190proof 1.0.96 → 1.0.98

package/dist/index.mjs

@@ -108,7 +108,6 @@ function isHeicImage(name, mime) {
 }
 
 // index.ts
-import { GoogleGenAI } from "@google/genai";
 var sharp = __require("sharp");
 var decode = __require("heic-decode");
 async function withRetries(identifier, apiName, fn, options = {}) {
@@ -139,9 +138,10 @@ async function withRetries(identifier, apiName, fn, options = {}) {
   error2.cause = lastError;
   throw error2;
 }
-function parseStreamedResponse(identifier, paragraph, toolCallAccumulators, allowedFunctionNames) {
+function parseStreamedResponse(identifier, paragraph, toolCallAccumulators, allowedFunctionNames, reasoning) {
   const functionCalls = [];
-  for (const acc of toolCallAccumulators) {
+  for (let i = 0; i < toolCallAccumulators.length; i++) {
+    const acc = toolCallAccumulators[i];
     if (!acc.name || !acc.arguments)
       continue;
     if (allowedFunctionNames && !allowedFunctionNames.has(acc.name)) {
@@ -151,6 +151,7 @@ function parseStreamedResponse(identifier, paragraph, toolCallAccumulators, allo
     }
     try {
       functionCalls.push({
+        id: acc.id || `call_${i}`,
         name: acc.name,
         arguments: JSON.parse(acc.arguments)
       });
@@ -179,6 +180,7 @@ function parseStreamedResponse(identifier, paragraph, toolCallAccumulators, allo
     function_call: functionCalls[0] || null,
     function_calls: functionCalls,
     files: [],
+    reasoning: reasoning || void 0,
     usage: null
   };
 }
@@ -280,7 +282,7 @@ function buildOpenAIRequestConfig(identifier, model, config) {
   };
 }
 async function prepareOpenAIPayload(identifier, payload) {
-  var _a;
+  var _a, _b;
   const preparedPayload = {
     model: payload.model,
     messages: [],
@@ -291,6 +293,16 @@ async function prepareOpenAIPayload(identifier, payload) {
     tool_choice: payload.function_call ? typeof payload.function_call === "string" ? payload.function_call : { type: "function", function: payload.function_call } : void 0
   };
   for (const message of payload.messages) {
+    if (message.role === "tool") {
+      for (const tr of message.toolResults || []) {
+        preparedPayload.messages.push({
+          role: "tool",
+          tool_call_id: tr.toolCallId,
+          content: tr.content
+        });
+      }
+      continue;
+    }
     const contentBlocks = [];
     if (message.content) {
       contentBlocks.push({ type: "text", text: message.content });
@@ -316,15 +328,34 @@ async function prepareOpenAIPayload(identifier, payload) {
         });
       }
     }
-    preparedPayload.messages.push({
+    const outMessage = {
       role: message.role,
-      content: contentBlocks
-    });
+      // OpenAI wants null (not []) content on a tool-call-only assistant turn.
+      content: contentBlocks.length ? contentBlocks : null
+    };
+    if ((_b = message.functionCalls) == null ? void 0 : _b.length) {
+      outMessage.tool_calls = message.functionCalls.map((fc, i) => {
+        var _a2;
+        return {
+          id: (_a2 = fc.id) != null ? _a2 : `call_${i}`,
+          type: "function",
+          function: {
+            name: fc.name,
+            arguments: JSON.stringify(fc.arguments)
+          }
+        };
+      });
+    }
+    if (message.reasoning)
+      outMessage.reasoning = message.reasoning;
+    if (message.reasoningDetails)
+      outMessage.reasoning_details = message.reasoningDetails;
+    preparedPayload.messages.push(outMessage);
   }
   return preparedPayload;
 }
 async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const functionNames = openAiPayload.tools ? new Set(openAiPayload.tools.map((fn) => fn.function.name)) : null;
   const { endpoint, headers } = buildOpenAIRequestConfig(
     id,
@@ -342,6 +373,7 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs)
     throw new Error("Stream error: no response body");
   }
   let paragraph = "";
+  let reasoning = "";
   const toolCallAccumulators = [];
   const reader = response.body.getReader();
   let partialChunk = "";
@@ -376,7 +408,8 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs)
           id,
           paragraph,
           toolCallAccumulators,
-          functionNames
+          functionNames,
+          reasoning
         );
       }
       let json;
