@blockrun/clawrouter 0.12.60 → 0.12.62

package/README.md

@@ -248,6 +248,10 @@ USDC stays in your wallet until spent — non-custodial. Price is visible in the
 /chain solana        # Alias for /wallet solana
 /stats               # View usage and savings
 /stats clear         # Reset usage statistics
+/exclude             # Show excluded models
+/exclude add <model> # Block a model from routing (aliases work: "grok-4", "free")
+/exclude remove <model> # Unblock a model
+/exclude clear       # Remove all exclusions
 ```
 
 **Fund your wallet:**
@@ -289,6 +293,21 @@ For basic usage, no configuration needed. For advanced options:
 
 **Full reference:** [docs/configuration.md](docs/configuration.md)
 
+### Model Exclusion
+
+Block specific models from being routed to. Useful if a model doesn't follow your agent instructions or you want to control costs.
+
+```bash
+/exclude add nvidia/gpt-oss-120b   # Block the free model
+/exclude add grok-4                # Aliases work — blocks all grok-4 variants
+/exclude add gpt-5.4               # Skip expensive models
+/exclude                           # Show current exclusions
+/exclude remove grok-4             # Unblock a model
+/exclude clear                     # Remove all exclusions
+```
+
+Exclusions persist across restarts (`~/.openclaw/blockrun/exclude-models.json`). If all models in a tier are excluded, the safety net ignores the filter so routing never breaks.
+
 ---
 
 ## Troubleshooting

package/dist/cli.js

@@ -25522,10 +25522,10 @@ var init_client = __esm({
 // src/proxy.ts
 import { createServer } from "http";
 import { finished } from "stream";
-import { homedir as homedir4 } from "os";
-import { join as join7 } from "path";
+import { homedir as homedir5 } from "os";
+import { join as join8 } from "path";
 import { mkdir as mkdir3, writeFile as writeFile2, readFile, stat as fsStat } from "fs/promises";
-import { readFileSync, existsSync } from "fs";
+import { readFileSync as readFileSync2, existsSync } from "fs";
 
 // node_modules/viem/_esm/utils/getAction.js
 function getAction(client, actionFn, name) {
@@ -39019,6 +39019,11 @@ function filterByVision(models, hasVision, supportsVision2) {
   const filtered = models.filter(supportsVision2);
   return filtered.length > 0 ? filtered : models;
 }
+function filterByExcludeList(models, excludeList) {
+  if (excludeList.size === 0) return models;
+  const filtered = models.filter((m) => !excludeList.has(m));
+  return filtered.length > 0 ? filtered : models;
+}
 function getFallbackChainFiltered(tier, tierConfigs, estimatedTotalTokens, getContextWindow) {
   const fullChain = getFallbackChain(tier, tierConfigs);
   const filtered = fullChain.filter((modelId) => {
@@ -40454,7 +40459,9 @@ var MODEL_ALIASES = {
   nvidia: "nvidia/gpt-oss-120b",
   "gpt-120b": "nvidia/gpt-oss-120b",
   // MiniMax
-  minimax: "minimax/minimax-m2.5",
+  minimax: "minimax/minimax-m2.7",
+  "minimax-m2.7": "minimax/minimax-m2.7",
+  "minimax-m2.5": "minimax/minimax-m2.5",
   // Z.AI GLM-5
   glm: "zai/glm-5",
   "glm-5": "zai/glm-5",
@@ -40960,6 +40967,18 @@ var BLOCKRUN_MODELS = [
     toolCalling: true
   },
   // MiniMax
+  {
+    id: "minimax/minimax-m2.7",
+    name: "MiniMax M2.7",
+    version: "m2.7",
+    inputPrice: 0.3,
+    outputPrice: 1.2,
+    contextWindow: 204800,
+    maxOutput: 16384,
+    reasoning: true,
+    agentic: true,
+    toolCalling: true
+  },
   {
     id: "minimax/minimax-m2.5",
     name: "MiniMax M2.5",
@@ -46344,6 +46363,29 @@ async function checkForUpdates() {
   }
 }
 
+// src/exclude-models.ts
+import { readFileSync, writeFileSync, mkdirSync } from "fs";
+import { join as join7, dirname as dirname2 } from "path";
+import { homedir as homedir4 } from "os";
+var DEFAULT_FILE_PATH = join7(
+  homedir4(),
+  ".openclaw",
+  "blockrun",
+  "exclude-models.json"
+);
+function loadExcludeList(filePath = DEFAULT_FILE_PATH) {
+  try {
+    const raw = readFileSync(filePath, "utf-8");
+    const arr = JSON.parse(raw);
+    if (Array.isArray(arr)) {
+      return new Set(arr.filter((x) => typeof x === "string"));
+    }
+    return /* @__PURE__ */ new Set();
+  } catch {
+    return /* @__PURE__ */ new Set();
+  }
+}
+
 // src/config.ts
 var DEFAULT_PORT = 8402;
 var PROXY_PORT = (() => {
@@ -46528,7 +46570,7 @@ ${lines.join("\n")}`;
 // src/proxy.ts
 var BLOCKRUN_API = "https://blockrun.ai/api";
 var BLOCKRUN_SOLANA_API = "https://sol.blockrun.ai/api";
