@blockrun/clawrouter 0.6.7 → 0.6.9

package/dist/index.js

@@ -715,7 +715,7 @@ function scoreAgenticTask(text, keywords) {
       }
     }
   }
-  if (matchCount >= 3) {
+  if (matchCount >= 4) {
     return {
       dimensionScore: {
         name: "agenticTask",
@@ -724,7 +724,7 @@ function scoreAgenticTask(text, keywords) {
       },
       agenticScore: 1
     };
-  } else if (matchCount >= 2) {
+  } else if (matchCount >= 3) {
     return {
       dimensionScore: {
         name: "agenticTask",
@@ -737,10 +737,10 @@ function scoreAgenticTask(text, keywords) {
     return {
       dimensionScore: {
         name: "agenticTask",
-        score: 0.3,
-        signal: `agentic (${signals.join(", ")})`
+        score: 0.2,
+        signal: `agentic-light (${signals.join(", ")})`
       },
-      agenticScore: 0.3
+      agenticScore: 0.2
     };
   }
   return {
@@ -1479,8 +1479,9 @@ var DEFAULT_ROUTING_CONFIG = {
       "gitterbasiert"
     ],
     // Agentic task keywords - file ops, execution, multi-step, iterative work
+    // Pruned: removed overly common words like "then", "first", "run", "test", "build"
     agenticTaskKeywords: [
-      // English - File operations
+      // English - File operations (clearly agentic)
       "read file",
       "read the file",
       "look at",
@@ -1492,30 +1493,19 @@ var DEFAULT_ROUTING_CONFIG = {
       "change the",
       "write to",
       "create file",
-      // English - Execution
-      "run",
+      // English - Execution (specific commands only)
       "execute",
-      "test",
-      "build",
       "deploy",
       "install",
       "npm",
       "pip",
       "compile",
-      "start",
-      "launch",
-      // English - Multi-step patterns
-      "then",
+      // English - Multi-step patterns (specific only)
       "after that",
-      "next",
       "and also",
-      "finally",
       "once done",
       "step 1",
       "step 2",
-      "first",
-      "second",
-      "lastly",
       // English - Iterative work
       "fix",
       "debug",
@@ -1525,7 +1515,7 @@ var DEFAULT_ROUTING_CONFIG = {
       "make sure",
       "verify",
       "confirm",
-      // Chinese
+      // Chinese (keep specific ones)
       "\u8BFB\u53D6\u6587\u4EF6",
       "\u67E5\u770B",
       "\u6253\u5F00",
@@ -1533,15 +1523,9 @@ var DEFAULT_ROUTING_CONFIG = {
       "\u4FEE\u6539",
       "\u66F4\u65B0",
       "\u521B\u5EFA",
-      "\u8FD0\u884C",
       "\u6267\u884C",
-      "\u6D4B\u8BD5",
-      "\u6784\u5EFA",
       "\u90E8\u7F72",
       "\u5B89\u88C5",
-      "\u7136\u540E",
-      "\u63A5\u4E0B\u6765",
-      "\u6700\u540E",
       "\u7B2C\u4E00\u6B65",
       "\u7B2C\u4E8C\u6B65",
       "\u4FEE\u590D",
@@ -1567,14 +1551,15 @@ var DEFAULT_ROUTING_CONFIG = {
       referenceComplexity: 0.02,
       negationComplexity: 0.01,
       domainSpecificity: 0.02,
-      agenticTask: 0.1
-      // Significant weight for agentic detection
+      agenticTask: 0.04
+      // Reduced - agentic signals influence tier selection, not dominate it
     },
     // Tier boundaries on weighted score axis
     tierBoundaries: {
       simpleMedium: 0,
-      mediumComplex: 0.15,
-      complexReasoning: 0.25
+      mediumComplex: 0.18,
+      complexReasoning: 0.4
+      // Raised from 0.25 - requires strong reasoning signals
     },
     // Sigmoid steepness for confidence calibration
     confidenceSteepness: 12,
@@ -1621,9 +1606,9 @@ var DEFAULT_ROUTING_CONFIG = {
       fallback: ["anthropic/claude-opus-4", "xai/grok-4-0709", "openai/gpt-4o"]
     },
     REASONING: {
-      primary: "xai/grok-4-fast-reasoning",
-      // Cheap reasoning for agentic tasks
-      fallback: ["moonshot/kimi-k2.5", "anthropic/claude-sonnet-4", "deepseek/deepseek-reasoner"]
+      primary: "anthropic/claude-sonnet-4",
+      // Strong tool use + reasoning for agentic tasks
+      fallback: ["xai/grok-4-fast-reasoning", "moonshot/kimi-k2.5", "deepseek/deepseek-reasoner"]
     }
   },
   overrides: {
@@ -2457,6 +2442,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 +2831,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);
     }
@@ -2883,17 +2943,10 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
           const systemPrompt = typeof systemMsg?.content === "string" ? systemMsg.content : void 0;
           const tools = parsed.tools;
           const hasTools = Array.isArray(tools) && tools.length > 0;
-          const effectiveRouterOpts = hasTools ? {
-            ...routerOpts,
-            config: {
-              ...routerOpts.config,
-              overrides: { ...routerOpts.config.overrides, agenticMode: true }
-            }
-          } : routerOpts;
           if (hasTools) {
-            console.log(`[ClawRouter] Tools detected (${tools.length}), forcing agentic mode`);
+            console.log(`[ClawRouter] Tools detected (${tools.length}), agentic mode via keywords`);
           }
-          routingDecision = route(prompt, systemPrompt, maxTokens, effectiveRouterOpts);
+          routingDecision = route(prompt, systemPrompt, maxTokens, routerOpts);
           parsed.model = routingDecision.model;
           modelId = routingDecision.model;
           bodyModified = true;