@blockrun/clawrouter 0.12.229 → 0.12.230

package/dist/cli.js

@@ -82181,6 +82181,65 @@ function extractGptCalls(content) {
   }
   return { calls: [], matches: [] };
 }
+function deriveRequestTools(tools) {
+  if (!Array.isArray(tools)) return [];
+  const derived = [];
+  for (const raw of tools) {
+    const fn = raw?.function;
+    const name = fn?.name;
+    if (typeof name !== "string" || name.trim() === "") continue;
+    const params = fn?.parameters;
+    const props = isPlainObject(params?.properties) ? Object.keys(params.properties) : [];
+    const required = Array.isArray(params?.required) ? params.required.filter((r2) => typeof r2 === "string") : [];
+    derived.push({ name: name.trim(), propKeys: new Set(props), required });
+  }
+  return derived;
+}
+function keyMatchesParam(key2, propKeys) {
+  if (propKeys.has(key2)) return true;
+  if (key2 === "cmd" && propKeys.has("command")) return true;
+  if (key2 === "command" && propKeys.has("cmd")) return true;
+  return false;
+}
+function requiredSatisfied(tool, blobKeys) {
+  return tool.required.every(
+    (r2) => blobKeys.has(r2) || r2 === "command" && blobKeys.has("cmd") || r2 === "cmd" && blobKeys.has("command")
+  );
+}
+function resolveKimiTool(prose, blob, tools) {
+  const blobKeys = Object.keys(blob);
+  if (prose) {
+    const named = tools.filter(
+      (t) => new RegExp(`(?:^|[^A-Za-z0-9_])${escapeRegExp2(t.name)}(?:[^A-Za-z0-9_]|$)`).test(prose)
+    );
+    if (named.length === 1) return named[0].name;
+  }
+  if (blobKeys.length === 0) return null;
+  const keySet = new Set(blobKeys);
+  const sigMatches = tools.filter(
+    (t) => blobKeys.every((k) => keyMatchesParam(k, t.propKeys)) && requiredSatisfied(t, keySet)
+  );
+  return sigMatches.length === 1 ? sigMatches[0].name : null;
+}
+function escapeRegExp2(s3) {
+  return s3.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function extractKimiCalls(content, tools) {
+  if (tools.length === 0) return { calls: [], matches: [] };
+  const trailing = findTrailingJsonObject(content);
+  if (!trailing || !isPlainObject(trailing.parsed)) return { calls: [], matches: [] };
+  if (typeof trailing.parsed.name === "string" && trailing.parsed.name.trim() !== "") {
+    return { calls: [], matches: [] };
+  }
+  const prose = content.slice(0, trailing.start).trim();
+  const name = resolveKimiTool(prose, trailing.parsed, tools);
+  if (!name) return { calls: [], matches: [] };
+  const start = prose === "" ? 0 : trailing.start;
+  return {
+    calls: [makeCall(name, normalizeGptArgs(trailing.parsed))],
+    matches: [{ start, end: content.length }]
+  };
+}
 function stripRanges(content, ranges) {
   if (ranges.length === 0) return content;
   const sorted = [...ranges].sort((a, b) => a.start - b.start);
@@ -82195,15 +82254,23 @@ function stripRanges(content, ranges) {
   cleaned += content.slice(cursor);
   return cleaned;
 }
-function extractTextualToolCalls(content) {
+function extractTextualToolCalls(content, options) {
   if (!content) {
     return { toolCalls: [], cleanedContent: "" };
   }
   const openClaw = extractOpenClawCalls(content);
   const anthropic = extractAnthropicCalls(content);
   const gemini = extractGeminiCalls(content);
-  const gpt = openClaw.calls.length + anthropic.calls.length + gemini.calls.length === 0 ? extractGptCalls(content) : { calls: [], matches: [] };
-  const toolCalls = [...openClaw.calls, ...anthropic.calls, ...gemini.calls, ...gpt.calls];
+  const tagBasedCount = openClaw.calls.length + anthropic.calls.length + gemini.calls.length;
+  const gpt = tagBasedCount === 0 ? extractGptCalls(content) : { calls: [], matches: [] };
+  const kimi = tagBasedCount + gpt.calls.length === 0 ? extractKimiCalls(content, deriveRequestTools(options?.tools)) : { calls: [], matches: [] };
+  const toolCalls = [
+    ...openClaw.calls,
+    ...anthropic.calls,
+    ...gemini.calls,
+    ...gpt.calls,
+    ...kimi.calls
+  ];
   if (toolCalls.length === 0) {
     return { toolCalls: [], cleanedContent: content };
   }
@@ -82211,7 +82278,8 @@ function extractTextualToolCalls(content) {
     ...openClaw.matches,
     ...anthropic.matches,
     ...gemini.matches,
-    ...gpt.matches
+    ...gpt.matches,
+    ...kimi.matches
   ]);
   return { toolCalls, cleanedContent };
 }
@@ -85986,6 +86054,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
   const debugMode = debugHeadersEnabledFromEnv() && req.headers["x-clawrouter-debug"] !== "false";
   let routingDecision;
   let hasTools = false;
+  let requestTools;
   let hasVision = false;
   let isStreaming = false;
   let modelId = "";
@@ -86023,6 +86092,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
         requestSummaryForStore = summarizeRequest(promptText);
       }
       hasTools = Array.isArray(parsed.tools) && parsed.tools.length > 0;
+      requestTools = parsed.tools;
       const rawLastContent = lastUserMsg?.content;
       const lastContent = typeof rawLastContent === "string" ? rawLastContent : Array.isArray(rawLastContent) ? rawLastContent.filter((b) => b.type === "text").map((b) => b.text ?? "").join(" ") : "";
       if (sessionId && parsedMessages.length > 0) {
@@ -87566,7 +87636,7 @@ data: [DONE]
               let toolCalls = choice.message?.tool_calls ?? choice.delta?.tool_calls;
               const rawContent = choice.message?.content ?? choice.delta?.content ?? "";
               if (!endsWithToolCalls && (!toolCalls || toolCalls.length === 0) && rawContent) {
-                const extracted = extractTextualToolCalls(rawContent);
+                const extracted = extractTextualToolCalls(rawContent, { tools: requestTools });
                 if (extracted.toolCalls.length > 0) {
                   toolCalls = extracted.toolCalls;
                 }
@@ -87779,7 +87849,7 @@ data: [DONE]
               }
               continue;
             }
-            const extracted = extractTextualToolCalls(message.content);
+            const extracted = extractTextualToolCalls(message.content, { tools: requestTools });
             if (extracted.toolCalls.length > 0) {
               message.tool_calls = extracted.toolCalls;
               message.content = "";

package/dist/index.js

@@ -82001,6 +82001,65 @@ function extractGptCalls(content) {
   }
   return { calls: [], matches: [] };
 }
+function deriveRequestTools(tools) {
+  if (!Array.isArray(tools)) return [];
+  const derived = [];
+  for (const raw of tools) {
+    const fn = raw?.function;
+    const name = fn?.name;
+    if (typeof name !== "string" || name.trim() === "") continue;
+    const params = fn?.parameters;
+    const props = isPlainObject(params?.properties) ? Object.keys(params.properties) : [];
+    const required = Array.isArray(params?.required) ? params.required.filter((r2) => typeof r2 === "string") : [];
+    derived.push({ name: name.trim(), propKeys: new Set(props), required });
+  }
+  return derived;
+}
+function keyMatchesParam(key2, propKeys) {
+  if (propKeys.has(key2)) return true;
+  if (key2 === "cmd" && propKeys.has("command")) return true;
+  if (key2 === "command" && propKeys.has("cmd")) return true;
+  return false;
+}
+function requiredSatisfied(tool, blobKeys) {
+  return tool.required.every(
+    (r2) => blobKeys.has(r2) || r2 === "command" && blobKeys.has("cmd") || r2 === "cmd" && blobKeys.has("command")
+  );
+}
+function resolveKimiTool(prose, blob, tools) {
+  const blobKeys = Object.keys(blob);
+  if (prose) {
+    const named = tools.filter(
+      (t) => new RegExp(`(?:^|[^A-Za-z0-9_])${escapeRegExp2(t.name)}(?:[^A-Za-z0-9_]|$)`).test(prose)
+    );
+    if (named.length === 1) return named[0].name;
+  }
+  if (blobKeys.length === 0) return null;
+  const keySet = new Set(blobKeys);
+  const sigMatches = tools.filter(
+    (t) => blobKeys.every((k) => keyMatchesParam(k, t.propKeys)) && requiredSatisfied(t, keySet)
+  );
+  return sigMatches.length === 1 ? sigMatches[0].name : null;
+}
+function escapeRegExp2(s3) {
+  return s3.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function extractKimiCalls(content, tools) {
+  if (tools.length === 0) return { calls: [], matches: [] };
+  const trailing = findTrailingJsonObject(content);
+  if (!trailing || !isPlainObject(trailing.parsed)) return { calls: [], matches: [] };
+  if (typeof trailing.parsed.name === "string" && trailing.parsed.name.trim() !== "") {
+    return { calls: [], matches: [] };
+  }
+  const prose = content.slice(0, trailing.start).trim();
+  const name = resolveKimiTool(prose, trailing.parsed, tools);
+  if (!name) return { calls: [], matches: [] };
+  const start = prose === "" ? 0 : trailing.start;
+  return {
+    calls: [makeCall(name, normalizeGptArgs(trailing.parsed))],
+    matches: [{ start, end: content.length }]
+  };
+}
 function stripRanges(content, ranges) {
   if (ranges.length === 0) return content;
   const sorted = [...ranges].sort((a, b) => a.start - b.start);
@@ -82015,15 +82074,23 @@ function stripRanges(content, ranges) {
   cleaned += content.slice(cursor);
   return cleaned;
 }
-function extractTextualToolCalls(content) {
+function extractTextualToolCalls(content, options) {
   if (!content) {
     return { toolCalls: [], cleanedContent: "" };
   }
   const openClaw = extractOpenClawCalls(content);
   const anthropic = extractAnthropicCalls(content);
   const gemini = extractGeminiCalls(content);
-  const gpt = openClaw.calls.length + anthropic.calls.length + gemini.calls.length === 0 ? extractGptCalls(content) : { calls: [], matches: [] };
-  const toolCalls = [...openClaw.calls, ...anthropic.calls, ...gemini.calls, ...gpt.calls];
+  const tagBasedCount = openClaw.calls.length + anthropic.calls.length + gemini.calls.length;
+  const gpt = tagBasedCount === 0 ? extractGptCalls(content) : { calls: [], matches: [] };
+  const kimi = tagBasedCount + gpt.calls.length === 0 ? extractKimiCalls(content, deriveRequestTools(options?.tools)) : { calls: [], matches: [] };
+  const toolCalls = [
+    ...openClaw.calls,
+    ...anthropic.calls,
+    ...gemini.calls,
+    ...gpt.calls,
+    ...kimi.calls
+  ];
   if (toolCalls.length === 0) {
     return { toolCalls: [], cleanedContent: content };
   }
@@ -82031,7 +82098,8 @@ function extractTextualToolCalls(content) {
     ...openClaw.matches,
     ...anthropic.matches,
     ...gemini.matches,
-    ...gpt.matches
+    ...gpt.matches,
+    ...kimi.matches
   ]);
   return { toolCalls, cleanedContent };
 }
@@ -85806,6 +85874,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
   const debugMode = debugHeadersEnabledFromEnv() && req.headers["x-clawrouter-debug"] !== "false";
   let routingDecision;
   let hasTools = false;
+  let requestTools;
   let hasVision = false;
   let isStreaming = false;
   let modelId = "";
@@ -85843,6 +85912,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
         requestSummaryForStore = summarizeRequest(promptText);
       }
       hasTools = Array.isArray(parsed.tools) && parsed.tools.length > 0;
+      requestTools = parsed.tools;
       const rawLastContent = lastUserMsg?.content;
       const lastContent = typeof rawLastContent === "string" ? rawLastContent : Array.isArray(rawLastContent) ? rawLastContent.filter((b) => b.type === "text").map((b) => b.text ?? "").join(" ") : "";
       if (sessionId && parsedMessages.length > 0) {
@@ -87386,7 +87456,7 @@ data: [DONE]
               let toolCalls = choice.message?.tool_calls ?? choice.delta?.tool_calls;
               const rawContent = choice.message?.content ?? choice.delta?.content ?? "";
               if (!endsWithToolCalls && (!toolCalls || toolCalls.length === 0) && rawContent) {
-                const extracted = extractTextualToolCalls(rawContent);
+                const extracted = extractTextualToolCalls(rawContent, { tools: requestTools });
                 if (extracted.toolCalls.length > 0) {
                   toolCalls = extracted.toolCalls;
                 }
@@ -87599,7 +87669,7 @@ data: [DONE]
               }
               continue;
             }
-            const extracted = extractTextualToolCalls(message.content);
+            const extracted = extractTextualToolCalls(message.content, { tools: requestTools });
             if (extracted.toolCalls.length > 0) {
               message.tool_calls = extracted.toolCalls;
               message.content = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockrun/clawrouter",
-  "version": "0.12.229",
+  "version": "0.12.230",
   "description": "Smart LLM router — save 85% on inference costs. 55+ models (8 free), one wallet, x402 micropayments.",
   "type": "module",
   "main": "dist/index.js",

package/scripts/update.sh

@@ -16,6 +16,96 @@ WALLET_FILE="$HOME/.openclaw/blockrun/wallet.key"
 WALLET_BACKUP=""
 PLUGIN_BACKUP=""
 CONFIG_BACKUP=""
+ACTIVE_PACKAGE_DIR=""
+
+NPM_PREFIX="$(npm config get prefix 2>/dev/null || echo "")"
+if [ -n "$NPM_PREFIX" ] && [ -d "$NPM_PREFIX/bin" ]; then
+  PATH="$NPM_PREFIX/bin:$PATH"
+  export PATH
+fi
+
+find_clawrouter_package_dir() {
+  node <<'NODE'
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+
+const home = os.homedir();
+const candidates = [
+  { packagePath: path.join(home, '.openclaw', 'extensions', 'clawrouter', 'package.json'), priority: 0 },
+  { packagePath: path.join(home, '.openclaw', 'npm', 'node_modules', '@blockrun', 'clawrouter', 'package.json'), priority: 2 },
+];
+
+const projectsDir = path.join(home, '.openclaw', 'npm', 'projects');
+try {
+  for (const name of fs.readdirSync(projectsDir)) {
+    candidates.push({
+      packagePath: path.join(projectsDir, name, 'node_modules', '@blockrun', 'clawrouter', 'package.json'),
+      priority: 1,
+    });
+  }
+} catch {}
+
+function versionParts(version) {
+  return String(version || '').split(/[.-]/).slice(0, 3).map((part) => Number.parseInt(part, 10) || 0);
+}
+
+function compareVersions(a, b) {
+  const left = versionParts(a);
+  const right = versionParts(b);
+  for (let i = 0; i < 3; i++) {
+    if (left[i] !== right[i]) return left[i] - right[i];
+  }
+  return 0;
+}
+
+let best = null;
+for (const candidate of candidates) {
+  try {
+    const stat = fs.statSync(candidate.packagePath);
+    const pkg = JSON.parse(fs.readFileSync(candidate.packagePath, 'utf8'));
+    if (pkg?.name !== '@blockrun/clawrouter') continue;
+    const versionOrder = best ? compareVersions(pkg.version, best.pkg.version) : 1;
+    if (
+      !best ||
+      versionOrder > 0 ||
+      (versionOrder === 0 &&
+        (candidate.priority < best.priority ||
+          (candidate.priority === best.priority && stat.mtimeMs > best.mtimeMs)))
+    ) {
+      best = { ...candidate, pkg, mtimeMs: stat.mtimeMs };
+    }
+  } catch {}
+}
+
+if (best) console.log(path.dirname(best.packagePath));
+NODE
+}
+
+sync_cli_shim() {
+  local package_dir="$1"
+  if [ -z "$package_dir" ] || [ ! -f "$package_dir/dist/cli.js" ]; then
+    echo "  ⚠ Could not update CLI shim: ClawRouter CLI not found"
+    return 1
+  fi
+
+  local prefix
+  prefix=$(npm config get prefix 2>/dev/null || echo "")
+  if [ -z "$prefix" ]; then
+    echo "  ⚠ Could not update CLI shim: npm prefix unavailable"
+    return 1
+  fi
+
+  local bin_dir="$prefix/bin"
+  mkdir -p "$bin_dir"
+  rm -f "$bin_dir/clawrouter"
+  cat >"$bin_dir/clawrouter" <<EOF
+#!/bin/sh
+exec node "$package_dir/dist/cli.js" "\$@"
+EOF
+  chmod +x "$bin_dir/clawrouter"
+  echo "  ✓ CLI shim updated: $bin_dir/clawrouter → $package_dir/dist/cli.js"
+}
 
 cleanup_backups() {
   if [ -n "$PLUGIN_BACKUP" ] && [ -d "$PLUGIN_BACKUP" ]; then
@@ -93,6 +183,7 @@ echo ""
 
 # Pre-flight: fail fast if config is corrupt
 validate_config
+ACTIVE_PACKAGE_DIR=$(find_clawrouter_package_dir)
 
 echo "→ Checking wallet..."
 
@@ -105,7 +196,7 @@ if [ -f "$WALLET_FILE" ]; then
     # Derive wallet address via node (viem is available post-install)
     WALLET_ADDRESS=$(node -e "
       try {
-        const { privateKeyToAccount } = require('$HOME/.openclaw/extensions/clawrouter/node_modules/viem/accounts/index.js');
+        const { privateKeyToAccount } = require(require.resolve('viem/accounts', { paths: ['$ACTIVE_PACKAGE_DIR'] }));
         const acct = privateKeyToAccount('$WALLET_KEY');
         console.log(acct.address);
       } catch {
@@ -551,41 +642,42 @@ force_install_from_npm() {
   return 1
 }
 
-if [ "$OPENCLAW_INSTALL_RECOVERABLE" = "1" ]; then
-  LATEST_VER=$(npm view @blockrun/clawrouter@latest version 2>/dev/null || echo "")
-  if [ -z "$LATEST_VER" ]; then
-    echo "  ✗ Could not resolve latest ClawRouter version from npm"
-    exit 1
+LATEST_VER=$(npm view @blockrun/clawrouter@latest version 2>/dev/null || echo "")
+if [ -z "$LATEST_VER" ]; then
+  echo "  ✗ Could not resolve latest ClawRouter version from npm"
+  exit 1
+fi
+
+ACTIVE_PACKAGE_DIR=$(find_clawrouter_package_dir)
+INSTALLED_VER=""
+if [ -n "$ACTIVE_PACKAGE_DIR" ] && [ -f "$ACTIVE_PACKAGE_DIR/package.json" ]; then
+  INSTALLED_VER=$(node -e "try{const p=require('$ACTIVE_PACKAGE_DIR/package.json');console.log(p.version);}catch{console.log('');}" 2>/dev/null || echo "")
+fi
+
+if [ "$OPENCLAW_INSTALL_RECOVERABLE" = "1" ] || [ -z "$INSTALLED_VER" ] || [ "$INSTALLED_VER" != "$LATEST_VER" ]; then
+  if [ -n "$INSTALLED_VER" ] && [ "$INSTALLED_VER" != "$LATEST_VER" ]; then
+    echo "  ⚠️  OpenClaw installed v${INSTALLED_VER} but latest is v${LATEST_VER}"
   fi
   force_install_from_npm "$LATEST_VER"
-  if [ ! -f "$PLUGIN_DIR/package.json" ]; then
-    echo "  ✗ ClawRouter package.json missing after npm fallback"
-    exit 1
-  fi
-  INSTALLED_VER=$(node -e "try{const p=require('$PLUGIN_DIR/package.json');console.log(p.version);}catch{console.log('');}" 2>/dev/null || echo "")
-  if [ -z "$INSTALLED_VER" ]; then
-    echo "  ✗ Could not verify ClawRouter version after npm fallback"
-    exit 1
-  fi
-  echo "  ✓ ClawRouter v${INSTALLED_VER} installed"
-  trap - EXIT INT TERM
-elif [ -d "$PLUGIN_DIR" ] && [ -f "$PLUGIN_DIR/package.json" ]; then
-  INSTALLED_VER=$(node -e "try{const p=require('$PLUGIN_DIR/package.json');console.log(p.version);}catch{console.log('');}" 2>/dev/null || echo "")
-  LATEST_VER=$(npm view @blockrun/clawrouter@latest version 2>/dev/null || echo "")
-  if [ -n "$LATEST_VER" ] && [ -n "$INSTALLED_VER" ] && [ "$INSTALLED_VER" != "$LATEST_VER" ]; then
-    echo "  ⚠️  openclaw installed v${INSTALLED_VER} (cached) but latest is v${LATEST_VER}"
-    force_install_from_npm "$LATEST_VER" || true
-  fi
-  INSTALLED_VER=$(node -e "try{const p=require('$PLUGIN_DIR/package.json');console.log(p.version);}catch{console.log('?');}" 2>/dev/null || echo "?")
-  echo "  ✓ ClawRouter v${INSTALLED_VER} installed"
+  ACTIVE_PACKAGE_DIR=$(find_clawrouter_package_dir)
+  INSTALLED_VER=$(node -e "try{const p=require('$ACTIVE_PACKAGE_DIR/package.json');console.log(p.version);}catch{console.log('');}" 2>/dev/null || echo "")
 fi
 
+if [ -z "$ACTIVE_PACKAGE_DIR" ] || [ -z "$INSTALLED_VER" ]; then
+  echo "  ✗ Could not verify ClawRouter install"
+  exit 1
+fi
+
+echo "  ✓ ClawRouter v${INSTALLED_VER} installed at $ACTIVE_PACKAGE_DIR"
+sync_cli_shim "$ACTIVE_PACKAGE_DIR"
+trap - EXIT INT TERM
+
 # ── Step 4c: Ensure all dependencies are installed ────────────
 # openclaw's plugin installer may skip native/optional deps like @solana/kit.
 # Run npm install in the plugin directory to fill any gaps.
-if [ -d "$PLUGIN_DIR" ] && [ -f "$PLUGIN_DIR/package.json" ]; then
+if [ -n "$ACTIVE_PACKAGE_DIR" ] && [ -f "$ACTIVE_PACKAGE_DIR/package.json" ]; then
   echo "→ Installing dependencies (Solana, x402, etc.)..."
-  run_dependency_install "$PLUGIN_DIR"
+  run_dependency_install "$ACTIVE_PACKAGE_DIR"
 fi
 
 # ── Step 5: Verify wallet survived ─────────────────────────────
@@ -724,7 +816,7 @@ const os = require('os');
 const fs = require('fs');
 const path = require('path');
 const configPath = path.join(os.homedir(), '.openclaw', 'openclaw.json');
-const topModelsPath = '$SCRIPT_DIR/../src/top-models.json';
+const topModelsPath = path.join('$ACTIVE_PACKAGE_DIR', 'src', 'top-models.json');
 
 if (!fs.existsSync(configPath)) {
   console.log('  No config file found, skipping');
@@ -1025,7 +1117,7 @@ if [ -f "$WALLET_FILE" ]; then
   FINAL_KEY=$(cat "$WALLET_FILE" | tr -d '[:space:]')
   FINAL_ADDRESS=$(node -e "
     try {
-      const { privateKeyToAccount } = require('$HOME/.openclaw/extensions/clawrouter/node_modules/viem/accounts/index.js');
+      const { privateKeyToAccount } = require(require.resolve('viem/accounts', { paths: ['$ACTIVE_PACKAGE_DIR'] }));
       console.log(privateKeyToAccount('$FINAL_KEY').address);
     } catch { console.log('(run /wallet in OpenClaw to see your address)'); }
   " 2>/dev/null || echo "(run /wallet in OpenClaw to see your address)")