@blockrun/clawrouter 0.11.13 → 0.12.0

package/dist/index.js

@@ -8,55 +8,6 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/wallet.ts
-var wallet_exports = {};
-__export(wallet_exports, {
-  deriveAllKeys: () => deriveAllKeys,
-  deriveEvmKey: () => deriveEvmKey,
-  deriveSolanaKeyBytes: () => deriveSolanaKeyBytes,
-  generateWalletMnemonic: () => generateWalletMnemonic,
-  isValidMnemonic: () => isValidMnemonic
-});
-import { HDKey } from "@scure/bip32";
-import { generateMnemonic, mnemonicToSeedSync, validateMnemonic } from "@scure/bip39";
-import { wordlist as english } from "@scure/bip39/wordlists/english";
-import { privateKeyToAccount } from "viem/accounts";
-function generateWalletMnemonic() {
-  return generateMnemonic(english, 256);
-}
-function isValidMnemonic(mnemonic) {
-  return validateMnemonic(mnemonic, english);
-}
-function deriveEvmKey(mnemonic) {
-  const seed = mnemonicToSeedSync(mnemonic);
-  const hdKey = HDKey.fromMasterSeed(seed);
-  const derived = hdKey.derive(ETH_DERIVATION_PATH);
-  if (!derived.privateKey) throw new Error("Failed to derive EVM private key");
-  const hex = `0x${Buffer.from(derived.privateKey).toString("hex")}`;
-  const account = privateKeyToAccount(hex);
-  return { privateKey: hex, address: account.address };
-}
-function deriveSolanaKeyBytes(mnemonic) {
-  const seed = mnemonicToSeedSync(mnemonic);
-  const hdKey = HDKey.fromMasterSeed(seed);
-  const derived = hdKey.derive(SOLANA_DERIVATION_PATH);
-  if (!derived.privateKey) throw new Error("Failed to derive Solana private key");
-  return new Uint8Array(derived.privateKey);
-}
-function deriveAllKeys(mnemonic) {
-  const { privateKey: evmPrivateKey, address: evmAddress } = deriveEvmKey(mnemonic);
-  const solanaPrivateKeyBytes = deriveSolanaKeyBytes(mnemonic);
-  return { mnemonic, evmPrivateKey, evmAddress, solanaPrivateKeyBytes };
-}
-var ETH_DERIVATION_PATH, SOLANA_DERIVATION_PATH;
-var init_wallet = __esm({
-  "src/wallet.ts"() {
-    "use strict";
-    ETH_DERIVATION_PATH = "m/44'/60'/0'/0/0";
-    SOLANA_DERIVATION_PATH = "m/44'/501'/0'/0'";
-  }
-});
-
 // src/solana-balance.ts
 var solana_balance_exports = {};
 __export(solana_balance_exports, {
@@ -104,6 +55,28 @@ var init_solana_balance = __esm({
         this.invalidate();
         return this.checkBalance();
       }
+      /**
+       * Check if balance is sufficient for an estimated cost.
+       */
+      async checkSufficient(estimatedCostMicros) {
+        const info = await this.checkBalance();
+        if (info.balance >= estimatedCostMicros) {
+          return { sufficient: true, info };
+        }
+        const shortfall = estimatedCostMicros - info.balance;
+        return {
+          sufficient: false,
+          info,
+          shortfall: this.formatUSDC(shortfall)
+        };
+      }
+      /**
+       * Format USDC amount (in micros) as "$X.XX".
+       */
+      formatUSDC(amountMicros) {
+        const dollars = Number(amountMicros) / 1e6;
+        return `$${dollars.toFixed(2)}`;
+      }
       getWalletAddress() {
         return this.walletAddress;
       }
@@ -122,7 +95,10 @@ var init_solana_balance = __esm({
           }
           return total;
         } catch (err) {
-          throw new Error(`Failed to fetch Solana USDC balance: ${err instanceof Error ? err.message : String(err)}`);
+          throw new Error(
+            `Failed to fetch Solana USDC balance: ${err instanceof Error ? err.message : String(err)}`,
+            { cause: err }
+          );
         } finally {
           clearTimeout(timer);
         }
@@ -141,125 +117,834 @@ var init_solana_balance = __esm({
   }
 });
 
-// src/partners/registry.ts
-function getPartnerService(id) {
-  return PARTNER_SERVICES.find((s) => s.id === id);
+// node_modules/@noble/hashes/esm/utils.js
+function isBytes(a) {
+  return a instanceof Uint8Array || ArrayBuffer.isView(a) && a.constructor.name === "Uint8Array";
+}
+function anumber(n) {
+  if (!Number.isSafeInteger(n) || n < 0)
+    throw new Error("positive integer expected, got " + n);
+}
+function abytes(b, ...lengths) {
+  if (!isBytes(b))
+    throw new Error("Uint8Array expected");
+  if (lengths.length > 0 && !lengths.includes(b.length))
+    throw new Error("Uint8Array expected of length " + lengths + ", got length=" + b.length);
+}
+function ahash(h) {
+  if (typeof h !== "function" || typeof h.create !== "function")
+    throw new Error("Hash should be wrapped by utils.createHasher");
+  anumber(h.outputLen);
+  anumber(h.blockLen);
+}
+function aexists(instance, checkFinished = true) {
+  if (instance.destroyed)
+    throw new Error("Hash instance has been destroyed");
+  if (checkFinished && instance.finished)
+    throw new Error("Hash#digest() has already been called");
+}
+function aoutput(out, instance) {
+  abytes(out);
+  const min = instance.outputLen;
+  if (out.length < min) {
+    throw new Error("digestInto() expects output buffer of length at least " + min);
+  }
+}
+function clean(...arrays) {
+  for (let i = 0; i < arrays.length; i++) {
+    arrays[i].fill(0);
+  }
+}
+function createView(arr) {
+  return new DataView(arr.buffer, arr.byteOffset, arr.byteLength);
 }
-var PARTNER_SERVICES;
-var init_registry = __esm({
-  "src/partners/registry.ts"() {
+function utf8ToBytes(str) {
+  if (typeof str !== "string")
+    throw new Error("string expected");
+  return new Uint8Array(new TextEncoder().encode(str));
+}
+function toBytes(data) {
+  if (typeof data === "string")
+    data = utf8ToBytes(data);
+  abytes(data);
+  return data;
+}
+function createHasher(hashCons) {
+  const hashC = (msg) => hashCons().update(toBytes(msg)).digest();
+  const tmp = hashCons();
+  hashC.outputLen = tmp.outputLen;
+  hashC.blockLen = tmp.blockLen;
+  hashC.create = () => hashCons();
+  return hashC;
+}
+var Hash;
+var init_utils = __esm({
+  "node_modules/@noble/hashes/esm/utils.js"() {
     "use strict";
-    PARTNER_SERVICES = [
-      {
-        id: "x_users_lookup",
-        name: "Twitter/X User Lookup",
-        partner: "AttentionVC",
-        description: "ALWAYS use this tool to look up real-time Twitter/X user profiles. Call this when the user asks about any Twitter/X account, username, handle, follower count, verification status, bio, or profile. Do NOT answer Twitter/X user questions from memory \u2014 always fetch live data with this tool. Returns: follower count, verification badge, bio, location, join date. Accepts up to 100 usernames per request (without @ prefix).",
-        proxyPath: "/x/users/lookup",
-        method: "POST",
-        params: [
-          {
-            name: "usernames",
-            type: "string[]",
-            description: 'Array of Twitter/X usernames to look up (without @ prefix). Example: ["elonmusk", "naval"]',
-            required: true
+    Hash = class {
+    };
+  }
+});
+
+// node_modules/@noble/hashes/esm/hmac.js
+var HMAC, hmac;
+var init_hmac = __esm({
+  "node_modules/@noble/hashes/esm/hmac.js"() {
+    "use strict";
+    init_utils();
+    HMAC = class extends Hash {
+      constructor(hash, _key) {
+        super();
+        this.finished = false;
+        this.destroyed = false;
+        ahash(hash);
+        const key = toBytes(_key);
+        this.iHash = hash.create();
+        if (typeof this.iHash.update !== "function")
+          throw new Error("Expected instance of class which extends utils.Hash");
+        this.blockLen = this.iHash.blockLen;
+        this.outputLen = this.iHash.outputLen;
+        const blockLen = this.blockLen;
+        const pad = new Uint8Array(blockLen);
+        pad.set(key.length > blockLen ? hash.create().update(key).digest() : key);
+        for (let i = 0; i < pad.length; i++)
+          pad[i] ^= 54;
+        this.iHash.update(pad);
+        this.oHash = hash.create();
+        for (let i = 0; i < pad.length; i++)
+          pad[i] ^= 54 ^ 92;
+        this.oHash.update(pad);
+        clean(pad);
+      }
+      update(buf) {
+        aexists(this);
+        this.iHash.update(buf);
+        return this;
+      }
+      digestInto(out) {
+        aexists(this);
+        abytes(out, this.outputLen);
+        this.finished = true;
+        this.iHash.digestInto(out);
+        this.oHash.update(out);
+        this.oHash.digestInto(out);
+        this.destroy();
+      }
+      digest() {
+        const out = new Uint8Array(this.oHash.outputLen);
+        this.digestInto(out);
+        return out;
+      }
+      _cloneInto(to) {
+        to || (to = Object.create(Object.getPrototypeOf(this), {}));
+        const { oHash, iHash, finished: finished2, destroyed, blockLen, outputLen } = this;
+        to = to;
+        to.finished = finished2;
+        to.destroyed = destroyed;
+        to.blockLen = blockLen;
+        to.outputLen = outputLen;
+        to.oHash = oHash._cloneInto(to.oHash);
+        to.iHash = iHash._cloneInto(to.iHash);
+        return to;
+      }
+      clone() {
+        return this._cloneInto();
+      }
+      destroy() {
+        this.destroyed = true;
+        this.oHash.destroy();
+        this.iHash.destroy();
+      }
+    };
+    hmac = (hash, key, message) => new HMAC(hash, key).update(message).digest();
+    hmac.create = (hash, key) => new HMAC(hash, key);
+  }
+});
+
+// node_modules/@noble/hashes/esm/_md.js
+function setBigUint64(view, byteOffset, value, isLE) {
+  if (typeof view.setBigUint64 === "function")
+    return view.setBigUint64(byteOffset, value, isLE);
+  const _32n2 = BigInt(32);
+  const _u32_max = BigInt(4294967295);
+  const wh = Number(value >> _32n2 & _u32_max);
+  const wl = Number(value & _u32_max);
+  const h = isLE ? 4 : 0;
+  const l = isLE ? 0 : 4;
+  view.setUint32(byteOffset + h, wh, isLE);
+  view.setUint32(byteOffset + l, wl, isLE);
+}
+var HashMD, SHA512_IV;
+var init_md = __esm({
+  "node_modules/@noble/hashes/esm/_md.js"() {
+    "use strict";
+    init_utils();
+    HashMD = class extends Hash {
+      constructor(blockLen, outputLen, padOffset, isLE) {
+        super();
+        this.finished = false;
+        this.length = 0;
+        this.pos = 0;
+        this.destroyed = false;
+        this.blockLen = blockLen;
+        this.outputLen = outputLen;
+        this.padOffset = padOffset;
+        this.isLE = isLE;
+        this.buffer = new Uint8Array(blockLen);
+        this.view = createView(this.buffer);
+      }
+      update(data) {
+        aexists(this);
+        data = toBytes(data);
+        abytes(data);
+        const { view, buffer, blockLen } = this;
+        const len = data.length;
+        for (let pos = 0; pos < len; ) {
+          const take = Math.min(blockLen - this.pos, len - pos);
+          if (take === blockLen) {
+            const dataView = createView(data);
+            for (; blockLen <= len - pos; pos += blockLen)
+              this.process(dataView, pos);
+            continue;
+          }
+          buffer.set(data.subarray(pos, pos + take), this.pos);
+          this.pos += take;
+          pos += take;
+          if (this.pos === blockLen) {
+            this.process(view, 0);
+            this.pos = 0;
           }
-        ],
-        pricing: {
-          perUnit: "$0.001",
-          unit: "user",
-          minimum: "$0.01 (10 users)",
-          maximum: "$0.10 (100 users)"
-        },
-        example: {
-          input: { usernames: ["elonmusk", "naval", "balaboris"] },
-          description: "Look up 3 Twitter/X user profiles"
         }
+        this.length += data.length;
+        this.roundClean();
+        return this;
       }
-    ];
+      digestInto(out) {
+        aexists(this);
+        aoutput(out, this);
+        this.finished = true;
+        const { buffer, view, blockLen, isLE } = this;
+        let { pos } = this;
+        buffer[pos++] = 128;
+        clean(this.buffer.subarray(pos));
+        if (this.padOffset > blockLen - pos) {
+          this.process(view, 0);
+          pos = 0;
+        }
+        for (let i = pos; i < blockLen; i++)
+          buffer[i] = 0;
+        setBigUint64(view, blockLen - 8, BigInt(this.length * 8), isLE);
+        this.process(view, 0);
+        const oview = createView(out);
+        const len = this.outputLen;
+        if (len % 4)
+          throw new Error("_sha2: outputLen should be aligned to 32bit");
+        const outLen = len / 4;
+        const state = this.get();
+        if (outLen > state.length)
+          throw new Error("_sha2: outputLen bigger than state");
+        for (let i = 0; i < outLen; i++)
+          oview.setUint32(4 * i, state[i], isLE);
+      }
+      digest() {
+        const { buffer, outputLen } = this;
+        this.digestInto(buffer);
+        const res = buffer.slice(0, outputLen);
+        this.destroy();
+        return res;
+      }
+      _cloneInto(to) {
+        to || (to = new this.constructor());
+        to.set(...this.get());
+        const { blockLen, buffer, length, finished: finished2, destroyed, pos } = this;
+        to.destroyed = destroyed;
+        to.finished = finished2;
+        to.length = length;
+        to.pos = pos;
+        if (length % blockLen)
+          to.buffer.set(buffer);
+        return to;
+      }
+      clone() {
+        return this._cloneInto();
+      }
+    };
+    SHA512_IV = /* @__PURE__ */ Uint32Array.from([
+      1779033703,
+      4089235720,
+      3144134277,
+      2227873595,
+      1013904242,
+      4271175723,
+      2773480762,
+      1595750129,
+      1359893119,
+      2917565137,
+      2600822924,
+      725511199,
+      528734635,
+      4215389547,
+      1541459225,
+      327033209
+    ]);
   }
 });
 
-// src/partners/tools.ts
-function buildTool(service, proxyBaseUrl) {
-  const properties = {};
-  const required = [];
-  for (const param of service.params) {
-    const prop = {
-      description: param.description
-    };
-    if (param.type === "string[]") {
-      prop.type = "array";
-      prop.items = { type: "string" };
-    } else {
-      prop.type = param.type;
-    }
-    properties[param.name] = prop;
-    if (param.required) {
-      required.push(param.name);
-    }
+// node_modules/@noble/hashes/esm/_u64.js
+function fromBig(n, le = false) {
+  if (le)
+    return { h: Number(n & U32_MASK64), l: Number(n >> _32n & U32_MASK64) };
+  return { h: Number(n >> _32n & U32_MASK64) | 0, l: Number(n & U32_MASK64) | 0 };
+}
+function split(lst, le = false) {
+  const len = lst.length;
+  let Ah = new Uint32Array(len);
+  let Al = new Uint32Array(len);
+  for (let i = 0; i < len; i++) {
+    const { h, l } = fromBig(lst[i], le);
+    [Ah[i], Al[i]] = [h, l];
+  }
+  return [Ah, Al];
+}
+function add(Ah, Al, Bh, Bl) {
+  const l = (Al >>> 0) + (Bl >>> 0);
+  return { h: Ah + Bh + (l / 2 ** 32 | 0) | 0, l: l | 0 };
+}
+var U32_MASK64, _32n, shrSH, shrSL, rotrSH, rotrSL, rotrBH, rotrBL, add3L, add3H, add4L, add4H, add5L, add5H;
+var init_u64 = __esm({
+  "node_modules/@noble/hashes/esm/_u64.js"() {
+    "use strict";
+    U32_MASK64 = /* @__PURE__ */ BigInt(2 ** 32 - 1);
+    _32n = /* @__PURE__ */ BigInt(32);
+    shrSH = (h, _l, s) => h >>> s;
+    shrSL = (h, l, s) => h << 32 - s | l >>> s;
+    rotrSH = (h, l, s) => h >>> s | l << 32 - s;
+    rotrSL = (h, l, s) => h << 32 - s | l >>> s;
+    rotrBH = (h, l, s) => h << 64 - s | l >>> s - 32;
+    rotrBL = (h, l, s) => h >>> s - 32 | l << 64 - s;
+    add3L = (Al, Bl, Cl) => (Al >>> 0) + (Bl >>> 0) + (Cl >>> 0);
+    add3H = (low, Ah, Bh, Ch) => Ah + Bh + Ch + (low / 2 ** 32 | 0) | 0;
+    add4L = (Al, Bl, Cl, Dl) => (Al >>> 0) + (Bl >>> 0) + (Cl >>> 0) + (Dl >>> 0);
+    add4H = (low, Ah, Bh, Ch, Dh) => Ah + Bh + Ch + Dh + (low / 2 ** 32 | 0) | 0;
+    add5L = (Al, Bl, Cl, Dl, El) => (Al >>> 0) + (Bl >>> 0) + (Cl >>> 0) + (Dl >>> 0) + (El >>> 0);
+    add5H = (low, Ah, Bh, Ch, Dh, Eh) => Ah + Bh + Ch + Dh + Eh + (low / 2 ** 32 | 0) | 0;
   }
-  return {
-    name: `blockrun_${service.id}`,
-    description: [
-      service.description,
-      "",
-      `Partner: ${service.partner}`,
-      `Pricing: ${service.pricing.perUnit} per ${service.pricing.unit} (min: ${service.pricing.minimum}, max: ${service.pricing.maximum})`
-    ].join("\n"),
-    parameters: {
-      type: "object",
-      properties,
-      required
-    },
-    execute: async (_toolCallId, params) => {
-      const url = `${proxyBaseUrl}/v1${service.proxyPath}`;
-      const response = await fetch(url, {
-        method: service.method,
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(params)
-      });
-      if (!response.ok) {
-        const errText = await response.text().catch(() => "");
-        throw new Error(
-          `Partner API error (${response.status}): ${errText || response.statusText}`
-        );
+});
+
+// node_modules/@noble/hashes/esm/sha2.js
+var K512, SHA512_Kh, SHA512_Kl, SHA512_W_H, SHA512_W_L, SHA512, sha512;
+var init_sha2 = __esm({
+  "node_modules/@noble/hashes/esm/sha2.js"() {
+    "use strict";
+    init_md();
+    init_u64();
+    init_utils();
+    K512 = /* @__PURE__ */ (() => split([
+      "0x428a2f98d728ae22",
+      "0x7137449123ef65cd",
+      "0xb5c0fbcfec4d3b2f",
+      "0xe9b5dba58189dbbc",
+      "0x3956c25bf348b538",
+      "0x59f111f1b605d019",
+      "0x923f82a4af194f9b",
+      "0xab1c5ed5da6d8118",
+      "0xd807aa98a3030242",
+      "0x12835b0145706fbe",
+      "0x243185be4ee4b28c",
+      "0x550c7dc3d5ffb4e2",
+      "0x72be5d74f27b896f",
+      "0x80deb1fe3b1696b1",
+      "0x9bdc06a725c71235",
+      "0xc19bf174cf692694",
+      "0xe49b69c19ef14ad2",
+      "0xefbe4786384f25e3",
+      "0x0fc19dc68b8cd5b5",
+      "0x240ca1cc77ac9c65",
+      "0x2de92c6f592b0275",
+      "0x4a7484aa6ea6e483",
+      "0x5cb0a9dcbd41fbd4",
+      "0x76f988da831153b5",
+      "0x983e5152ee66dfab",
+      "0xa831c66d2db43210",
+      "0xb00327c898fb213f",
+      "0xbf597fc7beef0ee4",
+      "0xc6e00bf33da88fc2",
+      "0xd5a79147930aa725",
+      "0x06ca6351e003826f",
+      "0x142929670a0e6e70",
+      "0x27b70a8546d22ffc",
+      "0x2e1b21385c26c926",
+      "0x4d2c6dfc5ac42aed",
+      "0x53380d139d95b3df",
+      "0x650a73548baf63de",
+      "0x766a0abb3c77b2a8",
+      "0x81c2c92e47edaee6",
+      "0x92722c851482353b",
+      "0xa2bfe8a14cf10364",
+      "0xa81a664bbc423001",
+      "0xc24b8b70d0f89791",
+      "0xc76c51a30654be30",
+      "0xd192e819d6ef5218",
+      "0xd69906245565a910",
+      "0xf40e35855771202a",
+      "0x106aa07032bbd1b8",
+      "0x19a4c116b8d2d0c8",
+      "0x1e376c085141ab53",
+      "0x2748774cdf8eeb99",
+      "0x34b0bcb5e19b48a8",
+      "0x391c0cb3c5c95a63",
+      "0x4ed8aa4ae3418acb",
+      "0x5b9cca4f7763e373",
+      "0x682e6ff3d6b2b8a3",
+      "0x748f82ee5defb2fc",
+      "0x78a5636f43172f60",
+      "0x84c87814a1f0ab72",
+      "0x8cc702081a6439ec",
+      "0x90befffa23631e28",
+      "0xa4506cebde82bde9",
+      "0xbef9a3f7b2c67915",
+      "0xc67178f2e372532b",
+      "0xca273eceea26619c",
+      "0xd186b8c721c0c207",
+      "0xeada7dd6cde0eb1e",
+      "0xf57d4f7fee6ed178",
+      "0x06f067aa72176fba",
+      "0x0a637dc5a2c898a6",
+      "0x113f9804bef90dae",
+      "0x1b710b35131c471b",
+      "0x28db77f523047d84",
+      "0x32caab7b40c72493",
+      "0x3c9ebe0a15c9bebc",
+      "0x431d67c49c100d4c",
+      "0x4cc5d4becb3e42b6",
+      "0x597f299cfc657e2a",
+      "0x5fcb6fab3ad6faec",
+      "0x6c44198c4a475817"
+    ].map((n) => BigInt(n))))();
+    SHA512_Kh = /* @__PURE__ */ (() => K512[0])();
+    SHA512_Kl = /* @__PURE__ */ (() => K512[1])();
+    SHA512_W_H = /* @__PURE__ */ new Uint32Array(80);
+    SHA512_W_L = /* @__PURE__ */ new Uint32Array(80);
+    SHA512 = class extends HashMD {
+      constructor(outputLen = 64) {
+        super(128, outputLen, 16, false);
+        this.Ah = SHA512_IV[0] | 0;
+        this.Al = SHA512_IV[1] | 0;
+        this.Bh = SHA512_IV[2] | 0;
+        this.Bl = SHA512_IV[3] | 0;
+        this.Ch = SHA512_IV[4] | 0;
+        this.Cl = SHA512_IV[5] | 0;
+        this.Dh = SHA512_IV[6] | 0;
+        this.Dl = SHA512_IV[7] | 0;
+        this.Eh = SHA512_IV[8] | 0;
+        this.El = SHA512_IV[9] | 0;
+        this.Fh = SHA512_IV[10] | 0;
+        this.Fl = SHA512_IV[11] | 0;
+        this.Gh = SHA512_IV[12] | 0;
+        this.Gl = SHA512_IV[13] | 0;
+        this.Hh = SHA512_IV[14] | 0;
+        this.Hl = SHA512_IV[15] | 0;
       }
-      const data = await response.json();
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(data, null, 2)
-          }
-        ],
-        details: data
-      };
-    }
-  };
+      // prettier-ignore
+      get() {
+        const { Ah, Al, Bh, Bl, Ch, Cl, Dh, Dl, Eh, El, Fh, Fl, Gh, Gl, Hh, Hl } = this;
+        return [Ah, Al, Bh, Bl, Ch, Cl, Dh, Dl, Eh, El, Fh, Fl, Gh, Gl, Hh, Hl];
+      }
+      // prettier-ignore
+      set(Ah, Al, Bh, Bl, Ch, Cl, Dh, Dl, Eh, El, Fh, Fl, Gh, Gl, Hh, Hl) {
+        this.Ah = Ah | 0;
+        this.Al = Al | 0;
+        this.Bh = Bh | 0;
+        this.Bl = Bl | 0;
+        this.Ch = Ch | 0;
+        this.Cl = Cl | 0;
+        this.Dh = Dh | 0;
+        this.Dl = Dl | 0;
+        this.Eh = Eh | 0;
+        this.El = El | 0;
+        this.Fh = Fh | 0;
+        this.Fl = Fl | 0;
+        this.Gh = Gh | 0;
+        this.Gl = Gl | 0;
+        this.Hh = Hh | 0;
+        this.Hl = Hl | 0;
+      }
+      process(view, offset) {
+        for (let i = 0; i < 16; i++, offset += 4) {
+          SHA512_W_H[i] = view.getUint32(offset);
+          SHA512_W_L[i] = view.getUint32(offset += 4);
+        }
+        for (let i = 16; i < 80; i++) {
+          const W15h = SHA512_W_H[i - 15] | 0;
+          const W15l = SHA512_W_L[i - 15] | 0;
+          const s0h = rotrSH(W15h, W15l, 1) ^ rotrSH(W15h, W15l, 8) ^ shrSH(W15h, W15l, 7);
+          const s0l = rotrSL(W15h, W15l, 1) ^ rotrSL(W15h, W15l, 8) ^ shrSL(W15h, W15l, 7);
+          const W2h = SHA512_W_H[i - 2] | 0;
+          const W2l = SHA512_W_L[i - 2] | 0;
+          const s1h = rotrSH(W2h, W2l, 19) ^ rotrBH(W2h, W2l, 61) ^ shrSH(W2h, W2l, 6);
+          const s1l = rotrSL(W2h, W2l, 19) ^ rotrBL(W2h, W2l, 61) ^ shrSL(W2h, W2l, 6);
+          const SUMl = add4L(s0l, s1l, SHA512_W_L[i - 7], SHA512_W_L[i - 16]);
+          const SUMh = add4H(SUMl, s0h, s1h, SHA512_W_H[i - 7], SHA512_W_H[i - 16]);
+          SHA512_W_H[i] = SUMh | 0;
+          SHA512_W_L[i] = SUMl | 0;
+        }
+        let { Ah, Al, Bh, Bl, Ch, Cl, Dh, Dl, Eh, El, Fh, Fl, Gh, Gl, Hh, Hl } = this;
+        for (let i = 0; i < 80; i++) {
+          const sigma1h = rotrSH(Eh, El, 14) ^ rotrSH(Eh, El, 18) ^ rotrBH(Eh, El, 41);
+          const sigma1l = rotrSL(Eh, El, 14) ^ rotrSL(Eh, El, 18) ^ rotrBL(Eh, El, 41);
+          const CHIh = Eh & Fh ^ ~Eh & Gh;
+          const CHIl = El & Fl ^ ~El & Gl;
+          const T1ll = add5L(Hl, sigma1l, CHIl, SHA512_Kl[i], SHA512_W_L[i]);
+          const T1h = add5H(T1ll, Hh, sigma1h, CHIh, SHA512_Kh[i], SHA512_W_H[i]);
+          const T1l = T1ll | 0;
+          const sigma0h = rotrSH(Ah, Al, 28) ^ rotrBH(Ah, Al, 34) ^ rotrBH(Ah, Al, 39);
+          const sigma0l = rotrSL(Ah, Al, 28) ^ rotrBL(Ah, Al, 34) ^ rotrBL(Ah, Al, 39);
+          const MAJh = Ah & Bh ^ Ah & Ch ^ Bh & Ch;
+          const MAJl = Al & Bl ^ Al & Cl ^ Bl & Cl;
+          Hh = Gh | 0;
+          Hl = Gl | 0;
+          Gh = Fh | 0;
+          Gl = Fl | 0;
+          Fh = Eh | 0;
+          Fl = El | 0;
+          ({ h: Eh, l: El } = add(Dh | 0, Dl | 0, T1h | 0, T1l | 0));
+          Dh = Ch | 0;
+          Dl = Cl | 0;
+          Ch = Bh | 0;
+          Cl = Bl | 0;
+          Bh = Ah | 0;
+          Bl = Al | 0;
+          const All = add3L(T1l, sigma0l, MAJl);
+          Ah = add3H(All, T1h, sigma0h, MAJh);
+          Al = All | 0;
+        }
+        ({ h: Ah, l: Al } = add(this.Ah | 0, this.Al | 0, Ah | 0, Al | 0));
+        ({ h: Bh, l: Bl } = add(this.Bh | 0, this.Bl | 0, Bh | 0, Bl | 0));
+        ({ h: Ch, l: Cl } = add(this.Ch | 0, this.Cl | 0, Ch | 0, Cl | 0));
+        ({ h: Dh, l: Dl } = add(this.Dh | 0, this.Dl | 0, Dh | 0, Dl | 0));
+        ({ h: Eh, l: El } = add(this.Eh | 0, this.El | 0, Eh | 0, El | 0));
+        ({ h: Fh, l: Fl } = add(this.Fh | 0, this.Fl | 0, Fh | 0, Fl | 0));
+        ({ h: Gh, l: Gl } = add(this.Gh | 0, this.Gl | 0, Gh | 0, Gl | 0));
+        ({ h: Hh, l: Hl } = add(this.Hh | 0, this.Hl | 0, Hh | 0, Hl | 0));
+        this.set(Ah, Al, Bh, Bl, Ch, Cl, Dh, Dl, Eh, El, Fh, Fl, Gh, Gl, Hh, Hl);
+      }
+      roundClean() {
+        clean(SHA512_W_H, SHA512_W_L);
+      }
+      destroy() {
+        clean(this.buffer);
+        this.set(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+      }
+    };
+    sha512 = /* @__PURE__ */ createHasher(() => new SHA512());
+  }
+});
+
+// node_modules/@noble/hashes/esm/sha512.js
+var sha5122;
+var init_sha512 = __esm({
+  "node_modules/@noble/hashes/esm/sha512.js"() {
+    "use strict";
+    init_sha2();
+    sha5122 = sha512;
+  }
+});
+
+// src/wallet.ts
+var wallet_exports = {};
+__export(wallet_exports, {
+  deriveAllKeys: () => deriveAllKeys,
+  deriveEvmKey: () => deriveEvmKey,
+  deriveSolanaKeyBytes: () => deriveSolanaKeyBytes,
+  deriveSolanaKeyBytesLegacy: () => deriveSolanaKeyBytesLegacy,
+  generateWalletMnemonic: () => generateWalletMnemonic,
+  isValidMnemonic: () => isValidMnemonic
+});
+import { HDKey } from "@scure/bip32";
+import { generateMnemonic, mnemonicToSeedSync, validateMnemonic } from "@scure/bip39";
+import { wordlist as english } from "@scure/bip39/wordlists/english";
+import { privateKeyToAccount } from "viem/accounts";
+function generateWalletMnemonic() {
+  return generateMnemonic(english, 256);
 }
-function buildPartnerTools(proxyBaseUrl) {
-  return PARTNER_SERVICES.map((service) => buildTool(service, proxyBaseUrl));
+function isValidMnemonic(mnemonic) {
+  return validateMnemonic(mnemonic, english);
+}
+function deriveEvmKey(mnemonic) {
+  const seed = mnemonicToSeedSync(mnemonic);
+  const hdKey = HDKey.fromMasterSeed(seed);
+  const derived = hdKey.derive(ETH_DERIVATION_PATH);
+  if (!derived.privateKey) throw new Error("Failed to derive EVM private key");
+  const hex = `0x${Buffer.from(derived.privateKey).toString("hex")}`;
+  const account = privateKeyToAccount(hex);
+  return { privateKey: hex, address: account.address };
 }
-var init_tools = __esm({
-  "src/partners/tools.ts"() {
+function deriveSolanaKeyBytes(mnemonic) {
+  const seed = mnemonicToSeedSync(mnemonic);
+  let I = hmac(sha5122, "ed25519 seed", seed);
+  let key = I.slice(0, 32);
+  let chainCode = I.slice(32);
+  for (const index of SOLANA_HARDENED_INDICES) {
+    const data = new Uint8Array(37);
+    data[0] = 0;
+    data.set(key, 1);
+    data[33] = index >>> 24 & 255;
+    data[34] = index >>> 16 & 255;
+    data[35] = index >>> 8 & 255;
+    data[36] = index & 255;
+    I = hmac(sha5122, chainCode, data);
+    key = I.slice(0, 32);
+    chainCode = I.slice(32);
+  }
+  return new Uint8Array(key);
+}
+function deriveSolanaKeyBytesLegacy(mnemonic) {
+  const seed = mnemonicToSeedSync(mnemonic);
+  const hdKey = HDKey.fromMasterSeed(seed);
+  const derived = hdKey.derive("m/44'/501'/0'/0'");
+  if (!derived.privateKey) throw new Error("Failed to derive legacy Solana private key");
+  return new Uint8Array(derived.privateKey);
+}
+function deriveAllKeys(mnemonic) {
+  const { privateKey: evmPrivateKey, address: evmAddress } = deriveEvmKey(mnemonic);
+  const solanaPrivateKeyBytes = deriveSolanaKeyBytes(mnemonic);
+  return { mnemonic, evmPrivateKey, evmAddress, solanaPrivateKeyBytes };
+}
+var ETH_DERIVATION_PATH, SOLANA_HARDENED_INDICES;
+var init_wallet = __esm({
+  "src/wallet.ts"() {
     "use strict";
-    init_registry();
+    init_hmac();
+    init_sha512();
+    ETH_DERIVATION_PATH = "m/44'/60'/0'/0/0";
+    SOLANA_HARDENED_INDICES = [
+      44 + 2147483648,
+      501 + 2147483648,
+      0 + 2147483648,
+      0 + 2147483648
+    ];
   }
 });
 
-// src/partners/index.ts
-var partners_exports = {};
-__export(partners_exports, {
-  PARTNER_SERVICES: () => PARTNER_SERVICES,
-  buildPartnerTools: () => buildPartnerTools,
-  getPartnerService: () => getPartnerService
+// src/solana-sweep.ts
+var solana_sweep_exports = {};
+__export(solana_sweep_exports, {
+  sweepSolanaWallet: () => sweepSolanaWallet
 });
-var init_partners = __esm({
-  "src/partners/index.ts"() {
+import {
+  address as solAddress2,
+  createSolanaRpc as createSolanaRpc2,
+  createSolanaRpcSubscriptions,
+  createKeyPairSignerFromPrivateKeyBytes,
+  pipe,
+  createTransactionMessage,
+  setTransactionMessageFeePayer,
+  setTransactionMessageLifetimeUsingBlockhash,
+  appendTransactionMessageInstructions,
+  signTransactionMessageWithSigners,
+  getSignatureFromTransaction,
+  sendAndConfirmTransactionFactory,
+  getProgramDerivedAddress,
+  getAddressEncoder
+} from "@solana/kit";
+async function getAssociatedTokenAddress(owner, mint) {
+  const encoder = getAddressEncoder();
+  const [ata] = await getProgramDerivedAddress({
+    programAddress: ASSOCIATED_TOKEN_PROGRAM,
+    seeds: [encoder.encode(owner), encoder.encode(TOKEN_PROGRAM), encoder.encode(mint)]
+  });
+  return ata;
+}
+function buildCreateAtaIdempotentInstruction(payer, ata, owner, mint) {
+  return {
+    programAddress: ASSOCIATED_TOKEN_PROGRAM,
+    accounts: [
+      {
+        address: payer,
+        role: 3
+        /* writable signer */
+      },
+      {
+        address: ata,
+        role: 1
+        /* writable */
+      },
+      {
+        address: owner,
+        role: 0
+        /* readonly */
+      },
+      {
+        address: mint,
+        role: 0
+        /* readonly */
+      },
+      {
+        address: SYSTEM_PROGRAM,
+        role: 0
+        /* readonly */
+      },
+      {
+        address: TOKEN_PROGRAM,
+        role: 0
+        /* readonly */
+      }
+    ],
+    data: new Uint8Array([1])
+    // instruction index 1 = CreateIdempotent
+  };
+}
+function buildTokenTransferInstruction(source, destination, authority, amount) {
+  const data = new Uint8Array(9);
+  data[0] = 3;
+  const view = new DataView(data.buffer, data.byteOffset);
+  view.setBigUint64(1, amount, true);
+  return {
+    programAddress: TOKEN_PROGRAM,
+    accounts: [
+      {
+        address: source,
+        role: 1
+        /* writable */
+      },
+      {
+        address: destination,
+        role: 1
+        /* writable */
+      },
+      {
+        address: authority,
+        role: 2
+        /* signer */
+      }
+    ],
+    data
+  };
+}
+async function sweepSolanaWallet(oldKeyBytes, newAddress, rpcUrl) {
+  const url = rpcUrl || process["env"].CLAWROUTER_SOLANA_RPC_URL || SOLANA_DEFAULT_RPC2;
+  const rpc = createSolanaRpc2(url);
+  const oldSigner = await createKeyPairSignerFromPrivateKeyBytes(oldKeyBytes);
+  const oldAddress = oldSigner.address;
+  const mint = solAddress2(SOLANA_USDC_MINT2);
+  const newOwner = solAddress2(newAddress);
+  let solBalance;
+  try {
+    const solResp = await rpc.getBalance(solAddress2(oldAddress)).send();
+    solBalance = solResp.value;
+  } catch (err) {
+    return {
+      error: `Failed to check SOL balance: ${err instanceof Error ? err.message : String(err)}`,
+      oldAddress,
+      newAddress
+    };
+  }
+  let usdcBalance = 0n;
+  let oldTokenAccount;
+  try {
+    const response = await rpc.getTokenAccountsByOwner(
+      solAddress2(oldAddress),
+      { mint },
+      { encoding: "jsonParsed" }
+    ).send();
+    if (response.value.length > 0) {
+      for (const account of response.value) {
+        const parsed = account.account.data;
+        const amount = BigInt(parsed.parsed.info.tokenAmount.amount);
+        if (amount > 0n) {
+          usdcBalance += amount;
+          oldTokenAccount = account.pubkey;
+        }
+      }
+    }
+  } catch (err) {
+    return {
+      error: `Failed to check USDC balance: ${err instanceof Error ? err.message : String(err)}`,
+      oldAddress,
+      newAddress
+    };
+  }
+  if (usdcBalance === 0n) {
+    return {
+      error: "No USDC found in old wallet. Nothing to sweep.",
+      oldAddress,
+      newAddress,
+      solBalance,
+      usdcBalance: 0n
+    };
+  }
+  const MIN_SOL_FOR_GAS = 5000000n;
+  if (solBalance < MIN_SOL_FOR_GAS) {
+    const needed = Number(MIN_SOL_FOR_GAS - solBalance) / 1e9;
+    return {
+      error: `Insufficient SOL for transaction fees. Send ~${needed.toFixed(4)} SOL to ${oldAddress} to cover gas. Current SOL balance: ${(Number(solBalance) / 1e9).toFixed(6)} SOL`,
+      oldAddress,
+      newAddress,
+      solBalance,
+      usdcBalance
+    };
+  }
+  if (!oldTokenAccount) {
+    return {
+      error: "Could not find USDC token account in old wallet.",
+      oldAddress,
+      newAddress
+    };
+  }
+  try {
+    const newAta = await getAssociatedTokenAddress(newOwner, mint);
+    const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
+    const createAtaIx = buildCreateAtaIdempotentInstruction(
+      oldSigner.address,
+      newAta,
+      newOwner,
+      mint
+    );
+    const transferIx = buildTokenTransferInstruction(
+      solAddress2(oldTokenAccount),
+      newAta,
+      oldSigner.address,
+      usdcBalance
+    );
+    const txMessage = pipe(
+      createTransactionMessage({ version: 0 }),
+      (msg) => setTransactionMessageFeePayer(oldSigner.address, msg),
+      (msg) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, msg),
+      (msg) => appendTransactionMessageInstructions([createAtaIx, transferIx], msg)
+    );
+    const signedTx = await signTransactionMessageWithSigners(txMessage);
+    const txSignature = getSignatureFromTransaction(signedTx);
+    const wsUrl = url.replace("https://", "wss://").replace("http://", "ws://");
+    const rpcSubscriptions = createSolanaRpcSubscriptions(wsUrl);
+    const sendAndConfirm = sendAndConfirmTransactionFactory({ rpc, rpcSubscriptions });
+    await sendAndConfirm(signedTx, { commitment: "confirmed" });
+    const dollars = Number(usdcBalance) / 1e6;
+    return {
+      transferred: `$${dollars.toFixed(2)}`,
+      transferredMicros: usdcBalance,
+      txSignature,
+      oldAddress,
+      newAddress
+    };
+  } catch (err) {
+    return {
+      error: `Transaction failed: ${err instanceof Error ? err.message : String(err)}`,
+      oldAddress,
+      newAddress,
+      solBalance,
+      usdcBalance
+    };
+  }
+}
+var SOLANA_USDC_MINT2, SOLANA_DEFAULT_RPC2, TOKEN_PROGRAM, ASSOCIATED_TOKEN_PROGRAM, SYSTEM_PROGRAM;
+var init_solana_sweep = __esm({
+  "src/solana-sweep.ts"() {
     "use strict";
-    init_registry();
-    init_tools();
+    SOLANA_USDC_MINT2 = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
+    SOLANA_DEFAULT_RPC2 = "https://api.mainnet-beta.solana.com";
+    TOKEN_PROGRAM = "TokenkegQfeN4jV6bme4LphiJbfPe2VopRsimuVSoZ5K";
+    ASSOCIATED_TOKEN_PROGRAM = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
+    SYSTEM_PROGRAM = "11111111111111111111111111111111";
   }
 });
 
@@ -307,6 +992,8 @@ var MODEL_ALIASES = {
   // Google
   gemini: "google/gemini-2.5-pro",
   flash: "google/gemini-2.5-flash",
+  "gemini-3.1-pro-preview": "google/gemini-3.1-pro",
+  "google/gemini-3.1-pro-preview": "google/gemini-3.1-pro",
   // xAI
   grok: "xai/grok-3",
   "grok-fast": "xai/grok-4-fast-reasoning",
@@ -380,7 +1067,8 @@ var BLOCKRUN_MODELS = [
     maxOutput: 128e3,
     reasoning: true,
     vision: true,
-    agentic: true
+    agentic: true,
+    toolCalling: true
   },
   {
     id: "openai/gpt-5-mini",
@@ -389,7 +1077,8 @@ var BLOCKRUN_MODELS = [
     inputPrice: 0.25,
     outputPrice: 2,
     contextWindow: 2e5,
-    maxOutput: 65536
+    maxOutput: 65536,
+    toolCalling: true
   },
   {
     id: "openai/gpt-5-nano",
@@ -398,7 +1087,8 @@ var BLOCKRUN_MODELS = [
     inputPrice: 0.05,
     outputPrice: 0.4,
     contextWindow: 128e3,
-    maxOutput: 32768
+    maxOutput: 32768,
+    toolCalling: true
   },
   {
     id: "openai/gpt-5.2-pro",
@@ -408,7 +1098,8 @@ var BLOCKRUN_MODELS = [
     outputPrice: 168,
     contextWindow: 4e5,
     maxOutput: 128e3,
-    reasoning: true
+    reasoning: true,
+    toolCalling: true
   },
   // OpenAI Codex Family
   {
@@ -419,7 +1110,8 @@ var BLOCKRUN_MODELS = [
     outputPrice: 14,
     contextWindow: 128e3,
     maxOutput: 32e3,
-    agentic: true
+    agentic: true,
+    toolCalling: true
   },
   // OpenAI GPT-4 Family
   {
@@ -430,7 +1122,8 @@ var BLOCKRUN_MODELS = [
     outputPrice: 8,
     contextWindow: 128e3,
     maxOutput: 16384,
-    vision: true
+    vision: true,
+    toolCalling: true
   },
   {
     id: "openai/gpt-4.1-mini",
@@ -439,7 +1132,8 @@ var BLOCKRUN_MODELS = [
     inputPrice: 0.4,
     outputPrice: 1.6,
     contextWindow: 128e3,
-    maxOutput: 16384
+    maxOutput: 16384,
+    toolCalling: true
   },
   {
     id: "openai/gpt-4.1-nano",
@@ -448,7 +1142,8 @@ var BLOCKRUN_MODELS = [
     inputPrice: 0.1,
     outputPrice: 0.4,
     contextWindow: 128e3,
-    maxOutput: 16384
+    maxOutput: 16384,
+    toolCalling: true
   },
   {
     id: "openai/gpt-4o",
@@ -459,7 +1154,8 @@ var BLOCKRUN_MODELS = [
     contextWindow: 128e3,
     maxOutput: 16384,
     vision: true,
-    agentic: true
+    agentic: true,
+    toolCalling: true
   },
   {
     id: "openai/gpt-4o-mini",
@@ -468,7 +1164,8 @@ var BLOCKRUN_MODELS = [
     inputPrice: 0.15,
     outputPrice: 0.6,
     contextWindow: 128e3,
-    maxOutput: 16384
+    maxOutput: 16384,
+    toolCalling: true
   },
   // OpenAI O-series (Reasoning)
   {
@@ -479,7 +1176,8 @@ var BLOCKRUN_MODELS = [
     outputPrice: 60,
     contextWindow: 2e5,
     maxOutput: 1e5,
-    reasoning: true
+    reasoning: true,
+    toolCalling: true
   },
   {
     id: "openai/o1-mini",
@@ -489,7 +1187,8 @@ var BLOCKRUN_MODELS = [
     outputPrice: 4.4,
     contextWindow: 128e3,
     maxOutput: 65536,
-    reasoning: true
+    reasoning: true,
+    toolCalling: true
   },
   {
     id: "openai/o3",
@@ -499,7 +1198,8 @@ var BLOCKRUN_MODELS = [
     outputPrice: 8,
     contextWindow: 2e5,
     maxOutput: 1e5,
-    reasoning: true
+    reasoning: true,
+    toolCalling: true
   },
   {
     id: "openai/o3-mini",
@@ -509,7 +1209,8 @@ var BLOCKRUN_MODELS = [
     outputPrice: 4.4,
     contextWindow: 128e3,
     maxOutput: 65536,
-    reasoning: true
+    reasoning: true,
+    toolCalling: true
   },
   {
     id: "openai/o4-mini",
@@ -519,7 +1220,8 @@ var BLOCKRUN_MODELS = [
     outputPrice: 4.4,
     contextWindow: 128e3,
     maxOutput: 65536,
-    reasoning: true
+    reasoning: true,
+    toolCalling: true
   },
   // Anthropic - all Claude models excel at agentic workflows
   // Use newest versions (4.6) with full provider prefix
@@ -531,7 +1233,9 @@ var BLOCKRUN_MODELS = [
     outputPrice: 5,
     contextWindow: 2e5,
     maxOutput: 8192,
-    agentic: true
+    vision: true,
+    agentic: true,
+    toolCalling: true
   },
   {
     id: "anthropic/claude-sonnet-4.6",
@@ -542,7 +1246,9 @@ var BLOCKRUN_MODELS = [
     contextWindow: 2e5,
     maxOutput: 64e3,
     reasoning: true,
-    agentic: true
+    vision: true,
+    agentic: true,
+    toolCalling: true
   },
   {
     id: "anthropic/claude-opus-4.6",
@@ -553,19 +1259,22 @@ var BLOCKRUN_MODELS = [
     contextWindow: 2e5,
     maxOutput: 32e3,
     reasoning: true,
-    agentic: true
+    vision: true,
+    agentic: true,
+    toolCalling: true
   },
   // Google
   {
-    id: "google/gemini-3.1-pro-preview",
-    name: "Gemini 3.1 Pro Preview",
+    id: "google/gemini-3.1-pro",
+    name: "Gemini 3.1 Pro",
     version: "3.1",
     inputPrice: 2,
     outputPrice: 12,
     contextWindow: 105e4,
     maxOutput: 65536,
     reasoning: true,
-    vision: true
+    vision: true,
+    toolCalling: true
   },
   {
     id: "google/gemini-3-pro-preview",
@@ -576,7 +1285,8 @@ var BLOCKRUN_MODELS = [
     contextWindow: 105e4,
     maxOutput: 65536,
     reasoning: true,
-    vision: true
+    vision: true,
+    toolCalling: true
   },
   {
     id: "google/gemini-3-flash-preview",
@@ -586,7 +1296,8 @@ var BLOCKRUN_MODELS = [
     outputPrice: 3,
     contextWindow: 1e6,
     maxOutput: 65536,
-    vision: true
+    vision: true,
+    toolCalling: true
   },
   {
     id: "google/gemini-2.5-pro",
@@ -597,7 +1308,8 @@ var BLOCKRUN_MODELS = [
     contextWindow: 105e4,
     maxOutput: 65536,
     reasoning: true,
-    vision: true
+    vision: true,
+    toolCalling: true
   },
   {
     id: "google/gemini-2.5-flash",
@@ -606,7 +1318,9 @@ var BLOCKRUN_MODELS = [
     inputPrice: 0.3,
     outputPrice: 2.5,
     contextWindow: 1e6,
-    maxOutput: 65536
+    maxOutput: 65536,
+    vision: true,
+    toolCalling: true
   },
   {
     id: "google/gemini-2.5-flash-lite",
@@ -615,7 +1329,8 @@ var BLOCKRUN_MODELS = [
     inputPrice: 0.1,
     outputPrice: 0.4,
     contextWindow: 1e6,
-    maxOutput: 65536
+    maxOutput: 65536,
+    toolCalling: true
   },
   // DeepSeek
   {
@@ -625,7 +1340,8 @@ var BLOCKRUN_MODELS = [
     inputPrice: 0.28,
     outputPrice: 0.42,
     contextWindow: 128e3,
-    maxOutput: 8192
+    maxOutput: 8192,
+    toolCalling: true
   },
   {
     id: "deepseek/deepseek-reasoner",
@@ -635,7 +1351,8 @@ var BLOCKRUN_MODELS = [
     outputPrice: 0.42,
     contextWindow: 128e3,
     maxOutput: 8192,
-    reasoning: true
+    reasoning: true,
+    toolCalling: true
   },
   // Moonshot / Kimi - optimized for agentic workflows
   {
@@ -648,7 +1365,8 @@ var BLOCKRUN_MODELS = [
     maxOutput: 8192,
     reasoning: true,
     vision: true,
-    agentic: true
+    agentic: true,
+    toolCalling: true
   },
   // xAI / Grok
   {
@@ -659,7 +1377,8 @@ var BLOCKRUN_MODELS = [
     outputPrice: 15,
     contextWindow: 131072,
     maxOutput: 16384,
-    reasoning: true
+    reasoning: true,
+    toolCalling: true
   },
   // grok-3-fast removed - too expensive ($5/$25), use grok-4-fast instead
   {
@@ -669,7 +1388,8 @@ var BLOCKRUN_MODELS = [
     inputPrice: 0.3,
     outputPrice: 0.5,
     contextWindow: 131072,
-    maxOutput: 16384
+    maxOutput: 16384,
+    toolCalling: true
   },
   // xAI Grok 4 Family - Ultra-cheap fast models
   {
@@ -680,7 +1400,8 @@ var BLOCKRUN_MODELS = [
     outputPrice: 0.5,
     contextWindow: 131072,
     maxOutput: 16384,
-    reasoning: true
+    reasoning: true,
+    toolCalling: true
   },
   {
     id: "xai/grok-4-fast-non-reasoning",
@@ -689,7 +1410,8 @@ var BLOCKRUN_MODELS = [
     inputPrice: 0.2,
     outputPrice: 0.5,
     contextWindow: 131072,
-    maxOutput: 16384
+    maxOutput: 16384,
+    toolCalling: true
   },
   {
     id: "xai/grok-4-1-fast-reasoning",
@@ -699,7 +1421,8 @@ var BLOCKRUN_MODELS = [
     outputPrice: 0.5,
     contextWindow: 131072,
     maxOutput: 16384,
-    reasoning: true
+    reasoning: true,
+    toolCalling: true
   },
   {
     id: "xai/grok-4-1-fast-non-reasoning",
@@ -708,7 +1431,8 @@ var BLOCKRUN_MODELS = [
     inputPrice: 0.2,
     outputPrice: 0.5,
     contextWindow: 131072,
-    maxOutput: 16384
+    maxOutput: 16384,
+    toolCalling: true
   },
   {
     id: "xai/grok-code-fast-1",
@@ -717,9 +1441,10 @@ var BLOCKRUN_MODELS = [
     inputPrice: 0.2,
     outputPrice: 1.5,
     contextWindow: 131072,
-    maxOutput: 16384,
-    agentic: true
-    // Good for coding tasks
+    maxOutput: 16384
+    // toolCalling intentionally omitted: outputs tool calls as plain text JSON,
+    // not OpenAI-compatible structured function calls. Will be skipped when
+    // request has tools to prevent the "talking to itself" bug.
   },
   {
     id: "xai/grok-4-0709",
@@ -729,7 +1454,8 @@ var BLOCKRUN_MODELS = [
     outputPrice: 1.5,
     contextWindow: 131072,
     maxOutput: 16384,
-    reasoning: true
+    reasoning: true,
+    toolCalling: true
   },
   {
     id: "xai/grok-2-vision",
@@ -739,7 +1465,8 @@ var BLOCKRUN_MODELS = [
     outputPrice: 10,
     contextWindow: 131072,
     maxOutput: 16384,
-    vision: true
+    vision: true,
+    toolCalling: true
   },
   // MiniMax
   {
@@ -751,7 +1478,8 @@ var BLOCKRUN_MODELS = [
     contextWindow: 204800,
     maxOutput: 16384,
     reasoning: true,
-    agentic: true
+    agentic: true,
+    toolCalling: true
   },
   // NVIDIA - Free/cheap models
   {
@@ -762,6 +1490,8 @@ var BLOCKRUN_MODELS = [
     outputPrice: 0,
     contextWindow: 128e3,
     maxOutput: 16384
+    // toolCalling intentionally omitted: free model, structured function
+    // calling support unverified. Excluded from tool-heavy routing paths.
   },
   {
     id: "nvidia/kimi-k2.5",
@@ -770,7 +1500,8 @@ var BLOCKRUN_MODELS = [
     inputPrice: 0.55,
     outputPrice: 2.5,
     contextWindow: 262144,
-    maxOutput: 16384
+    maxOutput: 16384,
+    toolCalling: true
   }
 ];
 function toOpenClawModel(m) {
@@ -815,6 +1546,16 @@ function isAgenticModel(modelId) {
 function getAgenticModels() {
   return BLOCKRUN_MODELS.filter((m) => m.agentic).map((m) => m.id);
 }
+function supportsToolCalling(modelId) {
+  const normalized = modelId.replace("blockrun/", "");
+  const model = BLOCKRUN_MODELS.find((m) => m.id === normalized);
+  return model?.toolCalling ?? false;
+}
+function supportsVision(modelId) {
+  const normalized = modelId.replace("blockrun/", "");
+  const model = BLOCKRUN_MODELS.find((m) => m.id === normalized);
+  return model?.vision ?? false;
+}
 function getModelContextWindow(modelId) {
   const normalized = modelId.replace("blockrun/", "");
   const model = BLOCKRUN_MODELS.find((m) => m.id === normalized);
@@ -861,13 +1602,13 @@ import { x402Client } from "@x402/fetch";
 // src/payment-preauth.ts
 import { x402HTTPClient } from "@x402/fetch";
 var DEFAULT_TTL_MS = 36e5;
-function createPayFetchWithPreAuth(baseFetch, client, ttlMs = DEFAULT_TTL_MS) {
+function createPayFetchWithPreAuth(baseFetch, client, ttlMs = DEFAULT_TTL_MS, options) {
   const httpClient = new x402HTTPClient(client);
   const cache = /* @__PURE__ */ new Map();
   return async (input, init) => {
     const request = new Request(input, init);
     const urlPath = new URL(request.url).pathname;
-    const cached = cache.get(urlPath);
+    const cached = !options?.skipPreAuth ? cache.get(urlPath) : void 0;
     if (cached && Date.now() - cached.cachedAt < ttlMs) {
       try {
         const payload2 = await client.createPaymentPayload(cached.paymentRequired);
@@ -903,7 +1644,8 @@ function createPayFetchWithPreAuth(baseFetch, client, ttlMs = DEFAULT_TTL_MS) {
       cache.set(urlPath, { paymentRequired, cachedAt: Date.now() });
     } catch (error) {
       throw new Error(
-        `Failed to parse payment requirements: ${error instanceof Error ? error.message : "Unknown error"}`
+        `Failed to parse payment requirements: ${error instanceof Error ? error.message : "Unknown error"}`,
+        { cause: error }
       );
     }
     const payload = await client.createPaymentPayload(paymentRequired);
@@ -1007,20 +1749,18 @@ function scoreAgenticTask(text, keywords) {
   };
 }
 function classifyByRules(prompt, systemPrompt, estimatedTokens, config) {
-  const text = `${systemPrompt ?? ""} ${prompt}`.toLowerCase();
   const userText = prompt.toLowerCase();
   const dimensions = [
-    // Original 8 dimensions
+    // Token count uses total estimated tokens (system + user) — context size matters for model selection
     scoreTokenCount(estimatedTokens, config.tokenCountThresholds),
     scoreKeywordMatch(
-      text,
+      userText,
       config.codeKeywords,
       "codePresence",
       "code",
       { low: 1, high: 2 },
       { none: 0, low: 0.5, high: 1 }
     ),
-    // Reasoning markers use USER prompt only — system prompt "step by step" shouldn't trigger reasoning
     scoreKeywordMatch(
       userText,
       config.reasoningKeywords,
@@ -1030,7 +1770,7 @@ function classifyByRules(prompt, systemPrompt, estimatedTokens, config) {
       { none: 0, low: 0.7, high: 1 }
     ),
     scoreKeywordMatch(
-      text,
+      userText,
       config.technicalKeywords,
       "technicalTerms",
       "technical",
@@ -1038,7 +1778,7 @@ function classifyByRules(prompt, systemPrompt, estimatedTokens, config) {
       { none: 0, low: 0.5, high: 1 }
     ),
     scoreKeywordMatch(
-      text,
+      userText,
       config.creativeKeywords,
       "creativeMarkers",
       "creative",
@@ -1046,18 +1786,18 @@ function classifyByRules(prompt, systemPrompt, estimatedTokens, config) {
       { none: 0, low: 0.5, high: 0.7 }
     ),
     scoreKeywordMatch(
-      text,
+      userText,
       config.simpleKeywords,
       "simpleIndicators",
       "simple",
       { low: 1, high: 2 },
       { none: 0, low: -1, high: -1 }
     ),
-    scoreMultiStep(text),
+    scoreMultiStep(userText),
     scoreQuestionComplexity(prompt),
     // 6 new dimensions
     scoreKeywordMatch(
-      text,
+      userText,
       config.imperativeVerbs,
       "imperativeVerbs",
       "imperative",
@@ -1065,7 +1805,7 @@ function classifyByRules(prompt, systemPrompt, estimatedTokens, config) {
       { none: 0, low: 0.3, high: 0.5 }
     ),
     scoreKeywordMatch(
-      text,
+      userText,
       config.constraintIndicators,
       "constraintCount",
       "constraints",
@@ -1073,7 +1813,7 @@ function classifyByRules(prompt, systemPrompt, estimatedTokens, config) {
       { none: 0, low: 0.3, high: 0.7 }
     ),
     scoreKeywordMatch(
-      text,
+      userText,
       config.outputFormatKeywords,
       "outputFormat",
       "format",
@@ -1081,7 +1821,7 @@ function classifyByRules(prompt, systemPrompt, estimatedTokens, config) {
       { none: 0, low: 0.4, high: 0.7 }
     ),
     scoreKeywordMatch(
-      text,
+      userText,
       config.referenceKeywords,
       "referenceComplexity",
       "references",
@@ -1089,7 +1829,7 @@ function classifyByRules(prompt, systemPrompt, estimatedTokens, config) {
       { none: 0, low: 0.3, high: 0.5 }
     ),
     scoreKeywordMatch(
-      text,
+      userText,
       config.negationKeywords,
       "negationComplexity",
       "negation",
@@ -1097,7 +1837,7 @@ function classifyByRules(prompt, systemPrompt, estimatedTokens, config) {
       { none: 0, low: 0.3, high: 0.5 }
     ),
     scoreKeywordMatch(
-      text,
+      userText,
       config.domainSpecificKeywords,
       "domainSpecificity",
       "domain-specific",
@@ -1129,7 +1869,8 @@ function classifyByRules(prompt, systemPrompt, estimatedTokens, config) {
       tier: "REASONING",
       confidence: Math.max(confidence2, 0.85),
       signals,
-      agenticScore
+      agenticScore,
+      dimensions
     };
   }
   const { simpleMedium, mediumComplex, complexReasoning } = config.tierBoundaries;
@@ -1153,9 +1894,9 @@ function classifyByRules(prompt, systemPrompt, estimatedTokens, config) {
   }
   const confidence = calibrateConfidence(distanceFromBoundary, config.confidenceSteepness);
   if (confidence < config.confidenceThreshold) {
-    return { score: weightedScore, tier: null, confidence, signals, agenticScore };
+    return { score: weightedScore, tier: null, confidence, signals, agenticScore, dimensions };
   }
-  return { score: weightedScore, tier, confidence, signals, agenticScore };
+  return { score: weightedScore, tier, confidence, signals, agenticScore, dimensions };
 }
 function calibrateConfidence(distance, steepness) {
   return 1 / (1 + Math.exp(-steepness * distance));
@@ -1163,7 +1904,9 @@ function calibrateConfidence(distance, steepness) {
 
 // src/router/selector.ts
 var BASELINE_MODEL_ID = "anthropic/claude-opus-4.6";
-function selectModel(tier, confidence, method, reasoning, tierConfigs, modelPricing, estimatedInputTokens, maxOutputTokens, routingProfile) {
+var BASELINE_INPUT_PRICE = 5;
+var BASELINE_OUTPUT_PRICE = 25;
+function selectModel(tier, confidence, method, reasoning, tierConfigs, modelPricing, estimatedInputTokens, maxOutputTokens, routingProfile, agenticScore) {
   const tierConfig = tierConfigs[tier];
   const model = tierConfig.primary;
   const pricing = modelPricing.get(model);
@@ -1173,8 +1916,8 @@ function selectModel(tier, confidence, method, reasoning, tierConfigs, modelPric
   const outputCost = maxOutputTokens / 1e6 * outputPrice;
   const costEstimate = inputCost + outputCost;
   const opusPricing = modelPricing.get(BASELINE_MODEL_ID);
-  const opusInputPrice = opusPricing?.inputPrice ?? 0;
-  const opusOutputPrice = opusPricing?.outputPrice ?? 0;
+  const opusInputPrice = opusPricing?.inputPrice ?? BASELINE_INPUT_PRICE;
+  const opusOutputPrice = opusPricing?.outputPrice ?? BASELINE_OUTPUT_PRICE;
   const baselineInput = estimatedInputTokens / 1e6 * opusInputPrice;
   const baselineOutput = maxOutputTokens / 1e6 * opusOutputPrice;
   const baselineCost = baselineInput + baselineOutput;
@@ -1187,7 +1930,8 @@ function selectModel(tier, confidence, method, reasoning, tierConfigs, modelPric
     reasoning,
     costEstimate,
     baselineCost,
-    savings
+    savings,
+    ...agenticScore !== void 0 && { agenticScore }
   };
 }
 function getFallbackChain(tier, tierConfigs) {
@@ -1202,14 +1946,24 @@ function calculateModelCost(model, modelPricing, estimatedInputTokens, maxOutput
   const outputCost = maxOutputTokens / 1e6 * outputPrice;
   const costEstimate = inputCost + outputCost;
   const opusPricing = modelPricing.get(BASELINE_MODEL_ID);
-  const opusInputPrice = opusPricing?.inputPrice ?? 0;
-  const opusOutputPrice = opusPricing?.outputPrice ?? 0;
+  const opusInputPrice = opusPricing?.inputPrice ?? BASELINE_INPUT_PRICE;
+  const opusOutputPrice = opusPricing?.outputPrice ?? BASELINE_OUTPUT_PRICE;
   const baselineInput = estimatedInputTokens / 1e6 * opusInputPrice;
   const baselineOutput = maxOutputTokens / 1e6 * opusOutputPrice;
   const baselineCost = baselineInput + baselineOutput;
   const savings = routingProfile === "premium" ? 0 : baselineCost > 0 ? Math.max(0, (baselineCost - costEstimate) / baselineCost) : 0;
   return { costEstimate, baselineCost, savings };
 }
+function filterByToolCalling(models, hasTools, supportsToolCalling2) {
+  if (!hasTools) return models;
+  const filtered = models.filter(supportsToolCalling2);
+  return filtered.length > 0 ? filtered : models;
+}
+function filterByVision(models, hasVision, supportsVision2) {
+  if (!hasVision) return models;
+  const filtered = models.filter(supportsVision2);
+  return filtered.length > 0 ? filtered : models;
+}
 function getFallbackChainFiltered(tier, tierConfigs, estimatedTotalTokens, getContextWindow) {
   const fullChain = getFallbackChain(tier, tierConfigs);
   const filtered = fullChain.filter((modelId) => {
@@ -2265,18 +3019,18 @@ var DEFAULT_ROUTING_CONFIG = {
       ]
     },
     MEDIUM: {
-      primary: "xai/grok-code-fast-1",
-      // Code specialist, $0.20/$1.50
+      primary: "moonshot/kimi-k2.5",
+      // $0.50/$2.40 - strong tool use, proper function call format
       fallback: [
+        "deepseek/deepseek-chat",
         "google/gemini-2.5-flash-lite",
         // 1M context, ultra cheap ($0.10/$0.40)
-        "deepseek/deepseek-chat",
         "xai/grok-4-1-fast-non-reasoning"
         // Upgraded Grok 4.1
       ]
     },
     COMPLEX: {
-      primary: "google/gemini-3.1-pro-preview",
+      primary: "google/gemini-3.1-pro",
       // Newest Gemini 3.1 - upgraded from 3.0
       fallback: [
         "google/gemini-2.5-flash-lite",
@@ -2336,7 +3090,7 @@ var DEFAULT_ROUTING_CONFIG = {
       fallback: [
         "anthropic/claude-haiku-4.5",
         "google/gemini-2.5-flash-lite",
-        "xai/grok-code-fast-1"
+        "deepseek/deepseek-chat"
       ]
     },
     MEDIUM: {
@@ -2356,7 +3110,7 @@ var DEFAULT_ROUTING_CONFIG = {
         "openai/gpt-5.2-codex",
         "anthropic/claude-opus-4.6",
         "anthropic/claude-sonnet-4.6",
-        "google/gemini-3.1-pro-preview",
+        "google/gemini-3.1-pro",
         // Newest Gemini
         "google/gemini-3-pro-preview",
         "moonshot/kimi-k2.5"
@@ -2387,9 +3141,13 @@ var DEFAULT_ROUTING_CONFIG = {
       ]
     },
     MEDIUM: {
-      primary: "xai/grok-code-fast-1",
-      // Code specialist for agentic coding
-      fallback: ["moonshot/kimi-k2.5", "anthropic/claude-haiku-4.5", "claude-sonnet-4"]
+      primary: "moonshot/kimi-k2.5",
+      // $0.50/$2.40 - strong tool use, handles function calls correctly
+      fallback: [
+        "anthropic/claude-haiku-4.5",
+        "deepseek/deepseek-chat",
+        "xai/grok-4-1-fast-non-reasoning"
+      ]
     },
     COMPLEX: {
       primary: "anthropic/claude-sonnet-4.6",
@@ -2397,7 +3155,7 @@ var DEFAULT_ROUTING_CONFIG = {
         "anthropic/claude-opus-4.6",
         // Latest Opus - best agentic
         "openai/gpt-5.2",
-        "google/gemini-3.1-pro-preview",
+        "google/gemini-3.1-pro",
         // Newest Gemini
         "google/gemini-3-pro-preview",
         "xai/grok-4-0709"
@@ -2429,7 +3187,7 @@ function route(prompt, systemPrompt, maxOutputTokens, options) {
   const ruleResult = classifyByRules(prompt, systemPrompt, estimatedTokens, config.scoring);
   const { routingProfile } = options;
   let tierConfigs;
-  let profileSuffix = "";
+  let profileSuffix;
   if (routingProfile === "eco" && config.ecoTiers) {
     tierConfigs = config.ecoTiers;
     profileSuffix = " | eco";
@@ -2444,6 +3202,7 @@ function route(prompt, systemPrompt, maxOutputTokens, options) {
     tierConfigs = useAgenticTiers ? config.agenticTiers : config.tiers;
     profileSuffix = useAgenticTiers ? " | agentic" : "";
   }
+  const agenticScoreValue = ruleResult.agenticScore;
   if (estimatedTokens > config.overrides.maxTokensForceComplex) {
     return selectModel(
       "COMPLEX",
@@ -2454,7 +3213,8 @@ function route(prompt, systemPrompt, maxOutputTokens, options) {
       modelPricing,
       estimatedTokens,
       maxOutputTokens,
-      routingProfile
+      routingProfile,
+      agenticScoreValue
     );
   }
   const hasStructuredOutput = systemPrompt ? /json|structured|schema/i.test(systemPrompt) : false;
@@ -2488,7 +3248,8 @@ function route(prompt, systemPrompt, maxOutputTokens, options) {
     modelPricing,
     estimatedTokens,
     maxOutputTokens,
-    routingProfile
+    routingProfile,
+    agenticScoreValue
   );
 }
 
@@ -3243,6 +4004,9 @@ var BalanceMonitor = class {
   }
 };
 
+// src/proxy.ts
+init_solana_balance();
+
 // src/auth.ts
 import { writeFile, mkdir as mkdir2 } from "fs/promises";
 init_wallet();
@@ -3263,7 +4027,9 @@ async function loadSavedWallet() {
     console.error(`[ClawRouter] \u2717 CRITICAL: Wallet file exists but has invalid format!`);
     console.error(`[ClawRouter]   File: ${WALLET_FILE}`);
     console.error(`[ClawRouter]   Expected: 0x followed by 64 hex characters (66 chars total)`);
-    console.error(`[ClawRouter]   To fix: restore your backup key or set BLOCKRUN_WALLET_KEY env var`);
+    console.error(
+      `[ClawRouter]   To fix: restore your backup key or set BLOCKRUN_WALLET_KEY env var`
+    );
     throw new Error(
       `Wallet file at ${WALLET_FILE} is corrupted or has wrong format. Refusing to auto-generate new wallet to protect existing funds. Restore your backup key or set BLOCKRUN_WALLET_KEY environment variable.`
     );
@@ -3276,7 +4042,8 @@ async function loadSavedWallet() {
         `[ClawRouter] \u2717 Failed to read wallet file: ${err instanceof Error ? err.message : String(err)}`
       );
       throw new Error(
-        `Cannot read wallet file at ${WALLET_FILE}: ${err instanceof Error ? err.message : String(err)}. Refusing to auto-generate new wallet to protect existing funds. Fix file permissions or set BLOCKRUN_WALLET_KEY environment variable.`
+        `Cannot read wallet file at ${WALLET_FILE}: ${err instanceof Error ? err.message : String(err)}. Refusing to auto-generate new wallet to protect existing funds. Fix file permissions or set BLOCKRUN_WALLET_KEY environment variable.`,
+        { cause: err }
       );
     }
   }
@@ -3321,7 +4088,8 @@ async function generateAndSaveWallet() {
     console.log(`[ClawRouter] Wallet saved and verified at ${WALLET_FILE}`);
   } catch (err) {
     throw new Error(
-      `Failed to verify wallet file after creation: ${err instanceof Error ? err.message : String(err)}`
+      `Failed to verify wallet file after creation: ${err instanceof Error ? err.message : String(err)}`,
+      { cause: err }
     );
   }
   console.log(`[ClawRouter]`);
@@ -3347,6 +4115,29 @@ async function generateAndSaveWallet() {
     solanaPrivateKeyBytes: derived.solanaPrivateKeyBytes
   };
 }
+async function logMigrationWarning(legacyKeyBytes, newKeyBytes) {
+  try {
+    const { createKeyPairSignerFromPrivateKeyBytes: createKeyPairSignerFromPrivateKeyBytes2 } = await import("@solana/kit");
+    const [oldSigner, newSigner] = await Promise.all([
+      createKeyPairSignerFromPrivateKeyBytes2(legacyKeyBytes),
+      createKeyPairSignerFromPrivateKeyBytes2(newKeyBytes)
+    ]);
+    console.log(`[ClawRouter]`);
+    console.log(`[ClawRouter] \u26A0 SOLANA WALLET MIGRATION DETECTED`);
+    console.log(`[ClawRouter] \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`);
+    console.log(`[ClawRouter]   Old address (secp256k1): ${oldSigner.address}`);
+    console.log(`[ClawRouter]   New address (SLIP-10):   ${newSigner.address}`);
+    console.log(`[ClawRouter]`);
+    console.log(`[ClawRouter]   Your Solana wallet derivation has been fixed to use`);
+    console.log(`[ClawRouter]   SLIP-10 Ed25519 (Phantom/Solflare compatible).`);
+    console.log(`[ClawRouter]`);
+    console.log(`[ClawRouter]   If you had funds in the old wallet, run:`);
+    console.log(`[ClawRouter]     /wallet migrate-solana`);
+    console.log(`[ClawRouter] \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`);
+    console.log(`[ClawRouter]`);
+  } catch {
+  }
+}
 async function resolveOrGenerateWalletKey() {
   const saved = await loadSavedWallet();
   if (saved) {
@@ -3354,13 +4145,19 @@ async function resolveOrGenerateWalletKey() {
     const mnemonic = await loadMnemonic();
     if (mnemonic) {
       const solanaKeyBytes = deriveSolanaKeyBytes(mnemonic);
-      return {
+      const result2 = {
         key: saved,
         address: account.address,
         source: "saved",
         mnemonic,
         solanaPrivateKeyBytes: solanaKeyBytes
       };
+      const legacyKeyBytes = deriveSolanaKeyBytesLegacy(mnemonic);
+      if (Buffer.from(legacyKeyBytes).toString("hex") !== Buffer.from(solanaKeyBytes).toString("hex")) {
+        result2.legacySolanaKeyBytes = legacyKeyBytes;
+        await logMigrationWarning(legacyKeyBytes, solanaKeyBytes);
+      }
+      return result2;
     }
     return { key: saved, address: account.address, source: "saved" };
   }
@@ -3370,13 +4167,19 @@ async function resolveOrGenerateWalletKey() {
     const mnemonic = await loadMnemonic();
     if (mnemonic) {
       const solanaKeyBytes = deriveSolanaKeyBytes(mnemonic);
-      return {
+      const result2 = {
         key: envKey,
         address: account.address,
         source: "env",
         mnemonic,
         solanaPrivateKeyBytes: solanaKeyBytes
       };
+      const legacyKeyBytes = deriveSolanaKeyBytesLegacy(mnemonic);
+      if (Buffer.from(legacyKeyBytes).toString("hex") !== Buffer.from(solanaKeyBytes).toString("hex")) {
+        result2.legacySolanaKeyBytes = legacyKeyBytes;
+        await logMigrationWarning(legacyKeyBytes, solanaKeyBytes);
+      }
+      return result2;
     }
     return { key: envKey, address: account.address, source: "env" };
   }
@@ -3392,9 +4195,7 @@ async function resolveOrGenerateWalletKey() {
 async function setupSolana() {
   const existing = await loadMnemonic();
   if (existing) {
-    throw new Error(
-      "Solana wallet already set up. Mnemonic file exists at " + MNEMONIC_FILE
-    );
+    throw new Error("Solana wallet already set up. Mnemonic file exists at " + MNEMONIC_FILE);
   }
   const savedKey = await loadSavedWallet();
   if (!savedKey) {
@@ -4175,8 +4976,9 @@ function shouldCompress(messages) {
 }
 
 // src/session.ts
+import { createHash as createHash3 } from "crypto";
 var DEFAULT_SESSION_CONFIG = {
-  enabled: false,
+  enabled: true,
   timeoutMs: 30 * 60 * 1e3,
   // 30 minutes
   headerName: "x-session-id"
@@ -4231,7 +5033,10 @@ var SessionStore = class {
         tier,
         createdAt: now,
         lastUsedAt: now,
-        requestCount: 1
+        requestCount: 1,
+        recentHashes: [],
+        strikes: 0,
+        escalated: false
       });
     }
   }
@@ -4283,6 +5088,43 @@ var SessionStore = class {
       }
     }
   }
+  /**
+   * Record a request content hash and detect repetitive patterns.
+   * Returns true if escalation should be triggered (3+ consecutive similar requests).
+   */
+  recordRequestHash(sessionId, hash) {
+    const entry = this.sessions.get(sessionId);
+    if (!entry) return false;
+    const prev = entry.recentHashes;
+    if (prev.length > 0 && prev[prev.length - 1] === hash) {
+      entry.strikes++;
+    } else {
+      entry.strikes = 0;
+    }
+    entry.recentHashes.push(hash);
+    if (entry.recentHashes.length > 3) {
+      entry.recentHashes.shift();
+    }
+    return entry.strikes >= 2 && !entry.escalated;
+  }
+  /**
+   * Escalate session to next tier. Returns the new model/tier or null if already at max.
+   */
+  escalateSession(sessionId, tierConfigs) {
+    const entry = this.sessions.get(sessionId);
+    if (!entry) return null;
+    const TIER_ORDER = ["SIMPLE", "MEDIUM", "COMPLEX", "REASONING"];
+    const currentIdx = TIER_ORDER.indexOf(entry.tier);
+    if (currentIdx < 0 || currentIdx >= TIER_ORDER.length - 1) return null;
+    const nextTier = TIER_ORDER[currentIdx + 1];
+    const nextConfig = tierConfigs[nextTier];
+    if (!nextConfig) return null;
+    entry.model = nextConfig.primary;
+    entry.tier = nextTier;
+    entry.strikes = 0;
+    entry.escalated = true;
+    return { model: nextConfig.primary, tier: nextTier };
+  }
   /**
    * Stop the cleanup interval.
    */
@@ -4303,6 +5145,17 @@ function getSessionId(headers, headerName = DEFAULT_SESSION_CONFIG.headerName) {
   }
   return void 0;
 }
+function deriveSessionId(messages) {
+  const firstUser = messages.find((m) => m.role === "user");
+  if (!firstUser) return void 0;
+  const content = typeof firstUser.content === "string" ? firstUser.content : JSON.stringify(firstUser.content);
+  return createHash3("sha256").update(content).digest("hex").slice(0, 8);
+}
+function hashRequestContent(lastUserContent, toolCallNames) {
+  const normalized = lastUserContent.replace(/\s+/g, " ").trim().slice(0, 500);
+  const toolSuffix = toolCallNames?.length ? `|tools:${toolCallNames.sort().join(",")}` : "";
+  return createHash3("sha256").update(normalized + toolSuffix).digest("hex").slice(0, 12);
+}
 
 // src/updater.ts
 var NPM_REGISTRY = "https://registry.npmjs.org/@blockrun/clawrouter/latest";
@@ -5060,13 +5913,36 @@ async function proxyPartnerRequest(req, res, apiBase, payFetch) {
   }).catch(() => {
   });
 }
+async function uploadDataUriToHost(dataUri) {
+  const match = dataUri.match(/^data:(image\/\w+);base64,(.+)$/);
+  if (!match) throw new Error("Invalid data URI format");
+  const [, mimeType, b64Data] = match;
+  const ext = mimeType === "image/jpeg" ? "jpg" : mimeType.split("/")[1] ?? "png";
+  const buffer = Buffer.from(b64Data, "base64");
+  const blob = new Blob([buffer], { type: mimeType });
+  const form = new FormData();
+  form.append("reqtype", "fileupload");
+  form.append("fileToUpload", blob, `image.${ext}`);
+  const resp = await fetch("https://catbox.moe/user/api.php", {
+    method: "POST",
+    body: form
+  });
+  if (!resp.ok) throw new Error(`catbox.moe upload failed: HTTP ${resp.status}`);
+  const result = await resp.text();
+  if (result.startsWith("https://")) {
+    return result.trim();
+  }
+  throw new Error(`catbox.moe upload failed: ${result}`);
+}
 async function startProxy(options) {
   const walletKey = typeof options.wallet === "string" ? options.wallet : options.wallet.key;
   const solanaPrivateKeyBytes = typeof options.wallet === "string" ? void 0 : options.wallet.solanaPrivateKeyBytes;
   const paymentChain = options.paymentChain ?? await resolvePaymentChain();
   const apiBase = options.apiBase ?? (paymentChain === "solana" && solanaPrivateKeyBytes ? BLOCKRUN_SOLANA_API : BLOCKRUN_API);
   if (paymentChain === "solana" && !solanaPrivateKeyBytes) {
-    console.warn(`[ClawRouter] Payment chain is Solana but no Solana keys provided. Using Base (EVM).`);
+    console.warn(
+      `[ClawRouter] Payment chain is Solana but no Solana keys provided. Using Base (EVM).`
+    );
   } else if (paymentChain === "solana") {
     console.log(`[ClawRouter] Payment chain: Solana (${BLOCKRUN_SOLANA_API})`);
   }
@@ -5074,7 +5950,6 @@ async function startProxy(options) {
   const existingProxy = await checkExistingProxy(listenPort);
   if (existingProxy) {
     const account2 = privateKeyToAccount3(walletKey);
-    const balanceMonitor2 = new BalanceMonitor(account2.address);
     const baseUrl2 = `http://127.0.0.1:${listenPort}`;
     if (existingProxy.wallet !== account2.address) {
       console.warn(
@@ -5088,17 +5963,20 @@ async function startProxy(options) {
         );
       }
     } else if (paymentChain !== "base") {
-      console.warn(`[ClawRouter] Existing proxy on port ${listenPort} does not report paymentChain (pre-v0.11 instance). Assuming Base.`);
+      console.warn(
+        `[ClawRouter] Existing proxy on port ${listenPort} does not report paymentChain (pre-v0.11 instance). Assuming Base.`
+      );
       throw new Error(
         `Existing proxy on port ${listenPort} is a pre-v0.11 instance (assumed Base) but ${paymentChain} was requested. Stop the existing proxy first or use a different port.`
       );
     }
     let reuseSolanaAddress;
     if (solanaPrivateKeyBytes) {
-      const { createKeyPairSignerFromPrivateKeyBytes } = await import("@solana/kit");
-      const solanaSigner = await createKeyPairSignerFromPrivateKeyBytes(solanaPrivateKeyBytes);
+      const { createKeyPairSignerFromPrivateKeyBytes: createKeyPairSignerFromPrivateKeyBytes2 } = await import("@solana/kit");
+      const solanaSigner = await createKeyPairSignerFromPrivateKeyBytes2(solanaPrivateKeyBytes);
       reuseSolanaAddress = solanaSigner.address;
     }
+    const balanceMonitor2 = paymentChain === "solana" && reuseSolanaAddress ? new SolanaBalanceMonitor(reuseSolanaAddress) : new BalanceMonitor(account2.address);
     options.onReady?.(listenPort);
     return {
       port: listenPort,
@@ -5118,8 +5996,8 @@ async function startProxy(options) {
   let solanaAddress;
   if (solanaPrivateKeyBytes) {
     const { registerExactSvmScheme } = await import("@x402/svm/exact/client");
-    const { createKeyPairSignerFromPrivateKeyBytes } = await import("@solana/kit");
-    const solanaSigner = await createKeyPairSignerFromPrivateKeyBytes(solanaPrivateKeyBytes);
+    const { createKeyPairSignerFromPrivateKeyBytes: createKeyPairSignerFromPrivateKeyBytes2 } = await import("@solana/kit");
+    const solanaSigner = await createKeyPairSignerFromPrivateKeyBytes2(solanaPrivateKeyBytes);
     solanaAddress = solanaSigner.address;
     registerExactSvmScheme(x402, { signer: solanaSigner });
     console.log(`[ClawRouter] Solana x402 scheme registered: ${solanaAddress}`);
@@ -5129,8 +6007,10 @@ async function startProxy(options) {
     const chain = network.startsWith("eip155") ? "Base (EVM)" : network.startsWith("solana") ? "Solana" : network;
     console.log(`[ClawRouter] Payment signed on ${chain} (${network})`);
   });
-  const payFetch = createPayFetchWithPreAuth(fetch, x402);
-  const balanceMonitor = new BalanceMonitor(account.address);
+  const payFetch = createPayFetchWithPreAuth(fetch, x402, void 0, {
+    skipPreAuth: paymentChain === "solana"
+  });
+  const balanceMonitor = paymentChain === "solana" && solanaAddress ? new SolanaBalanceMonitor(solanaAddress) : new BalanceMonitor(account.address);
   const routingConfig = mergeRoutingConfig(options.routingConfig);
   const modelPricing = buildModelPricing();
   const routerOpts = {
@@ -5284,7 +6164,11 @@ async function startProxy(options) {
           const existingProxy2 = await checkExistingProxy(listenPort);
           if (existingProxy2) {
             console.log(`[ClawRouter] Existing proxy detected on port ${listenPort}, reusing`);
-            rejectAttempt({ code: "REUSE_EXISTING", wallet: existingProxy2.wallet, existingChain: existingProxy2.paymentChain });
+            rejectAttempt({
+              code: "REUSE_EXISTING",
+              wallet: existingProxy2.wallet,
+              existingChain: existingProxy2.paymentChain
+            });
             return;
           }
           if (attempt < PORT_RETRY_ATTEMPTS) {
@@ -5319,7 +6203,8 @@ async function startProxy(options) {
       if (error.code === "REUSE_EXISTING" && error.wallet) {
         if (error.existingChain && error.existingChain !== paymentChain) {
           throw new Error(
-            `Existing proxy on port ${listenPort} is using ${error.existingChain} but ${paymentChain} was requested. Stop the existing proxy first or use a different port.`
+            `Existing proxy on port ${listenPort} is using ${error.existingChain} but ${paymentChain} was requested. Stop the existing proxy first or use a different port.`,
+            { cause: err }
           );
         }
         const baseUrl2 = `http://127.0.0.1:${listenPort}`;
@@ -5427,15 +6312,12 @@ async function tryModelRequest(upstreamUrl, method, headers, body, modelId, maxT
   } catch {
   }
   try {
-    const response = await payFetch(
-      upstreamUrl,
-      {
-        method,
-        headers,
-        body: requestBody.length > 0 ? new Uint8Array(requestBody) : void 0,
-        signal
-      }
-    );
+    const response = await payFetch(upstreamUrl, {
+      method,
+      headers,
+      body: requestBody.length > 0 ? new Uint8Array(requestBody) : void 0,
+      signal
+    });
     if (response.status !== 200) {
       const errorBody = await response.text();
       const isProviderErr = isProviderError(response.status, errorBody);
@@ -5483,14 +6365,19 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
   }
   let body = Buffer.concat(bodyChunks);
   const originalContextSizeKB = Math.ceil(body.length / 1024);
+  const debugMode = req.headers["x-clawrouter-debug"] !== "false";
   let routingDecision;
+  let hasTools = false;
+  let hasVision = false;
   let isStreaming = false;
   let modelId = "";
   let maxTokens = 4096;
   let routingProfile = null;
   let accumulatedContent = "";
+  let responseInputTokens;
   const isChatCompletion = req.url?.includes("/chat/completions");
   const sessionId = getSessionId(req.headers);
+  let effectiveSessionId = sessionId;
   if (isChatCompletion && body.length > 0) {
     try {
       const parsed = JSON.parse(body.toString());
@@ -5498,10 +6385,12 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
       modelId = parsed.model || "";
       maxTokens = parsed.max_tokens || 4096;
       let bodyModified = false;
-      if (sessionId && Array.isArray(parsed.messages)) {
-        const messages = parsed.messages;
-        const lastUserMsg = [...messages].reverse().find((m) => m.role === "user");
-        const lastContent = typeof lastUserMsg?.content === "string" ? lastUserMsg.content : "";
+      const parsedMessages = Array.isArray(parsed.messages) ? parsed.messages : [];
+      const lastUserMsg = [...parsedMessages].reverse().find((m) => m.role === "user");
+      const rawLastContent = lastUserMsg?.content;
+      const lastContent = typeof rawLastContent === "string" ? rawLastContent : Array.isArray(rawLastContent) ? rawLastContent.filter((b) => b.type === "text").map((b) => b.text ?? "").join(" ") : "";
+      if (sessionId && parsedMessages.length > 0) {
+        const messages = parsedMessages;
         if (sessionJournal.needsContext(lastContent)) {
           const journalText = sessionJournal.format(sessionId);
           if (journalText) {
@@ -5512,15 +6401,312 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
                 content: journalText + "\n\n" + messages[sysIdx].content
               };
             } else {
-              messages.unshift({ role: "system", content: journalText });
+              messages.unshift({ role: "system", content: journalText });
+            }
+            parsed.messages = messages;
+            bodyModified = true;
+            console.log(
+              `[ClawRouter] Injected session journal (${journalText.length} chars) for session ${sessionId.slice(0, 8)}...`
+            );
+          }
+        }
+      }
+      if (lastContent.startsWith("/debug")) {
+        const debugPrompt = lastContent.slice("/debug".length).trim() || "hello";
+        const messages = parsed.messages;
+        const systemMsg = messages?.find((m) => m.role === "system");
+        const systemPrompt = typeof systemMsg?.content === "string" ? systemMsg.content : void 0;
+        const fullText = `${systemPrompt ?? ""} ${debugPrompt}`;
+        const estimatedTokens = Math.ceil(fullText.length / 4);
+        const normalizedModel2 = typeof parsed.model === "string" ? parsed.model.trim().toLowerCase() : "";
+        const profileName = normalizedModel2.replace("blockrun/", "");
+        const debugProfile = ["free", "eco", "auto", "premium"].includes(profileName) ? profileName : "auto";
+        const scoring = classifyByRules(
+          debugPrompt,
+          systemPrompt,
+          estimatedTokens,
+          DEFAULT_ROUTING_CONFIG.scoring
+        );
+        const debugRouting = route(debugPrompt, systemPrompt, maxTokens, {
+          ...routerOpts,
+          routingProfile: debugProfile
+        });
+        const dimLines = (scoring.dimensions ?? []).map((d) => {
+          const nameStr = (d.name + ":").padEnd(24);
+          const scoreStr = d.score.toFixed(2).padStart(6);
+          const sigStr = d.signal ? `  [${d.signal}]` : "";
+          return `  ${nameStr}${scoreStr}${sigStr}`;
+        }).join("\n");
+        const sess = sessionId ? sessionStore.getSession(sessionId) : void 0;
+        const sessLine = sess ? `Session: ${sessionId.slice(0, 8)}... \u2192 pinned: ${sess.model} (${sess.requestCount} requests)` : sessionId ? `Session: ${sessionId.slice(0, 8)}... \u2192 no pinned model` : "Session: none";
+        const { simpleMedium, mediumComplex, complexReasoning } = DEFAULT_ROUTING_CONFIG.scoring.tierBoundaries;
+        const debugText = [
+          "ClawRouter Debug",
+          "",
+          `Profile: ${debugProfile} | Tier: ${debugRouting.tier} | Model: ${debugRouting.model}`,
+          `Confidence: ${debugRouting.confidence.toFixed(2)} | Cost: $${debugRouting.costEstimate.toFixed(4)} | Savings: ${(debugRouting.savings * 100).toFixed(0)}%`,
+          `Reasoning: ${debugRouting.reasoning}`,
+          "",
+          `Scoring (weighted: ${scoring.score.toFixed(3)})`,
+          dimLines,
+          "",
+          `Tier Boundaries: SIMPLE <${simpleMedium.toFixed(2)} | MEDIUM <${mediumComplex.toFixed(2)} | COMPLEX <${complexReasoning.toFixed(2)} | REASONING >=${complexReasoning.toFixed(2)}`,
+          "",
+          sessLine
+        ].join("\n");
+        const completionId = `chatcmpl-debug-${Date.now()}`;
+        const timestamp = Math.floor(Date.now() / 1e3);
+        const syntheticResponse = {
+          id: completionId,
+          object: "chat.completion",
+          created: timestamp,
+          model: "clawrouter/debug",
+          choices: [
+            {
+              index: 0,
+              message: { role: "assistant", content: debugText },
+              finish_reason: "stop"
+            }
+          ],
+          usage: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 }
+        };
+        if (isStreaming) {
+          res.writeHead(200, {
+            "Content-Type": "text/event-stream",
+            "Cache-Control": "no-cache",
+            Connection: "keep-alive"
+          });
+          const sseChunk = {
+            id: completionId,
+            object: "chat.completion.chunk",
+            created: timestamp,
+            model: "clawrouter/debug",
+            choices: [
+              {
+                index: 0,
+                delta: { role: "assistant", content: debugText },
+                finish_reason: null
+              }
+            ]
+          };
+          const sseDone = {
+            id: completionId,
+            object: "chat.completion.chunk",
+            created: timestamp,
+            model: "clawrouter/debug",
+            choices: [{ index: 0, delta: {}, finish_reason: "stop" }]
+          };
+          res.write(`data: ${JSON.stringify(sseChunk)}
+
+`);
+          res.write(`data: ${JSON.stringify(sseDone)}
+
+`);
+          res.write("data: [DONE]\n\n");
+          res.end();
+        } else {
+          res.writeHead(200, { "Content-Type": "application/json" });
+          res.end(JSON.stringify(syntheticResponse));
+        }
+        console.log(`[ClawRouter] /debug command \u2192 ${debugRouting.tier} | ${debugRouting.model}`);
+        return;
+      }
+      if (lastContent.startsWith("/imagegen")) {
+        const imageArgs = lastContent.slice("/imagegen".length).trim();
+        let imageModel = "google/nano-banana";
+        let imageSize = "1024x1024";
+        let imagePrompt = imageArgs;
+        const modelMatch = imageArgs.match(/--model\s+(\S+)/);
+        if (modelMatch) {
+          const raw = modelMatch[1];
+          const IMAGE_MODEL_ALIASES = {
+            "dall-e-3": "openai/dall-e-3",
+            dalle3: "openai/dall-e-3",
+            dalle: "openai/dall-e-3",
+            "gpt-image": "openai/gpt-image-1",
+            "gpt-image-1": "openai/gpt-image-1",
+            flux: "black-forest/flux-1.1-pro",
+            "flux-pro": "black-forest/flux-1.1-pro",
+            banana: "google/nano-banana",
+            "nano-banana": "google/nano-banana",
+            "banana-pro": "google/nano-banana-pro",
+            "nano-banana-pro": "google/nano-banana-pro"
+          };
+          imageModel = IMAGE_MODEL_ALIASES[raw] ?? raw;
+          imagePrompt = imagePrompt.replace(/--model\s+\S+/, "").trim();
+        }
+        const sizeMatch = imageArgs.match(/--size\s+(\d+x\d+)/);
+        if (sizeMatch) {
+          imageSize = sizeMatch[1];
+          imagePrompt = imagePrompt.replace(/--size\s+\d+x\d+/, "").trim();
+        }
+        if (!imagePrompt) {
+          const errorText = [
+            "Usage: /imagegen <prompt>",
+            "",
+            "Options:",
+            "  --model <model>  Model to use (default: nano-banana)",
+            "  --size <WxH>     Image size (default: 1024x1024)",
+            "",
+            "Models:",
+            "  nano-banana       Google Gemini Flash \u2014 $0.05/image",
+            "  banana-pro        Google Gemini Pro \u2014 $0.10/image (up to 4K)",
+            "  dall-e-3          OpenAI DALL-E 3 \u2014 $0.04/image",
+            "  gpt-image         OpenAI GPT Image 1 \u2014 $0.02/image",
+            "  flux              Black Forest Flux 1.1 Pro \u2014 $0.04/image",
+            "",
+            "Examples:",
+            "  /imagegen a cat wearing sunglasses",
+            "  /imagegen --model dall-e-3 a futuristic city at sunset",
+            "  /imagegen --model banana-pro --size 2048x2048 mountain landscape"
+          ].join("\n");
+          const completionId = `chatcmpl-image-${Date.now()}`;
+          const timestamp = Math.floor(Date.now() / 1e3);
+          if (isStreaming) {
+            res.writeHead(200, {
+              "Content-Type": "text/event-stream",
+              "Cache-Control": "no-cache",
+              Connection: "keep-alive"
+            });
+            res.write(
+              `data: ${JSON.stringify({ id: completionId, object: "chat.completion.chunk", created: timestamp, model: "clawrouter/image", choices: [{ index: 0, delta: { role: "assistant", content: errorText }, finish_reason: null }] })}
+
+`
+            );
+            res.write(
+              `data: ${JSON.stringify({ id: completionId, object: "chat.completion.chunk", created: timestamp, model: "clawrouter/image", choices: [{ index: 0, delta: {}, finish_reason: "stop" }] })}
+
+`
+            );
+            res.write("data: [DONE]\n\n");
+            res.end();
+          } else {
+            res.writeHead(200, { "Content-Type": "application/json" });
+            res.end(
+              JSON.stringify({
+                id: completionId,
+                object: "chat.completion",
+                created: timestamp,
+                model: "clawrouter/image",
+                choices: [
+                  {
+                    index: 0,
+                    message: { role: "assistant", content: errorText },
+                    finish_reason: "stop"
+                  }
+                ],
+                usage: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 }
+              })
+            );
+          }
+          console.log(`[ClawRouter] /imagegen command \u2192 showing usage help`);
+          return;
+        }
+        console.log(
+          `[ClawRouter] /imagegen command \u2192 ${imageModel} (${imageSize}): ${imagePrompt.slice(0, 80)}...`
+        );
+        try {
+          const imageUpstreamUrl = `${apiBase}/v1/images/generations`;
+          const imageBody = JSON.stringify({
+            model: imageModel,
+            prompt: imagePrompt,
+            size: imageSize,
+            n: 1
+          });
+          const imageResponse = await payFetch(imageUpstreamUrl, {
+            method: "POST",
+            headers: { "content-type": "application/json", "user-agent": USER_AGENT },
+            body: imageBody
+          });
+          const imageResult = await imageResponse.json();
+          let responseText;
+          if (!imageResponse.ok || imageResult.error) {
+            const errMsg = typeof imageResult.error === "string" ? imageResult.error : imageResult.error?.message ?? `HTTP ${imageResponse.status}`;
+            responseText = `Image generation failed: ${errMsg}`;
+            console.log(`[ClawRouter] /imagegen error: ${errMsg}`);
+          } else {
+            const images = imageResult.data ?? [];
+            if (images.length === 0) {
+              responseText = "Image generation returned no results.";
+            } else {
+              const lines = [];
+              for (const img of images) {
+                if (img.url) {
+                  if (img.url.startsWith("data:")) {
+                    try {
+                      const hostedUrl = await uploadDataUriToHost(img.url);
+                      lines.push(hostedUrl);
+                    } catch (uploadErr) {
+                      console.error(
+                        `[ClawRouter] /imagegen: failed to upload data URI: ${uploadErr instanceof Error ? uploadErr.message : String(uploadErr)}`
+                      );
+                      lines.push(
+                        "Image generated but upload failed. Try again or use --model dall-e-3."
+                      );
+                    }
+                  } else {
+                    lines.push(img.url);
+                  }
+                }
+                if (img.revised_prompt) lines.push(`Revised prompt: ${img.revised_prompt}`);
+              }
+              lines.push("", `Model: ${imageModel} | Size: ${imageSize}`);
+              responseText = lines.join("\n");
             }
-            parsed.messages = messages;
-            bodyModified = true;
-            console.log(
-              `[ClawRouter] Injected session journal (${journalText.length} chars) for session ${sessionId.slice(0, 8)}...`
+            console.log(`[ClawRouter] /imagegen success: ${images.length} image(s) generated`);
+          }
+          const completionId = `chatcmpl-image-${Date.now()}`;
+          const timestamp = Math.floor(Date.now() / 1e3);
+          if (isStreaming) {
+            res.writeHead(200, {
+              "Content-Type": "text/event-stream",
+              "Cache-Control": "no-cache",
+              Connection: "keep-alive"
+            });
+            res.write(
+              `data: ${JSON.stringify({ id: completionId, object: "chat.completion.chunk", created: timestamp, model: "clawrouter/image", choices: [{ index: 0, delta: { role: "assistant", content: responseText }, finish_reason: null }] })}
+
+`
+            );
+            res.write(
+              `data: ${JSON.stringify({ id: completionId, object: "chat.completion.chunk", created: timestamp, model: "clawrouter/image", choices: [{ index: 0, delta: {}, finish_reason: "stop" }] })}
+
+`
+            );
+            res.write("data: [DONE]\n\n");
+            res.end();
+          } else {
+            res.writeHead(200, { "Content-Type": "application/json" });
+            res.end(
+              JSON.stringify({
+                id: completionId,
+                object: "chat.completion",
+                created: timestamp,
+                model: "clawrouter/image",
+                choices: [
+                  {
+                    index: 0,
+                    message: { role: "assistant", content: responseText },
+                    finish_reason: "stop"
+                  }
+                ],
+                usage: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 }
+              })
+            );
+          }
+        } catch (err) {
+          const errMsg = err instanceof Error ? err.message : String(err);
+          console.error(`[ClawRouter] /imagegen error: ${errMsg}`);
+          if (!res.headersSent) {
+            res.writeHead(500, { "Content-Type": "application/json" });
+            res.end(
+              JSON.stringify({
+                error: { message: `Image generation failed: ${errMsg}`, type: "image_error" }
+              })
             );
           }
         }
+        return;
       }
       if (parsed.stream === true) {
         parsed.stream = false;
@@ -5562,54 +6748,118 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
             latencyMs: 0
           });
         } else {
-          const sessionId2 = getSessionId(
-            req.headers
-          );
-          const existingSession = sessionId2 ? sessionStore.getSession(sessionId2) : void 0;
+          effectiveSessionId = getSessionId(req.headers) ?? deriveSessionId(parsedMessages);
+          const existingSession = effectiveSessionId ? sessionStore.getSession(effectiveSessionId) : void 0;
+          const rawPrompt = lastUserMsg?.content;
+          const prompt = typeof rawPrompt === "string" ? rawPrompt : Array.isArray(rawPrompt) ? rawPrompt.filter((b) => b.type === "text").map((b) => b.text ?? "").join(" ") : "";
+          const systemMsg = parsedMessages.find((m) => m.role === "system");
+          const systemPrompt = typeof systemMsg?.content === "string" ? systemMsg.content : void 0;
+          const tools = parsed.tools;
+          hasTools = Array.isArray(tools) && tools.length > 0;
+          if (hasTools && tools) {
+            console.log(`[ClawRouter] Tools detected (${tools.length}), agentic mode via keywords`);
+          }
+          hasVision = parsedMessages.some((m) => {
+            if (Array.isArray(m.content)) {
+              return m.content.some((p) => p.type === "image_url");
+            }
+            return false;
+          });
+          if (hasVision) {
+            console.log(`[ClawRouter] Vision content detected, filtering to vision-capable models`);
+          }
+          routingDecision = route(prompt, systemPrompt, maxTokens, {
+            ...routerOpts,
+            routingProfile: routingProfile ?? void 0
+          });
           if (existingSession) {
-            console.log(
-              `[ClawRouter] Session ${sessionId2?.slice(0, 8)}... using pinned model: ${existingSession.model}`
-            );
-            parsed.model = existingSession.model;
-            modelId = existingSession.model;
-            bodyModified = true;
-            sessionStore.touchSession(sessionId2);
-          } else {
-            const messages = parsed.messages;
-            let lastUserMsg;
-            if (messages) {
-              for (let i = messages.length - 1; i >= 0; i--) {
-                if (messages[i].role === "user") {
-                  lastUserMsg = messages[i];
-                  break;
-                }
+            const tierRank = {
+              SIMPLE: 0,
+              MEDIUM: 1,
+              COMPLEX: 2,
+              REASONING: 3
+            };
+            const existingRank = tierRank[existingSession.tier] ?? 0;
+            const newRank = tierRank[routingDecision.tier] ?? 0;
+            if (newRank > existingRank) {
+              console.log(
+                `[ClawRouter] Session ${effectiveSessionId?.slice(0, 8)}... upgrading: ${existingSession.tier} \u2192 ${routingDecision.tier} (${routingDecision.model})`
+              );
+              parsed.model = routingDecision.model;
+              modelId = routingDecision.model;
+              bodyModified = true;
+              if (effectiveSessionId) {
+                sessionStore.setSession(
+                  effectiveSessionId,
+                  routingDecision.model,
+                  routingDecision.tier
+                );
               }
-            }
-            const systemMsg = messages?.find((m) => m.role === "system");
-            const prompt = typeof lastUserMsg?.content === "string" ? lastUserMsg.content : "";
-            const systemPrompt = typeof systemMsg?.content === "string" ? systemMsg.content : void 0;
-            const tools = parsed.tools;
-            const hasTools = Array.isArray(tools) && tools.length > 0;
-            if (hasTools && tools) {
+            } else {
               console.log(
-                `[ClawRouter] Tools detected (${tools.length}), agentic mode via keywords`
+                `[ClawRouter] Session ${effectiveSessionId?.slice(0, 8)}... keeping pinned model: ${existingSession.model} (${existingSession.tier} >= ${routingDecision.tier})`
+              );
+              parsed.model = existingSession.model;
+              modelId = existingSession.model;
+              bodyModified = true;
+              sessionStore.touchSession(effectiveSessionId);
+              routingDecision = {
+                ...routingDecision,
+                model: existingSession.model,
+                tier: existingSession.tier
+              };
+            }
+            const lastAssistantMsg = [...parsedMessages].reverse().find((m) => m.role === "assistant");
+            const assistantToolCalls = lastAssistantMsg?.tool_calls;
+            const toolCallNames = Array.isArray(assistantToolCalls) ? assistantToolCalls.map((tc) => tc.function?.name).filter((n) => Boolean(n)) : void 0;
+            const contentHash = hashRequestContent(prompt, toolCallNames);
+            const shouldEscalate = sessionStore.recordRequestHash(effectiveSessionId, contentHash);
+            if (shouldEscalate) {
+              const activeTierConfigs = (() => {
+                if (routingDecision.reasoning?.includes("agentic") && routerOpts.config.agenticTiers) {
+                  return routerOpts.config.agenticTiers;
+                }
+                if (routingProfile === "eco" && routerOpts.config.ecoTiers) {
+                  return routerOpts.config.ecoTiers;
+                }
+                if (routingProfile === "premium" && routerOpts.config.premiumTiers) {
+                  return routerOpts.config.premiumTiers;
+                }
+                return routerOpts.config.tiers;
+              })();
+              const escalation = sessionStore.escalateSession(
+                effectiveSessionId,
+                activeTierConfigs
               );
+              if (escalation) {
+                console.log(
+                  `[ClawRouter] \u26A1 3-strike escalation: ${existingSession.model} \u2192 ${escalation.model} (${existingSession.tier} \u2192 ${escalation.tier})`
+                );
+                parsed.model = escalation.model;
+                modelId = escalation.model;
+                routingDecision = {
+                  ...routingDecision,
+                  model: escalation.model,
+                  tier: escalation.tier
+                };
+              }
             }
-            routingDecision = route(prompt, systemPrompt, maxTokens, {
-              ...routerOpts,
-              routingProfile: routingProfile ?? void 0
-            });
+          } else {
             parsed.model = routingDecision.model;
             modelId = routingDecision.model;
             bodyModified = true;
-            if (sessionId2) {
-              sessionStore.setSession(sessionId2, routingDecision.model, routingDecision.tier);
+            if (effectiveSessionId) {
+              sessionStore.setSession(
+                effectiveSessionId,
+                routingDecision.model,
+                routingDecision.tier
+              );
               console.log(
-                `[ClawRouter] Session ${sessionId2.slice(0, 8)}... pinned to model: ${routingDecision.model}`
+                `[ClawRouter] Session ${effectiveSessionId.slice(0, 8)}... pinned to model: ${routingDecision.model}`
               );
             }
-            options.onRouted?.(routingDecision);
           }
+          options.onRouted?.(routingDecision);
         }
       }
       if (bodyModified) {
@@ -5702,6 +6952,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
   }
   deduplicator.markInflight(dedupKey);
   let estimatedCostMicros;
+  let balanceFallbackNotice;
   const isFreeModel = modelId === FREE_MODEL;
   if (modelId && !options.skipBalanceCheck && !isFreeModel) {
     const estimated = estimateAmount(modelId, body.length, maxTokens);
@@ -5712,12 +6963,17 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
       if (sufficiency.info.isEmpty || !sufficiency.sufficient) {
         const originalModel = modelId;
         console.log(
-          `[ClawRouter] Wallet ${sufficiency.info.isEmpty ? "empty" : "insufficient"} ($${sufficiency.info.balanceUSD}), falling back to free model: ${FREE_MODEL} (requested: ${originalModel})`
+          `[ClawRouter] Wallet ${sufficiency.info.isEmpty ? "empty" : "insufficient"} (${sufficiency.info.balanceUSD}), falling back to free model: ${FREE_MODEL} (requested: ${originalModel})`
         );
         modelId = FREE_MODEL;
         const parsed = JSON.parse(body.toString());
         parsed.model = FREE_MODEL;
         body = Buffer.from(JSON.stringify(parsed));
+        balanceFallbackNotice = sufficiency.info.isEmpty ? `> **\u26A0\uFE0F Wallet empty** \u2014 using free model. Fund your wallet to use ${originalModel}.
+
+` : `> **\u26A0\uFE0F Insufficient balance** (${sufficiency.info.balanceUSD}) \u2014 using free model instead of ${originalModel}.
+
+`;
         options.onLowBalance?.({
           balanceUSD: sufficiency.info.balanceUSD,
           walletAddress: sufficiency.info.walletAddress
@@ -5781,8 +7037,18 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
     if (routingDecision) {
       const estimatedInputTokens = Math.ceil(body.length / 4);
       const estimatedTotalTokens = estimatedInputTokens + maxTokens;
-      const useAgenticTiers = routingDecision.reasoning?.includes("agentic") && routerOpts.config.agenticTiers;
-      const tierConfigs = useAgenticTiers ? routerOpts.config.agenticTiers : routerOpts.config.tiers;
+      const tierConfigs = (() => {
+        if (routingDecision.reasoning?.includes("agentic") && routerOpts.config.agenticTiers) {
+          return routerOpts.config.agenticTiers;
+        }
+        if (routingProfile === "eco" && routerOpts.config.ecoTiers) {
+          return routerOpts.config.ecoTiers;
+        }
+        if (routingProfile === "premium" && routerOpts.config.premiumTiers) {
+          return routerOpts.config.premiumTiers;
+        }
+        return routerOpts.config.tiers;
+      })();
       const fullChain = getFallbackChain(routingDecision.tier, tierConfigs);
       const contextFiltered = getFallbackChainFiltered(
         routingDecision.tier,
@@ -5796,14 +7062,27 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
           `[ClawRouter] Context filter (~${estimatedTotalTokens} tokens): excluded ${contextExcluded.join(", ")}`
         );
       }
-      modelsToTry = contextFiltered.slice(0, MAX_FALLBACK_ATTEMPTS);
+      const toolFiltered = filterByToolCalling(contextFiltered, hasTools, supportsToolCalling);
+      const toolExcluded = contextFiltered.filter((m) => !toolFiltered.includes(m));
+      if (toolExcluded.length > 0) {
+        console.log(
+          `[ClawRouter] Tool-calling filter: excluded ${toolExcluded.join(", ")} (no structured function call support)`
+        );
+      }
+      const visionFiltered = filterByVision(toolFiltered, hasVision, supportsVision);
+      const visionExcluded = toolFiltered.filter((m) => !visionFiltered.includes(m));
+      if (visionExcluded.length > 0) {
+        console.log(
+          `[ClawRouter] Vision filter: excluded ${visionExcluded.join(", ")} (no vision support)`
+        );
+      }
+      modelsToTry = visionFiltered.slice(0, MAX_FALLBACK_ATTEMPTS);
       modelsToTry = prioritizeNonRateLimited(modelsToTry);
     } else {
-      if (modelId && modelId !== FREE_MODEL) {
-        modelsToTry = [modelId, FREE_MODEL];
-      } else {
-        modelsToTry = modelId ? [modelId] : [];
-      }
+      modelsToTry = modelId ? [modelId] : [];
+    }
+    if (!modelsToTry.includes(FREE_MODEL)) {
+      modelsToTry.push(FREE_MODEL);
     }
     let upstream;
     let lastError;
@@ -5837,6 +7116,17 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
         if (result.errorStatus === 429) {
           markRateLimited(tryModel);
         }
+        const isPaymentErr = /payment.*verification.*failed|insufficient.*funds/i.test(
+          result.errorBody || ""
+        );
+        if (isPaymentErr && tryModel !== FREE_MODEL) {
+          const freeIdx = modelsToTry.indexOf(FREE_MODEL);
+          if (freeIdx > i + 1) {
+            console.log(`[ClawRouter] Payment error \u2014 skipping to free model: ${FREE_MODEL}`);
+            i = freeIdx - 1;
+            continue;
+          }
+        }
         console.log(
           `[ClawRouter] Provider error from ${tryModel}, trying fallback: ${result.errorBody?.slice(0, 100)}`
         );
@@ -5854,6 +7144,12 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
       clearInterval(heartbeatInterval);
       heartbeatInterval = void 0;
     }
+    if (debugMode && headersSentEarly && routingDecision) {
+      const debugComment = `: x-clawrouter-debug profile=${routingProfile ?? "auto"} tier=${routingDecision.tier} model=${actualModelUsed} agentic=${routingDecision.agenticScore?.toFixed(2) ?? "n/a"} confidence=${routingDecision.confidence.toFixed(2)} reasoning=${routingDecision.reasoning}
+
+`;
+      safeWrite(res, debugComment);
+    }
     if (routingDecision && actualModelUsed !== routingDecision.model) {
       const estimatedInputTokens = Math.ceil(body.length / 4);
       const newCosts = calculateModelCost(
@@ -5872,6 +7168,12 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
         savings: newCosts.savings
       };
       options.onRouted?.(routingDecision);
+      if (effectiveSessionId) {
+        sessionStore.setSession(effectiveSessionId, actualModelUsed, routingDecision.tier);
+        console.log(
+          `[ClawRouter] Session ${effectiveSessionId.slice(0, 8)}... updated pin to fallback: ${actualModelUsed}`
+        );
+      }
     }
     if (!upstream) {
       const rawErrBody = lastError?.body || "All models in fallback chain failed";
@@ -5934,6 +7236,10 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
         const jsonStr = jsonBody.toString();
         try {
           const rsp = JSON.parse(jsonStr);
+          if (rsp.usage && typeof rsp.usage === "object") {
+            const u = rsp.usage;
+            if (typeof u.prompt_tokens === "number") responseInputTokens = u.prompt_tokens;
+          }
           const baseChunk = {
             id: rsp.id ?? `chatcmpl-${Date.now()}`,
             object: "chat.completion.chunk",
@@ -5959,6 +7265,25 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
 `;
               safeWrite(res, roleData);
               responseChunks.push(Buffer.from(roleData));
+              if (balanceFallbackNotice) {
+                const noticeChunk = {
+                  ...baseChunk,
+                  choices: [
+                    {
+                      index,
+                      delta: { content: balanceFallbackNotice },
+                      logprobs: null,
+                      finish_reason: null
+                    }
+                  ]
+                };
+                const noticeData = `data: ${JSON.stringify(noticeChunk)}
+
+`;
+                safeWrite(res, noticeData);
+                responseChunks.push(Buffer.from(noticeData));
+                balanceFallbackNotice = void 0;
+              }
               if (content) {
                 const contentChunk = {
                   ...baseChunk,
@@ -6033,23 +7358,46 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
       });
       responseHeaders["x-context-used-kb"] = String(originalContextSizeKB);
       responseHeaders["x-context-limit-kb"] = String(CONTEXT_LIMIT_KB);
-      res.writeHead(upstream.status, responseHeaders);
+      if (debugMode && routingDecision) {
+        responseHeaders["x-clawrouter-profile"] = routingProfile ?? "auto";
+        responseHeaders["x-clawrouter-tier"] = routingDecision.tier;
+        responseHeaders["x-clawrouter-model"] = actualModelUsed;
+        responseHeaders["x-clawrouter-confidence"] = routingDecision.confidence.toFixed(2);
+        responseHeaders["x-clawrouter-reasoning"] = routingDecision.reasoning;
+        if (routingDecision.agenticScore !== void 0) {
+          responseHeaders["x-clawrouter-agentic-score"] = routingDecision.agenticScore.toFixed(2);
+        }
+      }
+      const bodyParts = [];
       if (upstream.body) {
         const reader = upstream.body.getReader();
         try {
           while (true) {
             const { done, value } = await reader.read();
             if (done) break;
-            const chunk = Buffer.from(value);
-            safeWrite(res, chunk);
-            responseChunks.push(chunk);
+            bodyParts.push(Buffer.from(value));
           }
         } finally {
           reader.releaseLock();
         }
       }
+      let responseBody = Buffer.concat(bodyParts);
+      if (balanceFallbackNotice && responseBody.length > 0) {
+        try {
+          const parsed = JSON.parse(responseBody.toString());
+          if (parsed.choices?.[0]?.message?.content !== void 0) {
+            parsed.choices[0].message.content = balanceFallbackNotice + parsed.choices[0].message.content;
+            responseBody = Buffer.from(JSON.stringify(parsed));
+          }
+        } catch {
+        }
+        balanceFallbackNotice = void 0;
+      }
+      responseHeaders["content-length"] = String(responseBody.length);
+      res.writeHead(upstream.status, responseHeaders);
+      safeWrite(res, responseBody);
+      responseChunks.push(responseBody);
       res.end();
-      const responseBody = Buffer.concat(responseChunks);
       deduplicator.complete(dedupKey, {
         status: upstream.status,
         headers: responseHeaders,
@@ -6072,6 +7420,10 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
         if (rspJson.choices?.[0]?.message?.content) {
           accumulatedContent = rspJson.choices[0].message.content;
         }
+        if (rspJson.usage && typeof rspJson.usage === "object") {
+          if (typeof rspJson.usage.prompt_tokens === "number")
+            responseInputTokens = rspJson.usage.prompt_tokens;
+        }
       } catch {
       }
     }
@@ -6097,7 +7449,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
     deduplicator.removeInflight(dedupKey);
     balanceMonitor.invalidate();
     if (err instanceof Error && err.name === "AbortError") {
-      throw new Error(`Request timed out after ${timeoutMs}ms`);
+      throw new Error(`Request timed out after ${timeoutMs}ms`, { cause: err });
     }
     throw err;
   }
@@ -6120,7 +7472,8 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
       cost: costWithBuffer,
       baselineCost: baselineWithBuffer,
       savings: accurateCosts.savings,
-      latencyMs: Date.now() - startTime
+      latencyMs: Date.now() - startTime,
+      ...responseInputTokens !== void 0 && { inputTokens: responseInputTokens }
     };
     logUsage(entry).catch(() => {
     });
@@ -6139,6 +7492,103 @@ import {
 import { homedir as homedir5 } from "os";
 import { join as join6 } from "path";
 import { privateKeyToAccount as privateKeyToAccount4 } from "viem/accounts";
+
+// src/partners/registry.ts
+var PARTNER_SERVICES = [
+  {
+    id: "x_users_lookup",
+    name: "Twitter/X User Lookup",
+    partner: "AttentionVC",
+    description: "ALWAYS use this tool to look up real-time Twitter/X user profiles. Call this when the user asks about any Twitter/X account, username, handle, follower count, verification status, bio, or profile. Do NOT answer Twitter/X user questions from memory \u2014 always fetch live data with this tool. Returns: follower count, verification badge, bio, location, join date. Accepts up to 100 usernames per request (without @ prefix).",
+    proxyPath: "/x/users/lookup",
+    method: "POST",
+    params: [
+      {
+        name: "usernames",
+        type: "string[]",
+        description: 'Array of Twitter/X usernames to look up (without @ prefix). Example: ["elonmusk", "naval"]',
+        required: true
+      }
+    ],
+    pricing: {
+      perUnit: "$0.001",
+      unit: "user",
+      minimum: "$0.01 (10 users)",
+      maximum: "$0.10 (100 users)"
+    },
+    example: {
+      input: { usernames: ["elonmusk", "naval", "balaboris"] },
+      description: "Look up 3 Twitter/X user profiles"
+    }
+  }
+];
+function getPartnerService(id) {
+  return PARTNER_SERVICES.find((s) => s.id === id);
+}
+
+// src/partners/tools.ts
+function buildTool(service, proxyBaseUrl) {
+  const properties = {};
+  const required = [];
+  for (const param of service.params) {
+    const prop = {
+      description: param.description
+    };
+    if (param.type === "string[]") {
+      prop.type = "array";
+      prop.items = { type: "string" };
+    } else {
+      prop.type = param.type;
+    }
+    properties[param.name] = prop;
+    if (param.required) {
+      required.push(param.name);
+    }
+  }
+  return {
+    name: `blockrun_${service.id}`,
+    description: [
+      service.description,
+      "",
+      `Partner: ${service.partner}`,
+      `Pricing: ${service.pricing.perUnit} per ${service.pricing.unit} (min: ${service.pricing.minimum}, max: ${service.pricing.maximum})`
+    ].join("\n"),
+    parameters: {
+      type: "object",
+      properties,
+      required
+    },
+    execute: async (_toolCallId, params) => {
+      const url = `${proxyBaseUrl}/v1${service.proxyPath}`;
+      const response = await fetch(url, {
+        method: service.method,
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(params)
+      });
+      if (!response.ok) {
+        const errText = await response.text().catch(() => "");
+        throw new Error(
+          `Partner API error (${response.status}): ${errText || response.statusText}`
+        );
+      }
+      const data = await response.json();
+      return {
+        content: [
+          {
+            type: "text",
+            text: JSON.stringify(data, null, 2)
+          }
+        ],
+        details: data
+      };
+    }
+  };
+}
+function buildPartnerTools(proxyBaseUrl) {
+  return PARTNER_SERVICES.map((service) => buildTool(service, proxyBaseUrl));
+}
+
+// src/index.ts
 init_solana_balance();
 
 // src/spend-control.ts
@@ -6391,6 +7841,7 @@ function formatDuration(seconds) {
 
 // src/index.ts
 init_wallet();
+init_solana_sweep();
 
 // src/retry.ts
 var DEFAULT_RETRY_CONFIG = {
@@ -6449,7 +7900,6 @@ function isRetryable(errorOrResponse, config) {
 }
 
 // src/index.ts
-init_partners();
 async function waitForProxyHealth(port, timeoutMs = 3e3) {
   const start = Date.now();
   while (Date.now() - start < timeoutMs) {
@@ -6586,56 +8036,48 @@ function injectModelsConfig(logger) {
     logger.info("Set default model to blockrun/auto (first install)");
     needsWrite = true;
   }
-  const KEY_MODEL_ALIASES = [
-    { id: "auto", alias: "auto" },
-    { id: "eco", alias: "eco" },
-    { id: "premium", alias: "premium" },
-    { id: "free", alias: "free" },
-    { id: "sonnet", alias: "sonnet-4.6" },
-    { id: "opus", alias: "opus" },
-    { id: "haiku", alias: "haiku" },
-    { id: "gpt5", alias: "gpt5" },
-    { id: "codex", alias: "codex" },
-    { id: "grok-fast", alias: "grok-fast" },
-    { id: "grok-code", alias: "grok-code" },
-    { id: "deepseek", alias: "deepseek" },
-    { id: "reasoner", alias: "reasoner" },
-    { id: "kimi", alias: "kimi" },
-    { id: "minimax", alias: "minimax" },
-    { id: "gemini", alias: "gemini" }
+  const TOP_MODELS = [
+    "auto",
+    "free",
+    "eco",
+    "premium",
+    "anthropic/claude-sonnet-4.6",
+    "anthropic/claude-opus-4.6",
+    "anthropic/claude-haiku-4.5",
+    "openai/gpt-5.2",
+    "openai/gpt-4o",
+    "openai/o3",
+    "google/gemini-3.1-pro",
+    "google/gemini-3-flash-preview",
+    "deepseek/deepseek-chat",
+    "moonshot/kimi-k2.5",
+    "xai/grok-3",
+    "minimax/minimax-m2.5"
   ];
-  const DEPRECATED_ALIASES = [
-    "blockrun/nvidia",
-    "blockrun/gpt",
-    "blockrun/o3",
-    "blockrun/grok",
-    "blockrun/mini",
-    "blockrun/flash"
-    // removed from picker - use gemini instead
-  ];
-  if (!defaults.models) {
+  if (!defaults.models || typeof defaults.models !== "object" || Array.isArray(defaults.models)) {
     defaults.models = {};
     needsWrite = true;
   }
   const allowlist = defaults.models;
-  for (const deprecated of DEPRECATED_ALIASES) {
-    if (allowlist[deprecated]) {
-      delete allowlist[deprecated];
-      logger.info(`Removed deprecated model alias: ${deprecated}`);
+  const topSet = new Set(TOP_MODELS.map((id) => `blockrun/${id}`));
+  for (const key of Object.keys(allowlist)) {
+    if (key.startsWith("blockrun/") && !topSet.has(key)) {
+      delete allowlist[key];
       needsWrite = true;
     }
   }
-  for (const m of KEY_MODEL_ALIASES) {
-    const fullId = `blockrun/${m.id}`;
-    const existing = allowlist[fullId];
-    if (!existing) {
-      allowlist[fullId] = { alias: m.alias };
-      needsWrite = true;
-    } else if (existing.alias !== m.alias) {
-      existing.alias = m.alias;
-      needsWrite = true;
+  let addedCount = 0;
+  for (const id of TOP_MODELS) {
+    const key = `blockrun/${id}`;
+    if (!allowlist[key]) {
+      allowlist[key] = {};
+      addedCount++;
     }
   }
+  if (addedCount > 0) {
+    needsWrite = true;
+    logger.info(`Added ${addedCount} models to allowlist (${TOP_MODELS.length} total)`);
+  }
   if (needsWrite) {
     try {
       const tmpPath = `${configPath}.tmp.${process.pid}`;
@@ -6754,18 +8196,19 @@ async function startProxyInBackground(api) {
   activeProxyHandle = proxy;
   api.logger.info(`ClawRouter ready \u2014 smart routing enabled`);
   api.logger.info(`Pricing: Simple ~$0.001 | Code ~$0.01 | Complex ~$0.05 | Free: $0`);
-  const startupMonitor = new BalanceMonitor(wallet.address);
-  startupMonitor.checkBalance().then((balance) => {
+  const currentChain = await resolvePaymentChain();
+  const displayAddress = currentChain === "solana" && proxy.solanaAddress ? proxy.solanaAddress : wallet.address;
+  proxy.balanceMonitor.checkBalance().then((balance) => {
     if (balance.isEmpty) {
-      api.logger.info(`Wallet: ${wallet.address} | Balance: $0.00`);
+      api.logger.info(`Wallet: ${displayAddress} | Balance: $0.00`);
       api.logger.info(`Using FREE model. Fund wallet for premium models.`);
     } else if (balance.isLow) {
-      api.logger.info(`Wallet: ${wallet.address} | Balance: ${balance.balanceUSD} (low)`);
+      api.logger.info(`Wallet: ${displayAddress} | Balance: ${balance.balanceUSD} (low)`);
     } else {
-      api.logger.info(`Wallet: ${wallet.address} | Balance: ${balance.balanceUSD}`);
+      api.logger.info(`Wallet: ${displayAddress} | Balance: ${balance.balanceUSD}`);
     }
   }).catch(() => {
-    api.logger.info(`Wallet: ${wallet.address} | Balance: (checking...)`);
+    api.logger.info(`Wallet: ${displayAddress} | Balance: (checking...)`);
   });
 }
 async function createStatsCommand() {
@@ -6839,8 +8282,8 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
               hasMnemonic = true;
               const { deriveSolanaKeyBytes: deriveSolanaKeyBytes2 } = await Promise.resolve().then(() => (init_wallet(), wallet_exports));
               const solKeyBytes = deriveSolanaKeyBytes2(mnemonic);
-              const { createKeyPairSignerFromPrivateKeyBytes } = await import("@solana/kit");
-              const signer = await createKeyPairSignerFromPrivateKeyBytes(solKeyBytes);
+              const { createKeyPairSignerFromPrivateKeyBytes: createKeyPairSignerFromPrivateKeyBytes2 } = await import("@solana/kit");
+              const signer = await createKeyPairSignerFromPrivateKeyBytes2(solKeyBytes);
               lines.push(
                 "",
                 "**Solana:**",
@@ -6881,8 +8324,8 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
               await savePaymentChain("solana");
               const { deriveSolanaKeyBytes: deriveSolanaKeyBytes2 } = await Promise.resolve().then(() => (init_wallet(), wallet_exports));
               const solKeyBytes = deriveSolanaKeyBytes2(existingMnemonic);
-              const { createKeyPairSignerFromPrivateKeyBytes: createKeyPairSignerFromPrivateKeyBytes2 } = await import("@solana/kit");
-              const signer2 = await createKeyPairSignerFromPrivateKeyBytes2(solKeyBytes);
+              const { createKeyPairSignerFromPrivateKeyBytes: createKeyPairSignerFromPrivateKeyBytes3 } = await import("@solana/kit");
+              const signer2 = await createKeyPairSignerFromPrivateKeyBytes3(solKeyBytes);
               solanaAddr = signer2.address;
               return {
                 text: [
@@ -6896,8 +8339,8 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
           }
           const { solanaPrivateKeyBytes } = await setupSolana();
           await savePaymentChain("solana");
-          const { createKeyPairSignerFromPrivateKeyBytes } = await import("@solana/kit");
-          const signer = await createKeyPairSignerFromPrivateKeyBytes(solanaPrivateKeyBytes);
+          const { createKeyPairSignerFromPrivateKeyBytes: createKeyPairSignerFromPrivateKeyBytes2 } = await import("@solana/kit");
+          const signer = await createKeyPairSignerFromPrivateKeyBytes2(solanaPrivateKeyBytes);
           return {
             text: [
               "**Solana Wallet Set Up**",
@@ -6918,6 +8361,88 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
           };
         }
       }
+      if (subcommand === "migrate-solana") {
+        try {
+          if (!existsSync2(MNEMONIC_FILE)) {
+            return {
+              text: "No mnemonic file found. Solana wallet not set up \u2014 nothing to migrate.",
+              isError: true
+            };
+          }
+          const mnemonic = readTextFileSync(MNEMONIC_FILE).trim();
+          if (!mnemonic) {
+            return { text: "Mnemonic file is empty.", isError: true };
+          }
+          const { deriveSolanaKeyBytes: deriveSolanaKeyBytes2, deriveSolanaKeyBytesLegacy: deriveSolanaKeyBytesLegacy2 } = await Promise.resolve().then(() => (init_wallet(), wallet_exports));
+          const { createKeyPairSignerFromPrivateKeyBytes: createKeyPairSignerFromPrivateKeyBytes2 } = await import("@solana/kit");
+          const legacyKeyBytes = deriveSolanaKeyBytesLegacy2(mnemonic);
+          const newKeyBytes = deriveSolanaKeyBytes2(mnemonic);
+          const [oldSigner, newSigner] = await Promise.all([
+            createKeyPairSignerFromPrivateKeyBytes2(legacyKeyBytes),
+            createKeyPairSignerFromPrivateKeyBytes2(newKeyBytes)
+          ]);
+          if (oldSigner.address === newSigner.address) {
+            return { text: "Legacy and new Solana addresses are the same. No migration needed." };
+          }
+          let oldUsdcText = "unknown";
+          try {
+            const { SolanaBalanceMonitor: SolanaBalanceMonitor2 } = await Promise.resolve().then(() => (init_solana_balance(), solana_balance_exports));
+            const monitor = new SolanaBalanceMonitor2(oldSigner.address);
+            const balance = await monitor.checkBalance();
+            oldUsdcText = balance.balanceUSD;
+            if (balance.isEmpty) {
+              return {
+                text: [
+                  "**Solana Migration Status**",
+                  "",
+                  `Old wallet (secp256k1): \`${oldSigner.address}\``,
+                  `  USDC: $0.00`,
+                  "",
+                  `New wallet (SLIP-10): \`${newSigner.address}\``,
+                  "",
+                  "No USDC in old wallet. Nothing to sweep.",
+                  "Your new SLIP-10 address is Phantom/Solflare compatible."
+                ].join("\n")
+              };
+            }
+          } catch {
+          }
+          const { sweepSolanaWallet: sweepSolanaWallet2 } = await Promise.resolve().then(() => (init_solana_sweep(), solana_sweep_exports));
+          const result = await sweepSolanaWallet2(legacyKeyBytes, newSigner.address);
+          if ("error" in result) {
+            return {
+              text: [
+                "**Solana Migration Failed**",
+                "",
+                `Old wallet: \`${result.oldAddress}\` (USDC: ${oldUsdcText})`,
+                `New wallet: \`${result.newAddress || newSigner.address}\``,
+                "",
+                `Error: ${result.error}`
+              ].join("\n"),
+              isError: true
+            };
+          }
+          return {
+            text: [
+              "**Solana Migration Complete**",
+              "",
+              `Swept **${result.transferred}** USDC from old to new wallet.`,
+              "",
+              `Old wallet: \`${result.oldAddress}\``,
+              `New wallet: \`${result.newAddress}\``,
+              `TX: https://solscan.io/tx/${result.txSignature}`,
+              "",
+              "Your new SLIP-10 address is Phantom/Solflare compatible.",
+              "You can recover it from your 24-word mnemonic in any standard wallet."
+            ].join("\n")
+          };
+        } catch (err) {
+          return {
+            text: `Migration failed: ${err instanceof Error ? err.message : String(err)}`,
+            isError: true
+          };
+        }
+      }
       if (subcommand === "base") {
         try {
           await savePaymentChain("base");
@@ -6931,7 +8456,7 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
           };
         }
       }
-      let evmBalanceText = "Balance: (checking...)";
+      let evmBalanceText;
       try {
         const monitor = new BalanceMonitor(address);
         const balance = await monitor.checkBalance();
@@ -6946,8 +8471,8 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
           const mnemonic = readTextFileSync(MNEMONIC_FILE).trim();
           if (mnemonic) {
             const solKeyBytes = deriveSolanaKeyBytes2(mnemonic);
-            const { createKeyPairSignerFromPrivateKeyBytes } = await import("@solana/kit");
-            const signer = await createKeyPairSignerFromPrivateKeyBytes(solKeyBytes);
+            const { createKeyPairSignerFromPrivateKeyBytes: createKeyPairSignerFromPrivateKeyBytes2 } = await import("@solana/kit");
+            const signer = await createKeyPairSignerFromPrivateKeyBytes2(solKeyBytes);
             const solAddr = signer.address;
             let solBalanceText = "Balance: (checking...)";
             try {
@@ -6989,7 +8514,8 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
           "\u2022 `/wallet export` - Export private key for backup",
           !solanaSection ? "\u2022 `/wallet solana` - Enable Solana payments" : "",
           solanaSection ? "\u2022 `/wallet base` - Switch to Base (EVM)" : "",
-          solanaSection ? "\u2022 `/wallet solana` - Switch to Solana" : ""
+          solanaSection ? "\u2022 `/wallet solana` - Switch to Solana" : "",
+          solanaSection ? "\u2022 `/wallet migrate-solana` - Sweep funds from old Solana wallet" : ""
         ].filter(Boolean).join("\n")
       };
     }
@@ -7000,7 +8526,7 @@ var plugin = {
   name: "ClawRouter",
   description: "Smart LLM router \u2014 30+ models, x402 micropayments, 78% cost savings",
   version: VERSION,
-  async register(api) {
+  register(api) {
     const isDisabled = process["env"].CLAWROUTER_DISABLED === "true" || process["env"].CLAWROUTER_DISABLED === "1";
     if (isDisabled) {
       api.logger.info("ClawRouter disabled (CLAWROUTER_DISABLED=true). Using default routing.");
@@ -7029,14 +8555,15 @@ var plugin = {
     };
     api.logger.info("BlockRun provider registered (30+ models via x402)");
     try {
-      const { buildPartnerTools: buildPartnerTools2, PARTNER_SERVICES: PARTNER_SERVICES2 } = await Promise.resolve().then(() => (init_partners(), partners_exports));
       const proxyBaseUrl = `http://127.0.0.1:${runtimePort}`;
-      const partnerTools = buildPartnerTools2(proxyBaseUrl);
+      const partnerTools = buildPartnerTools(proxyBaseUrl);
       for (const tool of partnerTools) {
         api.registerTool(tool);
       }
       if (partnerTools.length > 0) {
-        api.logger.info(`Registered ${partnerTools.length} partner tool(s): ${partnerTools.map((t) => t.name).join(", ")}`);
+        api.logger.info(
+          `Registered ${partnerTools.length} partner tool(s): ${partnerTools.map((t) => t.name).join(", ")}`
+        );
       }
       api.registerCommand({
         name: "partners",
@@ -7044,19 +8571,20 @@ var plugin = {
         acceptsArgs: false,
         requireAuth: false,
         handler: async () => {
-          if (PARTNER_SERVICES2.length === 0) {
+          if (PARTNER_SERVICES.length === 0) {
             return { text: "No partner APIs available." };
           }
-          const lines = [
-            "**Partner APIs** (paid via your ClawRouter wallet)",
-            ""
-          ];
-          for (const svc of PARTNER_SERVICES2) {
+          const lines = ["**Partner APIs** (paid via your ClawRouter wallet)", ""];
+          for (const svc of PARTNER_SERVICES) {
             lines.push(`**${svc.name}** (${svc.partner})`);
             lines.push(`  ${svc.description}`);
             lines.push(`  Tool: \`${`blockrun_${svc.id}`}\``);
-            lines.push(`  Pricing: ${svc.pricing.perUnit} per ${svc.pricing.unit} (min ${svc.pricing.minimum}, max ${svc.pricing.maximum})`);
-            lines.push(`  **How to use:** Ask "Look up Twitter user @elonmusk" or "Get info on these X accounts: @naval, @balajis"`);
+            lines.push(
+              `  Pricing: ${svc.pricing.perUnit} per ${svc.pricing.unit} (min ${svc.pricing.minimum}, max ${svc.pricing.maximum})`
+            );
+            lines.push(
+              `  **How to use:** Ask "Look up Twitter user @elonmusk" or "Get info on these X accounts: @naval, @balajis"`
+            );
             lines.push("");
           }
           return { text: lines.join("\n") };
@@ -7163,6 +8691,7 @@ export {
   deriveAllKeys,
   deriveEvmKey,
   deriveSolanaKeyBytes,
+  deriveSolanaKeyBytesLegacy,
   fetchWithRetry,
   formatDuration,
   formatStatsAscii,
@@ -7175,6 +8704,7 @@ export {
   getProxyPort,
   getSessionId,
   getStats,
+  hashRequestContent,
   isAgenticModel,
   isBalanceError,
   isEmptyWalletError,
@@ -7189,6 +8719,12 @@ export {
   route,
   savePaymentChain,
   setupSolana,
-  startProxy
+  startProxy,
+  sweepSolanaWallet
 };
+/*! Bundled license information:
+
+@noble/hashes/esm/utils.js:
+  (*! noble-hashes - MIT License (c) 2022 Paul Miller (paulmillr.com) *)
+*/
 //# sourceMappingURL=index.js.map