@modelcontextprotocol/inspector 2.0.0 → 2.1.0

package/clients/tui/build/index.js

@@ -422,9 +422,13 @@ function loadMcpServersConfig(configPath, writable) {
     return { ...config, mcpServers: normalizedServers };
   } catch (error) {
     if (error instanceof Error) {
-      throw new Error(`Error loading configuration: ${error.message}`);
+      throw new Error(`Error loading configuration: ${error.message}`, {
+        cause: error
+      });
     }
-    throw new Error("Error loading configuration: Unknown error");
+    throw new Error("Error loading configuration: Unknown error", {
+      cause: error
+    });
   }
 }
 function loadServerFromConfig(configPath, serverName, writable) {
@@ -994,7 +998,9 @@ function parseHttpUrl(value, label) {
     return new URL(trimmed);
   } catch (err) {
     const detail = err instanceof Error ? err.message : String(err);
-    throw new Error(`Invalid ${label}: "${trimmed}" (${detail})`);
+    throw new Error(`Invalid ${label}: "${trimmed}" (${detail})`, {
+      cause: err
+    });
   }
 }
 var parseOAuthCallbackParams = (location) => {
@@ -1734,7 +1740,7 @@ function parseRunnerOAuthCallbackUrl(cliCallbackUrl) {
     url = new URL(raw);
   } catch (err) {
     const reason = err?.message ?? String(err);
-    throw new Error(`Invalid OAuth callback URL: ${reason}`);
+    throw new Error(`Invalid OAuth callback URL: ${reason}`, { cause: err });
   }
   if (url.protocol !== "http:") {
     throw new Error("OAuth callback URL must use http scheme");
@@ -1779,6 +1785,7 @@ import { Client } from "@modelcontextprotocol/client";
 
 // ../../core/json/xMcpHeader.ts
 var X_MCP_HEADER_KEY = "x-mcp-header";
+var MCP_PARAM_HEADER_PREFIX = "Mcp-Param-";
 var RFC9110_TOKEN = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
 var PERMITTED_X_MCP_HEADER_TYPES = /* @__PURE__ */ new Set([
   "string",
@@ -1868,6 +1875,66 @@ function scanXMcpHeaderDeclarations(inputSchema) {
   const fault = visit(inputSchema, [], true);
   return fault === void 0 ? { valid: true, declarations } : { valid: false, reason: fault };
 }
+var BASE64_SENTINEL_PREFIX = "=?base64?";
+var BASE64_SENTINEL_SUFFIX = "?=";
+function mcpParamPrimitiveToString(value) {
+  if (typeof value === "string") return value;
+  if (typeof value === "boolean") return value ? "true" : "false";
+  if (typeof value === "number") {
+    if (!Number.isFinite(value)) return void 0;
+    if (Number.isInteger(value) && !Number.isSafeInteger(value)) {
+      return void 0;
+    }
+    return String(value);
+  }
+  return void 0;
+}
+function needsBase64(s) {
+  if (s.length === 0) return true;
+  if (s.startsWith(BASE64_SENTINEL_PREFIX) && s.endsWith(BASE64_SENTINEL_SUFFIX)) {
+    return true;
+  }
+  if (s !== s.trim()) return true;
+  for (let i = 0; i < s.length; i++) {
+    const c = s.codePointAt(i);
+    if (c === 9 || c >= 32 && c <= 126) continue;
+    return true;
+  }
+  return false;
+}
+function utf8ToBase64(s) {
+  const bytes = new TextEncoder().encode(s);
+  let bin = "";
+  for (const b of bytes) bin += String.fromCodePoint(b);
+  return btoa(bin);
+}
+function encodeMcpParamValue(value) {
+  return needsBase64(value) ? `${BASE64_SENTINEL_PREFIX}${utf8ToBase64(value)}${BASE64_SENTINEL_SUFFIX}` : value;
+}
+function valueAtPath(root, path3) {
+  let node = root;
+  for (const key of path3) {
+    if (node === null || typeof node !== "object") return void 0;
+    node = node[key];
+  }
+  return node;
+}
+function buildMcpParamHeaders(declarations, args) {
+  const out = {};
+  for (const decl of declarations) {
+    const raw = valueAtPath(args, decl.path);
+    if (raw === void 0 || raw === null) continue;
+    const stringValue = mcpParamPrimitiveToString(raw);
+    if (stringValue === void 0) continue;
+    out[`${MCP_PARAM_HEADER_PREFIX}${decl.headerName}`] = encodeMcpParamValue(stringValue);
+  }
+  return out;
+}
+function mcpParamHeadersForTool(tool, args) {
+  const scan = scanXMcpHeaderDeclarations(tool.inputSchema);
+  if (!scan.valid || scan.declarations.length === 0) return {};
+  return buildMcpParamHeaders(scan.declarations, args);
+}
 
 // ../../core/mcp/messageTrackingTransport.ts
 var MessageTrackingTransport = class {
@@ -2967,7 +3034,9 @@ function getAuthorizationServerUrl(serverUrl, resourceMetadata) {
     return new URL("/", serverUrl);
   } catch (err) {
     const detail = err instanceof Error ? err.message : String(err);
-    throw new Error(`Invalid MCP server URL: "${serverUrl}" (${detail})`);
+    throw new Error(`Invalid MCP server URL: "${serverUrl}" (${detail})`, {
+      cause: err
+    });
   }
 }
 
@@ -4648,7 +4717,10 @@ var RemoteClientTransport = class {
       message,
       ...options?.relatedRequestId != null && {
         relatedRequestId: options.relatedRequestId
-      }
+      },
+      // Forward per-send `Mcp-Param-*` headers (SEP-2243) for the backend to
+      // apply to the upstream send; the browser can't set them cross-origin.
+      ...options?.headers != null && { headers: options.headers }
     };
     const res = await this.fetchFn(`${this.baseUrl}/api/mcp/send`, {
       method: "POST",
@@ -6898,6 +6970,43 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
       }
     }
   }
+  /**
+   * Coerce the string-valued entries of a tool's arguments to the types its
+   * `inputSchema` declares (the Tools form hands everything over as text).
+   * Shared by the two `tools/call` entry points — {@link attemptToolCall} and
+   * {@link callToolStream} — so both put the SAME arguments on the wire.
+   */
+  convertStringToolArgs(tool, args) {
+    const stringArgs = {};
+    for (const [key, value] of Object.entries(args)) {
+      if (typeof value === "string") {
+        stringArgs[key] = value;
+      }
+    }
+    if (Object.keys(stringArgs).length === 0) return args;
+    return { ...args, ...convertToolParameters(tool, stringArgs) };
+  }
+  /**
+   * SEP-2243: mirror `x-mcp-header`-annotated arguments into `Mcp-Param-*`
+   * headers on a modern connection. The SDK only does this inside
+   * `client.callTool()` (and skips it in the browser), but we route
+   * `tools/call` through `client.request()` for manual MRTR driving (#1704), so
+   * we mirror ourselves. `Protocol.request` forwards `headers` (preserved
+   * across MRTR retry legs) to the transport, and the remote transport relays
+   * them to the backend's upstream send — issued server-side, where the browser
+   * skip doesn't apply. No-op on legacy/stdio (no annotations).
+   *
+   * Applied by BOTH `tools/call` entry points: a plain call
+   * ({@link attemptToolCall}) and a task-augmented one
+   * ({@link callToolStream}) — a strict modern server rejects either with
+   * `-32020` when the mirrored header is missing.
+   */
+  applyMirroredParamHeaders(tool, convertedArgs, requestOptions) {
+    if (this.protocolEra !== "modern") return;
+    const paramHeaders = mcpParamHeadersForTool(tool, convertedArgs);
+    if (Object.keys(paramHeaders).length === 0) return;
+    requestOptions.headers = { ...requestOptions.headers, ...paramHeaders };
+  }
   /**
    * Run a single tools/call attempt: convert args, issue the request, validate,
    * and return a successful {@link ToolCallInvocation}. Throws on any error
@@ -6917,17 +7026,7 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
     if (!client) {
       throw new Error("Client is not connected");
     }
-    let convertedArgs = args;
-    const stringArgs = {};
-    for (const [key, value] of Object.entries(args)) {
-      if (typeof value === "string") {
-        stringArgs[key] = value;
-      }
-    }
-    if (Object.keys(stringArgs).length > 0) {
-      const convertedStringArgs = convertToolParameters(tool, stringArgs);
-      convertedArgs = { ...args, ...convertedStringArgs };
-    }
+    const convertedArgs = this.convertStringToolArgs(tool, args);
     const callMetadata = generalMetadata || toolSpecificMetadata ? { ...generalMetadata || {}, ...toolSpecificMetadata || {} } : void 0;
     const timestamp = /* @__PURE__ */ new Date();
     const metadata = this.mergeMeta(callMetadata);
@@ -6943,6 +7042,7 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
       metadata?.progressToken,
       signal
     );
+    this.applyMirroredParamHeaders(tool, convertedArgs, requestOptions);
     const rawResult = await this.invokeMcpClient(
       () => this.requestWithInputRequired(
         "tools/call",
@@ -7346,17 +7446,7 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
       throw new Error("Client is not connected");
     }
     try {
-      let convertedArgs = args;
-      const stringArgs = {};
-      for (const [key, value] of Object.entries(args)) {
-        if (typeof value === "string") {
-          stringArgs[key] = value;
-        }
-      }
-      if (Object.keys(stringArgs).length > 0) {
-        const convertedStringArgs = convertToolParameters(tool, stringArgs);
-        convertedArgs = { ...args, ...convertedStringArgs };
-      }
+      const convertedArgs = this.convertStringToolArgs(tool, args);
       const callMetadata = generalMetadata || toolSpecificMetadata ? { ...generalMetadata || {}, ...toolSpecificMetadata || {} } : void 0;
       const timestamp = /* @__PURE__ */ new Date();
       const metadata = this.mergeMeta(callMetadata);
@@ -7374,6 +7464,7 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
       let taskId;
       let error;
       const requestOptions = this.getRequestOptions(metadata?.progressToken);
+      this.applyMirroredParamHeaders(tool, convertedArgs, requestOptions);
       if (this.progress) {
         const innerOnProgress = requestOptions.onprogress;
         requestOptions.onprogress = (progress) => {
@@ -7479,7 +7570,8 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
           );
         } catch (resultError) {
           throw new Error(
-            `Tool call did not return a result: ${resultError instanceof Error ? resultError.message : String(resultError)}`
+            `Tool call did not return a result: ${resultError instanceof Error ? resultError.message : String(resultError)}`,
+            { cause: resultError }
           );
         }
       }
@@ -7622,7 +7714,8 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
       expandedUri = uriTemplate2.expand(params);
     } catch (error) {
       throw new Error(
-        `Failed to expand URI template "${uriTemplate}": ${error instanceof Error ? error.message : String(error)}`
+        `Failed to expand URI template "${uriTemplate}": ${error instanceof Error ? error.message : String(error)}`,
+        { cause: error }
       );
     }
     const readInvocation = await this.readResource(expandedUri, metadata);
@@ -7820,7 +7913,8 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
         return { values: [] };
       }
       throw new Error(
-        `Failed to get completions: ${error instanceof Error ? error.message : String(error)}`
+        `Failed to get completions: ${error instanceof Error ? error.message : String(error)}`,
+        { cause: error }
       );
     }
   }
