fix(browser): preserve cleanup failure diagnostics
Preserve Electron cleanup observer reasons and typed primary failures through the shared error projection. Keep ownership and partial Evidence semantics intact. Fixes #4403. Refs #4227, #4282.
This commit is contained in:
1 parent
2c7583599b
commit
5a77acfbcd
4 files changed
+202
-58
No files matched your search
@@ -9,6 +9,7 @@ import {
|
||||
} from "../../tests/fixtures/electron/fuseImage.js";
|
||||
|
||||
import * as processOwnership from "../process/ProcessOwnership.js";
|
||||
import * as ownershipObservation from "../process/ProcessOwnershipObservation.js";
|
||||
import * as electronActions from "./PlaywrightElectronActiveActions.js";
|
||||
import { electronActiveObservationInputSchema } from "../domain/javascript/electronActiveObservation.js";
|
||||
import type { OwnedProcessGroup } from "../process/ProcessOwnership.js";
|
||||
@@ -97,32 +98,90 @@ const emptyHookSnapshot = () => ({
|
||||
hook_error: false,
|
||||
});
|
||||
|
||||
it("does not signal a Windows Electron PID when lineage is unavailable", async () => {
|
||||
const terminateTree = vi.fn(async () => ({
|
||||
cleaned: true as const,
|
||||
signaled: true,
|
||||
}));
|
||||
const result = await cleanupElectronProcesses(
|
||||
ownership,
|
||||
{
|
||||
status: "unavailable",
|
||||
observedAt: "2026-10-10T00:00:00.000Z",
|
||||
runId: ownership.runId,
|
||||
launcherPid: ownership.leaderPid,
|
||||
processGroupId: ownership.processGroupId,
|
||||
reason: "owned launcher is not live",
|
||||
},
|
||||
{ platform: "win32", terminateTree },
|
||||
);
|
||||
it.each([
|
||||
"owned launcher is not live",
|
||||
"process table permission denied",
|
||||
"process ownership did not match",
|
||||
])(
|
||||
"does not signal a Windows Electron PID when lineage is unavailable: %s",
|
||||
async (reason) => {
|
||||
const terminateTree = vi.fn(async () => ({
|
||||
cleaned: true as const,
|
||||
signaled: true,
|
||||
}));
|
||||
const result = await cleanupElectronProcesses(
|
||||
ownership,
|
||||
{
|
||||
status: "unavailable",
|
||||
observedAt: "2026-10-10T00:00:00.000Z",
|
||||
runId: ownership.runId,
|
||||
launcherPid: ownership.leaderPid,
|
||||
processGroupId: ownership.processGroupId,
|
||||
reason,
|
||||
},
|
||||
{ platform: "win32", terminateTree },
|
||||
);
|
||||
|
||||
expect(terminateTree).not.toHaveBeenCalled();
|
||||
expect(result).toEqual({
|
||||
expect(terminateTree).not.toHaveBeenCalled();
|
||||
expect(result).toEqual({
|
||||
cleaned: false,
|
||||
reason: `${reason}; helper cleanup was not proven`,
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
it("does not signal an unobserved Windows Electron lineage", async () => {
|
||||
const terminateTree = vi.fn();
|
||||
expect(
|
||||
await cleanupElectronProcesses(ownership, undefined, {
|
||||
platform: "win32",
|
||||
terminateTree,
|
||||
}),
|
||||
).toEqual({
|
||||
cleaned: false,
|
||||
reason:
|
||||
"owned Electron lineage was unavailable; helper cleanup was not proven",
|
||||
"owned Electron lineage was not observed; helper cleanup was not proven",
|
||||
});
|
||||
expect(terminateTree).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it.each([0, 1])(
|
||||
"preserves a Windows termination failure at tree index %i",
|
||||
async (failedIndex) => {
|
||||
const failure = { cleaned: false as const, reason: "termination denied" };
|
||||
const terminateTree = vi
|
||||
.fn<typeof processOwnership.cleanupWindowsProcessTree>()
|
||||
.mockResolvedValue({ cleaned: true, signaled: true });
|
||||
terminateTree.mockImplementationOnce(async () =>
|
||||
failedIndex === 0 ? failure : { cleaned: true, signaled: true },
|
||||
);
|
||||
if (failedIndex === 1) terminateTree.mockResolvedValueOnce(failure);
|
||||
const result = await cleanupElectronProcesses(
|
||||
ownership,
|
||||
{
|
||||
status: "verified",
|
||||
observedAt: "2026-10-10T00:00:00.000Z",
|
||||
lineage: {
|
||||
runId: ownership.runId,
|
||||
launcherPid: ownership.leaderPid,
|
||||
launcherParentPid: 1,
|
||||
processGroupId: ownership.processGroupId,
|
||||
descendants: [
|
||||
{
|
||||
pid: 4343,
|
||||
parentPid: ownership.leaderPid,
|
||||
processGroupId: ownership.processGroupId,
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
{ platform: "win32", terminateTree },
|
||||
);
|
||||
expect(result).toBe(failure);
|
||||
expect(terminateTree).toHaveBeenCalledTimes(failedIndex + 1);
|
||||
},
|
||||
);
|
||||
|
||||
it("signals a Windows Electron tree only after lineage is verified", async () => {
|
||||
const terminateTree = vi.fn(async () => ({
|
||||
cleaned: true as const,
|
||||
@@ -157,6 +216,18 @@ it("signals a Windows Electron tree only after lineage is verified", async () =>
|
||||
|
||||
it("retains the partial capture without taskkill when Windows lineage is unavailable", async () => {
|
||||
// Exercise the Windows decision branch; this is not native Windows coverage.
|
||||
// The injected unavailable observation keeps this independent of host PID reuse.
|
||||
vi.spyOn(
|
||||
ownershipObservation,
|
||||
"observeOwnedProcessLineage",
|
||||
).mockResolvedValue({
|
||||
status: "unavailable",
|
||||
observedAt: "2026-10-10T00:00:00.000Z",
|
||||
runId: "fixture-run",
|
||||
launcherPid: 424242,
|
||||
processGroupId: 424242,
|
||||
reason: "process table permission denied",
|
||||
});
|
||||
const originalPlatform = Object.getOwnPropertyDescriptor(process, "platform");
|
||||
Object.defineProperty(process, "platform", { value: "win32" });
|
||||
const terminateTree = vi
|
||||
@@ -198,7 +269,7 @@ it("retains the partial capture without taskkill when Windows lineage is unavail
|
||||
reason: "cleanup_failed",
|
||||
cleanup: {
|
||||
reason:
|
||||
"owned Electron lineage was unavailable; helper cleanup was not proven",
|
||||
"process table permission denied; helper cleanup was not proven",
|
||||
},
|
||||
partialObservation: {
|
||||
kind: "electron-active-observation",
|
||||
|
||||
@@ -292,14 +292,17 @@ export const cleanupElectronProcesses = async (
|
||||
terminateTree: cleanupWindowsProcessTree,
|
||||
},
|
||||
): Promise<ProcessCleanupResult> => {
|
||||
if (lineage?.status !== "verified") {
|
||||
if (host.platform !== "win32") {
|
||||
const root = await cleanupOwnedProcessGroup(ownership);
|
||||
if (!root.cleaned) return root;
|
||||
}
|
||||
return {
|
||||
cleaned: false,
|
||||
reason: `${lineage?.reason ?? "owned Electron lineage was not observed"}; helper cleanup was not proven`,
|
||||
};
|
||||
}
|
||||
if (host.platform === "win32") {
|
||||
// An empty Windows process table is not ownership proof for this PID.
|
||||
if (lineage?.status !== "verified")
|
||||
return {
|
||||
cleaned: false,
|
||||
reason:
|
||||
"owned Electron lineage was unavailable; helper cleanup was not proven",
|
||||
};
|
||||
const root = await host.terminateTree(ownership.leaderPid);
|
||||
if (!root.cleaned) return root;
|
||||
for (const descendant of lineage.lineage.descendants) {
|
||||
@@ -308,16 +311,6 @@ export const cleanupElectronProcesses = async (
|
||||
}
|
||||
return root;
|
||||
}
|
||||
if (lineage?.status !== "verified") {
|
||||
const root = await cleanupOwnedProcessGroup(ownership);
|
||||
return root.cleaned
|
||||
? {
|
||||
cleaned: false,
|
||||
reason:
|
||||
"owned Electron lineage was unavailable; helper cleanup was not proven",
|
||||
}
|
||||
: root;
|
||||
}
|
||||
const groupIds = selectCapturedProcessGroupIds(
|
||||
ownership.leaderPid,
|
||||
lineage.lineage.descendants.map(({ pid, processGroupId }) => ({
|
||||
|
||||
Reference in new issue
Block a user