@blockrun/clawrouter 0.5.8 → 0.6.1

package/dist/index.js

@@ -1996,9 +1996,13 @@ var InsufficientFundsError = class extends Error {
   requiredUSD;
   walletAddress;
   constructor(opts) {
-    super(
-      `Insufficient USDC balance. Current: ${opts.currentBalanceUSD}, Required: ${opts.requiredUSD}. Fund wallet: ${opts.walletAddress}`
-    );
+    const msg = [
+      `Insufficient balance. Current: ${opts.currentBalanceUSD}, Required: ${opts.requiredUSD}`,
+      `Options:`,
+      `  1. Fund wallet: ${opts.walletAddress}`,
+      `  2. Use free model: /model free`
+    ].join("\n");
+    super(msg);
     this.name = "InsufficientFundsError";
     this.currentBalanceUSD = opts.currentBalanceUSD;
     this.requiredUSD = opts.requiredUSD;
@@ -2009,7 +2013,14 @@ var EmptyWalletError = class extends Error {
   code = "EMPTY_WALLET";
   walletAddress;
   constructor(walletAddress) {
-    super(`No USDC balance. Fund wallet to use ClawRouter: ${walletAddress}`);
+    const msg = [
+      `No USDC balance.`,
+      `Options:`,
+      `  1. Fund wallet: ${walletAddress}`,
+      `  2. Use free model: /model free`,
+      `  3. Uninstall: bash ~/.openclaw/extensions/clawrouter/scripts/uninstall.sh`
+    ].join("\n");
+    super(msg);
     this.name = "EmptyWalletError";
     this.walletAddress = walletAddress;
   }
@@ -2384,6 +2395,28 @@ function isProviderError(status, body) {
   }
   return PROVIDER_ERROR_PATTERNS.some((pattern) => pattern.test(body));
 }
+var VALID_ROLES = /* @__PURE__ */ new Set(["system", "user", "assistant", "tool", "function"]);
+var ROLE_MAPPINGS = {
+  developer: "system",
+  // OpenAI's newer API uses "developer" for system messages
+  model: "assistant"
+  // Some APIs use "model" instead of "assistant"
+};
+function normalizeMessageRoles(messages) {
+  if (!messages || messages.length === 0) return messages;
+  let hasChanges = false;
+  const normalized = messages.map((msg) => {
+    if (VALID_ROLES.has(msg.role)) return msg;
+    const mappedRole = ROLE_MAPPINGS[msg.role];
+    if (mappedRole) {
+      hasChanges = true;
+      return { ...msg, role: mappedRole };
+    }
+    hasChanges = true;
+    return { ...msg, role: "user" };
+  });
+  return hasChanges ? normalized : messages;
+}
 function normalizeMessagesForGoogle(messages) {
   if (!messages || messages.length === 0) return messages;
   let firstNonSystemIdx = -1;
@@ -2409,6 +2442,18 @@ function normalizeMessagesForGoogle(messages) {
 function isGoogleModel(modelId) {
   return modelId.startsWith("google/") || modelId.startsWith("gemini");
 }
+function normalizeMessagesForThinking(messages) {
+  if (!messages || messages.length === 0) return messages;
+  let hasChanges = false;
+  const normalized = messages.map((msg) => {
+    if (msg.role === "assistant" && msg.tool_calls && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0 && msg.reasoning_content === void 0) {
+      hasChanges = true;
+      return { ...msg, reasoning_content: "" };
+    }
+    return msg;
+  });
+  return hasChanges ? normalized : messages;
+}
 var KIMI_BLOCK_RE = /<[｜|][^<>]*begin[^<>]*[｜|]>[\s\S]*?<[｜|][^<>]*end[^<>]*[｜|]>/gi;
 var KIMI_TOKEN_RE = /<[｜|][^<>]*[｜|]>/g;
 var THINKING_TAG_RE = /<\s*\/?\s*(?:think(?:ing)?|thought|antthinking)\b[^>]*>/gi;
@@ -2614,9 +2659,15 @@ async function tryModelRequest(upstreamUrl, method, headers, body, modelId, maxT
   try {
     const parsed = JSON.parse(body.toString());
     parsed.model = modelId;
+    if (Array.isArray(parsed.messages)) {
+      parsed.messages = normalizeMessageRoles(parsed.messages);
+    }
     if (isGoogleModel(modelId) && Array.isArray(parsed.messages)) {
       parsed.messages = normalizeMessagesForGoogle(parsed.messages);
     }
+    if (parsed.thinking && Array.isArray(parsed.messages)) {
+      parsed.messages = normalizeMessagesForThinking(parsed.messages);
+    }
     requestBody = Buffer.from(JSON.stringify(parsed));
   } catch {
   }
@@ -2776,42 +2827,18 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
       const bufferedCostMicros = estimatedCostMicros * BigInt(Math.ceil(BALANCE_CHECK_BUFFER * 100)) / 100n;
       const sufficiency = await balanceMonitor.checkSufficient(bufferedCostMicros);
       if (sufficiency.info.isEmpty || !sufficiency.sufficient) {
-        if (routingDecision) {
-          console.log(
-            `[ClawRouter] Wallet ${sufficiency.info.isEmpty ? "empty" : "insufficient"} ($${sufficiency.info.balanceUSD}), falling back to free model: ${FREE_MODEL}`
-          );
-          modelId = FREE_MODEL;
-          const parsed = JSON.parse(body.toString());
-          parsed.model = FREE_MODEL;
-          body = Buffer.from(JSON.stringify(parsed));
-          options.onLowBalance?.({
-            balanceUSD: sufficiency.info.balanceUSD,
-            walletAddress: sufficiency.info.walletAddress
-          });
-        } else {
-          deduplicator.removeInflight(dedupKey);
-          if (sufficiency.info.isEmpty) {
-            const error = new EmptyWalletError(sufficiency.info.walletAddress);
-            options.onInsufficientFunds?.({
-              balanceUSD: sufficiency.info.balanceUSD,
-              requiredUSD: balanceMonitor.formatUSDC(bufferedCostMicros),
-              walletAddress: sufficiency.info.walletAddress
-            });
-            throw error;
-          } else {
-            const error = new InsufficientFundsError({
-              currentBalanceUSD: sufficiency.info.balanceUSD,
-              requiredUSD: balanceMonitor.formatUSDC(bufferedCostMicros),
-              walletAddress: sufficiency.info.walletAddress
-            });
-            options.onInsufficientFunds?.({
-              balanceUSD: sufficiency.info.balanceUSD,
-              requiredUSD: balanceMonitor.formatUSDC(bufferedCostMicros),
-              walletAddress: sufficiency.info.walletAddress
-            });
-            throw error;
-          }
-        }
+        const originalModel = modelId;
+        console.log(
+          `[ClawRouter] Wallet ${sufficiency.info.isEmpty ? "empty" : "insufficient"} ($${sufficiency.info.balanceUSD}), falling back to free model: ${FREE_MODEL} (requested: ${originalModel})`
+        );
+        modelId = FREE_MODEL;
+        const parsed = JSON.parse(body.toString());
+        parsed.model = FREE_MODEL;
+        body = Buffer.from(JSON.stringify(parsed));
+        options.onLowBalance?.({
+          balanceUSD: sufficiency.info.balanceUSD,
+          walletAddress: sufficiency.info.walletAddress
+        });
       } else if (sufficiency.info.isLow) {
         options.onLowBalance?.({
           balanceUSD: sufficiency.info.balanceUSD,
@@ -3240,6 +3267,18 @@ function isRetryable(errorOrResponse, config) {
 }
 
 // src/index.ts
+async function waitForProxyHealth(port, timeoutMs = 3e3) {
+  const start = Date.now();
+  while (Date.now() - start < timeoutMs) {
+    try {
+      const res = await fetch(`http://127.0.0.1:${port}/health`);
+      if (res.ok) return true;
+    } catch {
+    }
+    await new Promise((r) => setTimeout(r, 100));
+  }
+  return false;
+}
 function isCompletionMode() {
   const args = process.argv;
   return args.some((arg, i) => arg === "completion" && i >= 1 && i <= 3);
@@ -3289,20 +3328,34 @@ function injectModelsConfig(logger) {
       config.agents.defaults.model.primary = "blockrun/auto";
       needsWrite = true;
     }
-    if (config.agents.defaults.models && typeof config.agents.defaults.models === "object") {
-      const allowlist = config.agents.defaults.models;
-      for (const model of OPENCLAW_MODELS) {
-        const fullId = `blockrun/${model.id}`;
-        if (!allowlist[fullId]) {
-          const alias = model.id.includes("/") ? model.id.split("/").pop() : model.id;
-          allowlist[fullId] = { alias };
-          needsWrite = true;
-        }
+    const KEY_MODEL_ALIASES = [
+      { id: "auto", alias: "auto" },
+      { id: "free", alias: "free" },
+      { id: "sonnet", alias: "sonnet" },
+      { id: "opus", alias: "opus" },
+      { id: "haiku", alias: "haiku" },
+      { id: "grok", alias: "grok" },
+      { id: "deepseek", alias: "deepseek" },
+      { id: "kimi", alias: "kimi" },
+      { id: "gemini", alias: "gemini" },
+      { id: "flash", alias: "flash" },
+      { id: "gpt", alias: "gpt" },
+      { id: "reasoner", alias: "reasoner" }
+    ];
+    if (!config.agents) config.agents = {};
+    if (!config.agents.defaults) config.agents.defaults = {};
+    if (!config.agents.defaults.models) config.agents.defaults.models = {};
+    const allowlist = config.agents.defaults.models;
+    for (const m of KEY_MODEL_ALIASES) {
+      const fullId = `blockrun/${m.id}`;
+      if (!allowlist[fullId]) {
+        allowlist[fullId] = { alias: m.alias };
+        needsWrite = true;
       }
     }
     if (needsWrite) {
       writeFileSync(configPath, JSON.stringify(config, null, 2));
-      logger.info("Set default model to blockrun/auto (smart routing enabled)");
+      logger.info("Smart routing enabled (blockrun/auto)");
     }
   } catch {
   }
@@ -3374,29 +3427,11 @@ async function startProxyInBackground(api) {
   const { key: walletKey, address, source } = await resolveOrGenerateWalletKey();
   if (source === "generated") {
     api.logger.info(`Generated new wallet: ${address}`);
-    api.logger.info(`Fund with USDC on Base to start using ClawRouter.`);
   } else if (source === "saved") {
     api.logger.info(`Using saved wallet: ${address}`);
   } else {
     api.logger.info(`Using wallet from BLOCKRUN_WALLET_KEY: ${address}`);
   }
-  const startupMonitor = new BalanceMonitor(address);
-  try {
-    const startupBalance = await startupMonitor.checkBalance();
-    if (startupBalance.isEmpty) {
-      api.logger.warn(`[!] No USDC balance. Fund wallet to use ClawRouter: ${address}`);
-    } else if (startupBalance.isLow) {
-      api.logger.warn(
-        `[!] Low balance: ${startupBalance.balanceUSD} remaining. Fund wallet: ${address}`
-      );
-    } else {
-      api.logger.info(`Wallet balance: ${startupBalance.balanceUSD}`);
-    }
-  } catch (err) {
-    api.logger.warn(
-      `Could not check wallet balance: ${err instanceof Error ? err.message : String(err)}`
-    );
-  }
   const routingConfig = api.pluginConfig?.routing;
   const proxy = await startProxy({
     walletKey,
@@ -3425,7 +3460,21 @@ async function startProxyInBackground(api) {
   });
   setActiveProxy(proxy);
   activeProxyHandle = proxy;
-  api.logger.info(`BlockRun provider active \u2014 ${proxy.baseUrl}/v1 (smart routing enabled)`);
+  api.logger.info(`ClawRouter ready \u2014 smart routing enabled`);
+  api.logger.info(`Pricing: Simple ~$0.001 | Code ~$0.01 | Complex ~$0.05 | Free: $0`);
+  const startupMonitor = new BalanceMonitor(address);
+  startupMonitor.checkBalance().then((balance) => {
+    if (balance.isEmpty) {
+      api.logger.info(`Wallet: ${address} | Balance: $0.00`);
+      api.logger.info(`Using FREE model. Fund wallet for premium models.`);
+    } else if (balance.isLow) {
+      api.logger.info(`Wallet: ${address} | Balance: ${balance.balanceUSD} (low)`);
+    } else {
+      api.logger.info(`Wallet: ${address} | Balance: ${balance.balanceUSD}`);
+    }
+  }).catch(() => {
+    api.logger.info(`Wallet: ${address} | Balance: (checking...)`);
+  });
 }
 async function createStatsCommand() {
   return {
@@ -3531,7 +3580,7 @@ var plugin = {
   name: "ClawRouter",
   description: "Smart LLM router \u2014 30+ models, x402 micropayments, 78% cost savings",
   version: VERSION,
-  register(api) {
+  async register(api) {
     const isDisabled = process.env.CLAWROUTER_DISABLED === "true" || process.env.CLAWROUTER_DISABLED === "1";
     if (isDisabled) {
       api.logger.info("ClawRouter disabled (CLAWROUTER_DISABLED=true). Using default routing.");
@@ -3597,11 +3646,18 @@ var plugin = {
         }
       }
     });
-    startProxyInBackground(api).catch((err) => {
+    try {
+      await startProxyInBackground(api);
+      const port = getProxyPort();
+      const healthy = await waitForProxyHealth(port);
+      if (!healthy) {
+        api.logger.warn(`Proxy health check timed out, commands may not work immediately`);
+      }
+    } catch (err) {
       api.logger.error(
         `Failed to start BlockRun proxy: ${err instanceof Error ? err.message : String(err)}`
       );
-    });
+    }
   }
 };
 var index_default = plugin;