fix(hopper): wait for late bridges during cleanup (#1866)
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import { spawn, type ChildProcess } from "node:child_process";
|
||||
import { access, copyFile, readFile, rm, writeFile } from "node:fs/promises";
|
||||
import { dirname, resolve } from "node:path";
|
||||
import { setTimeout as delay } from "node:timers/promises";
|
||||
|
||||
import { Client } from "@modelcontextprotocol/client";
|
||||
import { StdioClientTransport } from "@modelcontextprotocol/client/stdio";
|
||||
@@ -14,91 +15,106 @@ import { acquireHopperTargetLease } from "../../../src/hopper/HopperTargetLease.
|
||||
const statusSchema = z.object({ result: z.object({ open: z.boolean() }) });
|
||||
const test = workspaceCliTest.skipIf(process.platform !== "darwin");
|
||||
|
||||
test("retains a denial-shaped failure when caller arguments can alter the helper's AppleScript", async ({
|
||||
workspace,
|
||||
}) => {
|
||||
for (const source of ["target", "loader"] as const) {
|
||||
const target = workspace.path(
|
||||
source === "target" ? 'quoted"target' : "loader-target",
|
||||
);
|
||||
await copyFile("/usr/bin/true", target);
|
||||
const mode = await workspace.write(
|
||||
`${source}-mode`,
|
||||
"denied-after-handoff",
|
||||
);
|
||||
const receipt = workspace.path(`${source}-bootstrap`);
|
||||
const loaderArgs = [
|
||||
resolve("tests/fixtures/hopperLaunchAdmission.mjs"),
|
||||
mode,
|
||||
receipt,
|
||||
...(source === "loader" ? ['caller"loader'] : []),
|
||||
];
|
||||
const transport = new StdioClientTransport({
|
||||
command: process.execPath,
|
||||
args: [resolve("dist/main.js")],
|
||||
stderr: "pipe",
|
||||
env: {
|
||||
...workspace.environment,
|
||||
PATH: process.env.PATH ?? "",
|
||||
REA_ANALYSIS_PROVIDER: "hopper",
|
||||
HOPPER_LAUNCHER_PATH: process.execPath,
|
||||
HOPPER_LOADER_ARGS_JSON: JSON.stringify(loaderArgs),
|
||||
REA_LOG_LEVEL: "silent",
|
||||
},
|
||||
});
|
||||
const mcp = new Client({ name: "hopper-literal-boundary", version: "1" });
|
||||
let runtime: string | undefined;
|
||||
onTestFinished(async () => {
|
||||
await mcp.close();
|
||||
await transport.close();
|
||||
// The fixture created only this marker, never a native GUI document.
|
||||
if (runtime !== undefined)
|
||||
await rm(runtime, { recursive: true, force: true });
|
||||
const acquired = await acquireHopperTargetLease({
|
||||
targetPath: target,
|
||||
targetKind: "executable",
|
||||
loaderArgs,
|
||||
runId: "literal-boundary-test-cleanup",
|
||||
test(
|
||||
"retains a denial-shaped failure when caller arguments can alter the helper's AppleScript",
|
||||
{ timeout: 90_000 },
|
||||
async ({ workspace }) => {
|
||||
for (const source of ["target", "loader"] as const) {
|
||||
const target = workspace.path(
|
||||
source === "target" ? 'quoted"target' : "loader-target",
|
||||
);
|
||||
await copyFile("/usr/bin/true", target);
|
||||
const mode = await workspace.write(
|
||||
`${source}-mode`,
|
||||
"denied-after-handoff",
|
||||
);
|
||||
const receipt = workspace.path(`${source}-bootstrap`);
|
||||
const loaderArgs = [
|
||||
resolve("tests/fixtures/hopperLaunchAdmission.mjs"),
|
||||
mode,
|
||||
receipt,
|
||||
...(source === "loader" ? ['caller"loader'] : []),
|
||||
];
|
||||
const transport = new StdioClientTransport({
|
||||
command: process.execPath,
|
||||
args: [resolve("dist/main.js")],
|
||||
stderr: "pipe",
|
||||
env: {
|
||||
...workspace.environment,
|
||||
PATH: process.env.PATH ?? "",
|
||||
REA_ANALYSIS_PROVIDER: "hopper",
|
||||
HOPPER_LAUNCHER_PATH: process.execPath,
|
||||
HOPPER_LOADER_ARGS_JSON: JSON.stringify(loaderArgs),
|
||||
REA_LOG_LEVEL: "silent",
|
||||
},
|
||||
});
|
||||
if (!acquired.acquired) throw new Error("Fixture lease remained live");
|
||||
await acquired.lease.release();
|
||||
});
|
||||
await mcp.connect(transport);
|
||||
const call = (name: string, arguments_: Record<string, string> = {}) =>
|
||||
mcp.callTool({ name, arguments: arguments_ });
|
||||
expect((await call("open_binary", { path: target })).isError).not.toBe(
|
||||
true,
|
||||
);
|
||||
const first = parseMcpToolError(await call("current_document"));
|
||||
runtime = dirname(await readFile(receipt, "utf8"));
|
||||
expect(first.error).toMatchObject({
|
||||
code: "cleanup_incomplete",
|
||||
details: {
|
||||
diagnostics: {
|
||||
primary_error: {
|
||||
code: "provider_unavailable",
|
||||
details: {
|
||||
launcher: {
|
||||
exit_code: 2,
|
||||
stderr: {
|
||||
text: expect.stringContaining(
|
||||
"Not authorized to send Apple events",
|
||||
),
|
||||
const mcp = new Client({ name: "hopper-literal-boundary", version: "1" });
|
||||
let runtime: string | undefined;
|
||||
onTestFinished(async () => {
|
||||
// SDK close can return immediately after SIGKILL. Wait for its actual
|
||||
// child-close event before recovering this process's retained lease.
|
||||
let serverExited: Promise<void> | undefined;
|
||||
if (transport.pid !== null) {
|
||||
const onclose = transport.onclose;
|
||||
serverExited = new Promise<void>((resolveExit) => {
|
||||
transport.onclose = () => {
|
||||
onclose?.();
|
||||
resolveExit();
|
||||
};
|
||||
});
|
||||
}
|
||||
await mcp.close();
|
||||
await transport.close();
|
||||
await serverExited;
|
||||
// The fixture created only this marker, never a native GUI document.
|
||||
if (runtime !== undefined)
|
||||
await rm(runtime, { recursive: true, force: true });
|
||||
const acquired = await acquireHopperTargetLease({
|
||||
targetPath: target,
|
||||
targetKind: "executable",
|
||||
loaderArgs,
|
||||
runId: "literal-boundary-test-cleanup",
|
||||
});
|
||||
if (!acquired.acquired) throw new Error("Fixture lease remained live");
|
||||
await acquired.lease.release();
|
||||
});
|
||||
await mcp.connect(transport);
|
||||
const call = (name: string, arguments_: Record<string, string> = {}) =>
|
||||
mcp.callTool({ name, arguments: arguments_ });
|
||||
expect((await call("open_binary", { path: target })).isError).not.toBe(
|
||||
true,
|
||||
);
|
||||
const first = parseMcpToolError(await call("current_document"));
|
||||
runtime = dirname(await readFile(receipt, "utf8"));
|
||||
expect(first.error).toMatchObject({
|
||||
code: "cleanup_incomplete",
|
||||
details: {
|
||||
diagnostics: {
|
||||
primary_error: {
|
||||
code: "provider_unavailable",
|
||||
details: {
|
||||
launcher: {
|
||||
exit_code: 2,
|
||||
stderr: {
|
||||
text: expect.stringContaining(
|
||||
"Not authorized to send Apple events",
|
||||
),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
await access(`${receipt}.document-created`);
|
||||
await access(runtime);
|
||||
expect(parseMcpToolError(await call("list_procedures"))).toEqual(first);
|
||||
expect(parseMcpToolError(await call("close_binary")).error.code).toBe(
|
||||
"cleanup_incomplete",
|
||||
);
|
||||
}
|
||||
});
|
||||
});
|
||||
await access(`${receipt}.document-created`);
|
||||
await access(runtime);
|
||||
expect(parseMcpToolError(await call("list_procedures"))).toEqual(first);
|
||||
expect(parseMcpToolError(await call("close_binary")).error.code).toBe(
|
||||
"cleanup_incomplete",
|
||||
);
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
test("recovers a denied Hopper launch through the same stdio MCP session and CLI", async ({
|
||||
workspace,
|
||||
@@ -185,120 +201,133 @@ test("recovers a denied Hopper launch through the same stdio MCP session and CLI
|
||||
).toBe(false);
|
||||
});
|
||||
|
||||
test("preserves a timed-out handoff and closes only a late bridge with matching run identity", async ({
|
||||
workspace,
|
||||
}) => {
|
||||
const target = workspace.path("target");
|
||||
await copyFile("/usr/bin/true", target);
|
||||
const mode = await workspace.write("mode", "handoff");
|
||||
const receipt = workspace.path("bootstrap-path");
|
||||
const transport = new StdioClientTransport({
|
||||
command: process.execPath,
|
||||
args: [resolve("dist/main.js")],
|
||||
stderr: "pipe",
|
||||
env: {
|
||||
...workspace.environment,
|
||||
PATH: process.env.PATH ?? "",
|
||||
REA_ANALYSIS_PROVIDER: "hopper",
|
||||
HOPPER_LAUNCHER_PATH: process.execPath,
|
||||
HOPPER_LOADER_ARGS_JSON: JSON.stringify([
|
||||
resolve("tests/fixtures/hopperLaunchAdmission.mjs"),
|
||||
mode,
|
||||
receipt,
|
||||
]),
|
||||
REA_HOPPER_STARTUP_TIMEOUT_MS: "2000",
|
||||
REA_LOG_LEVEL: "silent",
|
||||
},
|
||||
});
|
||||
const mcp = new Client({ name: "hopper-late-readiness", version: "1" });
|
||||
const children: ChildProcess[] = [];
|
||||
let runtime: string | undefined;
|
||||
const stop = async (child: ChildProcess) => {
|
||||
if (child.exitCode !== null || child.signalCode !== null) return;
|
||||
const exited = new Promise<void>((resolveExit) =>
|
||||
child.once("exit", () => resolveExit()),
|
||||
test(
|
||||
"preserves a timed-out handoff and closes only a late bridge with matching run identity",
|
||||
{ timeout: 60_000 },
|
||||
async ({ workspace }) => {
|
||||
const target = workspace.path("target");
|
||||
await copyFile("/usr/bin/true", target);
|
||||
const mode = await workspace.write("mode", "handoff");
|
||||
const receipt = workspace.path("bootstrap-path");
|
||||
const transport = new StdioClientTransport({
|
||||
command: process.execPath,
|
||||
args: [resolve("dist/main.js")],
|
||||
stderr: "pipe",
|
||||
env: {
|
||||
...workspace.environment,
|
||||
PATH: process.env.PATH ?? "",
|
||||
REA_ANALYSIS_PROVIDER: "hopper",
|
||||
HOPPER_LAUNCHER_PATH: process.execPath,
|
||||
HOPPER_LOADER_ARGS_JSON: JSON.stringify([
|
||||
resolve("tests/fixtures/hopperLaunchAdmission.mjs"),
|
||||
mode,
|
||||
receipt,
|
||||
]),
|
||||
REA_HOPPER_STARTUP_TIMEOUT_MS: "2000",
|
||||
REA_LOG_LEVEL: "silent",
|
||||
},
|
||||
});
|
||||
const mcp = new Client({ name: "hopper-late-readiness", version: "1" });
|
||||
const children: ChildProcess[] = [];
|
||||
let runtime: string | undefined;
|
||||
const stop = async (child: ChildProcess) => {
|
||||
if (child.exitCode !== null || child.signalCode !== null) return;
|
||||
const exited = new Promise<void>((resolveExit) =>
|
||||
child.once("exit", () => resolveExit()),
|
||||
);
|
||||
child.kill("SIGKILL");
|
||||
await exited;
|
||||
};
|
||||
onTestFinished(async () => {
|
||||
await Promise.all(children.map(stop));
|
||||
await mcp.close();
|
||||
await transport.close();
|
||||
if (runtime !== undefined)
|
||||
await rm(runtime, { recursive: true, force: true });
|
||||
});
|
||||
await mcp.connect(transport);
|
||||
const call = (name: string, arguments_: Record<string, string> = {}) =>
|
||||
mcp.callTool({ name, arguments: arguments_ });
|
||||
expect((await call("open_binary", { path: target })).isError).not.toBe(
|
||||
true,
|
||||
);
|
||||
child.kill("SIGKILL");
|
||||
await exited;
|
||||
};
|
||||
onTestFinished(async () => {
|
||||
await Promise.all(children.map(stop));
|
||||
await mcp.close();
|
||||
await transport.close();
|
||||
if (runtime !== undefined)
|
||||
await rm(runtime, { recursive: true, force: true });
|
||||
});
|
||||
await mcp.connect(transport);
|
||||
const call = (name: string, arguments_: Record<string, string> = {}) =>
|
||||
mcp.callTool({ name, arguments: arguments_ });
|
||||
expect((await call("open_binary", { path: target })).isError).not.toBe(true);
|
||||
const initial = parseMcpToolError(await call("current_document"));
|
||||
expect(initial.error).toMatchObject({
|
||||
code: "cleanup_incomplete",
|
||||
details: {
|
||||
diagnostics: {
|
||||
primary_error: {
|
||||
code: "provider_timeout",
|
||||
details: { timeout_ms: 2000, launcher: { exit_code: 0 } },
|
||||
const initial = parseMcpToolError(await call("current_document"));
|
||||
expect(initial.error).toMatchObject({
|
||||
code: "cleanup_incomplete",
|
||||
details: {
|
||||
diagnostics: {
|
||||
primary_error: {
|
||||
code: "provider_timeout",
|
||||
details: { timeout_ms: 2000, launcher: { exit_code: 0 } },
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
expect(parseMcpToolError(await call("list_procedures"))).toEqual(initial);
|
||||
const status = z.object({
|
||||
result: z.object({
|
||||
provider_operation_health: z.object({
|
||||
state: z.literal("not_started"),
|
||||
stage: z.literal("launch"),
|
||||
});
|
||||
expect(parseMcpToolError(await call("list_procedures"))).toEqual(initial);
|
||||
const status = z.object({
|
||||
result: z.object({
|
||||
provider_operation_health: z.object({
|
||||
state: z.literal("not_started"),
|
||||
stage: z.literal("launch"),
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
});
|
||||
status.parse((await call("binary_session")).structuredContent);
|
||||
expect(parseMcpToolError(await call("close_binary")).error.code).toBe(
|
||||
"cleanup_incomplete",
|
||||
);
|
||||
const bootstrap = await readFile(await readFile(receipt, "utf8"), "utf8");
|
||||
const setting = (name: string): string => {
|
||||
const line = bootstrap
|
||||
.split("\n")
|
||||
.find((value) => value.startsWith(`${name} = `));
|
||||
if (line === undefined)
|
||||
throw new Error(`Missing bootstrap setting ${name}`);
|
||||
return z.string().parse(JSON.parse(line.slice(name.length + 3)));
|
||||
};
|
||||
const socket = setting("REA_SOCKET");
|
||||
const token = setting("REA_TOKEN");
|
||||
const runId = setting("REA_RUN_ID");
|
||||
runtime = dirname(socket);
|
||||
const lateBridge = async (identity: string, credential = token) => {
|
||||
const child = spawn(
|
||||
process.execPath,
|
||||
[resolve("tests/fixtures/fakeHopper.mjs"), socket, credential, identity],
|
||||
{ stdio: "ignore" },
|
||||
);
|
||||
children.push(child);
|
||||
await vi.waitFor(() => access(socket));
|
||||
return child;
|
||||
};
|
||||
for (const [identity, credential] of [
|
||||
["different-run", token],
|
||||
[runId, "different-token"],
|
||||
] as const) {
|
||||
const wrong = await lateBridge(identity, credential);
|
||||
});
|
||||
status.parse((await call("binary_session")).structuredContent);
|
||||
expect(parseMcpToolError(await call("close_binary")).error.code).toBe(
|
||||
"cleanup_incomplete",
|
||||
);
|
||||
expect(wrong.exitCode).toBeNull();
|
||||
await access(runtime);
|
||||
await stop(wrong);
|
||||
await rm(socket, { force: true });
|
||||
}
|
||||
const owned = await lateBridge(runId);
|
||||
expect((await call("close_binary")).isError).not.toBe(true);
|
||||
await vi.waitFor(() => expect(owned.exitCode).toBe(0));
|
||||
await expect(access(runtime)).rejects.toMatchObject({ code: "ENOENT" });
|
||||
await writeFile(mode, "bridge");
|
||||
expect((await call("open_binary", { path: target })).isError).not.toBe(true);
|
||||
expect((await call("current_document")).isError).not.toBe(true);
|
||||
expect((await call("close_binary")).isError).not.toBe(true);
|
||||
});
|
||||
const bootstrap = await readFile(await readFile(receipt, "utf8"), "utf8");
|
||||
const setting = (name: string): string => {
|
||||
const line = bootstrap
|
||||
.split("\n")
|
||||
.find((value) => value.startsWith(`${name} = `));
|
||||
if (line === undefined)
|
||||
throw new Error(`Missing bootstrap setting ${name}`);
|
||||
return z.string().parse(JSON.parse(line.slice(name.length + 3)));
|
||||
};
|
||||
const socket = setting("REA_SOCKET");
|
||||
const token = setting("REA_TOKEN");
|
||||
const runId = setting("REA_RUN_ID");
|
||||
runtime = dirname(socket);
|
||||
const lateBridge = async (identity: string, credential = token) => {
|
||||
const child = spawn(
|
||||
process.execPath,
|
||||
[
|
||||
resolve("tests/fixtures/fakeHopper.mjs"),
|
||||
socket,
|
||||
credential,
|
||||
identity,
|
||||
],
|
||||
{ stdio: "ignore" },
|
||||
);
|
||||
children.push(child);
|
||||
await vi.waitFor(() => access(socket));
|
||||
return child;
|
||||
};
|
||||
for (const [identity, credential] of [
|
||||
["different-run", token],
|
||||
[runId, "different-token"],
|
||||
] as const) {
|
||||
const wrong = await lateBridge(identity, credential);
|
||||
expect(parseMcpToolError(await call("close_binary")).error.code).toBe(
|
||||
"cleanup_incomplete",
|
||||
);
|
||||
expect(wrong.exitCode).toBeNull();
|
||||
await access(runtime);
|
||||
await stop(wrong);
|
||||
await rm(socket, { force: true });
|
||||
}
|
||||
const closing = call("close_binary");
|
||||
await delay(150);
|
||||
const owned = await lateBridge(runId);
|
||||
expect((await closing).isError).not.toBe(true);
|
||||
await vi.waitFor(() => expect(owned.exitCode).toBe(0));
|
||||
await expect(access(runtime)).rejects.toMatchObject({ code: "ENOENT" });
|
||||
await writeFile(mode, "bridge");
|
||||
expect((await call("open_binary", { path: target })).isError).not.toBe(
|
||||
true,
|
||||
);
|
||||
expect((await call("current_document")).isError).not.toBe(true);
|
||||
expect((await call("close_binary")).isError).not.toBe(true);
|
||||
},
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user