@blockrun/clawrouter 0.12.64 → 0.12.66

package/dist/index.js

@@ -42464,7 +42464,19 @@ function createPayFetchWithPreAuth(baseFetch, client, ttlMs = DEFAULT_TTL_MS, op
   return async (input, init) => {
     const request = new Request(input, init);
     const urlPath = new URL(request.url).pathname;
-    const cached = !options?.skipPreAuth ? cache2.get(urlPath) : void 0;
+    let requestModel = "";
+    if (init?.body) {
+      try {
+        const bodyStr = init.body instanceof Uint8Array ? new TextDecoder().decode(init.body) : typeof init.body === "string" ? init.body : "";
+        if (bodyStr) {
+          const parsed = JSON.parse(bodyStr);
+          requestModel = parsed.model ?? "";
+        }
+      } catch {
+      }
+    }
+    const cacheKey2 = `${urlPath}:${requestModel}`;
+    const cached = !options?.skipPreAuth ? cache2.get(cacheKey2) : void 0;
     if (cached && Date.now() - cached.cachedAt < ttlMs) {
       try {
         const payload2 = await client.createPaymentPayload(cached.paymentRequired);
@@ -42477,9 +42489,9 @@ function createPayFetchWithPreAuth(baseFetch, client, ttlMs = DEFAULT_TTL_MS, op
         if (response2.status !== 402) {
           return response2;
         }
-        cache2.delete(urlPath);
+        cache2.delete(cacheKey2);
       } catch {
-        cache2.delete(urlPath);
+        cache2.delete(cacheKey2);
       }
     }
     const clonedRequest = request.clone();
@@ -42502,7 +42514,7 @@ function createPayFetchWithPreAuth(baseFetch, client, ttlMs = DEFAULT_TTL_MS, op
       } catch {
       }
       paymentRequired = httpClient.getPaymentRequiredResponse(getHeader, body);
-      cache2.set(urlPath, { paymentRequired, cachedAt: Date.now() });
+      cache2.set(cacheKey2, { paymentRequired, cachedAt: Date.now() });
     } catch (error) {
       throw new Error(
         `Failed to parse payment requirements: ${error instanceof Error ? error.message : "Unknown error"}`,
@@ -46862,12 +46874,7 @@ async function checkForUpdates() {
 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"
-);
+var DEFAULT_FILE_PATH = join7(homedir4(), ".openclaw", "blockrun", "exclude-models.json");
 function loadExcludeList(filePath = DEFAULT_FILE_PATH) {
   try {
     const raw = readFileSync(filePath, "utf-8");
@@ -47272,8 +47279,7 @@ function categorizeError(status, body) {
   if (status === 401) return "auth_failure";
   if (status === 402) return "payment_error";
   if (status === 403) {
-    if (/plan.*limit|quota.*exceeded|subscription|allowance/i.test(body))
-      return "quota_exceeded";
+    if (/plan.*limit|quota.*exceeded|subscription|allowance/i.test(body)) return "quota_exceeded";
     return "auth_failure";
   }
   if (status === 429) return "rate_limited";
@@ -49560,6 +49566,7 @@ data: [DONE]
     let upstream;
     let lastError;
     let actualModelUsed = modelId;
+    const failedAttempts = [];
     for (let i = 0; i < modelsToTry.length; i++) {
       const tryModel = modelsToTry[i];
       const isLastAttempt = i === modelsToTry.length - 1;
@@ -49608,6 +49615,31 @@ data: [DONE]
         body: result.errorBody || "Unknown error",
         status: result.errorStatus || 500
       };
+      failedAttempts.push({
+        model: tryModel,
+        reason: result.errorCategory || `HTTP ${result.errorStatus || 500}`,
+        status: result.errorStatus || 500
+      });
+      const isPaymentErr = /payment.*verification.*failed|payment.*settlement.*failed|insufficient.*funds|transaction_simulation_failed/i.test(
+        result.errorBody || ""
+      );
+      if (isPaymentErr && tryModel !== FREE_MODEL && !isLastAttempt) {
+        failedAttempts.push({
+          ...failedAttempts[failedAttempts.length - 1],
+          reason: "payment_error"
+        });
+        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;
+        }
+        if (freeIdx === -1) {
+          modelsToTry.push(FREE_MODEL);
+          console.log(`[ClawRouter] Payment error \u2014 appending free model: ${FREE_MODEL}`);
+          continue;
+        }
+      }
       if (result.isProviderError && !isLastAttempt) {
         const isExplicitModelError = !routingDecision;
         const isUnknownExplicitModel = isExplicitModelError && /unknown.*model|invalid.*model/i.test(result.errorBody || "");
@@ -49685,17 +49717,6 @@ data: [DONE]
             `[ClawRouter] \u{1F511} ${errorCat === "auth_failure" ? "Auth failure" : "Quota exceeded"} for ${tryModel} \u2014 check provider config`
           );
         }
-        const isPaymentErr = /payment.*verification.*failed|payment.*settlement.*failed|insufficient.*funds|transaction_simulation_failed/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)}`
         );
@@ -49745,7 +49766,10 @@ data: [DONE]
       }
     }
     if (!upstream) {
-      const rawErrBody = lastError?.body || "All models in fallback chain failed";
+      const attemptSummary = failedAttempts.length > 0 ? failedAttempts.map((a) => `${a.model} (${a.reason})`).join(", ") : "unknown";
+      const structuredMessage = failedAttempts.length > 0 ? `All ${failedAttempts.length} models failed. Tried: ${attemptSummary}` : "All models in fallback chain failed";
+      console.log(`[ClawRouter] ${structuredMessage}`);
+      const rawErrBody = lastError?.body || structuredMessage;
       const errStatus = lastError?.status || 502;
       const transformedErr = transformPaymentError(rawErrBody);
       if (headersSentEarly) {
@@ -49804,7 +49828,7 @@ data: [DONE]
             id: rsp.id ?? `chatcmpl-${Date.now()}`,
             object: "chat.completion.chunk",
             created: rsp.created ?? Math.floor(Date.now() / 1e3),
-            model: rsp.model ?? "unknown",
+            model: actualModelUsed || rsp.model || "unknown",
             system_fingerprint: null
           };
           if (rsp.choices && Array.isArray(rsp.choices)) {
@@ -49919,6 +49943,13 @@ data: [DONE]
           responseChunks.push(Buffer.from(sseData));
         }
       }
+      if (routingDecision) {
+        const costComment = `: cost=$${routingDecision.costEstimate.toFixed(4)} savings=${(routingDecision.savings * 100).toFixed(0)}% model=${actualModelUsed} tier=${routingDecision.tier}
+
+`;
+        safeWrite(res, costComment);
+        responseChunks.push(Buffer.from(costComment));
+      }
       safeWrite(res, "data: [DONE]\n\n");
       responseChunks.push(Buffer.from("data: [DONE]\n\n"));
       res.end();
@@ -49947,6 +49978,10 @@ data: [DONE]
           responseHeaders["x-clawrouter-agentic-score"] = routingDecision.agenticScore.toFixed(2);
         }
       }
+      if (routingDecision) {
+        responseHeaders["x-clawrouter-cost"] = routingDecision.costEstimate.toFixed(6);
+        responseHeaders["x-clawrouter-savings"] = `${(routingDecision.savings * 100).toFixed(0)}%`;
+      }
       const bodyParts = [];
       if (upstream.body) {
         const chunks = await readBodyWithTimeout(upstream.body);
@@ -49977,6 +50012,16 @@ data: [DONE]
         }
         budgetDowngradeNotice = void 0;
       }
+      if (actualModelUsed && responseBody.length > 0) {
+        try {
+          const parsed = JSON.parse(responseBody.toString());
+          if (parsed.model !== void 0) {
+            parsed.model = actualModelUsed;
+            responseBody = Buffer.from(JSON.stringify(parsed));
+          }
+        } catch {
+        }
+      }
       if (budgetDowngradeHeaderMode) {
         responseHeaders["x-clawrouter-budget-downgrade"] = "1";
         responseHeaders["x-clawrouter-budget-mode"] = budgetDowngradeHeaderMode;
@@ -50802,7 +50847,9 @@ async function startProxyInBackground(api) {
   activeProxyHandle = proxy;
   const startupExclusions = loadExcludeList();
   if (startupExclusions.size > 0) {
-    api.logger.info(`Model exclusions active (${startupExclusions.size}): ${[...startupExclusions].join(", ")}`);
+    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`);
@@ -50891,7 +50938,10 @@ 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 };
+          return {
+            text: "Usage: /exclude add <model>\nExample: /exclude add nvidia/gpt-oss-120b",
+            isError: true
+          };
         }
         const resolved = addExclusion(modelArg);
         const list = loadExcludeList();