@@ -8222,7 +8316,8 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
       this.dispatchSubscriptionsChange();
     } catch (error) {
       throw new Error(
-        `Failed to subscribe to resource: ${error instanceof Error ? error.message : String(error)}`
+        `Failed to subscribe to resource: ${error instanceof Error ? error.message : String(error)}`,
+        { cause: error }
       );
     }
   }
@@ -8266,7 +8361,8 @@ var InspectorClient = class _InspectorClient extends InspectorClientEventTarget
       }
     } catch (error) {
       throw new Error(
-        `Failed to unsubscribe from resource: ${error instanceof Error ? error.message : String(error)}`
+        `Failed to unsubscribe from resource: ${error instanceof Error ? error.message : String(error)}`,
+        { cause: error }
       );
     }
   }

package/clients/web/build/index.js

@@ -453,9 +453,13 @@ function loadMcpServersConfig(configPath, writable) {
     return { ...config, mcpServers: normalizedServers };
   } catch (error) {
     if (error instanceof Error) {
-      throw new Error(`Error loading configuration: ${error.message}`);
+      throw new Error(`Error loading configuration: ${error.message}`, {
+        cause: error
+      });
     }
-    throw new Error("Error loading configuration: Unknown error");
+    throw new Error("Error loading configuration: Unknown error", {
+      cause: error
+    });
   }
 }
 function loadServerFromConfig(configPath, serverName, writable) {
@@ -1507,6 +1511,9 @@ function createTransportNode(config, options = {}) {
   }
 }
 
