@codeproxy/core 0.1.6 → 0.1.8

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

@@ -527,9 +527,14 @@ 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;
@@ -838,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()) {
@@ -949,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,
@@ -1059,9 +1073,66 @@ __export(openai_exports, {
   translateStream: () => translateStream2
 });
 
+// src/translate/openai/toolSchema.ts
+function sanitizeJsonSchema(schema, depth = 0) {
+  if (!schema || typeof schema !== "object" || Array.isArray(schema) || depth > 20) {
+    return schema;
+  }
+  const src = schema;
+  if ("$ref" in src) {
+    return src.description ? { description: src.description } : {};
+  }
+  const out = {};
+  for (const [key, val] of Object.entries(src)) {
+    if (isDroppedSchemaKeyword(key)) {
+      continue;
+    }
+    if (key === "properties" && val && typeof val === "object" && !Array.isArray(val)) {
+      const props = {};
+      for (const [propName, propSchema] of Object.entries(val)) {
+        props[propName] = sanitizeJsonSchema(propSchema, depth + 1);
+      }
+      out[key] = props;
+    } else if (key === "additionalProperties") {
+      if (typeof val !== "boolean") {
+        out[key] = sanitizeJsonSchema(val, depth + 1);
+      }
+    } else if (key === "items") {
+      out[key] = sanitizeJsonSchema(val, depth + 1);
+    } else if (isSchemaCompositionKeyword(key) && Array.isArray(val)) {
+      out[key] = val.map((schemaItem) => sanitizeJsonSchema(schemaItem, depth + 1));
+    } else {
+      out[key] = val;
+    }
+  }
+  return out;
+}
+function getValidFunctionNames(tools) {
+  const names = /* @__PURE__ */ new Set();
+  for (const tool of tools) {
+    const maybeTool = tool;
+    if (maybeTool.type === "function" && typeof maybeTool.function?.name === "string") {
+      names.add(maybeTool.function.name);
+    }
+  }
+  return names.size ? names : void 0;
+}
+function isDroppedSchemaKeyword(key) {
+  return key === "$schema" || key === "$defs" || key === "definitions" || key === "$id" || key === "$anchor" || key === "$comment";
+}
+function isSchemaCompositionKeyword(key) {
+  return key === "anyOf" || key === "oneOf" || key === "allOf" || key === "not";
+}
+
 // src/translate/openai/translateRequest.ts
 function translateRequest2(data, options = {}) {
   const messages = [];
+  const tools = mapTools2(data.tools ?? []);
+  const validFunctionNames = getValidFunctionNames(tools);
+  const context = {
+    validFunctionNames,
+    ignoredToolCallIds: /* @__PURE__ */ new Set()
+  };
   const systemContent = buildSystemContent(data.instructions);
   if (systemContent) {
     messages.push({ role: "system", content: systemContent });
@@ -1076,7 +1147,7 @@ function translateRequest2(data, options = {}) {
       continue;
     }
     const rawItem = raw;
-    processInputItem(rawItem, messages, options.dropImages);
+    processInputItem(rawItem, messages, options, context);
   }
   const request = {
     model: data.model,
@@ -1097,7 +1168,6 @@ function translateRequest2(data, options = {}) {
   if (typeof maxTokens === "number") {
     request.max_tokens = maxTokens;
   }
-  const tools = mapTools2(data.tools ?? []);
   if (tools.length) {
     request.tools = tools;
     const toolChoice = mapToolChoice2(data.tool_choice);
@@ -1136,7 +1206,7 @@ function buildSystemContent(instructions) {
   }
   return out;
 }
-function processInputItem(item, messages, dropImages) {
+function processInputItem(item, messages, options, context) {
   const itemType = String(item.type) || "message";
   const getLastAssistant = () => {
     const last = messages[messages.length - 1];
@@ -1198,7 +1268,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 = "";
@@ -1273,15 +1343,15 @@ 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, context);
     return;
   }
   if (itemType === "function_call_output" || itemType === "commandExecutionOutput" || itemType === "fileChangeOutput" || itemType === "custom_tool_call_output") {
-    processToolOutput(item, messages);
+    processToolOutput(item, messages, context);
     return;
   }
 }
-function processToolCall(item, messages, getLastAssistant) {
+function processToolCall(item, messages, getLastAssistant, fallbackThoughtSignature, context) {
   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);
@@ -1323,25 +1393,35 @@ function processToolCall(item, messages, getLastAssistant) {
   if (!name) {
     return;
   }
+  if (context?.validFunctionNames?.size && !context.validFunctionNames.has(name)) {
+    context.ignoredToolCallIds.add(callId);
+    const amsg2 = getLastAssistant();
+    const note = `Unsupported tool call omitted: ${name}`;
+    amsg2.content = typeof amsg2.content === "string" && amsg2.content ? `${amsg2.content}
+${note}` : note;
+    return;
+  }
   const amsg = 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;
   }
 }
-function processToolOutput(item, messages) {
+function processToolOutput(item, messages, context) {
   const callId = item.call_id === void 0 ? void 0 : String(item.call_id);
   const outputRaw = item.output ?? item.content ?? item.stdout ?? "";
   let content = "";
@@ -1368,6 +1448,15 @@ function processToolOutput(item, messages) {
   if (!content && typeof item.stderr === "string" && item.stderr) {
     content = `Error: ${item.stderr}`;
   }
+  if (callId && context?.ignoredToolCallIds.has(callId)) {
+    if (content) {
+      messages.push({
+        role: "user",
+        content: `Output for omitted unsupported tool call: ${content}`
+      });
+    }
+    return;
+  }
   messages.push({
     role: "tool",
     tool_call_id: callId,
@@ -1387,7 +1476,8 @@ function mapTools2(tools) {
       if (!name) {
         continue;
       }
-      const params = fn?.parameters ?? tool.parameters ?? { type: "object" };
+      const rawParams = fn?.parameters ?? tool.parameters ?? { type: "object" };
+      const params = sanitizeJsonSchema(rawParams);
       out.push({
         type: "function",
         function: {
@@ -1540,6 +1630,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);
@@ -1547,6 +1641,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"]);
@@ -1649,6 +1747,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;
         }
@@ -1760,6 +1862,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) {
@@ -1767,7 +1873,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'`
@@ -1938,7 +2044,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, {
@@ -1994,7 +2101,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;
@@ -2025,7 +2132,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 };