@@ -406,6 +439,8 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs)
           while (toolCallAccumulators.length <= idx) {
             toolCallAccumulators.push({ name: "", arguments: "" });
           }
+          if (toolCall.id)
+            toolCallAccumulators[idx].id = toolCall.id;
           if ((_e = toolCall.function) == null ? void 0 : _e.name)
             toolCallAccumulators[idx].name += toolCall.function.name;
           if ((_f = toolCall.function) == null ? void 0 : _f.arguments)
@@ -415,11 +450,14 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs)
       const text = (_h = (_g = json.choices[0]) == null ? void 0 : _g.delta) == null ? void 0 : _h.content;
       if (text)
         paragraph += text;
+      const reasoningDelta = (_j = (_i = json.choices[0]) == null ? void 0 : _i.delta) == null ? void 0 : _j.reasoning;
+      if (reasoningDelta)
+        reasoning += reasoningDelta;
     }
   }
 }
 async function callOpenAI(id, openAiPayload, openAiConfig) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const { endpoint, headers } = buildOpenAIRequestConfig(
     id,
     openAiPayload.model,
@@ -447,19 +485,22 @@ async function callOpenAI(id, openAiPayload, openAiConfig) {
   const toolCalls = (_b = choice.message) == null ? void 0 : _b.tool_calls;
   const functionCalls = [];
   if (toolCalls == null ? void 0 : toolCalls.length) {
-    for (const tc of toolCalls) {
+    for (let i = 0; i < toolCalls.length; i++) {
+      const tc = toolCalls[i];
       functionCalls.push({
+        id: (_c = tc.id) != null ? _c : `call_${i}`,
         name: tc.function.name,
         arguments: JSON.parse(tc.function.arguments)
       });
     }
   } else if (choice.function_call) {
     functionCalls.push({
+      id: "call_0",
       name: choice.function_call.name,
       arguments: JSON.parse(choice.function_call.arguments)
     });
   }
-  if (!((_c = choice.message) == null ? void 0 : _c.content) && !functionCalls.length) {
+  if (!((_d = choice.message) == null ? void 0 : _d.content) && !functionCalls.length) {
     logger_default.error(
       id,
       "OpenAI: received message without content or function_call:",
@@ -475,11 +516,13 @@ async function callOpenAI(id, openAiPayload, openAiConfig) {
     function_call: functionCalls[0] || null,
     function_calls: functionCalls,
     files: [],
+    reasoning: (_f = (_e = choice.message) == null ? void 0 : _e.reasoning) != null ? _f : void 0,
+    reasoningDetails: (_h = (_g = choice.message) == null ? void 0 : _g.reasoning_details) != null ? _h : void 0,
     usage: data.usage ? {
       prompt_tokens: data.usage.prompt_tokens,
       completion_tokens: data.usage.completion_tokens,
       total_tokens: data.usage.total_tokens,
-      cached_tokens: (_e = (_d = data.usage.prompt_tokens_details) == null ? void 0 : _d.cached_tokens) != null ? _e : 0
+      cached_tokens: (_j = (_i = data.usage.prompt_tokens_details) == null ? void 0 : _i.cached_tokens) != null ? _j : 0
     } : null
   };
 }
@@ -532,7 +575,8 @@ async function callOpenAiWithRetries(id, openAiPayload, openAiConfig, retries =
   );
 }
 function jigAnthropicMessages(messages) {
-  var _a, _b;
+  var _a;
+  const hasToolBlock = (content) => Array.isArray(content) && content.some((b) => b.type === "tool_use" || b.type === "tool_result");
   let jiggedMessages = messages.slice();
   if (((_a = jiggedMessages[0]) == null ? void 0 : _a.role) !== "user") {
     jiggedMessages = [
@@ -547,11 +591,8 @@ function jigAnthropicMessages(messages) {
     if (lastMessage.role === message.role) {
       const lastContent = Array.isArray(lastMessage.content) ? lastMessage.content : [{ type: "text", text: lastMessage.content }];
       const newContent = Array.isArray(message.content) ? message.content : [{ type: "text", text: message.content }];
-      lastMessage.content = [
-        ...lastContent,
-        { type: "text", text: "\n\n---\n\n" },
-        ...newContent
-      ];
+      const separator = hasToolBlock(lastMessage.content) || hasToolBlock(message.content) ? [] : [{ type: "text", text: "\n\n---\n\n" }];
+      lastMessage.content = [...lastContent, ...separator, ...newContent];
       return acc;
     }
     if (typeof message.content === "string") {
@@ -559,7 +600,8 @@ function jigAnthropicMessages(messages) {
     }
     return [...acc, message];
   }, []);
-  if (((_b = jiggedMessages[jiggedMessages.length - 1]) == null ? void 0 : _b.role) === "assistant") {
+  const last = jiggedMessages[jiggedMessages.length - 1];
+  if ((last == null ? void 0 : last.role) === "assistant" && !hasToolBlock(last.content)) {
     jiggedMessages.push({ role: "user", content: "..." });
   }
   return jiggedMessages;
@@ -576,6 +618,17 @@ async function prepareAnthropicPayload(_identifier, payload) {
       preparedPayload.system = message.content;
       continue;
     }
+    if (message.role === "tool") {
+      preparedPayload.messages.push({
+        role: "user",
+        content: (message.toolResults || []).map((tr) => ({
+          type: "tool_result",
+          tool_use_id: tr.toolCallId,
+          content: tr.content
+        }))
+      });
+      continue;
+    }
     const contentBlocks = [];
     if (message.content) {
       contentBlocks.push({ type: "text", text: message.content });
@@ -613,9 +666,19 @@ async function prepareAnthropicPayload(_identifier, payload) {
         });
       }
     }
+    const leadingBlocks = message.role === "assistant" && Array.isArray(message.reasoningDetails) ? message.reasoningDetails : [];
+    const toolUseBlocks = (message.functionCalls || []).map((fc, i) => {
+      var _a;
+      return {
+        type: "tool_use",
+        id: (_a = fc.id) != null ? _a : `call_${i}`,
+        name: fc.name,
+        input: fc.arguments
+      };
+    });
     preparedPayload.messages.push({
       role: message.role,
-      content: contentBlocks
+      content: [...leadingBlocks, ...contentBlocks, ...toolUseBlocks]
     });
   }
   return preparedPayload;
@@ -682,6 +745,7 @@ async function callAnthropic(id, payload, config) {
   }
   let textResponse = "";
   const functionCalls = [];
+  const reasoningBlocks = [];
   for (const answer of answers) {
     if (!answer.type) {
       logger_default.error(id, "Missing answer type in Anthropic API response:", data);
@@ -701,9 +765,12 @@ async function callAnthropic(id, payload, config) {
 ${text}` : text;
     } else if (answer.type === "tool_use") {
       functionCalls.push({
+        id: answer.id,
         name: answer.name,
         arguments: answer.input
       });
+    } else if (answer.type === "thinking" || answer.type === "redacted_thinking") {
+      reasoningBlocks.push(answer);
     }
   }
   if (!textResponse && !functionCalls.length) {
@@ -732,6 +799,7 @@ ${text}` : text;
     function_call: functionCalls[0] || null,
     function_calls: functionCalls,
     files: [],
+    reasoningDetails: reasoningBlocks.length ? reasoningBlocks : void 0,
     usage
   };
 }
@@ -746,7 +814,8 @@ async function callAnthropicWithRetries(id, payload, config, retries = 5) {
   );
 }
 function jigGoogleMessages(messages) {
-  var _a, _b;
+  var _a;
+  const hasFunctionPart = (parts) => parts.some((p) => "functionCall" in p || "functionResponse" in p);
   let jiggedMessages = messages.slice();
   if (((_a = jiggedMessages[0]) == null ? void 0 : _a.role) === "model") {
     jiggedMessages = [
@@ -764,7 +833,8 @@ function jigGoogleMessages(messages) {
     }
     return [...acc, message];
   }, []);
-  if (((_b = jiggedMessages[jiggedMessages.length - 1]) == null ? void 0 : _b.role) === "model") {
+  const last = jiggedMessages[jiggedMessages.length - 1];
+  if ((last == null ? void 0 : last.role) === "model" && !hasFunctionPart(last.parts)) {
     jiggedMessages.push({ role: "user", parts: [{ text: "..." }] });
   }
   return jiggedMessages;
@@ -773,6 +843,7 @@ async function prepareGoogleAIPayload(_identifier, payload) {
   const preparedPayload = {
     model: payload.model,
     messages: [],
+    requestTimeoutMs: payload.requestTimeoutMs,
     tools: payload.functions ? {
       functionDeclarations: payload.functions.map((fn) => ({
         name: fn.name,
@@ -783,11 +854,34 @@ async function prepareGoogleAIPayload(_identifier, payload) {
       }))
     } : void 0
   };
+  const toolNameById = /* @__PURE__ */ new Map();
+  for (const m of payload.messages) {
+    for (const fc of m.functionCalls || []) {
+      if (fc.id)
+        toolNameById.set(fc.id, fc.name);
+    }
+  }
   for (const message of payload.messages) {
     if (message.role === "system") {
       preparedPayload.systemInstruction = message.content;
       continue;
     }
+    if (message.role === "tool") {
+      preparedPayload.messages.push({
+        role: "user",
+        parts: (message.toolResults || []).map((tr) => {
+          var _a, _b;
+          return {
+            functionResponse: {
+              id: tr.toolCallId,
+              name: (_b = (_a = tr.name) != null ? _a : toolNameById.get(tr.toolCallId)) != null ? _b : "",
+              response: { output: tr.content }
+            }
+          };
+        })
+      });
+      continue;
+    }
     const parts = [];
     if (message.content) {
       parts.push({ text: message.content });
@@ -816,6 +910,17 @@ async function prepareGoogleAIPayload(_identifier, payload) {
         });
       }
     }
+    for (const fc of message.functionCalls || []) {
+      parts.push({
+        functionCall: {
+          id: fc.id,
+          name: fc.name,
+          args: fc.arguments
+        },
+        // Gemini requires its thoughtSignature echoed back on the call part.
+        ...fc.thoughtSignature ? { thoughtSignature: fc.thoughtSignature } : {}
+      });
+    }
     preparedPayload.messages.push({
       role: message.role === "assistant" ? "model" : message.role,
       parts
@@ -824,39 +929,73 @@ async function prepareGoogleAIPayload(_identifier, payload) {
   return preparedPayload;
 }
 async function callGoogleAI(id, payload) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-  const googleMessages = jigGoogleMessages(payload.messages);
-  const history = googleMessages.slice(0, -1);
-  const lastMessage = googleMessages.slice(-1)[0];
-  const genAI = new GoogleGenAI({ apiKey: process.env.GEMINI_API_KEY });
-  const chat = genAI.chats.create({
-    model: payload.model,
-    history,
-    config: {
-      responseModalities: ["Text"],
-      tools: payload.tools ? [payload.tools] : void 0,
-      systemInstruction: payload.systemInstruction
-    }
-  });
-  const response = await chat.sendMessage({ message: lastMessage.parts });
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
+  const contents = jigGoogleMessages(payload.messages);
+  const requestBody = {
+    contents,
+    generationConfig: { responseModalities: ["TEXT"] }
+  };
+  if (payload.tools)
+    requestBody.tools = [payload.tools];
+  if (payload.systemInstruction) {
+    requestBody.systemInstruction = {
+      parts: [{ text: payload.systemInstruction }]
+    };
+  }
+  let response;
+  try {
+    const httpResponse = await axios.post(
+      `https://generativelanguage.googleapis.com/v1beta/models/${payload.model}:generateContent`,
+      requestBody,
+      {
+        headers: {
+          "content-type": "application/json",
+          "x-goog-api-key": process.env.GEMINI_API_KEY
+        },
+        // Per-attempt timeout. Defaults to 60s; callers pass a larger value via
+        // payload.requestTimeoutMs for slow, large generations (e.g. single-file
+        // app codegen) so a long-but-valid response isn't cut short.
+        timeout: (_a = payload.requestTimeoutMs) != null ? _a : 6e4
+      }
+    );
+    response = httpResponse.data;
+  } catch (err) {
+    const apiError = (_c = (_b = err == null ? void 0 : err.response) == null ? void 0 : _b.data) == null ? void 0 : _c.error;
+    const wrapped = new Error(
+      (apiError == null ? void 0 : apiError.message) || (err == null ? void 0 : err.message) || "Google AI API request failed"
+    );
+    wrapped.status = (_e = apiError == null ? void 0 : apiError.status) != null ? _e : (_d = err == null ? void 0 : err.response) == null ? void 0 : _d.status;
+    wrapped.code = apiError == null ? void 0 : apiError.code;
+    wrapped.details = apiError == null ? void 0 : apiError.details;
+    wrapped.promptFeedback = (_g = (_f = err == null ? void 0 : err.response) == null ? void 0 : _f.data) == null ? void 0 : _g.promptFeedback;
+    throw wrapped;
+  }
   let text = "";
   const files = [];
-  for (const part of ((_c = (_b = (_a = response.candidates) == null ? void 0 : _a[0]) == null ? void 0 : _b.content) == null ? void 0 : _c.parts) || []) {
+  const reasoningParts = [];
+  const functionCalls = [];
+  for (const part of ((_j = (_i = (_h = response.candidates) == null ? void 0 : _h[0]) == null ? void 0 : _i.content) == null ? void 0 : _j.parts) || []) {
+    if (part.thought) {
+      reasoningParts.push(part);
+      continue;
+    }
+    if (part.functionCall) {
+      functionCalls.push({
+        id: (_k = part.functionCall.id) != null ? _k : `call_${functionCalls.length}`,
+        name: (_l = part.functionCall.name) != null ? _l : "",
+        arguments: (_m = part.functionCall.args) != null ? _m : {},
+        thoughtSignature: part.thoughtSignature
+      });
+      continue;
+    }
     if (part.text)
       text += part.text;
-    if ((_d = part.inlineData) == null ? void 0 : _d.data) {
+    if ((_n = part.inlineData) == null ? void 0 : _n.data) {
       files.push({ mimeType: "image/png", data: part.inlineData.data });
     }
   }
-  const functionCalls = (_e = response.functionCalls) == null ? void 0 : _e.map((fc) => {
-    var _a2, _b2;
-    return {
-      name: (_a2 = fc.name) != null ? _a2 : "",
-      arguments: (_b2 = fc.args) != null ? _b2 : {}
-    };
-  });
-  if (!text && !(functionCalls == null ? void 0 : functionCalls.length) && !files.length) {
-    const candidate = (_f = response.candidates) == null ? void 0 : _f[0];
+  if (!text && !functionCalls.length && !files.length) {
+    const candidate = (_o = response.candidates) == null ? void 0 : _o[0];
     const finishReason = candidate == null ? void 0 : candidate.finishReason;
     logger_default.error(id, "Missing text & functions in Google AI API response:", {
       finishReason,
@@ -887,13 +1026,14 @@ async function callGoogleAI(id, payload) {
     role: "assistant",
     content: text || null,
     files,
-    function_call: (functionCalls == null ? void 0 : functionCalls[0]) || null,
-    function_calls: functionCalls || [],
+    function_call: functionCalls[0] || null,
+    function_calls: functionCalls,
+    reasoningDetails: reasoningParts.length ? reasoningParts : void 0,
     usage: response.usageMetadata ? {
-      prompt_tokens: (_g = response.usageMetadata.promptTokenCount) != null ? _g : 0,
-      completion_tokens: (_h = response.usageMetadata.candidatesTokenCount) != null ? _h : 0,
-      total_tokens: (_i = response.usageMetadata.totalTokenCount) != null ? _i : 0,
-      cached_tokens: (_j = response.usageMetadata.cachedContentTokenCount) != null ? _j : 0
+      prompt_tokens: (_p = response.usageMetadata.promptTokenCount) != null ? _p : 0,
+      completion_tokens: (_q = response.usageMetadata.candidatesTokenCount) != null ? _q : 0,
+      total_tokens: (_r = response.usageMetadata.totalTokenCount) != null ? _r : 0,
+      cached_tokens: (_s = response.usageMetadata.cachedContentTokenCount) != null ? _s : 0
     } : null
   };
 }
@@ -989,14 +1129,52 @@ async function callGoogleAIWithRetries(id, payload, retries = 5) {
 function normalizeMessageContent(content) {
   return Array.isArray(content) ? content.map((c) => c.type === "text" ? c.text : `[${c.type}]`).join("\n") : content;
 }
+function prepareOpenAICompatMessages(messages) {
+  var _a;
+  const out = [];
+  for (const message of messages) {
+    if (message.role === "tool") {
+      for (const tr of message.toolResults || []) {
+        out.push({
+          role: "tool",
+          tool_call_id: tr.toolCallId,
+          content: tr.content
+        });
+      }
+      continue;
+    }
+    const outMessage = {
+      role: message.role,
+      content: normalizeMessageContent(message.content)
+    };
+    if ((_a = message.functionCalls) == null ? void 0 : _a.length) {
+      outMessage.tool_calls = message.functionCalls.map((fc, i) => {
+        var _a2;
+        return {
+          id: (_a2 = fc.id) != null ? _a2 : `call_${i}`,
+          type: "function",
+          function: {
+            name: fc.name,
+            arguments: JSON.stringify(fc.arguments)
+          }
+        };
+      });
+      if (!message.content)
+        outMessage.content = null;
+    }
+    if (message.reasoning)
+      outMessage.reasoning = message.reasoning;
+    if (message.reasoningDetails)
+      outMessage.reasoning_details = message.reasoningDetails;
+    out.push(outMessage);
+  }
+  return out;
+}
 function prepareGroqPayload(payload) {
   var _a;
   return {
     model: payload.model,
-    messages: payload.messages.map((message) => ({
-      role: message.role,
-      content: normalizeMessageContent(message.content)
-    })),
+    messages: prepareOpenAICompatMessages(payload.messages),
     tools: (_a = payload.functions) == null ? void 0 : _a.map((fn) => ({
       type: "function",
       function: fn
@@ -1006,7 +1184,7 @@ function prepareGroqPayload(payload) {
   };
 }
 async function callGroq(id, payload) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g;
   const response = await axios.post(
     "https://api.groq.com/openai/v1/chat/completions",
     payload,
@@ -1017,15 +1195,21 @@ async function callGroq(id, payload) {
       }
     }
   );
-  const answer = (_a = response.data.choices[0]) == null ? void 0 : _a.message;
+  if (response.data.error) {
+    logger_default.error(id, "Groq error:", response.data.error);
+    throw new Error(`Groq error: ${response.data.error.message}`);
+  }
+  const answer = (_b = (_a = response.data.choices) == null ? void 0 : _a[0]) == null ? void 0 : _b.message;
   if (!answer) {
     logger_default.error(id, "Missing answer in Groq API response:", response.data);
     throw new Error("Missing answer in Groq API");
   }
   const functionCalls = [];
-  if ((_b = answer.tool_calls) == null ? void 0 : _b.length) {
-    for (const tc of answer.tool_calls) {
+  if ((_c = answer.tool_calls) == null ? void 0 : _c.length) {
+    for (let i = 0; i < answer.tool_calls.length; i++) {
+      const tc = answer.tool_calls[i];
       functionCalls.push({
+        id: (_d = tc.id) != null ? _d : `call_${i}`,
         name: tc.function.name,
         arguments: JSON.parse(tc.function.arguments)
       });
@@ -1047,11 +1231,12 @@ async function callGroq(id, payload) {
     function_call: functionCalls[0] || null,
     function_calls: functionCalls,
     files: [],
+    reasoning: (_e = answer.reasoning) != null ? _e : void 0,
     usage: response.data.usage ? {
       prompt_tokens: response.data.usage.prompt_tokens,
       completion_tokens: response.data.usage.completion_tokens,
       total_tokens: response.data.usage.total_tokens,
-      cached_tokens: (_d = (_c = response.data.usage.prompt_tokens_details) == null ? void 0 : _c.cached_tokens) != null ? _d : 0
+      cached_tokens: (_g = (_f = response.data.usage.prompt_tokens_details) == null ? void 0 : _f.cached_tokens) != null ? _g : 0
     } : null
   };
 }
@@ -1062,10 +1247,7 @@ function prepareOpenRouterPayload(payload) {
   var _a;
   return {
     model: payload.model,
-    messages: payload.messages.map((message) => ({
-      role: message.role,
-      content: normalizeMessageContent(message.content)
-    })),
+    messages: prepareOpenAICompatMessages(payload.messages),
     tools: (_a = payload.functions) == null ? void 0 : _a.map((fn) => ({
       type: "function",
       function: fn
@@ -1076,7 +1258,7 @@ function prepareOpenRouterPayload(payload) {
   };
 }
 async function callOpenRouter(id, payload) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const response = await axios.post(
     "https://openrouter.ai/api/v1/chat/completions",
     payload,
@@ -1087,15 +1269,21 @@ async function callOpenRouter(id, payload) {
       }
     }
   );
-  const answer = (_a = response.data.choices[0]) == null ? void 0 : _a.message;
+  if (response.data.error) {
+    logger_default.error(id, "OpenRouter error:", response.data.error);
+    throw new Error(`OpenRouter error: ${response.data.error.message}`);
+  }
+  const answer = (_b = (_a = response.data.choices) == null ? void 0 : _a[0]) == null ? void 0 : _b.message;
   if (!answer) {
     logger_default.error(id, "Missing answer in OpenRouter API response:", response.data);
     throw new Error("Missing answer in OpenRouter API");
   }
   const functionCalls = [];
-  if ((_b = answer.tool_calls) == null ? void 0 : _b.length) {
-    for (const tc of answer.tool_calls) {
+  if ((_c = answer.tool_calls) == null ? void 0 : _c.length) {
+    for (let i = 0; i < answer.tool_calls.length; i++) {
+      const tc = answer.tool_calls[i];
       functionCalls.push({
+        id: (_d = tc.id) != null ? _d : `call_${i}`,
         name: tc.function.name,
         arguments: JSON.parse(tc.function.arguments)
       });
@@ -1117,11 +1305,13 @@ async function callOpenRouter(id, payload) {
     function_call: functionCalls[0] || null,
     function_calls: functionCalls,
     files: [],
+    reasoning: (_e = answer.reasoning) != null ? _e : void 0,
+    reasoningDetails: (_f = answer.reasoning_details) != null ? _f : void 0,
     usage: response.data.usage ? {
       prompt_tokens: response.data.usage.prompt_tokens,
       completion_tokens: response.data.usage.completion_tokens,
       total_tokens: response.data.usage.total_tokens,
-      cached_tokens: (_d = (_c = response.data.usage.prompt_tokens_details) == null ? void 0 : _c.cached_tokens) != null ? _d : 0
+      cached_tokens: (_h = (_g = response.data.usage.prompt_tokens_details) == null ? void 0 : _g.cached_tokens) != null ? _h : 0
     } : null
   };
 }