@openrouter/ai-sdk-provider 2.3.3 → 2.4.0

package/dist/internal/index.js

@@ -2416,6 +2416,31 @@ function createFinishReason(unified, raw) {
   return { unified, raw };
 }
 
+// src/utils/with-stream-error-handling.ts
+function withStreamErrorHandling(source, onError) {
+  const reader = source.getReader();
+  return new ReadableStream({
+    async pull(controller) {
+      try {
+        const { done, value } = await reader.read();
+        if (done) {
+          controller.close();
+        } else {
+          controller.enqueue(value);
+        }
+      } catch (err) {
+        onError(err);
+        reader.cancel().catch(() => {
+        });
+        controller.close();
+      }
+    },
+    cancel(reason) {
+      reader.cancel(reason);
+    }
+  });
+}
+
 // src/utils/reasoning-details-duplicate-tracker.ts
 var _seenKeys;
 var ReasoningDetailsDuplicateTracker = class {
@@ -2803,6 +2828,7 @@ function convertToOpenRouterChatMessages(prompt) {
             role: "tool",
             tool_call_id: toolResponse.toolCallId,
             content: content2,
+            name: toolResponse.toolName,
             cache_control: (_h = getCacheControl(providerOptions)) != null ? _h : getCacheControl(toolResponse.providerOptions)
           });
         }
@@ -3465,7 +3491,8 @@ var OpenRouterChatLanguageModel = class {
       (d) => d.type === "reasoning.encrypted" /* Encrypted */ && d.data
     );
     const shouldOverrideFinishReason = hasToolCalls && hasEncryptedReasoning && choice.finish_reason === "stop";
-    const effectiveFinishReason = shouldOverrideFinishReason ? createFinishReason("tool-calls", (_j = choice.finish_reason) != null ? _j : void 0) : mapOpenRouterFinishReason(choice.finish_reason);
+    const mappedFinishReason = shouldOverrideFinishReason ? createFinishReason("tool-calls", (_j = choice.finish_reason) != null ? _j : void 0) : mapOpenRouterFinishReason(choice.finish_reason);
+    const effectiveFinishReason = hasToolCalls && mappedFinishReason.unified === "other" ? createFinishReason("tool-calls", mappedFinishReason.raw) : mappedFinishReason;
     return {
       content,
       finishReason: effectiveFinishReason,
@@ -3529,6 +3556,10 @@ var OpenRouterChatLanguageModel = class {
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
+    let streamError;
+    const safeResponse = withStreamErrorHandling(response, (err) => {
+      streamError = err;
+    });
     const toolCalls = [];
     let finishReason = createFinishReason("other");
     const usage = {
@@ -3557,7 +3588,7 @@ var OpenRouterChatLanguageModel = class {
     let openrouterResponseId;
     let provider;
     return {
-      stream: response.pipeThrough(
+      stream: safeResponse.pipeThrough(
         new TransformStream({
           transform(chunk, controller) {
             var _a17, _b17, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
@@ -3879,12 +3910,19 @@ var OpenRouterChatLanguageModel = class {
           flush(controller) {
             var _a17;
             const hasToolCalls = toolCalls.length > 0;
+            if (streamError != null) {
+              finishReason = createFinishReason("error");
+              controller.enqueue({ type: "error", error: streamError });
+            }
             const hasEncryptedReasoning = accumulatedReasoningDetails.some(
               (d) => d.type === "reasoning.encrypted" /* Encrypted */ && d.data
             );
             if (hasToolCalls && hasEncryptedReasoning && finishReason.unified === "stop") {
               finishReason = createFinishReason("tool-calls", finishReason.raw);
             }
+            if (hasToolCalls && finishReason.unified === "other") {
+              finishReason = createFinishReason("tool-calls", finishReason.raw);
+            }
             if (finishReason.unified === "tool-calls") {
               for (const toolCall of toolCalls) {
                 if (toolCall && !toolCall.sent) {
@@ -4270,6 +4308,10 @@ var OpenRouterCompletionLanguageModel = class {
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
+    let streamError;
+    const safeResponse = withStreamErrorHandling(response, (err) => {
+      streamError = err;
+    });
     let finishReason = createFinishReason("other");
     const usage = {
       inputTokens: {
@@ -4289,7 +4331,7 @@ var OpenRouterCompletionLanguageModel = class {
     let provider;
     let rawUsage;
     return {
-      stream: response.pipeThrough(
+      stream: safeResponse.pipeThrough(
         new TransformStream({
           transform(chunk, controller) {
             var _a16, _b16, _c, _d, _e;
@@ -4353,6 +4395,10 @@ var OpenRouterCompletionLanguageModel = class {
             }
           },
           flush(controller) {
+            if (streamError != null) {
+              finishReason = createFinishReason("error");
+              controller.enqueue({ type: "error", error: streamError });
+            }
             usage.raw = rawUsage;
             const openrouterMetadata = {
               usage: openrouterUsage