@blockrun/clawrouter 0.12.35 → 0.12.36

package/dist/cli.js

@@ -1,4 +1,132 @@
 #!/usr/bin/env node
+var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __esm = (fn, res) => function __init() {
+  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+};
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+
+// src/solana-balance.ts
+var solana_balance_exports = {};
+__export(solana_balance_exports, {
+  SolanaBalanceMonitor: () => SolanaBalanceMonitor
+});
+import { address as solAddress, createSolanaRpc } from "@solana/kit";
+var SOLANA_USDC_MINT, SOLANA_DEFAULT_RPC, BALANCE_TIMEOUT_MS, CACHE_TTL_MS2, SolanaBalanceMonitor;
+var init_solana_balance = __esm({
+  "src/solana-balance.ts"() {
+    "use strict";
+    SOLANA_USDC_MINT = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
+    SOLANA_DEFAULT_RPC = "https://api.mainnet-beta.solana.com";
+    BALANCE_TIMEOUT_MS = 1e4;
+    CACHE_TTL_MS2 = 3e4;
+    SolanaBalanceMonitor = class {
+      rpc;
+      walletAddress;
+      cachedBalance = null;
+      cachedAt = 0;
+      constructor(walletAddress, rpcUrl) {
+        this.walletAddress = walletAddress;
+        const url = rpcUrl || process["env"].CLAWROUTER_SOLANA_RPC_URL || SOLANA_DEFAULT_RPC;
+        this.rpc = createSolanaRpc(url);
+      }
+      async checkBalance() {
+        const now = Date.now();
+        if (this.cachedBalance !== null && this.cachedBalance > 0n && now - this.cachedAt < CACHE_TTL_MS2) {
+          return this.buildInfo(this.cachedBalance);
+        }
+        const balance = await this.fetchBalance();
+        if (balance > 0n) {
+          this.cachedBalance = balance;
+          this.cachedAt = now;
+        }
+        return this.buildInfo(balance);
+      }
+      deductEstimated(amountMicros) {
+        if (this.cachedBalance !== null && this.cachedBalance >= amountMicros) {
+          this.cachedBalance -= amountMicros;
+        }
+      }
+      invalidate() {
+        this.cachedBalance = null;
+        this.cachedAt = 0;
+      }
+      async refresh() {
+        this.invalidate();
+        return this.checkBalance();
+      }
+      /**
+       * Check if balance is sufficient for an estimated cost.
+       */
+      async checkSufficient(estimatedCostMicros) {
+        const info = await this.checkBalance();
+        if (info.balance >= estimatedCostMicros) {
+          return { sufficient: true, info };
+        }
+        const shortfall = estimatedCostMicros - info.balance;
+        return {
+          sufficient: false,
+          info,
+          shortfall: this.formatUSDC(shortfall)
+        };
+      }
+      /**
+       * Format USDC amount (in micros) as "$X.XX".
+       */
+      formatUSDC(amountMicros) {
+        const dollars = Number(amountMicros) / 1e6;
+        return `$${dollars.toFixed(2)}`;
+      }
+      getWalletAddress() {
+        return this.walletAddress;
+      }
+      async fetchBalance() {
+        const owner = solAddress(this.walletAddress);
+        const mint = solAddress(SOLANA_USDC_MINT);
+        for (let attempt = 0; attempt < 2; attempt++) {
+          const result = await this.fetchBalanceOnce(owner, mint);
+          if (result > 0n || attempt === 1) return result;
+          await new Promise((r) => setTimeout(r, 1e3));
+        }
+        return 0n;
+      }
+      async fetchBalanceOnce(owner, mint) {
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), BALANCE_TIMEOUT_MS);
+        try {
+          const response = await this.rpc.getTokenAccountsByOwner(owner, { mint }, { encoding: "jsonParsed" }).send({ abortSignal: controller.signal });
+          if (response.value.length === 0) return 0n;
+          let total = 0n;
+          for (const account of response.value) {
+            const parsed = account.account.data;
+            total += BigInt(parsed.parsed.info.tokenAmount.amount);
+          }
+          return total;
+        } catch (err) {
+          throw new Error(
+            `Failed to fetch Solana USDC balance: ${err instanceof Error ? err.message : String(err)}`,
+            { cause: err }
+          );
+        } finally {
+          clearTimeout(timer);
+        }
+      }
+      buildInfo(balance) {
+        const dollars = Number(balance) / 1e6;
+        return {
+          balance,
+          balanceUSD: `$${dollars.toFixed(2)}`,
+          isLow: balance < 1000000n,
+          isEmpty: balance < 100n,
+          walletAddress: this.walletAddress
+        };
+      }
+    };
+  }
+});
 
 // src/proxy.ts
 import { createServer } from "http";
