Skip to content

armgit / rea

Public Imported from GitHub
0

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

fix(mcp): attribute doctor timeouts to owned deadline facts

morluto2589c0074d3e
diff --git a/src/mcpDoctor.ts b/src/mcpDoctor.ts
index 0cd745b41..67236c1ca 100644
--- a/src/mcpDoctor.ts
+++ b/src/mcpDoctor.ts
@@ -1,4 +1,4 @@
-import { Client } from "@modelcontextprotocol/client";
+import { Client, SdkError, SdkErrorCode } from "@modelcontextprotocol/client";
import { StdioClientTransport } from "@modelcontextprotocol/client/stdio";
import { Formatter, Help, z } from "incur";
import { performance } from "node:perf_hooks";
@@ -127,7 +127,7 @@ export const runProductionMcpDoctor = async (options: McpDoctorOptions) => {
{
name: "transport",
ok: false,
- detail: doctorTransportDetail(cause, budgetMs),
+ detail: doctorTransportDetail(cause, budgetMs, controller.signal),
},
],
};
@@ -219,7 +219,7 @@ const inspectProductionMcpSession = async (
.then(ok, (cause: unknown) =>
err({
kind: "request-flow" as const,
- detail: doctorTransportDetail(cause, budgetMs),
+ detail: doctorTransportDetail(cause, budgetMs, signal),
}),
);
const inventory = {
@@ -549,21 +549,17 @@ const isRecord = (value: unknown): value is Readonly<Record<string, unknown>> =>
const errorMessage = (cause: unknown): string =>
cause instanceof Error ? cause.message : String(cause);
-const doctorDeadlineFired = (cause: unknown): boolean => {
- const message = errorMessage(cause);
- return (
- message.includes("Production MCP doctor deadline expired") ||
- message.includes("Request timed out") ||
- message.includes("Maximum total timeout exceeded") ||
- (cause instanceof Error &&
- (cause.name === "TimeoutError" || cause.name === "AbortError"))
- );
-};
-
/** Name the fixed doctor deadline when it fires, without turning Codex's 30s into a REA knob. */
-const doctorTransportDetail = (cause: unknown, budgetMs: number): string => {
+const doctorTransportDetail = (
+ cause: unknown,
+ budgetMs: number,
+ signal: AbortSignal,
+): string => {
const message = errorMessage(cause);
- return doctorDeadlineFired(cause)
+ const timedOut =
+ (signal.aborted && cause === signal.reason) ||
+ (cause instanceof SdkError && cause.code === SdkErrorCode.RequestTimeout);
+ return timedOut
? `${message} ${mcpDoctorDeadlineRecovery(budgetMs)}`
: message;
};
diff --git a/tests/boundary/mcp/mcpDoctor.test.ts b/tests/boundary/mcp/mcpDoctor.test.ts
index 2bb10fc95..23ac6c081 100644
--- a/tests/boundary/mcp/mcpDoctor.test.ts
+++ b/tests/boundary/mcp/mcpDoctor.test.ts
@@ -426,26 +426,36 @@ describe("production MCP doctor request-flow deadline", () => {
expect(requestFlow?.detail).not.toContain("REA_MCP_STARTUP");
}, 15_000);
- it("does not add deadline guidance to an unrelated binary_session failure", async () => {
- const result = await runProductionMcpDoctor({
- command: process.execPath,
- args: [resolve("tests/fixtures/mcpStartupProbeChild.mjs")],
- cwd: process.cwd(),
- environment: {
- ...process.env,
- REA_MCP_PROBE_MODE: "refuse-call",
- },
- deadlineMs: 5_000,
- });
- expect(result.server).not.toBeNull();
- const requestFlow = result.checks.find(
- (check) => check.name === "request-flow",
- );
- expect(requestFlow?.ok).toBe(false);
- expect(requestFlow?.detail).toContain("unrelated fixture method refusal");
- expect(requestFlow?.detail).not.toContain("no runtime override");
- expect(requestFlow?.detail).not.toContain("MCP doctor startup deadline");
- }, 10_000);
+ it.each([
+ "unrelated fixture method refusal",
+ "Request timed out while reading a remote fixture",
+ "Maximum total timeout exceeded in a remote operation",
+ "Production MCP doctor deadline expired is remote diagnostic text",
+ ])(
+ "does not infer the doctor deadline from remote failure prose: %s",
+ async (message) => {
+ const result = await runProductionMcpDoctor({
+ command: process.execPath,
+ args: [resolve("tests/fixtures/mcpStartupProbeChild.mjs")],
+ cwd: process.cwd(),
+ environment: {
+ ...process.env,
+ REA_MCP_PROBE_MODE: "refuse-call",
+ REA_MCP_PROBE_ERROR_MESSAGE: message,
+ },
+ deadlineMs: 5_000,
+ });
+ expect(result.server).not.toBeNull();
+ const requestFlow = result.checks.find(
+ (check) => check.name === "request-flow",
+ );
+ expect(requestFlow?.ok).toBe(false);
+ expect(requestFlow?.detail).toContain(message);
+ expect(requestFlow?.detail).not.toContain("no runtime override");
+ expect(requestFlow?.detail).not.toContain("MCP doctor startup deadline");
+ },
+ 10_000,
+ );
});
const runNoisyDoctorChild = async (body: string) => {
diff --git a/tests/fixtures/mcpStartupProbeChild.mjs b/tests/fixtures/mcpStartupProbeChild.mjs
index 6310b918e..e09a7d6ea 100644
--- a/tests/fixtures/mcpStartupProbeChild.mjs
+++ b/tests/fixtures/mcpStartupProbeChild.mjs
@@ -14,7 +14,9 @@ const respond = (id, result) => {
? {
error: {
code: -32601,
- message: "unrelated fixture method refusal",
+ message:
+ process.env.REA_MCP_PROBE_ERROR_MESSAGE ??
+ "unrelated fixture method refusal",
},
}
: { result };