refactor(verify): release five verifier roots through VerifierFixture after their clients confirm (#11118)

* refactor(verify): release five verifier roots through VerifierFixture after their clients confirm

* fix(verify): keep the binary-layout and EVM roots until their auxiliary MCP clients confirm

* fix(verify): carry the retained root on each migrated verifier's final failure
This commit is contained in:
morluto authored and GitHub committed 2026-11-15 21:07:13 +08:00
1 parent e38e339e5f
commit fe05a4c56d
9 files changed
+183 -125

No files matched your search

+24 -24
View File
@@ -1,19 +1,18 @@
import assert from "node:assert/strict";
import { execFile } from "node:child_process";
import { mkdtemp, readdir, rmdir } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join, resolve } from "node:path";
import { readdir } from "node:fs/promises";
import { resolve } from "node:path";
import { promisify } from "node:util";
import { Client } from "@modelcontextprotocol/client";
import { StdioClientTransport } from "@modelcontextprotocol/client/stdio";
import { toolContract } from "../dist/contracts/toolContracts.js";
import { ArtifactResourceScope } from "../dist/artifacts/ArtifactResourceScope.js";
import { requireMcpOutput } from "./lib/mcp-verifier-results.mjs";
import {
closeVerifierResources,
withVerifierCleanup,
} from "./lib/verifier-cleanup.mjs";
import { hashVerifierFile } from "./lib/verifier-file-resources.mjs";
import {
VerifierFixture,
withVerifierFixture,
} from "./lib/verifier-fixture.mjs";
const args = process.argv.slice(2);
if (args.includes("--help") || args.includes("-h")) {
@@ -27,7 +26,11 @@ if (!(args.length === 0 || (args.length === 2 && args[0] === "--pcap")))
const path = args[1] === undefined ? null : resolve(args[1]);
// This parent is shared by independent CLI/MCP owners. A leased Windows
// runtime root would prevent their native admission of its directory handle.
const root = await mkdtemp(join(tmpdir(), "rea-pcap-verifier-"));
const fixture = await VerifierFixture.open({
prefix: "rea-pcap-verifier-",
private: false,
});
const root = fixture.path;
const resources = new ArtifactResourceScope();
const environment = Object.fromEntries(
Object.entries(process.env).filter(([, value]) => typeof value === "string"),
@@ -47,7 +50,18 @@ const transport = new StdioClientTransport({
stderr: "pipe",
});
transport.stderr?.resume();
await withVerifierCleanup(async () => {
fixture.releaseAfter(() => client.close());
fixture.releaseAfter(() => transport.close());
fixture.releaseAfter(() => resources.close());
// The product releases what it created under TMPDIR; anything left fails.
fixture.releaseAfter(async () =>
assert.deepEqual(
await readdir(root),
[],
`Owned capture resources remain under ${root}`,
),
);
await withVerifierFixture(fixture, async () => {
await client.connect(transport);
const readiness = await run("inspect_pcap_client", {});
assert(readiness.client.tshark_version && readiness.client.capinfos_version);
@@ -91,21 +105,7 @@ await withVerifierCleanup(async () => {
`[ok] ${result.packet_count} packets; ${result.endpoint_count} addresses; coverage=${result.coverage}`,
);
}
}, [
async () => {
await closeVerifierResources([
() => client.close(),
() => transport.close(),
() => resources.close(),
]);
assert.deepEqual(
await readdir(root),
[],
`Owned capture resources remain under ${root}`,
);
await rmdir(root);
},
]);
});
console.log("All asserted pcap CLI/MCP checks passed");
async function run(name, input) {