@openrouter/ai-sdk-provider 2.5.0 → 2.6.0

package/dist/internal/index.js

@@ -2441,6 +2441,29 @@ function withStreamErrorHandling(source, onError) {
   });
 }
 
+// src/utils/deterministic-stringify.ts
+function deterministicStringify(value) {
+  return JSON.stringify(sortKeys(value));
+}
+function sortKeys(value) {
+  if (value === null || value === void 0) {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    return value.map(sortKeys);
+  }
+  if (typeof value === "object") {
+    const sorted = {};
+    const entries = Object.entries(value);
+    entries.sort(([a], [b]) => a.localeCompare(b));
+    for (const [key, val] of entries) {
+      sorted[key] = sortKeys(val);
+    }
+    return sorted;
+  }
+  return value;
+}
+
 // src/utils/reasoning-details-duplicate-tracker.ts
 var _seenKeys;
 var ReasoningDetailsDuplicateTracker = class {
@@ -2772,7 +2795,7 @@ function convertToOpenRouterChatMessages(prompt) {
                 type: "function",
                 function: {
                   name: part.toolName,
-                  arguments: JSON.stringify(part.input)
+                  arguments: deterministicStringify(part.input)
                 }
               });
               break;
@@ -2800,7 +2823,7 @@ function convertToOpenRouterChatMessages(prompt) {
               return true;
             }
             const format = (_a17 = detail.format) != null ? _a17 : DEFAULT_REASONING_FORMAT;
