@blockrun/clawrouter 0.12.60 → 0.12.61

package/dist/index.d.ts

@@ -681,6 +681,8 @@ type ProxyOptions = {
     requestTimeoutMs?: number;
     /** Skip balance checks (for testing only). Default: false */
     skipBalanceCheck?: boolean;
+    /** Override the balance monitor with a mock (for testing only). */
+    _balanceMonitorOverride?: AnyBalanceMonitor;
     /**
      * Session persistence config. When enabled, maintains model selection
      * across requests within a session to prevent mid-task model switching.
@@ -717,6 +719,12 @@ type ProxyOptions = {
      * - 'strict': immediately return 429 once the session spend reaches the cap.
      */
     maxCostPerRunMode?: "graceful" | "strict";
+    /**
+     * Set of model IDs to exclude from routing.
+     * Excluded models are filtered out of fallback chains.
+     * Loaded from ~/.openclaw/blockrun/exclude-models.json
+     */
+    excludeModels?: Set<string>;
     onReady?: (port: number) => void;
     onError?: (error: Error) => void;
     onPayment?: (info: {
@@ -913,6 +921,8 @@ type UsageEntry = {
     latencyMs: number;
     /** Input (prompt) tokens reported by the provider */
     inputTokens?: number;
+    /** Output (completion) tokens reported by the provider */
+    outputTokens?: number;
     /** Partner service ID (e.g., "x_users_lookup") — only set for partner API calls */
     partnerId?: string;
     /** Partner service name (e.g., "AttentionVC") — only set for partner API calls */

package/dist/index.js

@@ -32889,7 +32889,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",
@@ -33395,6 +33397,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",
@@ -33541,10 +33555,10 @@ var blockrunProvider = {
 // 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) {
@@ -43494,6 +43508,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) => {
@@ -46839,6 +46858,54 @@ 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();
+  }
+}
+function saveExcludeList(set, filePath) {
+  const sorted = [...set].sort();
+  const dir = dirname2(filePath);
+  mkdirSync(dir, { recursive: true });
+  writeFileSync(filePath, JSON.stringify(sorted, null, 2) + "\n", "utf-8");
+}
+function addExclusion(model, filePath = DEFAULT_FILE_PATH) {
+  const resolved = resolveModelAlias(model);
+  const set = loadExcludeList(filePath);
+  set.add(resolved);
+  saveExcludeList(set, filePath);
+  return resolved;
+}
+function removeExclusion(model, filePath = DEFAULT_FILE_PATH) {
+  const resolved = resolveModelAlias(model);
+  const set = loadExcludeList(filePath);
+  const had = set.delete(resolved);
+  if (had) {
+    saveExcludeList(set, filePath);
+  }
+  return had;
+}
+function clearExclusions(filePath = DEFAULT_FILE_PATH) {
+  saveExcludeList(/* @__PURE__ */ new Set(), filePath);
+}
+
 // src/config.ts
 var DEFAULT_PORT = 8402;
 var PROXY_PORT = (() => {
@@ -47023,7 +47090,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",
@@ -47691,7 +47758,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}`);
   }
@@ -47703,7 +47770,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) {
@@ -47821,7 +47888,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 {
@@ -47946,7 +48015,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");
@@ -48005,7 +48074,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://")) {
@@ -48016,7 +48085,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}`);
                 }
@@ -48105,7 +48174,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://")) {
@@ -48116,7 +48185,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}`);
                 }
@@ -48428,6 +48497,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;
@@ -49361,6 +49431,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;
@@ -49378,8 +49449,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)`
@@ -49412,7 +49490,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") {
@@ -49720,6 +49798,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()}`,
@@ -49933,6 +50012,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 {
       }
@@ -49965,25 +50046,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(() => {
     });
@@ -49992,15 +50073,15 @@ data: [DONE]
 
 // src/index.ts
 import {
-  writeFileSync as writeFileSync2,
+  writeFileSync as writeFileSync3,
   existsSync as existsSync3,
   readdirSync,
-  mkdirSync as mkdirSync2,
+  mkdirSync as mkdirSync3,
   copyFileSync,
   renameSync
 } from "fs";
-import { homedir as homedir6 } from "os";
-import { join as join9 } from "path";
+import { homedir as homedir7 } from "os";
+import { join as join10 } from "path";
 init_accounts();
 
 // src/partners/registry.ts
@@ -50104,8 +50185,8 @@ init_solana_balance();
 // src/spend-control.ts
 import * as fs from "fs";
 import * as path from "path";
-import { homedir as homedir5 } from "os";
-var WALLET_DIR2 = path.join(homedir5(), ".openclaw", "blockrun");
+import { homedir as homedir6 } from "os";
+var WALLET_DIR2 = path.join(homedir6(), ".openclaw", "blockrun");
 var HOUR_MS = 60 * 60 * 1e3;
 var DAY_MS = 24 * HOUR_MS;
 var FileSpendControlStorage = class {
@@ -50430,13 +50511,13 @@ function isGatewayMode() {
   return args.includes("gateway");
 }
 function injectModelsConfig(logger) {
-  const configDir = join9(homedir6(), ".openclaw");
-  const configPath = join9(configDir, "openclaw.json");
+  const configDir = join10(homedir7(), ".openclaw");
+  const configPath = join10(configDir, "openclaw.json");
   let config = {};
   let needsWrite = false;
   if (!existsSync3(configDir)) {
     try {
-      mkdirSync2(configDir, { recursive: true });
+      mkdirSync3(configDir, { recursive: true });
       logger.info("Created OpenClaw config directory");
     } catch (err) {
       logger.info(
@@ -50597,7 +50678,7 @@ function injectModelsConfig(logger) {
   if (needsWrite) {
     try {
       const tmpPath = `${configPath}.tmp.${process.pid}`;
-      writeFileSync2(tmpPath, JSON.stringify(config, null, 2));
+      writeFileSync3(tmpPath, JSON.stringify(config, null, 2));
       renameSync(tmpPath, configPath);
       logger.info("Smart routing enabled (blockrun/auto)");
     } catch (err) {
@@ -50606,10 +50687,10 @@ function injectModelsConfig(logger) {
   }
 }
 function injectAuthProfile(logger) {
-  const agentsDir = join9(homedir6(), ".openclaw", "agents");
+  const agentsDir = join10(homedir7(), ".openclaw", "agents");
   if (!existsSync3(agentsDir)) {
     try {
-      mkdirSync2(agentsDir, { recursive: true });
+      mkdirSync3(agentsDir, { recursive: true });
     } catch (err) {
       logger.info(
         `Could not create agents dir: ${err instanceof Error ? err.message : String(err)}`
@@ -50623,11 +50704,11 @@ function injectAuthProfile(logger) {
       agents = ["main", ...agents];
     }
     for (const agentId of agents) {
-      const authDir = join9(agentsDir, agentId, "agent");
-      const authPath = join9(authDir, "auth-profiles.json");
+      const authDir = join10(agentsDir, agentId, "agent");
+      const authPath = join10(authDir, "auth-profiles.json");
       if (!existsSync3(authDir)) {
         try {
-          mkdirSync2(authDir, { recursive: true });
+          mkdirSync3(authDir, { recursive: true });
         } catch {
           continue;
         }
@@ -50655,7 +50736,7 @@ function injectAuthProfile(logger) {
         key: "x402-proxy-handles-auth"
       };
       try {
-        writeFileSync2(authPath, JSON.stringify(store, null, 2));
+        writeFileSync3(authPath, JSON.stringify(store, null, 2));
         logger.info(`Injected BlockRun auth profile for agent: ${agentId}`);
       } catch (err) {
         logger.info(
@@ -50719,6 +50800,10 @@ async function startProxyInBackground(api) {
   });
   setActiveProxy(proxy);
   activeProxyHandle = proxy;
+  const startupExclusions = loadExcludeList();
+  if (startupExclusions.size > 0) {
+    api.logger.info(`Model exclusions active (${startupExclusions.size}): ${[...startupExclusions].join(", ")}`);
+  }
   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 currentChain = await resolvePaymentChain();
@@ -50778,6 +50863,78 @@ async function createStatsCommand() {
     }
   };
 }
+async function createExcludeCommand() {
+  return {
+    name: "exclude",
+    description: "Manage excluded models \u2014 /exclude add|remove|clear <model>",
+    acceptsArgs: true,
+    requireAuth: true,
+    handler: async (ctx) => {
+      const args = ctx.args?.trim() || "";
+      const parts = args.split(/\s+/);
+      const subcommand = parts[0]?.toLowerCase() || "";
+      const modelArg = parts.slice(1).join(" ").trim();
+      if (!subcommand) {
+        const list = loadExcludeList();
+        if (list.size === 0) {
+          return {
+            text: "No models excluded.\n\nUsage:\n  /exclude add <model>  \u2014 block a model\n  /exclude remove <model> \u2014 unblock\n  /exclude clear \u2014 remove all"
+          };
+        }
+        const models = [...list].sort().map((m) => `  \u2022 ${m}`).join("\n");
+        return {
+          text: `Excluded models (${list.size}):
+${models}
+
+Use /exclude remove <model> to unblock.`
+        };
+      }
+      if (subcommand === "add") {
+        if (!modelArg) {
+          return { text: "Usage: /exclude add <model>\nExample: /exclude add nvidia/gpt-oss-120b", isError: true };
+        }
+        const resolved = addExclusion(modelArg);
+        const list = loadExcludeList();
+        return {
+          text: `Excluded: ${resolved}
+
+Active exclusions (${list.size}):
+${[...list].sort().map((m) => `  \u2022 ${m}`).join("\n")}`
+        };
+      }
+      if (subcommand === "remove") {
+        if (!modelArg) {
+          return { text: "Usage: /exclude remove <model>", isError: true };
+        }
+        const removed = removeExclusion(modelArg);
+        if (!removed) {
+          return { text: `Model "${modelArg}" was not in the exclude list.` };
+        }
+        const list = loadExcludeList();
+        return {
+          text: `Unblocked: ${modelArg}
+
+Active exclusions (${list.size}):
+${list.size > 0 ? [...list].sort().map((m) => `  \u2022 ${m}`).join("\n") : "  (none)"}`
+        };
+      }
+      if (subcommand === "clear") {
+        clearExclusions();
+        return { text: "All model exclusions cleared." };
+      }
+      return {
+        text: `Unknown subcommand: ${subcommand}
+
+Usage:
+  /exclude \u2014 show list
+  /exclude add <model>
+  /exclude remove <model>
+  /exclude clear`,
+        isError: true
+      };
+    }
+  };
+}
 async function createWalletCommand() {
   return {
     name: "wallet",
@@ -51090,6 +51247,13 @@ var plugin = {
         `Failed to register /stats command: ${err instanceof Error ? err.message : String(err)}`
       );
     });
+    createExcludeCommand().then((excludeCommand) => {
+      api.registerCommand(excludeCommand);
+    }).catch((err) => {
+      api.logger.warn(
+        `Failed to register /exclude command: ${err instanceof Error ? err.message : String(err)}`
+      );
+    });
     api.registerService({
       id: "clawrouter-proxy",
       start: () => {