@standardagents/openrouter 0.43.1 → 0.44.0

package/dist/index.js

@@ -1,7 +1,37 @@
 // src/OpenRouterProvider.ts
-import { ProviderError, defineTool } from "@standardagents/spec";
+import { ProviderError, defineTool, resolveRequestReasoningLevels } from "@standardagents/spec";
 import { z } from "zod";
 
+// src/responses-transformers.ts
+import { mapReasoningLevel as mapReasoningLevel2 } from "@standardagents/spec";
+
+// src/reasoning.ts
+function getOpenRouterReasoningLevels(model) {
+  if (/^openai\/o[134](?:[-:]|$)/.test(model)) {
+    return { 0: "low", 33: "low", 66: "medium", 100: "high" };
+  }
+  return { 0: null, 10: "minimal", 33: "low", 66: "medium", 100: "high" };
+}
+function mapOpenRouterReasoningLevels(model, mandatory, supportedEfforts) {
+  const efforts = ["minimal", "low", "medium", "high", "xhigh", "max"].filter((effort) => supportedEfforts?.includes(effort));
+  if (efforts.length === 0) {
+    const fallback = getOpenRouterReasoningLevels(model);
+    if (mandatory) return { 0: "low", 33: "low", 66: "medium", 100: "high" };
+    return mandatory === false ? { ...fallback, 0: null } : fallback;
+  }
+  const values = mandatory ? efforts : [null, ...efforts];
+  return Object.fromEntries(values.map((effort, index) => [
+    Math.round(index * 100 / Math.max(1, values.length - 1)),
+    effort
+  ]));
+}
+
+// src/responses-transformers.ts
+import { unrecognized } from "@openrouter/sdk/types";
+
+// src/chat-completions-transformers.ts
+import { mapReasoningLevel } from "@standardagents/spec";
+
 // src/server-tools.ts
 var OPENROUTER_SERVER_TOOL_NAMES = [
   "web_search",
@@ -235,21 +265,22 @@ function transformChatAssistantMessage(msg) {
   return message;
 }
 function transformChatToolMessage(msg) {
+  const content = Array.isArray(msg.content) ? msg.content.filter((part) => part.type === "text").map((part) => part.text).join("\n") : msg.content;
   let output;
-  if (typeof msg.content === "string") {
-    output = msg.content;
-  } else if ("type" in msg.content) {
-    if (msg.content.type === "text") {
-      output = msg.content.text;
-    } else if (msg.content.type === "error") {
-      output = `Error: ${msg.content.error}`;
+  if (typeof content === "string") {
+    output = content;
+  } else if ("type" in content) {
+    if (content.type === "text") {
+      output = content.text;
+    } else if (content.type === "error") {
+      output = `Error: ${content.error}`;
     } else {
-      output = JSON.stringify(msg.content);
+      output = JSON.stringify(content);
     }
   } else {
-    output = JSON.stringify(msg.content);
+    output = JSON.stringify(content);
   }
-  const imageAttachments = msg.attachments?.filter((a) => a.type === "image" && a.data) || [];
+  const imageAttachments = Array.isArray(msg.content) ? msg.content.filter((part) => part.type === "image" && Boolean(part.data) || part.type === "image_url") : [];
   const toolMessage = {
     role: "tool",
     tool_call_id: msg.toolCallId,
@@ -268,15 +299,7 @@ function transformChatToolMessage(msg) {
     text: `Here ${verb} ${descriptor} from ${toolName}:`
   });
   for (const attachment of imageAttachments) {
-    const attachmentData = attachment.data || "";
-    const imageData = attachmentData.startsWith("data:") ? attachmentData : `data:${attachment.mediaType || "image/png"};base64,${attachmentData}`;
-    imageContent.push({
-      type: "image_url",
-      image_url: {
-        url: imageData,
-        detail: "auto"
-      }
-    });
+    imageContent.push(transformChatContentPart(attachment));
   }
   const syntheticUserMessage = {
     role: "user",
@@ -728,7 +751,7 @@ async function* parseChatSSEStream(response, state) {
     reader.releaseLock();
   }
 }
-function buildChatParams(request) {
+function buildChatParams(request, reasoningLevels = getOpenRouterReasoningLevels(request.model)) {
   const messages = transformChatMessages(request.messages);
   const params = {
     model: request.model,
@@ -757,18 +780,6 @@ function buildChatParams(request) {
   if (request.topP !== void 0) {
     params.top_p = request.topP;
   }
-  if (request.reasoning?.level !== void 0) {
-    const effortMap = {
-      10: "minimal",
-      33: "low",
-      66: "medium",
-      100: "high"
-    };
-    const effort = effortMap[request.reasoning.level];
-    if (effort) {
-      params.reasoning = { effort };
-    }
-  }
   if (request.responseFormat) {
     if (request.responseFormat.type === "json") {
       if (request.responseFormat.schema) {
@@ -792,7 +803,27 @@ function buildChatParams(request) {
     request.providerOptions
   );
   if (safeOptions) {
-    Object.assign(params, safeOptions);
+    if (request.reasoning?.level !== void 0) {
+      const { effort, reasoning_effort, reasoningEffort, ...otherOptions } = safeOptions;
+      Object.assign(params, otherOptions);
+    } else {
+      Object.assign(params, safeOptions);
+    }
+  }
+  if (request.reasoning?.level !== void 0) {
+    if (params.reasoning) {
+      params.reasoning = { ...params.reasoning };
+      delete params.reasoning.effort;
+    }
+    const effort = mapReasoningLevel(request.reasoning.level, request.reasoning.levels ?? reasoningLevels);
+    if (effort === null || params.reasoning?.enabled !== void 0) {
+      params.reasoning = { ...params.reasoning, enabled: effort !== null && effort !== "none" };
+    }
+    if (effort === "none" || effort === "minimal" || effort === "low" || effort === "medium" || effort === "high" || effort === "xhigh" || effort === "max") {
+      params.reasoning = { ...params.reasoning, effort };
+    } else if (effort === "enabled") {
+      params.reasoning = { ...params.reasoning, enabled: true };
+    }
   }
   return params;
 }
@@ -930,21 +961,22 @@ function transformAssistantMessage(msg) {
   return items;
 }
 function transformToolMessage(msg) {
+  const content = Array.isArray(msg.content) ? msg.content.filter((part) => part.type === "text").map((part) => part.text).join("\n") : msg.content;
   let output;
-  if (typeof msg.content === "string") {
-    output = msg.content;
-  } else if ("type" in msg.content) {
-    if (msg.content.type === "text") {
-      output = msg.content.text;
-    } else if (msg.content.type === "error") {
-      output = `Error: ${msg.content.error}`;
+  if (typeof content === "string") {
+    output = content;
+  } else if ("type" in content) {
+    if (content.type === "text") {
+      output = content.text;
+    } else if (content.type === "error") {
+      output = `Error: ${content.error}`;
     } else {
-      output = JSON.stringify(msg.content);
+      output = JSON.stringify(content);
     }
   } else {
-    output = JSON.stringify(msg.content);
+    output = JSON.stringify(content);
   }
-  const imageAttachments = msg.attachments?.filter((a) => a.type === "image" && a.data) || [];
+  const imageAttachments = Array.isArray(msg.content) ? msg.content.filter((part) => part.type === "image" && Boolean(part.data) || part.type === "image_url") : [];
   const toolOutput = {
     type: "function_call_output",
     call_id: msg.toolCallId,
@@ -963,13 +995,7 @@ function transformToolMessage(msg) {
     text: `Here ${verb} ${descriptor} from ${toolName}:`
   });
   for (const attachment of imageAttachments) {
-    const attachmentData = attachment.data || "";
-    const imageData = attachmentData.startsWith("data:") ? attachmentData : `data:${attachment.mediaType || "image/png"};base64,${attachmentData}`;
-    imageContent.push({
-      type: "input_image",
-      image_url: imageData,
-      detail: "auto"
-    });
+    imageContent.push(transformContentPart(attachment));
   }
   const syntheticUserMessage = {
     role: "user",
@@ -1246,7 +1272,7 @@ function extractReasoningDetails(output, streamedReasoningContent) {
   }
   return details.length > 0 ? details : void 0;
 }
-function buildCreateParams(request) {
+function buildCreateParams(request, reasoningLevels = getOpenRouterReasoningLevels(request.model)) {
   const { input, instructions } = transformMessages(request.messages);
   const params = {
     model: request.model,
@@ -1275,24 +1301,6 @@ function buildCreateParams(request) {
   if (request.topP !== void 0) {
     params.topP = request.topP;
   }
-  if (request.reasoning?.level !== void 0) {
-    const effortMap = {
-      10: "minimal",
-      // Basic reasoning
-      33: "low",
-      // Light reasoning
-      66: "medium",
-      // Balanced reasoning
-      100: "high"
-      // Deep reasoning
-    };
-    const effort = effortMap[request.reasoning.level];
-    if (effort) {
-      params.reasoning = {
-        effort
-      };
-    }
-  }
   if (request.responseFormat) {
     if (request.responseFormat.type === "json") {
       if (request.responseFormat.schema) {
@@ -1318,7 +1326,27 @@ function buildCreateParams(request) {
     request.providerOptions
   );
   if (providerOptions) {
-    Object.assign(params, providerOptions);
+    if (request.reasoning?.level !== void 0) {
+      const { effort, reasoning_effort, reasoningEffort, ...otherOptions } = providerOptions;
+      Object.assign(params, otherOptions);
+    } else {
+      Object.assign(params, providerOptions);
+    }
+  }
+  if (request.reasoning?.level !== void 0) {
+    if (params.reasoning) {
+      params.reasoning = { ...params.reasoning };
+      delete params.reasoning.effort;
+    }
+    const effort = mapReasoningLevel2(request.reasoning.level, request.reasoning.levels ?? reasoningLevels);
+    if (effort === null || params.reasoning?.enabled !== void 0) {
+      params.reasoning = { ...params.reasoning, enabled: effort !== null && effort !== "none" };
+    }
+    if (effort === "none" || effort === "minimal" || effort === "low" || effort === "medium" || effort === "high" || effort === "xhigh" || effort === "max") {
+      params.reasoning = { ...params.reasoning, effort: effort === "max" ? unrecognized(effort) : effort };
+    } else if (effort === "enabled") {
+      params.reasoning = { ...params.reasoning, enabled: true };
+    }
   }
   return params;
 }
@@ -2205,8 +2233,10 @@ var OpenRouterProvider = class _OpenRouterProvider {
     }
     if (!_OpenRouterProvider.modelsFetchPromise) {
       _OpenRouterProvider.modelsFetchPromise = (async () => {
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), 2500);
         try {
-          const response = await fetch("https://openrouter.ai/api/v1/models");
+          const response = await fetch("https://openrouter.ai/api/v1/models", { signal: controller.signal });
           if (!response.ok) {
             throw new Error(`OpenRouter API error: ${response.status}`);
           }
@@ -2218,6 +2248,7 @@ var OpenRouterProvider = class _OpenRouterProvider {
           _OpenRouterProvider.modelsFetchFailedAt = Date.now();
           throw error;
         } finally {
+          clearTimeout(timer);
           _OpenRouterProvider.modelsFetchPromise = null;
         }
       })();
@@ -2243,7 +2274,7 @@ var OpenRouterProvider = class _OpenRouterProvider {
       capabilities.maxOutputTokens = model.top_provider.max_completion_tokens;
     }
     if (model.id.includes("o1") || model.id.includes("o3") || model.id.includes("o4")) {
-      capabilities.reasoningLevels = { 0: null, 33: "low", 66: "medium", 100: "high" };
+      capabilities.reasoningLevels = { 0: "low", 33: "low", 66: "medium", 100: "high" };
       if (model.id.includes("o1-preview") || model.id.includes("o1-mini")) {
         capabilities.supportsToolCalls = false;
         capabilities.supportsJsonMode = false;
@@ -2251,6 +2282,13 @@ var OpenRouterProvider = class _OpenRouterProvider {
     } else if (model.id.includes("claude") && model.id.includes("thinking")) {
       capabilities.reasoningLevels = { 0: null, 100: "enabled" };
     }
+    if (model.reasoning) {
+      capabilities.reasoningLevels = mapOpenRouterReasoningLevels(
+        model.id,
+        model.reasoning.mandatory,
+        model.reasoning.supported_efforts
+      );
+    }
     return capabilities;
   }
   /**
@@ -2303,7 +2341,7 @@ var OpenRouterProvider = class _OpenRouterProvider {
     const apiKey = this.config.apiKey;
     const baseUrl = this.config.baseUrl || "https://openrouter.ai/api/v1";
     try {
-      const params = buildChatParams(request);
+      const params = buildChatParams(request, await resolveRequestReasoningLevels(request, (model) => this.getModelCapabilities(model)));
       if (this.config.providers && this.config.providers.length > 0) {
         params.provider = { only: this.config.providers };
       }
@@ -2341,7 +2379,7 @@ var OpenRouterProvider = class _OpenRouterProvider {
     const apiKey = this.config.apiKey;
     const baseUrl = this.config.baseUrl || "https://openrouter.ai/api/v1";
     try {
-      const params = buildCreateParams(request);
+      const params = buildCreateParams(request, await resolveRequestReasoningLevels(request, (model) => this.getModelCapabilities(model)));
       this.applyConfiguredProvidersToResponses(params);
       const pricingPromise = this.getUsagePricing(params.model);
       if (this.hasOpenRouterServerTools(params)) {
@@ -2388,7 +2426,7 @@ var OpenRouterProvider = class _OpenRouterProvider {
     const apiKey = this.config.apiKey;
     const baseUrl = this.config.baseUrl || "https://openrouter.ai/api/v1";
     try {
-      const params = buildChatParams(request);
+      const params = buildChatParams(request, await resolveRequestReasoningLevels(request, (model) => this.getModelCapabilities(model)));
       if (this.config.providers && this.config.providers.length > 0) {
         params.provider = { only: this.config.providers };
       }
@@ -2464,7 +2502,7 @@ var OpenRouterProvider = class _OpenRouterProvider {
     const apiKey = this.config.apiKey;
     const baseUrl = this.config.baseUrl || "https://openrouter.ai/api/v1";
     try {
-      const params = buildCreateParams(request);
+      const params = buildCreateParams(request, await resolveRequestReasoningLevels(request, (model) => this.getModelCapabilities(model)));
       this.applyConfiguredProvidersToResponses(params);
       const pricingPromise = this.getUsagePricing(params.model);
       const response = await fetch(`${baseUrl}/responses`, {
@@ -2601,7 +2639,7 @@ var OpenRouterProvider = class _OpenRouterProvider {
   async inspectRequest(request) {
     const apiMode = this.getApiMode(request);
     if (apiMode === "responses") {
-      const params2 = buildCreateParams(request);
+      const params2 = buildCreateParams(request, await resolveRequestReasoningLevels(request, (model) => this.getModelCapabilities(model)));
       if (this.config.providers && this.config.providers.length > 0) {
         params2.provider = { only: this.config.providers };
       }
@@ -2613,7 +2651,7 @@ var OpenRouterProvider = class _OpenRouterProvider {
         }
       };
     }
-    const params = buildChatParams(request);
+    const params = buildChatParams(request, await resolveRequestReasoningLevels(request, (model) => this.getModelCapabilities(model)));
     if (this.config.providers && this.config.providers.length > 0) {
       params.provider = { only: this.config.providers };
     }