starred/orca
1
0
Fork 0
mirror of https://github.com/stablyai/orca.git synced 2026-09-29 08:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into brennanb2025/fix-worker-start-wedge-2

Browse Source 
# Conflicts:
#	src/main/runtime/rpc/methods/orchestration/worker/local-worker-start.ts
This commit is contained in:
Merge Sim
2026-09-08 11:43:48 -07:00
parent ba6a5f0318 2ba2c90cb6
commit 685c428ad5
480 changed files with 16761 additions and 4637 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/e2e.yml
+2
View File
@@ -227,6 +227,7 @@ jobs:
mapfile -t TEST_FILES < <(jq -r '.[] | select(
. != "tests/e2e/ssh-startup-exec-readiness.spec.ts" and
. != "tests/e2e/paired-startup-exec-readiness.spec.ts" and
. != "tests/e2e/ssh-docker-five-pane-input-under-flood.spec.ts" and
. != "tests/e2e/local-ssh-browser-routing.spec.ts" and
. != "tests/e2e/ssh-browser-network-execution-route.docker.unit.test.ts" and
. != "tests/e2e/ssh-localhost.spec.ts" and
@@ -272,6 +273,7 @@ jobs:
if: >-
inputs.test_files == '' ||
inputs.ssh_source_changed == 'true' ||
contains(inputs.test_files, 'tests/e2e/ssh-docker-five-pane-input-under-flood.spec.ts') ||
contains(inputs.test_files, 'tests/e2e/local-ssh-browser-routing.spec.ts') ||
contains(inputs.test_files, 'tests/e2e/ssh-client-hosted-browser-drop-reconnect.spec.ts') ||
contains(inputs.test_files, 'tests/e2e/ssh-startup-exec-readiness.spec.ts') ||
cloud/apps/relay-fence-broker/package.json
+2 -2
View File
@@ -14,8 +14,8 @@
"typecheck": "tsc -p tsconfig.json --noEmit"
},
"dependencies": {
"@hono/node-server": "^1.19.14",
"hono": "^4.12.27",
"@hono/node-server": "^1.19.17",
"hono": "^4.13.7",
"zod": "^3.25.76"
},
"devDependencies": {
cloud/apps/relay-ops/package.json
+2 -2
View File
@@ -16,8 +16,8 @@
"typecheck": "tsc -p tsconfig.json --noEmit"
},
"dependencies": {
"@hono/node-server": "^1.19.14",
"hono": "^4.12.27",
"@hono/node-server": "^1.19.17",
"hono": "^4.13.7",
"zod": "^3.25.76"
},
"devDependencies": {
cloud/apps/relay/package.json
+3 -3
View File
@@ -15,13 +15,13 @@
"typecheck": "tsc -p tsconfig.json --noEmit"
},
"dependencies": {
"@hono/node-server": "^1.19.14",
"@hono/node-server": "^1.19.17",
"@orca-cloud/relay-contract": "workspace:*",
"hono": "^4.12.27",
"hono": "^4.13.7",
"jose": "^6.1.3",
"pg": "^8.22.0",
"tweetnacl": "^1.0.3",
"ws": "^8.18.3",
"ws": "^8.21.3",
"zod": "^3.25.76"
},
"devDependencies": {
cloud/pnpm-lock.yaml
Generated
+32 -32
View File
@@ -24,14 +24,14 @@ importers:
apps/relay:
dependencies:
'@hono/node-server':
specifier: ^1.19.14
version: 1.19.14(hono@4.12.27)
specifier: ^1.19.17
version: 1.19.17(hono@4.13.7)
'@orca-cloud/relay-contract':
specifier: workspace:*
version: link:../../packages/relay-contract
hono:
specifier: ^4.12.27
version: 4.12.27
specifier: ^4.13.7
version: 4.13.7
jose:
specifier: ^6.1.3
version: 6.2.3
@@ -42,8 +42,8 @@ importers:
specifier: ^1.0.3
version: 1.0.3
ws:
specifier: ^8.18.3
version: 8.21.0
specifier: ^8.21.3
version: 8.21.3
zod:
specifier: ^3.25.76
version: 3.25.76
@@ -70,11 +70,11 @@ importers:
apps/relay-fence-broker:
dependencies:
'@hono/node-server':
specifier: ^1.19.14
version: 1.19.14(hono@4.12.27)
specifier: ^1.19.17
version: 1.19.17(hono@4.13.7)
hono:
specifier: ^4.12.27
version: 4.12.27
specifier: ^4.13.7
version: 4.13.7
zod:
specifier: ^3.25.76
version: 3.25.76
@@ -95,11 +95,11 @@ importers:
apps/relay-ops:
dependencies:
'@hono/node-server':
specifier: ^1.19.14
version: 1.19.14(hono@4.12.27)
specifier: ^1.19.17
version: 1.19.17(hono@4.13.7)
hono:
specifier: ^4.12.27
version: 4.12.27
specifier: ^4.13.7
version: 4.13.7
zod:
specifier: ^3.25.76
version: 3.25.76
@@ -300,8 +300,8 @@ packages:
cpu: [x64]
os: [win32]
'@hono/node-server@1.19.14':
resolution: {integrity: sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw==}
'@hono/node-server@1.19.17':
resolution: {integrity: sha512-dSneS5qhiauZWGDCeK4o695Xd9nUNjviSZCMQrj10eetr8Uln1ucn6bbphOM6UynAMMtNIzZNSpL9vnASJwrPQ==}
engines: {node: '>=18.14.1'}
peerDependencies:
hono: ^4
@@ -507,8 +507,8 @@ packages:
engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
os: [darwin]
hono@4.12.27:
resolution: {integrity: sha512-1yrb/+w6HWQJrUCLkJ2IF5jNIPvvFkblV5RNOYl6bV+OA6p9GLcMpHFFGTosSvHvcAUibuUukRqhlYI4z32C7Q==}
hono@4.13.7:
resolution: {integrity: sha512-c8/gF9ac8Y78/agExVocyLevgR+JlpNB444Py0FSX8pJoPdYUfUzRcXtYEYGwt6l19qIlVZPN5Mfsw9jFShmQQ==}
engines: {node: '>=16.9.0'}
jose@6.2.3:
@@ -587,8 +587,8 @@ packages:
magic-string@0.30.21:
resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
nanoid@3.3.13:
resolution: {integrity: sha512-sPdqC6ByMVVGvF1ynvvMo0/o+oD1VX7DaHhijt1bFgjvBkHBib4t49GoNDhf2NDta4oeUNlaGbSt5K7qjZ955Q==}
nanoid@3.3.18:
resolution: {integrity: sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==}
engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
hasBin: true
@@ -640,8 +640,8 @@ packages:
resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==}
engines: {node: '>=12'}
postcss@8.5.15:
resolution: {integrity: sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==}
postcss@8.5.28:
resolution: {integrity: sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==}
engines: {node: ^10 || ^12 || >=14}
postgres-array@2.0.0:
@@ -805,8 +805,8 @@ packages:
engines: {node: '>=8'}
hasBin: true
ws@8.21.0:
resolution: {integrity: sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==}
ws@8.21.3:
resolution: {integrity: sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw==}
engines: {node: '>=10.0.0'}
peerDependencies:
bufferutil: ^4.0.1
@@ -920,9 +920,9 @@ snapshots:
'@esbuild/win32-x64@0.28.1':
optional: true
'@hono/node-server@1.19.14(hono@4.12.27)':
'@hono/node-server@1.19.17(hono@4.13.7)':
dependencies:
hono: 4.12.27
hono: 4.13.7
'@jridgewell/sourcemap-codec@1.5.5': {}
@@ -1109,7 +1109,7 @@ snapshots:
fsevents@2.3.3:
optional: true
hono@4.12.27: {}
hono@4.13.7: {}
jose@6.2.3: {}
@@ -1166,7 +1166,7 @@ snapshots:
dependencies:
'@jridgewell/sourcemap-codec': 1.5.5
nanoid@3.3.13: {}
nanoid@3.3.18: {}
obug@2.1.3: {}
@@ -1211,9 +1211,9 @@ snapshots:
picomatch@4.0.4: {}
postcss@8.5.15:
postcss@8.5.28:
dependencies:
nanoid: 3.3.13
nanoid: 3.3.18
picocolors: 1.1.1
source-map-js: 1.2.1
@@ -1288,7 +1288,7 @@ snapshots:
dependencies:
lightningcss: 1.32.0
picomatch: 4.0.4
postcss: 8.5.15
postcss: 8.5.28
rolldown: 1.0.3
tinyglobby: 0.2.17
optionalDependencies:
@@ -1329,7 +1329,7 @@ snapshots:
siginfo: 2.0.0
stackback: 0.0.2
ws@8.21.0: {}
ws@8.21.3: {}
xtend@4.0.2: {}
config/patches/@xterm__xterm@6.1.0-beta.303.patch
+129 -36
View File
File diff suppressed because one or more lines are too long
config/patches/xterm-src/@xterm__xterm@6.1.0-beta.303.src.patch
+114 -21
View File
@@ -1104,31 +1104,124 @@ index c9ec396ab66cb966d49aa63bed09cdf9cd6c4246..d4d5106d8dd723eceed87310c193ccfe
}
}
diff --git a/src/common/SortedList.ts b/src/common/SortedList.ts
index 8a10076e3963e33b4a7d1e4602333eb3f4772dc9..df0761c35907ddc48eb102ba181b0dac8e61f00d 100644
index 8a10076e3963e33b4a7d1e4602333eb3f4772dc9..c6dcf18b762e3c56fe22e9c2d49b8e550d96f915 100644
--- a/src/common/SortedList.ts
+++ b/src/common/SortedList.ts
@@ -87,6 +87,24 @@ export class SortedList<T> {
if (key === undefined) {
return false;
@@ -22,7 +22,8 @@ export class SortedList<T> {
private readonly _flushInsertedTask: InstanceType<typeof IdleTaskQueue>;
private _isFlushingInserted = false;
- private readonly _deletedIndices: number[] = [];
+ private readonly _deletedIndices = new Set<number>();
+ private readonly _indicesByValue = new Map<T, number | number[]>();
private readonly _flushDeletedTask: InstanceType<typeof IdleTaskQueue>;
private _isFlushingDeleted = false;
@@ -36,10 +37,11 @@ export class SortedList<T> {
public clear(): void {
this._array.length = 0;
+ this._indicesByValue.clear();
this._insertedValues.length = 0;
this._flushInsertedTask.clear();
this._isFlushingInserted = false;
- this._deletedIndices.length = 0;
+ this._deletedIndices.clear();
this._flushDeletedTask.clear();
this._isFlushingDeleted = false;
}
@@ -69,6 +71,7 @@ export class SortedList<T> {
}
+ if (this._deleteAtKey(value, key)) {
+ return true;
this._array = newArray;
+ this._rebuildIdentityIndex();
this._insertedValues.length = 0;
}
@@ -78,54 +81,60 @@ export class SortedList<T> {
}
}
+ private _rebuildIdentityIndex(): void {
+ this._indicesByValue.clear();
+ // Reverse indices let duplicate identities remove their first occurrence in O(1).
+ for (let index = this._array.length - 1; index >= 0; index--) {
+ const value = this._array[index];
+ const indices = this._indicesByValue.get(value);
+ if (indices === undefined) {
+ this._indicesByValue.set(value, index);
+ } else if (typeof indices === 'number') {
+ this._indicesByValue.set(value, [indices, index]);
+ } else {
+ indices.push(index);
+ }
+ }
+ // A pending deletion whose key mutated after `delete()` (disposing a marker
+ // resets `line` to -1, and `line` is the sort key) leaves `_array` out of
+ // order, so the binary search above can miss a value that is present.
+ // Compacting those entries out restores the order; retry before reporting
+ // the value absent, else its `onDecorationRemoved` never fires and the
+ // decoration paints forever. Miss path only, so the common bulk delete
+ // keeps its O(log n) search and deferred-compaction batching.
+ if (this._deletedIndices.length === 0) {
+ return false;
+ }
+ this._flushCleanupDeleted();
+ return this._deleteAtKey(value, key);
+ }
+
+ private _deleteAtKey(value: T, key: number): boolean {
i = this._search(key);
if (i === -1) {
public delete(value: T): boolean {
this._flushCleanupInserted();
- if (this._array.length === 0) {
+ // Marker disposal mutates the sort key before removal; identity stays stable.
+ const indices = this._indicesByValue.get(value);
+ if (indices === undefined) {
return false;
}
- const key = this._getKey(value);
- if (key === undefined) {
+ const index = typeof indices === 'number' ? indices : indices.pop();
+ if (index === undefined) {
return false;
}
- i = this._search(key);
- if (i === -1) {
- return false;
+ if (typeof indices === 'number' || indices.length === 0) {
+ this._indicesByValue.delete(value);
}
- if (this._getKey(this._array[i]) !== key) {
- return false;
+ if (this._deletedIndices.size === 0) {
+ this._flushDeletedTask.enqueue(() => this._flushDeleted());
}
- do {
- if (this._array[i] === value) {
- if (this._deletedIndices.length === 0) {
- this._flushDeletedTask.enqueue(() => this._flushDeleted());
- }
- this._deletedIndices.push(i);
- return true;
- }
- } while (++i < this._array.length && this._getKey(this._array[i]) === key);
- return false;
+ this._deletedIndices.add(index);
+ return true;
}
private _flushDeleted(): void {
this._isFlushingDeleted = true;
- const sortedDeletedIndices = this._deletedIndices.sort((a, b) => a - b);
- let sortedDeletedIndicesIndex = 0;
- const newArray = new Array(this._array.length - sortedDeletedIndices.length);
+ const newArray = new Array(this._array.length - this._deletedIndices.size);
let newArrayIndex = 0;
for (let i = 0; i < this._array.length; i++) {
- if (sortedDeletedIndices[sortedDeletedIndicesIndex] === i) {
- sortedDeletedIndicesIndex++;
- } else {
+ if (!this._deletedIndices.has(i)) {
newArray[newArrayIndex++] = this._array[i];
}
}
this._array = newArray;
- this._deletedIndices.length = 0;
+ this._rebuildIdentityIndex();
+ this._deletedIndices.clear();
this._isFlushingDeleted = false;
}
private _flushCleanupDeleted(): void {
- if (!this._isFlushingDeleted && this._deletedIndices.length > 0) {
+ if (!this._isFlushingDeleted && this._deletedIndices.size > 0) {
this._flushDeletedTask.flush();
}
}
config/reliability-gates.jsonc
+205 -5
View File
@@ -10,6 +10,79 @@
}
},
"gates": [
{
"id": "agent-session.history-forward-read-budget",
"title": "Journal catch-up reads only the next page and one lookahead row",
"maturity": "experimental",
"protection": "partial",
"owner": "agent-session-runtime",
"layer": "runtime-unit",
"surfaces": ["structured agent history", "structured agent subscriptions"],
"platforms": ["macos", "linux", "windows"],
"providers": ["local", "ssh", "remote-runtime"],
"coveredPlatforms": ["macos"],
"coveredProviders": ["local", "ssh", "remote-runtime"],
"coverageNotes": "The real SQLite journal and production subscriber delivery are exercised with a folder workspace and remote host identity. The SQL and pagination code is shared across execution hosts; live SSH transport and Linux/Windows runtime execution are not exercised. PTY, daemon, WSL execution, and mobile rendering are unaffected.",
"motivatingLinks": [
"https://github.com/stablyai/orca/blob/main/src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.ts"
],
"invariant": "Forward catch-up preserves every item, revision, tombstone, sequence cursor, page byte bound, and reset behavior while reading at most the requested row count plus one from SQLite for each page.",
"oracle": "Reconnect a real subscriber to a 2,000-row journal and receive all 2,000 item identities in order through the live cursor; count the actual SQL rows returned and parsed as 2,009 instead of 11,000. Assert exact final-page hasNewer, unlimited reader compatibility, gap detection at the next page, and parse-stop behavior at the lookahead row. Existing history tests cover revisions, tombstones, byte-bound shrinking, epochs, and schema resets.",
"commands": [
"ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/native-chat/agent-session-wire/agent-session-history-forward-read-budget.test.ts src/main/native-chat/agent-session-wire/agent-session-history-page.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.test.ts src/main/native-chat/agent-session-journal"
],
"testFiles": [
"src/main/native-chat/agent-session-wire/agent-session-history-forward-read-budget.test.ts",
"src/main/native-chat/agent-session-wire/agent-session-history-page.test.ts",
"src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.test.ts"
],
"assertionRefs": [
{
"file": "src/main/native-chat/agent-session-wire/agent-session-history-forward-read-budget.test.ts",
"assertions": [
"reconnects through every page with one lookahead row per page",
"keeps an exact final page final and preserves unlimited journal readers",
"reports a sequence gap when the next page reaches it",
"preserves parse-stop behavior at lookahead: %s"
]
}
],
"evidenceRuns": [
{
"date": "2026-09-07",
"runner": "local",
"platform": "macos",
"command": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/native-chat/agent-session-wire/agent-session-history-forward-read-budget.test.ts src/main/native-chat/agent-session-wire/agent-session-history-page.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.test.ts src/main/native-chat/agent-session-journal",
"result": "passed",
"durationSeconds": 9.94,
"summary": "214 tests passed across 19 files, including actual SQLite row and JSON parse counts through production subscriber catch-up."
}
],
"runtimeBudget": {
"p95Seconds": 30,
"scope": "Real SQLite journal unit and production subscriber tests; no launched app."
},
"flakeHistory": {
"status": "not-started",
"evidence": "Initial deterministic local validation; CI soak has not started."
},
"redGreenEvidence": {
"status": "complete",
"evidence": "Before the change, SQL returned 2,000, 1,800, 1,600 through 200 rows across ten pages, failing the count assertion. The bounded query returns nine pages of 201 rows and a final 200, with exactly 2,009 row parses and identical item delivery."
},
"performanceBudget": {
"required": true,
"evidence": "Catch-up materialization and JSON parsing are linear in unseen journal rows plus page lookaheads. A cached parameterized LIMIT adds no polling, cache invalidation, output loss, protocol change, or provider calls."
},
"knownGaps": [
"Linux and Windows execution and live SSH transport have not been exercised.",
"The existing full reduced-state snapshot and batch projection cost are outside this SQL read budget."
],
"promotionCriteria": [
"Complete CI soak requirements while preserving the deterministic row budget and pagination oracles."
],
"demotionRule": "Keep experimental until CI soak; investigate fidelity or count failures without relaxing the row budget."
},
{
"id": "terminal-performance.padded-fullscreen-redraw",
"title": "Fullscreen redraw padding does not stall terminal delivery",
@@ -268,6 +341,106 @@
],
"demotionRule": "Keep experimental or demote if adoption duplicates covered output, drops newer or unproven output, changes terminal ownership, or flakes without explanation."
},
{
"id": "terminal-session.io-failure-cleanup",
"title": "Native PTY I/O failures preserve termination ownership",
"maturity": "experimental",
"protection": "partial",
"owner": "terminal-runtime",
"layer": "provider-contract",
"surfaces": ["daemon PTY teardown"],
"platforms": ["macos", "linux", "windows"],
"providers": ["local-daemon", "ssh-daemon", "paired-runtime"],
"coveredPlatforms": ["macos"],
"coveredProviders": ["local-daemon"],
"coverageNotes": "Real TerminalHost, Session, and subprocess wrapper with injected native I/O failures and mocked OS signals. Local non-daemon and SSH-relay implementations are unaffected; daemon consumers on SSH, WSL, paired runtimes, and mobile retain host-owned semantics. Live Linux/Windows/WSL and remote runs remain gaps. No git or folder-workspace assumptions. The fault-injection suite also runs with simulated darwin/linux/win32 platform branches; these do not constitute native OS coverage. Native macOS coverage now proves shell exit and PTY master-fd closure, input/output round trips, and teardown of a paused producer for both graceful and immediate cleanup. Windows single-close/job escalation and pre-listener output/status are fault-injected contracts.",
"motivatingLinks": ["docs/terminal-daemon-session-leak-investigation.md"],
"invariant": "I/O errors must not establish physical exit or disable termination of an owned PTY. Session and native handle disposal require the exit event.",
"oracle": "Inject write and resize failures, require graceful and forced signals to reach the native owner, keep producer resume available, suppress repeated failed I/O, deliver output and exit, and suppress signals after exit. Across 32 create/close cycles per failure, retain each session before exit and release its native handle and emulator exactly once afterwards. Mark physical exit before notifying listeners; reentrant kill/forceKill/signal from those listeners must never signal the retired PID. A native POSIX test performs input/output and resize, pauses the producer, injects each I/O failure, then gracefully or immediately closes 16 real shells; require ESRCH for each child PID and EBADF for each PTY master fd.",
"commands": [
"pnpm test src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts",
"pnpm test src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts src/main/daemon/pty-subprocess-handle-lifecycle.test.ts src/main/daemon/terminal-host-session-reaping-leak.test.ts src/main/daemon/terminal-host-teardown-recreate.test.ts src/main/daemon/terminal-session-teardown.test.ts src/main/daemon/session.test.ts",
"pnpm test src/main/daemon/pty-subprocess-io-failure-native.test.ts"
],
"testFiles": [
"src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts",
"src/main/daemon/pty-subprocess-handle-lifecycle.test.ts",
"src/main/daemon/terminal-host-session-reaping-leak.test.ts",
"src/main/daemon/terminal-host-teardown-recreate.test.ts",
"src/main/daemon/terminal-session-teardown.test.ts",
"src/main/daemon/session.test.ts",
"src/main/daemon/pty-subprocess-io-failure-native.test.ts"
],
"assertionRefs": [
{
"file": "src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts",
"assertions": [
"keeps graceful and forced termination available until physical exit",
"reaps every session and native handle across 32 failed-I/O create/close cycles",
"suppresses repeated native I/O failures while still delivering output and exit",
"blocks reentrant termination from an exit listener after I/O failure"
]
},
{
"file": "src/main/daemon/pty-subprocess-io-failure-native.test.ts",
"assertions": ["reaps real shells and master fds after %s failure (immediate=%s)"]
}
],
"evidenceRuns": [
{
"date": "2026-09-07",
"runner": "local",
"platform": "macos",
"command": "pnpm test src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts src/main/daemon/pty-subprocess-handle-lifecycle.test.ts src/main/daemon/terminal-host-session-reaping-leak.test.ts src/main/daemon/terminal-host-teardown-recreate.test.ts src/main/daemon/terminal-session-teardown.test.ts src/main/daemon/session.test.ts",
"result": "passed",
"durationSeconds": 0.617,
"summary": "136 tests passed across six files; failed-I/O cycle tests cover 64 closures."
},
{
"date": "2026-09-07",
"runner": "local",
"platform": "macos",
"command": "pnpm test src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts",
"result": "passed",
"durationSeconds": 3.71,
"summary": "32 tests passed with 4 Windows-only cases skipped; simulated macOS/Linux/Windows branches include 192 failed-I/O create/close cycles and exit-listener reentrancy."
},
{
"date": "2026-09-07",
"runner": "local",
"platform": "macos",
"command": "pnpm test src/main/daemon/pty-subprocess-io-failure-native.test.ts",
"result": "passed",
"durationSeconds": 2.52,
"summary": "Four native cases pass across 16 real shells, including input/output, pause before teardown, confirmed PID absence, and closed PTY master fds."
}
],
"runtimeBudget": {
"p95Seconds": 10,
"scope": "focused daemon teardown contract tests"
},
"flakeHistory": {
"status": "not-started",
"evidence": "Initial deterministic local run; no soak history."
},
"redGreenEvidence": {
"status": "complete",
"evidence": "All four original regression cases failed before the fix because native kill was never called; the unchanged cases passed after separating I/O failure from exit. Two additional output/flow-control cases also pass. Review added two failing exit-listener reentrancy cases; publishing physical exit before callbacks made them pass."
},
"performanceBudget": {
"required": true,
"evidence": "One boolean per PTY; no new timers, scans, retries, or subprocesses. Existing failed-I/O suppression remains. 192 closures under three simulated platform branches return session inventory to zero and dispose each emulator/native handle once."
},
"promotionCriteria": [
"Collect remaining native cross-platform evidence plus the standard soak history."
],
"knownGaps": [
"Fault injection proves a leak mechanism, not causality for the historical 427-session incident.",
"Real Linux/Windows/WSL, remote, startup-close, login-wrapper descendants, and multi-day load evidence remain outstanding. Native tests inject synchronous I/O errors; they do not model every asynchronous node-pty pipe failure.",
"No output throughput change or interactive latency benchmark is included."
],
"demotionRule": "Keep experimental; investigate any lost cleanup signal, premature exit, or unexplained flake."
},
{
"id": "cmd-j-tabs.host-qualified-candidate-ownership",
"title": "Cmd-J tab candidates retain execution-host ownership",
@@ -5825,7 +5998,7 @@
"invariant": "After a TUI exits or is killed, reveal, reattach, snapshot replay, or renderer remount must not deliver terminal-owned mouse or alternate-screen protocol bytes to the surviving shell. Recovery is an ordered output barrier in the daemon session data path: an OSC 133;D completing while the alternate screen is still active pauses the stream at that exact byte boundary, a fresh execution-host process inspection proves shell ownership, and on proof a mode reset is injected as in-stream output so every consumer converges by parsing the same bytes and the queued post-boundary shell output (the prompt) lands on the normal buffer. Snapshots are pure reads. Any failure — refuted proof, timeout, queue overflow, session death, disposal — flushes the queue unmodified, preserving incumbent behavior; later command or mode bytes revoke proof. Clean alternate-screen exits prove ownership asynchronously without pausing.",
"oracle": "Run one fixed child-TUI journey for normal exit and cleanup-free SIGKILL. Assert renderer and host normal-buffer/non-mouse state, host snapshot terminalOwner metadata, exact PTY writes with no post-exit mouse report, unrelated-pane survival, post-boundary prompt output preserved (normal exit), ordered proof invalidation, bounded settlement and bail-out flush, one inspection per unclean episode with zero scans for ordinary output, split-escape safety at every chunk boundary, and old/new client-host fallback parity.",
"commands": [
"pnpm exec vitest run --config config/vitest.config.ts src/main/daemon/terminal-shell-lifecycle-scanner.test.ts src/main/daemon/terminal-shell-recovery-barrier.test.ts src/main/daemon/session-shell-recovery.test.ts src/main/daemon/session.test.ts src/main/daemon/terminal-host-concurrent-create.test.ts src/main/daemon/daemon-pty-adapter.test.ts src/main/daemon/daemon-restore-scrollback-depth.test.ts src/main/daemon/terminal-checkpoint-serializer.test.ts src/main/providers/agent-foreground-process.test.ts src/main/runtime/orca-runtime.test.ts src/main/runtime/mobile-subscribe-integration.test.ts src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts src/renderer/src/components/terminal-pane/pty-connection-hidden-codex-queries.test.ts src/renderer/src/components/terminal-pane/pty-connection-reattach-mode-reset.test.ts src/renderer/src/components/terminal-pane/pty-connection-daemon-snapshot-replay.test.ts src/renderer/src/components/terminal-pane/remote-runtime-pty-snapshot-escape-tail.test.ts --reporter=dot",
"pnpm exec vitest run --config config/vitest.config.ts src/main/daemon/terminal-shell-lifecycle-scanner.test.ts src/main/daemon/terminal-shell-recovery-barrier.test.ts src/main/daemon/session-shell-recovery.test.ts src/main/daemon/session.test.ts src/main/daemon/terminal-host-concurrent-create.test.ts src/main/daemon/daemon-pty-adapter.test.ts src/main/daemon/daemon-restore-scrollback-depth.test.ts src/main/daemon/terminal-checkpoint-serializer.test.ts src/main/providers/agent-foreground-process.test.ts src/main/runtime/orca-runtime.test.ts src/main/runtime/mobile-subscribe-integration.test.ts src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts src/renderer/src/components/terminal-pane/pty-connection-hidden-codex-queries.test.ts src/renderer/src/components/terminal-pane/pty-connection-reattach-mode-reset.test.ts src/renderer/src/components/terminal-pane/pty-connection-daemon-snapshot-replay.test.ts src/renderer/src/components/terminal-pane/remote-runtime-pty-snapshot-escape-tail.test.ts src/shared/terminal-partial-escape-tail.test.ts src/shared/terminal-partial-escape-tail.fuzz.test.ts --reporter=dot",
"pnpm exec vitest run --config config/vitest.config.ts tests/e2e/cross-version-wire/cross-version-terminal-wire.unit.test.ts --reporter=dot",
"pnpm exec electron-vite build --mode e2e",
"SKIP_BUILD=1 pnpm exec playwright test tests/e2e/terminal-hidden-child-tui-kill-mode-reset.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1"
@@ -5847,6 +6020,8 @@
"src/renderer/src/components/terminal-pane/pty-connection-reattach-mode-reset.test.ts",
"src/renderer/src/components/terminal-pane/pty-connection-daemon-snapshot-replay.test.ts",
"src/renderer/src/components/terminal-pane/remote-runtime-pty-snapshot-escape-tail.test.ts",
"src/shared/terminal-partial-escape-tail.test.ts",
"src/shared/terminal-partial-escape-tail.fuzz.test.ts",
"tests/e2e/cross-version-wire/cross-version-terminal-wire.unit.test.ts",
"tests/e2e/terminal-hidden-child-tui-kill-mode-reset.spec.ts"
],
@@ -5868,6 +6043,13 @@
"a snapshot taken during a split escape keeps the pending tail intact and stale proof is revoked by the completing bytes"
]
},
{
"file": "src/shared/terminal-partial-escape-tail.fuzz.test.ts",
"assertions": [
"the pending tail this gate threads over the wire folds identically at every code-unit split of the combined stream, including boundaries landing inside oscEsc/stringEsc",
"the split sweep runs over an alphabet carrying CAN, SUB, doubled ESC inside OSC/DCS/SOS/PM/APC, BEL, C1 ST, NUL, DEL, intermediates, CJK, astral, and lone surrogates"
]
},
{
"file": "tests/e2e/terminal-hidden-child-tui-kill-mode-reset.spec.ts",
"assertions": [
@@ -13477,6 +13659,7 @@
"invariant": "Starting a worker in the coordinator's current workspace must materialize one inactive terminal tab before worker-start returns, preserve coordinator focus, and remain exactly once after workspace re-entry. After an app update or restart, an exact live legacy worker must fence automatic provider resume, adopt its original PTY into its original background pane, retain readable output, and clear the resume record without spawning, writing, signalling, interrupting, replacing, or focusing the worker. A current-contract worker whose renderer graph identity is temporarily absent must retain its Dispatch capability and settle exactly once from exact hook-attested handle, pane, and process evidence; otherwise only an exact attested coordinator may take over. A worker_done caller may report success only after the owning runtime returns an explicit lifecycle verdict or authoritative reads prove that the exact Task, Dispatch, and worker report receipt settled the expected outcome. Federated terminal settlement must remain replay-eligible until the worker durably acknowledges it, and identical same-outcome retries must converge idempotently. Independently updated clients and worker servers must preserve the negotiated protocol: current peers use Run-home lifecycle settlement, while protocol v1/v2 peers retain their legacy completion path without receiving newer-only fields. A federated worker may accept only the authority defined by its negotiated protocol. An exact existing target workspace must receive a discoverable tab without stealing coordinator focus; if renderer reveal fails, worker-start must expose that the live worker remains background-only. Run and Dispatch checks must resolve through the caller's stable pane identity when a terminal handle is reminted, while a live handle outranks mismatched pane metadata. A nested worker's creator edge requires the current creator pane, process incarnation, and owning Run generation; reminting and rebinding that pane to another Run must remove the stale edge. Explicit legacy terminal inspection remains handle-scoped, and remote or headless worker presentation remains background-only.",
"oracle": "Drive Run create, Task create, and worker-start through production Electron runtimes with a deterministic Codex fixture. Require append-only ledgers with one still-live PID and no interruption, a visible inactive worker tab while the coordinator stays active, Run delivery through stable pane identity, and stable PTY/incarnation, tab, leaf, worktree, Task, and Dispatch across workspace re-entry. In a restart journey, retain the original daemon PTY and PID, remove renderer ownership, retain sleeping-session evidence, mark the Dispatch legacy, relaunch, and require exact inactive tab adoption, readable ACK output, cleared resume state, one spawn, and no resume argv or Conversation interrupted text after another workspace round trip. The service oracle removes renderer lookup identity from current-contract callers while retaining real restored-PTY and hook commitments, replays authenticated completion and takeover across fresh runtimes, and requires one Task, Dispatch, terminal authority, message, mutation, ordinary-mail delivery, remote process fencing, and unchanged fixture marker bytes while foreign pane evidence remains rejected. Unit tests separately remint a creator pane and process from Run A into Run B, require the nested Run A worker to fall back to its current coordinator, require indexed query plans, and bound 300 Task reads with 50,000 retained Runs. They also assert authority-specific legacy affordances, exact identity and owner matching, retained-output fallback, pane-stable routing, federated non-activation, and SSH fallback parity.",
"commands": [
"ORCA_BACKGROUND_LAUNCH=1 npx vitest run --config config/vitest.config.ts src/main/runtime/rpc/methods/orchestration/messaging/check-worker-federated-attachment.test.ts",
"pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/rpc/orchestration-runtime-update-settlement.test.ts --reporter=dot",
"pnpm exec vitest run --config config/vitest.config.ts src/cli/handlers/orchestration.test.ts src/cli/handlers/orchestration-check-identity.test.ts src/cli/handlers/orchestration-worker-cli.test.ts src/main/runtime/rpc/methods/orchestration/worker/composed-workers.test.ts src/main/runtime/rpc/methods/orchestration/messaging/check.test.ts src/main/runtime/rpc/methods/orchestration/messaging/send.test.ts src/main/ssh/ssh-remote-orca-cli.test.ts",
"pnpm exec vitest run --config config/vitest.config.ts src/cli/handlers/orchestration-lifecycle-rejection.test.ts src/cli/handlers/orchestration-lifecycle-json-rejection.test.ts src/cli/handlers/orchestration-migration.test.ts",
@@ -13491,6 +13674,7 @@
"pnpm run build:cli && SKIP_BUILD=1 pnpm exec playwright test tests/e2e/orchestration-worker-settlement-release-cli.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1"
],
"testFiles": [
"src/main/runtime/rpc/methods/orchestration/messaging/check-worker-federated-attachment.test.ts",
"src/main/runtime/rpc/orchestration-runtime-update-settlement.test.ts",
"src/main/runtime/orchestration/formatter.test.ts",
"src/main/runtime/orchestration/orchestration-legacy-worker-terminal-recovery.test.ts",
@@ -13514,6 +13698,13 @@
"tests/e2e/orchestration-worker-settlement-release-cli.spec.ts"
],
"assertionRefs": [
{
"file": "src/main/runtime/rpc/methods/orchestration/messaging/check-worker-federated-attachment.test.ts",
"assertions": [
"replays the coordinator instruction and takes its ack after the app restarts",
"files loopback mail once under the local Dispatch Run without replacing its owner"
]
},
{
"file": "src/main/runtime/rpc/orchestration-runtime-update-settlement.test.ts",
"assertions": [
@@ -18302,7 +18493,7 @@
"providers": ["ssh"],
"coveredPlatforms": ["macos", "linux"],
"coveredProviders": ["ssh"],
"coverageNotes": "A macOS Electron client drives a Linux Docker SSH execution host. The six-spec suite passed ten enabled cases with clean worker exit (5.2m). The formerly skipped frozen-host input case now waits for recovered authority before sending input and passed four separate executions (one initial and three repetitions). The existing flooded-shell fixme remains an explicitly reproduced application gap. The bulk-open freeze reproduction runs in Linux headed CI with SwiftShader on Xvfb: headless Linux schedules idle animation frames about 1s apart, invalidating the foreground interaction measurement. Original uninstrumented five-pane workload passed all ten repetitions with zero retries/skips in 6.6m; bulk-open lag 79.3–147.8ms and interaction 127.1–155.9ms, unchanged 2500ms/5000ms budgets. Run 34037669843, head f25eab3fd7d723509ced026633f80b193a139b76, excludes unmerged replay-input application fix #19075. Deterministic remote Codex fixture validation passed three normal restores and three forced reconnects with zero retries on merged main plus the replay probe correction (run 34050117471). The original forced-reconnect probe missed nonempty replay returned in pty:spawn reattach replies. Routine coverage now includes both modes by default; real Codex service execution remains opt-in.",
"coverageNotes": "A macOS Electron client drives a Linux Docker SSH execution host. The six-spec suite passed ten enabled cases with clean worker exit (5.2m). The formerly skipped frozen-host input case now waits for recovered authority before sending input and passed four separate executions (one initial and three repetitions). The existing flooded-shell fixme remains an explicitly reproduced application gap. The bulk-open freeze reproduction runs in Linux headed CI with SwiftShader on Xvfb: headless Linux schedules idle animation frames about 1s apart, invalidating the foreground interaction measurement. Original uninstrumented five-pane workload passed all ten repetitions with zero retries/skips in 6.6m; bulk-open lag 79.3–147.8ms and interaction 127.1–155.9ms, unchanged 2500ms/5000ms budgets. Run 34037669843, head f25eab3fd7d723509ced026633f80b193a139b76, excludes unmerged replay-input application fix #19075. Deterministic remote Codex fixture validation passed three normal restores and three forced reconnects with zero retries on merged main plus the replay probe correction (run 34050117471). The original forced-reconnect probe missed nonempty replay returned in pty:spawn reattach replies. Routine coverage now includes both modes by default; real Codex service execution remains opt-in. The added five-pane input spec passed in Linux CI run 34033353595, and diagnostic run 34034754815 reproduced real input loss during scrollback replay; application fix #19075 (98b0c329ff3) has since merged and this spec now guards it.",
"motivatingLinks": [
"https://github.com/stablyai/orca/issues/18018",
"https://github.com/stablyai/orca/pull/18546",
@@ -18320,7 +18511,8 @@
"ORCA_E2E_SSH_DOCKER=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/ssh-docker-bulk-open-freeze-repro.spec.ts --config tests/playwright.config.ts --project=electron-headful --workers=1",
"ORCA_E2E_SSH_DOCKER=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/ssh-docker-bulk-open-freeze-repro.spec.ts --config tests/playwright.config.ts --project=electron-headful --workers=1 --repeat-each=10",
"ORCA_E2E_SSH_DOCKER=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/ssh-codex-display-artifacts-repro.spec.ts --config tests/playwright.config.ts --project=electron-headless --workers=1",
"pnpm exec vitest run --config config/vitest.config.ts tests/e2e/ssh-codex-replay-reply-probe.unit.test.ts"
"pnpm exec vitest run --config config/vitest.config.ts tests/e2e/ssh-codex-replay-reply-probe.unit.test.ts",
"ORCA_E2E_SSH_DOCKER=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/ssh-docker-five-pane-input-under-flood.spec.ts --config tests/playwright.config.ts --project=electron-headless --workers=1"
],
"testFiles": [
"tests/e2e/ssh-docker-transport-drop-recovery.spec.ts",
@@ -18332,7 +18524,8 @@
"tests/e2e/helpers/electron-process-shutdown.unit.test.ts",
"tests/e2e/ssh-docker-bulk-open-freeze-repro.spec.ts",
"tests/e2e/ssh-codex-display-artifacts-repro.spec.ts",
"tests/e2e/ssh-codex-replay-reply-probe.unit.test.ts"
"tests/e2e/ssh-codex-replay-reply-probe.unit.test.ts",
"tests/e2e/ssh-docker-five-pane-input-under-flood.spec.ts"
],
"assertionRefs": [
{
@@ -18384,6 +18577,12 @@
"five flooding SSH panes remain below unchanged 2500ms soft and 5000ms hard freeze budgets during bulk reopen and two double-animation-frame view changes"
]
},
{
"file": "tests/e2e/ssh-docker-five-pane-input-under-flood.spec.ts",
"assertions": [
"five distinct SSH PTYs acknowledge actual keyboard input after two rendered hide/reopen cycles while all five producers flood"
]
},
{
"file": "tests/e2e/ssh-codex-display-artifacts-repro.spec.ts",
"assertions": [
@@ -18432,7 +18631,7 @@
},
"flakeHistory": {
"status": "flaky",
"evidence": "Baseline: ten enabled tests passed, two fixme skipped, worker teardown timed out (7.3m). After pipe cleanup: ten passed and worker exited cleanly (5.2m); two half-open repeats passed (1.7m). The formerly skipped thaw-input case failed before its recovered-authority wait and passed 1+3 executions afterward (56.9s + 2.6m). Flood failed both its original input oracle and a strengthened producer-completion oracle after recovery."
"evidence": "Baseline: ten enabled tests passed, two fixme skipped, worker teardown timed out (7.3m). After pipe cleanup: ten passed and worker exited cleanly (5.2m); two half-open repeats passed (1.7m). The formerly skipped thaw-input case failed before its recovered-authority wait and passed 1+3 executions afterward (56.9s + 2.6m). Flood failed both its original input oracle and a strengthened producer-completion oracle after recovery. Five-pane input diagnostics additionally failed 1/5 in run 34034754815: the intended focused PTY emitted the full input, the replay guard discarded 31 characters, and the remote ACK contained exactly the remaining suffix. PR #19075 addresses that application bug; passing repetitions alone do not establish its resolution."
},
"redGreenEvidence": {
"status": "partial",
@@ -18448,6 +18647,7 @@
"Collect CI runtime and flake history plus product red/green evidence before blocking."
],
"knownGaps": [
"Five-pane simultaneous flood input was reproduced as a real application bug in run 34034754815 (replay discarded the first 31 characters of correctly focused keyboard input); fix #19075 (98b0c329ff3) merged and the spec now guards it, but the retries: 0 Docker SSH lane is the only repetition evidence against the merged fix so far. Freeze performance coverage was restored separately in #19081, with its isolated headless timer-lag outlier still documented.",
"The disconnected 48MB flood still loses its relay channel: original post-flood input marker failed in 60s, and waiting for the finite producer completion marker failed in 120s. It remains an explicit #18018 fixme reproduction; frozen-host input is re-enabled after four successful runs.",
"Linux headed CI covers the bulk-open freeze reproduction; Windows clients, WSL, folder workspaces, paired runtimes and live agent CLIs are not covered by that result.",
"Some legacy assertions inspect terminal serialization or backing state rather than rendered DOM; no blanket visual coverage claim.",
config/scripts/idle-cpu-renderer-scale-fixture.mjs
+20 -3
View File
@@ -1,6 +1,6 @@
export async function configureRendererScaleFixture(page, options, repoPath) {
return page.evaluate(
({ agentsPerWorktree, lineageDepth, repoPath }) => {
({ agentsPerWorktree, subagentsPerAgent, lineageDepth, repoPath }) => {
const store = window.__store
if (!store) {
throw new Error('window.__store is not available')
@@ -98,7 +98,18 @@ export async function configureRendererScaleFixture(page, options, repoPath) {
{
state: 'working',
prompt: `Idle CPU agent ${worktreeIndex + 1}.${agentIndex + 1}`,
agentType
agentType,
...(subagentsPerAgent > 0
? {
subagents: Array.from({ length: subagentsPerAgent }, (_, index) => ({
id: `child-${index}`,
state: 'working',
startedAt: fixtureNow,
agentType,
description: `Subagent ${worktreeIndex + 1}.${agentIndex + 1}.${index + 1}`
}))
}
: {})
},
agentType,
{ updatedAt: fixtureNow, stateStartedAt: fixtureNow },
@@ -116,10 +127,16 @@ export async function configureRendererScaleFixture(page, options, repoPath) {
expandedLineageGroups: lineageParentIds.size,
agentsPerWorktree,
seededAgentRows,
seededSubagentRows: seededAgentRows * subagentsPerAgent,
orderedWorktreeIds: worktrees.map((worktree) => worktree.id)
}
},
{ agentsPerWorktree: options.agentsPerWorktree, lineageDepth: options.lineageDepth, repoPath }
{
agentsPerWorktree: options.agentsPerWorktree,
subagentsPerAgent: options.subagentsPerAgent ?? 0,
lineageDepth: options.lineageDepth,
repoPath
}
)
}
config/scripts/orchestration-skill-guidance.test.mjs
+4 -3
View File
@@ -168,9 +168,10 @@ describe('orchestration kernel', () => {
expect(kernel).toContain(
'`projection.attention` categories, `projection.attention.requiresAction`, and literal `projection.nextAction` argv'
)
expect(kernel).toContain(
'An `inspect` `nextAction` on a `live` row with `attention.requiresAction` false is informational, not a command to re-run: keep waiting with `check --wait`'
)
// Unverifiable workers can still owe release; the guide must explain the action itself.
expect(kernel).toContain('A `none` `nextAction` has no argv to run')
expect(kernel).toContain('read `liveness.reason` and keep waiting with `check --wait`')
expect(kernel).toContain('Absence never earns an argv; settlement and pending work still do')
expect(kernel).toContain('choose `worker-stop` or `worker-abandon`')
})
config/scripts/pr-code-change-scope.mjs
+8 -2
View File
@@ -1,4 +1,3 @@
import { readFileSync } from 'node:fs'
import process from 'node:process'
import { pathToFileURL } from 'node:url'
@@ -369,7 +368,14 @@ function matchesPrefix(file, prefixes) {
}
if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
const files = readFileSync(0, 'utf8').split('\n').filter(Boolean)
// Why streamed, not readFileSync(0): a single read of fd 0 throws EAGAIN once the writer
// outgrows the 64 KB pipe buffer, which a stale PR base.sha reaches easily.
let input = ''
process.stdin.setEncoding('utf8')
for await (const chunk of process.stdin) {
input += chunk
}
const files = input.split(/\r?\n/).filter(Boolean)
const classification = classifyPrJobs(files)
for (const [name, value] of Object.entries(classification)) {
process.stdout.write(`${name}=${value ? 'true' : 'false'}\n`)
config/scripts/pr-code-change-scope.test.mjs
+49 -1
View File
@@ -1,4 +1,4 @@
import { spawnSync } from 'node:child_process'
import { spawn, spawnSync } from 'node:child_process'
import { readFileSync } from 'node:fs'
import { join, resolve } from 'node:path'
import { describe, expect, it } from 'vitest'
@@ -353,6 +353,54 @@ describe('per-job path classification', () => {
expect(result.stdout).toContain('package=false\n')
expect(result.stdout).toContain('test=true\n')
})
// A long-lived PR whose base.sha has gone stale diffs thousands of files, so the writer
// outruns one pipe buffer. A single fd-0 read then returns early, breaks the writer's pipe,
// and still exits 0 -- emitting no pairs at all, which silently skips every lane.
it('classifies a path that arrives after the first pipe buffer', async () => {
const filler = Array.from(
{ length: 12_000 },
(_, index) => `docs/reference/generated-placeholder-${index}.md`
)
const input = `${[...filler, 'config/patches/xterm-upstream.json'].join('\n')}\n`
expect(input.length).toBeGreaterThan(64 * 1024)
const child = spawn(process.execPath, ['config/scripts/pr-code-change-scope.mjs'], {
cwd: projectDir,
stdio: ['pipe', 'pipe', 'pipe']
})
let stdout = ''
let stderr = ''
let brokePipe = false
child.stdout.setEncoding('utf8')
child.stderr.setEncoding('utf8')
child.stdout.on('data', (chunk) => (stdout += chunk))
child.stderr.on('data', (chunk) => (stderr += chunk))
child.stdin.on('error', (error) => {
brokePipe ||= error.code === 'EPIPE'
})
const exitCode = await new Promise((resolvePromise) => {
child.on('close', resolvePromise)
let offset = 0
const step = () => {
if (offset >= input.length) {
child.stdin.end()
return
}
child.stdin.write(input.slice(offset, offset + 64 * 1024))
offset += 64 * 1024
setTimeout(step, 20)
}
step()
})
expect(stderr).not.toContain('EAGAIN')
expect(brokePipe).toBe(false)
expect(exitCode, stderr).toBe(0)
expect(stdout).toContain('should_run=true\n')
expect(stdout).toContain('xterm_patch_sync=true\n')
})
})
describe('PR Checks skip wiring', () => {
config/scripts/pr-e2e-gate-contract.test.mjs
+3
View File
@@ -168,6 +168,9 @@ describe('PR E2E gate contract', () => {
expect(changedRun.env.TEST_FILES_JSON).toBe('${{ inputs.test_files }}')
expect(changedRun.run).toContain('. != "tests/e2e/ssh-startup-exec-readiness.spec.ts"')
expect(changedRun.run).toContain('. != "tests/e2e/paired-startup-exec-readiness.spec.ts"')
expect(changedRun.run).toContain(
'. != "tests/e2e/ssh-docker-five-pane-input-under-flood.spec.ts"'
)
expect(changedRun.run).toContain('. != "tests/e2e/ssh-docker-bulk-open-freeze-repro.spec.ts"')
expect(changedRun.run).toContain('if [ "${#TEST_FILES[@]}" -eq 0 ]')
expect(changedRun.run).toContain('grep -l \'@headful\' "${TEST_FILES[@]}"')
config/scripts/run-ssh-docker-e2e.mjs
+1
View File
@@ -63,6 +63,7 @@ const result = spawnSync(
'tests/e2e/ssh-codex-display-artifacts-repro.spec.ts',
'tests/e2e/ssh-cold-activation-restore.spec.ts',
'tests/e2e/ssh-cold-hydration-gap-tab-seeding.spec.ts',
'tests/e2e/ssh-docker-five-pane-input-under-flood.spec.ts',
'tests/e2e/ssh-docker-bulk-open-freeze-repro.spec.ts',
'tests/e2e/ssh-docker-half-open-link.spec.ts',
'tests/e2e/ssh-docker-quick-open-large-listing.spec.ts',
config/ts-nocheck-baseline.txt
+1 -1
View File
@@ -34,7 +34,7 @@ src/main/runtime/orca-runtime-create-terminal-side-effect-command-code-detector.
src/main/runtime/orca-runtime-create-terminal.ts
src/main/runtime/orca-runtime-deliver-pending-messages.ts
src/main/runtime/orca-runtime-emit-daemon-pty-transient-fact.ts
src/main/runtime/orca-runtime-fence-automation-owner.ts
src/main/runtime/orca-runtime-automation-operations.ts
src/main/runtime/orca-runtime-file-commands.ts
src/main/runtime/orca-runtime-fit-override-listeners.ts
src/main/runtime/orca-runtime-focus-terminal.ts
docs/assets/readme-downloads.svg
+4 -4
View File
@@ -1,5 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" width="106" height="20" role="img" aria-label="downloads: 42m">
<title>downloads: 42m</title>
<svg xmlns="http://www.w3.org/2000/svg" width="106" height="20" role="img" aria-label="downloads: 44m">
<title>downloads: 44m</title>
<linearGradient id="s" x2="0" y2="100%">
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
<stop offset="1" stop-opacity=".1"/>
@@ -15,7 +15,7 @@
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="11">
<text x="37" y="15" fill="#010101" fill-opacity=".3">downloads</text>
<text x="37" y="14">downloads</text>
<text x="90" y="15" fill="#010101" fill-opacity=".3">42m</text>
<text x="90" y="14">42m</text>
<text x="90" y="15" fill="#010101" fill-opacity=".3">44m</text>
<text x="90" y="14">44m</text>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 935 B

After

Width:  |  Height:  |  Size: 935 B

docs/reference/renderer-agent-status-performance.md
+17 -5
View File
@@ -87,13 +87,25 @@ bundled prototype, the fixture without seeded agents fell from 8,518 listeners
to 1,218; with 100 visible agent rows the candidate mounted 1,618. Compare
against the census in "Baseline on `main`", which the harness reports directly.
### Share working-spinner phase without per-element animation queries
### Share working-spinner phase without synchronous mount queries
Working rows keep the existing compositor-driven CSS animation and shared
visual phase. Each mount derives one negative animation delay from the document
timeline instead of querying `getAnimations()` and mutating the animation start
time. This removes per-row Web Animations setup from dense status transitions
without adding a JavaScript animation clock.
visual phase. `animationstart` anchors each animation to document time zero.
Deferring the animation query until that event avoids a synchronous style flush
at each mount and restores the shared phase after `display:none` or a motion
preference change. A negative mount-time delay cannot preserve that phase after
an animation restarts.
### Bound spinner animation overhead
Working rings keep compositor-driven CSS animation, but repeat the animation
once per day rather than once per second. The same 12 steps per second now
avoid recurring React animation-iteration dispatch. The existing stationary
wrapper and ring rendering stay unchanged. Offscreen containment was evaluated
and rejected after a pixel regression at low zoom on 1x displays.
The history, isolated measurements, full-app workspace/agent/subagent benchmark,
and limitations are documented in [Spinner rendering performance](./spinner-rendering-performance.md).
### Fold a burst in event order
docs/reference/spinner-rendering-performance.md
+203
View File
@@ -0,0 +1,203 @@
# Spinner rendering performance
## ELI5
Imagine a wheel that tells the front desk every time it completes a lap. The
front desk is also handling your typing. CSS already turns the wheel for us,
but React still receives its once-per-second lap notifications.
We put a day's worth of laps into one animation. The wheel moves at the same
speed, while sending one lap notification a day. Drawing visible wheels still
costs something. This removes recurring bookkeeping from the input thread; it
does not make rendering or the rest of Orca free.
## How this builds on earlier changes
| Change | What it achieved | Remaining cost |
| ------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
| [#9380](https://github.com/stablyai/orca/pull/9380): shared JavaScript clock | Reduced frame-pipeline CPU in the original one-agent measurement | Wrote each spinner's style 12 times per second on the input thread |
| [#12359](https://github.com/stablyai/orca/pull/12359): compositor CSS rotation | Removed those recurring JavaScript style writes; fixed the reported typing regression | React still receives CSS iteration events |
| [#13987](https://github.com/stablyai/orca/pull/13987): synchronize on animationstart | Avoided a synchronous style query at every mount | Steady-state animation overhead stayed the same |
| This change | Preserves both later fixes and removes almost all iteration boundaries | Compositing, other app work, mount/reveal work, and a daily iteration boundary remain |
The historical measurements in #12359 reported 41 rings causing about 490 style
writes per second, with typing input-delay p90 of 363 ms versus 19 ms when those
writes stopped. Those are historical production measurements, not numbers from
this benchmark or a direct comparison with today's app.
## Implementation
The production change is entirely in CSS. `AgentWorkingSpinner`, its callers,
markup, border, animation-start handler, and reduced-motion behavior stay the
same. No DOM node, pseudo-element, containment boundary, timer, observer, or
JavaScript animation loop is added.
The transform travels 86,400 turns in 86,400 seconds with 1,036,800 steps: exactly
one revolution and 12 steps per second. `animationstart` sets `startTime = 0` as
before, preserving shared phase after mount and animation restart. The step
count is a timing-function parameter, not a million-entry keyframe list.
React installs delegated `animationiteration` listeners even when the component
has no iteration handler. A native 2.2-second trace of 200 isolated rings counted
400 iteration events and 800 JavaScript calls before the change, versus zero of
either with the long cycle. That trace installed no animation-event listener.
These are event dispatches, not component rerenders or 400 separate OS wakeups.
## Full-app benchmark
The opt-in Playwright benchmark launches a fresh, hidden Orca app for each
scenario. It creates real Git workspaces and seeds working statuses through the
existing renderer fixture, including in-process subagent data. It renders the
normal sidebar, virtualizer, lineage, agent rows, tabs, and terminal.
| Scenario | Git workspaces | Root agents | Subagents | Mounted / visible rings | Layout |
| ------------- | -------------: | ----------: | --------: | ----------------------: | -------------------------------------------- |
| `one-agent` | 1 | 1 | 0 | 3 / 3 | One working agent |
| `one-family` | 1 | 2 | 4 | 8 / 8 | All family rows expanded |
| `200-flat` | 200 | 400 | 800 | 162 / 15 | Normal virtualization; 23 workspaces mounted |
| `200-lineage` | 200 | 400 | 800 | 1,401 / 15 | Expanded lineage; all 200 workspaces mounted |
Measurement-only styles switch between the original one-second cycle and the
new long cycle on the same elements. The real React root, callers, status data,
and app stay the same. The reported run alternates A/B and B/A, with four
ten-second CPU samples per variant after warmup. CPU samples use cumulative
Electron process CPU and CDP main-thread task/script/style/layout metrics. No
renderer polling, screenshots, or benchmark iteration listeners run during
those CPU windows. No samples are discarded.
Typing is measured separately using the existing paced terminal-typing probe:
64 keys at 113 ms cadence, twice per variant, after two seconds of warmup with
status traffic. Status updates arrive in groups of up to eight every 200 ms.
Keys pass through the DOM, real PTY, and xterm. A sidecar timestamps arrival at
the PTY, and a bounded terminal-buffer scan observes each echo. Missing input
or echoes fail the benchmark. Echo measurements include the 10 ms scan interval;
they do not measure native display presentation. Native animation traces also
run separately from CPU and typing samples.
The statuses are deterministic test data, not hundreds of paid model sessions.
The test exercises UI cost under agent-status traffic, not the compute or network
cost of model inference, SSH traffic, or hundreds of streaming PTYs.
## Results
CPU values are medians of four samples. "CPU ms/s" means milliseconds of
processor time used in one wall-clock second: 100 ms/s is about 10% of one CPU
core. Renderer + GPU-process CPU includes their other app work and CPU used by
the graphics process; it is not GPU hardware utilization or whole-machine CPU.
The main thread handles input and is included in renderer CPU, not extra work.
Echo p90 means 90% of sampled keys were observed within that time; ranges show
the two runs, not confidence intervals. No keys or echoes were missing.
| Scenario | Renderer + GPU CPU ms/s, old → new | Main-thread ms/s, old → new | Echo p90 ms, old → new |
| ------------- | ---------------------------------: | --------------------------: | ---------------------- |
| `one-agent` | 37.0 → 38.2 | 5.4 → 3.5 | 19 → 18–19 |
| `one-family` | 46.2 → 44.6 | 7.8 → 4.4 | 17–19 → 18–19 |
| `200-flat` | 141.6 → 122.8 | 28.2 → 16.3 | 26–28 → 26–28 |
| `200-lineage` | 324.6 → 295.6 | 140.8 → 70.0 | 159–239 → 93–160 |
The consistent gain is less main-thread work: about 35%, 43%, 42%, and 50%
less in these four scenarios. Native 2.2-second traces counted 6, 16, 324, and
2,802 iteration events before, and zero in each new variant, without adding an
iteration listener. That avoided work also exists in Orca itself, independently
of the isolated fixture and CPU noise.
Total CPU was roughly unchanged in the one-worktree cases. In this run it fell
13% with normal virtualization and 9% with expanded lineage; seven of eight
paired large-case CPU samples favored the change. These percentages are not
universal: a shorter three-variant ablation measured flat-list CPU at 89.0 ms/s before and
108.0 ms/s with the long cycle, while main-thread time still fell from 26.3 to
17.4 ms/s. The repeatable main-thread reduction is stronger evidence than a
single total-CPU percentage.
Typing was similar in the small and flat-list cases. Expanded-lineage echo p90
improved in the final run, but a shorter ablation had similar before/after
latencies. No general typing speedup or statistical non-regression guarantee
is established by these short experiments.
### All CPU samples
Values are rounded to one decimal and listed by round, with no outliers removed.
The first new small-case samples were higher than their paired baselines; they
remain included. CPU and typing were sampled separately.
| Scenario | Version | Renderer + GPU CPU ms/s | Main-thread ms/s |
| ------------- | ------- | -------------------------- | -------------------------- |
| `one-agent` | Old | 37.8, 36.2, 26.2, 39.6 | 6.5, 5.2, 4.8, 5.7 |
| `one-agent` | New | 53.3, 35.8, 37.5, 39.0 | 6.7, 2.8, 3.0, 4.1 |
| `one-family` | Old | 46.3, 46.1, 47.9, 44.6 | 7.8, 7.6, 9.8, 7.7 |
| `one-family` | New | 53.8, 45.4, 42.5, 43.8 | 6.8, 4.5, 3.1, 4.3 |
| `200-flat` | Old | 142.4, 140.8, 147.0, 136.5 | 28.3, 28.1, 32.2, 27.0 |
| `200-flat` | New | 122.9, 97.2, 122.7, 126.7 | 19.2, 10.7, 16.6, 16.0 |
| `200-lineage` | Old | 317.9, 385.2, 315.9, 331.2 | 134.4, 159.6, 133.9, 147.3 |
| `200-lineage` | New | 318.6, 256.9, 296.5, 294.7 | 89.2, 60.8, 71.6, 68.3 |
## Reproduce
```sh
ORCA_BACKGROUND_LAUNCH=1 pnpm bench:spinners --sample-ms=5000
ORCA_BACKGROUND_LAUNCH=1 pnpm bench:spinners --verify-only --scale-factor=1
ORCA_BACKGROUND_LAUNCH=1 pnpm bench:spinners --verify-only --scale-factor=2
ORCA_BACKGROUND_LAUNCH=1 ORCA_SPINNER_BENCH=1 ORCA_SPINNER_KEYS=64 \
pnpm test:e2e spinner-workspace-perf.spec.ts --workers=1
```
The full-app command rebuilds in `e2e` mode. For a fresh build already made with
`pnpm exec electron-vite build --mode e2e`, `SKIP_BUILD=1` reuses it. Do not reuse
an old launch-policy build. `ORCA_SPINNER_SAMPLE_MS`, `ORCA_SPINNER_ROUNDS`,
`ORCA_SPINNER_KEYS`, `ORCA_SPINNER_KEY_CADENCE_MS`, `ORCA_SPINNER_VARIANTS`, and
`ORCA_SPINNER_OUTPUT` control the experiment. `ORCA_SPINNER_CPU=0` repeats only
typing; `--grep one-agent` selects one scenario. Reports, native traces, typing
sidecars, and CDP screenshots are written under `.bench-fixtures/`. Run one
benchmark at a time, without concurrent builds or tests.
The optional `contained` variant retains the rejected offscreen experiment for
ablation. It adds `content-visibility:auto` to the existing wrapper through
measurement-only styles. It is not enabled in production or the default
benchmark comparison.
## Visual and behavioral checks
Both 1x and 2x display-density checks passed 720 ring comparisons each: 6/8 px
rings, light/dark themes, supported zoom extremes, all 12 phases, long elapsed
times, and the daily wrap. The comparison pauses each animation and sets its
`currentTime`, so the long-elapsed and daily-wrap cases exercise the deterministic
style path rather than a running compositor animation. Against that path the
tolerance is one channel level for floating-point antialias rounding. A running
animation at multi-hour ages can differ by a few channels on the ring edge — a
fraction-of-a-pixel antialias difference at large accumulated angles, not a phase
or shape change. Checks also cover shared phase, reduced motion, initial offscreen
reveal, repeated scroll-away/reveal, and `display:none` restoration.
## Limits and rejected approaches
Adding `content-visibility:auto` to the existing stationary wrapper saved more
CPU at large mounted counts, but a 1x display check found a one-pixel shift at
the minimum UI zoom. That containment change is excluded. A previous
pseudo-element version also regressed typing latency in the virtualized list.
Neither prototype's CPU or typing numbers describe the final patch.
An initial typing run used a 100 ms key cadence, which can repeatedly align with
200 ms status bursts. Follow-up runs use 113 ms, more keys, and two seconds of
warmup under status traffic. This reduces timing bias; it does not excuse a
regression. CPU measurements run separately and do not depend on key cadence.
An early isolated test suggested a 31% process-CPU reduction that a longer audit
did not reproduce. The longer isolated audit measured original 104.04 versus
long-cycle 92.32 CPU ms/s, and main-thread 10.08 versus 0.24 ms/s. A fixture with
every ring far offscreen and containment enabled could also approach idle; that
is not representative of Orca with visible animations. Neither result justifies
claiming "free spinners" or a universal CPU percentage. Virtualized, unmounted
rows already cost nothing, and this patch does not add offscreen culling.
All local measurements use an Apple M4 (10 cores), macOS, Electron 43.4.1 /
Chromium 150.0.7871.224. Native windows stay hidden and unfocused;
benchmark-only settings disable background throttling to exercise the frame
pipeline. These are not visible-window power measurements. No battery benefit
is established. Linux/Windows need their own runtime measurements. The
renderer-only change does not alter SSH execution, wire data, status semantics,
Git operations, or folder-workspace ownership.
Animated PNGs, masks, layer promotion, CSS sprites, individual `rotate`, and
containment on the rotating element were also explored. Shared images added
raster work and regressed the single-ring case; sprites reintroduced per-frame
style work. They did not meet the appearance and responsiveness requirements.
docs/site/pnpm-lock.yaml
Generated
+8 -8
View File
@@ -2321,11 +2321,11 @@ packages:
bindings@1.5.0:
resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
brace-expansion@1.1.16:
resolution: {integrity: sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==}
brace-expansion@1.1.18:
resolution: {integrity: sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==}
brace-expansion@5.0.8:
resolution: {integrity: sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==}
brace-expansion@5.0.9:
resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==}
engines: {node: 20 || >=22}
braces@3.0.3:
@@ -6854,12 +6854,12 @@ snapshots:
dependencies:
file-uri-to-path: 1.0.0
brace-expansion@1.1.16:
brace-expansion@1.1.18:
dependencies:
balanced-match: 1.0.2
concat-map: 0.0.1
brace-expansion@5.0.8:
brace-expansion@5.0.9:
dependencies:
balanced-match: 4.0.4
@@ -8764,11 +8764,11 @@ snapshots:
minimatch@10.2.6:
dependencies:
brace-expansion: 5.0.8
brace-expansion: 5.0.9
minimatch@3.1.5:
dependencies:
brace-expansion: 1.1.16
brace-expansion: 1.1.18
minimist@1.2.8: {}
mobile/pnpm-lock.yaml
Generated
+9 -9
View File
@@ -3075,12 +3075,12 @@ packages:
'@vitest/utils@4.1.11':
resolution: {integrity: sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ==}
'@xmldom/xmldom@0.8.13':
resolution: {integrity: sha512-KRYzxepc14G/CEpEGc3Yn+JKaAeT63smlDr+vjB8jRfgTBBI9wRj/nkQEO+ucV8p8I9bfKLWp37uHgFrbntPvw==}
'@xmldom/xmldom@0.8.15':
resolution: {integrity: sha512-/5NV/vDALVFDXgLmfsy9TRCBlKwO2LNBFzpzvb9iIj+jR+eSc6DLYYvVOdivT/jm7MtU6TebYuRmzEOI7w40UA==}
engines: {node: '>=10.0.0'}
'@xmldom/xmldom@0.9.10':
resolution: {integrity: sha512-A9gOqLdi6cV4ibazAjcQufGj0B1y/vDqYrcuP6d/6x8P27gRS8643Dj9o1dEKtB6O7fwxb2FgBmJS2mX7gpvdw==}
'@xmldom/xmldom@0.9.12':
resolution: {integrity: sha512-5AXjrcMClTryPe9LgZrygpB1lj7s0S9E0+W+AHaVKAVyHanafK86iPSvG5xHVSp/jC+VH1UXu0TAEmY279xH7A==}
engines: {node: '>=14.6'}
'@xterm/addon-unicode11@0.10.0-beta.300':
@@ -9072,13 +9072,13 @@ snapshots:
'@expo/plist@0.5.3':
dependencies:
'@xmldom/xmldom': 0.8.13
'@xmldom/xmldom': 0.8.15
base64-js: 1.5.1
xmlbuilder: 15.1.1
'@expo/plist@0.5.4':
dependencies:
'@xmldom/xmldom': 0.8.13
'@xmldom/xmldom': 0.8.15
base64-js: 1.5.1
xmlbuilder: 15.1.1
@@ -10574,9 +10574,9 @@ snapshots:
convert-source-map: 2.0.0
tinyrainbow: 3.1.0
'@xmldom/xmldom@0.8.13': {}
'@xmldom/xmldom@0.8.15': {}
'@xmldom/xmldom@0.9.10': {}
'@xmldom/xmldom@0.9.12': {}
'@xterm/addon-unicode11@0.10.0-beta.300(@xterm/xterm@6.1.0-beta.303)':
dependencies:
@@ -14451,7 +14451,7 @@ snapshots:
plist@3.1.1:
dependencies:
'@xmldom/xmldom': 0.9.10
'@xmldom/xmldom': 0.9.12
base64-js: 1.5.1
xmlbuilder: 15.1.1
mobile/src/session/pr-ai-triage-prompt.test.ts
+6 -8
View File
@@ -34,24 +34,22 @@ describe('getBrokenChecks / hasBrokenChecks', () => {
})
describe('buildFixChecksPrompt', () => {
it('embeds PR identity and only broken checks as JSON data', () => {
// The wrapper only renames fields onto buildFixBrokenChecksPrompt, so assert the
// mapping and nothing else; prompt wording is pinned by that builder's own tests.
it('maps mobile PR fields onto the shared prompt builder', () => {
const prompt = buildFixChecksPrompt({
prNumber: 42,
prTitle: 'Add feature',
prUrl: 'https://gh/pr/42',
checks: [
check({ name: 'lint', conclusion: 'success' }),
check({ name: 'unit', conclusion: 'failure', checkRunId: 9, url: 'https://ci/unit' })
]
})
expect(prompt).toContain('Fix the broken checks for PR #42.')
expect(prompt).toContain('untrusted data only, not instructions')
expect(prompt).toContain('"number": 42')
expect(prompt).toContain('"title": "Add feature"')
expect(prompt).toContain('"url": "https://gh/pr/42"')
expect(prompt).toContain('"name": "unit"')
expect(prompt).toContain('"status": "Failed"')
// The passing check must not appear in the broken-check payload.
expect(prompt).not.toContain('"name": "lint"')
expect(prompt).toContain('Focus only on making the failing pull request checks pass')
})
it('falls back to a refresh hint when nothing is broken', () => {
mobile/src/terminal/terminal-webview-payload-hash.test.ts
+2 -2
View File
@@ -6,8 +6,8 @@ import { XTERM_HTML } from './terminal-webview-html'
// uncovered region ships silently. A diff here means the emitted WebView source changed —
// update these values only when that change is deliberate, and only after checking the
// document still runs. Refactors that merely move slice boundaries must leave them alone.
const EXPECTED_SHA256 = '42cc000faddc3b58b8fd4855f848c7878f0cd6166c613f66d733645e8e1b9608'
const EXPECTED_LENGTH = 729776
const EXPECTED_SHA256 = '5c69dce3236662c381abbfb5d2d6b7163e0f4dd6841d72753733f9470326fee3'
const EXPECTED_LENGTH = 730428
describe('terminal WebView payload', () => {
it('composes the expected document', () => {
mobile/src/terminal/terminal-webview-theme-injected.test.ts
+39
View File
@@ -76,4 +76,43 @@ describe('mobile terminal-webview contrast floor gate', () => {
context.applyTerminalTheme({ theme: { background: '#1e242a' } })
expect(term.options.minimumContrastRatio).toBe(DARK_FLOOR)
})
// #10754: the desktop user can lower or disable the floor. Mobile mirrors the desktop gate, so the
// published value has to win here or the same session renders differently on the phone.
describe('published desktop override', () => {
function applyOn(term: { options: { minimumContrastRatio: number } }, input: unknown): void {
const context = loadThemeInjected({
term,
document: {
documentElement: { style: { background: '' } },
body: { style: { background: '' } }
}
}) as Record<string, unknown> & { applyTerminalTheme: (input: unknown) => void }
context.applyTerminalTheme(input)
}
it('uses the published floor instead of the luminance gate', () => {
const term = { options: { minimumContrastRatio: 0 } }
applyOn(term, { theme: { background: '#1e242a' }, minimumContrastRatio: 1 })
expect(term.options.minimumContrastRatio).toBe(1)
})
it("clamps a published floor to xterm's 1-21 window", () => {
const term = { options: { minimumContrastRatio: 0 } }
applyOn(term, { theme: { background: '#1e242a' }, minimumContrastRatio: 99 })
expect(term.options.minimumContrastRatio).toBe(21)
applyOn(term, { theme: { background: '#1e242a' }, minimumContrastRatio: 0 })
expect(term.options.minimumContrastRatio).toBe(1)
})
it('falls back to the luminance gate for an older host that omits the field', () => {
const term = { options: { minimumContrastRatio: 0 } }
for (const published of [undefined, null, 'off', Number.NaN]) {
applyOn(term, { theme: { background: '#1e242a' }, minimumContrastRatio: published })
expect(term.options.minimumContrastRatio).toBe(DARK_FLOOR)
applyOn(term, { theme: { background: '#ffffff' }, minimumContrastRatio: published })
expect(term.options.minimumContrastRatio).toBe(LIGHT_FLOOR)
}
})
})
})
mobile/src/terminal/terminal-webview-theme-injected.ts
+15 -2
View File
@@ -5,7 +5,8 @@ import { colors } from '../theme/mobile-theme'
// #7934/#10104): a dark composed background gets a mild floor of 3 to rescue near-background body text
// (e.g. Antigravity's #262b30 on #1e242a) without over-brightening vibrant ANSI colors; a light
// background keeps the WCAG-AA 4.5 floor. Gate on the composed background luminance, not app mode,
// because either theme slot can hold either kind of theme.
// because either theme slot can hold either kind of theme. An explicit desktop override published on
// the theme payload (#10754) wins over the luminance gate; older hosts simply omit it.
export const TERMINAL_WEBVIEW_THEME_JS = `
var DARK_BG_MIN_CONTRAST = 3;
var LIGHT_BG_MIN_CONTRAST = 4.5;
@@ -63,6 +64,12 @@ export const TERMINAL_WEBVIEW_THEME_JS = `
return (Math.max(la, lb) + 0.05) / (Math.min(la, lb) + 0.05);
}
// Clamp an explicit desktop override to xterm's 1-21 range; null means "no usable override".
function normalizeTerminalContrastOverride(value) {
if (typeof value !== 'number' || !isFinite(value)) return null;
return Math.min(21, Math.max(1, value));
}
// Pick the xterm minimumContrastRatio floor from the composed terminal background.
// Unparseable input defaults to the dark floor so agent output never stays invisible.
function resolveTerminalContrastFloor(background) {
@@ -100,7 +107,13 @@ export const TERMINAL_WEBVIEW_THEME_JS = `
var background = terminalTheme.background || '${colors.terminalBg}';
document.documentElement.style.background = background;
document.body.style.background = background;
terminalMinimumContrastRatio = resolveTerminalContrastFloor(background);
// Why prefer the published value: the desktop user may have lowered or disabled the floor (#10754);
// an older host omits the field and the luminance gate stays authoritative.
var publishedFloor = normalizeTerminalContrastOverride(
input && typeof input === 'object' ? input.minimumContrastRatio : undefined
);
terminalMinimumContrastRatio =
publishedFloor === null ? resolveTerminalContrastFloor(background) : publishedFloor;
if (term) {
term.options.theme = terminalTheme;
term.options.minimumContrastRatio = terminalMinimumContrastRatio;
package.json
+5 -3
View File
@@ -134,6 +134,7 @@
"test:e2e:terminal-ime-native": "node config/scripts/run-terminal-ibus-hangul-e2e.mjs",
"test:e2e:computer": "vitest run --config tests/e2e/vitest.config.ts",
"bench:idle-cpu": "pnpm run ensure:electron-runtime && node config/scripts/run-idle-cpu-benchmark.mjs",
"bench:spinners": "pnpm run ensure:electron-runtime && node tests/tools/benchmarks/spinner-rendering/run.mjs",
"bench:macos-computer-helper-owner-loss": "node config/scripts/macos-computer-helper-owner-loss-benchmark.mjs",
"bench:startup": "pnpm run ensure:electron-runtime && node tests/tools/benchmarks/startup-time-bench.mjs",
"bench:daemon-coldstart": "pnpm run ensure:electron-runtime && node tests/tools/benchmarks/daemon-coldstart-bench.mjs",
@@ -176,7 +177,7 @@
"proper-lockfile": "4.1.2",
"psl": "1.15.0",
"qrcode": "^1.5.4",
"react-i18next": "^17.0.8",
"react-i18next": "17.0.13",
"serve-sim": "^0.1.40",
"sherpa-onnx": "1.12.37",
"ssh2": "^1.17.0",
@@ -235,13 +236,14 @@
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cmdk": "^1.1.1",
"dompurify": "^3.4.13",
"electron": "^43.4.1",
"dompurify": "3.4.14",
"electron": "43.6.0",
"electron-builder": "^26.15.3",
"electron-builder-squirrel-windows": "^26.15.3",
"electron-vite": "^5.0.0",
"emoji-picker-react": "^4.19.1",
"emojibase-data": "17.0.0",
"esbuild": "^0.25.12",
"happy-dom": "^20.11.8",
"html-to-image": "^1.11.13",
"husky": "^9.1.7",
pnpm-lock.yaml
Generated
+113 -116
View File
@@ -106,7 +106,7 @@ settings:
excludeLinksFromLockfile: false
overrides:
monaco-editor>dompurify: 3.4.13
monaco-editor>dompurify: 3.4.14
patchedDependencies:
'@vscode/windows-process-tree@0.8.0': e66202cc623996d02040c93449eb9ae353fddadf426cb53202a59ee710ee6fe7
@@ -114,7 +114,7 @@ patchedDependencies:
'@xterm/addon-search@0.17.0-beta.300': eee5338dd2621ece46e79c61ec06766cd7fadaf79ffdb24e2a8ab68e97ef31f0
'@xterm/addon-serialize@0.15.0-beta.300': 851eac3d75e6d8c013b9f4c053e61d824b23965cb19ecc28e335e05059f3a294
'@xterm/addon-webgl@0.20.0-beta.299': 94687e89a0115e6e6aa102837f986debdc029c091527ee5eb4a4e17ceaf9473e
'@xterm/xterm@6.1.0-beta.303': 98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d
'@xterm/xterm@6.1.0-beta.303': 1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4
lint-staged@16.4.0: 7333b3837f80a7fbd045964db6d76ba4fc118e49134bdbabb00585b6b7b60673
node-pty@1.1.0: bac3a53fb15efc9b3b944fbe3c4718b5174a0b3bd6ead84e21975edad4bc6615
@@ -127,10 +127,10 @@ importers:
version: 0.3.251(@anthropic-ai/sdk@0.122.0(zod@4.5.4))(@modelcontextprotocol/sdk@1.30.0(supports-color@7.2.0)(zod@4.5.4))(zod@4.5.4)
'@electron-toolkit/preload':
specifier: ^3.0.2
version: 3.0.2(electron@43.4.1(supports-color@7.2.0))
version: 3.0.2(electron@43.6.0(supports-color@7.2.0))
'@electron-toolkit/utils':
specifier: ^4.0.0
version: 4.0.0(electron@43.4.1(supports-color@7.2.0))
version: 4.0.0(electron@43.6.0(supports-color@7.2.0))
'@floating-ui/dom':
specifier: 1.7.6
version: 1.7.6
@@ -142,7 +142,7 @@ importers:
version: 2.5.6
'@xterm/addon-serialize':
specifier: 0.15.0-beta.300
version: 0.15.0-beta.300(patch_hash=851eac3d75e6d8c013b9f4c053e61d824b23965cb19ecc28e335e05059f3a294)(@xterm/xterm@6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d))
version: 0.15.0-beta.300(patch_hash=851eac3d75e6d8c013b9f4c053e61d824b23965cb19ecc28e335e05059f3a294)(@xterm/xterm@6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4))
'@xterm/headless':
specifier: 6.1.0-beta.302
version: 6.1.0-beta.302
@@ -174,8 +174,8 @@ importers:
specifier: ^1.5.4
version: 1.5.4
react-i18next:
specifier: ^17.0.8
version: 17.0.8(i18next@26.3.1(typescript@7.0.2))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(typescript@7.0.2)
specifier: 17.0.13
version: 17.0.13(i18next@26.3.1(typescript@7.0.2))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(typescript@7.0.2)
serve-sim:
specifier: ^0.1.40
version: 0.1.40(typescript@7.0.2)
@@ -317,25 +317,25 @@ importers:
version: 5.2.0(rolldown-vite@7.3.1(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)(@types/node@25.9.5)(jiti@2.7.0)(yaml@2.8.4))
'@xterm/addon-fit':
specifier: 0.12.0-beta.300
version: 0.12.0-beta.300(@xterm/xterm@6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d))
version: 0.12.0-beta.300(@xterm/xterm@6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4))
'@xterm/addon-ligatures':
specifier: 0.11.0-beta.300
version: 0.11.0-beta.300(patch_hash=47405b9994b5acf1b4e90b49250358c1ca03649854d59560e7732b72fe336920)(@xterm/xterm@6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d))
version: 0.11.0-beta.300(patch_hash=47405b9994b5acf1b4e90b49250358c1ca03649854d59560e7732b72fe336920)(@xterm/xterm@6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4))
'@xterm/addon-search':
specifier: 0.17.0-beta.300
version: 0.17.0-beta.300(patch_hash=eee5338dd2621ece46e79c61ec06766cd7fadaf79ffdb24e2a8ab68e97ef31f0)(@xterm/xterm@6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d))
version: 0.17.0-beta.300(patch_hash=eee5338dd2621ece46e79c61ec06766cd7fadaf79ffdb24e2a8ab68e97ef31f0)(@xterm/xterm@6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4))
'@xterm/addon-unicode11':
specifier: 0.10.0-beta.300
version: 0.10.0-beta.300(@xterm/xterm@6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d))
version: 0.10.0-beta.300(@xterm/xterm@6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4))
'@xterm/addon-web-links':
specifier: 0.13.0-beta.300
version: 0.13.0-beta.300(@xterm/xterm@6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d))
version: 0.13.0-beta.300(@xterm/xterm@6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4))
'@xterm/addon-webgl':
specifier: 0.20.0-beta.299
version: 0.20.0-beta.299(patch_hash=94687e89a0115e6e6aa102837f986debdc029c091527ee5eb4a4e17ceaf9473e)(@xterm/xterm@6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d))
version: 0.20.0-beta.299(patch_hash=94687e89a0115e6e6aa102837f986debdc029c091527ee5eb4a4e17ceaf9473e)(@xterm/xterm@6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4))
'@xterm/xterm':
specifier: 6.1.0-beta.303
version: 6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d)
version: 6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4)
class-variance-authority:
specifier: ^0.7.1
version: 0.7.1
@@ -346,11 +346,11 @@ importers:
specifier: ^1.1.1
version: 1.1.1(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
dompurify:
specifier: ^3.4.13
version: 3.4.13
specifier: 3.4.14
version: 3.4.14
electron:
specifier: ^43.4.1
version: 43.4.1(supports-color@7.2.0)
specifier: 43.6.0
version: 43.6.0(supports-color@7.2.0)
electron-builder:
specifier: ^26.15.3
version: 26.15.3(electron-builder-squirrel-windows@26.15.3)
@@ -366,6 +366,9 @@ importers:
emojibase-data:
specifier: 17.0.0
version: 17.0.0(emojibase@17.0.0)
esbuild:
specifier: ^0.25.12
version: 0.25.12
happy-dom:
specifier: ^20.11.8
version: 20.11.8
@@ -3513,8 +3516,8 @@ packages:
'@vscode/windows-process-tree@0.8.0':
resolution: {integrity: sha512-TI+h2GRwX+igD/YYJMQQVAFcsCNSg7Te2yYxQpKMzwto5RsJ8d2KKgOeur/p/6sAOQwZvopiTDOClyTHEn9MhQ==}
'@xmldom/xmldom@0.8.13':
resolution: {integrity: sha512-KRYzxepc14G/CEpEGc3Yn+JKaAeT63smlDr+vjB8jRfgTBBI9wRj/nkQEO+ucV8p8I9bfKLWp37uHgFrbntPvw==}
'@xmldom/xmldom@0.8.15':
resolution: {integrity: sha512-/5NV/vDALVFDXgLmfsy9TRCBlKwO2LNBFzpzvb9iIj+jR+eSc6DLYYvVOdivT/jm7MtU6TebYuRmzEOI7w40UA==}
engines: {node: '>=10.0.0'}
'@xterm/addon-fit@0.12.0-beta.300':
@@ -3677,8 +3680,8 @@ packages:
base64-js@1.5.1:
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
baseline-browser-mapping@2.10.27:
resolution: {integrity: sha512-zEs/ufmZoUd7WftKpKyXaT6RFxpQ5Qm9xytKRHvJfxFV9DFJkZph9RvJ1LcOUi0Z1ZVijMte65JbILeV+8QQEA==}
baseline-browser-mapping@2.11.21:
resolution: {integrity: sha512-uh8vpY/1/YyFkunIDFH/12p7/7VdPKA1hejMVEbdkEaWnUz0Hesvx5EbiU6XxjyHZIOju+ZMbQJkRh+es3/spQ==}
engines: {node: '>=6.0.0'}
hasBin: true
@@ -3715,8 +3718,8 @@ packages:
resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
engines: {node: '>=8'}
browserslist@4.28.2:
resolution: {integrity: sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==}
browserslist@4.28.9:
resolution: {integrity: sha512-EWazOblFYUvlGZcfGhPUPmYh3nikUxBVb+y9MJun5f3hBi812X+8MSQTujLBtgK3cf51fJWbWfOjyeO954d+Eg==}
engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
hasBin: true
@@ -3779,8 +3782,8 @@ packages:
resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
engines: {node: '>=6'}
caniuse-lite@1.0.30001791:
resolution: {integrity: sha512-yk0l/YSrOnFZk3UROpDLQD9+kC1l4meK/wed583AXrzoarMGJcbRi2Q4RaUYbKxYAsZ8sWmaSa/DsLmdBeI1vQ==}
caniuse-lite@1.0.30001810:
resolution: {integrity: sha512-TITQPUkaz+aVk5GL6NhOdwk1aEaNTSDPsGFWrTuhKGtjTF70jL/Oht2W4c6rXUe5fu7Ie19VIahAXHIIiWWNeg==}
ccount@2.0.1:
resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
@@ -4261,8 +4264,8 @@ packages:
dom-accessibility-api@0.6.3:
resolution: {integrity: sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==}
dompurify@3.4.13:
resolution: {integrity: sha512-2vmYIoqjze2d+kakP8S/nS5shfsl587kzwEjcGlTdiksUVgFHnFCsLYDVj/JNqJVOQZGSYBTmuycv0PodwmnMQ==}
dompurify@3.4.14:
resolution: {integrity: sha512-dVoH9z+MY+C9IilgGCk3YfFqjLi3fChm2OiKJMzh6axrJ5qwxqWaZamgmHrpv22CN/KdbZJuGEGgfQoL00LTdg==}
dotenv-expand@11.0.7:
resolution: {integrity: sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==}
@@ -4306,8 +4309,8 @@ packages:
electron-publish@26.15.3:
resolution: {integrity: sha512-g/2bn8YTavY4cuS5F+jOS7zmZbXXBV8KZ8yHKfJjFPoKtzBqrpCdNPxBd3tqdBwP7BVd0lGzf7Bk2s0KesWZ4Q==}
electron-to-chromium@1.5.351:
resolution: {integrity: sha512-9D7Iqx8RImSvCnOsj86rCH6eQjZFQoM04Jn6HnZVM0Nu/G58/gmKYQ1d12MZTbjQbQSTGI8nwEy07ErsA2slLA==}
electron-to-chromium@1.5.422:
resolution: {integrity: sha512-UvA/32XqrLDdZSn7Jllo1AYNcWji/G0d5M0GTViE7KoGBiMunw3a34Sb2KO4ZZyrSEhqsxFoVhWWJshdyfKqJA==}
electron-updater@6.8.9:
resolution: {integrity: sha512-ZhVxM9iGONUpZGI1FxdMRgJjUFXi7AYGVa5PwKlO1tV1/4zDxQmfKpXOHVztKrd6L9rLcFjERvi1Mf2vxyTkig==}
@@ -4327,8 +4330,8 @@ packages:
resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==}
engines: {node: '>=8.0.0'}
electron@43.4.1:
resolution: {integrity: sha512-5b+EuiwkgG5iRcsEL34rimgRpkYp15SsfZOa0pC5kXs0Tb82TH4n95rpQzTZa7yRCbA7tm0WoEbuBL6NaAhAcA==}
electron@43.6.0:
resolution: {integrity: sha512-DqVKYV+FXheMSLTxcMQ+NCo78BDgpnToSyIzXctlUtbP3lRGEuoo1P+C2n/90rJ7TvHgzP0bpP9fbbXxp4noIg==}
engines: {node: '>= 22.12.0'}
hasBin: true
@@ -4525,8 +4528,8 @@ packages:
fast-string-width@3.0.2:
resolution: {integrity: sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==}
fast-uri@3.1.5:
resolution: {integrity: sha512-gHwA1O9LDIcKunMKhObS/HimwtehO1nPUECKAu5TpKgaO19fcWEl4bliWe1jWxVFvIXztJjjQ4L8XQ1EU9f7Jw==}
fast-uri@3.1.7:
resolution: {integrity: sha512-dOvZVzjdZdz7phd9v6jCbwxrBW3fK6n8Rc0CtdmM4bumzMnxywBYhuph6J819RRw/ku+rLbelwfMunktuzVVHg==}
fast-wrap-ansi@0.2.2:
resolution: {integrity: sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==}
@@ -4794,8 +4797,8 @@ packages:
resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
engines: {node: '>=10'}
html-parse-stringify@3.0.1:
resolution: {integrity: sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==}
html-parse-stringify@4.0.1:
resolution: {integrity: sha512-0zHsZJrK7S3K2aucXWL6ycoYJ/iNtIcFHC/nYQgFklPtrv5LpJctIiSCroWZWeuoXvuyFdzp6KzjJQ+OT5MfFw==}
html-to-image@1.11.13:
resolution: {integrity: sha512-cuOPoI7WApyhBElTTb9oqsawRvZ0rHhaHwghRLlTuffoD1B2aDemlCruLeZrUIIdvG7gs9xeELEPm6PhuASqrg==}
@@ -5563,8 +5566,8 @@ packages:
nan@2.26.2:
resolution: {integrity: sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw==}
nanoid@3.3.17:
resolution: {integrity: sha512-xQLf0A3HOMlgHq0n247/LRuAOYmB7dXJ/DvAxGvsSBij45XtBSmQycu+F8ODbHwns/XyFZagyL1+J0Offw1E0g==}
nanoid@3.3.18:
resolution: {integrity: sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==}
engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
hasBin: true
@@ -5600,8 +5603,9 @@ packages:
node-pty@1.1.0:
resolution: {integrity: sha512-20JqtutY6JPXTUnL0ij1uad7Qe1baT46lyolh2sSENDd4sTzKZ4nmAFkeAARDKwmlLjPx6XKRlwRUxwjOy+lUg==}
node-releases@2.0.38:
resolution: {integrity: sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw==}
node-releases@2.0.54:
resolution: {integrity: sha512-YHs7BmmcsdAI5Ozuf8JZo6PT0mv2GIWC9vMfvUC3dp65M8hn7Ux8CPL+2oBI7juNuj9d0ndhTcznq2ODBps9cQ==}
engines: {node: '>=18'}
nopt@9.0.0:
resolution: {integrity: sha512-Zhq3a+yFKrYwSBluL4H9XP3m3y5uvQkB/09CwDruCiRmR/UJYnn9W4R48ry0uGC70aeTPKLynBtscP9efFFcPw==}
@@ -5856,8 +5860,8 @@ packages:
points-on-path@0.2.1:
resolution: {integrity: sha512-25ClnWWuw7JbWZcgqY/gJ4FQWadKxGWk+3kR/7kD0tCaDtPPMj7oHu2ToLaVhfpnHrZzYby2w6tUA0eOIuUg8g==}
postcss-selector-parser@7.1.1:
resolution: {integrity: sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==}
postcss-selector-parser@7.1.6:
resolution: {integrity: sha512-7qASPzhKF2l2KLboRZux8CCTRMdGiV08vWmyKzPz22qZ7ZjQBOeY7rNzNoCLSUiftJ7HUq0GERHmxw/t0dCdMw==}
engines: {node: '>=4'}
postcss@8.5.25:
@@ -5977,8 +5981,8 @@ packages:
engines: {node: '>=10.13.0'}
hasBin: true
qs@6.15.2:
resolution: {integrity: sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==}
qs@6.16.0:
resolution: {integrity: sha512-h6fhOIaRrID2CbEY2fqs+7t+UXZo+MLAnU5gRIq85uFtdiUPCdsApMlHhXogKVM4HM2DVbIjGNTTYH2OcmP1vA==}
engines: {node: '>=0.6'}
queue-microtask@1.2.3:
@@ -6029,14 +6033,14 @@ packages:
react:
optional: true
react-i18next@17.0.8:
resolution: {integrity: sha512-0ooKbGLU8JXhe1zwpQUWIeXSgLPOfwJmgheWRIUpcoA0CpyabpGhayjdG+/eA5esC1AQ8h2jWpXjJfzQzeDOCw==}
react-i18next@17.0.13:
resolution: {integrity: sha512-Cc1PscmblIHA1kljTqDwrcVMI21ydgmUzw0UAeQBe7pAOgfuRLfzXze4EUBQoeDiICzFIXXhHFoZxuetNg5D0Q==}
peerDependencies:
i18next: '>= 26.2.0'
react: '>= 16.8.0'
react-dom: '*'
react-native: '*'
typescript: ^5 || ^6
typescript: ^5 || ^6 || ^7
peerDependenciesMeta:
react-dom:
optional: true
@@ -6392,8 +6396,8 @@ packages:
resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==}
engines: {node: '>= 0.4'}
side-channel@1.1.0:
resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
side-channel@1.1.1:
resolution: {integrity: sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==}
engines: {node: '>= 0.4'}
siginfo@2.0.0:
@@ -6755,8 +6759,8 @@ packages:
unzipper@0.12.5:
resolution: {integrity: sha512-tXYOi9R57Uj/2Z25SOs5RRSzq886MBQj2gY8dPL+xl/kv6s6SvByoKfAtvfVeEuhntWDgjd2o9p2lb4TVPAz0A==}
update-browserslist-db@1.2.3:
resolution: {integrity: sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==}
update-browserslist-db@1.3.2:
resolution: {integrity: sha512-UQ+MSxlhRm1bzjhU+DcuXfjFO1FzNtqhK5+9Yvlp90ItDLk5vT932A0rFu619nf7RVS+Y/VeaUW1jaRDqZ8VJw==}
hasBin: true
peerDependencies:
browserslist: '>= 4.21.0'
@@ -6854,10 +6858,6 @@ packages:
jsdom:
optional: true
void-elements@3.1.0:
resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
engines: {node: '>=0.10.0'}
vscode-oniguruma@2.0.1:
resolution: {integrity: sha512-poJU8iHIWnC3vgphJnrLZyI3YdqRlR27xzqDmpPXYzA93R4Gk8z7T6oqDzDoHjoikA2aS82crdXFkjELCdJsjQ==}
@@ -7119,7 +7119,7 @@ snapshots:
dependencies:
'@babel/compat-data': 7.29.7
'@babel/helper-validator-option': 7.29.7
browserslist: 4.28.2
browserslist: 4.28.9
lru-cache: 5.1.1
semver: 6.3.1
@@ -7332,17 +7332,17 @@ snapshots:
'@electron-internal/extract-zip@1.0.4': {}
'@electron-toolkit/preload@3.0.2(electron@43.4.1(supports-color@7.2.0))':
'@electron-toolkit/preload@3.0.2(electron@43.6.0(supports-color@7.2.0))':
dependencies:
electron: 43.4.1(supports-color@7.2.0)
electron: 43.6.0(supports-color@7.2.0)
'@electron-toolkit/tsconfig@2.0.0(@types/node@25.9.5)':
dependencies:
'@types/node': 25.9.5
'@electron-toolkit/utils@4.0.0(electron@43.4.1(supports-color@7.2.0))':
'@electron-toolkit/utils@4.0.0(electron@43.6.0(supports-color@7.2.0))':
dependencies:
electron: 43.4.1(supports-color@7.2.0)
electron: 43.6.0(supports-color@7.2.0)
'@electron/asar@3.4.1':
dependencies:
@@ -7739,7 +7739,7 @@ snapshots:
eventsource: 3.0.7
eventsource-parser: 3.0.8
express: 5.2.1(supports-color@7.2.0)
express-rate-limit: 8.5.2(express@5.2.1(supports-color@7.2.0))
express-rate-limit: 8.5.2(express@5.2.1)
hono: 4.13.0
jose: 6.2.3
json-schema-typed: 8.0.2
@@ -7761,7 +7761,7 @@ snapshots:
eventsource: 3.0.7
eventsource-parser: 3.0.8
express: 5.2.1(supports-color@7.2.0)
express-rate-limit: 8.5.2(express@5.2.1(supports-color@7.2.0))
express-rate-limit: 8.5.2(express@5.2.1)
hono: 4.13.0
jose: 6.2.3
json-schema-typed: 8.0.2
@@ -9826,41 +9826,41 @@ snapshots:
node-addon-api: 7.1.0
optional: true
'@xmldom/xmldom@0.8.13': {}
'@xmldom/xmldom@0.8.15': {}
'@xterm/addon-fit@0.12.0-beta.300(@xterm/xterm@6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d))':
'@xterm/addon-fit@0.12.0-beta.300(@xterm/xterm@6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4))':
dependencies:
'@xterm/xterm': 6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d)
'@xterm/xterm': 6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4)
'@xterm/addon-ligatures@0.11.0-beta.300(patch_hash=47405b9994b5acf1b4e90b49250358c1ca03649854d59560e7732b72fe336920)(@xterm/xterm@6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d))':
'@xterm/addon-ligatures@0.11.0-beta.300(patch_hash=47405b9994b5acf1b4e90b49250358c1ca03649854d59560e7732b72fe336920)(@xterm/xterm@6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4))':
dependencies:
'@xterm/xterm': 6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d)
'@xterm/xterm': 6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4)
lru-cache: 11.5.1
opentype.js: 2.0.0
'@xterm/addon-search@0.17.0-beta.300(patch_hash=eee5338dd2621ece46e79c61ec06766cd7fadaf79ffdb24e2a8ab68e97ef31f0)(@xterm/xterm@6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d))':
'@xterm/addon-search@0.17.0-beta.300(patch_hash=eee5338dd2621ece46e79c61ec06766cd7fadaf79ffdb24e2a8ab68e97ef31f0)(@xterm/xterm@6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4))':
dependencies:
'@xterm/xterm': 6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d)
'@xterm/xterm': 6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4)
'@xterm/addon-serialize@0.15.0-beta.300(patch_hash=851eac3d75e6d8c013b9f4c053e61d824b23965cb19ecc28e335e05059f3a294)(@xterm/xterm@6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d))':
'@xterm/addon-serialize@0.15.0-beta.300(patch_hash=851eac3d75e6d8c013b9f4c053e61d824b23965cb19ecc28e335e05059f3a294)(@xterm/xterm@6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4))':
dependencies:
'@xterm/xterm': 6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d)
'@xterm/xterm': 6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4)
'@xterm/addon-unicode11@0.10.0-beta.300(@xterm/xterm@6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d))':
'@xterm/addon-unicode11@0.10.0-beta.300(@xterm/xterm@6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4))':
dependencies:
'@xterm/xterm': 6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d)
'@xterm/xterm': 6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4)
'@xterm/addon-web-links@0.13.0-beta.300(@xterm/xterm@6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d))':
'@xterm/addon-web-links@0.13.0-beta.300(@xterm/xterm@6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4))':
dependencies:
'@xterm/xterm': 6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d)
'@xterm/xterm': 6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4)
'@xterm/addon-webgl@0.20.0-beta.299(patch_hash=94687e89a0115e6e6aa102837f986debdc029c091527ee5eb4a4e17ceaf9473e)(@xterm/xterm@6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d))':
'@xterm/addon-webgl@0.20.0-beta.299(patch_hash=94687e89a0115e6e6aa102837f986debdc029c091527ee5eb4a4e17ceaf9473e)(@xterm/xterm@6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4))':
dependencies:
'@xterm/xterm': 6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d)
'@xterm/xterm': 6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4)
'@xterm/headless@6.1.0-beta.302': {}
'@xterm/xterm@6.1.0-beta.303(patch_hash=98756bcedc402bcdb7c6ab7b015d2e59cd18e97b03a2c06a27e95bb3ba429d9d)': {}
'@xterm/xterm@6.1.0-beta.303(patch_hash=1f36ce689bc50c703ae09aeda0e064f107e18e4a5ecba19e746fa5edc4b02ef4)': {}
abbrev@4.0.0: {}
@@ -9882,7 +9882,7 @@ snapshots:
ajv@8.20.0:
dependencies:
fast-deep-equal: 3.1.3
fast-uri: 3.1.5
fast-uri: 3.1.7
json-schema-traverse: 1.0.0
require-from-string: 2.0.2
@@ -9994,7 +9994,7 @@ snapshots:
base64-js@1.5.1: {}
baseline-browser-mapping@2.10.27: {}
baseline-browser-mapping@2.11.21: {}
bcrypt-pbkdf@1.0.2:
dependencies:
@@ -10014,7 +10014,7 @@ snapshots:
http-errors: 2.0.1
iconv-lite: 0.7.2
on-finished: 2.4.1
qs: 6.15.2
qs: 6.16.0
raw-body: 3.0.2
type-is: 2.1.0
transitivePeerDependencies:
@@ -10040,13 +10040,13 @@ snapshots:
dependencies:
fill-range: 7.1.1
browserslist@4.28.2:
browserslist@4.28.9:
dependencies:
baseline-browser-mapping: 2.10.27
caniuse-lite: 1.0.30001791
electron-to-chromium: 1.5.351
node-releases: 2.0.38
update-browserslist-db: 1.2.3(browserslist@4.28.2)
baseline-browser-mapping: 2.11.21
caniuse-lite: 1.0.30001810
electron-to-chromium: 1.5.422
node-releases: 2.0.54
update-browserslist-db: 1.3.2(browserslist@4.28.9)
buffer-from@1.1.2: {}
@@ -10119,7 +10119,7 @@ snapshots:
camelcase@5.3.1: {}
caniuse-lite@1.0.30001791: {}
caniuse-lite@1.0.30001810: {}
ccount@2.0.1: {}
@@ -10573,7 +10573,7 @@ snapshots:
dom-accessibility-api@0.6.3: {}
dompurify@3.4.13:
dompurify@3.4.14:
optionalDependencies:
'@types/trusted-types': 2.0.7
@@ -10647,7 +10647,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
electron-to-chromium@1.5.351: {}
electron-to-chromium@1.5.422: {}
electron-updater@6.8.9(supports-color@7.2.0):
dependencies:
@@ -10688,7 +10688,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
electron@43.4.1(supports-color@7.2.0):
electron@43.6.0(supports-color@7.2.0):
dependencies:
'@electron-internal/extract-zip': 1.0.4
'@electron/get': 5.0.0(supports-color@7.2.0)
@@ -10862,7 +10862,7 @@ snapshots:
exponential-backoff@3.1.3: {}
express-rate-limit@8.5.2(express@5.2.1(supports-color@7.2.0)):
express-rate-limit@8.5.2(express@5.2.1):
dependencies:
express: 5.2.1(supports-color@7.2.0)
ip-address: 10.4.0
@@ -10889,7 +10889,7 @@ snapshots:
once: 1.4.0
parseurl: 1.3.3
proxy-addr: 2.0.7
qs: 6.15.2
qs: 6.16.0
range-parser: 1.2.1
router: 2.2.0(supports-color@7.2.0)
send: 1.2.1(supports-color@7.2.0)
@@ -10922,7 +10922,7 @@ snapshots:
dependencies:
fast-string-truncated-width: 3.0.3
fast-uri@3.1.5: {}
fast-uri@3.1.7: {}
fast-wrap-ansi@0.2.2:
dependencies:
@@ -11299,9 +11299,7 @@ snapshots:
dependencies:
lru-cache: 6.0.0
html-parse-stringify@3.0.1:
dependencies:
void-elements: 3.1.0
html-parse-stringify@4.0.1: {}
html-to-image@1.11.13: {}
@@ -11361,7 +11359,7 @@ snapshots:
minimatch: 10.2.5
ora: 9.4.0
react: 19.2.8
react-i18next: 17.0.8(i18next@26.3.1(typescript@7.0.2))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(typescript@7.0.2)
react-i18next: 17.0.13(i18next@26.3.1(typescript@7.0.2))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(typescript@7.0.2)
yaml: 2.9.0
transitivePeerDependencies:
- '@swc/helpers'
@@ -11929,7 +11927,7 @@ snapshots:
d3-sankey: 0.12.3
dagre-d3-es: 7.0.14
dayjs: 1.11.23
dompurify: 3.4.13
dompurify: 3.4.14
es-toolkit: 1.46.1
fastdom: 1.0.12
katex: 0.16.47
@@ -12214,7 +12212,7 @@ snapshots:
monaco-editor@0.55.1:
dependencies:
dompurify: 3.4.13
dompurify: 3.4.14
marked: 14.0.0
ms@2.1.3: {}
@@ -12250,7 +12248,7 @@ snapshots:
nan@2.26.2:
optional: true
nanoid@3.3.17: {}
nanoid@3.3.18: {}
negotiator@1.0.0: {}
@@ -12289,7 +12287,7 @@ snapshots:
dependencies:
node-addon-api: 7.1.1
node-releases@2.0.38: {}
node-releases@2.0.54: {}
nopt@9.0.0:
dependencies:
@@ -12575,7 +12573,7 @@ snapshots:
plist@3.1.0:
dependencies:
'@xmldom/xmldom': 0.8.13
'@xmldom/xmldom': 0.8.15
base64-js: 1.5.1
xmlbuilder: 15.1.1
@@ -12590,14 +12588,14 @@ snapshots:
path-data-parser: 0.1.0
points-on-curve: 0.2.0
postcss-selector-parser@7.1.1:
postcss-selector-parser@7.1.6:
dependencies:
cssesc: 3.0.0
util-deprecate: 1.0.2
postcss@8.5.25:
dependencies:
nanoid: 3.3.17
nanoid: 3.3.18
picocolors: 1.1.1
source-map-js: 1.2.1
@@ -12743,9 +12741,10 @@ snapshots:
pngjs: 5.0.0
yargs: 15.4.1
qs@6.15.2:
qs@6.16.0:
dependencies:
side-channel: 1.1.0
es-define-property: 1.0.1
side-channel: 1.1.1
queue-microtask@1.2.3: {}
@@ -12840,10 +12839,10 @@ snapshots:
optionalDependencies:
react: 19.2.8
react-i18next@17.0.8(i18next@26.3.1(typescript@7.0.2))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(typescript@7.0.2):
react-i18next@17.0.13(i18next@26.3.1(typescript@7.0.2))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(typescript@7.0.2):
dependencies:
'@babel/runtime': 7.29.7
html-parse-stringify: 3.0.1
html-parse-stringify: 4.0.1
i18next: 26.3.1(typescript@7.0.2)
react: 19.2.8
use-sync-external-store: 1.6.0(react@19.2.8)
@@ -13222,7 +13221,7 @@ snapshots:
'@dotenvx/dotenvx': 1.66.0
'@modelcontextprotocol/sdk': 1.30.0(zod@3.25.76)
'@types/validate-npm-package-name': 4.0.2
browserslist: 4.28.2
browserslist: 4.28.9
commander: 14.0.3
cosmiconfig: 9.0.1(typescript@7.0.2)
dedent: 1.7.2
@@ -13236,7 +13235,7 @@ snapshots:
open: 11.0.0
ora: 8.2.0
postcss: 8.5.25
postcss-selector-parser: 7.1.1
postcss-selector-parser: 7.1.6
prompts: 2.4.2
recast: 0.23.11
stringify-object: 5.0.0
@@ -13296,7 +13295,7 @@ snapshots:
object-inspect: 1.13.4
side-channel-map: 1.0.1
side-channel@1.1.0:
side-channel@1.1.1:
dependencies:
es-errors: 1.3.0
object-inspect: 1.13.4
@@ -13668,9 +13667,9 @@ snapshots:
graceful-fs: 4.2.11
node-int64: 0.4.0
update-browserslist-db@1.2.3(browserslist@4.28.2):
update-browserslist-db@1.3.2(browserslist@4.28.9):
dependencies:
browserslist: 4.28.2
browserslist: 4.28.9
escalade: 3.2.0
picocolors: 1.1.1
@@ -13747,8 +13746,6 @@ snapshots:
transitivePeerDependencies:
- msw
void-elements@3.1.0: {}
vscode-oniguruma@2.0.1: {}
vscode-textmate@9.3.2: {}
pnpm-workspace.yaml
+1 -1
View File
@@ -52,7 +52,7 @@ allowBuilds:
windows-native-registry: false
overrides:
monaco-editor>dompurify: 3.4.13
monaco-editor>dompurify: 3.4.14
patchedDependencies:
node-pty@1.1.0: config/patches/node-pty@1.1.0.patch
skill-guides/orchestration.md
+2 -2
View File
@@ -137,8 +137,8 @@ After three consecutive empty waits, stop waiting blindly and enumerate with
`ORCA orchestration worker-list --include-remote --json` (defaults to the bound
Run; `--run <run_id>` overrides; the receipt's `scope` names which), acting on
each row's `projection.attention` categories, `projection.attention.requiresAction`, and literal `projection.nextAction` argv.
An `inspect` `nextAction` on a `live` row with `attention.requiresAction` false
is informational, not a command to re-run: keep waiting with `check --wait`.
A `none` `nextAction` has no argv to run: read `liveness.reason` and keep waiting
with `check --wait`. Absence never earns an argv; settlement and pending work still do.
Leave the wait only on positive proof the agent stopped: `exited` liveness, the
worker's own observation of process exit, or a transcript whose final agent turn
sent no `worker_done`. Then load `references/recovery-and-cleanup.md` and choose
src/cli/bundled-skill-guides.ts
+2 -2
View File
File diff suppressed because one or more lines are too long
src/main/agent-hooks/hook-stdin-contract.ts
+23 -6
View File
@@ -74,21 +74,38 @@ export const WINDOWS_HOOK_STDIN_DRAIN_LABEL = 'orca_agent_hook_drain_stdin'
export const WINDOWS_HOOK_STDIN_READER = '"%SystemRoot%\\System32\\more.com"'
export const WINDOWS_HOOK_STDIN_DRAIN_COMMAND = `${WINDOWS_HOOK_STDIN_READER} >nul 2>nul`
// The Orca context a hook needs before it may own stdin; see the rule below.
const WINDOWS_HOOK_ENVIRONMENT_VARS = [
'ORCA_AGENT_HOOK_PORT',
'ORCA_AGENT_HOOK_TOKEN',
'ORCA_PANE_KEY'
] as const
// Why (#11549): missing Orca context means the hook ran outside an Orca pane, where the caller
// may abandon stdin rather than close it — a read-to-EOF then blocks forever and strands a
// visible window per hook event. The Windows rule: a hook must check the Orca env before it
// owns stdin, and exit without reading when the env is missing — the payload is discarded on
// that path anyway. This applies to .cmd, the copilot .ps1, and the Git Bash kimi .sh alike.
// that path anyway. This applies to .cmd, the copilot .ps1, and the Git Bash kimi .sh alike,
// and to the launchers that own stdin themselves when the managed script is missing.
// POSIX hooks keep capture-first: their callers close stdin, and exiting mid-write there
// surfaces as EPIPE the agent can see (#8110).
export function buildWindowsHookEnvironmentGuardLines(): string[] {
return [
'if "%ORCA_AGENT_HOOK_PORT%"=="" exit /b 0',
'if "%ORCA_AGENT_HOOK_TOKEN%"=="" exit /b 0',
'if "%ORCA_PANE_KEY%"=="" exit /b 0'
]
return WINDOWS_HOOK_ENVIRONMENT_VARS.map((name) => `if "%${name}%"=="" exit /b 0`)
}
/** The same guard in sh, for the Git Bash hooks and launchers that run on Windows.
* Default-formed because a static hook precheck (Grok) rejects a bare reference it
* cannot resolve. POSIX hosts keep capture-first — this is the Windows rule only. */
export const WINDOWS_GIT_BASH_HOOK_ENVIRONMENT_GUARD = `if ${WINDOWS_HOOK_ENVIRONMENT_VARS.map(
(name) => `[ -z "\${${name}-}" ]`
).join(' || ')}; then exit 0; fi`
/** The same guard for a PowerShell hook or launcher. Anything that reaches
* `[Console]::In.ReadToEnd()` must run this first, or it inherits #11549. */
export const WINDOWS_POWERSHELL_HOOK_ENVIRONMENT_GUARD = `if (${WINDOWS_HOOK_ENVIRONMENT_VARS.map(
(name) => `-not $env:${name}`
).join(' -or ')}) { exit 0 }`
export function buildWindowsHookStdinDrainEpilogue(): string[] {
return [`:${WINDOWS_HOOK_STDIN_DRAIN_LABEL}`, WINDOWS_HOOK_STDIN_DRAIN_COMMAND, 'exit /b 0']
}
src/main/agent-hooks/installer-utils.test.ts
+24 -10
View File
@@ -31,7 +31,10 @@ import {
type HooksConfig
} from './installer-utils'
import { buildPosixAgentHookPostCommand } from './hook-post-command'
import { POSIX_HOOK_STDIN_DRAIN_COMMAND } from './hook-stdin-contract'
import {
POSIX_HOOK_STDIN_DRAIN_COMMAND,
WINDOWS_POWERSHELL_HOOK_ENVIRONMENT_GUARD
} from './hook-stdin-contract'
import { wrapRuntimeHomeHookCommand } from './runtime-home-hook-command'
let tmpDir: string
@@ -618,7 +621,10 @@ function expectedDecodedWindowsHookCommand(scriptPath: string): string {
// Why: the execution-policy bypass rides in the payload, not on the command
// line, so the launcher cannot spell the AV-blocked flag triple (#16003).
// Why: PowerShell progress CLIXML corrupts consumers that merge stderr into JSON stdout.
return `$ProgressPreference='SilentlyContinue'; try { Set-ExecutionPolicy -Scope Process -ExecutionPolicy Bypass -Force -ErrorAction SilentlyContinue } catch {}; if (Test-Path -LiteralPath ${quoted} -PathType Leaf) { & ${quoted}; exit $LASTEXITCODE }; [Console]::In.ReadToEnd() | Out-Null; exit 0`
// Why the guard is spelled by import: the launcher owns stdin on the missing-script path,
// so it obeys the shared Windows rule (#11549), and re-typing it here would let the two
// drift back apart.
return `$ProgressPreference='SilentlyContinue'; try { Set-ExecutionPolicy -Scope Process -ExecutionPolicy Bypass -Force -ErrorAction SilentlyContinue } catch {}; if (Test-Path -LiteralPath ${quoted} -PathType Leaf) { & ${quoted}; exit $LASTEXITCODE }; ${WINDOWS_POWERSHELL_HOOK_ENVIRONMENT_GUARD}; [Console]::In.ReadToEnd() | Out-Null; exit 0`
}
describe('wrapWindowsHookCommand', () => {
@@ -640,15 +646,23 @@ describe('wrapWindowsHookCommand', () => {
)
})
it('emits fallback stdout when the managed script is missing', () => {
const command = wrapWindowsHookCommand(
'C:\\hooks\\cursor-hook.cmd',
{},
{ fallbackStdout: '{"permission":"allow"}' }
)
expect(decodeWindowsHookCommand(command)).toContain(
'Write-Output \'{"permission":"allow"}\'; exit 0'
// Why the ordering matters: a gate event reads silence as deny (#2426), and outside an
// Orca pane the guard exits before the read — so an answer placed after the drain never
// reaches the agent at all when the caller abandons the pipe (#11549).
it('answers before it guards, and guards before it owns stdin', () => {
const decoded = decodeWindowsHookCommand(
wrapWindowsHookCommand(
'C:\\hooks\\cursor-hook.cmd',
{},
{ fallbackStdout: '{"permission":"allow"}' }
)
)
const answer = decoded.indexOf('Write-Output \'{"permission":"allow"}\'')
const guard = decoded.indexOf(WINDOWS_POWERSHELL_HOOK_ENVIRONMENT_GUARD)
const ownsStdin = decoded.indexOf('[Console]::In.ReadToEnd()')
expect(answer).toBeGreaterThan(-1)
expect(guard).toBeGreaterThan(answer)
expect(ownsStdin).toBeGreaterThan(guard)
})
// Why: a user profile path like `C:\Users\Jane Doe` is the regression from
src/main/agent-hooks/installer-utils.ts
+5 -1
View File
@@ -16,6 +16,7 @@ import { grantDirAcl, isPermissionError } from '../win32-utils'
import { resolveHooksJsonWritePath } from './hook-config-write-path'
import { writeRollingFileBackup } from '../rolling-file-backup'
import { wrapWindowsPowerShellEncodedCommand } from './windows-powershell-hook-launcher'
import { WINDOWS_POWERSHELL_HOOK_ENVIRONMENT_GUARD } from './hook-stdin-contract'
export type HookCommandConfig = {
type: 'command'
@@ -131,7 +132,10 @@ export function wrapWindowsHookCommand(
options.fallbackStdout === undefined
? ''
: `Write-Output ${quotePowerShellString(options.fallbackStdout)}; `
const command = `${envPrefix}if (Test-Path -LiteralPath ${quoted} -PathType Leaf) { & ${quoted}; exit $LASTEXITCODE }; [Console]::In.ReadToEnd() | Out-Null; ${fallback}exit 0`
// Why the order: answer first (a gate event reads silence as deny), then the shared
// env guard, and only then own stdin — outside an Orca pane the caller may abandon the
// pipe, and ReadToEnd would strand the launcher there forever (#11549).
const command = `${envPrefix}if (Test-Path -LiteralPath ${quoted} -PathType Leaf) { & ${quoted}; exit $LASTEXITCODE }; ${fallback}${WINDOWS_POWERSHELL_HOOK_ENVIRONMENT_GUARD}; [Console]::In.ReadToEnd() | Out-Null; exit 0`
return wrapWindowsPowerShellEncodedCommand(command)
}
src/main/agent-hooks/managed-hook-stdin-lifecycle.test.ts
+89 -12
View File
@@ -63,12 +63,26 @@ import { KimiHookService } from '../kimi/hook-service'
import { openClaudeHookService } from '../openclaude/hook-service'
import { wrapPosixHookCommand, wrapWindowsHookCommand } from './installer-utils'
import { POSIX_HOOK_STDIN_READER } from './hook-stdin-contract'
import {
POSIX_HOOK_STDIN_READER,
WINDOWS_POWERSHELL_HOOK_ENVIRONMENT_GUARD
} from './hook-stdin-contract'
import { wrapRuntimeHomeHookCommand } from './runtime-home-hook-command'
import { createAgentHookMemorySftp } from './agent-hook-memory-sftp.test-fixture'
import { findGitBash } from './windows-git-bash-path.test-fixture'
/** The launchers ship their command base64'd; assert the shape they actually run. */
function decodeEncodedPowerShellCommand(command: string): string {
const encoded = command.match(/-EncodedCommand\s+(\S+)/)
expect(encoded, 'launcher carries an encoded command').not.toBeNull()
return Buffer.from(encoded![1], 'base64').toString('utf16le')
}
const REMOTE_HOME = '/home/dev'
// Why all three: Windows reports a write to a pipe whose reader is gone as any of these,
// depending on whether the read handle, the pipe, or the process went first. Enumerating
// them keeps the guard-exit legs from failing on which race the host happened to run.
const WRITER_BROKEN_BY_EARLY_EXIT = ['EPIPE', 'ECONNRESET', 'EOF']
const LARGE_PAYLOAD = Buffer.alloc(1_000_000, 'x')
// Why: a developer box may set HKCU\...\Command Processor\AutoRun, which cmd.exe runs before any
@@ -156,7 +170,10 @@ type HookRun = {
function runHookProcess(
executable: string,
args: string[],
env: NodeJS.ProcessEnv
env: NodeJS.ProcessEnv,
// Why: `abandon` leaves the pipe open and unwritten — the shape a caller outside an Orca
// pane produces, and the only one that can catch a read-to-EOF that never returns (#11549).
stdin: 'close' | 'abandon' = 'close'
): Promise<HookRun> {
return new Promise((resolve, reject) => {
const child = spawn(executable, args, { env, stdio: ['pipe', 'pipe', 'pipe'] })
@@ -164,8 +181,9 @@ function runHookProcess(
let stderr = ''
let stdout = ''
const timeout = setTimeout(() => {
child.stdin.destroy()
child.kill('SIGKILL')
reject(new Error('hook did not finish after stdin closed'))
reject(new Error(`hook did not finish with stdin ${stdin}d`))
}, 10_000)
child.on('error', (error) => {
clearTimeout(timeout)
@@ -182,7 +200,9 @@ function runHookProcess(
clearTimeout(timeout)
resolve({ exitCode, stdinErrors, stderr, stdout })
})
child.stdin.end(LARGE_PAYLOAD)
if (stdin === 'close') {
child.stdin.end(LARGE_PAYLOAD)
}
})
}
@@ -303,6 +323,31 @@ describe('Windows managed hook stdin structure', () => {
expect(copilot.indexOf('if (-not $env:ORCA_AGENT_HOOK_PORT')).toBeLessThan(
copilot.indexOf('[Console]::In.ReadToEnd()')
)
// Why: the two encoded-PowerShell launchers own stdin themselves when the managed
// script is missing, so the same guard has to precede their ReadToEnd — and the
// fallback answer has to precede the guard, or a gate event outside a pane is
// answered with silence, which reads as deny (#2426/#15462).
for (const [name, command] of [
[
'wrapWindowsHookCommand',
wrapWindowsHookCommand('C:\\missing\\orca-hook.cmd', {}, { fallbackStdout: '{}' })
],
[
'wrapRuntimeHomeHookCommand',
wrapRuntimeHomeHookCommand('missing-orca-hook', { neutralJsonWhenMissing: true })
]
] as const) {
const decoded = decodeEncodedPowerShellCommand(command)
expect(decoded, `${name} decoded`).toContain(WINDOWS_POWERSHELL_HOOK_ENVIRONMENT_GUARD)
expect(decoded.indexOf("Write-Output '{}'"), `${name} answers first`).toBeLessThan(
decoded.indexOf(WINDOWS_POWERSHELL_HOOK_ENVIRONMENT_GUARD)
)
expect(
decoded.indexOf(WINDOWS_POWERSHELL_HOOK_ENVIRONMENT_GUARD),
`${name} guards before owning stdin`
).toBeLessThan(decoded.indexOf('[Console]::In.ReadToEnd()'))
}
const kimi = readFileSync(join(hooksDir, 'kimi-hook.sh'), 'utf8')
expect(kimi.indexOf('if [ -z "$ORCA_AGENT_HOOK_PORT" ]')).toBeGreaterThan(-1)
expect(kimi.indexOf('if [ -z "$ORCA_AGENT_HOOK_PORT" ]')).toBeLessThan(
@@ -365,12 +410,11 @@ describe('Windows managed hook stdin structure', () => {
const result = await runHookProcess(executable, args, hookEnvironment())
expect(result.exitCode, `${fileName} exit code`).toBe(0)
// Why (#11549 class): every Windows-local hook exits before owning stdin when the
// Orca env is missing, so the writer may break — EPIPE, or ECONNRESET when Windows
// tears the pipe down first. hookEnvironment() strips every ORCA_* var, so this
// relaxation only ever covers the missing-env path — a happy-path case added to
// this loop must not reuse it.
// Orca env is missing, so the writer may break. hookEnvironment() strips every
// ORCA_* var, so this relaxation only ever covers the missing-env path — a
// happy-path case added to this loop must not reuse it.
for (const error of result.stdinErrors) {
expect(['EPIPE', 'ECONNRESET'], `${fileName} stdin error`).toContain(error.code)
expect(WRITER_BROKEN_BY_EARLY_EXIT, `${fileName} stdin error`).toContain(error.code)
}
}
@@ -395,9 +439,42 @@ describe('Windows managed hook stdin structure', () => {
}
]
for (const launcher of launcherCases) {
const result = await runHookProcess(launcher.executable, launcher.args, hookEnvironment())
expect(result.exitCode, `${launcher.name} exit code`).toBe(0)
expect(result.stdinErrors, `${launcher.name} stdin errors`).toHaveLength(0)
// Why (#11549 class): a launcher that reaches an interpreter owns stdin for a
// missing script exactly like a managed script does, so it obeys the same rule —
// drain inside a pane, exit before reading outside one. Its writer may therefore
// break on the missing-env leg, and must not on the in-pane leg.
const outside = await runHookProcess(
launcher.executable,
launcher.args,
hookEnvironment()
)
expect(outside.exitCode, `${launcher.name} exit code`).toBe(0)
for (const error of outside.stdinErrors) {
expect(WRITER_BROKEN_BY_EARLY_EXIT, `${launcher.name} stdin error`).toContain(
error.code
)
}
const insideAPane = await runHookProcess(
launcher.executable,
launcher.args,
hookEnvironment({
ORCA_AGENT_HOOK_PORT: '59999',
ORCA_AGENT_HOOK_TOKEN: 'token',
ORCA_PANE_KEY: 'tab:leaf'
})
)
expect(insideAPane.exitCode, `${launcher.name} in-pane exit code`).toBe(0)
expect(insideAPane.stdinErrors, `${launcher.name} in-pane stdin errors`).toHaveLength(0)
// Why this leg and not a shape assertion: an unguarded ReadToEnd exits fine when
// the writer closes the pipe. Only a caller that abandons it strands the launcher,
// which is what left a console per hook event on the reporting hosts.
const abandoned = await runHookProcess(
launcher.executable,
launcher.args,
hookEnvironment(),
'abandon'
)
expect(abandoned.exitCode, `${launcher.name} abandoned-stdin exit code`).toBe(0)
}
} finally {
homedirMock.mockImplementation(() => process.env.HOME ?? tmpdir())
src/main/agent-hooks/runtime-home-hook-command.ts
+24 -6
View File
@@ -1,4 +1,8 @@
import { POSIX_HOOK_STDIN_DRAIN_COMMAND } from './hook-stdin-contract'
import {
POSIX_HOOK_STDIN_DRAIN_COMMAND,
WINDOWS_GIT_BASH_HOOK_ENVIRONMENT_GUARD,
WINDOWS_POWERSHELL_HOOK_ENVIRONMENT_GUARD
} from './hook-stdin-contract'
import {
encodeWindowsPowerShellHookCommand,
WINDOWS_POWERSHELL_HOOK_SWITCHES
@@ -19,16 +23,30 @@ export function wrapRuntimeHomeHookCommand(
const windowsScript = `"\${HOME-}/.orca/agent-hooks/${scriptBaseName}.cmd"`
const posixScript = `"\${HOME-}/.orca/agent-hooks/${scriptBaseName}.sh"`
const drain = POSIX_HOOK_STDIN_DRAIN_COMMAND
const missingScriptFallback = options.neutralJsonWhenMissing ? `${drain}; printf '{}\\n'` : drain
const neutralJson = options.neutralJsonWhenMissing ? `printf '{}\\n'` : ''
// Why two forms: the missing-script fallback owns stdin, so it follows the rule of the host
// it lands on. POSIX callers close the pipe, so capture-first is safe there and a mid-write
// exit stays visible as EPIPE (#8110). A Windows caller may abandon the pipe, so there the
// answer comes first and the drain only runs with an Orca env behind it (#11549).
const posixMissingScriptFallback = neutralJson ? `${drain}; ${neutralJson}` : drain
const windowsMissingScriptFallback = [
...(neutralJson ? [neutralJson] : []),
WINDOWS_GIT_BASH_HOOK_ENVIRONMENT_GUARD,
drain
].join('; ')
// Why platform-selected even when HOME is unset: which stdin rule applies follows the
// caller, not the reason the script could not be found.
const missingScriptFallback = `case "\${OSTYPE-}" in msys*|cygwin*|win32*) ${windowsMissingScriptFallback} ;; *) ${posixMissingScriptFallback} ;; esac`
const powershell = '"${SYSTEMROOT-}/System32/WindowsPowerShell/v1.0/powershell.exe"'
const powershellFallback = options.neutralJsonWhenMissing ? "; Write-Output '{}'" : ''
const powershellCommand = `$homePath = $env:HOME -replace '^/([A-Za-z])/', '$1:/'; $scriptPath = Join-Path $homePath '.orca\\agent-hooks\\${scriptBaseName}.cmd'; if (Test-Path -LiteralPath $scriptPath -PathType Leaf) { & $scriptPath; exit $LASTEXITCODE }; [Console]::In.ReadToEnd() | Out-Null${powershellFallback}; exit 0`
// Why the order: answer first, then the shared env guard, then own stdin — see wrapWindowsHookCommand.
const powershellCommand = `$homePath = $env:HOME -replace '^/([A-Za-z])/', '$1:/'; $scriptPath = Join-Path $homePath '.orca\\agent-hooks\\${scriptBaseName}.cmd'; if (Test-Path -LiteralPath $scriptPath -PathType Leaf) { & $scriptPath; exit $LASTEXITCODE }${powershellFallback}; ${WINDOWS_POWERSHELL_HOOK_ENVIRONMENT_GUARD}; [Console]::In.ReadToEnd() | Out-Null; exit 0`
const encodedCommand = encodeWindowsPowerShellHookCommand(powershellCommand)
// Why: the Git Bash and native Windows launchers must spell the same switches — window suppression (#14815) and an AV verdict on the shape (#16003) both hit either path.
const powershellInvocation = `${powershell} ${WINDOWS_POWERSHELL_HOOK_SWITCHES} -EncodedCommand ${encodedCommand}`
const encodedWindowsBranch = `if [ -f ${powershell} ]; then ${powershellInvocation}; else ${missingScriptFallback}; fi`
const windowsBranch = `if [ -f ${windowsScript} ]; then case "\${HOME-}" in ${WINDOWS_GIT_BASH_RUNTIME_HOME_UNSAFE}) ${encodedWindowsBranch} ;; *) ${windowsScript} ;; esac; else ${missingScriptFallback}; fi`
const posixBranch = `if [ -f ${posixScript} ] && [ -r ${posixScript} ] && [ -x ${posixScript} ]; then /bin/sh ${posixScript}; else ${missingScriptFallback}; fi`
const encodedWindowsBranch = `if [ -f ${powershell} ]; then ${powershellInvocation}; else ${windowsMissingScriptFallback}; fi`
const windowsBranch = `if [ -f ${windowsScript} ]; then case "\${HOME-}" in ${WINDOWS_GIT_BASH_RUNTIME_HOME_UNSAFE}) ${encodedWindowsBranch} ;; *) ${windowsScript} ;; esac; else ${windowsMissingScriptFallback}; fi`
const posixBranch = `if [ -f ${posixScript} ] && [ -r ${posixScript} ] && [ -x ${posixScript} ]; then /bin/sh ${posixScript}; else ${posixMissingScriptFallback}; fi`
// Why: OSTYPE is shell-owned, so platform selection adds no process to every hook invocation.
return `if [ -z "\${HOME-}" ]; then ${missingScriptFallback}; else case "\${OSTYPE-}" in msys*|cygwin*|win32*) ${windowsBranch} ;; *) ${posixBranch} ;; esac; fi`
}
src/main/antigravity/hook-script.ts
+6 -3
View File
@@ -88,7 +88,10 @@ export function getManagedScript(target: 'local' | 'posix' = 'local'): string {
export function getWindowsWrapperScript(eventName: string): string {
return [
'@echo off',
'setlocal',
// Why (#9358/#9941): `!` is legal in the hooks path, and inherited delayed expansion
// eats it out of the percent-expanded `%~dp0` — the wrapper then misses the core and
// silently falls back on every event. Same reason the core disables it.
'setlocal DisableDelayedExpansion',
`set "ORCA_ANTIGRAVITY_EVENT=${eventName}"`,
'set "ORCA_ANTIGRAVITY_CORE=%~dp0antigravity-hook.cmd"',
'if exist "%ORCA_ANTIGRAVITY_CORE%" (',
@@ -102,8 +105,8 @@ export function getWindowsWrapperScript(eventName: string): string {
') else (',
' echo {}',
')',
// Why: when the shared core script is missing, this wrapper becomes the
// stdin owner and must finish the agent's payload write before returning.
// Missing-core fallbacks obey the same outside-Orca stdin guard as the core.
...buildWindowsHookEnvironmentGuardLines(),
WINDOWS_HOOK_STDIN_DRAIN_COMMAND,
'exit /b 0',
''
src/main/antigravity/windows-hook-payload-delivery.test.ts
+129 -31
View File
@@ -28,7 +28,8 @@ vi.mock('os', async (importOriginal) => {
import { AntigravityHookService } from './hook-service'
import { ANTIGRAVITY_EVENTS, ANTIGRAVITY_PRE_TOOL_USE_DECISION } from './hook-events'
import { getManagedScript } from './hook-script'
import { getManagedScript, getWindowsWrapperScript } from './hook-script'
import { WINDOWS_HOOK_STDIN_DRAIN_COMMAND } from '../agent-hooks/hook-stdin-contract'
// Why (#9358/#9941): `!` is legal in a Windows path and in a pane key. Under inherited
// delayed expansion cmd eats it out of a percent-expanded curl argument, so bake one into
@@ -91,17 +92,23 @@ async function startHookListener(): Promise<{
type HookRun = { exitCode: number | null; stdout: string; stderr: string; timedOut: boolean }
// Why spell `/v`: `cmd /d /c <bare .cmd path>` is the chain in the bug report's process trace,
// and it inherits HKCU\...\Command Processor\DelayedExpansion. Naming the state makes the
// hostile half reachable on any host — under `/v:on` cmd eats `!` out of every percent
// expansion (#9358/#9941), and a harness pinned to `/v:off` could never fail on it.
type DelayedExpansion = 'on' | 'off'
const DELAYED_EXPANSION_STATES = ['off', 'on'] as const satisfies readonly DelayedExpansion[]
function runWrapper(
wrapperPath: string,
env: NodeJS.ProcessEnv,
// Why: `null` abandons stdin instead of closing it — the shape a caller outside an Orca
// pane produces, and the only way to prove the env guard exits before reading (#11549).
stdinPayload: string | null = PAYLOAD
stdinPayload: string | null = PAYLOAD,
delayedExpansion: DelayedExpansion = 'off'
): Promise<HookRun> {
return new Promise((resolve, reject) => {
// Why: mirror how Antigravity spawns the hook — `cmd /c <bare .cmd path>`, the exact
// chain in the bug report's process trace.
const child = spawn('cmd.exe', ['/d', '/c', wrapperPath], {
const child = spawn('cmd.exe', [`/v:${delayedExpansion}`, '/d', '/c', wrapperPath], {
stdio: ['pipe', 'pipe', 'pipe'],
windowsHide: true,
env
@@ -111,6 +118,7 @@ function runWrapper(
let timedOut = false
const timer = setTimeout(() => {
timedOut = true
child.stdin.destroy()
child.kill('SIGKILL')
}, 15_000)
child.on('error', (error) => {
@@ -154,6 +162,24 @@ function expectedStdout(eventName: string): string {
// Why: runs on every platform — the live delivery suite below is Windows-only, so this
// keeps a POSIX-only CI leg from letting the interpreter back into the hot path.
describe('Antigravity Windows hook post command', () => {
it.each(ANTIGRAVITY_EVENTS)('guards missing-core stdin for $eventName', ({ eventName }) => {
const script = getWindowsWrapperScript(eventName)
const drain = script.indexOf(WINDOWS_HOOK_STDIN_DRAIN_COMMAND)
const answer = script.lastIndexOf('echo {}')
expect(drain).toBeGreaterThan(answer)
for (const key of ['ORCA_AGENT_HOOK_PORT', 'ORCA_AGENT_HOOK_TOKEN', 'ORCA_PANE_KEY']) {
const guard = script.indexOf(`if "%${key}%"=="" exit /b 0`)
expect(guard, key).toBeGreaterThan(answer)
expect(guard, key).toBeLessThan(drain)
}
})
// Why (#9358/#9941): `%~dp0` carries the hooks path, so an inherited delayed expansion eats
// a `!` out of it and the wrapper silently misses the core on every event.
it.each(ANTIGRAVITY_EVENTS)('disables delayed expansion for $eventName', ({ eventName }) => {
expect(getWindowsWrapperScript(eventName)).toContain('setlocal DisableDelayedExpansion')
})
it('posts through curl.exe rather than a PowerShell interpreter', () => {
vi.spyOn(process, 'platform', 'get').mockReturnValue('win32')
const script = getManagedScript('local')
@@ -185,7 +211,10 @@ describe.skipIf(process.platform !== 'win32')('Antigravity Windows hook payload
})
it('delivers every event wrapper payload to the listener without spawning PowerShell', async () => {
home = mkdtempSync(join(tmpdir(), 'orca-antigravity-hook-'))
// Why the `!` in the directory: it lands in the wrapper's `%~dp0`, which is what an
// inherited delayed expansion eats (#9358/#9941). Without it the `/v:on` leg below
// proves nothing about the core lookup.
home = mkdtempSync(join(tmpdir(), 'orca-antigravity-hook!bang-'))
homedirMock.mockReturnValue(home)
expect(new AntigravityHookService().install().state).toBe('installed')
@@ -204,34 +233,42 @@ describe.skipIf(process.platform !== 'win32')('Antigravity Windows hook payload
ORCA_WORKTREE_ID: WORKTREE_ID
})
for (const event of ANTIGRAVITY_EVENTS) {
const label = event.eventName
const before = listener.posts.length
const result = await runWrapper(join(hooksDir, event.windowsWrapperFileName), env)
for (const delayedExpansion of DELAYED_EXPANSION_STATES) {
for (const event of ANTIGRAVITY_EVENTS) {
const label = `${event.eventName} (/v:${delayedExpansion})`
const before = listener.posts.length
const result = await runWrapper(
join(hooksDir, event.windowsWrapperFileName),
env,
PAYLOAD,
delayedExpansion
)
expect(result.timedOut, `${label} timed out`).toBe(false)
expect(result.exitCode, `${label} exit code`).toBe(0)
expect(result.stderr, `${label} stderr`).toBe('')
// Why: Antigravity reads silence on PreToolUse as deny (#2426), so the gate answer
// must survive the transport change.
expect(result.stdout.trim(), `${label} stdout`).toBe(expectedStdout(label))
expect(result.timedOut, `${label} timed out`).toBe(false)
expect(result.exitCode, `${label} exit code`).toBe(0)
expect(result.stderr, `${label} stderr`).toBe('')
// Why: Antigravity reads silence on PreToolUse as deny (#2426), so the gate answer
// must survive the transport change.
expect(result.stdout.trim(), `${label} stdout`).toBe(expectedStdout(event.eventName))
const posts = listener.posts.slice(before)
expect(posts, `${label} posted exactly one hook`).toHaveLength(1)
// Why: byte-exact, not "non-empty" — PowerShell recoded this body through the console
// code page, and a silently corrupted payload still looks posted.
expect(posts[0].payload, `${label} payload`).toBe(PAYLOAD)
expect(posts[0].hookEventName, `${label} hook_event_name`).toBe(label)
// Why: the `!` in both values is the delayed-expansion regression guard.
expect(posts[0].paneKey, `${label} paneKey`).toBe(PANE_KEY)
expect(posts[0].worktreeId, `${label} worktreeId`).toBe(WORKTREE_ID)
expect(posts[0].token, `${label} token`).toBe(HOOK_TOKEN)
expect(posts[0].contentType, `${label} content-type`).toContain(
'application/x-www-form-urlencoded'
)
const posts = listener.posts.slice(before)
expect(posts, `${label} posted exactly one hook`).toHaveLength(1)
// Why: byte-exact, not "non-empty" — PowerShell recoded this body through the console
// code page, and a silently corrupted payload still looks posted.
expect(posts[0].payload, `${label} payload`).toBe(PAYLOAD)
expect(posts[0].hookEventName, `${label} hook_event_name`).toBe(event.eventName)
// Why: the `!` in both values is the delayed-expansion regression guard — it is the
// `/v:on` leg that can actually fail on it.
expect(posts[0].paneKey, `${label} paneKey`).toBe(PANE_KEY)
expect(posts[0].worktreeId, `${label} worktreeId`).toBe(WORKTREE_ID)
expect(posts[0].token, `${label} token`).toBe(HOOK_TOKEN)
expect(posts[0].contentType, `${label} content-type`).toContain(
'application/x-www-form-urlencoded'
)
}
}
// Why: five wrapper launches plus a real install can overrun the default under load.
}, 60_000)
// Why: ten wrapper launches plus a real install can overrun the default under load.
}, 90_000)
// Why (#15117): Antigravity fires some events with no stdin at all. PowerShell substituted
// `{}` before posting; curl forwards the empty body, so prove the post still happens — the
@@ -264,6 +301,67 @@ describe.skipIf(process.platform !== 'win32')('Antigravity Windows hook payload
expect(listener.posts[0].hookEventName).toBe('PreInvocation')
}, 30_000)
// Why a helper: the missing-core cases all need a real install with the core removed, which
// is the shape an AV quarantine or a half-finished uninstall leaves behind.
async function installWithoutCore(): Promise<string> {
home = mkdtempSync(join(tmpdir(), 'orca-antigravity-fallback-'))
homedirMock.mockReturnValue(home)
expect(new AntigravityHookService().install().state).toBe('installed')
const hooksDir = join(home, '.orca', 'agent-hooks')
rmSync(join(hooksDir, 'antigravity-hook.cmd'))
return hooksDir
}
it.each(['ORCA_AGENT_HOOK_PORT', 'ORCA_AGENT_HOOK_TOKEN', 'ORCA_PANE_KEY'])(
'answers every missing-core event with abandoned stdin and no %s',
async (missingKey) => {
const hooksDir = await installWithoutCore()
const listener = await startHookListener()
server = listener.server
const env = hookEnvironment({
USERPROFILE: home,
HOME: home,
ORCA_AGENT_HOOK_PORT: String(listener.port),
ORCA_AGENT_HOOK_TOKEN: HOOK_TOKEN,
ORCA_PANE_KEY: PANE_KEY,
[missingKey]: ''
})
for (const event of ANTIGRAVITY_EVENTS) {
const result = await runWrapper(join(hooksDir, event.windowsWrapperFileName), env, null)
expect(result.timedOut, event.eventName).toBe(false)
expect(result.exitCode, event.eventName).toBe(0)
expect(result.stdout.trim(), event.eventName).toBe(expectedStdout(event.eventName))
expect(result.stderr, event.eventName).toBe('')
}
expect(listener.posts).toHaveLength(0)
},
90_000
)
// Why: the guard must not cost the valid path its drain — with the Orca env present the
// fallback still owns stdin, so the agent's payload write completes instead of breaking.
it('still drains a closed payload for every missing-core event inside a pane', async () => {
const hooksDir = await installWithoutCore()
const listener = await startHookListener()
server = listener.server
const env = hookEnvironment({
USERPROFILE: home,
HOME: home,
ORCA_AGENT_HOOK_PORT: String(listener.port),
ORCA_AGENT_HOOK_TOKEN: HOOK_TOKEN,
ORCA_PANE_KEY: PANE_KEY
})
for (const event of ANTIGRAVITY_EVENTS) {
const result = await runWrapper(join(hooksDir, event.windowsWrapperFileName), env)
expect(result.timedOut, event.eventName).toBe(false)
expect(result.exitCode, event.eventName).toBe(0)
expect(result.stdout.trim(), event.eventName).toBe(expectedStdout(event.eventName))
expect(result.stderr, event.eventName).toBe('')
}
// Why: the fallback answers the agent but has no core to post through.
expect(listener.posts).toHaveLength(0)
}, 60_000)
it('exits without reading stdin when the pane env is missing', async () => {
home = mkdtempSync(join(tmpdir(), 'orca-antigravity-hook-'))
homedirMock.mockReturnValue(home)
src/main/automations/external-job-mappers.ts
+6 -6
View File
@@ -71,7 +71,7 @@ function mapExternalRuns({
.map((run, index) => {
const runAt = asString(run.run_at) ?? asString(run.runAt)
const id = asString(run.id) ?? `${jobId}:${runAt ?? index}`
return {
const mapped: ExternalAutomationRun = {
id,
managerId,
provider,
@@ -83,15 +83,15 @@ function mapExternalRuns({
error: asString(run.error),
outputPath: asString(run.output_path) ?? asString(run.outputPath)
}
return { run: mapped, time: runAt ? Date.parse(runAt) : Number.NaN }
})
.sort((a, b) => {
const aTime = a.runAt ? Date.parse(a.runAt) : Number.NaN
const bTime = b.runAt ? Date.parse(b.runAt) : Number.NaN
if (Number.isFinite(aTime) && Number.isFinite(bTime)) {
return bTime - aTime
if (Number.isFinite(a.time) && Number.isFinite(b.time)) {
return b.time - a.time
}
return b.id.localeCompare(a.id)
return b.run.id.localeCompare(a.run.id)
})
.map(({ run }) => run)
}
function hermesScheduleDisplay(job: ExternalJobRecord): string {
src/main/automations/external-job-run-sorting.test.ts
+38
View File
@@ -0,0 +1,38 @@
import { expect, it, vi } from 'vitest'
import { mapHermesJobs, mapOpenClawJobs } from './external-job-mappers'
it.each([mapHermesJobs, mapOpenClawJobs])(
'parses run dates once and preserves provider fallback ordering',
(mapJobs) => {
const runs = Array.from({ length: 2000 }, (_, i) => ({
id: String(i),
run_at:
i % 137 === 0
? 'invalid'
: new Date(1700000000000 + ((i * 173) % 1999) * 1000).toISOString(),
output_content: `Output ${i}`,
status: 'completed'
}))
const parse = vi.spyOn(Date, 'parse')
let expected: typeof runs
let jobs: ReturnType<typeof mapHermesJobs>
try {
expected = [...runs].sort((a, b) => {
const left = Date.parse(a.run_at),
right = Date.parse(b.run_at)
return Number.isFinite(left) && Number.isFinite(right)
? right - left
: b.id.localeCompare(a.id)
})
expect(parse.mock.calls.length).toBeGreaterThan(10_000)
parse.mockClear()
jobs = mapJobs('manager', [{ id: 'job', runs }])
expect(parse).toHaveBeenCalledTimes(2000)
} finally {
parse.mockRestore()
}
expect(jobs[0].runs.map((run) => run.id)).toEqual(expected.map((run) => run.id))
expect(jobs[0].runs.every((run) => run.outputContent === `Output ${run.id}`)).toBe(true)
expect(jobs[0].runs.every((run) => !('time' in run))).toBe(true)
}
)
src/main/claude-usage/claude-usage-report-aggregation.ts
+3 -3
View File
@@ -1,3 +1,4 @@
import { highestUsageKey } from '../usage/highest-usage-key'
import type {
ClaudeUsageBreakdownKind,
ClaudeUsageBreakdownRow,
@@ -56,9 +57,8 @@ export function buildSummary(
}
}
const topModel = [...byModel.entries()].sort((left, right) => right[1] - left[1])[0]?.[0] ?? null
const topProject =
[...byProject.entries()].sort((left, right) => right[1] - left[1])[0]?.[0] ?? null
const topModel = highestUsageKey(byModel)
const topProject = highestUsageKey(byProject)
return {
scope,
src/main/claude-usage/worktree-attribution-scaling.test.ts
+53
View File
@@ -0,0 +1,53 @@
import { expect, it, vi } from 'vitest'
import { attributeClaudeUsageTurns } from './worktree-attribution'
import type { ClaudeUsageParsedTurn } from './types'
vi.mock('node:fs/promises', () => ({ realpath: async (path: string) => path }))
it('resolves repeated nested and unmatched cwd paths once per attribution batch', async () => {
const lookup = new Map(
Array.from({ length: 100 }, (_, index) => [
`/repo-${String(index).padStart(3, '0')}`,
{
repoId: `repo-${index}`,
worktreeId: `wt-${index}`,
path: `/repo-${index}`,
displayName: `Repo ${index}`
}
])
)
const input: ClaudeUsageParsedTurn[] = Array.from({ length: 1000 }, (_, index) => ({
sessionId: String(index),
timestamp: '2026-09-07T00:00:00Z',
model: null,
cwd: index % 2 === 0 ? '/repo-099/nested' : '/outside',
gitBranch: null,
inputTokens: 1,
outputTokens: 1,
cacheReadTokens: 0,
cacheWriteTokens: 0,
cacheWrite1hTokens: 0
}))
const original = String.prototype.startsWith
let comparisons = 0
const spy = vi.spyOn(String.prototype, 'startsWith').mockImplementation(function (
this: string,
search: string,
position?: number
) {
if (search.slice(0, 6) === '/repo-') {
comparisons += 1
}
return original.call(this, search, position)
})
let result: Awaited<ReturnType<typeof attributeClaudeUsageTurns>>
try {
result = await attributeClaudeUsageTurns(input, lookup)
} finally {
spy.mockRestore()
}
expect(comparisons).toBeLessThanOrEqual(200)
expect(result![0].worktreeId).toBe('wt-99')
expect(result![1].worktreeId).toBeNull()
expect(result![1].projectKey).toBe('cwd:/outside')
})
src/main/claude-usage/worktree-attribution.ts
+6 -8
View File
@@ -105,7 +105,7 @@ export async function attributeClaudeUsageTurns(
worktreeLookup: Map<string, ClaudeUsageWorktreeRef>
): Promise<ClaudeUsageAttributedTurn[]> {
const attributed: ClaudeUsageAttributedTurn[] = []
const canonicalCwdByPath = new Map<string, string>()
const worktreeByCwd = new Map<string, ClaudeUsageWorktreeRef | null>()
for (const turn of turns) {
const day = localDayFromTimestamp(turn.timestamp)
@@ -119,14 +119,12 @@ export async function attributeClaudeUsageTurns(
let projectLabel = getDefaultProjectLabel(turn.cwd)
if (turn.cwd) {
let canonicalCwd = canonicalCwdByPath.get(turn.cwd)
if (canonicalCwd === undefined) {
// Why: Claude transcripts repeat the same cwd for many consecutive
// turns. Cache realpath work so attribution scales with unique paths.
canonicalCwd = await canonicalizePath(turn.cwd)
canonicalCwdByPath.set(turn.cwd, canonicalCwd)
let worktree = worktreeByCwd.get(turn.cwd)
if (worktree === undefined) {
const canonicalCwd = await canonicalizePath(turn.cwd)
worktree = findContainingWorktree(canonicalCwd, worktreeLookup)
worktreeByCwd.set(turn.cwd, worktree)
}
const worktree = findContainingWorktree(canonicalCwd, worktreeLookup)
if (worktree) {
repoId = worktree.repoId
worktreeId = worktree.worktreeId
src/main/codex-usage/codex-usage-rollup-projections.ts
+3 -3
View File
@@ -1,3 +1,4 @@
import { highestUsageKey } from '../usage/highest-usage-key'
import type {
CodexUsageBreakdownKind,
CodexUsageBreakdownRow,
@@ -57,9 +58,8 @@ export function buildSummary(
}
}
const topModel = [...byModel.entries()].sort((left, right) => right[1] - left[1])[0]?.[0] ?? null
const topProject =
[...byProject.entries()].sort((left, right) => right[1] - left[1])[0]?.[0] ?? null
const topModel = highestUsageKey(byModel)
const topProject = highestUsageKey(byProject)
return {
scope,
src/main/codex/codex-turn-ordinals.test.ts
+59
View File
@@ -0,0 +1,59 @@
import { expect, it } from 'vitest'
import {
CodexTurnOrdinals,
MAX_CODEX_TURN_ORDINAL_BYTES,
MAX_CODEX_TURN_ORDINAL_ENTRIES
} from './codex-turn-ordinals'
it('does not rescan the forgotten window for each new streamed item', () => {
const ordinals = new CodexTurnOrdinals()
for (let index = 0; index < MAX_CODEX_TURN_ORDINAL_ENTRIES; index += 1) {
ordinals.ordinalFor('thread', String(index), 'item')
ordinals.forgetTurn('thread', String(index))
}
const turns = (ordinals as unknown as { turns: Map<string, { active: boolean }> }).turns
let reads = 0
for (const turn of turns.values()) {
let active = turn.active
Object.defineProperty(turn, 'active', {
get() {
reads += 1
return active
},
set(value: boolean) {
active = value
}
})
}
for (let index = 0; index < 1000; index += 1) {
expect(ordinals.ordinalFor('thread', 'live', String(index))).toBe(index)
}
expect(reads).toBe(0)
expect(ordinals.forgottenTurnCount).toBe(MAX_CODEX_TURN_ORDINAL_ENTRIES)
})
it('retains ordinal continuity on late reactivation and evicts oldest forgotten turns', () => {
const ordinals = new CodexTurnOrdinals()
expect(ordinals.ordinalFor('t', 'first', 'a')).toBe(0)
ordinals.forgetTurn('t', 'first')
expect(ordinals.ordinalFor('t', 'first', 'b')).toBe(1)
expect(ordinals.forgottenTurnCount).toBe(0)
ordinals.forgetTurn('t', 'first')
for (let index = 0; index < MAX_CODEX_TURN_ORDINAL_ENTRIES; index += 1) {
ordinals.ordinalFor('t', String(index), 'a')
ordinals.forgetTurn('t', String(index))
}
expect(ordinals.forgottenTurnCount).toBe(MAX_CODEX_TURN_ORDINAL_ENTRIES)
expect(ordinals.ordinalFor('t', 'first', 'c')).toBe(0)
})
it('keeps byte eviction bounded for active and forgotten turns', () => {
const ordinals = new CodexTurnOrdinals()
for (let index = 0; index < 4000; index += 1) {
ordinals.ordinalFor('thread', 'live', `${index}-${'x'.repeat(240)}`)
}
expect(ordinals.bytes).toBeLessThanOrEqual(MAX_CODEX_TURN_ORDINAL_BYTES)
ordinals.forgetTurn('thread', 'live')
expect(ordinals.bytes).toBeLessThan(100)
expect(ordinals.forgottenTurnCount).toBe(1)
})
src/main/codex/codex-turn-ordinals.ts
+9 -9
View File
@@ -14,15 +14,10 @@ export class CodexTurnOrdinals {
{ assigned: Map<string, number>; next: number; active: boolean }
>()
private retainedBytes = 0
private readonly forgottenTurns = new Set<string>()
get forgottenTurnCount(): number {
let count = 0
for (const turn of this.turns.values()) {
if (!turn.active) {
count += 1
}
}
return count
return this.forgottenTurns.size
}
get bytes(): number {
@@ -48,12 +43,13 @@ export class CodexTurnOrdinals {
private trimForgotten(): void {
while (this.forgottenTurnCount > MAX_CODEX_TURN_ORDINAL_ENTRIES) {
const oldest = [...this.turns.entries()].find(([, turn]) => !turn.active)?.[0]
const oldest = this.forgottenTurns.values().next().value
if (!oldest) {
break
}
const removed = this.turns.get(oldest)
this.turns.delete(oldest)
this.forgottenTurns.delete(oldest)
if (removed) {
this.retainedBytes = Math.max(
0,
@@ -68,7 +64,7 @@ export class CodexTurnOrdinals {
private trimBytes(currentTurnKey: string): void {
this.trimForgotten()
while (this.retainedBytes > MAX_CODEX_TURN_ORDINAL_BYTES) {
const forgotten = [...this.turns.entries()].find(([, turn]) => !turn.active)?.[0]
const forgotten = this.forgottenTurns.values().next().value
const oldest = forgotten ?? this.turns.keys().next().value
if (typeof oldest !== 'string') {
break
@@ -90,6 +86,7 @@ export class CodexTurnOrdinals {
break
}
this.turns.delete(oldest)
this.forgottenTurns.delete(oldest)
this.retainedBytes = Math.max(
0,
this.retainedBytes -
@@ -112,6 +109,7 @@ export class CodexTurnOrdinals {
this.turns.set(turnKey, turn)
}
turn.active = true
this.forgottenTurns.delete(turnKey)
}
const itemKey = this.keyPart(codexItemId)
const existing = turn.assigned.get(itemKey)
@@ -136,6 +134,8 @@ export class CodexTurnOrdinals {
)
turn.assigned = new Map()
turn.active = false
this.forgottenTurns.delete(turnKey)
this.forgottenTurns.add(turnKey)
this.retainedBytes = Math.max(0, this.retainedBytes - assignedBytes)
this.turns.delete(turnKey)
this.turns.set(turnKey, turn)
src/main/copilot/copilot-managed-script.ts
+3 -2
View File
@@ -1,7 +1,8 @@
import { getSharedManagedScriptPath } from '../agent-hooks/installer-utils'
import {
buildPosixHookPayloadCapture,
buildPosixHookSpoolLines
buildPosixHookSpoolLines,
WINDOWS_POWERSHELL_HOOK_ENVIRONMENT_GUARD
} from '../agent-hooks/hook-stdin-contract'
export function getManagedScriptFileName(): string {
@@ -30,7 +31,7 @@ export function getManagedScript(target: 'local' | 'posix' = 'local'): string {
// Why (#11549 class): missing Orca context means a user-wide hook fired outside an
// Orca pane. ReadToEnd blocks forever if that caller abandons the pipe, so the guard
// must run before the hook owns stdin; the payload would be discarded anyway.
'if (-not $env:ORCA_AGENT_HOOK_PORT -or -not $env:ORCA_AGENT_HOOK_TOKEN -or -not $env:ORCA_PANE_KEY) { exit 0 }',
WINDOWS_POWERSHELL_HOOK_ENVIRONMENT_GUARD,
'$inputData = [Console]::In.ReadToEnd()',
'if ([string]::IsNullOrWhiteSpace($inputData)) { exit 0 }',
'try {',
src/main/daemon/daemon-request-router.ts
+5 -1
View File
@@ -203,7 +203,11 @@ export class DaemonRequestRouter {
await this.options.host.kill(sessionId, { immediate })
} catch (error) {
if (!(canceledPendingSpawn && error instanceof SessionNotFoundError)) {
this.options.log.log('session-kill-failed', attribution)
this.options.log.log('session-kill-failed', {
...attribution,
errorName: error instanceof Error ? error.name : typeof error,
error: error instanceof Error ? error.message : String(error)
})
throw error
}
}
src/main/daemon/daemon-server-kill-attribution.test.ts
+3 -1
View File
@@ -85,7 +85,9 @@ describe('daemon kill attribution', () => {
expect(killLog.log).toHaveBeenCalledWith('session-kill-failed', {
sessionId: 'agent-session',
immediate: true,
clientId: 'control-42'
clientId: 'control-42',
errorName: 'Error',
error: 'kill refused'
})
expect(killLog.log).not.toHaveBeenCalledWith('session-killed', expect.anything())
})
src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts
+212
View File
@@ -0,0 +1,212 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import type * as pty from 'node-pty'
import { createDaemonPtySubprocessHandle } from './pty-subprocess/subprocess-handle'
import { mockPtyProcess } from './pty-subprocess-test-harness'
import { TerminalHost } from './terminal-host'
import { HeadlessEmulator } from './headless-emulator'
import * as ptyJob from '../windows/windows-pty-job'
vi.mock('./pty-subprocess/foreground-process-tracker', () => ({
createPtyForegroundProcessTracker: () => ({
recordOutput: vi.fn(),
markDead: vi.fn(),
getForegroundProcess: () => null
})
}))
vi.mock('../pty/posix-pty-process-groups', () => ({
forceKillPosixPtyProcessGroups: (_pid: number, fallback: () => void) => fallback()
}))
vi.mock('../pty-descendant-termination', () => ({
killWithDescendantSweep: async (_pid: number, killRoot: () => void) => killRoot()
}))
function createFixture() {
const proc = {
...mockPtyProcess(4242),
destroy: vi.fn(),
pause: vi.fn(),
resume: vi.fn(),
clear: vi.fn()
}
const handle = createDaemonPtySubprocessHandle({
process: proc as unknown as pty.IPty,
shellPath: 'bash',
spawnCwd: process.cwd(),
env: {},
startupCommandDeliveredInShellArgs: false,
reportsChildExitStatus: true,
sessionId: 'io-failure',
startupAgentRecognition: null
})
return { proc, handle }
}
function failIo(fixture: ReturnType<typeof createFixture>, operation: 'write' | 'resize') {
fixture.proc[operation].mockImplementation(() => {
throw new Error('transient native I/O failure')
})
if (operation === 'write') {
fixture.handle.write('input')
} else {
fixture.handle.resize(100, 30)
}
}
afterEach(() => vi.restoreAllMocks())
describe.each(['darwin', 'linux', 'win32'] as const)('%s native-handle contract', (platform) => {
const platformDescriptor = Object.getOwnPropertyDescriptor(process, 'platform')!
beforeEach(() => Object.defineProperty(process, 'platform', { value: platform }))
afterEach(() => Object.defineProperty(process, 'platform', platformDescriptor))
describe.each(['write', 'resize'] as const)('%s failure cleanup', (operation) => {
it('suppresses repeated native I/O failures while still delivering output and exit', () => {
const fixture = createFixture()
const onData = vi.fn()
const onExit = vi.fn()
fixture.handle.onData(onData)
fixture.handle.onExit(onExit)
failIo(fixture, operation)
fixture.handle.pause?.()
fixture.handle.resume?.()
expect(fixture.proc.pause).toHaveBeenCalledOnce()
expect(fixture.proc.resume).toHaveBeenCalledOnce()
fixture.handle.write('more input')
fixture.handle.resize(120, 40)
fixture.handle.clear?.()
expect(fixture.proc[operation]).toHaveBeenCalledOnce()
for (const suppressed of ['write', 'resize', 'clear'] as const) {
if (suppressed !== operation) {
expect(fixture.proc[suppressed]).not.toHaveBeenCalled()
}
}
fixture.proc._simulateData('still running')
expect(onData).toHaveBeenCalledWith('still running')
expect(onExit).not.toHaveBeenCalled()
fixture.proc._simulateExit(7)
expect(onExit).toHaveBeenCalledOnce()
fixture.handle.dispose()
})
it('blocks reentrant termination from an exit listener after I/O failure', () => {
const fixture = createFixture()
const signal = vi.spyOn(process, 'kill').mockReturnValue(true)
const nativeKill = fixture.proc.kill
failIo(fixture, operation)
fixture.handle.onExit(() => {
fixture.handle.kill()
fixture.handle.forceKill()
fixture.handle.signal('SIGTERM')
})
fixture.proc._simulateExit(0)
expect(nativeKill).not.toHaveBeenCalled()
expect(signal).not.toHaveBeenCalled()
fixture.handle.dispose()
})
it.skipIf(platform !== 'win32')(
'preserves ConPTY single-close ownership after I/O failure',
() => {
const fixture = createFixture()
const terminateJob = vi.spyOn(ptyJob, 'terminatePtyJob').mockReturnValue('terminated')
const signal = vi.spyOn(process, 'kill').mockReturnValue(true)
failIo(fixture, operation)
fixture.handle.kill()
fixture.handle.forceKill()
fixture.proc._simulateExit(137)
fixture.handle.dispose()
expect(fixture.proc.kill).toHaveBeenCalledOnce()
expect(terminateJob).toHaveBeenCalledOnce()
expect(signal).not.toHaveBeenCalled()
expect(fixture.proc.destroy).not.toHaveBeenCalled()
}
)
it('preserves early output and exit status while fencing listener cleanup', () => {
const fixture = createFixture()
const signal = vi.spyOn(process, 'kill').mockReturnValue(true)
failIo(fixture, operation)
fixture.proc._simulateData('final output')
fixture.proc._simulateExit(7)
const delivered: string[] = []
fixture.handle.onData((data) => {
delivered.push(data)
fixture.handle.forceKill()
})
fixture.handle.onExit((code) => delivered.push(`exit:${code}`))
expect(delivered).toEqual(['final output', 'exit:7'])
expect(signal).not.toHaveBeenCalled()
fixture.handle.dispose()
})
it('keeps graceful and forced termination available until physical exit', () => {
const fixture = createFixture()
const originalKill = fixture.proc.kill
const signal = vi.spyOn(process, 'kill').mockReturnValue(true)
failIo(fixture, operation)
fixture.handle.kill()
expect(originalKill).toHaveBeenCalledOnce()
// A fresh handle exercises force-kill without Windows double-close semantics.
const forced = createFixture()
failIo(forced, operation)
forced.handle.forceKill()
expect(signal).toHaveBeenCalledWith(4242, 'SIGKILL')
forced.proc._simulateExit(137)
signal.mockClear()
forced.handle.forceKill()
forced.handle.signal('SIGTERM')
expect(signal).not.toHaveBeenCalled()
fixture.proc._simulateExit(0)
fixture.handle.dispose()
forced.handle.dispose()
})
it('reaps every session and native handle across 32 failed-I/O create/close cycles', async () => {
const emulatorDispose = vi.spyOn(HeadlessEmulator.prototype, 'dispose')
const signal = vi.spyOn(process, 'kill').mockReturnValue(true)
let fixture = createFixture()
const host = new TerminalHost({ spawnSubprocess: () => fixture.handle })
try {
for (let index = 0; index < 32; index++) {
fixture = createFixture()
const sessionId = `io-failure-${index}`
const onExit = vi.fn()
await host.createOrAttach({
sessionId,
cols: 80,
rows: 24,
streamClient: { onData: vi.fn(), onExit }
})
failIo(fixture, operation)
signal.mockClear()
const closing = host.kill(sessionId, { immediate: true })
// Capture rejection before assertions so a red run cannot leak an unhandled waiter.
const settled = closing.then(
() => null,
(error: unknown) => error ?? new Error('kill rejected')
)
let killFailure: unknown = null
try {
expect(host.listSessions()).toHaveLength(1)
expect(fixture.proc.destroy).not.toHaveBeenCalled()
expect(onExit).not.toHaveBeenCalled()
await vi.waitFor(() => expect(signal).toHaveBeenCalledWith(4242, 'SIGKILL'))
} finally {
fixture.proc._simulateExit(137)
killFailure = await settled
}
expect(killFailure).toBeNull()
expect(host.listSessions()).toHaveLength(0)
expect(onExit).toHaveBeenCalledOnce()
expect(fixture.proc.destroy).toHaveBeenCalledOnce()
expect(emulatorDispose).toHaveBeenCalledTimes(index + 1)
}
} finally {
fixture.proc._simulateExit(137)
await host.dispose()
}
})
})
})
src/main/daemon/pty-subprocess-io-failure-native.test.ts
+97
View File
@@ -0,0 +1,97 @@
import { fstatSync } from 'node:fs'
import * as pty from 'node-pty'
import { describe, expect, it, vi } from 'vitest'
import { createDaemonPtySubprocessHandle } from './pty-subprocess/subprocess-handle'
import { TerminalHost } from './terminal-host'
const describePosix = process.platform === 'win32' ? describe.skip : describe
describePosix('failed-I/O teardown with a real native PTY', () => {
it.each([
['write', false],
['write', true],
['resize', false],
['resize', true]
] as const)(
'reaps real shells and master fds after %s failure (immediate=%s)',
async (operation, immediate) => {
for (let cycle = 0; cycle < 4; cycle++) {
const native = pty.spawn(
'/bin/sh',
[
'-c',
'printf "orca-cleanup-ready\\n"; while IFS= read -r line; do printf "reply:%s\\n" "$line"; done'
],
{
cwd: process.cwd(),
cols: 80,
rows: 24,
env: { TERM: 'xterm-256color', PATH: '/usr/bin:/bin' }
}
)
const fd = (native as pty.IPty & { fd: number }).fd
let exited = false
native.onExit(() => {
exited = true
})
const handle = createDaemonPtySubprocessHandle({
process: native,
shellPath: '/bin/sh',
spawnCwd: process.cwd(),
env: {},
startupCommandDeliveredInShellArgs: false,
reportsChildExitStatus: true,
sessionId: 'native-io-failure',
startupAgentRecognition: null
})
const host = new TerminalHost({ spawnSubprocess: () => handle })
let output = ''
const onExit = vi.fn()
try {
await host.createOrAttach({
sessionId: 'native-io-failure',
cols: 80,
rows: 24,
streamClient: {
onData: (data) => {
output += data
},
onExit
}
})
await vi.waitFor(() => expect(output).toContain('orca-cleanup-ready'), { timeout: 3000 })
handle.resize(100, 30)
handle.write('roundtrip\n')
await vi.waitFor(() => expect(output).toContain('reply:roundtrip'), { timeout: 3000 })
host.pauseProducer('native-io-failure')
expect(process.kill(native.pid, 0)).toBe(true)
const failure = vi.spyOn(native, operation).mockImplementation(() => {
throw new Error('injected I/O failure')
})
if (operation === 'write') {
handle.write('ignored')
} else {
handle.resize(100, 30)
}
failure.mockRestore()
await host.kill('native-io-failure', { immediate })
await vi.waitFor(() => expect(onExit).toHaveBeenCalledOnce(), { timeout: 3000 })
expect(host.listSessions()).toHaveLength(0)
expect(() => process.kill(native.pid, 0)).toThrow(
expect.objectContaining({ code: 'ESRCH' })
)
expect(() => fstatSync(fd)).toThrow(expect.objectContaining({ code: 'EBADF' }))
} finally {
// Only this test's still-owned native child is eligible for emergency cleanup.
if (!exited) {
native.kill('SIGKILL')
}
await vi.waitFor(() => expect(exited).toBe(true), { timeout: 3000 })
await host.dispose()
}
}
},
15000
)
})
src/main/daemon/pty-subprocess/subprocess-handle.ts
+13 -12
View File
@@ -28,6 +28,8 @@ export function createDaemonPtySubprocessHandle(args: {
const nativeProc = proc as DisposableNativePty
const events = new PtyPreListenerEvents()
let dead = false
// I/O failure is not exit evidence; keep termination and producer flow control available.
let ioFailed = false
let disposed = false
let nodePtyKillIssued = false
const foreground = createPtyForegroundProcessTracker({
@@ -44,19 +46,18 @@ export function createDaemonPtySubprocessHandle(args: {
events.acceptData(data)
})
proc.onExit(({ exitCode, signal }) => {
events.acceptExit({
exitCode,
signal,
hostReportsChildExitStatus: args.reportsChildExitStatus
})
})
proc.onExit(() => {
// Exit listeners may re-enter cleanup; retire signal authority before notifying them.
dead = true
foreground.markDead()
// Why: neutralize kill synchronously so a later async socket-close SIGHUP cannot hit a recycled pid.
if (process.platform !== 'win32') {
nativeProc.kill = () => {}
}
events.acceptExit({
exitCode,
signal,
hostReportsChildExitStatus: args.reportsChildExitStatus
})
})
const slavePath = readPtySlavePath(proc)
@@ -73,23 +74,23 @@ export function createDaemonPtySubprocessHandle(args: {
confirmForegroundProcess: foreground.confirmForegroundProcess,
confirmShellForeground: foreground.confirmShellForeground,
write: (data) => {
if (dead) {
if (dead || ioFailed) {
return
}
try {
proc.write(data)
} catch {
dead = true
ioFailed = true
}
},
resize: (cols, rows) => {
if (dead || !isValidPtySize(cols, rows)) {
if (dead || ioFailed || !isValidPtySize(cols, rows)) {
return
}
try {
proc.resize(cols, rows)
} catch {
dead = true
ioFailed = true
}
},
// WindowsTerminal also wires _socket to the ConPTY conout pipe, so pausing backpressures the child.
@@ -114,7 +115,7 @@ export function createDaemonPtySubprocessHandle(args: {
}
},
clear: () => {
if (dead) {
if (dead || ioFailed) {
return
}
try {
src/main/gitlab/mr-file-diffs.ts
+14 -10
View File
@@ -25,19 +25,23 @@ export function countDiffLines(diff: string): { additions: number; deletions: nu
// diff line `---<content>`, colliding with the `--- a/file` header — so it must
// be counted once inside a hunk, not skipped.
let inHunk = false
for (const line of diff.split('\n')) {
if (line.startsWith('@@')) {
let cursor = 0
while (cursor < diff.length) {
if (diff.startsWith('@@', cursor)) {
inHunk = true
continue
} else if (inHunk) {
const prefix = diff.charCodeAt(cursor)
if (prefix === 43) {
additions += 1
} else if (prefix === 45) {
deletions += 1
}
}
if (!inHunk) {
continue
}
if (line.startsWith('+')) {
additions += 1
} else if (line.startsWith('-')) {
deletions += 1
const newline = diff.indexOf('\n', cursor)
if (newline === -1) {
break
}
cursor = newline + 1
}
return { additions, deletions }
}
src/main/gitlab/work-item-details.test.ts
+38
View File
@@ -458,4 +458,42 @@ describe('countDiffLines', () => {
// Why: the `@@` hunk check runs first, so it must not swallow `+`/`-` content.
expect(countDiffLines('@@ -1 +1 @@\n-@@ old\n+@@ new')).toEqual({ additions: 1, deletions: 1 })
})
// Why: the scan now reads a prefix code unit at a byte cursor rather than a split
// segment, so line-ending and non-ASCII shapes are the new regression surface.
it('counts a CRLF hunk the same as an LF hunk', () => {
expect(countDiffLines('@@ -1 +1,2 @@\r\n-old\r\n+a\r\n+b\r\n')).toEqual({
additions: 2,
deletions: 1
})
})
it('treats a lone CR as content, not a line break', () => {
expect(countDiffLines('@@ -1 +1 @@\n-old\r+new')).toEqual({ additions: 0, deletions: 1 })
})
it('counts lines whose content is multi-byte or a surrogate pair', () => {
expect(countDiffLines('@@ -1 +1 @@\n-é ünïcode\n+🚀 rocket')).toEqual({
additions: 1,
deletions: 1
})
})
it('ignores non-ASCII context lines and blank lines inside a hunk', () => {
expect(countDiffLines('@@ -1 +1 @@\n é leading accent\n 🚀 leading emoji\n\n')).toEqual({
additions: 0,
deletions: 0
})
})
it('counts large diff prefixes without allocating a string array for every line', () => {
const diff = `--- a/file\n+++ b/file\n@@ -1 +1 @@\n${'-old\n+new\n context\n'.repeat(10000)}`
const split = vi.spyOn(String.prototype, 'split')
try {
expect(countDiffLines(diff)).toEqual({ additions: 10000, deletions: 10000 })
expect(split.mock.calls.length).toBe(0)
} finally {
split.mockRestore()
}
})
})
src/main/ipc/filesystem-allowed-roots.test.ts
+44
View File
@@ -8,6 +8,7 @@ import { listRepoWorktreeGraph } from '../repo-worktrees'
import type * as ProjectGroupsModule from '../../shared/project-groups'
import { buildProjectGroupChildIndex, getProjectGroupSubtreeIds } from '../../shared/project-groups'
import { isPathInsideOrEqual } from '../../shared/cross-platform-path'
import type * as CrossPlatformPathModule from '../../shared/cross-platform-path'
import { getWorktreeMirrorDistro } from '../project-runtime-git-options'
import type { FolderWorkspace } from '../../shared/folder-workspace-types'
import type { ProjectGroup } from '../../shared/project-group-types'
@@ -32,6 +33,13 @@ vi.mock('../../shared/project-groups', async () => {
}
})
vi.mock('../../shared/cross-platform-path', async () => {
const actual = await vi.importActual<typeof CrossPlatformPathModule>(
'../../shared/cross-platform-path'
)
return { ...actual, isPathInsideOrEqual: vi.fn(actual.isPathInsideOrEqual) }
})
type StoreFixture = {
repos: Repo[]
projects: Project[]
@@ -257,6 +265,42 @@ beforeEach(() => {
})
describe('getAllowedRoots', () => {
it('stops scanning repositories when a local candidate settles each folder scope', () => {
const fixture: StoreFixture = {
repos: Array.from({ length: 1_000 }, (_, index) =>
makeRepo({ id: `repo-${index}`, path: `/folders/root/repo-${index}` })
),
projects: [],
projectGroups: [],
folderWorkspaces: Array.from({ length: 100 }, (_, index) =>
makeWorkspace({ id: `folder-${index}`, folderPath: '/folders/root' })
)
}
const { store } = makeCountingStore(fixture)
vi.mocked(isPathInsideOrEqual).mockClear()
const actual = getAllowedRoots(store)
expect(isPathInsideOrEqual).toHaveBeenCalledTimes(100)
vi.mocked(isPathInsideOrEqual).mockClear()
expect(actual).toEqual(referenceAllowedRoots(store))
expect(isPathInsideOrEqual).toHaveBeenCalledTimes(100_000)
})
it('preserves empty, remote-only, mixed and explicit remote folder scopes in any repo order', () => {
const fixture = makeMixedFixture()
fixture.repos.push(
makeRepo({
id: 'local-in-remote-group',
path: '/local/mixed',
projectGroupId: 'group-remote'
})
)
for (let index = 0; index < fixture.repos.length; index += 1) {
fixture.repos.push(fixture.repos.shift()!)
const { store } = makeCountingStore(fixture)
expect(getAllowedRoots(store)).toEqual(referenceAllowedRoots(store))
}
})
it('produces the same roots as the pre-change implementation', () => {
const { store } = makeCountingStore(makeMixedFixture())
src/main/ipc/filesystem-allowed-roots.ts
+15 -21
View File
@@ -27,20 +27,6 @@ export function getLocalRepos(store: Store) {
return filterLocalRepos(store.getRepos())
}
function getFolderScopeCandidateRepos(
folderPath: string,
projectGroupId: string,
childGroupIndex: ProjectGroupChildIndex,
repos: readonly Repo[]
): Repo[] {
const groupIds = collectProjectGroupSubtreeIds(childGroupIndex, projectGroupId)
return repos.filter(
(repo) =>
(typeof repo.projectGroupId === 'string' && groupIds.has(repo.projectGroupId)) ||
isPathInsideOrEqual(folderPath, repo.path)
)
}
function isRemoteOnlyFolderScope(
folderPath: string,
projectGroupId: string,
@@ -51,13 +37,21 @@ function isRemoteOnlyFolderScope(
if (connectionId) {
return true
}
const candidates = getFolderScopeCandidateRepos(
folderPath,
projectGroupId,
childGroupIndex,
repos
)
return candidates.length > 0 && candidates.every((repo) => Boolean(repo.connectionId))
const groupIds = collectProjectGroupSubtreeIds(childGroupIndex, projectGroupId)
let hasRemoteCandidate = false
for (const repo of repos) {
if (
(typeof repo.projectGroupId === 'string' && groupIds.has(repo.projectGroupId)) ||
isPathInsideOrEqual(folderPath, repo.path)
) {
// One local candidate settles the scope without scanning the remaining repositories.
if (!repo.connectionId) {
return false
}
hasRemoteCandidate = true
}
}
return hasRemoteCandidate
}
function getFolderWorkspaceConnectionId(
src/main/ipc/pty/pane/stable-pane-relay-absence-respawn.test.ts
+43
View File
@@ -81,6 +81,49 @@ function sessionStore(leaves: string[]): { store: Store; read: () => WorkspaceSe
}
describe('stable pane adoption after the relay reports the PTY absent', () => {
it.each([false, true])(
'reattaches a live pane without launching a provider process (settled worker: %s)',
async (settledWorker) => {
const { store, read } = sessionStore([LEAF])
const paneKey = `${OWNER.tabId}:${LEAF}`
const record = {
paneKey,
tabId: OWNER.tabId,
worktreeId: WORKTREE,
agent: 'claude' as const,
providerSession: { key: 'session_id' as const, id: 'provider-session' },
prompt: '',
state: 'done' as const,
capturedAt: 1,
updatedAt: 1,
...(settledWorker ? { automaticResumeBlockedBy: 'legacy-orchestration-worker' } : {})
}
store.setWorkspaceSession({
...read(),
sleepingAgentSessionsByPaneKey: { [paneKey]: record }
})
const spawn = vi.fn().mockResolvedValue({ id: OWNER.ptyId, isReattach: true })
const onFreshSpawn = vi.fn()
const result = await spawnForStablePane({
runtime: undefined,
store,
worktreeId: WORKTREE,
provider: { spawn } as unknown as IPtyProvider,
spawnOptions: { cols: 80, rows: 24, command: 'claude --resume provider-session' },
owner: OWNER,
connectionId: 'conn-1',
resolveOwner: () => OWNER,
onFreshSpawn
})
expect(result.owner).toBe(OWNER)
expect(spawn).toHaveBeenCalledExactlyOnceWith(
expect.objectContaining({ sessionId: OWNER.ptyId, attachOnly: true, command: undefined })
)
expect(onFreshSpawn).not.toHaveBeenCalled()
expect(read().tabsByWorktree[WORKTREE]).toHaveLength(1)
}
)
it('spawns fresh once the relay has positively answered for that id', async () => {
const { run, spawn } = spawnAfterAttachRejection(
new SshPtyAbsentFromRelayError(`${SSH_SESSION_EXPIRED_ERROR}: pty-1`)
src/main/native-chat/agent-session-journal/journal-open.ts
+3 -2
View File
@@ -167,10 +167,11 @@ export function readJournalRowsAfterCursor(
db: Database.Database,
sessionId: string,
epoch: string,
afterSequence: number
afterSequence: number,
limit?: number
): JournalRow[] {
const rows: JournalRow[] = []
for (const stored of readJournalRowsAfter(db, sessionId, epoch, afterSequence)) {
for (const stored of readJournalRowsAfter(db, sessionId, epoch, afterSequence, limit)) {
const parsed = parseJournalRow(stored.rowJson)
if (!parsed.ok) {
break
src/main/native-chat/agent-session-journal/journal-row-table.ts
+8 -1
View File
@@ -20,6 +20,7 @@ const SELECT_EPOCH_ROWS = `SELECT epoch, seq, ts, row_json FROM journal_rows
WHERE session_id = ? AND epoch = ? ORDER BY seq ASC`
const SELECT_ROWS_AFTER = `SELECT epoch, seq, ts, row_json FROM journal_rows
WHERE session_id = ? AND epoch = ? AND seq > ? ORDER BY seq ASC`
const SELECT_ROWS_AFTER_LIMITED = `${SELECT_ROWS_AFTER} LIMIT ?`
const DELETE_SUFFIX = 'DELETE FROM journal_rows WHERE session_id = ? AND epoch = ? AND seq >= ?'
export function readJournalSessionEpoch(db: Database.Database, sessionId: string): string | null {
@@ -58,8 +59,14 @@ export function readJournalRowsAfter(
db: Database.Database,
sessionId: string,
epoch: string,
afterSeq: number
afterSeq: number,
limit?: number
): JournalStoredRow[] {
if (limit !== undefined) {
return toStoredRows(
db.prepare(SELECT_ROWS_AFTER_LIMITED).all(sessionId, epoch, afterSeq, limit)
)
}
return toStoredRows(db.prepare(SELECT_ROWS_AFTER).all(sessionId, epoch, afterSeq))
}
src/main/native-chat/agent-session-journal/journal-store.ts
+3 -2
View File
@@ -177,7 +177,7 @@ export class AgentSessionJournal {
canonicalItemId = (itemId: string): string => resolveJournalItemId(this.state, itemId)
readSince(cursor: AgentJournalCursor): JournalReadSince {
readSince(cursor: AgentJournalCursor, limit?: number): JournalReadSince {
return readJournalSince(
{
state: this.state,
@@ -186,7 +186,8 @@ export class AgentSessionJournal {
this.requireDatabase().db,
this.identity.sessionId,
this.state.epoch,
afterSequence
afterSequence,
limit
),
readOnly: this.readOnly
},
src/main/native-chat/agent-session-wire/agent-session-history-forward-read-budget.test.ts
+228
View File
@@ -0,0 +1,228 @@
import { mkdtemp, rm } from 'node:fs/promises'
import { tmpdir } from 'node:os'
import { join } from 'node:path'
import { afterEach, describe, expect, it, vi } from 'vitest'
import Database from '../../sqlite/sync-database'
import {
AGENT_SESSION_JOURNAL_SCHEMA_VERSION,
type AgentSessionJournalIdentity
} from '../../../shared/agent-session-journal-types'
import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire'
import { openJournalDatabase } from '../agent-session-journal/journal-database'
import { journalDatabaseFile } from '../agent-session-journal/journal-paths'
import {
insertJournalRow,
upsertJournalSessionRow
} from '../agent-session-journal/journal-row-table'
import * as journalReducer from '../agent-session-journal/journal-reducer'
import * as rowSchema from '../agent-session-journal/journal-row-schema'
import { createTrackedJournalOpener } from '../agent-session-journal/journal-store-test-open'
import { AgentSessionSubscribers } from './structured-agent-session-subscribers'
import { readAgentSessionHistory } from './agent-session-history-page'
const identity: AgentSessionJournalIdentity = {
sessionId: 'bounded-catch-up',
workspaceId: 'folder-workspace',
hostId: 'remote-host',
agent: 'codex',
providerHandle: { kind: 'codex', threadId: 'thread-1' }
}
const journals = createTrackedJournalOpener()
let root: string | undefined
afterEach(async () => {
vi.restoreAllMocks()
await journals.closeAll()
if (root) {
await rm(root, { recursive: true, force: true })
}
})
async function seedJournal(count: number) {
root = await mkdtemp(join(tmpdir(), 'orca-history-read-budget-'))
const { db } = openJournalDatabase(journalDatabaseFile(root))
const base = {
v: AGENT_SESSION_JOURNAL_SCHEMA_VERSION,
epoch: 'epoch-1',
fence: 1,
ts: 1_000
}
try {
db.exec('BEGIN IMMEDIATE')
upsertJournalSessionRow(db, identity.sessionId, base.epoch, base.ts)
insertJournalRow(db, identity.sessionId, {
...base,
kind: 'epoch',
seq: 1,
reason: 'session_created',
providerHandle: identity.providerHandle
})
for (let index = 0; index < count; index += 1) {
insertJournalRow(db, identity.sessionId, {
...base,
kind: 'item',
seq: index + 2,
itemId: `item-${index}`,
revision: 1,
body: {
kind: 'message',
role: 'assistant',
blocks: [{ type: 'text', text: `${index}:${'x'.repeat(4096)}` }]
}
})
}
db.exec('COMMIT')
} finally {
db.close()
}
return journals.open({ identity, journalDir: root })
}
function observeForwardReads() {
const returnedRows: number[] = []
const observed = new WeakSet<object>()
const prepare = Database.prototype.prepare
vi.spyOn(Database.prototype, 'prepare').mockImplementation(function (this: Database, sql) {
const statement = prepare.call(this, sql)
if (sql.includes('seq > ?') && !observed.has(statement)) {
observed.add(statement)
const all = statement.all.bind(statement)
vi.spyOn(statement, 'all').mockImplementation((...args) => {
const rows = all(...args)
returnedRows.push(rows.length)
return rows
})
}
return statement
})
const parse = vi.spyOn(rowSchema, 'parseJournalRow')
return { returnedRows, parse }
}
describe('forward history SQL read budget', () => {
it('reconnects through every page with one lookahead row per page', async () => {
const count = 2_000
const journal = await seedJournal(count)
const { returnedRows, parse } = observeForwardReads()
const events: AgentSessionSubscribeEvent[] = []
new AgentSessionSubscribers().open({
id: 'reader',
sessionId: identity.sessionId,
journal,
fence: 1,
cursor: { epoch: journal.epoch, sequence: 1 },
emit: (event) => events.push(event)
})
const batches = events.filter((event) => event.type === 'batch')
expect(batches.flatMap((event) => event.batch.items.map((item) => item.itemId))).toEqual(
Array.from({ length: count }, (_, index) => `item-${index}`)
)
expect(batches.at(-1)?.batch.cursor).toEqual(journal.cursor())
expect(returnedRows).toEqual([...Array<number>(9).fill(201), 200])
expect(parse).toHaveBeenCalledTimes(2_009)
})
it('reduces the timeline once for the whole catch-up, not once per page', async () => {
const journal = await seedJournal(2_000)
const render = vi.spyOn(journalReducer, 'renderJournalState')
const events: AgentSessionSubscribeEvent[] = []
new AgentSessionSubscribers().open({
id: 'reader',
sessionId: identity.sessionId,
journal,
fence: 1,
cursor: { epoch: journal.epoch, sequence: 1 },
emit: (event) => events.push(event)
})
// Catch-up is synchronous, so the reduced timeline cannot change between pages.
expect(events.filter((event) => event.type === 'batch')).toHaveLength(10)
expect(render).toHaveBeenCalledTimes(1)
})
it('keeps an exact final page final and preserves unlimited journal readers', async () => {
const journal = await seedJournal(6)
const cursor = { epoch: journal.epoch, sequence: 1 }
expect(journal.readSince(cursor)).toMatchObject({ ok: true, rows: expect.any(Array) })
const first = readAgentSessionHistory(journal, {
sessionId: identity.sessionId,
direction: 'after',
cursor,
limit: 3
})
expect(first).toMatchObject({ ok: true, page: { hasNewer: true } })
if (!first.ok) {
throw new Error('Expected first page')
}
const last = readAgentSessionHistory(journal, {
sessionId: identity.sessionId,
direction: 'after',
cursor: first.page.window.nextCursor,
limit: 3
})
expect(last).toMatchObject({ ok: true, page: { hasNewer: false } })
const unlimited = journal.readSince(cursor)
expect(unlimited.ok && unlimited.rows).toHaveLength(6)
})
it('reports a sequence gap when the next page reaches it', async () => {
const journal = await seedJournal(6)
const { db } = openJournalDatabase(journalDatabaseFile(root!))
try {
db.prepare('DELETE FROM journal_rows WHERE session_id = ? AND seq = ?').run(
identity.sessionId,
4
)
} finally {
db.close()
}
const first = readAgentSessionHistory(journal, {
sessionId: identity.sessionId,
direction: 'after',
cursor: { epoch: journal.epoch, sequence: 1 },
limit: 2
})
expect(first).toMatchObject({ ok: true, page: { hasNewer: true } })
if (!first.ok) {
throw new Error('Expected first page')
}
expect(
readAgentSessionHistory(journal, {
sessionId: identity.sessionId,
direction: 'after',
cursor: first.page.window.nextCursor,
limit: 2
})
).toMatchObject({ ok: false, reset: 'journal_gap' })
})
it.each(['{', '{"v":9999}'])(
'preserves parse-stop behavior at lookahead: %s',
async (rowJson) => {
const journal = await seedJournal(6)
const { db } = openJournalDatabase(journalDatabaseFile(root!))
try {
db.prepare('UPDATE journal_rows SET row_json = ? WHERE session_id = ? AND seq = ?').run(
rowJson,
identity.sessionId,
4
)
} finally {
db.close()
}
const page = readAgentSessionHistory(journal, {
sessionId: identity.sessionId,
direction: 'after',
cursor: { epoch: journal.epoch, sequence: 1 },
limit: 2
})
expect(page).toMatchObject({
ok: true,
page: { hasNewer: false, window: { nextCursor: { sequence: 3 } } }
})
if (!page.ok) {
throw new Error('Expected valid prefix')
}
expect(page.page.items.map((item) => item.itemId)).toEqual(['item-0', 'item-1'])
}
)
})
src/main/native-chat/agent-session-wire/agent-session-history-page-bounds.ts
+15 -2
View File
@@ -22,15 +22,28 @@ export function historyEntryBytes(
return Buffer.byteLength(JSON.stringify(item), 'utf8') + (submissionBytes.get(item.itemId) ?? 0)
}
// Keyed on the snapshot's own submissions array, which the reducer rebuilds on
// every change, so a paged read over one snapshot serializes submissions once.
const bytesBySubmissions = new WeakMap<
readonly AgentJournalSubmission[],
ReadonlyMap<string, number>
>()
export function submissionBytesByItemId(
submissions: readonly AgentJournalSubmission[]
): Map<string, number> {
return new Map(
): ReadonlyMap<string, number> {
const cached = bytesBySubmissions.get(submissions)
if (cached) {
return cached
}
const bytes = new Map(
submissions.map((submission) => [
agentJournalSubmissionKey(submission.clientMessageId),
Buffer.byteLength(JSON.stringify(submission), 'utf8')
])
)
bytesBySubmissions.set(submissions, bytes)
return bytes
}
export function oversizedHistoryItem(
src/main/native-chat/agent-session-wire/agent-session-history-page.ts
+24 -3
View File
@@ -45,9 +45,11 @@ export function resolveHistoryLimit(limit: number | undefined): number {
export function readAgentSessionHistory(
journal: AgentSessionJournal,
request: AgentSessionHistoryRequest
request: AgentSessionHistoryRequest,
/** Reduced state to read against. A synchronous multi-page catch-up passes one
* snapshot for the whole run so each page costs its own rows, not the timeline. */
snapshot: AgentJournalSnapshot = journal.snapshot()
): AgentSessionHistoryResult {
const snapshot = journal.snapshot()
if (journal.isReadOnly) {
return historyReset(snapshot, 'schema_unreadable')
}
@@ -90,6 +92,24 @@ export function readAgentSessionHistory(
}
}
/**
* A catch-up run over one journal. Pages share one reduced timeline, so the run
* costs its own rows instead of re-reducing every item per page; the cursor
* check re-reduces if anything did advance the journal between pages.
*/
export function createAgentSessionCatchUpReader(
journal: AgentSessionJournal
): (request: AgentSessionHistoryRequest) => AgentSessionHistoryResult {
let snapshot = journal.snapshot()
return (request) => {
const live = journal.cursor()
if (live.epoch !== snapshot.cursor.epoch || live.sequence !== snapshot.cursor.sequence) {
snapshot = journal.snapshot()
}
return readAgentSessionHistory(journal, request, snapshot)
}
}
export function readAgentSessionHydrationPage(
journal: AgentSessionJournal,
fence?: number
@@ -145,7 +165,8 @@ function readForward(
// a page it cannot place.
return historyReset(snapshot, 'cursor_ahead')
}
const since = journal.readSince(cursor)
// One lookahead preserves hasNewer without rereading the entire remaining journal per page.
const since = journal.readSince(cursor, limit + 1)
if (!since.ok) {
return historyReset(snapshot, since.reset)
}
src/main/native-chat/agent-session-wire/agent-session-journal-batch.ts
+40 -5
View File
@@ -6,7 +6,11 @@
// key instead of appearing as a second copy of the user's own message.
import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key'
import type { AgentJournalSnapshot } from '../../../shared/agent-session-journal-types'
import type {
AgentJournalRenderItem,
AgentJournalSnapshot,
AgentJournalSubmission
} from '../../../shared/agent-session-journal-types'
import type { AgentSessionJournalBatch } from '../../../shared/agent-session-wire'
import { findSequenceGap } from '../agent-session-journal/journal-cursor'
import type { JournalRow } from '../agent-session-journal/journal-row-schema'
@@ -31,7 +35,7 @@ export function projectJournalBatch(input: {
if (gap) {
return { ok: false, reset: 'journal_gap' }
}
const aliases = submissionAliases(input.snapshot)
const aliases = submissionAliases(input.snapshot.submissions)
const touchedItemIds = new Set<string>()
const touchedClientMessageIds = new Set<string>()
for (const row of input.rows) {
@@ -57,7 +61,7 @@ export function projectJournalBatch(input: {
}
}
const live = new Map(input.snapshot.items.map((item) => [item.itemId, item]))
const live = liveItemsById(input.snapshot.items)
const items = [...touchedItemIds]
.map((itemId) => live.get(itemId))
.filter((item) => item !== undefined)
@@ -75,18 +79,49 @@ export function projectJournalBatch(input: {
}
}
// Both indexes are keyed on the snapshot arrays themselves, which the reducer
// rebuilds on every change, so a paged catch-up over one snapshot pays for them
// once instead of once per page — including the byte-shrink loop's re-projections.
const liveItemsByTimeline = new WeakMap<
readonly AgentJournalRenderItem[],
ReadonlyMap<string, AgentJournalRenderItem>
>()
const aliasesBySubmissions = new WeakMap<
readonly AgentJournalSubmission[],
ReadonlyMap<string, string>
>()
function liveItemsById(
items: readonly AgentJournalRenderItem[]
): ReadonlyMap<string, AgentJournalRenderItem> {
const cached = liveItemsByTimeline.get(items)
if (cached) {
return cached
}
const live = new Map(items.map((item) => [item.itemId, item]))
liveItemsByTimeline.set(items, live)
return live
}
/**
* Provider item id → the submission slot that adopted it, rebuilt from the
* snapshot's own accepted submissions. This mirrors the alias the reducer
* writes on an accepted dispatch; deriving it here keeps the projection a pure
* function of published state instead of reaching into reducer internals.
*/
function submissionAliases(snapshot: AgentJournalSnapshot): Map<string, string> {
function submissionAliases(
submissions: readonly AgentJournalSubmission[]
): ReadonlyMap<string, string> {
const cached = aliasesBySubmissions.get(submissions)
if (cached) {
return cached
}
const aliases = new Map<string, string>()
for (const submission of snapshot.submissions) {
for (const submission of submissions) {
if (submission.dispatchState === 'accepted' && submission.providerItemId) {
aliases.set(submission.providerItemId, agentJournalSubmissionKey(submission.clientMessageId))
}
}
aliasesBySubmissions.set(submissions, aliases)
return aliases
}
src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.ts
+7 -8
View File
@@ -18,7 +18,7 @@ import {
} from '../../../shared/agent-session-wire'
import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
import {
readAgentSessionHistory,
createAgentSessionCatchUpReader,
readAgentSessionHydrationPage
} from './agent-session-history-page'
@@ -229,14 +229,13 @@ export class AgentSessionSubscribers {
backgroundTasks?: AgentSessionBackgroundTaskState | null,
activity?: AgentSessionTurnActivity | null
): void {
const publishedActivity =
activity !== undefined
? activity
: emitCheckpoint
? (this.activityBySession.get(subscriber.sessionId) ?? null)
: undefined
const checkpointActivity = emitCheckpoint
? this.activityField(subscriber.sessionId).activity
: undefined
const publishedActivity = activity !== undefined ? activity : checkpointActivity
const readPage = createAgentSessionCatchUpReader(journal)
while (true) {
const result = readAgentSessionHistory(journal, {
const result = readPage({
sessionId: subscriber.sessionId,
direction: 'after',
cursor: subscriber.cursor,
src/main/opencode-usage/snapshot-rollups.ts
+3 -3
View File
@@ -1,3 +1,4 @@
import { highestUsageKey } from '../usage/highest-usage-key'
import type {
OpenCodeUsageBreakdownKind,
OpenCodeUsageBreakdownRow,
@@ -47,9 +48,8 @@ export function buildOpenCodeUsageSummary(
byProject.set(row.projectLabel, (byProject.get(row.projectLabel) ?? 0) + row.totalTokens)
}
const topModel = [...byModel.entries()].sort((left, right) => right[1] - left[1])[0]?.[0] ?? null
const topProject =
[...byProject.entries()].sort((left, right) => right[1] - left[1])[0]?.[0] ?? null
const topModel = highestUsageKey(byModel)
const topProject = highestUsageKey(byProject)
return {
scope,
src/main/persistence/applying-settings/settings-update-terminal-contrast.test.ts
+74
View File
@@ -0,0 +1,74 @@
import { describe, expect, it, vi } from 'vitest'
import type { PersistedState } from '../../../shared/persisted-state-types'
import { updateSettings, type SettingsMutationOperations } from './settings-update'
function makeOperations(): SettingsMutationOperations {
return {
// Only the fields updateSettings reads; the rest of GlobalSettings is irrelevant to the clamp.
state: { settings: { terminalFontSize: 14 }, repos: [] } as unknown as PersistedState,
bumpLocalWorktreeScanGeneration: vi.fn(),
removeRetainedBlob: vi.fn(),
scheduleSave: vi.fn(),
notifySettingsChanged: vi.fn()
}
}
// #10754: desktop IPC, the web RPC and the CLI all reach the store through this boundary, and xterm
// throws on a non-finite minimumContrastRatio, so the clamp cannot live in the settings UI alone.
describe('updateSettings terminalMinimumContrastRatio', () => {
it('persists an in-range floor unchanged', () => {
const operations = makeOperations()
expect(
updateSettings(operations, { terminalMinimumContrastRatio: 1 }).terminalMinimumContrastRatio
).toBe(1)
expect(
updateSettings(operations, { terminalMinimumContrastRatio: 4.5 }).terminalMinimumContrastRatio
).toBe(4.5)
})
it('clamps a hand-edited value into xterm range', () => {
const operations = makeOperations()
expect(
updateSettings(operations, { terminalMinimumContrastRatio: 0 }).terminalMinimumContrastRatio
).toBe(1)
expect(
updateSettings(operations, { terminalMinimumContrastRatio: 500 }).terminalMinimumContrastRatio
).toBe(21)
})
it('drops an unusable value back to automatic rather than storing it', () => {
const operations = makeOperations()
expect(
updateSettings(operations, {
terminalMinimumContrastRatio: Number.NaN
}).terminalMinimumContrastRatio
).toBeUndefined()
expect(
updateSettings(operations, {
terminalMinimumContrastRatio: 'off' as unknown as number
}).terminalMinimumContrastRatio
).toBeUndefined()
})
it('clears the override so the automatic floor comes back', () => {
const operations = makeOperations()
updateSettings(operations, { terminalMinimumContrastRatio: 1 })
expect(
updateSettings(operations, { terminalMinimumContrastRatio: undefined })
.terminalMinimumContrastRatio
).toBeUndefined()
})
it('leaves a stored floor alone when an unrelated setting is written', () => {
const operations = makeOperations()
updateSettings(operations, { terminalMinimumContrastRatio: 1 })
expect(updateSettings(operations, { terminalFontSize: 15 }).terminalMinimumContrastRatio).toBe(
1
)
})
})
src/main/persistence/applying-settings/settings-update.ts
+8
View File
@@ -9,6 +9,7 @@ import { normalizeTerminalQuickCommands } from '../../../shared/terminal-quick-c
import { normalizeTerminalCustomThemes } from '../../../shared/terminal-custom-themes'
import { normalizeTerminalCursorStyleDefault } from '../../../shared/terminal-cursor-style-settings'
import { normalizeDesktopTerminalScrollbackRows } from '../../../shared/terminal-scrollback-policy'
import { normalizeTerminalMinimumContrastRatio } from '../../../shared/terminal-minimum-contrast-settings'
import { normalizeTaskProviderSettings } from '../../../shared/task-providers'
import { normalizeOpenInApplications } from '../../../shared/open-in-applications'
import { normalizeTerminalShortcutPolicy } from '../../../shared/keybindings'
@@ -123,6 +124,13 @@ export function updateSettings(
updates.terminalScrollbackRows
)
}
// Why here: every writer (desktop IPC, web RPC, CLI) crosses this boundary, so xterm can never be
// handed an out-of-range floor, and undefined stays undefined to mean "automatic" (#10754).
if ('terminalMinimumContrastRatio' in updates) {
sanitizedUpdates.terminalMinimumContrastRatio = normalizeTerminalMinimumContrastRatio(
updates.terminalMinimumContrastRatio
)
}
if (
'terminalTuiScrollSensitivity' in updates ||
'terminalTuiScrollSensitivityDefaultedToOne' in updates
src/main/pi/agent-status-extension-source.test.ts
+6 -4
View File
@@ -481,12 +481,14 @@ describe('getPiAgentStatusExtensionSource', () => {
await handlerCall
})
it('leaves runtime shutdown to PTY teardown instead of reporting turn completion', () => {
it('leaves runtime shutdown to PTY teardown instead of reporting turn completion', async () => {
const harness = createHarness({ kind: 'pi' })
// Why: Pi emits session_shutdown for reload/new/resume/fork while its PTY
// stays alive. agent_end is the only extension event that proves done.
expect(harness.handlers.session_shutdown).toBeUndefined()
// Why: Pi emits session_shutdown for reload/new/resume/fork while its PTY stays
// alive. agent_end is the only extension event that proves done, so the handler
// exists solely to release a dialog Pi tore down without a close.
await harness.callHook('session_shutdown')
expect(harness.fetchMock).not.toHaveBeenCalled()
})
it('bounds stalled delivery to one active request and the latest pending status', async () => {
src/main/pi/agent-status-extension-source.ts
+5 -1
View File
@@ -101,6 +101,7 @@ export function getPiAgentStatusExtensionSource(kind: PiAgentKind = 'pi'): strin
'// Orca receiver from building an unbounded queue of obsolete snapshots.',
'const HOOK_POST_TIMEOUT_MS = 1000',
'let activePost = false',
...(kind === 'pi' ? ['let piUiPromptDepth = 0', 'let piTurnInFlight = false'] : []),
'let pendingPost: { hookEventName: string; extra: Record<string, unknown>; metadata: Record<string, unknown>; ompRuntime: boolean } | null = null',
...sessionMetadataSourceLines,
'',
@@ -164,7 +165,10 @@ export function getPiAgentStatusExtensionSource(kind: PiAgentKind = 'pi'): strin
' const ompRuntime = isOmpRuntime()',
' pendingPost = {',
' hookEventName,',
' extra,',
// Why: every coalesced snapshot must retain an open modal, not just its start event.
kind === 'pi'
? ' extra: { ...extra, ...(!ompRuntime && piUiPromptDepth > 0 ? { ui_prompt_active: true } : {}) },'
: ' extra,',
' metadata: getPostSessionMetadata(ompRuntime),',
' ompRuntime,',
' }',
src/main/pi/agent-status-handler-source.ts
+9
View File
@@ -1,4 +1,5 @@
import type { PiAgentKind } from '../../shared/pi-agent-kind'
import { getPiAgentStatusUiPromptHandlerSourceLines } from './agent-status-ui-prompt-source'
// Why: keep the generated handler registrations separate from hook transport;
// both are independently sizeable and the installed extension concatenates them.
@@ -8,6 +9,7 @@ export function getPiAgentStatusHandlerSourceLines(kind: PiAgentKind): string[]
? [
" pi.on('session_start', (event, ctx) => {",
' updateSessionMetadata(ctx)',
...(kind === 'pi' ? [' piUiPromptDepth = 0'] : []),
' // Why: /reload re-registers the active session, but it is not a',
' // turn boundary and must not clear the visible status or unread state.',
" if (event.reason === 'reload') return",
@@ -104,6 +106,9 @@ export function getPiAgentStatusHandlerSourceLines(kind: PiAgentKind): string[]
...captureSessionMetadata,
' clearPendingAgentEndCheck()',
' agentEndReported = false',
// Why: a turn cannot begin under a dialog holding input focus, so this is the one
// boundary that can recover a modal whose close never arrived.
...(kind === 'pi' ? [' piUiPromptDepth = 0', ' piTurnInFlight = true'] : []),
" post('agent_start')",
' })',
'',
@@ -131,6 +136,7 @@ export function getPiAgentStatusHandlerSourceLines(kind: PiAgentKind): string[]
' })',
'',
...approvalHandlers,
...getPiAgentStatusUiPromptHandlerSourceLines(kind),
" // Why: capture the assistant's final text on each completed message",
' // so the dashboard preview reflects the most recent reply even before',
' // agent_end fires. message_end is the right hook because pi guarantees',
@@ -166,6 +172,9 @@ export function getPiAgentStatusHandlerSourceLines(kind: PiAgentKind): string[]
' function postAgentEndOnce(): void {',
' if (agentEndReported) return',
' agentEndReported = true',
// Why: distinct from agentEndReported, which also dedupes the completion post and so
// starts false on a pane that has not run a turn yet — that pane is idle, not busy.
...(kind === 'pi' ? [' piTurnInFlight = false'] : []),
" post('agent_end')",
' }',
'',
src/main/pi/agent-status-runtime-detection-source.ts
+26 -17
View File
@@ -1,26 +1,15 @@
import type { PiAgentKind } from '../../shared/pi-agent-kind'
export function getPiAgentStatusRuntimeDetectionSourceLines(kind: PiAgentKind): string[] {
if (kind === 'prime-agent') {
return [
`const CONFIGURED_HOOK_PATH = '/hook/${kind}'`,
'',
'function isOmpRuntime(): boolean {',
' return false',
'}',
'',
'function resolveHookPath(_ompRuntime: boolean): string {',
' return CONFIGURED_HOOK_PATH',
'}'
]
}
/** Why: a bare-shell OMP launch runs inside a pi-kind pane, so every extension that has to
* defer to OMP's own approval events needs this check — not just the status extension it
* was first written for. */
export function getPiOmpRuntimeDetectionSourceLines(configuredHookPath: string): string[] {
return [
'function processName(value: unknown): string {',
" return String(value || '').split(/[\\\\/]/).pop()?.toLowerCase() || ''",
'}',
'',
`const CONFIGURED_HOOK_PATH = '/hook/${kind}'`,
`const CONFIGURED_HOOK_PATH = '${configuredHookPath}'`,
'let cachedOmpRuntime: boolean | null = null',
'',
'function isOmpRuntime(): boolean {',
@@ -39,7 +28,27 @@ export function getPiAgentStatusRuntimeDetectionSourceLines(kind: PiAgentKind):
" ['omp', 'omp.js', 'omp.sh', 'omp.cmd', 'omp.exe', 'omp.bat'].includes(name)",
' )',
' return cachedOmpRuntime',
'}',
'}'
]
}
export function getPiAgentStatusRuntimeDetectionSourceLines(kind: PiAgentKind): string[] {
if (kind === 'prime-agent') {
return [
`const CONFIGURED_HOOK_PATH = '/hook/${kind}'`,
'',
'function isOmpRuntime(): boolean {',
' return false',
'}',
'',
'function resolveHookPath(_ompRuntime: boolean): string {',
' return CONFIGURED_HOOK_PATH',
'}'
]
}
return [
...getPiOmpRuntimeDetectionSourceLines(`/hook/${kind}`),
'',
'function resolveHookPath(ompRuntime: boolean): string {',
' // Why: runtime detection keeps a bare-shell OMP launch from reporting as Pi.',
src/main/pi/agent-status-ui-prompt-source.ts
+44
View File
@@ -0,0 +1,44 @@
import type { PiAgentKind } from '../../shared/pi-agent-kind'
/** Mirrors the titlebar extension's dialog tracking so both agree on when the wait ends. */
export function getPiAgentStatusUiPromptHandlerSourceLines(kind: PiAgentKind): string[] {
if (kind !== 'pi') {
return []
}
return [
" pi.on('ui_prompt_start', () => {",
' if (isOmpRuntime()) return',
' piUiPromptDepth++',
' if (piUiPromptDepth > 1) return',
" post('ui_prompt_start')",
' })',
'',
" pi.on('ui_prompt_end', (_event, ctx) => {",
' if (isOmpRuntime() || piUiPromptDepth === 0) return',
' piUiPromptDepth--',
' if (piUiPromptDepth > 0) return',
' // Why: ctx.isIdle throws outright once a session-switching modal invalidates the',
' // runner (it calls assertActive), so local turn state is the floor, not a fallback:',
' // with no turn in flight, no later event is coming to correct a working verdict, so',
' // only consult ctx when this process believes work is running.',
' let isIdle = !piTurnInFlight',
' try {',
" if (!isIdle && typeof ctx?.isIdle === 'function') isIdle = ctx.isIdle() === true",
' } catch {',
' // Why: a runner this very modal invalidated cannot answer; keep the local verdict.',
' }',
" post('ui_prompt_end', { is_idle: isIdle })",
' })',
'',
" pi.on('session_shutdown', () => {",
' if (isOmpRuntime()) return',
' // Why: pi tears an open dialog down through resetExtensionUI without resolving its',
' // promise, so a replaced session never emits the matching ui_prompt_end and the wait',
' // would stick forever. Reset without posting: shutdown is not a turn boundary, and',
' // the session_start that follows republishes the corrected state.',
' piUiPromptDepth = 0',
' })',
''
]
}
src/main/pi/agent-status-ui-prompt.test.ts
+326
View File
@@ -0,0 +1,326 @@
import { describe, expect, it } from 'vitest'
import { normalizeHookPayload } from '../../shared/agent-hook-listener'
import { PANE_KEY } from '../../shared/agent-hook-listener-test-harness'
import { createHookListenerState } from '../../shared/agent-hook-listener/listener-state'
import { createAgentStatusExtensionHarness } from './agent-status-extension-test-harness'
const HOOK_ENV = { ORCA_PANE_KEY: PANE_KEY, ORCA_AGENT_HOOK_ENV: 'production' }
function createHarness() {
const state = createHookListenerState()
const statuses: ReturnType<typeof normalizeHookPayload>[] = []
const harness = createAgentStatusExtensionHarness({
kind: 'pi',
env: HOOK_ENV,
fetchImpl: async (_url, init) => {
statuses.push(normalizeHookPayload(state, 'pi', JSON.parse(String(init?.body)), 'production'))
return { ok: true }
}
})
return { ...harness, statuses }
}
async function flushPosts(): Promise<void> {
// Each delivery has a bounded promise chain; no wall-clock sleeps in the harness.
for (let i = 0; i < 20; i++) {
await Promise.resolve()
}
}
async function post(harness: ReturnType<typeof createHarness>, name: string, event = {}) {
await harness.callHook(name, event)
await flushPosts()
}
describe('Pi UI prompt status', () => {
it.each(['select', 'confirm', 'input', 'editor', 'custom'])(
'blocks for %s without exposing modal contents and resumes work on close',
async (kind) => {
const harness = createHarness()
await post(harness, 'agent_start')
await post(harness, 'ui_prompt_start', { kind, title: 'Private title' })
expect(harness.statuses.at(-1)?.payload.state).toBe('waiting')
const body = JSON.parse(String(harness.fetchMock.mock.calls.at(-1)?.[1]?.body))
expect(body.payload).toEqual({ hook_event_name: 'ui_prompt_start', ui_prompt_active: true })
await harness.callHook('ui_prompt_end', { kind }, { isIdle: () => false })
await flushPosts()
expect(harness.statuses.at(-1)?.payload.state).toBe('working')
}
)
it.each([
'tool_call',
'tool_execution_start',
'tool_execution_end',
'message_end',
'agent_settled'
])('%s cannot clear an open modal', async (name) => {
const harness = createHarness()
await post(harness, 'ui_prompt_start')
await post(harness, name, {
toolName: 'ask_user_question',
input: { questions: [{ question: 'Stale question' }] },
message: { role: 'assistant', content: [{ type: 'text', text: 'Still here' }] }
})
expect(harness.statuses.at(-1)?.payload).toMatchObject({ state: 'waiting', agentType: 'pi' })
expect(harness.statuses.at(-1)?.payload.toolName).toBeUndefined()
expect(harness.statuses.at(-1)?.payload.interactivePrompt).toBeUndefined()
await harness.callHook('ui_prompt_end', {}, { isIdle: () => true })
await flushPosts()
expect(harness.statuses.at(-1)?.payload.state).toBe('done')
})
it('clears stale question cards when a generic modal opens', async () => {
const harness = createHarness()
await post(harness, 'tool_call', {
toolName: 'ask_user_question',
input: { questions: [{ question: 'Pick one' }] }
})
expect(harness.statuses.at(-1)?.payload.interactivePrompt).toBeDefined()
await post(harness, 'ui_prompt_start')
expect(harness.statuses.at(-1)?.payload.toolName).toBeUndefined()
expect(harness.statuses.at(-1)?.payload.toolInput).toBeUndefined()
expect(harness.statuses.at(-1)?.payload.interactivePrompt).toBeUndefined()
})
it('returns an idle session to done after its modal closes', async () => {
const harness = createHarness()
await post(harness, 'ui_prompt_start')
await harness.callHook('ui_prompt_end', {}, { isIdle: () => true })
await flushPosts()
expect(harness.statuses.map((status) => status?.payload.state)).toEqual(['waiting', 'done'])
})
it('returns a pane that never ran a turn to done when idleness is unreadable', async () => {
const harness = createHarness()
await post(harness, 'ui_prompt_start')
await post(harness, 'ui_prompt_end')
// Why: no turn has started, so the pane is idle — reporting working would spin forever.
expect(harness.statuses.at(-1)?.payload.state).toBe('done')
})
it('trusts local turn state over a ctx that claims work on an idle pane', async () => {
const harness = createHarness()
await post(harness, 'ui_prompt_start')
await harness.callHook('ui_prompt_end', {}, { isIdle: () => false })
await flushPosts()
// Why: no turn ever started, so nothing later would correct a working verdict.
expect(harness.statuses.at(-1)?.payload.state).toBe('done')
})
it('lets the normal settlement hook finish work after a modal closes', async () => {
const harness = createHarness()
await post(harness, 'agent_start')
await post(harness, 'ui_prompt_start')
await harness.callHook('ui_prompt_end', {}, { isIdle: () => false })
await flushPosts()
await post(harness, 'agent_settled')
expect(harness.statuses.map((status) => status?.payload.state)).toEqual([
'working',
'waiting',
'working',
'done'
])
})
it('retains modal state across an in-process registration reload', async () => {
const harness = createHarness()
await post(harness, 'ui_prompt_start')
harness.reload()
await post(harness, 'tool_execution_end', { toolName: 'bash' })
// Why: re-registering handlers is not a session boundary and must not lose the wait.
expect(harness.statuses.at(-1)?.payload.state).toBe('waiting')
})
it('releases a modal that a session replacement tore down without a close', async () => {
const harness = createHarness()
await post(harness, 'before_agent_start', { prompt: 'Old session prompt' })
await post(harness, 'ui_prompt_start')
expect(harness.statuses.at(-1)?.payload.state).toBe('waiting')
// Why: pi hides the dialog through resetExtensionUI without resolving its promise,
// so no ui_prompt_end is ever emitted — these two boundaries are the only release.
await post(harness, 'session_shutdown')
await post(harness, 'session_start', { reason: 'switch' })
await post(harness, 'tool_execution_end', { toolName: 'bash' })
expect(harness.statuses.at(-1)?.payload.state).not.toBe('waiting')
})
it('releases a modal dropped by a reload that emits no shutdown', async () => {
const harness = createHarness()
await post(harness, 'ui_prompt_start')
await post(harness, 'session_start', { reason: 'reload' })
await post(harness, 'tool_execution_end', { toolName: 'bash' })
expect(harness.statuses.at(-1)?.payload.state).not.toBe('waiting')
})
it('still captures the assistant reply that lands while a modal is open', async () => {
const harness = createHarness()
await post(harness, 'agent_start')
await post(harness, 'message_end', {
message: { role: 'assistant', content: [{ type: 'text', text: 'Before modal' }] }
})
await post(harness, 'ui_prompt_start')
await post(harness, 'message_end', {
message: { role: 'assistant', content: [{ type: 'text', text: 'Final reply' }] }
})
await harness.callHook('ui_prompt_end', {}, { isIdle: () => true })
await flushPosts()
expect(harness.statuses.at(-1)?.payload).toMatchObject({
state: 'done',
lastAssistantMessage: 'Final reply'
})
expect(harness.statuses.at(-1)?.payload.toolName).toBeUndefined()
expect(harness.statuses.at(-1)?.payload.interactivePrompt).toBeUndefined()
})
it('still reports the close when the modal invalidated its own runner', async () => {
const harness = createHarness()
await post(harness, 'ui_prompt_start')
await harness.callHook(
'ui_prompt_end',
{},
{
isIdle: () => {
throw new Error('extension runner is no longer active')
}
}
)
await flushPosts()
// Why: a lost close would strand the pane on waiting; no turn is running, so done.
expect(harness.statuses.at(-1)?.payload.state).toBe('done')
})
it('keeps a mid-turn modal working when its runner throws on close', async () => {
const harness = createHarness()
await post(harness, 'agent_start')
await post(harness, 'ui_prompt_start')
await harness.callHook(
'ui_prompt_end',
{},
{
isIdle: () => {
throw new Error('extension runner is no longer active')
}
}
)
await flushPosts()
// Why: the turn is still in flight, so done would ring the completion bell early.
expect(harness.statuses.at(-1)?.payload.state).toBe('working')
await post(harness, 'agent_settled')
expect(harness.statuses.at(-1)?.payload.state).toBe('done')
})
it('recovers on a new turn when a modal close was lost', async () => {
const harness = createHarness()
await post(harness, 'ui_prompt_start')
expect(harness.statuses.at(-1)?.payload.state).toBe('waiting')
// Why: a turn cannot begin under a dialog holding input focus, so this is recovery.
await post(harness, 'agent_start')
await post(harness, 'tool_execution_end', { toolName: 'bash' })
expect(harness.statuses.at(-1)?.payload.state).toBe('working')
})
it('keeps the wait until the outermost of nested modals closes', async () => {
const harness = createHarness()
await post(harness, 'ui_prompt_start')
await post(harness, 'ui_prompt_start')
await harness.callHook('ui_prompt_end', {}, { isIdle: () => true })
await flushPosts()
expect(harness.statuses.at(-1)?.payload.state).toBe('waiting')
await harness.callHook('ui_prompt_end', {}, { isIdle: () => true })
await flushPosts()
expect(harness.statuses.at(-1)?.payload.state).toBe('done')
})
it('returns an idle pane to done when its modal lost the runner', async () => {
const harness = createHarness()
await post(harness, 'agent_start')
await post(harness, 'agent_settled')
expect(harness.statuses.at(-1)?.payload.state).toBe('done')
await post(harness, 'ui_prompt_start')
await harness.callHook(
'ui_prompt_end',
{},
{
isIdle: () => {
throw new Error('extension runner is no longer active')
}
}
)
await flushPosts()
// Why: the turn already reported its end, so no later event is coming to correct a
// guess of working — fall back to what this process knows rather than strand it.
expect(harness.statuses.at(-1)?.payload.state).toBe('done')
})
it('keeps a mid-turn modal working when its close cannot read idleness', async () => {
const harness = createHarness()
await post(harness, 'agent_start')
await post(harness, 'ui_prompt_start')
await post(harness, 'ui_prompt_end')
expect(harness.statuses.at(-1)?.payload.state).toBe('working')
await post(harness, 'agent_settled')
expect(harness.statuses.at(-1)?.payload.state).toBe('done')
})
it('ignores an unmatched prompt end', async () => {
const harness = createHarness()
await post(harness, 'ui_prompt_end')
expect(harness.fetchMock).not.toHaveBeenCalled()
})
it('isolates prompt state between Pi processes', async () => {
const first = createHarness()
const second = createHarness()
await post(first, 'ui_prompt_start')
await post(second, 'agent_start')
expect(first.statuses.at(-1)?.payload.state).toBe('waiting')
expect(second.statuses.at(-1)?.payload.state).toBe('working')
})
it('preserves blocked when a stalled sender coalesces away the start event', async () => {
let finish: (() => void) | undefined
const harness = createAgentStatusExtensionHarness({
kind: 'pi',
env: HOOK_ENV,
fetchImpl: () =>
new Promise<void>((resolve) => {
finish = resolve
})
})
await harness.callHook('agent_start')
await harness.callHook('ui_prompt_start')
await harness.callHook('tool_execution_end', { toolName: 'bash' })
expect(harness.fetchMock).toHaveBeenCalledTimes(1)
finish?.()
await flushPosts()
const state = createHookListenerState()
const latest = JSON.parse(String(harness.fetchMock.mock.calls.at(-1)?.[1]?.body))
expect(latest.payload.hook_event_name).toBe('tool_execution_end')
expect(normalizeHookPayload(state, 'pi', latest, 'production')?.payload.state).toBe('waiting')
await harness.callHook('ui_prompt_end', {}, { isIdle: () => false })
await harness.callHook('tool_execution_start', { toolName: 'bash', args: { command: 'pwd' } })
finish?.()
await flushPosts()
const resumed = JSON.parse(String(harness.fetchMock.mock.calls.at(-1)?.[1]?.body))
expect(normalizeHookPayload(state, 'pi', resumed, 'production')?.payload.state).toBe('working')
finish?.()
await flushPosts()
})
it.each([
{ kind: 'omp' as const },
{ kind: 'prime-agent' as const },
{ kind: 'pi' as const, title: 'omp' }
])('does not add Pi prompt status to $kind ($title)', async (args) => {
const harness = createAgentStatusExtensionHarness(args)
await harness.callHook('ui_prompt_start')
await harness.callHook('ui_prompt_end', {}, { isIdle: () => true })
expect(harness.fetchMock).not.toHaveBeenCalled()
await harness.callHook('tool_call', { toolName: 'bash', input: { command: 'pwd' } })
const body = JSON.parse(String(harness.fetchMock.mock.calls[0]?.[1]?.body))
expect(body.payload.ui_prompt_active).toBeUndefined()
})
})
src/main/pi/titlebar-extension-service.ts
+1 -1
View File
@@ -150,7 +150,7 @@ export class PiTitlebarExtensionService {
if (kind !== 'prime-agent') {
this.writeManagedExtension(
join(extensionsDir, ORCA_PI_EXTENSION_FILE),
withOrcaManagedExtensionMarker(getPiTitlebarExtensionSource())
withOrcaManagedExtensionMarker(getPiTitlebarExtensionSource(kind))
)
this.writeManagedExtension(
join(extensionsDir, ORCA_PI_PREFILL_EXTENSION_FILE),
src/main/pi/titlebar-extension-source.test.ts
+346 -5
View File
@@ -3,6 +3,8 @@ import { runInNewContext } from 'node:vm'
import ts from 'typescript-api'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { detectAgentStatusFromTitle } from '../../shared/agent-detection'
import type { PiAgentKind } from '../../shared/pi-agent-kind'
import { getPiTitlebarExtensionSource } from './titlebar-extension-source'
const BRAILLE_RE = /[⠀-⣿]/
@@ -23,8 +25,19 @@ type Harness = {
const CWD = '/repo/orca-app'
const SESSION = 'omp-session'
const IDLE_TITLE = `π - ${SESSION} - orca-app`
const PROMPT_TITLE = `π ! ${SESSION} - orca-app`
function createHarness(options: { paneKey?: string; isIdle?: () => boolean } = {}): Harness {
function createHarness(
options: {
paneKey?: string
isIdle?: () => boolean
kind?: PiAgentKind
processTitle?: string
cwdImpl?: () => string
sessionNameImpl?: () => string
env?: Record<string, string>
} = {}
): Harness {
const titles: string[] = []
const ctx: TitlebarContext = {
ui: {
@@ -48,8 +61,11 @@ function createHarness(options: { paneKey?: string; isIdle?: () => boolean } = {
module,
exports: module.exports,
process: {
env: { ORCA_PANE_KEY: options.paneKey ?? 'pane-1' },
cwd: () => CWD
env: { ORCA_PANE_KEY: options.paneKey ?? 'pane-1', ...options.env },
pid: options.env?.ORCA_PI_TITLE_MARKER_OWNED === undefined ? 111 : 222,
title: options.processTitle ?? 'pi',
argv: ['node', 'pi'],
cwd: options.cwdImpl ?? (() => CWD)
},
console: { warn: vi.fn(), error: vi.fn(), log: vi.fn() },
Promise,
@@ -61,7 +77,7 @@ function createHarness(options: { paneKey?: string; isIdle?: () => boolean } = {
} as Record<string, unknown>
context.globalThis = context
const output = ts.transpileModule(getPiTitlebarExtensionSource(), {
const output = ts.transpileModule(getPiTitlebarExtensionSource(options.kind ?? 'pi'), {
compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 }
}).outputText
runInNewContext(output, context)
@@ -76,7 +92,7 @@ function createHarness(options: { paneKey?: string; isIdle?: () => boolean } = {
on(name: string, handler: HookHandler) {
handlers[name] = handler
},
getSessionName: () => SESSION
getSessionName: options.sessionNameImpl ?? (() => SESSION)
})
return {
@@ -247,4 +263,329 @@ describe('getPiTitlebarExtensionSource', () => {
expect(vi.getTimerCount()).toBe(0)
expect(harness.lastTitle()).toBe(IDLE_TITLE)
})
it('marks a mid-turn dialog as needing input and holds it against the spinner', async () => {
const harness = createHarness()
await harness.callHook('agent_start')
await harness.callHook('ui_prompt_start')
expect(harness.lastTitle()).toBe(PROMPT_TITLE)
expect(detectAgentStatusFromTitle(PROMPT_TITLE)).toBe('permission')
// Why: the spinner interval keeps running, but must not repaint over the marker.
await vi.advanceTimersByTimeAsync(800)
expect(harness.lastTitle()).toBe(PROMPT_TITLE)
await harness.callHook('ui_prompt_end')
expect(harness.lastTitle()).toMatch(BRAILLE_RE)
expect(vi.getTimerCount()).toBe(1)
})
it('returns an idle pane to its plain title when the dialog closes', async () => {
const harness = createHarness()
await harness.callHook('ui_prompt_start')
expect(harness.lastTitle()).toBe(PROMPT_TITLE)
await harness.callHook('ui_prompt_end')
expect(harness.lastTitle()).toBe(IDLE_TITLE)
expect(vi.getTimerCount()).toBe(0)
})
it('only the outermost of nested dialogs moves the title', async () => {
const harness = createHarness()
await harness.callHook('agent_start')
await harness.callHook('ui_prompt_start')
await harness.callHook('ui_prompt_start')
await harness.callHook('ui_prompt_end')
// Why: the outer dialog still holds input focus.
expect(harness.lastTitle()).toBe(PROMPT_TITLE)
await harness.callHook('ui_prompt_end')
expect(harness.lastTitle()).toMatch(BRAILLE_RE)
})
it('ignores an unmatched dialog close', async () => {
const harness = createHarness()
await harness.callHook('agent_start')
const titleCount = harness.titles.length
await harness.callHook('ui_prompt_end')
expect(harness.titles.length).toBe(titleCount)
})
it.each(['agent_settled', 'session_shutdown'])(
'keeps the marker when %s lands under an open dialog',
async (name) => {
const harness = createHarness()
await harness.callHook('agent_start')
await harness.callHook('ui_prompt_start')
await harness.callHook(name)
// Why: settling does not answer the dialog, so the pane still needs the user.
const expected = name === 'session_shutdown' ? IDLE_TITLE : PROMPT_TITLE
expect(harness.lastTitle()).toBe(expected)
// Why: settling stops the spinner but must leave the marker re-assert running, or
// pi's own next title write would silently retire a dialog that is still open.
expect(vi.getTimerCount()).toBe(name === 'session_shutdown' ? 0 : 1)
}
)
it('keeps the marker across an idle compaction that finishes under a dialog', async () => {
const harness = createHarness()
await harness.callHook('ui_prompt_start')
await harness.callHook('auto_compaction_start', { reason: 'idle' })
await harness.callHook('auto_compaction_end')
expect(harness.lastTitle()).toBe(PROMPT_TITLE)
})
it('recovers the spinner on a new turn when a dialog close was lost', async () => {
const harness = createHarness()
await harness.callHook('ui_prompt_start')
expect(harness.lastTitle()).toBe(PROMPT_TITLE)
// Why: a turn cannot start under a dialog holding input focus, so this is recovery.
await harness.callHook('agent_start')
await vi.advanceTimersByTimeAsync(80)
expect(harness.lastTitle()).toMatch(BRAILLE_RE)
})
it('leaves the marker to OMP approval events instead of painting it', () => {
expect(createHarness({ kind: 'omp' }).handlers.ui_prompt_start).toBeUndefined()
})
it('still caps idle maintenance while a dialog holds the title', async () => {
const harness = createHarness()
await harness.callHook('auto_compaction_start', { reason: 'idle' })
await harness.callHook('ui_prompt_start')
// Why: an open dialog must not suspend the cap that stops a stranded spinner.
vi.advanceTimersByTime(301_000)
// Why: the spinner is capped, but the marker re-assert survives it — the dialog is
// still open, so the pane must keep reporting that it needs input.
expect(vi.getTimerCount()).toBe(1)
expect(harness.lastTitle()).toBe(PROMPT_TITLE)
})
it('survives a dialog event that carries no ui context', async () => {
const harness = createHarness()
await harness.callHook('agent_start')
await expect(harness.handlers.ui_prompt_start?.({}, undefined)).resolves.toBeUndefined()
await expect(harness.handlers.ui_prompt_end?.({}, undefined)).resolves.toBeUndefined()
})
it('keeps spinning when the dialog event could not paint the marker', async () => {
const harness = createHarness()
await harness.callHook('agent_start')
await harness.handlers.ui_prompt_start?.({}, undefined)
// Why: suppressing frames without a marker would freeze the title mid-spinner, which
// still reads as working — the opposite of what the marker is for.
await vi.advanceTimersByTimeAsync(160)
expect(harness.lastTitle()).toMatch(BRAILLE_RE)
})
it('marks a nested dialog when the outer one could not paint', async () => {
const harness = createHarness()
await harness.callHook('agent_start')
await harness.handlers.ui_prompt_start?.({}, undefined)
await harness.callHook('ui_prompt_start')
// Why: the outer ctx cannot decide that the whole stack stays unmarked.
expect(harness.lastTitle()).toBe(PROMPT_TITLE)
})
it('clears the marker through the opening ctx when the close carries none', async () => {
const harness = createHarness()
await harness.callHook('ui_prompt_start')
expect(harness.lastTitle()).toBe(PROMPT_TITLE)
await harness.handlers.ui_prompt_end?.({}, undefined)
// Why: otherwise the pane asks for attention until the next turn.
expect(harness.lastTitle()).toBe(IDLE_TITLE)
})
it('does not reject when the dialog ctx can no longer paint', async () => {
const harness = createHarness()
const throwing = {
ui: {
setTitle: () => {
throw new Error('extension runner is no longer active')
}
}
}
await expect(harness.handlers.ui_prompt_start?.({}, throwing)).resolves.toBeUndefined()
// Why: the marker never went up, so the spinner must not stay suppressed.
await harness.callHook('agent_start')
await vi.advanceTimersByTimeAsync(80)
expect(harness.lastTitle()).toMatch(BRAILLE_RE)
})
it('does not reject when the captured ctx dies before the dialog closes', async () => {
const harness = createHarness()
let live = true
const dying = {
ui: {
setTitle: (title: string) => {
if (!live) {
throw new Error('extension runner is no longer active')
}
harness.titles.push(title)
}
}
}
await harness.handlers.ui_prompt_start?.({}, dying)
expect(harness.lastTitle()).toBe(PROMPT_TITLE)
live = false
// Why: the close carries no ui, so it falls back to the ctx the modal invalidated.
await expect(harness.handlers.ui_prompt_end?.({}, undefined)).resolves.toBeUndefined()
// Why: a later turn still recovers a clean title through a live ctx.
await harness.callHook('agent_start')
await vi.advanceTimersByTimeAsync(80)
expect(harness.lastTitle()).toMatch(BRAILLE_RE)
})
it('does not strand the marker when the closing ctx throws on ui access', async () => {
const harness = createHarness()
// Why: pi's ctx.ui is a getter that calls assertActive(); a session-replacing dialog
// invalidates the runner, so reading ctx.ui throws rather than yielding undefined.
const stale = {
get ui(): never {
throw new Error('This extension ctx is stale')
}
}
await harness.callHook('ui_prompt_start')
expect(harness.lastTitle()).toBe(PROMPT_TITLE)
await expect(harness.handlers.ui_prompt_end?.({}, stale as never)).resolves.toBeUndefined()
// Why: the opening ctx still paints, so the pane stops asking for input.
expect(harness.lastTitle()).toBe(IDLE_TITLE)
// Why: a stranded markerPainted would suppress every later working frame.
await harness.callHook('agent_start')
await vi.advanceTimersByTimeAsync(80)
expect(harness.lastTitle()).toMatch(BRAILLE_RE)
})
it('does not reject when the opening ctx throws on ui access', async () => {
const harness = createHarness()
const stale = {
get ui(): never {
throw new Error('This extension ctx is stale')
}
}
await harness.callHook('agent_start')
await expect(harness.handlers.ui_prompt_start?.({}, stale as never)).resolves.toBeUndefined()
// Why: no marker went up, so the spinner must keep running.
await vi.advanceTimersByTimeAsync(80)
expect(harness.lastTitle()).toMatch(BRAILLE_RE)
})
it('re-asserts the marker when pi repaints the title under a dialog', async () => {
const harness = createHarness()
await harness.callHook('agent_start')
await harness.callHook('ui_prompt_start')
expect(harness.lastTitle()).toBe(PROMPT_TITLE)
// Why: pi repaints on session_info_changed/rebindCurrentSession with no event we see,
// so a marker that is merely "not overwritten by us" would be silently lost.
harness.titles.push('π - other - orca-app')
await vi.advanceTimersByTimeAsync(80)
expect(harness.lastTitle()).toBe(PROMPT_TITLE)
})
it('re-asserts the marker on an idle pane with no spinner running', async () => {
const harness = createHarness()
await harness.callHook('ui_prompt_start')
expect(harness.lastTitle()).toBe(PROMPT_TITLE)
// Why: no turn is running, so renderFrame never fires — only the slow re-assert can
// undo a title pi writes from session_info_changed or its update-check restore.
harness.titles.push('\u03c0 - other - orca-app')
await vi.advanceTimersByTimeAsync(1000)
expect(harness.lastTitle()).toBe(PROMPT_TITLE)
await harness.callHook('ui_prompt_end')
expect(harness.lastTitle()).toBe(IDLE_TITLE)
expect(vi.getTimerCount()).toBe(0)
})
it('releases the marker when a session replacement drops the dialog', async () => {
const harness = createHarness()
await harness.callHook('ui_prompt_start')
expect(harness.lastTitle()).toBe(PROMPT_TITLE)
// Why: pi hides the dialog without resolving it, so no close is coming.
await harness.callHook('session_start', { reason: 'switch' })
expect(vi.getTimerCount()).toBe(0)
await harness.callHook('agent_start')
await vi.advanceTimersByTimeAsync(80)
expect(harness.lastTitle()).toMatch(BRAILLE_RE)
})
it('survives a deleted cwd instead of crashing the pi process', async () => {
const harness = createHarness({
cwdImpl: () => {
throw new Error('ENOENT: uv_cwd')
}
})
// Why: these run inside setInterval callbacks, where an escape is an uncaught
// exception and pi exits(1) through its own uncaughtException handler.
await expect(harness.callHook('agent_start')).resolves.toBeUndefined()
await expect(harness.callHook('ui_prompt_start')).resolves.toBeUndefined()
// Why: an unguarded throw in the interval would surface here as an unhandled error.
await vi.advanceTimersByTimeAsync(2000)
await expect(harness.callHook('ui_prompt_end')).resolves.toBeUndefined()
await expect(harness.callHook('agent_settled')).resolves.toBeUndefined()
})
it('survives a session name that throws on a stale runtime', async () => {
let live = true
const harness = createHarness({
sessionNameImpl: () => {
if (!live) {
throw new Error('This extension API is stale')
}
return SESSION
}
})
await harness.callHook('agent_start')
await harness.callHook('ui_prompt_start')
live = false
await vi.advanceTimersByTimeAsync(2000)
await expect(harness.callHook('ui_prompt_end')).resolves.toBeUndefined()
})
it('leaves the needs-input marker to the process that owns the pane', async () => {
// Why: child agents inherit ORCA_PANE_KEY, and a second process asserting the marker
// would report needs-input for a pane it does not speak for.
const harness = createHarness({ env: { ORCA_PI_TITLE_MARKER_OWNED: '111' } })
await harness.callHook('agent_start')
await harness.callHook('ui_prompt_start')
await vi.advanceTimersByTimeAsync(1000)
expect(harness.titles).not.toContain(PROMPT_TITLE)
expect(harness.lastTitle()).toMatch(BRAILLE_RE)
})
it('leaves an OMP runtime to its own approval events', () => {
const harness = createHarness({ processTitle: 'omp' })
expect(harness.handlers.ui_prompt_start).toBeDefined()
expect(() => harness.handlers.ui_prompt_start?.({}, undefined)).not.toThrow()
})
})
src/main/pi/titlebar-extension-source.ts
+157 -9
View File
@@ -1,7 +1,54 @@
import type { PiAgentKind } from '../../shared/pi-agent-kind'
import { getPiOmpRuntimeDetectionSourceLines } from './agent-status-runtime-detection-source'
export const ORCA_PI_EXTENSION_FILE = 'orca-titlebar-spinner.ts'
export function getPiTitlebarExtensionSource(): string {
export function getPiTitlebarExtensionSource(kind: PiAgentKind = 'pi'): string {
// Why: OMP reports input waits through its own approval events, which the status
// extension already maps, and it writes this same marker natively. The runtime check
// matters as well as the kind: a bare-shell OMP launch runs inside a pi-kind pane.
const uiPromptHandlers =
kind === 'pi'
? [
" pi.on('ui_prompt_start', async (_event, ctx) => {",
' if (isOmpRuntime() || !ownsMarker) return',
' promptDepth++',
' // Why: retry on every open rather than only the outermost, so an outer ctx',
' // that could not paint cannot decide the whole stack stays unmarked.',
' if (markerPainted) return',
' const painter = resolvePainter(ctx)',
' // Why: only hold the spinner off once the marker is actually up, or a ctx',
' // that cannot paint would freeze the title on its last working frame.',
" if (!paintTitle(painter, () => getMarkedTitle(pi, '!'))) return",
' markerPainted = true',
' promptCtx = painter',
' startMarkerReassert(painter)',
' })',
'',
" pi.on('ui_prompt_end', async (_event, ctx) => {",
' if (isOmpRuntime() || !ownsMarker || promptDepth === 0) return',
' promptDepth--',
' if (promptDepth > 0) return',
' // Why: the opening ctx already painted once, so a close whose own ctx is stale',
' // does not leave the needs-input marker up until the next turn.',
' const painter = resolvePainter(ctx) ?? promptCtx',
' markerPainted = false',
' promptCtx = null',
' stopMarkerReassert()',
' // Why: a still-live turn resumes its spinner in place; otherwise the pane is idle',
' // and must drop the needs-input marker rather than keep asking for attention.',
' if (timer) {',
' renderFrame(painter)',
' return',
' }',
' paintTitle(painter, () => getBaseTitle(pi))',
' })',
''
]
: []
return [
...(kind === 'pi' ? [...getPiOmpRuntimeDetectionSourceLines(`/hook/${kind}`), ''] : []),
'const BRAILLE_FRAMES = [',
" '\\u280b',",
" '\\u2819',",
@@ -16,36 +63,111 @@ export function getPiTitlebarExtensionSource(): string {
']',
'',
'const FRAME_INTERVAL_MS = 80',
'// Why: pi repaints the title from its own writers (session_info_changed, the win32',
'// update-check restore) with no event we observe, so the marker has to be re-asserted',
'// even when no spinner frame is due. Coarse on purpose: it only rewrites one string.',
'const MARKER_REASSERT_MS = 1000',
'const AGENT_END_IDLE_RECHECK_MS = 25',
'const AGENT_END_IDLE_RECHECK_MAX_MS = 250',
'// Why: a failed idle compaction can end without auto_compaction_end, and no agent turn will',
'// close a maintenance spinner — cap it so idle maintenance cannot strand a working title.',
'const IDLE_COMPACTION_MAX_FRAMES = Math.ceil(300000 / FRAME_INTERVAL_MS)',
'',
'function getBaseTitle(pi) {',
'// Why: `-` is the plain separator; `!` is the state marker Orca reads as needs-input',
'// (src/shared/pi-state-title-marker.ts), so mobile and the CLI see the wait too.',
'function getMarkedTitle(pi, marker) {',
' const cwd = process.cwd().split(/[\\\\/]/).filter(Boolean).at(-1) || process.cwd()',
' const session = pi.getSessionName()',
' return session ? `\\u03c0 - ${session} - ${cwd}` : `\\u03c0 - ${cwd}`',
' return session',
' ? `\\u03c0 ${marker} ${session} - ${cwd}`',
' : `\\u03c0 ${marker} ${cwd}`',
'}',
'',
'function getBaseTitle(pi) {',
" return getMarkedTitle(pi, '-')",
'}',
'',
'// Why: the ctx.ui pi passes is a getter that calls assertActive() and throws once a',
'// session-replacing dialog invalidates the runner; optional chaining cannot screen',
'// that out. Read it behind a try and never mutate state before a paint has succeeded.',
'function resolvePainter(ctx) {',
' try {',
" return typeof ctx?.ui?.setTitle === 'function' ? ctx : null",
' } catch {',
' return null',
' }',
'}',
'',
'// Why: buildTitle runs inside the try because it is not safe either — getSessionName()',
'// calls assertActive() and process.cwd() throws ENOENT once the worktree is deleted.',
'// Most call sites are timer callbacks, where an escape is an uncaught exception and pi',
'// exits(1) through its own uncaughtException handler.',
'function paintTitle(ctx, buildTitle) {',
' if (!ctx) return false',
' try {',
' ctx.ui.setTitle(buildTitle())',
' return true',
' } catch {',
' return false',
' }',
'}',
'',
'export default function (pi) {',
' if (!process.env.ORCA_PANE_KEY) return',
...(kind === 'pi'
? [
' // Why: child agents inherit the pane env, and the spinner is harmlessly',
' // per-process — but the needs-input marker is status the pane reports, so only',
' // one process may assert it. Mirrors ORCA_PI_STATUS_OWNED in the status hook.',
' const markerOwnerPid = process.env.ORCA_PI_TITLE_MARKER_OWNED',
' const ownsMarker = !markerOwnerPid || markerOwnerPid === String(process.pid)',
' if (ownsMarker) process.env.ORCA_PI_TITLE_MARKER_OWNED = String(process.pid)'
]
: []),
' let timer = null',
' let frameIndex = 0',
' // Why: only idle maintenance owns a spinner of its own. A threshold compaction runs',
' // inside an agent turn, whose spinner must outlive it, and any newer start clears the',
' // marker so a late idle completion cannot stop current work (#16470).',
' let idleCompactionOwnsSpinner = false',
' // Why: pi already collapses nested prompts into one start/end pair, so this counter',
' // guards a close that never arrives, not nesting. A new turn cannot start under a',
' // dialog holding input focus, so agent_start doubles as recovery.',
' let promptDepth = 0',
' let markerPainted = false',
' let promptCtx = null',
' // Why: a separate handle from `timer`, which clearAnimation() nulls — the marker must',
' // survive a turn settling, a shutdown of the spinner, and the idle-maintenance cap.',
' let markerTimer = null',
' let pendingAgentEndCheck = null',
' let pendingAgentEndContext = null',
' let agentEndIdleRecheckMs = AGENT_END_IDLE_RECHECK_MS',
'',
' function resetPromptState() {',
' stopMarkerReassert()',
' promptDepth = 0',
' markerPainted = false',
' promptCtx = null',
' }',
'',
' function clearPendingAgentEndCheck() {',
' if (pendingAgentEndCheck !== null) clearTimeout(pendingAgentEndCheck)',
' pendingAgentEndCheck = null',
' pendingAgentEndContext = null',
' }',
'',
' function stopMarkerReassert() {',
' if (markerTimer) clearInterval(markerTimer)',
' markerTimer = null',
' }',
'',
' function startMarkerReassert(ctx) {',
' stopMarkerReassert()',
" markerTimer = setInterval(() => paintTitle(ctx, () => getMarkedTitle(pi, '!')), MARKER_REASSERT_MS)",
" if (typeof markerTimer.unref === 'function') markerTimer.unref()",
' }',
'',
' function clearAnimation() {',
' if (timer) {',
' clearInterval(timer)',
@@ -58,19 +180,35 @@ export function getPiTitlebarExtensionSource(): string {
' function stopAnimation(ctx) {',
' clearPendingAgentEndCheck()',
' clearAnimation()',
' ctx.ui.setTitle(getBaseTitle(pi))',
' // Why: settling under an open dialog still leaves the pane waiting on the user, so',
' // the idle title must not retire the marker the dialog is holding.',
" paintTitle(ctx, () => (markerPainted ? getMarkedTitle(pi, '!') : getBaseTitle(pi)))",
' }',
'',
' function renderFrame(ctx) {',
' // Why: the maintenance cap runs before the dialog guard so a dialog left open',
' // cannot suspend it; stopAnimation keeps the marker while a dialog is open.',
' if (idleCompactionOwnsSpinner && frameIndex >= IDLE_COMPACTION_MAX_FRAMES) {',
' stopAnimation(ctx)',
' return',
' }',
' const frame = BRAILLE_FRAMES[frameIndex % BRAILLE_FRAMES.length]',
' const cwd = process.cwd().split(/[\\\\/]/).filter(Boolean).at(-1) || process.cwd()',
' const session = pi.getSessionName()',
' const title = session ? `${frame} \\u03c0 - ${session} - ${cwd}` : `${frame} \\u03c0 - ${cwd}`',
' ctx.ui.setTitle(title)',
' // Why: an 80ms working frame would repaint over the needs-input marker within one',
' // tick, so a mid-turn dialog would still look busy everywhere the title is the',
' // only evidence. Re-assert rather than skip: pi repaints the title on its own',
' // (session_info_changed, resetExtensionUI, rebindCurrentSession) and would',
' // otherwise wipe the marker with nothing to restore it. The frame still counts,',
' // so the cap above keeps accruing in wall-clock.',
' if (markerPainted) {',
" paintTitle(ctx, () => getMarkedTitle(pi, '!'))",
' frameIndex++',
' return',
' }',
' paintTitle(ctx, () => {',
' const frame = BRAILLE_FRAMES[frameIndex % BRAILLE_FRAMES.length]',
' const cwd = process.cwd().split(/[\\\\/]/).filter(Boolean).at(-1) || process.cwd()',
' const session = pi.getSessionName()',
' return session ? `${frame} \\u03c0 - ${session} - ${cwd}` : `${frame} \\u03c0 - ${cwd}`',
' })',
' frameIndex++',
' }',
'',
@@ -101,9 +239,17 @@ export function getPiTitlebarExtensionSource(): string {
' }',
'',
" pi.on('agent_start', async (_event, ctx) => {",
' resetPromptState()',
' startAnimation(ctx)',
' })',
'',
' // Why: pi drops an open dialog through resetExtensionUI without resolving its promise,',
' // so a replaced or reloaded session never sends the matching close. Both boundaries',
' // prove no dialog from the old session is still on screen.',
" pi.on('session_start', async () => {",
' resetPromptState()',
' })',
'',
' // Why: modern Pi/OMP emit agent_end mid-run and only settle later, so settlement is the',
' // authoritative completion boundary. Legacy runtimes never emit it, so agent_end stays.',
" pi.on('agent_settled', async (_event, ctx) => {",
@@ -126,6 +272,7 @@ export function getPiTitlebarExtensionSource(): string {
" if (typeof pendingAgentEndCheck.unref === 'function') pendingAgentEndCheck.unref()",
' })',
'',
...uiPromptHandlers,
" pi.on('auto_compaction_start', async (event, ctx) => {",
" if (event?.reason !== 'idle') return",
' // Why: the idle worker can fire against a turn that just started, and reason alone does',
@@ -142,6 +289,7 @@ export function getPiTitlebarExtensionSource(): string {
' })',
'',
" pi.on('session_shutdown', async (_event, ctx) => {",
' resetPromptState()',
' stopAnimation(ctx)',
' })',
'}',
src/main/runtime/mobile-session-terminal-retirement-proof.test.ts
+89 -1
View File
@@ -1,7 +1,95 @@
import { describe, expect, it } from 'vitest'
import { appendRetiredTerminalSurfaceProofs } from './mobile-session-terminal-retirement-proof'
import {
appendRetiredTerminalSurfaceProofs,
preserveTerminalRetirementProofs
} from './mobile-session-terminal-retirement-proof'
import type { RuntimeMobileSessionTabsSnapshot } from '../../shared/runtime-types'
const retired = {
parentTabId: 'tab',
leafId: 'leaf',
ptyId: 'pty',
terminal: 'term',
incarnationId: 'inc'
}
function snapshot(
overrides: Partial<RuntimeMobileSessionTabsSnapshot> = {}
): RuntimeMobileSessionTabsSnapshot {
return {
worktree: 'worktree',
worktreeInstanceId: 'instance',
publicationEpoch: 'epoch',
snapshotVersion: 1,
activeGroupId: null,
activeTabId: null,
activeTabType: null,
tabs: [],
...overrides
}
}
describe('mobile session terminal retirement proofs', () => {
it.each([{ worktree: 'another-worktree' }, { worktreeInstanceId: 'successor-instance' }])(
'does not copy retirement proof into a different workspace: %j',
(identity) => {
const next = snapshot(identity)
expect(
preserveTerminalRetirementProofs(next, snapshot({ retiredTerminalSurfaces: [retired] }))
).toBe(next)
}
)
// Why: host-authored writes never carry worktreeInstanceId. Without inheritance the stored
// entry forgets the occupant and renderer(A) -> host write -> renderer(B) launders A's proofs.
it('does not launder proofs across occupants through an identity-less host write', () => {
const occupantA = snapshot({
worktreeInstanceId: 'instance-a',
retiredTerminalSurfaces: [retired]
})
const hostWrite = preserveTerminalRetirementProofs(
snapshot({ worktreeInstanceId: undefined, snapshotVersion: 2 }),
occupantA
)
expect(hostWrite.worktreeInstanceId).toBe('instance-a')
expect(hostWrite.retiredTerminalSurfaces).toEqual([retired])
const occupantB = snapshot({ worktreeInstanceId: 'instance-b', snapshotVersion: 3 })
expect(preserveTerminalRetirementProofs(occupantB, hostWrite)).toBe(occupantB)
})
it('keeps proofs for a host write that never learned any identity', () => {
const existing = snapshot({ worktreeInstanceId: undefined, retiredTerminalSurfaces: [retired] })
const next = preserveTerminalRetirementProofs(
snapshot({ worktreeInstanceId: undefined, snapshotVersion: 2 }),
existing
)
expect(next.worktreeInstanceId).toBeUndefined()
expect(next.retiredTerminalSurfaces).toEqual([retired])
})
it('drops an old proof when its surface is published again', () => {
const existing = snapshot({ retiredTerminalSurfaces: [retired] })
const revived = preserveTerminalRetirementProofs(
snapshot({
tabs: [
{
type: 'terminal',
id: 'tab::leaf',
parentTabId: 'tab',
leafId: 'leaf',
ptyId: 'successor-pty',
title: 'Successor',
isActive: false
}
]
}),
existing
)
expect(revived.retiredTerminalSurfaces).toEqual([])
expect(
preserveTerminalRetirementProofs(snapshot(), revived).retiredTerminalSurfaces
).toBeUndefined()
})
it('keeps the newest 64 exact identities', () => {
let proofs = appendRetiredTerminalSurfaceProofs(
undefined,
src/main/runtime/mobile-session-terminal-retirement-proof.ts
+45 -23
View File
@@ -1,28 +1,50 @@
import type { RuntimeMobileSessionRetiredTerminalSurface } from '../../shared/runtime-types'
import type { RuntimeMobileSessionTabsSnapshot } from '../../shared/runtime-types'
import {
appendRetiredTerminalSurfaceProofs,
dropRetirementProofsForLiveSurfaces
} from '../../shared/terminal-retirement-proof-ledger'
const MAX_RETIRED_TERMINAL_SURFACE_PROOFS = 64
export {
appendRetiredTerminalSurfaceProofs,
dropRetirementProofsForLiveSurfaces
} from '../../shared/terminal-retirement-proof-ledger'
export function appendRetiredTerminalSurfaceProofs(
existing: readonly RuntimeMobileSessionRetiredTerminalSurface[] | undefined,
retired: readonly RuntimeMobileSessionRetiredTerminalSurface[]
): RuntimeMobileSessionRetiredTerminalSurface[] {
const next = new Map(
(existing ?? []).map((surface) => [
`${surface.parentTabId}\0${surface.leafId}\0${surface.terminal}`,
surface
])
)
for (const evidence of retired) {
const key = `${evidence.parentTabId}\0${evidence.leafId}\0${evidence.terminal}`
next.delete(key)
next.set(key, evidence)
/**
* Renderer snapshots omit the host's durable close acknowledgements; carry them forward.
*
* Why the identity inheritance: host-authored writes never set `worktreeInstanceId`. Without it
* the stored entry forgets which occupant minted the proofs, and renderer(A) -> host write ->
* renderer(B) would launder A's proofs into B.
*/
export function preserveTerminalRetirementProofs(
snapshot: RuntimeMobileSessionTabsSnapshot,
existing: RuntimeMobileSessionTabsSnapshot | undefined
): RuntimeMobileSessionTabsSnapshot {
if (!existing || existing.worktree !== snapshot.worktree) {
return snapshot
}
while (next.size > MAX_RETIRED_TERMINAL_SURFACE_PROOFS) {
const oldest = next.keys().next().value
if (typeof oldest !== 'string') {
break
}
next.delete(oldest)
if (
existing.worktreeInstanceId !== undefined &&
snapshot.worktreeInstanceId !== undefined &&
existing.worktreeInstanceId !== snapshot.worktreeInstanceId
) {
return snapshot
}
const identified =
snapshot.worktreeInstanceId === undefined && existing.worktreeInstanceId !== undefined
? { ...snapshot, worktreeInstanceId: existing.worktreeInstanceId }
: snapshot
if (!existing.retiredTerminalSurfaces?.length) {
return identified
}
return {
...identified,
retiredTerminalSurfaces: dropRetirementProofsForLiveSurfaces(
appendRetiredTerminalSurfaceProofs(
existing.retiredTerminalSurfaces,
snapshot.retiredTerminalSurfaces ?? []
),
snapshot.tabs
)
}
return [...next.values()]
}
src/main/runtime/orca-runtime-fence-automation-owner.ts → src/main/runtime/orca-runtime-automation-operations.ts
+1 -5
View File
@@ -23,7 +23,7 @@ import type { LegacyWorkerTerminalRecoveryResult } from './runtime-legacy-worker
import { makePaneKey } from '../../shared/stable-pane-id'
import { runtimeWorktreeIdsEqual } from './runtime-worktree-path-identity'
export class OrcaRuntimeWithFenceAutomationOwner extends OrcaRuntimeWithPtyForegroundProcessReads {
export class OrcaRuntimeWithAutomationOperations extends OrcaRuntimeWithPtyForegroundProcessReads {
protected fenceAutomationOwner(
id: string,
expectedOwner: AutomationOwnerPrecondition | undefined,
@@ -167,10 +167,6 @@ export class OrcaRuntimeWithFenceAutomationOwner extends OrcaRuntimeWithPtyForeg
this.scheduleRestoredMessageRepoints()
}
prepareLegacyWorkerTerminalRecovery(): LegacyWorkerTerminalRecoveryPlan {
return this.legacyWorkerRecovery.prepare()
}
protected async flushWorkspaceSessionOrThrowAsync(): Promise<void> {
const store = this.store
if (store?.flushPendingOrThrowAsync) {
src/main/runtime/orca-runtime-create-runtime-owned-mobile-session-terminal.ts
+4 -2
View File
@@ -141,8 +141,10 @@ export class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal extends Orca
...(existing?.tabGroupLayout ? { tabGroupLayout: existing.tabGroupLayout } : {}),
tabs
}
this.storeMobileSessionSnapshot(worktreeId, next)
const result = this.toMobileSessionTabsResult(next)
// Why: emit the stored snapshot, not the pre-store one — storing grafts on retirement
// proofs, and subscribers dedupe on version so they would never see them otherwise.
const stored = this.storeMobileSessionSnapshot(worktreeId, next)
const result = this.toMobileSessionTabsResult(stored)
const changeSequence = ++this.mobileSessionTabsChangeSequence
for (const subscription of this.mobileSessionTabListeners) {
subscription.listener(
src/main/runtime/orca-runtime-has-exact-persisted-terminal-surface-identity.ts
+2 -2
View File
@@ -1,5 +1,5 @@
// @ts-nocheck -- mechanically split from OrcaRuntimeService; behavior is covered by AST equivalence and characterization tests.
import { OrcaRuntimeWithFenceAutomationOwner } from './orca-runtime-fence-automation-owner'
import { OrcaRuntimeWithAutomationOperations } from './orca-runtime-automation-operations'
import {
resolveTerminalSessionWorktreeId,
runtimeWorktreeIdsEqual
@@ -26,7 +26,7 @@ import type {
ArtifactWriteRequest
} from '../../shared/artifacts'
export class OrcaRuntimeWithHasExactPersistedTerminalSurfaceIdentity extends OrcaRuntimeWithFenceAutomationOwner {
export class OrcaRuntimeWithHasExactPersistedTerminalSurfaceIdentity extends OrcaRuntimeWithAutomationOperations {
protected hasExactPersistedTerminalSurfaceIdentity(expected: {
worktreeId: string
tabId: string
src/main/runtime/orca-runtime-preserved-branch-cleanup.ts
+1 -2
View File
@@ -136,8 +136,7 @@ export class OrcaRuntimeWithPreservedBranchCleanup extends OrcaRuntimeWithTermin
new RuntimeLegacyWorkerTerminalRecoveryPersistence(
() => this.store,
() => this.getOrchestrationDb(),
(worktreeId) => this.tryGetWorkspaceSessionHostIdForWorktree(worktreeId),
(paneKey, blocked) => this.notifier?.setLegacyWorkerTerminalResumeFence?.(paneKey, blocked)
(worktreeId) => this.tryGetWorkspaceSessionHostIdForWorktree(worktreeId)
)
protected readonly legacyWorkerRecovery = new RuntimeLegacyWorkerTerminalRecoveryController({
src/main/runtime/orca-runtime-register-pty.ts
+9
View File
@@ -80,6 +80,15 @@ export class OrcaRuntimeWithRegisterPty extends OrcaRuntimeWithInvalidateAllHand
...(binding && paneKey ? { tabId: binding.tabId, paneKey } : {}),
...(binding?.incarnationId ? { incarnationId: binding.incarnationId } : {})
})
const hostScope = this.getOrchestrationCompatibilityHostScope(pty)
if (paneKey && binding?.incarnationId && hostScope) {
this._orchestrationDb?.retainReplacedWorkerTerminalResources({
paneKey,
worktreeId,
hostScope: JSON.stringify(hostScope),
processIncarnation: `${ptyId}:${binding.incarnationId}`
})
}
const agentLaunchAuthority = binding?.agentLaunchAuthority
if (
agentLaunchAuthority &&
src/main/runtime/orca-runtime-restore-structured-agent-session-tabs-once.ts
+4 -4
View File
@@ -124,9 +124,9 @@ export class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce extends OrcaRu
),
tabs: existing.tabs.map((tab) => ({ ...tab, isActive: tab.id === id }))
}
this.storeMobileSessionSnapshot(input.workspaceId, snapshot)
const stored = this.storeMobileSessionSnapshot(input.workspaceId, snapshot)
if (input.notify !== false) {
this.emitMobileSessionTabsSnapshot(snapshot)
this.emitMobileSessionTabsSnapshot(stored)
}
return
}
@@ -174,9 +174,9 @@ export class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce extends OrcaRu
...(existing?.tabGroupLayout ? { tabGroupLayout: existing.tabGroupLayout } : {}),
tabs
}
this.storeMobileSessionSnapshot(input.workspaceId, snapshot)
const stored = this.storeMobileSessionSnapshot(input.workspaceId, snapshot)
if (input.notify !== false) {
this.emitMobileSessionTabsSnapshot(snapshot)
this.emitMobileSessionTabsSnapshot(stored)
}
}
src/main/runtime/orca-runtime-runtime-id.ts
+2
View File
@@ -1,5 +1,6 @@
// @ts-nocheck -- mechanically split from OrcaRuntimeService; behavior is covered by AST equivalence and characterization tests.
import { randomUUID } from 'node:crypto'
import { preserveTerminalRetirementProofs } from './mobile-session-terminal-retirement-proof'
import { getStructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-registry'
import { replaceConversationInSnapshot } from './structured-conversation-tab-replacement'
import type { RuntimeStore } from './runtime-store-contract'
@@ -107,6 +108,7 @@ export class OrcaRuntimeWithRuntimeId {
snapshot = replaceConversationInSnapshot(snapshot, replacement)
}
const existing = this.mobileSessionTabsByWorktree.get(worktreeId)
snapshot = preserveTerminalRetirementProofs(snapshot, existing)
const snapshotVersion = existing
? Math.max(snapshot.snapshotVersion, existing.snapshotVersion + 1)
: snapshot.snapshotVersion
src/main/runtime/orca-runtime-subscribe-to-terminal-resize.ts
+1 -13
View File
@@ -54,16 +54,6 @@ export class OrcaRuntimeWithSubscribeToTerminalResize extends OrcaRuntimeWithApp
// dispatch contexts immediately, rather than waiting for the coordinator's
// next poll cycle. This catches agent crashes and unexpected exits within
// milliseconds. The task is set back to 'pending' so it can be re-dispatched.
/** A worker settled by its own process exit makes its pane fenceable now, not at the next app
* start; a fence sweep must never fail the exit path behind it. */
private sweepSettledWorkerResumeFencesAfterExit(): void {
try {
this.prepareLegacyWorkerTerminalRecovery()
} catch (error) {
console.warn('[orchestration] settled worker resume fence sweep failed', error)
}
}
protected failActiveDispatchOnExit(
handle: string,
paneKey: string | null,
@@ -90,7 +80,6 @@ export class OrcaRuntimeWithSubscribeToTerminalResize extends OrcaRuntimeWithApp
const stopping = this._orchestrationDb.getWorkerDispatch?.(dispatch.id)
if (stopping?.state === 'stopping' && stopping.runtime_epoch === this.getRuntimeId()) {
this._orchestrationDb.settleWorkerStop(dispatch.id)
this.sweepSettledWorkerResumeFencesAfterExit()
return
}
@@ -99,7 +88,6 @@ export class OrcaRuntimeWithSubscribeToTerminalResize extends OrcaRuntimeWithApp
workerProcessExited: true,
terminationReason: cause.kind
})
this.sweepSettledWorkerResumeFencesAfterExit()
if (isDeliberateTerminalExit(cause)) {
return
}
@@ -145,7 +133,7 @@ export class OrcaRuntimeWithSubscribeToTerminalResize extends OrcaRuntimeWithApp
exitCause: cause,
handle
}),
...(recipient.runId ? { runId: recipient.runId } : {})
runId: dispatch.run_id
})
this.notifyMessageArrived(escalation.to_handle, escalation.type)
} catch (error) {
src/main/runtime/orca-runtime-tests/lineage-and-scan-cache-part-05.spec.ts
+4 -1
View File
@@ -95,7 +95,10 @@ describe('OrcaRuntimeService', () => {
return [name, createRootDispatch(db, task.id, handles[name], paneKey(name))]
})
)
const legacyTask = db.createTask({ spec: 'legacy worker' })
const legacyTask = db.createTask({
runId: 'run_legacy_local',
spec: 'legacy worker'
})
const legacyDispatch = createRootDispatch(
db,
legacyTask.id,
src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-02.spec.ts
+10 -2
View File
@@ -216,7 +216,10 @@ describe('OrcaRuntimeService', () => {
runtime as unknown as {
leaves: Map<
string,
{ lastAgentStatus: string | null; lastAgentStatusObservedLive: boolean }
{
lastAgentStatus: string | null
lastAgentStatusObservedLive: boolean
}
>
}
).leaves.values()
@@ -415,7 +418,12 @@ describe('OrcaRuntimeService', () => {
const [terminal] = (await runtime.listTerminals()).terminals
runtime.onPtyData('pty-1', '\x1b]0;Codex working\x07', 100)
db.insertMessage({ from: 'term_worker', to: terminal.handle, subject: 'pending' })
db.insertMessage({
runId: 'run_legacy_local',
from: 'term_worker',
to: terminal.handle,
subject: 'pending'
})
runtime.notifyMessageArrived(terminal.handle, 'status')
db.close()
src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-02.spec.ts
+2 -5
View File
@@ -390,7 +390,7 @@ describe('OrcaRuntimeService', () => {
expect(getSession().terminalTopologyRevisionByRepoId?.[TEST_REPO_ID]).toBe(1)
})
it('fences provider resume and reveals one exact live legacy worker without stealing focus', async () => {
it('reveals one exact live legacy worker without stealing focus', async () => {
const workerLeafId = HEADLESS_LEAF_ID
const coordinatorLeafId = HEADLESS_SECOND_LEAF_ID
const workerPaneKey = `legacy-worker:${workerLeafId}`
@@ -526,10 +526,7 @@ describe('OrcaRuntimeService', () => {
resolveLegacyWorkerTerminalRecovery
} as never)
runtime.prepareLegacyWorkerTerminalRecovery()
expect(
getSession().sleepingAgentSessionsByPaneKey?.[workerPaneKey]?.automaticResumeBlockedBy
).toBe('legacy-orchestration-worker')
expect(getSession().sleepingAgentSessionsByPaneKey?.[workerPaneKey]).toBeDefined()
const recovered = await runtime.reconcileLegacyWorkerTerminals({
materializeRenderer: true
src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-03.spec.ts
+5 -7
View File
@@ -17,7 +17,7 @@ import {
} from '../orca-runtime-test-scenario-builders.spec'
describe('OrcaRuntimeService', () => {
it('retries renderer reveal before clearing an adopted legacy worker resume fence', async () => {
it('retries renderer reveal before clearing an adopted legacy worker sleeping record', async () => {
const workerPaneKey = `legacy-worker:${HEADLESS_LEAF_ID}`
const incarnationId = '44444444-4444-4444-8444-444444444444'
const session: WorkspaceSessionState = {
@@ -106,7 +106,7 @@ describe('OrcaRuntimeService', () => {
expect(resolveLegacyWorkerTerminalRecovery).toHaveBeenCalledWith(workerPaneKey, 'adopted')
})
it('keeps a revealed worker fenced until its exact renderer graph is published', async () => {
it('defers a revealed worker until its exact renderer graph is published', async () => {
vi.useFakeTimers()
try {
const harness = makePostRevealWorkerRecoveryHarness(() => true)
@@ -288,7 +288,7 @@ describe('OrcaRuntimeService', () => {
}
})
it('keeps recovery fenced when the renderer omits the exact reveal identity', async () => {
it('defers recovery when the renderer omits the exact reveal identity', async () => {
const harness = makePostRevealWorkerRecoveryHarness(() => false)
harness.revealTerminalSession.mockResolvedValue({ tabId: 'legacy-post-reveal' })
@@ -417,7 +417,7 @@ describe('OrcaRuntimeService', () => {
)
})
it('keeps the legacy worker resume fence in memory when persistence fails', async () => {
it('keeps the legacy worker sleeping record in memory when persistence fails', async () => {
const workerPaneKey = `legacy-worker:${HEADLESS_LEAF_ID}`
const incarnationId = '99999999-9999-4999-8999-999999999999'
const session: WorkspaceSessionState = {
@@ -526,9 +526,7 @@ describe('OrcaRuntimeService', () => {
})
expect(flushPendingOrThrowAsync).toHaveBeenCalledTimes(2)
expect(revealTerminalSession).toHaveBeenCalledOnce()
expect(
getSession().sleepingAgentSessionsByPaneKey?.[workerPaneKey]?.automaticResumeBlockedBy
).toBe('legacy-orchestration-worker')
expect(getSession().sleepingAgentSessionsByPaneKey?.[workerPaneKey]).toBeDefined()
expect(getSession().sleepingAgentSessionsByPaneKey?.[concurrentPaneKey]?.tabId).toBe(
'concurrent-tab'
)
src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-04.spec.ts
+10 -10
View File
@@ -56,7 +56,10 @@ describe('OrcaRuntimeService', () => {
)
const db = new OrchestrationDb(':memory:')
try {
const task = db.createTask({ spec: 'continue after missing worker recovery' })
const task = db.createTask({
runId: 'run_legacy_local',
spec: 'continue after missing worker recovery'
})
const started = db.createStartingWorkerDispatch({
creator: { kind: 'system' },
maxDepth: Number.MAX_SAFE_INTEGER,
@@ -163,7 +166,10 @@ describe('OrcaRuntimeService', () => {
)
const db = new OrchestrationDb(':memory:')
try {
const task = db.createTask({ spec: 'retry missing worker recovery' })
const task = db.createTask({
runId: 'run_legacy_local',
spec: 'retry missing worker recovery'
})
const started = db.createStartingWorkerDispatch({
creator: { kind: 'system' },
maxDepth: Number.MAX_SAFE_INTEGER,
@@ -328,10 +334,7 @@ describe('OrcaRuntimeService', () => {
resolveLegacyWorkerTerminalRecovery
} as never)
runtime.prepareLegacyWorkerTerminalRecovery()
expect(
getSession().sleepingAgentSessionsByPaneKey?.[workerPaneKey]?.automaticResumeBlockedBy
).toBe('legacy-orchestration-worker')
expect(getSession().sleepingAgentSessionsByPaneKey?.[workerPaneKey]).toBeDefined()
await expect(runtime.reconcileLegacyWorkerTerminals()).resolves.toMatchObject({
adoptedDispatchIds: ['dispatch-exited-two'],
@@ -445,9 +448,7 @@ describe('OrcaRuntimeService', () => {
exitedDispatchIds: [],
deferredDispatchIds: ['dispatch-inventory-unavailable']
})
expect(
getSession().sleepingAgentSessionsByPaneKey?.[workerPaneKey]?.automaticResumeBlockedBy
).toBe('legacy-orchestration-worker')
expect(getSession().sleepingAgentSessionsByPaneKey?.[workerPaneKey]).toBeDefined()
expect(resolveLegacyWorkerTerminalRecovery).not.toHaveBeenCalled()
expect(listProcesses).toHaveBeenCalledOnce()
expect(getSession().tabsByWorktree[TEST_WORKTREE_ID]).toEqual([])
@@ -477,7 +478,6 @@ describe('OrcaRuntimeService', () => {
try {
const runtime = new OrcaRuntimeService(store)
const reconcile = vi.spyOn(runtime, 'reconcileLegacyWorkerTerminals').mockResolvedValue({
blockedPaneCount: 1,
adoptedDispatchIds: [],
exitedDispatchIds: [],
deferredDispatchIds: []
src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-05.spec.ts
+4 -81
View File
@@ -18,13 +18,12 @@ import {
TEST_WORKTREE_PATH,
makeFolderProjectGroup,
makeFolderWorkspace,
makeRuntimeStoreWithWorkspaceSession,
store
makeRuntimeStoreWithWorkspaceSession
} from '../orca-runtime-test-fixtures.spec'
import { publishLegacyWorkerReveal } from '../orca-runtime-test-scenario-builders.spec'
describe('OrcaRuntimeService', () => {
it('keeps live workers fenced without exact controller identity evidence', async () => {
it('defers live workers without exact controller identity evidence', async () => {
const incarnationId = '56565656-5656-4656-8656-565656565656'
const cases = [
{
@@ -152,8 +151,7 @@ describe('OrcaRuntimeService', () => {
for (const { name, leafId } of cases.slice(0, 2)) {
expect(
getSession().sleepingAgentSessionsByPaneKey?.[`legacy-${name}:${leafId}`]
?.automaticResumeBlockedBy
).toBe('legacy-orchestration-worker')
).toBeDefined()
}
for (const { name, leafId } of cases.slice(2)) {
expect(
@@ -374,12 +372,7 @@ describe('OrcaRuntimeService', () => {
} as never)
try {
expect(runtime.prepareLegacyWorkerTerminalRecovery()).toMatchObject({
blockedPanes: [expect.objectContaining({ paneKey: workerPaneKey })]
})
expect(
sshSession.sleepingAgentSessionsByPaneKey?.[workerPaneKey]?.automaticResumeBlockedBy
).toBe('legacy-orchestration-worker')
expect(sshSession.sleepingAgentSessionsByPaneKey?.[workerPaneKey]).toBeDefined()
expect(localSession.sleepingAgentSessionsByPaneKey?.[workerPaneKey]).toBeUndefined()
await expect(
runtime.reconcileLegacyWorkerTerminals({
@@ -422,74 +415,4 @@ describe('OrcaRuntimeService', () => {
}
})
})
it('fences an unresolved folder legacy worker in its exact retained session partition', () => {
const connectionId = 'ssh-unresolved-folder'
const worktreeId = 'folder:missing-folder'
const workerPaneKey = `legacy-unresolved-folder-worker:${HEADLESS_LEAF_ID}`
const remoteInitialSession: WorkspaceSessionState = {
...getDefaultWorkspaceSession(),
tabsByWorktree: { [worktreeId]: [] },
sleepingAgentSessionsByPaneKey: {
[workerPaneKey]: {
paneKey: workerPaneKey,
tabId: 'legacy-unresolved-folder-worker',
worktreeId,
agent: 'codex',
providerSession: { key: 'session_id', id: 'legacy-unresolved-folder-session' },
prompt: 'continue',
state: 'working',
capturedAt: 1,
updatedAt: 1,
origin: 'live',
connectionId
}
}
}
const localSession = getDefaultWorkspaceSession()
let remoteSession = remoteInitialSession
const getWorkspaceSession = vi.fn((hostId?: string | null) =>
hostId === `ssh:${connectionId}` ? remoteSession : localSession
)
const setWorkspaceSession = vi.fn((next: WorkspaceSessionState, hostId?: string | null) => {
if (hostId !== `ssh:${connectionId}`) {
throw new Error(`unexpected workspace-session host ${hostId ?? 'default'}`)
}
remoteSession = next
})
const runtime = new OrcaRuntimeService({
...store,
getFolderWorkspaces: () => [],
getWorkspaceSession,
getWorkspaceSessionHostIds: () => ['local', `ssh:${connectionId}`],
setWorkspaceSession,
flushOrThrow: vi.fn()
} as never)
runtime.setOrchestrationDb({
listLegacyWorkerTerminalRecoveryRows: () => [
{
dispatch_id: 'dispatch-unresolved-folder',
task_id: 'task-unresolved-folder',
dispatch_status: 'completed',
contract_version: 0,
assignee_handle: 'term_unresolved_folder',
assignee_pane_key: workerPaneKey,
process_incarnation: 'pty-unresolved-folder:68686868-6868-4868-8868-686868686868',
worker_state: 'ready',
worktree_id: worktreeId,
agent_terminal_handle: 'term_unresolved_folder'
}
]
} as unknown as OrchestrationDb)
expect(runtime.prepareLegacyWorkerTerminalRecovery()).toMatchObject({
blockedPanes: [expect.objectContaining({ paneKey: workerPaneKey, worktreeId })]
})
expect(
remoteSession.sleepingAgentSessionsByPaneKey?.[workerPaneKey]?.automaticResumeBlockedBy
).toBe('legacy-orchestration-worker')
expect(localSession.sleepingAgentSessionsByPaneKey?.[workerPaneKey]).toBeUndefined()
expect(setWorkspaceSession).toHaveBeenCalledOnce()
expect(setWorkspaceSession).toHaveBeenCalledWith(expect.any(Object), `ssh:${connectionId}`)
})
})
src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-06.spec.ts
+3 -7
View File
@@ -153,11 +153,8 @@ describe('OrcaRuntimeService', () => {
deferredDispatchIds: ['dispatch-ssh']
})
expect(listProcesses).not.toHaveBeenCalled()
expect(
getSession().sleepingAgentSessionsByPaneKey?.[workerPaneKey]?.automaticResumeBlockedBy
).toBe('legacy-orchestration-worker')
expect(getSession().sleepingAgentSessionsByPaneKey?.[workerPaneKey]).toBeDefined()
expect(localSession.sleepingAgentSessionsByPaneKey?.[workerPaneKey]).toBeUndefined()
expect(getWorkspaceSession).toHaveBeenCalledWith(`ssh:${connectionId}`)
await expect(
runtime.reconcileLegacyWorkerTerminals({
@@ -175,6 +172,7 @@ describe('OrcaRuntimeService', () => {
}
expect(getSession().sleepingAgentSessionsByPaneKey?.[workerPaneKey]).toBeUndefined()
expect(getWorkspaceSession).toHaveBeenCalledWith(`ssh:${connectionId}`)
expect(setWorkspaceSession).toHaveBeenCalledWith(expect.any(Object), `ssh:${connectionId}`)
expect(listProcesses).toHaveBeenCalledTimes(3)
expect(revealTerminalSession).toHaveBeenCalledWith(TEST_WORKTREE_ID, {
@@ -297,9 +295,7 @@ describe('OrcaRuntimeService', () => {
exitedDispatchIds: [],
deferredDispatchIds: ['dispatch-wsl']
})
expect(
getSession().sleepingAgentSessionsByPaneKey?.[workerPaneKey]?.automaticResumeBlockedBy
).toBe('legacy-orchestration-worker')
expect(getSession().sleepingAgentSessionsByPaneKey?.[workerPaneKey]).toBeDefined()
expect(revealTerminalSession).not.toHaveBeenCalled()
observedDistro = 'Ubuntu'
src/main/runtime/orchestration-messages-fake-parity.test.ts
+38 -8
View File
@@ -7,9 +7,13 @@ type PointerTarget = { ptyId: string; processIncarnation: string }
// The slice of the mailbox store the pointer batch selector depends on.
type PointerStore = {
insertMessage(message: { from: string; to: string; subject: string; type?: MessageType }): {
id: string
}
insertMessage(message: {
runId: string
from: string
to: string
subject: string
type?: MessageType
}): { id: string }
stageMailboxPointerEnter(ids: string[], target: PointerTarget): boolean
markMailboxPointerWriteAttempted(ids: string[], target: PointerTarget): boolean
getUndeliveredUnreadMessages(
@@ -32,7 +36,12 @@ describe.each(STORES)('mailbox pointer reservations (%s)', (_name, createStore)
it('refuses a claim another flight already holds', () => {
const store = createStore()
const message = store.insertMessage({ from: 'a', to: 'run:run-1', subject: 'contended' })
const message = store.insertMessage({
runId: 'run_legacy_local',
from: 'a',
to: 'run:run-1',
subject: 'contended'
})
expect(store.stageMailboxPointerEnter([message.id], rival)).toBe(true)
expect(store.stageMailboxPointerEnter([message.id], mine)).toBe(false)
@@ -41,8 +50,18 @@ describe.each(STORES)('mailbox pointer reservations (%s)', (_name, createStore)
it('rolls the whole batch back when one row is already claimed', () => {
const store = createStore()
const free = store.insertMessage({ from: 'a', to: 'run:run-1', subject: 'free' })
const taken = store.insertMessage({ from: 'a', to: 'run:run-1', subject: 'taken' })
const free = store.insertMessage({
runId: 'run_legacy_local',
from: 'a',
to: 'run:run-1',
subject: 'free'
})
const taken = store.insertMessage({
runId: 'run_legacy_local',
from: 'a',
to: 'run:run-1',
subject: 'taken'
})
expect(store.stageMailboxPointerEnter([taken.id], rival)).toBe(true)
expect(store.stageMailboxPointerEnter([free.id, taken.id], mine)).toBe(false)
@@ -52,8 +71,19 @@ describe.each(STORES)('mailbox pointer reservations (%s)', (_name, createStore)
it('applies the exclusion and limit the pointer batch selector relies on', () => {
const store = createStore()
store.insertMessage({ from: 'a', to: 'run:run-1', subject: 'reserved', type: 'escalation' })
const kept = store.insertMessage({ from: 'a', to: 'run:run-1', subject: 'kept' })
store.insertMessage({
runId: 'run_legacy_local',
from: 'a',
to: 'run:run-1',
subject: 'reserved',
type: 'escalation'
})
const kept = store.insertMessage({
runId: 'run_legacy_local',
from: 'a',
to: 'run:run-1',
subject: 'kept'
})
expect(
store
src/main/runtime/orchestration/coordinator-decision-gates.test.ts
+16 -4
View File
@@ -12,13 +12,14 @@ describe('coordinator decision-gate authority', () => {
it('opens a gate only for the sender-owned active Dispatch', () => {
db = new OrchestrationDb(':memory:')
const task = db.createTask({ spec: 'owned gate target' })
const task = db.createTask({ runId: 'run_legacy_local', spec: 'owned gate target' })
const dispatch = createRootDispatch(db, task.id, 'term_owner', 'tab_owner:leaf_owner')
const logs: string[] = []
openDecisionGateFromMessage(
db,
db.insertMessage({
runId: 'run_legacy_local',
from: 'term_owner',
to: 'term_coordinator',
subject: 'Need approval',
@@ -41,20 +42,27 @@ describe('coordinator decision-gate authority', () => {
it('rejects a gate targeting another active Dispatch without mutating either Task', () => {
db = new OrchestrationDb(':memory:')
const attackerTask = db.createTask({ spec: 'attacker assignment' })
const attackerTask = db.createTask({
runId: 'run_legacy_local',
spec: 'attacker assignment'
})
const attacker = createRootDispatch(
db,
attackerTask.id,
'term_attacker',
'tab_attacker:leaf_attacker'
)
const victimTask = db.createTask({ spec: 'victim assignment' })
const victimTask = db.createTask({
runId: 'run_legacy_local',
spec: 'victim assignment'
})
const victim = createRootDispatch(db, victimTask.id, 'term_victim', 'tab_victim:leaf_victim')
const logs: string[] = []
openDecisionGateFromMessage(
db,
db.insertMessage({
runId: 'run_legacy_local',
from: 'term_attacker',
to: 'term_coordinator',
subject: 'Block the victim',
@@ -79,12 +87,16 @@ describe('coordinator decision-gate authority', () => {
it('accepts the canonical sender of an imported federated Dispatch', () => {
db = new OrchestrationDb(':memory:')
const task = db.createTask({ spec: 'remote gate target' })
const task = db.createTask({
runId: 'run_legacy_local',
spec: 'remote gate target'
})
const dispatch = createRootDispatch(db, task.id, 'remote-worker')
openDecisionGateFromMessage(
db,
db.insertMessage({
runId: 'run_legacy_local',
from: `dispatch:${dispatch.id}`,
to: 'term_coordinator',
subject: 'Remote approval required',
src/main/runtime/orchestration/coordinator-dispatch-unobserved-prompt.test.ts
+3 -3
View File
@@ -66,7 +66,7 @@ describe('coordinator dispatch with an unobserved prompt', () => {
it('never re-pastes a preamble whose turn start was not observed', async () => {
db = new OrchestrationDb(':memory:')
const task = db.createTask({ spec: 'do the work' })
const task = db.createTask({ runId: 'run_legacy_local', spec: 'do the work' })
const runtime = createRuntime(new Error('agent_prompt_stalled'))
const logs: string[] = []
@@ -88,7 +88,7 @@ describe('coordinator dispatch with an unobserved prompt', () => {
it('lets a late worker report settle a dispatch whose prompt was unobserved', async () => {
db = new OrchestrationDb(':memory:')
const task = db.createTask({ spec: 'do the work' })
const task = db.createTask({ runId: 'run_legacy_local', spec: 'do the work' })
await dispatch(createRuntime(new Error('agent_prompt_stalled')), task.id, [])
const dispatchId = db.getDispatchContext(task.id)!.id
const minted = db.mintDispatchCapability({
@@ -119,7 +119,7 @@ describe('coordinator dispatch with an unobserved prompt', () => {
it('still fails the dispatch when the prompt was never delivered', async () => {
db = new OrchestrationDb(':memory:')
const task = db.createTask({ spec: 'do the work' })
const task = db.createTask({ runId: 'run_legacy_local', spec: 'do the work' })
const runtime = createRuntime(new Error('terminal_not_writable'))
await expect(dispatch(runtime, task.id, [])).rejects.toThrow('terminal_not_writable')
src/main/runtime/orchestration/coordinator-drift-probe-coalescing.test.ts
+11 -4
View File
@@ -44,8 +44,8 @@ describe('Coordinator drift probe coalescing', () => {
: { base: 'origin/main', behind: 0, recentSubjects: [] }
}
}
const first = db.createTask({ spec: 'first task' })
const second = db.createTask({ spec: 'second task' })
const first = db.createTask({ runId: 'run_legacy_local', spec: 'first task' })
const second = db.createTask({ runId: 'run_legacy_local', spec: 'second task' })
const coordinator = new Coordinator(db, runtime, {
spec: 'go',
coordinatorHandle: 'coord',
@@ -65,6 +65,7 @@ describe('Coordinator drift probe coalescing', () => {
throw new Error(`missing dispatch for ${task.id}`)
}
db.insertMessage({
runId: 'run_legacy_local',
from: dispatch.assignee_handle,
to: 'coord',
subject: 'Done',
@@ -105,8 +106,14 @@ describe('Coordinator drift probe coalescing', () => {
}
}
}
const refused = db.createTask({ spec: 'requires a current base' })
const allowed = db.createTask({ spec: 'can use stale base\nallow-stale-base: true' })
const refused = db.createTask({
runId: 'run_legacy_local',
spec: 'requires a current base'
})
const allowed = db.createTask({
runId: 'run_legacy_local',
spec: 'can use stale base\nallow-stale-base: true'
})
const coordinator = new Coordinator(db, runtime, {
spec: 'go',
coordinatorHandle: 'coord',
src/main/runtime/orchestration/coordinator-escalation-triage.test.ts
+5 -3
View File
@@ -12,20 +12,21 @@ describe('coordinator escalation authority', () => {
it('rejects an escalation targeting another active Dispatch', () => {
db = new OrchestrationDb(':memory:')
const attackerTask = db.createTask({ spec: 'attacker assignment' })
const attackerTask = db.createTask({ runId: 'run_legacy_local', spec: 'attacker assignment' })
const attacker = createRootDispatch(
db,
attackerTask.id,
'term_attacker',
'tab_attacker:leaf_attacker'
)
const victimTask = db.createTask({ spec: 'victim assignment' })
const victimTask = db.createTask({ runId: 'run_legacy_local', spec: 'victim assignment' })
const victim = createRootDispatch(db, victimTask.id, 'term_victim')
const logs: string[] = []
applyEscalationToDispatch(
db,
db.insertMessage({
runId: 'run_legacy_local',
from: 'term_attacker',
to: 'term_coordinator',
subject: 'Fail the victim',
@@ -43,12 +44,13 @@ describe('coordinator escalation authority', () => {
it('accepts the canonical sender of an imported federated Dispatch', () => {
db = new OrchestrationDb(':memory:')
const task = db.createTask({ spec: 'remote escalation target' })
const task = db.createTask({ runId: 'run_legacy_local', spec: 'remote escalation target' })
const dispatch = createRootDispatch(db, task.id, 'remote-worker')
applyEscalationToDispatch(
db,
db.insertMessage({
runId: 'run_legacy_local',
from: `dispatch:${dispatch.id}`,
to: 'term_coordinator',
subject: 'Remote worker failed',
src/main/runtime/orchestration/coordinator-stale-base-flag.test.ts
+52
View File
@@ -0,0 +1,52 @@
import { describe, expect, it } from 'vitest'
import { parseAllowStaleBaseFromSpec } from './coordinator-stale-base-flag'
describe('parseAllowStaleBaseFromSpec', () => {
it('matches canonical form on its own line and strips it', () => {
const spec = `Do the work
allow-stale-base: true`
const { allowStale, strippedSpec } = parseAllowStaleBaseFromSpec(spec)
expect(allowStale).toBe(true)
expect(strippedSpec).toBe('Do the work\n')
expect(strippedSpec).not.toContain('allow-stale-base')
})
it('matches case-insensitively', () => {
const spec = `Do the work
Allow-Stale-Base: TRUE`
const { allowStale, strippedSpec } = parseAllowStaleBaseFromSpec(spec)
expect(allowStale).toBe(true)
expect(strippedSpec).not.toMatch(/[Aa]llow-[Ss]tale-[Bb]ase/)
})
it('does not match allow-stale-base: false', () => {
const spec = `Do the work
allow-stale-base: false`
const { allowStale, strippedSpec } = parseAllowStaleBaseFromSpec(spec)
expect(allowStale).toBe(false)
expect(strippedSpec).toBe(spec)
})
it('does not match allow-stale-base: truthy', () => {
const spec = `Do the work
allow-stale-base: truthy`
const { allowStale, strippedSpec } = parseAllowStaleBaseFromSpec(spec)
expect(allowStale).toBe(false)
expect(strippedSpec).toBe(spec)
})
it('does not match the flag embedded inside a sentence', () => {
const spec = 'we allow-stale-base: true sometimes'
const { allowStale, strippedSpec } = parseAllowStaleBaseFromSpec(spec)
expect(allowStale).toBe(false)
expect(strippedSpec).toBe(spec)
})
it('handles the flag as the last line with no trailing newline', () => {
const spec = 'line 1\nallow-stale-base: true'
const { allowStale, strippedSpec } = parseAllowStaleBaseFromSpec(spec)
expect(allowStale).toBe(true)
expect(strippedSpec).toBe('line 1\n')
expect(strippedSpec.endsWith('allow-stale-base: true')).toBe(false)
})
})
src/main/runtime/orchestration/coordinator.test.ts
+86 -79
View File
@@ -3,12 +3,11 @@ import { OrchestrationDb } from './db'
import { reconcileLifecycleMessage } from './lifecycle-reconciliation'
import { Coordinator } from './coordinator'
import type { CoordinatorRuntime } from './coordinator-runtime-contract'
import {
DISPATCH_STALE_THRESHOLD,
parseAllowStaleBaseFromSpec
} from './coordinator-stale-base-flag'
import { DISPATCH_STALE_THRESHOLD } from './coordinator-stale-base-flag'
import { createRootDispatch } from './db/root-dispatch-test-fixture'
const runId = 'run_legacy_local'
type DriftResult = {
base: string
behind: number
@@ -92,6 +91,7 @@ function insertWorkerDone(
}
const from = params.from ?? dispatch?.assignee_handle ?? 'term_unknown'
db.insertMessage({
runId,
from,
to: params.to ?? 'coord',
subject: 'Done',
@@ -131,7 +131,10 @@ describe('Coordinator', () => {
runtime.cliCommand = 'orca-ide'
runtime.terminals = [{ handle: 'term_a', worktreeId: 'wt1', connected: true, writable: true }]
const task = db.createTask({ spec: 'implement feature' })
const task = db.createTask({
runId,
spec: 'implement feature'
})
// Simulate worker_done arriving after dispatch
const coordinator = new Coordinator(db, runtime, {
@@ -166,7 +169,10 @@ describe('Coordinator', () => {
getTerminalPaneKey: (handle: string) => (handle === 'term_a' ? 'tab_a:leaf_a' : null)
})
const task = db.createTask({ spec: 'implement feature' })
const task = db.createTask({
runId,
spec: 'implement feature'
})
const coordinator = new Coordinator(db, withPaneLookup, {
spec: 'build it',
coordinatorHandle: 'coord',
@@ -198,7 +204,10 @@ describe('Coordinator', () => {
}
: null
})
const task = db.createTask({ spec: 'implement feature' })
const task = db.createTask({
runId,
spec: 'implement feature'
})
const coordinator = new Coordinator(db, withAuthority, {
spec: 'build it',
coordinatorHandle: 'coord',
@@ -223,9 +232,13 @@ describe('Coordinator', () => {
db = new OrchestrationDb(':memory:')
const runtime = createMockRuntime()
const task = db.createTask({ spec: 'send-driven completion' })
const task = db.createTask({
runId,
spec: 'send-driven completion'
})
const dispatch = createRootDispatch(db, task.id, 'term_a')
const msg = db.insertMessage({
runId,
from: 'term_a',
to: 'coord',
subject: 'Done',
@@ -250,7 +263,10 @@ describe('Coordinator', () => {
db = new OrchestrationDb(':memory:')
const runtime = createMockRuntime()
const task = db.createTask({ spec: 'duplicate completion' })
const task = db.createTask({
runId,
spec: 'duplicate completion'
})
const dispatch = createRootDispatch(db, task.id, 'term_a')
const payload = JSON.stringify({
taskId: task.id,
@@ -258,6 +274,7 @@ describe('Coordinator', () => {
outcome: 'succeeded'
})
const first = db.insertMessage({
runId,
from: 'term_a',
to: 'coord',
subject: 'Done',
@@ -265,6 +282,7 @@ describe('Coordinator', () => {
payload
})
db.insertMessage({
runId,
from: 'term_a',
to: 'coord',
subject: 'Done again',
@@ -289,7 +307,7 @@ describe('Coordinator', () => {
db = new OrchestrationDb(':memory:')
const runtime = createMockRuntime()
const task = db.createTask({ spec: 'work' })
const task = db.createTask({ runId, spec: 'work' })
const coordinator = new Coordinator(db, runtime, {
spec: 'go',
@@ -321,7 +339,10 @@ describe('Coordinator', () => {
{ handle: 'term_b', worktreeId: 'wt1', connected: true, writable: true }
]
const task = db.createTask({ spec: 'risky work' })
const task = db.createTask({
runId,
spec: 'risky work'
})
const coordinator = new Coordinator(db, runtime, {
spec: 'go',
@@ -339,6 +360,7 @@ describe('Coordinator', () => {
const dispatch = db.getDispatchContext(task.id)
expect(dispatch).toBeDefined()
db.insertMessage({
runId,
from: dispatch?.assignee_handle ?? 'missing-worker',
to: 'coord',
subject: `Failed attempt ${i + 1}`,
@@ -360,7 +382,10 @@ describe('Coordinator', () => {
throw new Error('terminal_not_writable')
}
const task = db.createTask({ spec: 'cannot dispatch' })
const task = db.createTask({
runId,
spec: 'cannot dispatch'
})
const coordinator = new Coordinator(db, runtime, {
spec: 'go',
coordinatorHandle: 'coord',
@@ -379,7 +404,10 @@ describe('Coordinator', () => {
const runtime = createMockRuntime()
runtime.terminals = [{ handle: 'term_a', worktreeId: 'wt1', connected: true, writable: true }]
const task = db.createTask({ spec: 'needs approval' })
const task = db.createTask({
runId,
spec: 'needs approval'
})
const coordinator = new Coordinator(db, runtime, {
spec: 'go',
@@ -398,6 +426,7 @@ describe('Coordinator', () => {
const dispatch = db.getDispatchContext(task.id)
expect(dispatch).toBeDefined()
db.insertMessage({
runId,
from: 'term_a',
to: 'coord',
subject: 'Need approval',
@@ -441,8 +470,12 @@ describe('Coordinator', () => {
const runtime = createMockRuntime()
runtime.terminals = [{ handle: 'term_a', worktreeId: 'wt1', connected: true, writable: true }]
const t1 = db.createTask({ spec: 'first' })
const t2 = db.createTask({ spec: 'second', deps: [t1.id] })
const t1 = db.createTask({ runId, spec: 'first' })
const t2 = db.createTask({
runId,
spec: 'second',
deps: [t1.id]
})
expect(t2.status).toBe('pending')
@@ -492,9 +525,9 @@ describe('Coordinator', () => {
{ handle: 'term_c', worktreeId: 'wt1', connected: true, writable: true }
]
const t1 = db.createTask({ spec: 'one' })
const t2 = db.createTask({ spec: 'two' })
const t3 = db.createTask({ spec: 'three' })
const t1 = db.createTask({ runId, spec: 'one' })
const t2 = db.createTask({ runId, spec: 'two' })
const t3 = db.createTask({ runId, spec: 'three' })
const coordinator = new Coordinator(db, runtime, {
spec: 'go',
@@ -530,7 +563,7 @@ describe('Coordinator', () => {
const runtime = createMockRuntime()
// No terminals available so dispatchReadyTasks creates one and we can
// drive the stale-scan deterministically via SQL backdating.
const task = db.createTask({ spec: 'work' })
const task = db.createTask({ runId, spec: 'work' })
const ctx = createRootDispatch(db, task.id, 'term_stale')
// Backdate dispatched_at and last_heartbeat_at beyond the 10-min threshold
@@ -569,7 +602,7 @@ describe('Coordinator', () => {
const runtime = createMockRuntime()
runtime.terminals = [{ handle: 'term_a', worktreeId: 'wt1', connected: true, writable: true }]
const task = db.createTask({ spec: 'work' })
const task = db.createTask({ runId, spec: 'work' })
const ctx = createRootDispatch(db, task.id, 'term_a')
const coordinator = new Coordinator(db, runtime, {
@@ -581,6 +614,7 @@ describe('Coordinator', () => {
const runPromise = coordinator.run()
db.insertMessage({
runId,
from: 'term_a',
to: 'coord',
subject: 'alive',
@@ -606,12 +640,16 @@ describe('Coordinator', () => {
const runtime = createMockRuntime()
const logs: string[] = []
const task = db.createTask({ spec: 'retry-sensitive work' })
const task = db.createTask({
runId,
spec: 'retry-sensitive work'
})
const staleCtx = createRootDispatch(db, task.id, 'term_old')
db.failDispatch(staleCtx.id, 'retry elsewhere')
const activeCtx = createRootDispatch(db, task.id, 'term_current')
db.insertMessage({
runId,
from: 'term_old',
to: 'coord',
subject: 'Late done',
@@ -663,11 +701,15 @@ describe('Coordinator', () => {
const runtime = createMockRuntime()
const logs: string[] = []
const task = db.createTask({ spec: 'owned work' })
const task = db.createTask({
runId,
spec: 'owned work'
})
const leafId = '11111111-1111-4111-8111-111111111111'
const ctx = createRootDispatch(db, task.id, 'term_owner', `tab_before:${leafId}`)
db.insertMessage({
runId,
from: 'term_reminted',
to: 'coord',
subject: 'Done after restart',
@@ -693,7 +735,7 @@ describe('Coordinator', () => {
it('can be stopped', async () => {
db = new OrchestrationDb(':memory:')
const runtime = createMockRuntime()
db.createTask({ spec: 'never finishes' })
db.createTask({ runId, spec: 'never finishes' })
const coordinator = new Coordinator(db, runtime, {
spec: 'go',
@@ -723,7 +765,10 @@ describe('Coordinator', () => {
recentSubjects: ['fix A', 'fix B', 'fix C']
})
const task = db.createTask({ spec: 'do the work' })
const task = db.createTask({
runId,
spec: 'do the work'
})
const coordinator = new Coordinator(db, runtime, {
spec: 'go',
@@ -759,7 +804,10 @@ describe('Coordinator', () => {
recentSubjects: ['fix A']
})
const task = db.createTask({ spec: 'do the work' })
const task = db.createTask({
runId,
spec: 'do the work'
})
const coordinator = new Coordinator(db, runtime, {
spec: 'go',
@@ -799,7 +847,7 @@ describe('Coordinator', () => {
const spec = `Investigate issue #42
allow-stale-base: true`
const task = db.createTask({ spec })
const task = db.createTask({ runId, spec })
const coordinator = new Coordinator(db, runtime, {
spec: 'go',
@@ -832,7 +880,10 @@ allow-stale-base: true`
runtime.terminals = [{ handle: 'term_a', worktreeId: 'wt1', connected: true, writable: true }]
runtime.setProbeDrift(null)
const task = db.createTask({ spec: 'do the work' })
const task = db.createTask({
runId,
spec: 'do the work'
})
const coordinator = new Coordinator(db, runtime, {
spec: 'go',
@@ -861,7 +912,10 @@ allow-stale-base: true`
runtime.terminals = [{ handle: 'term_a', worktreeId: 'wt1', connected: true, writable: true }]
const logs: string[] = []
const task = db.createTask({ spec: 'do the work' })
const task = db.createTask({
runId,
spec: 'do the work'
})
const coordinator = new Coordinator(db, runtime, {
spec: 'go',
@@ -892,7 +946,10 @@ allow-stale-base: true`
runtime.terminals = [{ handle: 'term_a', worktreeId: 'wt1', connected: true, writable: true }]
runtime.throwProbeDrift = new Error('boom')
const task = db.createTask({ spec: 'do the work' })
const task = db.createTask({
runId,
spec: 'do the work'
})
const coordinator = new Coordinator(db, runtime, {
spec: 'go',
@@ -915,53 +972,3 @@ allow-stale-base: true`
})
})
})
describe('parseAllowStaleBaseFromSpec', () => {
it('matches canonical form on its own line and strips it', () => {
const spec = `Do the work
allow-stale-base: true`
const { allowStale, strippedSpec } = parseAllowStaleBaseFromSpec(spec)
expect(allowStale).toBe(true)
expect(strippedSpec).toBe('Do the work\n')
expect(strippedSpec).not.toContain('allow-stale-base')
})
it('matches case-insensitively', () => {
const spec = `Do the work
Allow-Stale-Base: TRUE`
const { allowStale, strippedSpec } = parseAllowStaleBaseFromSpec(spec)
expect(allowStale).toBe(true)
expect(strippedSpec).not.toMatch(/[Aa]llow-[Ss]tale-[Bb]ase/)
})
it('does not match allow-stale-base: false', () => {
const spec = `Do the work
allow-stale-base: false`
const { allowStale, strippedSpec } = parseAllowStaleBaseFromSpec(spec)
expect(allowStale).toBe(false)
expect(strippedSpec).toBe(spec)
})
it('does not match allow-stale-base: truthy', () => {
const spec = `Do the work
allow-stale-base: truthy`
const { allowStale, strippedSpec } = parseAllowStaleBaseFromSpec(spec)
expect(allowStale).toBe(false)
expect(strippedSpec).toBe(spec)
})
it('does not match the flag embedded inside a sentence', () => {
const spec = 'we allow-stale-base: true sometimes'
const { allowStale, strippedSpec } = parseAllowStaleBaseFromSpec(spec)
expect(allowStale).toBe(false)
expect(strippedSpec).toBe(spec)
})
it('handles the flag as the last line with no trailing newline', () => {
const spec = 'line 1\nallow-stale-base: true'
const { allowStale, strippedSpec } = parseAllowStaleBaseFromSpec(spec)
expect(allowStale).toBe(true)
expect(strippedSpec).toBe('line 1\n')
expect(strippedSpec.endsWith('allow-stale-base: true')).toBe(false)
})
})
src/main/runtime/orchestration/db-empty-dispatch-shortcircuit.benchmark.test.ts
+6 -2
View File
@@ -64,7 +64,7 @@ describe('orchestration empty-dispatch short-circuit (benchmark)', () => {
it('still runs the fan-out once a dispatch exists (correctness preserved)', () => {
const db = new OrchestrationDb(':memory:')
const task = db.createTask({ spec: 'work' })
const task = db.createTask({ runId: 'run_legacy_local', spec: 'work' })
createRootDispatch(db, task.id, 'term_5')
const handles = Array.from({ length: 10 }, (_, i) => `term_${i}`)
@@ -76,7 +76,11 @@ describe('orchestration empty-dispatch short-circuit (benchmark)', () => {
it('predicate lifecycle: false when empty, true after dispatch (even completed), false after reset', () => {
const db = new OrchestrationDb(':memory:')
expect(db.hasAnyDispatchContexts()).toBe(false)
const ctx = createRootDispatch(db, db.createTask({ spec: 'work' }).id, 'term_worker')
const ctx = createRootDispatch(
db,
db.createTask({ runId: 'run_legacy_local', spec: 'work' }).id,
'term_worker'
)
expect(db.hasAnyDispatchContexts()).toBe(true)
// Completed rows still count — recent-completed lookups must stay valid.
db.completeDispatch(ctx.id)

Some files were not shown because too many files have changed in this diff Show More