@codeproxy/core 0.1.7 → 0.1.8

package/dist/index.js

@@ -1071,9 +1071,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 });
@@ -1088,7 +1145,7 @@ function translateRequest2(data, options = {}) {
       continue;
     }
     const rawItem = raw;
-    processInputItem(rawItem, messages, options);
+    processInputItem(rawItem, messages, options, context);
   }
   const request = {
     model: data.model,
@@ -1109,7 +1166,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);
@@ -1148,7 +1204,7 @@ function buildSystemContent(instructions) {
   }
   return out;
 }
-function processInputItem(item, messages, options) {
+function processInputItem(item, messages, options, context) {
   const itemType = String(item.type) || "message";
   const getLastAssistant = () => {
     const last = messages[messages.length - 1];
@@ -1285,15 +1341,15 @@ function processInputItem(item, messages, options) {
     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, options.fallbackThoughtSignature);
+    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, fallbackThoughtSignature) {
+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);
@@ -1335,6 +1391,14 @@ function processToolCall(item, messages, getLastAssistant, fallbackThoughtSignat
   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 = [];
@@ -1355,7 +1419,7 @@ function processToolCall(item, messages, getLastAssistant, fallbackThoughtSignat
     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 = "";
@@ -1382,6 +1446,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,
@@ -1401,7 +1474,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: {