@codeproxy/core 0.1.5 → 0.1.7

package/README.md

@@ -62,8 +62,11 @@ Creates a `fetch` wrapper that translates Responses API traffic to the configure
 | `dropImages` | `boolean` | Strip image parts from messages (text-only models) |
 | `timeoutMs` | `number` | Upstream request timeout |
 | `onCacheStats` | `(stats) => void` | Receive cache usage stats |
+| `fallbackThoughtSignature` | `string` | Fallback Gemini thought signature for OpenAI-compatible tool call histories |
 | `fallbackUpstream` | `object` | When `dropImages: true` and the request contains images, automatically route to this upstream instead (e.g. a vision-capable model) |
 
+Gemini OpenAI-compatible tool calls preserve `thought_signature` through Responses function-call items. When migrating old histories that do not include a returned signature, pass `fallbackThoughtSignature` so the next upstream tool-call request can still include `extra_content.google.thought_signature`.
+
 ### Translators
 
 Low-level translators are also available by namespace:

package/README.zh-CN.md

@@ -62,8 +62,11 @@ npm install @codeproxy/core
 | `dropImages` | `boolean` | 从消息中移除图片部分（纯文本模型） |
 | `timeoutMs` | `number` | 上游请求超时 |
 | `onCacheStats` | `(stats) => void` | 接收缓存使用统计 |
+| `fallbackThoughtSignature` | `string` | Gemini OpenAI 兼容工具调用历史的兜底 thought signature |
 | `fallbackUpstream` | `object` | 当 `dropImages: true` 且请求包含图片时，自动切换到该上游（如支持视觉的模型） |
 
+Gemini OpenAI 兼容工具调用会在 Responses function-call item 中保留 `thought_signature`。迁移旧历史时，如果历史里没有上游返回的 signature，可以传入 `fallbackThoughtSignature`，让下一次上游工具调用请求继续带上 `extra_content.google.thought_signature`。
+
 ### 转换器
 
 底层转换器也按命名空间导出：

package/dist/index.cjs

