mirror of
https://github.com/stablyai/orca.git
synced 2026-09-28 16:02:45 +00:00
* fix(terminal): move the recovery ledger onto the tab row and gate it on outcome The recovery budget lived in module-level Maps keyed by tabId. Anything keyed outside the row needs a release path, and that release fired on every remount-driven pane disposal, so each remount erased the budget it had just consumed (crash b5cfc6ca). Put the ledger on TerminalTab and write it in the same set() as the generation bump: reading the budget is now reading the tab, so releasing it independently has no expression. Counting was also the wrong control. Every remount mounts a pane that captures a FRESH recovery epoch, so the epoch check can never refuse its request — recovery re-requested the exact action that had just failed with no evidence anything changed. Gate on an observed outcome instead, reusing the direct-SSH pane retry vocabulary (success | failed | timed-out | superseded) and its settle call sites: an unsettled attempt blocks the next one, and a settled failure refuses the same reason until a new trigger arrives (generation move, or the user's Retry). The 3-per-5min cap stays as a breadcrumb-emitting backstop, not the control. viewMode now also lands on the row from the local toggles, mirroring how pin already does it, so the chat-ownership guard reads one index instead of OR-ing two. * fix(terminal): persist the row's viewMode and keep both chat-ownership reads The narrowed chat-ownership guard read a field the session schema strips: terminalTabSchema never declared viewMode, so the terminal row lost it on every load while the unified tab kept it. After a restart the row read undefined and recovery would remount a chat-owned tab's hidden surface — the race #19745's guard exists to prevent. Declare viewMode on terminalTabSchema so the row is durable, and keep the disjunction rather than replacing it. The schema cannot retroactively add the field to sessions already on disk, so the first load after upgrade still has it only on the unified tab; and for a safety check over two partly-redundant sources, a hole in either index should err toward declining a heal. Also cover three structural guards that no test was holding: both remote ledger-carry paths (terminal-build, remote-workspace-session-merge) and the only success settle in the state machine, including its placement past the failure branches. * fix(terminal): settle a fresh spawn's outcome and prove the ownership guard across a reload spawn-left-pane-unbound was the one recovery reason with no success settle: its remount heals by spawning, not reattaching, so it reached none of the reattach settle points and left the attempt 'pending' for the full 31s bound. A fresh spawn that binds a PTY now reports it, the dual of the unbound settle that already reported failure. Two tests outside src/ still called remountTerminalTabForRecovery by its old boolean contract and broke CI; both are updated to the admission result. Also strips the client-local recovery ledger at the remote-workspace projection boundary, in the type as well as the destructure, so a future producer cannot put another machine's Date.now() on the wire. * fix(terminal): resolve the pane's tab row once for both epochs after the main merge #20034 replaced connect-pane-pty's inline tab resolution with findTerminalTabForPane, and this branch had rewritten the line below it to read the recovery epoch off the row that block used to bind. The merge was textually clean and semantically broken: `terminalTab` no longer existed, so typecheck failed and every test that connects a pane threw ReferenceError. Resolve the row once through the new helper and feed both epochs from it, which keeps #20034's refactor and this branch's reason for reading the row here — a second lookup would put another tabsByWorktree scan on the connect path. captureTabRecoveryGeneration is narrowed to the one field it reads so the helper's record type can carry it.
352 lines
13 KiB
TypeScript
352 lines
13 KiB
TypeScript
import { randomUUID } from 'node:crypto'
|
|
import { existsSync, readFileSync, rmSync } from 'node:fs'
|
|
import os from 'node:os'
|
|
import path from 'node:path'
|
|
import { stripAnsiEscapeSequences } from '../../src/shared/ansi-escape-sequences'
|
|
import { test, expect } from './helpers/orca-app'
|
|
import {
|
|
runNodeScriptInTerminal,
|
|
stageNodeScriptForTerminal
|
|
} from './helpers/run-node-script-in-terminal'
|
|
import { registerTerminalPaneMountReadiness } from './helpers/terminal-pane-mount-readiness'
|
|
import {
|
|
focusActiveTerminalInput,
|
|
getTerminalContent,
|
|
waitForPaneIdentitySnapshot,
|
|
waitForTerminalOutput
|
|
} from './helpers/terminal'
|
|
|
|
type QuickCommandIdentity = {
|
|
marker: string
|
|
paneKey: string
|
|
pid: number
|
|
tabId: string
|
|
}
|
|
|
|
type QueueObservation = {
|
|
pending: boolean
|
|
ptyIds: string[]
|
|
}
|
|
|
|
type QueueObservationWindow = Window & {
|
|
__quickCommandQueueObservations?: QueueObservation[]
|
|
__stopQuickCommandQueueObservations?: () => void
|
|
}
|
|
|
|
function exactMarkerLineCount(content: string, marker: string): number {
|
|
return stripAnsiEscapeSequences(content)
|
|
.split(/\r?\n/)
|
|
.map((line) => line.trim())
|
|
.filter((line) => line === marker).length
|
|
}
|
|
|
|
test.describe('Quick Command startup recovery', () => {
|
|
registerTerminalPaneMountReadiness()
|
|
|
|
test('visible Quick Command survives a forced pre-bind recovery on one fresh PTY', async ({
|
|
orcaPage
|
|
}) => {
|
|
const siblingBefore = await waitForPaneIdentitySnapshot(orcaPage, 1)
|
|
const siblingPtyId = siblingBefore.panes[0]?.ptyId
|
|
if (!siblingPtyId) {
|
|
throw new Error('Sibling terminal has no live PTY')
|
|
}
|
|
|
|
const siblingMarker = `ORCA_QUICK_COMMAND_SIBLING_${randomUUID()}`
|
|
const siblingProbe = await runNodeScriptInTerminal(
|
|
orcaPage,
|
|
siblingPtyId,
|
|
`process.stdout.write(${JSON.stringify(`${siblingMarker}\n`)})`
|
|
)
|
|
await waitForTerminalOutput(orcaPage, siblingMarker)
|
|
siblingProbe.cleanup()
|
|
|
|
const marker = `ORCA_QUICK_COMMAND_RECOVERY_${randomUUID()}`
|
|
const label = `Recovery sentinel ${randomUUID()}`
|
|
const identityPath = path.join(os.tmpdir(), `orca-quick-command-identity-${randomUUID()}.json`)
|
|
const staged = stageNodeScriptForTerminal(
|
|
`
|
|
const { writeFileSync } = require('node:fs')
|
|
const identity = {
|
|
marker: ${JSON.stringify(marker)},
|
|
paneKey: process.env.ORCA_PANE_KEY || '',
|
|
pid: process.pid,
|
|
tabId: process.env.ORCA_TAB_ID || ''
|
|
}
|
|
writeFileSync(${JSON.stringify(identityPath)}, JSON.stringify(identity), { flag: 'wx' })
|
|
process.stdout.write(${JSON.stringify(`${marker}\n`)})
|
|
`.trim()
|
|
)
|
|
|
|
try {
|
|
await orcaPage.evaluate(
|
|
async ({ command, label }) => {
|
|
const store = window.__store
|
|
if (!store) {
|
|
throw new Error('Renderer store unavailable')
|
|
}
|
|
await store.getState().updateSettings({
|
|
terminalQuickCommands: [
|
|
{
|
|
id: 'e2e-pre-bind-recovery',
|
|
label,
|
|
scope: { type: 'global' },
|
|
action: 'terminal-command',
|
|
command,
|
|
appendEnter: true
|
|
}
|
|
]
|
|
})
|
|
const spawnBarrier = window.__terminalPtyPreSpawnE2EBarrier
|
|
if (!spawnBarrier) {
|
|
throw new Error('Terminal PTY pre-spawn E2E barrier unavailable')
|
|
}
|
|
spawnBarrier.arm()
|
|
},
|
|
{ command: staged.command, label }
|
|
)
|
|
|
|
const quickCommandButton = orcaPage.getByRole('button', {
|
|
name: `Run quick command: ${label}`
|
|
})
|
|
await expect(quickCommandButton).toBeVisible()
|
|
await quickCommandButton.click()
|
|
await orcaPage.evaluate(async () => {
|
|
const spawnBarrier = window.__terminalPtyPreSpawnE2EBarrier
|
|
if (!spawnBarrier) {
|
|
throw new Error('Terminal PTY pre-spawn E2E barrier unavailable')
|
|
}
|
|
await spawnBarrier.waitUntilBlocked()
|
|
})
|
|
|
|
const blocked = await orcaPage.evaluate(() => {
|
|
const store = window.__store
|
|
if (!store) {
|
|
throw new Error('Renderer store unavailable')
|
|
}
|
|
const state = store.getState()
|
|
const tabId = state.activeTabId
|
|
if (!tabId) {
|
|
throw new Error('Quick Command did not create an active tab')
|
|
}
|
|
return {
|
|
generation:
|
|
state.tabsByWorktree[state.activeWorktreeId ?? '']?.find((tab) => tab.id === tabId)
|
|
?.generation ?? 0,
|
|
pending: state.pendingStartupByTabId[tabId]?.command ?? null,
|
|
status: window.__terminalPtyPreSpawnE2EBarrier?.status(),
|
|
tabId
|
|
}
|
|
})
|
|
expect(blocked.pending).toBe(staged.command)
|
|
expect(blocked.status).toBe('blocked')
|
|
|
|
await orcaPage.evaluate((tabId) => {
|
|
const store = window.__store
|
|
if (!store) {
|
|
throw new Error('Renderer store unavailable')
|
|
}
|
|
const target = window as QueueObservationWindow
|
|
const observations: QueueObservation[] = []
|
|
const observe = (): void => {
|
|
const state = store.getState()
|
|
observations.push({
|
|
pending: state.pendingStartupByTabId[tabId] !== undefined,
|
|
ptyIds: [...(state.ptyIdsByTabId[tabId] ?? [])]
|
|
})
|
|
}
|
|
target.__quickCommandQueueObservations = observations
|
|
target.__stopQuickCommandQueueObservations = store.subscribe(observe)
|
|
observe()
|
|
}, blocked.tabId)
|
|
|
|
// No request argument: an external lifecycle remount, which skips the
|
|
// recovery ledger entirely and so reports generation 0.
|
|
const remountResult = await orcaPage.evaluate((tabId) => {
|
|
const state = window.__store?.getState()
|
|
if (!state) {
|
|
throw new Error('Renderer store unavailable')
|
|
}
|
|
return state.remountTerminalTabForRecovery(tabId)
|
|
}, blocked.tabId)
|
|
expect(remountResult).toMatchObject({ remounted: true })
|
|
|
|
// Keep the original pre-spawn attempt gated until React has committed the
|
|
// successor pane. Releasing earlier lets a loaded CI renderer finish the
|
|
// old mount's teardown before the replacement reaches its connect path.
|
|
await expect
|
|
.poll(
|
|
() =>
|
|
orcaPage.evaluate(
|
|
({ expectedGeneration, tabId }) => {
|
|
const state = window.__store?.getState()
|
|
const manager = window.__paneManagers?.get(tabId)
|
|
const pane = manager?.getPanes()[0]
|
|
const tab = state?.tabsByWorktree[state.activeWorktreeId ?? '']?.find(
|
|
(candidate) => candidate.id === tabId
|
|
)
|
|
return {
|
|
generation: tab?.generation ?? 0,
|
|
leafReady: Boolean(pane?.leafId),
|
|
pending: state?.pendingStartupByTabId[tabId]?.command ?? null,
|
|
expectedGeneration
|
|
}
|
|
},
|
|
{ expectedGeneration: blocked.generation + 1, tabId: blocked.tabId }
|
|
),
|
|
{ message: 'Successor mount did not become ready before barrier release' }
|
|
)
|
|
.toEqual({
|
|
generation: blocked.generation + 1,
|
|
leafReady: true,
|
|
pending: staged.command,
|
|
expectedGeneration: blocked.generation + 1
|
|
})
|
|
await orcaPage.evaluate(() => window.__terminalPtyPreSpawnE2EBarrier?.release())
|
|
|
|
let targetPtyId = ''
|
|
let targetLeafId = ''
|
|
const successorReady = (): Promise<{
|
|
generation: number
|
|
leafReady: boolean
|
|
pending: string | null
|
|
ptyReady: boolean
|
|
expectedGeneration: number
|
|
}> =>
|
|
orcaPage.evaluate(
|
|
({ expectedGeneration, tabId }) => {
|
|
const state = window.__store?.getState()
|
|
const manager = window.__paneManagers?.get(tabId)
|
|
const pane = manager?.getPanes()[0]
|
|
const tab = state?.tabsByWorktree[state.activeWorktreeId ?? '']?.find(
|
|
(candidate) => candidate.id === tabId
|
|
)
|
|
return {
|
|
generation: tab?.generation ?? 0,
|
|
leafReady: Boolean(pane?.leafId),
|
|
pending: state?.pendingStartupByTabId[tabId]?.command ?? null,
|
|
ptyReady: Boolean(pane?.container.dataset.ptyId),
|
|
expectedGeneration
|
|
}
|
|
},
|
|
{ expectedGeneration: blocked.generation + 1, tabId: blocked.tabId }
|
|
)
|
|
try {
|
|
await expect
|
|
.poll(successorReady, {
|
|
timeout: 60_000,
|
|
message: 'Successor mount did not bind its fresh Quick Command PTY'
|
|
})
|
|
.toEqual({
|
|
generation: blocked.generation + 1,
|
|
leafReady: true,
|
|
pending: null,
|
|
ptyReady: true,
|
|
expectedGeneration: blocked.generation + 1
|
|
})
|
|
} catch (error) {
|
|
const diagnostics = await orcaPage.evaluate(() => ({
|
|
ptyConnect: (window as Window & { __ptyConnectDiag?: string[] }).__ptyConnectDiag ?? [],
|
|
barrier: window.__terminalPtyPreSpawnE2EBarrier?.status() ?? 'missing'
|
|
}))
|
|
throw new Error(
|
|
`${error instanceof Error ? error.message : String(error)}\nDiagnostics: ${JSON.stringify(diagnostics)}`
|
|
)
|
|
}
|
|
|
|
const successor = await orcaPage.evaluate((tabId) => {
|
|
const pane = window.__paneManagers?.get(tabId)?.getPanes()[0]
|
|
return {
|
|
leafId: pane?.leafId ?? '',
|
|
ptyId: pane?.container.dataset.ptyId ?? ''
|
|
}
|
|
}, blocked.tabId)
|
|
targetPtyId = successor.ptyId
|
|
targetLeafId = successor.leafId
|
|
expect(targetPtyId).not.toBe('')
|
|
expect(targetLeafId).not.toBe('')
|
|
expect(targetPtyId).not.toBe(siblingPtyId)
|
|
|
|
const queueObservations = await orcaPage.evaluate(() => {
|
|
const target = window as QueueObservationWindow
|
|
target.__stopQuickCommandQueueObservations?.()
|
|
target.__stopQuickCommandQueueObservations = undefined
|
|
return target.__quickCommandQueueObservations ?? []
|
|
})
|
|
const firstConsumed = queueObservations.find((observation) => !observation.pending)
|
|
expect(firstConsumed?.ptyIds).toContain(targetPtyId)
|
|
|
|
await expect
|
|
.poll(
|
|
() =>
|
|
orcaPage.evaluate((tabId) => {
|
|
const pane = window.__paneManagers?.get(tabId)?.getPanes()[0]
|
|
return pane?.serializeAddon.serialize() ?? ''
|
|
}, blocked.tabId),
|
|
{ message: 'Quick Command marker never reached the visible xterm' }
|
|
)
|
|
.toContain(marker)
|
|
const targetContent = await orcaPage.evaluate((tabId) => {
|
|
const pane = window.__paneManagers?.get(tabId)?.getPanes()[0]
|
|
return pane?.serializeAddon.serialize() ?? ''
|
|
}, blocked.tabId)
|
|
expect(exactMarkerLineCount(targetContent, marker)).toBe(1)
|
|
|
|
await expect.poll(() => existsSync(identityPath)).toBe(true)
|
|
const identity = JSON.parse(readFileSync(identityPath, 'utf8')) as QuickCommandIdentity
|
|
expect(identity).toMatchObject({
|
|
marker,
|
|
paneKey: `${blocked.tabId}:${targetLeafId}`,
|
|
tabId: blocked.tabId
|
|
})
|
|
expect(identity.pid).toBeGreaterThan(0)
|
|
|
|
const ptyIdentity = await orcaPage.evaluate(
|
|
async ({ siblingPtyId, siblingTabId, tabId, targetPtyId }) => {
|
|
const state = window.__store?.getState()
|
|
const layout = state?.terminalLayoutsByTabId[tabId]
|
|
const sessions = await window.api.pty.listSessions()
|
|
return {
|
|
layoutPtyIds: Object.values(layout?.ptyIdsByLeafId ?? {}),
|
|
siblingLive: await window.api.pty.hasPty(siblingPtyId),
|
|
siblingStorePtyIds: state?.ptyIdsByTabId[siblingTabId] ?? [],
|
|
targetLive: await window.api.pty.hasPty(targetPtyId),
|
|
targetSessionIds: sessions
|
|
.filter((session) => session.id === targetPtyId)
|
|
.map((session) => session.id),
|
|
targetStorePtyIds: state?.ptyIdsByTabId[tabId] ?? []
|
|
}
|
|
},
|
|
{ siblingPtyId, siblingTabId: siblingBefore.tabId, tabId: blocked.tabId, targetPtyId }
|
|
)
|
|
expect(ptyIdentity.targetLive).toBe(true)
|
|
expect(ptyIdentity.targetSessionIds).toEqual([targetPtyId])
|
|
expect(ptyIdentity.targetStorePtyIds).toContain(targetPtyId)
|
|
expect(ptyIdentity.layoutPtyIds).toContain(targetPtyId)
|
|
expect(ptyIdentity.siblingLive).toBe(true)
|
|
expect(ptyIdentity.siblingStorePtyIds).toContain(siblingPtyId)
|
|
|
|
const siblingAfterMarker = `ORCA_QUICK_COMMAND_SIBLING_AFTER_${randomUUID()}`
|
|
await orcaPage.evaluate(
|
|
(tabId) => window.__store?.getState().setActiveTab(tabId),
|
|
siblingBefore.tabId
|
|
)
|
|
await expect
|
|
.poll(() => orcaPage.evaluate(() => window.__store?.getState().activeTabId))
|
|
.toBe(siblingBefore.tabId)
|
|
await focusActiveTerminalInput(orcaPage)
|
|
await orcaPage.keyboard.type(`echo ${siblingAfterMarker}`)
|
|
await orcaPage.keyboard.press('Enter')
|
|
await expect
|
|
.poll(async () => (await getTerminalContent(orcaPage)).split(siblingAfterMarker).length - 1)
|
|
.toBeGreaterThanOrEqual(1)
|
|
} finally {
|
|
await orcaPage
|
|
.evaluate(() => window.__terminalPtyPreSpawnE2EBarrier?.release())
|
|
.catch(() => {})
|
|
staged.cleanup()
|
|
rmSync(identityPath, { force: true })
|
|
}
|
|
})
|
|
})
|