mirror of
https://github.com/stablyai/orca.git
synced 2026-09-25 08:02:31 +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.
347 lines
11 KiB
TypeScript
347 lines
11 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import {
|
|
exportRemoteWorkspaceSession,
|
|
importRemoteWorkspaceSession
|
|
} from './remote-workspace-session-projection'
|
|
import { getDefaultWorkspaceSession } from './constants'
|
|
|
|
describe('remote workspace session projection', () => {
|
|
// The transient set this boundary mirrors. `recovery` is the tab's in-flight
|
|
// heal, timestamped with THIS machine's clock, and `pendingActivationSpawn` is
|
|
// a one-shot mount handoff — neither means anything on another client's row,
|
|
// and a foreign `startedAt` would be compared against the reader's Date.now().
|
|
it('strips client-local transient tab fields on the way out', () => {
|
|
const session = {
|
|
...getDefaultWorkspaceSession(),
|
|
activeRepoId: 'repo-a',
|
|
activeWorktreeId: 'repo-a::/srv/app',
|
|
activeTabId: 'tab-1',
|
|
tabsByWorktree: {
|
|
'repo-a::/srv/app': [
|
|
{
|
|
id: 'tab-1',
|
|
ptyId: 'pty-1',
|
|
worktreeId: 'repo-a::/srv/app',
|
|
title: 'Remote',
|
|
customTitle: null,
|
|
color: null,
|
|
sortOrder: 0,
|
|
createdAt: 1,
|
|
pendingActivationSpawn: true,
|
|
recovery: {
|
|
attemptedAt: [1_000],
|
|
generation: 1,
|
|
outcome: 'failed' as const,
|
|
startedAt: 1_000,
|
|
reason: 'reattach-unverifiable' as const,
|
|
tabGeneration: 1
|
|
}
|
|
}
|
|
]
|
|
},
|
|
terminalLayoutsByTabId: {}
|
|
}
|
|
|
|
const projected = exportRemoteWorkspaceSession(session, {
|
|
isTargetWorktree: (worktreeId) => worktreeId.startsWith('repo-a::')
|
|
})
|
|
|
|
const exported = projected.tabsByWorktreePath['/srv/app'][0] as Record<string, unknown>
|
|
expect(exported.recovery).toBeUndefined()
|
|
expect(exported.pendingActivationSpawn).toBeUndefined()
|
|
expect(exported.id).toBe('tab-1')
|
|
})
|
|
|
|
it('exports terminal state using remote worktree paths instead of local repo ids', () => {
|
|
const session = {
|
|
...getDefaultWorkspaceSession(),
|
|
activeRepoId: 'repo-a',
|
|
activeWorktreeId: 'repo-a::/srv/app',
|
|
activeTabId: 'tab-1',
|
|
tabsByWorktree: {
|
|
'repo-a::/srv/app': [
|
|
{
|
|
id: 'tab-1',
|
|
ptyId: 'pty-1',
|
|
worktreeId: 'repo-a::/srv/app',
|
|
title: 'Remote',
|
|
customTitle: null,
|
|
color: null,
|
|
sortOrder: 0,
|
|
createdAt: 1
|
|
}
|
|
],
|
|
'repo-local::/tmp/local': [
|
|
{
|
|
id: 'tab-local',
|
|
ptyId: 'pty-local',
|
|
worktreeId: 'repo-local::/tmp/local',
|
|
title: 'Local',
|
|
customTitle: null,
|
|
color: null,
|
|
sortOrder: 0,
|
|
createdAt: 1
|
|
}
|
|
]
|
|
},
|
|
terminalLayoutsByTabId: {
|
|
'tab-1': { root: null, activeLeafId: null, expandedLeafId: null },
|
|
'tab-local': { root: null, activeLeafId: null, expandedLeafId: null }
|
|
},
|
|
remoteSessionIdsByTabId: {
|
|
'tab-1': 'pty-1',
|
|
'tab-local': 'pty-local'
|
|
},
|
|
defaultTerminalTabsAppliedByWorktreeId: {
|
|
'repo-a::/srv/app': true as const,
|
|
'repo-local::/tmp/local': true as const
|
|
}
|
|
}
|
|
|
|
const projected = exportRemoteWorkspaceSession(session, {
|
|
isTargetWorktree: (worktreeId) => worktreeId.startsWith('repo-a::')
|
|
})
|
|
|
|
expect(Object.keys(projected.tabsByWorktreePath)).toEqual(['/srv/app'])
|
|
expect(projected.tabsByWorktreePath['/srv/app'][0]).toMatchObject({
|
|
id: 'tab-1',
|
|
worktreePath: '/srv/app'
|
|
})
|
|
expect(projected.terminalLayoutsByTabId).toEqual({
|
|
'tab-1': { root: null, activeLeafId: null, expandedLeafId: null }
|
|
})
|
|
expect(projected.remoteSessionIdsByTabId).toEqual({ 'tab-1': 'pty-1' })
|
|
expect(projected.defaultTerminalTabsAppliedByWorktreePath).toEqual({ '/srv/app': true })
|
|
})
|
|
|
|
it('imports projected terminal state into this client repo id', () => {
|
|
const session = importRemoteWorkspaceSession(
|
|
{
|
|
activeWorktreePath: '/srv/app',
|
|
activeTabId: 'tab-1',
|
|
tabsByWorktreePath: {
|
|
'/srv/app': [
|
|
{
|
|
id: 'tab-1',
|
|
ptyId: 'pty-1',
|
|
worktreePath: '/srv/app',
|
|
title: 'Remote',
|
|
customTitle: null,
|
|
color: null,
|
|
sortOrder: 0,
|
|
createdAt: 1
|
|
}
|
|
]
|
|
},
|
|
terminalLayoutsByTabId: {
|
|
'tab-1': { root: null, activeLeafId: null, expandedLeafId: null }
|
|
},
|
|
remoteSessionIdsByTabId: { 'tab-1': 'pty-1' },
|
|
defaultTerminalTabsAppliedByWorktreePath: { '/srv/app': true }
|
|
},
|
|
{ resolveWorktreeId: (path) => (path === '/srv/app' ? 'repo-b::/srv/app' : null) }
|
|
)
|
|
|
|
expect(session.activeRepoId).toBe('repo-b')
|
|
expect(session.activeWorktreeId).toBe('repo-b::/srv/app')
|
|
expect(session.tabsByWorktree['repo-b::/srv/app'][0]).toMatchObject({
|
|
id: 'tab-1',
|
|
worktreeId: 'repo-b::/srv/app'
|
|
})
|
|
expect(session.remoteSessionIdsByTabId).toEqual({ 'tab-1': 'pty-1' })
|
|
expect(session.defaultTerminalTabsAppliedByWorktreeId).toEqual({
|
|
'repo-b::/srv/app': true
|
|
})
|
|
})
|
|
|
|
it('imports active worktree metadata even when the worktree has no terminal tabs', () => {
|
|
const session = importRemoteWorkspaceSession(
|
|
{
|
|
activeWorktreePath: '/srv/app',
|
|
activeTabId: null,
|
|
tabsByWorktreePath: {},
|
|
terminalLayoutsByTabId: {},
|
|
activeTabIdByWorktreePath: { '/srv/app': null },
|
|
lastVisitedAtByWorktreePath: { '/srv/app': 456 }
|
|
},
|
|
{ resolveWorktreeId: (path) => (path === '/srv/app' ? 'repo-b::/srv/app' : null) }
|
|
)
|
|
|
|
expect(session.activeRepoId).toBe('repo-b')
|
|
expect(session.activeWorktreeId).toBe('repo-b::/srv/app')
|
|
expect(session.activeTabIdByWorktree).toEqual({ 'repo-b::/srv/app': null })
|
|
expect(session.lastVisitedAtByWorktreeId).toEqual({ 'repo-b::/srv/app': 456 })
|
|
})
|
|
|
|
it('reports every host path whose terminal tabs could not be placed locally', () => {
|
|
const unplaced: [string, number][] = []
|
|
|
|
const session = importRemoteWorkspaceSession(
|
|
{
|
|
activeWorktreePath: '/srv/app',
|
|
activeTabId: null,
|
|
tabsByWorktreePath: {
|
|
'/srv/app': [
|
|
{
|
|
id: 'tab-1',
|
|
ptyId: 'pty-1',
|
|
worktreePath: '/srv/app',
|
|
title: 'Placed',
|
|
customTitle: null,
|
|
color: null,
|
|
sortOrder: 0,
|
|
createdAt: 1
|
|
}
|
|
],
|
|
'/srv/gone': [
|
|
{
|
|
id: 'tab-2',
|
|
ptyId: 'pty-2',
|
|
worktreePath: '/srv/gone',
|
|
title: 'Unplaced',
|
|
customTitle: null,
|
|
color: null,
|
|
sortOrder: 0,
|
|
createdAt: 2
|
|
},
|
|
{
|
|
id: 'tab-3',
|
|
ptyId: 'pty-3',
|
|
worktreePath: '/srv/gone',
|
|
title: 'Unplaced too',
|
|
customTitle: null,
|
|
color: null,
|
|
sortOrder: 1,
|
|
createdAt: 3
|
|
}
|
|
],
|
|
'/srv/also-gone': [
|
|
{
|
|
id: 'tab-4',
|
|
ptyId: 'pty-4',
|
|
worktreePath: '/srv/also-gone',
|
|
title: 'Unplaced elsewhere',
|
|
customTitle: null,
|
|
color: null,
|
|
sortOrder: 0,
|
|
createdAt: 4
|
|
}
|
|
],
|
|
'/srv/empty-and-gone': []
|
|
},
|
|
terminalLayoutsByTabId: {}
|
|
},
|
|
{
|
|
resolveWorktreeId: (path) => (path === '/srv/app' ? 'repo-b::/srv/app' : null),
|
|
onUnplacedTerminalTabs: (worktreePath, tabCount) => unplaced.push([worktreePath, tabCount])
|
|
}
|
|
)
|
|
|
|
// Once per unresolvable path that actually carried tabs: not the resolved path, and not the
|
|
// path whose tab array was empty (nothing was lost there).
|
|
expect(unplaced).toEqual([
|
|
['/srv/gone', 2],
|
|
['/srv/also-gone', 1]
|
|
])
|
|
expect(Object.keys(session.tabsByWorktree)).toEqual(['repo-b::/srv/app'])
|
|
})
|
|
|
|
it('unions two local repo rows that collapse onto one host path instead of clobbering', () => {
|
|
// Duplicate repo rows for one remote checkout are the normal state while a host catalog
|
|
// reconciles. `worktreePathFromId` drops the repoId, so both keys project onto '/srv/app'; a
|
|
// freshly created empty row iterating last used to publish an empty tab list for a workspace
|
|
// the user had panes open in, and the upload is a wholesale replace-session (#15484).
|
|
const session = {
|
|
...getDefaultWorkspaceSession(),
|
|
activeWorktreeId: 'repo-old::/srv/app',
|
|
activeTabId: 'tab-live',
|
|
tabsByWorktree: {
|
|
'repo-old::/srv/app': [
|
|
{
|
|
id: 'tab-live',
|
|
ptyId: 'pty-live',
|
|
worktreeId: 'repo-old::/srv/app',
|
|
title: 'Agent',
|
|
customTitle: null,
|
|
color: null,
|
|
sortOrder: 0,
|
|
createdAt: 1
|
|
}
|
|
],
|
|
'repo-new::/srv/app': []
|
|
},
|
|
activeTabIdByWorktree: {
|
|
'repo-old::/srv/app': 'tab-live',
|
|
'repo-new::/srv/app': null
|
|
},
|
|
remoteSessionIdsByTabId: { 'tab-live': 'pty-live' }
|
|
}
|
|
|
|
const projected = exportRemoteWorkspaceSession(session, {
|
|
isTargetWorktree: () => true
|
|
})
|
|
|
|
expect(
|
|
projected.tabsByWorktreePath['/srv/app']?.map((tab) => tab.id),
|
|
'the empty twin row erased a live pane from the host ledger'
|
|
).toEqual(['tab-live'])
|
|
expect(projected.activeTabIdByWorktreePath?.['/srv/app']).toBe('tab-live')
|
|
expect(projected.remoteSessionIdsByTabId).toEqual({ 'tab-live': 'pty-live' })
|
|
})
|
|
|
|
it('keeps one row per tab id when colliding local keys share a tab', () => {
|
|
const tab = {
|
|
id: 'tab-shared',
|
|
ptyId: 'pty-shared',
|
|
title: 'Agent',
|
|
customTitle: null,
|
|
color: null,
|
|
sortOrder: 0,
|
|
createdAt: 1
|
|
}
|
|
const session = {
|
|
...getDefaultWorkspaceSession(),
|
|
tabsByWorktree: {
|
|
'repo-old::/srv/app': [{ ...tab, worktreeId: 'repo-old::/srv/app' }],
|
|
'repo-new::/srv/app': [{ ...tab, worktreeId: 'repo-new::/srv/app' }]
|
|
}
|
|
}
|
|
|
|
const projected = exportRemoteWorkspaceSession(session, { isTargetWorktree: () => true })
|
|
|
|
expect(projected.tabsByWorktreePath['/srv/app']?.map((row) => row.id)).toEqual(['tab-shared'])
|
|
})
|
|
|
|
it('does not report unplaced tabs when every host path resolves', () => {
|
|
const unplaced: string[] = []
|
|
|
|
importRemoteWorkspaceSession(
|
|
{
|
|
activeWorktreePath: '/srv/app',
|
|
activeTabId: 'tab-1',
|
|
tabsByWorktreePath: {
|
|
'/srv/app': [
|
|
{
|
|
id: 'tab-1',
|
|
ptyId: 'pty-1',
|
|
worktreePath: '/srv/app',
|
|
title: 'Remote',
|
|
customTitle: null,
|
|
color: null,
|
|
sortOrder: 0,
|
|
createdAt: 1
|
|
}
|
|
]
|
|
},
|
|
terminalLayoutsByTabId: {}
|
|
},
|
|
{
|
|
resolveWorktreeId: (path) => `repo-b::${path}`,
|
|
onUnplacedTerminalTabs: (worktreePath) => unplaced.push(worktreePath)
|
|
}
|
|
)
|
|
|
|
expect(unplaced).toEqual([])
|
|
})
|
|
})
|