@blockrun/clawrouter 0.8.11 → 0.8.13

package/dist/cli.js

@@ -2223,6 +2223,42 @@ var HEALTH_CHECK_TIMEOUT_MS = 2e3;
 var RATE_LIMIT_COOLDOWN_MS = 6e4;
 var PORT_RETRY_ATTEMPTS = 5;
 var PORT_RETRY_DELAY_MS = 1e3;
+function transformPaymentError(errorBody) {
+  try {
+    const parsed = JSON.parse(errorBody);
+    if (parsed.error === "Payment verification failed" && parsed.details) {
+      const match = parsed.details.match(/Verification failed:\s*(\{.*\})/s);
+      if (match) {
+        const innerJson = JSON.parse(match[1]);
+        if (innerJson.invalidReason === "insufficient_funds" && innerJson.invalidMessage) {
+          const balanceMatch = innerJson.invalidMessage.match(
+            /insufficient balance:\s*(\d+)\s*<\s*(\d+)/i
+          );
+          if (balanceMatch) {
+            const currentMicros = parseInt(balanceMatch[1], 10);
+            const requiredMicros = parseInt(balanceMatch[2], 10);
+            const currentUSD = (currentMicros / 1e6).toFixed(6);
+            const requiredUSD = (requiredMicros / 1e6).toFixed(6);
+            const wallet = innerJson.payer || "unknown";
+            const shortWallet = wallet.length > 12 ? `${wallet.slice(0, 6)}...${wallet.slice(-4)}` : wallet;
+            return JSON.stringify({
+              error: {
+                message: `Insufficient USDC balance. Current: $${currentUSD}, Required: ~$${requiredUSD}`,
+                type: "insufficient_funds",
+                wallet,
+                current_balance_usd: currentUSD,
+                required_usd: requiredUSD,
+                help: `Fund wallet ${shortWallet} with USDC on Base, or use free model: /model free`
+              }
+            });
+          }
+        }
+      }
+    }
+  } catch {
+  }
+  return errorBody;
+}
 var rateLimitedModels = /* @__PURE__ */ new Map();
 function isRateLimited(modelId) {
   const hitTime = rateLimitedModels.get(modelId);
@@ -2467,12 +2503,16 @@ function normalizeMessagesForThinking(messages) {
 }
 var KIMI_BLOCK_RE = /<[｜|][^<>]*begin[^<>]*[｜|]>[\s\S]*?<[｜|][^<>]*end[^<>]*[｜|]>/gi;
 var KIMI_TOKEN_RE = /<[｜|][^<>]*[｜|]>/g;
+var DSML_BLOCK_RE = /<[｜|]DSML[｜|][^>]*>[\s\S]*?<\/[｜|]DSML[｜|][^>]*>/gi;
+var DSML_TAG_RE = /<\/?[｜|]DSML[｜|][^>]*>/gi;
 var THINKING_TAG_RE = /<\s*\/?\s*(?:think(?:ing)?|thought|antthinking)\b[^>]*>/gi;
 var THINKING_BLOCK_RE = /<\s*(?:think(?:ing)?|thought|antthinking)\b[^>]*>[\s\S]*?<\s*\/\s*(?:think(?:ing)?|thought|antthinking)\s*>/gi;
 function stripThinkingTokens(content) {
   if (!content) return content;
   let cleaned = content.replace(KIMI_BLOCK_RE, "");
   cleaned = cleaned.replace(KIMI_TOKEN_RE, "");
+  cleaned = cleaned.replace(DSML_BLOCK_RE, "");
+  cleaned = cleaned.replace(DSML_TAG_RE, "");
   cleaned = cleaned.replace(THINKING_BLOCK_RE, "");
   cleaned = cleaned.replace(THINKING_TAG_RE, "");
   return cleaned;
@@ -3091,10 +3131,18 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
       options.onRouted?.(routingDecision);
     }
     if (!upstream) {
-      const errBody = lastError?.body || "All models in fallback chain failed";
+      const rawErrBody = lastError?.body || "All models in fallback chain failed";
       const errStatus = lastError?.status || 502;
+      const transformedErr = transformPaymentError(rawErrBody);
       if (headersSentEarly) {
-        const errEvent = `data: ${JSON.stringify({ error: { message: errBody, type: "provider_error", status: errStatus } })}
+        let errPayload;
+        try {
+          const parsed = JSON.parse(transformedErr);
+          errPayload = JSON.stringify(parsed);
+        } catch {
+          errPayload = JSON.stringify({ error: { message: rawErrBody, type: "provider_error", status: errStatus } });
+        }
+        const errEvent = `data: ${errPayload}
 
 `;
         safeWrite(res, errEvent);
@@ -3109,17 +3157,11 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
         });
       } else {
         res.writeHead(errStatus, { "Content-Type": "application/json" });
-        res.end(
-          JSON.stringify({
-            error: { message: errBody, type: "provider_error" }
-          })
-        );
+        res.end(transformedErr);
         deduplicator.complete(dedupKey, {
           status: errStatus,
           headers: { "content-type": "application/json" },
-          body: Buffer.from(
-            JSON.stringify({ error: { message: errBody, type: "provider_error" } })
-          ),
+          body: Buffer.from(transformedErr),
           completedAt: Date.now()
         });
       }