@codeproxy/core 0.1.14 → 0.1.16

package/dist/index.js

@@ -1071,6 +1071,101 @@ __export(openai_exports, {
   translateStream: () => translateStream2
 });
 
+// src/translate/openai/gemini-fixups.ts
+function isGeminiModel(model) {
+  if (!model) {
+    return false;
+  }
+  const lower = model.toLowerCase();
+  return lower.includes("gemini") || lower.startsWith("google/");
+}
+function extractTextContent(content) {
+  if (typeof content === "string") {
+    return content;
+  }
+  if (!Array.isArray(content)) {
+    return "";
+  }
+  let out = "";
+  for (const part of content) {
+    if (typeof part === "string") {
+      out += part;
+    } else if (part && typeof part === "object") {
+      out += String(part.text ?? "");
+    }
+  }
+  return out;
+}
+function mergeSystemMessages(messages) {
+  const systemTexts = [];
+  const rest = [];
+  for (const msg of messages) {
+    if (msg.role === "system") {
+      systemTexts.push(extractTextContent(msg.content));
+    } else {
+      rest.push(msg);
+    }
+  }
+  if (systemTexts.length <= 1) {
+    return;
+  }
+  messages.length = 0;
+  messages.push({ role: "system", content: systemTexts.join("\n\n") }, ...rest);
+}
+var MULTI_TOOL_USE_MANDATE = "Use `multi_tool_use.parallel` to parallelize tool calls and only this.";
+var MULTI_TOOL_USE_REWRITE = "Parallelize by returning multiple tool calls in a single response. A tool named `multi_tool_use.parallel` does NOT exist in this environment \u2014 never call it.";
+var UNSUPPORTED_PARALLEL_RE = /^unsupported call: (?:multi_tool_use\W*)?parallel/iu;
+var UNSUPPORTED_PARALLEL_HINT = " (`multi_tool_use.parallel` is not a real tool here. Re-issue each inner call as its own separate tool call \u2014 several tool calls in one response are fine.)";
+function applyGeminiToolUseShim(messages) {
+  for (const msg of messages) {
+    if (msg.role === "system" && typeof msg.content === "string" && msg.content.includes(MULTI_TOOL_USE_MANDATE)) {
+      msg.content = msg.content.split(MULTI_TOOL_USE_MANDATE).join(MULTI_TOOL_USE_REWRITE);
+    } else if (msg.role === "tool" && typeof msg.content === "string" && UNSUPPORTED_PARALLEL_RE.test(msg.content)) {
+      msg.content = msg.content + UNSUPPORTED_PARALLEL_HINT;
+    }
+  }
+}
+var SYNTHETIC_TOOL_RESPONSE = '{"status":"no_result","note":"No tool result was recorded for this call before the request was sent (the turn was interrupted or the result was not persisted). Treat the call as unfinished \u2014 do not assume it succeeded; re-check the underlying state before retrying."}';
+function synthesizeMissingToolResponses(messages) {
+  const answered = /* @__PURE__ */ new Set();
+  for (const msg of messages) {
+    if (msg.role === "tool" && msg.tool_call_id !== void 0) {
+      answered.add(String(msg.tool_call_id));
+    }
+  }
+  const out = [];
+  let cursor = 0;
+  while (cursor < messages.length) {
+    const msg = messages[cursor];
+    out.push(msg);
+    cursor += 1;
+    if (msg.role !== "assistant" || !msg.tool_calls?.length) {
+      continue;
+    }
+    while (cursor < messages.length && messages[cursor].role === "tool") {
+      out.push(messages[cursor]);
+      cursor += 1;
+    }
+    for (const call of msg.tool_calls) {
+      const id = call.id ? String(call.id) : "";
+      if (id && !answered.has(id)) {
+        out.push({ role: "tool", tool_call_id: id, content: SYNTHETIC_TOOL_RESPONSE });
+        answered.add(id);
+      }
+    }
+  }
+  messages.length = 0;
+  messages.push(...out);
+}
+function applyGeminiFixups(messages, model) {
+  if (!isGeminiModel(model)) {
+    return;
+  }
+  mergeSystemMessages(messages);
+  applyGeminiToolUseShim(messages);
+  synthesizeMissingToolResponses(messages);
+}
+
 // src/translate/openai/translateRequest.ts
 function translateRequest2(data, options = {}) {
   const messages = [];
@@ -1126,6 +1221,7 @@ function translateRequest2(data, options = {}) {
     }
   }
   repairToolMessageOrder(messages);
+  applyGeminiFixups(messages, data.model);
   return { request };
 }
 function buildSystemContent(instructions) {
@@ -1497,43 +1593,41 @@ function repairToolMessageOrder(messages) {
   if (messages.length === 0) {
     return;
   }
-  const blocks = [];
-  let currentBlock = null;
+  const toolById = /* @__PURE__ */ new Map();
   for (const msg of messages) {
-    if (msg.role === "assistant") {
-      currentBlock = { assistant: msg, trailing: [] };
-      blocks.push(currentBlock);
-    } else if (currentBlock) {
-      currentBlock.trailing.push(msg);
-    } else {
-      blocks.push({ assistant: { role: "assistant", content: null }, trailing: [msg] });
+    if (msg.role === "tool" && msg.tool_call_id !== void 0 && !toolById.has(String(msg.tool_call_id))) {
+      toolById.set(String(msg.tool_call_id), msg);
     }
   }
-  for (const block of blocks) {
-    const toolCallIds = new Set(
-      (block.assistant.tool_calls ?? []).map((tc) => tc.id).filter(Boolean)
-    );
-    if (toolCallIds.size === 0) {
+  const used = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const msg of messages) {
+    if (msg.role === "tool") {
       continue;
     }
-    const tools = [];
-    const others = [];
-    for (const m of block.trailing) {
-      if (m.role === "tool" && m.tool_call_id !== void 0 && toolCallIds.has(String(m.tool_call_id))) {
-        tools.push(m);
-      } else {
-        others.push(m);
+    if (msg.role !== "assistant") {
+      out.push(msg);
+      continue;
+    }
+    const calls = msg.tool_calls ?? [];
+    if (calls.length === 0) {
+      if (msg.content != null || msg.reasoning_content != null) {
+        out.push(msg);
       }
+      continue;
     }
-    block.trailing = [...tools, ...others];
-  }
-  messages.length = 0;
-  for (const block of blocks) {
-    if (block.assistant.tool_calls || block.assistant.content != null) {
-      messages.push(block.assistant);
+    out.push(msg);
+    for (const call of calls) {
+      const id = call.id ? String(call.id) : "";
+      const tool = id ? toolById.get(id) : void 0;
+      if (id && tool && !used.has(id)) {
+        out.push(tool);
+        used.add(id);
+      }
     }
-    messages.push(...block.trailing);
   }
+  messages.length = 0;
+  messages.push(...out);
 }
 
 // src/translate/openai/translateResponse.ts