@ai-sdk/mcp 1.0.3 → 1.0.5

package/dist/index.mjs

@@ -1,7 +1,10 @@
 // src/tool/mcp-client.ts
 import {
+  asSchema,
   dynamicTool,
   jsonSchema,
+  safeParseJSON,
+  safeValidateTypes,
   tool
 } from "@ai-sdk/provider-utils";
 
@@ -103,6 +106,10 @@ var ToolSchema = z.object({
     type: z.literal("object"),
     properties: z.optional(z.object({}).loose())
   }).loose(),
+  /**
+   * @see https://modelcontextprotocol.io/specification/2025-06-18/server/tools#output-schema
+   */
+  outputSchema: z.optional(z.object({}).loose()),
   annotations: z.optional(
     z.object({
       title: z.optional(z.string())
@@ -165,6 +172,10 @@ var CallToolResultSchema = ResultSchema.extend({
   content: z.array(
     z.union([TextContentSchema, ImageContentSchema, EmbeddedResourceSchema])
   ),
+  /**
+   * @see https://modelcontextprotocol.io/specification/2025-06-18/server/tools#structured-content
+   */
+  structuredContent: z.optional(z.unknown()),
   isError: z.boolean().default(false).optional()
 }).or(
   ResultSchema.extend({
@@ -1833,7 +1844,7 @@ var DefaultMCPClient = class {
   async tools({
     schemas = "automatic"
   } = {}) {
-    var _a3;
+    var _a3, _b3;
     const tools = {};
     try {
       const listToolsResult = await this.listTools();
@@ -1849,17 +1860,22 @@ var DefaultMCPClient = class {
           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();
-          return self.callTool({ name: name3, args, options });
+          const result = await self.callTool({ name: name3, args, options });
+          if (outputSchema != null) {
+            return self.extractStructuredContent(result, outputSchema, name3);
+          }
+          return result;
         };
         const toolWithExecute = schemas === "automatic" ? dynamicTool({
           description,
           title,
           inputSchema: jsonSchema({
             ...inputSchema,
-            properties: (_a3 = inputSchema.properties) != null ? _a3 : {},
+            properties: (_b3 = inputSchema.properties) != null ? _b3 : {},
             additionalProperties: false
           }),
           execute
@@ -1867,6 +1883,7 @@ var DefaultMCPClient = class {
           description,
           title,
           inputSchema: schemas[name3].inputSchema,
+          ...outputSchema != null ? { outputSchema } : {},
           execute
         });
         tools[name3] = { ...toolWithExecute, _meta };
@@ -1876,6 +1893,43 @@ var DefaultMCPClient = class {
       throw error;
     }
   }
+  /**
+   * Extracts and validates structuredContent from a tool result.
+   */
+  async extractStructuredContent(result, outputSchema, toolName) {
+    if ("structuredContent" in result && result.structuredContent != null) {
+      const validationResult = await safeValidateTypes({
+        value: result.structuredContent,
+        schema: asSchema(outputSchema)
+      });
+      if (!validationResult.success) {
+        throw new MCPClientError({
+          message: `Tool "${toolName}" returned structuredContent that does not match the expected outputSchema`,
+          cause: validationResult.error
+        });
+      }
+      return validationResult.value;
+    }
+    if ("content" in result && Array.isArray(result.content)) {
+      const textContent = result.content.find((c) => c.type === "text");
+      if (textContent && "text" in textContent) {
+        const parseResult = await safeParseJSON({
+          text: textContent.text,
+          schema: outputSchema
+        });
+        if (!parseResult.success) {
+          throw new MCPClientError({
+            message: `Tool "${toolName}" returned content that does not match the expected outputSchema`,
+            cause: parseResult.error
+          });
+        }
+        return parseResult.value;
+      }
+    }
+    throw new MCPClientError({
+      message: `Tool "${toolName}" did not return structuredContent or parseable text content`
+    });
+  }
   listResources({
     params,
     options