@blockrun/clawrouter 0.10.19 → 0.10.21

package/dist/index.js

@@ -5437,9 +5437,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
           const tools = parsed.tools;
           hasTools = Array.isArray(tools) && tools.length > 0;
           if (hasTools && tools) {
-            console.log(
-              `[ClawRouter] Tools detected (${tools.length}), agentic mode via keywords`
-            );
+            console.log(`[ClawRouter] Tools detected (${tools.length}), agentic mode via keywords`);
           }
           routingDecision = route(prompt, systemPrompt, maxTokens, {
             ...routerOpts,
@@ -5704,11 +5702,10 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
       modelsToTry = toolFiltered.slice(0, MAX_FALLBACK_ATTEMPTS);
       modelsToTry = prioritizeNonRateLimited(modelsToTry);
     } else {
-      if (modelId && modelId !== FREE_MODEL) {
-        modelsToTry = [modelId, FREE_MODEL];
-      } else {
-        modelsToTry = modelId ? [modelId] : [];
-      }
+      modelsToTry = modelId ? [modelId] : [];
+    }
+    if (!modelsToTry.includes(FREE_MODEL)) {
+      modelsToTry.push(FREE_MODEL);
     }
     let upstream;
     let lastError;
@@ -5742,6 +5739,19 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
         if (result.errorStatus === 429) {
           markRateLimited(tryModel);
         }
+        const isPaymentErr = /payment.*verification.*failed|insufficient.*funds/i.test(
+          result.errorBody || ""
+        );
+        if (isPaymentErr && tryModel !== FREE_MODEL) {
+          const freeIdx = modelsToTry.indexOf(FREE_MODEL);
+          if (freeIdx > i + 1) {
+            console.log(
+              `[ClawRouter] Payment error \u2014 skipping to free model: ${FREE_MODEL}`
+            );
+            i = freeIdx - 1;
+            continue;
+          }
+        }
         console.log(
           `[ClawRouter] Provider error from ${tryModel}, trying fallback: ${result.errorBody?.slice(0, 100)}`
         );
@@ -6440,56 +6450,6 @@ function injectModelsConfig(logger) {
     logger.info("Set default model to blockrun/auto (first install)");
     needsWrite = true;
   }
-  const KEY_MODEL_ALIASES = [
-    { id: "auto", alias: "auto" },
-    { id: "eco", alias: "eco" },
-    { id: "premium", alias: "premium" },
-    { id: "free", alias: "free" },
-    { id: "sonnet", alias: "sonnet-4.6" },
-    { id: "opus", alias: "opus" },
-    { id: "haiku", alias: "haiku" },
-    { id: "gpt5", alias: "gpt5" },
-    { id: "codex", alias: "codex" },
-    { id: "grok-fast", alias: "grok-fast" },
-    { id: "grok-code", alias: "grok-code" },
-    { id: "deepseek", alias: "deepseek" },
-    { id: "reasoner", alias: "reasoner" },
-    { id: "kimi", alias: "kimi" },
-    { id: "minimax", alias: "minimax" },
-    { id: "gemini", alias: "gemini" }
-  ];
-  const DEPRECATED_ALIASES = [
-    "blockrun/nvidia",
-    "blockrun/gpt",
-    "blockrun/o3",
-    "blockrun/grok",
-    "blockrun/mini",
-    "blockrun/flash"
-    // removed from picker - use gemini instead
-  ];
-  if (!defaults.models) {
-    defaults.models = {};
-    needsWrite = true;
-  }
-  const allowlist = defaults.models;
-  for (const deprecated of DEPRECATED_ALIASES) {
-    if (allowlist[deprecated]) {
-      delete allowlist[deprecated];
-      logger.info(`Removed deprecated model alias: ${deprecated}`);
-      needsWrite = true;
-    }
-  }
-  for (const m of KEY_MODEL_ALIASES) {
-    const fullId = `blockrun/${m.id}`;
-    const existing = allowlist[fullId];
-    if (!existing) {
-      allowlist[fullId] = { alias: m.alias };
-      needsWrite = true;
-    } else if (existing.alias !== m.alias) {
-      existing.alias = m.alias;
-      needsWrite = true;
-    }
-  }
   if (needsWrite) {
     try {
       const tmpPath = `${configPath}.tmp.${process.pid}`;