+// ../../core/json/xMcpHeader.ts
+var MCP_PARAM_HEADER_PREFIX = "Mcp-Param-";
+
 // ../../core/mcp/import/clientConfig.ts
 function parseJsonObject(raw) {
   let data;
@@ -1514,7 +1521,7 @@ function parseJsonObject(raw) {
     data = JSON.parse(raw);
   } catch (err) {
     const detail = err instanceof Error ? err.message : String(err);
-    throw new Error(`Invalid JSON: ${detail}`);
+    throw new Error(`Invalid JSON: ${detail}`, { cause: err });
   }
   if (!data || typeof data !== "object" || Array.isArray(data)) {
     throw new Error("Expected a JSON object at the top level");
@@ -2347,6 +2354,16 @@ function requestIdForSendWait(message) {
   }
   return void 0;
 }
+function mcpParamHeadersOnly(headers) {
+  if (headers === null || typeof headers !== "object") return void 0;
+  const out = {};
+  for (const [key, value] of Object.entries(headers)) {
+    if (typeof value === "string" && key.toLowerCase().startsWith(MCP_PARAM_HEADER_PREFIX.toLowerCase())) {
+      out[key] = value;
+    }
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
+}
 function createRemoteApp(options) {
   const dangerouslyOmitAuth = !!options.dangerouslyOmitAuth;
   const authToken = dangerouslyOmitAuth ? "" : options.authToken || process.env[API_SERVER_ENV_VARS.AUTH_TOKEN] || randomBytes(32).toString("hex");
@@ -2554,7 +2571,7 @@ function createRemoteApp(options) {
     } catch {
       return c.json({ error: "Invalid JSON body" }, 400);
     }
-    const { sessionId, message, relatedRequestId } = body;
+    const { sessionId, message, relatedRequestId, headers } = body;
     if (!sessionId || !message) {
       return c.json({ error: "Missing sessionId or message" }, 400);
     }
@@ -2575,8 +2592,10 @@ function createRemoteApp(options) {
       });
     }
     try {
+      const paramHeaders = mcpParamHeadersOnly(headers);
       await session.transport.send(message, {
-        relatedRequestId
+        relatedRequestId,
+        ...paramHeaders && { headers: paramHeaders }
       });
       if (responseWait) {
         await responseWait;