Reverse engineer anything with agents, from app behavior down to native binaries.
TypeScript agent-skillsai-agentsbinary-analysisclaude-codeclicodexcordisdecompilerdeveloper-toolsdshdsh-pluginghidrahopperllmmcpmodel-context-protocolreareverse-engineeringstatic-analysistouhou
fix(mcp): deliver tool errors within advertised schema contracts
N0zoM1z0da606ff77718
diff --git a/docs/mcp-contracts.md b/docs/mcp-contracts.mdindex 994f301a7..f4db6cfd4 100644--- a/docs/mcp-contracts.md+++ b/docs/mcp-contracts.md@@ -77,6 +77,15 @@ inventories, and do not claim that no short-lived descendant existed.## Progress and cancellation+Tool execution failures return `isError: true` and the complete canonical+`{ "error": ... }` diagnostic as JSON in text `content`. Read that diagnostic+for the error code, target details, partial observations, and remediation.+Failures omit `structuredContent`, since each advertised `outputSchema`+describes successful results. Successful replies retain their schema-validated+structured data and matching text projection. Oversized errors are retained+as Evidence before delivery of a bounded diagnostic with an export reference;+if retention is unavailable or fails, the diagnostic reports that reason.+REA accepts ordinary `tools/call` progress tokens. Updates are monotonic,rate-bounded to at most one intermediate update per 100 ms, and always allow aterminal update. Unknown totals are omitted; REA does not fabricate percentages.diff --git a/scripts/lib/browser-screenshot-e2e.mjs b/scripts/lib/browser-screenshot-e2e.mjsindex 9eed016c4..14232e14e 100644--- a/scripts/lib/browser-screenshot-e2e.mjs+++ b/scripts/lib/browser-screenshot-e2e.mjs@@ -1,3 +1,4 @@+import { requireMcpToolError } from "./mcp-verifier-results.mjs";import assert from "node:assert/strict";import { execFile } from "node:child_process";import { mkdtemp, readFile, rm } from "node:fs/promises";@@ -161,11 +162,11 @@ const verifyDefaultScreenshotDelivery = async ({);assert.equal(constrained.isError, true);assert.equal(- constrained.structuredContent?.error?.details?.resource,+ requireMcpToolError(constrained)?.details?.resource,"transport",);const reference =- constrained.structuredContent?.error?.details?.reported_limits+ requireMcpToolError(constrained)?.details?.reported_limits?.evidence_reference;assert.equal(reference?.kind, "retained-evidence");await client.ping();diff --git a/scripts/lib/ghidra-reference-snapshot-e2e.mjs b/scripts/lib/ghidra-reference-snapshot-e2e.mjsindex 905ed6b02..7dcb81a48 100644--- a/scripts/lib/ghidra-reference-snapshot-e2e.mjs+++ b/scripts/lib/ghidra-reference-snapshot-e2e.mjs@@ -1,3 +1,7 @@+import {+ requireMcpToolError,+ requireMcpResult,+} from "./mcp-verifier-results.mjs";import assert from "node:assert/strict";import { execFile } from "node:child_process";import { randomUUID } from "node:crypto";@@ -15,7 +19,6 @@ import {} from "../../dist/domain/analysisSnapshot.js";import { createEvidence } from "../../dist/domain/evidence.js";import { createEvidenceBundle } from "../../dist/domain/evidenceBundle.js";-import { requireMcpResult } from "./mcp-verifier-results.mjs";/** Reject a valid older snapshot whose instruction-only collector omitted a real edge. */export async function verifyLegacyGhidraReferenceSnapshot(@@ -120,7 +123,7 @@ export async function verifyLegacyGhidraReferenceSnapshot(},});assert.equal(reply.isError, true);- const mcpRejection = reply.structuredContent.error;+ const mcpRejection = requireMcpToolError(reply);assert.equal(mcpRejection.code, "evidence_integrity_mismatch");assert.match(mcpRejection.details.reason, /profile_mismatch/u);assert.match(diff --git a/scripts/lib/mcp-verifier-results.mjs b/scripts/lib/mcp-verifier-results.mjsindex f9e2d7080..8375bea87 100644--- a/scripts/lib/mcp-verifier-results.mjs+++ b/scripts/lib/mcp-verifier-results.mjs@@ -1,3 +1,5 @@+import { analysisErrorProjectionSchema } from "../../dist/contracts/errorSchemas.js";+/** Read the textual JSON projection from one MCP tool call. */export const mcpTextValue = (result) => {const text = result.content?.find((item) => item.type === "text")?.text;@@ -7,6 +9,12 @@ export const mcpTextValue = (result) => {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) {diff --git a/scripts/lib/real-ghidra-address-boundaries.mjs b/scripts/lib/real-ghidra-address-boundaries.mjsindex 032e65be8..eb9f02480 100644--- a/scripts/lib/real-ghidra-address-boundaries.mjs+++ b/scripts/lib/real-ghidra-address-boundaries.mjs@@ -1,3 +1,4 @@+import { requireMcpToolError } from "./mcp-verifier-results.mjs";import assert from "node:assert/strict";/** Exercise segmented-address truncation through real CLI/MCP reads and edits. */@@ -40,7 +41,7 @@ export async function verifyGhidraAddressBoundaries(client, entry, cli) {{ timeout: 240000 },);assert.equal(reply.isError, true, `${name} accepted ${address}`);- const error = reply.structuredContent?.error;+ const error = requireMcpToolError(reply);assert.equal(error?.code, "invalid_request", JSON.stringify(reply));assert.equal(error.details.operation, name);const issues = JSON.stringify(error.details.issues);diff --git a/scripts/lib/real-ghidra-boundaries.mjs b/scripts/lib/real-ghidra-boundaries.mjsindex 2aa9a1106..2535b10df 100644--- a/scripts/lib/real-ghidra-boundaries.mjs+++ b/scripts/lib/real-ghidra-boundaries.mjs@@ -1,3 +1,8 @@+import {+ requireMcpToolError,+ mcpTextValue,+ requireMcpResult,+} from "./mcp-verifier-results.mjs";import assert from "node:assert/strict";import { execFile } from "node:child_process";import { createHash, randomUUID } from "node:crypto";@@ -7,8 +12,7 @@ import { setTimeout as delay } from "node:timers/promises";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, requireMcpResult } 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";@@ -58,23 +62,19 @@ export async function verifyGhidraBoundaries(true,`${name} accepted ${JSON.stringify(args)}`,);- // SDK input-schema rejections are text-only; application errors use the- // canonical structured error projection, separately from success schemas.- if (reply.structuredContent !== undefined) {- analysisErrorProjectionSchema.parse(reply.structuredContent.error);- assert.deepEqual(- reply.structuredContent,- JSON.parse(mcpTextValue(reply)),- );- }+ // SDK input rejections are prose; application errors carry canonical JSON+ // text without publishing data outside the advertised success schema.+ const error = mcpTextValue(reply).startsWith("{")+ ? requireMcpToolError(reply)+ : undefined;+ assert.equal(reply.structuredContent, undefined);if (diagnostic !== undefined) {- const error = reply.structuredContent?.error;assert.equal(error?.code, "invalid_request");assert.equal(error?.details?.operation, name);assert.match(JSON.stringify(error.details.issues), diagnostic);}rejectedCalls++;- return reply.structuredContent?.error;+ return error;};const cli = async (command, value, flags = []) => {const { stdout } = await promisify(execFile)(@@ -478,7 +478,7 @@ export async function verifyGhidraBoundaries(options,);assert.equal(regexFailure.isError, true);- const regexError = regexFailure.structuredContent.error;+ const regexError = requireMcpToolError(regexFailure);assert.equal(regexError.code, "resource_constraint");assert.equal(regexError.details.operation, "search_strings");assert.equal(regexError.details.resource, "memory");@@ -500,7 +500,7 @@ export async function verifyGhidraBoundaries(options,);assert.equal(compileFailure.isError, true);- const compileError = compileFailure.structuredContent.error;+ const compileError = requireMcpToolError(compileFailure);assert.equal(compileError.code, "resource_constraint");assert.equal(compileError.details.operation, "search_procedures");assert.match(compileError.details.reason, /stack while compiling pattern/u);diff --git a/scripts/lib/real-ghidra-snapshot-lifecycle.mjs b/scripts/lib/real-ghidra-snapshot-lifecycle.mjsindex 7333b72f5..78cdd1aab 100644--- a/scripts/lib/real-ghidra-snapshot-lifecycle.mjs+++ b/scripts/lib/real-ghidra-snapshot-lifecycle.mjs@@ -1,10 +1,13 @@+import {+ requireMcpToolError,+ requireMcpResult,+} 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";import { join } from "node:path";import { parseAnalysisSnapshot } from "../../dist/domain/analysisSnapshot.js";import { parseEvidenceBundle } from "../../dist/domain/evidenceBundle.js";-import { requireMcpResult } from "./mcp-verifier-results.mjs";/** Keep mutable Ghidra observations out of immutable snapshots across target opens. */export async function verifyGhidraSnapshotLifecycle(@@ -31,7 +34,7 @@ export async function verifyGhidraSnapshotLifecycle(true,`${name} accepted a mutated snapshot binding`,);- const error = reply.structuredContent?.error;+ const error = requireMcpToolError(reply);assert.equal(error?.code,"evidence_integrity_mismatch",diff --git a/scripts/verify-native-calls.mjs b/scripts/verify-native-calls.mjsindex 696b6db52..62c9a2b19 100644--- a/scripts/verify-native-calls.mjs+++ b/scripts/verify-native-calls.mjs@@ -1,3 +1,4 @@+import { requireMcpToolError } from "./lib/mcp-verifier-results.mjs";import assert from "node:assert/strict";import { execFile } from "node:child_process";import { mkdtemp, rm, writeFile } from "node:fs/promises";@@ -232,12 +233,12 @@ const checkHardenedRuntime = async (directory, binary) => {{ timeout: CLI_TIMEOUT_MS },);assert.equal(deniedMcp.isError, true, JSON.stringify(deniedMcp));- assert.equal(deniedMcp.structuredContent.error.code, denied.code);+ assert.equal(requireMcpToolError(deniedMcp).code, denied.code);assert.match(- deniedMcp.structuredContent.error.details.reason,+ requireMcpToolError(deniedMcp).details.reason,/^debugger-attach-denied: /u,);- assert.ok(deniedMcp.structuredContent.error.details.partial_observation);+ assert.ok(requireMcpToolError(deniedMcp).details.partial_observation);});const allowed = join(directory, "debuggable");const entitlements = join(directory, "get-task-allow.plist");diff --git a/scripts/verify-package-mcp.mjs b/scripts/verify-package-mcp.mjsindex 3b5be1b5d..215d4aabb 100644--- a/scripts/verify-package-mcp.mjs+++ b/scripts/verify-package-mcp.mjs@@ -1,3 +1,4 @@+import { requireMcpToolError } from "./lib/mcp-verifier-results.mjs";import assert from "node:assert/strict";import { join } from "node:path";import { execFile } from "node:child_process";@@ -50,7 +51,7 @@ const verifyMcpUnknownProvider = async (client, mcpOptions) => {);if (unknownProvider.isError !== true ||- unknownProvider.structuredContent?.error?.details?.selection_reason !==+ requireMcpToolError(unknownProvider)?.details?.selection_reason !=="unknown_provider")throw new Error("packaged MCP accepted an unknown analysis provider");diff --git a/scripts/verify-real-ida.mjs b/scripts/verify-real-ida.mjsindex e457f1b19..0076baa42 100644--- a/scripts/verify-real-ida.mjs+++ b/scripts/verify-real-ida.mjs@@ -1,4 +1,5 @@#!/usr/bin/env node+import { requireMcpToolError } from "./lib/mcp-verifier-results.mjs";import assert from "node:assert/strict";import { execFile } from "node:child_process";@@ -172,7 +173,7 @@ const mcp = async (cliDossier) => {arguments: { address: "not-an-address" },});assert.equal(invalid.isError, true);- assert.equal(invalid.structuredContent.error.code, "invalid_request");+ assert.equal(requireMcpToolError(invalid).code, "invalid_request");await call("close_binary", {});opened = false;report.checks.push(diff --git a/scripts/verify/android/failure-recovery.mjs b/scripts/verify/android/failure-recovery.mjsindex 42f241d38..f09911380 100644--- a/scripts/verify/android/failure-recovery.mjs+++ b/scripts/verify/android/failure-recovery.mjs@@ -1,3 +1,4 @@+import { requireMcpToolError } from "../../lib/mcp-verifier-results.mjs";import assert from "node:assert/strict";import {access,@@ -190,13 +191,12 @@ export async function verifyAndroidFailureRecovery({{ timeout: 150_000 },);assert.equal(response.isError, true);- assert.equal(response.structuredContent.error.code, "invalid_request");- assert.deepEqual(- response.structuredContent.error.details.issues[0].path,- ["class_name"],- );+ assert.equal(requireMcpToolError(response).code, "invalid_request");+ assert.deepEqual(requireMcpToolError(response).details.issues[0].path, [+ "class_name",+ ]);assert.match(- response.structuredContent.error.details.issues[0].message,+ requireMcpToolError(response).details.issues[0].message,/search_android_classes/u,);assert.doesNotMatch(JSON.stringify(response), /rea doctor/u);@@ -213,8 +213,8 @@ export async function verifyAndroidFailureRecovery({},{ timeout: 150_000 },);- assert.equal(method.structuredContent.error.code, "invalid_request");- assert.deepEqual(method.structuredContent.error.details.issues[0].path, [+ assert.equal(requireMcpToolError(method).code, "invalid_request");+ assert.deepEqual(requireMcpToolError(method).details.issues[0].path, ["method_name",]);await client.ping();diff --git a/scripts/verify/electron/tool-contracts.mjs b/scripts/verify/electron/tool-contracts.mjsindex 7404238dc..588580dd4 100644--- a/scripts/verify/electron/tool-contracts.mjs+++ b/scripts/verify/electron/tool-contracts.mjs@@ -1,3 +1,4 @@+import { requireMcpToolError } from "../../lib/mcp-verifier-results.mjs";import assert from "node:assert/strict";import { execFile, spawn } from "node:child_process";import { randomUUID } from "node:crypto";@@ -172,11 +173,11 @@ window.loadFile("renderer.html");require("node:fs").writeFileSync(${JSON.stringi{ timeout: 150_000 },);const capture = active.isError- ? active.structuredContent.error.details.partial_observation.capture+ ? requireMcpToolError(active).details.partial_observation.capture: active.structuredContent.result;if (active.isError) {assert.equal(- active.structuredContent.error.code,+ requireMcpToolError(active).code,"cleanup_incomplete",JSON.stringify(active),);diff --git a/src/server/EvidenceMcpServer.ts b/src/server/EvidenceMcpServer.tsindex 9e9fbae49..efbf03f8c 100644--- a/src/server/EvidenceMcpServer.ts+++ b/src/server/EvidenceMcpServer.ts@@ -124,7 +124,18 @@ class ErrorEvidenceTransport implements Transport {: undefined;const tool = id === undefined ? undefined : this.pendingTools.get(id);try {- await this.transport.send(this.recoverError(message, tool), options);+ const recovered = this.recoverError(message, tool);+ if (+ isJSONRPCResultResponse(recovered) &&+ isCallToolResult(recovered.result) &&+ recovered.result.isError === true+ ) {+ // Keep the complete typed JSON in content. Error projections are not+ // success outputSchema data; oversized recovery must consume their+ // private structured carrier before it is removed from the wire.+ const { structuredContent: _diagnostic, ...result } = recovered.result;+ await this.transport.send({ ...recovered, result }, options);+ } else await this.transport.send(recovered, options);} finally {if (!isJSONRPCRequest(message) && id !== undefined)this.pendingTools.delete(id);diff --git a/tests/acceptance/nonBinaryComposition.test.ts b/tests/acceptance/nonBinaryComposition.test.tsindex 0cb337de7..b333db20e 100644--- a/tests/acceptance/nonBinaryComposition.test.ts+++ b/tests/acceptance/nonBinaryComposition.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../fixtures/mcpToolError.js";import { Client, InMemoryTransport } from "@modelcontextprotocol/client";import { writeFile } from "node:fs/promises";import { join } from "node:path";@@ -67,8 +68,8 @@ for (const { jarConfigured, setting } of [arguments: { path: apk },});expect(response.isError).toBe(true);- expect(response.structuredContent).toEqual({ error: cliResult.json });- expect(JSON.stringify(response.structuredContent)).toContain(setting);+ expect(parseMcpToolError(response)).toEqual({ error: cliResult.json });+ expect(JSON.stringify(parseMcpToolError(response))).toContain(setting);},);@@ -92,8 +93,8 @@ cliTest.skipIf(process.platform !== "linux")(arguments: { path },});expect(response.isError).toBe(true);- expect(response.structuredContent).toEqual({ error: cliResult.json });- expect(JSON.stringify(response.structuredContent)).toContain(+ expect(parseMcpToolError(response)).toEqual({ error: cliResult.json });+ expect(JSON.stringify(parseMcpToolError(response))).toContain("REA_BINWALK_COMMAND",);},@@ -145,8 +146,8 @@ cliTest(arguments: { path, output_directory: join(root, "output") },});expect(response.isError).toBe(true);- expect(response.structuredContent).toEqual({ error: cliResult.json });- expect(JSON.stringify(response.structuredContent)).toContain(+ expect(parseMcpToolError(response)).toEqual({ error: cliResult.json });+ expect(JSON.stringify(parseMcpToolError(response))).toContain("REA_WAKARU_COMMAND",);},@@ -183,7 +184,7 @@ cliTest(});expect(result.exitCode).toBe(1);expect(response.isError).toBe(true);- expect(response.structuredContent).toEqual({ error: result.json });+ expect(parseMcpToolError(response)).toEqual({ error: result.json });expect(result.json).toMatchObject({code: "invalid_request",details: {diff --git a/tests/boundary/mcp/analysisViewMcp.test.ts b/tests/boundary/mcp/analysisViewMcp.test.tsindex d85fa05ec..8675fa314 100644--- a/tests/boundary/mcp/analysisViewMcp.test.ts+++ b/tests/boundary/mcp/analysisViewMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { Client, InMemoryTransport } from "@modelcontextprotocol/client";import { Ajv2020 } from "ajv/dist/2020.js";import { expect, it, onTestFinished } from "vitest";@@ -164,7 +165,7 @@ it("retains an oversized selected observation and keeps subsequent views usable"}),}),})- .parse(response.structuredContent).error.details+ .parse(parseMcpToolError(response)).error.details.reported_limits.evidence_reference;expect(session.evidenceById(reference.evidence_id)?.normalized_result,@@ -222,11 +223,8 @@ it("returns a JavaScript summary without graph payloads from a retained referencview: { kind: "summary" },},});- expect(stale).toMatchObject({- isError: true,- structuredContent: {- error: { details: { reason: "missing" } },- },+ expect(parseMcpToolError(stale)).toMatchObject({+ error: { details: { reason: "missing" } },});});diff --git a/tests/boundary/mcp/applicationEvidenceMcp.test.ts b/tests/boundary/mcp/applicationEvidenceMcp.test.tsindex ba2944aa6..ae9b8ca4b 100644--- a/tests/boundary/mcp/applicationEvidenceMcp.test.ts+++ b/tests/boundary/mcp/applicationEvidenceMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import type { Client } from "@modelcontextprotocol/client";import { describe, expect, it } from "vitest";@@ -178,16 +179,13 @@ async function assertRejectedEvidenceReferences(application: record,},});- expect(rejected).toMatchObject({- isError: true,- structuredContent: {- // A recorded Evidence with the wrong operation or predicate is an- // invalid caller input, not a provider failure.- error: {- code: "invalid_request",- category: "invalid_input",- retryable: true,- },+ expect(parseMcpToolError(rejected)).toMatchObject({+ // A recorded Evidence with the wrong operation or predicate is an+ // invalid caller input, not a provider failure.+ error: {+ code: "invalid_request",+ category: "invalid_input",+ retryable: true,},});}diff --git a/tests/boundary/mcp/artifactMcp.inlineInventory.test.ts b/tests/boundary/mcp/artifactMcp.inlineInventory.test.tsindex 6d14f9df4..4259a6e71 100644--- a/tests/boundary/mcp/artifactMcp.inlineInventory.test.ts+++ b/tests/boundary/mcp/artifactMcp.inlineInventory.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { readFile, writeFile } from "node:fs/promises";import { join } from "node:path";@@ -62,7 +63,7 @@ it("inspects a standalone keyed archive through MCP with original object identitarguments: { path: "other.plist" },});expect(rejected.isError).toBe(true);- expect(rejected.structuredContent).toMatchObject({+ expect(parseMcpToolError(rejected)).toMatchObject({error: {code: "invalid_request",details: {@@ -81,7 +82,7 @@ it("inspects a standalone keyed archive through MCP with original object identitarguments: { root: "missing" },});expect(missingRoot.isError).toBe(true);- expect(missingRoot.structuredContent).toMatchObject({+ expect(parseMcpToolError(missingRoot)).toMatchObject({error: {code: "invalid_request",details: {diff --git a/tests/boundary/mcp/artifactMcp.test.ts b/tests/boundary/mcp/artifactMcp.test.tsindex 8dfb3d8dd..d62e85178 100644--- a/tests/boundary/mcp/artifactMcp.test.ts+++ b/tests/boundary/mcp/artifactMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { mkdir, readFile, rm, writeFile } from "node:fs/promises";import { join } from "node:path";@@ -62,7 +63,7 @@ it.each([arguments: {},});expect(result.isError).toBe(true);- expect(result.structuredContent).toEqual({+ expect(parseMcpToolError(result)).toEqual({error: {code: "artifact_integrity_mismatch",category: "integrity_mismatch",diff --git a/tests/boundary/mcp/browserMcp.test.ts b/tests/boundary/mcp/browserMcp.test.tsindex a61576ee7..8ace88edb 100644--- a/tests/boundary/mcp/browserMcp.test.ts+++ b/tests/boundary/mcp/browserMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { Client, InMemoryTransport } from "@modelcontextprotocol/client";import { afterEach, expect, it } from "vitest";import { z } from "zod";@@ -275,7 +276,7 @@ it("does not attach to a target outside the request's allowed origin scope", asy},});expect(result.isError).toBe(true);- expect(result.structuredContent).toMatchObject({+ expect(parseMcpToolError(result)).toMatchObject({error: {details: {operation: "inspect_web_page",diff --git a/tests/boundary/mcp/bundleComparisonMcp.test.ts b/tests/boundary/mcp/bundleComparisonMcp.test.tsindex ab1343bd7..039074572 100644--- a/tests/boundary/mcp/bundleComparisonMcp.test.ts+++ b/tests/boundary/mcp/bundleComparisonMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { rm, writeFile } from "node:fs/promises";import { join } from "node:path";@@ -130,7 +131,7 @@ describe("bundle comparison MCP integration", () => {},});expect(result.isError).toBe(true);- expect(result.structuredContent).toMatchObject({+ expect(parseMcpToolError(result)).toMatchObject({error: {code: "evidence_integrity_mismatch",message: expect.stringContaining(diff --git a/tests/boundary/mcp/dylibResolutionMcp.test.ts b/tests/boundary/mcp/dylibResolutionMcp.test.tsindex 2bb0d7076..c73d5d548 100644--- a/tests/boundary/mcp/dylibResolutionMcp.test.ts+++ b/tests/boundary/mcp/dylibResolutionMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { chmod, mkdir, symlink, writeFile } from "node:fs/promises";import { join } from "node:path";@@ -107,7 +108,7 @@ it("traces dylib resolution for an opened app bundle and rejects a changed targearguments: {},});expect(changed.isError).toBe(true);- expect(JSON.stringify(changed.structuredContent)).toContain("integrity");+ expect(JSON.stringify(parseMcpToolError(changed))).toContain("integrity");});});@@ -126,7 +127,7 @@ it("rejects targets that are not Mach-O", async () => {arguments: {},});expect(called.isError).toBe(true);- expect(called.structuredContent).toMatchObject({+ expect(parseMcpToolError(called)).toMatchObject({error: { code: "unsupported_target", category: "unsupported_target" },});});@@ -153,7 +154,7 @@ it("reports target kinds that artifact operations cannot inspect as unsupported"const open = { name: "open_binary", arguments: { path } };expect((await client.callTool(open)).isError, path).not.toBe(true);const called = await client.callTool({ name: operation, arguments: {} });- expect(called.structuredContent, operation).toMatchObject({+ expect(parseMcpToolError(called), operation).toMatchObject({error: {code: "unsupported_target",message: expect.stringContaining(`${operation} at ${path}`),@@ -230,7 +231,7 @@ it.skipIf(process.getuid?.() === 0)(arguments: {},});expect(called.isError).toBe(true);- expect(JSON.stringify(called.structuredContent)).toMatch(+ expect(JSON.stringify(parseMcpToolError(called))).toMatch(/Permission denied \(EACCES\)/u,);} finally {@@ -442,7 +443,7 @@ it("reports caller-selected roots that cannot be traced as invalid input", asyncarguments: { roots: ["Contents/MacOS/App", root] },});expect(called.isError, root).toBe(true);- expect(called.structuredContent, root).toMatchObject({+ expect(parseMcpToolError(called), root).toMatchObject({error: {code: "invalid_request",details: {diff --git a/tests/boundary/mcp/enhancedTools.04-uses-complete-inventories-inline.test.ts b/tests/boundary/mcp/enhancedTools.04-uses-complete-inventories-inline.test.tsindex 7e024f604..79002f40e 100644--- a/tests/boundary/mcp/enhancedTools.04-uses-complete-inventories-inline.test.ts+++ b/tests/boundary/mcp/enhancedTools.04-uses-complete-inventories-inline.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { afterEach, describe, expect, it } from "vitest";import {@@ -109,7 +110,7 @@ describe("enhanced MCP tools", () => {expect(result.isError).toBe(true);const text = result.content.find((item) => item.type === "text");expect(text?.type === "text" ? text.text : "").toBe(- JSON.stringify(result.structuredContent),+ JSON.stringify(parseMcpToolError(result)),);});});diff --git a/tests/boundary/mcp/enhancedTools.06-rejects-incomplete-function-dossiers-at.test.ts b/tests/boundary/mcp/enhancedTools.06-rejects-incomplete-function-dossiers-at.test.tsindex d0ac870fc..212e32824 100644--- a/tests/boundary/mcp/enhancedTools.06-rejects-incomplete-function-dossiers-at.test.ts+++ b/tests/boundary/mcp/enhancedTools.06-rejects-incomplete-function-dossiers-at.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { afterEach, describe, expect, it } from "vitest";import { functionDossierSchema } from "../../../src/domain/hopperValues.js";@@ -26,7 +27,7 @@ describe("analyze_function MCP producer validation", () => {expect(result.isError).toBe(true);expect(result.content).toContainEqual({type: "text",- text: JSON.stringify(result.structuredContent),+ text: JSON.stringify(parseMcpToolError(result)),});});@@ -55,7 +56,7 @@ describe("analyze_function MCP producer validation", () => {expect(result.isError).toBe(true);expect(result.content).toContainEqual({type: "text",- text: JSON.stringify(result.structuredContent),+ text: JSON.stringify(parseMcpToolError(result)),});});});diff --git a/tests/boundary/mcp/enhancedTools.inputValidation.test.ts b/tests/boundary/mcp/enhancedTools.inputValidation.test.tsindex f6c881c37..a88361a01 100644--- a/tests/boundary/mcp/enhancedTools.inputValidation.test.ts+++ b/tests/boundary/mcp/enhancedTools.inputValidation.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { afterEach, describe, expect, it } from "vitest";import { closeEnhancedToolResources, connect } from "./enhancedToolsHarness.js";@@ -41,7 +42,7 @@ describe("enhanced MCP input validation", () => {expect(result.isError).toBe(true);const text = result.content.find((item) => item.type === "text");expect(text?.type === "text" ? text.text : "").toBe(- JSON.stringify(result.structuredContent),+ JSON.stringify(parseMcpToolError(result)),);});});diff --git a/tests/boundary/mcp/enhancedToolsHarness.ts b/tests/boundary/mcp/enhancedToolsHarness.tsindex 5c4af15dc..17ec27491 100644--- a/tests/boundary/mcp/enhancedToolsHarness.ts+++ b/tests/boundary/mcp/enhancedToolsHarness.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import type { CallToolResult } from "@modelcontextprotocol/server";import {jsonValueSchema,@@ -40,6 +41,8 @@ export const closeEnhancedToolResources = async (): Promise<void> => {};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);diff --git a/tests/boundary/mcp/ghidraEvidenceMcp.test.ts b/tests/boundary/mcp/ghidraEvidenceMcp.test.tsindex 7506a7d0b..60cd80155 100644--- a/tests/boundary/mcp/ghidraEvidenceMcp.test.ts+++ b/tests/boundary/mcp/ghidraEvidenceMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { describe, expect, it } from "vitest";import { EnhancedTools } from "../../../src/application/EnhancedTools.js";import { connectGhidraMcp, sessionEvidence } from "./ghidraMcpHarness.js";@@ -52,7 +53,7 @@ it("rejects contradictory annotation readback across the provider and MCP bounda},});expect(reply.isError).toBe(true);- expect(reply.structuredContent).toMatchObject({+ expect(parseMcpToolError(reply)).toMatchObject({error: { code: "unreadable_output" },});}diff --git a/tests/boundary/mcp/ghidraFailureDiagnostics.test.ts b/tests/boundary/mcp/ghidraFailureDiagnostics.test.tsindex 15bcb1320..74a4ed35b 100644--- a/tests/boundary/mcp/ghidraFailureDiagnostics.test.ts+++ b/tests/boundary/mcp/ghidraFailureDiagnostics.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { expect, it } from "vitest";import { logCliCommand } from "../../../src/cliLogging.js";@@ -66,7 +67,7 @@ it("preserves queue failure diagnostics through the provider, CLI adapter and SDarguments: {},});expect(mcp.isError).toBe(true);- expect(mcp.structuredContent).toMatchObject({ error: parsed });+ expect(parseMcpToolError(mcp)).toMatchObject({ error: parsed });expect(mcp.content).toContainEqual(expect.objectContaining({type: "text",diff --git a/tests/boundary/mcp/ghidraInventoryMcp.test.ts b/tests/boundary/mcp/ghidraInventoryMcp.test.tsindex 3a484cae1..9a2f1cbe7 100644--- a/tests/boundary/mcp/ghidraInventoryMcp.test.ts+++ b/tests/boundary/mcp/ghidraInventoryMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { expect, it } from "vitest";import { jsonValueSchema } from "../../../src/domain/jsonValue.js";import { ok } from "../../../src/domain/result.js";@@ -98,11 +99,11 @@ it("rejects contradictory provider output before emitting MCP Evidence", async (arguments: probe.arguments,});expect(rejected.isError, probe.name).toBe(true);- expect(rejected.structuredContent).toMatchObject({+ expect(parseMcpToolError(rejected)).toMatchObject({error: { code: "unreadable_output" },});- expect(rejected.structuredContent).not.toHaveProperty("evidence_id");- expect(rejected.structuredContent).not.toHaveProperty("result");+ expect(parseMcpToolError(rejected)).not.toHaveProperty("evidence_id");+ expect(parseMcpToolError(rejected)).not.toHaveProperty("result");}} finally {await harness.close();diff --git a/tests/boundary/mcp/ghidraRoutingMcp.test.ts b/tests/boundary/mcp/ghidraRoutingMcp.test.tsindex 800a2b142..10ec4e2cb 100644--- a/tests/boundary/mcp/ghidraRoutingMcp.test.ts+++ b/tests/boundary/mcp/ghidraRoutingMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { describe, expect, it } from "vitest";import { connectGhidraMcp } from "./ghidraMcpHarness.js";@@ -28,7 +29,7 @@ describe("Ghidra MCP capability routing", () => {arguments: { address: "0x1000", comment: "must not mutate" },});expect(denied.isError).toBe(true);- expect(denied.structuredContent).toMatchObject({+ expect(parseMcpToolError(denied)).toMatchObject({error: {code: "capability_unavailable",category: "unsupported_provider",diff --git a/tests/boundary/mcp/managedMcp.test.ts b/tests/boundary/mcp/managedMcp.test.tsindex f54aa37ac..cbe8c4bf5 100644--- a/tests/boundary/mcp/managedMcp.test.ts+++ b/tests/boundary/mcp/managedMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { writeFile } from "node:fs/promises";import { join } from "node:path";@@ -230,11 +231,8 @@ const verifyManagedCatalogAndNativeWorkflow = async (],},});- expect(wrong).toMatchObject({- isError: true,- structuredContent: {- error: { code: "evidence_integrity_mismatch" },- },+ expect(parseMcpToolError(wrong)).toMatchObject({+ error: { code: "evidence_integrity_mismatch" },});};@@ -446,6 +444,7 @@ const verifyImport = async (};const structured = (result: CallToolResult): Record<string, unknown> => {+ if (result.isError === true) return parseMcpToolError(result);if (typeof result.structuredContent !== "object" ||result.structuredContent === nulldiff --git a/tests/boundary/mcp/nativeCallObservationMcp.test.ts b/tests/boundary/mcp/nativeCallObservationMcp.test.tsindex 7ae612b9f..0a3995db1 100644--- a/tests/boundary/mcp/nativeCallObservationMcp.test.ts+++ b/tests/boundary/mcp/nativeCallObservationMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { createHash } from "node:crypto";import { writeFile } from "node:fs/promises";import { join } from "node:path";@@ -258,7 +259,7 @@ it.each([});expect(called.isError).toBe(true);- expect(called.structuredContent).toMatchObject({+ expect(parseMcpToolError(called)).toMatchObject({error: {code: expectedCode,details: {diff --git a/tests/boundary/mcp/nativeSignatureTargetBindingMcp.test.ts b/tests/boundary/mcp/nativeSignatureTargetBindingMcp.test.tsindex f7701838a..be331a7cc 100644--- a/tests/boundary/mcp/nativeSignatureTargetBindingMcp.test.ts+++ b/tests/boundary/mcp/nativeSignatureTargetBindingMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { writeFile } from "node:fs/promises";import { join } from "node:path";import { Client, InMemoryTransport } from "@modelcontextprotocol/client";@@ -40,7 +41,7 @@ it("rejects changed signature targets through MCP and accepts reopening the newarguments: {},});expect(changed.isError).toBe(true);- expect(changed.structuredContent).toMatchObject({+ expect(parseMcpToolError(changed)).toMatchObject({error: { code: "artifact_changed", details: { path } },});expect((await open()).isError).not.toBe(true);diff --git a/tests/boundary/mcp/officialTools.test.ts b/tests/boundary/mcp/officialTools.test.tsindex b7e4f0014..532e562d9 100644--- a/tests/boundary/mcp/officialTools.test.ts+++ b/tests/boundary/mcp/officialTools.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { Ajv2020 } from "ajv/dist/2020.js";import { Client, InMemoryTransport } from "@modelcontextprotocol/client";import { afterEach, describe, expect, it } from "vitest";@@ -140,7 +141,7 @@ describe("official Hopper proxy tools", () => {expect(result.isError).toBe(true);expect(result.content[0]).toEqual({type: "text",- text: JSON.stringify(result.structuredContent),+ text: JSON.stringify(parseMcpToolError(result)),});});diff --git a/tests/boundary/mcp/optionalProviderIsolation.test.ts b/tests/boundary/mcp/optionalProviderIsolation.test.tsindex f6f7a3a1e..687d02620 100644--- a/tests/boundary/mcp/optionalProviderIsolation.test.ts+++ b/tests/boundary/mcp/optionalProviderIsolation.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { writeFile } from "node:fs/promises";import { join } from "node:path";import { McpServer } from "@modelcontextprotocol/server";@@ -138,7 +139,7 @@ mcpTest.for(failedAdapters)(arguments: example.input,});expect(unavailable.isError).toBe(true);- expect(unavailable.structuredContent).toMatchObject({+ expect(parseMcpToolError(unavailable)).toMatchObject({error: {details: {provider_id: providerId,diff --git a/tests/boundary/mcp/oversizedErrorDeliveryMcp.test.ts b/tests/boundary/mcp/oversizedErrorDeliveryMcp.test.tsindex c5d6a206c..6db36be56 100644--- a/tests/boundary/mcp/oversizedErrorDeliveryMcp.test.ts+++ b/tests/boundary/mcp/oversizedErrorDeliveryMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { Client, InMemoryTransport } from "@modelcontextprotocol/client";import {STDIO_DEFAULT_MAX_BUFFER_SIZE,@@ -9,7 +10,8 @@ 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";@@ -26,6 +28,7 @@ const oversizedFailure = () =>const exerciseDeliveryFailure = async (recordEvidence: EvidenceWriter["recordEvidence"] | undefined,+ retention: "retained" | "unavailable" | "failed",) => {const server = new EvidenceMcpServer({ name: "oversized-error-test", version: "1" },@@ -54,7 +57,8 @@ const exerciseDeliveryFailure = async (arguments: {},});expect(failure.isError).toBe(true);- expect(failure.structuredContent).toMatchObject({+ expect(failure.structuredContent).toBeUndefined();+ expect(parseMcpToolError(failure)).toMatchObject({error: {code: "resource_constraint",details: {@@ -73,8 +77,8 @@ const exerciseDeliveryFailure = async (}),}),})- .parse(failure.structuredContent).error.details.reported_limits;- expect(failure.structuredContent).toMatchObject({+ .parse(parseMcpToolError(failure)).error.details.reported_limits;+ expect(parseMcpToolError(failure)).toMatchObject({error: {details: {reported_limits: {@@ -83,11 +87,17 @@ const exerciseDeliveryFailure = async (},},});- expect(reportedLimits).not.toHaveProperty("evidence_reference");- expect(reportedLimits.retention).toBe(- recordEvidence === undefined ? "unavailable" : "failed",- );- if (recordEvidence !== undefined)+ if (retention === "retained") {+ expect(reportedLimits.evidence_reference).toMatchObject({+ kind: "retained-evidence",+ evidence_id: expect.any(String),+ });+ expect(reportedLimits).not.toHaveProperty("retention");+ } else {+ expect(reportedLimits).not.toHaveProperty("evidence_reference");+ expect(reportedLimits.retention).toBe(retention);+ }+ if (retention === "failed")expect(reportedLimits.retention_error).toMatchObject({code: "evidence_integrity_mismatch",});@@ -106,10 +116,27 @@ const exerciseDeliveryFailure = async (};it("keeps the SDK connection usable when oversized-error retention is unavailable or fails", async () => {- await exerciseDeliveryFailure(undefined);- await exerciseDeliveryFailure(() =>- err(- new EvidenceIntegrityError("fixture ledger rejected the Evidence record"),- ),+ await exerciseDeliveryFailure(undefined, "unavailable");+ await exerciseDeliveryFailure(+ () =>+ err(+ new EvidenceIntegrityError(+ "fixture ledger rejected the Evidence record",+ ),+ ),+ "failed",+ );+});++it("retains the complete oversized diagnostic before removing its private structured carrier", async () => {+ const retained: Evidence[] = [];+ await exerciseDeliveryFailure((evidence) => {+ retained.push(evidence);+ return ok("added");+ }, "retained");+ expect(retained).toHaveLength(1);+ expect(retained[0]?.normalized_result).toEqual(+ oversizedFailure().structuredContent,);+ expect(retained[0]?.raw_result).toEqual(oversizedFailure());});diff --git a/tests/boundary/mcp/processComparisonDiagnosticsMcp.test.ts b/tests/boundary/mcp/processComparisonDiagnosticsMcp.test.tsindex 81722a384..3d229b240 100644--- a/tests/boundary/mcp/processComparisonDiagnosticsMcp.test.ts+++ b/tests/boundary/mcp/processComparisonDiagnosticsMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { writeFile } from "node:fs/promises";import { join } from "node:path";@@ -70,7 +71,7 @@ it("names differing comparison contract fields through MCP and the CLI", async (),expected: ["working_directory"],};- expect(response.structuredContent).toMatchObject({+ expect(parseMcpToolError(response)).toMatchObject({error: { code: "invalid_request", details: { issues: [issue] } },});@@ -97,7 +98,7 @@ it("names the stale capture that exceeds max_capture_age_ms", async () => {},});expect(response.isError).toBe(true);- expect(response.structuredContent).toMatchObject({+ expect(parseMcpToolError(response)).toMatchObject({error: {code: "invalid_request",details: {@@ -146,7 +147,7 @@ it("names the side and constraint when Evidence is not a usable capture", asyncname: "compare_process_captures",arguments: { left: unrelated, right: capture },});- expect(wrongKind.structuredContent).toMatchObject({+ expect(parseMcpToolError(wrongKind)).toMatchObject({error: {code: "invalid_request",details: {@@ -170,7 +171,7 @@ it("names the side and constraint when Evidence is not a usable capture", asyncright: { ...capture, parameters: { side: "changed" } },},});- expect(tampered.structuredContent).toMatchObject({+ expect(parseMcpToolError(tampered)).toMatchObject({error: {code: "evidence_integrity_mismatch",message: expect.stringContaining(@@ -189,7 +190,7 @@ it("names the side and constraint when Evidence is not a usable capture", asyncname: "compare_process_captures",arguments: { left: capture, right: invalidResult },});- expect(malformed.structuredContent).toMatchObject({+ expect(parseMcpToolError(malformed)).toMatchObject({error: {code: "evidence_integrity_mismatch",message: expect.stringContaining(diff --git a/tests/boundary/mcp/processEvidenceIdentityMcp.test.ts b/tests/boundary/mcp/processEvidenceIdentityMcp.test.tsindex c4b709a32..83d7df22f 100644--- a/tests/boundary/mcp/processEvidenceIdentityMcp.test.ts+++ b/tests/boundary/mcp/processEvidenceIdentityMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { writeFile } from "node:fs/promises";import { join } from "node:path";@@ -294,7 +295,7 @@ for (const name of providerNames)for (const { expected: _expected, ...call } of consumerCalls(invalid)) {const response = await client.callTool(call);expect(response.isError, call.name).toBe(true);- expect(response.structuredContent, call.name).toMatchObject({+ expect(parseMcpToolError(response), call.name).toMatchObject({error: { code: "invalid_request" },});}@@ -333,7 +334,7 @@ it("separately rejects a tampered digest before admission to any consumer or ses)) {const response = await client.callTool(call);expect(response.isError, call.name).toBe(true);- expect(response.structuredContent).toMatchObject({+ expect(parseMcpToolError(response)).toMatchObject({error: { code: "invalid_request" },});}diff --git a/tests/boundary/mcp/providerSelectionMcp.test.ts b/tests/boundary/mcp/providerSelectionMcp.test.tsindex af80423b8..9b1ec229e 100644--- a/tests/boundary/mcp/providerSelectionMcp.test.ts+++ b/tests/boundary/mcp/providerSelectionMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { rm, writeFile } from "node:fs/promises";import { join } from "node:path";@@ -233,4 +234,6 @@ const capability = (provider: ProviderIdentity): CapabilityDescriptor => ({});const structured = (result: CallToolResult): Record<string, unknown> =>- z.record(z.string(), z.unknown()).parse(result.structuredContent);+ result.isError === true+ ? parseMcpToolError(result)+ : z.record(z.string(), z.unknown()).parse(result.structuredContent);diff --git a/tests/boundary/mcp/reconstructionCoverageMcp.test.ts b/tests/boundary/mcp/reconstructionCoverageMcp.test.tsindex 297247d2a..a350ee828 100644--- a/tests/boundary/mcp/reconstructionCoverageMcp.test.ts+++ b/tests/boundary/mcp/reconstructionCoverageMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { Client, InMemoryTransport } from "@modelcontextprotocol/client";import { describe, expect, it } from "vitest";@@ -42,7 +43,7 @@ describe("reconstruction coverage MCP", () => {},});expect(unknown.isError).toBe(true);- expect(unknown.structuredContent).toMatchObject({+ expect(parseMcpToolError(unknown)).toMatchObject({error: {code: "invalid_request",details: {diff --git a/tests/boundary/mcp/retainedApplicationEvidenceMcp.test.ts b/tests/boundary/mcp/retainedApplicationEvidenceMcp.test.tsindex 1dfe0093a..716462663 100644--- a/tests/boundary/mcp/retainedApplicationEvidenceMcp.test.ts+++ b/tests/boundary/mcp/retainedApplicationEvidenceMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { Client, InMemoryTransport } from "@modelcontextprotocol/client";import { afterEach, expect, it } from "vitest";import { Ajv2020 } from "ajv/dist/2020.js";@@ -136,15 +137,12 @@ it("keeps references session-scoped and expires them when close_binary clears th},};const foreign = await second.client.callTool(request);- expect(foreign).toMatchObject({- isError: true,- structuredContent: {- error: {- details: {- evidence_id: application.evidence_id,- reason: "missing",- actual: null,- },+ expect(parseMcpToolError(foreign)).toMatchObject({+ error: {+ details: {+ evidence_id: application.evidence_id,+ reason: "missing",+ actual: null,},},});@@ -156,10 +154,9 @@ it("keeps references session-scoped and expires them when close_binary clears tharguments: {},});expect(closed.isError).not.toBe(true);- expect(await first.client.callTool(request)).toMatchObject({- isError: true,- structuredContent: { error: { details: { reason: "missing" } } },- });+ expect(parseMcpToolError(await first.client.callTool(request))).toMatchObject(+ { error: { details: { reason: "missing" } } },+ );for (const harness of [first, second]) {const portable = await harness.client.callTool({name: "trace_application_feature",@@ -199,11 +196,8 @@ it("preserves validation for the referenced record's operation, predicate, and sapplication: 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" },});}const tampered = {diff --git a/tests/boundary/mcp/serverIdentity.test.ts b/tests/boundary/mcp/serverIdentity.test.tsindex e69f0f1e6..c7dab3ab1 100644--- a/tests/boundary/mcp/serverIdentity.test.ts+++ b/tests/boundary/mcp/serverIdentity.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { readFile, writeFile } from "node:fs/promises";import { join } from "node:path";@@ -285,7 +286,7 @@ describe("active-target availability over MCP", () => {name: "inspect_macho",arguments: {},});- expect(call.structuredContent).toMatchObject({+ expect(parseMcpToolError(call)).toMatchObject({error: { code: "target_unavailable" },});await openTarget(client, plist);diff --git a/tests/boundary/mcp/serverLifecycleMcp.test.ts b/tests/boundary/mcp/serverLifecycleMcp.test.tsindex af5ba7c13..1e99fc54b 100644--- a/tests/boundary/mcp/serverLifecycleMcp.test.ts+++ b/tests/boundary/mcp/serverLifecycleMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { Client, InMemoryTransport } from "@modelcontextprotocol/client";import type { CallToolResult } from "@modelcontextprotocol/server";import { afterEach, expect, it } from "vitest";@@ -37,6 +38,7 @@ const text = (result: CallToolResult): string => {};const structured = (result: CallToolResult): Record<string, unknown> => {+ if (result.isError === true) return parseMcpToolError(result);if (typeof result.structuredContent !== "object" ||result.structuredContent === null@@ -61,7 +63,7 @@ it("projects remote failures without provider or bridge details", async () => {category: "execution_failure",},});- expect(text(result)).toBe(JSON.stringify(result.structuredContent));+ expect(text(result)).toBe(JSON.stringify(parseMcpToolError(result)));});it("lets the SDK validate a tool call before invoking its handler", async () => {diff --git a/tests/boundary/mcp/serverUnknownsMcp.test.ts b/tests/boundary/mcp/serverUnknownsMcp.test.tsindex c08aedfd1..158277444 100644--- a/tests/boundary/mcp/serverUnknownsMcp.test.ts+++ b/tests/boundary/mcp/serverUnknownsMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { Client, InMemoryTransport } from "@modelcontextprotocol/client";import type { CallToolResult } from "@modelcontextprotocol/server";import { afterEach, expect, it } from "vitest";@@ -68,6 +69,7 @@ const providerWithCapabilities = (};const structured = (result: CallToolResult): Record<string, unknown> => {+ if (result.isError === true) return parseMcpToolError(result);if (typeof result.structuredContent !== "object" ||result.structuredContent === nulldiff --git a/tests/boundary/mcp/serverWorkflowMcp.test.ts b/tests/boundary/mcp/serverWorkflowMcp.test.tsindex 93368a451..e24bec3ce 100644--- a/tests/boundary/mcp/serverWorkflowMcp.test.ts+++ b/tests/boundary/mcp/serverWorkflowMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { Client, InMemoryTransport } from "@modelcontextprotocol/client";import type { CallToolResult } from "@modelcontextprotocol/server";import { afterEach, expect, it } from "vitest";@@ -35,6 +36,7 @@ const connect = async (analysis: AnalysisOperationPort) => {};const structured = (result: CallToolResult): Record<string, unknown> => {+ if (result.isError === true) return parseMcpToolError(result);if (typeof result.structuredContent !== "object" ||result.structuredContent === nulldiff --git a/tests/boundary/mcp/sessionMcp.test.ts b/tests/boundary/mcp/sessionMcp.test.tsindex dbd5d14b5..df277e67f 100644--- a/tests/boundary/mcp/sessionMcp.test.ts+++ b/tests/boundary/mcp/sessionMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { readFile, realpath, rm, writeFile } from "node:fs/promises";import { join } from "node:path";import { Client, InMemoryTransport } from "@modelcontextprotocol/client";@@ -492,6 +493,7 @@ const text = (result: CallToolResult): string => {};const structured = (result: CallToolResult): Record<string, unknown> => {+ if (result.isError === true) return parseMcpToolError(result);if (typeof result.structuredContent !== "object" ||result.structuredContent === nulldiff --git a/tests/boundary/mcp/sessionMcpHarness.ts b/tests/boundary/mcp/sessionMcpHarness.tsindex 7df364a74..cf9f241b7 100644--- a/tests/boundary/mcp/sessionMcpHarness.ts+++ b/tests/boundary/mcp/sessionMcpHarness.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { readFile, writeFile } from "node:fs/promises";import { join } from "node:path";@@ -151,6 +152,7 @@ export const snapshotAndRecordUnknown = async (};const structured = (result: CallToolResult): Record<string, unknown> => {+ if (result.isError === true) return parseMcpToolError(result);if (typeof result.structuredContent !== "object" ||result.structuredContent === nulldiff --git a/tests/boundary/mcp/toolErrorSchemaDelivery.test.ts b/tests/boundary/mcp/toolErrorSchemaDelivery.test.tsnew file mode 100644index 000000000..af1952d8f--- /dev/null+++ b/tests/boundary/mcp/toolErrorSchemaDelivery.test.ts@@ -0,0 +1,50 @@+import { mkdtemp, rm } from "node:fs/promises";+import { tmpdir } from "node:os";+import { join } from "node:path";++import { Ajv2020 } from "ajv/dist/2020.js";+import { expect, it, onTestFinished } from "vitest";+import { z } from "zod";++import { connectLocalToolsMcp } from "../../fixtures/localToolsMcp.js";+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";++it("delivers typed tool failures without violating the advertised success schema over stdio", async () => {+ const root = await mkdtemp(join(tmpdir(), "rea-tool-error-schema-"));+ onTestFinished(() => rm(root, { recursive: true, force: true }));+ const missing = join(root, "not-present.bin");+ const { client, call } = await connectLocalToolsMcp();+ const tools = (await client.listTools()).tools;+ const failures: string[] = [];+ const requests = [+ { name: "list_documents", arguments: {} },+ { name: "open_binary", arguments: { path: missing } },+ {+ name: "analyze_javascript_application",+ arguments: { input_path: missing },+ },+ { name: "inspect_artifact", arguments: {} },+ ];+ for (const request of requests) {+ const tool = tools.find(({ name }) => name === request.name);+ if (tool?.outputSchema === undefined)+ throw new Error(`${request.name} omitted its output schema`);+ const reply = await client.callTool(request);+ const diagnostic = parseMcpToolError(reply);+ expect(diagnostic.error.message, request.name).not.toBe("");+ if ("path" in request.arguments || "input_path" in request.arguments)+ expect(JSON.stringify(diagnostic), request.name).toContain(missing);+ if (reply.structuredContent !== undefined) {+ const validate = new Ajv2020({+ strict: false,+ validateFormats: false,+ }).compile(z.record(z.string(), z.unknown()).parse(tool.outputSchema));+ if (!validate(reply.structuredContent)) failures.push(request.name);+ }+ }+ expect(failures).toEqual([]);+ const successful = await call("get_evidence_bundle", {});+ expect(successful.isError).not.toBe(true);+ expect(successful.structuredContent).toBeDefined();+ await client.ping();+});diff --git a/tests/boundary/mcp/webNetworkCaptureMcp.test.ts b/tests/boundary/mcp/webNetworkCaptureMcp.test.tsindex fdbe0753e..4b64a1a5f 100644--- a/tests/boundary/mcp/webNetworkCaptureMcp.test.ts+++ b/tests/boundary/mcp/webNetworkCaptureMcp.test.ts@@ -1,3 +1,4 @@+import { parseMcpToolError } from "../../fixtures/mcpToolError.js";import { Client, InMemoryTransport } from "@modelcontextprotocol/client";import { Ajv2020 } from "ajv/dist/2020.js";import { expect, it, onTestFinished } from "vitest";@@ -93,7 +94,7 @@ it("publishes valid SDK schemas and retains historical inline Evidence with thearguments: { ...args, sensitive_values: ["secret"], mysecret: true },});expect(invalidSensitive.isError).toBe(true);- expect(invalidSensitive.structuredContent).toMatchObject({+ expect(parseMcpToolError(invalidSensitive)).toMatchObject({error: { code: "invalid_request", details: { issues: [{ path: [] }] } },});expect(JSON.stringify(invalidSensitive)).not.toContain("secret");diff --git a/tests/fixtures/localToolsMcp.ts b/tests/fixtures/localToolsMcp.tsindex 53a84b6c9..2b08642ac 100644--- a/tests/fixtures/localToolsMcp.ts+++ b/tests/fixtures/localToolsMcp.ts@@ -47,11 +47,7 @@ export async function connectLocalToolsMcp() {const call = async (name: string, arguments_: Record<string, unknown>) => {const response = await client.callTool({ name, arguments: arguments_ });const validate = validators.get(name);- if (- response.isError !== true &&- response.structuredContent !== undefined &&- validate !== undefined- )+ if (response.structuredContent !== undefined && validate !== undefined)expect(validate(response.structuredContent),JSON.stringify(validate.errors),diff --git a/tests/fixtures/mcpToolError.ts b/tests/fixtures/mcpToolError.tsnew file mode 100644index 000000000..d6b45fa92--- /dev/null+++ b/tests/fixtures/mcpToolError.ts@@ -0,0 +1,16 @@+import type { CallToolResult } from "@modelcontextprotocol/server";+import { expect } from "vitest";+import { z } from "zod";++import { analysisErrorProjectionSchema } from "../../src/contracts/errorSchemas.js";++/** Read and validate the complete typed diagnostic in an MCP tool failure. */+export function parseMcpToolError(result: CallToolResult) {+ expect(result.isError).toBe(true);+ const text = result.content.find((item) => item.type === "text");+ if (text?.type !== "text") throw new Error("Tool error omitted text content");+ return z+ .object({ error: analysisErrorProjectionSchema })+ .strict()+ .parse(JSON.parse(text.text));+}