@ai-sdk/openai 3.0.0-beta.54 → 3.0.0-beta.55

package/dist/internal/index.mjs

@@ -2559,6 +2559,19 @@ var openaiResponsesChunkSchema = lazySchema12(
               ])
             ).nullable(),
             status: z14.string()
+          }),
+          z14.object({
+            type: z14.literal("mcp_call"),
+            id: z14.string(),
+            status: z14.string()
+          }),
+          z14.object({
+            type: z14.literal("mcp_list_tools"),
+            id: z14.string()
+          }),
+          z14.object({
+            type: z14.literal("mcp_approval_request"),
+            id: z14.string()
           })
         ])
       }),
@@ -2660,6 +2673,52 @@ var openaiResponsesChunkSchema = lazySchema12(
             type: z14.literal("computer_call"),
             id: z14.string(),
             status: z14.literal("completed")
+          }),
+          z14.object({
+            type: z14.literal("mcp_call"),
+            id: z14.string(),
+            status: z14.string(),
+            arguments: z14.string(),
+            name: z14.string(),
+            server_label: z14.string(),
+            output: z14.string().nullish(),
+            error: z14.union([
+              z14.string(),
+              z14.object({
+                type: z14.string().optional(),
+                code: z14.union([z14.number(), z14.string()]).optional(),
+                message: z14.string().optional()
+              }).loose()
+            ]).nullish()
+          }),
+          z14.object({
+            type: z14.literal("mcp_list_tools"),
+            id: z14.string(),
+            server_label: z14.string(),
+            tools: z14.array(
+              z14.object({
+                name: z14.string(),
+                description: z14.string().optional(),
+                input_schema: z14.any(),
+                annotations: z14.record(z14.string(), z14.unknown()).optional()
+              })
+            ),
+            error: z14.union([
+              z14.string(),
+              z14.object({
+                type: z14.string().optional(),
+                code: z14.union([z14.number(), z14.string()]).optional(),
+                message: z14.string().optional()
+              }).loose()
+            ]).optional()
+          }),
+          z14.object({
+            type: z14.literal("mcp_approval_request"),
+            id: z14.string(),
+            server_label: z14.string(),
+            name: z14.string(),
+            arguments: z14.string(),
+            approval_request_id: z14.string()
           })
         ])
       }),
@@ -2915,6 +2974,52 @@ var openaiResponsesResponseSchema = lazySchema12(
                 text: z14.string()
               })
             )
+          }),
+          z14.object({
+            type: z14.literal("mcp_call"),
+            id: z14.string(),
+            status: z14.string(),
+            arguments: z14.string(),
+            name: z14.string(),
+            server_label: z14.string(),
+            output: z14.string().nullish(),
+            error: z14.union([
+              z14.string(),
+              z14.object({
+                type: z14.string().optional(),
+                code: z14.union([z14.number(), z14.string()]).optional(),
+                message: z14.string().optional()
+              }).loose()
+            ]).nullish()
+          }),
+          z14.object({
+            type: z14.literal("mcp_list_tools"),
+            id: z14.string(),
+            server_label: z14.string(),
+            tools: z14.array(
+              z14.object({
+                name: z14.string(),
+                description: z14.string().optional(),
+                input_schema: z14.any(),
+                annotations: z14.record(z14.string(), z14.unknown()).optional()
+              })
+            ),
+            error: z14.union([
+              z14.string(),
+              z14.object({
+                type: z14.string().optional(),
+                code: z14.union([z14.number(), z14.string()]).optional(),
+                message: z14.string().optional()
+              }).loose()
+            ]).optional()
+          }),
+          z14.object({
+            type: z14.literal("mcp_approval_request"),
+            id: z14.string(),
+            server_label: z14.string(),
+            name: z14.string(),
+            arguments: z14.string(),
+            approval_request_id: z14.string()
           })
         ])
       ),
@@ -3300,6 +3405,97 @@ var imageGeneration = (args = {}) => {
   return imageGenerationToolFactory(args);
 };
 
