@modelcontextprotocol/inspector 2.13.0 → 2.14.0

package/clients/mcpdo/build/mcp-bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { $ as CliExitCodeError, A as sanitizeDeep, B as ensureDaemonDir, C as clearAllOAuthClientState, D as positiveNumberParser, E as positiveIntegerParser, F as readDaemonTokenFile, G as loadServerEntries, H as getDaemonLogPath, I as DAEMON_DIR_ENV, J as parseKeyValuePair, K as selectServerEntry, L as DAEMON_TOKEN_ENV, M as encodeRequest, N as generateDaemonToken, O as resolveLoadOptions, P as getDaemonTokenFromEnv, Q as DEFAULT_TASK_TTL_MS, R as assertSocketPathWithinLimit, S as NodeOAuthStorage, T as resetNodeOAuthStorageCache, U as getDaemonSocketPath, V as getDaemonDir, W as readInspectorVersion, X as withDefaultCatalogPath, Y as resolveServerSource, Z as DEFAULT_MAX_FETCH_REQUESTS, _ as isCliAutoOpenForced, a as obtainPendingUrlForKey, at as setSecretStorageWarningsQuiet, b as DEFAULT_CONNECT_TIMEOUT_MS, c as runAuthHelper, ct as CallbackNavigation, d as emaLogin, dt as idpOAuthStorageKey, et as EXIT_CODES, f as emaLogout, ft as normalizeIdpIssuer, g as runEmaIdpInteractiveFlow, h as requireIdp, ht as awaitableLog, i as obtainPendingAuthUrl, it as getSecretStorageInfo, j as sanitizeText, k as isSafeLinkTarget, l as writePendingAuthMarker, lt as clearEmaIdpSession, m as loadEmaIdpConfig, mt as awaitableError, n as AUTH_HELPER_COMMAND, nt as readOAuthStore, o as pendingAuthMarkerPath, ot as warnAboutSecretStorage, p as getEmaStatus, pt as parseIdpOAuthStorageKey, q as parseHeaderPair, r as PENDING_AUTH_TTL_MS, rt as disallowMemorySecretStoreFallback, s as removeOwnPendingAuthMarker, st as InMemorySecretStore, tt as handleError, u as authorizeInFrontend, ut as getEmaIdpLoginState, v as PLAIN, w as getStateFilePath, x as withConnectTimeout, y as styleFromOpts, z as createPrivateDaemonDir } from "./server-BHuKGkMj.js";
+import { $ as withDefaultCatalogPath, A as resolveLoadOptions, B as assertSocketPathWithinLimit, C as clearAllOAuthClientState, D as loadSummaryWarnings, E as LOAD_FLAG_CONFLICT, F as generateDaemonToken, G as getDaemonSocketPath, H as ensureDaemonDir, I as getDaemonTokenFromEnv, J as loadServerEntries, K as readInspectorVersion, L as readDaemonTokenFile, M as sanitizeDeep, N as sanitizeText, O as positiveIntegerParser, P as encodeRequest, Q as resolveServerSource, R as DAEMON_DIR_ENV, S as NodeOAuthStorage, T as resetNodeOAuthStorageCache, U as getDaemonDir, V as createPrivateDaemonDir, W as getDaemonLogPath, X as parseHeaderPair, Y as selectServerEntry, Z as parseKeyValuePair, _ as isCliAutoOpenForced, _t as awaitableError, a as obtainPendingUrlForKey, at as readOAuthStore, b as DEFAULT_CONNECT_TIMEOUT_MS, c as runAuthHelper, ct as setSecretStorageWarningsQuiet, d as emaLogin, dt as CallbackNavigation, et as DEFAULT_MAX_FETCH_REQUESTS, f as emaLogout, ft as clearEmaIdpSession, g as runEmaIdpInteractiveFlow, gt as parseIdpOAuthStorageKey, h as requireIdp, ht as normalizeIdpIssuer, i as obtainPendingAuthUrl, it as handleError, j as isSafeLinkTarget, k as positiveNumberParser, l as writePendingAuthMarker, lt as warnAboutSecretStorage, m as loadEmaIdpConfig, mt as idpOAuthStorageKey, n as AUTH_HELPER_COMMAND, nt as CliExitCodeError, o as pendingAuthMarkerPath, ot as disallowMemorySecretStoreFallback, p as getEmaStatus, pt as getEmaIdpLoginState, q as readInspectorVersionSafe, r as PENDING_AUTH_TTL_MS, rt as EXIT_CODES, s as removeOwnPendingAuthMarker, st as getSecretStorageInfo, tt as DEFAULT_TASK_TTL_MS, u as authorizeInFrontend, ut as InMemorySecretStore, v as PLAIN, vt as awaitableLog, w as getStateFilePath, x as withConnectTimeout, y as styleFromOpts, z as DAEMON_TOKEN_ENV } from "./server-Dv339Ejx.js";
 import { realpathSync } from "fs";
 import { resolve } from "path";
 import { fileURLToPath } from "url";
