@ai-sdk/openai 3.0.0-beta.109 → 3.0.0-beta.110

package/dist/internal/index.js

@@ -283,6 +283,9 @@ function convertToOpenAIChatMessages({
       }
       case "tool": {
         for (const toolResponse of content) {
+          if (toolResponse.type === "tool-approval-response") {
+            continue;
+          }
           const output = toolResponse.output;
           let contentValue;
           switch (output.type) {
@@ -2689,6 +2692,9 @@ async function convertToOpenAIResponsesInput({
       }
       case "tool": {
         for (const part of content) {
+          if (part.type === "tool-approval-response") {
+            continue;
+          }
           const output = part.output;
           const resolvedToolName = toolNameMapping.toProviderToolName(
             part.toolName
@@ -3878,16 +3884,14 @@ var mcpArgsSchema = (0, import_provider_utils28.lazySchema)(
       authorization: import_v421.z.string().optional(),
       connectorId: import_v421.z.string().optional(),
       headers: import_v421.z.record(import_v421.z.string(), import_v421.z.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(),
+      requireApproval: import_v421.z.union([
+        import_v421.z.enum(["always", "never"]),
+        import_v421.z.object({
+          never: import_v421.z.object({
+            toolNames: import_v421.z.array(import_v421.z.string()).optional()
+          }).optional()
+        })
+      ]).optional(),
       serverDescription: import_v421.z.string().optional(),
       serverUrl: import_v421.z.string().optional()
     }).refine(
@@ -3899,36 +3903,14 @@ var mcpArgsSchema = (0, import_provider_utils28.lazySchema)(
 var mcpInputSchema = (0, import_provider_utils28.lazySchema)(() => (0, import_provider_utils28.zodSchema)(import_v421.z.object({})));
 var mcpOutputSchema = (0, import_provider_utils28.lazySchema)(
   () => (0, import_provider_utils28.zodSchema)(
-    import_v421.z.discriminatedUnion("type", [
-      import_v421.z.object({
-        type: import_v421.z.literal("call"),
-        serverLabel: import_v421.z.string(),
-        name: import_v421.z.string(),
-        arguments: import_v421.z.string(),
-        output: import_v421.z.string().nullable().optional(),
-        error: import_v421.z.union([import_v421.z.string(), jsonValueSchema]).optional()
-      }),
-      import_v421.z.object({
-        type: import_v421.z.literal("listTools"),
-        serverLabel: import_v421.z.string(),
-        tools: import_v421.z.array(
-          import_v421.z.object({
-            name: import_v421.z.string(),
-            description: import_v421.z.string().optional(),
-            inputSchema: jsonValueSchema,
-            annotations: import_v421.z.record(import_v421.z.string(), jsonValueSchema).optional()
-          })
-        ),
-        error: import_v421.z.union([import_v421.z.string(), jsonValueSchema]).optional()
-      }),
-      import_v421.z.object({
-        type: import_v421.z.literal("approvalRequest"),
-        serverLabel: import_v421.z.string(),
-        name: import_v421.z.string(),
-        arguments: import_v421.z.string(),
-        approvalRequestId: import_v421.z.string()
-      })
-    ])
+    import_v421.z.object({
+      type: import_v421.z.literal("call"),
+      serverLabel: import_v421.z.string(),
+      name: import_v421.z.string(),
+      arguments: import_v421.z.string(),
+      output: import_v421.z.string().nullable().optional(),
+      error: import_v421.z.union([import_v421.z.string(), jsonValueSchema]).optional()
+    })
   )
 );
 var mcpToolFactory = (0, import_provider_utils28.createProviderToolFactoryWithOutputSchema)({
@@ -4699,54 +4681,9 @@ var OpenAIResponsesLanguageModel = class {
           break;
         }
         case "mcp_list_tools": {
-          content.push({
-            type: "tool-call",
-            toolCallId: part.id,
-            toolName: toolNameMapping.toCustomToolName("mcp"),
-            input: JSON.stringify({}),
-            providerExecuted: true
-          });
-          content.push({
-            type: "tool-result",
-            toolCallId: part.id,
-            toolName: toolNameMapping.toCustomToolName("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: toolNameMapping.toCustomToolName("mcp"),
-            input: JSON.stringify({}),
-            providerExecuted: true
-          });
-          content.push({
-            type: "tool-result",
-            toolCallId: part.id,
-            toolName: toolNameMapping.toCustomToolName("mcp"),
-            result: {
-              type: "approvalRequest",
-              serverLabel: part.server_label,
-              name: part.name,
-              arguments: part.arguments,
-              approvalRequestId: part.approval_request_id
-            }
-          });
           break;
         }
         case "computer_call": {
@@ -5184,25 +5121,6 @@ var OpenAIResponsesLanguageModel = class {
                 });
               } else if (value.item.type === "mcp_list_tools") {
                 ongoingToolCalls[value.output_index] = void 0;
-                controller.enqueue({
-                  type: "tool-result",
-                  toolCallId: value.item.id,
-                  toolName: toolNameMapping.toCustomToolName("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 === "apply_patch_call") {
                 ongoingToolCalls[value.output_index] = void 0;
                 if (value.item.status === "completed") {
@@ -5223,18 +5141,6 @@ var OpenAIResponsesLanguageModel = class {
                 }
               } else if (value.item.type === "mcp_approval_request") {
                 ongoingToolCalls[value.output_index] = void 0;
-                controller.enqueue({
-                  type: "tool-result",
-                  toolCallId: value.item.id,
-                  toolName: toolNameMapping.toCustomToolName("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({