refactor(terminal): window saves carry presentation only; delete the rebase and binding replay (core C7)

config/scripts/ci-shard-timings.json

@@ -7294,7 +7294,7 @@
       "src/renderer/src/components/terminal-pane/terminal-layout-leaf-detach.test.ts": 62,
       "src/renderer/src/components/terminal-pane/terminal-layout-leaf-ids.test.ts": 39,
       "src/renderer/src/components/terminal-pane/terminal-layout-overlay-focus.test.tsx": 328,
-      "src/renderer/src/components/terminal-pane/terminal-layout-pty-ownership-depth.test.ts": 103,
+      "src/shared/terminal-layout-pty-ownership-depth.test.ts": 103,
       "src/renderer/src/components/terminal-pane/terminal-layout-pty-ownership.test.ts": 111,
       "src/renderer/src/components/terminal-pane/terminal-link-action-routing.test.ts": 1448,
       "src/renderer/src/components/terminal-pane/terminal-link-activation.test.ts": 226,

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

@@ -170,6 +170,8 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/runtime/agent-session-store-transactions.test.ts',
   'src/main/runtime/agent-session-unsaved-creation-supersession.test.ts',
   'src/main/runtime/automation-change-publication.test.ts',
+  'src/main/runtime/headless-editor-tab-close-persistence.test.ts',
+  'src/main/runtime/headless-terminal-tab-order-persistence.test.ts',
   'src/main/runtime/host-terminal-close-persistence-durability.test.ts',
   'src/main/runtime/orca-runtime-terminal-close-records.test.ts',
   'src/main/runtime/orca-runtime-terminal-surface-close.test.ts',
@@ -201,6 +203,7 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/runtime/structured-agent-session-startup-reconcile.test.ts',
   'src/main/runtime/structured-claude-attachment-grant.test.ts',
   'src/main/runtime/structured-claude-pending-rewind.test.ts',
+  'src/main/legacy-terminal-surface-tombstones-write.test.ts',
   'src/main/ssh-expired-lease-pane-readoption.test.ts',
   'src/main/ssh-reattach-pane-cardinality.test.ts',
   'src/main/ssh/orcad-migration-cutover-coordinator.test.ts',
@@ -211,6 +214,7 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/ssh/orcad-runtime-conversion.test.ts',
   'src/main/ssh/orcad-unreachable-setup-release.test.ts',
   'src/main/ssh/ssh-target-orcad-preflight.test.ts',
+  'src/main/terminal-topology-main-writer-pushes.test.ts',
   'src/main/worktree-identity-persistence.test.ts',
   'src/main/worktree-removal-close-records.test.ts',
   'src/main/worktree-removal-session-partition-fencing.test.ts',

src/main/agent-hooks/first-work-folder-rename.test.ts

@@ -1,6 +1,11 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { GlobalSettings } from '../../shared/global-settings-types'
 import type { Repo } from '../../shared/repo-types'
