@trustwallet/cli 0.7.0 → 0.9.0

package/dist/index.js

@@ -49,10 +49,15 @@
       head: { appendChild: function(){} }
     };
   }
-  // --- Suppress Node.js --localstorage-file warning from Trust SDK WASM ---
+  // --- Suppress noisy warnings fired by transitive deps at module load time ---
   var _origEmit = process.emitWarning;
   process.emitWarning = function(warning) {
     if (typeof warning === 'string' && warning.indexOf('--localstorage-file') !== -1) return;
+    // DEP0040: punycode module deprecation from ws/url used by Trust SDK
+    var opts = arguments[1];
+    var code = (opts && typeof opts === 'object' ? opts.code : arguments[2])
+      || (warning && typeof warning === 'object' ? warning.code : null);
+    if (code === 'DEP0040') return;
     return _origEmit.apply(process, arguments);
   };
 
@@ -71,7 +76,7 @@ var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __esm = (fn2, res) => function __init() {
   return fn2 && (res = (0, fn2[__getOwnPropNames(fn2)[0]])(fn2 = 0)), res;
 };
-var __commonJS = (cb, mod2) => function __require3() {
+var __commonJS = (cb, mod2) => function __require2() {
   return mod2 || (0, cb[__getOwnPropNames(cb)[0]])((mod2 = { exports: {} }).exports, mod2), mod2.exports;
 };
 var __export = (target, all) => {
@@ -3125,20 +3130,21 @@ function decrypt(data, password) {
   decrypted += decipher.final("utf-8");
   return decrypted;
 }
-function loadKeytar() {
+function isNoEntryError(err) {
+  return err instanceof Error && /no entry|no such entry/i.test(err.message);
+}
+function isKeychainUnavailableError(err) {
+  return err instanceof Error && (/no keychain service/i.test(err.message) || /org\.freedesktop/i.test(err.message) || /failed to unlock/i.test(err.message) || /secret service/i.test(err.message));
+}
+function getPassword(service, account) {
   try {
-    return __require("keytar");
-  } catch {
-    return null;
+    return new import_keyring.Entry(service, account).getPassword();
+  } catch (err) {
+    if (isNoEntryError(err) || isKeychainUnavailableError(err)) return null;
+    throw err;
   }
 }
-function getBackend() {
-  const keytar = loadKeytar();
-  if (keytar) return keytar;
-  if (macSecurity.isAvailable()) return macSecurity;
-  return null;
-}
-var fs, path, os, crypto2, import_child_process, import_os, crypto22, crypto3, __require, FileStore, ALGORITHM, KEY_LENGTH, IV_LENGTH, SALT_LENGTH, ITERATIONS, SERVICE, WALLET_ACCOUNT, API_SECRET_ACCOUNT, macSecurity, KeychainManager, CREDENTIALS_FILE, CredentialManager, WALLET_FILE, WalletConfigStore, ALERTS_FILE, AlertStore, AUTOMATIONS_FILE, AutomationStore, SEEN_HASHES_FILE, SeenHashStore;
+var fs, path, os, crypto2, import_keyring, crypto22, crypto3, FileStore, ALGORITHM, KEY_LENGTH, IV_LENGTH, SALT_LENGTH, ITERATIONS, SERVICE, WALLET_ACCOUNT, API_SECRET_ACCOUNT, KeychainManager, CREDENTIALS_FILE, CredentialManager, WALLET_FILE, WalletConfigStore, ALERTS_FILE, AlertStore, AUTOMATIONS_FILE, AutomationStore, SEEN_HASHES_FILE, SeenHashStore, ASSET_CACHE_FILE, AssetCache;
 var init_dist = __esm({
   "../storage/dist/index.mjs"() {
     "use strict";
@@ -3146,16 +3152,9 @@ var init_dist = __esm({
     path = __toESM(require("path"), 1);
     os = __toESM(require("os"), 1);
     crypto2 = __toESM(require("crypto"), 1);
-    import_child_process = require("child_process");
-    import_os = require("os");
+    import_keyring = require("@napi-rs/keyring");
     crypto22 = __toESM(require("crypto"), 1);
     crypto3 = __toESM(require("crypto"), 1);
-    __require = /* @__PURE__ */ ((x6) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x6, {
-      get: (a3, b3) => (typeof require !== "undefined" ? require : a3)[b3]
-    }) : x6)(function(x6) {
-      if (typeof require !== "undefined") return require.apply(this, arguments);
-      throw Error('Dynamic require of "' + x6 + '" is not supported');
-    });
     FileStore = class {
       dataDir;
       constructor(config2) {
@@ -3206,84 +3205,36 @@ var init_dist = __esm({
     SERVICE = "twak";
     WALLET_ACCOUNT = "wallet";
     API_SECRET_ACCOUNT = "api-secret";
-    macSecurity = {
-      isAvailable() {
-        return (0, import_os.platform)() === "darwin";
-      },
-      getPassword(service, account) {
-        try {
-          const output2 = (0, import_child_process.execFileSync)(
-            "security",
-            ["find-generic-password", "-s", service, "-a", account, "-w"],
-            { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }
-          );
-          return output2.replace(/\r?\n$/, "");
-        } catch {
-          return null;
-        }
-      },
-      setPassword(service, account, password) {
-        (0, import_child_process.execFileSync)(
-          "security",
-          ["add-generic-password", "-U", "-s", service, "-a", account, "-w"],
-          { input: password + "\n", stdio: ["pipe", "pipe", "pipe"] }
-        );
-      },
-      deletePassword(service, account) {
-        try {
-          (0, import_child_process.execFileSync)(
-            "security",
-            ["delete-generic-password", "-s", service, "-a", account],
-            { stdio: ["pipe", "pipe", "pipe"] }
-          );
-        } catch {
-        }
-      }
-    };
     KeychainManager = class {
       async getWalletPassword() {
-        const backend = getBackend();
-        if (!backend) return null;
-        try {
-          return await backend.getPassword(SERVICE, WALLET_ACCOUNT);
-        } catch {
-          return null;
-        }
+        return getPassword(SERVICE, WALLET_ACCOUNT);
       }
       async saveWalletPassword(password) {
-        const backend = getBackend();
-        if (!backend) throw new Error("No keychain backend available (keytar not installed and not on macOS)");
-        await backend.setPassword(SERVICE, WALLET_ACCOUNT, password);
+        new import_keyring.Entry(SERVICE, WALLET_ACCOUNT).setPassword(password);
       }
       async deleteWalletPassword() {
-        const backend = getBackend();
-        if (!backend) throw new Error("No keychain backend available (keytar not installed and not on macOS)");
-        await backend.deletePassword(SERVICE, WALLET_ACCOUNT);
+        new import_keyring.Entry(SERVICE, WALLET_ACCOUNT).deletePassword();
       }
       async getApiSecret() {
-        const backend = getBackend();
-        if (!backend) return null;
-        try {
-          return await backend.getPassword(SERVICE, API_SECRET_ACCOUNT);
-        } catch {
-          return null;
-        }
+        return getPassword(SERVICE, API_SECRET_ACCOUNT);
       }
       async saveApiSecret(secret) {
-        const backend = getBackend();
-        if (!backend) throw new Error("No keychain backend available (keytar not installed and not on macOS)");
-        await backend.setPassword(SERVICE, API_SECRET_ACCOUNT, secret);
+        new import_keyring.Entry(SERVICE, API_SECRET_ACCOUNT).setPassword(secret);
       }
       async deleteApiSecret() {
-        const backend = getBackend();
-        if (!backend) return;
         try {
-          await backend.deletePassword(SERVICE, API_SECRET_ACCOUNT);
+          new import_keyring.Entry(SERVICE, API_SECRET_ACCOUNT).deletePassword();
         } catch {
         }
       }
       isAvailable() {
-        return getBackend() !== null;
+        try {
+          new import_keyring.Entry(SERVICE, "__availability_probe__").getPassword();
+          return true;
+        } catch (err) {
+          if (isNoEntryError(err)) return true;
+          return false;
+        }
       }
     };
     CREDENTIALS_FILE = "credentials.json";
@@ -3311,6 +3262,10 @@ var init_dist = __esm({
           try {
             await this.kc.saveApiSecret(credentials.hmacSecret);
           } catch {
+            try {
+              await this.kc.deleteApiSecret();
+            } catch {
+            }
           }
         }
       }
@@ -3484,6 +3439,45 @@ var init_dist = __esm({
         await this.store.remove(SEEN_HASHES_FILE);
       }
     };
+    ASSET_CACHE_FILE = "asset-cache.json";
+    AssetCache = class {
+      store;
+      mem = /* @__PURE__ */ new Map();
+      loadPromise = null;
+      writeQueue = Promise.resolve();
+      constructor(config2) {
+        this.store = new FileStore(config2);
+      }
+      async get(tokenId) {
+        await this.ensureLoaded();
+        return this.mem.get(tokenId);
+      }
+      async set(tokenId, symbol) {
+        await this.ensureLoaded();
+        this.mem.set(tokenId, symbol);
+        this.writeQueue = this.writeQueue.then(
+          () => this.store.write(ASSET_CACHE_FILE, Object.fromEntries(this.mem))
+        );
+        await this.writeQueue;
+      }
+      async clear() {
+        this.mem.clear();
+        this.loadPromise = null;
+        await this.store.remove(ASSET_CACHE_FILE);
+      }
+      ensureLoaded() {
+        if (!this.loadPromise) {
+          this.loadPromise = this.store.read(ASSET_CACHE_FILE).then((data) => {
+            if (data) {
+              for (const [k4, v5] of Object.entries(data)) {
+                this.mem.set(k4, v5);
+              }
+            }
+          });
+        }
+        return this.loadPromise;
+      }
+    };
   }
 });
 
@@ -5166,11 +5160,13 @@ function resolveToken(token, chainKey) {
     };
   }
   if (upperToken.startsWith("USDC")) {
-    const addr = chainTokens?.["USDC.e"] || chainTokens?.["USDC"] || token;
+    const addr = chainTokens?.["USDC.e"] || chainTokens?.["USDC"];
+    if (!addr) return null;
     return { address: addr, decimals: isBsc ? 18 : 6 };
   }
   if (upperToken.startsWith("USDT")) {
-    const addr = chainTokens?.["USDT"] || token;
+    const addr = chainTokens?.["USDT"];
+    if (!addr) return null;
     return { address: addr, decimals: isBsc ? 18 : 6 };
   }
   if (token.startsWith("0x") || token.length > 20) {
@@ -5186,7 +5182,7 @@ function resolveToken(token, chainKey) {
     }
     return { address: token, decimals: 18 };
   }
-  return { address: token, decimals: 18 };
+  return null;
 }
 function chainKeyToCoinType(chainKey) {
   const key = chainKey.toLowerCase();
@@ -5941,7 +5937,7 @@ function setPolyfillNaasSessionId(sessionId) {
 }
 function resolveSdkDir() {
   try {
-    return path2.dirname(__require2.resolve("@trustwallet-trust-sdk/trust-sdk"));
+    return path2.dirname(__require.resolve("@trustwallet-trust-sdk/trust-sdk"));
   } catch {
     let dir = __dirname;
     for (let i2 = 0; i2 < 10; i2++) {
@@ -6106,7 +6102,7 @@ function applyPolyfills() {
     };
   }
   if (typeof globalThis.localStorage === "undefined") {
-    const os5 = __require2("os");
+    const os5 = __require("os");
     const storePath = path2.join(os5.homedir(), ".twak", "local-storage.json");
     const load = () => {
       try {
@@ -6148,7 +6144,7 @@ function applyPolyfills() {
     };
   }
   if (typeof globalThis.crypto === "undefined") {
-    const nodeCrypto = __require2("crypto");
+    const nodeCrypto = __require("crypto");
     globalThis.crypto = nodeCrypto.webcrypto ?? nodeCrypto;
   }
   for (const method of ["log", "error"]) {
@@ -6455,7 +6451,7 @@ function registerShutdownHandlers(providers, onBeforeExit) {
     process.removeListener("SIGTERM", handler);
   };
 }
-var fs2, path2, import_trust_sdk, import_trust_sdk2, import_trust_sdk3, import_trust_sdk4, import_crypto2, __require2, polyfillsApplied, _credentials, _naasSessionId, nodeStubsPatched, NAAS_SESSION_RE, naasSessionPatched, coinTypeByValue, walletCore, initialized, SPONSORED_RPC, BlockchainClient, WalletCoreSigner, domainsByCoinId, GATEWAY_URL, WALLET_ID_SUFFIX, WALLET_ID_LENGTH, EVM_COIN_IDS, MAINTAINED_COIN_IDS, WalletProvider, AgentWalletProvider, SHUTDOWN_TIMEOUT_MS;
+var fs2, path2, import_trust_sdk, import_trust_sdk2, import_trust_sdk3, import_trust_sdk4, import_crypto2, __require, polyfillsApplied, _credentials, _naasSessionId, nodeStubsPatched, NAAS_SESSION_RE, naasSessionPatched, coinTypeByValue, walletCore, initialized, SPONSORED_RPC, BlockchainClient, WalletCoreSigner, domainsByCoinId, GATEWAY_URL, WALLET_ID_SUFFIX, WALLET_ID_LENGTH, EVM_COIN_IDS, MAINTAINED_COIN_IDS, WalletProvider, AgentWalletProvider, SHUTDOWN_TIMEOUT_MS;
 var init_dist3 = __esm({
   "../wallet-core/dist/index.mjs"() {
     "use strict";
@@ -6471,7 +6467,7 @@ var init_dist3 = __esm({
     import_crypto2 = require("crypto");
     init_dist2();
     init_dist();
-    __require2 = /* @__PURE__ */ ((x6) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x6, {
+    __require = /* @__PURE__ */ ((x6) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x6, {
       get: (a3, b3) => (typeof require !== "undefined" ? require : a3)[b3]
     }) : x6)(function(x6) {
       if (typeof require !== "undefined") return require.apply(this, arguments);
@@ -6604,7 +6600,16 @@ var init_dist3 = __esm({
         const chain2 = new import_trust_sdk2.DefinedChain(ct5);
         const account = this.getAccountFromSigner(chainKey);
         const asset = contractAddress ? new import_trust_sdk2.Asset.Token(account, contractAddress, tokenTypeForCoinId(coinId)) : new import_trust_sdk2.Asset.Coin(account);
-        const decimals = params.decimals !== void 0 ? params.decimals : contractAddress ? resolveToken(params.assetId, chainKey).decimals : getCoinDecimals(coinId);
+        let decimals;
+        if (params.decimals !== void 0) {
+          decimals = params.decimals;
+        } else if (contractAddress) {
+          const resolved = resolveToken(params.assetId, chainKey);
+          if (!resolved) throw new Error(`Cannot resolve decimals for ${params.assetId}`);
+          decimals = resolved.decimals;
+        } else {
+          decimals = getCoinDecimals(coinId);
+        }
         const amountWei = humanAmountToWei(params.amount, decimals);
         let transaction = new import_trust_sdk2.TransactionTransfer(
           params.to,
@@ -7518,11 +7523,11 @@ function __metadata(metadataKey, metadataValue) {
 }
 function __awaiter(thisArg, _arguments, P5, generator) {
   function adopt(value) {
-    return value instanceof P5 ? value : new P5(function(resolve3) {
-      resolve3(value);
+    return value instanceof P5 ? value : new P5(function(resolve2) {
+      resolve2(value);
     });
   }
-  return new (P5 || (P5 = Promise))(function(resolve3, reject) {
+  return new (P5 || (P5 = Promise))(function(resolve2, reject) {
     function fulfilled(value) {
       try {
         step(generator.next(value));
@@ -7538,7 +7543,7 @@ function __awaiter(thisArg, _arguments, P5, generator) {
       }
     }
     function step(result) {
-      result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
+      result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
     }
     step((generator = generator.apply(thisArg, _arguments || [])).next());
   });
@@ -7716,14 +7721,14 @@ function __asyncValues(o4) {
   }, i2);
   function verb(n4) {
     i2[n4] = o4[n4] && function(v5) {
-      return new Promise(function(resolve3, reject) {
-        v5 = o4[n4](v5), settle(resolve3, reject, v5.done, v5.value);
+      return new Promise(function(resolve2, reject) {
+        v5 = o4[n4](v5), settle(resolve2, reject, v5.done, v5.value);
       });
     };
   }
-  function settle(resolve3, reject, d3, v5) {
+  function settle(resolve2, reject, d3, v5) {
     Promise.resolve(v5).then(function(v6) {
-      resolve3({ value: v6, done: d3 });
+      resolve2({ value: v6, done: d3 });
     }, reject);
   }
 }
@@ -7792,9 +7797,9 @@ var require_delay = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.delay = void 0;
     function delay(timeout) {
-      return new Promise((resolve3) => {
+      return new Promise((resolve2) => {
         setTimeout(() => {
-          resolve3(true);
+          resolve2(true);
         }, timeout);
       });
     }
@@ -12877,13 +12882,12 @@ var init_dist5 = __esm({
         }
       }
       async getAssetInfo(assetId) {
-        const info2 = await this.client.gateway("GET", `/v1/assets/${assetId}`);
+        const info2 = await this.client.gateway(
+          "GET",
+          `/v1/assets/${encodeURIComponent(assetId)}`
+        );
         try {
-          const priceResp = await this.client.market(
-            "POST",
-            "/v2/market/tickers",
-            { currency: "USD", assets: [assetId] }
-          );
+          const priceResp = await this.client.market("POST", "/v2/market/tickers", { currency: "USD", assets: [assetId] });
           const ticker = priceResp.tickers?.[0];
           if (ticker) {
             if (ticker.price != null) info2.priceUsd = ticker.price;
@@ -12919,17 +12923,22 @@ var init_dist5 = __esm({
         return this.transformCoinStatus(assetId, raw);
       }
       async getAssetListings(params) {
+        const limit = params.limit || 20;
         const query = new URLSearchParams({
           version: "27",
           currency: params.currency || "USD",
-          limit: String(params.limit || 20)
+          limit: String(params.sort ? Math.max(limit, 50) : limit)
         });
         if (params.categoryId) query.set("category_id", params.categoryId);
-        if (params.sort) query.set("sort", params.sort);
         if (params.networks) query.set("networks", params.networks);
-        const response = await this.client.gateway("GET", "/v1/assets/listings", void 0, query.toString());
+        const response = await this.client.gateway(
+          "GET",
+          "/v1/assets/listings",
+          void 0,
+          query.toString()
+        );
         const docs = response.docs || response.results || [];
-        return docs.map((doc) => {
+        const tokens = docs.map((doc) => {
           const asset = doc.asset || doc;
           const price = doc.price || {};
           const market = doc.market || {};
@@ -12948,6 +12957,16 @@ var init_dist5 = __esm({
             volume24hUsd: market.volume_24h ?? price.volume_24h ?? doc.volume_24h_usd
           };
         });
+        if (params.sort) {
+          const sortKeyMap = {
+            percent_change_24h: "priceChange24h",
+            market_cap: "marketCapUsd",
+            volume_24h: "volume24hUsd"
+          };
+          const key = sortKeyMap[params.sort] || "priceChange24h";
+          tokens.sort((a3, b3) => (b3[key] ?? 0) - (a3[key] ?? 0));
+        }
+        return tokens.slice(0, limit);
       }
       async getTrendingTokens(limit = 20, sort = "percent_change_24h") {
         const knownAssets = [
@@ -12972,7 +12991,7 @@ var init_dist5 = __esm({
           "c10000324",
           "c81457"
         ];
-        const response = await this.client.market("POST", "/v1/tickers", {
+        const response = await this.client.market("POST", "/v2/market/tickers", {
           currency: "USD",
           assets: knownAssets
         });
@@ -16095,7 +16114,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve3.call(this, root, ref);
+      let _sch = resolve2.call(this, root, ref);
       if (_sch === void 0) {
         const schema = (_a2 = root.localRefs) === null || _a2 === void 0 ? void 0 : _a2[ref];
         const { schemaId } = this.opts;
@@ -16122,7 +16141,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve3(root, ref) {
+    function resolve2(root, ref) {
       let sch;
       while (typeof (sch = this.refs[ref]) == "string")
         ref = sch;
@@ -16697,7 +16716,7 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve3(baseURI, relativeURI, options) {
+    function resolve2(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const resolved = resolveComponent(parse3(baseURI, schemelessOptions), parse3(relativeURI, schemelessOptions), schemelessOptions, true);
       schemelessOptions.skipEscape = true;
@@ -16924,7 +16943,7 @@ var require_fast_uri = __commonJS({
     var fastUri = {
       SCHEMES,
       normalize,
-      resolve: resolve3,
+      resolve: resolve2,
       resolveComponent,
       equal,
       serialize,
@@ -19936,11 +19955,11 @@ function __rest2(s2, e2) {
 }
 function __awaiter2(thisArg, _arguments, P5, generator) {
   function adopt(value) {
-    return value instanceof P5 ? value : new P5(function(resolve3) {
-      resolve3(value);
+    return value instanceof P5 ? value : new P5(function(resolve2) {
+      resolve2(value);
     });
   }
-  return new (P5 || (P5 = Promise))(function(resolve3, reject) {
+  return new (P5 || (P5 = Promise))(function(resolve2, reject) {
     function fulfilled(value) {
       try {
         step(generator.next(value));
@@ -19956,7 +19975,7 @@ function __awaiter2(thisArg, _arguments, P5, generator) {
       }
     }
     function step(result) {
-      result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
+      result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
     }
     step((generator = generator.apply(thisArg, _arguments || [])).next());
   });
@@ -20526,8 +20545,8 @@ var init_timeline = __esm({
       };
       Timeline2.prototype.push = function(event) {
         var _this = this;
-        return new Promise(function(resolve3) {
-          _this.queue.push([event, resolve3]);
+        return new Promise(function(resolve2) {
+          _this.queue.push([event, resolve2]);
           _this.scheduleApply(0);
         });
       };
@@ -20547,7 +20566,7 @@ var init_timeline = __esm({
       };
       Timeline2.prototype.apply = function(item) {
         return __awaiter2(this, void 0, void 0, function() {
-          var _a2, event, _b, resolve3, before, before_1, before_1_1, plugin, e2, e_1_1, enrichment, enrichment_1, enrichment_1_1, plugin, e2, e_2_1, destination, executeDestinations;
+          var _a2, event, _b, resolve2, before, before_1, before_1_1, plugin, e2, e_1_1, enrichment, enrichment_1, enrichment_1_1, plugin, e2, e_2_1, destination, executeDestinations;
           var e_1, _c2, e_2, _d;
           return __generator2(this, function(_e6) {
             switch (_e6.label) {
@@ -20559,7 +20578,7 @@ var init_timeline = __esm({
                   ];
                 }
                 _a2 = __read2(item, 1), event = _a2[0];
-                _b = __read2(item, 2), resolve3 = _b[1];
+                _b = __read2(item, 2), resolve2 = _b[1];
                 this.loggerProvider.log("Timeline.apply: Initial event", event);
                 before = this.plugins.filter(function(plugin2) {
                   return plugin2.type === "before";
@@ -20580,7 +20599,7 @@ var init_timeline = __esm({
                 e2 = _e6.sent();
                 if (e2 === null) {
                   this.loggerProvider.log("Timeline.apply: Event filtered out by before plugin '".concat(String(plugin.name), "', event: ").concat(JSON.stringify(event)));
-                  resolve3({ event, code: 0, message: "" });
+                  resolve2({ event, code: 0, message: "" });
                   return [
                     2
                     /*return*/
@@ -20629,7 +20648,7 @@ var init_timeline = __esm({
                 e2 = _e6.sent();
                 if (e2 === null) {
                   this.loggerProvider.log("Timeline.apply: Event filtered out by enrichment plugin '".concat(String(plugin.name), "', event: ").concat(JSON.stringify(event)));
-                  resolve3({ event, code: 0, message: "" });
+                  resolve2({ event, code: 0, message: "" });
                   return [
                     2
                     /*return*/
@@ -20672,7 +20691,7 @@ var init_timeline = __esm({
                 void Promise.all(executeDestinations).then(function(_a3) {
                   var _b2 = __read2(_a3, 1), result = _b2[0];
                   var resolveResult = result || buildResult(event, 100, "Event not tracked, no destination plugins on the instance");
-                  resolve3(resolveResult);
+                  resolve2(resolveResult);
                 });
                 return [
                   2
@@ -21011,8 +21030,8 @@ var init_core_client = __esm({
           var _this = this;
           return __generator2(this, function(_a2) {
             if (!this.isReady) {
-              return [2, new Promise(function(resolve3) {
-                _this.dispatchQ.push(_this.dispatchWithCallback.bind(_this, event, resolve3));
+              return [2, new Promise(function(resolve2) {
+                _this.dispatchQ.push(_this.dispatchWithCallback.bind(_this, event, resolve2));
               })];
             }
             return [2, this.process(event)];
@@ -21614,12 +21633,12 @@ var init_destination = __esm({
         if (!event.insert_id) {
           event.insert_id = UUID();
         }
-        return new Promise(function(resolve3) {
+        return new Promise(function(resolve2) {
           var context = {
             event,
             attempts: 0,
             callback: function(result) {
-              return resolve3(result);
+              return resolve2(result);
             },
             timeout: 0
           };
@@ -22131,7 +22150,7 @@ var init_context = __esm({
       };
       Context2.prototype.execute = function(context) {
         var _this = this;
-        return new Promise(function(resolve3) {
+        return new Promise(function(resolve2) {
           var time3 = (/* @__PURE__ */ new Date()).getTime();
           var contextEvent = __assign2(__assign2(__assign2({ time: time3, insert_id: UUID(), plan: _this.config.plan }, _this.config.ingestionMetadata && {
             ingestion_metadata: {
@@ -22139,7 +22158,7 @@ var init_context = __esm({
               source_version: _this.config.ingestionMetadata.sourceVersion
             }
           }), context), { event_id: _this.eventId++, library: _this.library });
-          return resolve3(contextEvent);
+          return resolve2(contextEvent);
         });
       };
       return Context2;
@@ -22185,7 +22204,7 @@ var init_http = __esm({
           port: url.port,
           protocol: url.protocol
         };
-        return new Promise(function(resolve3) {
+        return new Promise(function(resolve2) {
           var req = protocol.request(options, function(res) {
             res.setEncoding("utf8");
             var responsePayload = "";
@@ -22197,15 +22216,15 @@ var init_http = __esm({
                 try {
                   var parsedResponsePayload = JSON.parse(responsePayload);
                   var result = _this.buildResponse(parsedResponsePayload);
-                  resolve3(result);
+                  resolve2(result);
                 } catch (_a2) {
-                  resolve3(_this.buildResponse({ code: res.statusCode }));
+                  resolve2(_this.buildResponse({ code: res.statusCode }));
                 }
               }
             });
           });
           req.on("error", function() {
-            return resolve3(null);
+            return resolve2(null);
           });
           req.end(requestPayload);
         });
@@ -22417,6 +22436,20 @@ function info(message) {
 function dim(message) {
   console.log(import_chalk.default.dim(message));
 }
+function safeExit() {
+  const code2 = process.exitCode ?? 0;
+  const streams = [process.stdout, process.stderr].filter(
+    (s2) => s2.writableNeedDrain || s2.writableLength > 0
+  );
+  if (streams.length === 0) {
+    process.exit(code2);
+  }
+  let pending = streams.length;
+  const onDrain = () => {
+    if (--pending === 0) process.exit(code2);
+  };
+  for (const s2 of streams) s2.once("drain", onDrain);
+}
 
 // src/config-loader.ts
 var import_chalk2 = __toESM(require_source());
@@ -22426,7 +22459,8 @@ init_dist();
 var EMBEDDED_NAAS_SESSION_ID = "NDVjMWRjY2MtYTYwNy00NGNhLWIxZGUtMmJiZDIyNmEyODQ4";
 function resolveNaasSessionId() {
   if (process.env.TWAK_NAAS_SESSION_ID) return process.env.TWAK_NAAS_SESSION_ID;
-  if (EMBEDDED_NAAS_SESSION_ID && !EMBEDDED_NAAS_SESSION_ID.startsWith("__")) return EMBEDDED_NAAS_SESSION_ID;
+  if (EMBEDDED_NAAS_SESSION_ID && !EMBEDDED_NAAS_SESSION_ID.startsWith("__"))
+    return EMBEDDED_NAAS_SESSION_ID;
   return void 0;
 }
 async function getCredentials() {
@@ -22441,13 +22475,29 @@ async function getCredentials() {
     return { accessId: credentials.accessId, hmacSecret: credentials.hmacSecret };
   }
   console.error(import_chalk2.default.red("No API credentials found."));
-  console.error(import_chalk2.default.dim("Set TWAK_ACCESS_ID and TWAK_HMAC_SECRET environment variables, then run `twak init`"));
+  console.error(
+    import_chalk2.default.dim(
+      "Set TWAK_ACCESS_ID and TWAK_HMAC_SECRET environment variables, then run `twak init`"
+    )
+  );
   process.exit(1);
 }
 async function getClient() {
   const creds = await getCredentials();
   return createTwakClient({ ...creds });
 }
+async function tryGetClient() {
+  const envAccessId = process.env.TWAK_ACCESS_ID;
+  const envSecret = process.env.TWAK_HMAC_SECRET;
+  if (envAccessId && envSecret) {
+    return createTwakClient({ accessId: envAccessId, hmacSecret: envSecret });
+  }
+  const credentials = await new CredentialManager().load();
+  if (credentials) {
+    return createTwakClient({ accessId: credentials.accessId, hmacSecret: credentials.hmacSecret });
+  }
+  return void 0;
+}
 async function ensureTrustSDK() {
   const creds = await getCredentials();
   await initTrustSDK({
@@ -22475,7 +22525,9 @@ async function registerWalletWithBackend(creds, provider) {
 async function resolvePassword(opts) {
   if (opts?.password) {
     process.stderr.write(
-      import_chalk2.default.yellow("Note: --password is visible in shell history. Use `twak wallet keychain save` or TWAK_WALLET_PASSWORD instead.\n")
+      import_chalk2.default.yellow(
+        "Note: --password is visible in shell history. Use `twak wallet keychain save` or TWAK_WALLET_PASSWORD instead.\n"
+      )
     );
     return opts.password;
   }
@@ -23155,8 +23207,8 @@ async function dispose(driver) {
 
 // ../../node_modules/.pnpm/idb-keyval@6.2.2/node_modules/idb-keyval/dist/index.js
 function promisifyRequest(request) {
-  return new Promise((resolve3, reject) => {
-    request.oncomplete = request.onsuccess = () => resolve3(request.result);
+  return new Promise((resolve2, reject) => {
+    request.oncomplete = request.onsuccess = () => resolve2(request.result);
     request.onabort = request.onerror = () => reject(request.error);
   });
 }
@@ -38756,8 +38808,24 @@ function getQRString(address) {
 }
 function registerWalletCommand(program3) {
   const wallet = program3.command("wallet").description("Manage agent wallet");
-  wallet.command("create").description("Create a new agent wallet").requiredOption("--password <password>", "Password to encrypt the wallet").option("--no-keychain", "Do not save password to OS keychain").option("--json", "JSON output").action(async (opts) => {
+  wallet.command("create").description("Create a new agent wallet").requiredOption("--password <password>", "Password to encrypt the wallet").option("--no-keychain", "Do not save password to OS keychain").option("--skip-password-check", "Skip password strength validation").option("--json", "JSON output").action(async (opts) => {
     try {
+      if (!opts.skipPasswordCheck) {
+        const pw = opts.password;
+        const issues = [];
+        if (pw.length < 8) issues.push("be at least 8 characters long");
+        if (!/[a-z]/.test(pw)) issues.push("include a lowercase letter");
+        if (!/[A-Z]/.test(pw)) issues.push("include an uppercase letter");
+        if (!/[0-9]/.test(pw)) issues.push("include a number");
+        if (issues.length > 0) {
+          const msg = `Password too weak: must ${issues.join(", ")}.`;
+          error(msg);
+          if (opts.json) output({ error: msg }, true);
+          process.exitCode = 1;
+          process.exit();
+          return;
+        }
+      }
       await ensureTrustSDK();
       const store = new WalletConfigStore();
       if (await store.exists()) {
@@ -38765,7 +38833,7 @@ function registerWalletCommand(program3) {
         error(msg);
         if (opts.json) output({ error: msg }, true);
         process.exitCode = 1;
-        process.exit();
+        safeExit();
         return;
       }
       const provider = await AgentWalletProvider.create(opts.password);
@@ -38796,9 +38864,12 @@ function registerWalletCommand(program3) {
       if (opts.json) output({ error: msg }, true);
       process.exitCode = 1;
     }
-    process.exit();
+    safeExit();
   });
-  wallet.command("address").description("Get wallet address for a chain").requiredOption("--chain <key>", "Chain key (e.g., ethereum, solana)").option("--password <password>", "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)").option("--json", "JSON output").action(async (opts) => {
+  wallet.command("address").description("Get wallet address for a chain").requiredOption("--chain <key>", "Chain key (e.g., ethereum, solana)").option(
+    "--password <password>",
+    "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
+  ).option("--json", "JSON output").action(async (opts) => {
     try {
       await ensureTrustSDK();
       const password = await resolvePassword(opts);
@@ -38820,9 +38891,12 @@ ${qr3}`;
       if (opts.json) output({ error: msg }, true);
       process.exitCode = 1;
     }
-    process.exit();
+    safeExit();
   });
-  wallet.command("addresses").description("List all wallet addresses").option("--password <password>", "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)").option("--json", "JSON output").action(async (opts) => {
+  wallet.command("addresses").description("List all wallet addresses").option(
+    "--password <password>",
+    "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
+  ).option("--json", "JSON output").action(async (opts) => {
     try {
       await ensureTrustSDK();
       const password = await resolvePassword(opts);
@@ -38868,16 +38942,19 @@ ${qr3}`;
       if (opts.json) output({ error: msg }, true);
       process.exitCode = 1;
     }
-    process.exit();
+    safeExit();
   });
-  wallet.command("balance").description("Get wallet balance on a chain (native + token holdings)").option("--chain <key>", "Chain key").option("--all", "Show balances across all chains with funds").option("--password <password>", "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)").option("--no-tokens", "Skip token balance lookup").option("--json", "JSON output").action(async (opts) => {
+  wallet.command("balance").description("Get wallet balance on a chain (native + token holdings)").option("--chain <key>", "Chain key").option("--all", "Show balances across all chains with funds").option(
+    "--password <password>",
+    "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
+  ).option("--no-tokens", "Skip token balance lookup").option("--json", "JSON output").action(async (opts) => {
     try {
       if (opts.all && opts.chain) {
         const msg = "--all and --chain are mutually exclusive";
         error(msg);
         if (opts.json) output({ error: msg }, true);
         process.exitCode = 1;
-        process.exit();
+        safeExit();
         return;
       }
       if (!opts.all && !opts.chain) {
@@ -38885,7 +38962,7 @@ ${qr3}`;
         error(msg);
         if (opts.json) output({ error: msg }, true);
         process.exitCode = 1;
-        process.exit();
+        safeExit();
         return;
       }
       const creds = await ensureTrustSDK();
@@ -38912,11 +38989,14 @@ ${qr3}`;
         const holdings = await securityService.getTokenHoldings(assets);
         for (const h4 of holdings) {
           if (h4.tokens?.length) {
-            holdingsMap.set(h4.coin, h4.tokens.map((t) => ({
-              symbol: t.symbol ?? t.contract,
-              contract: t.contract,
-              decimals: t.decimals ?? 18
-            })));
+            holdingsMap.set(
+              h4.coin,
+              h4.tokens.map((t) => ({
+                symbol: t.symbol ?? t.contract,
+                contract: t.contract,
+                decimals: t.decimals ?? 18
+              }))
+            );
           }
         }
       } catch {
@@ -38935,11 +39015,14 @@ ${qr3}`;
           const retryHoldings = await retrySec.getTokenHoldings(retryAssets);
           for (const h4 of retryHoldings) {
             if (h4.tokens?.length) {
-              holdingsMap.set(h4.coin, h4.tokens.map((t) => ({
-                symbol: t.symbol ?? t.contract,
-                contract: t.contract,
-                decimals: t.decimals ?? 18
-              })));
+              holdingsMap.set(
+                h4.coin,
+                h4.tokens.map((t) => ({
+                  symbol: t.symbol ?? t.contract,
+                  contract: t.contract,
+                  decimals: t.decimals ?? 18
+                }))
+              );
             }
           }
         } catch {
@@ -38960,6 +39043,7 @@ ${qr3}`;
             if (knownTokens) {
               for (const [sym, addr] of Object.entries(knownTokens)) {
                 const resolved = resolveToken(sym, chainKey);
+                if (!resolved) continue;
                 tokenDefs.push({ symbol: sym, contract: addr, decimals: resolved.decimals });
               }
             }
@@ -38967,11 +39051,15 @@ ${qr3}`;
           const tokenResults = await Promise.all(
             tokenDefs.map(async (t) => {
               try {
-                const bal = await blockchainClient.getBalance(`c${chain2.coinId}_t${t.contract}`, address);
+                const bal = await blockchainClient.getBalance(
+                  `c${chain2.coinId}_t${t.contract}`,
+                  address
+                );
                 const rawBal = bal.total ?? bal.available ?? "0";
                 if (BigInt(rawBal) <= 0n) return null;
                 const human = fmtRaw(rawBal, t.decimals);
-                if (human && human !== "0.000000") return { symbol: t.symbol, contract: t.contract, balance: human };
+                if (human && human !== "0.000000")
+                  return { symbol: t.symbol, contract: t.contract, balance: human };
               } catch {
               }
               return null;
@@ -39000,7 +39088,9 @@ ${qr3}`;
           addressMap.set(a3.chainId, a3.address);
         }
         const results = [];
-        const chainEntries = chainKeys.map((k4) => ({ chainKey: k4, chain: getChainById2(k4), address: addressMap.get(k4) })).filter((e2) => !!e2.chain && !!e2.address);
+        const chainEntries = chainKeys.map((k4) => ({ chainKey: k4, chain: getChainById2(k4), address: addressMap.get(k4) })).filter(
+          (e2) => !!e2.chain && !!e2.address
+        );
         const settled = await Promise.allSettled(
           chainEntries.map(
             async ({ chainKey, chain: chain2, address }) => fetchChainBalance(chainKey, chain2, address, opts.tokens === false)
@@ -39010,7 +39100,10 @@ ${qr3}`;
           const result = settled[i2];
           if (result.status === "rejected") {
             const chainKey = chainEntries[i2].chainKey;
-            results.push({ chain: chainKey, error: result.reason instanceof Error ? result.reason.message : String(result.reason) });
+            results.push({
+              chain: chainKey,
+              error: result.reason instanceof Error ? result.reason.message : String(result.reason)
+            });
             continue;
           }
           const r3 = result.value;
@@ -39054,15 +39147,10 @@ ${qr3}`;
           error(msg);
           if (opts.json) output({ error: msg }, true);
           process.exitCode = 1;
-          process.exit();
+          safeExit();
           return;
         }
-        const result = await fetchChainBalance(
-          opts.chain,
-          chain2,
-          address,
-          opts.tokens === false
-        );
+        const result = await fetchChainBalance(opts.chain, chain2, address, opts.tokens === false);
         if (opts.json) {
           output(result, true);
         } else {
@@ -39086,7 +39174,7 @@ ${qr3}`;
       if (opts.json) output({ error: msg }, true);
       process.exitCode = 1;
     }
-    process.exit();
+    safeExit();
   });
   const keychain = wallet.command("keychain").description("Manage wallet password in OS keychain");
   keychain.command("save").description("Save wallet password to OS keychain").requiredOption("--password <password>", "Wallet password to store").action(async (opts) => {
@@ -39098,7 +39186,7 @@ ${qr3}`;
       error(err instanceof Error ? err.message : String(err));
       process.exitCode = 1;
     }
-    process.exit();
+    safeExit();
   });
   keychain.command("delete").description("Remove wallet password from OS keychain").action(async () => {
     try {
@@ -39109,13 +39197,14 @@ ${qr3}`;
       error(err instanceof Error ? err.message : String(err));
       process.exitCode = 1;
     }
-    process.exit();
+    safeExit();
   });
   keychain.command("check").description("Check if wallet password is stored in OS keychain").action(async () => {
     const kc2 = new KeychainManager();
     if (!kc2.isAvailable()) {
       warn("keytar not available on this system");
-      process.exit(0);
+      safeExit();
+      return;
     }
     const pw = await kc2.getWalletPassword();
     if (pw) {
@@ -39123,13 +39212,21 @@ ${qr3}`;
     } else {
       info("No wallet password found in OS keychain");
     }
-    process.exit();
+    safeExit();
   });
-  wallet.command("connect").description("Connect external wallet via WalletConnect").option("--project-id <id>", "WalletConnect project ID (or set WALLETCONNECT_PROJECT_ID)").option("--chains <list>", "Comma-separated CAIP-2 chain IDs", "eip155:1,eip155:56,eip155:137,eip155:8453,eip155:42161").option("--timeout <seconds>", "Connection timeout in seconds", "300").option("--json", "JSON output").action(async (opts) => {
+  wallet.command("connect").description("Connect external wallet via WalletConnect").option("--project-id <id>", "WalletConnect project ID (or set WALLETCONNECT_PROJECT_ID)").option(
+    "--chains <list>",
+    "Comma-separated CAIP-2 chain IDs",
+    "eip155:1,eip155:56,eip155:137,eip155:8453,eip155:42161"
+  ).option("--timeout <seconds>", "Connection timeout in seconds", "300").option("--json", "JSON output").action(async (opts) => {
     const projectId = opts.projectId || process.env.WALLETCONNECT_PROJECT_ID;
     if (!projectId) {
-      error("WalletConnect project ID required. Use --project-id or set WALLETCONNECT_PROJECT_ID");
-      process.exit(1);
+      error(
+        "WalletConnect project ID required. Use --project-id or set WALLETCONNECT_PROJECT_ID"
+      );
+      process.exitCode = 1;
+      safeExit();
+      return;
     }
     const provider = new WalletConnectProvider({ projectId });
     const chains = opts.chains.split(",").map((s2) => s2.trim()).filter(Boolean);
@@ -39145,13 +39242,21 @@ ${qr3}`;
     const timeoutMs = parseInt(opts.timeout, 10) * 1e3;
     const session = await provider.waitForSession(timeoutMs);
     if (opts.json) {
-      output({ connected: true, address: session.address, chainId: session.chainId, peer: session.peerName }, true);
+      output(
+        {
+          connected: true,
+          address: session.address,
+          chainId: session.chainId,
+          peer: session.peerName
+        },
+        true
+      );
     } else {
       success(`Connected to ${session.peerName || "wallet"}`);
       info(`  Address: ${session.address}`);
       info(`  Chain:   ${session.chainId}`);
     }
-    process.exit();
+    safeExit();
   });
   wallet.command("status").description("Check wallet configuration status").option("--json", "JSON output").action(async (opts) => {
     const store = new WalletConfigStore();
@@ -39177,17 +39282,28 @@ ${qr3}`;
     if (opts.json) {
       output(result, true);
     } else {
-      console.log(`  ${import_chalk5.default.dim("Wallet")}     ${exists ? import_chalk5.default.green("configured") : import_chalk5.default.yellow("not configured")}`);
+      console.log(
+        `  ${import_chalk5.default.dim("Wallet")}     ${exists ? import_chalk5.default.green("configured") : import_chalk5.default.yellow("not configured")}`
+      );
       if (createdAt) console.log(`  ${import_chalk5.default.dim("Created")}    ${createdAt}`);
-      console.log(`  ${import_chalk5.default.dim("Keychain")}   ${keychainHasPassword ? import_chalk5.default.green("password stored") : import_chalk5.default.yellow("no password")}`);
+      console.log(
+        `  ${import_chalk5.default.dim("Keychain")}   ${keychainHasPassword ? import_chalk5.default.green("password stored") : import_chalk5.default.yellow("no password")}`
+      );
       console.log(`  ${import_chalk5.default.dim("Chains")}     ${totalChains} supported`);
       if (addressCount !== void 0) console.log(`  ${import_chalk5.default.dim("Addresses")}  ${addressCount}`);
       if (!exists) info("\nRun `twak wallet create --password <pw>` to create a wallet.");
     }
   });
-  wallet.command("portfolio").description("Show portfolio balances and USD values across chains, including token holdings").option("--chains <list>", "Comma-separated chain keys (default: all EVM + major L1s)", "ethereum,base,bsc,polygon,arbitrum,optimism,avalanche,fantom,linea,scroll,zksync,blast,sonic,celo,aurora,solana,tron").option("--password <password>", "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)").option("--json", "JSON output").action(async (opts) => {
+  wallet.command("portfolio").description("Show portfolio balances and USD values across chains, including token holdings").option(
+    "--chains <list>",
+    "Comma-separated chain keys (default: all supported chains)",
+    Object.keys(CHAINS).join(",")
+  ).option(
+    "--password <password>",
+    "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
+  ).option("--json", "JSON output").action(async (opts) => {
     try {
-      await ensureTrustSDK();
+      const creds = await ensureTrustSDK();
       const password = await resolvePassword(opts);
       const provider = await AgentWalletProvider.fromStorage(password);
       const { getChainById: getChainById2 } = await Promise.resolve().then(() => (init_dist2(), dist_exports));
@@ -39203,6 +39319,15 @@ ${qr3}`;
         return [{ chainKey, chain: chain2, address: addrEntry.address }];
       });
       const suppress = (fn2) => fn2();
+      const withTimeout = (promise, ms3) => {
+        let timerId;
+        const timeout = new Promise((_2, reject) => {
+          timerId = setTimeout(() => reject(new Error(`timed out after ${ms3 / 1e3}s`)), ms3);
+        });
+        return Promise.race([promise, timeout]).finally(() => {
+          if (timerId !== void 0) clearTimeout(timerId);
+        });
+      };
       const pMap = async (items, fn2, concurrency) => {
         const results = new Array(items.length);
         let idx = 0;
@@ -39212,7 +39337,9 @@ ${qr3}`;
             results[i2] = await fn2(items[i2]);
           }
         };
-        await Promise.all(Array.from({ length: Math.min(concurrency, items.length) }, () => run()));
+        await Promise.all(
+          Array.from({ length: Math.min(concurrency, items.length) }, () => run())
+        );
         return results;
       };
       const toHuman = (raw, decimals) => {
@@ -39223,16 +39350,52 @@ ${qr3}`;
         const fracStr = fracPart.toString().padStart(decimals, "0").replace(/0+$/, "");
         return fracStr ? `${intPart}.${fracStr}` : intPart.toString();
       };
-      const holdingsAssets = chainEntries.map(({ chain: chain2, address }) => ({ coin: chain2.coinId, address }));
+      const holdingsAssets = chainEntries.map(
+        ({ chain: chain2, address }) => ({
+          coin: chain2.coinId,
+          address
+        })
+      );
       const [nativeResults, holdings] = await Promise.all([
-        pMap(chainEntries, async ({ chainKey, chain: chain2, address }) => {
-          try {
-            const balance = await suppress(() => blockchainClient.getBalance(`c${chain2.coinId}`, address));
-            return { chainKey, chain: chain2, address, balance };
-          } catch {
-            return { chainKey, chain: chain2, address, balance: null };
-          }
-        }, 5),
+        pMap(
+          chainEntries,
+          async ({
+            chainKey,
+            chain: chain2,
+            address
+          }) => {
+            try {
+              const balance = await withTimeout(
+                suppress(() => blockchainClient.getBalance(`c${chain2.coinId}`, address)),
+                15e3
+              );
+              if (!balance) {
+                return {
+                  chainKey,
+                  chain: chain2,
+                  address,
+                  balance: null,
+                  error: "empty response from SDK"
+                };
+              }
+              return { chainKey, chain: chain2, address, balance, error: void 0 };
+            } catch (e2) {
+              const code2 = e2 != null ? e2.code : void 0;
+              let msg;
+              if (code2 === 429) {
+                msg = "rate limited (429)";
+              } else if (e2 instanceof Error && e2.message && e2.message !== "null") {
+                msg = e2.message;
+              } else if (code2) {
+                msg = `HTTP ${code2}`;
+              } else {
+                msg = "unsupported or unavailable";
+              }
+              return { chainKey, chain: chain2, address, balance: null, error: msg };
+            }
+          },
+          5
+        ),
         (async () => {
           try {
             return await new SecurityService2(httpClient).getTokenHoldings(holdingsAssets);
@@ -39245,14 +39408,27 @@ ${qr3}`;
       for (const h4 of holdings) {
         if (h4.tokens?.length) holdingsMap.set(h4.coin, h4.tokens);
       }
+      if (holdingsMap.size === 0) {
+        try {
+          await registerWalletWithBackend(creds, provider);
+          const retryHoldings = await new SecurityService2(httpClient).getTokenHoldings(
+            holdingsAssets
+          );
+          for (const h4 of retryHoldings) {
+            if (h4.tokens?.length) holdingsMap.set(h4.coin, h4.tokens);
+          }
+        } catch {
+        }
+      }
       for (const { chainKey, chain: chain2 } of chainEntries) {
         const coinId = chain2.coinId;
         if (holdingsMap.has(coinId)) continue;
         const knownTokens = COMMON_TOKENS[chainKey];
         if (!knownTokens) continue;
-        const fallbackTokens = Object.entries(knownTokens).map(([sym, addr]) => {
+        const fallbackTokens = Object.entries(knownTokens).flatMap(([sym, addr]) => {
           const resolved = resolveToken(sym, chainKey);
-          return { contract: addr, decimals: resolved.decimals, symbol: sym };
+          if (!resolved) return [];
+          return [{ contract: addr, decimals: resolved.decimals, symbol: sym }];
         });
         holdingsMap.set(coinId, fallbackTokens);
       }
@@ -39260,28 +39436,45 @@ ${qr3}`;
       for (const { chainKey, chain: chain2, address } of chainEntries) {
         const tokens = holdingsMap.get(chain2.coinId) ?? [];
         for (const t of tokens) {
-          if (t.contract) tokenJobs.push({ chainKey, coinId: chain2.coinId, address, ...t });
+          if (t.contract)
+            tokenJobs.push({
+              chainKey,
+              coinId: chain2.coinId,
+              address,
+              ...t
+            });
         }
       }
-      const tokenBalances = await pMap(tokenJobs, async (job) => {
-        const fallback = job.balance ?? "0";
-        try {
-          const assetId = `c${job.coinId}_t${job.contract}`;
-          const bal = await suppress(() => blockchainClient.getBalance(assetId, job.address));
-          return { ...job, rawBalance: bal.total ?? bal.available ?? "0" };
-        } catch {
-          return { ...job, rawBalance: fallback };
-        }
-      }, 5);
-      const nativeAssetIds = nativeResults.map(({ chain: chain2 }) => `c${chain2.coinId}`);
+      const tokenBalances = await pMap(
+        tokenJobs,
+        async (job) => {
+          const fallback = job.balance ?? "0";
+          try {
+            const assetId = `c${job.coinId}_t${job.contract}`;
+            const bal = await withTimeout(
+              suppress(() => blockchainClient.getBalance(assetId, job.address)),
+              15e3
+            );
+            return { ...job, rawBalance: bal.total ?? bal.available ?? fallback };
+          } catch {
+            return { ...job, rawBalance: fallback };
+          }
+        },
+        5
+      );
+      const nativeAssetIds = nativeResults.map(
+        ({ chain: chain2 }) => `c${chain2.coinId}`
+      );
       const nonZeroTokens = tokenBalances.filter((t) => {
         const dec = t.decimals ?? 18;
         return toHuman(t.rawBalance, dec) !== "0";
       });
-      const tokenAssetIds = nonZeroTokens.map((t) => `c${t.coinId}_t${t.contract}`);
+      const tokenAssetIds = nonZeroTokens.map(
+        (t) => `c${t.coinId}_t${t.contract}`
+      );
       const priceMap = /* @__PURE__ */ new Map();
       try {
-        const priceResp = await httpClient.market("POST", "/v1/tickers", {
+        const priceResp = await httpClient.market("POST", "/v2/market/tickers", {
           currency: "USD",
           assets: [.../* @__PURE__ */ new Set([...nativeAssetIds, ...tokenAssetIds])]
         });
@@ -39291,13 +39484,33 @@ ${qr3}`;
       } catch {
       }
       const rows = [];
-      for (const { chainKey, chain: chain2, address, balance } of nativeResults) {
+      const failedChains = [];
+      for (const { chainKey, chain: chain2, address, balance, error: fetchError } of nativeResults) {
         const c3 = chain2;
+        if (fetchError) {
+          failedChains.push(`${chainKey} (${fetchError})`);
+          rows.push({
+            chain: chainKey,
+            type: "native",
+            symbol: c3.symbol,
+            address,
+            balance: "--",
+            usdValue: null
+          });
+          continue;
+        }
         const price = priceMap.get(`c${c3.coinId}`) ?? null;
         const rawTotal = balance?.total ?? balance?.available ?? "0";
         const humanAmount = toHuman(rawTotal, c3.decimals);
         const usdValue = price !== null ? parseFloat((parseFloat(humanAmount) * price).toFixed(2)) : null;
-        rows.push({ chain: chainKey, type: "native", symbol: c3.symbol, address, balance: humanAmount, usdValue });
+        rows.push({
+          chain: chainKey,
+          type: "native",
+          symbol: c3.symbol,
+          address,
+          balance: humanAmount,
+          usdValue
+        });
       }
       for (const t of tokenBalances) {
         const dec = t.decimals ?? 18;
@@ -39306,22 +39519,39 @@ ${qr3}`;
         const tokenAssetId = `c${t.coinId}_t${t.contract}`;
         const tokenPrice = priceMap.get(tokenAssetId) ?? null;
         const usdValue = tokenPrice !== null ? parseFloat((parseFloat(humanAmount) * tokenPrice).toFixed(2)) : null;
-        rows.push({ chain: t.chainKey, type: "token", symbol: t.symbol ?? t.contract, address: t.address, contract: t.contract, balance: humanAmount, usdValue });
+        rows.push({
+          chain: t.chainKey,
+          type: "token",
+          symbol: t.symbol ?? t.contract,
+          address: t.address,
+          contract: t.contract,
+          balance: humanAmount,
+          usdValue
+        });
       }
       if (opts.json) {
+        if (failedChains.length > 0) {
+          warn(`Balance unavailable for: ${failedChains.join(", ")}`);
+        }
         output(rows, true);
       } else {
-        const totalUsd = rows.reduce((sum, r3) => sum + (typeof r3.usdValue === "number" ? r3.usdValue : 0), 0);
+        const totalUsd = rows.reduce(
+          (sum, r3) => sum + (typeof r3.usdValue === "number" ? r3.usdValue : 0),
+          0
+        );
         console.log("Chain        Type    Symbol            Balance               USD");
         console.log("\u2500".repeat(72));
         for (const r3 of rows) {
-          const usd = r3.usdValue !== null ? `$${r3.usdValue.toFixed(2)}` : "";
+          const usd = r3.balance === "--" ? "" : r3.usdValue !== null ? `$${r3.usdValue.toFixed(2)}` : "";
           console.log(
             `${String(r3.chain).padEnd(12)} ${String(r3.type).padEnd(7)} ${String(r3.symbol).padEnd(17)} ${String(r3.balance).padEnd(20)} ${usd}`
           );
         }
         console.log("\u2500".repeat(72));
         console.log(`Total USD: $${totalUsd.toFixed(2)}`);
+        if (failedChains.length > 0) {
+          warn(`Balance unavailable for: ${failedChains.join(", ")}`);
+        }
       }
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
@@ -39329,9 +39559,12 @@ ${qr3}`;
       if (opts.json) output({ error: msg }, true);
       process.exitCode = 1;
     }
-    process.exit();
+    safeExit();
   });
-  wallet.command("sign-message").description("Sign a message with the agent wallet").requiredOption("--chain <key>", "Chain key (e.g., ethereum, solana)").requiredOption("--message <text>", "Message to sign").option("--password <password>", "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)").option("--json", "JSON output").action(async (opts) => {
+  wallet.command("sign-message").description("Sign a message with the agent wallet").requiredOption("--chain <key>", "Chain key (e.g., ethereum, solana)").requiredOption("--message <text>", "Message to sign").option(
+    "--password <password>",
+    "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
+  ).option("--json", "JSON output").action(async (opts) => {
     try {
       await ensureTrustSDK();
       const password = await resolvePassword(opts);
@@ -39345,7 +39578,7 @@ ${qr3}`;
       if (opts.json) output({ error: msg }, true);
       process.exitCode = 1;
     }
-    process.exit();
+    safeExit();
   });
   wallet.command("register").description("Register wallet addresses with Trust Wallet backend (enables token holdings)").option("--password <password>", "Wallet password").option("--json", "JSON output").action(async (opts) => {
     try {
@@ -39362,7 +39595,7 @@ ${qr3}`;
       if (opts.json) output({ error: msg }, true);
       process.exitCode = 1;
     }
-    process.exit();
+    safeExit();
   });
 }
 
@@ -39374,6 +39607,7 @@ init_dist5();
 // ../swap/dist/index.mjs
 init_dist2();
 init_dist2();
+init_dist2();
 var SwapClient = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
@@ -39520,6 +39754,26 @@ var SwapClient = class {
     }
   }
 };
+var MAX_RETRIES = 3;
+var BASE_DELAY_MS = 3e3;
+function isRateLimited(err) {
+  return err instanceof TwakApiError && err.statusCode === 429;
+}
+function sleep(ms3) {
+  return new Promise((r3) => setTimeout(r3, ms3));
+}
+async function withRetry(fn2, onRetry) {
+  for (let attempt = 0; ; attempt++) {
+    try {
+      return await fn2();
+    } catch (err) {
+      if (!isRateLimited(err) || attempt >= MAX_RETRIES) throw err;
+      const delay = BASE_DELAY_MS * Math.pow(2, attempt);
+      onRetry?.(attempt + 1, delay);
+      await sleep(delay);
+    }
+  }
+}
 var SwapExecutor = class {
   constructor(swapClient, walletProvider, options = {}) {
     this.swapClient = swapClient;
@@ -39532,7 +39786,10 @@ var SwapExecutor = class {
   async execute(params) {
     const address = await this.walletProvider.getAddress(params.fromChain);
     const fromTokenInfo = resolveToken(params.fromToken, params.fromChain);
+    if (!fromTokenInfo)
+      throw new Error(`Unknown token: ${params.fromToken} on ${params.fromChain}`);
     const toTokenInfo = resolveToken(params.toToken, params.toChain);
+    if (!toTokenInfo) throw new Error(`Unknown token: ${params.toToken} on ${params.toChain}`);
     const parsedAmount = parseAmount(params.amount, fromTokenInfo.decimals);
     const fromCoinId = getChainById(params.fromChain)?.coinId;
     const toCoinId = getChainById(params.toChain)?.coinId;
@@ -39541,40 +39798,65 @@ var SwapExecutor = class {
     if (params.toChain !== params.fromChain) {
       destinationAddress = await this.walletProvider.getAddress(params.toChain);
     }
-    const quote = await this.swapClient.getQuote({
-      fromChain: params.fromChain,
-      fromToken: fromTokenInfo.address,
-      toChain: params.toChain,
-      toToken: toTokenInfo.address,
-      amount: parsedAmount,
-      walletAddress: address,
-      destinationAddress,
-      slippage: params.slippage,
-      fromDomainId: fromCoinId ? domains.get(fromCoinId) : void 0,
-      toDomainId: toCoinId ? domains.get(toCoinId) : void 0
-    });
+    const quote = await withRetry(
+      () => this.swapClient.getQuote({
+        fromChain: params.fromChain,
+        fromToken: fromTokenInfo.address,
+        toChain: params.toChain,
+        toToken: toTokenInfo.address,
+        amount: parsedAmount,
+        walletAddress: address,
+        destinationAddress,
+        slippage: params.slippage,
+        fromDomainId: fromCoinId ? domains.get(fromCoinId) : void 0,
+        toDomainId: toCoinId ? domains.get(toCoinId) : void 0
+      })
+    );
     if (quote.routes.length === 0) {
-      return { success: false, route: { id: "", steps: [], warnings: ["No routes found"], expirationDate: "", totalOutput: "0" }, error: "No swap routes found" };
+      return {
+        success: false,
+        route: {
+          id: "",
+          steps: [],
+          warnings: ["No routes found"],
+          expirationDate: "",
+          totalOutput: "0"
+        },
+        error: "No swap routes found"
+      };
     }
     const route = quote.routes[0];
     const firstStep = route.steps[0];
     const lastStep = route.steps[route.steps.length - 1];
     const inputAmt = formatAmount(firstStep.from.amount, firstStep.from.asset.metadata.decimals);
     const outputAmt = formatAmount(lastStep.to.amount, lastStep.to.asset.metadata.decimals);
-    this.log(`Swapping ${inputAmt} ${firstStep.from.asset.metadata.symbol} -> ${outputAmt} ${lastStep.to.asset.metadata.symbol} via ${route.steps.map((s2) => s2.provider.name).join(" -> ")}`);
+    this.log(
+      `Swapping ${inputAmt} ${firstStep.from.asset.metadata.symbol} -> ${outputAmt} ${lastStep.to.asset.metadata.symbol} via ${route.steps.map((s2) => s2.provider.name).join(" -> ")}`
+    );
     const chainConfig = getChainById(params.fromChain);
-    const transactions = await this.swapClient.getSwapTransactions(route);
+    const transactions = await withRetry(() => this.swapClient.getSwapTransactions(route));
+    let approvalTxHash;
     try {
       let txHash = "";
       for (const txData of transactions) {
         const txType = txData.transaction.type;
         const isApproval = txType === "approval" || txType === "revokeApproval";
         if (isApproval) {
-          this.log(txType === "revokeApproval" ? "Revoking prior approval..." : "Sending token approval...");
+          this.log(
+            txType === "revokeApproval" ? "Revoking prior approval..." : "Sending token approval..."
+          );
         }
         txHash = await this.sendTransaction(txData, chainConfig, params.fromChain);
-        this.log(`${isApproval ? "Approval" : "Swap"} tx: ${getExplorerTxUrl(params.fromChain, txHash)}`);
-        await this.pollForConfirmation(params.fromChain, address, txHash, isApproval ? 6e4 : 12e4);
+        if (isApproval) approvalTxHash = txHash;
+        this.log(
+          `${isApproval ? "Approval" : "Swap"} tx: ${getExplorerTxUrl(params.fromChain, txHash)}`
+        );
+        await this.pollForConfirmation(
+          params.fromChain,
+          address,
+          txHash,
+          isApproval ? 6e4 : 12e4
+        );
       }
       return {
         success: true,
@@ -39583,7 +39865,10 @@ var SwapExecutor = class {
         explorerUrl: getExplorerTxUrl(params.fromChain, txHash)
       };
     } catch (err) {
-      const msg = err instanceof Error ? err.message : "Unknown error";
+      let msg = err instanceof Error ? err.message : "Unknown error";
+      if (approvalTxHash) {
+        msg += `. Approval was sent (tx: ${approvalTxHash}). Check allowance before retrying.`;
+      }
       return { success: false, route, error: msg };
     }
   }
@@ -39606,20 +39891,28 @@ var SwapExecutor = class {
   }
   async pollForConfirmation(chainKey, address, hash, timeoutMs) {
     const blockchainClient = this.walletProvider.getBlockchainClient?.();
-    if (!blockchainClient) return;
+    if (!blockchainClient)
+      throw new Error(
+        "Wallet provider does not support transaction status lookup; cannot confirm transaction"
+      );
     const deadline = Date.now() + timeoutMs;
     while (Date.now() < deadline) {
       await new Promise((r3) => setTimeout(r3, 2e3));
       try {
         const status = await blockchainClient.findTransactionStatus(chainKey, address, hash);
         if (status.confirmed) return;
-        if (status.failed) throw new Error(`Transaction failed: ${status.error || "unknown error"}`);
+        if (status.failed)
+          throw new Error(`Transaction failed: ${status.error || "unknown error"}`);
       } catch (e2) {
         const err = e2 instanceof Error ? e2 : new Error(String(e2));
         if (err.message.startsWith("Transaction failed")) throw err;
+        if (!err.message.includes("not found") && !err.message.includes("Transaction not found"))
+          throw err;
       }
     }
-    throw new Error(`Transaction ${hash} was not confirmed within ${Math.round(timeoutMs / 1e3)}s`);
+    throw new Error(
+      `Transaction ${hash} was not confirmed within ${Math.round(timeoutMs / 1e3)}s`
+    );
   }
 };
 
@@ -39648,7 +39941,7 @@ function registerTransferCommand(program3) {
         error(msg);
         if (opts.json) output({ error: msg }, true);
         process.exitCode = 1;
-        process.exit(0);
+        safeExit();
         return;
       }
       const resolvedTo = await resolveAddressOrName(opts.to);
@@ -39659,7 +39952,7 @@ function registerTransferCommand(program3) {
           error(msg);
           if (opts.json) output({ error: msg }, true);
           process.exitCode = 1;
-          process.exit();
+          safeExit();
           return;
         }
       }
@@ -39677,7 +39970,7 @@ function registerTransferCommand(program3) {
           error(msg);
           if (opts.json) output({ error: msg }, true);
           process.exitCode = 1;
-          process.exit();
+          safeExit();
           return;
         }
         const parsedAmount = parseFloat(opts.amount);
@@ -39686,11 +39979,16 @@ function registerTransferCommand(program3) {
           error(msg);
           if (opts.json) output({ error: msg }, true);
           process.exitCode = 1;
-          process.exit();
+          safeExit();
           return;
         }
         try {
           const tokenInfo = resolveToken(opts.token, chainKey);
+          if (!tokenInfo) {
+            error(`Unknown token: ${opts.token} on ${chainKey}. Use a contract address (0x...) or a supported symbol.`);
+            process.exitCode = 1;
+            return;
+          }
           const swapClient = new SwapClient(httpClient);
           const price = await swapClient.getTokenPrice(chainKey, tokenInfo.address);
           if (price && price > 0) {
@@ -39700,7 +39998,7 @@ function registerTransferCommand(program3) {
               error(msg);
               if (opts.json) output({ error: msg }, true);
               process.exitCode = 1;
-              process.exit();
+              safeExit();
               return;
             }
             if (usdValue > 1e3) {
@@ -39739,7 +40037,7 @@ function registerTransferCommand(program3) {
       if (opts.json) output({ error: msg }, true);
       process.exitCode = 1;
     }
-    process.exit();
+    safeExit();
   });
 }
 
@@ -39749,250 +40047,300 @@ init_dist4();
 var MAX_SLIPPAGE_PCT = 50;
 var WARN_SLIPPAGE_PCT = 5;
 function registerSwapCommand(program3) {
-  program3.command("swap").description("Quote or execute a token swap").argument("<amountOrFrom>", "Amount to swap, or source token when using --usd").argument("<fromOrTo>", "Source token, or destination token when using --usd").argument("[to]", "Destination token (omit when using --usd with 2 args)").option("--chain <id>", "Chain", "ethereum").option("--to-chain <id>", "Destination chain (for cross-chain swaps)").option("--slippage <pct>", "Slippage tolerance %", "1").option("--usd <amount>", "Swap a USD-equivalent amount of the source token").option("--quote-only", "Get quote without executing").option("--password <password>", "Wallet password (required to execute)").option("--json", "JSON output").action(async (amountOrFrom, fromOrTo, toOrUndefined, opts) => {
-    try {
-      let amount;
-      let from8;
-      let to3;
-      if (toOrUndefined) {
-        amount = amountOrFrom;
-        from8 = fromOrTo;
-        to3 = toOrUndefined;
-      } else {
-        from8 = amountOrFrom;
-        to3 = fromOrTo;
-      }
-      if (!amount && !opts.usd) {
-        error("Either <amount> or --usd <amount> is required");
-        return;
-      }
-      if (amount && opts.usd) {
-        error("Provide either <amount> or --usd, not both");
-        return;
-      }
-      const slippage = parseFloat(opts.slippage);
-      if (isNaN(slippage) || slippage <= 0) {
-        error("--slippage must be a positive number");
-        process.exitCode = 1;
-        return;
-      }
-      if (slippage > MAX_SLIPPAGE_PCT) {
-        error(`Slippage ${slippage}% exceeds maximum allowed (${MAX_SLIPPAGE_PCT}%). Reduce --slippage to proceed.`);
-        process.exitCode = 1;
-        return;
-      }
-      if (slippage > WARN_SLIPPAGE_PCT) {
-        warn(`High slippage tolerance: ${slippage}%. You may receive significantly fewer tokens than quoted.`);
-      }
-      const client = await getClient();
-      const swapClient = new SwapClient(client);
-      const detectChain = (token, fallback) => {
-        const m2 = token.match(/^c(\d+)/i);
-        if (m2) {
-          const key = coinTypeToChainKey(parseInt(m2[1]));
-          if (!key) throw new Error(`Unknown coin ID ${m2[1]} in token "${token}"`);
-          return key;
-        }
-        return fallback;
-      };
-      const fromChain = detectChain(from8, opts.chain);
-      const toChain = opts.toChain ? detectChain(to3, opts.toChain) : fromChain;
-      const fromInfo = resolveToken(from8, fromChain);
-      const toInfo = resolveToken(to3, toChain);
-      let resolvedAmount = amount;
-      if (opts.usd) {
-        const usdAmount = parseFloat(opts.usd);
-        if (isNaN(usdAmount) || usdAmount <= 0) {
-          error("--usd amount must be a positive number");
+  program3.command("swap").description("Quote or execute a token swap").argument("<amountOrFrom>", "Amount to swap, or source token when using --usd").argument("<fromOrTo>", "Source token, or destination token when using --usd").argument("[to]", "Destination token (omit when using --usd with 2 args)").option("--chain <id>", "Chain", "ethereum").option("--to-chain <id>", "Destination chain (for cross-chain swaps)").option("--slippage <pct>", "Slippage tolerance %", "1").option("--usd <amount>", "Swap a USD-equivalent amount of the source token").option("--quote-only", "Get quote without executing").option("--password <password>", "Wallet password (required to execute)").option("--json", "JSON output").action(
+    async (amountOrFrom, fromOrTo, toOrUndefined, opts) => {
+      try {
+        let amount;
+        let from8;
+        let to3;
+        if (toOrUndefined) {
+          amount = amountOrFrom;
+          from8 = fromOrTo;
+          to3 = toOrUndefined;
+        } else {
+          from8 = amountOrFrom;
+          to3 = fromOrTo;
+        }
+        if (!amount && !opts.usd) {
+          error("Either <amount> or --usd <amount> is required");
           return;
         }
-        const price = await swapClient.getTokenPrice(fromChain, fromInfo.address);
-        if (!price) {
-          error(`Unable to fetch price for ${from8} on ${fromChain}`);
+        if (amount && opts.usd) {
+          error("Provide either <amount> or --usd, not both");
           return;
         }
-        resolvedAmount = (usdAmount / price).toFixed(fromInfo.decimals);
-        info(`$${usdAmount} USD \u2248 ${resolvedAmount} ${from8.toUpperCase()} (@ $${price})`);
-      }
-      const parsedAmount = parseAmount(resolvedAmount, fromInfo.decimals);
-      const needsWallet = !opts.quoteOnly;
-      let walletAddress = getChainById(fromChain)?.sampleAccount || "0x0000000000000000000000000000000000000000";
-      let provider = null;
-      let destinationAddress;
-      let amberDomains = /* @__PURE__ */ new Map();
-      if (needsWallet) {
-        await ensureTrustSDK();
-        const password = await resolvePassword(opts);
-        provider = await AgentWalletProvider.fromStorage(password);
-        walletAddress = await provider.getAddress(fromChain);
-        if (toChain !== fromChain) {
-          destinationAddress = await provider.getAddress(toChain);
+        if (amount) {
+          const n4 = parseFloat(amount);
+          if (isNaN(n4) || n4 <= 0) {
+            error("Amount must be greater than 0");
+            process.exitCode = 1;
+            return;
+          }
         }
-        amberDomains = await getAmberDomainsByCoinId();
-      }
-      const fromCoinId = getChainById(fromChain)?.coinId;
-      const toCoinId = getChainById(toChain)?.coinId;
-      const quote = await swapClient.getQuote({
-        fromChain,
-        fromToken: fromInfo.address,
-        toChain,
-        toToken: toInfo.address,
-        amount: parsedAmount,
-        walletAddress,
-        destinationAddress,
-        slippage: opts.slippage,
-        fromDomainId: fromCoinId ? amberDomains.get(fromCoinId) : void 0,
-        toDomainId: toCoinId ? amberDomains.get(toCoinId) : void 0
-      });
-      if (quote.routes.length === 0) {
-        error("No swap routes found");
-        if (opts.json) output({ error: "No routes found" }, true);
-        return;
-      }
-      const route = quote.routes[0];
-      const firstStep = route.steps[0];
-      const lastStep = route.steps[route.steps.length - 1];
-      const inputAmt = formatAmount(firstStep.from.amount, firstStep.from.asset.metadata.decimals);
-      const outputAmt = formatAmount(lastStep.to.amount, lastStep.to.asset.metadata.decimals);
-      const minAmountOut = lastStep.to.minAmountOut;
-      const minReceivedAmt = minAmountOut ? formatAmount(minAmountOut, lastStep.to.asset.metadata.decimals) : null;
-      const networkFees = route.steps.filter((s2) => s2.networkFee).map((s2) => {
-        const fee = s2.networkFee;
-        const feeAmt = formatAmount(fee.amount, fee.asset.metadata.decimals);
-        return `${feeAmt} ${fee.asset.metadata.symbol}`;
-      });
-      const quoteData = {
-        input: `${inputAmt} ${firstStep.from.asset.metadata.symbol}`,
-        output: `${outputAmt} ${lastStep.to.asset.metadata.symbol}`,
-        ...minReceivedAmt ? { minReceived: `${minReceivedAmt} ${lastStep.to.asset.metadata.symbol}` } : {},
-        provider: route.steps.map((s2) => s2.provider.name).join(" \u2192 "),
-        priceImpact: firstStep.priceImpact,
-        ...networkFees.length > 0 ? { networkFee: networkFees.join(" + ") } : {},
-        ...route.steps.length > 1 ? { steps: route.steps.length } : {}
-      };
-      if (opts.quoteOnly) {
-        output(quoteData, opts.json);
-        return;
-      }
-      info(`Swapping ${quoteData.input} \u2192 ${quoteData.output} via ${quoteData.provider}...`);
-      const chainConfig = getChainById(fromChain);
-      const transactions = await swapClient.getSwapTransactions(route);
-      let txHash = "";
-      const blockchainClient = provider.getBlockchainClient();
-      const hasApprovalTx = transactions.some((t) => t.transaction.type === "approval");
-      if (!hasApprovalTx && chainConfig?.isEVM) {
-        const stepApproval = firstStep.approval;
-        if (stepApproval && stepApproval.operatorAddress) {
-          const fromAssetAddr = firstStep.from.asset.address;
-          const isNative = !fromAssetAddr || fromAssetAddr === NATIVE_TOKEN_ADDRESS;
-          if (!isNative && chainConfig.coinId) {
-            const assetId = formatTokenId(chainConfig.coinId, fromAssetAddr);
-            try {
-              const allowance = await blockchainClient.getAllowance({
-                assetId,
-                owner: walletAddress,
-                spender: stepApproval.operatorAddress
-              });
-              const requiredAmount = BigInt(stepApproval.minAmount || parsedAmount);
-              if (allowance < requiredAmount) {
-                info("Sending token approval...");
-                const hdWallet = provider.getSigner().getHDWallet();
-                const approveResult = await blockchainClient.approve({
+        const slippage = parseFloat(opts.slippage);
+        if (isNaN(slippage) || slippage <= 0) {
+          error("--slippage must be a positive number");
+          process.exitCode = 1;
+          return;
+        }
+        if (slippage > MAX_SLIPPAGE_PCT) {
+          error(
+            `Slippage ${slippage}% exceeds maximum allowed (${MAX_SLIPPAGE_PCT}%). Reduce --slippage to proceed.`
+          );
+          process.exitCode = 1;
+          return;
+        }
+        if (slippage > WARN_SLIPPAGE_PCT) {
+          warn(
+            `High slippage tolerance: ${slippage}%. You may receive significantly fewer tokens than quoted.`
+          );
+        }
+        const client = await getClient();
+        const swapClient = new SwapClient(client);
+        const detectChain = (token, fallback) => {
+          const m2 = token.match(/^c(\d+)/i);
+          if (m2) {
+            const key = coinTypeToChainKey(parseInt(m2[1]));
+            if (!key) throw new Error(`Unknown coin ID ${m2[1]} in token "${token}"`);
+            return key;
+          }
+          return fallback;
+        };
+        const fromChain = detectChain(from8, opts.chain);
+        const toChain = opts.toChain ? detectChain(to3, opts.toChain) : fromChain;
+        const fromInfo = resolveToken(from8, fromChain);
+        if (!fromInfo) {
+          error(
+            `Unknown token: ${from8} on ${fromChain}. Use a contract address (0x...) or a supported symbol.`
+          );
+          process.exitCode = 1;
+          return;
+        }
+        const toInfo = resolveToken(to3, toChain);
+        if (!toInfo) {
+          error(
+            `Unknown token: ${to3} on ${toChain}. Use a contract address (0x...) or a supported symbol.`
+          );
+          process.exitCode = 1;
+          return;
+        }
+        let resolvedAmount = amount;
+        if (opts.usd) {
+          const usdAmount = parseFloat(opts.usd);
+          if (isNaN(usdAmount) || usdAmount <= 0) {
+            error("--usd amount must be a positive number");
+            return;
+          }
+          const price = await swapClient.getTokenPrice(fromChain, fromInfo.address);
+          if (!price) {
+            error(`Unable to fetch price for ${from8} on ${fromChain}`);
+            return;
+          }
+          resolvedAmount = (usdAmount / price).toFixed(fromInfo.decimals);
+          info(`$${usdAmount} USD \u2248 ${resolvedAmount} ${from8.toUpperCase()} (@ $${price})`);
+        }
+        const parsedAmount = parseAmount(resolvedAmount, fromInfo.decimals);
+        const needsWallet = !opts.quoteOnly;
+        let walletAddress = getChainById(fromChain)?.sampleAccount || "0x0000000000000000000000000000000000000000";
+        let provider = null;
+        let destinationAddress;
+        let amberDomains = /* @__PURE__ */ new Map();
+        if (needsWallet) {
+          await ensureTrustSDK();
+          const password = await resolvePassword(opts);
+          provider = await AgentWalletProvider.fromStorage(password);
+          walletAddress = await provider.getAddress(fromChain);
+          if (toChain !== fromChain) {
+            destinationAddress = await provider.getAddress(toChain);
+          }
+          amberDomains = await getAmberDomainsByCoinId();
+        }
+        const fromCoinId = getChainById(fromChain)?.coinId;
+        const toCoinId = getChainById(toChain)?.coinId;
+        const quote = await swapClient.getQuote({
+          fromChain,
+          fromToken: fromInfo.address,
+          toChain,
+          toToken: toInfo.address,
+          amount: parsedAmount,
+          walletAddress,
+          destinationAddress,
+          slippage: opts.slippage,
+          fromDomainId: fromCoinId ? amberDomains.get(fromCoinId) : void 0,
+          toDomainId: toCoinId ? amberDomains.get(toCoinId) : void 0
+        });
+        if (quote.routes.length === 0) {
+          error("No swap routes found");
+          if (opts.json) output({ error: "No routes found" }, true);
+          return;
+        }
+        const route = quote.routes[0];
+        const firstStep = route.steps[0];
+        const lastStep = route.steps[route.steps.length - 1];
+        const inputAmt = formatAmount(
+          firstStep.from.amount,
+          firstStep.from.asset.metadata.decimals
+        );
+        const outputAmt = formatAmount(lastStep.to.amount, lastStep.to.asset.metadata.decimals);
+        const minAmountOut = lastStep.to.minAmountOut;
+        const minReceivedAmt = minAmountOut ? formatAmount(minAmountOut, lastStep.to.asset.metadata.decimals) : null;
+        const networkFees = route.steps.filter((s2) => s2.networkFee).map((s2) => {
+          const fee = s2.networkFee;
+          const feeAmt = formatAmount(fee.amount, fee.asset.metadata.decimals);
+          return `${feeAmt} ${fee.asset.metadata.symbol}`;
+        });
+        const quoteData = {
+          input: `${inputAmt} ${firstStep.from.asset.metadata.symbol}`,
+          output: `${outputAmt} ${lastStep.to.asset.metadata.symbol}`,
+          ...minReceivedAmt ? { minReceived: `${minReceivedAmt} ${lastStep.to.asset.metadata.symbol}` } : {},
+          provider: route.steps.map((s2) => s2.provider.name).join(" \u2192 "),
+          priceImpact: firstStep.priceImpact,
+          ...networkFees.length > 0 ? { networkFee: networkFees.join(" + ") } : {},
+          ...route.steps.length > 1 ? { steps: route.steps.length } : {}
+        };
+        if (opts.quoteOnly) {
+          output(quoteData, opts.json);
+          return;
+        }
+        info(`Swapping ${quoteData.input} \u2192 ${quoteData.output} via ${quoteData.provider}...`);
+        const chainConfig = getChainById(fromChain);
+        const transactions = await swapClient.getSwapTransactions(route);
+        let txHash = "";
+        const blockchainClient = provider.getBlockchainClient();
+        const hasApprovalTx = transactions.some((t) => t.transaction.type === "approval");
+        if (!hasApprovalTx && chainConfig?.isEVM) {
+          const stepApproval = firstStep.approval;
+          if (stepApproval && stepApproval.operatorAddress) {
+            const fromAssetAddr = firstStep.from.asset.address;
+            const isNative = !fromAssetAddr || fromAssetAddr === NATIVE_TOKEN_ADDRESS;
+            if (!isNative && chainConfig.coinId) {
+              const assetId = formatTokenId(chainConfig.coinId, fromAssetAddr);
+              try {
+                const allowance = await blockchainClient.getAllowance({
                   assetId,
-                  spender: stepApproval.operatorAddress,
-                  amount: requiredAmount.toString(),
-                  hdWallet
+                  owner: walletAddress,
+                  spender: stepApproval.operatorAddress
                 });
-                info(`Approval tx: ${getExplorerTxUrl(fromChain, approveResult.hash)}`);
-                const approvalDeadline = Date.now() + 6e4;
-                while (Date.now() < approvalDeadline) {
-                  await new Promise((r3) => setTimeout(r3, 2e3));
-                  try {
-                    const status = await blockchainClient.findTransactionStatus(fromChain, walletAddress, approveResult.hash);
-                    if (status.confirmed) break;
-                    if (status.failed) throw new Error("Approval transaction failed");
-                  } catch (e2) {
-                    const err = e2 instanceof Error ? e2 : new Error(String(e2));
-                    if (err.message.startsWith("Approval transaction failed")) throw err;
+                const requiredAmount = BigInt(stepApproval.minAmount || parsedAmount);
+                if (allowance < requiredAmount) {
+                  info("Sending token approval...");
+                  const hdWallet = provider.getSigner().getHDWallet();
+                  const approveResult = await blockchainClient.approve({
+                    assetId,
+                    spender: stepApproval.operatorAddress,
+                    amount: requiredAmount.toString(),
+                    hdWallet
+                  });
+                  info(`Approval tx: ${getExplorerTxUrl(fromChain, approveResult.hash)}`);
+                  const approvalDeadline = Date.now() + 6e4;
+                  while (Date.now() < approvalDeadline) {
+                    await new Promise((r3) => setTimeout(r3, 2e3));
+                    try {
+                      const status = await blockchainClient.findTransactionStatus(
+                        fromChain,
+                        walletAddress,
+                        approveResult.hash
+                      );
+                      if (status.confirmed) break;
+                      if (status.failed) throw new Error("Approval transaction failed");
+                    } catch (e2) {
+                      const err = e2 instanceof Error ? e2 : new Error(String(e2));
+                      if (err.message.startsWith("Approval transaction failed")) throw err;
+                    }
                   }
                 }
+              } catch (e2) {
+                const msg = e2 instanceof Error ? e2.message : String(e2);
+                if (msg.includes("insufficient funds")) {
+                  throw new Error(
+                    `Insufficient ${chainConfig?.symbol || "native token"} for approval gas. Fund your wallet with ${chainConfig?.symbol || "native tokens"} first.`
+                  );
+                }
+                if (msg.includes("failed")) throw e2;
+                info(`Warning: could not check/send approval: ${msg}`);
               }
-            } catch (e2) {
-              const msg = e2 instanceof Error ? e2.message : String(e2);
-              if (msg.includes("insufficient funds")) {
-                throw new Error(`Insufficient ${chainConfig?.symbol || "native token"} for approval gas. Fund your wallet with ${chainConfig?.symbol || "native tokens"} first.`);
-              }
-              if (msg.includes("failed")) throw e2;
-              info(`Warning: could not check/send approval: ${msg}`);
             }
           }
         }
-      }
-      const pollForConfirmation = async (hash, timeoutMs) => {
-        const deadline = Date.now() + timeoutMs;
-        while (Date.now() < deadline) {
-          await new Promise((r3) => setTimeout(r3, 2e3));
-          try {
-            const status = await blockchainClient.findTransactionStatus(fromChain, walletAddress, hash);
-            if (status.confirmed) return;
-            if (status.failed) throw new Error(`Transaction failed: ${status.error || "unknown error"}`);
-          } catch (e2) {
-            const err = e2 instanceof Error ? e2 : new Error(String(e2));
-            if (err.message.startsWith("Transaction failed")) throw err;
-            if (!err.message.includes("not found") && !err.message.includes("Transaction not found")) {
-              info(`Warning: tx status check error (will retry): ${err.message}`);
+        const pollForConfirmation = async (hash, timeoutMs) => {
+          const deadline = Date.now() + timeoutMs;
+          while (Date.now() < deadline) {
+            await new Promise((r3) => setTimeout(r3, 2e3));
+            try {
+              const status = await blockchainClient.findTransactionStatus(
+                fromChain,
+                walletAddress,
+                hash
+              );
+              if (status.confirmed) return;
+              if (status.failed)
+                throw new Error(`Transaction failed: ${status.error || "unknown error"}`);
+            } catch (e2) {
+              const err = e2 instanceof Error ? e2 : new Error(String(e2));
+              if (err.message.startsWith("Transaction failed")) throw err;
+              if (!err.message.includes("not found") && !err.message.includes("Transaction not found")) {
+                info(`Warning: tx status check error (will retry): ${err.message}`);
+              }
             }
           }
+          throw new Error(
+            `Transaction ${hash} was not confirmed within ${Math.round(timeoutMs / 1e3)}s`
+          );
+        };
+        for (const txData of transactions) {
+          const txType = txData.transaction.type;
+          const isApproval = txType === "approval" || txType === "revokeApproval";
+          if (isApproval) {
+            info(
+              txType === "revokeApproval" ? "Revoking prior approval..." : "Sending token approval..."
+            );
+          }
+          if (chainConfig?.namespace === "solana" && txData.transaction.solanaTx) {
+            const solanaChainId = `solana:${chainConfig.chainId}`;
+            txHash = await provider.sendTransaction({
+              chainId: solanaChainId,
+              to: "",
+              data: txData.transaction.solanaTx.serializedMessage
+            });
+          } else if (txData.transaction.evmTx) {
+            const wcChainId = `eip155:${chainConfig?.chainId || "1"}`;
+            txHash = await provider.sendTransaction({
+              chainId: wcChainId,
+              to: txData.transaction.evmTx.to,
+              data: txData.transaction.evmTx.data,
+              value: txData.transaction.evmTx.value || "0x0"
+            });
+          } else {
+            error("No transaction data returned for this swap step");
+            if (opts.json) output({ error: "No transaction data" }, true);
+            return;
+          }
+          info(`${isApproval ? "Approval" : "Swap"} tx: ${getExplorerTxUrl(fromChain, txHash)}`);
+          await pollForConfirmation(txHash, isApproval ? 6e4 : 12e4);
         }
-        throw new Error(`Transaction ${hash} was not confirmed within ${Math.round(timeoutMs / 1e3)}s`);
-      };
-      for (const txData of transactions) {
-        const txType = txData.transaction.type;
-        const isApproval = txType === "approval" || txType === "revokeApproval";
-        if (isApproval) {
-          info(txType === "revokeApproval" ? "Revoking prior approval..." : "Sending token approval...");
-        }
-        if (chainConfig?.namespace === "solana" && txData.transaction.solanaTx) {
-          const solanaChainId = `solana:${chainConfig.chainId}`;
-          txHash = await provider.sendTransaction({
-            chainId: solanaChainId,
-            to: "",
-            data: txData.transaction.solanaTx.serializedMessage
-          });
-        } else if (txData.transaction.evmTx) {
-          const wcChainId = `eip155:${chainConfig?.chainId || "1"}`;
-          txHash = await provider.sendTransaction({
-            chainId: wcChainId,
-            to: txData.transaction.evmTx.to,
-            data: txData.transaction.evmTx.data,
-            value: txData.transaction.evmTx.value || "0x0"
-          });
-        } else {
-          error("No transaction data returned for this swap step");
-          if (opts.json) output({ error: "No transaction data" }, true);
-          return;
-        }
-        info(`${isApproval ? "Approval" : "Swap"} tx: ${getExplorerTxUrl(fromChain, txHash)}`);
-        await pollForConfirmation(txHash, isApproval ? 6e4 : 12e4);
+        const explorerUrl = getExplorerTxUrl(fromChain, txHash);
+        success("Swap executed!");
+        output(
+          {
+            ...quoteData,
+            hash: txHash,
+            fromChain,
+            toChain,
+            explorer: explorerUrl
+          },
+          opts.json
+        );
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        error(`Swap failed: ${msg}`);
+        if (opts.json) output({ error: msg }, true);
+        process.exitCode = 1;
+      }
+      if (!opts.quoteOnly) {
+        safeExit();
       }
-      const explorerUrl = getExplorerTxUrl(fromChain, txHash);
-      success("Swap executed!");
-      output({
-        ...quoteData,
-        hash: txHash,
-        fromChain,
-        toChain,
-        explorer: explorerUrl
-      }, opts.json);
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      error(`Swap failed: ${msg}`);
-      if (opts.json) output({ error: msg }, true);
-    }
-    if (!opts.quoteOnly) {
-      setTimeout(() => process.exit(0), 100);
     }
-  });
+  );
 }
 
 // src/commands/erc20.ts
@@ -40011,7 +40359,7 @@ function registerErc20Command(program3) {
         error(msg);
         if (opts.json) output({ error: msg }, true);
         process.exitCode = 1;
-        process.exit();
+        safeExit();
         return;
       }
       const chainKey = coinTypeToChainKey(coinId);
@@ -40020,7 +40368,7 @@ function registerErc20Command(program3) {
         error(msg);
         if (opts.json) output({ error: msg }, true);
         process.exitCode = 1;
-        process.exit();
+        safeExit();
         return;
       }
       const address = await provider.getAddress(chainKey);
@@ -40031,7 +40379,7 @@ function registerErc20Command(program3) {
           error(msg);
           if (opts.json) output({ error: msg }, true);
           process.exitCode = 1;
-          process.exit();
+          safeExit();
           return;
         }
         warn("WARNING: Unlimited approval grants the spender access to ALL tokens of this type.");
@@ -40062,7 +40410,7 @@ function registerErc20Command(program3) {
       if (opts.json) output({ error: msg }, true);
       process.exitCode = 1;
     }
-    process.exit();
+    safeExit();
   });
   erc20.command("revoke").description("Revoke token approval (set allowance to 0)").requiredOption("--token <assetId>", "Token asset ID (e.g., c60_t0xA0b8...)").requiredOption("--spender <address>", "Spender address to revoke").option("--password <password>", "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)").option("--json", "JSON output").action(async (opts) => {
     try {
@@ -40075,7 +40423,7 @@ function registerErc20Command(program3) {
         error(msg);
         if (opts.json) output({ error: msg }, true);
         process.exitCode = 1;
-        process.exit();
+        safeExit();
         return;
       }
       const chainKey = coinTypeToChainKey(coinId);
@@ -40084,7 +40432,7 @@ function registerErc20Command(program3) {
         error(msg);
         if (opts.json) output({ error: msg }, true);
         process.exitCode = 1;
-        process.exit();
+        safeExit();
         return;
       }
       const address = await provider.getAddress(chainKey);
@@ -40113,7 +40461,7 @@ function registerErc20Command(program3) {
       if (opts.json) output({ error: msg }, true);
       process.exitCode = 1;
     }
-    process.exit();
+    safeExit();
   });
   erc20.command("allowance").description("Check token allowance").requiredOption("--token <assetId>", "Token asset ID (e.g., c60_t0xA0b8...)").requiredOption("--owner <address>", "Owner address").requiredOption("--spender <address>", "Spender address").option("--json", "JSON output").action(async (opts) => {
     try {
@@ -40136,19 +40484,50 @@ function registerErc20Command(program3) {
       if (opts.json) output({ error: msg }, true);
       process.exitCode = 1;
     }
-    process.exit();
+    safeExit();
   });
 }
 
 // src/commands/alert.ts
 init_dist();
 init_dist2();
-function resolveTokenLabel(tokenId) {
+init_dist5();
+var assetCache = new AssetCache();
+async function resolveTokenLabel(tokenId, service) {
+  const cached2 = await assetCache.get(tokenId);
+  if (cached2 !== void 0) return cached2;
   try {
     const { coinId, contractAddress } = parseTokenId(tokenId);
     const chain2 = getChainByCoinId(coinId);
-    if (chain2 && !contractAddress) return chain2.symbol;
-    return tokenId;
+    if (!chain2) return tokenId;
+    if (!contractAddress) {
+      return chain2.symbol;
+    }
+    const chainKey = tokenIdToChain(tokenId);
+    if (chainKey) {
+      const chainTokens = COMMON_TOKENS[chainKey];
+      if (chainTokens) {
+        const normalizedAddr = contractAddress.toLowerCase();
+        for (const [sym, addr] of Object.entries(chainTokens)) {
+          if (addr.toLowerCase() === normalizedAddr) {
+            await assetCache.set(tokenId, sym);
+            return sym;
+          }
+        }
+      }
+    }
+    if (service) {
+      try {
+        const assetInfo = await service.getAssetInfo(tokenId);
+        if (assetInfo.symbol) {
+          await assetCache.set(tokenId, assetInfo.symbol);
+          return assetInfo.symbol;
+        }
+      } catch {
+      }
+    }
+    const short = contractAddress.length > 10 ? `${contractAddress.slice(0, 6)}\u2026${contractAddress.slice(-4)}` : contractAddress;
+    return `${chain2.symbol}/${short}`;
   } catch {
     return tokenId;
   }
@@ -40212,7 +40591,9 @@ function registerAlertCommand(program3) {
         resolvedChain = NATIVE_SYMBOLS2[sym];
       }
       if (!resolvedChain) {
-        error(`Cannot resolve "${opts.token}" without --chain. Provide --chain or use asset ID format (c60).`);
+        error(
+          `Cannot resolve "${opts.token}" without --chain. Provide --chain or use asset ID format (c60).`
+        );
         if (opts.json) output({ error: "Chain required" }, true);
         process.exitCode = 1;
         return;
@@ -40225,6 +40606,14 @@ function registerAlertCommand(program3) {
         return;
       }
       const resolved = resolveToken(sym, resolvedChain);
+      if (!resolved) {
+        error(
+          `Unknown token: ${sym} on ${resolvedChain}. Use a contract address or asset ID (e.g. c60_t0xABC...).`
+        );
+        if (opts.json) output({ error: `Unknown token: ${sym}` }, true);
+        process.exitCode = 1;
+        return;
+      }
       if (resolved.address === NATIVE_TOKEN_ADDRESS || resolved.address === sym) {
         resolvedTokenId = formatTokenId(chain2.coinId);
       } else {
@@ -40248,15 +40637,19 @@ function registerAlertCommand(program3) {
   });
   alert.command("list").description("List all alerts").option("--active", "Show only active alerts").option("--json", "JSON output").action(async (opts) => {
     const alerts = opts.active ? await alertStore.getActive() : await alertStore.list();
+    const client = await tryGetClient();
+    const service = client ? new SecurityService(client) : void 0;
     if (opts.json) {
-      const enriched = alerts.map((a3) => {
-        let chainLabel = a3.chainKey;
-        try {
-          chainLabel = tokenIdToChain(a3.tokenId) ?? a3.chainKey;
-        } catch {
-        }
-        return { ...a3, tokenLabel: resolveTokenLabel(a3.tokenId), chainLabel };
-      });
+      const enriched = await Promise.all(
+        alerts.map(async (a3) => {
+          let chainLabel = a3.chainKey;
+          try {
+            chainLabel = tokenIdToChain(a3.tokenId) ?? a3.chainKey;
+          } catch {
+          }
+          return { ...a3, tokenLabel: await resolveTokenLabel(a3.tokenId, service), chainLabel };
+        })
+      );
       output(enriched, true);
     } else {
       if (alerts.length === 0) {
@@ -40264,7 +40657,7 @@ function registerAlertCommand(program3) {
         return;
       }
       for (const a3 of alerts) {
-        const label = resolveTokenLabel(a3.tokenId);
+        const label = await resolveTokenLabel(a3.tokenId, service);
         let chainHint = "";
         try {
           const chain2 = tokenIdToChain(a3.tokenId);
@@ -40272,7 +40665,9 @@ function registerAlertCommand(program3) {
         } catch {
           chainHint = "";
         }
-        info(`${a3.id} | ${label}${chainHint} | ${a3.condition} $${a3.targetPrice} | ${a3.active ? "active" : "triggered"}`);
+        info(
+          `${a3.id} | ${label}${chainHint} | ${a3.condition} $${a3.targetPrice} | ${a3.active ? "active" : "triggered"}`
+        );
       }
     }
   });
@@ -40292,16 +40687,34 @@ function registerAlertCommand(program3) {
           triggered.push({ ...a3, currentPrice: price });
         }
       }
-      output({ checked: activeAlerts.length, triggered: triggered.length, alerts: triggered }, opts.json);
+      output(
+        { checked: activeAlerts.length, triggered: triggered.length, alerts: triggered },
+        opts.json
+      );
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       error(msg);
       if (opts.json) output({ error: msg }, true);
+      process.exitCode = 1;
     }
   });
   alert.command("delete <id>").description("Delete an alert").option("--json", "JSON output").action(async (id, opts) => {
-    const deleted = await alertStore.delete(id);
-    output({ success: deleted }, opts.json);
+    try {
+      const deleted = await alertStore.delete(id);
+      if (!deleted) {
+        error(`Alert ${id} not found`);
+        if (opts.json) output({ error: `Alert ${id} not found` }, true);
+        process.exitCode = 1;
+        return;
+      }
+      if (!opts.json) success(`Alert ${id} deleted`);
+      output({ success: true }, opts.json);
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      error(msg);
+      if (opts.json) output({ error: msg }, true);
+      process.exitCode = 1;
+    }
   });
 }
 
@@ -40380,14 +40793,20 @@ function handleError(err, json) {
   process.exitCode = 1;
 }
 function registerQueryCommand(program3) {
-  program3.command("price <token>").description("Get token price").option("--chain <id>", "Chain").option("--history [period]", "Price history period: hour, day, week, month, year, all (default: week)").option("--json", "JSON output").action(async (token, opts) => {
+  program3.command("price <token>").description("Get token price").option("--chain <id>", "Chain").option(
+    "--history [period]",
+    "Price history period: hour, day, week, month, year, all (default: week)"
+  ).option("--json", "JSON output").action(async (token, opts) => {
     try {
       const client = await getClient();
       const swapClient = new SwapClient(client);
       const tokens = token.split(",").map((t) => t.trim()).filter(Boolean);
       const resolveChain = (t) => {
         if (opts.chain) return opts.chain;
-        const bySymbol = Object.entries(CHAINS).find(([, c3]) => c3.symbol.toUpperCase() === t.toUpperCase())?.[0];
+        if (Object.prototype.hasOwnProperty.call(CHAINS, t.toLowerCase())) return t.toLowerCase();
+        const bySymbol = Object.entries(CHAINS).find(
+          ([, c3]) => c3.symbol.toUpperCase() === t.toUpperCase()
+        )?.[0];
         if (bySymbol) return bySymbol;
         const upper = t.toUpperCase();
         for (const [chainKey, chainTokens] of Object.entries(COMMON_TOKENS)) {
@@ -40395,12 +40814,22 @@ function registerQueryCommand(program3) {
         }
         return "ethereum";
       };
+      if (opts.chain && !getChainById(opts.chain)) {
+        error(`Unknown chain: ${opts.chain}. Run 'twak chains' to list supported chains.`);
+        if (opts.json) output({ error: `Unknown chain: ${opts.chain}` }, true);
+        process.exitCode = 1;
+        return;
+      }
       if (tokens.length > 1) {
         const assetIds = [];
         const tokenMeta = [];
         for (const t of tokens) {
           const chain3 = resolveChain(t);
           const info2 = resolveToken(t, chain3);
+          if (!info2) {
+            warn(`Unknown token: ${t.toUpperCase()}`);
+            continue;
+          }
           const chainInfo = getChainById(chain3);
           if (!chainInfo) throw new Error(`Unknown chain: ${chain3}`);
           const isNative = !info2.address || info2.address === NATIVE_TOKEN_ADDRESS || info2.address === SOLANA_NATIVE_ADDRESS;
@@ -40408,10 +40837,19 @@ function registerQueryCommand(program3) {
           assetIds.push(assetId);
           tokenMeta.push({ token: t.toUpperCase(), chain: chain3 });
         }
-        const resp = await client.market("POST", "/v2/market/tickers", {
-          currency: "USD",
-          assets: assetIds
-        });
+        if (assetIds.length === 0) {
+          error("No valid tokens to look up");
+          process.exitCode = 1;
+          return;
+        }
+        const resp = await client.market(
+          "POST",
+          "/v2/market/tickers",
+          {
+            currency: "USD",
+            assets: assetIds
+          }
+        );
         const priceMap = /* @__PURE__ */ new Map();
         for (const t of resp.tickers || []) {
           if (t.id && t.price != null) priceMap.set(t.id, t.price);
@@ -40426,39 +40864,58 @@ function registerQueryCommand(program3) {
         } else {
           for (const r3 of results) {
             const priceStr = r3.priceUsd !== null ? `$${r3.priceUsd.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 6 })}` : "N/A";
-            console.log(`${import_chalk6.default.bold(r3.token.padEnd(10))} ${priceStr.padStart(14)}  ${import_chalk6.default.dim(r3.chain)}`);
+            console.log(
+              `${import_chalk6.default.bold(r3.token.padEnd(10))} ${priceStr.padStart(14)}  ${import_chalk6.default.dim(r3.chain)}`
+            );
           }
         }
         return;
       }
       const chain2 = resolveChain(token);
       const tokenInfo = resolveToken(token, chain2);
-      let price = await swapClient.getTokenPrice(chain2, tokenInfo.address);
+      let price = null;
+      if (tokenInfo) {
+        price = await swapClient.getTokenPrice(chain2, tokenInfo.address);
+      }
       if (price === null) {
-        const results = await swapClient.searchTokens({ query: token, chains: [chain2], limit: 1 });
-        if (results.length > 0 && results[0].priceUsd != null) {
-          price = results[0].priceUsd;
+        const results = await swapClient.searchTokens({
+          query: token,
+          chains: [chain2],
+          limit: 5
+        });
+        const exact = results.find(
+          (r3) => r3.symbol?.toUpperCase() === token.toUpperCase() && r3.priceUsd != null
+        );
+        if (exact) {
+          price = exact.priceUsd;
         }
       }
       if (price === null) {
         error(`Token not found: ${token}`);
-        if (opts.json) output({ token: token.toUpperCase(), chain: chain2, priceUsd: null, error: "Token not found" }, true);
+        if (opts.json)
+          output(
+            { token: token.toUpperCase(), chain: chain2, priceUsd: null, error: "Token not found" },
+            true
+          );
         process.exitCode = 1;
         return;
       }
       if (opts.history !== void 0) {
+        if (!tokenInfo) {
+          error(`Price history not available for "${token}" \u2014 token not locally resolved. Use an asset ID (e.g. c60) or contract address.`);
+          process.exitCode = 1;
+          return;
+        }
         const period = typeof opts.history === "string" ? opts.history : "week";
         const chainInfo = getChainById(chain2);
         if (!chainInfo) throw new Error(`Unknown chain: ${chain2}`);
         const isNative = !tokenInfo.address || tokenInfo.address === NATIVE_TOKEN_ADDRESS || tokenInfo.address === SOLANA_NATIVE_ADDRESS;
         const assetId = isNative ? `c${chainInfo.coinId}` : `c${chainInfo.coinId}_t${tokenInfo.address}`;
-        const chartData = await client.gateway(
-          "GET",
-          `/v1/market/charts/${assetId}`,
-          void 0,
-          `currency=USD&period=${period}`
+        const chartData = await client.gateway("GET", `/v1/market/charts/${assetId}`, void 0, `currency=USD&period=${period}`);
+        output(
+          { token: token.toUpperCase(), chain: chain2, priceUsd: price, history: chartData.prices },
+          opts.json
         );
-        output({ token: token.toUpperCase(), chain: chain2, priceUsd: price, history: chartData.prices }, opts.json);
         return;
       }
       if (opts.json) {
@@ -40482,7 +40939,9 @@ function registerQueryCommand(program3) {
           if (/^\d+$/.test(trimmed)) return trimmed;
           const chain2 = getChainById(trimmed);
           if (chain2) return String(chain2.coinId);
-          throw new Error(`Unknown network "${trimmed}". Use a supported chain name or numeric coin ID.`);
+          throw new Error(
+            `Unknown network "${trimmed}". Use a supported chain name or numeric coin ID.`
+          );
         }).join(",");
       }
       const result = await swapClient.searchTokens({
@@ -40499,6 +40958,18 @@ function registerQueryCommand(program3) {
     try {
       const client = await getClient();
       const service = new TransactionService(client);
+      if (opts.chain && !getChainById(opts.chain)) {
+        error(`Unknown chain: ${opts.chain}. Run 'twak chains' to list supported chains.`);
+        if (opts.json) output({ error: `Unknown chain: ${opts.chain}` }, true);
+        process.exitCode = 1;
+        return;
+      }
+      if (opts.address && opts.chain && !/^(0x[0-9a-fA-F]{40}|[1-9A-HJ-NP-Za-km-z]{20,}|[A-Za-z0-9]{20,})$/.test(opts.address)) {
+        error(`Invalid address: "${opts.address}"`);
+        if (opts.json) output({ error: `Invalid address: "${opts.address}"` }, true);
+        process.exitCode = 1;
+        return;
+      }
       if (!opts.chain) {
         await ensureTrustSDK();
         const password = await resolvePassword(opts);
@@ -40550,7 +41021,9 @@ function registerQueryCommand(program3) {
               const intPart = big / divisor;
               const scale = 10000n;
               const fracScaled = big % divisor * scale / divisor;
-              const usdValue = price !== null && (intPart > 0n || fracScaled > 0n) && intPart <= BigInt(Number.MAX_SAFE_INTEGER) ? parseFloat(((Number(intPart) + Number(fracScaled) / 1e4) * price).toFixed(4)) : void 0;
+              const usdValue = price !== null && (intPart > 0n || fracScaled > 0n) && intPart <= BigInt(Number.MAX_SAFE_INTEGER) ? parseFloat(
+                ((Number(intPart) + Number(fracScaled) / 1e4) * price).toFixed(4)
+              ) : void 0;
               return { ...tx, usdValue };
             } catch {
               return tx;
@@ -40572,9 +41045,16 @@ function registerQueryCommand(program3) {
     } catch (err) {
       handleError(err, opts.json);
     }
+    safeExit();
   });
   program3.command("tx <hash>").description("Get transaction details by hash (on-chain RPC lookup)").requiredOption("--chain <name>", "Chain name").option("--address <address>", "Wallet address (auto-detected from wallet if omitted)").option("--password <pw>", "Wallet password (for auto-detecting address)").option("--json", "JSON output").action(async (hash, opts) => {
     try {
+      if (!getChainById(opts.chain)) {
+        error(`Unknown chain: ${opts.chain}. Run 'twak chains' to list supported chains.`);
+        if (opts.json) output({ error: `Unknown chain: ${opts.chain}` }, true);
+        process.exitCode = 1;
+        return;
+      }
       let address = opts.address;
       if (!address) {
         try {
@@ -40589,11 +41069,14 @@ function registerQueryCommand(program3) {
         await ensureTrustSDK();
         const blockchainClient = new BlockchainClient();
         const status = await blockchainClient.findTransactionStatus(opts.chain, address, hash);
-        output({
-          hash,
-          chain: opts.chain,
-          ...status
-        }, opts.json);
+        output(
+          {
+            hash,
+            chain: opts.chain,
+            ...status
+          },
+          opts.json
+        );
       } else {
         const client = await getClient();
         const service = new TransactionService(client);
@@ -40607,11 +41090,37 @@ function registerQueryCommand(program3) {
   program3.command("chains").description("List supported chains").option("--json", "JSON output").action(async (opts) => {
     const chainEntries = Object.entries(CHAINS);
     if (opts.json) {
-      output(chainEntries.map(([key, chain2]) => ({ key, ...chain2 })), true);
+      output(
+        chainEntries.map(([key, chain2]) => ({
+          key,
+          name: chain2.name,
+          symbol: chain2.symbol,
+          namespace: chain2.namespace,
+          chainId: chain2.id,
+          coinId: chain2.coinId
+        })),
+        true
+      );
     } else {
-      for (const [key, chain2] of chainEntries) {
-        const idHint = key !== chain2.id ? import_chalk6.default.dim(` (${chain2.id})`) : "";
-        console.log(`${key.padEnd(15)} ${chain2.name.padEnd(25)} coinId:${chain2.coinId}${idHint}`);
+      const rows = chainEntries.map(([key, chain2]) => ({
+        key,
+        name: chain2.name,
+        symbol: chain2.symbol,
+        namespace: chain2.namespace
+      }));
+      const keyW = Math.max(...rows.map((r3) => r3.key.length), 3);
+      const nameW = Math.max(...rows.map((r3) => r3.name.length), 4);
+      const symW = Math.max(...rows.map((r3) => r3.symbol.length), 6);
+      const nsW = Math.max(...rows.map((r3) => r3.namespace.length), 9);
+      console.log(
+        import_chalk6.default.bold(
+          `${"KEY".padEnd(keyW)}  ${"NAME".padEnd(nameW)}  ${"SYMBOL".padEnd(symW)}  NAMESPACE`
+        )
+      );
+      for (const r3 of rows) {
+        console.log(
+          `${r3.key.padEnd(keyW)}  ${r3.name.padEnd(nameW)}  ${r3.symbol.padEnd(symW)}  ${r3.namespace.padEnd(nsW)}`
+        );
       }
     }
   });
@@ -40650,7 +41159,11 @@ function registerQueryCommand(program3) {
         const apiClient = await getClient();
         const swapClient = new SwapClient(apiClient);
         const chainKey = opts.chain || Object.entries(CHAINS).find(([, c3]) => c3.coinId === coinId)?.[0] || "";
-        const tokens = await swapClient.searchTokens({ query: opts.token, chains: [chainKey], limit: 1 });
+        const tokens = await swapClient.searchTokens({
+          query: opts.token,
+          chains: [chainKey],
+          limit: 1
+        });
         if (tokens.length > 0) {
           decimals = tokens[0].decimals ?? 18;
           symbol = tokens[0].symbol ?? opts.token;
@@ -40665,20 +41178,24 @@ function registerQueryCommand(program3) {
         const div = 10n ** BigInt(decimals);
         return `${big / div}.${(big % div).toString().padStart(decimals, "0").slice(0, 6)}`;
       };
-      output({
-        address: opts.address,
-        chain: chain2.id,
-        symbol,
-        ...opts.token ? { token: opts.token } : {},
-        available: fmt(balance.available),
-        ...balance.staked ? { staked: fmt(balance.staked) } : {},
-        ...balance.pending ? { pending: fmt(balance.pending) } : {},
-        total: fmt(balance.total),
-        raw: balance
-      }, opts.json);
+      output(
+        {
+          address: opts.address,
+          chain: chain2.id,
+          symbol,
+          ...opts.token ? { token: opts.token } : {},
+          available: fmt(balance.available),
+          ...balance.staked ? { staked: fmt(balance.staked) } : {},
+          ...balance.pending ? { pending: fmt(balance.pending) } : {},
+          total: fmt(balance.total),
+          raw: balance
+        },
+        opts.json
+      );
     } catch (err) {
       handleError(err, opts.json);
     }
+    safeExit();
   });
   program3.command("asset <assetId>").description("Get asset info").option("--json", "JSON output").action(async (assetId, opts) => {
     try {
@@ -40692,6 +41209,12 @@ function registerQueryCommand(program3) {
   });
   program3.command("validate").description("Validate an address").requiredOption("--address <address>", "Address to validate").option("--chain <key>", "Chain key (e.g., ethereum, solana)").option("--asset-id <id>", "Asset ID (alternative to --chain)").option("--json", "JSON output").action(async (opts) => {
     try {
+      if (!opts.chain && !opts.assetId) {
+        error("Provide --chain <key> or --asset-id <id> to validate an address");
+        if (opts.json) output({ error: "--chain or --asset-id required" }, true);
+        process.exitCode = 1;
+        return;
+      }
       let assetId = opts.assetId;
       if (!assetId && opts.chain) {
         const chain2 = getChainById(opts.chain);
@@ -40711,7 +41234,12 @@ function registerQueryCommand(program3) {
             if (!isValid2) {
               const chainInfo = getChainByCoinId(coinId);
               const label = chainInfo?.name ?? `coin ${coinId}`;
-              const result = { status: "error", valid: false, chain: chainInfo?.id, message: `Invalid address format for ${label}` };
+              const result = {
+                status: "error",
+                valid: false,
+                chain: chainInfo?.id,
+                message: `Invalid address format for ${label}`
+              };
               output(result, opts.json);
               return;
             }
@@ -40732,8 +41260,12 @@ function registerQueryCommand(program3) {
     } catch (err) {
       handleError(err, opts.json);
     }
+    safeExit();
   });
-  program3.command("trending").description("Get trending tokens by market activity or category").option("--category <id>", "Category: ai, rwa, memes, defi, dex, bnb, eth, sol, pumpfun, bonk, launchpad, launchpool, layer1").option("--sort <by>", "Sort: price_change, market_cap, volume (default: price_change)").option("--limit <n>", "Max results", "20").option("--json", "JSON output").action(async (opts) => {
+  program3.command("trending").description("Get trending tokens by market activity or category").option(
+    "--category <id>",
+    "Category: ai, rwa, memes, defi, dex, bnb, eth, sol, pumpfun, bonk, launchpad, launchpool, layer1"
+  ).option("--sort <by>", "Sort: price_change, market_cap, volume (default: price_change)").option("--limit <n>", "Max results", "20").option("--json", "JSON output").action(async (opts) => {
     try {
       const client = await getClient();
       const service = new SecurityService(client);
@@ -40757,15 +41289,13 @@ function registerQueryCommand(program3) {
         launchpool: "binance-launchpool",
         layer1: "layer_1"
       };
-      let tokens;
-      if (opts.category) {
-        const categoryId = categoryMap[opts.category] ?? opts.category;
-        const sort = opts.sort ? sortMap[opts.sort] ?? opts.sort : "percent_change_24h";
-        tokens = await service.getAssetListings({ categoryId, sort, limit: parseInt(opts.limit, 10) });
-      } else {
-        const sort = opts.sort ? sortMap[opts.sort] ?? opts.sort : "percent_change_24h";
-        tokens = await service.getTrendingTokens(parseInt(opts.limit, 10), sort);
-      }
+      const categoryId = opts.category ? categoryMap[opts.category] ?? opts.category : void 0;
+      const sort = opts.sort ? sortMap[opts.sort] ?? opts.sort : "percent_change_24h";
+      const tokens = await service.getAssetListings({
+        categoryId,
+        sort,
+        limit: parseInt(opts.limit, 10)
+      });
       const seen = /* @__PURE__ */ new Map();
       for (const t of tokens) {
         const key = t.symbol.toUpperCase();
@@ -40781,14 +41311,19 @@ function registerQueryCommand(program3) {
         for (const t of deduped) {
           const price = t.priceUsd != null ? `$${t.priceUsd.toFixed(4)}` : "N/A";
           const change = t.priceChange24h != null ? `${t.priceChange24h > 0 ? "+" : ""}${t.priceChange24h.toFixed(2)}%` : "";
-          console.log(`${t.symbol.padEnd(10)} ${t.name.padEnd(25)} ${price.padStart(12)} ${change.padStart(8)}`);
+          console.log(
+            `${t.symbol.padEnd(10)} ${t.name.padEnd(25)} ${price.padStart(12)} ${change.padStart(8)}`
+          );
         }
       }
     } catch (err) {
       handleError(err, opts.json);
     }
   });
-  program3.command("dapps").description("Browse DeFi protocols and DApps (data from DeFi Llama)").option("--category <name>", "Filter by category (e.g., Lending, Dexs, Liquid Staking, Bridge, Yield)").option("--search <query>", "Search by name, symbol, or category").option("--categories", "List available categories").option("--limit <n>", "Max results", "20").option("--json", "JSON output").action(async (opts) => {
+  program3.command("dapps").description("Browse DeFi protocols and DApps (data from DeFi Llama)").option(
+    "--category <name>",
+    "Filter by category (e.g., Lending, Dexs, Liquid Staking, Bridge, Yield)"
+  ).option("--search <query>", "Search by name, symbol, or category").option("--categories", "List available categories").option("--limit <n>", "Max results", "20").option("--json", "JSON output").action(async (opts) => {
     try {
       const { DappsService: DappsService2 } = await Promise.resolve().then(() => (init_dapps_service(), dapps_service_exports));
       const service = new DappsService2();
@@ -40808,12 +41343,16 @@ function registerQueryCommand(program3) {
         if (dapps.length === 0) {
           console.log("No DApps found.");
         } else {
-          console.log("Name".padEnd(25) + "Category".padEnd(20) + "TVL".padStart(15) + "  Chains");
+          console.log(
+            "Name".padEnd(25) + "Category".padEnd(20) + "TVL".padStart(15) + "  Chains"
+          );
           console.log("\u2500".repeat(80));
           for (const d3 of dapps) {
             const tvl = d3.tvl >= 1e9 ? `$${(d3.tvl / 1e9).toFixed(2)}B` : d3.tvl >= 1e6 ? `$${(d3.tvl / 1e6).toFixed(0)}M` : `$${(d3.tvl / 1e3).toFixed(0)}K`;
             const chains = d3.chains.slice(0, 5).join(", ") + (d3.chains.length > 5 ? ` +${d3.chains.length - 5}` : "");
-            console.log(`${d3.name.slice(0, 24).padEnd(25)}${d3.category.slice(0, 19).padEnd(20)}${tvl.padStart(15)}  ${chains}`);
+            console.log(
+              `${d3.name.slice(0, 24).padEnd(25)}${d3.category.slice(0, 19).padEnd(20)}${tvl.padStart(15)}  ${chains}`
+            );
           }
         }
       }
@@ -45220,7 +45759,9 @@ var SwapActionProvider = class extends ActionProvider {
           return { success: false, error: `Slippage must be greater than 0% and at most 50%. Got: ${input.slippage}` };
         }
         const fromTokenInfo = resolveToken(input.fromToken, input.fromChain);
+        if (!fromTokenInfo) return { success: false, error: `Unknown token: ${input.fromToken} on ${input.fromChain}` };
         const toTokenInfo = resolveToken(input.toToken, input.toChain);
+        if (!toTokenInfo) return { success: false, error: `Unknown token: ${input.toToken} on ${input.toChain}` };
         const parsedAmount = parseAmount(input.amount, fromTokenInfo.decimals);
         const address = await signer.getAddress(input.fromChain);
         const quote = await this.swapClient.getQuote({
@@ -45273,7 +45814,9 @@ var SwapActionProvider = class extends ActionProvider {
       invoke: async (_ctx, input) => {
         if (!this.swapClient) return { success: false, error: "Swap client required" };
         const fromTokenInfo = resolveToken(input.fromToken, input.fromChain);
+        if (!fromTokenInfo) return { success: false, error: `Unknown token: ${input.fromToken} on ${input.fromChain}` };
         const toTokenInfo = resolveToken(input.toToken, input.toChain);
+        if (!toTokenInfo) return { success: false, error: `Unknown token: ${input.toToken} on ${input.toChain}` };
         const parsedAmount = parseAmount(input.amount, fromTokenInfo.decimals);
         const quote = await this.swapClient.getQuote({
           fromChain: input.fromChain,
@@ -45310,6 +45853,7 @@ var SwapActionProvider = class extends ActionProvider {
       invoke: async (_ctx, input) => {
         if (!this.swapClient) return { success: false, error: "Swap client required" };
         const tokenInfo = resolveToken(input.token, input.chain);
+        if (!tokenInfo) return { success: false, error: `Unknown token: ${input.token} on ${input.chain}` };
         const price = await this.swapClient.getTokenPrice(input.chain, tokenInfo.address);
         if (price === null) return { success: false, error: `Price not found for ${input.token}` };
         return { success: true, token: input.token.toUpperCase(), chain: input.chain, priceUsd: price };
@@ -45745,7 +46289,7 @@ var MarketActionProvider = class extends ActionProvider {
         limit: external_exports.coerce.number().optional().default(20).describe("Number of tokens to return (default 20)")
       }),
       invoke: async (ctx, input) => {
-        const tokens = await this.getService(ctx).getTrendingTokens(input.limit);
+        const tokens = await this.getService(ctx).getAssetListings({ limit: input.limit });
         return { success: true, count: tokens.length, tokens };
       }
     };
@@ -45908,7 +46452,9 @@ var AutomateActionProvider = class extends ActionProvider {
         if (!record2) return { success: false, error: `Automation ${input.id} not found` };
         if (!record2.active) return { success: false, error: `Automation ${input.id} is inactive` };
         const fromTokenInfo = resolveToken(record2.fromToken, record2.chain);
+        if (!fromTokenInfo) return { success: false, error: `Unknown token: ${record2.fromToken} on ${record2.chain}` };
         const toTokenInfo = resolveToken(record2.toToken, record2.chain);
+        if (!toTokenInfo) return { success: false, error: `Unknown token: ${record2.toToken} on ${record2.chain}` };
         const parsedAmount = parseAmount(record2.amount, fromTokenInfo.decimals);
         const address = await this.walletProvider.getAddress(record2.chain);
         const quote = await this.swapClient.getQuote({
@@ -53051,7 +53597,7 @@ var Protocol = class {
           return;
         }
         const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
-        await new Promise((resolve3) => setTimeout(resolve3, pollInterval));
+        await new Promise((resolve2) => setTimeout(resolve2, pollInterval));
         options?.signal?.throwIfAborted();
       }
     } catch (error3) {
@@ -53068,7 +53614,7 @@ var Protocol = class {
    */
   request(request, resultSchema, options) {
     const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve2, reject) => {
       const earlyReject = (error3) => {
         reject(error3);
       };
@@ -53146,7 +53692,7 @@ var Protocol = class {
           if (!parseResult.success) {
             reject(parseResult.error);
           } else {
-            resolve3(parseResult.data);
+            resolve2(parseResult.data);
           }
         } catch (error3) {
           reject(error3);
@@ -53407,12 +53953,12 @@ var Protocol = class {
       }
     } catch {
     }
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve2, reject) => {
       if (signal.aborted) {
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
         return;
       }
-      const timeoutId = setTimeout(resolve3, interval);
+      const timeoutId = setTimeout(resolve2, interval);
       signal.addEventListener("abort", () => {
         clearTimeout(timeoutId);
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -54282,12 +54828,12 @@ var StdioServerTransport = class {
     this.onclose?.();
   }
   send(message) {
-    return new Promise((resolve3) => {
+    return new Promise((resolve2) => {
       const json = serializeMessage(message);
       if (this._stdout.write(json)) {
-        resolve3();
+        resolve2();
       } else {
-        this._stdout.once("drain", resolve3);
+        this._stdout.once("drain", resolve2);
       }
     });
   }
@@ -54598,7 +55144,7 @@ var TwakRestServer = class {
     };
   }
   start() {
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve2, reject) => {
       const server = (0, import_http.createServer)((req, res) => this.handleRequest(req, res));
       this.httpServer = server;
       server.on("error", (err) => {
@@ -54609,7 +55155,9 @@ var TwakRestServer = class {
         }
       });
       server.listen(this.config.port, this.config.host, () => {
-        console.error(`TWAK REST server listening on http://${this.config.host}:${this.config.port}`);
+        console.error(
+          `TWAK REST server listening on http://${this.config.host}:${this.config.port}`
+        );
         console.error("Endpoints: POST /actions/:name");
         if (this.config.apiKey) {
           console.error("API key authentication enabled (use Authorization: Bearer <HMAC_SECRET>)");
@@ -54617,28 +55165,38 @@ var TwakRestServer = class {
           console.error("WARNING: No API key configured \u2014 REST server is unauthenticated");
         }
         if (this.config.paymentRequired) {
-          console.error(`x402 payment required: ${this.config.paymentAmount} ${this.config.paymentAsset} on ${this.config.paymentChainId}`);
+          console.error(
+            `x402 payment required: ${this.config.paymentAmount} ${this.config.paymentAsset} on ${this.config.paymentChainId}`
+          );
         }
-        resolve3();
+        resolve2();
       });
     });
   }
   stop() {
-    return new Promise((resolve3) => {
+    return new Promise((resolve2) => {
       if (this.httpServer?.listening) {
         this.httpServer.close(() => {
           this.httpServer = null;
-          resolve3();
+          resolve2();
         });
       } else {
         this.httpServer = null;
-        resolve3();
+        resolve2();
       }
     });
   }
   async handleRequest(req, res) {
     res.setHeader("Content-Type", "application/json");
-    res.setHeader("Access-Control-Allow-Origin", "*");
+    const origin = req.headers.origin || "";
+    try {
+      const parsed = new URL(origin);
+      if (parsed.hostname === "localhost" || parsed.hostname === "127.0.0.1" || parsed.hostname === "::1") {
+        res.setHeader("Access-Control-Allow-Origin", origin);
+        res.setHeader("Vary", "Origin");
+      }
+    } catch {
+    }
     res.setHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
     res.setHeader("Access-Control-Allow-Headers", "Content-Type, X-Payment, Authorization");
     if (req.method === "OPTIONS") {
@@ -54656,16 +55214,20 @@ var TwakRestServer = class {
       const tokenValid = token && token.length === expected.length && (0, import_crypto5.timingSafeEqual)(Buffer.from(token), Buffer.from(expected));
       if (!tokenValid) {
         res.writeHead(401);
-        res.end(JSON.stringify({ error: "Unauthorized \u2014 provide Authorization: Bearer <HMAC_SECRET>" }));
+        res.end(
+          JSON.stringify({ error: "Unauthorized \u2014 provide Authorization: Bearer <HMAC_SECRET>" })
+        );
         return;
       }
     }
     if (req.method === "GET" && pathname === "/actions") {
       const actions = this.registry.getActions();
       res.writeHead(200);
-      res.end(JSON.stringify({
-        actions: actions.map((a3) => ({ name: a3.name, description: a3.description }))
-      }));
+      res.end(
+        JSON.stringify({
+          actions: actions.map((a3) => ({ name: a3.name, description: a3.description }))
+        })
+      );
       return;
     }
     const match = pathname.match(/^\/actions\/([^/]+)$/);
@@ -54678,31 +55240,44 @@ var TwakRestServer = class {
     if (this.config.paymentRequired) {
       const paymentHeader = req.headers["x-payment"];
       if (!paymentHeader) {
-        res.setHeader("WWW-Authenticate", `x402 realm="twak", asset="${this.config.paymentAsset}", amount="${this.config.paymentAmount}", chain="${this.config.paymentChainId}"`);
+        res.setHeader(
+          "WWW-Authenticate",
+          `x402 realm="twak", asset="${this.config.paymentAsset}", amount="${this.config.paymentAmount}", chain="${this.config.paymentChainId}"`
+        );
         res.writeHead(402);
-        res.end(JSON.stringify({
-          error: "payment_required",
-          message: `This endpoint requires payment of ${this.config.paymentAmount} ${this.config.paymentAsset}`,
-          asset: this.config.paymentAsset,
-          amount: this.config.paymentAmount,
-          chainId: this.config.paymentChainId,
-          recipient: this.config.paymentRecipient || void 0
-        }));
+        res.end(
+          JSON.stringify({
+            error: "payment_required",
+            message: `This endpoint requires payment of ${this.config.paymentAmount} ${this.config.paymentAsset}`,
+            asset: this.config.paymentAsset,
+            amount: this.config.paymentAmount,
+            chainId: this.config.paymentChainId,
+            recipient: this.config.paymentRecipient || void 0
+          })
+        );
         return;
       }
       if (this.config.paymentRecipient) {
-        const result = await verifyPayment(paymentHeader, {
-          asset: this.config.paymentAsset,
-          amount: this.config.paymentAmount,
-          chainId: this.config.paymentChainId,
-          recipient: this.config.paymentRecipient
-        }, this.context.httpClient, this.seenHashes, this.config.blockchainClient);
+        const result = await verifyPayment(
+          paymentHeader,
+          {
+            asset: this.config.paymentAsset,
+            amount: this.config.paymentAmount,
+            chainId: this.config.paymentChainId,
+            recipient: this.config.paymentRecipient
+          },
+          this.context.httpClient,
+          this.seenHashes,
+          this.config.blockchainClient
+        );
         if (!result.valid) {
           res.writeHead(402);
-          res.end(JSON.stringify({
-            error: "payment_verification_failed",
-            message: result.error ?? "Payment could not be verified"
-          }));
+          res.end(
+            JSON.stringify({
+              error: "payment_verification_failed",
+              message: result.error ?? "Payment could not be verified"
+            })
+          );
           return;
         }
       }
@@ -54857,6 +55432,11 @@ function registerAutomateCommand(program3) {
   const automate = program3.command("automate").description("Manage DCA and limit order automations");
   automate.command("add").description("Create a DCA or limit order automation").requiredOption("--from <token>", "Source token (e.g., USDC)").requiredOption("--to <token>", "Destination token (e.g., ETH)").option("--chain <chain>", "Chain", "ethereum").requiredOption("--amount <n>", "Amount of source token per run").option("--interval <duration>", "DCA interval \u2014 e.g. 30s, 5m, 1h (creates DCA automation)").option("--price <usd>", "Target price in USD (creates limit order)").option("--condition <cond>", "Price condition: above or below", "below").option("--max-runs <n>", "Stop after N executions").option("--expires <date>", "Expiry date (ISO 8601, e.g. 2026-04-01)").option("--json", "JSON output").action(async (opts) => {
     try {
+      if (opts.interval && opts.price) {
+        error("Provide --interval (DCA) or --price (limit order), not both");
+        process.exitCode = 1;
+        return;
+      }
       if (!opts.interval && !opts.price) {
         error("Provide --interval (DCA) or --price (limit order)");
         process.exitCode = 1;
@@ -54873,6 +55453,13 @@ function registerAutomateCommand(program3) {
         process.exitCode = 1;
         return;
       }
+      const SWAP_SUPPORTED_NAMESPACES = ["eip155", "solana"];
+      const chainInfo = getChainById(opts.chain);
+      if (chainInfo && !SWAP_SUPPORTED_NAMESPACES.includes(chainInfo.namespace)) {
+        error(`${chainInfo.name} automations are not supported. Use an EVM chain or Solana.`);
+        process.exitCode = 1;
+        return;
+      }
       let intervalMs;
       if (opts.interval) {
         const parsed = parseInterval(opts.interval);
@@ -54915,9 +55502,13 @@ function registerAutomateCommand(program3) {
       });
       success("Automation created!");
       if (opts.interval && intervalMs) {
-        info(`DCA: ${opts.amount} ${opts.from} \u2192 ${opts.to} every ${formatInterval(intervalMs)} on ${opts.chain}`);
+        info(
+          `DCA: ${opts.amount} ${opts.from} \u2192 ${opts.to} every ${formatInterval(intervalMs)} on ${opts.chain}`
+        );
       } else {
-        info(`Limit: swap ${opts.amount} ${opts.from} \u2192 ${opts.to} when price ${opts.condition} $${opts.price} on ${opts.chain}`);
+        info(
+          `Limit: swap ${opts.amount} ${opts.from} \u2192 ${opts.to} when price ${opts.condition} $${opts.price} on ${opts.chain}`
+        );
       }
       output(record2, opts.json);
     } catch (err) {
@@ -54927,11 +55518,10 @@ function registerAutomateCommand(program3) {
       process.exitCode = 1;
     }
   });
-  automate.command("list").description("List active automations").option("--all", "Include inactive automations").option("--json", "JSON output").action(async (opts) => {
+  automate.command("list").description("List automations").option("--json", "JSON output").action(async (opts) => {
     try {
       const store = new AutomationStore();
-      const all = await store.list();
-      const records = opts.all ? all : all.filter((a3) => a3.active);
+      const records = await store.list();
       if (opts.json) {
         const enriched = records.map((r3) => {
           const nextRunAt = r3.type === "dca" && r3.intervalMs ? r3.lastRunAt ? new Date(new Date(r3.lastRunAt).getTime() + r3.intervalMs).toISOString() : (/* @__PURE__ */ new Date()).toISOString() : null;
@@ -54961,10 +55551,14 @@ function registerAutomateCommand(program3) {
             const nextAt = new Date(r3.lastRunAt).getTime() + r3.intervalMs;
             nextPart = `next: ${formatRelativeTime(nextAt - Date.now())}`;
           }
-          console.log(`[${tag}] ${label} ${pair} every ${interval} \u2014 ${lastPart}, ${nextPart}`);
+          const statusTag = r3.active ? "" : " [paused]";
+          console.log(
+            `[${tag}] ${label} ${pair} every ${interval} \u2014 ${lastPart}, ${nextPart}${statusTag}`
+          );
         } else {
-          const cond = `${r3.fromToken} ${r3.condition} $${r3.targetPrice}`;
-          console.log(`[${tag}] ${label} ${pair} when ${cond} \u2014 waiting`);
+          const cond = `${r3.toToken} ${r3.condition} $${r3.targetPrice}`;
+          const statusTag = r3.active ? "" : " [paused]";
+          console.log(`[${tag}] ${label} ${pair} when ${cond} \u2014 waiting${statusTag}`);
         }
       }
     } catch (err) {
@@ -55029,66 +55623,6 @@ function registerAutomateCommand(program3) {
   });
 }
 
-// src/commands/skill.ts
-var import_fs = require("fs");
-var import_path = require("path");
-var import_os2 = require("os");
-var SKILL_ID = "twak";
-var SKILL_NAME = "TWAK \u2014 Trust Wallet Agent Kit";
-function findSkillMd() {
-  const candidates = [
-    (0, import_path.resolve)(__dirname, "../../../../skill.md"),
-    (0, import_path.resolve)(__dirname, "../../../skill.md"),
-    (0, import_path.resolve)(__dirname, "../../skill.md"),
-    (0, import_path.resolve)(process.cwd(), "skill.md")
-  ];
-  for (const p3 of candidates) {
-    if ((0, import_fs.existsSync)(p3)) return p3;
-  }
-  return null;
-}
-function registerSkillCommand(program3) {
-  const skill = program3.command("skill").description("Manage AI skills for Claude Code and other agents");
-  skill.command("install").description("Install the TWAK skill into your Claude Code skills directory").option("--dir <path>", "Custom skills directory (default: ~/.claude/skills/)").action(async (opts) => {
-    const skillSrc = findSkillMd();
-    if (!skillSrc) {
-      error("skill.md not found. Run from the TWAK monorepo root or a published install.");
-      process.exitCode = 1;
-      return;
-    }
-    const skillsDir = opts.dir ? (0, import_path.resolve)(opts.dir) : (0, import_path.join)((0, import_os2.homedir)(), ".claude", "skills");
-    if (opts.dir) {
-      const { relative, sep: sep2 } = await import("path");
-      const safeBase = (0, import_path.join)((0, import_os2.homedir)(), ".claude");
-      const rel = relative(safeBase, skillsDir);
-      const isOutside = rel.startsWith("..") || rel.startsWith(sep2) || (0, import_path.resolve)(opts.dir) === (0, import_path.resolve)("/");
-      if (isOutside) {
-        error(`Refusing to install outside ~/.claude/ (got ${skillsDir}). Use --dir ~/.claude/skills or omit --dir.`);
-        process.exitCode = 1;
-        return;
-      }
-    }
-    (0, import_fs.mkdirSync)(skillsDir, { recursive: true });
-    const dest = (0, import_path.join)(skillsDir, `${SKILL_ID}.md`);
-    (0, import_fs.copyFileSync)(skillSrc, dest);
-    success(`Skill installed to ${dest}`);
-    info("Claude Code will load it automatically on next startup.");
-  });
-  skill.command("list").description("List available TWAK skills").option("--json", "JSON output").action((opts) => {
-    const skills = [{ id: SKILL_ID, name: SKILL_NAME, description: "Wallets, swaps, transfers, market data, alerts, DCA, on/off-ramp, and MCP server." }];
-    output(skills, opts.json);
-  });
-  skill.command("retrieve").description("Print the full TWAK skill instructions").action(() => {
-    const skillSrc = findSkillMd();
-    if (!skillSrc) {
-      error("skill.md not found.");
-      process.exitCode = 1;
-      return;
-    }
-    console.log((0, import_fs.readFileSync)(skillSrc, "utf8"));
-  });
-}
-
 // src/commands/x402.ts
 init_dist2();
 init_dist4();
@@ -55121,7 +55655,7 @@ async function validateX402Url(urlStr) {
   if (parsed.protocol !== "https:") {
     throw new Error(`x402: only https:// URLs are allowed (got ${parsed.protocol}//)`);
   }
-  const h4 = parsed.hostname;
+  const h4 = parsed.hostname.replace(/^\[|\]$/g, "");
   if (h4 === "localhost" || isPrivateIp(h4)) {
     throw new Error(`x402: private/loopback addresses are not allowed (${h4})`);
   }
@@ -55130,7 +55664,9 @@ async function validateX402Url(urlStr) {
     const records = await dns.lookup(h4, { all: true });
     for (const record2 of records) {
       if (isPrivateIp(record2.address)) {
-        throw new Error(`x402: "${h4}" resolves to a private/loopback address (${record2.address}) \u2014 not allowed`);
+        throw new Error(
+          `x402: "${h4}" resolves to a private/loopback address (${record2.address}) \u2014 not allowed`
+        );
       }
     }
   } catch (err) {
@@ -55139,7 +55675,14 @@ async function validateX402Url(urlStr) {
 }
 function registerX402Command(program3) {
   const x402 = program3.command("x402").description("x402 micropayment protocol \u2014 pay HTTP endpoints that require on-chain payment");
-  x402.command("request <url>").description("Make an HTTP request to an x402-gated endpoint, paying automatically if required").option("--method <method>", "HTTP method", "GET").option("--body <json>", "Request body (JSON string)").option("--max-payment <amount>", "Maximum payment amount to auto-approve (default: 0.01)", "0.01").option("--yes", "Skip confirmation prompt and auto-approve payment up to --max-payment").option("--password <password>", "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)").option("--json", "JSON output").action(async (url, opts) => {
+  x402.command("request <url>").description("Make an HTTP request to an x402-gated endpoint, paying automatically if required").option("--method <method>", "HTTP method", "GET").option("--body <json>", "Request body (JSON string)").option(
+    "--max-payment <amount>",
+    "Maximum payment amount to auto-approve (default: 0.01)",
+    "0.01"
+  ).option("--yes", "Skip confirmation prompt and auto-approve payment up to --max-payment").option(
+    "--password <password>",
+    "Wallet password (falls back to keychain / TWAK_WALLET_PASSWORD)"
+  ).option("--json", "JSON output").action(async (url, opts) => {
     try {
       await validateX402Url(url);
       await ensureTrustSDK();
@@ -55147,7 +55690,7 @@ function registerX402Command(program3) {
       const provider = await AgentWalletProvider.fromStorage(password);
       const init3 = {
         method: opts.method.toUpperCase(),
-        headers: { "Content-Type": "application/json", "Accept": "application/json" },
+        headers: { "Content-Type": "application/json", Accept: "application/json" },
         body: opts.body || void 0
       };
       let resp = await fetch(url, init3);
@@ -55160,7 +55703,9 @@ function registerX402Command(program3) {
         if (!recipient) throw new Error("x402: no recipient address in 402 response");
         const maxPayment = parseFloat(opts.maxPayment);
         if (!Number.isFinite(maxPayment) || maxPayment <= 0) {
-          throw new Error(`x402: invalid --max-payment value "${opts.maxPayment}" \u2014 must be a positive number`);
+          throw new Error(
+            `x402: invalid --max-payment value "${opts.maxPayment}" \u2014 must be a positive number`
+          );
         }
         const requestedAmount = parseFloat(amount);
         if (isNaN(requestedAmount) || requestedAmount <= 0) {
@@ -55174,7 +55719,7 @@ function registerX402Command(program3) {
         if (!opts.yes) {
           const readline = await import("readline");
           const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
-          const confirmed = await new Promise((resolve3) => {
+          const confirmed = await new Promise((resolve2) => {
             rl.question(
               `
 Pay ${amount} ${asset.toUpperCase()} on ${chainId}
@@ -55182,7 +55727,7 @@ Recipient: ${recipient}
 Confirm? [y/N] `,
               (answer) => {
                 rl.close();
-                resolve3(answer.toLowerCase() === "y");
+                resolve2(answer.toLowerCase() === "y");
               }
             );
           });
@@ -55210,7 +55755,9 @@ Confirm? [y/N] `,
         }
         const txResult = await bc2.transfer({ assetId, to: recipient, amount, hdWallet });
         info(`Payment sent: ${txResult.hash}`);
-        const paymentProof = Buffer.from(JSON.stringify({ txHash: txResult.hash, chainId })).toString("base64");
+        const paymentProof = Buffer.from(
+          JSON.stringify({ txHash: txResult.hash, chainId })
+        ).toString("base64");
         resp = await fetch(url, {
           ...init3,
           headers: { ...init3.headers, "X-Payment": paymentProof }
@@ -55251,7 +55798,7 @@ var crypto6 = __toESM(require("crypto"));
 // package.json
 var package_default = {
   name: "@trustwallet/cli",
-  version: "0.7.0",
+  version: "0.9.0",
   description: "TWAK CLI \u2014 command-line interface for Trust Wallet Agent Kit",
   main: "dist/index.js",
   types: "dist/index.d.ts",
@@ -55267,16 +55814,17 @@ var package_default = {
     prebuild: "rm -rf trust-sdk && cp -r ../../vendor/trust-sdk trust-sdk",
     build: "tsup && tsc --emitDeclarationOnly --outDir dist",
     typecheck: "tsc --noEmit",
+    test: "vitest run",
     lint: "eslint src/",
     clean: "rm -rf dist"
   },
   dependencies: {
     "node-fetch": "2.7.0",
-    "qrcode-terminal": "0.12.0"
+    "qrcode-terminal": "0.12.0",
+    "@napi-rs/keyring": "1.2.0"
   },
   optionalDependencies: {
-    "@amplitude/analytics-node": "1.5.39",
-    keytar: "7.9.0"
+    "@amplitude/analytics-node": "1.5.39"
   },
   devDependencies: {
     boxen: "5.1.2",
@@ -55295,7 +55843,8 @@ var package_default = {
     "@twak/wallet-core": "workspace:*",
     "@twak/walletconnect": "workspace:*",
     tsup: "8.5.1",
-    typescript: "5.7.3"
+    typescript: "5.7.3",
+    vitest: "4.1.2"
   },
   publishConfig: {
     access: "public"
@@ -55426,7 +55975,13 @@ function parseInterval2(value) {
   return num;
 }
 function registerWatchCommand(program3) {
-  program3.command("watch").description("Background watcher \u2014 polls prices to trigger alerts and execute DCA/limit automations").option("--interval <duration>", "Poll interval \u2014 e.g. 30s, 5m, 1h, or plain number (seconds)", "60").option("--password <password>", "Wallet password for executing swaps").option("--auto-lock <minutes>", "Auto-lock wallet after N minutes of inactivity").option("--dry-run", "Check conditions without executing swaps").option("--json", "JSON output per tick").action(async (opts) => {
+  program3.command("watch").description(
+    "Background watcher \u2014 polls prices to trigger alerts and execute DCA/limit automations"
+  ).option(
+    "--interval <duration>",
+    "Poll interval \u2014 e.g. 30s, 5m, 1h, or plain number (seconds)",
+    "60"
+  ).option("--password <password>", "Wallet password for executing swaps").option("--auto-lock <minutes>", "Auto-lock wallet after N minutes of inactivity").option("--dry-run", "Check conditions without executing swaps").option("--json", "JSON output per tick").action(async (opts) => {
     const intervalSec = parseInterval2(opts.interval);
     if (intervalSec === null || intervalSec < 5) {
       error("Interval must be at least 5 seconds (e.g. 30s, 5m, 1h)");
@@ -55472,7 +56027,20 @@ function registerWatchCommand(program3) {
     }
     const alertStore = new AlertStore();
     const automationStore = new AutomationStore();
-    info(`[${ts3()}] Watcher started \u2014 polling every ${intervalSec}s${opts.dryRun ? " (dry run)" : ""}`);
+    const dryRunState = /* @__PURE__ */ new Map();
+    const getMemState = (id, stored) => {
+      if (!dryRunState.has(id)) {
+        dryRunState.set(id, {
+          lastRunAt: stored.lastRunAt ?? null,
+          runCount: stored.runCount ?? 0,
+          active: true
+        });
+      }
+      return dryRunState.get(id);
+    };
+    info(
+      `[${ts3()}] Watcher started \u2014 polling every ${intervalSec}s${opts.dryRun ? " (dry run)" : ""}`
+    );
     const tick = async () => {
       const tickResults = {
         alerts: { checked: 0, triggered: [] },
@@ -55488,44 +56056,81 @@ function registerWatchCommand(program3) {
             if (price === null) continue;
             const triggered = alert.condition === "above" && price >= alert.targetPrice || alert.condition === "below" && price <= alert.targetPrice;
             if (triggered) {
-              await alertStore.update(alert.id, { active: false, triggeredAt: (/* @__PURE__ */ new Date()).toISOString() });
-              const detail = { id: alert.id, tokenId: alert.tokenId, condition: alert.condition, targetPrice: alert.targetPrice, currentPrice: price };
+              if (!opts.dryRun)
+                await alertStore.update(alert.id, {
+                  active: false,
+                  triggeredAt: (/* @__PURE__ */ new Date()).toISOString()
+                });
+              const detail = {
+                id: alert.id,
+                tokenId: alert.tokenId,
+                condition: alert.condition,
+                targetPrice: alert.targetPrice,
+                currentPrice: price
+              };
               tickResults.alerts.triggered.push(detail);
-              success(`[${ts3()}] ALERT TRIGGERED: ${alert.tokenId} price $${price} is ${alert.condition} $${alert.targetPrice}`);
+              success(
+                `[${ts3()}] ${opts.dryRun ? "DRY RUN \u2014 would trigger alert: " : "ALERT TRIGGERED: "}${alert.tokenId} price $${price} is ${alert.condition} $${alert.targetPrice}`
+              );
             }
           } catch (err) {
-            warn(`[${ts3()}] Alert ${alert.id} check failed: ${err instanceof Error ? err.message : String(err)}`);
+            warn(
+              `[${ts3()}] Alert ${alert.id} check failed: ${err instanceof Error ? err.message : String(err)}`
+            );
           }
         }
         const automations = await automationStore.getActive();
         const now = Date.now();
         for (const auto of automations) {
           try {
+            const memState = opts.dryRun ? getMemState(auto.id, auto) : null;
+            if (memState && !memState.active) {
+              tickResults.automations.skipped++;
+              continue;
+            }
             if (auto.expiresAt && new Date(auto.expiresAt).getTime() <= now) {
-              await automationStore.update(auto.id, { active: false });
+              if (!opts.dryRun) await automationStore.update(auto.id, { active: false });
+              else if (memState) memState.active = false;
               dim(`[${ts3()}] Automation ${auto.id.slice(0, 8)} expired`);
               tickResults.automations.skipped++;
               continue;
             }
-            if (auto.maxRuns && (auto.runCount ?? 0) >= auto.maxRuns) {
-              await automationStore.update(auto.id, { active: false });
-              dim(`[${ts3()}] Automation ${auto.id.slice(0, 8)} reached max runs (${auto.maxRuns})`);
+            const effectiveRunCount = memState ? memState.runCount : auto.runCount ?? 0;
+            if (auto.maxRuns && effectiveRunCount >= auto.maxRuns) {
+              if (!opts.dryRun) await automationStore.update(auto.id, { active: false });
+              dim(
+                `[${ts3()}] Automation ${auto.id.slice(0, 8)} reached max runs (${auto.maxRuns})`
+              );
+              tickResults.automations.skipped++;
+              continue;
+            }
+            if (!getChainById(auto.chain)) {
+              warn(
+                `[${ts3()}] Automation ${auto.id.slice(0, 8)} skipped \u2014 unknown chain "${auto.chain}"`
+              );
               tickResults.automations.skipped++;
               continue;
             }
             if (auto.type === "dca") {
-              const lastRun = auto.lastRunAt ? new Date(auto.lastRunAt).getTime() : 0;
+              const effectiveLastRunAt = memState ? memState.lastRunAt : auto.lastRunAt;
+              const lastRun = effectiveLastRunAt ? new Date(effectiveLastRunAt).getTime() : 0;
               const intervalMs = auto.intervalMs || 0;
               if (lastRun + intervalMs > now) {
                 tickResults.automations.skipped++;
                 continue;
               }
-              if (opts.dryRun) {
-                dim(`[${ts3()}] DRY RUN: would swap ${auto.amount} ${auto.fromToken} -> ${auto.toToken} on ${auto.chain}`);
+              if (opts.dryRun && memState) {
+                memState.lastRunAt = (/* @__PURE__ */ new Date()).toISOString();
+                memState.runCount++;
+                dim(
+                  `[${ts3()}] DRY RUN: would swap ${auto.amount} ${auto.fromToken} -> ${auto.toToken} on ${auto.chain}`
+                );
                 tickResults.automations.executed.push({ id: auto.id, type: "dca", dryRun: true });
                 continue;
               }
-              info(`[${ts3()}] Executing DCA: ${auto.amount} ${auto.fromToken} -> ${auto.toToken} on ${auto.chain}`);
+              info(
+                `[${ts3()}] Executing DCA: ${auto.amount} ${auto.fromToken} -> ${auto.toToken} on ${auto.chain}`
+              );
               const result = await executor.execute({
                 fromChain: auto.chain,
                 fromToken: auto.fromToken,
@@ -55534,27 +56139,58 @@ function registerWatchCommand(program3) {
                 amount: auto.amount
               });
               if (result.success) {
-                await automationStore.update(auto.id, { lastRunAt: (/* @__PURE__ */ new Date()).toISOString(), runCount: (auto.runCount ?? 0) + 1 });
+                await automationStore.update(auto.id, {
+                  lastRunAt: (/* @__PURE__ */ new Date()).toISOString(),
+                  runCount: (auto.runCount ?? 0) + 1
+                });
                 success(`[${ts3()}] DCA executed: ${result.explorerUrl}`);
-                tickResults.automations.executed.push({ id: auto.id, type: "dca", txHash: result.txHash, explorer: result.explorerUrl });
+                tickResults.automations.executed.push({
+                  id: auto.id,
+                  type: "dca",
+                  txHash: result.txHash,
+                  explorer: result.explorerUrl
+                });
               } else {
                 warn(`[${ts3()}] DCA ${auto.id} failed: ${result.error}`);
               }
             } else if (auto.type === "limit") {
               const toTokenInfo = resolveToken(auto.toToken, auto.chain);
+              if (!toTokenInfo) {
+                warn(`[${ts3()}] Automation ${auto.id.slice(0, 8)} skipped \u2014 unknown token "${auto.toToken}" on ${auto.chain}`);
+                continue;
+              }
               const price = await swapClient.getTokenPrice(auto.chain, toTokenInfo.address);
-              if (price === null) continue;
+              if (price === null) {
+                if (opts.dryRun)
+                  dim(
+                    `[${ts3()}] DRY RUN: skipping limit order ${auto.id.slice(0, 8)} \u2014 price unavailable for ${auto.toToken}`
+                  );
+                continue;
+              }
               const triggered = auto.condition === "below" && price <= (auto.targetPrice || 0) || auto.condition === "above" && price >= (auto.targetPrice || 0);
               if (!triggered) {
+                if (opts.dryRun)
+                  dim(
+                    `[${ts3()}] DRY RUN: limit order ${auto.id.slice(0, 8)} waiting \u2014 ${auto.toToken} $${price} vs target $${auto.targetPrice} (${auto.condition})`
+                  );
                 tickResults.automations.skipped++;
                 continue;
               }
-              if (opts.dryRun) {
-                dim(`[${ts3()}] DRY RUN: limit order triggered \u2014 would swap ${auto.amount} ${auto.fromToken} -> ${auto.toToken} on ${auto.chain}`);
-                tickResults.automations.executed.push({ id: auto.id, type: "limit", dryRun: true });
+              if (opts.dryRun && memState) {
+                memState.active = false;
+                dim(
+                  `[${ts3()}] DRY RUN: limit order triggered \u2014 would swap ${auto.amount} ${auto.fromToken} -> ${auto.toToken} on ${auto.chain}`
+                );
+                tickResults.automations.executed.push({
+                  id: auto.id,
+                  type: "limit",
+                  dryRun: true
+                });
                 continue;
               }
-              info(`[${ts3()}] Limit order triggered: swapping ${auto.amount} ${auto.fromToken} -> ${auto.toToken} on ${auto.chain}`);
+              info(
+                `[${ts3()}] Limit order triggered: swapping ${auto.amount} ${auto.fromToken} -> ${auto.toToken} on ${auto.chain}`
+              );
               const result = await executor.execute({
                 fromChain: auto.chain,
                 fromToken: auto.fromToken,
@@ -55563,15 +56199,25 @@ function registerWatchCommand(program3) {
                 amount: auto.amount
               });
               if (result.success) {
-                await automationStore.update(auto.id, { active: false, lastRunAt: (/* @__PURE__ */ new Date()).toISOString() });
+                await automationStore.update(auto.id, {
+                  active: false,
+                  lastRunAt: (/* @__PURE__ */ new Date()).toISOString()
+                });
                 success(`[${ts3()}] Limit order executed: ${result.explorerUrl}`);
-                tickResults.automations.executed.push({ id: auto.id, type: "limit", txHash: result.txHash, explorer: result.explorerUrl });
+                tickResults.automations.executed.push({
+                  id: auto.id,
+                  type: "limit",
+                  txHash: result.txHash,
+                  explorer: result.explorerUrl
+                });
               } else {
                 warn(`[${ts3()}] Limit order ${auto.id} failed: ${result.error}`);
               }
             }
           } catch (err) {
-            warn(`[${ts3()}] Automation ${auto.id} failed: ${err instanceof Error ? err.message : String(err)}`);
+            warn(
+              `[${ts3()}] Automation ${auto.id} failed: ${err instanceof Error ? err.message : String(err)}`
+            );
           }
         }
       } catch (err) {
@@ -55580,7 +56226,9 @@ function registerWatchCommand(program3) {
       if (opts.json) {
         output({ timestamp: (/* @__PURE__ */ new Date()).toISOString(), ...tickResults }, true);
       } else if (tickResults.alerts.triggered.length === 0 && tickResults.automations.executed.length === 0) {
-        dim(`[${ts3()}] Checked ${tickResults.alerts.checked} alerts, ${tickResults.automations.skipped} automations \u2014 nothing to do`);
+        dim(
+          `[${ts3()}] Checked ${tickResults.alerts.checked} alerts, ${tickResults.automations.skipped} automations \u2014 nothing to do`
+        );
       }
     };
     await tick();
@@ -55619,7 +56267,6 @@ registerAlertCommand(program2);
 registerQueryCommand(program2);
 registerServeCommand(program2);
 registerAutomateCommand(program2);
-registerSkillCommand(program2);
 registerX402Command(program2);
 registerTelemetryCommand(program2);
 registerWatchCommand(program2);