@codeproxy/core 0.1.8 → 0.1.11

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: {
@@ -1486,6 +1412,32 @@ function mapTools2(tools) {
       });
       continue;
     }
+    if (tt === "namespace") {
+      const ns = tool.name;
+      const nested = tool.tools;
+      if (ns && Array.isArray(nested)) {
+        for (const sub of nested) {
+          if (!sub || typeof sub !== "object" || sub.type !== "function") {
+            continue;
+          }
+          const subName = sub.name;
+          if (!subName) {
+            continue;
+          }
+          const params = sub.parameters ?? { type: "object" };
+          out.push({
+            type: "function",
+            function: {
+              name: `${ns}.${subName}`,
+              description: sub.description ?? "",
+              // eslint-disable-next-line no-restricted-syntax -- schema is Record<string,unknown> by OpenAPI convention
+              parameters: params
+            }
+          });
+        }
+      }
+      continue;
+    }
   }
   return out;
 }
@@ -1564,6 +1516,36 @@ function repairToolMessageOrder(messages) {
 
 // src/translate/openai/translateResponse.ts
 var SHELL_TOOL_NAMES3 = /* @__PURE__ */ new Set(["shell", "container.exec", "shell_command"]);
+function buildShortNameToNamespace(tools) {
+  const map = /* @__PURE__ */ new Map();
+  for (const tool of tools) {
+    if (!tool || typeof tool !== "object") {
+      continue;
+    }
+    const entry = tool;
+    const fn = entry.function;
+    const flatName = typeof fn?.name === "string" ? fn.name : typeof entry.name === "string" ? entry.name : "";
+    const dotIdx = flatName.indexOf(".");
+    if (dotIdx !== -1) {
+      map.set(flatName.slice(dotIdx + 1), flatName.slice(0, dotIdx));
+      continue;
+    }
+    if (entry.type === "namespace" && typeof entry.name === "string" && Array.isArray(entry.tools)) {
+      const ns = entry.name;
+      for (const sub of entry.tools) {
+        if (!sub || typeof sub !== "object") {
+          continue;
+        }
+        const subEntry = sub;
+        const subName = typeof subEntry.name === "string" ? subEntry.name : "";
+        if (subName) {
+          map.set(subName, ns);
+        }
+      }
+    }
+  }
+  return map;
+}
 function translateResponse2(body, options = {}) {
   const createdAt = options.createdAt ?? body.created ?? Math.floor(Date.now() / 1e3);
   const id = options.responseId ?? body.id ?? makeId("resp");
@@ -1571,9 +1553,10 @@ function translateResponse2(body, options = {}) {
   const choice = body.choices?.[0];
   const message = choice?.message;
   const output = [];
+  const shortNameToNs = buildShortNameToNamespace(options.requestTools ?? []);
   if (message?.tool_calls?.length) {
     for (const tc of message.tool_calls) {
-      const item = mapToolCallToOutput(tc);
+      const item = mapToolCallToOutput(tc, shortNameToNs);
       if (item) {
         output.push(item);
       }
@@ -1610,7 +1593,7 @@ function translateResponse2(body, options = {}) {
     }
   };
 }
-function mapToolCallToOutput(tc) {
+function mapToolCallToOutput(tc, shortNameToNs) {
   const name = tc.function?.name;
   if (!name) {
     return void 0;
@@ -1620,11 +1603,23 @@ function mapToolCallToOutput(tc) {
   if (typeof args !== "string") {
     args = jsonStringifySafe(args ?? {});
   }
+  let resolvedName = name;
+  let resolvedNamespace;
+  if (!SHELL_TOOL_NAMES3.has(name)) {
+    const dotIdx = name.indexOf(".");
+    if (dotIdx !== -1) {
+      resolvedNamespace = name.slice(0, dotIdx);
+      resolvedName = name.slice(dotIdx + 1);
+    } else {
+      resolvedNamespace = shortNameToNs?.get(name);
+    }
+  }
   const item = {
     id: callId,
     type: "function_call",
     status: "completed",
-    name,
+    name: resolvedName,
+    ...resolvedNamespace ? { namespace: resolvedNamespace } : {},
     arguments: args,
     call_id: callId
   };
@@ -1632,7 +1627,7 @@ function mapToolCallToOutput(tc) {
   if (thoughtSignature) {
     item.thought_signature = thoughtSignature;
   }
-  if (SHELL_TOOL_NAMES3.has(name)) {
+  if (SHELL_TOOL_NAMES3.has(resolvedName)) {
     item.type = "local_shell_call";
     const parsed = safeJsonParse(args);
     item.action = { type: "exec", command: parsed?.command ?? [] };
@@ -1646,6 +1641,36 @@ function getThoughtSignature(tc) {
 
 // src/translate/openai/translateStream.ts
 var SHELL_TOOL_NAMES4 = /* @__PURE__ */ new Set(["shell", "container.exec", "shell_command"]);
+function buildShortNameToNamespace2(tools) {
+  const map = /* @__PURE__ */ new Map();
+  for (const tool of tools) {
+    if (!tool || typeof tool !== "object") {
+      continue;
+    }
+    const entry = tool;
+    const fn = entry.function;
+    const flatName = typeof fn?.name === "string" ? fn.name : typeof entry.name === "string" ? entry.name : "";
+    const dotIdx = flatName.indexOf(".");
+    if (dotIdx !== -1) {
+      map.set(flatName.slice(dotIdx + 1), flatName.slice(0, dotIdx));
+      continue;
+    }
+    if (entry.type === "namespace" && typeof entry.name === "string" && Array.isArray(entry.tools)) {
+      const ns = entry.name;
+      for (const sub of entry.tools) {
+        if (!sub || typeof sub !== "object") {
+          continue;
+        }
+        const subEntry = sub;
+        const subName = typeof subEntry.name === "string" ? subEntry.name : "";
+        if (subName) {
+          map.set(subName, ns);
+        }
+      }
+    }
+  }
+  return map;
+}
 async function* translateStream2(stream, options = {}) {
   const translator = new StreamTranslator2(options);
   yield translator.createInitialEvent();
@@ -1664,6 +1689,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");
@@ -1676,6 +1710,10 @@ var StreamTranslator2 = class {
     __publicField(this, "textItemIndex", -1);
     __publicField(this, "textBuffer", "");
     __publicField(this, "toolCalls", /* @__PURE__ */ new Map());
+    // shortName → namespace reverse map built from flattened namespace tools in
+    // the translated request.  Used to restore the namespace when an upstream
+    // (e.g. DeepSeek) omits the "namespace." prefix in its tool-call response.
+    __publicField(this, "shortNameToNamespace");
     __publicField(this, "inputTokens", 0);
     __publicField(this, "outputTokens", 0);
     __publicField(this, "cachedTokens", 0);
@@ -1683,6 +1721,7 @@ var StreamTranslator2 = class {
     this.responseId = options.responseId ?? makeId("resp");
     this.createdAt = options.createdAt ?? Math.floor(Date.now() / 1e3);
     this.metadata = options.requestMetadata ?? {};
+    this.shortNameToNamespace = buildShortNameToNamespace2(this.metadata.tools ?? []);
   }
   createInitialEvent() {
     const toolsArr = this.metadata.tools ?? [];
@@ -1722,9 +1761,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 +1776,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,
@@ -1804,6 +1843,18 @@ var StreamTranslator2 = class {
     for (const state of this.toolCalls.values()) {
       const item = state.item;
       item.status = "completed";
+      if (item.name && !SHELL_TOOL_NAMES4.has(item.name)) {
+        const dotIdx = item.name.indexOf(".");
+        if (dotIdx !== -1) {
+          item.namespace = item.name.slice(0, dotIdx);
+          item.name = item.name.slice(dotIdx + 1);
+        } else {
+          const ns = this.shortNameToNamespace.get(item.name);
+          if (ns) {
+            item.namespace = ns;
+          }
+        }
+      }
       if (item.name && SHELL_TOOL_NAMES4.has(item.name)) {
         item.type = "local_shell_call";
         const parsed = safeJsonParse(item.arguments ?? "");
@@ -1865,6 +1916,109 @@ function getThoughtSignature2(tc) {
   return typeof sig === "string" && sig ? sig : void 0;
 }
 
+// src/tool-name-sanitizer.ts
+function sanitizeUpstreamToolNames(body) {
+  const map = /* @__PURE__ */ new Map();
+  const tools = body.tools;
+  if (!Array.isArray(tools)) {
+    return map;
+  }
+  for (const tool of tools) {
+    if (!tool || typeof tool !== "object") {
+      continue;
+    }
+    const toolRecord = tool;
+    const fn = toolRecord.function;
+    if (!fn || typeof fn !== "object") {
+      continue;
+    }
+    const fnRecord = fn;
+    const original = fnRecord.name;
+    if (typeof original !== "string") {
+      continue;
+    }
+    const sanitized = original.replace(/[^a-zA-Z0-9_-]/g, "_");
+    if (sanitized !== original) {
+      map.set(sanitized, original);
+      fnRecord.name = sanitized;
+    }
+  }
+  return map;
+}
+function restoreToolNamesInChatResponse(body, map) {
+  if (map.size === 0) {
+    return body;
+  }
+  const choices = body.choices;
+  if (!Array.isArray(choices)) {
+    return body;
+  }
+  for (const choice of choices) {
+    if (!choice || typeof choice !== "object") {
+      continue;
+    }
+    const choiceRecord = choice;
+    const message = choiceRecord.message;
+    if (!message || typeof message !== "object") {
+      continue;
+    }
+    const msg = message;
+    const toolCalls = msg.tool_calls;
+    if (!Array.isArray(toolCalls)) {
+      continue;
+    }
+    for (const tc of toolCalls) {
+      if (!tc || typeof tc !== "object") {
+        continue;
+      }
+      const callRecord = tc;
+      const fn = callRecord.function;
+      if (!fn || typeof fn !== "object") {
+        continue;
+      }
+      const fnRecord = fn;
+      const name = fnRecord.name;
+      if (typeof name === "string" && map.has(name)) {
+        fnRecord.name = map.get(name);
+      }
+    }
+  }
+  return body;
+}
+function createToolNameRestoreStream(body, map) {
+  if (map.size === 0) {
+    return body;
+  }
+  const entries = Array.from(map.entries());
+  const decoder = new TextDecoder();
+  const encoder = new TextEncoder();
+  const reader = body.getReader();
+  return new ReadableStream({
+    async pull(controller) {
+      try {
+        const { value, done } = await reader.read();
+        if (done) {
+          controller.close();
+          return;
+        }
+        let text = decoder.decode(value, { stream: true });
+        for (const [sanitized, original] of entries) {
+          const escapedSanitized = sanitized.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+          const re = new RegExp(`("name"\\s*:\\s*")${escapedSanitized}(")`, "g");
+          text = text.replace(re, `$1${original}$2`);
+        }
+        controller.enqueue(encoder.encode(text));
+      } catch (err) {
+        controller.error(err);
+      }
+    },
+    cancel() {
+      reader.cancel().catch(() => {
+      });
+    }
+  });
+}
+
 // src/fetch.ts
 function createResponsesFetch(options) {
   if (!options.baseUrl) {
@@ -2033,6 +2187,10 @@ async function handleResponses(request, format, options, baseFetch, incomingHead
     const fbModel = fb.model ? `, model: ${fb.model}` : "";
     console.warn(`[fallback] last user message has image, routing to ${fb.baseUrl}${fbModel}`);
   }
+  if (options.dropTools && request.tools) {
+    const { dropTools } = options;
+    request = { ...request, tools: request.tools.filter((tool) => !dropTools(tool)) };
+  }
   const streaming = request.stream ?? false;
   const resolvedUrl = normalizeBaseUrl(options.baseUrl, format);
   const { upstreamBody, requestMetadata } = buildUpstreamBody(
@@ -2046,6 +2204,10 @@ async function handleResponses(request, format, options, baseFetch, incomingHead
     options.fallbackThoughtSignature
   );
   const upstreamHeaders = buildUpstreamHeaders(format, options, incomingHeaders);
+  const toolNameMap = format === "openai-chat" ? (
+    // eslint-disable-next-line no-restricted-syntax -- upstreamBody is unknown; cast to Record for tool mutation
+    sanitizeUpstreamToolNames(upstreamBody)
+  ) : /* @__PURE__ */ new Map();
   const upstream = await baseFetch(resolvedUrl, {
     method: "POST",
     headers: upstreamHeaders,
@@ -2059,13 +2221,23 @@ async function handleResponses(request, format, options, baseFetch, incomingHead
     });
   }
   if (!streaming) {
-    const body = await upstream.json();
+    const rawBody = await upstream.json();
+    const restoredBody = restoreToolNamesInChatResponse(
+      // eslint-disable-next-line no-restricted-syntax -- upstream json() returns unknown; cast to Record for tool name restoration
+      rawBody,
+      toolNameMap
+    );
     const translated = format === "anthropic" ? (
       // eslint-disable-next-line no-restricted-syntax -- union type narrowing requires type assertion
-      translateResponse(body, { model: request.model })
+      translateResponse(restoredBody, {
+        model: request.model
+      })
     ) : (
       // eslint-disable-next-line no-restricted-syntax -- union type narrowing requires type assertion
-      translateResponse2(body, { model: request.model })
+      translateResponse2(restoredBody, {
+        model: request.model,
+        requestTools: request.tools ?? []
+      })
     );
     options.onCacheStats?.(extractCacheStatsFromResponse(translated));
     return new Response(JSON.stringify(translated), {
@@ -2076,7 +2248,8 @@ async function handleResponses(request, format, options, baseFetch, incomingHead
   if (!upstream.body) {
     return jsonErrorResponse(502, "Upstream streaming response has no body");
   }
-  const events = format === "anthropic" ? translateStream(upstream.body, { model: request.model, requestMetadata }) : translateStream2(upstream.body, { model: request.model, requestMetadata });
+  const upstreamBodyStream = createToolNameRestoreStream(upstream.body, toolNameMap);
+  const events = format === "anthropic" ? translateStream(upstreamBodyStream, { model: request.model, requestMetadata }) : translateStream2(upstreamBodyStream, { model: request.model, requestMetadata });
   return new Response(
     responsesEventsToSseStream(collectCacheStatsFromStream(events, options.onCacheStats)),
     {