@ai-sdk/mcp 2.0.4 → 2.0.6

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @ai-sdk/mcp
 
+## 2.0.6
+
+### Patch Changes
+
+- 3c30eb4: feat(mcp): expose a json-rpc message validator
+- Updated dependencies [c6f5e62]
+  - @ai-sdk/provider-utils@5.0.4
+
+## 2.0.5
+
+### Patch Changes
+
+- 8c616f0: feat(mcp): add maxRetries option for failed mcp tool calls
+- Updated dependencies [8c616f0]
+  - @ai-sdk/provider-utils@5.0.3
+
 ## 2.0.4
 
 ### Patch Changes

package/dist/index.d.ts

@@ -66,6 +66,7 @@ declare const JSONRPCMessageSchema: z.ZodUnion<readonly [z.ZodObject<{
     }, z.core.$strip>;
 }, z.core.$strict>]>;
 type JSONRPCMessage = z.infer<typeof JSONRPCMessageSchema>;
+declare function validateJSONRPCMessage(message: unknown): JSONRPCMessage;
 
 /**
  * OAuth 2.1 token response
@@ -600,6 +601,15 @@ interface MCPClientConfig {
     transport: MCPTransportConfig | MCPTransport;
     /** Optional callback for uncaught errors */
     onUncaughtError?: (error: unknown) => void;
