@ai-sdk/mcp 1.0.4 → 1.0.6

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @ai-sdk/mcp
 
+## 1.0.6
+
+### Patch Changes
+
+- Updated dependencies [34d1c8a]
+  - @ai-sdk/provider-utils@4.0.5
+
+## 1.0.5
+
+### Patch Changes
+
+- 9cc0f88: feat(mcp): add support for structuredContent / outputSchema for typed tool outputs
+
 ## 1.0.4
 
 ### Patch Changes

package/dist/index.d.mts

@@ -247,18 +247,23 @@ declare const ToolMetaSchema: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknow
 type ToolMeta = z.infer<typeof ToolMetaSchema>;
 type ToolSchemas = Record<string, {
     inputSchema: FlexibleSchema<JSONObject | unknown>;
+    outputSchema?: FlexibleSchema<JSONObject | unknown>;
 }> | 'automatic' | undefined;
 /** Base MCP tool type with execute and _meta */
-type McpToolBase<INPUT = unknown> = Tool<INPUT, CallToolResult> & Required<Pick<Tool<INPUT, CallToolResult>, 'execute'>> & {
+type McpToolBase<INPUT = unknown, OUTPUT = CallToolResult> = Tool<INPUT, OUTPUT> & Required<Pick<Tool<INPUT, OUTPUT>, 'execute'>> & {
     _meta?: ToolMeta;
 };
 type McpToolSet<TOOL_SCHEMAS extends ToolSchemas = 'automatic'> = TOOL_SCHEMAS extends Record<string, {
     inputSchema: FlexibleSchema<any>;
+    outputSchema?: FlexibleSchema<any>;
 }> ? {
     [K in keyof TOOL_SCHEMAS]: TOOL_SCHEMAS[K] extends {
         inputSchema: FlexibleSchema<infer INPUT>;
-    } ? McpToolBase<INPUT> : never;
-} : Record<string, McpToolBase<unknown>>;
+        outputSchema: FlexibleSchema<infer OUTPUT>;
+    } ? McpToolBase<INPUT, OUTPUT> : TOOL_SCHEMAS[K] extends {
+        inputSchema: FlexibleSchema<infer INPUT>;
+    } ? McpToolBase<INPUT, CallToolResult> : never;
+} : Record<string, McpToolBase<unknown, CallToolResult>>;
 declare const BaseParamsSchema: z.ZodObject<{
     _meta: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;
 }, z.core.$loose>;
@@ -324,6 +329,7 @@ declare const CallToolResultSchema: z.ZodUnion<[z.ZodObject<{
             blob: z.ZodBase64;
         }, z.core.$loose>]>;
     }, z.core.$loose>]>>;
+    structuredContent: z.ZodOptional<z.ZodUnknown>;
     isError: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
 }, z.core.$loose>, z.ZodObject<{
     _meta: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;

package/dist/index.d.ts

@@ -247,18 +247,23 @@ declare const ToolMetaSchema: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknow
 type ToolMeta = z.infer<typeof ToolMetaSchema>;
 type ToolSchemas = Record<string, {
     inputSchema: FlexibleSchema<JSONObject | unknown>;
+    outputSchema?: FlexibleSchema<JSONObject | unknown>;
 }> | 'automatic' | undefined;
 /** Base MCP tool type with execute and _meta */
-type McpToolBase<INPUT = unknown> = Tool<INPUT, CallToolResult> & Required<Pick<Tool<INPUT, CallToolResult>, 'execute'>> & {
+type McpToolBase<INPUT = unknown, OUTPUT = CallToolResult> = Tool<INPUT, OUTPUT> & Required<Pick<Tool<INPUT, OUTPUT>, 'execute'>> & {
     _meta?: ToolMeta;
 };
 type McpToolSet<TOOL_SCHEMAS extends ToolSchemas = 'automatic'> = TOOL_SCHEMAS extends Record<string, {
     inputSchema: FlexibleSchema<any>;
+    outputSchema?: FlexibleSchema<any>;
 }> ? {
     [K in keyof TOOL_SCHEMAS]: TOOL_SCHEMAS[K] extends {
         inputSchema: FlexibleSchema<infer INPUT>;
-    } ? McpToolBase<INPUT> : never;
-} : Record<string, McpToolBase<unknown>>;
+        outputSchema: FlexibleSchema<infer OUTPUT>;
+    } ? McpToolBase<INPUT, OUTPUT> : TOOL_SCHEMAS[K] extends {
+        inputSchema: FlexibleSchema<infer INPUT>;
+    } ? McpToolBase<INPUT, CallToolResult> : never;
+} : Record<string, McpToolBase<unknown, CallToolResult>>;
 declare const BaseParamsSchema: z.ZodObject<{
     _meta: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;
 }, z.core.$loose>;
@@ -324,6 +329,7 @@ declare const CallToolResultSchema: z.ZodUnion<[z.ZodObject<{
             blob: z.ZodBase64;
         }, z.core.$loose>]>;
     }, z.core.$loose>]>>;
+    structuredContent: z.ZodOptional<z.ZodUnknown>;
     isError: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
 }, z.core.$loose>, z.ZodObject<{
     _meta: z.ZodOptional<z.ZodObject<{}, z.core.$loose>>;

package/dist/index.js

@@ -136,6 +136,10 @@ var ToolSchema = import_v4.z.object({
     type: import_v4.z.literal("object"),
     properties: import_v4.z.optional(import_v4.z.object({}).loose())
   }).loose(),
+  /**
+   * @see https://modelcontextprotocol.io/specification/2025-06-18/server/tools#output-schema
+   */
+  outputSchema: import_v4.z.optional(import_v4.z.object({}).loose()),
   annotations: import_v4.z.optional(
     import_v4.z.object({
       title: import_v4.z.optional(import_v4.z.string())
@@ -198,6 +202,10 @@ var CallToolResultSchema = ResultSchema.extend({
   content: import_v4.z.array(
     import_v4.z.union([TextContentSchema, ImageContentSchema, EmbeddedResourceSchema])
   ),
+  /**
+   * @see https://modelcontextprotocol.io/specification/2025-06-18/server/tools#structured-content
+   */
+  structuredContent: import_v4.z.optional(import_v4.z.unknown()),
   isError: import_v4.z.boolean().default(false).optional()
 }).or(
   ResultSchema.extend({
@@ -1862,7 +1870,7 @@ var DefaultMCPClient = class {
   async tools({
     schemas = "automatic"
   } = {}) {
-    var _a3;
+    var _a3, _b3;
     const tools = {};
     try {
       const listToolsResult = await this.listTools();
@@ -1878,17 +1886,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" ? (0, import_provider_utils3.dynamicTool)({
           description,
           title,
           inputSchema: (0, import_provider_utils3.jsonSchema)({
             ...inputSchema,
-            properties: (_a3 = inputSchema.properties) != null ? _a3 : {},
+            properties: (_b3 = inputSchema.properties) != null ? _b3 : {},
             additionalProperties: false
           }),
           execute
@@ -1896,6 +1909,7 @@ var DefaultMCPClient = class {
           description,
           title,
           inputSchema: schemas[name3].inputSchema,
+          ...outputSchema != null ? { outputSchema } : {},
           execute
         });
         tools[name3] = { ...toolWithExecute, _meta };
@@ -1905,6 +1919,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 (0, import_provider_utils3.safeValidateTypes)({
+        value: result.structuredContent,
+        schema: (0, import_provider_utils3.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 (0, import_provider_utils3.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