@ai-sdk/openai 3.0.0 → 3.0.2

package/dist/index.js

@@ -2307,7 +2307,7 @@ var mcpOutputSchema = (0, import_provider_utils22.lazySchema)(
       serverLabel: import_v417.z.string(),
       name: import_v417.z.string(),
       arguments: import_v417.z.string(),
-      output: import_v417.z.string().nullable().optional(),
+      output: import_v417.z.string().nullish(),
       error: import_v417.z.union([import_v417.z.string(), jsonValueSchema]).optional()
     })
   )
@@ -2478,9 +2478,10 @@ async function convertToOpenAIResponsesInput({
   hasShellTool = false,
   hasApplyPatchTool = false
 }) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const input = [];
   const warnings = [];
+  const processedApprovalIds = /* @__PURE__ */ new Set();
   for (const { role, content } of prompt) {
     switch (role) {
       case "system": {
@@ -2571,10 +2572,13 @@ async function convertToOpenAIResponsesInput({
               break;
             }
             case "tool-call": {
+              const id = (_g = (_d = (_c = part.providerOptions) == null ? void 0 : _c.openai) == null ? void 0 : _d.itemId) != null ? _g : (_f = (_e = part.providerMetadata) == null ? void 0 : _e.openai) == null ? void 0 : _f.itemId;
               if (part.providerExecuted) {
+                if (store && id != null) {
+                  input.push({ type: "item_reference", id });
+                }
                 break;
               }
-              const id = (_d = (_c = part.providerOptions) == null ? void 0 : _c.openai) == null ? void 0 : _d.itemId;
               if (store && id != null) {
                 input.push({ type: "item_reference", id });
                 break;
@@ -2631,8 +2635,12 @@ async function convertToOpenAIResponsesInput({
             }
             // assistant tool result parts are from provider-executed tools:
             case "tool-result": {
+              if (part.output.type === "execution-denied" || part.output.type === "json" && typeof part.output.value === "object" && part.output.value != null && "type" in part.output.value && part.output.value.type === "execution-denied") {
+                break;
+              }
               if (store) {
-                input.push({ type: "item_reference", id: part.toolCallId });
+                const itemId = (_j = (_i = (_h = part.providerMetadata) == null ? void 0 : _h.openai) == null ? void 0 : _i.itemId) != null ? _j : part.toolCallId;
+                input.push({ type: "item_reference", id: itemId });
               } else {
                 warnings.push({
                   type: "other",
@@ -2702,9 +2710,31 @@ async function convertToOpenAIResponsesInput({
       case "tool": {
         for (const part of content) {
           if (part.type === "tool-approval-response") {
+            const approvalResponse = part;
+            if (processedApprovalIds.has(approvalResponse.approvalId)) {
+              continue;
+            }
+            processedApprovalIds.add(approvalResponse.approvalId);
+            if (store) {
+              input.push({
+                type: "item_reference",
+                id: approvalResponse.approvalId
+              });
+            }
+            input.push({
+              type: "mcp_approval_response",
+              approval_request_id: approvalResponse.approvalId,
+              approve: approvalResponse.approved
+            });
             continue;
           }
           const output = part.output;
+          if (output.type === "execution-denied") {
+            const approvalId = (_l = (_k = output.providerOptions) == null ? void 0 : _k.openai) == null ? void 0 : _l.approvalId;
+            if (approvalId) {
+              continue;
+            }
+          }
           const resolvedToolName = toolNameMapping.toProviderToolName(
             part.toolName
           );
@@ -2759,7 +2789,7 @@ async function convertToOpenAIResponsesInput({
               contentValue = output.value;
               break;
             case "execution-denied":
-              contentValue = (_e = output.reason) != null ? _e : "Tool execution denied.";
+              contentValue = (_m = output.reason) != null ? _m : "Tool execution denied.";
               break;
             case "json":
             case "error-json":
@@ -2934,7 +2964,8 @@ var openaiResponsesChunkSchema = (0, import_provider_utils24.lazySchema)(
           import_v419.z.object({
             type: import_v419.z.literal("mcp_call"),
             id: import_v419.z.string(),
-            status: import_v419.z.string()
+            status: import_v419.z.string(),
+            approval_request_id: import_v419.z.string().nullish()
           }),
           import_v419.z.object({
             type: import_v419.z.literal("mcp_list_tools"),
@@ -3091,7 +3122,8 @@ var openaiResponsesChunkSchema = (0, import_provider_utils24.lazySchema)(
                 code: import_v419.z.union([import_v419.z.number(), import_v419.z.string()]).optional(),
                 message: import_v419.z.string().optional()
               }).loose()
-            ]).nullish()
+            ]).nullish(),
+            approval_request_id: import_v419.z.string().nullish()
           }),
           import_v419.z.object({
             type: import_v419.z.literal("mcp_list_tools"),
@@ -3120,7 +3152,7 @@ var openaiResponsesChunkSchema = (0, import_provider_utils24.lazySchema)(
             server_label: import_v419.z.string(),
             name: import_v419.z.string(),
             arguments: import_v419.z.string(),
-            approval_request_id: import_v419.z.string()
+            approval_request_id: import_v419.z.string().optional()
           }),
           import_v419.z.object({
             type: import_v419.z.literal("apply_patch_call"),
@@ -3443,7 +3475,8 @@ var openaiResponsesResponseSchema = (0, import_provider_utils24.lazySchema)(
                 code: import_v419.z.union([import_v419.z.number(), import_v419.z.string()]).optional(),
                 message: import_v419.z.string().optional()
               }).loose()
-            ]).nullish()
+            ]).nullish(),
+            approval_request_id: import_v419.z.string().nullish()
           }),
           import_v419.z.object({
             type: import_v419.z.literal("mcp_list_tools"),
@@ -3472,7 +3505,7 @@ var openaiResponsesResponseSchema = (0, import_provider_utils24.lazySchema)(
             server_label: import_v419.z.string(),
             name: import_v419.z.string(),
             arguments: import_v419.z.string(),
-            approval_request_id: import_v419.z.string()
+            approval_request_id: import_v419.z.string().optional()
           }),
           import_v419.z.object({
             type: import_v419.z.literal("apply_patch_call"),
@@ -3873,6 +3906,11 @@ async function prepareResponsesTools({
               value: tool.args,
               schema: mcpArgsSchema
             });
+            const mapApprovalFilter = (filter) => ({
+              tool_names: filter.toolNames
+            });
+            const requireApproval = args.requireApproval;
+            const requireApprovalParam = requireApproval == null ? void 0 : typeof requireApproval === "string" ? requireApproval : requireApproval.never != null ? { never: mapApprovalFilter(requireApproval.never) } : void 0;
             openaiTools2.push({
               type: "mcp",
               server_label: args.serverLabel,
@@ -3883,7 +3921,7 @@ async function prepareResponsesTools({
               authorization: args.authorization,
               connector_id: args.connectorId,
               headers: args.headers,
-              require_approval: "never",
+              require_approval: requireApprovalParam != null ? requireApprovalParam : "never",
               server_description: args.serverDescription,
               server_url: args.serverUrl
             });
@@ -3925,6 +3963,21 @@ async function prepareResponsesTools({
 }
 
 // src/responses/openai-responses-language-model.ts
+function extractApprovalRequestIdToToolCallIdMapping(prompt) {
+  var _a, _b;
+  const mapping = {};
+  for (const message of prompt) {
+    if (message.role !== "assistant") continue;
+    for (const part of message.content) {
+      if (part.type !== "tool-call") continue;
+      const approvalRequestId = (_b = (_a = part.providerOptions) == null ? void 0 : _a.openai) == null ? void 0 : _b.approvalRequestId;
+      if (approvalRequestId != null) {
+        mapping[approvalRequestId] = part.toolCallId;
+      }
+    }
+  }
+  return mapping;
+}
 var OpenAIResponsesLanguageModel = class {
   constructor(modelId, config) {
     this.specificationVersion = "v3";
@@ -4160,7 +4213,7 @@ var OpenAIResponsesLanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E;
     const {
       args: body,
       warnings,
@@ -4172,6 +4225,7 @@ var OpenAIResponsesLanguageModel = class {
       modelId: this.modelId
     });
     const providerKey = this.config.provider.replace(".responses", "");
+    const approvalRequestIdToDummyToolCallIdFromPrompt = extractApprovalRequestIdToToolCallIdMapping(options.prompt);
     const {
       responseHeaders,
       value: response,
@@ -4388,17 +4442,20 @@ var OpenAIResponsesLanguageModel = class {
           break;
         }
         case "mcp_call": {
+          const toolCallId = part.approval_request_id != null ? (_v = approvalRequestIdToDummyToolCallIdFromPrompt[part.approval_request_id]) != null ? _v : part.id : part.id;
+          const toolName = `mcp.${part.name}`;
           content.push({
             type: "tool-call",
-            toolCallId: part.id,
-            toolName: toolNameMapping.toCustomToolName("mcp"),
-            input: JSON.stringify({}),
-            providerExecuted: true
+            toolCallId,
+            toolName,
+            input: part.arguments,
+            providerExecuted: true,
+            dynamic: true
           });
           content.push({
             type: "tool-result",
-            toolCallId: part.id,
-            toolName: toolNameMapping.toCustomToolName("mcp"),
+            toolCallId,
+            toolName,
             result: {
               type: "call",
               serverLabel: part.server_label,
@@ -4406,6 +4463,11 @@ var OpenAIResponsesLanguageModel = class {
               arguments: part.arguments,
               ...part.output != null ? { output: part.output } : {},
               ...part.error != null ? { error: part.error } : {}
+            },
+            providerMetadata: {
+              [providerKey]: {
+                itemId: part.id
+              }
             }
           });
           break;
@@ -4414,6 +4476,22 @@ var OpenAIResponsesLanguageModel = class {
           break;
         }
         case "mcp_approval_request": {
+          const approvalRequestId = (_w = part.approval_request_id) != null ? _w : part.id;
+          const dummyToolCallId = (_z = (_y = (_x = this.config).generateId) == null ? void 0 : _y.call(_x)) != null ? _z : (0, import_provider_utils27.generateId)();
+          const toolName = `mcp.${part.name}`;
+          content.push({
+            type: "tool-call",
+            toolCallId: dummyToolCallId,
+            toolName,
+            input: part.arguments,
+            providerExecuted: true,
+            dynamic: true
+          });
+          content.push({
+            type: "tool-approval-request",
+            approvalId: approvalRequestId,
+            toolCallId: dummyToolCallId
+          });
           break;
         }
         case "computer_call": {
@@ -4449,13 +4527,13 @@ var OpenAIResponsesLanguageModel = class {
             toolName: toolNameMapping.toCustomToolName("file_search"),
             result: {
               queries: part.queries,
-              results: (_w = (_v = part.results) == null ? void 0 : _v.map((result) => ({
+              results: (_B = (_A = part.results) == null ? void 0 : _A.map((result) => ({
                 attributes: result.attributes,
                 fileId: result.file_id,
                 filename: result.filename,
                 score: result.score,
                 text: result.text
-              }))) != null ? _w : null
+              }))) != null ? _B : null
             }
           });
           break;
@@ -4514,10 +4592,10 @@ var OpenAIResponsesLanguageModel = class {
       content,
       finishReason: {
         unified: mapOpenAIResponseFinishReason({
-          finishReason: (_x = response.incomplete_details) == null ? void 0 : _x.reason,
+          finishReason: (_C = response.incomplete_details) == null ? void 0 : _C.reason,
           hasFunctionCall
         }),
-        raw: (_z = (_y = response.incomplete_details) == null ? void 0 : _y.reason) != null ? _z : void 0
+        raw: (_E = (_D = response.incomplete_details) == null ? void 0 : _D.reason) != null ? _E : void 0
       },
       usage: convertOpenAIResponsesUsage(usage),
       request: { body },
@@ -4559,6 +4637,8 @@ var OpenAIResponsesLanguageModel = class {
     });
     const self = this;
     const providerKey = this.config.provider.replace(".responses", "");
+    const approvalRequestIdToDummyToolCallIdFromPrompt = extractApprovalRequestIdToToolCallIdMapping(options.prompt);
+    const approvalRequestIdToDummyToolCallIdFromStream = /* @__PURE__ */ new Map();
     let finishReason = {
       unified: "other",
       raw: void 0
@@ -4578,7 +4658,7 @@ var OpenAIResponsesLanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -4674,13 +4754,6 @@ var OpenAIResponsesLanguageModel = class {
                   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: toolNameMapping.toCustomToolName("mcp"),
-                  input: "{}",
-                  providerExecuted: true
-                });
               } else if (value.item.type === "apply_patch_call") {
                 const { call_id: callId, operation } = value.item;
                 ongoingToolCalls[value.output_index] = {
@@ -4852,10 +4925,23 @@ var OpenAIResponsesLanguageModel = class {
                 });
               } else if (value.item.type === "mcp_call") {
                 ongoingToolCalls[value.output_index] = void 0;
+                const approvalRequestId = (_d = value.item.approval_request_id) != null ? _d : void 0;
+                const aliasedToolCallId = approvalRequestId != null ? (_f = (_e = approvalRequestIdToDummyToolCallIdFromStream.get(
+                  approvalRequestId
+                )) != null ? _e : approvalRequestIdToDummyToolCallIdFromPrompt[approvalRequestId]) != null ? _f : value.item.id : value.item.id;
+                const toolName = `mcp.${value.item.name}`;
+                controller.enqueue({
+                  type: "tool-call",
+                  toolCallId: aliasedToolCallId,
+                  toolName,
+                  input: value.item.arguments,
+                  providerExecuted: true,
+                  dynamic: true
+                });
                 controller.enqueue({
                   type: "tool-result",
-                  toolCallId: value.item.id,
-                  toolName: toolNameMapping.toCustomToolName("mcp"),
+                  toolCallId: aliasedToolCallId,
+                  toolName,
                   result: {
                     type: "call",
                     serverLabel: value.item.server_label,
@@ -4863,6 +4949,11 @@ var OpenAIResponsesLanguageModel = class {
                     arguments: value.item.arguments,
                     ...value.item.output != null ? { output: value.item.output } : {},
                     ...value.item.error != null ? { error: value.item.error } : {}
+                  },
+                  providerMetadata: {
+                    [providerKey]: {
+                      itemId: value.item.id
+                    }
                   }
                 });
               } else if (value.item.type === "mcp_list_tools") {
@@ -4907,6 +4998,26 @@ var OpenAIResponsesLanguageModel = class {
                 ongoingToolCalls[value.output_index] = void 0;
               } else if (value.item.type === "mcp_approval_request") {
                 ongoingToolCalls[value.output_index] = void 0;
+                const dummyToolCallId = (_i = (_h = (_g = self.config).generateId) == null ? void 0 : _h.call(_g)) != null ? _i : (0, import_provider_utils27.generateId)();
+                const approvalRequestId = (_j = value.item.approval_request_id) != null ? _j : value.item.id;
+                approvalRequestIdToDummyToolCallIdFromStream.set(
+                  approvalRequestId,
+                  dummyToolCallId
+                );
+                const toolName = `mcp.${value.item.name}`;
+                controller.enqueue({
+                  type: "tool-call",
+                  toolCallId: dummyToolCallId,
+                  toolName,
+                  input: value.item.arguments,
+                  providerExecuted: true,
+                  dynamic: true
+                });
+                controller.enqueue({
+                  type: "tool-approval-request",
+                  approvalId: approvalRequestId,
+                  toolCallId: dummyToolCallId
+                });
               } else if (value.item.type === "local_shell_call") {
                 ongoingToolCalls[value.output_index] = void 0;
                 controller.enqueue({
@@ -4956,7 +5067,7 @@ var OpenAIResponsesLanguageModel = class {
                     providerMetadata: {
                       [providerKey]: {
                         itemId: value.item.id,
-                        reasoningEncryptedContent: (_d = value.item.encrypted_content) != null ? _d : null
+                        reasoningEncryptedContent: (_k = value.item.encrypted_content) != null ? _k : null
                       }
                     }
                   });
@@ -5060,7 +5171,7 @@ var OpenAIResponsesLanguageModel = class {
                 id: value.item_id,
                 delta: value.delta
               });
-              if (((_f = (_e = options.providerOptions) == null ? void 0 : _e.openai) == null ? void 0 : _f.logprobs) && value.logprobs) {
+              if (((_m = (_l = options.providerOptions) == null ? void 0 : _l.openai) == null ? void 0 : _m.logprobs) && value.logprobs) {
                 logprobs.push(value.logprobs);
               }
             } else if (value.type === "response.reasoning_summary_part.added") {
@@ -5087,7 +5198,7 @@ var OpenAIResponsesLanguageModel = class {
                   providerMetadata: {
                     [providerKey]: {
                       itemId: value.item_id,
-                      reasoningEncryptedContent: (_h = (_g = activeReasoning[value.item_id]) == null ? void 0 : _g.encryptedContent) != null ? _h : null
+                      reasoningEncryptedContent: (_o = (_n = activeReasoning[value.item_id]) == null ? void 0 : _n.encryptedContent) != null ? _o : null
                     }
                   }
                 });
@@ -5119,10 +5230,10 @@ var OpenAIResponsesLanguageModel = class {
             } else if (isResponseFinishedChunk(value)) {
               finishReason = {
                 unified: mapOpenAIResponseFinishReason({
-                  finishReason: (_i = value.response.incomplete_details) == null ? void 0 : _i.reason,
+                  finishReason: (_p = value.response.incomplete_details) == null ? void 0 : _p.reason,
                   hasFunctionCall
                 }),
-                raw: (_k = (_j = value.response.incomplete_details) == null ? void 0 : _j.reason) != null ? _k : void 0
+                raw: (_r = (_q = value.response.incomplete_details) == null ? void 0 : _q.reason) != null ? _r : void 0
               };
               usage = value.response.usage;
               if (typeof value.response.service_tier === "string") {
@@ -5134,7 +5245,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "url",
-                  id: (_n = (_m = (_l = self.config).generateId) == null ? void 0 : _m.call(_l)) != null ? _n : (0, import_provider_utils27.generateId)(),
+                  id: (_u = (_t = (_s = self.config).generateId) == null ? void 0 : _t.call(_s)) != null ? _u : (0, import_provider_utils27.generateId)(),
                   url: value.annotation.url,
                   title: value.annotation.title
                 });
@@ -5142,10 +5253,10 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "document",
-                  id: (_q = (_p = (_o = self.config).generateId) == null ? void 0 : _p.call(_o)) != null ? _q : (0, import_provider_utils27.generateId)(),
+                  id: (_x = (_w = (_v = self.config).generateId) == null ? void 0 : _w.call(_v)) != null ? _x : (0, import_provider_utils27.generateId)(),
                   mediaType: "text/plain",
-                  title: (_s = (_r = value.annotation.quote) != null ? _r : value.annotation.filename) != null ? _s : "Document",
-                  filename: (_t = value.annotation.filename) != null ? _t : value.annotation.file_id,
+                  title: (_z = (_y = value.annotation.quote) != null ? _y : value.annotation.filename) != null ? _z : "Document",
+                  filename: (_A = value.annotation.filename) != null ? _A : value.annotation.file_id,
                   ...value.annotation.file_id ? {
                     providerMetadata: {
                       [providerKey]: {
@@ -5158,10 +5269,10 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "document",
-                  id: (_w = (_v = (_u = self.config).generateId) == null ? void 0 : _v.call(_u)) != null ? _w : (0, import_provider_utils27.generateId)(),
+                  id: (_D = (_C = (_B = self.config).generateId) == null ? void 0 : _C.call(_B)) != null ? _D : (0, import_provider_utils27.generateId)(),
                   mediaType: "text/plain",
-                  title: (_y = (_x = value.annotation.filename) != null ? _x : value.annotation.file_id) != null ? _y : "Document",
-                  filename: (_z = value.annotation.filename) != null ? _z : value.annotation.file_id,
+                  title: (_F = (_E = value.annotation.filename) != null ? _E : value.annotation.file_id) != null ? _F : "Document",
+                  filename: (_G = value.annotation.filename) != null ? _G : value.annotation.file_id,
                   providerMetadata: {
                     [providerKey]: {
                       fileId: value.annotation.file_id,
@@ -5174,7 +5285,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "document",
-                  id: (_C = (_B = (_A = self.config).generateId) == null ? void 0 : _B.call(_A)) != null ? _C : (0, import_provider_utils27.generateId)(),
+                  id: (_J = (_I = (_H = self.config).generateId) == null ? void 0 : _I.call(_H)) != null ? _J : (0, import_provider_utils27.generateId)(),
                   mediaType: "application/octet-stream",
                   title: value.annotation.file_id,
                   filename: value.annotation.file_id,
@@ -5633,7 +5744,7 @@ var OpenAITranscriptionModel = class {
 };
 
 // src/version.ts
-var VERSION = true ? "3.0.0" : "0.0.0-test";
+var VERSION = true ? "3.0.2" : "0.0.0-test";
 
 // src/openai-provider.ts
 function createOpenAI(options = {}) {