-var IMAGE_DIR = join7(homedir4(), ".openclaw", "blockrun", "images");
+var IMAGE_DIR = join8(homedir5(), ".openclaw", "blockrun", "images");
 var AUTO_MODEL = "blockrun/auto";
 var ROUTING_PROFILES = /* @__PURE__ */ new Set([
   "blockrun/free",
@@ -47196,7 +47238,7 @@ async function proxyPartnerRequest(req, res, apiBase, payFetch) {
   });
 }
 function readImageFileAsDataUri(filePath) {
-  const resolved = filePath.startsWith("~/") ? join7(homedir4(), filePath.slice(2)) : filePath;
+  const resolved = filePath.startsWith("~/") ? join8(homedir5(), filePath.slice(2)) : filePath;
   if (!existsSync(resolved)) {
     throw new Error(`Image file not found: ${resolved}`);
   }
@@ -47208,7 +47250,7 @@ function readImageFileAsDataUri(filePath) {
     webp: "image/webp"
   };
   const mime = mimeMap[ext] ?? "image/png";
-  const data = readFileSync(resolved);
+  const data = readFileSync2(resolved);
   return `data:${mime};base64,${data.toString("base64")}`;
 }
 async function uploadDataUriToHost(dataUri) {
@@ -47326,7 +47368,9 @@ async function startProxy(options) {
     skipPreAuth: paymentChain === "solana"
   });
   let balanceMonitor;