+import { getDefaultWorkspaceSession } from '../../shared/constants'
+import {
+  TerminalTopologyPublisher,
+  type TerminalTopologyOwners
+} from '../runtime/terminal-topology-publisher'
 import {
   renameWorktreeFolderOnFirstWork,
   type FirstWorkFolderRenameDeps
@@ -97,4 +102,52 @@ describe('renameWorktreeFolderOnFirstWork', () => {
     expect(await renameWorktreeFolderOnFirstWork(OLD_ID, 'fix-auth', deps)).toBe(false)
     expect(deps.moveWorktree).not.toHaveBeenCalled()
   })
+
+  it("tells the window about the rename before main pushes either id's topology", async () => {
+    const NEW_ID = 'repo1::/ws/worktree-creation-spinner'
+    const tab = (worktreeId: string) => ({
+      id: 'tab',
+      ptyId: 'pty',
+      worktreeId,
+      title: 'Terminal',
+      customTitle: null,
+      color: null,
+      sortOrder: 0,
+      createdAt: 1
+    })
+    const ownedBy = (worktreeId: string): TerminalTopologyOwners =>
+      new Map([
+        [
+          worktreeId,
+          {
+            hostId: 'local',
+            session: {
+              ...getDefaultWorkspaceSession(),
+              tabsByWorktree: { [worktreeId]: [tab(worktreeId)] }
+            }
+          }
+        ]
+      ])
+    let owners = ownedBy(OLD_ID)
+    const order: string[] = []
+    const publisher = new TerminalTopologyPublisher(
+      () => owners,
+      (slice) => order.push(`${slice.worktreeId}: ${slice.tabs.length} tab(s)`)
+    )
+    publisher.snapshot()
+    order.length = 0
+
+    const deps = makeDeps({
+      migrateWorktreeIdentity: vi.fn(() => {
+        owners = ownedBy(NEW_ID)
+        publisher.markDirty()
+      }),
+      notifyWorktreeRenamed: vi.fn(() => order.push('renamed'))
+    })
+    await renameWorktreeFolderOnFirstWork(OLD_ID, 'worktree-creation-spinner', deps)
+    await Promise.resolve()
+
+    // The window re-keys its tabs first, so the old id's empty slice finds none to drop.
+    expect(order).toEqual(['renamed', `${OLD_ID}: 0 tab(s)`, `${NEW_ID}: 1 tab(s)`])
+  })
 })

src/main/ipc/pty-dead-owner-respawn.test.ts

@@ -109,6 +109,7 @@ describe('registerPtyHandlers', () => {
         session = next
       }),
       flushOrThrow: vi.fn(),
+      retirePtyBinding: vi.fn(async () => true),
       persistPtyBinding: vi.fn(),
       getFolderWorkspace: vi.fn(() => undefined),
       getFolderWorkspaces: vi.fn(() => []),
@@ -171,8 +172,9 @@ describe('registerPtyHandlers', () => {
       'inc-proven-absent-owner',
       { hostExitConfirmed: true }
     )
-    expect(store.setWorkspaceSession).toHaveBeenCalledOnce()
-    expect(store.flushOrThrow).toHaveBeenCalledOnce()
+    // The pane, its binding and its row stay for the fresh spawn's bind to swap.
+    expect(store.setWorkspaceSession).not.toHaveBeenCalled()
+    expect(store.retirePtyBinding).not.toHaveBeenCalled()
   })
   it('does not poll after the routed provider confirms absence', async () => {
     const worktreeId = 'repo-1::/tmp/probe-blip-owner'
@@ -233,6 +235,7 @@ describe('registerPtyHandlers', () => {
         session = next
       }),
       flushOrThrow: vi.fn(),
+      retirePtyBinding: vi.fn(async () => true),
       persistPtyBinding: vi.fn(),
       getFolderWorkspace: vi.fn(() => undefined),
       getFolderWorkspaces: vi.fn(() => []),
@@ -357,6 +360,7 @@ describe('registerPtyHandlers', () => {
         session = next
       }),
       flushOrThrow: vi.fn(),
+      retirePtyBinding: vi.fn(async () => true),
       persistPtyBinding: vi.fn(),
       getFolderWorkspace: vi.fn(() => undefined),
       getFolderWorkspaces: vi.fn(() => []),

src/main/ipc/pty-pane-claim-arbitration.test.ts

@@ -159,7 +159,6 @@ describe('registerPtyHandlers', () => {
       leafId,
       ptyId: expect.any(String),
       incarnationId: expect.any(String),
-      hostAdmittedMembership: true,
       origin: 'spawn'
     })
   })
@@ -519,7 +518,6 @@ describe('registerPtyHandlers', () => {
       leafId,
       ptyId: 'pty-shared',
       startupCwd: '/tmp',
-      hostAdmittedMembership: true,
       origin: 'spawn'
     })
   })

src/main/ipc/pty-pane-reservation-settlement.test.ts