+// src/tool/mcp.ts
+import {
+  createProviderDefinedToolFactoryWithOutputSchema as createProviderDefinedToolFactoryWithOutputSchema7,
+  lazySchema as lazySchema19,
+  zodSchema as zodSchema19
+} from "@ai-sdk/provider-utils";
+import { z as z21 } from "zod/v4";
+var jsonValueSchema = z21.lazy(
+  () => z21.union([
+    z21.string(),
+    z21.number(),
+    z21.boolean(),
+    z21.null(),
+    z21.array(jsonValueSchema),
+    z21.record(z21.string(), jsonValueSchema)
+  ])
+);
+var mcpArgsSchema = lazySchema19(
+  () => zodSchema19(
+    z21.object({
+      serverLabel: z21.string(),
+      allowedTools: z21.union([
+        z21.array(z21.string()),
+        z21.object({
+          readOnly: z21.boolean().optional(),
+          toolNames: z21.array(z21.string()).optional()
+        })
+      ]).optional(),
+      authorization: z21.string().optional(),
+      connectorId: z21.string().optional(),
+      headers: z21.record(z21.string(), z21.string()).optional(),
+      // TODO: Integrate this MCP tool approval with our SDK's existing tool approval architecture
+      // requireApproval: z
+      //   .union([
+      //     z.enum(['always', 'never']),
+      //     z.object({
+      //       readOnly: z.boolean().optional(),
+      //       toolNames: z.array(z.string()).optional(),
+      //     }),
+      //   ])
+      //   .optional(),
+      serverDescription: z21.string().optional(),
+      serverUrl: z21.string().optional()
+    }).refine(
+      (v) => v.serverUrl != null || v.connectorId != null,
+      "One of serverUrl or connectorId must be provided."
+    )
+  )
+);
+var mcpInputSchema = lazySchema19(() => zodSchema19(z21.object({})));
+var mcpOutputSchema = lazySchema19(
+  () => zodSchema19(
+    z21.discriminatedUnion("type", [
+      z21.object({
+        type: z21.literal("call"),
+        serverLabel: z21.string(),
+        name: z21.string(),
+        arguments: z21.string(),
+        output: z21.string().nullable().optional(),
+        error: z21.union([z21.string(), jsonValueSchema]).optional()
+      }),
+      z21.object({
+        type: z21.literal("listTools"),
+        serverLabel: z21.string(),
+        tools: z21.array(
+          z21.object({
+            name: z21.string(),
+            description: z21.string().optional(),
+            inputSchema: jsonValueSchema,
+            annotations: z21.record(z21.string(), jsonValueSchema).optional()
+          })
+        ),
+        error: z21.union([z21.string(), jsonValueSchema]).optional()
+      }),
+      z21.object({
+        type: z21.literal("approvalRequest"),
+        serverLabel: z21.string(),
+        name: z21.string(),
+        arguments: z21.string(),
+        approvalRequestId: z21.string()
+      })
+    ])
+  )
+);
+var mcpToolFactory = createProviderDefinedToolFactoryWithOutputSchema7({
+  id: "openai.mcp",
+  name: "mcp",
+  inputSchema: mcpInputSchema,
+  outputSchema: mcpOutputSchema
+});
+
 // src/responses/openai-responses-prepare-tools.ts
 import { validateTypes as validateTypes2 } from "@ai-sdk/provider-utils";
 async function prepareResponsesTools({
@@ -3408,6 +3604,36 @@ async function prepareResponsesTools({
             });
             break;
           }
+          case "openai.mcp": {
+            const args = await validateTypes2({
+              value: tool.args,
+              schema: mcpArgsSchema
+            });
+            openaiTools.push({
+              type: "mcp",
+              server_label: args.serverLabel,
+              allowed_tools: Array.isArray(args.allowedTools) ? args.allowedTools : args.allowedTools ? {
+                read_only: args.allowedTools.readOnly,
+                tool_names: args.allowedTools.toolNames
+              } : void 0,
+              authorization: args.authorization,
+              connector_id: args.connectorId,
+              headers: args.headers,
+              // require_approval:
+              //   typeof args.requireApproval === 'string'
+              //     ? args.requireApproval
+              //     : args.requireApproval
+              //       ? {
+              //           read_only: args.requireApproval.readOnly,
+              //           tool_names: args.requireApproval.toolNames,
+              //         }
+              //       : undefined,
+              require_approval: "never",
+              server_description: args.serverDescription,
+              server_url: args.serverUrl
+            });
+            break;
+          }
         }
         break;
       }
