mirror of
https://github.com/morluto/rea.git
synced 2026-11-16 11:43:20 +00:00
* perf(tests): give MCP test clients the shared lazy schema validation The MCP SDK client compiles every listed tool's output schema on its first tool call. With the SDK's default Ajv options, REA's catalog costs gigabytes of allocation per client (inspect_analysis_view alone: 1.7 s and ~500 MiB retained), so native MCP files peaked at 1-2 GiB per worker. tests/fixtures/mcpSchemaValidation already owns lazy, reference-preserving validation. Route the native MCP, process-boundary and shared harness clients through it, share compiled validators across clients in a worker (bounded LRU keyed by schema text), and add a counted architecture guard so default-validation test clients cannot spread; the remaining copies are the baseline. * fix(guards): read call arguments past parentheses inside string literals * perf(tests): give MCP boundary test clients the shared schema validation (#11022) * perf(tests): give MCP boundary test clients the shared schema validation * perf(tests): give the remaining MCP test clients the shared schema validation (#11025) * fix(guards): read an MCP client's validator option from parsed code The default-validation counter searched each new Client(...) call's text for jsonSchemaValidator, so an inline comment, a string literal or a client name naming the option hid a default client. Parse the source with @babel/parser and count NewExpressions of Client whose object-literal arguments have no jsonSchemaValidator property; a source that does not parse counts every textual call. The guard reads raw test sources, and the generated-child-script allowlist entry, which no longer counts as a call, is removed. * fix(guards): read an MCP client's options only from a whole object-literal argument The default-validation counter skipped files without the text 'new Client(', so a comment between the tokens hid a client, and it took any depth-two key as an option, so 'enabled ? { jsonSchemaValidator } : {}' passed while its false branch uses the SDK default. The skip now only requires the name Client, and the validator counts only when it is a key of an object literal that is a whole argument; anything else counts as the default.
230 lines
7.5 KiB
TypeScript
230 lines
7.5 KiB
TypeScript
import { unknownTarget } from "../../src/domain/targetIdentity.js";
|
|
import { Client, InMemoryTransport } from "@modelcontextprotocol/client";
|
|
import { writeFile } from "node:fs/promises";
|
|
import { join } from "node:path";
|
|
import pino from "pino";
|
|
import { expect, it, onTestFinished, vi } from "vitest";
|
|
import { z } from "zod";
|
|
import { createEvidence } from "../../src/domain/evidence.js";
|
|
import { createServer } from "../../src/server/createServer.js";
|
|
import {
|
|
createDeferred,
|
|
createTestBinarySession,
|
|
} from "../fixtures/binarySession.js";
|
|
import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js";
|
|
import type { ProgressUpdate } from "../../src/ports/ProgressReporter.js";
|
|
import { createMcpSchemaValidation } from "../fixtures/mcpSchemaValidation.js";
|
|
|
|
const progressBoundary = vi.hoisted(() => ({
|
|
observe: undefined as ((update: ProgressUpdate) => Promise<void>) | undefined,
|
|
}));
|
|
|
|
// Observe each application boundary deterministically; transport rate limiting
|
|
// is covered by reporter tests and must not select the cancellation site.
|
|
vi.mock("../../src/ports/ProgressReporter.js", async (original) => {
|
|
const actual =
|
|
await original<typeof import("../../src/ports/ProgressReporter.js")>();
|
|
return {
|
|
...actual,
|
|
createProgressReporter: (
|
|
...args: Parameters<typeof actual.createProgressReporter>
|
|
) =>
|
|
actual.createProgressReporter(
|
|
async (update) => {
|
|
await args[0](update);
|
|
await progressBoundary.observe?.(update);
|
|
},
|
|
{
|
|
...args[1],
|
|
minimumIntervalMs: 0,
|
|
},
|
|
),
|
|
};
|
|
});
|
|
|
|
const createCancellationBoundary = (phase: string, message: string) => {
|
|
const released = createDeferred<void>();
|
|
let heldAtBoundary = false;
|
|
let acknowledgedCancellation = false;
|
|
let acknowledgementError: unknown;
|
|
const release = () => released.resolve(undefined);
|
|
return {
|
|
release,
|
|
async observe(update: ProgressUpdate) {
|
|
if (update.phase === phase && update.message.includes(message)) {
|
|
heldAtBoundary = true;
|
|
await released.promise;
|
|
}
|
|
},
|
|
acknowledge(client: Client) {
|
|
// Ordered in-memory messages make the ping acknowledge the cancellation
|
|
// before the producer crosses the held boundary.
|
|
void client.ping().then(
|
|
() => {
|
|
acknowledgedCancellation = true;
|
|
release();
|
|
},
|
|
(error: unknown) => {
|
|
acknowledgementError = error;
|
|
release();
|
|
},
|
|
);
|
|
},
|
|
expectAcknowledged() {
|
|
expect(heldAtBoundary).toBe(true);
|
|
expect(acknowledgedCancellation).toBe(true);
|
|
expect(acknowledgementError).toBeUndefined();
|
|
},
|
|
};
|
|
};
|
|
|
|
it.each([
|
|
{ phase: "parse_javascript_source", message: "second.js", parsedFiles: 1 },
|
|
{
|
|
phase: "analyze_javascript_application",
|
|
message: "Application graph and Electron boundaries reconstructed",
|
|
parsedFiles: 2,
|
|
},
|
|
])(
|
|
"retains completed facts and prior Evidence after SDK cancellation during $phase, then accepts subsequent work",
|
|
async ({ phase, message, parsedFiles }) => {
|
|
const boundary = createCancellationBoundary(phase, message);
|
|
progressBoundary.observe = boundary.observe;
|
|
const root = await createTestTempDirectory("rea-mcp-js-cancellation-");
|
|
await writeFile(join(root, "main.js"), "export const observed = 1;\n");
|
|
await writeFile(join(root, "second.js"), "export const pending = 2;\n");
|
|
const session = createTestBinarySession(() => {
|
|
throw new Error(
|
|
"Static JavaScript analysis must not start a binary provider",
|
|
);
|
|
});
|
|
const prior = createEvidence(
|
|
unknownTarget("not-observed"),
|
|
{ id: "fixture", name: "Fixture", version: "1" },
|
|
{
|
|
operation: "prior_observation",
|
|
parameters: {},
|
|
result: { preserved: true },
|
|
},
|
|
);
|
|
expect(session.recordEvidence(prior).ok).toBe(true);
|
|
const completed = createDeferred<string>();
|
|
const completionSchema = z.object({
|
|
tool: z.string(),
|
|
status: z.string(),
|
|
msg: z.string(),
|
|
});
|
|
const logger = pino(
|
|
{ level: "info" },
|
|
{
|
|
write(line) {
|
|
const value: unknown = JSON.parse(line);
|
|
const parsed = completionSchema.safeParse(value);
|
|
if (
|
|
parsed.success &&
|
|
parsed.data.tool === "analyze_javascript_application" &&
|
|
parsed.data.msg === "MCP tool execution completed"
|
|
)
|
|
completed.resolve(parsed.data.status);
|
|
},
|
|
},
|
|
);
|
|
const server = createServer({ kind: "session", session }, { logger });
|
|
const client = new Client(
|
|
{
|
|
name: "javascript-cancellation",
|
|
version: "1",
|
|
},
|
|
{ jsonSchemaValidator: createMcpSchemaValidation() },
|
|
);
|
|
onTestFinished(async () => {
|
|
boundary.release();
|
|
progressBoundary.observe = undefined;
|
|
await client.close();
|
|
await server.close();
|
|
await session.close();
|
|
});
|
|
const [clientTransport, serverTransport] =
|
|
InMemoryTransport.createLinkedPair();
|
|
await server.connect(serverTransport);
|
|
await client.connect(clientTransport);
|
|
const controller = new AbortController();
|
|
let requested = false;
|
|
const call = client.callTool(
|
|
{
|
|
name: "analyze_javascript_application",
|
|
arguments: {
|
|
input_path: root,
|
|
format: "directory",
|
|
},
|
|
},
|
|
{
|
|
signal: controller.signal,
|
|
onprogress(update) {
|
|
if (
|
|
!update.message?.startsWith(`${phase}:`) ||
|
|
!update.message.includes(message)
|
|
)
|
|
return;
|
|
requested = true;
|
|
controller.abort(new Error("SDK cancellation verification"));
|
|
boundary.acknowledge(client);
|
|
},
|
|
},
|
|
);
|
|
await expect(call).rejects.toThrow("SDK cancellation verification");
|
|
expect(requested).toBe(true);
|
|
// A rejected client promise alone does not prove that the server stopped.
|
|
expect(await completed.promise).toBe("error");
|
|
boundary.expectAcknowledged();
|
|
await client.ping();
|
|
const bundle = await client.callTool({
|
|
name: "get_evidence_bundle",
|
|
arguments: {},
|
|
});
|
|
const records = z
|
|
.object({
|
|
result: z.object({
|
|
records: z.array(z.object({ evidence_id: z.string() })),
|
|
}),
|
|
})
|
|
.parse(bundle.structuredContent).result.records;
|
|
expect(records).toContainEqual({ evidence_id: prior.evidence_id });
|
|
const partial = records.find(
|
|
({ evidence_id }) => evidence_id !== prior.evidence_id,
|
|
);
|
|
if (partial === undefined)
|
|
throw new Error(
|
|
"Cancelled analysis discarded its completed source facts",
|
|
);
|
|
expect(
|
|
z
|
|
.object({
|
|
statistics: z.object({
|
|
parsed_javascript_files: z.number(),
|
|
parse_failures: z.number(),
|
|
}),
|
|
})
|
|
.parse(session.evidenceById(partial.evidence_id)?.normalized_result)
|
|
.statistics,
|
|
).toEqual({ parsed_javascript_files: parsedFiles, parse_failures: 0 });
|
|
const view = await client.callTool({
|
|
name: "inspect_analysis_view",
|
|
arguments: {
|
|
source: { kind: "retained-evidence", evidence_id: partial.evidence_id },
|
|
view: { kind: "summary" },
|
|
},
|
|
});
|
|
expect(view.isError, JSON.stringify(view)).not.toBe(true);
|
|
const next = await client.callTool({
|
|
name: "analyze_javascript_application",
|
|
arguments: {
|
|
input_path: root,
|
|
format: "directory",
|
|
},
|
|
});
|
|
expect(next.isError, JSON.stringify(next)).not.toBe(true);
|
|
await client.ping();
|
|
},
|
|
);
|