PR Evaluator
a76a33476a
Replaces the bespoke batch-scoped process.exit interceptor with the
withExitGuard convention main established for extension/hook/plugin
loaders (500c39aa2): guard the module import and factory invocation so
a synchronous process.exit()/process.reallyExit() from a custom tool
becomes an ExtensionExitError handled as a recoverable load error,
while host exit paths stay untouched outside the guarded windows.
Tests cover the import-time exit (issue #1704 repro) and factory-time
exit; both would kill the test process without the guard.
83 lines
2.7 KiB
TypeScript
83 lines
2.7 KiB
TypeScript
import { afterEach, describe, expect, it } from "bun:test";
|
|
import * as fs from "node:fs/promises";
|
|
import * as os from "node:os";
|
|
import * as path from "node:path";
|
|
import { loadCustomTools } from "../../src/extensibility/custom-tools/loader";
|
|
|
|
let tempRoot: string | undefined;
|
|
|
|
afterEach(async () => {
|
|
if (tempRoot) {
|
|
await fs.rm(tempRoot, { recursive: true, force: true });
|
|
tempRoot = undefined;
|
|
}
|
|
});
|
|
|
|
async function writeTool(name: string, source: string): Promise<string> {
|
|
tempRoot ??= await fs.mkdtemp(path.join(os.tmpdir(), "omp-custom-tool-loader-"));
|
|
const filePath = path.join(tempRoot, name);
|
|
await Bun.write(filePath, source);
|
|
return filePath;
|
|
}
|
|
|
|
function requireTempRoot(): string {
|
|
if (!tempRoot) throw new Error("Temporary custom tool root was not created.");
|
|
return tempRoot;
|
|
}
|
|
|
|
const VALID_TOOL_SOURCE = [
|
|
"export default api => ({",
|
|
'\tname: "safe_custom_tool",',
|
|
'\tlabel: "Safe Custom Tool",',
|
|
'\tdescription: "Returns a fixed response",',
|
|
"\tparameters: api.zod.object({}),",
|
|
"\tasync execute() {",
|
|
'\t\treturn { content: [{ type: "text", text: "ok" }] };',
|
|
"\t},",
|
|
"});",
|
|
].join("\n");
|
|
|
|
describe("custom tool loader", () => {
|
|
it("skips a tool that calls process.exit synchronously at import time and still loads later valid tools", async () => {
|
|
// CLI-shaped module: main() at the bottom, exit on failure (issue #1704).
|
|
// Without the exit guard this terminates the test process before the
|
|
// assertions run.
|
|
const exitingTool = await writeTool(
|
|
"sync-exit.js",
|
|
[
|
|
"function main() {",
|
|
"\ttry {",
|
|
"\t\tdoWork();",
|
|
"\t} catch {",
|
|
"\t\tprocess.exit(1);",
|
|
"\t}",
|
|
"}",
|
|
"main();",
|
|
].join("\n"),
|
|
);
|
|
const validTool = await writeTool("valid.js", VALID_TOOL_SOURCE);
|
|
|
|
const result = await loadCustomTools([{ path: exitingTool }, { path: validTool }], requireTempRoot(), []);
|
|
|
|
expect(result.tools.map(tool => tool.tool.name)).toEqual(["safe_custom_tool"]);
|
|
expect(result.errors).toHaveLength(1);
|
|
expect(result.errors[0]?.path).toBe(exitingTool);
|
|
expect(result.errors[0]?.error).toContain("process.exit(1)");
|
|
});
|
|
|
|
it("skips a tool whose factory calls process.exit and still loads later valid tools", async () => {
|
|
const factoryExitTool = await writeTool(
|
|
"factory-exit.js",
|
|
["export default () => {", "\tprocess.exit(3);", "};"].join("\n"),
|
|
);
|
|
const validTool = await writeTool("valid.js", VALID_TOOL_SOURCE);
|
|
|
|
const result = await loadCustomTools([{ path: factoryExitTool }, { path: validTool }], requireTempRoot(), []);
|
|
|
|
expect(result.tools.map(tool => tool.tool.name)).toEqual(["safe_custom_tool"]);
|
|
expect(result.errors).toHaveLength(1);
|
|
expect(result.errors[0]?.path).toBe(factoryExitTool);
|
|
expect(result.errors[0]?.error).toContain("process.exit(3)");
|
|
});
|
|
});
|