-  if (paymentChain === "solana" && solanaAddress) {
+  if (options._balanceMonitorOverride) {
+    balanceMonitor = options._balanceMonitorOverride;
+  } else if (paymentChain === "solana" && solanaAddress) {
     const { SolanaBalanceMonitor: SolanaBalanceMonitor2 } = await Promise.resolve().then(() => (init_solana_balance(), solana_balance_exports));
     balanceMonitor = new SolanaBalanceMonitor2(solanaAddress);
   } else {
@@ -47451,7 +47495,7 @@ async function startProxy(options) {
         res.end("Bad request");
         return;
       }
-      const filePath = join7(IMAGE_DIR, filename);
+      const filePath = join8(IMAGE_DIR, filename);
       try {
         const s3 = await fsStat(filePath);
         if (!s3.isFile()) throw new Error("not a file");
@@ -47510,7 +47554,7 @@ async function startProxy(options) {
               const [, mimeType, b64] = dataUriMatch;
               const ext = mimeType === "image/jpeg" ? "jpg" : mimeType.split("/")[1] ?? "png";
               const filename = `${Date.now()}-${Math.random().toString(36).slice(2, 10)}.${ext}`;
-              await writeFile2(join7(IMAGE_DIR, filename), Buffer.from(b64, "base64"));
+              await writeFile2(join8(IMAGE_DIR, filename), Buffer.from(b64, "base64"));
               img.url = `http://localhost:${port2}/images/${filename}`;
               console.log(`[ClawRouter] Image saved \u2192 ${img.url}`);
             } else if (img.url?.startsWith("https://") || img.url?.startsWith("http://")) {
@@ -47521,7 +47565,7 @@ async function startProxy(options) {
                   const ext = contentType.includes("jpeg") || contentType.includes("jpg") ? "jpg" : contentType.includes("webp") ? "webp" : "png";
                   const filename = `${Date.now()}-${Math.random().toString(36).slice(2, 10)}.${ext}`;
                   const buf = Buffer.from(await imgResp.arrayBuffer());
-                  await writeFile2(join7(IMAGE_DIR, filename), buf);
+                  await writeFile2(join8(IMAGE_DIR, filename), buf);
                   img.url = `http://localhost:${port2}/images/${filename}`;
                   console.log(`[ClawRouter] Image downloaded & saved \u2192 ${img.url}`);
                 }
@@ -47610,7 +47654,7 @@ async function startProxy(options) {
               const [, mimeType, b64] = dataUriMatch;
               const ext = mimeType === "image/jpeg" ? "jpg" : mimeType.split("/")[1] ?? "png";
               const filename = `${Date.now()}-${Math.random().toString(36).slice(2, 10)}.${ext}`;
-              await writeFile2(join7(IMAGE_DIR, filename), Buffer.from(b64, "base64"));
+              await writeFile2(join8(IMAGE_DIR, filename), Buffer.from(b64, "base64"));
               img.url = `http://localhost:${port2}/images/${filename}`;
               console.log(`[ClawRouter] Image saved \u2192 ${img.url}`);
             } else if (img.url?.startsWith("https://") || img.url?.startsWith("http://")) {
@@ -47621,7 +47665,7 @@ async function startProxy(options) {
                   const ext = contentType.includes("jpeg") || contentType.includes("jpg") ? "jpg" : contentType.includes("webp") ? "webp" : "png";
                   const filename = `${Date.now()}-${Math.random().toString(36).slice(2, 10)}.${ext}`;
                   const buf = Buffer.from(await imgResp.arrayBuffer());
-                  await writeFile2(join7(IMAGE_DIR, filename), buf);
+                  await writeFile2(join8(IMAGE_DIR, filename), buf);
                   img.url = `http://localhost:${port2}/images/${filename}`;
                   console.log(`[ClawRouter] Image downloaded & saved \u2192 ${img.url}`);
                 }
@@ -47933,6 +47977,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
   let budgetDowngradeHeaderMode;
   let accumulatedContent = "";
   let responseInputTokens;
+  let responseOutputTokens;
   const isChatCompletion = req.url?.includes("/chat/completions");
   const sessionId = getSessionId(req.headers);
   let effectiveSessionId = sessionId;
@@ -48866,6 +48911,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
   const timeoutId = setTimeout(() => globalController.abort(), timeoutMs);
   try {
     let modelsToTry;
+    const excludeList = options.excludeModels ?? loadExcludeList();
     if (routingDecision) {
       const estimatedInputTokens = Math.ceil(body.length / 4);
       const estimatedTotalTokens = estimatedInputTokens + maxTokens;
@@ -48883,8 +48929,15 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
           `[ClawRouter] Context filter (~${estimatedTotalTokens} tokens): excluded ${contextExcluded.join(", ")}`
         );
       }
-      let toolFiltered = filterByToolCalling(contextFiltered, hasTools, supportsToolCalling);
-      const toolExcluded = contextFiltered.filter((m) => !toolFiltered.includes(m));
+      const excludeFiltered = filterByExcludeList(contextFiltered, excludeList);
+      const excludeExcluded = contextFiltered.filter((m) => !excludeFiltered.includes(m));
+      if (excludeExcluded.length > 0) {
+        console.log(
+          `[ClawRouter] Exclude filter: excluded ${excludeExcluded.join(", ")} (user preference)`
+        );
+      }
+      let toolFiltered = filterByToolCalling(excludeFiltered, hasTools, supportsToolCalling);
+      const toolExcluded = excludeFiltered.filter((m) => !toolFiltered.includes(m));
       if (toolExcluded.length > 0) {
         console.log(
           `[ClawRouter] Tool-calling filter: excluded ${toolExcluded.join(", ")} (no structured function call support)`
@@ -48917,7 +48970,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
     } else {
       modelsToTry = modelId ? [modelId] : [];
     }
-    if (!hasTools && !modelsToTry.includes(FREE_MODEL)) {
+    if (!hasTools && !modelsToTry.includes(FREE_MODEL) && !excludeList.has(FREE_MODEL)) {
       modelsToTry.push(FREE_MODEL);
     }
     if (options.maxCostPerRunUsd && effectiveSessionId && !isFreeModel && (options.maxCostPerRunMode ?? "graceful") === "graceful") {
@@ -49225,6 +49278,7 @@ data: [DONE]
           if (rsp.usage && typeof rsp.usage === "object") {
             const u = rsp.usage;
             if (typeof u.prompt_tokens === "number") responseInputTokens = u.prompt_tokens;
+            if (typeof u.completion_tokens === "number") responseOutputTokens = u.completion_tokens;
           }
           const baseChunk = {
             id: rsp.id ?? `chatcmpl-${Date.now()}`,
@@ -49438,6 +49492,8 @@ data: [DONE]
         if (rspJson.usage && typeof rspJson.usage === "object") {
           if (typeof rspJson.usage.prompt_tokens === "number")
             responseInputTokens = rspJson.usage.prompt_tokens;
+          if (typeof rspJson.usage.completion_tokens === "number")
+            responseOutputTokens = rspJson.usage.completion_tokens;
         }
       } catch {
       }
@@ -49470,25 +49526,25 @@ data: [DONE]
   }
   const logModel = routingDecision?.model ?? modelId;
   if (logModel) {
-    const estimatedInputTokens = Math.ceil(body.length / 4);
+    const actualInputTokens = responseInputTokens ?? Math.ceil(body.length / 4);
+    const actualOutputTokens = responseOutputTokens ?? maxTokens;
     const accurateCosts = calculateModelCost(
       logModel,
       routerOpts.modelPricing,
-      estimatedInputTokens,
-      maxTokens,
+      actualInputTokens,
+      actualOutputTokens,
       routingProfile ?? void 0
     );
-    const costWithBuffer = accurateCosts.costEstimate * 1.2;
-    const baselineWithBuffer = accurateCosts.baselineCost * 1.2;
     const entry = {
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       model: logModel,
       tier: routingDecision?.tier ?? "DIRECT",
-      cost: costWithBuffer,
-      baselineCost: baselineWithBuffer,
+      cost: accurateCosts.costEstimate,
+      baselineCost: accurateCosts.baselineCost,
       savings: accurateCosts.savings,
       latencyMs: Date.now() - startTime,
-      ...responseInputTokens !== void 0 && { inputTokens: responseInputTokens }
+      ...responseInputTokens !== void 0 && { inputTokens: responseInputTokens },
+      ...responseOutputTokens !== void 0 && { outputTokens: responseOutputTokens }
     };
     logUsage(entry).catch(() => {
     });