@@ -45,13 +45,21 @@ var DEFAULT_REASONING_BUDGETS = {
 function translateRequest(data, options = {}) {
   const model = data.model;
   const maxTokens = typeof data.max_output_tokens === "number" && data.max_output_tokens || typeof data.max_tokens === "number" && data.max_tokens || options.defaultMaxTokens || 8192;
-  const systemBlocks = extractSystemBlocks(data.instructions);
+  let systemBlocks = extractSystemBlocks(data.instructions);
   const built = buildMessages(data, systemBlocks);
   let messages = built.messages;
-  const hasPromptCache = built.hasPromptCache;
+  let hasPromptCache = built.hasPromptCache;
+  if (data.prompt_cache_key) {
+    hasPromptCache = true;
+    systemBlocks = markBlocksForCache(systemBlocks);
+    messages = markCacheBreakpoint(messages);
+  }
   messages = repairToolAdjacency(messages);
   messages = sanitizeMessages(messages);
   messages = ensureEndsWithUser(messages);
+  if (data.prompt_cache_key) {
+    messages = markCacheBreakpoint(messages);
+  }
   const request = {
     model,
     messages,
@@ -192,7 +200,15 @@ function buildMessages(data, systemBlocks) {
           } else if (part && typeof part === "object") {
             const contentPart = part;
             if (contentPart.type === "input_text" || contentPart.type === "text" || contentPart.type === "output_text") {
-              contentBlocks.push({ type: "text", text: String(contentPart.text ?? "") });
+              const textBlock = {
+                type: "text",
+                text: String(contentPart.text ?? "")
+              };
+              const cc = contentPart.cache_control;
+              if (cc) {
+                textBlock.cache_control = cc;
+              }
+              contentBlocks.push(textBlock);
             } else if (contentPart.type === "input_image" || contentPart.type === "image" || contentPart.type === "image_url") {
               const imgUrlPart = contentPart;
               const imgUrl = imgUrlPart.image_url;
@@ -510,6 +526,48 @@ function ensureEndsWithUser(messages) {
   }
   return [...messages, { role: "user", content: [{ type: "text", text: "Continue." }] }];
 }
+function markBlocksForCache(blocks) {
+  let count = 0;
+  for (const block of blocks) {
+    if (!block.cache_control) {
+      block.cache_control = { type: "ephemeral" };
+      count++;
+      if (count >= 3) {
+        break;
+      }
+    }
+  }
+  return blocks;
+}
+function markCacheBreakpoint(messages) {
+  for (const msg of messages) {
+    if (msg.role === "assistant" && Array.isArray(msg.content)) {
+      for (let j = msg.content.length - 1; j >= 0; j--) {
+        const block = msg.content[j];
+        if (block.type === "text") {
+          if (!block.cache_control) {
+            block.cache_control = { type: "ephemeral" };
+          }
+          return messages;
+        }
+      }
+    }
+  }
+  for (const msg of messages) {
+    if (msg.role === "user" && Array.isArray(msg.content)) {
+      for (let j = msg.content.length - 1; j >= 0; j--) {
+        const block = msg.content[j];
+        if (block.type === "text") {
+          if (!block.cache_control) {
+            block.cache_control = { type: "ephemeral" };
+          }
+          return messages;
+        }
+      }
+    }
+  }
+  return messages;
+}
 
 // src/utils/json.ts
 function safeJsonParse(text) {
@@ -785,6 +843,8 @@ var StreamTranslator = class {
   *finalize() {
     const items = [];
     if (this.textItem) {
+      this.textItem.status = "completed";
+      this.textItem.content[0].text = this.textBuffer;
       items.push({ index: this.textItemIndex, item: this.textItem });
     }
     for (const block of this.blocks.values()) {
@@ -896,15 +956,22 @@ var StreamTranslator = class {
     if (btype === "tool_use") {
       const outputIndex = this.outputCounter++;
       const callId = block.id ?? makeId("call");
+      const initialInput = typeof block.input === "object" && block.input !== null ? jsonStringifySafe(block.input) : "";
+      const hasInitialInput = initialInput !== "" && initialInput !== "{}";
       const item = {
         id: callId,
         type: "function_call",
         status: "in_progress",
         name: block.name ?? "",
-        arguments: "",
+        arguments: hasInitialInput ? initialInput : "",
         call_id: callId
       };
-      this.blocks.set(index, { type: "tool_use", outputIndex, item, buffer: "" });
+      this.blocks.set(index, {
+        type: "tool_use",
+        outputIndex,
+        item,
+        buffer: hasInitialInput ? initialInput : ""
+      });
       yield this.makeEvent("response.output_item.added", {
         response_id: this.responseId,
         output_index: outputIndex,
@@ -1023,7 +1090,7 @@ function translateRequest2(data, options = {}) {
       continue;
     }
     const rawItem = raw;
-    processInputItem(rawItem, messages, options.dropImages);
+    processInputItem(rawItem, messages, options);
   }
   const request = {
     model: data.model,
@@ -1083,7 +1150,7 @@ function buildSystemContent(instructions) {
   }
   return out;
 }
-function processInputItem(item, messages, dropImages) {
+function processInputItem(item, messages, options) {
   const itemType = String(item.type) || "message";
   const getLastAssistant = () => {
     const last = messages[messages.length - 1];
@@ -1145,7 +1212,7 @@ function processInputItem(item, messages, dropImages) {
             } else if (contentPart.type === "reasoning_text") {
               reasoningContent += String(contentPart.text ?? "");
             } else if (contentPart.type === "input_image" || contentPart.type === "image" || contentPart.type === "image_url") {
-              if (dropImages) {
+              if (options.dropImages) {
                 continue;
               }
               let url = "";
@@ -1220,7 +1287,7 @@ function processInputItem(item, messages, dropImages) {
     return;
   }
   if (itemType === "function_call" || itemType === "commandExecution" || itemType === "local_shell_call" || itemType === "fileChange" || itemType === "custom_tool_call" || itemType === "web_search_call") {
-    processToolCall(item, messages, getLastAssistant);
+    processToolCall(item, messages, getLastAssistant, options.fallbackThoughtSignature);
     return;
   }
   if (itemType === "function_call_output" || itemType === "commandExecutionOutput" || itemType === "fileChangeOutput" || itemType === "custom_tool_call_output") {
@@ -1228,7 +1295,7 @@ function processInputItem(item, messages, dropImages) {
     return;
   }
 }
-function processToolCall(item, messages, getLastAssistant) {
+function processToolCall(item, messages, getLastAssistant, fallbackThoughtSignature) {
   const callId = String(item.call_id ?? "") || String(item.id ?? "") || makeId("call");
   let name = item.name === void 0 ? void 0 : String(item.name);
   const itemType = item.type === void 0 ? void 0 : String(item.type);
@@ -1274,16 +1341,18 @@ function processToolCall(item, messages, getLastAssistant) {
   if (!amsg.tool_calls) {
     amsg.tool_calls = [];
   }
-  amsg.tool_calls.push({
+  const toolCall = {
     id: callId,
     type: "function",
     function: { name, arguments: argsStr }
-  });
-  const sig = item.thought_signature;
+  };
+  const sig = item.thought_signature ?? fallbackThoughtSignature;
   const thought = item.thought;
   if (typeof sig === "string" && sig) {
+    toolCall.extra_content = { google: { thought_signature: sig } };
     amsg.thought_signature = sig;
   }
+  amsg.tool_calls.push(toolCall);
   if (typeof thought === "string" && thought) {
     amsg.reasoning_content = (amsg.reasoning_content ?? "") + thought;
   }
@@ -1487,6 +1556,10 @@ function mapToolCallToOutput(tc) {
     arguments: args,
     call_id: callId
   };
+  const thoughtSignature = getThoughtSignature(tc);
+  if (thoughtSignature) {
+    item.thought_signature = thoughtSignature;
+  }
   if (SHELL_TOOL_NAMES3.has(name)) {
     item.type = "local_shell_call";
     const parsed = safeJsonParse(args);
@@ -1494,6 +1567,10 @@ function mapToolCallToOutput(tc) {
   }
   return item;
 }
+function getThoughtSignature(tc) {
+  const sig = tc.extra_content?.google?.thought_signature ?? tc.thought_signature;
+  return typeof sig === "string" && sig ? sig : void 0;
+}
 
 // src/translate/openai/translateStream.ts
 var SHELL_TOOL_NAMES4 = /* @__PURE__ */ new Set(["shell", "container.exec", "shell_command"]);
@@ -1596,6 +1673,10 @@ var StreamTranslator2 = class {
           });
         }
         const fn = tc.function;
+        const thoughtSignature = getThoughtSignature2(tc);
+        if (thoughtSignature) {
+          state.item.thought_signature = thoughtSignature;
+        }
         if (fn?.name) {
           state.item.name = (state.item.name ?? "") + fn.name;
         }
@@ -1707,6 +1788,10 @@ var StreamTranslator2 = class {
     };
   }
 };
+function getThoughtSignature2(tc) {
+  const sig = tc.extra_content?.google?.thought_signature ?? tc.thought_signature;
+  return typeof sig === "string" && sig ? sig : void 0;
+}
 
 // src/fetch.ts
 function createResponsesFetch(options) {
@@ -1714,7 +1799,7 @@ function createResponsesFetch(options) {
     throw new Error("baseUrl is required");
   }
   const rawFormat = options.upstreamFormat;
-  const format = rawFormat ? normalizeFormat(rawFormat) : inferFormatFromUrl(options.baseUrl) ?? "openai-chat";
+  const format = rawFormat ? normalizeFormat(rawFormat) : inferFormatFromUrl(options.baseUrl) ?? inferFormatFromModel(options.model) ?? "openai-chat";
   if (!format) {
     throw new Error(
       `Unsupported upstream format: ${options.upstreamFormat}. Use 'anthropic' or 'openai-chat'`
@@ -1885,7 +1970,8 @@ async function handleResponses(request, format, options, baseFetch, incomingHead
     options.baseUrl,
     dropImages,
     options.reasoning_effort,
-    options.thinking
+    options.thinking,
+    options.fallbackThoughtSignature
   );
   const upstreamHeaders = buildUpstreamHeaders(format, options, incomingHeaders);
   const upstream = await baseFetch(resolvedUrl, {
@@ -1941,7 +2027,7 @@ function buildRequestMetadata(request, temperature, top_p) {
     metadata: request.metadata ?? {}
   };
 }
-function buildUpstreamBody(request, format, streaming, baseUrl, dropImages, reasoning_effort, thinking) {
+function buildUpstreamBody(request, format, streaming, baseUrl, dropImages, reasoning_effort, thinking, fallbackThoughtSignature) {
   if (format === "anthropic") {
     const { request: ar } = translateRequest(request);
     ar.stream = streaming;
@@ -1972,7 +2058,10 @@ function buildUpstreamBody(request, format, streaming, baseUrl, dropImages, reas
       requestMetadata: buildRequestMetadata(request, ar.temperature, ar.top_p)
     };
   }
-  const { request: cr } = translateRequest2(request, { dropImages });
+  const { request: cr } = translateRequest2(request, {
+    dropImages,
+    fallbackThoughtSignature
+  });
   cr.stream = streaming;
   if (streaming) {
     cr.stream_options = { include_usage: true };