mirror of
https://github.com/stablyai/orca.git
synced 2026-09-27 16:02:35 +00:00
Neil
eff317939a
* fix(terminal): mount one surface per workspace id in the workbench (STA-4846) * test(terminal): pin the workbench projection against under-selecting Losing a surface unmounts live terminals, which is worse than the duplicate mount STA-4846 fixes, so cover every catalog shape that reaches the workbench: local-only rows that name no host, an unqualified row colliding with a host-qualified one, two SSH hosts on one id, folder rows across three hosts, folder ids alongside git worktree ids, and a whole-catalog assertion that the emitted id set equals the distinct input id set. Also pin the `useAllWorktrees` -> `useWorktreeMap` swap: both read the same WeakMap-cached snapshot, so the zustand compare is unchanged. Harden the folder tie-break to require the row to name its own host. `getCatalogOwnerHostId` defaults an unstamped row to `local`, which would let a row that never named a host win the `local` tie and mount another host's path; it now keeps first-wins instead of guessing. * fix(terminal): surface the unresolvable folder-surface collision When two hosts publish the same folder-workspace id and the active workspace's host cannot be resolved, the projection drops one row's folderPath first-wins. That path is the PTY cwd for any tab without a startupCwd, so the drop was silent. Warn on it, and pin the two tie-break branches the unit tests missed: a colliding row that is not the active workspace, and the same collision with the rows in swapped order (a host reconnect re-appends its rows, flipping which row is first mid-session). * test(e2e): ride out Playwright's spurious main-process evaluate rejection `e2e / changed e2e specs` failed on `pr11346-selected-runtime-add.spec.ts` with "Execution context was destroyed, most likely because of a navigation" from the paired client's first `app.evaluate` — the isolated-HOME assert that runs one millisecond after `electron.launch()` resolves, which is before the app is `ready`. Nothing navigates there: Playwright raises that message for any main-process CDP failure that is neither a JS error nor a closed session, and `ElectronApplication.evaluate` is unreliable on Electron 27+ (microsoft/playwright#33737). Reproduced locally, and a plain re-run of the same commit went green. Extract the retry `installTerminalPtyWriteSpy` already carried for this exact message into `retryTransientMainEvaluate`, and use it for the launch-time home read in all three launchers. The read is idempotent and a real boundary escape still throws on the first successful read. Also forward the paired client's process logs before the assert instead of after: this failure reached CI with none of the client's own output, because forwarding had not started yet. * test(e2e): wait on the owning group before asserting a Cmd-J browser tab is active `changed e2e specs` then failed at the remote browser-page step: the store poll had already seen `activeBrowserTabId` land on the mirrored workspace, but `[data-tab-id=...][data-active="true"]` never appeared. `data-active` on a `BrowserTab` is the strip's active tab, which comes from the owning group's `activeTabId` — not from `activeBrowserTabId` — so the DOM assert was racing an activation the poll never waited for. The simulator rows in the same spec already poll the group; the two browser-page rows did not. Poll the same triple for them, so a genuinely stuck group fails with the ids it ended on instead of a bare "element(s) not found".
55 lines
1.6 KiB
TypeScript
55 lines
1.6 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import { retryTransientMainEvaluate } from './electron-main-evaluate-retry'
|
|
|
|
const transient = (): Error =>
|
|
new Error('Execution context was destroyed, most likely because of a navigation.')
|
|
|
|
describe('retryTransientMainEvaluate', () => {
|
|
it('returns the first successful read without retrying', async () => {
|
|
let calls = 0
|
|
await expect(
|
|
retryTransientMainEvaluate(async () => {
|
|
calls += 1
|
|
return '/isolated/home'
|
|
})
|
|
).resolves.toBe('/isolated/home')
|
|
expect(calls).toBe(1)
|
|
})
|
|
|
|
it('rides out the startup window that made the paired-client launch flaky', async () => {
|
|
let calls = 0
|
|
await expect(
|
|
retryTransientMainEvaluate(async () => {
|
|
calls += 1
|
|
if (calls < 3) {
|
|
throw transient()
|
|
}
|
|
return '/isolated/home'
|
|
})
|
|
).resolves.toBe('/isolated/home')
|
|
expect(calls).toBe(3)
|
|
})
|
|
|
|
it('rethrows a real failure immediately instead of masking it behind retries', async () => {
|
|
let calls = 0
|
|
await expect(
|
|
retryTransientMainEvaluate(async () => {
|
|
calls += 1
|
|
throw new Error('Electron E2E HOME escaped the disposable profile boundary')
|
|
})
|
|
).rejects.toThrow(/escaped the disposable profile/)
|
|
expect(calls).toBe(1)
|
|
})
|
|
|
|
it('gives up rather than looping forever when the app never becomes evaluable', async () => {
|
|
let calls = 0
|
|
await expect(
|
|
retryTransientMainEvaluate(async () => {
|
|
calls += 1
|
|
throw transient()
|
|
})
|
|
).rejects.toThrow(/Execution context was destroyed/)
|
|
expect(calls).toBe(5)
|
|
})
|
|
})
|