@@ -3428,7 +3654,7 @@ async function prepareResponsesTools({
     case "tool":
       return {
         tools: openaiTools,
-        toolChoice: toolChoice.toolName === "code_interpreter" || toolChoice.toolName === "file_search" || toolChoice.toolName === "image_generation" || toolChoice.toolName === "web_search_preview" || toolChoice.toolName === "web_search" ? { type: toolChoice.toolName } : { type: "function", name: toolChoice.toolName },
+        toolChoice: toolChoice.toolName === "code_interpreter" || toolChoice.toolName === "file_search" || toolChoice.toolName === "image_generation" || toolChoice.toolName === "web_search_preview" || toolChoice.toolName === "web_search" || toolChoice.toolName === "mcp" ? { type: toolChoice.toolName } : { type: "function", name: toolChoice.toolName },
         toolWarnings
       };
     default: {
@@ -3858,6 +4084,80 @@ var OpenAIResponsesLanguageModel = class {
           });
           break;
         }
+        case "mcp_call": {
+          content.push({
+            type: "tool-call",
+            toolCallId: part.id,
+            toolName: "mcp",
+            input: JSON.stringify({}),
+            providerExecuted: true
+          });
+          content.push({
+            type: "tool-result",
+            toolCallId: part.id,
+            toolName: "mcp",
+            result: {
+              type: "call",
+              serverLabel: part.server_label,
+              name: part.name,
+              arguments: part.arguments,
+              ...part.output != null ? { output: part.output } : {},
+              ...part.error != null ? { error: part.error } : {}
+            }
+          });
+          break;
+        }
+        case "mcp_list_tools": {
+          content.push({
+            type: "tool-call",
+            toolCallId: part.id,
+            toolName: "mcp",
+            input: JSON.stringify({}),
+            providerExecuted: true
+          });
+          content.push({
+            type: "tool-result",
+            toolCallId: part.id,
+            toolName: "mcp",
+            result: {
+              type: "listTools",
+              serverLabel: part.server_label,
+              tools: part.tools.map((t) => {
+                var _a2, _b2;
+                return {
+                  name: t.name,
+                  description: (_a2 = t.description) != null ? _a2 : void 0,
+                  inputSchema: t.input_schema,
+                  annotations: (_b2 = t.annotations) != null ? _b2 : void 0
+                };
+              }),
+              ...part.error != null ? { error: part.error } : {}
+            }
+          });
+          break;
+        }
+        case "mcp_approval_request": {
+          content.push({
+            type: "tool-call",
+            toolCallId: part.id,
+            toolName: "mcp",
+            input: JSON.stringify({}),
+            providerExecuted: true
+          });
+          content.push({
+            type: "tool-result",
+            toolCallId: part.id,
+            toolName: "mcp",
+            result: {
+              type: "approvalRequest",
+              serverLabel: part.server_label,
+              name: part.name,
+              arguments: part.arguments,
+              approvalRequestId: part.approval_request_id
+            }
+          });
+          break;
+        }
         case "computer_call": {
           content.push({
             type: "tool-call",
@@ -4092,6 +4392,14 @@ var OpenAIResponsesLanguageModel = class {
                   input: "{}",
                   providerExecuted: true
                 });
+              } else if (value.item.type === "mcp_call" || value.item.type === "mcp_list_tools" || value.item.type === "mcp_approval_request") {
+                controller.enqueue({
+                  type: "tool-call",
+                  toolCallId: value.item.id,
+                  toolName: "mcp",
+                  input: "{}",
+                  providerExecuted: true
+                });
               } else if (value.item.type === "message") {
                 controller.enqueue({
                   type: "text-start",
@@ -4203,6 +4511,56 @@ var OpenAIResponsesLanguageModel = class {
                     result: value.item.result
                   }
                 });
+              } else if (value.item.type === "mcp_call") {
+                ongoingToolCalls[value.output_index] = void 0;
+                controller.enqueue({
+                  type: "tool-result",
+                  toolCallId: value.item.id,
+                  toolName: "mcp",
+                  result: {
+                    type: "call",
+                    serverLabel: value.item.server_label,
+                    name: value.item.name,
+                    arguments: value.item.arguments,
+                    ...value.item.output != null ? { output: value.item.output } : {},
+                    ...value.item.error != null ? { error: value.item.error } : {}
+                  }
+                });
+              } else if (value.item.type === "mcp_list_tools") {
+                ongoingToolCalls[value.output_index] = void 0;
+                controller.enqueue({
+                  type: "tool-result",
+                  toolCallId: value.item.id,
+                  toolName: "mcp",
+                  result: {
+                    type: "listTools",
+                    serverLabel: value.item.server_label,
+                    tools: value.item.tools.map((t) => {
+                      var _a2, _b2;
+                      return {
+                        name: t.name,
+                        description: (_a2 = t.description) != null ? _a2 : void 0,
+                        inputSchema: t.input_schema,
+                        annotations: (_b2 = t.annotations) != null ? _b2 : void 0
+                      };
+                    }),
+                    ...value.item.error != null ? { error: value.item.error } : {}
+                  }
+                });
+              } else if (value.item.type === "mcp_approval_request") {
+                ongoingToolCalls[value.output_index] = void 0;
+                controller.enqueue({
+                  type: "tool-result",
+                  toolCallId: value.item.id,
+                  toolName: "mcp",
+                  result: {
+                    type: "approvalRequest",
+                    serverLabel: value.item.server_label,
+                    name: value.item.name,
+                    arguments: value.item.arguments,
+                    approvalRequestId: value.item.approval_request_id
+                  }
+                });
               } else if (value.item.type === "local_shell_call") {
                 ongoingToolCalls[value.output_index] = void 0;
                 controller.enqueue({