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

package/dist/internal/index.js

@@ -2156,9 +2156,8 @@ var localShellInputSchema = (0, import_provider_utils19.lazySchema)(
 var localShellOutputSchema = (0, import_provider_utils19.lazySchema)(
   () => (0, import_provider_utils19.zodSchema)(import_v412.z.object({ output: import_v412.z.string() }))
 );
-var localShell = (0, import_provider_utils19.createProviderDefinedToolFactoryWithOutputSchema)({
+var localShell = (0, import_provider_utils19.createProviderToolFactoryWithOutputSchema)({
   id: "openai.local_shell",
-  name: "local_shell",
   inputSchema: localShellInputSchema,
   outputSchema: localShellOutputSchema
 });
@@ -2170,6 +2169,7 @@ function isFileId(data, prefixes) {
 }
 async function convertToOpenAIResponsesInput({
   prompt,
+  toolNameMapping,
   systemMessageMode,
   fileIdPrefixes,
   store,
@@ -2252,7 +2252,6 @@ async function convertToOpenAIResponsesInput({
       }
       case "assistant": {
         const reasoningMessages = {};
-        const toolCallParts = {};
         for (const part of content) {
           switch (part.type) {
             case "text": {
@@ -2269,7 +2268,6 @@ async function convertToOpenAIResponsesInput({
               break;
             }
             case "tool-call": {
-              toolCallParts[part.toolCallId] = part;
               if (part.providerExecuted) {
                 break;
               }
@@ -2278,7 +2276,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 (0, import_provider_utils20.validateTypes)({
                   value: part.input,
                   schema: localShellInputSchema
@@ -2301,7 +2302,7 @@ async function convertToOpenAIResponsesInput({
               input.push({
                 type: "function_call",
                 call_id: part.toolCallId,
-                name: part.toolName,
+                name: resolvedToolName,
                 arguments: JSON.stringify(part.input),
                 id
               });
@@ -2380,7 +2381,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 (0, import_provider_utils20.validateTypes)({
               value: output.value,
               schema: localShellOutputSchema
@@ -3182,6 +3186,7 @@ var openaiResponsesProviderOptionsSchema = (0, import_provider_utils22.lazySchem
 
 // src/responses/openai-responses-prepare-tools.ts
 var import_provider7 = require("@ai-sdk/provider");
+var import_provider_utils29 = require("@ai-sdk/provider-utils");
 
 // src/tool/code-interpreter.ts
 var import_provider_utils23 = require("@ai-sdk/provider-utils");
@@ -3218,9 +3223,8 @@ var codeInterpreterArgsSchema = (0, import_provider_utils23.lazySchema)(
     })
   )
 );
-var codeInterpreterToolFactory = (0, import_provider_utils23.createProviderDefinedToolFactoryWithOutputSchema)({
+var codeInterpreterToolFactory = (0, import_provider_utils23.createProviderToolFactoryWithOutputSchema)({
   id: "openai.code_interpreter",
-  name: "code_interpreter",
   inputSchema: codeInterpreterInputSchema,
   outputSchema: codeInterpreterOutputSchema
 });
@@ -3271,144 +3275,40 @@ var fileSearchOutputSchema = (0, import_provider_utils24.lazySchema)(
     })
   )
 );
-var fileSearch = (0, import_provider_utils24.createProviderDefinedToolFactoryWithOutputSchema)({
+var fileSearch = (0, import_provider_utils24.createProviderToolFactoryWithOutputSchema)({
   id: "openai.file_search",
-  name: "file_search",
   inputSchema: import_v417.z.object({}),
   outputSchema: fileSearchOutputSchema
 });
 
-// src/tool/web-search.ts
+// src/tool/image-generation.ts
 var import_provider_utils25 = require("@ai-sdk/provider-utils");
 var import_v418 = require("zod/v4");
-var webSearchArgsSchema = (0, import_provider_utils25.lazySchema)(
-  () => (0, import_provider_utils25.zodSchema)(
-    import_v418.z.object({
-      externalWebAccess: import_v418.z.boolean().optional(),
-      filters: import_v418.z.object({ allowedDomains: import_v418.z.array(import_v418.z.string()).optional() }).optional(),
-      searchContextSize: import_v418.z.enum(["low", "medium", "high"]).optional(),
-      userLocation: import_v418.z.object({
-        type: import_v418.z.literal("approximate"),
-        country: import_v418.z.string().optional(),
-        city: import_v418.z.string().optional(),
-        region: import_v418.z.string().optional(),
-        timezone: import_v418.z.string().optional()
-      }).optional()
-    })
-  )
-);
-var webSearchInputSchema = (0, import_provider_utils25.lazySchema)(() => (0, import_provider_utils25.zodSchema)(import_v418.z.object({})));
-var webSearchOutputSchema = (0, import_provider_utils25.lazySchema)(
+var imageGenerationArgsSchema = (0, import_provider_utils25.lazySchema)(
   () => (0, import_provider_utils25.zodSchema)(
     import_v418.z.object({
-      action: import_v418.z.discriminatedUnion("type", [
-        import_v418.z.object({
-          type: import_v418.z.literal("search"),
-          query: import_v418.z.string().optional()
-        }),
-        import_v418.z.object({
-          type: import_v418.z.literal("openPage"),
-          url: import_v418.z.string()
-        }),
-        import_v418.z.object({
-          type: import_v418.z.literal("find"),
-          url: import_v418.z.string(),
-          pattern: import_v418.z.string()
-        })
-      ]),
-      sources: import_v418.z.array(
-        import_v418.z.discriminatedUnion("type", [
-          import_v418.z.object({ type: import_v418.z.literal("url"), url: import_v418.z.string() }),
-          import_v418.z.object({ type: import_v418.z.literal("api"), name: import_v418.z.string() })
-        ])
-      ).optional()
-    })
-  )
-);
-var webSearchToolFactory = (0, import_provider_utils25.createProviderDefinedToolFactoryWithOutputSchema)({
-  id: "openai.web_search",
-  name: "web_search",
-  inputSchema: webSearchInputSchema,
-  outputSchema: webSearchOutputSchema
-});
-
-// src/tool/web-search-preview.ts
-var import_provider_utils26 = require("@ai-sdk/provider-utils");
-var import_v419 = require("zod/v4");
-var webSearchPreviewArgsSchema = (0, import_provider_utils26.lazySchema)(
-  () => (0, import_provider_utils26.zodSchema)(
-    import_v419.z.object({
-      searchContextSize: import_v419.z.enum(["low", "medium", "high"]).optional(),
-      userLocation: import_v419.z.object({
-        type: import_v419.z.literal("approximate"),
-        country: import_v419.z.string().optional(),
-        city: import_v419.z.string().optional(),
-        region: import_v419.z.string().optional(),
-        timezone: import_v419.z.string().optional()
-      }).optional()
-    })
-  )
-);
-var webSearchPreviewInputSchema = (0, import_provider_utils26.lazySchema)(
-  () => (0, import_provider_utils26.zodSchema)(import_v419.z.object({}))
-);
-var webSearchPreviewOutputSchema = (0, import_provider_utils26.lazySchema)(
-  () => (0, import_provider_utils26.zodSchema)(
-    import_v419.z.object({
-      action: import_v419.z.discriminatedUnion("type", [
-        import_v419.z.object({
-          type: import_v419.z.literal("search"),
-          query: import_v419.z.string().optional()
-        }),
-        import_v419.z.object({
-          type: import_v419.z.literal("openPage"),
-          url: import_v419.z.string()
-        }),
-        import_v419.z.object({
-          type: import_v419.z.literal("find"),
-          url: import_v419.z.string(),
-          pattern: import_v419.z.string()
-        })
-      ])
-    })
-  )
-);
-var webSearchPreview = (0, import_provider_utils26.createProviderDefinedToolFactoryWithOutputSchema)({
-  id: "openai.web_search_preview",
-  name: "web_search_preview",
-  inputSchema: webSearchPreviewInputSchema,
-  outputSchema: webSearchPreviewOutputSchema
-});
-
-// src/tool/image-generation.ts
-var import_provider_utils27 = require("@ai-sdk/provider-utils");
-var import_v420 = require("zod/v4");
-var imageGenerationArgsSchema = (0, import_provider_utils27.lazySchema)(
-  () => (0, import_provider_utils27.zodSchema)(
-    import_v420.z.object({
-      background: import_v420.z.enum(["auto", "opaque", "transparent"]).optional(),
-      inputFidelity: import_v420.z.enum(["low", "high"]).optional(),
-      inputImageMask: import_v420.z.object({
-        fileId: import_v420.z.string().optional(),
-        imageUrl: import_v420.z.string().optional()
+      background: import_v418.z.enum(["auto", "opaque", "transparent"]).optional(),
+      inputFidelity: import_v418.z.enum(["low", "high"]).optional(),
+      inputImageMask: import_v418.z.object({
+        fileId: import_v418.z.string().optional(),
+        imageUrl: import_v418.z.string().optional()
       }).optional(),
-      model: import_v420.z.string().optional(),
-      moderation: import_v420.z.enum(["auto"]).optional(),
-      outputCompression: import_v420.z.number().int().min(0).max(100).optional(),
-      outputFormat: import_v420.z.enum(["png", "jpeg", "webp"]).optional(),
-      partialImages: import_v420.z.number().int().min(0).max(3).optional(),
-      quality: import_v420.z.enum(["auto", "low", "medium", "high"]).optional(),
-      size: import_v420.z.enum(["1024x1024", "1024x1536", "1536x1024", "auto"]).optional()
+      model: import_v418.z.string().optional(),
+      moderation: import_v418.z.enum(["auto"]).optional(),
+      outputCompression: import_v418.z.number().int().min(0).max(100).optional(),
+      outputFormat: import_v418.z.enum(["png", "jpeg", "webp"]).optional(),
+      partialImages: import_v418.z.number().int().min(0).max(3).optional(),
+      quality: import_v418.z.enum(["auto", "low", "medium", "high"]).optional(),
+      size: import_v418.z.enum(["1024x1024", "1024x1536", "1536x1024", "auto"]).optional()
     }).strict()
   )
 );
-var imageGenerationInputSchema = (0, import_provider_utils27.lazySchema)(() => (0, import_provider_utils27.zodSchema)(import_v420.z.object({})));
-var imageGenerationOutputSchema = (0, import_provider_utils27.lazySchema)(
-  () => (0, import_provider_utils27.zodSchema)(import_v420.z.object({ result: import_v420.z.string() }))
+var imageGenerationInputSchema = (0, import_provider_utils25.lazySchema)(() => (0, import_provider_utils25.zodSchema)(import_v418.z.object({})));
+var imageGenerationOutputSchema = (0, import_provider_utils25.lazySchema)(
+  () => (0, import_provider_utils25.zodSchema)(import_v418.z.object({ result: import_v418.z.string() }))
 );
-var imageGenerationToolFactory = (0, import_provider_utils27.createProviderDefinedToolFactoryWithOutputSchema)({
+var imageGenerationToolFactory = (0, import_provider_utils25.createProviderToolFactoryWithOutputSchema)({
   id: "openai.image_generation",
-  name: "image_generation",
   inputSchema: imageGenerationInputSchema,
   outputSchema: imageGenerationOutputSchema
 });
@@ -3417,32 +3317,32 @@ var imageGeneration = (args = {}) => {
 };
 
 // src/tool/mcp.ts
-var import_provider_utils28 = require("@ai-sdk/provider-utils");
-var import_v421 = require("zod/v4");
-var jsonValueSchema = import_v421.z.lazy(
-  () => import_v421.z.union([
-    import_v421.z.string(),
-    import_v421.z.number(),
-    import_v421.z.boolean(),
-    import_v421.z.null(),
-    import_v421.z.array(jsonValueSchema),
-    import_v421.z.record(import_v421.z.string(), jsonValueSchema)
+var import_provider_utils26 = require("@ai-sdk/provider-utils");
+var import_v419 = require("zod/v4");
+var jsonValueSchema = import_v419.z.lazy(
+  () => import_v419.z.union([
+    import_v419.z.string(),
+    import_v419.z.number(),
+    import_v419.z.boolean(),
+    import_v419.z.null(),
+    import_v419.z.array(jsonValueSchema),
+    import_v419.z.record(import_v419.z.string(), jsonValueSchema)
   ])
 );
-var mcpArgsSchema = (0, import_provider_utils28.lazySchema)(
-  () => (0, import_provider_utils28.zodSchema)(
-    import_v421.z.object({
-      serverLabel: import_v421.z.string(),
-      allowedTools: import_v421.z.union([
-        import_v421.z.array(import_v421.z.string()),
-        import_v421.z.object({
-          readOnly: import_v421.z.boolean().optional(),
-          toolNames: import_v421.z.array(import_v421.z.string()).optional()
+var mcpArgsSchema = (0, import_provider_utils26.lazySchema)(
+  () => (0, import_provider_utils26.zodSchema)(
+    import_v419.z.object({
+      serverLabel: import_v419.z.string(),
+      allowedTools: import_v419.z.union([
+        import_v419.z.array(import_v419.z.string()),
+        import_v419.z.object({
+          readOnly: import_v419.z.boolean().optional(),
+          toolNames: import_v419.z.array(import_v419.z.string()).optional()
         })
       ]).optional(),
-      authorization: import_v421.z.string().optional(),
-      connectorId: import_v421.z.string().optional(),
-      headers: import_v421.z.record(import_v421.z.string(), import_v421.z.string()).optional(),
+      authorization: import_v419.z.string().optional(),
+      connectorId: import_v419.z.string().optional(),
+      headers: import_v419.z.record(import_v419.z.string(), import_v419.z.string()).optional(),
       // TODO: Integrate this MCP tool approval with our SDK's existing tool approval architecture
       // requireApproval: z
       //   .union([
@@ -3453,58 +3353,156 @@ var mcpArgsSchema = (0, import_provider_utils28.lazySchema)(
       //     }),
       //   ])
       //   .optional(),
-      serverDescription: import_v421.z.string().optional(),
-      serverUrl: import_v421.z.string().optional()
+      serverDescription: import_v419.z.string().optional(),
+      serverUrl: import_v419.z.string().optional()
     }).refine(
       (v) => v.serverUrl != null || v.connectorId != null,
       "One of serverUrl or connectorId must be provided."
     )
   )
 );
-var mcpInputSchema = (0, import_provider_utils28.lazySchema)(() => (0, import_provider_utils28.zodSchema)(import_v421.z.object({})));
-var mcpOutputSchema = (0, import_provider_utils28.lazySchema)(
-  () => (0, import_provider_utils28.zodSchema)(
-    import_v421.z.discriminatedUnion("type", [
-      import_v421.z.object({
-        type: import_v421.z.literal("call"),
-        serverLabel: import_v421.z.string(),
-        name: import_v421.z.string(),
-        arguments: import_v421.z.string(),
-        output: import_v421.z.string().nullable().optional(),
-        error: import_v421.z.union([import_v421.z.string(), jsonValueSchema]).optional()
+var mcpInputSchema = (0, import_provider_utils26.lazySchema)(() => (0, import_provider_utils26.zodSchema)(import_v419.z.object({})));
+var mcpOutputSchema = (0, import_provider_utils26.lazySchema)(
+  () => (0, import_provider_utils26.zodSchema)(
+    import_v419.z.discriminatedUnion("type", [
+      import_v419.z.object({
+        type: import_v419.z.literal("call"),
+        serverLabel: import_v419.z.string(),
+        name: import_v419.z.string(),
+        arguments: import_v419.z.string(),
+        output: import_v419.z.string().nullable().optional(),
+        error: import_v419.z.union([import_v419.z.string(), jsonValueSchema]).optional()
       }),
-      import_v421.z.object({
-        type: import_v421.z.literal("listTools"),
-        serverLabel: import_v421.z.string(),
-        tools: import_v421.z.array(
-          import_v421.z.object({
-            name: import_v421.z.string(),
-            description: import_v421.z.string().optional(),
+      import_v419.z.object({
+        type: import_v419.z.literal("listTools"),
+        serverLabel: import_v419.z.string(),
+        tools: import_v419.z.array(
+          import_v419.z.object({
+            name: import_v419.z.string(),
+            description: import_v419.z.string().optional(),
             inputSchema: jsonValueSchema,
-            annotations: import_v421.z.record(import_v421.z.string(), jsonValueSchema).optional()
+            annotations: import_v419.z.record(import_v419.z.string(), jsonValueSchema).optional()
           })
         ),
-        error: import_v421.z.union([import_v421.z.string(), jsonValueSchema]).optional()
+        error: import_v419.z.union([import_v419.z.string(), jsonValueSchema]).optional()
       }),
-      import_v421.z.object({
-        type: import_v421.z.literal("approvalRequest"),
-        serverLabel: import_v421.z.string(),
-        name: import_v421.z.string(),
-        arguments: import_v421.z.string(),
-        approvalRequestId: import_v421.z.string()
+      import_v419.z.object({
+        type: import_v419.z.literal("approvalRequest"),
+        serverLabel: import_v419.z.string(),
+        name: import_v419.z.string(),
+        arguments: import_v419.z.string(),
+        approvalRequestId: import_v419.z.string()
       })
     ])
   )
 );
-var mcpToolFactory = (0, import_provider_utils28.createProviderDefinedToolFactoryWithOutputSchema)({
+var mcpToolFactory = (0, import_provider_utils26.createProviderToolFactoryWithOutputSchema)({
   id: "openai.mcp",
-  name: "mcp",
   inputSchema: mcpInputSchema,
   outputSchema: mcpOutputSchema
 });
 
+// src/tool/web-search.ts
+var import_provider_utils27 = require("@ai-sdk/provider-utils");
+var import_v420 = require("zod/v4");
+var webSearchArgsSchema = (0, import_provider_utils27.lazySchema)(
+  () => (0, import_provider_utils27.zodSchema)(
+    import_v420.z.object({
+      externalWebAccess: import_v420.z.boolean().optional(),
+      filters: import_v420.z.object({ allowedDomains: import_v420.z.array(import_v420.z.string()).optional() }).optional(),
+      searchContextSize: import_v420.z.enum(["low", "medium", "high"]).optional(),
+      userLocation: import_v420.z.object({
+        type: import_v420.z.literal("approximate"),
+        country: import_v420.z.string().optional(),
+        city: import_v420.z.string().optional(),
+        region: import_v420.z.string().optional(),
+        timezone: import_v420.z.string().optional()
+      }).optional()
+    })
+  )
+);
+var webSearchInputSchema = (0, import_provider_utils27.lazySchema)(() => (0, import_provider_utils27.zodSchema)(import_v420.z.object({})));
+var webSearchOutputSchema = (0, import_provider_utils27.lazySchema)(
+  () => (0, import_provider_utils27.zodSchema)(
+    import_v420.z.object({
+      action: import_v420.z.discriminatedUnion("type", [
+        import_v420.z.object({
+          type: import_v420.z.literal("search"),
+          query: import_v420.z.string().optional()
+        }),
+        import_v420.z.object({
+          type: import_v420.z.literal("openPage"),
+          url: import_v420.z.string()
+        }),
+        import_v420.z.object({
+          type: import_v420.z.literal("find"),
+          url: import_v420.z.string(),
+          pattern: import_v420.z.string()
+        })
+      ]),
+      sources: import_v420.z.array(
+        import_v420.z.discriminatedUnion("type", [
+          import_v420.z.object({ type: import_v420.z.literal("url"), url: import_v420.z.string() }),
+          import_v420.z.object({ type: import_v420.z.literal("api"), name: import_v420.z.string() })
+        ])
+      ).optional()
+    })
+  )
+);
+var webSearchToolFactory = (0, import_provider_utils27.createProviderToolFactoryWithOutputSchema)({
+  id: "openai.web_search",
+  inputSchema: webSearchInputSchema,
+  outputSchema: webSearchOutputSchema
+});
+
+// src/tool/web-search-preview.ts
+var import_provider_utils28 = require("@ai-sdk/provider-utils");
+var import_v421 = require("zod/v4");
+var webSearchPreviewArgsSchema = (0, import_provider_utils28.lazySchema)(
+  () => (0, import_provider_utils28.zodSchema)(
+    import_v421.z.object({
+      searchContextSize: import_v421.z.enum(["low", "medium", "high"]).optional(),
+      userLocation: import_v421.z.object({
+        type: import_v421.z.literal("approximate"),
+        country: import_v421.z.string().optional(),
+        city: import_v421.z.string().optional(),
+        region: import_v421.z.string().optional(),
+        timezone: import_v421.z.string().optional()
+      }).optional()
+    })
+  )
+);
+var webSearchPreviewInputSchema = (0, import_provider_utils28.lazySchema)(
+  () => (0, import_provider_utils28.zodSchema)(import_v421.z.object({}))
+);
+var webSearchPreviewOutputSchema = (0, import_provider_utils28.lazySchema)(
+  () => (0, import_provider_utils28.zodSchema)(
+    import_v421.z.object({
+      action: import_v421.z.discriminatedUnion("type", [
+        import_v421.z.object({
+          type: import_v421.z.literal("search"),
+          query: import_v421.z.string().optional()
+        }),
+        import_v421.z.object({
+          type: import_v421.z.literal("openPage"),
+          url: import_v421.z.string()
+        }),
+        import_v421.z.object({
+          type: import_v421.z.literal("find"),
+          url: import_v421.z.string(),
+          pattern: import_v421.z.string()
+        })
+      ])
+    })
+  )
+);
+var webSearchPreview = (0, import_provider_utils28.createProviderToolFactoryWithOutputSchema)({
+  id: "openai.web_search_preview",
+  inputSchema: webSearchPreviewInputSchema,
+  outputSchema: webSearchPreviewOutputSchema
+});
+
 // src/responses/openai-responses-prepare-tools.ts
-var import_provider_utils29 = require("@ai-sdk/provider-utils");
 async function prepareResponsesTools({
   tools,
   toolChoice,
@@ -3527,7 +3525,7 @@ async function prepareResponsesTools({
           strict: strictJsonSchema
         });
         break;
-      case "provider-defined": {
+      case "provider": {
         switch (tool.id) {
           case "openai.file_search": {
             const args = await (0, import_provider_utils29.validateTypes)({
@@ -3627,15 +3625,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
@@ -3736,8 +3725,21 @@ var OpenAIResponsesLanguageModel = class {
         details: "conversation and previousResponseId cannot be used together"
       });
     }
+    const toolNameMapping = (0, import_provider_utils30.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,
@@ -3754,16 +3756,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");
@@ -3891,7 +3891,8 @@ var OpenAIResponsesLanguageModel = class {
         tool_choice: openaiToolChoice
       },
       warnings: [...warnings, ...toolWarnings],
-      store
+      store,
+      toolNameMapping
     };
   }
   async doGenerate(options) {
@@ -3899,7 +3900,8 @@ var OpenAIResponsesLanguageModel = class {
     const {
       args: body,
       warnings,
-      webSearchToolName
+      webSearchToolName,
+      toolNameMapping
     } = await this.getArgs(options);
     const url = this.config.url({
       path: "/responses",
@@ -3959,14 +3961,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
             }
@@ -3977,7 +3979,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
             }),
@@ -4087,14 +4089,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;
@@ -4103,14 +4109,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,
@@ -4126,14 +4132,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,
@@ -4155,14 +4161,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,
@@ -4177,14 +4183,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"
@@ -4196,14 +4202,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) => ({
@@ -4221,7 +4227,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
@@ -4231,7 +4237,7 @@ var OpenAIResponsesLanguageModel = class {
           content.push({
             type: "tool-result",
             toolCallId: part.id,
-            toolName: "code_interpreter",
+            toolName: toolNameMapping.toCustomToolName("code_interpreter"),
             result: {
               outputs: part.outputs
             }
@@ -4280,6 +4286,7 @@ var OpenAIResponsesLanguageModel = class {
       args: body,
       warnings,
       webSearchToolName,
+      toolNameMapping,
       store
     } = await this.getArgs(options);
     const { responseHeaders, value: response } = await (0, import_provider_utils30.postJsonToApi)({
@@ -4344,13 +4351,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({
@@ -4360,24 +4371,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
@@ -4386,7 +4399,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({
@@ -4398,7 +4411,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-call",
                   toolCallId: value.item.id,
-                  toolName: "file_search",
+                  toolName: toolNameMapping.toCustomToolName("file_search"),
                   input: "{}",
                   providerExecuted: true
                 });
@@ -4406,7 +4419,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-call",
                   toolCallId: value.item.id,
-                  toolName: "image_generation",
+                  toolName: toolNameMapping.toCustomToolName("image_generation"),
                   input: "{}",
                   providerExecuted: true
                 });
@@ -4414,7 +4427,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-call",
                   toolCallId: value.item.id,
-                  toolName: "mcp",
+                  toolName: toolNameMapping.toCustomToolName("mcp"),
                   input: "{}",
                   providerExecuted: true
                 });
@@ -4482,7 +4495,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") {
@@ -4494,14 +4509,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"
@@ -4512,7 +4527,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) => ({
@@ -4529,7 +4544,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
                   }
@@ -4538,7 +4553,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
                   }
@@ -4548,7 +4563,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,
@@ -4563,7 +4578,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,
@@ -4584,7 +4599,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,
@@ -4598,7 +4613,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",
@@ -4647,7 +4662,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
                 },
@@ -4679,7 +4694,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