@@ -1429,11 +1557,14 @@ var DEFAULT_ROUTING_CONFIG = {
       primary: "moonshot/kimi-k2.5",
       // $0.60/$3.00 - best quality/price for simple tasks
       fallback: [
+        "google/gemini-2.5-flash",
+        // 60% retention (best), fast growth (+800%)
         "google/gemini-2.5-flash-lite",
         // 1M context, ultra cheap ($0.10/$0.40)
-        "nvidia/gpt-oss-120b",
+        "deepseek/deepseek-chat",
+        // 41% retention
+        "nvidia/gpt-oss-120b"
         // FREE fallback
-        "deepseek/deepseek-chat"
       ]
     },
     MEDIUM: {
@@ -1441,6 +1572,9 @@ var DEFAULT_ROUTING_CONFIG = {
       // $0.50/$2.40 - strong tool use, proper function call format
       fallback: [
         "deepseek/deepseek-chat",
+        // 41% retention
+        "google/gemini-2.5-flash",
+        // 60% retention, cheap fast model
         "google/gemini-2.5-flash-lite",
         // 1M context, ultra cheap ($0.10/$0.40)
         "xai/grok-4-1-fast-non-reasoning"
@@ -1451,6 +1585,8 @@ var DEFAULT_ROUTING_CONFIG = {
       primary: "google/gemini-3.1-pro",
       // Newest Gemini 3.1 - upgraded from 3.0
       fallback: [
+        "google/gemini-2.5-flash",
+        // 60% retention, cheap failsafe before expensive models
         "google/gemini-2.5-flash-lite",
         // CRITICAL: 1M context, ultra-cheap failsafe ($0.10/$0.40)
         "google/gemini-3-pro-preview",
@@ -1481,12 +1617,12 @@ var DEFAULT_ROUTING_CONFIG = {
     SIMPLE: {
       primary: "nvidia/gpt-oss-120b",
       // FREE! $0.00/$0.00
-      fallback: ["google/gemini-2.5-flash-lite", "deepseek/deepseek-chat"]
+      fallback: ["google/gemini-2.5-flash-lite", "google/gemini-2.5-flash", "deepseek/deepseek-chat"]
     },
     MEDIUM: {
       primary: "google/gemini-2.5-flash-lite",
       // $0.10/$0.40 - cheapest capable with 1M context
-      fallback: ["deepseek/deepseek-chat", "nvidia/gpt-oss-120b"]
+      fallback: ["google/gemini-2.5-flash", "deepseek/deepseek-chat", "nvidia/gpt-oss-120b"]
     },
     COMPLEX: {
       primary: "google/gemini-2.5-flash-lite",
@@ -1506,6 +1642,8 @@ var DEFAULT_ROUTING_CONFIG = {
       primary: "moonshot/kimi-k2.5",
       // $0.60/$3.00 - good for simple coding
       fallback: [
+        "google/gemini-2.5-flash",
+        // 60% retention, fast growth
         "anthropic/claude-haiku-4.5",
         "google/gemini-2.5-flash-lite",
         "deepseek/deepseek-chat"
@@ -1516,6 +1654,8 @@ var DEFAULT_ROUTING_CONFIG = {
       // $2.50/$10 - strong coding for medium tasks
       fallback: [
         "moonshot/kimi-k2.5",
+        "google/gemini-2.5-flash",
+        // 60% retention, good coding capability
         "google/gemini-2.5-pro",
         "xai/grok-4-0709",
         "anthropic/claude-sonnet-4.6"
@@ -1726,7 +1866,8 @@ var MODEL_ALIASES = {
   // xAI
   grok: "xai/grok-3",
   "grok-fast": "xai/grok-4-fast-reasoning",
-  "grok-code": "xai/grok-code-fast-1",
+  "grok-code": "deepseek/deepseek-chat",
+  // was grok-code-fast-1, delisted due to poor retention
   // NVIDIA
   nvidia: "nvidia/gpt-oss-120b",
   "gpt-120b": "nvidia/gpt-oss-120b",
@@ -2194,18 +2335,8 @@ var BLOCKRUN_MODELS = [
     maxOutput: 16384,
     toolCalling: true
   },
-  {
-    id: "xai/grok-code-fast-1",
-    name: "Grok Code Fast",
-    version: "1",
-    inputPrice: 0.2,
-    outputPrice: 1.5,
-    contextWindow: 131072,
-    maxOutput: 16384
-    // toolCalling intentionally omitted: outputs tool calls as plain text JSON,
-    // not OpenAI-compatible structured function calls. Will be skipped when
-    // request has tools to prevent the "talking to itself" bug.
-  },
+  // xai/grok-code-fast-1 delisted 2026-03-12: poor retention (coding users churn),
+  // no structured tool calling, alias "grok-code" redirected to deepseek-chat
   {
     id: "xai/grok-4-0709",
     name: "Grok 4 (0709)",
@@ -2973,115 +3104,6 @@ var BalanceMonitor = class {
   }
 };
 
-// src/solana-balance.ts
-import { address as solAddress, createSolanaRpc } from "@solana/kit";
-var SOLANA_USDC_MINT = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
-var SOLANA_DEFAULT_RPC = "https://api.mainnet-beta.solana.com";
-var BALANCE_TIMEOUT_MS = 1e4;
-var CACHE_TTL_MS2 = 3e4;
-var SolanaBalanceMonitor = class {
-  rpc;
-  walletAddress;
-  cachedBalance = null;
-  cachedAt = 0;
-  constructor(walletAddress, rpcUrl) {
-    this.walletAddress = walletAddress;
-    const url = rpcUrl || process["env"].CLAWROUTER_SOLANA_RPC_URL || SOLANA_DEFAULT_RPC;
-    this.rpc = createSolanaRpc(url);
-  }
-  async checkBalance() {
-    const now = Date.now();
-    if (this.cachedBalance !== null && this.cachedBalance > 0n && now - this.cachedAt < CACHE_TTL_MS2) {
-      return this.buildInfo(this.cachedBalance);
-    }
-    const balance = await this.fetchBalance();
-    if (balance > 0n) {
-      this.cachedBalance = balance;
-      this.cachedAt = now;
-    }
-    return this.buildInfo(balance);
-  }
-  deductEstimated(amountMicros) {
-    if (this.cachedBalance !== null && this.cachedBalance >= amountMicros) {
-      this.cachedBalance -= amountMicros;
-    }
-  }
-  invalidate() {
-    this.cachedBalance = null;
-    this.cachedAt = 0;
-  }
-  async refresh() {
-    this.invalidate();
-    return this.checkBalance();
-  }
-  /**
-   * Check if balance is sufficient for an estimated cost.
-   */
-  async checkSufficient(estimatedCostMicros) {
-    const info = await this.checkBalance();
-    if (info.balance >= estimatedCostMicros) {
-      return { sufficient: true, info };
-    }
-    const shortfall = estimatedCostMicros - info.balance;
-    return {
-      sufficient: false,
-      info,
-      shortfall: this.formatUSDC(shortfall)
-    };
-  }
-  /**
-   * Format USDC amount (in micros) as "$X.XX".
-   */
-  formatUSDC(amountMicros) {
-    const dollars = Number(amountMicros) / 1e6;
-    return `$${dollars.toFixed(2)}`;
-  }
-  getWalletAddress() {
-    return this.walletAddress;
-  }
-  async fetchBalance() {
-    const owner = solAddress(this.walletAddress);
-    const mint = solAddress(SOLANA_USDC_MINT);
-    for (let attempt = 0; attempt < 2; attempt++) {
-      const result = await this.fetchBalanceOnce(owner, mint);
-      if (result > 0n || attempt === 1) return result;
-      await new Promise((r) => setTimeout(r, 1e3));
-    }
-    return 0n;
-  }
-  async fetchBalanceOnce(owner, mint) {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), BALANCE_TIMEOUT_MS);
-    try {
-      const response = await this.rpc.getTokenAccountsByOwner(owner, { mint }, { encoding: "jsonParsed" }).send({ abortSignal: controller.signal });
-      if (response.value.length === 0) return 0n;
-      let total = 0n;
-      for (const account of response.value) {
-        const parsed = account.account.data;
-        total += BigInt(parsed.parsed.info.tokenAmount.amount);
-      }
-      return total;
-    } catch (err) {
-      throw new Error(
-        `Failed to fetch Solana USDC balance: ${err instanceof Error ? err.message : String(err)}`,
-        { cause: err }
-      );
-    } finally {
-      clearTimeout(timer);
-    }
-  }
-  buildInfo(balance) {
-    const dollars = Number(balance) / 1e6;
-    return {
-      balance,
-      balanceUSD: `$${dollars.toFixed(2)}`,
-      isLow: balance < 1000000n,
-      isEmpty: balance < 100n,
-      walletAddress: this.walletAddress
-    };
-  }
-};
-
 // src/auth.ts
 import { writeFile, mkdir as mkdir2 } from "fs/promises";
 import { join as join4 } from "path";
@@ -5004,6 +5026,7 @@ var ROUTING_PROFILES = /* @__PURE__ */ new Set([
   "premium"
 ]);
 var FREE_MODEL = "nvidia/gpt-oss-120b";
+var freeRequestCount = 0;
 var MAX_MESSAGES = 200;
 var CONTEXT_LIMIT_KB = 5120;
 var HEARTBEAT_INTERVAL_MS = 2e3;
@@ -5705,7 +5728,13 @@ async function startProxy(options) {
       const solanaSigner = await createKeyPairSignerFromPrivateKeyBytes(solanaPrivateKeyBytes);
       reuseSolanaAddress = solanaSigner.address;
     }
-    const balanceMonitor2 = paymentChain === "solana" && reuseSolanaAddress ? new SolanaBalanceMonitor(reuseSolanaAddress) : new BalanceMonitor(account2.address);
+    let balanceMonitor2;
+    if (paymentChain === "solana" && reuseSolanaAddress) {
+      const { SolanaBalanceMonitor: SolanaBalanceMonitor2 } = await Promise.resolve().then(() => (init_solana_balance(), solana_balance_exports));
+      balanceMonitor2 = new SolanaBalanceMonitor2(reuseSolanaAddress);
+    } else {
+      balanceMonitor2 = new BalanceMonitor(account2.address);
+    }
     options.onReady?.(listenPort);
     return {
       port: listenPort,
@@ -5739,7 +5768,13 @@ async function startProxy(options) {
   const payFetch = createPayFetchWithPreAuth(fetch, x402, void 0, {
     skipPreAuth: paymentChain === "solana"
   });
-  const balanceMonitor = paymentChain === "solana" && solanaAddress ? new SolanaBalanceMonitor(solanaAddress) : new BalanceMonitor(account.address);
+  let balanceMonitor;
+  if (paymentChain === "solana" && solanaAddress) {
+    const { SolanaBalanceMonitor: SolanaBalanceMonitor2 } = await Promise.resolve().then(() => (init_solana_balance(), solana_balance_exports));
+    balanceMonitor = new SolanaBalanceMonitor2(solanaAddress);
+  } else {
+    balanceMonitor = new BalanceMonitor(account.address);
+  }
   const routingConfig = mergeRoutingConfig(options.routingConfig);
   const modelPricing = buildModelPricing();
   const routerOpts = {
@@ -5959,11 +5994,14 @@ async function startProxy(options) {
           if (val.startsWith("data:")) {
           } else if (val.startsWith("https://") || val.startsWith("http://")) {
             const imgResp = await fetch(val);
-            if (!imgResp.ok) throw new Error(`Failed to download ${field} from ${val}: HTTP ${imgResp.status}`);
+            if (!imgResp.ok)
+              throw new Error(`Failed to download ${field} from ${val}: HTTP ${imgResp.status}`);
             const contentType = imgResp.headers.get("content-type") ?? "image/png";
             const buf = Buffer.from(await imgResp.arrayBuffer());
             parsed[field] = `data:${contentType};base64,${buf.toString("base64")}`;
-            console.log(`[ClawRouter] img2img: downloaded ${field} URL \u2192 data URI (${buf.length} bytes)`);
+            console.log(
+              `[ClawRouter] img2img: downloaded ${field} URL \u2192 data URI (${buf.length} bytes)`
+            );
           } else {
             parsed[field] = readImageFileAsDataUri(val);
             console.log(`[ClawRouter] img2img: read ${field} file \u2192 data URI`);
@@ -6320,6 +6358,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
   let modelId = "";
   let maxTokens = 4096;
   let routingProfile = null;
+  let balanceFallbackNotice;
   let accumulatedContent = "";
   let responseInputTokens;
   const isChatCompletion = req.url?.includes("/chat/completions");
@@ -6855,6 +6894,12 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
           parsed.model = freeModel;
           modelId = freeModel;
           bodyModified = true;
+          freeRequestCount++;
+          if (freeRequestCount % 5 === 0) {
+            balanceFallbackNotice = `> **\u{1F4A1} Tip:** Not satisfied with free model quality? Fund your wallet to unlock deepseek-chat, gemini-flash, and 30+ premium models \u2014 starting at $0.001/request.
+
+`;
+          }
           await logUsage({
             timestamp: (/* @__PURE__ */ new Date()).toISOString(),
             model: freeModel,
@@ -7071,7 +7116,6 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
   }
   deduplicator.markInflight(dedupKey);
   let estimatedCostMicros;
-  let balanceFallbackNotice;
   const isFreeModel = modelId === FREE_MODEL;
   if (modelId && !options.skipBalanceCheck && !isFreeModel) {
     const estimated = estimateAmount(modelId, body.length, maxTokens);
@@ -7093,6 +7137,12 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
 ` : `> **\u26A0\uFE0F Insufficient balance** (${sufficiency.info.balanceUSD}) \u2014 using free model instead of ${originalModel}.
 
 `;
+        freeRequestCount++;
+        if (freeRequestCount % 5 === 0) {
+          balanceFallbackNotice = `> **\u{1F4A1} Tip:** Not satisfied with free model quality? Fund your wallet to unlock deepseek-chat, gemini-flash, and 30+ premium models \u2014 starting at $0.001/request.
+
+`;
+        }
         options.onLowBalance?.({
           balanceUSD: sufficiency.info.balanceUSD,
           walletAddress: sufficiency.info.walletAddress
@@ -7976,7 +8026,7 @@ var PARTNER_SERVICES = [
     id: "x_users_lookup",
     name: "Twitter/X User Lookup",
     partner: "AttentionVC",
-    description: "ALWAYS use this tool to look up real-time Twitter/X user profiles. Call this when the user asks about any Twitter/X account, username, handle, follower count, verification status, bio, or profile. Do NOT answer Twitter/X user questions from memory \u2014 always fetch live data with this tool. Returns: follower count, verification badge, bio, location, join date. Accepts up to 100 usernames per request (without @ prefix).",
+    description: "Look up real-time Twitter/X user profiles by username. Call this ONLY when the user explicitly asks to look up, check, or get information about a specific Twitter/X user's profile (follower count, bio, verification status, etc.). Do NOT call this for messages that merely contain x.com or twitter.com URLs \u2014 only invoke when the user is asking for profile information about a specific account. Returns: follower count, verification badge, bio, location, join date. Accepts up to 100 usernames per request (without @ prefix).",
     proxyPath: "/x/users/lookup",
     method: "POST",
     params: [