@blockrun/clawrouter 0.6.8 → 0.7.0

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: {
@@ -2339,6 +2324,8 @@ var DEFAULT_PORT = 8402;
 var MAX_FALLBACK_ATTEMPTS = 3;
 var HEALTH_CHECK_TIMEOUT_MS = 2e3;
 var RATE_LIMIT_COOLDOWN_MS = 6e4;
+var PORT_RETRY_ATTEMPTS = 5;
+var PORT_RETRY_DELAY_MS = 1e3;
 var rateLimitedModels = /* @__PURE__ */ new Map();
 function isRateLimited(modelId) {
   const hitTime = rateLimitedModels.get(modelId);
@@ -2628,7 +2615,7 @@ async function startProxy(options) {
   if (existingWallet) {
     const account2 = privateKeyToAccount2(options.walletKey);
     const balanceMonitor2 = new BalanceMonitor(account2.address);
-    const baseUrl = `http://127.0.0.1:${listenPort}`;
+    const baseUrl2 = `http://127.0.0.1:${listenPort}`;
     if (existingWallet !== account2.address) {
       console.warn(
         `[ClawRouter] Existing proxy on port ${listenPort} uses wallet ${existingWallet}, but current config uses ${account2.address}. Reusing existing proxy.`
@@ -2637,7 +2624,7 @@ async function startProxy(options) {
     options.onReady?.(listenPort);
     return {
       port: listenPort,
-      baseUrl,
+      baseUrl: baseUrl2,
       walletAddress: existingWallet,
       balanceMonitor: balanceMonitor2,
       close: async () => {
@@ -2763,80 +2750,123 @@ async function startProxy(options) {
       }
     }
   });
-  return new Promise((resolve, reject) => {
-    server.on("error", (err) => {
-      if (err.code === "EADDRINUSE") {
-        const baseUrl = `http://127.0.0.1:${listenPort}`;
+  const tryListen = (attempt) => {
+    return new Promise((resolveAttempt, rejectAttempt) => {
+      const onError = async (err) => {
+        server.removeListener("error", onError);
+        if (err.code === "EADDRINUSE") {
+          const existingWallet2 = await checkExistingProxy(listenPort);
+          if (existingWallet2) {
+            console.log(`[ClawRouter] Existing proxy detected on port ${listenPort}, reusing`);
+            rejectAttempt({ code: "REUSE_EXISTING", wallet: existingWallet2 });
+            return;
+          }
+          if (attempt < PORT_RETRY_ATTEMPTS) {
+            console.log(
+              `[ClawRouter] Port ${listenPort} in TIME_WAIT, retrying in ${PORT_RETRY_DELAY_MS}ms (attempt ${attempt}/${PORT_RETRY_ATTEMPTS})`
+            );
+            rejectAttempt({ code: "RETRY", attempt });
+            return;
+          }
+          console.error(
+            `[ClawRouter] Port ${listenPort} still in use after ${PORT_RETRY_ATTEMPTS} attempts`
+          );
+          rejectAttempt(err);
+          return;
+        }
+        rejectAttempt(err);
+      };
+      server.once("error", onError);
+      server.listen(listenPort, "127.0.0.1", () => {
+        server.removeListener("error", onError);
+        resolveAttempt();
+      });
+    });
+  };
+  let lastError;
+  for (let attempt = 1; attempt <= PORT_RETRY_ATTEMPTS; attempt++) {
+    try {
+      await tryListen(attempt);
+      break;
+    } catch (err) {
+      const error = err;
+      if (error.code === "REUSE_EXISTING" && error.wallet) {
+        const baseUrl2 = `http://127.0.0.1:${listenPort}`;
         options.onReady?.(listenPort);
-        resolve({
+        return {
           port: listenPort,
-          baseUrl,
-          walletAddress: account.address,
+          baseUrl: baseUrl2,
+          walletAddress: error.wallet,
           balanceMonitor,
           close: async () => {
           }
-        });
-        return;
+        };
       }
-      reject(err);
+      if (error.code === "RETRY") {
+        await new Promise((r) => setTimeout(r, PORT_RETRY_DELAY_MS));
+        continue;
+      }
+      lastError = err;
+      break;
+    }
+  }
+  if (lastError) {
+    throw lastError;
+  }
+  const addr = server.address();
+  const port = addr.port;
+  const baseUrl = `http://127.0.0.1:${port}`;
+  options.onReady?.(port);
+  server.on("error", (err) => {
+    console.error(`[ClawRouter] Server runtime error: ${err.message}`);
+    options.onError?.(err);
+  });
+  server.on("clientError", (err, socket) => {
+    console.error(`[ClawRouter] Client error: ${err.message}`);
+    if (socket.writable && !socket.destroyed) {
+      socket.end("HTTP/1.1 400 Bad Request\r\n\r\n");
+    }
+  });
+  server.on("connection", (socket) => {
+    connections.add(socket);
+    socket.setTimeout(3e5);
+    socket.on("timeout", () => {
+      console.error(`[ClawRouter] Socket timeout, destroying connection`);
+      socket.destroy();
     });
-    server.listen(listenPort, "127.0.0.1", () => {
-      const addr = server.address();
-      const port = addr.port;
-      const baseUrl = `http://127.0.0.1:${port}`;
-      options.onReady?.(port);
-      server.on("error", (err) => {
-        console.error(`[ClawRouter] Server runtime error: ${err.message}`);
-        options.onError?.(err);
-      });
-      server.on("clientError", (err, socket) => {
-        console.error(`[ClawRouter] Client error: ${err.message}`);
-        if (socket.writable && !socket.destroyed) {
-          socket.end("HTTP/1.1 400 Bad Request\r\n\r\n");
-        }
-      });
-      server.on("connection", (socket) => {
-        connections.add(socket);
-        socket.setTimeout(3e5);
-        socket.on("timeout", () => {
-          console.error(`[ClawRouter] Socket timeout, destroying connection`);
-          socket.destroy();
-        });
-        socket.on("end", () => {
-        });
-        socket.on("error", (err) => {
-          console.error(`[ClawRouter] Socket error: ${err.message}`);
-        });
-        socket.on("close", () => {
-          connections.delete(socket);
-        });
-      });
-      resolve({
-        port,
-        baseUrl,
-        walletAddress: account.address,
-        balanceMonitor,
-        close: () => new Promise((res, rej) => {
-          const timeout = setTimeout(() => {
-            rej(new Error("[ClawRouter] Close timeout after 4s"));
-          }, 4e3);
-          sessionStore.close();
-          for (const socket of connections) {
-            socket.destroy();
-          }
-          connections.clear();
-          server.close((err) => {
-            clearTimeout(timeout);
-            if (err) {
-              rej(err);
-            } else {
-              res();
-            }
-          });
-        })
-      });
+    socket.on("end", () => {
+    });
+    socket.on("error", (err) => {
+      console.error(`[ClawRouter] Socket error: ${err.message}`);
+    });
+    socket.on("close", () => {
+      connections.delete(socket);
     });
   });
+  return {
+    port,
+    baseUrl,
+    walletAddress: account.address,
+    balanceMonitor,
+    close: () => new Promise((res, rej) => {
+      const timeout = setTimeout(() => {
+        rej(new Error("[ClawRouter] Close timeout after 4s"));
+      }, 4e3);
+      sessionStore.close();
+      for (const socket of connections) {
+        socket.destroy();
+      }
+      connections.clear();
+      server.close((err) => {
+        clearTimeout(timeout);
+        if (err) {
+          rej(err);
+        } else {
+          res();
+        }
+      });
+    })
+  };
 }
 async function tryModelRequest(upstreamUrl, method, headers, body, modelId, maxTokens, payFetch, balanceMonitor, signal) {
   let requestBody = body;
@@ -2958,17 +2988,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;