@ai-sdk/mcp 1.0.18 → 1.0.20

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @ai-sdk/mcp
 
+## 1.0.20
+
+### Patch Changes
+
+- 60ee2df: feat(mcp): expose serializable data from the server tools
+
+## 1.0.19
+
+### Patch Changes
+
+- Updated dependencies [7168375]
+  - @ai-sdk/provider@3.0.8
+  - @ai-sdk/provider-utils@4.0.14
+
 ## 1.0.18
 
 ### Patch Changes

package/dist/index.d.mts

@@ -291,6 +291,25 @@ type PaginatedRequest = Request & {
         cursor?: string;
     };
 };
+declare const ListToolsResultSchema: z.ZodObject<{
+    _meta: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;
+    nextCursor: z.ZodOptional<z.ZodString>;
+    tools: z.ZodArray<z.ZodObject<{
+        name: z.ZodString;
+        title: z.ZodOptional<z.ZodString>;
+        description: z.ZodOptional<z.ZodString>;
+        inputSchema: z.ZodObject<{
+            type: z.ZodLiteral<"object">;
+            properties: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;
+        }, z.core.$loose>;
+        outputSchema: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;
+        annotations: z.ZodOptional<z.ZodObject<{
+            title: z.ZodOptional<z.ZodString>;
+        }, z.core.$loose>>;
+        _meta: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+    }, z.core.$loose>>;
+}, z.core.$loose>;
+type ListToolsResult = z.infer<typeof ListToolsResultSchema>;
 declare const ListResourcesResultSchema: z.ZodObject<{
     _meta: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;
     nextCursor: z.ZodOptional<z.ZodString>;
@@ -447,6 +466,19 @@ interface MCPClient {
     tools<TOOL_SCHEMAS extends ToolSchemas = 'automatic'>(options?: {
         schemas?: TOOL_SCHEMAS;
     }): Promise<McpToolSet<TOOL_SCHEMAS>>;
+    /**
+     * Lists available tools from the MCP server.
+     */
+    listTools(options?: {
+        params?: PaginatedRequest['params'];
+        options?: RequestOptions;
+    }): Promise<ListToolsResult>;
+    /**
+     * Creates AI SDK tools from tool definitions.
+     */
+    toolsFromDefinitions<TOOL_SCHEMAS extends ToolSchemas = 'automatic'>(definitions: ListToolsResult, options?: {
+        schemas?: TOOL_SCHEMAS;
+    }): McpToolSet<TOOL_SCHEMAS>;
     listResources(options?: {
         params?: PaginatedRequest['params'];
         options?: RequestOptions;
@@ -471,4 +503,4 @@ interface MCPClient {
     close: () => Promise<void>;
 }
 
-export { type ElicitResult, ElicitResultSchema, type ElicitationRequest, ElicitationRequestSchema, type JSONRPCError, type JSONRPCMessage, type JSONRPCNotification, type JSONRPCRequest, type JSONRPCResponse, type MCPClient, type ClientCapabilities as MCPClientCapabilities, type MCPClientConfig, type MCPTransport, 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 };
+export { type ElicitResult, ElicitResultSchema, type ElicitationRequest, ElicitationRequestSchema, type JSONRPCError, type JSONRPCMessage, type JSONRPCNotification, type JSONRPCRequest, type JSONRPCResponse, type ListToolsResult, type MCPClient, type ClientCapabilities as MCPClientCapabilities, type MCPClientConfig, type MCPTransport, 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 };

package/dist/index.d.ts

@@ -291,6 +291,25 @@ type PaginatedRequest = Request & {
         cursor?: string;
     };
 };
+declare const ListToolsResultSchema: z.ZodObject<{
+    _meta: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;
+    nextCursor: z.ZodOptional<z.ZodString>;
+    tools: z.ZodArray<z.ZodObject<{
+        name: z.ZodString;
+        title: z.ZodOptional<z.ZodString>;
+        description: z.ZodOptional<z.ZodString>;
+        inputSchema: z.ZodObject<{
+            type: z.ZodLiteral<"object">;
+            properties: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;
+        }, z.core.$loose>;
+        outputSchema: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;
+        annotations: z.ZodOptional<z.ZodObject<{
+            title: z.ZodOptional<z.ZodString>;
+        }, z.core.$loose>>;
+        _meta: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+    }, z.core.$loose>>;
+}, z.core.$loose>;
+type ListToolsResult = z.infer<typeof ListToolsResultSchema>;
 declare const ListResourcesResultSchema: z.ZodObject<{
     _meta: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;
     nextCursor: z.ZodOptional<z.ZodString>;
@@ -447,6 +466,19 @@ interface MCPClient {
     tools<TOOL_SCHEMAS extends ToolSchemas = 'automatic'>(options?: {
         schemas?: TOOL_SCHEMAS;
     }): Promise<McpToolSet<TOOL_SCHEMAS>>;
+    /**
+     * Lists available tools from the MCP server.
+     */
+    listTools(options?: {
+        params?: PaginatedRequest['params'];
+        options?: RequestOptions;
+    }): Promise<ListToolsResult>;
+    /**
+     * Creates AI SDK tools from tool definitions.
+     */
+    toolsFromDefinitions<TOOL_SCHEMAS extends ToolSchemas = 'automatic'>(definitions: ListToolsResult, options?: {
+        schemas?: TOOL_SCHEMAS;
+    }): McpToolSet<TOOL_SCHEMAS>;
     listResources(options?: {
         params?: PaginatedRequest['params'];
         options?: RequestOptions;
@@ -471,4 +503,4 @@ interface MCPClient {
     close: () => Promise<void>;
 }
 
-export { type ElicitResult, ElicitResultSchema, type ElicitationRequest, ElicitationRequestSchema, type JSONRPCError, type JSONRPCMessage, type JSONRPCNotification, type JSONRPCRequest, type JSONRPCResponse, type MCPClient, type ClientCapabilities as MCPClientCapabilities, type MCPClientConfig, type MCPTransport, 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 };
+export { type ElicitResult, ElicitResultSchema, type ElicitationRequest, ElicitationRequestSchema, type JSONRPCError, type JSONRPCMessage, type JSONRPCNotification, type JSONRPCRequest, type JSONRPCResponse, type ListToolsResult, type MCPClient, type ClientCapabilities as MCPClientCapabilities, type MCPClientConfig, type MCPTransport, 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 };

package/dist/index.js

@@ -1791,15 +1791,11 @@ var DefaultMCPClient = class {
     params,
     options
   } = {}) {
-    try {
-      return this.request({
-        request: { method: "tools/list", params },
-        resultSchema: ListToolsResultSchema,
-        options
-      });
-    } catch (error) {
-      throw error;
-    }
+    return this.request({
+      request: { method: "tools/list", params },
+      resultSchema: ListToolsResultSchema,
+      options
+    });
   }
   async callTool({
     name: name3,
@@ -1896,63 +1892,68 @@ var DefaultMCPClient = class {
     await this.transport.send(jsonrpcNotification);
   }
   /**
-   * Returns a set of AI SDK tools from the MCP server
+   * Returns a set of AI SDK tools from the MCP server.
+   * This fetches tool definitions and wraps them with execute functions.
    * @returns A record of tool names to their implementations
    */
   async tools({
     schemas = "automatic"
   } = {}) {
+    const definitions = await this.listTools();
+    return this.toolsFromDefinitions(definitions, {
+      schemas
+    });
+  }
+  /**
+   * Creates AI SDK tools from tool definitions without fetching from the server.
+   */
+  toolsFromDefinitions(definitions, { schemas = "automatic" } = {}) {
     var _a3, _b3;
     const tools = {};
-    try {
-      const listToolsResult = await this.listTools();
-      for (const {
-        name: name3,
-        title,
-        description,
-        inputSchema,
-        annotations,
-        _meta
-      } of listToolsResult.tools) {
-        const resolvedTitle = title != null ? title : annotations == null ? void 0 : annotations.title;
-        if (schemas !== "automatic" && !(name3 in schemas)) {
-          continue;
-        }
-        const self = this;
-        const outputSchema = schemas !== "automatic" ? (_a3 = schemas[name3]) == null ? void 0 : _a3.outputSchema : void 0;
-        const execute = async (args, options) => {
-          var _a4;
-          (_a4 = options == null ? void 0 : options.abortSignal) == null ? void 0 : _a4.throwIfAborted();
-          const result = await self.callTool({ name: name3, args, options });
-          if (outputSchema != null) {
-            return self.extractStructuredContent(result, outputSchema, name3);
-          }
-          return result;
-        };
-        const toolWithExecute = schemas === "automatic" ? (0, import_provider_utils3.dynamicTool)({
-          description,
-          title: resolvedTitle,
-          inputSchema: (0, import_provider_utils3.jsonSchema)({
-            ...inputSchema,
-            properties: (_b3 = inputSchema.properties) != null ? _b3 : {},
-            additionalProperties: false
-          }),
-          execute,
-          toModelOutput: mcpToModelOutput
-        }) : (0, import_provider_utils3.tool)({
-          description,
-          title: resolvedTitle,
-          inputSchema: schemas[name3].inputSchema,
-          ...outputSchema != null ? { outputSchema } : {},
-          execute,
-          toModelOutput: mcpToModelOutput
-        });
-        tools[name3] = { ...toolWithExecute, _meta };
+    for (const {
+      name: name3,
+      title,
+      description,
+      inputSchema,
+      annotations,
+      _meta
+    } of definitions.tools) {
+      const resolvedTitle = title != null ? title : annotations == null ? void 0 : annotations.title;
+      if (schemas !== "automatic" && !(name3 in schemas)) {
+        continue;
       }
-      return tools;
-    } catch (error) {
-      throw error;
+      const self = this;
+      const outputSchema = schemas !== "automatic" ? (_a3 = schemas[name3]) == null ? void 0 : _a3.outputSchema : void 0;
+      const execute = async (args, options) => {
+        var _a4;
+        (_a4 = options == null ? void 0 : options.abortSignal) == null ? void 0 : _a4.throwIfAborted();
+        const result = await self.callTool({ name: name3, args, options });
+        if (outputSchema != null) {
+          return self.extractStructuredContent(result, outputSchema, name3);
+        }
+        return result;
+      };
+      const toolWithExecute = schemas === "automatic" ? (0, import_provider_utils3.dynamicTool)({
+        description,
+        title: resolvedTitle,
+        inputSchema: (0, import_provider_utils3.jsonSchema)({
+          ...inputSchema,
+          properties: (_b3 = inputSchema.properties) != null ? _b3 : {},
+          additionalProperties: false
+        }),
+        execute,
+        toModelOutput: mcpToModelOutput
+      }) : (0, import_provider_utils3.tool)({
+        description,
+        title: resolvedTitle,
+        inputSchema: schemas[name3].inputSchema,
+        ...outputSchema != null ? { outputSchema } : {},
+        execute,
+        toModelOutput: mcpToModelOutput
+      });
+      tools[name3] = { ...toolWithExecute, _meta };
     }
+    return tools;
   }
   /**
    * Extracts and validates structuredContent from a tool result.