fix(mcp): return complete inline Evidence records (#585)
Return complete canonical Evidence records inline, including normalized_result, and preserve direct comparison and retained bundle identity. Verified full deterministic gate, real Linux Ghidra CLI/MCP and independently installed artifact, generic package acceptance, private local samples, and targeted updates after syncing main. Closes #551 Assisted-by: Kogasa (gensokyo-skills:kogasa-surprise-testing)
This commit is contained in:
@@ -0,0 +1,49 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
|
||||
import { toolContract } from "../../../src/contracts/toolContracts.js";
|
||||
import { parseEvidence } from "../../../src/domain/evidence.js";
|
||||
import { parseEvidenceBundle } from "../../../src/domain/evidenceBundle.js";
|
||||
import { connectGhidraMcp } from "./ghidraMcpHarness.js";
|
||||
|
||||
describe("inline MCP Evidence composition", () => {
|
||||
it("feeds returned function Evidence directly to comparison and matches the bundle", async () => {
|
||||
const harness = await connectGhidraMcp("inline-function-evidence");
|
||||
const { mcp, session } = harness;
|
||||
try {
|
||||
const response = await mcp.callTool({
|
||||
name: "analyze_function",
|
||||
arguments: { procedure: "fixture_main" },
|
||||
});
|
||||
expect(response.isError).not.toBe(true);
|
||||
const analyzed = toolContract("analyze_function").outputSchema.parse(
|
||||
response.structuredContent,
|
||||
);
|
||||
const comparison = await mcp.callTool({
|
||||
name: "compare_functions",
|
||||
arguments: { left: analyzed.evidence, right: analyzed.evidence },
|
||||
});
|
||||
expect(comparison.isError).not.toBe(true);
|
||||
const inline = parseEvidence(analyzed.evidence);
|
||||
expect(inline.normalized_result).toEqual(analyzed.result);
|
||||
expect(session.evidenceById(inline.evidence_id)).toEqual(inline);
|
||||
const compared = toolContract("compare_functions").outputSchema.parse(
|
||||
comparison.structuredContent,
|
||||
);
|
||||
const comparisonEvidence = parseEvidence(compared.evidence);
|
||||
expect(comparisonEvidence.evidence_links).toContain(inline.evidence_id);
|
||||
expect(comparisonEvidence.normalized_result).toEqual(compared.result);
|
||||
const bundle = await mcp.callTool({
|
||||
name: "get_evidence_bundle",
|
||||
arguments: {},
|
||||
});
|
||||
const exported = toolContract("get_evidence_bundle").outputSchema.parse(
|
||||
bundle.structuredContent,
|
||||
);
|
||||
const retained = parseEvidenceBundle(exported.result);
|
||||
expect(retained.records).toContainEqual(inline);
|
||||
expect(retained.records).toContainEqual(comparisonEvidence);
|
||||
} finally {
|
||||
await harness.close();
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -6,7 +6,8 @@ import { ok } from "../../../src/domain/result.js";
|
||||
import { err } from "../../../src/domain/result.js";
|
||||
import { HopperProcessError } from "../../../src/domain/errors.js";
|
||||
import { toCallToolResult } from "../../../src/server/toolResult.js";
|
||||
import { createEvidence } from "../../../src/domain/evidence.js";
|
||||
import { createEvidence, parseEvidence } from "../../../src/domain/evidence.js";
|
||||
import type { JsonValue } from "../../../src/domain/jsonValue.js";
|
||||
import { evidenceResultOf } from "../../../src/contracts/toolOutputSchemas.js";
|
||||
|
||||
const contract: ToolContract = {
|
||||
@@ -102,6 +103,7 @@ describe("tool result projection", () => {
|
||||
result: { value: "observed" },
|
||||
evidence_id: evidence.evidence_id,
|
||||
evidence: {
|
||||
normalized_result: { value: "observed" },
|
||||
provider: { id: "fixture", name: "Fixture", version: "1" },
|
||||
operation: "fixture",
|
||||
predicate_type: "rea.analysis",
|
||||
@@ -119,5 +121,40 @@ describe("tool result projection", () => {
|
||||
type: "text",
|
||||
text: expect.stringContaining('"value":"observed"'),
|
||||
});
|
||||
const parsed = evidenceContract.outputSchema.parse(
|
||||
result.structuredContent,
|
||||
);
|
||||
expect(parseEvidence(parsed.evidence)).toEqual(evidence);
|
||||
});
|
||||
|
||||
it.each<JsonValue>([null, false, 0, "", [], { nested: [false, null, 7] }])(
|
||||
"preserves a complete reusable Evidence record for JSON result %j",
|
||||
(value) => {
|
||||
const evidence = createEvidence(
|
||||
undefined,
|
||||
{ id: "fixture", name: "Fixture", version: "1" },
|
||||
{ operation: "fixture", parameters: {}, result: value },
|
||||
);
|
||||
const evidenceContract = {
|
||||
...contract,
|
||||
outputSchema: evidenceResultOf(z.json()),
|
||||
};
|
||||
const result = toCallToolResult(ok(evidence), evidenceContract);
|
||||
const parsed = evidenceContract.outputSchema.parse(
|
||||
result.structuredContent,
|
||||
);
|
||||
expect(parsed.result).toEqual(value);
|
||||
expect(parseEvidence(parsed.evidence)).toEqual(evidence);
|
||||
expect(result.content).toEqual([
|
||||
{ type: "text", text: JSON.stringify(parsed) },
|
||||
]);
|
||||
const { normalized_result: _missingResult, ...incomplete } = evidence;
|
||||
expect(
|
||||
evidenceContract.outputSchema.safeParse({
|
||||
...parsed,
|
||||
evidence: incomplete,
|
||||
}).success,
|
||||
).toBe(false);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user