-            if (format !== "anthropic-claude-v1" /* AnthropicClaudeV1 */) {
+            if (format !== "anthropic-claude-v1" /* AnthropicClaudeV1 */ && format !== "google-gemini-v1" /* GoogleGeminiV1 */) {
               return true;
             }
             return !!detail.signature;
@@ -2809,7 +2832,7 @@ function convertToOpenRouterChatMessages(prompt) {
             const logger = globalThis.AI_SDK_LOG_WARNINGS;
             if (logger !== false && typeof logger !== "function") {
               console.warn(
-                "[openrouter] Some reasoning_details entries were removed because they were missing signatures. See https://github.com/OpenRouterTeam/ai-sdk-provider/issues/423 for more details."
+                "[openrouter] Some reasoning_details entries were removed because they were missing signatures. See https://github.com/OpenRouterTeam/ai-sdk-provider/issues/423 and https://github.com/OpenRouterTeam/ai-sdk-provider/issues/418 for more details."
               );
             }
           }
@@ -3335,16 +3358,21 @@ var OpenRouterChatLanguageModel = class {
       cache_control: this.settings.cache_control
     }, this.config.extraBody), this.settings.extraBody);
     if (tools && tools.length > 0) {
-      const mappedTools = tools.filter(
-        (tool) => tool.type === "function"
-      ).map((tool) => ({
-        type: "function",
-        function: {
-          name: tool.name,
-          description: tool.description,
-          parameters: tool.inputSchema
+      const mappedTools = [];
+      for (const tool of tools) {
+        if (tool.type === "function") {
+          mappedTools.push({
+            type: "function",
+            function: {
+              name: tool.name,
+              description: tool.description,
+              parameters: tool.inputSchema
+            }
+          });
+        } else if (tool.type === "provider") {
+          mappedTools.push(mapProviderTool(tool));
         }
-      }));
+      }
       return __spreadProps(__spreadValues({}, baseArgs), {
         tools: mappedTools,
         tool_choice: toolChoice ? getChatCompletionToolChoice(toolChoice) : void 0
@@ -3353,7 +3381,7 @@ var OpenRouterChatLanguageModel = class {
     return baseArgs;
   }
   async doGenerate(options) {
-    var _b16, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+    var _b16, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v;
     const providerOptions = options.providerOptions || {};
     const openrouterOptions = providerOptions.openrouter || {};
     const _a16 = openrouterOptions, { cacheControl } = _a16, restOpenrouterOptions = __objRest(_a16, ["cacheControl"]);
@@ -3449,12 +3477,18 @@ var OpenRouterChatLanguageModel = class {
     }
     if (choice.message.tool_calls) {
       let reasoningDetailsAttachedToToolCall = false;
+      const seenToolCallIds = /* @__PURE__ */ new Set();
       for (const toolCall of choice.message.tool_calls) {
+        let toolCallId = toolCall.id;
+        if (!toolCallId || seenToolCallIds.has(toolCallId)) {
+          toolCallId = generateId();
+        }
+        seenToolCallIds.add(toolCallId);
         content.push({
           type: "tool-call",
-          toolCallId: (_c = toolCall.id) != null ? _c : generateId(),
+          toolCallId,
           toolName: toolCall.function.name,
-          input: (_d = toolCall.function.arguments) != null ? _d : "{}",
+          input: (_c = toolCall.function.arguments) != null ? _c : "{}",
           providerMetadata: !reasoningDetailsAttachedToToolCall ? {
             openrouter: {
               reasoning_details: reasoningDetails
@@ -3481,19 +3515,19 @@ var OpenRouterChatLanguageModel = class {
             sourceType: "url",
             id: annotation.url_citation.url,
             url: annotation.url_citation.url,
-            title: (_e = annotation.url_citation.title) != null ? _e : "",
+            title: (_d = annotation.url_citation.title) != null ? _d : "",
             providerMetadata: {
               openrouter: {
-                content: (_f = annotation.url_citation.content) != null ? _f : "",
-                startIndex: (_g = annotation.url_citation.start_index) != null ? _g : 0,
-                endIndex: (_h = annotation.url_citation.end_index) != null ? _h : 0
+                content: (_e = annotation.url_citation.content) != null ? _e : "",
+                startIndex: (_f = annotation.url_citation.start_index) != null ? _f : 0,
+                endIndex: (_g = annotation.url_citation.end_index) != null ? _g : 0
               }
             }
           });
         }
       }
     }
-    const fileAnnotations = (_i = choice.message.annotations) == null ? void 0 : _i.filter(
+    const fileAnnotations = (_h = choice.message.annotations) == null ? void 0 : _h.filter(
       (a) => a.type === "file"
     );
     const hasToolCalls = choice.message.tool_calls && choice.message.tool_calls.length > 0;
@@ -3501,7 +3535,7 @@ var OpenRouterChatLanguageModel = class {
       (d) => d.type === "reasoning.encrypted" /* Encrypted */ && d.data
     );
     const shouldOverrideFinishReason = hasToolCalls && hasEncryptedReasoning && choice.finish_reason === "stop";
-    const mappedFinishReason = shouldOverrideFinishReason ? createFinishReason("tool-calls", (_j = choice.finish_reason) != null ? _j : void 0) : mapOpenRouterFinishReason(choice.finish_reason);
+    const mappedFinishReason = shouldOverrideFinishReason ? createFinishReason("tool-calls", (_i = choice.finish_reason) != null ? _i : void 0) : mapOpenRouterFinishReason(choice.finish_reason);
     const effectiveFinishReason = hasToolCalls && mappedFinishReason.unified === "other" ? createFinishReason("tool-calls", mappedFinishReason.raw) : mappedFinishReason;
     return {
       content,
@@ -3510,22 +3544,22 @@ var OpenRouterChatLanguageModel = class {
       warnings: [],
       providerMetadata: {
         openrouter: OpenRouterProviderMetadataSchema.parse({
-          provider: (_k = response.provider) != null ? _k : "",
-          reasoning_details: (_l = choice.message.reasoning_details) != null ? _l : [],
+          provider: (_j = response.provider) != null ? _j : "",
+          reasoning_details: (_k = choice.message.reasoning_details) != null ? _k : [],
           annotations: fileAnnotations && fileAnnotations.length > 0 ? fileAnnotations : void 0,
           usage: __spreadValues(__spreadValues(__spreadValues(__spreadValues({
-            promptTokens: (_m = usageInfo.inputTokens.total) != null ? _m : 0,
-            completionTokens: (_n = usageInfo.outputTokens.total) != null ? _n : 0,
-            totalTokens: ((_o = usageInfo.inputTokens.total) != null ? _o : 0) + ((_p = usageInfo.outputTokens.total) != null ? _p : 0)
-          }, ((_q = response.usage) == null ? void 0 : _q.cost) != null ? { cost: response.usage.cost } : {}), ((_s = (_r = response.usage) == null ? void 0 : _r.prompt_tokens_details) == null ? void 0 : _s.cached_tokens) != null ? {
+            promptTokens: (_l = usageInfo.inputTokens.total) != null ? _l : 0,
+            completionTokens: (_m = usageInfo.outputTokens.total) != null ? _m : 0,
+            totalTokens: ((_n = usageInfo.inputTokens.total) != null ? _n : 0) + ((_o = usageInfo.outputTokens.total) != null ? _o : 0)
+          }, ((_p = response.usage) == null ? void 0 : _p.cost) != null ? { cost: response.usage.cost } : {}), ((_r = (_q = response.usage) == null ? void 0 : _q.prompt_tokens_details) == null ? void 0 : _r.cached_tokens) != null ? {
             promptTokensDetails: {
               cachedTokens: response.usage.prompt_tokens_details.cached_tokens
             }
-          } : {}), ((_u = (_t = response.usage) == null ? void 0 : _t.completion_tokens_details) == null ? void 0 : _u.reasoning_tokens) != null ? {
+          } : {}), ((_t = (_s = response.usage) == null ? void 0 : _s.completion_tokens_details) == null ? void 0 : _t.reasoning_tokens) != null ? {
             completionTokensDetails: {
               reasoningTokens: response.usage.completion_tokens_details.reasoning_tokens
             }
-          } : {}), ((_w = (_v = response.usage) == null ? void 0 : _v.cost_details) == null ? void 0 : _w.upstream_inference_cost) != null ? {
+          } : {}), ((_v = (_u = response.usage) == null ? void 0 : _u.cost_details) == null ? void 0 : _v.upstream_inference_cost) != null ? {
             costDetails: {
               upstreamInferenceCost: response.usage.cost_details.upstream_inference_cost
             }
@@ -3572,6 +3606,7 @@ var OpenRouterChatLanguageModel = class {
       streamError = err;
     });
     const toolCalls = [];
+    const seenToolCallIds = /* @__PURE__ */ new Set();
     let finishReason = createFinishReason("other");
     const usage = {
       inputTokens: {
@@ -3802,24 +3837,23 @@ var OpenRouterChatLanguageModel = class {
                       message: `Expected 'function' type.`
                     });
                   }
-                  if (toolCallDelta.id == null) {
-                    throw new InvalidResponseDataError({
-                      data: toolCallDelta,
-                      message: `Expected 'id' to be a string.`
-                    });
-                  }
                   if (((_k = toolCallDelta.function) == null ? void 0 : _k.name) == null) {
                     throw new InvalidResponseDataError({
                       data: toolCallDelta,
                       message: `Expected 'function.name' to be a string.`
                     });
                   }
+                  let toolCallId = (_l = toolCallDelta.id) != null ? _l : "";
+                  if (!toolCallId || seenToolCallIds.has(toolCallId)) {
+                    toolCallId = generateId();
+                  }
+                  seenToolCallIds.add(toolCallId);
                   toolCalls[index] = {
-                    id: toolCallDelta.id,
+                    id: toolCallId,
                     type: "function",
                     function: {
                       name: toolCallDelta.function.name,
-                      arguments: (_l = toolCallDelta.function.arguments) != null ? _l : ""
+                      arguments: (_m = toolCallDelta.function.arguments) != null ? _m : ""
                     },
                     inputStarted: false,
                     sent: false
@@ -3831,7 +3865,7 @@ var OpenRouterChatLanguageModel = class {
                       message: `Tool call at index ${index} is missing after creation.`
                     });
                   }
-                  if (((_m = toolCall2.function) == null ? void 0 : _m.name) != null && ((_n = toolCall2.function) == null ? void 0 : _n.arguments) != null && isParsableJson(toolCall2.function.arguments)) {
+                  if (((_n = toolCall2.function) == null ? void 0 : _n.name) != null && ((_o = toolCall2.function) == null ? void 0 : _o.arguments) != null && isParsableJson(toolCall2.function.arguments)) {
                     toolCall2.inputStarted = true;
                     controller.enqueue({
                       type: "tool-input-start",
@@ -3889,22 +3923,22 @@ var OpenRouterChatLanguageModel = class {
                     });
                   }
                 }
-                if (((_o = toolCallDelta.function) == null ? void 0 : _o.arguments) != null) {
-                  toolCall.function.arguments += (_q = (_p = toolCallDelta.function) == null ? void 0 : _p.arguments) != null ? _q : "";
+                if (((_p = toolCallDelta.function) == null ? void 0 : _p.arguments) != null) {
+                  toolCall.function.arguments += (_r = (_q = toolCallDelta.function) == null ? void 0 : _q.arguments) != null ? _r : "";
                 }
                 controller.enqueue({
                   type: "tool-input-delta",
                   id: toolCall.id,
-                  delta: (_r = toolCallDelta.function.arguments) != null ? _r : ""
+                  delta: (_s = toolCallDelta.function.arguments) != null ? _s : ""
                 });
-                if (((_s = toolCall.function) == null ? void 0 : _s.name) != null && ((_t = toolCall.function) == null ? void 0 : _t.arguments) != null && isParsableJson(toolCall.function.arguments)) {
+                if (((_t = toolCall.function) == null ? void 0 : _t.name) != null && ((_u = toolCall.function) == null ? void 0 : _u.arguments) != null && isParsableJson(toolCall.function.arguments)) {
                   controller.enqueue({
                     type: "tool-input-end",
                     id: toolCall.id
                   });
                   controller.enqueue({
                     type: "tool-call",
-                    toolCallId: (_u = toolCall.id) != null ? _u : generateId(),
+                    toolCallId: toolCall.id,
                     toolName: toolCall.function.name,
                     input: toolCall.function.arguments,
                     providerMetadata: !reasoningDetailsAttachedToToolCall ? {
@@ -3929,7 +3963,6 @@ var OpenRouterChatLanguageModel = class {
             }
           },
           flush(controller) {
-            var _a17;
             const hasToolCalls = toolCalls.length > 0;
             if (streamError != null) {
               finishReason = createFinishReason("error");
@@ -3966,7 +3999,7 @@ var OpenRouterChatLanguageModel = class {
                   });
                   controller.enqueue({
                     type: "tool-call",
-                    toolCallId: (_a17 = toolCall.id) != null ? _a17 : generateId(),
+                    toolCallId: toolCall.id,
                     toolName: toolCall.function.name,
                     input,
                     providerMetadata: !reasoningDetailsAttachedToToolCall ? {
@@ -4029,6 +4062,22 @@ var OpenRouterChatLanguageModel = class {
     };
   }
 };
+function mapProviderTool(tool) {
+  const [provider, toolName] = tool.id.split(".");
+  const apiToolType = `${provider}:${toolName}`;
+  const mappedArgs = {};
+  for (const [key, value] of Object.entries(tool.args)) {
+    if (value !== void 0) {
+      mappedArgs[camelToSnake(key)] = value;
+    }
+  }
+  return __spreadValues({
+    type: apiToolType
+  }, mappedArgs);
+}
+function camelToSnake(str) {
+  return str.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
+}
 
 // src/completion/convert-to-openrouter-completion-prompt.ts
 function convertToOpenRouterCompletionPrompt({