+    /**
+     * Maximum number of retries for transient MCP tool call failures.
+     *
+     * Set to 0 to disable retries. Retries only apply to tools/call requests.
+     * JSON-RPC application errors, such as invalid params, are not retried.
+     *
+     * @default 0
+     */
+    maxRetries?: number;
     /**
      * Initialize result from a previous MCP session. When provided, the client
      * starts the transport and reuses this metadata without sending a new
@@ -752,4 +762,4 @@ declare function readMCPAppResource({ client, uri, options, }: {
     options?: RequestOptions;
 }): Promise<MCPAppResource>;
 
-export { type CallToolResult, type CompleteRequestParams, type CompleteResult, type Configuration, type ElicitResult, ElicitResultSchema, type ElicitationRequest, ElicitationRequestSchema, type InitializeResult, type JSONRPCError, type JSONRPCMessage, type JSONRPCNotification, type JSONRPCRequest, type JSONRPCResponse, type ListToolsResult, type MCPAppResource, type MCPAppResourceCSP, type MCPAppResourceMeta, type MCPClient, type ClientCapabilities as MCPClientCapabilities, type MCPClientConfig, type MCPTransport, MCP_APP_MIME_TYPE, type McpProviderMetadata, type OAuthAuthorizationServerInformation, type OAuthClientInformation, type OAuthClientMetadata, type OAuthClientProvider, type OAuthTokens, UnauthorizedError, auth, createMCPClient, type MCPClient as experimental_MCPClient, type ClientCapabilities as experimental_MCPClientCapabilities, type MCPClientConfig as experimental_MCPClientConfig, createMCPClient as experimental_createMCPClient, mcpAppClientCapabilities, readMCPAppResource, splitMCPAppTools };
+export { type CallToolResult, type CompleteRequestParams, type CompleteResult, type Configuration, type ElicitResult, ElicitResultSchema, type ElicitationRequest, ElicitationRequestSchema, type InitializeResult, type JSONRPCError, type JSONRPCMessage, type JSONRPCNotification, type JSONRPCRequest, type JSONRPCResponse, type ListToolsResult, type MCPAppResource, type MCPAppResourceCSP, type MCPAppResourceMeta, type MCPClient, type ClientCapabilities as MCPClientCapabilities, type MCPClientConfig, type MCPTransport, MCP_APP_MIME_TYPE, type McpProviderMetadata, type OAuthAuthorizationServerInformation, type OAuthClientInformation, type OAuthClientMetadata, type OAuthClientProvider, type OAuthTokens, UnauthorizedError, auth, createMCPClient, type MCPClient as experimental_MCPClient, type ClientCapabilities as experimental_MCPClientCapabilities, type MCPClientConfig as experimental_MCPClientConfig, createMCPClient as experimental_createMCPClient, mcpAppClientCapabilities, readMCPAppResource, splitMCPAppTools, validateJSONRPCMessage };

package/dist/index.js

@@ -1,50 +1,3 @@
-// src/tool/mcp-client.ts
-import {
-  asSchema,
-  dynamicTool,
-  jsonSchema,
-  safeParseJSON,
-  safeValidateTypes,
-  tool
-} from "@ai-sdk/provider-utils";
-
-// src/error/mcp-client-error.ts
-import { AISDKError } from "@ai-sdk/provider";
-var name = "AI_MCPClientError";
-var marker = `vercel.ai.error.${name}`;
-var symbol = Symbol.for(marker);
-var _a, _b;
-var MCPClientError = class extends (_b = AISDKError, _a = symbol, _b) {
-  constructor({
-    name: name3 = "MCPClientError",
-    message,
-    cause,
-    data,
-    code,
-    statusCode,
-    url,
-    responseBody
-  }) {
-    super({ name: name3, message, cause });
-    this[_a] = true;
-    this.data = data;
-    this.code = code;
-    this.statusCode = statusCode;
-    this.url = url;
-    this.responseBody = responseBody;
-  }
-  static isInstance(error) {
-    return AISDKError.hasMarker(error, marker);
-  }
-};
-
-// src/tool/mcp-sse-transport.ts
-import {
-  EventSourceParserStream,
-  withUserAgentSuffix,
-  getRuntimeEnvironmentUserAgent
-} from "@ai-sdk/provider-utils";
-
 // src/tool/json-rpc-message.ts
 import { parseJSON } from "@ai-sdk/provider-utils";
 import { z as z2 } from "zod/v4";
@@ -329,10 +282,61 @@ var JSONRPCMessageSchema = z2.union([
   JSONRPCResponseSchema,
   JSONRPCErrorSchema
 ]);
+function validateJSONRPCMessage(message) {
+  return JSONRPCMessageSchema.parse(message);
+}
 async function parseJSONRPCMessage(text) {
-  return JSONRPCMessageSchema.parse(await parseJSON({ text }));
+  return validateJSONRPCMessage(await parseJSON({ text }));
 }
 
+// src/tool/mcp-client.ts
+import {
+  asSchema,
+  dynamicTool,
+  jsonSchema,
+  retryWithExponentialBackoff,
+  safeParseJSON,
+  safeValidateTypes,
+  tool
+} from "@ai-sdk/provider-utils";
+
+// src/error/mcp-client-error.ts
+import { AISDKError } from "@ai-sdk/provider";
+var name = "AI_MCPClientError";
+var marker = `vercel.ai.error.${name}`;
+var symbol = Symbol.for(marker);
+var _a, _b;
+var MCPClientError = class extends (_b = AISDKError, _a = symbol, _b) {
+  constructor({
+    name: name3 = "MCPClientError",
+    message,
+    cause,
+    data,
+    code,
+    statusCode,
+    url,
+    responseBody
+  }) {
+    super({ name: name3, message, cause });
+    this[_a] = true;
+    this.data = data;
+    this.code = code;
+    this.statusCode = statusCode;
+    this.url = url;
+    this.responseBody = responseBody;
+  }
+  static isInstance(error) {
+    return AISDKError.hasMarker(error, marker);
+  }
+};
+
+// src/tool/mcp-sse-transport.ts
+import {
+  EventSourceParserStream,
+  withUserAgentSuffix,
+  getRuntimeEnvironmentUserAgent
+} from "@ai-sdk/provider-utils";
+
 // src/version.ts
 var VERSION = typeof __PACKAGE_VERSION__ !== "undefined" ? __PACKAGE_VERSION__ : "0.0.0-test";
 
@@ -1720,9 +1724,7 @@ var HttpMCPTransport = class {
         const contentType = response.headers.get("content-type") || "";
         if (contentType.includes("application/json")) {
           const data = await response.json();
-          const messages = Array.isArray(data) ? data.map(
-            (message2) => JSONRPCMessageSchema.parse(message2)
-          ) : [JSONRPCMessageSchema.parse(data)];
+          const messages = Array.isArray(data) ? data.map((message2) => validateJSONRPCMessage(message2)) : [validateJSONRPCMessage(data)];
           for (const jsonRpcMessage of messages) {
             (_d = this.onmessage) == null ? void 0 : _d.call(this, jsonRpcMessage);
           }
@@ -2042,6 +2044,55 @@ async function readMCPAppResource({
 
 // src/tool/mcp-client.ts
 var CLIENT_VERSION = "1.0.0";
+var DEFAULT_MAX_TOOL_CALL_RETRIES = 0;
+var DEFAULT_RETRY_ERROR_CODES = [
+  "ConnectionRefused",
+  "ConnectionClosed",
+  "FailedToOpenSocket",
+  "ECONNRESET",
+  "ECONNREFUSED",
+  "ETIMEDOUT",
+  "EPIPE"
+];
+function getErrorStatusCode(error) {
+  if (error != null && typeof error === "object" && "statusCode" in error && typeof error.statusCode === "number") {
+    return error.statusCode;
+  }
+  return void 0;
+}
+function getStringErrorCode(error) {
+  if (error != null && typeof error === "object" && "code" in error && typeof error.code === "string") {
+    return error.code;
+  }
+  return void 0;
+}
+function isRetryableMCPToolCallError(error) {
+  const statusCode = getErrorStatusCode(error);
+  if (statusCode != null) {
+    return statusCode === 408 || statusCode === 409 || statusCode === 429 || statusCode >= 500;
+  }
+  if (MCPClientError.isInstance(error) && error.code != null) {
+    return false;
+  }
+  const errorCode = getStringErrorCode(error);
+  return errorCode != null && DEFAULT_RETRY_ERROR_CODES.includes(errorCode);
+}
+function prepareMaxRetries(maxRetries) {
+  if (maxRetries == null) {
+    return DEFAULT_MAX_TOOL_CALL_RETRIES;
+  }
+  if (!Number.isInteger(maxRetries)) {
+    throw new MCPClientError({
+      message: "maxRetries must be an integer"
+    });
+  }
+  if (maxRetries < 0) {
+    throw new MCPClientError({
+      message: "maxRetries must be >= 0"
+    });
+  }
+  return maxRetries;
+}
 function mcpToModelOutput({
   output
 }) {
@@ -2078,6 +2129,7 @@ var DefaultMCPClient = class {
     clientName = name3 != null ? name3 : "ai-sdk-mcp-client",
     version = CLIENT_VERSION,
     onUncaughtError,
+    maxRetries,
     capabilities,
     initialInitializeResult
   }) {
@@ -2092,6 +2144,7 @@ var DefaultMCPClient = class {
     };
     this.isClosed = true;
     this.onUncaughtError = onUncaughtError;
+    this.maxRetries = prepareMaxRetries(maxRetries);
     this.clientCapabilities = capabilities != null ? capabilities : {};
     this.initialInitializeResult = initialInitializeResult;
     if (isCustomMcpTransport(transportConfig)) {
@@ -2295,16 +2348,39 @@ var DefaultMCPClient = class {
       options
     });
   }
+  async callToolWithRetry({
+    options,
+    execute
+  }) {
+    if (this.maxRetries === 0) {
+      return execute();
+    }
+    return retryWithExponentialBackoff({
+      maxRetries: this.maxRetries,
+      abortSignal: options == null ? void 0 : options.signal,
+      shouldRetry: isRetryableMCPToolCallError,
+      createRetryError: ({ message, errors }) => new MCPClientError({
+        message,
+        cause: errors[errors.length - 1]
+      })
+    })(execute);
+  }
   async callTool({
     name: name3,
     arguments: args = {},
     options
   }) {
     try {
-      return this.request({
-        request: { method: "tools/call", params: { name: name3, arguments: args } },
-        resultSchema: CallToolResultSchema,
-        options
+      return this.callToolWithRetry({
+        options,
+        execute: () => this.request({
+          request: {
+            method: "tools/call",
+            params: { name: name3, arguments: args }
+          },
+          resultSchema: CallToolResultSchema,
+          options
+        })
       });
     } catch (error) {
       throw error;
@@ -2678,6 +2754,7 @@ export {
   createMCPClient as experimental_createMCPClient,
   mcpAppClientCapabilities,
   readMCPAppResource,
-  splitMCPAppTools
+  splitMCPAppTools,
+  validateJSONRPCMessage
 };
 //# sourceMappingURL=index.js.map