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

package/dist/internal/index.mjs

@@ -237,6 +237,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) {
@@ -296,7 +299,7 @@ function mapOpenAIFinishReason(finishReason) {
     case "tool_calls":
       return "tool-calls";
     default:
-      return "unknown";
+      return "other";
   }
 }
 
@@ -820,7 +823,7 @@ var OpenAIChatLanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const { args: body, warnings } = await this.getArgs(options);
     const {
       responseHeaders,
@@ -877,7 +880,10 @@ var OpenAIChatLanguageModel = class {
     }
     return {
       content,
-      finishReason: mapOpenAIFinishReason(choice.finish_reason),
+      finishReason: {
+        unified: mapOpenAIFinishReason(choice.finish_reason),
+        raw: (_g = choice.finish_reason) != null ? _g : void 0
+      },
       usage: convertOpenAIChatUsage(response.usage),
       request: { body },
       response: {
@@ -913,7 +919,10 @@ var OpenAIChatLanguageModel = class {
       fetch: this.config.fetch
     });
     const toolCalls = [];
-    let finishReason = "unknown";
+    let finishReason = {
+      unified: "other",
+      raw: void 0
+    };
     let usage = void 0;
     let metadataExtracted = false;
     let isActiveText = false;
@@ -930,13 +939,13 @@ var OpenAIChatLanguageModel = class {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
             if (!chunk.success) {
-              finishReason = "error";
+              finishReason = { unified: "error", raw: void 0 };
               controller.enqueue({ type: "error", error: chunk.error });
               return;
             }
             const value = chunk.value;
             if ("error" in value) {
-              finishReason = "error";
+              finishReason = { unified: "error", raw: void 0 };
               controller.enqueue({ type: "error", error: value.error });
               return;
             }
@@ -961,7 +970,10 @@ var OpenAIChatLanguageModel = class {
             }
             const choice = value.choices[0];
             if ((choice == null ? void 0 : choice.finish_reason) != null) {
-              finishReason = mapOpenAIFinishReason(choice.finish_reason);
+              finishReason = {
+                unified: mapOpenAIFinishReason(choice.finish_reason),
+                raw: choice.finish_reason
+              };
             }
             if (((_e = choice == null ? void 0 : choice.logprobs) == null ? void 0 : _e.content) != null) {
               providerMetadata.openai.logprobs = choice.logprobs.content;
@@ -1250,7 +1262,7 @@ function mapOpenAIFinishReason2(finishReason) {
     case "tool_calls":
       return "tool-calls";
     default:
-      return "unknown";
+      return "other";
   }
 }
 
@@ -1448,6 +1460,7 @@ var OpenAICompletionLanguageModel = class {
     };
   }
   async doGenerate(options) {
+    var _a;
     const { args, warnings } = await this.getArgs(options);
     const {
       responseHeaders,
@@ -1475,7 +1488,10 @@ var OpenAICompletionLanguageModel = class {
     return {
       content: [{ type: "text", text: choice.text }],
       usage: convertOpenAICompletionUsage(response.usage),
-      finishReason: mapOpenAIFinishReason2(choice.finish_reason),
+      finishReason: {
+        unified: mapOpenAIFinishReason2(choice.finish_reason),
+        raw: (_a = choice.finish_reason) != null ? _a : void 0
+      },
       request: { body: args },
       response: {
         ...getResponseMetadata2(response),
@@ -1509,7 +1525,10 @@ var OpenAICompletionLanguageModel = class {
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
-    let finishReason = "unknown";
+    let finishReason = {
+      unified: "other",
+      raw: void 0
+    };
     const providerMetadata = { openai: {} };
     let usage = void 0;
     let isFirstChunk = true;
@@ -1524,13 +1543,13 @@ var OpenAICompletionLanguageModel = class {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
             if (!chunk.success) {
-              finishReason = "error";
+              finishReason = { unified: "error", raw: void 0 };
               controller.enqueue({ type: "error", error: chunk.error });
               return;
             }
             const value = chunk.value;
             if ("error" in value) {
-              finishReason = "error";
+              finishReason = { unified: "error", raw: void 0 };
               controller.enqueue({ type: "error", error: value.error });
               return;
             }
@@ -1547,7 +1566,10 @@ var OpenAICompletionLanguageModel = class {
             }
             const choice = value.choices[0];
             if ((choice == null ? void 0 : choice.finish_reason) != null) {
-              finishReason = mapOpenAIFinishReason2(choice.finish_reason);
+              finishReason = {
+                unified: mapOpenAIFinishReason2(choice.finish_reason),
+                raw: choice.finish_reason
+              };
             }
             if ((choice == null ? void 0 : choice.logprobs) != null) {
               providerMetadata.openai.logprobs = choice.logprobs;
@@ -2691,6 +2713,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
@@ -2818,7 +2843,7 @@ function mapOpenAIResponseFinishReason({
     case "content_filter":
       return "content-filter";
     default:
-      return hasFunctionCall ? "tool-calls" : "unknown";
+      return hasFunctionCall ? "tool-calls" : "other";
   }
 }
 
@@ -3898,16 +3923,14 @@ var mcpArgsSchema = lazySchema19(
       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(),
+      requireApproval: z21.union([
+        z21.enum(["always", "never"]),
+        z21.object({
+          never: z21.object({
+            toolNames: z21.array(z21.string()).optional()
+          }).optional()
+        })
+      ]).optional(),
       serverDescription: z21.string().optional(),
       serverUrl: z21.string().optional()
     }).refine(
@@ -3919,36 +3942,14 @@ var mcpArgsSchema = lazySchema19(
 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()
-      })
-    ])
+    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()
+    })
   )
 );
 var mcpToolFactory = createProviderToolFactoryWithOutputSchema7({
@@ -4476,7 +4477,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;
+    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;
     const {
       args: body,
       warnings,
@@ -4727,54 +4728,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": {
@@ -4873,10 +4829,13 @@ var OpenAIResponsesLanguageModel = class {
     const usage = response.usage;
     return {
       content,
-      finishReason: mapOpenAIResponseFinishReason({
-        finishReason: (_x = response.incomplete_details) == null ? void 0 : _x.reason,
-        hasFunctionCall
-      }),
+      finishReason: {
+        unified: mapOpenAIResponseFinishReason({
+          finishReason: (_x = response.incomplete_details) == null ? void 0 : _x.reason,
+          hasFunctionCall
+        }),
+        raw: (_z = (_y = response.incomplete_details) == null ? void 0 : _y.reason) != null ? _z : void 0
+      },
       usage: convertOpenAIResponsesUsage(usage),
       request: { body },
       response: {
@@ -4917,7 +4876,10 @@ var OpenAIResponsesLanguageModel = class {
     });
     const self = this;
     const providerKey = this.config.provider.replace(".responses", "");
-    let finishReason = "unknown";
+    let finishReason = {
+      unified: "other",
+      raw: void 0
+    };
     let usage = void 0;
     const logprobs = [];
     let responseId = null;
@@ -4933,12 +4895,12 @@ 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;
+            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;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
             if (!chunk.success) {
-              finishReason = "error";
+              finishReason = { unified: "error", raw: void 0 };
               controller.enqueue({ type: "error", error: chunk.error });
               return;
             }
@@ -5206,25 +5168,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") {
@@ -5245,18 +5188,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({
@@ -5437,10 +5368,13 @@ var OpenAIResponsesLanguageModel = class {
                 activeReasoning[value.item_id].summaryParts[value.summary_index] = "can-conclude";
               }
             } else if (isResponseFinishedChunk(value)) {
-              finishReason = mapOpenAIResponseFinishReason({
-                finishReason: (_i = value.response.incomplete_details) == null ? void 0 : _i.reason,
-                hasFunctionCall
-              });
+              finishReason = {
+                unified: mapOpenAIResponseFinishReason({
+                  finishReason: (_i = value.response.incomplete_details) == null ? void 0 : _i.reason,
+                  hasFunctionCall
+                }),
+                raw: (_k = (_j = value.response.incomplete_details) == null ? void 0 : _j.reason) != null ? _k : void 0
+              };
               usage = value.response.usage;
               if (typeof value.response.service_tier === "string") {
                 serviceTier = value.response.service_tier;
@@ -5451,7 +5385,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "url",
-                  id: (_l = (_k = (_j = self.config).generateId) == null ? void 0 : _k.call(_j)) != null ? _l : generateId2(),
+                  id: (_n = (_m = (_l = self.config).generateId) == null ? void 0 : _m.call(_l)) != null ? _n : generateId2(),
                   url: value.annotation.url,
                   title: value.annotation.title
                 });
@@ -5459,10 +5393,10 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "document",
-                  id: (_o = (_n = (_m = self.config).generateId) == null ? void 0 : _n.call(_m)) != null ? _o : generateId2(),
+                  id: (_q = (_p = (_o = self.config).generateId) == null ? void 0 : _p.call(_o)) != null ? _q : generateId2(),
                   mediaType: "text/plain",
-                  title: (_q = (_p = value.annotation.quote) != null ? _p : value.annotation.filename) != null ? _q : "Document",
-                  filename: (_r = value.annotation.filename) != null ? _r : value.annotation.file_id,
+                  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,
                   ...value.annotation.file_id ? {
                     providerMetadata: {
                       [providerKey]: {
@@ -5475,10 +5409,10 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "document",
-                  id: (_u = (_t = (_s = self.config).generateId) == null ? void 0 : _t.call(_s)) != null ? _u : generateId2(),
+                  id: (_w = (_v = (_u = self.config).generateId) == null ? void 0 : _v.call(_u)) != null ? _w : generateId2(),
                   mediaType: "text/plain",
-                  title: (_w = (_v = value.annotation.filename) != null ? _v : value.annotation.file_id) != null ? _w : "Document",
-                  filename: (_x = value.annotation.filename) != null ? _x : value.annotation.file_id,
+                  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,
                   providerMetadata: {
                     [providerKey]: {
                       fileId: value.annotation.file_id,
@@ -5491,7 +5425,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "source",
                   sourceType: "document",
-                  id: (_A = (_z = (_y = self.config).generateId) == null ? void 0 : _z.call(_y)) != null ? _A : generateId2(),
+                  id: (_C = (_B = (_A = self.config).generateId) == null ? void 0 : _B.call(_A)) != null ? _C : generateId2(),
                   mediaType: "application/octet-stream",
                   title: value.annotation.file_id,
                   filename: value.annotation.file_id,