@@ -304,14 +304,18 @@ async function waitForDaemon(socketPath, token, logPath, opts) {
 	while (Date.now() < deadline) {
 		if (await isDaemonReachable(socketPath)) {
 			const effectiveToken = opts?.rereadTokenDir ? readDaemonTokenFile(opts.rereadTokenDir) ?? token : token;
+			let pong;
 			try {
-				await callDaemon("ping", {}, {
+				pong = await callDaemon("ping", {}, {
 					socketPath,
 					timeoutMs: 2e3,
 					token: effectiveToken
 				});
-				return;
 			} catch {}
+			if (pong !== void 0) {
+				assertDaemonVersion(pong.version, CLIENT_VERSION);
+				return;
+			}
 		}
 		await new Promise((r) => setTimeout(r, READY_POLL_MS));
 	}
@@ -343,6 +347,12 @@ async function waitForDaemonExit(pid, socketPath, timeoutMs = STOPPING_EXIT_TIME
 		await new Promise((r) => setTimeout(r, pollMs));
 	}
 }
+const CLIENT_VERSION = readInspectorVersionSafe(import.meta.url);
+function assertDaemonVersion(daemonVersion, clientVersion) {
+	if (clientVersion === void 0 || daemonVersion === clientVersion) return;
+	const running = daemonVersion === void 0 ? "an older mcpdo release" : `mcpdo ${daemonVersion}`;
+	throw new CliExitCodeError(EXIT_CODES.UNREACHABLE, `The running connection daemon is from ${running}, but this is mcpdo ${clientVersion}. Run \`mcpdo daemon stop\` (its open connections will close), then re-run the command.`, { code: "daemon_version_mismatch" });
+}
 async function ensureDaemon(options) {
 	const dir = options?.dir ?? getDaemonDir();
 	let token = options?.token ?? getDaemonTokenFromEnv();
@@ -356,10 +366,13 @@ async function ensureDaemon(options) {
 			timeoutMs: 2e3,
 			token
 		});
-		if (pong?.stopping !== true) return {
-			socketPath,
-			spawned: false
-		};
+		if (pong?.stopping !== true) {
+			assertDaemonVersion(pong?.version, CLIENT_VERSION);
+			return {
+				socketPath,
+				spawned: false
+			};
+		}
 		await waitForDaemonExit(pong.pid, socketPath);
 	}
 	const tokenWasGenerated = token === void 0;
@@ -572,7 +585,7 @@ function p99Breach(summary, max) {
 	const p99 = summary.latencyMs?.p99;
 	if (p99 === void 0) return {
 		code: LOAD_P99_EXCEEDED,
-		message: `no call completed, so there is no p99 latency to check against --load-max-p99 ${max}`
+		message: `no call succeeded, so there is no p99 latency to check against --load-max-p99 ${max}`
 	};
 	if (p99 <= max) return void 0;
 	return {
@@ -626,7 +639,7 @@ function resolveLoadFlags(flags) {
 		...thresholds && { thresholds }
 	};
 }
-function usage(message, code = "load_flag_conflict") {
+function usage(message, code = LOAD_FLAG_CONFLICT) {
 	return new CliExitCodeError(EXIT_CODES.USAGE, message, { code });
 }
 //#endregion
@@ -1483,16 +1496,27 @@ function formatLoadSummaryHuman(summary, style = PLAIN) {
 	const rate = `${(summary.errorRate * 100).toFixed(2)}%`;
 	const lines = [
 		`${heading(style, "Load test")}${tool} ${style.dim(`(${bounds.join(", ")})`)}`,
-		`  Requests:   ${summary.requests} in ${(summary.elapsedMs / 1e3).toFixed(2)}s (${summary.throughput}/s)`,
+		`  Requests:   ${summary.requests} in ${(summary.elapsedMs / 1e3).toFixed(2)}s (${summary.throughput}/s, ${summary.okThroughput}/s ok)`,
 		`  Outcomes:   ${style.green(`${summary.ok} ok`)}, ${summary.toolErrors} tool errors, ${summary.errors} errors`,
 		`  Error rate: ${failed > 0 ? style.red(rate) : rate}`
 	];
+	if (summary.plannedStarts !== void 0) {
+		const dropped = `${summary.droppedSlots} dropped`;
+		lines.push(`  Rate:       ${summary.achievedRate}/s achieved; ${summary.plannedStarts} planned, ${summary.droppedSlots > 0 ? style.red(dropped) : dropped}`);
+	}
 	const l = summary.latencyMs;
-	lines.push(l === null ? `  Latency:    ${style.dim("no calls completed")}` : `  Latency:    min ${l.min} / mean ${l.mean} / p50 ${l.p50} / p90 ${l.p90} / p99 ${l.p99} / max ${l.max} ms`);
+	lines.push(l === null ? `  Latency:    ${style.dim("no calls succeeded")}` : `  Latency:    min ${l.min} / mean ${l.mean} / p50 ${l.p50} / p90 ${l.p90} / p99 ${l.p99} / max ${l.max} ms`);
+	const e = summary.errorLatencyMs;
+	if (e !== null) lines.push(`  Failed in:  min ${e.min} / mean ${e.mean} / p50 ${e.p50} / p90 ${e.p90} / p99 ${e.p99} / max ${e.max} ms`);
 	if (summary.errorMessages.length > 0) {
 		lines.push(`  ${style.bold("Top errors:")}`);
 		for (const { message, count } of summary.errorMessages) lines.push(`    ${count}× ${message}`);
 	}
+	if (summary.toolErrorMessages.length > 0) {
+		lines.push(`  ${style.bold("Top tool errors:")}`);
+		for (const { message, count } of summary.toolErrorMessages) lines.push(`    ${count}× ${message}`);
+	}
+	if (summary.stoppedEarly !== void 0) lines.push(`  ${style.red("Stopped early")} (${summary.stoppedEarly.reason}): ${summary.stoppedEarly.detail}`);
 	const c = summary.connections;
 	if (c !== void 0) {
 		const failed = `${c.failed} failed`;
@@ -2061,7 +2085,10 @@ async function dispatchConnectionRpc(method, methodArgs, opts) {
 		format,
 		style
 	}, method, methodArgs.toolName, outcome);
-	if (outcome.kind === "load") checkLoadThresholds(outcome.summary, opts.load?.thresholds);
+	if (outcome.kind === "load") {
+		for (const warning of loadSummaryWarnings(outcome.summary)) await awaitableError(`${warning}\n`);
+		checkLoadThresholds(outcome.summary, opts.load?.thresholds);
+	}
 }
 async function writeRpcOutcome(out, method, toolName, outcome) {
 	const { format, style } = out;
@@ -2300,13 +2327,17 @@ function resolveFriendlyName(name, index) {
 function isDaemonUnreachable(error) {
 	return error instanceof CliExitCodeError && error.envelope?.code === "daemon_unreachable";
 }
+function assertNoDaemonMeansNothingConnected(error) {
+	if (!isDaemonUnreachable(error)) throw error;
+	assertSocketPathWithinLimit(getDaemonSocketPath());
+}
 async function resolveMruEntryName() {
 	if (requireExplicitConnection()) throw new CliExitCodeError(EXIT_CODES.USAGE, "servers/show requires an entry name in non-interactive mode. Pass one (see mcpdo servers/list).", { code: "server_name_required" });
 	let connections = [];
 	try {
 		connections = (await callDaemon("connections/list", {})).connections;
 	} catch (error) {
-		if (!isDaemonUnreachable(error)) throw error;
+		assertNoDaemonMeansNothingConnected(error);
 	}
 	const mru = connections.find((c) => c.isMru);
 	if (!mru) throw new CliExitCodeError(EXIT_CODES.USAGE, "No entry name given and there is no most-recently-used connection to infer one from. Pass a catalog entry name (see mcpdo servers/list).", { code: "server_name_required" });
@@ -2699,14 +2730,11 @@ function registerConnectionAdmin(program) {
 				connections: result.connections
 			});
 		} catch (error) {
-			if (isDaemonUnreachable(error)) {
-				await writeConnectionOutput(outOpts(opts), {
-					kind: "connections/list",
-					connections: []
-				});
-				return;
-			}
-			throw error;
+			assertNoDaemonMeansNothingConnected(error);
+			await writeConnectionOutput(outOpts(opts), {
+				kind: "connections/list",
+				connections: []
+			});
 		}
 	});
 	program.command("connections/use").description("Set the MRU connection without an MCP RPC").argument("<connection>", "Connection @name / name").action(async (connectionArg) => {
@@ -2835,7 +2863,7 @@ function registerRpcCommands(program) {
 				});
 				break;
 			case "tools/call":
-				cmd.argument("[toolName]", "Tool name").argument("[toolArgs...]", "Arguments as key:=value pairs or a JSON object").option("--tool-name <name>", "Tool name").option("--tool-arg <pairs...>", "Tool argument as key=value pair (alternative to key:=value positionals)", parseKeyValue, {}).option("--tool-args-json <json>", "Tool arguments as a JSON object (alternative to inline JSON positional)").option("--tool-metadata <pairs...>", "Tool-specific metadata", parseKeyValue, {}).option("--task", "Request a task-augmented tool call (legacy servers; on modern the server decides)").option("--app-info", "Probe MCP App metadata only").option("--load", "Load-test the tool: call it repeatedly and concurrently, then print a latency and error-rate summary instead of a result. Bounded by --load-duration (default 10s) and/or --load-requests. Later commands on this connection wait until the run ends.").option("--load-concurrency <n>", "With --load: most calls in flight at once (positive integer; default 10).", positiveIntegerParser("--load-concurrency")).option("--load-connections <n>", "With --load: spread the calls over this many independent sessions to the connection's HTTP or SSE server, opened before timing starts with stored credentials only (positive integer, at most --load-concurrency; default 1).", positiveIntegerParser("--load-connections")).option("--load-duration <sec>", "With --load: stop starting calls after this many seconds; in-flight calls still finish (default 10 when --load-requests is not set).", positiveNumberParser("--load-duration")).option("--load-requests <n>", "With --load: stop after starting this many calls (positive integer).", positiveIntegerParser("--load-requests")).option("--load-rate <n>", "With --load: start at most this many calls per second, spread evenly (positive number; default unlimited).", positiveNumberParser("--load-rate")).option("--load-max-error-rate <fraction>", "With --load: exit 10 (load_error_rate_exceeded) when the share of failed calls is above this value, after printing the summary (0 to 1; 0 fails on any failed call).", fractionParser("--load-max-error-rate")).option("--load-max-p99 <ms>", "With --load: exit 10 (load_p99_exceeded) when the p99 latency is above this many milliseconds, or when no call completed, after printing the summary (positive number).", maxP99Parser);
+				cmd.argument("[toolName]", "Tool name").argument("[toolArgs...]", "Arguments as key:=value pairs or a JSON object").option("--tool-name <name>", "Tool name").option("--tool-arg <pairs...>", "Tool argument as key=value pair (alternative to key:=value positionals)", parseKeyValue, {}).option("--tool-args-json <json>", "Tool arguments as a JSON object (alternative to inline JSON positional)").option("--tool-metadata <pairs...>", "Tool-specific metadata", parseKeyValue, {}).option("--task", "Request a task-augmented tool call (legacy servers; on modern the server decides)").option("--app-info", "Probe MCP App metadata only").option("--load", "Load-test the tool: call it repeatedly and concurrently, then print a latency and error-rate summary instead of a result. Bounded by --load-duration (default 10s) and/or --load-requests. Later commands on this connection wait until the run ends.").option("--load-concurrency <n>", "With --load: most calls in flight at once (positive integer; default 10).", positiveIntegerParser("--load-concurrency")).option("--load-connections <n>", "With --load: spread the calls over this many independent sessions to the connection's HTTP or SSE server, opened before timing starts with stored credentials only (positive integer, at most --load-concurrency; default 1).", positiveIntegerParser("--load-connections")).option("--load-duration <sec>", "With --load: stop starting calls after this many seconds; in-flight calls still finish (default 10 when --load-requests is not set).", positiveNumberParser("--load-duration")).option("--load-requests <n>", "With --load: stop after starting this many calls (positive integer).", positiveIntegerParser("--load-requests")).option("--load-rate <n>", "With --load: start at most this many calls per second, spread evenly (positive number; default unlimited).", positiveNumberParser("--load-rate")).option("--load-max-error-rate <fraction>", "With --load: exit 10 (load_error_rate_exceeded) when the share of failed calls is above this value, after printing the summary (0 to 1; 0 fails on any failed call).", fractionParser("--load-max-error-rate")).option("--load-max-p99 <ms>", "With --load: exit 10 (load_p99_exceeded) when the p99 latency of the successful calls is above this many milliseconds, or when no call succeeded, after printing the summary (positive number).", maxP99Parser);
 				cmd.action(async (toolNamePos, toolArgsPos, o) => {
 					const { toolName, toolArg } = resolveToolCallArgs({
 						toolNameFlag: o.toolName,

package/clients/mcpdo/build/mcpdod.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { B as ensureDaemonDir, N as generateDaemonToken, P as getDaemonTokenFromEnv, mt as awaitableError, rt as disallowMemorySecretStoreFallback, t as DaemonServer } from "./server-BHuKGkMj.js";
+import { F as generateDaemonToken, H as ensureDaemonDir, I as getDaemonTokenFromEnv, _t as awaitableError, ot as disallowMemorySecretStoreFallback, t as DaemonServer } from "./server-Dv339Ejx.js";
 //#region src/daemon/run.ts
 process.title = "mcpdod";
 disallowMemorySecretStoreFallback();