diff --git a/src/application/javascript/JavaScriptEvidenceInputs.test.ts b/src/application/javascript/JavaScriptEvidenceInputs.test.ts index 06a6db7320..e0e3ae4c8b 100644 --- a/src/application/javascript/JavaScriptEvidenceInputs.test.ts +++ b/src/application/javascript/JavaScriptEvidenceInputs.test.ts @@ -13,11 +13,9 @@ import { JAVASCRIPT_APPLICATION_VERSION_COMPARISON_EXAMPLE, JAVASCRIPT_FEATURE_TRACE_EXAMPLE, } from "../../contracts/javascript/javascriptApplicationWorkflowExamples.js"; -import { JAVASCRIPT_EXPORT_SHAPE_COMPARISON_EXAMPLE } from "../../contracts/javascript/javascriptExportShapeComparisonExample.js"; import { JAVASCRIPT_RUNTIME_RECONCILIATION_EXAMPLE } from "../../contracts/javascript/javascriptRuntimeReconciliationExample.js"; import { compareApplicationVersionsEvidence, - compareJavaScriptExportShapesEvidence, traceApplicationFeatureEvidence, } from "./JavaScriptApplicationWorkflowService.js"; import { reconcileJavaScriptRuntimeEvidence } from "./JavaScriptRuntimeReconciliationService.js"; @@ -68,11 +66,14 @@ it("keeps a static trace subject unknown when legacy graph root evidence is omit expect(trace.value.evidence.subject.identity.kind).toBe("unknown"); }); -const native = createEvidence( - { path: "/example/addon.node", sha256: "e".repeat(64), format: "elf" }, - { id: "fixture", name: "Native fixture", version: "1" }, - { operation: "procedure_info", parameters: {}, result: {} }, -); +const nativeObservation = (address: string) => + createEvidence( + { path: "/example/addon.node", sha256: "e".repeat(64), format: "elf" }, + { id: "fixture", name: "Native fixture", version: "1" }, + { operation: "procedure_info", parameters: { address }, result: {} }, + ); + +const native = nativeObservation("0x1000"); it("preserves the verified application subject in both trace workflows", async () => { const original = JAVASCRIPT_FEATURE_TRACE_EXAMPLE.application; @@ -172,15 +173,18 @@ it("resolves feature native arrays without changing source identity or unknowns" expect(lookup).toHaveBeenCalledTimes(2); }); -it("resolves per-side native observations with one lookup per repeated exact ID", () => { - const input = { - ...JAVASCRIPT_APPLICATION_VERSION_COMPARISON_EXAMPLE, - left_native_observations: [native], - right_native_observations: [native], - }; - const inline = compareApplicationVersionsEvidence(input); +it("preserves native Evidence on each side while resolving a shared ID once", () => { + const { left, right } = JAVASCRIPT_APPLICATION_VERSION_COMPARISON_EXAMPLE; + const leftNative = nativeObservation("0x1100"); + const rightNative = nativeObservation("0x1200"); + const inline = compareApplicationVersionsEvidence({ + left, + right, + left_native_observations: [leftNative, native], + right_native_observations: [rightNative, native], + }); const records = new Map( - [input.left, input.right, native].map((record) => [ + [left, right, leftNative, rightNative, native].map((record) => [ record.evidence_id, record, ]), @@ -188,10 +192,10 @@ it("resolves per-side native observations with one lookup per repeated exact ID" const lookup = vi.fn((id: string) => records.get(id)); const retained = compareApplicationVersionsEvidence( { - left: reference(input.left), - right: reference(input.right), - left_native_observations: [reference(native)], - right_native_observations: [reference(native)], + left: reference(left), + right: reference(right), + left_native_observations: [reference(leftNative), reference(native)], + right_native_observations: [reference(rightNative), reference(native)], }, lookup, ); @@ -201,28 +205,13 @@ it("resolves per-side native observations with one lookup per repeated exact ID" inline.value.evidence.evidence_id, ); expect(retained.value.result).toEqual(inline.value.result); - expect(lookup).toHaveBeenCalledTimes(3); -}); - -it("uses retained graphs for exact export-shape comparison", () => { - const input = JAVASCRIPT_EXPORT_SHAPE_COMPARISON_EXAMPLE; - const inline = compareJavaScriptExportShapesEvidence(input); - const records = new Map( - [input.left, input.right].map((record) => [record.evidence_id, record]), - ); - const retained = compareJavaScriptExportShapesEvidence( - { - ...input, - left: reference(input.left), - right: reference(input.right), - }, - (id) => records.get(id), - ); - if (!inline.ok) throw inline.error; - if (!retained.ok) throw retained.error; - expect(retained.value.evidence.evidence_id).toBe( - inline.value.evidence.evidence_id, - ); + expect(retained.value.evidence.parameters).toMatchObject({ + left_evidence_id: left.evidence_id, + right_evidence_id: right.evidence_id, + left_native_evidence_ids: [leftNative.evidence_id, native.evidence_id], + right_native_evidence_ids: [rightNative.evidence_id, native.evidence_id], + }); + expect(lookup.mock.calls.flat().sort()).toEqual([...records.keys()].sort()); }); it("resolves nested static layers and runtime arrays before source-owned reconciliation", () => { @@ -284,7 +273,12 @@ it("reports missing nested references before reconciliation without guessing a s }); expect(result).toMatchObject({ ok: false, - error: { _tag: "EvidenceIntegrityError" }, + error: { + _tag: "EvidenceIntegrityError", + reason: "missing", + evidenceId: layer.analysis.evidence_id, + diagnostics: { input_path: ["static_layers", 0, "analysis"] }, + }, }); }); diff --git a/tests/boundary/cli/workflowInputIdentities.test.ts b/tests/boundary/cli/workflowInputIdentities.test.ts index b7058717d5..449aad95de 100644 --- a/tests/boundary/cli/workflowInputIdentities.test.ts +++ b/tests/boundary/cli/workflowInputIdentities.test.ts @@ -171,39 +171,42 @@ const checkNativeObservationIdentities = async ({ reference, otherReference, }: WorkflowContext) => { - for (const side of [ - "left_native_observations", - "right_native_observations", - ] as const) { - const input = { - left: application, - right: other, - [side]: [application, application], - }; - const response = await call("compare_application_versions", { - ...input, - left: reference, - right: otherReference, + const input = { + left: application, + right: other, + left_native_observations: [application, application], + right_native_observations: [other, other], + }; + const response = await call("compare_application_versions", { + ...input, + left: reference, + right: otherReference, + }); + expect(response.isError).toBe(true); + const mcpError = parseMcpToolError(response).error; + const invalid = await runJson( + cli, + root, + "compare-application-versions", + input, + ); + expect(invalid.exitCode).toBe(1); + const issues = ["left_native_observations", "right_native_observations"].map( + (side) => + expect.objectContaining({ + path: [side], + reason: "invalid_value", + message: expect.stringContaining("Native observations must be unique"), + }), + ); + for (const error of [mcpError, invalid.json]) { + expect(error).toMatchObject({ + code: "invalid_request", + details: { issues: expect.arrayContaining(issues) }, }); - expect(response.isError).toBe(true); - expectInputFailure( - parseMcpToolError(response).error, - side, - "Native observations must be unique", - ); - const invalid = await runJson( - cli, - root, - "compare-application-versions", - input, - ); - expect(invalid.exitCode).toBe(1); - expectInputFailure( - invalid.json, - side, - "Native observations must be unique", - ); + expect(error).toHaveProperty("details.issues.length", issues.length); } + const traceInput = { application, seed, diff --git a/tests/boundary/mcp/applicationEvidenceMcp.test.ts b/tests/boundary/mcp/applicationEvidenceMcp.test.ts index 287f092db5..1708f62580 100644 --- a/tests/boundary/mcp/applicationEvidenceMcp.test.ts +++ b/tests/boundary/mcp/applicationEvidenceMcp.test.ts @@ -348,19 +348,7 @@ async function assertRejectedEvidenceReferences( } } -async function assertRejectedInlineEvidence(client: Client): Promise { - const duplicateNative = await client.callTool({ - name: "trace_application_feature", - arguments: { - ...JAVASCRIPT_FEATURE_TRACE_EXAMPLE, - native_observations: [ - JAVASCRIPT_FEATURE_TRACE_EXAMPLE.application, - JAVASCRIPT_FEATURE_TRACE_EXAMPLE.application, - ], - }, - }); - expect(duplicateNative.isError).toBe(true); - +async function assertRejectedSpoofedEvidence(client: Client): Promise { const spoofed = await client.callTool({ name: "trace_application_feature", arguments: { @@ -380,7 +368,7 @@ describe("application workflow MCP parity", () => { try { await runInlineWorkflowScenarios(harness); await assertRejectedEvidenceReferences(harness.client, harness.session); - await assertRejectedInlineEvidence(harness.client); + await assertRejectedSpoofedEvidence(harness.client); } finally { await harness.close(); }