@@ -123,6 +123,7 @@ describe('registerPtyHandlers', () => {
         session = next
       }),
       flushOrThrow: vi.fn(),
+      retirePtyBinding: vi.fn(async () => true),
       persistPtyBinding: vi.fn(),
       upsertSshRemotePtyLease: vi.fn(),
       supersedeSshRemotePtyLeasesForBoundPane: vi.fn(),
@@ -184,16 +185,16 @@ describe('registerPtyHandlers', () => {
       expect(remoteSpawn.mock.calls[1]?.[0]).toMatchObject({
         command: 'codex resume exact-dead-ssh-provider-session'
       })
-      expect(store.setWorkspaceSession).toHaveBeenCalledWith(expect.anything(), hostId)
-      expect(store.persistPtyBinding).toHaveBeenCalledWith(
-        expect.objectContaining({
-          worktreeId,
-          tabId,
-          leafId,
-          ptyId: freshPtyId
-        }),
-        hostId
-      )
+      expect(store.setWorkspaceSession).not.toHaveBeenCalled()
+      // The fresh spawn replaces the absent owner, so its bind swaps the binding naming it.
+      const [input, persistHostId] = store.persistPtyBinding.mock.calls[0] ?? []
+      expect(persistHostId).toBe(hostId)
+      expect(typeof input === 'function' ? input() : input).toMatchObject({
+        worktreeId,
+        tabId,
+        leafId,
+        ptyId: freshPtyId
+      })
     } finally {
       unregisterSshPtyProvider(connectionId)
     }
@@ -542,7 +543,6 @@ describe('registerPtyHandlers', () => {
         tabId: 'tab-remote',
         leafId,
         ptyId: 'ssh:ssh-1@@relay-pty',
-        hostAdmittedMembership: true,
         origin: 'spawn'
       },
       'ssh:ssh-1'

src/main/ipc/pty-persisted-incarnation-repair.test.ts

@@ -279,6 +279,7 @@ describe('registerPtyHandlers', () => {
           session = next
         }),
         flushOrThrow: vi.fn(),
+        retirePtyBinding: vi.fn(async () => true),
         persistPtyBinding: vi.fn(),
         getFolderWorkspace: vi.fn(() => ({
           id: 'dead-persisted-owner',
@@ -350,7 +351,7 @@ describe('registerPtyHandlers', () => {
           sessionId: 'pty-dead-persisted-owner',
           command: undefined
         })
-        expect(store.setWorkspaceSession).toHaveBeenCalledOnce()
+        expect(store.setWorkspaceSession).not.toHaveBeenCalled()
         expect(runtime.onPtyExit).toHaveBeenCalledWith(
           'pty-dead-persisted-owner',
           -1,
@@ -374,8 +375,8 @@ describe('registerPtyHandlers', () => {
       expect(providerSpawn.mock.calls[1]?.[0]).toMatchObject({
         command: 'codex resume exact-dead-provider-session'
       })
-      expect(store.setWorkspaceSession).toHaveBeenCalledOnce()
-      expect(store.flushOrThrow).toHaveBeenCalledOnce()
+      // The pane and its binding stay for the fresh spawn's bind to swap.
+      expect(store.setWorkspaceSession).not.toHaveBeenCalled()
       expect(runtime.onPtyExit).toHaveBeenCalledWith(
         'pty-dead-persisted-owner',
         -1,
@@ -441,6 +442,7 @@ describe('registerPtyHandlers', () => {
         session = next
       }),
       flushOrThrow: vi.fn(),
+      retirePtyBinding: vi.fn(async () => true),
       persistPtyBinding: vi.fn(),
       getFolderWorkspace: vi.fn(() => undefined),
       getFolderWorkspaces: vi.fn(() => []),

src/main/ipc/pty-runtime-ssh-binding-persistence.test.ts

@@ -202,7 +202,6 @@ describe('registerPtyHandlers', () => {
           tabId: 'tab-remote',
           leafId,
           ptyId: 'ssh:ssh-reattach-ok@@relay-pty',
-          hostAdmittedMembership: true,
           origin: 'reattach'
         },
         'ssh:ssh-reattach-ok'

src/main/ipc/pty-spawn-placement-threading.test.ts

@@ -81,7 +81,9 @@ describe('pty spawn placement threading', () => {
       noteTerminalSpawnCommand: vi.fn(),
       onPtySpawned: vi.fn(),
       onPtyExit: vi.fn(),
-      onPtyData: vi.fn()
+      onPtyData: vi.fn(),
+      // Names a push only once the binding is written.
+      settleTerminalTopology: vi.fn(() => (store.persistPtyBinding.mock.calls.length > 0 ? 9 : 0))
     }
     // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: spawn reads only the window, runtime and store members these fakes define.
     const args = [
@@ -104,8 +106,8 @@ describe('pty spawn placement threading', () => {
     }
   }
 
-  async function ipcSpawn(extra: Record<string, unknown>): Promise<void> {
-    await handlers.get('pty:spawn')!(null, {
+  async function ipcSpawn(extra: Record<string, unknown>): Promise<unknown> {
+    return await handlers.get('pty:spawn')!(null, {
       cols: 80,
       rows: 24,
       cwd: '/tmp',
@@ -142,6 +144,11 @@ describe('pty spawn placement threading', () => {
     ])
   })
 
+  it('replies with the publishSeq of the push that carries the binding', async () => {
+    register()
+    await expect(ipcSpawn({ placement: SPLIT })).resolves.toMatchObject({ publishSeq: 9 })
+  })
+
   it('drops a malformed or future-kind placement instead of failing the spawn', async () => {
     const { store } = register()
     await ipcSpawn({ placement: { kind: 'floating-window', anchor: 'x' } })
@@ -170,7 +177,6 @@ describe('pty spawn placement threading', () => {
       leafId: LEAF,
       ptyId: expect.any(String),
       incarnationId: expect.any(String),
-      hostAdmittedMembership: true,
       placement: SPLIT,
       origin: 'spawn'
     })

src/main/ipc/pty/ipc/leaf-move.test.ts

@@ -3,7 +3,8 @@ import { agentHookServer } from '../../../agent-hooks/server'
 import type { Store } from '../../../persistence'
 import type { OrcaRuntimeService } from '../../../runtime/orca-runtime'
 import type { TerminalLeafMoveResult } from '../../../../shared/terminal-leaf-move'
-import { commitLeafMoveAndRekey } from './leaf-move'
+import { setPtyHostBindings } from '../../pty-host-bindings'
+import { commitLeafMoveAndRekey, installPtyLeafMoveIpcHandler } from './leaf-move'
 
 const LEAF = '22222222-2222-4222-8222-222222222222'
 const request = {
@@ -14,19 +15,22 @@ const request = {
   ptyId: 'pty-agent'
 }
 
-function deps(result: TerminalLeafMoveResult) {
+function deps(result: TerminalLeafMoveResult, homeHostId: string | null = 'ssh:target-1') {
   const rekeyWorkerTerminalResourcePaneKey = vi.fn(() => 1)
+  const moveTerminalLeafToNewTab = vi.fn(async () => result)
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the move reads only this Store method.
-  const store = { moveTerminalLeafToNewTab: vi.fn(async () => result) } as unknown as Store
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the move reads only the orchestration DB accessor.
+  const store = { moveTerminalLeafToNewTab } as unknown as Store
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the move reads only the home resolver and the orchestration DB accessor.
   const runtime = {
+    getTerminalTopologyHomeHostId: () => homeHostId,
     getExistingOrchestrationDb: () => ({ rekeyWorkerTerminalResourcePaneKey })
   } as unknown as OrcaRuntimeService
-  return { store, runtime, rekeyWorkerTerminalResourcePaneKey }
+  return { store, runtime, rekeyWorkerTerminalResourcePaneKey, moveTerminalLeafToNewTab }
 }
 
 afterEach(() => {
   vi.restoreAllMocks()
+  setPtyHostBindings({})
 })
 
 describe('pty:moveLeafToNewTab', () => {
@@ -67,4 +71,54 @@ describe('pty:moveLeafToNewTab', () => {
     expect(transfer).not.toHaveBeenCalled()
     expect(rekeyWorkerTerminalResourcePaneKey).not.toHaveBeenCalled()
   })
+
+  it("writes only the worktree's home partition", async () => {
+    vi.spyOn(agentHookServer, 'transferPaneAuthority').mockImplementation(() => {})
+    const { store, runtime, moveTerminalLeafToNewTab } = deps({ status: 'moved', ptyId: null })
+
+    await commitLeafMoveAndRekey({ store, runtime }, request)
+
+    expect(moveTerminalLeafToNewTab).toHaveBeenCalledExactlyOnceWith(request, 'ssh:target-1')
+  })
+
+  it('writes nothing when the home is unresolved', async () => {
+    const { store, runtime, moveTerminalLeafToNewTab } = deps(
+      { status: 'moved', ptyId: null },
+      null
+    )
+
+    await expect(commitLeafMoveAndRekey({ store, runtime }, request)).resolves.toEqual({
+      status: 'refused',
+      reason: 'home_unresolved'
+    })
+    expect(moveTerminalLeafToNewTab).not.toHaveBeenCalled()
+  })
+
+  it('replies with the publishSeq of the push that carries the move', async () => {
+    vi.spyOn(agentHookServer, 'transferPaneAuthority').mockImplementation(() => {})
+    const handlers = new Map<string, (event: never, args: unknown) => unknown>()
+    setPtyHostBindings({
+      ipc: {
+        handle: (channel, listener) => handlers.set(channel, listener),
+        on: () => {},
+        removeHandler: () => {},
+        removeAllListeners: () => {}
+      }
+    })
+    const { store, runtime } = deps({ status: 'moved', ptyId: 'pty-agent' })
+    const settleTerminalTopology = vi.fn(() => 12)
+    installPtyLeafMoveIpcHandler({
+      store,
+      runtime: Object.assign(runtime, { settleTerminalTopology })
+    })
+
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the handler never reads the IPC event.
+    const reply = handlers.get('pty:moveLeafToNewTab')!({} as never, request)
+    await expect(reply).resolves.toEqual({
+      status: 'moved',
+      ptyId: 'pty-agent',
+      publishSeq: 12
+    })
+    expect(settleTerminalTopology).toHaveBeenCalledWith(request.worktreeId)
+  })
 })

src/main/ipc/pty/ipc/leaf-move.ts

@@ -17,7 +17,12 @@ export async function commitLeafMoveAndRekey(
   if (!deps.store) {
     return { status: 'not_held' }
   }
-  const result = await deps.store.moveTerminalLeafToNewTab(request)
+  // One home per worktree; an unresolved one is unverifiable, so nothing is written.
+  const hostId = deps.runtime?.getTerminalTopologyHomeHostId(request.worktreeId)
+  if (!hostId) {
+    return { status: 'refused', reason: 'home_unresolved' }
+  }
+  const result = await deps.store.moveTerminalLeafToNewTab(request, hostId)
   if (result.status !== 'moved') {
     return result
   }
@@ -53,6 +58,7 @@ export function installPtyLeafMoveIpcHandler(deps: {
     if (!isTerminalLeafMoveRequest(args)) {
       return { status: 'refused', reason: 'invalid_request' } satisfies TerminalLeafMoveResult
     }
-    return commitLeafMoveAndRekey(deps, args)
+    const result = await commitLeafMoveAndRekey(deps, args)
+    return { ...result, publishSeq: deps.runtime?.settleTerminalTopology(args.worktreeId) }
   })
 }