@blockrun/clawrouter 0.12.270 → 0.12.272

package/dist/cli.js

@@ -40713,6 +40713,18 @@ function isBalanceError(error) {
 function isRpcError(error) {
   return error instanceof Error && error.code === "RPC_ERROR";
 }
+function describeFetchError(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  const cause = error?.cause;
+  if (!(cause instanceof Error)) return message;
+  const detail = cause;
+  const host = detail.hostname || detail.address;
+  const where = host && detail.port ? `${host}:${detail.port}` : host;
+  const parts = [detail.code, where, detail.code ? void 0 : detail.message].filter(
+    (part) => typeof part === "string" && part !== ""
+  );
+  return parts.length > 0 ? `${message} (${parts.join(" ")})` : message;
+}
 var InsufficientFundsError2, EmptyWalletError, RpcError2;
 var init_errors5 = __esm({
   "src/errors.ts"() {
@@ -55984,7 +55996,7 @@ var require_websocket = __commonJS({
     var net3 = __require("net");
     var tls2 = __require("tls");
     var { randomBytes: randomBytes9, createHash: createHash4 } = __require("crypto");
-    var { Duplex, Readable: Readable2 } = __require("stream");
+    var { Duplex, Readable: Readable3 } = __require("stream");
     var { URL: URL3 } = __require("url");
     var PerMessageDeflate2 = require_permessage_deflate();
     var Receiver2 = require_receiver();
@@ -60107,16 +60119,20 @@ function maskApiKey(key2) {
 async function readOptional2(path5) {
   try {
     return (await readTextFile(path5)).trim() || void 0;
-  } catch {
-    return void 0;
+  } catch (error) {
+    if (error.code === "ENOENT") return void 0;
+    throw new Error(
+      `Cannot read BlockRun API key file ${path5}; refusing to fall back to another account or wallet.`,
+      { cause: error }
+    );
   }
 }
 async function resolveApiKey() {
   const envKey = process["env"].BLOCKRUN_API_KEY?.trim();
   if (envKey) {
     if (isValidApiKey(envKey)) return { key: envKey, source: "env" };
-    console.warn(
-      `[ClawRouter] \u26A0 BLOCKRUN_API_KEY is set but does not look like a BlockRun key (expected brk_\u2026) \u2014 ignoring.`
+    throw new Error(
+      `BLOCKRUN_API_KEY is malformed (expected brk_\u2026). Mint one at ${PORTAL_KEYS_URL}, or unset it to pay from the wallet. Refusing to fall back silently.`
     );
   }
   for (const [path5, source] of [
@@ -60126,8 +60142,8 @@ async function resolveApiKey() {
     const stored = await readOptional2(path5);
     if (stored === void 0) continue;
     if (isValidApiKey(stored)) return { key: stored, source };
-    console.warn(
-      `[ClawRouter] \u26A0 ${path5} does not contain a BlockRun key (expected brk_\u2026) \u2014 ignoring.`
+    throw new Error(
+      `${path5} does not contain a BlockRun key (expected brk_\u2026). Run "clawrouter login" with a valid key, or "clawrouter logout" to return to wallet billing. Refusing to fall back silently: the next source could bill a different account or spend from a wallet.`
     );
   }
   return void 0;
@@ -60152,16 +60168,129 @@ async function clearApiKey() {
   }
   return { removed, envStillSet: Boolean(process["env"].BLOCKRUN_API_KEY?.trim()) };
 }
-function createApiKeyFetch(apiKey, baseFetch = fetch) {
+async function fetchCreditBalance(apiKey, timeoutMs = 5e3) {
+  try {
+    const controller = new AbortController();
+    const timer2 = setTimeout(() => controller.abort(), timeoutMs);
+    const res = await fetch(`${BLOCKRUN_API_KEY_API}/v1/credits`, {
+      headers: { authorization: `Bearer ${apiKey}` },
+      signal: controller.signal
+    });
+    clearTimeout(timer2);
+    if (!res.ok) return void 0;
+    const b = await res.json();
+    const num2 = (v) => typeof v === "number" ? v : null;
+    return {
+      accountId: typeof b.account_id === "string" ? b.account_id : void 0,
+      billingMode: typeof b.billing_mode === "string" ? b.billing_mode : void 0,
+      currency: typeof b.currency === "string" ? b.currency : "USD",
+      grantedUsd: num2(b.granted_usd),
+      spentUsd: num2(b.spent_usd),
+      remainingUsd: num2(b.remaining_usd),
+      blocked: b.blocked === true,
+      blockedReason: typeof b.blocked_reason === "string" ? b.blocked_reason : void 0
+    };
+  } catch {
+    return void 0;
+  }
+}
+function formatCreditBalance(b) {
+  const money = (v) => v === null ? void 0 : `$${v.toFixed(v < 0.01 && v > 0 ? 6 : 2)}`;
+  const remaining = money(b.remainingUsd);
+  const spent = money(b.spentUsd);
+  if (remaining) return `${remaining} remaining${spent ? ` (spent ${spent})` : ""}`;
+  const mode = b.billingMode === "ungated" ? "no prepaid limit" : b.billingMode ?? "unknown";
+  return `${spent ? `spent ${spent}` : "unknown"} \u2014 ${mode}`;
+}
+async function fetchUsagePage(apiKey, opts = {}) {
+  const params = new URLSearchParams();
+  if (opts.from) params.set("from", opts.from);
+  if (opts.to) params.set("to", opts.to);
+  if (opts.limit) params.set("limit", String(opts.limit));
+  if (opts.cursor) params.set("cursor", opts.cursor);
+  const query = params.toString();
+  try {
+    const res = await fetch(`${BLOCKRUN_API_KEY_API}/v1/usage${query ? `?${query}` : ""}`, {
+      headers: { authorization: `Bearer ${apiKey}` },
+      signal: AbortSignal.timeout(3e4)
+    });
+    if (!res.ok) return void 0;
+    const body = await res.json();
+    return {
+      rows: (body.data ?? []).map((r2) => ({
+        requestId: String(r2.request_id ?? ""),
+        timestamp: String(r2.timestamp ?? ""),
+        endpoint: String(r2.endpoint ?? ""),
+        model: typeof r2.model === "string" ? r2.model : null,
+        kind: String(r2.kind ?? ""),
+        inputTokens: typeof r2.input_tokens === "number" ? r2.input_tokens : 0,
+        outputTokens: typeof r2.output_tokens === "number" ? r2.output_tokens : 0,
+        costUsd: typeof r2.cost_usd === "number" ? r2.cost_usd : null,
+        costState: String(r2.cost_state ?? ""),
+        status: typeof r2.status === "number" ? r2.status : 0
+      })),
+      nextCursor: body.next_cursor ?? null,
+      unavailableDays: body.unavailable_days ?? []
+    };
+  } catch {
+    return void 0;
+  }
+}
+function normalizeApiKeyBase(raw) {
+  const base4 = raw.replace(/\/+$/, "").replace(/\/v1$/, "");
+  const url2 = new URL(base4);
+  if (url2.username || url2.password || url2.search || url2.hash || url2.protocol !== "https:" && !(url2.protocol === "http:" && ["localhost", "127.0.0.1", "[::1]"].includes(url2.hostname))) {
+    throw new Error(
+      "BlockRun account API URL requires HTTPS (except localhost) and no credentials, query or fragment."
+    );
+  }
+  return base4;
+}
+function createApiKeyFetch(apiKey, baseFetch = fetch, apiBase = BLOCKRUN_API_KEY_API) {
+  const base4 = new URL(normalizeApiKeyBase(apiBase));
   return async (input, init2) => {
-    const headers = new Headers(init2?.headers);
+    const request2 = input instanceof Request ? input : void 0;
+    const url2 = new URL(request2?.url ?? String(input), `${base4}/`);
+    if (url2.origin !== base4.origin || url2.username || url2.password) {
+      throw new Error("Refusing to forward a BlockRun account key to another origin.");
+    }
+    if (base4.pathname === "/" && url2.pathname.startsWith("/api/v1/")) {
+      url2.pathname = url2.pathname.slice(4);
+    }
+    const headers = new Headers(init2?.headers ?? request2?.headers);
+    for (const name of [...headers.keys()]) {
+      if (/payment/i.test(name) || name.toLowerCase() === "x-api-key") headers.delete(name);
+    }
     headers.set("authorization", `Bearer ${apiKey}`);
-    headers.delete("x-payment");
-    headers.delete("x-api-key");
-    const response = await baseFetch(input, { ...init2, headers });
+    const response = await baseFetch(request2 ? new Request(url2, request2) : url2.href, {
+      ...init2,
+      headers,
+      redirect: "error"
+    });
     return response.ok ? response : explainApiKeyFailure(response);
   };
 }
+async function pollApiKeyJob(response, payFetch, apiBase, signal, intervalMs = 2e3) {
+  if (response.status !== 202) return response;
+  const initial = await response.clone().json();
+  if (!initial.poll_url) throw new Error("Async account response missing poll_url");
+  const pollUrl = new URL(initial.poll_url, `${normalizeApiKeyBase(apiBase)}/`).href;
+  const abort = AbortSignal.any([signal, AbortSignal.timeout(15 * 6e4)]);
+  while (!abort.aborted) {
+    const polled = await payFetch(pollUrl, { signal: abort });
+    if ([502, 503, 504, 522, 524].includes(polled.status)) {
+      await polled.body?.cancel();
+    } else {
+      if (!polled.ok) return polled;
+      const data = await polled.clone().json();
+      if (data.status === "completed") return polled;
+      if (data.status === "failed") return polled;
+      await polled.body?.cancel();
+    }
+    await new Promise((resolve) => setTimeout(resolve, intervalMs));
+  }
+  throw new Error("Async account job did not complete before the client aborted or timed out.");
+}
 async function explainApiKeyFailure(response) {
   const hint = HINTS[response.status];
   if (!hint) return response;
@@ -60195,7 +60324,7 @@ var init_api_key = __esm({
     PORTAL_URL = "https://user.blockrun.ai";
     PORTAL_KEYS_URL = `${PORTAL_URL}/dashboard/keys`;
     PORTAL_CREDITS_URL = `${PORTAL_URL}/dashboard/credits`;
-    BLOCKRUN_API_KEY_API = process["env"].BLOCKRUN_API_BASE_URL?.replace(/\/+$/, "") || "https://api.blockrun.ai";
+    BLOCKRUN_API_KEY_API = process["env"].BLOCKRUN_API_BASE_URL?.replace(/\/+$/, "").replace(/\/v1$/, "") || "https://api.blockrun.ai";
     HINTS = {
       401: `Check BLOCKRUN_API_KEY, or mint a new key at ${PORTAL_KEYS_URL}.`,
       402: `Top up your BlockRun credit at ${PORTAL_CREDITS_URL}.`,
@@ -69341,7 +69470,7 @@ var require_client_h2 = __commonJS({
   "node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert10 = __require("assert");
-    var { pipeline } = __require("stream");
+    var { pipeline: pipeline2 } = __require("stream");
     var util5 = require_util();
     var {
       RequestContentLengthMismatchError,
@@ -70488,7 +70617,7 @@ var require_client_h2 = __commonJS({
     }
     function writeStream(abort, socket, expectsPayload, h2stream, body, client, request2, contentLength) {
       assert10(contentLength !== 0 || client[kRunning] === 0, "stream body cannot be pipelined");
-      const pipe2 = pipeline(
+      const pipe2 = pipeline2(
         body,
         h2stream,
         (err) => {
@@ -73643,7 +73772,7 @@ var require_readable = __commonJS({
     "use strict";
     var assert10 = __require("assert");
     var { addAbortListener } = __require("events");
-    var { Readable: Readable2 } = __require("stream");
+    var { Readable: Readable3 } = __require("stream");
     var { RequestAbortedError, NotSupportedError, InvalidArgumentError, AbortError } = require_errors();
     var util5 = require_util();
     var { ReadableStreamFrom } = require_util();
@@ -73657,7 +73786,7 @@ var require_readable = __commonJS({
     var kBytesRead = /* @__PURE__ */ Symbol("kBytesRead");
     var noop2 = () => {
     };
-    var BodyReadable = class extends Readable2 {
+    var BodyReadable = class extends Readable3 {
       /**
        * @param {object} opts
        * @param {(this: Readable, size: number) => void} opts.resume
@@ -74056,7 +74185,7 @@ var require_api_request = __commonJS({
     "use strict";
     var assert10 = __require("assert");
     var { AsyncResource } = __require("async_hooks");
-    var { Readable: Readable2 } = require_readable();
+    var { Readable: Readable3 } = require_readable();
     var { InvalidArgumentError, RequestAbortedError } = require_errors();
     var util5 = require_util();
     function noop2() {
@@ -74142,7 +74271,7 @@ var require_api_request = __commonJS({
         const parsedHeaders = headers;
         const contentType = parsedHeaders?.["content-type"];
         const contentLength = parsedHeaders?.["content-length"];
-        const res = new Readable2({
+        const res = new Readable3({
           resume: () => controller.resume(),
           abort: (reason) => controller.abort(reason),
           contentType,
@@ -74518,7 +74647,7 @@ var require_api_pipeline = __commonJS({
   "node_modules/undici/lib/api/api-pipeline.js"(exports, module) {
     "use strict";
     var {
-      Readable: Readable2,
+      Readable: Readable3,
       Duplex,
       PassThrough
     } = __require("stream");
@@ -74535,7 +74664,7 @@ var require_api_pipeline = __commonJS({
     function noop2() {
     }
     var kResume = /* @__PURE__ */ Symbol("resume");
-    var PipelineRequest = class extends Readable2 {
+    var PipelineRequest = class extends Readable3 {
       constructor() {
         super({ autoDestroy: true });
         this[kResume] = null;
@@ -74553,7 +74682,7 @@ var require_api_pipeline = __commonJS({
         callback(err);
       }
     };
-    var PipelineResponse = class extends Readable2 {
+    var PipelineResponse = class extends Readable3 {
       constructor(resume2) {
         super({ autoDestroy: true });
         this[kResume] = resume2;
@@ -74707,7 +74836,7 @@ var require_api_pipeline = __commonJS({
         util5.destroy(ret, err);
       }
     };
-    function pipeline(opts, handler) {
+    function pipeline2(opts, handler) {
       try {
         const pipelineHandler = new PipelineHandler(opts, handler);
         this.dispatch({ ...opts, body: pipelineHandler.req }, pipelineHandler);
@@ -74716,7 +74845,7 @@ var require_api_pipeline = __commonJS({
         return new PassThrough().destroy(err);
       }
     }
-    module.exports = pipeline;
+    module.exports = pipeline2;
   }
 });
 
@@ -76352,7 +76481,7 @@ var require_snapshot_utils = __commonJS({
 var require_snapshot_recorder = __commonJS({
   "node_modules/undici/lib/mock/snapshot-recorder.js"(exports, module) {
     "use strict";
-    var { writeFile: writeFile4, readFile: readFile3, mkdir: mkdir6 } = __require("fs/promises");
+    var { writeFile: writeFile4, readFile: readFile4, mkdir: mkdir6 } = __require("fs/promises");
     var { dirname: dirname4, resolve } = __require("path");
     var { setTimeout: setTimeout2, clearTimeout: clearTimeout2 } = __require("timers");
     var { InvalidArgumentError, UndiciError } = require_errors();
@@ -76569,7 +76698,7 @@ var require_snapshot_recorder = __commonJS({
           throw new InvalidArgumentError("Snapshot path is required");
         }
         try {
-          const data = await readFile3(resolve(path5), "utf8");
+          const data = await readFile4(resolve(path5), "utf8");
           const parsed = JSON.parse(data);
           if (Array.isArray(parsed)) {
             this.#snapshots.clear();
@@ -79834,7 +79963,7 @@ var require_cache2 = __commonJS({
   "node_modules/undici/lib/interceptor/cache.js"(exports, module) {
     "use strict";
     var assert10 = __require("assert");
-    var { Readable: Readable2 } = __require("stream");
+    var { Readable: Readable3 } = __require("stream");
     var util5 = require_util();
     var CacheHandler = require_cache_handler();
     var MemoryCacheStore = require_memory_cache_store();
@@ -80010,7 +80139,7 @@ var require_cache2 = __commonJS({
       return dispatch(opts, new CacheHandler(globalOpts, cacheKey2, handler));
     }
     function sendCachedValue(handler, opts, result, age, context, isStale2) {
-      const stream4 = util5.isStream(result.body) ? result.body : Readable2.from(result.body ?? []);
+      const stream4 = util5.isStream(result.body) ? result.body : Readable3.from(result.body ?? []);
       assert10(!stream4.destroyed, "stream should not be destroyed");
       assert10(!stream4.readableDidRead, "stream should not be readableDidRead");
       const controller = {
@@ -80255,7 +80384,7 @@ var require_decompress = __commonJS({
   "node_modules/undici/lib/interceptor/decompress.js"(exports, module) {
     "use strict";
     var { createInflate, createGunzip, createBrotliDecompress, createZstdDecompress } = __require("zlib");
-    var { pipeline } = __require("stream");
+    var { pipeline: pipeline2 } = __require("stream");
     var DecoratorHandler = require_decorator_handler();
     var supportedEncodings = {
       gzip: createGunzip,
@@ -80365,7 +80494,7 @@ var require_decompress = __commonJS({
       #setupMultipleDecompressors(controller) {
         const lastDecompressor = this.#decompressors[this.#decompressors.length - 1];
         this.#setupDecompressorEvents(lastDecompressor, controller);
-        pipeline(this.#decompressors, (err) => {
+        pipeline2(this.#decompressors, (err) => {
           if (err) {
             super.onResponseError(controller, err);
             return;
@@ -83159,7 +83288,7 @@ var require_fetch = __commonJS({
       subresourceSet
     } = require_constants4();
     var EE = __require("events");
-    var { Readable: Readable2, pipeline, finished: finished2, isErrored, isReadable } = __require("stream");
+    var { Readable: Readable3, pipeline: pipeline2, finished: finished2, isErrored, isReadable } = __require("stream");
     var { addAbortListener, bufferToLowerCasedHeaderName } = require_util();
     var { dataURLProcessor, serializeAMimeType, minimizeSupportedMimeType } = require_data_url();
     var { getGlobalDispatcher } = require_global2();
@@ -84135,7 +84264,7 @@ var require_fetch = __commonJS({
                 const headersList = new HeadersList();
                 appendHeadersListFromResponseHeaders(headersList, headers, rawHeaders);
                 const location = headersList.get("location", true);
-                this.body = new Readable2({ read: () => controller.resume() });
+                this.body = new Readable3({ read: () => controller.resume() });
                 const willFollow = location && request2.redirect === "follow" && redirectStatusSet.has(status);
                 const decoders = [];
                 if (request2.method !== "HEAD" && request2.method !== "CONNECT" && !nullBodyStatus.includes(status) && !willFollow) {
@@ -84183,7 +84312,7 @@ var require_fetch = __commonJS({
                   status,
                   statusText,
                   headersList,
-                  body: decoders.length ? pipeline(this.body, ...decoders, (err) => {
+                  body: decoders.length ? pipeline2(this.body, ...decoders, (err) => {
                     if (err) {
                       this.onResponseError(controller, err);
                     }
@@ -87995,7 +88124,7 @@ ${value}`;
 var require_eventsource = __commonJS({
   "node_modules/undici/lib/web/eventsource/eventsource.js"(exports, module) {
     "use strict";
-    var { pipeline } = __require("stream");
+    var { pipeline: pipeline2 } = __require("stream");
     var { fetching } = require_fetch();
     var { webidl } = require_webidl();
     var { EventSourceStream } = require_eventsource_stream();
@@ -88145,7 +88274,7 @@ var require_eventsource = __commonJS({
               ));
             }
           });
-          pipeline(
+          pipeline2(
             response.body.stream,
             eventSourceStream,
             (error) => {
@@ -90673,11 +90802,30 @@ var init_client3 = __esm({
   }
 });
 
+// node_modules/@x402/svm/dist/esm/v1/index.mjs
+var v1_exports = {};
+__export(v1_exports, {
+  ExactSvmSchemeV1: () => ExactSvmSchemeV1,
+  NETWORKS: () => NETWORKS2
+});
+var init_v1 = __esm({
+  "node_modules/@x402/svm/dist/esm/v1/index.mjs"() {
+    "use strict";
+    init_chunk_WWACQNRQ();
+    init_chunk_MNNIECS4();
+    init_chunk_WIPN332D();
+    init_chunk_FVTMOTG6();
+    init_chunk_FJ6REVHH();
+    init_chunk_QEBTC3LJ();
+  }
+});
+
 // src/proxy.ts
 import { AsyncLocalStorage } from "async_hooks";
 import { createHmac } from "crypto";
 import { createServer } from "http";
-import { finished } from "stream";
+import { finished, Readable } from "stream";
+import { pipeline } from "stream/promises";
 import { homedir as homedir8 } from "os";
 import { join as join11 } from "path";
 import { mkdir as mkdir5, writeFile as writeFile3, readFile as readFile2, stat as fsStat } from "fs/promises";
@@ -90686,10 +90834,10 @@ async function loadGatewayCatalog(apiBase, apiKey) {
   try {
     const controller = new AbortController();
     const timer2 = setTimeout(() => controller.abort(), GATEWAY_CATALOG_TIMEOUT_MS);
-    const res = await fetch(`${apiBase}/v1/models`, {
-      signal: controller.signal,
-      ...apiKey ? { headers: { authorization: `Bearer ${apiKey}` } } : {}
-    });
+    const res = await (apiKey ? createApiKeyFetch(apiKey, fetch, apiBase) : fetch)(
+      `${apiBase}/v1/models`,
+      { signal: controller.signal }
+    );
     clearTimeout(timer2);
     if (!res.ok) return;
     const body = await res.json();
@@ -91427,7 +91575,57 @@ function estimateImageCost(model, size5, n = 1) {
   const pricePerImage = sizePrice ?? pricing.default;
   return pricePerImage * n * 1.05;
 }
-async function proxyPaidApiRequest(req, res, apiBase, payFetch, getActualPaymentUsd) {
+function blockrunRequestId(response) {
+  if (!response) return void 0;
+  for (const name of ["x-blockrun-request-id", "x-request-id", "request-id"]) {
+    const value = response.headers.get(name)?.trim();
+    if (value) return value;
+  }
+  return void 0;
+}
+function gatewayRemainingCreditUsd(response) {
+  const raw = response?.headers.get("x-blockrun-credit-remaining-usd");
+  if (raw === null || raw === void 0) return void 0;
+  const trimmed = raw.trim();
+  if (trimmed === "") return void 0;
+  const value = Number(trimmed);
+  if (!Number.isFinite(value) || value < 0) return void 0;
+  return value;
+}
+function settledMediaCostUsd(upstream, body, x402AmountUsd, estimate) {
+  const header = gatewaySettledCostUsd(upstream);
+  if (header !== void 0) return header;
+  const price = body?.price?.amount;
+  if (typeof price === "string" || typeof price === "number") {
+    const parsed = Number(price);
+    if (Number.isFinite(parsed) && parsed >= 0) return parsed;
+  }
+  if (typeof x402AmountUsd === "number" && x402AmountUsd > 0) return x402AmountUsd;
+  return estimate;
+}
+function noteRemainingCredit(response) {
+  const remaining = gatewayRemainingCreditUsd(response);
+  if (remaining === void 0) return;
+  if (remaining > LOW_CREDIT_USD) {
+    lowCreditWarned = false;
+    return;
+  }
+  if (lowCreditWarned) return;
+  lowCreditWarned = true;
+  console.warn(
+    remaining <= 0 ? `[ClawRouter] \u26A0 BlockRun account credit is exhausted \u2014 calls will fail with 402. Top up: ${PORTAL_CREDITS_URL}` : `[ClawRouter] \u26A0 BlockRun account credit low: $${remaining.toFixed(2)} remaining. Top up: ${PORTAL_CREDITS_URL}`
+  );
+}
+function gatewaySettledCostUsd(response) {
+  const raw = response?.headers.get("x-blockrun-cost-usd");
+  if (raw === null || raw === void 0) return void 0;
+  const trimmed = raw.trim();
+  if (trimmed === "") return void 0;
+  const value = Number(trimmed);
+  if (!Number.isFinite(value) || value < 0) return void 0;
+  return value;
+}
+async function proxyPaidApiRequest(req, res, apiBase, payFetch, getActualPaymentUsd, accountPassthrough = false, authMode = "wallet") {
   const startTime = Date.now();
   const upstreamUrl = `${apiBase}${req.url}`;
   const isBlockrunExa = req.url?.startsWith("/v1/exa/") ?? false;
@@ -91466,18 +91664,35 @@ async function proxyPaidApiRequest(req, res, apiBase, payFetch, getActualPayment
       return;
     responseHeaders[key2] = value;
   });
+  if (accountPassthrough || authMode === "api-key") {
+    responseHeaders["cache-control"] = "no-store";
+  }
   res.writeHead(upstream.status, responseHeaders);
-  if (upstream.body) {
-    const chunks = await readBodyWithTimeout(upstream.body, ERROR_BODY_READ_TIMEOUT_MS);
-    for (const chunk of chunks) {
-      safeWrite(res, Buffer.from(chunk));
+  if (accountPassthrough) {
+    if (upstream.body) {
+      await pipeline(
+        Readable.fromWeb(upstream.body),
+        res,
+        { signal: clientAbort.signal }
+      );
+    } else {
+      res.end();
     }
+  } else {
+    if (upstream.body) {
+      const chunks = await readBodyWithTimeout(upstream.body, ERROR_BODY_READ_TIMEOUT_MS);
+      for (const chunk of chunks) {
+        safeWrite(res, Buffer.from(chunk));
+      }
+    }
+    res.end();
   }
-  res.end();
   const latencyMs = Date.now() - startTime;
   console.log(`[ClawRouter] ${requestLabel} response: ${upstream.status} (${latencyMs}ms)`);
-  const paidAmount = getActualPaymentUsd();
-  const requestCost = resolvePhoneTelemetryCost({
+  noteRemainingCredit(upstream);
+  const settledCostUsd = gatewaySettledCostUsd(upstream);
+  const paidAmount = settledCostUsd ?? getActualPaymentUsd();
+  const requestCost = settledCostUsd !== void 0 ? settledCostUsd : resolvePhoneTelemetryCost({
     paidAmount,
     isPhone,
     upstreamStatus: upstream.status,
@@ -91486,6 +91701,7 @@ async function proxyPaidApiRequest(req, res, apiBase, payFetch, getActualPayment
   });
   logUsage({
     timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    ...blockrunRequestId(upstream) ? { requestId: blockrunRequestId(upstream) } : {},
     model: isBlockrunExa ? "blockrun-exa" : isModalSandbox ? "modal-sandbox" : isPhone ? (req.url ?? "").replace(/^\/v1\//, "").split("?")[0] : isSurf ? (req.url ?? "").replace(/^\/v1\//, "").split("?")[0] : "partner",
     tier: isPhone ? "PHONE" : isSurf ? "SURF" : "PARTNER",
     cost: requestCost,
@@ -91577,7 +91793,8 @@ async function startProxy(options) {
   const walletKey = options.wallet === void 0 ? void 0 : typeof options.wallet === "string" ? options.wallet : options.wallet.key;
   const solanaPrivateKeyBytes = options.wallet === void 0 || typeof options.wallet === "string" ? void 0 : options.wallet.solanaPrivateKeyBytes;
   const paymentChain = options.paymentChain ?? await resolvePaymentChain();
-  const apiBase = options.apiBase ?? (authMode === "api-key" ? BLOCKRUN_API_KEY_API : paymentChain === "solana" && solanaPrivateKeyBytes ? BLOCKRUN_SOLANA_API : BLOCKRUN_API);
+  const requestedApiBase = options.apiBase ?? (authMode === "api-key" ? BLOCKRUN_API_KEY_API : paymentChain === "solana" && solanaPrivateKeyBytes ? BLOCKRUN_SOLANA_API : BLOCKRUN_API);
+  const apiBase = authMode === "api-key" ? normalizeApiKeyBase(requestedApiBase) : requestedApiBase;
   if (authMode === "api-key") {
     console.log(`[ClawRouter] Auth: BlockRun API key ${maskApiKey(apiKey)} (${apiBase})`);
     console.log(`[ClawRouter] Billing: account credit \u2014 top up at ${PORTAL_CREDITS_URL}`);
@@ -91677,8 +91894,20 @@ async function startProxy(options) {
     const { createKeyPairSignerFromPrivateKeyBytes: createKeyPairSignerFromPrivateKeyBytes2 } = await Promise.resolve().then(() => (init_index_node37(), index_node_exports));
     const solanaSigner = await createKeyPairSignerFromPrivateKeyBytes2(solanaPrivateKeyBytes);
     solanaAddress = solanaSigner.address;
+    const solanaRpcUrl = process["env"].CLAWROUTER_SOLANA_RPC_URL;
     registerExactSvmScheme2(x402, { signer: solanaSigner });
+    if (solanaRpcUrl) {
+      const { ExactSvmScheme: ExactSvmScheme2 } = await Promise.resolve().then(() => (init_client3(), client_exports));
+      const { ExactSvmSchemeV1: ExactSvmSchemeV12, NETWORKS: SVM_V1_NETWORKS } = await Promise.resolve().then(() => (init_v1(), v1_exports));
+      x402.register("solana:*", new ExactSvmScheme2(solanaSigner, { rpcUrl: solanaRpcUrl }));
+      for (const network of SVM_V1_NETWORKS) {
+        x402.registerV1(network, new ExactSvmSchemeV12(solanaSigner, { rpcUrl: solanaRpcUrl }));
+      }
+    }
     console.log(`[ClawRouter] Solana wallet: ${solanaAddress}`);
+    if (solanaRpcUrl) {
+      console.log(`[ClawRouter] Solana RPC (payment signing + balance): ${solanaRpcUrl}`);
+    }
   }
   x402?.onAfterPaymentCreation(async (context) => {
     if (!context.selectedRequirements.network.startsWith("eip155")) return;
@@ -91694,7 +91923,7 @@ async function startProxy(options) {
     if (store) store.amountUsd = amountUsd;
     console.log(`[ClawRouter] Payment signed on ${chain3} (${network}) \u2014 $${amountUsd.toFixed(6)}`);
   });
-  const payFetch = authMode === "api-key" ? createApiKeyFetch(apiKey) : createPayFetchWithPreAuth(fetch, x402, void 0, {
+  const payFetch = authMode === "api-key" ? createApiKeyFetch(apiKey, fetch, apiBase) : createPayFetchWithPreAuth(fetch, x402, void 0, {
     skipPreAuth: paymentChain === "solana",
     // Per-request cost estimate so pre-auth is only reused when the cached
     // payment still covers the (possibly larger) request — BlockRun prices per
@@ -91778,7 +92007,15 @@ async function startProxy(options) {
               )
             ]);
             if (authMode === "api-key") {
-              response.balance = null;
+              const credit = await fetchCreditBalance(apiKey, BALANCE_CHECK_TIMEOUT_MS);
+              response.balance = credit?.remainingUsd ?? null;
+              response.creditSpent = credit?.spentUsd ?? null;
+              response.creditGranted = credit?.grantedUsd ?? null;
+              response.billingMode = credit?.billingMode ?? null;
+              response.creditSummary = credit ? formatCreditBalance(credit) : null;
+              response.blocked = credit?.blocked ?? false;
+              if (credit?.blockedReason) response.blockedReason = credit.blockedReason;
+              response.isEmpty = credit?.remainingUsd !== null && (credit?.remainingUsd ?? 1) <= 0;
               response.billing = "BlockRun account credit";
               response.topUpUrl = PORTAL_CREDITS_URL;
             } else {
@@ -92190,9 +92427,15 @@ async function startProxy(options) {
               }
             }
           }
-          const imgActualCost = paymentStore.getStore()?.amountUsd ?? imgCost;
+          const imgActualCost = settledMediaCostUsd(
+            upstream,
+            result,
+            paymentStore.getStore()?.amountUsd,
+            imgCost
+          );
           logUsage({
             timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+            ...blockrunRequestId(upstream) ? { requestId: blockrunRequestId(upstream) } : {},
             model: imgModel,
             tier: "IMAGE",
             cost: imgActualCost,
@@ -92261,12 +92504,15 @@ async function startProxy(options) {
           return;
         }
         try {
-          const upstream = await payFetch(`${apiBase}/v1/images/image2image`, {
+          let upstream = await payFetch(`${apiBase}/v1/images/image2image`, {
             method: "POST",
             headers: { "content-type": "application/json", "user-agent": USER_AGENT },
             body: reqBody,
             signal: clientAbort.signal
           });
+          if (authMode === "api-key") {
+            upstream = await pollApiKeyJob(upstream, payFetch, apiBase, clientAbort.signal);
+          }
           const text = await upstream.text();
           if (!upstream.ok) {
             res.writeHead(upstream.status, { "Content-Type": "application/json" });
@@ -92313,9 +92559,15 @@ async function startProxy(options) {
               }
             }
           }
-          const img2imgActualCost = paymentStore.getStore()?.amountUsd ?? img2imgCost;
+          const img2imgActualCost = settledMediaCostUsd(
+            upstream,
+            result,
+            paymentStore.getStore()?.amountUsd,
+            img2imgCost
+          );
           logUsage({
             timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+            ...blockrunRequestId(upstream) ? { requestId: blockrunRequestId(upstream) } : {},
             model: img2imgModel,
             tier: "IMAGE",
             cost: img2imgActualCost,
@@ -92355,12 +92607,15 @@ async function startProxy(options) {
         } catch {
         }
         try {
-          const upstream = await payFetch(`${apiBase}/v1/audio/generations`, {
+          let upstream = await payFetch(`${apiBase}/v1/audio/generations`, {
             method: "POST",
             headers: { "content-type": "application/json", "user-agent": USER_AGENT },
             body: reqBody,
             signal: clientAbort.signal
           });
+          if (authMode === "api-key") {
+            upstream = await pollApiKeyJob(upstream, payFetch, apiBase, clientAbort.signal);
+          }
           const text = await upstream.text();
           if (!upstream.ok) {
             res.writeHead(upstream.status, { "Content-Type": "application/json" });
@@ -92399,9 +92654,15 @@ async function startProxy(options) {
               }
             }
           }
-          const audioActualCost = paymentStore.getStore()?.amountUsd ?? 0.15;
+          const audioActualCost = settledMediaCostUsd(
+            upstream,
+            result,
+            paymentStore.getStore()?.amountUsd,
+            0.15
+          );
           logUsage({
             timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+            ...blockrunRequestId(upstream) ? { requestId: blockrunRequestId(upstream) } : {},
             model: audioModel,
             tier: "AUDIO",
             cost: audioActualCost,
@@ -92559,7 +92820,12 @@ async function startProxy(options) {
               }
             }
           }
-          const videoActualCost = paymentStore.getStore()?.amountUsd ?? estimateVideoCost(videoModel, videoDuration, videoHasImageInput);
+          const videoActualCost = settledMediaCostUsd(
+            void 0,
+            submitResult,
+            paymentStore.getStore()?.amountUsd,
+            estimateVideoCost(videoModel, videoDuration, videoHasImageInput)
+          );
           logUsage({
             timestamp: (/* @__PURE__ */ new Date()).toISOString(),
             model: videoModel,
@@ -92593,7 +92859,9 @@ async function startProxy(options) {
             res,
             apiBase,
             payFetch,
-            () => paymentStore.getStore()?.amountUsd ?? 0
+            () => paymentStore.getStore()?.amountUsd ?? 0,
+            false,
+            authMode
           );
         } catch (err) {
           const error = err instanceof Error ? err : new Error(String(err));
@@ -92616,6 +92884,33 @@ async function startProxy(options) {
         res.end(JSON.stringify({ error: "Not found" }));
         return;
       }
+      if (authMode === "api-key" && /^\/v1\//.test(req.url ?? "") && !/^\/v1\/(?:chat\/completions|messages)(?:\?|$)/.test(req.url ?? "")) {
+        try {
+          await proxyPaidApiRequest(
+            req,
+            res,
+            apiBase,
+            payFetch,
+            () => paymentStore.getStore()?.amountUsd ?? 0,
+            true,
+            authMode
+          );
+        } catch (err) {
+          const error = err instanceof Error ? err : new Error(String(err));
+          options.onError?.(error);
+          if (!res.headersSent) {
+            res.writeHead(502, { "Content-Type": "application/json" });
+            res.end(
+              JSON.stringify({
+                error: { message: `Account API error: ${error.message}`, type: "account_error" }
+              })
+            );
+          } else if (!res.writableEnded) {
+            res.end();
+          }
+        }
+        return;
+      }
       if (!req.url.includes("/chat/completions")) {
         res.writeHead(404, { "Content-Type": "application/json" });
         res.end(
@@ -92883,7 +93178,8 @@ async function tryModelRequest(upstreamUrl, method, headers, body, modelId, maxT
         errorBody,
         errorStatus: response.status,
         isProviderError: category !== null,
-        errorCategory: category ?? void 0
+        errorCategory: category ?? void 0,
+        upstreamRequestId: blockrunRequestId(response)
       };
     }
     const contentType = response.headers.get("content-type") || "";
@@ -92920,9 +93216,12 @@ async function tryModelRequest(upstreamUrl, method, headers, body, modelId, maxT
         errorCategory: "payment_error"
       };
     }
+    const networkMsg = describeFetchError(err);
+    const solanaSigningHint = upstreamUrl.startsWith(BLOCKRUN_SOLANA_API) && networkMsg.startsWith("fetch failed") ? " \u2014 on the Solana rail this may be the RPC that signs the payment rather than the gateway; if api.mainnet-beta.solana.com is unreachable from this host, set CLAWROUTER_SOLANA_RPC_URL to your own endpoint" : "";
+    console.error(`[ClawRouter] ${modelId} network error: ${networkMsg}${solanaSigningHint}`);
     return {
       success: false,
-      errorBody: errorMsg,
+      errorBody: `${networkMsg}${solanaSigningHint}`,
       errorStatus: 500,
       isProviderError: true
       // Network errors are retryable
@@ -92955,6 +93254,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
   let accumulatedContent = "";
   let responseInputTokens;
   let responseOutputTokens;
+  let upstreamRequestId;
   let requestHadError = false;
   let requestSummaryForStore = "";
   const isChatCompletion = req.url?.includes("/chat/completions");
@@ -93294,9 +93594,15 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
               responseText = lines.join("\n");
             }
             console.log(`[ClawRouter] /imagegen success: ${images.length} image(s) generated`);
-            const imagegenActualCost = paymentStore.getStore()?.amountUsd ?? estimateImageCost(imageModel, imageSize, 1);
+            const imagegenActualCost = settledMediaCostUsd(
+              imageResponse,
+              imageResult,
+              paymentStore.getStore()?.amountUsd,
+              estimateImageCost(imageModel, imageSize, 1)
+            );
             logUsage({
               timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+              ...blockrunRequestId(imageResponse) ? { requestId: blockrunRequestId(imageResponse) } : {},
               model: imageModel,
               tier: "IMAGE",
               cost: imagegenActualCost,
@@ -93520,9 +93826,15 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
               responseText = lines.join("\n");
             }
             console.log(`[ClawRouter] /img2img success: ${images.length} image(s)`);
-            const img2imgActualCost2 = paymentStore.getStore()?.amountUsd ?? estimateImageCost(img2imgModel, img2imgSize, 1);
+            const img2imgActualCost2 = settledMediaCostUsd(
+              img2imgResponse,
+              img2imgResult,
+              paymentStore.getStore()?.amountUsd,
+              estimateImageCost(img2imgModel, img2imgSize, 1)
+            );
             logUsage({
               timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+              ...blockrunRequestId(img2imgResponse) ? { requestId: blockrunRequestId(img2imgResponse) } : {},
               model: img2imgModel,
               tier: "IMAGE",
               cost: img2imgActualCost2,
@@ -94361,7 +94673,8 @@ data: [DONE]
       }
       lastError = {
         body: result.errorBody || "Unknown error",
-        status: result.errorStatus || 500
+        status: result.errorStatus || 500,
+        requestId: result.upstreamRequestId
       };
       failedAttempts.push({
         model: tryModel,
@@ -94433,7 +94746,8 @@ data: [DONE]
           }
           lastError = {
             body: retryResult.errorBody || lastError?.body || "Unknown error",
-            status: retryResult.errorStatus || lastError?.status || 500
+            status: retryResult.errorStatus || lastError?.status || 500,
+            requestId: retryResult.upstreamRequestId ?? lastError?.requestId
           };
           failedAttempts.push({
             model: tryModel,
@@ -94575,10 +94889,14 @@ data: [DONE]
         }
       }
     }
+    upstreamRequestId = blockrunRequestId(upstream);
+    noteRemainingCredit(upstream);
     if (!upstream) {
       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}`);
+      console.log(
+        `[ClawRouter] ${structuredMessage}${lastError?.requestId ? ` | gateway request id: ${lastError.requestId}` : ""}`
+      );
       const rawErrBody = lastError?.body || structuredMessage;
       const errStatus = lastError?.status || 502;
       const transformedErr = transformPaymentError(rawErrBody);
@@ -94616,7 +94934,8 @@ data: [DONE]
         res.writeHead(errStatus, {
           "Content-Type": "application/json",
           "x-context-used-kb": String(originalContextSizeKB),
-          "x-context-limit-kb": String(CONTEXT_LIMIT_KB)
+          "x-context-limit-kb": String(CONTEXT_LIMIT_KB),
+          ...lastError?.requestId ? { "x-blockrun-request-id": lastError.requestId } : {}
         });
         res.end(transformedErr);
         deduplicator.complete(dedupKey, {
@@ -95080,12 +95399,24 @@ data: [DONE]
         maxTokens,
         routingProfile ?? void 0
       );
-      logCost = FREE_MODELS.has(logModel) ? 0 : costs.costEstimate;
+      const apiKeyPricing = options.apiKey ? routerOpts.modelPricing.get(logModel) : void 0;
+      if (FREE_MODELS.has(logModel)) {
+        logCost = 0;
+        logSavings = 1;
+      } else if (apiKeyPricing) {
+        const inTokens = responseInputTokens ?? chargedInputTokens;
+        const outTokens = responseOutputTokens ?? 0;
+        logCost = (inTokens * (apiKeyPricing.inputPrice ?? 0) + outTokens * (apiKeyPricing.outputPrice ?? 0)) / 1e6;
+        logSavings = costs.baselineCost > 0 ? Math.max(0, (costs.baselineCost - logCost) / costs.baselineCost) : 0;
+      } else {
+        logCost = costs.costEstimate;
+        logSavings = costs.savings;
+      }
       logBaseline = costs.baselineCost;
-      logSavings = FREE_MODELS.has(logModel) ? 1 : costs.savings;
     }
     const entry = {
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      ...upstreamRequestId ? { requestId: upstreamRequestId } : {},
       model: logModel,
       tier: routingDecision?.tier ?? "DIRECT",
       cost: logCost,
@@ -95100,7 +95431,7 @@ data: [DONE]
     });
   }
 }
-var paymentStore, BLOCKRUN_API, BLOCKRUN_SOLANA_API, DESKTOP_SERVICE_TOKEN_FILE, IMAGE_DIR, AUDIO_DIR, VIDEO_DIR, AUTO_MODEL, ROUTING_PROFILES, FREE_MODELS, gatewayModelIds, FREE_MODEL, FREE_UPSTREAM_OVERRIDES, MAX_MESSAGES, CONTEXT_LIMIT_KB, HEARTBEAT_INTERVAL_MS, BALANCE_CHECK_TIMEOUT_MS, GATEWAY_CATALOG_TIMEOUT_MS, DEFAULT_REQUEST_TIMEOUT_MS, PER_MODEL_TIMEOUT_MS, REASONING_MODEL_TIMEOUT_MS, REASONING_MODEL_IDS, MAX_FALLBACK_ATTEMPTS, HEALTH_CHECK_TIMEOUT_MS, RATE_LIMIT_COOLDOWN_MS, OVERLOAD_COOLDOWN_MS, PORT_RETRY_ATTEMPTS, PORT_RETRY_DELAY_MS, MODEL_BODY_READ_TIMEOUT_MS, ERROR_BODY_READ_TIMEOUT_MS, ClientDisconnectedError, rateLimitedModels, overloadedModels, perProviderErrors, BALANCE_CHECK_BUFFER, BALANCE_PREFLIGHT_OUTPUT_TOKEN_CAP, PROVIDER_ERROR_PATTERNS, DEGRADED_RESPONSE_PATTERNS, DEGRADED_LOOP_PATTERNS, VALID_ROLES, ROLE_MAPPINGS, VALID_TOOL_ID_PATTERN, KIMI_BLOCK_RE, KIMI_TOKEN_RE, THINKING_TAG_RE, THINKING_BLOCK_RE, BLOCKRUN_MODEL_BY_ID, IMAGE_PRICING, IMAGE_MODEL_IDS, IMAGE_MODEL_SIZES, IMAGE_MODEL_ALIASES, VIDEO_PRICING, PHONE_PRICING;
+var paymentStore, BLOCKRUN_API, BLOCKRUN_SOLANA_API, DESKTOP_SERVICE_TOKEN_FILE, IMAGE_DIR, AUDIO_DIR, VIDEO_DIR, AUTO_MODEL, ROUTING_PROFILES, FREE_MODELS, gatewayModelIds, FREE_MODEL, FREE_UPSTREAM_OVERRIDES, MAX_MESSAGES, CONTEXT_LIMIT_KB, HEARTBEAT_INTERVAL_MS, BALANCE_CHECK_TIMEOUT_MS, GATEWAY_CATALOG_TIMEOUT_MS, DEFAULT_REQUEST_TIMEOUT_MS, PER_MODEL_TIMEOUT_MS, REASONING_MODEL_TIMEOUT_MS, REASONING_MODEL_IDS, MAX_FALLBACK_ATTEMPTS, HEALTH_CHECK_TIMEOUT_MS, RATE_LIMIT_COOLDOWN_MS, OVERLOAD_COOLDOWN_MS, PORT_RETRY_ATTEMPTS, PORT_RETRY_DELAY_MS, MODEL_BODY_READ_TIMEOUT_MS, ERROR_BODY_READ_TIMEOUT_MS, ClientDisconnectedError, rateLimitedModels, overloadedModels, perProviderErrors, BALANCE_CHECK_BUFFER, BALANCE_PREFLIGHT_OUTPUT_TOKEN_CAP, PROVIDER_ERROR_PATTERNS, DEGRADED_RESPONSE_PATTERNS, DEGRADED_LOOP_PATTERNS, VALID_ROLES, ROLE_MAPPINGS, VALID_TOOL_ID_PATTERN, KIMI_BLOCK_RE, KIMI_TOKEN_RE, THINKING_TAG_RE, THINKING_BLOCK_RE, BLOCKRUN_MODEL_BY_ID, IMAGE_PRICING, IMAGE_MODEL_IDS, IMAGE_MODEL_SIZES, IMAGE_MODEL_ALIASES, VIDEO_PRICING, PHONE_PRICING, LOW_CREDIT_USD, lowCreditWarned;
 var init_proxy = __esm({
   "src/proxy.ts"() {
     "use strict";
@@ -95125,6 +95456,7 @@ var init_proxy = __esm({
     init_api_key();
     init_spend_control();
     init_compression();
+    init_errors5();
     init_version4();
     init_session();
     init_updater();
@@ -95361,6 +95693,8 @@ var init_proxy = __esm({
       "phone/numbers/release": 0,
       "voice/call": 0.54
     };
+    LOW_CREDIT_USD = 1;
+    lowCreditWarned = false;
   }
 });
 
@@ -96401,13 +96735,13 @@ ${USAGE}`
 ${USAGE}`);
     }
     if (raw === "clear") return { kind: "limit", window: target, usd: void 0 };
-    const usd = Number(raw);
-    if (!USD.test(raw) || !Number.isFinite(usd) || usd <= 0) {
+    const usd2 = Number(raw);
+    if (!USD.test(raw) || !Number.isFinite(usd2) || usd2 <= 0) {
       return fail(
         `Rejected amount "${raw}": must be a positive decimal USD value such as 0.10 or 5`
       );
     }
-    return { kind: "limit", window: target, usd };
+    return { kind: "limit", window: target, usd: usd2 };
   }
   if (!isListAction(action)) return fail(`Unknown subcommand "${sub}"
 ${USAGE}`);
@@ -96552,6 +96886,194 @@ var init_policy = __esm({
   }
 });
 
+// src/reconcile.ts
+var reconcile_exports = {};
+__export(reconcile_exports, {
+  formatReconcile: () => formatReconcile,
+  joinRows: () => joinRows,
+  loadGatewayRows: () => loadGatewayRows,
+  loadLocalRows: () => loadLocalRows,
+  reconcile: () => reconcile
+});
+import { readFile as readFile3, readdir as readdir3 } from "fs/promises";
+import { join as join12 } from "path";
+import { homedir as homedir9 } from "os";
+async function loadLocalRows(since) {
+  let files;
+  try {
+    files = (await readdir3(LOG_DIR3)).filter((f) => f.endsWith(".jsonl"));
+  } catch {
+    return { rows: [], unkeyed: 0 };
+  }
+  const rows = [];
+  let unkeyed = 0;
+  for (const file of files) {
+    let text;
+    try {
+      text = await readFile3(join12(LOG_DIR3, file), "utf8");
+    } catch {
+      continue;
+    }
+    for (const line of text.split("\n")) {
+      if (!line.trim()) continue;
+      let entry;
+      try {
+        entry = JSON.parse(line);
+      } catch {
+        continue;
+      }
+      if (!entry.timestamp || new Date(entry.timestamp) < since) continue;
+      if (!entry.requestId) {
+        unkeyed++;
+        continue;
+      }
+      rows.push({
+        requestId: entry.requestId,
+        model: entry.model,
+        cost: typeof entry.cost === "number" ? entry.cost : 0,
+        timestamp: entry.timestamp
+      });
+    }
+  }
+  return { rows, unkeyed };
+}
+async function loadGatewayRows(apiKey, from15, maxPages = 40) {
+  const rows = [];
+  const unavailableDays = /* @__PURE__ */ new Set();
+  let cursor;
+  for (let page = 0; page < maxPages; page++) {
+    const result = await fetchUsagePage(apiKey, { from: from15, limit: 500, cursor });
+    if (!result) return page === 0 ? void 0 : { rows, unavailableDays: [...unavailableDays] };
+    rows.push(...result.rows);
+    result.unavailableDays.forEach((d) => unavailableDays.add(d));
+    if (!result.nextCursor) break;
+    cursor = result.nextCursor;
+  }
+  return { rows, unavailableDays: [...unavailableDays] };
+}
+function joinRows(localRows, gatewayRows, unkeyed = 0, unavailableDays = []) {
+  const localById = new Map(localRows.map((r2) => [r2.requestId, r2]));
+  const seen = /* @__PURE__ */ new Set();
+  const matched = [];
+  const chargedNotRecorded = [];
+  const pending = [];
+  let gatewayTotalUsd = 0;
+  for (const remote of gatewayRows) {
+    if (remote.costState === "pending") {
+      pending.push(remote);
+      continue;
+    }
+    gatewayTotalUsd += remote.costUsd ?? 0;
+    const local = localById.get(remote.requestId);
+    if (!local) {
+      chargedNotRecorded.push(remote);
+      continue;
+    }
+    seen.add(remote.requestId);
+    matched.push({ local, remote, deltaUsd: local.cost - (remote.costUsd ?? 0) });
+  }
+  const recordedNotCharged = localRows.filter((r2) => !seen.has(r2.requestId));
+  const localTotalUsd = localRows.reduce((sum, r2) => sum + r2.cost, 0);
+  return {
+    matched,
+    chargedNotRecorded,
+    recordedNotCharged,
+    pending,
+    localTotalUsd,
+    gatewayTotalUsd,
+    unavailableDays,
+    unkeyedLocalCount: unkeyed
+  };
+}
+async function reconcile(apiKey, days) {
+  const since = new Date(Date.now() - days * 24 * 60 * 60 * 1e3);
+  const [{ rows: localRows, unkeyed }, gateway] = await Promise.all([
+    loadLocalRows(since),
+    loadGatewayRows(apiKey, since.toISOString())
+  ]);
+  if (!gateway) throw new Error("Could not read the BlockRun usage ledger (GET /v1/usage).");
+  return joinRows(localRows, gateway.rows, unkeyed, gateway.unavailableDays);
+}
+function formatReconcile(r2, days) {
+  const out = [];
+  const mismatched = r2.matched.filter((m) => Math.abs(m.deltaUsd) > CENT_EPSILON);
+  out.push(`
+BlockRun reconciliation \u2014 last ${days} day${days === 1 ? "" : "s"}
+`);
+  out.push(
+    `  Gateway charged:  ${usd(r2.gatewayTotalUsd)}   (${r2.matched.length + r2.chargedNotRecorded.length} settled calls)`
+  );
+  out.push(`  Journal recorded: ${usd(r2.localTotalUsd)}`);
+  out.push(
+    `  Matched:          ${r2.matched.length}, of which ${mismatched.length} disagree on amount`
+  );
+  if (mismatched.length > 0) {
+    out.push(`
+  Amount mismatches (journal vs gateway):`);
+    for (const m of mismatched.slice(0, 10)) {
+      out.push(
+        `    ${m.remote.requestId.slice(0, 8)}  ${(m.local.model || m.remote.endpoint).padEnd(28)} journal ${usd(m.local.cost)}  gateway ${usd(m.remote.costUsd ?? 0)}`
+      );
+    }
+    if (mismatched.length > 10) out.push(`    \u2026and ${mismatched.length - 10} more`);
+  }
+  if (r2.chargedNotRecorded.length > 0) {
+    const total = r2.chargedNotRecorded.reduce((s3, x) => s3 + (x.costUsd ?? 0), 0);
+    out.push(
+      `
+  \u26A0 Charged but NOT in this machine's journal: ${r2.chargedNotRecorded.length} call(s), ${usd(total)}`
+    );
+    out.push(
+      `    Expected if the same key is used elsewhere \u2014 another machine, another BlockRun product,`
+    );
+    out.push(`    or a call made before this proxy started recording request ids.`);
+    for (const x of r2.chargedNotRecorded.slice(0, 10)) {
+      out.push(
+        `    ${x.requestId.slice(0, 8)}  ${x.timestamp.slice(0, 19)}  ${x.endpoint.padEnd(26)} ${usd(x.costUsd ?? 0)}`
+      );
+    }
+    if (r2.chargedNotRecorded.length > 10) {
+      out.push(`    \u2026and ${r2.chargedNotRecorded.length - 10} more`);
+    }
+  }
+  if (r2.recordedNotCharged.length > 0) {
+    out.push(
+      `
+  Recorded locally with no settled ledger row: ${r2.recordedNotCharged.length} call(s)`
+    );
+    out.push(`    Usually benign \u2014 free models, cache hits, and calls still pending pricing.`);
+  }
+  if (r2.pending.length > 0) {
+    out.push(`
+  Pending pricing (excluded from totals): ${r2.pending.length} call(s)`);
+    out.push(`    Usage recorded, charge not final. These can still be repriced.`);
+  }
+  if (r2.unkeyedLocalCount > 0) {
+    out.push(`
+  Journal entries with no request id: ${r2.unkeyedLocalCount} (not reconcilable)`);
+  }
+  if (r2.unavailableDays.length > 0) {
+    out.push(`
+  \u26A0 Gateway could not list these days: ${r2.unavailableDays.join(", ")}`);
+    out.push(`    Totals above are incomplete for that period.`);
+  }
+  out.push(`
+  Note: the top-up fee (5.5% + $0.30) is charged at purchase, not per call,`);
+  out.push(`  so the sum above is less than your card was charged by exactly those fees.
+`);
+  return out.join("\n");
+}
+var LOG_DIR3, CENT_EPSILON, usd;
+var init_reconcile = __esm({
+  "src/reconcile.ts"() {
+    "use strict";
+    init_api_key();
+    LOG_DIR3 = join12(homedir9(), ".openclaw", "blockrun", "logs");
+    CENT_EPSILON = 1e-9;
+    usd = (n) => Math.abs(n) < 0.01 ? `$${n.toFixed(6)}` : `$${n.toFixed(2)}`;
+  }
+});
+
 // src/provider.ts
 function setActiveProxy(proxy) {
   activeProxy = proxy;
@@ -112394,7 +112916,7 @@ var init_readBlob = __esm({
 
 // node_modules/axios/lib/helpers/formDataToStream.js
 import util2 from "util";
-import { Readable } from "stream";
+import { Readable as Readable2 } from "stream";
 var BOUNDARY_ALPHABET, textEncoder, CRLF, CRLF_BYTES, CRLF_BYTES_COUNT, FormDataPart, formDataToStream, formDataToStream_default;
 var init_formDataToStream = __esm({
   "node_modules/axios/lib/helpers/formDataToStream.js"() {
@@ -112474,7 +112996,7 @@ var init_formDataToStream = __esm({
         computedHeaders["Content-Length"] = contentLength;
       }
       headersHandler && headersHandler(computedHeaders);
-      return Readable.from(
+      return Readable2.from(
         (async function* () {
           for (const part of parts) {
             yield boundaryBytes;
@@ -117538,8 +118060,8 @@ var init_constants3 = __esm({
 
 // src/polymarket/wallet-adapter.ts
 import fs2 from "fs";
-import { homedir as homedir9 } from "os";
-import { join as join12 } from "path";
+import { homedir as homedir10 } from "os";
+import { join as join13 } from "path";
 function getOrCreateWalletKey() {
   const envKey = process.env.BLOCKRUN_WALLET_KEY?.trim();
   if (envKey && /^0x[0-9a-fA-F]{64}$/.test(envKey)) return envKey;
@@ -117587,7 +118109,7 @@ var init_wallet_adapter = __esm({
     init_esm();
     init_chains();
     init_constants3();
-    WALLET_FILE2 = join12(homedir9(), ".openclaw", "blockrun", "wallet.key");
+    WALLET_FILE2 = join13(homedir10(), ".openclaw", "blockrun", "wallet.key");
     BASE_RPC_URLS = [
       "https://mainnet.base.org",
       "https://base.llamarpc.com",
@@ -117991,8 +118513,8 @@ var init_client5 = __esm({
 function resolveSpendControl(deps) {
   return deps?.spendControl ?? getSharedSpendControl();
 }
-function usdToMicros(usd) {
-  return String(Math.ceil(usd * 1e6));
+function usdToMicros(usd2) {
+  return String(Math.ceil(usd2 * 1e6));
 }
 async function signUnderSpendPolicy(deps, quote, action, sign4) {
   const control = resolveSpendControl(deps);
@@ -118021,13 +118543,13 @@ function getSessionLedger() {
     perAgent: Object.fromEntries(ledger.perAgent)
   };
 }
-function reserveBet(usd, agentId) {
-  ledger.totalUsd += usd;
-  if (agentId) ledger.perAgent.set(agentId, (ledger.perAgent.get(agentId) ?? 0) + usd);
+function reserveBet(usd2, agentId) {
+  ledger.totalUsd += usd2;
+  if (agentId) ledger.perAgent.set(agentId, (ledger.perAgent.get(agentId) ?? 0) + usd2);
 }
-function releaseBet(usd, agentId) {
-  ledger.totalUsd -= usd;
-  if (agentId) ledger.perAgent.set(agentId, (ledger.perAgent.get(agentId) ?? 0) - usd);
+function releaseBet(usd2, agentId) {
+  ledger.totalUsd -= usd2;
+  if (agentId) ledger.perAgent.set(agentId, (ledger.perAgent.get(agentId) ?? 0) - usd2);
 }
 function commitBet() {
   ledger.count += 1;
@@ -227989,9 +228511,9 @@ import {
   unlinkSync
 } from "fs";
 import { readFile as readFileAsync } from "fs/promises";
-import { homedir as homedir14 } from "os";
+import { homedir as homedir15 } from "os";
 import { randomUUID } from "crypto";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 async function waitForProxyHealth(port, timeoutMs = 3e3) {
   const start = Date.now();
   while (Date.now() - start < timeoutMs) {
@@ -228033,8 +228555,8 @@ function isBlockrunWebSearchDisabled(config) {
   return cfg.tools?.web?.search?.enabled === false;
 }
 function injectModelsConfig(logger48, options = {}) {
-  const configDir = join17(homedir14(), ".openclaw");
-  const configPath = join17(configDir, "openclaw.json");
+  const configDir = join18(homedir15(), ".openclaw");
+  const configPath = join18(configDir, "openclaw.json");
   let config = {};
   let needsWrite = false;
   if (!existsSync4(configDir)) {
@@ -228255,7 +228777,7 @@ function injectModelsConfig(logger48, options = {}) {
 }
 function syncAgentModelCache(logger48, options = {}) {
   if (!isGatewayMode() && !options.forceWrite) return;
-  const agentsDir = join17(homedir14(), ".openclaw", "agents");
+  const agentsDir = join18(homedir15(), ".openclaw", "agents");
   if (!existsSync4(agentsDir)) return;
   let agentDirs;
   try {
@@ -228265,7 +228787,7 @@ function syncAgentModelCache(logger48, options = {}) {
   }
   const expectedIds = VISIBLE_OPENCLAW_MODELS.map((m) => m.id);
   for (const agent of agentDirs) {
-    const cachePath = join17(agentsDir, agent, "agent", "models.json");
+    const cachePath = join18(agentsDir, agent, "agent", "models.json");
     if (!existsSync4(cachePath)) continue;
     try {
       const raw = readTextFileSync(cachePath).trim();
@@ -228294,7 +228816,7 @@ function syncAgentModelCache(logger48, options = {}) {
   }
 }
 function injectAuthProfile(logger48) {
-  const agentsDir = join17(homedir14(), ".openclaw", "agents");
+  const agentsDir = join18(homedir15(), ".openclaw", "agents");
   if (!existsSync4(agentsDir)) {
     try {
       mkdirSync3(agentsDir, { recursive: true });
@@ -228311,9 +228833,9 @@ function injectAuthProfile(logger48) {
       agents = ["main", ...agents];
     }
     for (const agentId of agents) {
-      const authDir = join17(agentsDir, agentId, "agent");
-      const authPath = join17(authDir, "auth-profiles.json");
-      const sqlitePath = join17(authDir, "openclaw-agent.sqlite");
+      const authDir = join18(agentsDir, agentId, "agent");
+      const authPath = join18(authDir, "auth-profiles.json");
+      const sqlitePath = join18(authDir, "openclaw-agent.sqlite");
       if (existsSync4(sqlitePath)) {
         removeInjectedAuthPlaceholder(authPath, logger48, agentId);
         continue;
@@ -228461,12 +228983,12 @@ async function startProxyInBackground(api, startupGeneration) {
     proc.__clawrouterStartupPhase = "starting";
   }
   const pluginApiKey = api.pluginConfig?.apiKey;
-  const resolvedApiKey = typeof pluginApiKey === "string" && isValidApiKey(pluginApiKey) ? { key: pluginApiKey.trim(), source: "config" } : await resolveApiKey();
-  if (typeof pluginApiKey === "string" && !isValidApiKey(pluginApiKey)) {
-    api.logger.warn(
-      `pluginConfig.apiKey is set but invalid (expected brk_...) \u2014 ignoring it and looking elsewhere`
+  if (typeof pluginApiKey === "string" && pluginApiKey.trim() && !isValidApiKey(pluginApiKey)) {
+    throw new Error(
+      `pluginConfig.apiKey is set but is not a BlockRun key (expected brk_\u2026). Fix it or remove it \u2014 refusing to fall back to another credential.`
     );
   }
+  const resolvedApiKey = typeof pluginApiKey === "string" && isValidApiKey(pluginApiKey) ? { key: pluginApiKey.trim(), source: "config" } : await resolveApiKey();
   const apiKey = resolvedApiKey?.key;
   const configKey = api.pluginConfig?.walletKey;
   let wallet;
@@ -228816,7 +229338,7 @@ function buildImageGenerationProvider() {
         (result.data ?? []).map(async (img) => {
           const filename = img.url?.split("/images/").pop();
           if (!filename) throw new Error(`Unexpected image URL format: ${img.url}`);
-          const filePath = join17(IMAGE_DIR2, filename);
+          const filePath = join18(IMAGE_DIR2, filename);
           const buffer2 = await readFileAsync(filePath);
           const ext = filename.split(".").pop()?.toLowerCase() ?? "png";
           const mimeType = ext === "jpg" || ext === "jpeg" ? "image/jpeg" : ext === "webp" ? "image/webp" : "image/png";
@@ -228868,7 +229390,7 @@ function buildMusicGenerationProvider() {
         (result.data ?? []).map(async (track) => {
           const filename = track.url?.split("/audio/").pop();
           if (!filename) throw new Error(`Unexpected audio URL format: ${track.url}`);
-          const filePath = join17(AUDIO_DIR2, filename);
+          const filePath = join18(AUDIO_DIR2, filename);
           const buffer2 = await readFileAsync(filePath);
           const ext = filename.split(".").pop()?.toLowerCase() ?? "mp3";
           const mimeType = ext === "wav" ? "audio/wav" : "audio/mpeg";
@@ -228944,7 +229466,7 @@ function buildVideoGenerationProvider() {
         (result.data ?? []).map(async (clip) => {
           const filename = clip.url?.split("/videos/").pop();
           if (!filename) throw new Error(`Unexpected video URL format: ${clip.url}`);
-          const filePath = join17(VIDEO_DIR2, filename);
+          const filePath = join18(VIDEO_DIR2, filename);
           const buffer2 = await readFileAsync(filePath);
           const ext = filename.split(".").pop()?.toLowerCase() ?? "mp4";
           const mimeType = ext === "webm" ? "video/webm" : ext === "mov" ? "video/quicktime" : "video/mp4";
@@ -229309,9 +229831,9 @@ var init_index = __esm({
     init_partners();
     activeProxyHandle = null;
     pendingConfiguredStartupApi = null;
-    IMAGE_DIR2 = join17(homedir14(), ".openclaw", "blockrun", "images");
-    AUDIO_DIR2 = join17(homedir14(), ".openclaw", "blockrun", "audio");
-    VIDEO_DIR2 = join17(homedir14(), ".openclaw", "blockrun", "videos");
+    IMAGE_DIR2 = join18(homedir15(), ".openclaw", "blockrun", "images");
+    AUDIO_DIR2 = join18(homedir15(), ".openclaw", "blockrun", "audio");
+    VIDEO_DIR2 = join18(homedir15(), ".openclaw", "blockrun", "videos");
     plugin = {
       // NOT "clawrouter". OpenClaw bundles its own plugin under that id since the
       // 2026.7.1 line (vendored at dist/extensions/clawrouter, provider `clawrouter/*`,
@@ -229653,7 +230175,18 @@ ${errText}`
         if (!isGatewayMode()) {
           if (shouldLogRegistration) {
             void (async () => {
-              const keyResolution = await resolveApiKey().catch(() => void 0);
+              let keyResolution;
+              try {
+                keyResolution = await resolveApiKey();
+              } catch (error) {
+                api.logger.error(
+                  `BlockRun API key is configured but unusable: ${error instanceof Error ? error.message : String(error)}`
+                );
+                api.logger.error(
+                  `Not falling back to a wallet \u2014 fix the key, or run "clawrouter logout" to pay from the wallet deliberately.`
+                );
+                return;
+              }
               if (keyResolution) {
                 api.logger.info(
                   `Using BlockRun API key ${maskApiKey(keyResolution.key)} (from ${keyResolution.source}) \u2014 billing account credit, no wallet`
@@ -229736,7 +230269,7 @@ ${errText}`
         }
         resetProxyStartupState();
         try {
-          const configPath = join17(homedir14(), ".openclaw", "openclaw.json");
+          const configPath = join18(homedir15(), ".openclaw", "openclaw.json");
           if (existsSync4(configPath)) {
             const config = JSON.parse(readTextFileSync(configPath));
             if (config.models?.providers?.blockrun) {
@@ -229778,11 +230311,11 @@ ${errText}`
           api.logger.warn(`Config cleanup failed: ${err instanceof Error ? err.message : String(err)}`);
         }
         try {
-          const agentsDir = join17(homedir14(), ".openclaw", "agents");
+          const agentsDir = join18(homedir15(), ".openclaw", "agents");
           if (existsSync4(agentsDir)) {
             for (const entry of readdirSync(agentsDir, { withFileTypes: true })) {
               if (!entry.isDirectory()) continue;
-              const authPath = join17(agentsDir, entry.name, "agent", "auth-profiles.json");
+              const authPath = join18(agentsDir, entry.name, "agent", "auth-profiles.json");
               if (!existsSync4(authPath)) continue;
               try {
                 const store = JSON.parse(readTextFileSync(authPath));
@@ -230598,6 +231131,27 @@ Use: clawrouter share <id> --as=<feishu|slack|discord|telegram|whatsapp|plain>
     process.exit(1);
   }
 }
+async function cmdReconcile(days) {
+  const resolved = await resolveApiKey().catch((error) => {
+    console.error(`\u2717 ${error instanceof Error ? error.message : String(error)}`);
+    process.exit(1);
+  });
+  if (!resolved) {
+    console.error(`\u2717 Reconciliation needs a BlockRun API key \u2014 it compares against your account`);
+    console.error(`  ledger. Wallet spend settles on-chain instead; see "clawrouter stats".`);
+    console.error(`  Sign in at ${PORTAL_URL} and run: clawrouter login brk_live_...`);
+    process.exit(1);
+  }
+  try {
+    const { reconcile: reconcile2, formatReconcile: formatReconcile2 } = await Promise.resolve().then(() => (init_reconcile(), reconcile_exports));
+    const result = await reconcile2(resolved.key, days);
+    console.log(formatReconcile2(result, days));
+    process.exitCode = result.chargedNotRecorded.length > 0 ? 2 : 0;
+  } catch (error) {
+    console.error(`\u2717 ${error instanceof Error ? error.message : String(error)}`);
+    process.exit(1);
+  }
+}
 async function cmdStatus(port) {
   try {
     const data = await queryProxy("/health?full=true", port);
@@ -230609,6 +231163,12 @@ ClawRouter Status (port ${port})
       console.log(`  Auth:          BlockRun API key ${data.apiKey}`);
       console.log(`  Gateway:       ${data.gateway}`);
       console.log(`  Billing:       account credit \u2014 top up at ${PORTAL_CREDITS_URL}`);
+      if (data.creditSummary) console.log(`  Credit:        ${data.creditSummary}`);
+      if (data.blocked) {
+        console.log(`  \u26A0 Account is blocked${data.blockedReason ? `: ${data.blockedReason}` : ""}`);
+      } else if (data.isEmpty) {
+        console.log(`  \u26A0 Credit exhausted \u2014 top up at ${PORTAL_CREDITS_URL}`);
+      }
     } else {
       console.log(`  Auth:          wallet (x402)`);
       console.log(`  Payment Chain: ${data.paymentChain}`);
@@ -230636,6 +231196,7 @@ ClawRouter Account
       console.log(`  Auth:    BlockRun API key ${data.apiKey}`);
       console.log(`  Gateway: ${data.gateway}`);
       console.log(`  Billing: account credit (no wallet, no chain)`);
+      if (data.creditSummary) console.log(`  Credit:  ${data.creditSummary}`);
       console.log(`  Top up:  ${PORTAL_CREDITS_URL}`);
       console.log(`  Usage:   ${PORTAL_URL}/dashboard`);
       console.log();
@@ -230868,8 +231429,8 @@ async function cmdSetup() {
     unlinkSync: unlinkSync2,
     writeFileSync: writeFileSync4
   } = await import("fs");
-  const { dirname: dirname4, join: join18 } = await import("path");
-  const { homedir: homedir15 } = await import("os");
+  const { dirname: dirname4, join: join19 } = await import("path");
+  const { homedir: homedir16 } = await import("os");
   const { injectModelsConfig: injectModelsConfig2, injectAuthProfile: injectAuthProfile2, syncAgentModelCache: syncAgentModelCache2, VISIBLE_OPENCLAW_MODELS: VISIBLE_OPENCLAW_MODELS2 } = await Promise.resolve().then(() => (init_index(), index_exports));
   const { BLOCKRUN_PLUGIN_ID: BLOCKRUN_PLUGIN_ID2, prepareBlockRunPluginConfig: prepareBlockRunPluginConfig2 } = await Promise.resolve().then(() => (init_openclaw_plugin_config(), openclaw_plugin_config_exports));
   console.log("\u{1F99E} ClawRouter setup\n");
@@ -230884,19 +231445,19 @@ async function cmdSetup() {
     } catch {
     }
     if (process.env.npm_config_prefix) {
-      candidates.push(join18(process.env.npm_config_prefix, "bin", "openclaw"));
+      candidates.push(join19(process.env.npm_config_prefix, "bin", "openclaw"));
     }
     try {
       const npmRoot = execSync("npm root -g", {
         encoding: "utf8",
         stdio: ["ignore", "pipe", "ignore"]
       }).trim();
-      if (npmRoot) candidates.push(join18(dirname4(dirname4(npmRoot)), "bin", "openclaw"));
+      if (npmRoot) candidates.push(join19(dirname4(dirname4(npmRoot)), "bin", "openclaw"));
     } catch {
     }
     candidates.push(
-      join18(homedir15(), ".npm-global", "bin", "openclaw"),
-      join18(homedir15(), ".local", "bin", "openclaw"),
+      join19(homedir16(), ".npm-global", "bin", "openclaw"),
+      join19(homedir16(), ".local", "bin", "openclaw"),
       "/usr/local/bin/openclaw"
     );
     return candidates.find((candidate) => existsSync5(candidate)) ?? "";
@@ -230908,7 +231469,7 @@ async function cmdSetup() {
     process.exit(1);
   }
   console.log(`  \u2713 Found openclaw at ${openclawPath}`);
-  const configPath = join18(homedir15(), ".openclaw", "openclaw.json");
+  const configPath = join19(homedir16(), ".openclaw", "openclaw.json");
   const configInitiallyExisted = existsSync5(configPath);
   const configRollbackBackup = configInitiallyExisted ? `${configPath}.before-${BLOCKRUN_PLUGIN_ID2}.${Date.now()}` : void 0;
   if (configRollbackBackup) copyFileSync2(configPath, configRollbackBackup);
@@ -230916,23 +231477,23 @@ async function cmdSetup() {
     return configRollbackBackup;
   };
   let installAttempted = false;
-  const openclawRoot = join18(homedir15(), ".openclaw");
+  const openclawRoot = join19(homedir16(), ".openclaw");
   const findManagedBlockRunInstalls = () => {
     const candidates = [
-      join18(openclawRoot, "extensions", BLOCKRUN_PLUGIN_ID2),
-      join18(openclawRoot, "extensions", "clawrouter"),
-      join18(openclawRoot, "npm", "node_modules", "@blockrun", "clawrouter")
+      join19(openclawRoot, "extensions", BLOCKRUN_PLUGIN_ID2),
+      join19(openclawRoot, "extensions", "clawrouter"),
+      join19(openclawRoot, "npm", "node_modules", "@blockrun", "clawrouter")
     ];
-    const projectsDir = join18(openclawRoot, "npm", "projects");
+    const projectsDir = join19(openclawRoot, "npm", "projects");
     try {
       for (const project of readdirSync2(projectsDir)) {
-        candidates.push(join18(projectsDir, project, "node_modules", "@blockrun", "clawrouter"));
+        candidates.push(join19(projectsDir, project, "node_modules", "@blockrun", "clawrouter"));
       }
     } catch {
     }
     return [...new Set(candidates)].filter((candidate) => {
       try {
-        const metadata = JSON.parse(readFileSync4(join18(candidate, "package.json"), "utf8"));
+        const metadata = JSON.parse(readFileSync4(join19(candidate, "package.json"), "utf8"));
         return metadata.name === "@blockrun/clawrouter";
       } catch {
         return false;
@@ -230940,7 +231501,7 @@ async function cmdSetup() {
     });
   };
   const initialPluginDirs = findManagedBlockRunInstalls();
-  const setupRollbackRoot = join18(
+  const setupRollbackRoot = join19(
     openclawRoot,
     "blockrun",
     "setup-rollbacks",
@@ -230950,7 +231511,7 @@ async function cmdSetup() {
   if (initialPluginDirs.length > 0) {
     mkdirSync4(setupRollbackRoot, { recursive: true, mode: 448 });
     for (const [index2, pluginDir] of initialPluginDirs.entries()) {
-      const backup = join18(setupRollbackRoot, String(index2));
+      const backup = join19(setupRollbackRoot, String(index2));
       cpSync(pluginDir, backup, { recursive: true });
       pluginRollbackBackups.set(pluginDir, backup);
     }
@@ -230995,8 +231556,8 @@ async function cmdSetup() {
   if (existsSync5(configPath)) {
     try {
       const config = JSON.parse(readFileSync4(configPath, "utf8"));
-      const legacyPackagePath = join18(
-        homedir15(),
+      const legacyPackagePath = join19(
+        homedir16(),
         ".openclaw",
         "extensions",
         "clawrouter",
@@ -231167,6 +231728,8 @@ function parseArgs(args) {
     queryModels: false,
     queryStats: false,
     queryStatsDays: 7,
+    reconcile: false,
+    reconcileDays: 7,
     queryCache: false,
     setup: false,
     share: false,
@@ -231201,6 +231764,12 @@ function parseArgs(args) {
         result.queryStatsDays = Math.min(parseInt(args[i + 2], 10) || 7, 30);
         i += 2;
       }
+    } else if (arg === "reconcile") {
+      result.reconcile = true;
+      if (args[i + 1] === "--days" && args[i + 2]) {
+        result.reconcileDays = Math.min(parseInt(args[i + 2], 10) || 7, 90);
+        i += 2;
+      }
     } else if (arg === "cache") {
       result.queryCache = true;
     } else if (arg === "doctor" || arg === "--doctor") {
@@ -231426,6 +231995,10 @@ async function main() {
     await cmdStats(queryPort, args.queryStatsDays);
     process.exit(0);
   }
+  if (args.reconcile) {
+    await cmdReconcile(args.reconcileDays);
+    process.exit(0);
+  }
   if (args.queryCache) {
     await cmdCache(queryPort);
     process.exit(0);