Skip to content

armgit / rea

Public Imported from GitHub
0

Reverse engineer anything with agents, from app behavior down to native binaries.

chore: integrate canonical Evidence changes for MCP error delivery

N0zoM1z07bf63ed7f831
diff --cc scripts/lib/ghidra-reference-snapshot-e2e.mjs
index 7dcb81a48,d759ed623..b0ce2318f
--- a/scripts/lib/ghidra-reference-snapshot-e2e.mjs
+++ b/scripts/lib/ghidra-reference-snapshot-e2e.mjs
@@@ -1,7 -1,3 +1,8 @@@
+import {
+ requireMcpToolError,
- requireMcpResult,
++ requireMcpLifecycleResult,
++ requireMcpEvidenceResult,
+} from "./mcp-verifier-results.mjs";
import assert from "node:assert/strict";
import { execFile } from "node:child_process";
import { randomUUID } from "node:crypto";
diff --cc scripts/lib/mcp-verifier-results.mjs
index 8375bea87,6af6bd9c5..7ac038a0a
--- a/scripts/lib/mcp-verifier-results.mjs
+++ b/scripts/lib/mcp-verifier-results.mjs
@@@ -1,4 -1,4 +1,5 @@@
+import { analysisErrorProjectionSchema } from "../../dist/contracts/errorSchemas.js";
+ import { toolContract } from "../../dist/contracts/toolContracts.js";
/** Read the textual JSON projection from one MCP tool call. */
export const mcpTextValue = (result) => {
@@@ -9,22 -9,49 +10,55 @@@
const jsonValue = (result) => JSON.parse(mcpTextValue(result));
+/** Read the complete canonical diagnostic from an MCP tool failure. */
+export const requireMcpToolError = (result) => {
+ if (result.isError !== true) throw new Error("Expected an MCP tool failure");
+ return analysisErrorProjectionSchema.parse(jsonValue(result).error);
+};
+
- /** Return the compact result projection from one successful MCP tool call. */
- export const requireMcpResult = (result, operation) => {
- if (result.isError === true) {
+ const requireOutput = (result, operation, contract) => {
+ if (result.isError === true)
throw new Error(`${operation} failed: ${mcpTextValue(result)}`);
- }
- const value = jsonValue(result);
- if (value === null || typeof value !== "object" || !("result" in value)) {
- throw new Error(`${operation} omitted its result projection`);
- }
- return value.result;
+ if (contract.name !== operation)
+ throw new Error(`${operation} received the ${contract.name} contract`);
+ return contract.outputSchema.parse(jsonValue(result));
+ };
+
+ const operationResultKey = (contract) => {
+ const shape = contract.outputSchema.shape;
+ if (shape === undefined)
+ throw new Error(`${contract.name} has an unsupported MCP output schema`);
+ const evidence = Object.hasOwn(shape, "normalized_result");
+ const lifecycle = Object.hasOwn(shape, "result");
+ if (evidence === lifecycle)
+ throw new Error(`${contract.name} has an unsupported MCP output schema`);
+ return evidence ? "normalized_result" : "result";
+ };
+
+ /** Validate an Evidence-producing tool output and return its normalized result. */
+ export const requireMcpEvidenceResult = (result, operation) => {
+ const contract = toolContract(operation);
+ if (operationResultKey(contract) !== "normalized_result")
+ throw new Error(`${operation} requires the lifecycle result extractor`);
+ return requireOutput(result, operation, contract).normalized_result;
+ };
+
+ /** Validate a lifecycle tool output and return its operation result. */
+ export const requireMcpLifecycleResult = (result, operation) => {
+ const contract = toolContract(operation);
+ if (operationResultKey(contract) !== "result")
+ throw new Error(`${operation} requires the Evidence result extractor`);
+ return requireOutput(result, operation, contract).result;
+ };
+
+ /** Project a mixed verifier call using its exact named canonical output schema. */
+ export const requireMcpOperationResult = (
+ result,
+ operation,
+ contract = toolContract(operation),
+ ) => {
+ const key = operationResultKey(contract);
+ return requireOutput(result, operation, contract)[key];
};
/** Verify provider identity directly from the tool result. */
diff --cc scripts/lib/real-ghidra-boundaries.mjs
index 2535b10df,bba21691d..0a59c5fae
--- a/scripts/lib/real-ghidra-boundaries.mjs
+++ b/scripts/lib/real-ghidra-boundaries.mjs
@@@ -1,8 -1,3 +1,8 @@@
+import {
+ requireMcpToolError,
+ mcpTextValue,
- requireMcpResult,
++ requireMcpOperationResult,
+} from "./mcp-verifier-results.mjs";
import assert from "node:assert/strict";
import { execFile } from "node:child_process";
import { createHash, randomUUID } from "node:crypto";
@@@ -12,7 -7,11 +12,9 @@@ import { setTimeout as delay } from "no
import { promisify } from "node:util";
import Ajv from "ajv/dist/2020.js";
import addFormats from "ajv-formats";
+
+ import { analysisErrorProjectionSchema } from "../../dist/contracts/errorSchemas.js";
-import {
- mcpTextValue,
- requireMcpOperationResult,
-} from "./mcp-verifier-results.mjs";
++
import { verifyLegacyGhidraReferenceSnapshot } from "./ghidra-reference-snapshot-e2e.mjs";
import { verifyGhidraSnapshotLifecycle } from "./real-ghidra-snapshot-lifecycle.mjs";
import { verifyGhidraTargetAdmission } from "./real-ghidra-target-admission.mjs";
diff --cc scripts/lib/real-ghidra-snapshot-lifecycle.mjs
index 78cdd1aab,f6456f263..4a854c731
--- a/scripts/lib/real-ghidra-snapshot-lifecycle.mjs
+++ b/scripts/lib/real-ghidra-snapshot-lifecycle.mjs
@@@ -1,7 -1,3 +1,7 @@@
+import {
+ requireMcpToolError,
- requireMcpResult,
++ requireMcpOperationResult,
+} from "./mcp-verifier-results.mjs";
import assert from "node:assert/strict";
import { access, mkdtemp, readFile, rm } from "node:fs/promises";
import { tmpdir } from "node:os";
diff --cc scripts/verify/electron/tool-contracts.mjs
index 588580dd4,6e45365d7..c5afa9f1c
--- a/scripts/verify/electron/tool-contracts.mjs
+++ b/scripts/verify/electron/tool-contracts.mjs
@@@ -173,11 -172,11 +173,11 @@@ window.loadFile("renderer.html");requir
{ timeout: 150_000 },
);
const capture = active.isError
- ? active.structuredContent.error.details.partial_observation.capture
+ ? requireMcpToolError(active).details.partial_observation.capture
- : active.structuredContent.result;
+ : active.structuredContent.normalized_result;
if (active.isError) {
assert.equal(
- active.structuredContent.error.code,
+ requireMcpToolError(active).code,
"cleanup_incomplete",
JSON.stringify(active),
);
diff --cc tests/boundary/mcp/artifactMcp.test.ts
index d62e85178,82837a162..5b786a2dd
--- a/tests/boundary/mcp/artifactMcp.test.ts
+++ b/tests/boundary/mcp/artifactMcp.test.ts
@@@ -1,4 -1,5 +1,6 @@@
+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";
+ import { parseEvidence } from "../../../src/domain/evidence.js";
+ import { ok as resultOk } from "../../../src/domain/result.js";
import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
import { join } from "node:path";
diff --cc tests/boundary/mcp/browserMcp.test.ts
index 8ace88edb,2cd03b089..379a27d93
--- a/tests/boundary/mcp/browserMcp.test.ts
+++ b/tests/boundary/mcp/browserMcp.test.ts
@@@ -1,7 -1,7 +1,8 @@@
+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";
+ import { parseEvidence } from "../../../src/domain/evidence.js";
+ import { ok as resultOk } from "../../../src/domain/result.js";
import { Client, InMemoryTransport } from "@modelcontextprotocol/client";
import { afterEach, expect, it } from "vitest";
- import { z } from "zod";
import { createTestBinarySession } from "../../fixtures/binarySession.js";
import { CdpBrowserProvider } from "../../../src/browser/CdpBrowserProvider.js";
diff --cc tests/boundary/mcp/bundleComparisonMcp.test.ts
index 039074572,31ad6e6bf..0ea1006b3
--- a/tests/boundary/mcp/bundleComparisonMcp.test.ts
+++ b/tests/boundary/mcp/bundleComparisonMcp.test.ts
@@@ -1,4 -1,4 +1,5 @@@
+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";
+ import { ok as resultOk } from "../../../src/domain/result.js";
import { rm, writeFile } from "node:fs/promises";
import { join } from "node:path";
diff --cc tests/boundary/mcp/enhancedToolsHarness.ts
index 17ec27491,2bb3bd3ca..26bb194ab
--- a/tests/boundary/mcp/enhancedToolsHarness.ts
+++ b/tests/boundary/mcp/enhancedToolsHarness.ts
@@@ -1,9 -1,6 +1,10 @@@
+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";
+ import { parseEvidence } from "../../../src/domain/evidence.js";
import type { CallToolResult } from "@modelcontextprotocol/server";
-import { type JsonValue } from "../../../src/domain/jsonValue.js";
+import {
+ jsonValueSchema,
+ type JsonValue,
+} from "../../../src/domain/jsonValue.js";
import { Client, InMemoryTransport } from "@modelcontextprotocol/client";
import type { AnalysisOperationPort } from "../../../src/application/AnalysisProvider.js";
import { createServer } from "../../../src/server/createServer.js";
@@@ -40,35 -37,5 +41,7 @@@ export const closeEnhancedToolResource
);
};
- export const jsonResult = (result: CallToolResult): JsonValue => {
- if (result.isError === true)
- return jsonValueSchema.parse(parseMcpToolError(result));
- if (result.structuredContent === undefined)
- throw new Error("Tool result omitted structured content");
- const structured = jsonValueSchema.safeParse(result.structuredContent);
- if (!structured.success)
- throw new Error("Tool structured result was not JSON");
- if (
- typeof structured.data === "object" &&
- structured.data !== null &&
- !Array.isArray(structured.data) &&
- "normalized_result" in structured.data
- ) {
- return structured.data.normalized_result ?? null;
- }
- if (
- typeof structured.data === "object" &&
- structured.data !== null &&
- !Array.isArray(structured.data) &&
- "evidence_id" in structured.data &&
- "result" in structured.data
- )
- return structured.data.result ?? null;
- const text = result.content.find((item) => item.type === "text");
- if (text?.type !== "text")
- throw new Error("Tool result omitted text content");
- const decoded: unknown = JSON.parse(text.text);
- const parsed = jsonValueSchema.safeParse(decoded);
- if (!parsed.success) throw new Error("Tool result was not JSON");
- return parsed.data;
- };
+ export const jsonResult = (result: CallToolResult): JsonValue =>
- parseEvidence(result.structuredContent).normalized_result;
++ result.isError === true
++ ? jsonValueSchema.parse(parseMcpToolError(result))
++ : parseEvidence(result.structuredContent).normalized_result;
diff --cc tests/boundary/mcp/managedMcp.test.ts
index cbe8c4bf5,2b71c6928..3d2524eb0
--- a/tests/boundary/mcp/managedMcp.test.ts
+++ b/tests/boundary/mcp/managedMcp.test.ts
@@@ -1,4 -1,4 +1,5 @@@
+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";
+ import { parseEvidence } from "../../../src/domain/evidence.js";
import { writeFile } from "node:fs/promises";
import { join } from "node:path";
diff --cc tests/boundary/mcp/oversizedErrorDeliveryMcp.test.ts
index 6db36be56,6bcec278b..ea2809b7c
--- a/tests/boundary/mcp/oversizedErrorDeliveryMcp.test.ts
+++ b/tests/boundary/mcp/oversizedErrorDeliveryMcp.test.ts
@@@ -10,13 -9,14 +10,15 @@@ import { z } from "zod"
import { AnalysisInputError } from "../../../src/domain/analysisErrorCore.js";
import type { EvidenceWriter } from "../../../src/application/investigation/InvestigationRecordPort.js";
import { EvidenceIntegrityError } from "../../../src/domain/evidenceErrors.js";
-import { err } from "../../../src/domain/result.js";
+import type { Evidence } from "../../../src/domain/evidence.js";
+import { err, ok } from "../../../src/domain/result.js";
import { EvidenceMcpServer } from "../../../src/server/EvidenceMcpServer.js";
- import { toErrorToolResult } from "../../../src/server/toolResult.js";
+ import { ToolResultDelivery } from "../../../src/server/toolResult.js";
+
+ const delivery = new ToolResultDelivery(STDIO_DEFAULT_MAX_BUFFER_SIZE);
const oversizedFailure = () =>
- toErrorToolResult(
+ delivery.toErrorToolResult(
new AnalysisInputError("procedure_address", undefined, [
{
path: ["procedure"],
diff --cc tests/boundary/mcp/reconstructionCoverageMcp.test.ts
index a350ee828,8cf0458ff..50dd2508a
--- a/tests/boundary/mcp/reconstructionCoverageMcp.test.ts
+++ b/tests/boundary/mcp/reconstructionCoverageMcp.test.ts
@@@ -1,4 -1,4 +1,5 @@@
+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";
+ import { ok as resultOk } from "../../../src/domain/result.js";
import { Client, InMemoryTransport } from "@modelcontextprotocol/client";
import { describe, expect, it } from "vitest";
diff --cc tests/boundary/mcp/retainedApplicationEvidenceMcp.test.ts
index 716462663,3173a0a63..e9c0dd222
--- a/tests/boundary/mcp/retainedApplicationEvidenceMcp.test.ts
+++ b/tests/boundary/mcp/retainedApplicationEvidenceMcp.test.ts
@@@ -196,10 -199,29 +196,26 @@@ it("preserves validation for the refere
application: retained(record.evidence_id),
},
});
- expect(response).toMatchObject({
- isError: true,
- structuredContent: {
- error: { code: "invalid_request", category: "invalid_input" },
- },
+ expect(parseMcpToolError(response)).toMatchObject({
+ error: { code: "invalid_request", category: "invalid_input" },
});
}
+ for (const reference of [
+ { evidence_id: application.evidence_id },
+ { ...retained(application.evidence_id), kind: "another-session" },
+ retained("ev_short"),
+ { ...retained(application.evidence_id), session_id: "foreign" },
+ { ...retained(application.evidence_id), normalized_result: {} },
+ ]) {
+ const rejected = await client.callTool({
+ name: "trace_application_feature",
+ arguments: {
+ ...JAVASCRIPT_FEATURE_TRACE_EXAMPLE,
+ application: reference,
+ },
+ });
+ expect(rejected.isError).toBe(true);
+ }
const tampered = {
...application,
provider: { ...application.provider, id: "tampered" },
diff --cc tests/boundary/mcp/serverIdentity.test.ts
index c7dab3ab1,9486496ce..1c28ddeeb
--- a/tests/boundary/mcp/serverIdentity.test.ts
+++ b/tests/boundary/mcp/serverIdentity.test.ts
@@@ -1,4 -1,4 +1,5 @@@
+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";
+ import { ok as resultOk } from "../../../src/domain/result.js";
import { readFile, writeFile } from "node:fs/promises";
import { join } from "node:path";
diff --cc tests/boundary/mcp/serverWorkflowMcp.test.ts
index e24bec3ce,e70ae0e56..aa57b58c4
--- a/tests/boundary/mcp/serverWorkflowMcp.test.ts
+++ b/tests/boundary/mcp/serverWorkflowMcp.test.ts
@@@ -1,4 -1,4 +1,5 @@@
+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";
+ import { ok as resultOk } from "../../../src/domain/result.js";
import { Client, InMemoryTransport } from "@modelcontextprotocol/client";
import type { CallToolResult } from "@modelcontextprotocol/server";
import { afterEach, expect, it } from "vitest";