Retain a 64 KiB diagnostic prefix while counting and draining the complete stderr stream. Report truncation and avoid manufacturing a replacement character at a truncated UTF-8 boundary. Validation: all nine doctor tests pass, including real noisy child, malformed bytes, canonical catalog and startup deadline controls. Based on #3121. Co-authored-by: 1052326311 <65798732+1052326311@users.noreply.github.com>
520 lines
17 KiB
TypeScript
520 lines
17 KiB
TypeScript
import { Client } from "@modelcontextprotocol/client";
|
|
import { StdioClientTransport } from "@modelcontextprotocol/client/stdio";
|
|
import { Formatter, Help, z } from "incur";
|
|
import { performance } from "node:perf_hooks";
|
|
import { resolve } from "node:path";
|
|
import { StringDecoder } from "node:string_decoder";
|
|
|
|
import { CATALOG_IDENTITY } from "./catalogIdentity.js";
|
|
import { PROMPT_CONTRACTS } from "./contracts/promptContracts.js";
|
|
import { TOOL_CONTRACTS } from "./contracts/toolContracts.js";
|
|
import { err, ok } from "./domain/result.js";
|
|
import { PRODUCT_IDENTITY } from "./identity.js";
|
|
import { MCP_STARTUP_POLICY } from "./mcpStartupPolicy.js";
|
|
|
|
const OUTPUT_FORMATS = ["toon", "json", "yaml", "md", "jsonl"] as const;
|
|
type OutputFormat = (typeof OUTPUT_FORMATS)[number];
|
|
|
|
/**
|
|
* Canonical `rea mcp doctor` options. This schema is the single source of
|
|
* truth: the argument parser accepts exactly these options (plus the `-h`
|
|
* alias below) and the help renderer lists them. Keep them in sync by
|
|
* changing this schema, not either consumer.
|
|
*/
|
|
const MCP_DOCTOR_OPTIONS = z.object({
|
|
format: z.enum(OUTPUT_FORMATS).optional().describe("Output format"),
|
|
json: z.boolean().optional().describe("Emit the report as JSON"),
|
|
fullOutput: z.boolean().optional().describe("Show the full output envelope"),
|
|
help: z.boolean().optional().describe("Show help"),
|
|
});
|
|
|
|
const MCP_DOCTOR_ALIAS = { help: "h" } as const;
|
|
|
|
const MCP_DOCTOR_COMMAND = "rea mcp doctor";
|
|
const MCP_DOCTOR_DESCRIPTION = "Validate MCP server startup and tool listing";
|
|
|
|
/** Help flags derived from `MCP_DOCTOR_OPTIONS` plus its alias. */
|
|
const HELP_FLAGS: ReadonlySet<string> = new Set(["--help", "-h"]);
|
|
|
|
/**
|
|
* Answer an advertised help request without starting a diagnostic session.
|
|
* Global options are hidden because this dispatcher entry accepts only the
|
|
* options above; the hint says so explicitly instead of implying full
|
|
* Incur parity.
|
|
*/
|
|
const renderMcpDoctorHelp = (): string =>
|
|
Help.formatCommand(MCP_DOCTOR_COMMAND, {
|
|
description: MCP_DOCTOR_DESCRIPTION,
|
|
hideGlobalOptions: true,
|
|
options: MCP_DOCTOR_OPTIONS,
|
|
alias: MCP_DOCTOR_ALIAS,
|
|
hint: "This entry accepts only the options above.",
|
|
});
|
|
|
|
interface McpDoctorOptions {
|
|
readonly command: string;
|
|
readonly args: readonly string[];
|
|
readonly cwd: string;
|
|
readonly environment: Readonly<Record<string, string | undefined>>;
|
|
readonly deadlineMs?: number;
|
|
}
|
|
|
|
interface InventoryComparison {
|
|
readonly expected: number;
|
|
readonly observed: number;
|
|
readonly missing: readonly string[];
|
|
readonly unexpected: readonly string[];
|
|
readonly duplicates: readonly string[];
|
|
}
|
|
|
|
interface McpDoctorCheck {
|
|
readonly name: string;
|
|
readonly ok: boolean;
|
|
readonly detail: string;
|
|
}
|
|
|
|
/** Diagnose the actual production stdio adapter with one startup-bounded SDK session. */
|
|
export const runProductionMcpDoctor = async (options: McpDoctorOptions) => {
|
|
const deadline =
|
|
performance.now() +
|
|
(options.deadlineMs ?? MCP_STARTUP_POLICY.doctorDeadlineMs);
|
|
const controller = new AbortController();
|
|
const timer = setTimeout(
|
|
() => controller.abort(new Error("Production MCP doctor deadline expired")),
|
|
Math.max(1, Math.ceil(deadline - performance.now())),
|
|
);
|
|
const stderr = captureStderr();
|
|
const transport = new OwnedStdioClientTransport({
|
|
command: options.command,
|
|
args: [...options.args],
|
|
cwd: options.cwd,
|
|
env: targetFreeEnvironment(options.environment),
|
|
stderr: "pipe",
|
|
});
|
|
transport.stderr?.on("data", stderr.append);
|
|
const client = new Client({ name: "rea-mcp-doctor", version: "1" });
|
|
let result: ProductionMcpDoctorResult;
|
|
let cleanupFailure: { readonly cause: unknown } | undefined;
|
|
try {
|
|
await client.connect(
|
|
transport,
|
|
requestOptions(deadline, controller.signal),
|
|
);
|
|
result = await inspectProductionMcpSession(
|
|
client,
|
|
deadline,
|
|
controller.signal,
|
|
);
|
|
} catch (cause: unknown) {
|
|
result = {
|
|
healthy: false,
|
|
adapter: "production-stdio" as const,
|
|
server: null,
|
|
inventory: null,
|
|
identity: null,
|
|
request_flow: { tool: "binary_session", ok: false },
|
|
checks: [
|
|
{
|
|
name: "transport",
|
|
ok: false,
|
|
detail: errorMessage(cause),
|
|
},
|
|
],
|
|
};
|
|
} finally {
|
|
clearTimeout(timer);
|
|
try {
|
|
await client.close();
|
|
} catch (cause: unknown) {
|
|
cleanupFailure = { cause };
|
|
}
|
|
try {
|
|
// An interrupted connect can clear the client's transport reference
|
|
// before its startup child is closed. The transport retains that child.
|
|
await transport.close();
|
|
} catch (cause: unknown) {
|
|
cleanupFailure = {
|
|
cause:
|
|
cleanupFailure === undefined || cleanupFailure.cause === cause
|
|
? cause
|
|
: new AggregateError(
|
|
[cleanupFailure.cause, cause],
|
|
`MCP client and transport cleanup failed: ${errorMessage(cleanupFailure.cause)}; ${errorMessage(cause)}`,
|
|
),
|
|
};
|
|
}
|
|
}
|
|
if (cleanupFailure !== undefined)
|
|
result = {
|
|
...result,
|
|
healthy: false,
|
|
checks: [
|
|
...result.checks,
|
|
{
|
|
name: "cleanup",
|
|
ok: false,
|
|
detail: `MCP stdio cleanup failed: ${errorMessage(cleanupFailure.cause)}`,
|
|
},
|
|
],
|
|
};
|
|
return { ...result, diagnostics: stderr.value() };
|
|
};
|
|
|
|
type ProductionMcpDoctorResult =
|
|
| Awaited<ReturnType<typeof inspectProductionMcpSession>>
|
|
| {
|
|
readonly healthy: false;
|
|
readonly adapter: "production-stdio";
|
|
readonly server: null;
|
|
readonly inventory: null;
|
|
readonly identity: null;
|
|
readonly request_flow: {
|
|
readonly tool: "binary_session";
|
|
readonly ok: false;
|
|
};
|
|
readonly checks: readonly McpDoctorCheck[];
|
|
};
|
|
|
|
/** Join SDK-triggered and caller-triggered close calls for the same child. */
|
|
class OwnedStdioClientTransport extends StdioClientTransport {
|
|
#closePromise: Promise<void> | undefined;
|
|
|
|
override close(): Promise<void> {
|
|
this.#closePromise ??= super.close();
|
|
return this.#closePromise;
|
|
}
|
|
}
|
|
|
|
const inspectProductionMcpSession = async (
|
|
client: Client,
|
|
deadline: number,
|
|
signal: AbortSignal,
|
|
) => {
|
|
const request = requestOptions(deadline, signal);
|
|
const [tools, prompts] = await Promise.all([
|
|
client.listTools(undefined, request),
|
|
client.listPrompts(undefined, request),
|
|
]);
|
|
const sessionTool = tools.tools.find(({ name }) => name === "binary_session");
|
|
const requestFlow = await client
|
|
.callTool(
|
|
{ name: "binary_session", arguments: {} },
|
|
{
|
|
...requestOptions(deadline, signal),
|
|
...(sessionTool === undefined ? {} : { toolDefinition: sessionTool }),
|
|
},
|
|
)
|
|
.then(ok, (cause: unknown) =>
|
|
err({ kind: "request-flow" as const, detail: errorMessage(cause) }),
|
|
);
|
|
const inventory = {
|
|
tools: compareInventory(
|
|
TOOL_CONTRACTS.map(({ name }) => name),
|
|
tools.tools.map(({ name }) => name),
|
|
),
|
|
prompts: compareInventory(
|
|
PROMPT_CONTRACTS.map(({ name }) => name),
|
|
prompts.prompts.map(({ name }) => name),
|
|
),
|
|
};
|
|
const observedIdentity = parseIdentityToolResult(
|
|
requestFlow.ok ? requestFlow.value.structuredContent : undefined,
|
|
);
|
|
const serverVersion = client.getServerVersion();
|
|
const protocolVersion = client.getNegotiatedProtocolVersion();
|
|
const checks: McpDoctorCheck[] = [
|
|
{
|
|
name: "initialize",
|
|
ok:
|
|
serverVersion?.name === PRODUCT_IDENTITY.mcpServerKey &&
|
|
serverVersion.version === PRODUCT_IDENTITY.packageVersion &&
|
|
protocolVersion !== undefined,
|
|
detail: `${serverVersion?.name ?? "unknown"}@${serverVersion?.version ?? "unknown"}; protocol=${protocolVersion ?? "unknown"}`,
|
|
},
|
|
...Object.entries(inventory).map(([name, comparison]) =>
|
|
inventoryCheck(name, comparison),
|
|
),
|
|
{
|
|
name: "server-identity",
|
|
ok:
|
|
observedIdentity.packageVersion === PRODUCT_IDENTITY.packageVersion &&
|
|
observedIdentity.catalogDigest ===
|
|
CATALOG_IDENTITY.digests.combined_sha256,
|
|
detail: `package=${observedIdentity.packageVersion ?? "missing"}; catalog=${observedIdentity.catalogDigest ?? "missing"}`,
|
|
},
|
|
{
|
|
name: "request-flow",
|
|
ok: requestFlow.ok && requestFlow.value.isError !== true,
|
|
detail: requestFlow.ok
|
|
? "binary_session target-free request"
|
|
: requestFlow.error.detail,
|
|
},
|
|
];
|
|
return {
|
|
healthy: checks.every(({ ok }) => ok),
|
|
adapter: "production-stdio" as const,
|
|
server: {
|
|
name: serverVersion?.name ?? null,
|
|
version: serverVersion?.version ?? null,
|
|
protocol_version: protocolVersion ?? null,
|
|
},
|
|
inventory,
|
|
identity: {
|
|
expected_package_version: PRODUCT_IDENTITY.packageVersion,
|
|
observed_package_version: observedIdentity.packageVersion,
|
|
expected_catalog_digest: CATALOG_IDENTITY.digests.combined_sha256,
|
|
observed_catalog_digest: observedIdentity.catalogDigest,
|
|
},
|
|
request_flow: {
|
|
tool: "binary_session",
|
|
ok: requestFlow.ok && requestFlow.value.isError !== true,
|
|
},
|
|
checks,
|
|
};
|
|
};
|
|
|
|
/**
|
|
* Dispatcher entry for `rea mcp doctor`, kept separate from Incur MCP setup.
|
|
* @public
|
|
*/
|
|
export const runProductionMcpDoctorCli = async (
|
|
arguments_: readonly string[],
|
|
input: { readonly dispatcherPath: string; readonly packageRoot: string },
|
|
): Promise<{ readonly output: string; readonly exitCode: number }> => {
|
|
const started = performance.now();
|
|
const parsed = parseOutputArguments(arguments_);
|
|
if (!parsed.ok) {
|
|
if (parsed.help)
|
|
return { output: `${renderMcpDoctorHelp()}\n`, exitCode: 0 };
|
|
return {
|
|
output: `${Formatter.format(
|
|
{ code: "VALIDATION_ERROR", message: parsed.message },
|
|
parsed.format,
|
|
)}\n`,
|
|
exitCode: 1,
|
|
};
|
|
}
|
|
const result = await runProductionMcpDoctor({
|
|
command: process.execPath,
|
|
args: [resolve(input.dispatcherPath), "mcp"],
|
|
cwd: input.packageRoot,
|
|
environment: process.env,
|
|
});
|
|
const outputValue = parsed.fullOutput
|
|
? {
|
|
ok: result.healthy,
|
|
...(result.healthy ? { data: result } : { error: result }),
|
|
meta: {
|
|
command: MCP_DOCTOR_COMMAND,
|
|
duration: `${Math.round(performance.now() - started)}ms`,
|
|
},
|
|
}
|
|
: result;
|
|
return {
|
|
output: `${Formatter.format(outputValue, parsed.format)}\n`,
|
|
exitCode: result.healthy ? 0 : 1,
|
|
};
|
|
};
|
|
|
|
/** Compare exact names while retaining actionable mismatch locations. */
|
|
export const compareInventory = (
|
|
expectedNames: readonly string[],
|
|
observedNames: readonly string[],
|
|
): InventoryComparison => {
|
|
const expected = new Set(expectedNames);
|
|
const observed = new Set(observedNames);
|
|
return {
|
|
expected: expectedNames.length,
|
|
observed: observedNames.length,
|
|
missing: [...expected].filter((name) => !observed.has(name)).sort(),
|
|
unexpected: [...observed].filter((name) => !expected.has(name)).sort(),
|
|
duplicates: [...observed]
|
|
.filter(
|
|
(name) =>
|
|
observedNames.filter((candidate) => candidate === name).length > 1,
|
|
)
|
|
.sort(),
|
|
};
|
|
};
|
|
|
|
const inventoryCheck = (
|
|
name: string,
|
|
comparison: InventoryComparison,
|
|
): McpDoctorCheck => ({
|
|
name: `inventory:${name}`,
|
|
ok:
|
|
comparison.expected === comparison.observed &&
|
|
comparison.missing.length === 0 &&
|
|
comparison.unexpected.length === 0 &&
|
|
comparison.duplicates.length === 0,
|
|
detail: `expected=${String(comparison.expected)} observed=${String(comparison.observed)} missing=${comparison.missing.join(",") || "none"} unexpected=${comparison.unexpected.join(",") || "none"} duplicates=${comparison.duplicates.join(",") || "none"}`,
|
|
});
|
|
|
|
const parseIdentityToolResult = (
|
|
input: unknown,
|
|
): {
|
|
readonly packageVersion: string | null;
|
|
readonly catalogDigest: string | null;
|
|
} => {
|
|
if (!isRecord(input) || !isRecord(input.result))
|
|
return { packageVersion: null, catalogDigest: null };
|
|
const identity = input.result.server_identity;
|
|
if (!isRecord(identity)) return { packageVersion: null, catalogDigest: null };
|
|
const packageIdentity = identity.package;
|
|
const catalog = identity.catalog;
|
|
const digests = isRecord(catalog) ? catalog.digests : undefined;
|
|
return {
|
|
packageVersion:
|
|
isRecord(packageIdentity) && typeof packageIdentity.version === "string"
|
|
? packageIdentity.version
|
|
: null,
|
|
catalogDigest:
|
|
isRecord(digests) && typeof digests.combined_sha256 === "string"
|
|
? digests.combined_sha256
|
|
: null,
|
|
};
|
|
};
|
|
|
|
/**
|
|
* Parsed `rea mcp doctor` arguments, including a help request. The `help`
|
|
* variant is the only success-independent early return; every other accepted
|
|
* flag is an output selector declared in `MCP_DOCTOR_OPTIONS`.
|
|
*/
|
|
type McpDoctorArguments =
|
|
| {
|
|
readonly ok: true;
|
|
readonly format: OutputFormat;
|
|
readonly fullOutput: boolean;
|
|
}
|
|
| { readonly ok: false; readonly help: true }
|
|
| {
|
|
readonly ok: false;
|
|
readonly help: false;
|
|
readonly format: OutputFormat;
|
|
readonly message: string;
|
|
};
|
|
|
|
const parseOutputArguments = (
|
|
arguments_: readonly string[],
|
|
): McpDoctorArguments => {
|
|
// Help wins over output selection and validation errors, but only when it
|
|
// appears in option position. A token consumed as `--format`'s value is
|
|
// not a flag, so `--format --help` reports an invalid format instead of
|
|
// masking the typo with usage.
|
|
if (hasHelpInOptionPosition(arguments_)) return { ok: false, help: true };
|
|
let format: OutputFormat = "toon";
|
|
let fullOutput = false;
|
|
for (let index = 0; index < arguments_.length; index += 1) {
|
|
const argument = arguments_[index];
|
|
if (argument === "--json") {
|
|
format = "json";
|
|
continue;
|
|
}
|
|
const inline = argument?.startsWith("--format=")
|
|
? argument.slice("--format=".length)
|
|
: undefined;
|
|
if (argument === "--format" || inline !== undefined) {
|
|
const candidate = inline ?? arguments_[index + 1];
|
|
if (inline === undefined) index += 1;
|
|
if (!isOutputFormat(candidate))
|
|
return {
|
|
ok: false,
|
|
help: false,
|
|
format,
|
|
message: `Invalid output format: ${candidate ?? "missing"}`,
|
|
};
|
|
format = candidate;
|
|
continue;
|
|
}
|
|
if (argument === "--full-output") {
|
|
fullOutput = true;
|
|
continue;
|
|
}
|
|
if (HELP_FLAGS.has(argument ?? "")) return { ok: false, help: true };
|
|
return {
|
|
ok: false,
|
|
help: false,
|
|
format,
|
|
message: `Unknown mcp doctor option: ${argument ?? "missing"}`,
|
|
};
|
|
}
|
|
return { ok: true, format, fullOutput };
|
|
};
|
|
|
|
/**
|
|
* Report whether `--help`/`-h` appears in option position. Tokens consumed
|
|
* as `--format`'s value are skipped so `--format --help` stays an invalid
|
|
* format error instead of silently becoming a help request.
|
|
*/
|
|
const hasHelpInOptionPosition = (arguments_: readonly string[]): boolean => {
|
|
for (let index = 0; index < arguments_.length; index += 1) {
|
|
const argument = arguments_[index];
|
|
if (argument === "--format") {
|
|
index += 1;
|
|
continue;
|
|
}
|
|
if (HELP_FLAGS.has(argument ?? "")) return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const isOutputFormat = (value: string | undefined): value is OutputFormat =>
|
|
OUTPUT_FORMATS.some((candidate) => candidate === value);
|
|
|
|
const requestOptions = (deadline: number, signal: AbortSignal) => ({
|
|
signal,
|
|
timeout: Math.max(1, Math.ceil(deadline - performance.now())),
|
|
});
|
|
|
|
const targetFreeEnvironment = (
|
|
environment: Readonly<Record<string, string | undefined>>,
|
|
): Record<string, string> => {
|
|
const result = Object.fromEntries(
|
|
Object.entries(environment).filter(
|
|
(entry): entry is [string, string] => entry[1] !== undefined,
|
|
),
|
|
);
|
|
for (const name of [
|
|
"HOPPER_TARGET_PATH",
|
|
"HOPPER_TARGET_KIND",
|
|
"HOPPER_LOADER_ARGS_JSON",
|
|
])
|
|
delete result[name];
|
|
return result;
|
|
};
|
|
|
|
const captureStderr = () => {
|
|
const retained = Buffer.allocUnsafe(MCP_STARTUP_POLICY.doctorStderrBytes);
|
|
let retainedBytes = 0;
|
|
let bytes = 0;
|
|
let truncated = false;
|
|
return {
|
|
append(chunk: unknown) {
|
|
const buffer = Buffer.isBuffer(chunk)
|
|
? chunk
|
|
: Buffer.from(String(chunk), "utf8");
|
|
bytes += buffer.byteLength;
|
|
const remaining = retained.byteLength - retainedBytes;
|
|
const copied = Math.min(remaining, buffer.byteLength);
|
|
if (copied > 0) {
|
|
buffer.copy(retained, retainedBytes, 0, copied);
|
|
retainedBytes += copied;
|
|
}
|
|
if (copied < buffer.byteLength) truncated = true;
|
|
},
|
|
value: () => ({
|
|
stderr: truncated
|
|
? new StringDecoder("utf8").write(retained.subarray(0, retainedBytes))
|
|
: retained.toString("utf8", 0, retainedBytes),
|
|
stderr_bytes: bytes,
|
|
stderr_truncated: truncated,
|
|
}),
|
|
};
|
|
};
|
|
|
|
const isRecord = (value: unknown): value is Readonly<Record<string, unknown>> =>
|
|
typeof value === "object" && value !== null && !Array.isArray(value);
|
|
|
|
const errorMessage = (cause: unknown): string =>
|
|
cause instanceof Error ? cause.message : String(cause);
|