Switch chats between Chat UI and a terminal without forking

config/flaky-test-pattern-baseline.txt

@@ -1127,7 +1127,6 @@
 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
 1 test-no-wall-clock:src/renderer/src/components/tab-bar/TabBarCreateEntry.history.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
 4 test-no-wall-clock:src/renderer/src/components/task-page/jira/task-page-jira-cache-selectors.test.ts
 1 test-no-wall-clock:src/renderer/src/components/task-page-jira-saved-filter-load-failure.test.tsx

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
@@ -60,10 +60,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

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

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) {

config/scripts/check-layout-writer-ratchets.mjs

@@ -320,6 +320,27 @@ 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.questionDotToken ||
+    call.arguments.length !== 2 ||
+    call.arguments[1] !== node
+  ) {
+    return false
+  }
+  const callee = call.expression
+  return (
+    ts.isPropertyAccessExpression(callee) &&
+    !callee.questionDotToken &&
+    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]
@@ -381,18 +402,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.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)
+      !ts.isLiteralTypeNode(node.parent) &&
+      !isOwnPresenceRead(node)
     ) {
       count += 1
     }

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 = [

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: '思考中',

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.

config/scripts/vitest-node-runtime-files.mjs

@@ -40,6 +40,7 @@ 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',

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'
 
@@ -129,7 +130,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,
@@ -148,6 +149,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 () => {

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>,