@ai-sdk/openai 4.0.42 → 4.0.44

package/dist/internal/index.d.ts

@@ -688,6 +688,22 @@ type OpenAIResponsesFunctionTool = {
     allowed_callers?: Array<'direct' | 'programmatic'>;
     output_schema?: JSONSchema7;
 };
+/**
+ * Entry in `tool_choice.allowed_tools.tools`. OpenAI identifies most built-in
+ * tools by type alone; only `function`, `custom` and `mcp` carry an identifier.
+ */
+type OpenAIResponsesAllowedTool = {
+    type: 'function';
+    name: string;
+} | {
+    type: 'custom';
+    name: string;
+} | {
+    type: 'mcp';
+    server_label: string;
+} | {
+    type: Exclude<OpenAIResponsesTool['type'], 'function' | 'custom' | 'mcp' | 'namespace' | 'tool_search'>;
+};
 type OpenAIResponsesTool = OpenAIResponsesFunctionTool | {
     type: 'namespace';
     name: string;
@@ -1600,10 +1616,7 @@ declare class OpenAIResponsesLanguageModel implements LanguageModelV4 {
             } | {
                 type: "allowed_tools";
                 mode: "auto" | "required";
-                tools: Array<{
-                    type: "function";
-                    name: string;
-                }>;
+                tools: Array<OpenAIResponsesAllowedTool>;
             } | undefined;
             reasoning?: {
                 context?: "auto" | "current_turn" | "all_turns" | undefined;

package/dist/internal/index.js

@@ -1143,7 +1143,7 @@ var OpenAIChatLanguageModel = class _OpenAIChatLanguageModel {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g;
     const { args: body, warnings } = await this.getArgs(options);
     const {
       responseHeaders,
@@ -1172,12 +1172,12 @@ var OpenAIChatLanguageModel = class _OpenAIChatLanguageModel {
     for (const toolCall of (_c = choice.message.tool_calls) != null ? _c : []) {
       content.push({
         type: "tool-call",
-        toolCallId: (_d = toolCall.id) != null ? _d : generateId(),
+        toolCallId: toolCall.id || generateId(),
         toolName: toolCall.function.name,
         input: toolCall.function.arguments
       });
     }
-    for (const annotation of (_e = choice.message.annotations) != null ? _e : []) {
+    for (const annotation of (_d = choice.message.annotations) != null ? _d : []) {
       content.push({
         type: "source",
         sourceType: "url",
@@ -1186,7 +1186,7 @@ var OpenAIChatLanguageModel = class _OpenAIChatLanguageModel {
         title: annotation.url_citation.title
       });
     }
-    const completionTokenDetails = (_f = response.usage) == null ? void 0 : _f.completion_tokens_details;
+    const completionTokenDetails = (_e = response.usage) == null ? void 0 : _e.completion_tokens_details;
     const providerMetadata = { openai: {} };
     if ((completionTokenDetails == null ? void 0 : completionTokenDetails.accepted_prediction_tokens) != null) {
       providerMetadata.openai.acceptedPredictionTokens = completionTokenDetails == null ? void 0 : completionTokenDetails.accepted_prediction_tokens;
@@ -1194,14 +1194,14 @@ var OpenAIChatLanguageModel = class _OpenAIChatLanguageModel {
     if ((completionTokenDetails == null ? void 0 : completionTokenDetails.rejected_prediction_tokens) != null) {
       providerMetadata.openai.rejectedPredictionTokens = completionTokenDetails == null ? void 0 : completionTokenDetails.rejected_prediction_tokens;
     }
-    if (((_g = choice.logprobs) == null ? void 0 : _g.content) != null) {
+    if (((_f = choice.logprobs) == null ? void 0 : _f.content) != null) {
       providerMetadata.openai.logprobs = choice.logprobs.content;
     }
     return {
       content,
       finishReason: {
         unified: mapOpenAIFinishReason(choice.finish_reason),
-        raw: (_h = choice.finish_reason) != null ? _h : void 0
+        raw: (_g = choice.finish_reason) != null ? _g : void 0
       },
       usage: convertOpenAIChatUsage(response.usage),
       request: { body },
@@ -6040,7 +6040,7 @@ async function prepareResponsesTools({
   customProviderToolNames,
   outputSchemaToolNames
 }) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   tools = (tools == null ? void 0 : tools.length) ? tools : void 0;
   const toolWarnings = [];
   if (tools == null) {
@@ -6049,6 +6049,20 @@ async function prepareResponsesTools({
   const openaiTools = [];
   const namespaceTools = /* @__PURE__ */ new Map();
   const resolvedCustomProviderToolNames = customProviderToolNames != null ? customProviderToolNames : /* @__PURE__ */ new Set();
+  const allowedToolResolutions = /* @__PURE__ */ new Map();
+  const allowedToolAliases = /* @__PURE__ */ new Map();
+  const recordAllowedTool = (toolName, resolution, canonicalName) => {
+    allowedToolResolutions.set(toolName, resolution);
+    if (canonicalName == null || canonicalName === toolName) {
+      return;
+    }
+    const existingAlias = allowedToolAliases.get(canonicalName);
+    if (existingAlias == null) {
+      allowedToolAliases.set(canonicalName, resolution);
+    } else if (existingAlias !== "ambiguous" && !isSameAllowedTool(existingAlias, resolution)) {
+      allowedToolAliases.set(canonicalName, "ambiguous");
+    }
+  };
   for (const tool of tools) {
     switch (tool.type) {
       case "function": {
@@ -6081,9 +6095,24 @@ async function prepareResponsesTools({
           }
           namespaceTool.tools.push(openaiFunctionTool);
         }
+        recordAllowedTool(
+          tool.name,
+          namespace != null ? {
+            supported: false,
+            reason: "tools inside an OpenAI tool namespace are not visible to tool_choice.allowed_tools"
+          } : (openaiOptions == null ? void 0 : openaiOptions.deferLoading) === true ? {
+            supported: false,
+            reason: "deferred tools are not visible to tool_choice.allowed_tools"
+          } : {
+            supported: true,
+            entry: { type: "function", name: tool.name }
+          },
+          void 0
+        );
         break;
       }
       case "provider": {
+        const openaiToolCountBefore = openaiTools.length;
         switch (tool.id) {
           case "openai.file_search": {
             const args = await validateTypes2({
@@ -6256,6 +6285,14 @@ async function prepareResponsesTools({
             break;
           }
         }
+        if (openaiTools.length > openaiToolCountBefore) {
+          const openaiTool = openaiTools[openaiToolCountBefore];
+          recordAllowedTool(
+            tool.name,
+            toAllowedToolResolution(openaiTool),
+            toolNameMapping == null ? void 0 : toolNameMapping.toProviderToolName(tool.name)
+          );
+        }
         break;
       }
       default:
@@ -6267,18 +6304,63 @@ async function prepareResponsesTools({
     }
   }
   if (allowedTools != null) {
+    const allowedToolEntries = [];
+    const droppedToolNames = [];
+    for (const name of allowedTools.toolNames) {
+      const directResolution = allowedToolResolutions.get(name);
+      const resolution = directResolution != null ? directResolution : allowedToolAliases.get(name);
+      if (directResolution != null && allowedToolAliases.has(name)) {
+        toolWarnings.push({
+          type: "unsupported",
+          feature: `allowedTools entry "${name}"`,
+          details: "this name is both a tool name and the provider tool name of another tool in this request; the tool with this name is allowed"
+        });
+      }
+      if (resolution === "ambiguous") {
+        toolWarnings.push({
+          type: "unsupported",
+          feature: `allowedTools entry "${name}"`,
+          details: "several tools in this request share this provider tool name; use the tool name from the tools for this request instead"
+        });
+        droppedToolNames.push(name);
+        continue;
+      }
+      if (resolution == null) {
+        toolWarnings.push({
+          type: "unsupported",
+          feature: `allowedTools entry "${name}"`,
+          details: "the tool is not part of the tools for this request and is sent as a function tool"
+        });
+        allowedToolEntries.push({
+          type: "function",
+          name: (_b = toolNameMapping == null ? void 0 : toolNameMapping.toProviderToolName(name)) != null ? _b : name
+        });
+        continue;
+      }
+      if (!resolution.supported) {
+        toolWarnings.push({
+          type: "unsupported",
+          feature: `allowedTools entry "${name}"`,
+          details: `${resolution.reason}; the tool is removed from the allowed tools`
+        });
+        droppedToolNames.push(name);
+        continue;
+      }
+      allowedToolEntries.push(resolution.entry);
+    }
+    if (allowedToolEntries.length === 0) {
+      throw new UnsupportedFunctionalityError6({
+        functionality: `allowedTools with only tools that cannot be allow-listed (${droppedToolNames.join(
+          ", "
+        )})`
+      });
+    }
     return {
       tools: openaiTools,
       toolChoice: {
         type: "allowed_tools",
-        mode: (_b = allowedTools.mode) != null ? _b : "auto",
-        tools: allowedTools.toolNames.map((name) => {
-          var _a2;
-          return {
-            type: "function",
-            name: (_a2 = toolNameMapping == null ? void 0 : toolNameMapping.toProviderToolName(name)) != null ? _a2 : name
-          };
-        })
+        mode: (_c = allowedTools.mode) != null ? _c : "auto",
+        tools: allowedToolEntries
       },
       toolWarnings
     };
@@ -6293,7 +6375,7 @@ async function prepareResponsesTools({
     case "required":
       return { tools: openaiTools, toolChoice: type, toolWarnings };
     case "tool": {
-      const resolvedToolName = (_c = toolNameMapping == null ? void 0 : toolNameMapping.toProviderToolName(toolChoice.toolName)) != null ? _c : toolChoice.toolName;
+      const resolvedToolName = (_d = toolNameMapping == null ? void 0 : toolNameMapping.toProviderToolName(toolChoice.toolName)) != null ? _d : toolChoice.toolName;
       return {
         tools: openaiTools,
         toolChoice: resolvedToolName === "code_interpreter" || resolvedToolName === "file_search" || resolvedToolName === "image_generation" || resolvedToolName === "web_search_preview" || resolvedToolName === "web_search" || resolvedToolName === "mcp" || resolvedToolName === "apply_patch" || resolvedToolName === "computer" || resolvedToolName === "programmatic_tool_calling" ? { type: resolvedToolName } : resolvedCustomProviderToolNames.has(resolvedToolName) ? { type: "custom", name: resolvedToolName } : { type: "function", name: resolvedToolName },
@@ -6308,6 +6390,53 @@ async function prepareResponsesTools({
     }
   }
 }
+function allowedToolKey(entry) {
+  switch (entry.type) {
+    case "mcp":
+      return `mcp:${entry.server_label}`;
+    case "function":
+    case "custom":
+      return `${entry.type}:${entry.name}`;
+    default:
+      return entry.type;
+  }
+}
+function isSameAllowedTool(a, b) {
+  if (a.supported && b.supported) {
+    return allowedToolKey(a.entry) === allowedToolKey(b.entry);
+  }
+  if (!a.supported && !b.supported) {
+    return a.reason === b.reason;
+  }
+  return false;
+}
+function toAllowedToolResolution(tool) {
+  switch (tool.type) {
+    case "custom":
+      return { supported: true, entry: { type: "custom", name: tool.name } };
+    case "mcp":
+      return {
+        supported: true,
+        entry: { type: "mcp", server_label: tool.server_label }
+      };
+    case "file_search":
+    case "web_search":
+    case "web_search_preview":
+    case "image_generation":
+    case "code_interpreter":
+    case "computer":
+    case "apply_patch":
+    case "shell":
+    case "local_shell":
+    case "programmatic_tool_calling":
+      return { supported: true, entry: { type: tool.type } };
+    default:
+      return {
+        supported: false,
+        reason: `OpenAI does not support ${tool.type} tools in tool_choice.allowed_tools`
+      };
+  }
+}
 function prepareFunctionTool({
   tool,
   options