@mcp-use/client 2.4.3 → 2.4.4-canary.1

package/dist/index.js

@@ -446,6 +446,95 @@ var init_json_schema_validator = __esm({
   }
 });
 
+// src/transport/mcp-param-headers.ts
+function sdkMirrorsMcpParamHeaders() {
+  const g = globalThis;
+  return g.window === void 0 || g.document === void 0;
+}
+function collectDeclarations(schema, path2, seen, out) {
+  if (schema === null || typeof schema !== "object") return;
+  const node = schema;
+  const headerName = node[X_MCP_HEADER_KEY];
+  if (path2.length > 0 && typeof headerName === "string" && RFC9110_TOKEN.test(headerName) && typeof node.type === "string" && PERMITTED_TYPES.has(node.type) && !seen.has(headerName.toLowerCase())) {
+    seen.add(headerName.toLowerCase());
+    out.push({ path: path2, headerName });
+  }
+  const properties = node.properties;
+  if (properties !== null && typeof properties === "object") {
+    for (const [key, child] of Object.entries(properties)) {
+      collectDeclarations(child, [...path2, key], seen, out);
+    }
+  }
+}
+function valueAtPath(root, path2) {
+  let node = root;
+  for (const key of path2) {
+    if (node === null || typeof node !== "object") return void 0;
+    node = node[key];
+  }
+  return node;
+}
+function primitiveToString(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(value) {
+  if (value.length === 0) return true;
+  if (value.startsWith(BASE64_SENTINEL_PREFIX) && value.endsWith(BASE64_SENTINEL_SUFFIX)) {
+    return true;
+  }
+  if (value !== value.trim()) return true;
+  for (let i = 0; i < value.length; i++) {
+    const code = value.charCodeAt(i);
+    if (code === 9 || code >= 32 && code <= 126) continue;
+    return true;
+  }
+  return false;
+}
+function utf8ToBase64(value) {
+  let binary = "";
+  for (const byte of new TextEncoder().encode(value)) {
+    binary += String.fromCharCode(byte);
+  }
+  return btoa(binary);
+}
+function encodeValue(value) {
+  return needsBase64(value) ? `${BASE64_SENTINEL_PREFIX}${utf8ToBase64(value)}${BASE64_SENTINEL_SUFFIX}` : value;
+}
+function buildMcpParamHeaders(inputSchema, args) {
+  const declarations = [];
+  collectDeclarations(inputSchema, [], /* @__PURE__ */ new Set(), declarations);
+  const headers = {};
+  for (const { path: path2, headerName } of declarations) {
+    const raw = valueAtPath(args, path2);
+    if (raw === void 0 || raw === null) continue;
+    const value = primitiveToString(raw);
+    if (value === void 0) continue;
+    headers[`${MCP_PARAM_HEADER_PREFIX}${headerName}`] = encodeValue(value);
+  }
+  return headers;
+}
+var MCP_PARAM_HEADER_PREFIX, X_MCP_HEADER_KEY, RFC9110_TOKEN, PERMITTED_TYPES, BASE64_SENTINEL_PREFIX, BASE64_SENTINEL_SUFFIX;
+var init_mcp_param_headers = __esm({
+  "src/transport/mcp-param-headers.ts"() {
+    "use strict";
+    MCP_PARAM_HEADER_PREFIX = "Mcp-Param-";
+    X_MCP_HEADER_KEY = "x-mcp-header";
+    RFC9110_TOKEN = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
+    PERMITTED_TYPES = /* @__PURE__ */ new Set(["string", "integer", "boolean", "number"]);
+    BASE64_SENTINEL_PREFIX = "=?base64?";
+    BASE64_SENTINEL_SUFFIX = "?=";
+  }
+});
+
 // src/transport/base.ts
 var passthroughResultSchema, BaseConnector;
 var init_base = __esm({
@@ -454,6 +543,7 @@ var init_base = __esm({
     init_logging();
     init_flow();
     init_connector_telemetry();
+    init_mcp_param_headers();
     passthroughResultSchema = {
       "~standard": {
         version: 1,
@@ -913,7 +1003,7 @@ var init_base = __esm({
         if (!this.client) {
           throw new Error("MCP client is not connected");
         }
-        const enhancedOptions = options ? { ...options } : void 0;
+        let enhancedOptions = options ? { ...options } : void 0;
         if (enhancedOptions?.resetTimeoutOnProgress && !enhancedOptions.onprogress) {
           enhancedOptions.onprogress = () => {
           };
@@ -921,6 +1011,16 @@ var init_base = __esm({
             `[BaseConnector] Added onprogress callback for tool '${name}' to enable progressToken`
           );
         }
+        if (this.protocolEra === "modern" && !sdkMirrorsMcpParamHeaders()) {
+          const tool = this.toolsCache?.find((t) => t.name === name);
+          const paramHeaders = tool ? buildMcpParamHeaders(tool.inputSchema, args) : {};
+          if (Object.keys(paramHeaders).length > 0) {
+            enhancedOptions = {
+              ...enhancedOptions,
+              headers: { ...enhancedOptions?.headers, ...paramHeaders }
+            };
+          }
+        }
         logger.debug(`Calling tool '${name}' with args`, args);
         const res = await this.executeRequest(
           () => this.client.callTool({ name, arguments: args }, enhancedOptions)
@@ -1559,7 +1659,7 @@ init_connector_telemetry();
 init_logging();
 
 // src/utils/version.ts
-var VERSION = "2.4.3";
+var VERSION = "2.4.4-canary.1";
 function getPackageVersion() {
   return VERSION;
 }
@@ -2297,7 +2397,11 @@ var OAuthSessionStore = class _OAuthSessionStore {
       if (legacyData) {
         try {
           const legacyValue = JSON.parse(legacyData);
-          if (!legacyValue.issuer || legacyValue.issuer === ctx.issuer) {
+          if (typeof legacyValue.issuer !== "string" || !legacyValue.issuer.trim()) {
+            await this.store.remove(legacyKey);
+            return void 0;
+          }
+          if (legacyValue.issuer === ctx.issuer) {
             const migratedValue = {
               ...legacyValue,
               issuer: ctx.issuer
@@ -2315,7 +2419,12 @@ var OAuthSessionStore = class _OAuthSessionStore {
     }
     if (!data) return void 0;
     try {
-      return { key, value: JSON.parse(data) };
+      const value = JSON.parse(data);
+      if (typeof value?.issuer !== "string" || !value.issuer.trim() || ctx && value.issuer !== ctx.issuer) {
+        await this.store.remove(key);
+        return void 0;
+      }
+      return { key, value };
     } catch (e) {
       console.warn(
         `[${this.storageKeyPrefix}] Failed to parse ${kind.replace("_", " ")}:`,
@@ -2984,6 +3093,7 @@ import {
   discoverOAuthProtectedResourceMetadata,
   SdkError,
   SdkHttpError,
+  selectResourceURL,
   StreamableHTTPClientTransport,
   UnauthorizedError as UnauthorizedError2
 } from "@modelcontextprotocol/client";
@@ -3156,19 +3266,20 @@ var HttpConnector = class extends BaseConnector {
     await this.completeInteractiveAuthorization();
   }
   async discoverAuthorization() {
-    if (!this.detectMixedAuth || !this.oauthProvider || this.hadAccessTokenAtConnect) {
+    const provider = this.oauthProvider;
+    if (!this.detectMixedAuth || !provider || this.hadAccessTokenAtConnect) {
       return this.authorizationCache;
     }
     if (this.authorizationDiscovery) return this.authorizationDiscovery;
-    this.authorizationDiscovery = this.discoverMixedAuthorization().then(
-      (authorization) => {
-        if (!authorization) this.authorizationDiscovery = null;
-        return authorization;
-      }
-    );
+    this.authorizationDiscovery = this.discoverMixedAuthorization(
+      provider
+    ).then((authorization) => {
+      if (!authorization) this.authorizationDiscovery = null;
+      return authorization;
+    });
     return this.authorizationDiscovery;
   }
-  async discoverMixedAuthorization() {
+  async discoverMixedAuthorization(provider) {
     const controller = new AbortController();
     let timeout;
     const discoveryTimeout = new Promise((_, reject) => {
@@ -3190,6 +3301,7 @@ var HttpConnector = class extends BaseConnector {
         ),
         discoveryTimeout
       ]);
+      await selectResourceURL(this.baseUrl, provider, metadata);
       this.authorizationCache = {
         mode: "mixed",
         authenticated: false,