@blockrun/clawrouter 0.6.7 → 0.6.8

package/dist/index.js

@@ -2457,6 +2457,78 @@ var ROLE_MAPPINGS = {
   model: "assistant"
   // Some APIs use "model" instead of "assistant"
 };
+var VALID_TOOL_ID_PATTERN = /^[a-zA-Z0-9_-]+$/;
+function sanitizeToolId(id) {
+  if (!id || typeof id !== "string") return id;
+  if (VALID_TOOL_ID_PATTERN.test(id)) return id;
+  return id.replace(/[^a-zA-Z0-9_-]/g, "_");
+}
+function sanitizeToolIds(messages) {
+  if (!messages || messages.length === 0) return messages;
+  let hasChanges = false;
+  const sanitized = messages.map((msg) => {
+    const typedMsg = msg;
+    let msgChanged = false;
+    let newMsg = { ...msg };
+    if (typedMsg.tool_calls && Array.isArray(typedMsg.tool_calls)) {
+      const newToolCalls = typedMsg.tool_calls.map((tc) => {
+        if (tc.id && typeof tc.id === "string") {
+          const sanitized2 = sanitizeToolId(tc.id);
+          if (sanitized2 !== tc.id) {
+            msgChanged = true;
+            return { ...tc, id: sanitized2 };
+          }
+        }
+        return tc;
+      });
+      if (msgChanged) {
+        newMsg = { ...newMsg, tool_calls: newToolCalls };
+      }
+    }
+    if (typedMsg.tool_call_id && typeof typedMsg.tool_call_id === "string") {
+      const sanitized2 = sanitizeToolId(typedMsg.tool_call_id);
+      if (sanitized2 !== typedMsg.tool_call_id) {
+        msgChanged = true;
+        newMsg = { ...newMsg, tool_call_id: sanitized2 };
+      }
+    }
+    if (Array.isArray(typedMsg.content)) {
+      const newContent = typedMsg.content.map((block) => {
+        if (!block || typeof block !== "object") return block;
+        let blockChanged = false;
+        let newBlock = { ...block };
+        if (block.type === "tool_use" && block.id && typeof block.id === "string") {
+          const sanitized2 = sanitizeToolId(block.id);
+          if (sanitized2 !== block.id) {
+            blockChanged = true;
+            newBlock = { ...newBlock, id: sanitized2 };
+          }
+        }
+        if (block.type === "tool_result" && block.tool_use_id && typeof block.tool_use_id === "string") {
+          const sanitized2 = sanitizeToolId(block.tool_use_id);
+          if (sanitized2 !== block.tool_use_id) {
+            blockChanged = true;
+            newBlock = { ...newBlock, tool_use_id: sanitized2 };
+          }
+        }
+        if (blockChanged) {
+          msgChanged = true;
+          return newBlock;
+        }
+        return block;
+      });
+      if (msgChanged) {
+        newMsg = { ...newMsg, content: newContent };
+      }
+    }
+    if (msgChanged) {
+      hasChanges = true;
+      return newMsg;
+    }
+    return msg;
+  });
+  return hasChanges ? sanitized : messages;
+}
 function normalizeMessageRoles(messages) {
   if (!messages || messages.length === 0) return messages;
   let hasChanges = false;
@@ -2774,6 +2846,9 @@ async function tryModelRequest(upstreamUrl, method, headers, body, modelId, maxT
     if (Array.isArray(parsed.messages)) {
       parsed.messages = normalizeMessageRoles(parsed.messages);
     }
+    if (Array.isArray(parsed.messages)) {
+      parsed.messages = sanitizeToolIds(parsed.messages);
+    }
     if (isGoogleModel(modelId) && Array.isArray(parsed.messages)) {
       parsed.messages = normalizeMessagesForGoogle(parsed.messages);
     }