@codeproxy/core 0.1.8 → 0.1.9

package/dist/index.js

@@ -1071,66 +1071,9 @@ __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 });
@@ -1145,7 +1088,7 @@ function translateRequest2(data, options = {}) {
       continue;
     }
     const rawItem = raw;
-    processInputItem(rawItem, messages, options, context);
+    processInputItem(rawItem, messages, options);
   }
   const request = {
     model: data.model,
@@ -1166,6 +1109,7 @@ 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);
@@ -1204,7 +1148,7 @@ function buildSystemContent(instructions) {
   }
   return out;
 }
-function processInputItem(item, messages, options, context) {
+function processInputItem(item, messages, options) {
   const itemType = String(item.type) || "message";
   const getLastAssistant = () => {
     const last = messages[messages.length - 1];
@@ -1341,15 +1285,15 @@ function processInputItem(item, messages, options, context) {
     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, context);
+    processToolCall(item, messages, getLastAssistant, options.fallbackThoughtSignature);
     return;
   }
   if (itemType === "function_call_output" || itemType === "commandExecutionOutput" || itemType === "fileChangeOutput" || itemType === "custom_tool_call_output") {
-    processToolOutput(item, messages, context);
+    processToolOutput(item, messages);
     return;
   }
 }
-function processToolCall(item, messages, getLastAssistant, fallbackThoughtSignature, context) {
+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);
@@ -1391,14 +1335,6 @@ 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 = [];
@@ -1419,7 +1355,7 @@ ${note}` : note;
     amsg.reasoning_content = (amsg.reasoning_content ?? "") + thought;
   }
 }
-function processToolOutput(item, messages, context) {
+function processToolOutput(item, messages) {
   const callId = item.call_id === void 0 ? void 0 : String(item.call_id);
   const outputRaw = item.output ?? item.content ?? item.stdout ?? "";
   let content = "";
@@ -1446,15 +1382,6 @@ function processToolOutput(item, messages, context) {
   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,
@@ -1474,8 +1401,7 @@ function mapTools2(tools) {
       if (!name) {
         continue;
       }
-      const rawParams = fn?.parameters ?? tool.parameters ?? { type: "object" };
-      const params = sanitizeJsonSchema(rawParams);
+      const params = fn?.parameters ?? tool.parameters ?? { type: "object" };
       out.push({
         type: "function",
         function: {
@@ -1664,6 +1590,15 @@ async function* translateStream2(stream, options = {}) {
 function isDoneMessage(msg) {
   return msg.data.trim() === "[DONE]";
 }
+function getToolCallKey(tc, ordinal) {
+  if (typeof tc.index === "number") {
+    return `index:${tc.index}`;
+  }
+  if (tc.id) {
+    return `id:${tc.id}`;
+  }
+  return `ordinal:${ordinal}`;
+}
 var StreamTranslator2 = class {
   constructor(options) {
     __publicField(this, "model");
@@ -1722,9 +1657,9 @@ var StreamTranslator2 = class {
       return;
     }
     if (delta.tool_calls?.length) {
-      for (const tc of delta.tool_calls) {
-        const idx = tc.index ?? 0;
-        let state = this.toolCalls.get(idx);
+      for (const [ordinal, tc] of delta.tool_calls.entries()) {
+        const key = getToolCallKey(tc, ordinal);
+        let state = this.toolCalls.get(key);
         if (!state) {
           const outputIndex = this.outputCounter++;
           const callId = tc.id ?? makeId("call");
@@ -1737,7 +1672,7 @@ var StreamTranslator2 = class {
             call_id: callId
           };
           state = { outputIndex, item };
-          this.toolCalls.set(idx, state);
+          this.toolCalls.set(key, state);
           yield this.makeEvent("response.output_item.added", {
             response_id: this.responseId,
             output_index: outputIndex,