fix(process): await cleanup on CLI and MCP cancellation

Propagate CLI interrupts to capture and interrupt post-exit settlement
without cancelling owned-resource cleanup or discarding prior observations.

Assisted-by: Kogasa (gensokyo-skills:kogasa-surprise-testing)
This commit is contained in:
Ysopwnable
2026-10-09 11:26:41 +00:00
committed by GitHub
parent b189c3ceb1
commit f6fe575094
8 changed files with 327 additions and 18 deletions
@@ -145,6 +145,41 @@ describe("owned process-group cleanup validation: ownership and lineage", () =>
});
describe("owned process-group cleanup validation: exited members", () => {
it("preserves cancellation during process-table observation instead of reporting unverifiable ownership", async () => {
const controller = new AbortController();
const reason = new Error("cancelled process observation");
const adapter: ProcessOwnershipHost = {
listProcesses: async (signal) => {
controller.abort(reason);
signal?.throwIfAborted();
return [];
},
environment: () => Promise.resolve({}),
signalGroup: () => {
throw new Error("Observation must never signal processes");
},
};
await expect(
observeOwnedProcessGroup(ownership, adapter, controller.signal),
).rejects.toBe(reason);
});
it("does not inspect a process group after observation was cancelled", async () => {
const controller = new AbortController();
const reason = new Error("already cancelled observation");
controller.abort(reason);
const adapter: ProcessOwnershipHost = {
listProcesses: () => {
throw new Error("Cancelled observation must not inspect processes");
},
environment: () => Promise.resolve({}),
signalGroup: () => {
throw new Error("Observation must never signal processes");
},
};
await expect(
observeOwnedProcessGroup(ownership, adapter, controller.signal),
).rejects.toBe(reason);
});
it("ignores exited zombie members during live ownership checks", async () => {
const environment = vi.fn((pid: number) =>
Promise.resolve(pid === 101 ? {} : { REA_PROCESS_RUN_ID: "run-token" }),
+12 -6
View File
@@ -19,31 +19,36 @@ import type {
export const observeOwnedProcessGroupWithHost = async (
ownership: OwnedProcessGroup,
host: ProcessOwnershipHost,
signal?: AbortSignal,
): Promise<ProcessGroupObservation> => {
signal?.throwIfAborted();
let members: readonly ProcessTableEntry[];
try {
members = (await host.listProcesses()).filter(
members = (await host.listProcesses(signal)).filter(
({ processGroupId }) => processGroupId === ownership.processGroupId,
);
} catch (cause: unknown) {
signal?.throwIfAborted();
return {
state: "unverifiable",
reason: `process group could not be inspected: ${errorMessage(cause)}`,
};
}
signal?.throwIfAborted();
const liveMembers = liveProcesses(members);
if (liveMembers.length === 0) return { state: "empty" };
for (const member of liveMembers) {
signal?.throwIfAborted();
try {
if (
(await host.environment(member.pid)).REA_PROCESS_RUN_ID !==
ownership.runId
)
const runId = (await host.environment(member.pid)).REA_PROCESS_RUN_ID;
signal?.throwIfAborted();
if (runId !== ownership.runId)
return {
state: "unverifiable",
reason: "process ownership did not match",
};
} catch (cause: unknown) {
signal?.throwIfAborted();
if (!(await processIsGone(host, member.pid))) {
return {
state: "unverifiable",
@@ -438,8 +443,9 @@ export const prepareProcessOwnershipInspection = async (
export const observeOwnedProcessGroup = async (
ownership: OwnedProcessGroup,
host: ProcessOwnershipHost = systemProcessOwnershipHost,
signal?: AbortSignal,
): Promise<ProcessGroupObservation> =>
observeOwnedProcessGroupWithHost(ownership, host);
observeOwnedProcessGroupWithHost(ownership, host, signal);
/**
* Record the live launcher and descendant lineage after run-token validation.
+11 -6
View File
@@ -3,6 +3,7 @@ import { constants, statSync, type BigIntStats } from "node:fs";
import { open, mkdtemp, rm, stat } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { setTimeout as delay } from "node:timers/promises";
import type { IPty } from "@lydell/node-pty";
import type {
@@ -530,7 +531,9 @@ export const observeSettlement = async (
settleMs: number,
recordEvent: RecordProcessCaptureEvent = () => undefined,
platform: NodeJS.Platform = process.platform,
signal?: AbortSignal,
): Promise<ObservedProcessSettlement> => {
assertNotCancelled(signal);
if (platform === "win32") {
recordEvent("lifecycle", 1);
return { state: "unverifiable", elapsed_ms: 0 };
@@ -539,15 +542,17 @@ export const observeSettlement = async (
let consecutiveEmpty = 0;
let deadlineReached = false;
while (!deadlineReached) {
assertNotCancelled(signal);
const observations = await Promise.all(
[...new Set(processGroupIds)].map((processGroupId) =>
observeOwnedProcessGroup({
runId,
leaderPid: processGroupId,
processGroupId,
}),
observeOwnedProcessGroup(
{ runId, leaderPid: processGroupId, processGroupId },
undefined,
signal,
),
),
);
assertNotCancelled(signal);
if (observations.some(({ state }) => state === "unverifiable")) {
recordEvent("lifecycle", 1);
return { state: "unverifiable", elapsed_ms: Date.now() - started };
@@ -561,7 +566,7 @@ export const observeSettlement = async (
} else consecutiveEmpty = 0;
deadlineReached = Date.now() - started >= settleMs;
if (deadlineReached) break;
await new Promise<void>((resolve) => setTimeout(resolve, 50));
await delay(50, undefined, { signal });
}
recordEvent("lifecycle", 1);
return { state: "alive_at_deadline", elapsed_ms: Date.now() - started };
+1
View File
@@ -370,6 +370,7 @@ const completeCapture = async (options: {
scenario.settle_ms,
options.recordEvent,
options.hostPlatform,
options.signal,
);
} catch (cause: unknown) {
options.observationBuffer.settlement = {