@blockrun/clawrouter 0.12.265 → 0.12.267

package/dist/cli.js

@@ -5786,15 +5786,15 @@ function wNAF(c, bits) {
       const { windows, windowSize } = calcWOpts(W, bits);
       const points = [];
       let p = elm;
-      let base3 = p;
+      let base4 = p;
       for (let window2 = 0; window2 < windows; window2++) {
-        base3 = p;
-        points.push(base3);
+        base4 = p;
+        points.push(base4);
         for (let i = 1; i < windowSize; i++) {
-          base3 = base3.add(p);
-          points.push(base3);
+          base4 = base4.add(p);
+          points.push(base4);
         }
-        p = base3.double();
+        p = base4.double();
       }
       return points;
     },
@@ -8432,7 +8432,7 @@ async function internal_estimateFeesPerGas(client, args) {
     throw new BaseFeeScalarError();
   const decimals = baseFeeMultiplier.toString().split(".")[1]?.length ?? 0;
   const denominator = 10 ** decimals;
-  const multiply = (base3) => base3 * BigInt(Math.round(baseFeeMultiplier * denominator)) / BigInt(denominator);
+  const multiply = (base4) => base4 * BigInt(Math.round(baseFeeMultiplier * denominator)) / BigInt(denominator);
   const block = block_ ? block_ : await getAction(client, getBlock, "getBlock")({});
   if (typeof chain3?.fees?.estimateFeesPerGas === "function") {
     const fees = await chain3.fees.estimateFeesPerGas({
@@ -8903,7 +8903,7 @@ async function fillTransaction(client, parameters) {
       throw new BaseFeeScalarError();
     const decimals = feeMultiplier.toString().split(".")[1]?.length ?? 0;
     const denominator = 10 ** decimals;
-    const multiplyFee = (base3) => base3 * BigInt(Math.round(feeMultiplier * denominator)) / BigInt(denominator);
+    const multiplyFee = (base4) => base4 * BigInt(Math.round(feeMultiplier * denominator)) / BigInt(denominator);
     if (!transaction.feePayerSignature) {
       if (transaction.maxFeePerGas && !parameters.maxFeePerGas)
         transaction.maxFeePerGas = multiplyFee(transaction.maxFeePerGas);
@@ -11861,17 +11861,17 @@ async function call(client, args) {
       }
     }
     const params = (() => {
-      const base3 = [
+      const base4 = [
         request2,
         block
       ];
       if (rpcStateOverride && rpcBlockOverrides)
-        return [...base3, rpcStateOverride, rpcBlockOverrides];
+        return [...base4, rpcStateOverride, rpcBlockOverrides];
       if (rpcStateOverride)
-        return [...base3, rpcStateOverride];
+        return [...base4, rpcStateOverride];
       if (rpcBlockOverrides)
-        return [...base3, {}, rpcBlockOverrides];
-      return base3;
+        return [...base4, {}, rpcBlockOverrides];
+      return base4;
     })();
     const response = await client.request({
       method: "eth_call",
@@ -13277,14 +13277,14 @@ function createClient(parameters) {
     uid: uid(),
     ...experimental_blockTag ? { experimental_blockTag } : {}
   };
-  function extend2(base3) {
+  function extend2(base4) {
     return (extendFn) => {
-      const extended = extendFn(base3);
+      const extended = extendFn(base4);
       for (const key3 in client)
         delete extended[key3];
-      const combined = { ...base3, ...extended };
+      const combined = { ...base4, ...extended };
       for (const key3 in extended) {
-        const a = base3[key3];
+        const a = base4[key3];
         const b = extended[key3];
         if (isPlainObject(a) && isPlainObject(b))
           combined[key3] = { ...a, ...b };
@@ -15037,10 +15037,10 @@ function defineChain(chain3) {
     serializers: void 0,
     ...chain3
   };
-  function extend2(base3) {
+  function extend2(base4) {
     return (fnOrExtended) => {
-      const properties = typeof fnOrExtended === "function" ? fnOrExtended(base3) : fnOrExtended;
-      const combined = { ...base3, ...properties };
+      const properties = typeof fnOrExtended === "function" ? fnOrExtended(base4) : fnOrExtended;
+      const combined = { ...base4, ...properties };
       return Object.assign(combined, { extend: extend2(combined) });
     };
   }
@@ -15404,9 +15404,9 @@ function validateTypedData(parameters) {
         throw new InvalidTypedDataTypeError({ type });
       const integerMatch = type.match(integerRegex2);
       if (integerMatch && (typeof value === "number" || typeof value === "bigint")) {
-        const [_type, base3, size_] = integerMatch;
+        const [_type, base4, size_] = integerMatch;
         numberToHex(value, {
-          signed: base3 === "int",
+          signed: base4 === "int",
           size: Number.parseInt(size_, 10) / 8
         });
       }
@@ -18035,15 +18035,15 @@ function wNAF2(c, bits) {
       const { windows, windowSize } = calcWOpts2(W, bits);
       const points = [];
       let p = elm;
-      let base3 = p;
+      let base4 = p;
       for (let window2 = 0; window2 < windows; window2++) {
-        base3 = p;
-        points.push(base3);
+        base4 = p;
+        points.push(base4);
         for (let i = 1; i < windowSize; i++) {
-          base3 = base3.add(p);
-          points.push(base3);
+          base4 = base4.add(p);
+          points.push(base4);
         }
-        p = base3.double();
+        p = base4.double();
       }
       return points;
     },
@@ -30627,23 +30627,23 @@ var init_types = __esm({
         }
         if (effect.type === "transform") {
           if (ctx.common.async === false) {
-            const base3 = this._def.schema._parseSync({
+            const base4 = this._def.schema._parseSync({
               data: ctx.data,
               path: ctx.path,
               parent: ctx
             });
-            if (!isValid(base3))
+            if (!isValid(base4))
               return INVALID;
-            const result = effect.transform(base3.value, checkCtx);
+            const result = effect.transform(base4.value, checkCtx);
             if (result instanceof Promise) {
               throw new Error(`Asynchronous transform encountered during synchronous parse operation. Use .parseAsync instead.`);
             }
             return { status: status.value, value: result };
           } else {
-            return this._def.schema._parseAsync({ data: ctx.data, path: ctx.path, parent: ctx }).then((base3) => {
-              if (!isValid(base3))
+            return this._def.schema._parseAsync({ data: ctx.data, path: ctx.path, parent: ctx }).then((base4) => {
+              if (!isValid(base4))
                 return INVALID;
-              return Promise.resolve(effect.transform(base3.value, checkCtx)).then((result) => ({
+              return Promise.resolve(effect.transform(base4.value, checkCtx)).then((result) => ({
                 status: status.value,
                 value: result
               }));
@@ -32305,6 +32305,11 @@ function cloneLimits(limits) {
   }
   return clone;
 }
+function canonicalLimits(limits) {
+  return JSON.stringify(
+    Object.fromEntries(Object.entries(limits).sort(([a], [b]) => a < b ? -1 : 1))
+  );
+}
 function parseQuotedAmountUsd(selected) {
   const raw = selected.amount ?? selected.maxAmountRequired;
   if (typeof raw !== "string" || !CANONICAL_AMOUNT.test(raw)) {
@@ -32380,7 +32385,7 @@ function formatDuration(seconds) {
     return mins > 0 ? `${hours}h ${mins}m` : `${hours}h`;
   }
 }
-var WALLET_DIR, HOUR_MS, DAY_MS, CAIP2_BASE, CAIP2_SOLANA_MAINNET, POLICY_LISTS, ADDRESS_LISTS, EVM_ADDRESS, MalformedSpendPolicyError, FileSpendControlStorage, InMemorySpendControlStorage, RESERVATION_TTL_MS, SpendControl, SpendPolicyError, CANONICAL_AMOUNT;
+var WALLET_DIR, HOUR_MS, DAY_MS, CAIP2_BASE, CAIP2_SOLANA_MAINNET, PAYABLE_NETWORKS, POLICY_LISTS, ADDRESS_LISTS, EVM_ADDRESS, MalformedSpendPolicyError, SpendPolicyConflictError, FileSpendControlStorage, InMemorySpendControlStorage, RESERVATION_TTL_MS, SpendControl, SpendPolicyError, CANONICAL_AMOUNT;
 var init_spend_control = __esm({
   "src/spend-control.ts"() {
     "use strict";
@@ -32390,6 +32395,7 @@ var init_spend_control = __esm({
     DAY_MS = 24 * HOUR_MS;
     CAIP2_BASE = "eip155:8453";
     CAIP2_SOLANA_MAINNET = "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d";
+    PAYABLE_NETWORKS = [CAIP2_BASE, CAIP2_SOLANA_MAINNET];
     POLICY_LISTS = [
       "allowedPayees",
       "blockedPayees",
@@ -32406,6 +32412,12 @@ var init_spend_control = __esm({
         this.name = "MalformedSpendPolicyError";
       }
     };
+    SpendPolicyConflictError = class extends Error {
+      constructor() {
+        super("spending.json limits changed underneath this write; nothing was written");
+        this.name = "SpendPolicyConflictError";
+      }
+    };
     FileSpendControlStorage = class {
       spendingFile;
       constructor() {
@@ -32486,6 +32498,25 @@ var init_spend_control = __esm({
         }
         this.save({ limits: storedLimits, history });
       }
+      /**
+       * Persist limits while leaving the stored history exactly as it is on disk.
+       * With `expect`, refuse when the stored limits are no longer the ones the
+       * writer read — a stale instance must not replace another writer's edit.
+       * The re-read happens immediately before the atomic rename, so the race
+       * window is the write itself, not the whole command.
+       */
+      saveLimits(limits, expect) {
+        let current;
+        try {
+          current = this.load();
+        } catch {
+          return;
+        }
+        if (expect !== void 0 && canonicalLimits(current?.limits ?? {}) !== canonicalLimits(expect)) {
+          throw new SpendPolicyConflictError();
+        }
+        this.save({ limits, history: current?.history ?? [] });
+      }
     };
     InMemorySpendControlStorage = class {
       data = null;
@@ -32501,6 +32532,15 @@ var init_spend_control = __esm({
           history: data.history.map((r2) => ({ ...r2 }))
         };
       }
+      saveLimits(limits, expect) {
+        if (expect !== void 0 && canonicalLimits(this.data?.limits ?? {}) !== canonicalLimits(expect)) {
+          throw new SpendPolicyConflictError();
+        }
+        this.data = {
+          limits: cloneLimits(limits),
+          history: this.data?.history.map((r2) => ({ ...r2 })) ?? []
+        };
+      }
     };
     RESERVATION_TTL_MS = 2 * 60 * 1e3;
     SpendControl = class {
@@ -32512,6 +32552,8 @@ var init_spend_control = __esm({
       reservationSeq = 0;
       /** Limits we loaded and have not changed; history-only saves must not clobber operator edits. */
       limitsDirty = false;
+      /** The limits this instance last read from or wrote to storage — the compare-and-swap baseline. */
+      diskLimits = {};
       /** Set when spending.json held an unusable policy list: refuse every payment. */
       policyFileBroken;
       storage;
@@ -32556,6 +32598,15 @@ var init_spend_control = __esm({
       getLimits() {
         return cloneLimits(this.limits);
       }
+      /**
+       * Why spending.json could not be loaded, or undefined when it is usable.
+       * While set, every setter mutates memory only: save() refuses to rewrite a
+       * file it could not fully parse, so callers must check this before
+       * reporting a change as applied.
+       */
+      getPolicyFileError() {
+        return this.policyFileBroken;
+      }
       check(estimatedCost2, counterparty) {
         if (this.policyFileBroken !== void 0) {
           return {
@@ -32816,6 +32867,22 @@ var init_spend_control = __esm({
           this.storage.saveHistory([...this.history]);
           return;
         }
+        if (this.limitsDirty && this.storage.saveLimits) {
+          try {
+            this.storage.saveLimits(cloneLimits(this.limits), cloneLimits(this.diskLimits));
+          } catch (err) {
+            if (err instanceof SpendPolicyConflictError) {
+              const current = this.storage.load();
+              this.limits = cloneLimits(current?.limits ?? {});
+              this.diskLimits = cloneLimits(this.limits);
+              this.limitsDirty = false;
+            }
+            throw err;
+          }
+          this.diskLimits = cloneLimits(this.limits);
+          this.limitsDirty = false;
+          return;
+        }
         this.storage.save({
           limits: cloneLimits(this.limits),
           history: [...this.history]
@@ -32836,6 +32903,7 @@ var init_spend_control = __esm({
         }
         if (data) {
           this.limits = cloneLimits(data.limits);
+          this.diskLimits = cloneLimits(data.limits);
           this.history = data.history;
           this.cleanup();
         }
@@ -32887,6 +32955,7 @@ function createPayFetchWithPreAuth(baseFetch, client, ttlMs = DEFAULT_TTL_MS, op
     const cached = !options?.skipPreAuth ? cache2.get(cacheKey2) : void 0;
     const preAuthCovers = cached !== void 0 && Date.now() - cached.cachedAt < ttlMs && cached.coverMicros !== void 0 && needMicros !== void 0 && needMicros <= cached.coverMicros;
     if (preAuthCovers) {
+      let paymentInFlight = false;
       try {
         const payload2 = await client.createPaymentPayload(cached.paymentRequired);
         const headers = httpClient.encodePaymentSignatureHeader(payload2);
@@ -32894,16 +32963,21 @@ function createPayFetchWithPreAuth(baseFetch, client, ttlMs = DEFAULT_TTL_MS, op
         for (const [key2, value] of Object.entries(headers)) {
           preAuthRequest.headers.set(key2, value);
         }
+        paymentInFlight = true;
         const response2 = await baseFetch(preAuthRequest);
         if (response2.status !== 402) {
           return response2;
         }
+        paymentInFlight = false;
         cache2.delete(cacheKey2);
       } catch (err) {
         cache2.delete(cacheKey2);
         if (err instanceof SpendPolicyError) {
           throw err;
         }
+        if (paymentInFlight) {
+          throw err;
+        }
       }
     }
     const clonedRequest = request2.clone();
@@ -34488,12 +34562,12 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
   const id2 = modelId.toLowerCase();
   const modelName = id2.slice(id2.indexOf("/") + 1);
   const match = (values, score) => values.some((value) => modelName === value) ? score : 0;
-  const base3 = 0.68;
+  const base4 = 0.68;
   switch (task) {
     case "code_agent":
       if (terminalToolSignal && agentRisk === "complex_high") {
         return Math.max(
-          base3,
+          base4,
           match(["claude-sonnet-5"], 1),
           match(["gpt-5.3-codex"], 0.87),
           match(["gpt-5-mini"], 0.78),
@@ -34501,7 +34575,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
         );
       }
       return Math.max(
-        base3,
+        base4,
         match(["gpt-5.3-codex"], 1),
         match(["claude-sonnet-5"], 0.98),
         match(["gpt-5-mini"], 0.96),
@@ -34512,7 +34586,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
     case "tool_agent":
       if (terminalToolSignal && agentRisk === "complex_high") {
         return Math.max(
-          base3,
+          base4,
           match(["claude-sonnet-5"], 1),
           match(["gpt-5.3-codex"], 0.87),
           match(["gpt-5-mini"], 0.78),
@@ -34521,7 +34595,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
       }
       if (terminalToolSignal && !terminalSafetySensitive) {
         return Math.max(
-          base3,
+          base4,
           match(["gpt-5-mini"], 1),
           match(["gpt-5.3-codex"], 0.98),
           match(["claude-sonnet-5"], 0.9),
@@ -34530,7 +34604,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
       }
       if (terminalToolSignal && terminalSafetySensitive) {
         return Math.max(
-          base3,
+          base4,
           match(["claude-sonnet-5"], 1),
           match(["claude-opus-4.8"], 0.9),
           match(["gpt-5.3-codex"], 0.84)
@@ -34538,14 +34612,14 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
       }
       if (agentDomain === "web_research") {
         return deepWebResearch ? Math.max(
-          base3,
+          base4,
           match(["claude-sonnet-5"], 1),
           match(["gpt-5-mini"], 0.88),
           match(["gemini-3.5-flash"], 0.84),
           match(["claude-opus-5"], 0.8),
           match(["claude-opus-4.8"], 0.78)
         ) : Math.max(
-          base3,
+          base4,
           match(["claude-sonnet-5"], 1),
           match(["gpt-5-mini"], 0.88),
           match(["gemini-3.5-flash"], 0.86),
@@ -34556,7 +34630,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
       if (agentDomain === "retail") {
         if (agentRisk === "standard") {
           return Math.max(
-            base3,
+            base4,
             match(["gpt-5-mini"], 1),
             match(["claude-sonnet-5"], 0.88),
             match(["gemini-3.5-flash"], 0.82),
@@ -34567,7 +34641,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
         }
         if (agentRisk === "policy_exception") {
           return Math.max(
-            base3,
+            base4,
             match(["gpt-4.1"], 1),
             match(["claude-sonnet-5"], 0.9),
             match(["deepseek-v4-pro"], 0.82),
@@ -34577,7 +34651,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
         }
         if (agentRisk === "policy_exception_simple") {
           return Math.max(
-            base3,
+            base4,
             match(["gpt-5-mini"], 1),
             match(["gpt-4.1"], 0.86),
             match(["deepseek-v4-pro"], 0.82),
@@ -34585,7 +34659,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
           );
         }
         return Math.max(
-          base3,
+          base4,
           match(["deepseek-v4-pro"], 1),
           match(["claude-sonnet-5"], 0.88),
           match(["gemini-3.5-flash"], 0.82),
@@ -34597,7 +34671,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
       if (agentDomain === "airline") {
         if (agentRisk === "complex_high") {
           return Math.max(
-            base3,
+            base4,
             match(["claude-sonnet-5"], 1),
             match(["gpt-5-mini"], 0.78),
             match(["gemini-3.5-flash"], 0.76),
@@ -34605,7 +34679,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
           );
         }
         return Math.max(
-          base3,
+          base4,
           match(["gpt-5-mini"], 1),
           match(["claude-sonnet-5"], 0.9),
           match(["gemini-3.5-flash"], 0.8),
@@ -34613,7 +34687,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
         );
       }
       return Math.max(
-        base3,
+        base4,
         match(["claude-sonnet-5"], 1),
         match(["gemini-3.5-flash"], 0.88),
         match(["gpt-5.3-codex"], 0.87),
@@ -34624,12 +34698,12 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
     case "tool_agent_parallel":
       if (terminalToolSignal) {
         return terminalSafetySensitive ? Math.max(
-          base3,
+          base4,
           match(["claude-sonnet-5"], 1),
           match(["claude-opus-4.8"], 0.9),
           match(["gpt-5.3-codex"], 0.86)
         ) : Math.max(
-          base3,
+          base4,
           match(["gpt-5-mini"], 1),
           match(["gpt-5.3-codex"], 0.98),
           match(["claude-sonnet-5"], 0.92),
@@ -34638,14 +34712,14 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
       }
       if (agentDomain === "web_research") {
         return deepWebResearch ? Math.max(
-          base3,
+          base4,
           match(["claude-sonnet-5"], 1),
           match(["gpt-5-mini"], 0.88),
           match(["gemini-3.5-flash"], 0.84),
           match(["claude-opus-5"], 0.8),
           match(["claude-opus-4.8"], 0.78)
         ) : Math.max(
-          base3,
+          base4,
           match(["claude-sonnet-5"], 1),
           match(["gpt-5-mini"], 0.88),
           match(["gemini-3.5-flash"], 0.86),
@@ -34656,7 +34730,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
       if (agentDomain === "retail") {
         if (agentRisk === "policy_exception") {
           return Math.max(
-            base3,
+            base4,
             match(["gpt-4.1"], 1),
             match(["claude-sonnet-5"], 0.9),
             match(["deepseek-v4-pro"], 0.82),
@@ -34666,7 +34740,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
         }
         if (agentRisk === "policy_exception_simple") {
           return Math.max(
-            base3,
+            base4,
             match(["gpt-5-mini"], 1),
             match(["gpt-4.1"], 0.86),
             match(["deepseek-v4-pro"], 0.82),
@@ -34674,7 +34748,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
           );
         }
         return Math.max(
-          base3,
+          base4,
           match(["deepseek-v4-pro"], 1),
           match(["claude-sonnet-5"], 0.88),
           match(["claude-opus-4.8"], 0.84),
@@ -34684,20 +34758,20 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
       }
       if (agentDomain === "airline") {
         return agentRisk === "complex_high" ? Math.max(
-          base3,
+          base4,
           match(["claude-sonnet-5"], 1),
           match(["gpt-5-mini"], 0.78),
           match(["claude-opus-4.8"], 0.76),
           match(["gemini-3.5-flash"], 0.74)
         ) : Math.max(
-          base3,
+          base4,
           match(["gpt-5-mini"], 1),
           match(["claude-sonnet-5"], 0.9),
           match(["gemini-3.5-flash"], 0.8)
         );
       }
       return Math.max(
-        base3,
+        base4,
         match(["claude-opus-4.8"], 1),
         match(["claude-sonnet-5"], 0.84),
         match(["grok-4.5"], 0.82),
@@ -34707,7 +34781,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
     case "code_edit":
     case "debug":
       return Math.max(
-        base3,
+        base4,
         match(["gpt-5.3-codex"], 1),
         match(["claude-sonnet-4.6"], 0.94),
         match(["glm-5.2"], 0.9),
@@ -34715,7 +34789,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
       );
     case "reasoning":
       return Math.max(
-        base3,
+        base4,
         match(["claude-sonnet-5", "claude-sonnet-4.6"], 0.98),
         match(["deepseek-v4-pro"], 0.95),
         match(["grok-4.5"], 0.94),
@@ -34723,7 +34797,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
       );
     case "reasoning_mcq":
       return Math.max(
-        base3,
+        base4,
         match(["gemini-3-flash-preview"], 1),
         match(["gemini-3.5-flash"], 0.91),
         match(["grok-4.5"], 0.9),
@@ -34732,20 +34806,20 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
       );
     case "reasoning_math":
       return Math.max(
-        base3,
+        base4,
         match(["gemini-3.5-flash"], 1),
         match(["grok-4.5"], 0.93),
         match(["claude-sonnet-5", "deepseek-v4-pro", "kimi-k3"], 0.9)
       );
     case "vision":
       return Math.max(
-        base3,
+        base4,
         match(["gemini-3.1-pro"], 0.96),
         match(["qwen3.7-max", "claude-sonnet-4.6", "kimi-k3", "grok-4.3"], 0.9)
       );
     case "long_context":
       return Math.max(
-        base3,
+        base4,
         match(["gemini-3.1-pro"], 1),
         match(["qwen3.7-max", "glm-5.2"], 0.89),
         match(["gemini-3.5-flash"], 0.88),
@@ -34755,7 +34829,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
       const kimiExtractionAffinity = language === "zh" ? 1 : 0.9;
       const otherExtractionAffinity = language === "zh" ? 0.88 : 0.9;
       return Math.max(
-        base3,
+        base4,
         match(["gemini-3.5-flash", "gemini-2.5-flash", "gpt-4o-mini"], otherExtractionAffinity),
         match(["claude-sonnet-5", "claude-sonnet-4.6"], otherExtractionAffinity),
         match(["kimi-k3"], kimiExtractionAffinity)
@@ -34763,7 +34837,7 @@ function affinity(modelId, task, language = "other", agentDomain = "other", deep
     }
     default:
       return Math.max(
-        base3,
+        base4,
         match(["gemini-3.5-flash", "gemini-2.5-flash", "kimi-k3"], 0.86)
       );
   }
@@ -36038,13 +36112,13 @@ ${value.slice(-(scanLimit - prefixLength))}`;
       name = "portfolio";
       route(prompt, systemPrompt, maxOutputTokens, options) {
         const features = classifyTask(prompt, systemPrompt, options);
-        const base3 = new RulesStrategy().route(prompt, systemPrompt, maxOutputTokens, {
+        const base4 = new RulesStrategy().route(prompt, systemPrompt, maxOutputTokens, {
           ...options,
           requiresTools: features.needsTools
         });
-        const tierConfigs = base3.tierConfigs;
-        if (!tierConfigs) return base3;
-        const targetTier = (features.taskType === "reasoning_mcq" || features.taskType === "reasoning_math") && (base3.tier === "SIMPLE" || base3.tier === "MEDIUM") ? "REASONING" : base3.tier;
+        const tierConfigs = base4.tierConfigs;
+        if (!tierConfigs) return base4;
+        const targetTier = (features.taskType === "reasoning_mcq" || features.taskType === "reasoning_math") && (base4.tier === "SIMPLE" || base4.tier === "MEDIUM") ? "REASONING" : base4.tier;
         const tierConfig = tierConfigs[targetTier];
         const configuredCandidates = tierConfig ? getFallbackChain(targetTier, tierConfigs) : [];
         const unavailable = new Set(options.unavailableModels ?? []);
@@ -36057,7 +36131,7 @@ ${value.slice(-(scanLimit - prefixLength))}`;
           (model2) => isEligible(model2, features, maxOutputTokens, options)
         );
         const eligibleCandidates = eligible.length > 0 ? eligible : chain3;
-        if (eligibleCandidates.length === 0) return base3;
+        if (eligibleCandidates.length === 0) return base4;
         const profileName = options.routingProfile === "eco" ? "eco" : options.routingProfile === "premium" ? "premium" : "auto";
         const portfolio = options.config.portfolio ?? DEFAULT_PORTFOLIO_WEIGHTS;
         const getAffinity = (model2) => affinity(
@@ -36130,27 +36204,27 @@ ${value.slice(-(scanLimit - prefixLength))}`;
             (model2) => !scoredModels.includes(model2) && !webResearchFallbackOrder.includes(model2)
           )
         ] : [...scoredModels, ...eligibleCandidates.filter((model2) => !scoredModels.includes(model2))];
-        const model = ranked[0] ?? base3.model;
+        const model = ranked[0] ?? base4.model;
         const selectedTierConfigs = {
           ...tierConfigs,
           [targetTier]: { primary: model, fallback: ranked.slice(1) }
         };
         const decision = selectModel(
           targetTier,
-          base3.confidence,
+          base4.confidence,
           "portfolio",
-          `${base3.reasoning} | v3 task=${features.taskType} agentRisk=${features.agentRisk} deepWebResearch=${features.deepWebResearch} terminalCode=${features.implicitTerminalCode} terminalSafety=${features.terminalSafetySensitive} candidates=${ranked.length}`,
+          `${base4.reasoning} | v3 task=${features.taskType} agentRisk=${features.agentRisk} deepWebResearch=${features.deepWebResearch} terminalCode=${features.implicitTerminalCode} terminalSafety=${features.terminalSafetySensitive} candidates=${ranked.length}`,
           selectedTierConfigs,
           options.modelPricing,
           features.estimatedInputTokens,
           maxOutputTokens,
           options.routingProfile,
-          base3.agenticScore
+          base4.agenticScore
         );
         return {
           ...decision,
           tierConfigs: selectedTierConfigs,
-          profile: base3.profile,
+          profile: base4.profile,
           candidates: ranked,
           candidateScores: rankedEntries.map(({ model: model2, score, quality, cost, speed, reliability }) => ({
             model: model2,
@@ -40597,7 +40671,7 @@ var init_errors5 = __esm({
           `Options:`,
           `  1. Fund wallet: ${walletAddress}`,
           `  2. Use free model: /model free`,
-          `  3. Uninstall: bash ~/.openclaw/extensions/clawrouter/scripts/uninstall.sh`
+          `  3. Uninstall: bash ~/.openclaw/extensions/blockrun-clawrouter/scripts/uninstall.sh`
         ].join("\n");
         super(msg);
         this.name = "EmptyWalletError";
@@ -40749,6 +40823,154 @@ var init_balance = __esm({
   }
 });
 
+// node_modules/base-x/src/esm/index.js
+function base2(ALPHABET3) {
+  if (ALPHABET3.length >= 255) {
+    throw new TypeError("Alphabet too long");
+  }
+  const BASE_MAP = new Uint8Array(256);
+  for (let j = 0; j < BASE_MAP.length; j++) {
+    BASE_MAP[j] = 255;
+  }
+  for (let i = 0; i < ALPHABET3.length; i++) {
+    const x = ALPHABET3.charAt(i);
+    const xc = x.charCodeAt(0);
+    if (BASE_MAP[xc] !== 255) {
+      throw new TypeError(x + " is ambiguous");
+    }
+    BASE_MAP[xc] = i;
+  }
+  const BASE = ALPHABET3.length;
+  const LEADER = ALPHABET3.charAt(0);
+  const FACTOR = Math.log(BASE) / Math.log(256);
+  const iFACTOR = Math.log(256) / Math.log(BASE);
+  function encode9(source) {
+    if (source instanceof Uint8Array) {
+    } else if (ArrayBuffer.isView(source)) {
+      source = new Uint8Array(source.buffer, source.byteOffset, source.byteLength);
+    } else if (Array.isArray(source)) {
+      source = Uint8Array.from(source);
+    }
+    if (!(source instanceof Uint8Array)) {
+      throw new TypeError("Expected Uint8Array");
+    }
+    if (source.length === 0) {
+      return "";
+    }
+    let zeroes = 0;
+    let length = 0;
+    let pbegin = 0;
+    const pend = source.length;
+    while (pbegin !== pend && source[pbegin] === 0) {
+      pbegin++;
+      zeroes++;
+    }
+    const size5 = (pend - pbegin) * iFACTOR + 1 >>> 0;
+    const b58 = new Uint8Array(size5);
+    while (pbegin !== pend) {
+      let carry2 = source[pbegin];
+      let i = 0;
+      for (let it1 = size5 - 1; (carry2 !== 0 || i < length) && it1 !== -1; it1--, i++) {
+        carry2 += 256 * b58[it1] >>> 0;
+        b58[it1] = carry2 % BASE >>> 0;
+        carry2 = carry2 / BASE >>> 0;
+      }
+      if (carry2 !== 0) {
+        throw new Error("Non-zero carry");
+      }
+      length = i;
+      pbegin++;
+    }
+    let it2 = size5 - length;
+    while (it2 !== size5 && b58[it2] === 0) {
+      it2++;
+    }
+    let str = LEADER.repeat(zeroes);
+    for (; it2 < size5; ++it2) {
+      str += ALPHABET3.charAt(b58[it2]);
+    }
+    return str;
+  }
+  function decodeUnsafe(source) {
+    if (typeof source !== "string") {
+      throw new TypeError("Expected String");
+    }
+    if (source.length === 0) {
+      return new Uint8Array();
+    }
+    let psz = 0;
+    let zeroes = 0;
+    let length = 0;
+    while (source[psz] === LEADER) {
+      zeroes++;
+      psz++;
+    }
+    const size5 = (source.length - psz) * FACTOR + 1 >>> 0;
+    const b256 = new Uint8Array(size5);
+    while (psz < source.length) {
+      const charCode = source.charCodeAt(psz);
+      if (charCode > 255) {
+        return;
+      }
+      let carry2 = BASE_MAP[charCode];
+      if (carry2 === 255) {
+        return;
+      }
+      let i = 0;
+      for (let it3 = size5 - 1; (carry2 !== 0 || i < length) && it3 !== -1; it3--, i++) {
+        carry2 += BASE * b256[it3] >>> 0;
+        b256[it3] = carry2 % 256 >>> 0;
+        carry2 = carry2 / 256 >>> 0;
+      }
+      if (carry2 !== 0) {
+        throw new Error("Non-zero carry");
+      }
+      length = i;
+      psz++;
+    }
+    let it4 = size5 - length;
+    while (it4 !== size5 && b256[it4] === 0) {
+      it4++;
+    }
+    const vch = new Uint8Array(zeroes + (size5 - it4));
+    let j = zeroes;
+    while (it4 !== size5) {
+      vch[j++] = b256[it4++];
+    }
+    return vch;
+  }
+  function decode4(string) {
+    const buffer2 = decodeUnsafe(string);
+    if (buffer2) {
+      return buffer2;
+    }
+    throw new Error("Non-base" + BASE + " character");
+  }
+  return {
+    encode: encode9,
+    decodeUnsafe,
+    decode: decode4
+  };
+}
+var esm_default;
+var init_esm6 = __esm({
+  "node_modules/base-x/src/esm/index.js"() {
+    "use strict";
+    esm_default = base2;
+  }
+});
+
+// node_modules/bs58/src/esm/index.js
+var ALPHABET, esm_default2;
+var init_esm7 = __esm({
+  "node_modules/bs58/src/esm/index.js"() {
+    "use strict";
+    init_esm6();
+    ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+    esm_default2 = esm_default(ALPHABET);
+  }
+});
+
 // node_modules/@noble/curves/node_modules/@noble/hashes/utils.js
 function isBytes7(a) {
   return a instanceof Uint8Array || ArrayBuffer.isView(a) && a.constructor.name === "Uint8Array" && "BYTES_PER_ELEMENT" in a && a.BYTES_PER_ELEMENT === 1;
@@ -41917,15 +42139,15 @@ var init_curve3 = __esm({
         const { windows, windowSize } = calcWOpts3(W, this.bits);
         const points = [];
         let p = point3;
-        let base3 = p;
+        let base4 = p;
         for (let window2 = 0; window2 < windows; window2++) {
-          base3 = p;
-          points.push(base3);
+          base4 = p;
+          points.push(base4);
           for (let i = 1; i < windowSize; i++) {
-            base3 = base3.add(p);
-            points.push(base3);
+            base4 = base4.add(p);
+            points.push(base4);
           }
-          p = base3.double();
+          p = base4.double();
         }
         return points;
       }
@@ -44973,6 +45195,37 @@ var init_sha26 = __esm({
   }
 });
 
+// src/solana-key.ts
+function deriveSolanaKeyBytes(mnemonic) {
+  const seed = mnemonicToSeedSync(mnemonic);
+  let digest = hmac6(sha5123, new TextEncoder().encode("ed25519 seed"), seed);
+  let key2 = digest.slice(0, 32);
+  let chainCode = digest.slice(32);
+  for (const index2 of SOLANA_HARDENED_INDICES) {
+    const data = new Uint8Array(37);
+    data[0] = 0;
+    data.set(key2, 1);
+    data[33] = index2 >>> 24 & 255;
+    data[34] = index2 >>> 16 & 255;
+    data[35] = index2 >>> 8 & 255;
+    data[36] = index2 & 255;
+    digest = hmac6(sha5123, chainCode, data);
+    key2 = digest.slice(0, 32);
+    chainCode = digest.slice(32);
+  }
+  return new Uint8Array(key2);
+}
+var SOLANA_HARDENED_INDICES;
+var init_solana_key = __esm({
+  "src/solana-key.ts"() {
+    "use strict";
+    init_hmac6();
+    init_sha26();
+    init_esm3();
+    SOLANA_HARDENED_INDICES = [44 + 2147483648, 501 + 2147483648, 0 + 2147483648, 0 + 2147483648];
+  }
+});
+
 // node_modules/@solana/errors/dist/index.node.mjs
 function encodeValue(value) {
   if (Array.isArray(value)) {
@@ -46414,20 +46667,20 @@ function partitionLeadingZeroes(value, zeroCharacter) {
   return [leadingZeros, tailChars];
 }
 function getBigIntFromBaseX(value, alphabet4) {
-  const base3 = BigInt(alphabet4.length);
+  const base4 = BigInt(alphabet4.length);
   let sum = 0n;
   for (const char of value) {
-    sum *= base3;
+    sum *= base4;
     sum += BigInt(alphabet4.indexOf(char));
   }
   return sum;
 }
 function getBaseXFromBigInt(value, alphabet4) {
-  const base3 = BigInt(alphabet4.length);
+  const base4 = BigInt(alphabet4.length);
   const tailChars = [];
   while (value > 0n) {
-    tailChars.unshift(alphabet4[Number(value % base3)]);
-    value /= base3;
+    tailChars.unshift(alphabet4[Number(value % base4)]);
+    value /= base4;
   }
   return tailChars.join("");
 }
@@ -48474,20 +48727,20 @@ function partitionLeadingZeroes2(value, zeroCharacter) {
   return [leadingZeros, tailChars];
 }
 function getBigIntFromBaseX2(value, alphabet4) {
-  const base3 = BigInt(alphabet4.length);
+  const base4 = BigInt(alphabet4.length);
   let sum = 0n;
   for (const char of value) {
-    sum *= base3;
+    sum *= base4;
     sum += BigInt(alphabet4.indexOf(char));
   }
   return sum;
 }
 function getBaseXFromBigInt2(value, alphabet4) {
-  const base3 = BigInt(alphabet4.length);
+  const base4 = BigInt(alphabet4.length);
   const tailChars = [];
   while (value > 0n) {
-    tailChars.unshift(alphabet4[Number(value % base3)]);
-    value /= base3;
+    tailChars.unshift(alphabet4[Number(value % base4)]);
+    value /= base4;
   }
   return tailChars.join("");
 }
@@ -59265,25 +59518,6 @@ function deriveEvmKey(mnemonic) {
   const account = privateKeyToAccount(hex);
   return { privateKey: hex, address: account.address };
 }
-function deriveSolanaKeyBytes(mnemonic) {
-  const seed = mnemonicToSeedSync(mnemonic);
-  let I = hmac6(sha5123, new TextEncoder().encode("ed25519 seed"), seed);
-  let key2 = I.slice(0, 32);
-  let chainCode = I.slice(32);
-  for (const index2 of SOLANA_HARDENED_INDICES) {
-    const data = new Uint8Array(37);
-    data[0] = 0;
-    data.set(key2, 1);
-    data[33] = index2 >>> 24 & 255;
-    data[34] = index2 >>> 16 & 255;
-    data[35] = index2 >>> 8 & 255;
-    data[36] = index2 & 255;
-    I = hmac6(sha5123, chainCode, data);
-    key2 = I.slice(0, 32);
-    chainCode = I.slice(32);
-  }
-  return new Uint8Array(key2);
-}
 function deriveAllKeys(mnemonic) {
   const { privateKey: evmPrivateKey, address: evmAddress } = deriveEvmKey(mnemonic);
   const solanaPrivateKeyBytes = deriveSolanaKeyBytes(mnemonic);
@@ -59294,18 +59528,17 @@ async function getSolanaAddress(privateKeyBytes) {
   const signer = await createKeyPairSignerFromPrivateKeyBytes2(privateKeyBytes);
   return signer.address;
 }
-var ETH_DERIVATION_PATH, SOLANA_HARDENED_INDICES;
+var ETH_DERIVATION_PATH;
 var init_wallet2 = __esm({
   "src/wallet.ts"() {
     "use strict";
     init_bip32();
     init_esm3();
     init_english();
-    init_hmac6();
-    init_sha26();
     init_accounts();
+    init_solana_key();
+    init_solana_key();
     ETH_DERIVATION_PATH = "m/44'/60'/0'/0/0";
-    SOLANA_HARDENED_INDICES = [44 + 2147483648, 501 + 2147483648, 0 + 2147483648, 0 + 2147483648];
   }
 });
 
@@ -59313,15 +59546,21 @@ var init_wallet2 = __esm({
 var auth_exports = {};
 __export(auth_exports, {
   CHAIN_FILE: () => CHAIN_FILE,
+  CORE_CHAIN_FILE: () => CORE_CHAIN_FILE,
+  CORE_SOLANA_WALLET_FILE: () => CORE_SOLANA_WALLET_FILE,
+  CORE_WALLET_FILE: () => CORE_WALLET_FILE,
   MNEMONIC_FILE: () => MNEMONIC_FILE,
   WALLET_FILE: () => WALLET_FILE,
   loadPaymentChain: () => loadPaymentChain,
+  migrateLegacyWalletToCore: () => migrateLegacyWalletToCore,
   recoverWalletFromMnemonic: () => recoverWalletFromMnemonic,
+  resolveExistingWalletKey: () => resolveExistingWalletKey,
   resolveOrGenerateWalletKey: () => resolveOrGenerateWalletKey,
   resolvePaymentChain: () => resolvePaymentChain,
   savePaymentChain: () => savePaymentChain,
   setupSolana: () => setupSolana
 });
+import { createPrivateKey, createPublicKey } from "crypto";
 import { writeFile, mkdir as mkdir2 } from "fs/promises";
 import { join as join7 } from "path";
 import { homedir as homedir4 } from "os";
@@ -59376,7 +59615,67 @@ async function saveMnemonic(mnemonic) {
   await mkdir2(WALLET_DIR2, { recursive: true });
   await writeFile(MNEMONIC_FILE, mnemonic + "\n", { mode: 384 });
 }
-async function generateAndSaveWallet() {
+async function migrateLegacyWalletToCore() {
+  const migrated = { base: false, solana: false, chain: false };
+  const [coreBase, coreSolana, coreChain] = await Promise.all([
+    readExisting(CORE_WALLET_FILE),
+    readExisting(CORE_SOLANA_WALLET_FILE),
+    readExisting(CORE_CHAIN_FILE)
+  ]);
+  if (coreBase === void 0) {
+    const legacyBase = await loadSavedWallet();
+    if (legacyBase) {
+      migrated.base = await writeCoreFileIfMissing(CORE_WALLET_FILE, legacyBase + "\n");
+    }
+  }
+  if (coreSolana === void 0) {
+    const mnemonic = await loadMnemonic();
+    if (mnemonic) {
+      const secret = solanaSecretKeyFromSeed(deriveSolanaKeyBytes(mnemonic));
+      migrated.solana = await writeCoreFileIfMissing(
+        CORE_SOLANA_WALLET_FILE,
+        JSON.stringify([...secret]) + "\n"
+      );
+    }
+  }
+  if (coreChain === void 0) {
+    const legacyChain = await readOptional(CHAIN_FILE);
+    if (legacyChain === "base" || legacyChain === "solana") {
+      migrated.chain = await writeCoreFileIfMissing(CORE_CHAIN_FILE, legacyChain + "\n");
+    }
+  }
+  if (migrated.base || migrated.solana || migrated.chain) {
+    const parts = Object.entries(migrated).filter(([, changed]) => changed).map(([name]) => name).join(", ");
+    console.log(`[ClawRouter] Migrated legacy ${parts} data to ${CORE_WALLET_DIR}`);
+  }
+  return migrated;
+}
+async function writeCoreFileIfMissing(path5, value) {
+  await mkdir2(CORE_WALLET_DIR, { recursive: true });
+  try {
+    await writeFile(path5, value, { mode: 384, flag: "wx" });
+    return true;
+  } catch (error) {
+    if (error.code === "EEXIST") return false;
+    throw error;
+  }
+}
+async function readExisting(path5) {
+  try {
+    return await readTextFile(path5);
+  } catch (error) {
+    if (error.code === "ENOENT") return void 0;
+    throw error;
+  }
+}
+function solanaSecretKeyFromSeed(seed) {
+  const privateDer = Buffer.concat([Buffer.from("302e020100300506032b657004220420", "hex"), seed]);
+  const publicDer = createPublicKey(
+    createPrivateKey({ key: privateDer, format: "der", type: "pkcs8" })
+  ).export({ format: "der", type: "spki" });
+  return Uint8Array.from([...seed, ...Buffer.from(publicDer).subarray(-32)]);
+}
+async function generateAndSaveWallet(existingCoreSolanaKey) {
   const existingMnemonic = await loadMnemonic();
   if (existingMnemonic) {
     throw new Error(
@@ -59394,7 +59693,17 @@ Then run: npx @blockrun/clawrouter`
   const derived = deriveAllKeys(mnemonic);
   await mkdir2(WALLET_DIR2, { recursive: true });
   await writeFile(WALLET_FILE, derived.evmPrivateKey + "\n", { mode: 384 });
-  await writeFile(MNEMONIC_FILE, mnemonic + "\n", { mode: 384 });
+  if (!existingCoreSolanaKey) {
+    await writeFile(MNEMONIC_FILE, mnemonic + "\n", { mode: 384 });
+  }
+  await writeCoreFileIfMissing(CORE_WALLET_FILE, derived.evmPrivateKey + "\n");
+  if (!existingCoreSolanaKey) {
+    await writeCoreFileIfMissing(
+      CORE_SOLANA_WALLET_FILE,
+      JSON.stringify([...solanaSecretKeyFromSeed(derived.solanaPrivateKeyBytes)]) + "\n"
+    );
+  }
+  const solanaPrivateKeyBytes = existingCoreSolanaKey ?? derived.solanaPrivateKeyBytes;
   try {
     const verification = (await readTextFile(WALLET_FILE)).trim();
     if (verification !== derived.evmPrivateKey) {
@@ -59409,7 +59718,7 @@ Then run: npx @blockrun/clawrouter`
   }
   let solanaAddress;
   try {
-    solanaAddress = await getSolanaAddress(derived.solanaPrivateKeyBytes);
+    solanaAddress = await getSolanaAddress(solanaPrivateKeyBytes);
   } catch {
   }
   let solanaDefaultSaved = false;
@@ -59428,8 +59737,11 @@ Then run: npx @blockrun/clawrouter`
   if (solanaAddress) {
     console.log(`[ClawRouter]   Solana Address : ${solanaAddress}`);
   }
-  console.log(`[ClawRouter]   Key file       : ${WALLET_FILE}`);
-  console.log(`[ClawRouter]   Mnemonic       : ${MNEMONIC_FILE}`);
+  console.log(`[ClawRouter]   Base key       : ${CORE_WALLET_FILE}`);
+  console.log(`[ClawRouter]   Solana key     : ${CORE_SOLANA_WALLET_FILE}`);
+  if (!existingCoreSolanaKey) {
+    console.log(`[ClawRouter]   Recovery words : ${MNEMONIC_FILE}`);
+  }
   console.log(`[ClawRouter]`);
   console.log(`[ClawRouter]   Both EVM (Base) and Solana wallets are ready.`);
   if (solanaDefaultSaved) {
@@ -59448,44 +59760,50 @@ Then run: npx @blockrun/clawrouter`
   return {
     key: derived.evmPrivateKey,
     address: derived.evmAddress,
-    mnemonic,
-    solanaPrivateKeyBytes: derived.solanaPrivateKeyBytes
+    ...existingCoreSolanaKey ? {} : { mnemonic },
+    solanaPrivateKeyBytes
   };
 }
-async function resolveOrGenerateWalletKey() {
+async function resolveExistingWalletKey() {
+  const coreSolanaKey = await loadCoreSolanaKeyForSelectedChain();
+  const envKey = process["env"].BLOCKRUN_WALLET_KEY;
+  if (typeof envKey === "string" && /^0x[0-9a-f]{64}$/i.test(envKey)) {
+    const account = privateKeyToAccount(envKey);
+    return {
+      key: envKey,
+      address: account.address,
+      source: "env",
+      ...await resolvedSolanaMaterial(coreSolanaKey)
+    };
+  }
+  const core = await loadCoreWallet();
+  if (core) {
+    const account = privateKeyToAccount(core);
+    return {
+      key: core,
+      address: account.address,
+      source: "core",
+      ...await resolvedSolanaMaterial(coreSolanaKey)
+    };
+  }
   const saved = await loadSavedWallet();
   if (saved) {
     const account = privateKeyToAccount(saved);
-    const mnemonic = await loadMnemonic();
-    if (mnemonic) {
-      const solanaKeyBytes = deriveSolanaKeyBytes(mnemonic);
-      return {
-        key: saved,
-        address: account.address,
-        source: "saved",
-        mnemonic,
-        solanaPrivateKeyBytes: solanaKeyBytes
-      };
-    }
-    return { key: saved, address: account.address, source: "saved" };
-  }
-  const envKey = process["env"].BLOCKRUN_WALLET_KEY;
-  if (typeof envKey === "string" && envKey.startsWith("0x") && envKey.length === 66) {
-    const account = privateKeyToAccount(envKey);
-    const mnemonic = await loadMnemonic();
-    if (mnemonic) {
-      const solanaKeyBytes = deriveSolanaKeyBytes(mnemonic);
-      return {
-        key: envKey,
-        address: account.address,
-        source: "env",
-        mnemonic,
-        solanaPrivateKeyBytes: solanaKeyBytes
-      };
-    }
-    return { key: envKey, address: account.address, source: "env" };
+    return {
+      key: saved,
+      address: account.address,
+      source: "saved",
+      ...await resolvedSolanaMaterial(coreSolanaKey)
+    };
   }
-  const result = await generateAndSaveWallet();
+  return void 0;
+}
+async function resolveOrGenerateWalletKey() {
+  await migrateLegacyWalletToCore();
+  const existing = await resolveExistingWalletKey();
+  if (existing) return existing;
+  const existingCoreSolanaKey = await loadCoreSolanaKey();
+  const result = await generateAndSaveWallet(existingCoreSolanaKey);
   return {
     key: result.key,
     address: result.address,
@@ -59494,6 +59812,62 @@ async function resolveOrGenerateWalletKey() {
     solanaPrivateKeyBytes: result.solanaPrivateKeyBytes
   };
 }
+async function loadCoreSolanaKeyForSelectedChain() {
+  try {
+    return await loadCoreSolanaKey();
+  } catch (error) {
+    if (await resolvePaymentChain() === "solana") throw error;
+    return void 0;
+  }
+}
+async function loadCoreWallet() {
+  const key2 = (await readExisting(CORE_WALLET_FILE))?.trim();
+  if (key2 === void 0) return void 0;
+  if (/^0x[0-9a-f]{64}$/i.test(key2)) return key2;
+  throw new Error(
+    `BlockRun Core wallet at ${CORE_WALLET_FILE} has an invalid format. Refusing to use another wallet implicitly.`
+  );
+}
+async function loadCoreSolanaKey() {
+  const environmentKey = process["env"].SOLANA_WALLET_KEY?.trim();
+  const raw = environmentKey || (await readExisting(CORE_SOLANA_WALLET_FILE))?.trim();
+  if (!raw) return void 0;
+  try {
+    let bytes;
+    if (raw.startsWith("[")) {
+      const parsed = JSON.parse(raw);
+      if (!Array.isArray(parsed) || !parsed.every((item) => Number.isInteger(item) && item >= 0 && item <= 255))
+        throw new Error("expected an array of byte values");
+      bytes = Uint8Array.from(parsed);
+    } else {
+      const hex = raw.replace(/^0x/i, "");
+      bytes = /^[0-9a-f]{128}$/i.test(hex) ? Buffer.from(hex, "hex") : esm_default2.decode(raw);
+    }
+    if (bytes.length !== 64) throw new Error(`expected 64 bytes, received ${bytes.length}`);
+    const expected = solanaSecretKeyFromSeed(bytes.slice(0, 32));
+    if (!Buffer.from(expected).equals(Buffer.from(bytes))) {
+      throw new Error("public key does not match the private seed");
+    }
+    return bytes.slice(0, 32);
+  } catch (error) {
+    throw new Error(
+      `BlockRun Core Solana wallet has an invalid format: ${error instanceof Error ? error.message : String(error)}`,
+      { cause: error }
+    );
+  }
+}
+async function readOptional(path5) {
+  try {
+    return (await readTextFile(path5)).trim() || void 0;
+  } catch {
+    return void 0;
+  }
+}
+async function resolvedSolanaMaterial(coreSolanaKey) {
+  if (coreSolanaKey) return { solanaPrivateKeyBytes: coreSolanaKey };
+  const mnemonic = await loadMnemonic();
+  return mnemonic ? { mnemonic, solanaPrivateKeyBytes: deriveSolanaKeyBytes(mnemonic) } : {};
+}
 async function recoverWalletFromMnemonic() {
   const mnemonic = await loadMnemonic();
   if (!mnemonic) {
@@ -59501,6 +59875,12 @@ async function recoverWalletFromMnemonic() {
     console.error(`[ClawRouter] Cannot recover \u2014 no mnemonic to derive from.`);
     process.exit(1);
   }
+  const existingCore = await loadCoreWallet();
+  if (existingCore) {
+    console.error(`[ClawRouter] BlockRun Core wallet already exists at ${CORE_WALLET_FILE}`);
+    console.error(`[ClawRouter] Recovery not needed.`);
+    process.exit(1);
+  }
   const existing = await loadSavedWallet().catch(() => void 0);
   if (existing) {
     console.error(`[ClawRouter] wallet.key already exists at ${WALLET_FILE}`);
@@ -59527,7 +59907,8 @@ async function recoverWalletFromMnemonic() {
   console.log(`[ClawRouter]`);
   await mkdir2(WALLET_DIR2, { recursive: true });
   await writeFile(WALLET_FILE, derived.evmPrivateKey + "\n", { mode: 384 });
-  console.log(`[ClawRouter] \u2713 wallet.key restored at ${WALLET_FILE}`);
+  await migrateLegacyWalletToCore();
+  console.log(`[ClawRouter] \u2713 Wallet restored into BlockRun Core at ${CORE_WALLET_DIR}`);
   console.log(`[ClawRouter]   Run: npx @blockrun/clawrouter`);
   console.log(`[ClawRouter]`);
 }
@@ -59536,8 +59917,8 @@ async function setupSolana() {
   if (existing) {
     throw new Error("Solana wallet already set up. Mnemonic file exists at " + MNEMONIC_FILE);
   }
-  const savedKey = await loadSavedWallet();
-  if (!savedKey) {
+  const evmKey = await loadCoreWallet() ?? await loadSavedWallet();
+  if (!evmKey) {
     throw new Error(
       "No EVM wallet found. Run ClawRouter first to generate a wallet before setting up Solana."
     );
@@ -59545,16 +59926,28 @@ async function setupSolana() {
   const mnemonic = generateWalletMnemonic();
   const solanaKeyBytes = deriveSolanaKeyBytes(mnemonic);
   await saveMnemonic(mnemonic);
+  await writeCoreFileIfMissing(
+    CORE_SOLANA_WALLET_FILE,
+    JSON.stringify([...solanaSecretKeyFromSeed(solanaKeyBytes)]) + "\n"
+  );
   console.log(`[ClawRouter] Solana wallet set up successfully.`);
-  console.log(`[ClawRouter] Mnemonic saved to ${MNEMONIC_FILE}`);
+  console.log(`[ClawRouter] Solana key saved to ${CORE_SOLANA_WALLET_FILE}`);
+  console.log(`[ClawRouter] Recovery mnemonic saved to ${MNEMONIC_FILE}`);
   console.log(`[ClawRouter] Existing EVM wallet unchanged.`);
   return { mnemonic, solanaPrivateKeyBytes: solanaKeyBytes };
 }
 async function savePaymentChain(chain3) {
   await mkdir2(WALLET_DIR2, { recursive: true });
-  await writeFile(CHAIN_FILE, chain3 + "\n", { mode: 384 });
+  await mkdir2(CORE_WALLET_DIR, { recursive: true });
+  await Promise.all([
+    writeFile(CHAIN_FILE, chain3 + "\n", { mode: 384 }),
+    writeFile(CORE_CHAIN_FILE, chain3 + "\n", { mode: 384 })
+  ]);
 }
 async function loadPaymentChain() {
+  const core = await readOptional(CORE_CHAIN_FILE);
+  if (core === "solana") return "solana";
+  if (core === "base") return "base";
   try {
     const content = (await readTextFile(CHAIN_FILE)).trim();
     if (content === "solana") return "solana";
@@ -59568,17 +59961,22 @@ async function resolvePaymentChain() {
   if (process["env"].CLAWROUTER_PAYMENT_CHAIN === "base") return "base";
   return loadPaymentChain();
 }
-var WALLET_DIR2, WALLET_FILE, MNEMONIC_FILE, CHAIN_FILE;
+var WALLET_DIR2, WALLET_FILE, MNEMONIC_FILE, CHAIN_FILE, CORE_WALLET_DIR, CORE_WALLET_FILE, CORE_SOLANA_WALLET_FILE, CORE_CHAIN_FILE;
 var init_auth = __esm({
   "src/auth.ts"() {
     "use strict";
     init_fs_read();
+    init_esm7();
     init_accounts();
     init_wallet2();
     WALLET_DIR2 = join7(homedir4(), ".openclaw", "blockrun");
     WALLET_FILE = join7(WALLET_DIR2, "wallet.key");
     MNEMONIC_FILE = join7(WALLET_DIR2, "mnemonic");
     CHAIN_FILE = join7(WALLET_DIR2, "payment-chain");
+    CORE_WALLET_DIR = join7(homedir4(), ".blockrun");
+    CORE_WALLET_FILE = join7(CORE_WALLET_DIR, ".session");
+    CORE_SOLANA_WALLET_FILE = join7(CORE_WALLET_DIR, ".solana-session");
+    CORE_CHAIN_FILE = join7(CORE_WALLET_DIR, ".chain");
   }
 });
 
@@ -75731,7 +76129,7 @@ var require_snapshot_recorder = __commonJS({
   "node_modules/undici/lib/mock/snapshot-recorder.js"(exports, module) {
     "use strict";
     var { writeFile: writeFile3, readFile: readFile3, mkdir: mkdir5 } = __require("fs/promises");
-    var { dirname: dirname5, resolve } = __require("path");
+    var { dirname: dirname4, resolve } = __require("path");
     var { setTimeout: setTimeout2, clearTimeout: clearTimeout2 } = __require("timers");
     var { InvalidArgumentError, UndiciError } = require_errors();
     var { hashId, isUrlExcludedFactory, normalizeHeaders: normalizeHeaders3, createHeaderFilters } = require_snapshot_utils();
@@ -75977,7 +76375,7 @@ var require_snapshot_recorder = __commonJS({
           throw new InvalidArgumentError("Snapshot path is required");
         }
         const resolvedPath = resolve(path5);
-        await mkdir5(dirname5(resolvedPath), { recursive: true });
+        await mkdir5(dirname4(resolvedPath), { recursive: true });
         const data = Array.from(this.#snapshots.entries()).map(([hash5, snapshot]) => ({
           hash: hash5,
           snapshot
@@ -90053,6 +90451,7 @@ var init_client3 = __esm({
 
 // src/proxy.ts
 import { AsyncLocalStorage } from "async_hooks";
+import { createHmac } from "crypto";
 import { createServer } from "http";
 import { finished } from "stream";
 import { homedir as homedir7 } from "os";
@@ -90678,12 +91077,25 @@ function buildProxyModelList(createdAt = Math.floor(Date.now() / 1e3)) {
     if (seen.has(model.id)) return false;
     seen.add(model.id);
     return true;
-  }).map((model) => ({
-    id: model.id,
-    object: "model",
-    created: createdAt,
-    owned_by: model.id.includes("/") ? model.id.split("/")[0] ?? "blockrun" : "blockrun"
-  }));
+  }).map((model) => {
+    const targetId = MODEL_ALIASES[model.id] ?? model.id;
+    const canonical = BLOCKRUN_MODELS.find((entry) => entry.id === targetId);
+    return {
+      id: model.id,
+      object: "model",
+      created: createdAt,
+      owned_by: targetId.includes("/") ? targetId.split("/")[0] ?? "blockrun" : "blockrun",
+      name: model.name,
+      context_window: model.contextWindow,
+      max_output: model.maxTokens,
+      input_price: model.cost.input,
+      output_price: model.cost.output,
+      reasoning: model.reasoning,
+      vision: model.input.includes("image"),
+      agentic: canonical?.agentic ?? false,
+      tool_calling: canonical?.toolCalling ?? false
+    };
+  });
 }
 function mergeRoutingConfig(overrides) {
   if (!overrides) return DEFAULT_ROUTING_CONFIG;
@@ -90923,7 +91335,7 @@ async function startProxy(options) {
   }
   void loadGatewayCatalog(apiBase);
   const listenPort = options.port ?? getProxyPort();
-  const existingProxy = await checkExistingProxy(listenPort);
+  const existingProxy = options.allowExistingProxy === false ? void 0 : await checkExistingProxy(listenPort);
   if (existingProxy) {
     const account2 = privateKeyToAccount(walletKey);
     const baseUrl2 = `http://127.0.0.1:${listenPort}`;
@@ -91078,7 +91490,22 @@ async function startProxy(options) {
             response.balanceError = "Could not fetch balance";
           }
         }
-        res.writeHead(200, { "Content-Type": "application/json" });
+        const headers = {
+          "Content-Type": "application/json",
+          "Cache-Control": "no-store"
+        };
+        const challengeValue = req.headers["x-clawrouter-challenge"];
+        const challenge2 = Array.isArray(challengeValue) ? challengeValue[0] : challengeValue;
+        if (challenge2 && /^[a-f0-9]{64}$/i.test(challenge2)) {
+          try {
+            const token = readFileSync2(DESKTOP_SERVICE_TOKEN_FILE, "utf8").trim();
+            if (/^[a-f0-9]{64}$/i.test(token)) {
+              headers["X-ClawRouter-Proof"] = createHmac("sha256", token).update(challenge2).digest("hex");
+            }
+          } catch {
+          }
+        }
+        res.writeHead(200, headers);
         res.end(JSON.stringify(response));
         return;
       }
@@ -91947,6 +92374,10 @@ async function startProxy(options) {
       const onError = async (err) => {
         server.removeListener("error", onError);
         if (err.code === "EADDRINUSE") {
+          if (options.allowExistingProxy === false) {
+            rejectAttempt(err);
+            return;
+          }
           const existingProxy2 = await checkExistingProxy(listenPort);
           if (existingProxy2) {
             console.log(`[ClawRouter] Existing proxy detected on port ${listenPort}, reusing`);
@@ -94351,7 +94782,7 @@ data: [DONE]
     });
   }
 }
-var paymentStore, BLOCKRUN_API, BLOCKRUN_SOLANA_API, 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;
 var init_proxy = __esm({
   "src/proxy.ts"() {
     "use strict";
@@ -94389,6 +94820,7 @@ var init_proxy = __esm({
     paymentStore = new AsyncLocalStorage();
     BLOCKRUN_API = "https://blockrun.ai/api";
     BLOCKRUN_SOLANA_API = "https://sol.blockrun.ai/api";
+    DESKTOP_SERVICE_TOKEN_FILE = process.env.CLAWROUTER_DESKTOP_TOKEN_FILE ?? join10(homedir7(), ".clawrouter-desktop", "service-token");
     IMAGE_DIR = join10(homedir7(), ".openclaw", "blockrun", "images");
     AUDIO_DIR = join10(homedir7(), ".openclaw", "blockrun", "audio");
     VIDEO_DIR = join10(homedir7(), ".openclaw", "blockrun", "videos");
@@ -95597,6 +96029,210 @@ var init_partners = __esm({
   }
 });
 
+// src/commands/policy.ts
+function unsetMeaning(key2) {
+  switch (key2) {
+    case "allowedPayees":
+      return "every payee is permitted";
+    case "allowedNetworks":
+      return "every network is permitted";
+    case "allowedAssets":
+      return "every asset is permitted";
+    case "blockedPayees":
+      return "no payee is blocked";
+    default:
+      return `spend in the ${key2} window is uncapped`;
+  }
+}
+function fail(text) {
+  return { text, isError: true };
+}
+function isPolicyList2(v) {
+  return POLICY_LISTS.includes(v);
+}
+function isSpendWindow(v) {
+  return SPEND_WINDOWS.includes(v);
+}
+function isListAction(v) {
+  return LIST_ACTIONS.includes(v);
+}
+function rejectValue(list, value) {
+  if (list === "allowedNetworks") {
+    return PAYABLE_NETWORKS.includes(value) ? void 0 : `"${value}" is not a network the proxy can pay on \u2014 allowedNetworks accepts only ${CAIP2_BASE} (Base) or ${CAIP2_SOLANA_MAINNET} (Solana mainnet), not a nickname. Other CAIP-2 ids are well formed but cannot appear in a payment quote, so allowlisting one would only block payments`;
+  }
+  if (/^0x/i.test(value)) {
+    return EVM_ADDRESS2.test(value) ? void 0 : `"${value}" starts with 0x but is not 0x followed by exactly 40 hex characters`;
+  }
+  return BASE58_ADDRESS.test(value) ? void 0 : `"${value}" is not an address \u2014 expected 0x plus 40 hex characters (Base) or a 32\u201344 character base58 id (Solana)`;
+}
+function parsePolicyArgs(argv) {
+  const [sub = "", target = "", ...values] = argv;
+  const action = sub.toLowerCase();
+  if (action === "") return { kind: "show" };
+  if (action === "limit") {
+    if (!isSpendWindow(target)) {
+      return fail(
+        `Unknown window "${target}"; expected one of: ${SPEND_WINDOWS.join(", ")}
+${USAGE}`
+      );
+    }
+    const raw = values[0];
+    if (raw === void 0 || values.length !== 1) {
+      return fail(`policy limit takes exactly one amount (or "clear")
+${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) {
+      return fail(
+        `Rejected amount "${raw}": must be a positive decimal USD value such as 0.10 or 5`
+      );
+    }
+    return { kind: "limit", window: target, usd };
+  }
+  if (!isListAction(action)) return fail(`Unknown subcommand "${sub}"
+${USAGE}`);
+  if (!isPolicyList2(target)) {
+    return fail(`Unknown list "${target}"; expected one of: ${POLICY_LISTS.join(", ")}
+${USAGE}`);
+  }
+  if (action === "clear" ? values.length !== 0 : values.length === 0) {
+    return fail(
+      `policy ${action} <list> ${action === "clear" ? "takes no values" : "needs at least one value"}
+${USAGE}`
+    );
+  }
+  for (const v of values) {
+    const why = rejectValue(target, v);
+    if (why !== void 0) return fail(`Rejected ${target} entry: ${why}`);
+  }
+  return { kind: "list", action, list: target, values };
+}
+function nextListValue(current, plan) {
+  const have = current ?? [];
+  const wanted = [...new Set(plan.values.map(normalizePayee))];
+  switch (plan.action) {
+    case "set":
+      return { next: wanted };
+    case "clear":
+      return { next: void 0 };
+    case "add":
+      return { next: [.../* @__PURE__ */ new Set([...have, ...wanted])] };
+    case "remove": {
+      if (have.length === 0) return { reject: `${plan.list} is not configured; nothing to remove` };
+      const missing = wanted.filter((v) => !have.includes(v));
+      if (missing.length > 0) return { reject: `not in ${plan.list}: ${missing.join(", ")}` };
+      const next = have.filter((v) => !wanted.includes(v));
+      if (next.length === 0 && ALLOW_LISTS.includes(plan.list)) {
+        return {
+          reject: `removing the last ${plan.list} entry would unset the list, and then ${unsetMeaning(plan.list)}. Use "policy clear ${plan.list}" if that is what you want`
+        };
+      }
+      return { next: next.length > 0 ? next : void 0 };
+    }
+  }
+}
+function formatPolicy(limits) {
+  const lines = ["Spend limits (USD):"];
+  for (const w of SPEND_WINDOWS) {
+    const v = limits[w];
+    lines.push(`  ${w}: ${v === void 0 ? `(unset \u2014 ${unsetMeaning(w)})` : `$${v}`}`);
+  }
+  lines.push("Policy lists:");
+  for (const l2 of POLICY_LISTS) {
+    const v = limits[l2];
+    lines.push(`  ${l2}: ${v && v.length > 0 ? v.join(", ") : `(unset \u2014 ${unsetMeaning(l2)})`}`);
+  }
+  return lines.join("\n");
+}
+function runPolicyCommand(argv, options) {
+  const plan = parsePolicyArgs(argv);
+  if (!("kind" in plan)) return plan;
+  const openControl = options?.openControl ?? (() => new SpendControl());
+  const live = options?.liveControl?.();
+  const control = live ?? openControl();
+  const broken = control.getPolicyFileError();
+  if (broken !== void 0) {
+    return fail(`${broken}
+Nothing was written; repair or delete spending.json, then retry.`);
+  }
+  if (plan.kind === "show") return { text: formatPolicy(control.getLimits()) };
+  const before = openControl().getLimits();
+  const key2 = plan.kind === "limit" ? plan.window : plan.list;
+  let expected;
+  try {
+    if (plan.kind === "limit") {
+      expected = plan.usd;
+      if (plan.usd === void 0) control.clearLimit(plan.window);
+      else control.setLimit(plan.window, plan.usd);
+    } else {
+      const outcome = nextListValue(control.getLimits()[plan.list], plan);
+      if ("reject" in outcome) return fail(`${outcome.reject}; nothing written`);
+      expected = outcome.next;
+      if (outcome.next === void 0) control.clearPolicy(plan.list);
+      else control.setPolicy(plan.list, outcome.next);
+    }
+  } catch (err) {
+    if (err instanceof SpendPolicyConflictError) {
+      return fail(
+        `${key2} was not written: another writer changed spending.json while this command ran, and replacing it would have dropped their change. Run "policy" to see what disk holds now, then retry`
+      );
+    }
+    return fail(`Nothing was written: ${err instanceof Error ? err.message : String(err)}`);
+  }
+  const expectedAll = { ...before };
+  if (expected === void 0) delete expectedAll[key2];
+  else expectedAll[key2] = expected;
+  const after = openControl().getLimits();
+  const keys = [.../* @__PURE__ */ new Set([...Object.keys(before), ...Object.keys(after), key2])];
+  const drift = keys.filter((k) => JSON.stringify(after[k]) !== JSON.stringify(expectedAll[k]));
+  if (drift.length > 0) {
+    const show = (v) => v === void 0 ? "(unset)" : JSON.stringify(v);
+    const detail = drift.map((k) => `${k} ${show(after[k])} vs ${show(expectedAll[k])}`).join("; ");
+    return fail(
+      `Write did not land cleanly \u2014 on disk vs expected: ${detail}. Another write may have raced this one; run "policy" to see what disk holds now`
+    );
+  }
+  const headline = expected === void 0 ? `${key2} is now unset \u2014 ${unsetMeaning(key2)}.` : `${key2}: ${JSON.stringify(expected)}`;
+  return {
+    text: live ? `${headline}
+${APPLIED_LIVE}` : `${RESTART_REQUIRED}
+${headline}`
+  };
+}
+function createPolicyCommand(options) {
+  return {
+    name: "policy",
+    description: "Spend limits and counterparty policy \u2014 /policy [set|add|remove|clear <list> ...] [limit <window> <usd>|clear]",
+    acceptsArgs: true,
+    requireAuth: true,
+    handler: async (ctx) => runPolicyCommand((ctx.args ?? "").trim().split(/\s+/).filter(Boolean), options)
+  };
+}
+var SPEND_WINDOWS, USD, EVM_ADDRESS2, BASE58_ADDRESS, LIST_ACTIONS, ALLOW_LISTS, USAGE, RESTART_REQUIRED, APPLIED_LIVE;
+var init_policy = __esm({
+  "src/commands/policy.ts"() {
+    "use strict";
+    init_spend_control();
+    SPEND_WINDOWS = ["perRequest", "hourly", "daily", "session"];
+    USD = /^\d+(\.\d+)?$/;
+    EVM_ADDRESS2 = /^0x[0-9a-fA-F]{40}$/;
+    BASE58_ADDRESS = /^[1-9A-HJ-NP-Za-km-z]{32,44}$/;
+    LIST_ACTIONS = ["set", "add", "remove", "clear"];
+    ALLOW_LISTS = ["allowedPayees", "allowedNetworks", "allowedAssets"];
+    USAGE = [
+      "Usage:",
+      "  policy                                 show limits and lists on disk",
+      `  policy set|add|remove <list> <v>...    <list>: ${POLICY_LISTS.join(" | ")}`,
+      "  policy clear <list>",
+      `  policy limit <window> <usd>|clear      <window>: ${SPEND_WINDOWS.join(" | ")}`,
+      `Networks are CAIP-2 ids: ${CAIP2_BASE} (Base) or ${CAIP2_SOLANA_MAINNET} (Solana mainnet).`
+    ].join("\n");
+    RESTART_REQUIRED = "NOT applied to a running proxy \u2014 it reads spending.json once at startup. Restart the proxy (or the OpenClaw gateway) for this to take effect.";
+    APPLIED_LIVE = "Applied to the running proxy and saved to spending.json.";
+  }
+});
+
 // src/provider.ts
 function setActiveProxy(proxy) {
   activeProxy = proxy;
@@ -95628,8 +96264,8 @@ var init_provider = __esm({
         return buildProviderModels(`http://127.0.0.1:${port}/v1`);
       },
       // No auth required — the x402 proxy handles wallet-based payments internally.
-      // The proxy auto-generates a wallet on first run and stores it at
-      // ~/.openclaw/blockrun/wallet.key. Users just fund that wallet with USDC.
+      // The proxy uses the shared BlockRun Core wallet under ~/.blockrun, with
+      // automatic non-destructive migration from older ClawRouter wallet files.
       auth: []
     };
   }
@@ -109014,7 +109650,7 @@ var init_URLSearchParams = __esm({
 
 // node_modules/axios/lib/platform/node/index.js
 import crypto6 from "crypto";
-var ALPHA, DIGIT, ALPHABET, generateString, node_default;
+var ALPHA, DIGIT, ALPHABET2, generateString, node_default;
 var init_node2 = __esm({
   "node_modules/axios/lib/platform/node/index.js"() {
     "use strict";
@@ -109022,12 +109658,12 @@ var init_node2 = __esm({
     init_FormData();
     ALPHA = "abcdefghijklmnopqrstuvwxyz";
     DIGIT = "0123456789";
-    ALPHABET = {
+    ALPHABET2 = {
       DIGIT,
       ALPHA,
       ALPHA_DIGIT: ALPHA + ALPHA.toUpperCase() + DIGIT
     };
-    generateString = (size5 = 16, alphabet4 = ALPHABET.ALPHA_DIGIT) => {
+    generateString = (size5 = 16, alphabet4 = ALPHABET2.ALPHA_DIGIT) => {
       let str = "";
       const { length } = alphabet4;
       const randomValues = new Uint32Array(size5);
@@ -109044,7 +109680,7 @@ var init_node2 = __esm({
         FormData: FormData_default,
         Blob: typeof Blob !== "undefined" && Blob || null
       },
-      ALPHABET,
+      ALPHABET: ALPHABET2,
       generateString,
       protocols: ["http", "https", "file", "data"]
     };
@@ -111108,8 +111744,8 @@ var require_follow_redirects = __commonJS({
       }
       return parsed;
     }
-    function resolveUrl(relative, base3) {
-      return useNativeURL ? new URL3(relative, base3) : parseUrl3(url2.resolve(base3, relative));
+    function resolveUrl(relative, base4) {
+      return useNativeURL ? new URL3(relative, base4) : parseUrl3(url2.resolve(base4, relative));
     }
     function validateUrl(input) {
       if (/^\[/.test(input.hostname) && !/^\[[:0-9a-f]+\]$/i.test(input.hostname)) {
@@ -117920,7 +118556,7 @@ function __addDisposableResource(env, value, async) {
   return value;
 }
 function __disposeResources(env) {
-  function fail(e7) {
+  function fail2(e7) {
     env.error = env.hasError ? new _SuppressedError(e7, env.error, "An error was suppressed during disposal.") : e7;
     env.hasError = true;
   }
@@ -117932,12 +118568,12 @@ function __disposeResources(env) {
         if (r2.dispose) {
           var result = r2.dispose.call(r2.value);
           if (r2.async) return s3 |= 2, Promise.resolve(result).then(next, function(e7) {
-            fail(e7);
+            fail2(e7);
             return next();
           });
         } else s3 |= 1;
       } catch (e7) {
-        fail(e7);
+        fail2(e7);
       }
     }
     if (s3 === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
@@ -125107,15 +125743,15 @@ var require_curve = __commonJS({
           const { windows, windowSize } = calcWOpts4(W, bits);
           const points = [];
           let p = elm;
-          let base3 = p;
+          let base4 = p;
           for (let window2 = 0; window2 < windows; window2++) {
-            base3 = p;
-            points.push(base3);
+            base4 = p;
+            points.push(base4);
             for (let i = 1; i < windowSize; i++) {
-              base3 = base3.add(p);
-              points.push(base3);
+              base4 = base4.add(p);
+              points.push(base4);
             }
-            p = base3.double();
+            p = base4.double();
           }
           return points;
         },
@@ -127873,7 +128509,7 @@ var require_estimateFeesPerGas = __commonJS({
         throw new fee_js_1.BaseFeeScalarError();
       const decimals = baseFeeMultiplier.toString().split(".")[1]?.length ?? 0;
       const denominator = 10 ** decimals;
-      const multiply = (base3) => base3 * BigInt(Math.round(baseFeeMultiplier * denominator)) / BigInt(denominator);
+      const multiply = (base4) => base4 * BigInt(Math.round(baseFeeMultiplier * denominator)) / BigInt(denominator);
       const block = block_ ? block_ : await (0, getAction_js_1.getAction)(client, getBlock_js_1.getBlock, "getBlock")({});
       if (typeof chain3?.fees?.estimateFeesPerGas === "function") {
         const fees = await chain3.fees.estimateFeesPerGas({
@@ -128383,7 +129019,7 @@ var require_fillTransaction = __commonJS({
           throw new fee_js_1.BaseFeeScalarError();
         const decimals = feeMultiplier.toString().split(".")[1]?.length ?? 0;
         const denominator = 10 ** decimals;
-        const multiplyFee = (base3) => base3 * BigInt(Math.round(feeMultiplier * denominator)) / BigInt(denominator);
+        const multiplyFee = (base4) => base4 * BigInt(Math.round(feeMultiplier * denominator)) / BigInt(denominator);
         if (!transaction.feePayerSignature) {
           if (transaction.maxFeePerGas && !parameters.maxFeePerGas)
             transaction.maxFeePerGas = multiplyFee(transaction.maxFeePerGas);
@@ -133141,17 +133777,17 @@ var require_call = __commonJS({
           }
         }
         const params = (() => {
-          const base3 = [
+          const base4 = [
             request2,
             block
           ];
           if (rpcStateOverride && rpcBlockOverrides)
-            return [...base3, rpcStateOverride, rpcBlockOverrides];
+            return [...base4, rpcStateOverride, rpcBlockOverrides];
           if (rpcStateOverride)
-            return [...base3, rpcStateOverride];
+            return [...base4, rpcStateOverride];
           if (rpcBlockOverrides)
-            return [...base3, {}, rpcBlockOverrides];
-          return base3;
+            return [...base4, {}, rpcBlockOverrides];
+          return base4;
         })();
         const response = await client.request({
           method: "eth_call",
@@ -134763,14 +135399,14 @@ var require_createClient = __commonJS({
         uid: (0, uid_js_1.uid)(),
         ...experimental_blockTag ? { experimental_blockTag } : {}
       };
-      function extend2(base3) {
+      function extend2(base4) {
         return (extendFn) => {
-          const extended = extendFn(base3);
+          const extended = extendFn(base4);
           for (const key3 in client)
             delete extended[key3];
-          const combined = { ...base3, ...extended };
+          const combined = { ...base4, ...extended };
           for (const key3 in extended) {
-            const a = base3[key3];
+            const a = base4[key3];
             const b = extended[key3];
             if (isPlainObject4(a) && isPlainObject4(b))
               combined[key3] = { ...a, ...b };
@@ -136788,10 +137424,10 @@ var require_defineChain = __commonJS({
         serializers: void 0,
         ...chain3
       };
-      function extend2(base3) {
+      function extend2(base4) {
         return (fnOrExtended) => {
-          const properties = typeof fnOrExtended === "function" ? fnOrExtended(base3) : fnOrExtended;
-          const combined = { ...base3, ...properties };
+          const properties = typeof fnOrExtended === "function" ? fnOrExtended(base4) : fnOrExtended;
+          const combined = { ...base4, ...properties };
           return Object.assign(combined, { extend: extend2(combined) });
         };
       }
@@ -138126,9 +138762,9 @@ var require_typedData2 = __commonJS({
             throw new typedData_js_1.InvalidTypedDataTypeError({ type });
           const integerMatch = type.match(regex_js_1.integerRegex);
           if (integerMatch && (typeof value === "number" || typeof value === "bigint")) {
-            const [_type, base3, size_] = integerMatch;
+            const [_type, base4, size_] = integerMatch;
             (0, toHex_js_1.numberToHex)(value, {
-              signed: base3 === "int",
+              signed: base4 === "int",
               size: Number.parseInt(size_, 10) / 8
             });
           }
@@ -141920,15 +142556,15 @@ var require_curve2 = __commonJS({
           const { windows, windowSize } = calcWOpts4(W, bits);
           const points = [];
           let p = elm;
-          let base3 = p;
+          let base4 = p;
           for (let window2 = 0; window2 < windows; window2++) {
-            base3 = p;
-            points.push(base3);
+            base4 = p;
+            points.push(base4);
             for (let i = 1; i < windowSize; i++) {
-              base3 = base3.add(p);
-              points.push(base3);
+              base4 = base4.add(p);
+              points.push(base4);
             }
-            p = base3.double();
+            p = base4.double();
           }
           return points;
         },
@@ -175441,14 +176077,14 @@ var require_Authenticator = __commonJS({
       const rpIdHash = Hash4.sha256(Hex.fromString(rpId));
       const flag_bytes = Hex.fromNumber(flag, { size: 1 });
       const signCount_bytes = Hex.fromNumber(signCount, { size: 4 });
-      const base3 = Hex.concat(rpIdHash, flag_bytes, signCount_bytes);
+      const base4 = Hex.concat(rpIdHash, flag_bytes, signCount_bytes);
       if (!credential)
-        return base3;
+        return base4;
       const aaguid = Hex.fromBytes(new Uint8Array(16));
       const credentialId = Hex.fromBytes(credential.id);
       const credIdLen = Hex.fromNumber(credential.id.length, { size: 2 });
       const coseKey = CoseKey.fromPublicKey(credential.publicKey);
-      return Hex.concat(base3, aaguid, credIdLen, credentialId, coseKey);
+      return Hex.concat(base4, aaguid, credIdLen, credentialId, coseKey);
     }
     function getSignCount(authenticatorData) {
       const bytes = Bytes.fromHex(authenticatorData);
@@ -179356,7 +179992,7 @@ var require_VirtualMaster = __commonJS({
           terminateAll();
           resolve(result);
         };
-        const fail = (error) => {
+        const fail2 = (error) => {
           if (settled)
             return;
           settled = true;
@@ -179381,14 +180017,14 @@ var require_VirtualMaster = __commonJS({
                 succeed(void 0);
               return;
             case "error":
-              fail(new Errors.BaseError(msg.message));
+              fail2(new Errors.BaseError(msg.message));
               return;
           }
         };
-        const onAbort = () => fail(getAbortError2(value.signal));
+        const onAbort = () => fail2(getAbortError2(value.signal));
         value.signal?.addEventListener("abort", onAbort, { once: true });
         for (let i = 0; i < value.workerCount; i++) {
-          const handle = value.pool.spawn(i, onMessage, fail);
+          const handle = value.pool.spawn(i, onMessage, fail2);
           handles.push(handle);
           handle.postMessage({
             type: "start",
@@ -179532,8 +180168,8 @@ var require_ZoneId = __commonJS({
       return chainId - getChainIdConfig(sourceId2).base;
     }
     function toChainId(zoneId, sourceId2 = defaultSourceId) {
-      const { base: base3, range } = getChainIdConfig(sourceId2);
-      return base3 + zoneId % range;
+      const { base: base4, range } = getChainIdConfig(sourceId2);
+      return base4 + zoneId % range;
     }
     var UnsupportedSourceIdError = class extends Errors.BaseError {
       constructor({ sourceId: sourceId2 }) {
@@ -193139,7 +193775,7 @@ var require_bn = __commonJS({
         ctor.prototype = new TempCtor();
         ctor.prototype.constructor = ctor;
       }
-      function BN3(number, base3, endian) {
+      function BN3(number, base4, endian) {
         if (BN3.isBN(number)) {
           return number;
         }
@@ -193148,11 +193784,11 @@ var require_bn = __commonJS({
         this.length = 0;
         this.red = null;
         if (number !== null) {
-          if (base3 === "le" || base3 === "be") {
-            endian = base3;
-            base3 = 10;
+          if (base4 === "le" || base4 === "be") {
+            endian = base4;
+            base4 = 10;
           }
-          this._init(number || 0, base3 || 10, endian || "be");
+          this._init(number || 0, base4 || 10, endian || "be");
         }
       }
       if (typeof module2 === "object") {
@@ -193185,17 +193821,17 @@ var require_bn = __commonJS({
         if (left.cmp(right) < 0) return left;
         return right;
       };
-      BN3.prototype._init = function init2(number, base3, endian) {
+      BN3.prototype._init = function init2(number, base4, endian) {
         if (typeof number === "number") {
-          return this._initNumber(number, base3, endian);
+          return this._initNumber(number, base4, endian);
         }
         if (typeof number === "object") {
-          return this._initArray(number, base3, endian);
+          return this._initArray(number, base4, endian);
         }
-        if (base3 === "hex") {
-          base3 = 16;
+        if (base4 === "hex") {
+          base4 = 16;
         }
-        assert10(base3 === (base3 | 0) && base3 >= 2 && base3 <= 36);
+        assert10(base4 === (base4 | 0) && base4 >= 2 && base4 <= 36);
         number = number.toString().replace(/\s+/g, "");
         var start = 0;
         if (number[0] === "-") {
@@ -193203,17 +193839,17 @@ var require_bn = __commonJS({
           this.negative = 1;
         }
         if (start < number.length) {
-          if (base3 === 16) {
+          if (base4 === 16) {
             this._parseHex(number, start, endian);
           } else {
-            this._parseBase(number, base3, start);
+            this._parseBase(number, base4, start);
             if (endian === "le") {
-              this._initArray(this.toArray(), base3, endian);
+              this._initArray(this.toArray(), base4, endian);
             }
           }
         }
       };
-      BN3.prototype._initNumber = function _initNumber(number, base3, endian) {
+      BN3.prototype._initNumber = function _initNumber(number, base4, endian) {
         if (number < 0) {
           this.negative = 1;
           number = -number;
@@ -193237,9 +193873,9 @@ var require_bn = __commonJS({
           this.length = 3;
         }
         if (endian !== "le") return;
-        this._initArray(this.toArray(), base3, endian);
+        this._initArray(this.toArray(), base4, endian);
       };
-      BN3.prototype._initArray = function _initArray(number, base3, endian) {
+      BN3.prototype._initArray = function _initArray(number, base4, endian) {
         assert10(typeof number.length === "number");
         if (number.length <= 0) {
           this.words = [0];
@@ -193353,20 +193989,20 @@ var require_bn = __commonJS({
         }
         return r2;
       }
-      BN3.prototype._parseBase = function _parseBase(number, base3, start) {
+      BN3.prototype._parseBase = function _parseBase(number, base4, start) {
         this.words = [0];
         this.length = 1;
-        for (var limbLen = 0, limbPow = 1; limbPow <= 67108863; limbPow *= base3) {
+        for (var limbLen = 0, limbPow = 1; limbPow <= 67108863; limbPow *= base4) {
           limbLen++;
         }
         limbLen--;
-        limbPow = limbPow / base3 | 0;
+        limbPow = limbPow / base4 | 0;
         var total = number.length - start;
         var mod5 = total % limbLen;
         var end = Math.min(total, total - mod5) + start;
         var word = 0;
         for (var i = start; i < end; i += limbLen) {
-          word = parseBase(number, i, i + limbLen, base3);
+          word = parseBase(number, i, i + limbLen, base4);
           this.imuln(limbPow);
           if (this.words[0] + word < 67108864) {
             this.words[0] += word;
@@ -193376,9 +194012,9 @@ var require_bn = __commonJS({
         }
         if (mod5 !== 0) {
           var pow = 1;
-          word = parseBase(number, i, number.length, base3);
+          word = parseBase(number, i, number.length, base4);
           for (i = 0; i < mod5; i++) {
-            pow *= base3;
+            pow *= base4;
           }
           this.imuln(pow);
           if (this.words[0] + word < 67108864) {
@@ -193548,11 +194184,11 @@ var require_bn = __commonJS({
         52521875,
         60466176
       ];
-      BN3.prototype.toString = function toString4(base3, padding3) {
-        base3 = base3 || 10;
+      BN3.prototype.toString = function toString4(base4, padding3) {
+        base4 = base4 || 10;
         padding3 = padding3 | 0 || 1;
         var out;
-        if (base3 === 16 || base3 === "hex") {
+        if (base4 === 16 || base4 === "hex") {
           out = "";
           var off = 0;
           var carry2 = 0;
@@ -193582,14 +194218,14 @@ var require_bn = __commonJS({
           }
           return out;
         }
-        if (base3 === (base3 | 0) && base3 >= 2 && base3 <= 36) {
-          var groupSize = groupSizes[base3];
-          var groupBase = groupBases[base3];
+        if (base4 === (base4 | 0) && base4 >= 2 && base4 <= 36) {
+          var groupSize = groupSizes[base4];
+          var groupBase = groupBases[base4];
           out = "";
           var c = this.clone();
           c.negative = 0;
           while (!c.isZero()) {
-            var r2 = c.modrn(groupBase).toString(base3);
+            var r2 = c.modrn(groupBase).toString(base4);
             c = c.idivn(groupBase);
             if (!c.isZero()) {
               out = zeros2[groupSize - r2.length] + r2 + out;
@@ -204158,8 +204794,8 @@ function createCommonjsModule(fn, basedir, module) {
   return module = {
     path: basedir,
     exports: {},
-    require: function(path5, base3) {
-      return commonjsRequire(path5, base3 === void 0 || base3 === null ? module.path : base3);
+    require: function(path5, base4) {
+      return commonjsRequire(path5, base4 === void 0 || base4 === null ? module.path : base4);
     }
   }, fn(module, module.exports), module.exports;
 }
@@ -204198,7 +204834,7 @@ function BasePoint(curve, type) {
   this.precomputed = null;
 }
 function ShortCurve(conf) {
-  base2.call(this, "short", conf);
+  base3.call(this, "short", conf);
   this.a = new import_bn2.default(conf.a, 16).toRed(this.red);
   this.b = new import_bn2.default(conf.b, 16).toRed(this.red);
   this.tinv = this.two.redInvm();
@@ -204209,7 +204845,7 @@ function ShortCurve(conf) {
   this._endoWnafT2 = new Array(4);
 }
 function Point3(curve, x, y, isRed) {
-  base2.BasePoint.call(this, curve, "affine");
+  base3.BasePoint.call(this, curve, "affine");
   if (x === null && y === null) {
     this.x = null;
     this.y = null;
@@ -204229,7 +204865,7 @@ function Point3(curve, x, y, isRed) {
   }
 }
 function JPoint(curve, x, y, z) {
-  base2.BasePoint.call(this, curve, "jacobian");
+  base3.BasePoint.call(this, curve, "jacobian");
   if (x === null && y === null && z === null) {
     this.x = this.curve.one;
     this.y = this.curve.one;
@@ -204359,7 +204995,7 @@ function EC(options) {
   this.g.precompute(options.curve.n.bitLength() + 1);
   this.hash = options.hash || options.curve.hash;
 }
-var import_bn2, import_hash2, minimalisticAssert, utils_1, utils_1$1, getNAF, getJSF, assert$1, base2, inherits_browser, assert$2, short_1, curve_1, curves_1, hmacDrbg, assert$3, key, assert$4, signature2, rand, assert$5, ec, elliptic_1, EC$1;
+var import_bn2, import_hash2, minimalisticAssert, utils_1, utils_1$1, getNAF, getJSF, assert$1, base3, inherits_browser, assert$2, short_1, curve_1, curves_1, hmacDrbg, assert$3, key, assert$4, signature2, rand, assert$5, ec, elliptic_1, EC$1;
 var init_elliptic = __esm({
   "node_modules/@ethersproject/signing-key/lib.esm/elliptic.js"() {
     "use strict";
@@ -204527,7 +205163,7 @@ var init_elliptic = __esm({
     getNAF = utils_1$1.getNAF;
     getJSF = utils_1$1.getJSF;
     assert$1 = utils_1$1.assert;
-    base2 = BaseCurve;
+    base3 = BaseCurve;
     BaseCurve.prototype.point = function point() {
       throw new Error("Not implemented");
     };
@@ -204839,7 +205475,7 @@ var init_elliptic = __esm({
       }
     });
     assert$2 = utils_1$1.assert;
-    inherits_browser(ShortCurve, base2);
+    inherits_browser(ShortCurve, base3);
     short_1 = ShortCurve;
     ShortCurve.prototype._getEndomorphism = function _getEndomorphism(conf) {
       if (!this.zeroA || !this.g || !this.n || this.p.modn(3) !== 1)
@@ -205013,7 +205649,7 @@ var init_elliptic = __esm({
       }
       return res;
     };
-    inherits_browser(Point3, base2.BasePoint);
+    inherits_browser(Point3, base3.BasePoint);
     ShortCurve.prototype.point = function point2(x, y, isRed) {
       return new Point3(this, x, y, isRed);
     };
@@ -205188,7 +205824,7 @@ var init_elliptic = __esm({
       var res = this.curve.jpoint(this.x, this.y, this.curve.one);
       return res;
     };
-    inherits_browser(JPoint, base2.BasePoint);
+    inherits_browser(JPoint, base3.BasePoint);
     ShortCurve.prototype.jpoint = function jpoint(x, y, z) {
       return new JPoint(this, x, y, z);
     };
@@ -205478,7 +206114,7 @@ var init_elliptic = __esm({
     curve_1 = createCommonjsModule(function(module, exports) {
       "use strict";
       var curve = exports;
-      curve.base = base2;
+      curve.base = base3;
       curve.short = short_1;
       curve.mont = /*RicMoo:ethers:require(./mont)*/
       null;
@@ -210699,10 +211335,10 @@ var init_lib28 = __esm({
 var require_bech32 = __commonJS({
   "node_modules/bech32/index.js"(exports, module) {
     "use strict";
-    var ALPHABET2 = "qpzry9x8gf2tvdw0s3jn54khce6mua7l";
+    var ALPHABET3 = "qpzry9x8gf2tvdw0s3jn54khce6mua7l";
     var ALPHABET_MAP = {};
-    for (z = 0; z < ALPHABET2.length; z++) {
-      x = ALPHABET2.charAt(z);
+    for (z = 0; z < ALPHABET3.length; z++) {
+      x = ALPHABET3.charAt(z);
       if (ALPHABET_MAP[x] !== void 0) throw new TypeError(x + " is ambiguous");
       ALPHABET_MAP[x] = z;
     }
@@ -210737,7 +211373,7 @@ var require_bech32 = __commonJS({
         var x2 = words2[i];
         if (x2 >> 5 !== 0) throw new Error("Non 5-bit word");
         chk = polymodStep(chk) ^ x2;
-        result += ALPHABET2.charAt(x2);
+        result += ALPHABET3.charAt(x2);
       }
       for (i = 0; i < 6; ++i) {
         chk = polymodStep(chk);
@@ -210745,7 +211381,7 @@ var require_bech32 = __commonJS({
       chk ^= 1;
       for (i = 0; i < 6; ++i) {
         var v = chk >> (5 - i) * 5 & 31;
-        result += ALPHABET2.charAt(v);
+        result += ALPHABET3.charAt(v);
       }
       return result;
     }
@@ -218125,12 +218761,12 @@ var require_axios = __commonJS({
     var URLSearchParams2 = url2.URLSearchParams;
     var ALPHA2 = "abcdefghijklmnopqrstuvwxyz";
     var DIGIT2 = "0123456789";
-    var ALPHABET2 = {
+    var ALPHABET3 = {
       DIGIT: DIGIT2,
       ALPHA: ALPHA2,
       ALPHA_DIGIT: ALPHA2 + ALPHA2.toUpperCase() + DIGIT2
     };
-    var generateString2 = (size5 = 16, alphabet4 = ALPHABET2.ALPHA_DIGIT) => {
+    var generateString2 = (size5 = 16, alphabet4 = ALPHABET3.ALPHA_DIGIT) => {
       let str = "";
       const {
         length
@@ -218149,7 +218785,7 @@ var require_axios = __commonJS({
         FormData: FormData$1,
         Blob: typeof Blob !== "undefined" && Blob || null
       },
-      ALPHABET: ALPHABET2,
+      ALPHABET: ALPHABET3,
       generateString: generateString2,
       protocols: ["http", "https", "file", "data"]
     };
@@ -225475,10 +226111,10 @@ async function redeemPosition(input, deps) {
       structured: { conditionId, negRisk, transactionHash: txHash, pusdBalance: balanceAfter }
     };
   } catch (err) {
-    const base3 = await mapClobError(err);
+    const base4 = await mapClobError(err);
     const legacyHint = ` If this market predates the 2026-04-28 V2 cutover it may settle in legacy USDC.e collateral, which this tool does not auto-detect yet \u2014 redeem it once via the Polymarket UI.`;
     return {
-      text: `${base3}${/revert|execution reverted|failed/i.test(base3) ? legacyHint : ""}`,
+      text: `${base4}${/revert|execution reverted|failed/i.test(base4) ? legacyHint : ""}`,
       isError: true
     };
   }
@@ -226124,8 +226760,8 @@ var init_dist7 = __esm({
         if (normalized.startsWith("/api/")) {
           normalized = normalized.slice(4);
         }
-        const base3 = `${this.apiUrl}${normalized}`;
-        if (!params) return base3;
+        const base4 = `${this.apiUrl}${normalized}`;
+        if (!params) return base4;
         const qs = new URLSearchParams();
         for (const [key2, value] of Object.entries(params)) {
           if (value === void 0 || value === null) continue;
@@ -226139,12 +226775,12 @@ var init_dist7 = __esm({
           }
         }
         const query = qs.toString();
-        return query ? `${base3}?${query}` : base3;
+        return query ? `${base4}?${query}` : base4;
       }
       absolute(url2) {
         if (url2.startsWith("http://") || url2.startsWith("https://")) return url2;
-        const base3 = this.apiUrl.endsWith("/api") ? this.apiUrl.slice(0, -"/api".length) : this.apiUrl;
-        return `${base3}${url2}`;
+        const base4 = this.apiUrl.endsWith("/api") ? this.apiUrl.slice(0, -"/api".length) : this.apiUrl;
+        return `${base4}${url2}`;
       }
       async requestWithPayment(url2, method, body) {
         const init2 = { method };
@@ -226768,6 +227404,113 @@ var init_mcp_config = __esm({
   }
 });
 
+// src/openclaw-plugin-config.ts
+var openclaw_plugin_config_exports = {};
+__export(openclaw_plugin_config_exports, {
+  BLOCKRUN_PLUGIN_ID: () => BLOCKRUN_PLUGIN_ID,
+  prepareBlockRunPluginConfig: () => prepareBlockRunPluginConfig
+});
+function asObject2(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function prepareBlockRunPluginConfig(config, options = {}) {
+  if (!options.explicitSetup && !options.legacyBlockRunInstall && !options.stripUnsupportedInstalls) {
+    return false;
+  }
+  let changed = false;
+  let plugins = asObject2(config.plugins);
+  if (!plugins) {
+    plugins = {};
+    config.plugins = plugins;
+    changed = true;
+  }
+  let entries = asObject2(plugins.entries);
+  if (!entries) {
+    entries = {};
+    plugins.entries = entries;
+    changed = true;
+  }
+  const legacyEntry = asObject2(entries.clawrouter);
+  const currentEntry = asObject2(entries[BLOCKRUN_PLUGIN_ID]);
+  if (options.legacyBlockRunInstall && legacyEntry) {
+    const migratedEntry = currentEntry ?? {};
+    if (!currentEntry && typeof legacyEntry.enabled === "boolean") {
+      migratedEntry.enabled = legacyEntry.enabled;
+    }
+    for (const key2 of ["walletKey", "routing"]) {
+      if (!(key2 in migratedEntry) && key2 in legacyEntry) {
+        migratedEntry[key2] = legacyEntry[key2];
+      }
+      if (key2 in legacyEntry) {
+        delete legacyEntry[key2];
+        changed = true;
+      }
+    }
+    const legacyConfig = asObject2(legacyEntry.config);
+    if (legacyConfig) {
+      const currentConfig = asObject2(migratedEntry.config) ?? {};
+      for (const key2 of ["walletKey", "routing"]) {
+        if (!(key2 in currentConfig) && key2 in legacyConfig) {
+          currentConfig[key2] = legacyConfig[key2];
+        }
+        if (key2 in legacyConfig) {
+          delete legacyConfig[key2];
+          changed = true;
+        }
+      }
+      if (Object.keys(currentConfig).length > 0) migratedEntry.config = currentConfig;
+      if (Object.keys(legacyConfig).length === 0) {
+        delete legacyEntry.config;
+        changed = true;
+      }
+    }
+    if (!currentEntry || entries[BLOCKRUN_PLUGIN_ID] !== migratedEntry) {
+      entries[BLOCKRUN_PLUGIN_ID] = migratedEntry;
+      changed = true;
+    }
+  }
+  if (options.explicitSetup) {
+    const next = asObject2(entries[BLOCKRUN_PLUGIN_ID]) ?? {};
+    if (next.enabled !== true) {
+      entries[BLOCKRUN_PLUGIN_ID] = { ...next, enabled: true };
+      changed = true;
+    }
+  }
+  const allow = plugins.allow;
+  if (Array.isArray(allow)) {
+    const shouldAllow = options.explicitSetup || options.legacyBlockRunInstall && allow.includes("clawrouter");
+    if (shouldAllow && !allow.includes(BLOCKRUN_PLUGIN_ID)) {
+      allow.push(BLOCKRUN_PLUGIN_ID);
+      changed = true;
+    }
+  }
+  const deny = plugins.deny;
+  if (Array.isArray(deny)) {
+    if (options.explicitSetup) {
+      const next = deny.filter((id2) => id2 !== BLOCKRUN_PLUGIN_ID);
+      if (next.length !== deny.length) {
+        plugins.deny = next;
+        changed = true;
+      }
+    } else if (options.legacyBlockRunInstall && deny.includes("clawrouter") && !deny.includes(BLOCKRUN_PLUGIN_ID)) {
+      deny.push(BLOCKRUN_PLUGIN_ID);
+      changed = true;
+    }
+  }
+  if (options.stripUnsupportedInstalls && "installs" in plugins) {
+    delete plugins.installs;
+    changed = true;
+  }
+  return changed;
+}
+var BLOCKRUN_PLUGIN_ID;
+var init_openclaw_plugin_config = __esm({
+  "src/openclaw-plugin-config.ts"() {
+    "use strict";
+    BLOCKRUN_PLUGIN_ID = "blockrun-clawrouter";
+  }
+});
+
 // src/retry.ts
 function sleep3(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -226850,6 +227593,7 @@ __export(index_exports, {
   MalformedSpendPolicyError: () => MalformedSpendPolicyError,
   OPENCLAW_MODELS: () => OPENCLAW_MODELS,
   PARTNER_SERVICES: () => PARTNER_SERVICES,
+  PAYABLE_NETWORKS: () => PAYABLE_NETWORKS,
   RequestDeduplicator: () => RequestDeduplicator,
   ResponseCache: () => ResponseCache,
   RpcError: () => RpcError2,
@@ -226911,13 +227655,14 @@ import {
   readdirSync,
   mkdirSync as mkdirSync3,
   copyFileSync,
+  chmodSync,
   renameSync as renameSync2,
   unlinkSync
 } from "fs";
 import { readFile as readFileAsync } from "fs/promises";
 import { homedir as homedir13 } from "os";
-import { join as join16, dirname as dirname4 } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { randomUUID } from "crypto";
+import { join as join16 } from "path";
 async function waitForProxyHealth(port, timeoutMs = 3e3) {
   const start = Date.now();
   while (Date.now() - start < timeoutMs) {
@@ -226930,53 +227675,21 @@ async function waitForProxyHealth(port, timeoutMs = 3e3) {
   }
   return false;
 }
-function getPackageRoot() {
-  return join16(dirname4(fileURLToPath2(import.meta.url)), "..");
-}
-function installSkillsToWorkspace(logger48) {
+function writePrivateJsonSync(path5, value) {
+  const temporary = `${path5}.tmp.${randomUUID()}`;
   try {
-    const packageRoot = getPackageRoot();
-    const bundledSkillsDir = join16(packageRoot, "skills");
-    if (!existsSync4(bundledSkillsDir)) {
-      return;
-    }
-    const profile = (process["env"].OPENCLAW_PROFILE ?? "").trim().toLowerCase();
-    const workspaceDirName = profile && profile !== "default" ? `workspace-${profile}` : "workspace";
-    const workspaceSkillsDir = join16(homedir13(), ".openclaw", workspaceDirName, "skills");
-    mkdirSync3(workspaceSkillsDir, { recursive: true });
-    const INTERNAL_SKILLS = /* @__PURE__ */ new Set(["release"]);
-    const entries = readdirSync(bundledSkillsDir, { withFileTypes: true });
-    let installed = 0;
-    for (const entry of entries) {
-      if (!entry.isDirectory()) continue;
-      const skillName = entry.name;
-      if (INTERNAL_SKILLS.has(skillName)) continue;
-      const srcSkillFile = join16(bundledSkillsDir, skillName, "SKILL.md");
-      if (!existsSync4(srcSkillFile)) continue;
-      const destDir = join16(workspaceSkillsDir, skillName);
-      const destSkillFile = join16(destDir, "SKILL.md");
-      let needsUpdate = true;
-      if (existsSync4(destSkillFile)) {
-        try {
-          const srcContent = readTextFileSync(srcSkillFile);
-          const destContent = readTextFileSync(destSkillFile);
-          if (srcContent === destContent) needsUpdate = false;
-        } catch {
-        }
-      }
-      if (needsUpdate) {
-        mkdirSync3(destDir, { recursive: true });
-        copyFileSync(srcSkillFile, destSkillFile);
-        installed++;
-      }
-    }
-    if (installed > 0) {
-      logger48.info(`Installed ${installed} skill(s) to ${workspaceSkillsDir}`);
-    }
-  } catch (err) {
-    logger48.warn(`Failed to install skills: ${err instanceof Error ? err.message : String(err)}`);
+    writeFileSync3(temporary, JSON.stringify(value, null, 2), { mode: 384 });
+    renameSync2(temporary, path5);
+    chmodSync(path5, 384);
+  } finally {
+    if (existsSync4(temporary)) unlinkSync(temporary);
   }
 }
+function hasConfiguredWallet() {
+  return Boolean(
+    process["env"].BLOCKRUN_WALLET_KEY || existsSync4(CORE_WALLET_FILE) || existsSync4(WALLET_FILE)
+  );
+}
 function isCompletionMode() {
   const args = process.argv;
   return args.some((arg, i) => arg === "completion" && i >= 1 && i <= 3);
@@ -227150,35 +227863,19 @@ function injectModelsConfig(logger48, options = {}) {
       logger48.info(`Added ${addedCount} models to allowlist (${TOP_MODELS.length} total)`);
     }
   }
-  const pluginEntries = config.plugins?.entries;
-  if (pluginEntries && pluginEntries.clawrouter && !pluginEntries[BLOCKRUN_PLUGIN_ID]) {
-    pluginEntries[BLOCKRUN_PLUGIN_ID] = pluginEntries.clawrouter;
-    delete pluginEntries.clawrouter;
+  const legacyEntry = config.plugins?.entries?.clawrouter;
+  const legacyEntryConfig = legacyEntry?.config;
+  const legacyBlockRunInstall = Boolean(
+    legacyEntry && ["walletKey", "routing"].some(
+      (key2) => key2 in legacyEntry || (legacyEntryConfig ? key2 in legacyEntryConfig : false)
+    )
+  );
+  if (legacyBlockRunInstall && prepareBlockRunPluginConfig(config, { legacyBlockRunInstall })) {
     needsWrite = true;
     logger48.info(
-      "Migrated plugins.entries.clawrouter -> blockrun-clawrouter (OpenClaw bundles its own `clawrouter` plugin; see #305)"
+      `Migrated legacy BlockRun plugin config to ${BLOCKRUN_PLUGIN_ID} (renamed from clawrouter; see #305)`
     );
   }
-  const pluginsCfg = config.plugins;
-  const allow = pluginsCfg?.allow;
-  if (Array.isArray(allow) && allow.includes("clawrouter") && !allow.includes(BLOCKRUN_PLUGIN_ID)) {
-    allow.push(BLOCKRUN_PLUGIN_ID);
-    needsWrite = true;
-    logger48.info(`Added ${BLOCKRUN_PLUGIN_ID} to plugins.allow (renamed from clawrouter; see #305)`);
-  }
-  const deny = pluginsCfg?.deny;
-  if (Array.isArray(deny) && deny.includes("clawrouter") && !deny.includes(BLOCKRUN_PLUGIN_ID)) {
-    deny.push(BLOCKRUN_PLUGIN_ID);
-    needsWrite = true;
-    logger48.info(`Added ${BLOCKRUN_PLUGIN_ID} to plugins.deny (renamed from clawrouter; see #305)`);
-  }
-  const installs = pluginsCfg?.installs;
-  if (installs && installs.clawrouter && !installs[BLOCKRUN_PLUGIN_ID]) {
-    installs[BLOCKRUN_PLUGIN_ID] = installs.clawrouter;
-    delete installs.clawrouter;
-    needsWrite = true;
-    logger48.info(`Migrated plugins.installs.clawrouter -> ${BLOCKRUN_PLUGIN_ID} (see #305)`);
-  }
   if (!config.tools || typeof config.tools !== "object" || Array.isArray(config.tools)) {
     config.tools = {};
     needsWrite = true;
@@ -227218,8 +227915,9 @@ function injectModelsConfig(logger48, options = {}) {
     }
     try {
       const tmpPath = `${configPath}.tmp.${process.pid}`;
-      writeFileSync3(tmpPath, JSON.stringify(config, null, 2));
+      writeFileSync3(tmpPath, JSON.stringify(config, null, 2), { mode: 384 });
       renameSync2(tmpPath, configPath);
+      chmodSync(configPath, 384);
       logger48.info("Smart routing enabled (blockrun/auto)");
     } catch (err) {
       logger48.info(`Failed to write config: ${err instanceof Error ? err.message : String(err)}`);
@@ -227254,7 +227952,7 @@ function syncAgentModelCache(logger48, options = {}) {
       const staleCount = Array.isArray(current) ? current.length : 0;
       entry.models = VISIBLE_OPENCLAW_MODELS;
       const tmpPath = `${cachePath}.tmp.${process.pid}`;
-      writeFileSync3(tmpPath, JSON.stringify(cache2, null, 2));
+      writeFileSync3(tmpPath, JSON.stringify(cache2, null, 2), { mode: 384 });
       renameSync2(tmpPath, cachePath);
       logger48.info(
         `Repaired ${agent} model cache: ${staleCount} \u2192 ${expectedIds.length} BlockRun models`
@@ -227325,7 +228023,7 @@ function injectAuthProfile(logger48) {
         key: "x402-proxy-handles-auth"
       };
       try {
-        writeFileSync3(authPath, JSON.stringify(store, null, 2));
+        writePrivateJsonSync(authPath, store);
         logger48.info(`Injected BlockRun auth profile for agent: ${agentId}`);
       } catch (err) {
         logger48.info(
@@ -227441,7 +228139,7 @@ async function startProxyInBackground(api, startupGeneration) {
   } else {
     if (configKey !== void 0) {
       api.logger.warn(
-        `pluginConfig.walletKey is set but invalid (expected 0x + 64 hex chars) \u2014 falling back to saved wallet`
+        `pluginConfig.walletKey is set but invalid (expected 0x + 64 hex chars) \u2014 falling back to the BlockRun wallet`
       );
     }
     wallet = await resolveOrGenerateWalletKey();
@@ -227453,6 +228151,8 @@ async function startProxyInBackground(api, startupGeneration) {
     api.logger.warn(`  Run /wallet export to get your private key`);
     api.logger.warn(`  Losing this key = losing your USDC funds`);
     api.logger.warn(`\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550`);
+  } else if (wallet.source === "core") {
+    api.logger.info(`Using BlockRun Core wallet: ${wallet.address}`);
   } else if (wallet.source === "saved") {
     api.logger.info(`Using saved wallet: ${wallet.address}`);
   } else if (wallet.source === "config") {
@@ -227473,6 +228173,7 @@ async function startProxyInBackground(api, startupGeneration) {
     routingConfig,
     maxCostPerRunUsd,
     maxCostPerRunMode,
+    spendControl: liveSpendControl = new SpendControl(),
     onReady: (port) => {
       api.logger.info(`BlockRun x402 proxy listening on port ${port}`);
     },
@@ -227739,7 +228440,7 @@ function buildImageGenerationProvider() {
         ]
       }
     },
-    isConfigured: () => existsSync4(WALLET_FILE),
+    isConfigured: hasConfiguredWallet,
     generateImage: async (req) => {
       const port = getProxyPort();
       const body = JSON.stringify({
@@ -227789,7 +228490,7 @@ function buildMusicGenerationProvider() {
       supportsFormat: true,
       supportedFormats: ["mp3"]
     },
-    isConfigured: () => existsSync4(WALLET_FILE),
+    isConfigured: hasConfiguredWallet,
     generateMusic: async (req) => {
       const port = getProxyPort();
       const body = JSON.stringify({
@@ -227865,7 +228566,7 @@ function buildVideoGenerationProvider() {
         supportedDurationSeconds: [5, 8, 10]
       }
     },
-    isConfigured: () => existsSync4(WALLET_FILE),
+    isConfigured: hasConfiguredWallet,
     generateVideo: async (req) => {
       const port = getProxyPort();
       const imageUrl = req.inputImages?.[0]?.url;
@@ -227944,26 +228645,25 @@ function createWalletCommand(api) {
     requireAuth: true,
     handler: async (ctx) => {
       const subcommand = ctx.args?.trim().toLowerCase() || "status";
-      let walletKey;
-      let address2;
+      let wallet;
       try {
-        if (existsSync4(WALLET_FILE)) {
-          walletKey = readTextFileSync(WALLET_FILE).trim();
-          if (walletKey.startsWith("0x") && walletKey.length === 66) {
-            const account = privateKeyToAccount(walletKey);
-            address2 = account.address;
-          }
-        }
-      } catch {
+        wallet = subcommand === "status" || subcommand === "export" ? await resolveExistingWalletKey() : await resolveOrGenerateWalletKey();
+      } catch (error) {
+        return {
+          text: `Could not load the BlockRun wallet: ${error instanceof Error ? error.message : String(error)}`,
+          isError: true
+        };
       }
-      if (!walletKey || !address2) {
+      if (!wallet) {
         return {
-          text: `No ClawRouter wallet found.
-
-Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
+          text: "No BlockRun wallet found. Run `clawrouter setup` or connect an agent in ClawRouter Desktop to create one.",
           isError: true
         };
       }
+      const walletKey = wallet.key;
+      const address2 = wallet.address;
+      const resolvedSolanaKey = wallet.solanaPrivateKeyBytes;
+      const walletPath = wallet.source === "core" ? CORE_WALLET_FILE : WALLET_FILE;
       if (subcommand === "export") {
         const lines = [
           "**ClawRouter Wallet Export**",
@@ -228000,13 +228700,26 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
           }
         } catch {
         }
+        if (!hasMnemonic3 && resolvedSolanaKey) {
+          try {
+            const { createKeyPairSignerFromPrivateKeyBytes: createKeyPairSignerFromPrivateKeyBytes2 } = await Promise.resolve().then(() => (init_index_node37(), index_node_exports));
+            const signer = await createKeyPairSignerFromPrivateKeyBytes2(resolvedSolanaKey);
+            lines.push(
+              "",
+              "**Solana:**",
+              `  Address: \`${signer.address}\``,
+              wallet.source === "core" ? `  Private key managed by BlockRun Core: \`${CORE_SOLANA_WALLET_FILE}\`` : "  Private key is managed by the configured wallet source."
+            );
+          } catch {
+          }
+        }
         lines.push(
           "",
           "**To restore on a new machine:**",
           "1. Set the environment variable before running OpenClaw:",
           `   \`export BLOCKRUN_WALLET_KEY=${walletKey}\``,
           "2. Or save to file:",
-          `   \`mkdir -p ~/.openclaw/blockrun && echo "${walletKey}" > ~/.openclaw/blockrun/wallet.key && chmod 600 ~/.openclaw/blockrun/wallet.key\``
+          `   \`mkdir -p ~/.blockrun && echo "${walletKey}" > ~/.blockrun/.session && chmod 600 ~/.blockrun/.session\``
         );
         if (hasMnemonic3) {
           lines.push(
@@ -228019,6 +228732,22 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
       if (subcommand === "solana") {
         try {
           let solanaAddr;
+          if (resolvedSolanaKey) {
+            await savePaymentChain("solana");
+            const { createKeyPairSignerFromPrivateKeyBytes: createKeyPairSignerFromPrivateKeyBytes3 } = await Promise.resolve().then(() => (init_index_node37(), index_node_exports));
+            const signer2 = await createKeyPairSignerFromPrivateKeyBytes3(resolvedSolanaKey);
+            solanaAddr = signer2.address;
+            if (api) restartProxyForChainSwitch(api);
+            return {
+              text: [
+                "\u2713 Payment chain switched to **Solana**.",
+                api ? "Proxy restarting in background (~2s)." : "Restart the gateway to apply.",
+                "",
+                `**Solana Address:** \`${solanaAddr}\``,
+                `**Fund with USDC on Solana:** https://solscan.io/account/${solanaAddr}`
+              ].join("\n")
+            };
+          }
           if (existsSync4(MNEMONIC_FILE)) {
             const existingMnemonic = readTextFileSync(MNEMONIC_FILE).trim();
             if (existingMnemonic) {
@@ -228090,13 +228819,9 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
       })();
       const solanaPromise = (async () => {
         try {
-          if (!existsSync4(MNEMONIC_FILE)) return "";
-          const { deriveSolanaKeyBytes: deriveSolanaKeyBytes2 } = await Promise.resolve().then(() => (init_wallet2(), wallet_exports));
-          const mnemonic = readTextFileSync(MNEMONIC_FILE).trim();
-          if (!mnemonic) return "";
-          const solKeyBytes = deriveSolanaKeyBytes2(mnemonic);
+          if (!resolvedSolanaKey) return "";
           const { createKeyPairSignerFromPrivateKeyBytes: createKeyPairSignerFromPrivateKeyBytes2 } = await Promise.resolve().then(() => (init_index_node37(), index_node_exports));
-          const signer = await createKeyPairSignerFromPrivateKeyBytes2(solKeyBytes);
+          const signer = await createKeyPairSignerFromPrivateKeyBytes2(resolvedSolanaKey);
           const solAddr = signer.address;
           let solBalanceText = "Balance: (could not check)";
           try {
@@ -228157,7 +228882,7 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
           solanaSection,
           usageSection,
           "",
-          `**Key File:** \`${WALLET_FILE}\``,
+          `**Key File:** \`${walletPath}\``,
           "",
           "**Commands:**",
           "\u2022 `/wallet` - Show this status",
@@ -228171,7 +228896,7 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
     }
   };
 }
-var activeProxyHandle, pendingConfiguredStartupApi, IMAGE_DIR2, AUDIO_DIR2, VIDEO_DIR2, BLOCKRUN_PLUGIN_ID, plugin, index_default2;
+var activeProxyHandle, liveSpendControl, pendingConfiguredStartupApi, IMAGE_DIR2, AUDIO_DIR2, VIDEO_DIR2, plugin, index_default2;
 var init_index = __esm({
   "src/index.ts"() {
     "use strict";
@@ -228191,7 +228916,11 @@ var init_index = __esm({
     init_tool();
     init_stats2();
     init_exclude();
+    init_policy();
+    init_spend_control();
     init_mcp_config();
+    init_openclaw_plugin_config();
+    init_openclaw_plugin_config();
     init_proxy();
     init_provider();
     init_models();
@@ -228210,11 +228939,11 @@ var init_index = __esm({
     init_response_cache();
     init_partners();
     activeProxyHandle = null;
+    liveSpendControl = null;
     pendingConfiguredStartupApi = null;
     IMAGE_DIR2 = join16(homedir13(), ".openclaw", "blockrun", "images");
     AUDIO_DIR2 = join16(homedir13(), ".openclaw", "blockrun", "audio");
     VIDEO_DIR2 = join16(homedir13(), ".openclaw", "blockrun", "videos");
-    BLOCKRUN_PLUGIN_ID = "blockrun-clawrouter";
     plugin = {
       // NOT "clawrouter". OpenClaw bundles its own plugin under that id since the
       // 2026.7.1 line (vendored at dist/extensions/clawrouter, provider `clawrouter/*`,
@@ -228232,7 +228961,6 @@ var init_index = __esm({
           api.logger.info("ClawRouter disabled (CLAWROUTER_DISABLED=true). Using default routing.");
           return;
         }
-        installSkillsToWorkspace(api.logger);
         const proc = process;
         const proxyAlreadyStarted = !!proc.__clawrouterProxyStarted;
         if (isCompletionMode()) {
@@ -228525,9 +229253,14 @@ ${errText}`
         }
         api.registerCommand(createStatsCommand());
         api.registerCommand(createExcludeCommand());
+        api.registerCommand(
+          createPolicyCommand({
+            liveControl: () => activeProxyHandle ? liveSpendControl ?? void 0 : void 0
+          })
+        );
         if (shouldLogRegistration) {
           api.logger.info(
-            "Commands registered: /wallet, /blockrun, /stats, /exclude, /partners, /cr-imagegen, /videogen, /cr-call"
+            "Commands registered: /wallet, /blockrun, /stats, /exclude, /policy, /partners, /cr-imagegen, /videogen, /cr-call"
           );
         }
         api.registerService({
@@ -228559,6 +229292,8 @@ ${errText}`
                 api.logger.warn(`  Run /wallet export to get your private key`);
                 api.logger.warn(`  Losing this key = losing your USDC funds`);
                 api.logger.warn(`\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550`);
+              } else if (source === "core") {
+                api.logger.info(`Using BlockRun Core wallet: ${address2}`);
               } else if (source === "saved") {
                 api.logger.info(`Using saved wallet: ${address2}`);
               } else if (source === "config") {
@@ -228632,18 +229367,18 @@ ${errText}`
               delete config.models.providers.blockrun;
             }
             removeManagedBlockrunMcpServerConfig(config);
-            for (const key2 of [
-              BLOCKRUN_PLUGIN_ID,
-              "clawrouter",
-              "ClawRouter",
-              "@blockrun/clawrouter"
-            ]) {
+            for (const key2 of [BLOCKRUN_PLUGIN_ID, "ClawRouter", "@blockrun/clawrouter"]) {
               if (config.plugins?.entries?.[key2]) delete config.plugins.entries[key2];
               if (config.plugins?.installs?.[key2]) delete config.plugins.installs[key2];
             }
             if (Array.isArray(config.plugins?.allow)) {
               config.plugins.allow = config.plugins.allow.filter(
-                (p) => p !== BLOCKRUN_PLUGIN_ID && p !== "clawrouter" && p !== "ClawRouter" && p !== "@blockrun/clawrouter"
+                (p) => p !== BLOCKRUN_PLUGIN_ID && p !== "ClawRouter" && p !== "@blockrun/clawrouter"
+              );
+            }
+            if (Array.isArray(config.plugins?.deny)) {
+              config.plugins.deny = config.plugins.deny.filter(
+                (p) => p !== BLOCKRUN_PLUGIN_ID && p !== "ClawRouter" && p !== "@blockrun/clawrouter"
               );
             }
             if (config.agents?.defaults?.models) {
@@ -228658,8 +229393,9 @@ ${errText}`
               delete config.tools.web.search.provider;
             }
             const tmpPath = `${configPath}.tmp.${process.pid}`;
-            writeFileSync3(tmpPath, JSON.stringify(config, null, 2));
+            writeFileSync3(tmpPath, JSON.stringify(config, null, 2), { mode: 384 });
             renameSync2(tmpPath, configPath);
+            chmodSync(configPath, 384);
             api.logger.info("ClawRouter config cleaned up");
           }
         } catch (err) {
@@ -228676,7 +229412,7 @@ ${errText}`
                 const store = JSON.parse(readTextFileSync(authPath));
                 if (store.profiles?.["blockrun:default"]) {
                   delete store.profiles["blockrun:default"];
-                  writeFileSync3(authPath, JSON.stringify(store, null, 2));
+                  writePrivateJsonSync(authPath, store);
                 }
               } catch {
               }
@@ -228956,7 +229692,8 @@ function printDiagnostics(result) {
   );
   console.log("\nWallet");
   if (result.wallet.exists && result.wallet.valid) {
-    console.log(`  ${green(`Key: ${WALLET_FILE} (${result.wallet.source})`)}`);
+    const walletPath = result.wallet.source === "core" ? CORE_WALLET_FILE : WALLET_FILE;
+    console.log(`  ${green(`Key: ${walletPath} (${result.wallet.source})`)}`);
     console.log(`  ${green(`EVM Address:    ${result.wallet.address}`)}`);
     if (result.wallet.solanaAddress) {
       console.log(`  ${green(`Solana Address: ${result.wallet.solanaAddress}`)}`);
@@ -229151,6 +229888,7 @@ async function runDoctor(userQuestion, model = "sonnet") {
 
 // src/cli.ts
 init_partners();
+init_policy();
 function printHelp() {
   console.log(`
 ClawRouter v${VERSION} - Smart LLM Router
@@ -229166,6 +229904,10 @@ Usage:
   clawrouter report [daily|weekly|monthly] [--json]
   clawrouter logs [--days <n>]
   clawrouter setup                     # Finish OpenClaw integration after npm install -g
+  clawrouter policy                    # Spend limits + payee/network/asset lists on disk
+  clawrouter policy set|add|remove <list> <value>...
+  clawrouter policy clear <list>       # <list>: allowedPayees|blockedPayees|allowedNetworks|allowedAssets
+  clawrouter policy limit <window> <usd>|clear   # <window>: perRequest|hourly|daily|session
   clawrouter share last [--as=<im>]    # Convert most recent response for IM (default: feishu)
   clawrouter share list [--limit=<n>]  # Recent response ids + summaries
   clawrouter share <id> [--as=<im>]    # Convert a specific response by id
@@ -229182,6 +229924,7 @@ Options:
   --version, -v     Show version number
   --help, -h        Show this help message
   --port <number>   Port to listen on (default: ${getProxyPort()})
+  --no-reuse        Refuse an existing listener (used by managed Desktop startup)
 
 Query Commands (talk to running proxy on localhost:${getProxyPort()}):
   status            Proxy status: wallet, balance, payment chain
@@ -229204,6 +229947,7 @@ Management Commands:
   wallet recover    Restore wallet.key from mnemonic (if generated by ClawRouter)
   chain solana      Switch to Solana (persists)
   chain base        Switch to Base EVM (persists)
+  policy            Edit spend limits and counterparty lists (fail-closed; restart proxy to apply)
 
 Environment Variables:
   BLOCKRUN_WALLET_KEY     Private key for x402 payments (auto-generated if not set)
@@ -229435,9 +230179,9 @@ Usage Stats (last ${days} days)
   }
 }
 async function cmdPhone(port, subcommand, numbersAction, arg, areaCode) {
-  const base3 = `http://127.0.0.1:${port}`;
+  const base4 = `http://127.0.0.1:${port}`;
   async function postJson(path5, body) {
-    const resp = await fetch(`${base3}${path5}`, {
+    const resp = await fetch(`${base4}${path5}`, {
       method: "POST",
       headers: { "content-type": "application/json" },
       body: JSON.stringify(body)
@@ -229571,10 +230315,22 @@ Cache Stats
 }
 async function cmdSetup() {
   const { execFileSync, execSync } = await import("child_process");
-  const { existsSync: existsSync5 } = await import("fs");
-  const { dirname: dirname5, join: join17 } = await import("path");
+  const {
+    copyFileSync: copyFileSync2,
+    cpSync,
+    existsSync: existsSync5,
+    mkdirSync: mkdirSync4,
+    readFileSync: readFileSync4,
+    readdirSync: readdirSync2,
+    renameSync: renameSync3,
+    rmSync,
+    unlinkSync: unlinkSync2,
+    writeFileSync: writeFileSync4
+  } = await import("fs");
+  const { dirname: dirname4, join: join17 } = await import("path");
   const { homedir: homedir14 } = 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");
   const openclawPath = (() => {
     const candidates = [];
@@ -229594,7 +230350,7 @@ async function cmdSetup() {
         encoding: "utf8",
         stdio: ["ignore", "pipe", "ignore"]
       }).trim();
-      if (npmRoot) candidates.push(join17(dirname5(dirname5(npmRoot)), "bin", "openclaw"));
+      if (npmRoot) candidates.push(join17(dirname4(dirname4(npmRoot)), "bin", "openclaw"));
     } catch {
     }
     candidates.push(
@@ -229611,38 +230367,236 @@ async function cmdSetup() {
     process.exit(1);
   }
   console.log(`  \u2713 Found openclaw at ${openclawPath}`);
+  const configPath = join17(homedir14(), ".openclaw", "openclaw.json");
+  const configInitiallyExisted = existsSync5(configPath);
+  const configRollbackBackup = configInitiallyExisted ? `${configPath}.before-${BLOCKRUN_PLUGIN_ID2}.${Date.now()}` : void 0;
+  if (configRollbackBackup) copyFileSync2(configPath, configRollbackBackup);
+  const ensureConfigRollbackBackup = () => {
+    return configRollbackBackup;
+  };
+  let installAttempted = false;
+  const openclawRoot = join17(homedir14(), ".openclaw");
+  const findManagedBlockRunInstalls = () => {
+    const candidates = [
+      join17(openclawRoot, "extensions", BLOCKRUN_PLUGIN_ID2),
+      join17(openclawRoot, "extensions", "clawrouter"),
+      join17(openclawRoot, "npm", "node_modules", "@blockrun", "clawrouter")
+    ];
+    const projectsDir = join17(openclawRoot, "npm", "projects");
+    try {
+      for (const project of readdirSync2(projectsDir)) {
+        candidates.push(join17(projectsDir, project, "node_modules", "@blockrun", "clawrouter"));
+      }
+    } catch {
+    }
+    return [...new Set(candidates)].filter((candidate) => {
+      try {
+        const metadata = JSON.parse(readFileSync4(join17(candidate, "package.json"), "utf8"));
+        return metadata.name === "@blockrun/clawrouter";
+      } catch {
+        return false;
+      }
+    });
+  };
+  const initialPluginDirs = findManagedBlockRunInstalls();
+  const setupRollbackRoot = join17(
+    openclawRoot,
+    "blockrun",
+    "setup-rollbacks",
+    `${Date.now()}-${process.pid}`
+  );
+  const pluginRollbackBackups = /* @__PURE__ */ new Map();
+  if (initialPluginDirs.length > 0) {
+    mkdirSync4(setupRollbackRoot, { recursive: true, mode: 448 });
+    for (const [index2, pluginDir] of initialPluginDirs.entries()) {
+      const backup = join17(setupRollbackRoot, String(index2));
+      cpSync(pluginDir, backup, { recursive: true });
+      pluginRollbackBackups.set(pluginDir, backup);
+    }
+  }
+  const restoreSetupConfig = () => {
+    if (configRollbackBackup && existsSync5(configRollbackBackup)) {
+      copyFileSync2(configRollbackBackup, configPath);
+      console.error(`  \u2713 Restored original OpenClaw config from ${configRollbackBackup}`);
+    } else if (!configInitiallyExisted && existsSync5(configPath)) {
+      rmSync(configPath);
+      console.error("  \u2713 Removed the partially created OpenClaw config");
+    }
+  };
+  const rollbackSetup = () => {
+    if (installAttempted) {
+      if (initialPluginDirs.length === 0) {
+        try {
+          execFileSync(openclawPath, ["plugins", "uninstall", "--force", BLOCKRUN_PLUGIN_ID2], {
+            stdio: "ignore",
+            timeout: 3e4
+          });
+        } catch {
+        }
+      }
+      for (const currentDir of findManagedBlockRunInstalls()) {
+        if (!pluginRollbackBackups.has(currentDir)) {
+          rmSync(currentDir, { recursive: true, force: true });
+        }
+      }
+      for (const [pluginDir, backup] of pluginRollbackBackups) {
+        if (!existsSync5(backup)) continue;
+        rmSync(pluginDir, { recursive: true, force: true });
+        mkdirSync4(dirname4(pluginDir), { recursive: true });
+        cpSync(backup, pluginDir, { recursive: true });
+      }
+    }
+    restoreSetupConfig();
+    rmSync(setupRollbackRoot, { recursive: true, force: true });
+  };
+  let legacyBlockRunInstall = false;
+  let stagedLegacyEntry;
+  if (existsSync5(configPath)) {
+    try {
+      const config = JSON.parse(readFileSync4(configPath, "utf8"));
+      const legacyPackagePath = join17(
+        homedir14(),
+        ".openclaw",
+        "extensions",
+        "clawrouter",
+        "package.json"
+      );
+      if (existsSync5(legacyPackagePath)) {
+        try {
+          const legacyPackage = JSON.parse(readFileSync4(legacyPackagePath, "utf8"));
+          legacyBlockRunInstall = legacyPackage.name === "@blockrun/clawrouter";
+        } catch {
+        }
+      }
+      let stripUnsupportedInstalls = false;
+      try {
+        execFileSync(openclawPath, ["config", "validate"], {
+          encoding: "utf8",
+          stdio: ["ignore", "pipe", "pipe"],
+          timeout: 3e4
+        });
+      } catch (error) {
+        const output = `${error instanceof Error ? error.message : String(error)} ${typeof error === "object" && error && "stdout" in error ? String(error.stdout) : ""} ${typeof error === "object" && error && "stderr" in error ? String(error.stderr) : ""}`;
+        stripUnsupportedInstalls = output.includes("Unrecognized key") && output.includes("installs");
+      }
+      let configChanged = false;
+      if (legacyBlockRunInstall) {
+        const stagedConfig = structuredClone(config);
+        prepareBlockRunPluginConfig2(stagedConfig, { legacyBlockRunInstall: true });
+        const stagedPlugins = stagedConfig.plugins;
+        const stagedEntries = stagedPlugins?.entries;
+        stagedLegacyEntry = stagedEntries?.[BLOCKRUN_PLUGIN_ID2];
+        const livePlugins = config.plugins;
+        if (stagedEntries?.clawrouter && livePlugins?.entries?.clawrouter) {
+          if (JSON.stringify(livePlugins.entries.clawrouter) !== JSON.stringify(stagedEntries.clawrouter)) {
+            livePlugins.entries.clawrouter = stagedEntries.clawrouter;
+            configChanged = true;
+          }
+        }
+      }
+      configChanged = prepareBlockRunPluginConfig2(config, { stripUnsupportedInstalls }) || configChanged;
+      if (configChanged) {
+        const backupPath = ensureConfigRollbackBackup();
+        const tmpPath = `${configPath}.tmp.${process.pid}`;
+        writeFileSync4(tmpPath, `${JSON.stringify(config, null, 2)}
+`, { mode: 384 });
+        renameSync3(tmpPath, configPath);
+        console.log(`  \u2713 Prepared OpenClaw 2.0 config (backup: ${backupPath})`);
+      }
+    } catch (err) {
+      rollbackSetup();
+      console.error(
+        `  \u2717 Cannot safely prepare OpenClaw config: ${err instanceof Error ? err.message : String(err)}`
+      );
+      process.exit(1);
+    }
+  }
   console.log("\n\u2192 Registering ClawRouter with OpenClaw...");
-  let installOk = false;
   try {
-    execFileSync(openclawPath, ["plugins", "install", "--force", "@blockrun/clawrouter"], {
-      stdio: "inherit"
+    let acceptsCapabilities = false;
+    try {
+      const help = execFileSync(openclawPath, ["plugins", "install", "--help"], {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "pipe"],
+        timeout: 15e3
+      });
+      acceptsCapabilities = help.includes("--accept-capabilities");
+    } catch {
+    }
+    const installSpec = process.env.BLOCKRUN_CLAWROUTER_INSTALL_SPEC ?? "@blockrun/clawrouter";
+    const installArgs = ["plugins", "install", "--force"];
+    if (acceptsCapabilities) installArgs.push("--accept-capabilities");
+    installArgs.push(installSpec);
+    installAttempted = true;
+    execFileSync(openclawPath, installArgs, {
+      stdio: "inherit",
+      timeout: 18e4
     });
-    installOk = true;
   } catch (err) {
-    console.warn(
-      `  \u26A0 openclaw plugins install reported a problem: ${err instanceof Error ? err.message : String(err)}`
+    rollbackSetup();
+    console.error(
+      `  \u2717 OpenClaw plugin install failed: ${err instanceof Error ? err.message : String(err)}`
     );
-    console.warn("    Continuing with manual config sync \u2014 if validation rejected the install,");
-    console.warn(
-      "    re-run `openclaw plugins install --force @blockrun/clawrouter` after gateway start."
+    console.error(
+      "    Configuration was rolled back. Fix the error and run `clawrouter setup` again."
     );
+    process.exit(1);
+  }
+  if (existsSync5(configPath)) {
+    try {
+      const config = JSON.parse(readFileSync4(configPath, "utf8"));
+      if (stagedLegacyEntry) {
+        const plugins = config.plugins ??= {};
+        const entries = plugins.entries ??= {};
+        const current = entries[BLOCKRUN_PLUGIN_ID2] ?? {};
+        const stagedConfig = stagedLegacyEntry.config;
+        const currentConfig = current.config;
+        entries[BLOCKRUN_PLUGIN_ID2] = {
+          ...stagedLegacyEntry,
+          ...current,
+          ...stagedConfig || currentConfig ? { config: { ...stagedConfig, ...currentConfig } } : {}
+        };
+      }
+      const configChanged = prepareBlockRunPluginConfig2(config, {
+        explicitSetup: true,
+        legacyBlockRunInstall
+      });
+      if (stagedLegacyEntry || configChanged) {
+        const backupPath = ensureConfigRollbackBackup();
+        const tmpPath = `${configPath}.tmp.${process.pid}`;
+        writeFileSync4(tmpPath, `${JSON.stringify(config, null, 2)}
+`, { mode: 384 });
+        renameSync3(tmpPath, configPath);
+        console.log(
+          `  \u2713 Enabled ${BLOCKRUN_PLUGIN_ID2}${backupPath ? ` (backup: ${backupPath})` : ""}`
+        );
+      }
+    } catch (err) {
+      rollbackSetup();
+      console.error(
+        `  \u2717 Plugin installed, but its config could not be enabled safely: ${err instanceof Error ? err.message : String(err)}`
+      );
+      process.exit(1);
+    }
   }
   console.log("\n\u2192 Syncing models allowlist + auth profile...");
   const setupLogger = {
     info: (msg) => console.log(`  ${msg}`)
   };
   try {
+    if (existsSync5(configPath)) ensureConfigRollbackBackup();
     injectModelsConfig2(setupLogger, { forceWrite: true });
     syncAgentModelCache2(setupLogger, { forceWrite: true });
     injectAuthProfile2(setupLogger);
   } catch (err) {
+    rollbackSetup();
     console.error(`  \u2717 Config sync failed: ${err instanceof Error ? err.message : String(err)}`);
     process.exit(1);
   }
-  if (installOk) {
-    console.log("\n\u2713 Setup complete.");
-  } else {
-    console.log("\n\u2713 Models config synced (plugin registration may need a manual retry).");
+  console.log("\n\u2713 Setup complete.");
+  rmSync(setupRollbackRoot, { recursive: true, force: true });
+  if (configRollbackBackup && existsSync5(configRollbackBackup)) {
+    unlinkSync2(configRollbackBackup);
   }
   console.log("\nNext: restart the gateway to load ClawRouter:");
   console.log("  openclaw gateway restart");
@@ -229666,6 +230620,7 @@ function parseArgs(args) {
     walletRecover: false,
     chain: void 0,
     port: void 0,
+    noReuse: false,
     queryStatus: false,
     queryWallet: false,
     queryModels: false,
@@ -229682,7 +230637,9 @@ function parseArgs(args) {
     phoneSubcommand: void 0,
     phoneNumbersAction: void 0,
     phoneArg: void 0,
-    phoneAreaCode: void 0
+    phoneAreaCode: void 0,
+    policy: false,
+    policyArgs: []
   };
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
@@ -229743,9 +230700,15 @@ function parseArgs(args) {
     } else if ((arg === "chain" || arg === "/wallet") && (args[i + 1] === "solana" || args[i + 1] === "base")) {
       result.chain = args[i + 1];
       i++;
+    } else if (arg === "policy") {
+      result.policy = true;
+      result.policyArgs = args.slice(i + 1);
+      break;
     } else if (arg === "--port" && args[i + 1]) {
       result.port = parseInt(args[i + 1], 10);
       i++;
+    } else if (arg === "--no-reuse") {
+      result.noReuse = true;
     } else if (arg === "setup") {
       result.setup = true;
     } else if (arg === "phone") {
@@ -229833,6 +230796,15 @@ async function main() {
     await cmdSetup();
     process.exit(0);
   }
+  if (args.policy) {
+    const result = runPolicyCommand(args.policyArgs);
+    if (result.isError) {
+      console.error(`\u2717 ${result.text}`);
+      process.exit(1);
+    }
+    console.log(result.text);
+    process.exit(0);
+  }
   const queryPort = args.port ?? getProxyPort();
   if (args.queryStatus) {
     await cmdStatus(queryPort);
@@ -229950,16 +230922,13 @@ ClawRouter Partner APIs (v${VERSION})
   if (args.chain) {
     const targetChain = args.chain;
     if (targetChain === "solana") {
-      const { existsSync: existsSync5 } = await import("fs");
       const { MNEMONIC_FILE: MNEMONIC_FILE2, setupSolana: setupSolana2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
-      const { deriveSolanaKeyBytes: deriveSolanaKeyBytes2, getSolanaAddress: getSolanaAddress2 } = await Promise.resolve().then(() => (init_wallet2(), wallet_exports));
+      const { getSolanaAddress: getSolanaAddress2 } = await Promise.resolve().then(() => (init_wallet2(), wallet_exports));
+      const wallet2 = await resolveOrGenerateWalletKey();
       let solanaAddr;
-      if (existsSync5(MNEMONIC_FILE2)) {
-        const { readFileSync: readFileSync4 } = await import("fs");
-        const mnemonic = readFileSync4(MNEMONIC_FILE2, "utf8").trim();
-        const keyBytes = deriveSolanaKeyBytes2(mnemonic);
-        solanaAddr = await getSolanaAddress2(keyBytes);
-        console.log(`[ClawRouter] Solana wallet already set up.`);
+      if (wallet2.solanaPrivateKeyBytes) {
+        solanaAddr = await getSolanaAddress2(wallet2.solanaPrivateKeyBytes);
+        console.log(`[ClawRouter] Using BlockRun Core Solana wallet.`);
       } else {
         console.log(`[ClawRouter] Setting up Solana wallet...`);
         const { solanaPrivateKeyBytes } = await setupSolana2();
@@ -229989,6 +230958,8 @@ ClawRouter Partner APIs (v${VERSION})
   const wallet = await resolveOrGenerateWalletKey();
   if (wallet.source === "generated") {
     console.log(`[ClawRouter] Generated new wallet: ${wallet.address}`);
+  } else if (wallet.source === "core") {
+    console.log(`[ClawRouter] Using BlockRun Core wallet: ${wallet.address}`);
   } else if (wallet.source === "saved") {
     console.log(`[ClawRouter] Using saved wallet: ${wallet.address}`);
   } else if (wallet.source === "config") {
@@ -230006,6 +230977,7 @@ ClawRouter Partner APIs (v${VERSION})
   const proxy = await startProxy({
     wallet,
     port: args.port,
+    allowExistingProxy: !args.noReuse,
     onReady: (port) => {
       console.log(`[ClawRouter] v${VERSION} | Proxy listening on http://127.0.0.1:${port}`);
       console.log(`[ClawRouter] Health check: http://127.0.0.1:${port}/health`);