@ai-sdk/openai 3.0.0-beta.71 → 3.0.0-beta.73

package/dist/internal/index.mjs

@@ -2128,6 +2128,7 @@ import {
   combineHeaders as combineHeaders7,
   createEventSourceResponseHandler as createEventSourceResponseHandler3,
   createJsonResponseHandler as createJsonResponseHandler6,
+  createToolNameMapping,
   generateId as generateId2,
   parseProviderOptions as parseProviderOptions7,
   postJsonToApi as postJsonToApi6
@@ -2147,7 +2148,7 @@ import { z as z13 } from "zod/v4";
 
 // src/tool/local-shell.ts
 import {
-  createProviderDefinedToolFactoryWithOutputSchema,
+  createProviderToolFactoryWithOutputSchema,
   lazySchema as lazySchema11,
   zodSchema as zodSchema11
 } from "@ai-sdk/provider-utils";
@@ -2169,9 +2170,8 @@ var localShellInputSchema = lazySchema11(
 var localShellOutputSchema = lazySchema11(
   () => zodSchema11(z12.object({ output: z12.string() }))
 );
-var localShell = createProviderDefinedToolFactoryWithOutputSchema({
+var localShell = createProviderToolFactoryWithOutputSchema({
   id: "openai.local_shell",
-  name: "local_shell",
   inputSchema: localShellInputSchema,
   outputSchema: localShellOutputSchema
 });
@@ -2183,6 +2183,7 @@ function isFileId(data, prefixes) {
 }
 async function convertToOpenAIResponsesInput({
   prompt,
+  toolNameMapping,
   systemMessageMode,
   fileIdPrefixes,
   store,
@@ -2265,7 +2266,6 @@ async function convertToOpenAIResponsesInput({
       }
       case "assistant": {
         const reasoningMessages = {};
-        const toolCallParts = {};
         for (const part of content) {
           switch (part.type) {
             case "text": {
@@ -2282,7 +2282,6 @@ async function convertToOpenAIResponsesInput({
               break;
             }
             case "tool-call": {
-              toolCallParts[part.toolCallId] = part;
               if (part.providerExecuted) {
                 break;
               }
@@ -2291,7 +2290,10 @@ async function convertToOpenAIResponsesInput({
                 input.push({ type: "item_reference", id });
                 break;
               }
-              if (hasLocalShellTool && part.toolName === "local_shell") {
+              const resolvedToolName = toolNameMapping.toProviderToolName(
+                part.toolName
+              );
+              if (hasLocalShellTool && resolvedToolName === "local_shell") {
                 const parsedInput = await validateTypes({
                   value: part.input,
                   schema: localShellInputSchema
@@ -2314,7 +2316,7 @@ async function convertToOpenAIResponsesInput({
               input.push({
                 type: "function_call",
                 call_id: part.toolCallId,
-                name: part.toolName,
+                name: resolvedToolName,
                 arguments: JSON.stringify(part.input),
                 id
               });
@@ -2393,7 +2395,10 @@ async function convertToOpenAIResponsesInput({
       case "tool": {
         for (const part of content) {
           const output = part.output;
-          if (hasLocalShellTool && part.toolName === "local_shell" && output.type === "json") {
+          const resolvedToolName = toolNameMapping.toProviderToolName(
+            part.toolName
+          );
+          if (hasLocalShellTool && resolvedToolName === "local_shell" && output.type === "json") {
             const parsedOutput = await validateTypes({
               value: output.value,
               schema: localShellOutputSchema
@@ -3197,10 +3202,11 @@ var openaiResponsesProviderOptionsSchema = lazySchema13(
 import {
   UnsupportedFunctionalityError as UnsupportedFunctionalityError5
 } from "@ai-sdk/provider";
+import { validateTypes as validateTypes2 } from "@ai-sdk/provider-utils";
 
 // src/tool/code-interpreter.ts
 import {
-  createProviderDefinedToolFactoryWithOutputSchema as createProviderDefinedToolFactoryWithOutputSchema2,
+  createProviderToolFactoryWithOutputSchema as createProviderToolFactoryWithOutputSchema2,
   lazySchema as lazySchema14,
   zodSchema as zodSchema14
 } from "@ai-sdk/provider-utils";
@@ -3237,9 +3243,8 @@ var codeInterpreterArgsSchema = lazySchema14(
     })
   )
 );
-var codeInterpreterToolFactory = createProviderDefinedToolFactoryWithOutputSchema2({
+var codeInterpreterToolFactory = createProviderToolFactoryWithOutputSchema2({
   id: "openai.code_interpreter",
-  name: "code_interpreter",
   inputSchema: codeInterpreterInputSchema,
   outputSchema: codeInterpreterOutputSchema
 });
@@ -3249,7 +3254,7 @@ var codeInterpreter = (args = {}) => {
 
 // src/tool/file-search.ts
 import {
-  createProviderDefinedToolFactoryWithOutputSchema as createProviderDefinedToolFactoryWithOutputSchema3,
+  createProviderToolFactoryWithOutputSchema as createProviderToolFactoryWithOutputSchema3,
   lazySchema as lazySchema15,
   zodSchema as zodSchema15
 } from "@ai-sdk/provider-utils";
@@ -3294,156 +3299,44 @@ var fileSearchOutputSchema = lazySchema15(
     })
   )
 );
-var fileSearch = createProviderDefinedToolFactoryWithOutputSchema3({
+var fileSearch = createProviderToolFactoryWithOutputSchema3({
   id: "openai.file_search",
-  name: "file_search",
   inputSchema: z17.object({}),
   outputSchema: fileSearchOutputSchema
 });
 
-// src/tool/web-search.ts
+// src/tool/image-generation.ts
 import {
-  createProviderDefinedToolFactoryWithOutputSchema as createProviderDefinedToolFactoryWithOutputSchema4,
+  createProviderToolFactoryWithOutputSchema as createProviderToolFactoryWithOutputSchema4,
   lazySchema as lazySchema16,
   zodSchema as zodSchema16
 } from "@ai-sdk/provider-utils";
 import { z as z18 } from "zod/v4";
-var webSearchArgsSchema = lazySchema16(
-  () => zodSchema16(
-    z18.object({
-      externalWebAccess: z18.boolean().optional(),
-      filters: z18.object({ allowedDomains: z18.array(z18.string()).optional() }).optional(),
-      searchContextSize: z18.enum(["low", "medium", "high"]).optional(),
-      userLocation: z18.object({
-        type: z18.literal("approximate"),
-        country: z18.string().optional(),
-        city: z18.string().optional(),
-        region: z18.string().optional(),
-        timezone: z18.string().optional()
-      }).optional()
-    })
-  )
-);
-var webSearchInputSchema = lazySchema16(() => zodSchema16(z18.object({})));
-var webSearchOutputSchema = lazySchema16(
+var imageGenerationArgsSchema = lazySchema16(
   () => zodSchema16(
     z18.object({
-      action: z18.discriminatedUnion("type", [
-        z18.object({
-          type: z18.literal("search"),
-          query: z18.string().optional()
-        }),
-        z18.object({
-          type: z18.literal("openPage"),
-          url: z18.string()
-        }),
-        z18.object({
-          type: z18.literal("find"),
-          url: z18.string(),
-          pattern: z18.string()
-        })
-      ]),
-      sources: z18.array(
-        z18.discriminatedUnion("type", [
-          z18.object({ type: z18.literal("url"), url: z18.string() }),
-          z18.object({ type: z18.literal("api"), name: z18.string() })
-        ])
-      ).optional()
-    })
-  )
-);
-var webSearchToolFactory = createProviderDefinedToolFactoryWithOutputSchema4({
-  id: "openai.web_search",
-  name: "web_search",
-  inputSchema: webSearchInputSchema,
-  outputSchema: webSearchOutputSchema
-});
-
-// src/tool/web-search-preview.ts
-import {
-  createProviderDefinedToolFactoryWithOutputSchema as createProviderDefinedToolFactoryWithOutputSchema5,
-  lazySchema as lazySchema17,
-  zodSchema as zodSchema17
-} from "@ai-sdk/provider-utils";
-import { z as z19 } from "zod/v4";
-var webSearchPreviewArgsSchema = lazySchema17(
-  () => zodSchema17(
-    z19.object({
-      searchContextSize: z19.enum(["low", "medium", "high"]).optional(),
-      userLocation: z19.object({
-        type: z19.literal("approximate"),
-        country: z19.string().optional(),
-        city: z19.string().optional(),
-        region: z19.string().optional(),
-        timezone: z19.string().optional()
-      }).optional()
-    })
-  )
-);
-var webSearchPreviewInputSchema = lazySchema17(
-  () => zodSchema17(z19.object({}))
-);
-var webSearchPreviewOutputSchema = lazySchema17(
-  () => zodSchema17(
-    z19.object({
-      action: z19.discriminatedUnion("type", [
-        z19.object({
-          type: z19.literal("search"),
-          query: z19.string().optional()
-        }),
-        z19.object({
-          type: z19.literal("openPage"),
-          url: z19.string()
-        }),
-        z19.object({
-          type: z19.literal("find"),
-          url: z19.string(),
-          pattern: z19.string()
-        })
-      ])
-    })
-  )
-);
-var webSearchPreview = createProviderDefinedToolFactoryWithOutputSchema5({
-  id: "openai.web_search_preview",
-  name: "web_search_preview",
-  inputSchema: webSearchPreviewInputSchema,
-  outputSchema: webSearchPreviewOutputSchema
-});
-
-// src/tool/image-generation.ts
-import {
-  createProviderDefinedToolFactoryWithOutputSchema as createProviderDefinedToolFactoryWithOutputSchema6,
-  lazySchema as lazySchema18,
-  zodSchema as zodSchema18
-} from "@ai-sdk/provider-utils";
-import { z as z20 } from "zod/v4";
-var imageGenerationArgsSchema = lazySchema18(
-  () => zodSchema18(
-    z20.object({
-      background: z20.enum(["auto", "opaque", "transparent"]).optional(),
-      inputFidelity: z20.enum(["low", "high"]).optional(),
-      inputImageMask: z20.object({
-        fileId: z20.string().optional(),
-        imageUrl: z20.string().optional()
+      background: z18.enum(["auto", "opaque", "transparent"]).optional(),
+      inputFidelity: z18.enum(["low", "high"]).optional(),
+      inputImageMask: z18.object({
+        fileId: z18.string().optional(),
+        imageUrl: z18.string().optional()
       }).optional(),
-      model: z20.string().optional(),
-      moderation: z20.enum(["auto"]).optional(),
-      outputCompression: z20.number().int().min(0).max(100).optional(),
-      outputFormat: z20.enum(["png", "jpeg", "webp"]).optional(),
-      partialImages: z20.number().int().min(0).max(3).optional(),
-      quality: z20.enum(["auto", "low", "medium", "high"]).optional(),
-      size: z20.enum(["1024x1024", "1024x1536", "1536x1024", "auto"]).optional()
+      model: z18.string().optional(),
+      moderation: z18.enum(["auto"]).optional(),
+      outputCompression: z18.number().int().min(0).max(100).optional(),
+      outputFormat: z18.enum(["png", "jpeg", "webp"]).optional(),
+      partialImages: z18.number().int().min(0).max(3).optional(),
+      quality: z18.enum(["auto", "low", "medium", "high"]).optional(),
+      size: z18.enum(["1024x1024", "1024x1536", "1536x1024", "auto"]).optional()
     }).strict()
   )
 );
-var imageGenerationInputSchema = lazySchema18(() => zodSchema18(z20.object({})));
-var imageGenerationOutputSchema = lazySchema18(
-  () => zodSchema18(z20.object({ result: z20.string() }))
+var imageGenerationInputSchema = lazySchema16(() => zodSchema16(z18.object({})));
+var imageGenerationOutputSchema = lazySchema16(
+  () => zodSchema16(z18.object({ result: z18.string() }))
 );
-var imageGenerationToolFactory = createProviderDefinedToolFactoryWithOutputSchema6({
+var imageGenerationToolFactory = createProviderToolFactoryWithOutputSchema4({
   id: "openai.image_generation",
-  name: "image_generation",
   inputSchema: imageGenerationInputSchema,
   outputSchema: imageGenerationOutputSchema
 });
@@ -3453,35 +3346,35 @@ var imageGeneration = (args = {}) => {
 
 // src/tool/mcp.ts
 import {
-  createProviderDefinedToolFactoryWithOutputSchema as createProviderDefinedToolFactoryWithOutputSchema7,
-  lazySchema as lazySchema19,
-  zodSchema as zodSchema19
+  createProviderToolFactoryWithOutputSchema as createProviderToolFactoryWithOutputSchema5,
+  lazySchema as lazySchema17,
+  zodSchema as zodSchema17
 } 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)
+import { z as z19 } from "zod/v4";
+var jsonValueSchema = z19.lazy(
+  () => z19.union([
+    z19.string(),
+    z19.number(),
+    z19.boolean(),
+    z19.null(),
+    z19.array(jsonValueSchema),
+    z19.record(z19.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()
+var mcpArgsSchema = lazySchema17(
+  () => zodSchema17(
+    z19.object({
+      serverLabel: z19.string(),
+      allowedTools: z19.union([
+        z19.array(z19.string()),
+        z19.object({
+          readOnly: z19.boolean().optional(),
+          toolNames: z19.array(z19.string()).optional()
         })
       ]).optional(),
-      authorization: z21.string().optional(),
-      connectorId: z21.string().optional(),
-      headers: z21.record(z21.string(), z21.string()).optional(),
+      authorization: z19.string().optional(),
+      connectorId: z19.string().optional(),
+      headers: z19.record(z19.string(), z19.string()).optional(),
       // TODO: Integrate this MCP tool approval with our SDK's existing tool approval architecture
       // requireApproval: z
       //   .union([
@@ -3492,58 +3385,164 @@ var mcpArgsSchema = lazySchema19(
       //     }),
       //   ])
       //   .optional(),
-      serverDescription: z21.string().optional(),
-      serverUrl: z21.string().optional()
+      serverDescription: z19.string().optional(),
+      serverUrl: z19.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()
+var mcpInputSchema = lazySchema17(() => zodSchema17(z19.object({})));
+var mcpOutputSchema = lazySchema17(
+  () => zodSchema17(
+    z19.discriminatedUnion("type", [
+      z19.object({
+        type: z19.literal("call"),
+        serverLabel: z19.string(),
+        name: z19.string(),
+        arguments: z19.string(),
+        output: z19.string().nullable().optional(),
+        error: z19.union([z19.string(), jsonValueSchema]).optional()
       }),
-      z21.object({
-        type: z21.literal("listTools"),
-        serverLabel: z21.string(),
-        tools: z21.array(
-          z21.object({
-            name: z21.string(),
-            description: z21.string().optional(),
+      z19.object({
+        type: z19.literal("listTools"),
+        serverLabel: z19.string(),
+        tools: z19.array(
+          z19.object({
+            name: z19.string(),
+            description: z19.string().optional(),
             inputSchema: jsonValueSchema,
-            annotations: z21.record(z21.string(), jsonValueSchema).optional()
+            annotations: z19.record(z19.string(), jsonValueSchema).optional()
           })
         ),
-        error: z21.union([z21.string(), jsonValueSchema]).optional()
+        error: z19.union([z19.string(), jsonValueSchema]).optional()
       }),
-      z21.object({
-        type: z21.literal("approvalRequest"),
-        serverLabel: z21.string(),
-        name: z21.string(),
-        arguments: z21.string(),
-        approvalRequestId: z21.string()
+      z19.object({
+        type: z19.literal("approvalRequest"),
+        serverLabel: z19.string(),
+        name: z19.string(),
+        arguments: z19.string(),
+        approvalRequestId: z19.string()
       })
     ])
   )
 );
-var mcpToolFactory = createProviderDefinedToolFactoryWithOutputSchema7({
+var mcpToolFactory = createProviderToolFactoryWithOutputSchema5({
   id: "openai.mcp",
-  name: "mcp",
   inputSchema: mcpInputSchema,
   outputSchema: mcpOutputSchema
 });
 
+// src/tool/web-search.ts
+import {
+  createProviderToolFactoryWithOutputSchema as createProviderToolFactoryWithOutputSchema6,
+  lazySchema as lazySchema18,
+  zodSchema as zodSchema18
+} from "@ai-sdk/provider-utils";
+import { z as z20 } from "zod/v4";
+var webSearchArgsSchema = lazySchema18(
+  () => zodSchema18(
+    z20.object({
+      externalWebAccess: z20.boolean().optional(),
+      filters: z20.object({ allowedDomains: z20.array(z20.string()).optional() }).optional(),
+      searchContextSize: z20.enum(["low", "medium", "high"]).optional(),
+      userLocation: z20.object({
+        type: z20.literal("approximate"),
+        country: z20.string().optional(),
+        city: z20.string().optional(),
+        region: z20.string().optional(),
+        timezone: z20.string().optional()
+      }).optional()
+    })
+  )
+);
+var webSearchInputSchema = lazySchema18(() => zodSchema18(z20.object({})));
+var webSearchOutputSchema = lazySchema18(
+  () => zodSchema18(
+    z20.object({
+      action: z20.discriminatedUnion("type", [
+        z20.object({
+          type: z20.literal("search"),
+          query: z20.string().optional()
+        }),
+        z20.object({
+          type: z20.literal("openPage"),
+          url: z20.string()
+        }),
+        z20.object({
+          type: z20.literal("find"),
+          url: z20.string(),
+          pattern: z20.string()
+        })
+      ]),
+      sources: z20.array(
+        z20.discriminatedUnion("type", [
+          z20.object({ type: z20.literal("url"), url: z20.string() }),
+          z20.object({ type: z20.literal("api"), name: z20.string() })
+        ])
+      ).optional()
+    })
+  )
+);
+var webSearchToolFactory = createProviderToolFactoryWithOutputSchema6({
+  id: "openai.web_search",
+  inputSchema: webSearchInputSchema,
+  outputSchema: webSearchOutputSchema
+});
+
+// src/tool/web-search-preview.ts
+import {
+  createProviderToolFactoryWithOutputSchema as createProviderToolFactoryWithOutputSchema7,
+  lazySchema as lazySchema19,
+  zodSchema as zodSchema19
+} from "@ai-sdk/provider-utils";
+import { z as z21 } from "zod/v4";
+var webSearchPreviewArgsSchema = lazySchema19(
+  () => zodSchema19(
+    z21.object({
+      searchContextSize: z21.enum(["low", "medium", "high"]).optional(),
+      userLocation: z21.object({
+        type: z21.literal("approximate"),
+        country: z21.string().optional(),
+        city: z21.string().optional(),
+        region: z21.string().optional(),
+        timezone: z21.string().optional()
+      }).optional()
+    })
+  )
+);
+var webSearchPreviewInputSchema = lazySchema19(
+  () => zodSchema19(z21.object({}))
+);
+var webSearchPreviewOutputSchema = lazySchema19(
+  () => zodSchema19(
+    z21.object({
+      action: z21.discriminatedUnion("type", [
+        z21.object({
+          type: z21.literal("search"),
+          query: z21.string().optional()
+        }),
+        z21.object({
+          type: z21.literal("openPage"),
+          url: z21.string()
+        }),
+        z21.object({
+          type: z21.literal("find"),
+          url: z21.string(),
+          pattern: z21.string()
+        })
+      ])
+    })
+  )
+);
+var webSearchPreview = createProviderToolFactoryWithOutputSchema7({
+  id: "openai.web_search_preview",
+  inputSchema: webSearchPreviewInputSchema,
+  outputSchema: webSearchPreviewOutputSchema
+});
+
 // src/responses/openai-responses-prepare-tools.ts
-import { validateTypes as validateTypes2 } from "@ai-sdk/provider-utils";
 async function prepareResponsesTools({
   tools,
   toolChoice,
@@ -3566,7 +3565,7 @@ async function prepareResponsesTools({
           strict: strictJsonSchema
         });
         break;
-      case "provider-defined": {
+      case "provider": {
         switch (tool.id) {
           case "openai.file_search": {
             const args = await validateTypes2({
@@ -3666,15 +3665,6 @@ async function prepareResponsesTools({
               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
@@ -3775,8 +3765,21 @@ var OpenAIResponsesLanguageModel = class {
         details: "conversation and previousResponseId cannot be used together"
       });
     }
+    const toolNameMapping = createToolNameMapping({
+      tools,
+      providerToolNames: {
+        "openai.code_interpreter": "code_interpreter",
+        "openai.file_search": "file_search",
+        "openai.image_generation": "image_generation",
+        "openai.local_shell": "local_shell",
+        "openai.web_search": "web_search",
+        "openai.web_search_preview": "web_search_preview",
+        "openai.mcp": "mcp"
+      }
+    });
     const { input, warnings: inputWarnings } = await convertToOpenAIResponsesInput({
       prompt,
+      toolNameMapping,
       systemMessageMode: modelConfig.systemMessageMode,
       fileIdPrefixes: this.config.fileIdPrefixes,
       store: (_a = openaiOptions == null ? void 0 : openaiOptions.store) != null ? _a : true,
@@ -3793,16 +3796,14 @@ var OpenAIResponsesLanguageModel = class {
       }
     }
     function hasOpenAITool(id) {
-      return (tools == null ? void 0 : tools.find(
-        (tool) => tool.type === "provider-defined" && tool.id === id
-      )) != null;
+      return (tools == null ? void 0 : tools.find((tool) => tool.type === "provider" && tool.id === id)) != null;
     }
     const topLogprobs = typeof (openaiOptions == null ? void 0 : openaiOptions.logprobs) === "number" ? openaiOptions == null ? void 0 : openaiOptions.logprobs : (openaiOptions == null ? void 0 : openaiOptions.logprobs) === true ? TOP_LOGPROBS_MAX : void 0;
     if (topLogprobs) {
       addInclude("message.output_text.logprobs");
     }
     const webSearchToolName = (_c = tools == null ? void 0 : tools.find(
-      (tool) => tool.type === "provider-defined" && (tool.id === "openai.web_search" || tool.id === "openai.web_search_preview")
+      (tool) => tool.type === "provider" && (tool.id === "openai.web_search" || tool.id === "openai.web_search_preview")
     )) == null ? void 0 : _c.name;
     if (webSearchToolName) {
       addInclude("web_search_call.action.sources");
@@ -3930,7 +3931,8 @@ var OpenAIResponsesLanguageModel = class {
         tool_choice: openaiToolChoice
       },
       warnings: [...warnings, ...toolWarnings],
-      store
+      store,
+      toolNameMapping
     };
   }
   async doGenerate(options) {
@@ -3938,7 +3940,8 @@ var OpenAIResponsesLanguageModel = class {
     const {
       args: body,
       warnings,
-      webSearchToolName
+      webSearchToolName,
+      toolNameMapping
     } = await this.getArgs(options);
     const url = this.config.url({
       path: "/responses",
@@ -3998,14 +4001,14 @@ var OpenAIResponsesLanguageModel = class {
           content.push({
             type: "tool-call",
             toolCallId: part.id,
-            toolName: "image_generation",
+            toolName: toolNameMapping.toCustomToolName("image_generation"),
             input: "{}",
             providerExecuted: true
           });
           content.push({
             type: "tool-result",
             toolCallId: part.id,
-            toolName: "image_generation",
+            toolName: toolNameMapping.toCustomToolName("image_generation"),
             result: {
               result: part.result
             }
@@ -4016,7 +4019,7 @@ var OpenAIResponsesLanguageModel = class {
           content.push({
             type: "tool-call",
             toolCallId: part.call_id,
-            toolName: "local_shell",
+            toolName: toolNameMapping.toCustomToolName("local_shell"),
             input: JSON.stringify({
               action: part.action
             }),
@@ -4126,14 +4129,18 @@ var OpenAIResponsesLanguageModel = class {
           content.push({
             type: "tool-call",
             toolCallId: part.id,
-            toolName: webSearchToolName != null ? webSearchToolName : "web_search",
+            toolName: toolNameMapping.toCustomToolName(
+              webSearchToolName != null ? webSearchToolName : "web_search"
+            ),
             input: JSON.stringify({}),
             providerExecuted: true
           });
           content.push({
             type: "tool-result",
             toolCallId: part.id,
-            toolName: webSearchToolName != null ? webSearchToolName : "web_search",
+            toolName: toolNameMapping.toCustomToolName(
+              webSearchToolName != null ? webSearchToolName : "web_search"
+            ),
             result: mapWebSearchOutput(part.action)
           });
           break;
@@ -4142,14 +4149,14 @@ var OpenAIResponsesLanguageModel = class {
           content.push({
             type: "tool-call",
             toolCallId: part.id,
-            toolName: "mcp",
+            toolName: toolNameMapping.toCustomToolName("mcp"),
             input: JSON.stringify({}),
             providerExecuted: true
           });
           content.push({
             type: "tool-result",
             toolCallId: part.id,
-            toolName: "mcp",
+            toolName: toolNameMapping.toCustomToolName("mcp"),
             result: {
               type: "call",
               serverLabel: part.server_label,
@@ -4165,14 +4172,14 @@ var OpenAIResponsesLanguageModel = class {
           content.push({
             type: "tool-call",
             toolCallId: part.id,
-            toolName: "mcp",
+            toolName: toolNameMapping.toCustomToolName("mcp"),
             input: JSON.stringify({}),
             providerExecuted: true
           });
           content.push({
             type: "tool-result",
             toolCallId: part.id,
-            toolName: "mcp",
+            toolName: toolNameMapping.toCustomToolName("mcp"),
             result: {
               type: "listTools",
               serverLabel: part.server_label,
@@ -4194,14 +4201,14 @@ var OpenAIResponsesLanguageModel = class {
           content.push({
             type: "tool-call",
             toolCallId: part.id,
-            toolName: "mcp",
+            toolName: toolNameMapping.toCustomToolName("mcp"),
             input: JSON.stringify({}),
             providerExecuted: true
           });
           content.push({
             type: "tool-result",
             toolCallId: part.id,
-            toolName: "mcp",
+            toolName: toolNameMapping.toCustomToolName("mcp"),
             result: {
               type: "approvalRequest",
               serverLabel: part.server_label,
@@ -4216,14 +4223,14 @@ var OpenAIResponsesLanguageModel = class {
           content.push({
             type: "tool-call",
             toolCallId: part.id,
-            toolName: "computer_use",
+            toolName: toolNameMapping.toCustomToolName("computer_use"),
             input: "",
             providerExecuted: true
           });
           content.push({
             type: "tool-result",
             toolCallId: part.id,
-            toolName: "computer_use",
+            toolName: toolNameMapping.toCustomToolName("computer_use"),
             result: {
               type: "computer_use_tool_result",
               status: part.status || "completed"
@@ -4235,14 +4242,14 @@ var OpenAIResponsesLanguageModel = class {
           content.push({
             type: "tool-call",
             toolCallId: part.id,
-            toolName: "file_search",
+            toolName: toolNameMapping.toCustomToolName("file_search"),
             input: "{}",
             providerExecuted: true
           });
           content.push({
             type: "tool-result",
             toolCallId: part.id,
-            toolName: "file_search",
+            toolName: toolNameMapping.toCustomToolName("file_search"),
             result: {
               queries: part.queries,
               results: (_w = (_v = part.results) == null ? void 0 : _v.map((result) => ({
@@ -4260,7 +4267,7 @@ var OpenAIResponsesLanguageModel = class {
           content.push({
             type: "tool-call",
             toolCallId: part.id,
-            toolName: "code_interpreter",
+            toolName: toolNameMapping.toCustomToolName("code_interpreter"),
             input: JSON.stringify({
               code: part.code,
               containerId: part.container_id
@@ -4270,7 +4277,7 @@ var OpenAIResponsesLanguageModel = class {
           content.push({
             type: "tool-result",
             toolCallId: part.id,
-            toolName: "code_interpreter",
+            toolName: toolNameMapping.toCustomToolName("code_interpreter"),
             result: {
               outputs: part.outputs
             }
@@ -4319,6 +4326,7 @@ var OpenAIResponsesLanguageModel = class {
       args: body,
       warnings,
       webSearchToolName,
+      toolNameMapping,
       store
     } = await this.getArgs(options);
     const { responseHeaders, value: response } = await postJsonToApi6({
@@ -4383,13 +4391,17 @@ var OpenAIResponsesLanguageModel = class {
                 });
               } else if (value.item.type === "web_search_call") {
                 ongoingToolCalls[value.output_index] = {
-                  toolName: webSearchToolName != null ? webSearchToolName : "web_search",
+                  toolName: toolNameMapping.toCustomToolName(
+                    webSearchToolName != null ? webSearchToolName : "web_search"
+                  ),
                   toolCallId: value.item.id
                 };
                 controller.enqueue({
                   type: "tool-input-start",
                   id: value.item.id,
-                  toolName: webSearchToolName != null ? webSearchToolName : "web_search",
+                  toolName: toolNameMapping.toCustomToolName(
+                    webSearchToolName != null ? webSearchToolName : "web_search"
+                  ),
                   providerExecuted: true
                 });
                 controller.enqueue({
@@ -4399,24 +4411,26 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-call",
                   toolCallId: value.item.id,
-                  toolName: webSearchToolName != null ? webSearchToolName : "web_search",
+                  toolName: toolNameMapping.toCustomToolName(
+                    webSearchToolName != null ? webSearchToolName : "web_search"
+                  ),
                   input: JSON.stringify({}),
                   providerExecuted: true
                 });
               } else if (value.item.type === "computer_call") {
                 ongoingToolCalls[value.output_index] = {
-                  toolName: "computer_use",
+                  toolName: toolNameMapping.toCustomToolName("computer_use"),
                   toolCallId: value.item.id
                 };
                 controller.enqueue({
                   type: "tool-input-start",
                   id: value.item.id,
-                  toolName: "computer_use",
+                  toolName: toolNameMapping.toCustomToolName("computer_use"),
                   providerExecuted: true
                 });
               } else if (value.item.type === "code_interpreter_call") {
                 ongoingToolCalls[value.output_index] = {
-                  toolName: "code_interpreter",
+                  toolName: toolNameMapping.toCustomToolName("code_interpreter"),
                   toolCallId: value.item.id,
                   codeInterpreter: {
                     containerId: value.item.container_id
@@ -4425,7 +4439,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-input-start",
                   id: value.item.id,
-                  toolName: "code_interpreter",
+                  toolName: toolNameMapping.toCustomToolName("code_interpreter"),
                   providerExecuted: true
                 });
                 controller.enqueue({
@@ -4437,7 +4451,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-call",
                   toolCallId: value.item.id,
-                  toolName: "file_search",
+                  toolName: toolNameMapping.toCustomToolName("file_search"),
                   input: "{}",
                   providerExecuted: true
                 });
@@ -4445,7 +4459,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-call",
                   toolCallId: value.item.id,
-                  toolName: "image_generation",
+                  toolName: toolNameMapping.toCustomToolName("image_generation"),
                   input: "{}",
                   providerExecuted: true
                 });
@@ -4453,7 +4467,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-call",
                   toolCallId: value.item.id,
-                  toolName: "mcp",
+                  toolName: toolNameMapping.toCustomToolName("mcp"),
                   input: "{}",
                   providerExecuted: true
                 });
@@ -4521,7 +4535,9 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-result",
                   toolCallId: value.item.id,
-                  toolName: webSearchToolName != null ? webSearchToolName : "web_search",
+                  toolName: toolNameMapping.toCustomToolName(
+                    webSearchToolName != null ? webSearchToolName : "web_search"
+                  ),
                   result: mapWebSearchOutput(value.item.action)
                 });
               } else if (value.item.type === "computer_call") {
@@ -4533,14 +4549,14 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-call",
                   toolCallId: value.item.id,
-                  toolName: "computer_use",
+                  toolName: toolNameMapping.toCustomToolName("computer_use"),
                   input: "",
                   providerExecuted: true
                 });
                 controller.enqueue({
                   type: "tool-result",
                   toolCallId: value.item.id,
-                  toolName: "computer_use",
+                  toolName: toolNameMapping.toCustomToolName("computer_use"),
                   result: {
                     type: "computer_use_tool_result",
                     status: value.item.status || "completed"
@@ -4551,7 +4567,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-result",
                   toolCallId: value.item.id,
-                  toolName: "file_search",
+                  toolName: toolNameMapping.toCustomToolName("file_search"),
                   result: {
                     queries: value.item.queries,
                     results: (_c = (_b = value.item.results) == null ? void 0 : _b.map((result) => ({
@@ -4568,7 +4584,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-result",
                   toolCallId: value.item.id,
-                  toolName: "code_interpreter",
+                  toolName: toolNameMapping.toCustomToolName("code_interpreter"),
                   result: {
                     outputs: value.item.outputs
                   }
@@ -4577,7 +4593,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-result",
                   toolCallId: value.item.id,
-                  toolName: "image_generation",
+                  toolName: toolNameMapping.toCustomToolName("image_generation"),
                   result: {
                     result: value.item.result
                   }
@@ -4587,7 +4603,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-result",
                   toolCallId: value.item.id,
-                  toolName: "mcp",
+                  toolName: toolNameMapping.toCustomToolName("mcp"),
                   result: {
                     type: "call",
                     serverLabel: value.item.server_label,
@@ -4602,7 +4618,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-result",
                   toolCallId: value.item.id,
-                  toolName: "mcp",
+                  toolName: toolNameMapping.toCustomToolName("mcp"),
                   result: {
                     type: "listTools",
                     serverLabel: value.item.server_label,
@@ -4623,7 +4639,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-result",
                   toolCallId: value.item.id,
-                  toolName: "mcp",
+                  toolName: toolNameMapping.toCustomToolName("mcp"),
                   result: {
                     type: "approvalRequest",
                     serverLabel: value.item.server_label,
@@ -4637,7 +4653,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-call",
                   toolCallId: value.item.call_id,
-                  toolName: "local_shell",
+                  toolName: toolNameMapping.toCustomToolName("local_shell"),
                   input: JSON.stringify({
                     action: {
                       type: "exec",
@@ -4686,7 +4702,7 @@ var OpenAIResponsesLanguageModel = class {
               controller.enqueue({
                 type: "tool-result",
                 toolCallId: value.item_id,
-                toolName: "image_generation",
+                toolName: toolNameMapping.toCustomToolName("image_generation"),
                 result: {
                   result: value.partial_image_b64
                 },
@@ -4718,7 +4734,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-call",
                   toolCallId: toolCall.toolCallId,
-                  toolName: "code_interpreter",
+                  toolName: toolNameMapping.toCustomToolName("code_interpreter"),
                   input: JSON.stringify({
                     code: value.code,
                     containerId: toolCall.codeInterpreter.containerId