@vultisig/cli 5.1.0 → 6.0.0

package/CHANGELOG.md

@@ -1,5 +1,46 @@
 # @vultisig/cli
 
+## 6.0.0
+
+### Major Changes
+
+- [#2218](https://github.com/vultisig/vultisig-sdk/pull/2218) [`d043dc4`](https://github.com/vultisig/vultisig-sdk/commit/d043dc43d9fe33a3160c2739150fd6294f0e7eff) Thanks [@rcoderdev](https://github.com/rcoderdev)! - Unify the workspace on the coordinated Noble/Scure v2 stack and align related workspace peer dependency ranges.
+
+### Minor Changes
+
+- [#2024](https://github.com/vultisig/vultisig-sdk/pull/2024) [`821c8a7`](https://github.com/vultisig/vultisig-sdk/commit/821c8a73dd7d3aee55eaca59c22adc1ce8dae2f2) Thanks [@neavra](https://github.com/neavra)! - Label XRP spendable-vs-total balance. `getRippleNativeBalanceDetail` exposes the `{ total, spendable, reserve }` breakdown of a native XRP balance (the existing resolvers keep returning the spendable number, so no consumer changes meaning). SDK `Balance` gains optional `totalAmount`/`reserveAmount` fields, populated for native XRP. The CLI labels the spendable headline and prints the locked reserve for XRP balances; all other chains render unchanged.
+
+### Patch Changes
+
+- [#2176](https://github.com/vultisig/vultisig-sdk/pull/2176) [`d2edffd`](https://github.com/vultisig/vultisig-sdk/commit/d2edffd98730daa474d0c2f35a305d5277e3eb15) Thanks [@rcoderdev](https://github.com/rcoderdev)! - Export a canonical typed parser for backend `tx_ready` and execute-prep envelopes, and migrate the CLI's non-EVM and THOR/Maya execution routing to that shared contract.
+
+- [#1736](https://github.com/vultisig/vultisig-sdk/pull/1736) [`b58da97`](https://github.com/vultisig/vultisig-sdk/commit/b58da972a3830eb11449401d97ae6b5e62189501) Thanks [@neavra](https://github.com/neavra)! - Fix agent send consent summaries so token tickers, chains, and contract details render exactly once; strip negated routed-chain phrases without leaving a dangling "not" and strip ASCII-ellipsis truncated contract copies like the Unicode form.
+
+- [#1760](https://github.com/vultisig/vultisig-sdk/pull/1760) [`9759c64`](https://github.com/vultisig/vultisig-sdk/commit/9759c6429225afe0ee96a8b51aff6b79026e1b8b) Thanks [@gomesalexandre](https://github.com/gomesalexandre)! - Preserve optional `priceProviderId` on `discoverTokens()` results so downstream consumers can price newly discovered tokens without app-local metadata backfills.
+
+- [#1870](https://github.com/vultisig/vultisig-sdk/pull/1870) [`3e37e69`](https://github.com/vultisig/vultisig-sdk/commit/3e37e69fdc60d63cb53a2ef7c74b01aa930b27e1) Thanks [@gomesalexandre](https://github.com/gomesalexandre)! - Add a public `pollTxStatusUntilFinal` helper to `@vultisig/sdk` and reuse it across SDK/CLI transaction finality polling paths.
+
+- [#2018](https://github.com/vultisig/vultisig-sdk/pull/2018) [`3163f30`](https://github.com/vultisig/vultisig-sdk/commit/3163f30ed91dad7c9e8f860c6d4dbb6e61899be8) Thanks [@neavra](https://github.com/neavra)! - The aggregate `balance` and `portfolio` views now say they only cover the vault's enabled chains. When the enabled set is a strict subset of the SDK-supported chains, the human output appends a hint pointing at `vultisig balance <chain>` and `vultisig chains --add <chain>`, and JSON mode carries the same text in a dedicated `scopeHint` field (omitted when every supported chain is enabled). The balances/portfolio payloads and the scoped `balance <chain>` path are unchanged.
+
+- Updated dependencies [[`d043dc4`](https://github.com/vultisig/vultisig-sdk/commit/d043dc43d9fe33a3160c2739150fd6294f0e7eff), [`d2edffd`](https://github.com/vultisig/vultisig-sdk/commit/d2edffd98730daa474d0c2f35a305d5277e3eb15), [`9759c64`](https://github.com/vultisig/vultisig-sdk/commit/9759c6429225afe0ee96a8b51aff6b79026e1b8b), [`eccbc25`](https://github.com/vultisig/vultisig-sdk/commit/eccbc25a1fd61fb9eb03494afb0d5ceb6977be8c), [`bd44426`](https://github.com/vultisig/vultisig-sdk/commit/bd44426fe80b160d8c9a0a866e3cbb759bf781ba), [`dd82325`](https://github.com/vultisig/vultisig-sdk/commit/dd82325ee2f5700429178cb513b338dac27aa281), [`e6375ee`](https://github.com/vultisig/vultisig-sdk/commit/e6375ee8a4d77035b4ae8dae01184b2100ac8ca7), [`e2be3d4`](https://github.com/vultisig/vultisig-sdk/commit/e2be3d41214b988c3b917538e26dbe1e123725de), [`f170bdd`](https://github.com/vultisig/vultisig-sdk/commit/f170bdddafd80d892cd35a050cf8f5393776a6a0), [`6c535ae`](https://github.com/vultisig/vultisig-sdk/commit/6c535ae3aed1c376d2e1bbbeb100e8b5c21c8929), [`5bf33f2`](https://github.com/vultisig/vultisig-sdk/commit/5bf33f264c90ec4055d2c12e90222bec9aea501b), [`3203589`](https://github.com/vultisig/vultisig-sdk/commit/3203589af5da361dfc51695aad4fef77afa2d78e), [`3e37e69`](https://github.com/vultisig/vultisig-sdk/commit/3e37e69fdc60d63cb53a2ef7c74b01aa930b27e1), [`4c30666`](https://github.com/vultisig/vultisig-sdk/commit/4c306668690f798ff4fb9094cf16dd26eaafa8e7), [`1672265`](https://github.com/vultisig/vultisig-sdk/commit/16722657dcefafff32744a7673c277e403e62a77), [`2faf1a2`](https://github.com/vultisig/vultisig-sdk/commit/2faf1a2b833b1fc0f10a02ad2c8bec50ef4b1f57), [`beaca3c`](https://github.com/vultisig/vultisig-sdk/commit/beaca3c086679a8b87592fb69ca30a0a9d1877db), [`5500717`](https://github.com/vultisig/vultisig-sdk/commit/5500717036e760ed81d4880c66bda559d37331cd), [`d04f246`](https://github.com/vultisig/vultisig-sdk/commit/d04f246a992f3256e4fe7151e5319003d8ae267a), [`da2ea4e`](https://github.com/vultisig/vultisig-sdk/commit/da2ea4e1ae00f17cfec3d27da4fff2e6cb5b1190), [`821c8a7`](https://github.com/vultisig/vultisig-sdk/commit/821c8a73dd7d3aee55eaca59c22adc1ce8dae2f2)]:
+  - @vultisig/core-chain@4.0.0
+  - @vultisig/sdk@6.0.0
+  - @vultisig/rujira@70.0.0
+  - @vultisig/client-shared@0.3.5
+
+## 5.2.0
+
+### Minor Changes
+
+- [#1719](https://github.com/vultisig/vultisig-sdk/pull/1719) [`ac213ac`](https://github.com/vultisig/vultisig-sdk/commit/ac213ac23f49e0d3ea3ad1cb10a055f28c921469) Thanks [@rcoderdev](https://github.com/rcoderdev)! - Add direct unsigned CLI preparation commands for contract calls, IBC, SPL, TRC-20, Jetton, Sui tokens, Polkadot assets, Cosmos staking, and CW-20 transfers.
+
+### Patch Changes
+
+- Updated dependencies [[`397c2b6`](https://github.com/vultisig/vultisig-sdk/commit/397c2b6629fdc7002d55bd95bb8585dce78de416), [`df144e9`](https://github.com/vultisig/vultisig-sdk/commit/df144e9e21c2fb64e73efcf12ac35c958dbf1c7b), [`7d6a014`](https://github.com/vultisig/vultisig-sdk/commit/7d6a01440fd0b855356cce81469b5b5a91665862)]:
+  - @vultisig/sdk@5.2.0
+  - @vultisig/core-chain@3.0.0
+  - @vultisig/rujira@69.0.0
+
 ## 5.1.0
 
 ### Patch Changes

package/README.md

@@ -367,6 +367,28 @@ Swap quotes and previews show your VULT discount tier when affiliate fees are ap
 | `sign`                       | Sign pre-hashed bytes for custom transactions |
 | `broadcast`                  | Broadcast a pre-signed raw transaction        |
 | `tx-status <chain> <txHash>` | Check transaction confirmation status         |
+| `prep <helper>`              | Build an unsigned SDK transaction payload     |
+
+#### Unsigned transaction preparation
+
+`vultisig prep` exposes the SDK's specialized transaction builders directly. These commands only build unsigned
+payloads: they never sign or broadcast. Identity-dependent helpers use the active vault's public identity by default;
+isolated tooling can pass the same non-secret fields with `--identity <json>`.
+
+```bash
+vultisig prep contract-call Ethereum <contractAddress> approve --sender <senderAddress> --abi '[{"type":"function","name":"approve","inputs":[{"type":"address","name":"spender"},{"type":"uint256","name":"amount"}]}]' --args '["<spenderAddress>","1000000"]'
+vultisig prep ibc-transfer Osmosis <sourceAddress> <receiverAddress> uosmo 1000000 --to-chain Cosmos
+vultisig prep spl-transfer <mint> <from> <to> 1000000 6
+vultisig prep trc20-transfer <contract> <from> <to> 1000000
+vultisig prep jetton-transfer <recipient> <senderJettonWallet> 1000000 5
+vultisig prep sui-token-transfer <coinType> <from> <to> 1000000 --decimals 6 --ticker USDC
+vultisig prep polkadot-asset-send 1984 <from> <to> 1000000
+vultisig prep cosmos-staking delegate <delegator> <validator> 5000000 uosmo
+vultisig prep cw20-transfer osmo <contract> <recipient> 1000000 <sender>
+```
+
+Run `vultisig prep <helper> --help` for the complete optional parameter set. JSON mode returns
+`{ helper, unsigned: true, result }` inside the standard versioned success envelope.
 
 #### Transaction Status
 

package/dist/index.js

@@ -2506,7 +2506,7 @@ var init_toBytes = __esm({
   }
 });
 
-// ../../node_modules/@noble/hashes/esm/_u64.js
+// ../../node_modules/viem/node_modules/@noble/hashes/esm/_u64.js
 function fromBig(n, le = false) {
   if (le)
     return { h: Number(n & U32_MASK64), l: Number(n >> _32n & U32_MASK64) };
@@ -2524,7 +2524,7 @@ function split(lst, le = false) {
 }
 var U32_MASK64, _32n, rotlSH, rotlSL, rotlBH, rotlBL;
 var init_u64 = __esm({
-  "../../node_modules/@noble/hashes/esm/_u64.js"() {
+  "../../node_modules/viem/node_modules/@noble/hashes/esm/_u64.js"() {
     U32_MASK64 = /* @__PURE__ */ BigInt(2 ** 32 - 1);
     _32n = /* @__PURE__ */ BigInt(32);
     rotlSH = (h, l, s) => h << s | l >>> 32 - s;
@@ -2534,16 +2534,16 @@ var init_u64 = __esm({
   }
 });
 
-// ../../node_modules/@noble/hashes/esm/cryptoNode.js
+// ../../node_modules/viem/node_modules/@noble/hashes/esm/cryptoNode.js
 import * as nc from "node:crypto";
 var crypto2;
 var init_cryptoNode = __esm({
-  "../../node_modules/@noble/hashes/esm/cryptoNode.js"() {
+  "../../node_modules/viem/node_modules/@noble/hashes/esm/cryptoNode.js"() {
     crypto2 = nc && typeof nc === "object" && "webcrypto" in nc ? nc.webcrypto : nc && typeof nc === "object" && "randomBytes" in nc ? nc : void 0;
   }
 });
 
-// ../../node_modules/@noble/hashes/esm/utils.js
+// ../../node_modules/viem/node_modules/@noble/hashes/esm/utils.js
 function isBytes(a) {
   return a instanceof Uint8Array || ArrayBuffer.isView(a) && a.constructor.name === "Uint8Array";
 }
@@ -2644,7 +2644,7 @@ function randomBytes2(bytesLength = 32) {
 }
 var isLE, swap32IfBE, Hash;
 var init_utils2 = __esm({
-  "../../node_modules/@noble/hashes/esm/utils.js"() {
+  "../../node_modules/viem/node_modules/@noble/hashes/esm/utils.js"() {
     init_cryptoNode();
     isLE = /* @__PURE__ */ (() => new Uint8Array(new Uint32Array([287454020]).buffer)[0] === 68)();
     swap32IfBE = isLE ? (u) => u : byteSwap32;
@@ -2653,7 +2653,7 @@ var init_utils2 = __esm({
   }
 });
 
-// ../../node_modules/@noble/hashes/esm/sha3.js
+// ../../node_modules/viem/node_modules/@noble/hashes/esm/sha3.js
 function keccakP(s, rounds = 24) {
   const B = new Uint32Array(5 * 2);
   for (let round = 24 - rounds; round < 24; round++) {
@@ -2696,7 +2696,7 @@ function keccakP(s, rounds = 24) {
 }
 var _0n, _1n, _2n, _7n, _256n, _0x71n, SHA3_PI, SHA3_ROTL, _SHA3_IOTA, IOTAS, SHA3_IOTA_H, SHA3_IOTA_L, rotlH, rotlL, Keccak, gen, keccak_256;
 var init_sha3 = __esm({
-  "../../node_modules/@noble/hashes/esm/sha3.js"() {
+  "../../node_modules/viem/node_modules/@noble/hashes/esm/sha3.js"() {
     init_u64();
     init_utils2();
     _0n = BigInt(0);
@@ -3852,10 +3852,10 @@ var init_decodeAbiParameters = __esm({
 });
 
 // ../../node_modules/viem/_esm/utils/stringify.js
-var stringify;
+var stringify2;
 var init_stringify = __esm({
   "../../node_modules/viem/_esm/utils/stringify.js"() {
-    stringify = (value, replacer, space) => JSON.stringify(value, (key, value_) => {
+    stringify2 = (value, replacer, space) => JSON.stringify(value, (key, value_) => {
       const value2 = typeof value_ === "bigint" ? value_.toString() : value_;
       return typeof replacer === "function" ? replacer(key, value2) : value2;
     }, space);
@@ -3895,7 +3895,7 @@ var init_Value = __esm({
   }
 });
 
-// ../../node_modules/@noble/hashes/esm/_md.js
+// ../../node_modules/viem/node_modules/@noble/hashes/esm/_md.js
 function setBigUint64(view, byteOffset, value, isLE2) {
   if (typeof view.setBigUint64 === "function")
     return view.setBigUint64(byteOffset, value, isLE2);
@@ -3916,7 +3916,7 @@ function Maj(a, b, c) {
 }
 var HashMD, SHA256_IV;
 var init_md = __esm({
-  "../../node_modules/@noble/hashes/esm/_md.js"() {
+  "../../node_modules/viem/node_modules/@noble/hashes/esm/_md.js"() {
     init_utils2();
     HashMD = class extends Hash {
       constructor(blockLen, outputLen, padOffset, isLE2) {
@@ -4021,10 +4021,10 @@ var init_md = __esm({
   }
 });
 
-// ../../node_modules/@noble/hashes/esm/sha2.js
+// ../../node_modules/viem/node_modules/@noble/hashes/esm/sha2.js
 var SHA256_K, SHA256_W, SHA256, sha256;
 var init_sha2 = __esm({
-  "../../node_modules/@noble/hashes/esm/sha2.js"() {
+  "../../node_modules/viem/node_modules/@noble/hashes/esm/sha2.js"() {
     init_md();
     init_utils2();
     SHA256_K = /* @__PURE__ */ Uint32Array.from([
@@ -4168,10 +4168,10 @@ var init_sha2 = __esm({
   }
 });
 
-// ../../node_modules/@noble/hashes/esm/hmac.js
+// ../../node_modules/viem/node_modules/@noble/hashes/esm/hmac.js
 var HMAC, hmac;
 var init_hmac = __esm({
-  "../../node_modules/@noble/hashes/esm/hmac.js"() {
+  "../../node_modules/viem/node_modules/@noble/hashes/esm/hmac.js"() {
     init_utils2();
     HMAC = class extends Hash {
       constructor(hash2, _key) {
@@ -9104,7 +9104,7 @@ x ${classified.message}`);
 }
 
 // src/commands/balance.ts
-import { fiatCurrencies, fiatCurrencyNameRecord as fiatCurrencyNameRecord2 } from "@vultisig/sdk";
+import { fiatCurrencies, fiatCurrencyNameRecord as fiatCurrencyNameRecord2, SUPPORTED_CHAINS } from "@vultisig/sdk";
 
 // src/ui.ts
 import { fiatCurrencyNameRecord, fromChainAmountExact, Vultisig } from "@vultisig/sdk";
@@ -9115,10 +9115,19 @@ var escapeTerminalControls = (value) => Array.from(value, (character) => {
   const isTerminalControl = codePoint <= 31 || codePoint === 127 || codePoint >= 128 && codePoint <= 159;
   return isTerminalControl ? `\\x${codePoint.toString(16).padStart(2, "0").toUpperCase()}` : character;
 }).join("");
+var hasLockedReserve = (balance) => balance.reserveAmount !== void 0 && balance.reserveAmount !== "0" && balance.totalAmount !== void 0;
+var formatAmountCell = (balance) => hasLockedReserve(balance) ? `${balance.formattedAmount} (spendable)` : balance.formattedAmount;
 function displayBalance(chain, balance, _raw = false) {
   printResult(chalk2.cyan(`
 ${chain} Balance:`));
-  printResult(`  Amount: ${balance.formattedAmount} ${balance.symbol}`);
+  printResult(
+    `  Amount: ${balance.formattedAmount} ${balance.symbol}${hasLockedReserve(balance) ? " (spendable)" : ""}`
+  );
+  if (hasLockedReserve(balance) && balance.totalAmount !== void 0) {
+    const reserve = formatBalanceAmount(balance.reserveAmount, balance.decimals);
+    const total = formatBalanceAmount(balance.totalAmount, balance.decimals);
+    printResult(`  Reserve: ${reserve} ${balance.symbol} locked (${total} ${balance.symbol} total on ledger)`);
+  }
   if (balance.fiatValue && balance.fiatCurrency) {
     printResult(`  Value:  ${balance.fiatValue.toFixed(2)} ${balance.fiatCurrency}`);
   }
@@ -9127,7 +9136,7 @@ function displayBalancesTable(balances, _raw = false) {
   printResult(chalk2.cyan("\nPortfolio Balances:\n"));
   const tableData = Object.entries(balances).map(([chain, balance]) => ({
     Chain: chain,
-    Amount: balance.formattedAmount,
+    Amount: formatAmountCell(balance),
     Symbol: balance.symbol,
     Value: balance.fiatValue && balance.fiatCurrency ? `${balance.fiatValue.toFixed(2)} ${balance.fiatCurrency}` : "N/A"
   }));
@@ -9145,7 +9154,7 @@ function displayPortfolio(portfolio, currency, _raw = false) {
   const table = portfolio.chainBalances.flatMap(({ chain, balance, value, tokens }) => [
     {
       Chain: chain,
-      Amount: balance.formattedAmount,
+      Amount: formatAmountCell(balance),
       Symbol: balance.symbol,
       Value: value ? `${value.amount} ${value.currency.toUpperCase()}` : "N/A"
     },
@@ -9257,7 +9266,7 @@ async function confirmTransaction() {
 function setupVaultEvents(vault) {
   vault.on("balanceUpdated", ({ chain, balance, tokenId }) => {
     const asset = tokenId ? `${balance.symbol} token` : balance.symbol;
-    info(chalk2.blue(`i Balance updated for ${chain} (${asset}): ${balance.formattedAmount}`));
+    info(chalk2.blue(`i Balance updated for ${chain} (${asset}): ${formatAmountCell(balance)}`));
   });
   vault.on("transactionBroadcast", ({ chain, txHash }) => {
     info(chalk2.green(`+ Transaction broadcast on ${chain}`));
@@ -9292,6 +9301,14 @@ function formatBigintAmount(amount, decimals) {
   const trimmed = fraction.replace(/0+$/, "");
   return trimmed ? `${whole}.${trimmed}` : whole;
 }
+function formatBalanceAmount(amount, decimals) {
+  if (!amount || amount === "0") return "0";
+  try {
+    return formatBigintAmount(BigInt(amount), decimals);
+  } catch {
+    return amount;
+  }
+}
 function displaySwapPreview(quote, fromAmount, fromSymbol, toSymbol, options) {
   const estimatedOutputFormatted = formatBigintAmount(quote.estimatedOutput, options.toDecimals);
   printResult(chalk2.cyan("\nSwap Preview:"));
@@ -9371,6 +9388,13 @@ async function confirmSwap() {
 }
 
 // src/commands/balance.ts
+function buildScopeHint(enabledChains) {
+  const supportedCount = SUPPORTED_CHAINS.length;
+  const enabledSupportedCount = new Set(enabledChains.filter((chain) => SUPPORTED_CHAINS.includes(chain))).size;
+  if (enabledSupportedCount >= supportedCount) return void 0;
+  const noun = enabledSupportedCount === 1 ? "chain" : "chains";
+  return `Showing the vault's ${enabledSupportedCount} enabled ${noun} of ${supportedCount} supported. Funds on other chains won't appear here \u2014 run \`vultisig balance <chain>\` to check one, or \`vultisig chains --add <chain>\` to include it.`;
+}
 function conciseError(err) {
   const message = err instanceof Error ? err.message : String(err);
   return message.split("\n")[0].trim() || "Unknown error";
@@ -9400,11 +9424,14 @@ async function executeBalance(ctx2, options = {}) {
   } else {
     const balances = await vault.balances(void 0, options.includeTokens);
     spinner.succeed("Balances loaded");
+    const scopeHint = buildScopeHint(vault.chains);
     if (isJsonOutput()) {
-      outputJson({ balances });
+      outputJson({ balances, scopeHint });
       return;
     }
     displayBalancesTable(balances, raw);
+    if (scopeHint) info(`
+${scopeHint}`);
   }
 }
 async function executePortfolio(ctx2, options = {}) {
@@ -9480,11 +9507,14 @@ async function executePortfolio(ctx2, options = {}) {
   const totalValue = { amount: total.toFixed(2), currency, lastUpdated: Date.now() };
   const portfolio = { totalValue, chainBalances };
   spinner.succeed("Portfolio loaded");
+  const scopeHint = buildScopeHint(chains);
   if (isJsonOutput()) {
-    outputJson({ portfolio, currency, failures });
+    outputJson({ portfolio, currency, failures, scopeHint });
     return;
   }
   displayPortfolio(portfolio, currency, options.raw ?? false);
+  if (scopeHint) info(`
+${scopeHint}`);
   if (failures.length > 0) {
     warn(`
 Warning: ${failures.length} chain(s) failed to load fully:`);
@@ -9495,7 +9525,7 @@ Warning: ${failures.length} chain(s) failed to load fully:`);
 }
 
 // src/commands/chains.ts
-import { SUPPORTED_CHAINS } from "@vultisig/sdk";
+import { SUPPORTED_CHAINS as SUPPORTED_CHAINS2 } from "@vultisig/sdk";
 import chalk3 from "chalk";
 
 // src/core/active-vault.ts
@@ -10332,19 +10362,19 @@ async function executeChains(ctx2, options = {}) {
   const vault = await ctx2.ensureActiveVault();
   if (options.addAll) {
     const currentCount = vault.chains.length;
-    const spinner = createSpinner(`Adding all ${SUPPORTED_CHAINS.length} supported chains...`);
-    await vault.setChains([...SUPPORTED_CHAINS]);
-    const addedCount = SUPPORTED_CHAINS.length - currentCount;
-    spinner.succeed(`Added ${addedCount} chains (${SUPPORTED_CHAINS.length} total)`);
+    const spinner = createSpinner(`Adding all ${SUPPORTED_CHAINS2.length} supported chains...`);
+    await vault.setChains([...SUPPORTED_CHAINS2]);
+    const addedCount = SUPPORTED_CHAINS2.length - currentCount;
+    spinner.succeed(`Added ${addedCount} chains (${SUPPORTED_CHAINS2.length} total)`);
     if (isJsonOutput()) {
-      outputJson({ chains: [...vault.chains], added: addedCount, total: SUPPORTED_CHAINS.length });
+      outputJson({ chains: [...vault.chains], added: addedCount, total: SUPPORTED_CHAINS2.length });
       return;
     }
     info(chalk3.gray("\nAll supported chains are now enabled."));
     return;
   }
   if (options.add) {
-    if (!SUPPORTED_CHAINS.includes(options.add)) {
+    if (!SUPPORTED_CHAINS2.includes(options.add)) {
       throw new InvalidChainError(
         `Unsupported chain: "${options.add}"`,
         'Run "vultisig chains" to see the supported chains, or check the spelling.',
@@ -10384,7 +10414,7 @@ Chain already active: ${options.add}` : `
       printResult(`  - ${chain}`);
     });
     info(chalk3.gray(`
-${chains.length} of ${SUPPORTED_CHAINS.length} chains enabled`));
+${chains.length} of ${SUPPORTED_CHAINS2.length} chains enabled`));
     info(chalk3.gray("Use --add <chain>, --add-all, or --remove <chain>"));
   }
 }
@@ -10836,6 +10866,307 @@ async function sendTransaction(vault, params) {
   }
 }
 
+// src/commands/prep.ts
+import {
+  assertSafeDestination,
+  buildCw20TransferMsg,
+  buildDelegateMsg,
+  buildRedelegateMsg,
+  buildSplTransfer,
+  buildUndelegateMsg,
+  buildWithdrawRewardsMsg,
+  prepareContractCallTxFromKeys,
+  prepareIbcTransfer,
+  prepareJettonTransferTxFromKeys,
+  preparePolkadotAssetSend,
+  prepareSuiTokenTransferFromKeys,
+  prepareTrc20TransferFromKeys
+} from "@vultisig/sdk";
+var isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var parseJson = (raw, label) => {
+  try {
+    return JSON.parse(raw);
+  } catch (error2) {
+    const message = error2 instanceof Error ? error2.message : String(error2);
+    throw new InvalidInputError(`Invalid ${label} JSON: ${message}`);
+  }
+};
+var parseJsonArray = (raw, label) => {
+  const value = parseJson(raw, label);
+  if (!Array.isArray(value)) {
+    throw new InvalidInputError(`${label} must be a JSON array`);
+  }
+  return value;
+};
+var MAX_SAFE_INTEGER = BigInt(Number.MAX_SAFE_INTEGER);
+var assertLosslessJsonNumberLexemes = (raw, label) => {
+  let inString = false;
+  let escaped = false;
+  for (let index = 0; index < raw.length; index += 1) {
+    const character = raw[index];
+    if (inString) {
+      if (escaped) {
+        escaped = false;
+      } else if (character === "\\") {
+        escaped = true;
+      } else if (character === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    if (character === '"') {
+      inString = true;
+      continue;
+    }
+    if (character !== "-" && (character < "0" || character > "9")) continue;
+    const match = raw.slice(index).match(/^-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?/);
+    if (match === null) continue;
+    const lexeme = match[0];
+    if (/[.eE]/.test(lexeme) || BigInt(lexeme) > MAX_SAFE_INTEGER || BigInt(lexeme) < -MAX_SAFE_INTEGER) {
+      throw new InvalidInputError(
+        `${label} numeric values must be safe base-10 integer literals; pass ABI integers as decimal strings`
+      );
+    }
+    index += lexeme.length - 1;
+  }
+};
+var parseLosslessJsonArray = (raw, label) => {
+  assertLosslessJsonNumberLexemes(raw, label);
+  const value = parseJsonArray(raw, label);
+  return value;
+};
+var parseDecimalBigInt = (raw, label) => {
+  if (!/^-?\d+$/.test(raw)) {
+    throw new InvalidInputError(`${label} must be a base-10 integer string`);
+  }
+  return BigInt(raw);
+};
+var parseInteger = (raw, label) => {
+  if (!/^-?\d+$/.test(raw)) {
+    throw new InvalidInputError(`${label} must be an integer`);
+  }
+  const value = Number(raw);
+  if (!Number.isSafeInteger(value)) {
+    throw new InvalidInputError(`${label} must be a safe integer`);
+  }
+  return value;
+};
+var parseOptionalInteger = (raw, label) => raw === void 0 ? void 0 : parseInteger(raw, label);
+var parseIdentity = (raw) => {
+  const value = parseJson(raw, "identity");
+  if (!isRecord(value)) {
+    throw new InvalidInputError("identity must be a JSON object");
+  }
+  const requiredStrings = ["ecdsaPublicKey", "eddsaPublicKey", "hexChainCode", "localPartyId", "libType"];
+  for (const field of requiredStrings) {
+    if (typeof value[field] !== "string" || value[field].length === 0) {
+      throw new InvalidInputError(`identity.${field} must be a non-empty string`);
+    }
+  }
+  if (!["GG20", "DKLS", "KeyImport"].includes(value.libType)) {
+    throw new InvalidInputError("identity.libType must be GG20, DKLS, or KeyImport");
+  }
+  if (value.chainPublicKeys !== void 0 && !isRecord(value.chainPublicKeys)) {
+    throw new InvalidInputError("identity.chainPublicKeys must be a JSON object when provided");
+  }
+  return value;
+};
+var identityFromVault = (vault) => ({
+  ecdsaPublicKey: vault.publicKeys.ecdsa,
+  eddsaPublicKey: vault.publicKeys.eddsa,
+  hexChainCode: vault.hexChainCode,
+  localPartyId: vault.localPartyId,
+  libType: vault.libType,
+  publicKeyMldsa: vault.publicKeyMldsa,
+  chainPublicKeys: vault.data.chainPublicKeys
+});
+var resolveIdentity = (vault, rawIdentity) => {
+  if (rawIdentity !== void 0) return parseIdentity(rawIdentity);
+  if (vault !== void 0) return identityFromVault(vault);
+  throw new InvalidInputError("An active vault or --identity JSON is required");
+};
+var stringify = (value) => JSON.stringify(value, (_key, item) => typeof item === "bigint" ? item.toString() : item, 2);
+var emitPrepResult = (helper, result) => {
+  const output = { helper, unsigned: true, result };
+  if (isJsonOutput()) {
+    outputJson(output);
+  } else {
+    printResult(stringify(output));
+  }
+};
+async function executePrepContractCall(vault, chain, contractAddress, functionName, options) {
+  const value = options.value === void 0 ? void 0 : parseDecimalBigInt(options.value, "value");
+  if (value !== void 0 && value > 0n) {
+    assertSafeDestination(chain, contractAddress);
+  }
+  const feeSettings = options.gasLimit !== void 0 || options.maxPriorityFeePerGas !== void 0 ? {
+    gasLimit: parseDecimalBigInt(options.gasLimit ?? "", "gas-limit"),
+    maxPriorityFeePerGas: parseDecimalBigInt(options.maxPriorityFeePerGas ?? "", "max-priority-fee-per-gas")
+  } : void 0;
+  const result = await prepareContractCallTxFromKeys(resolveIdentity(vault, options.identity), {
+    chain,
+    contractAddress,
+    abi: parseJsonArray(options.abi, "abi"),
+    functionName,
+    args: options.args === void 0 ? void 0 : parseLosslessJsonArray(options.args, "args"),
+    value,
+    senderAddress: options.sender,
+    feeSettings
+  });
+  emitPrepResult("contract-call", result);
+}
+function executePrepIbcTransfer(fromChain, fromAddress, toAddress, denom, amount, options) {
+  const result = prepareIbcTransfer({
+    fromChain,
+    fromAddress,
+    toAddress,
+    denom,
+    amount,
+    toChainId: options.toChain,
+    sourceChannel: options.sourceChannel,
+    timeoutHeight: options.timeoutHeight,
+    timeoutTimestamp: options.timeoutTimestamp,
+    accountNumber: options.accountNumber,
+    sequence: options.sequence,
+    memo: options.memo,
+    nowMs: parseOptionalInteger(options.nowMs, "now-ms")
+  });
+  emitPrepResult("ibc-transfer", result);
+}
+function executePrepSplTransfer(mint, from, to, amount, decimals, options) {
+  assertSafeDestination("Solana", to);
+  const result = buildSplTransfer({
+    mint,
+    from,
+    to,
+    amount: parseDecimalBigInt(amount, "amount"),
+    decimals: parseInteger(decimals, "decimals"),
+    isToken2022: options.token2022
+  });
+  emitPrepResult("spl-transfer", result);
+}
+function executePrepTrc20Transfer(contractAddress, from, to, amount, options) {
+  const result = prepareTrc20TransferFromKeys({
+    contractAddress,
+    from,
+    to,
+    amount,
+    memo: options.memo,
+    feeLimitSun: options.feeLimitSun
+  });
+  emitPrepResult("trc20-transfer", result);
+}
+function executePrepJettonTransfer(vault, receiver, jettonWalletAddress, amount, seqno, options) {
+  const built = prepareJettonTransferTxFromKeys(resolveIdentity(vault, options.identity), {
+    receiver,
+    jettonWalletAddress,
+    amount: parseDecimalBigInt(amount, "amount"),
+    seqno: parseInteger(seqno, "seqno"),
+    memo: options.memo,
+    validUntil: parseOptionalInteger(options.validUntil, "valid-until"),
+    workchain: parseOptionalInteger(options.workchain, "workchain")
+  });
+  const result = {
+    signingHashHex: built.signingHashHex,
+    unsignedBocHex: built.unsignedBocHex,
+    fromAddress: built.fromAddress
+  };
+  emitPrepResult("jetton-transfer", result);
+}
+async function executePrepSuiTokenTransfer(vault, coinType, from, to, amount, options) {
+  const result = await prepareSuiTokenTransferFromKeys(resolveIdentity(vault, options.identity), {
+    coinType,
+    from,
+    to,
+    amount: parseDecimalBigInt(amount, "amount"),
+    decimals: parseOptionalInteger(options.decimals, "decimals"),
+    ticker: options.ticker
+  });
+  emitPrepResult("sui-token-transfer", result);
+}
+function executePrepPolkadotAssetSend(assetId, from, to, amount, options) {
+  const result = preparePolkadotAssetSend({
+    assetId: parseInteger(assetId, "asset-id"),
+    from,
+    to,
+    amount: parseDecimalBigInt(amount, "amount"),
+    decimals: parseOptionalInteger(options.decimals, "decimals"),
+    ticker: options.ticker
+  });
+  emitPrepResult("polkadot-asset-send", result);
+}
+function executePrepCosmosStaking(action, delegatorAddress, validatorAddress, amount, denom, options) {
+  const prefixes = {
+    accountPrefix: options.accountPrefix,
+    validatorPrefix: options.validatorPrefix
+  };
+  let result;
+  switch (action) {
+    case "delegate":
+      if (amount === void 0 || denom === void 0) {
+        throw new InvalidInputError("delegate requires amount and denom");
+      }
+      result = buildDelegateMsg({
+        delegatorAddress,
+        validatorAddress,
+        amount,
+        denom,
+        ...prefixes
+      });
+      break;
+    case "undelegate":
+      if (amount === void 0 || denom === void 0) {
+        throw new InvalidInputError("undelegate requires amount and denom");
+      }
+      result = buildUndelegateMsg({
+        delegatorAddress,
+        validatorAddress,
+        amount,
+        denom,
+        ...prefixes
+      });
+      break;
+    case "redelegate":
+      if (amount === void 0 || denom === void 0 || options.validatorDst === void 0) {
+        throw new InvalidInputError("redelegate requires amount, denom, and --validator-dst");
+      }
+      result = buildRedelegateMsg({
+        delegatorAddress,
+        validatorSrcAddress: validatorAddress,
+        validatorDstAddress: options.validatorDst,
+        amount,
+        denom,
+        ...prefixes
+      });
+      break;
+    case "withdraw":
+      if (amount !== void 0 || denom !== void 0) {
+        throw new InvalidInputError("withdraw does not accept amount or denom");
+      }
+      result = buildWithdrawRewardsMsg({
+        delegatorAddress,
+        validatorAddress,
+        ...prefixes
+      });
+      break;
+    default:
+      throw new InvalidInputError("staking action must be delegate, undelegate, redelegate, or withdraw");
+  }
+  emitPrepResult("cosmos-staking", result);
+}
+function executePrepCw20Transfer(bech32Prefix, contract, recipient, amount, sender, options) {
+  const nativeDenoms = options.nativeDenoms?.split(",").map((value) => value.trim()).filter(Boolean);
+  const result = buildCw20TransferMsg({
+    bech32Prefix,
+    contract,
+    recipient,
+    amount,
+    sender,
+    nativeDenoms
+  });
+  emitPrepResult("cw20-transfer", result);
+}
+
 // src/commands/execute.ts
 var import_qrcode_terminal = __toESM(require_main(), 1);
 import {
@@ -11165,7 +11496,7 @@ async function executeBroadcast(ctx2, params) {
 }
 
 // src/commands/tx-status.ts
-import { Chain as Chain7, isValidTxHash, Vultisig as Vultisig5 } from "@vultisig/sdk";
+import { Chain as Chain7, isValidTxHash, pollTxStatusUntilFinal, Vultisig as Vultisig5 } from "@vultisig/sdk";
 function resolveTxStatusParams(params) {
   if (!Object.values(Chain7).includes(params.chain)) {
     throw new InvalidInputError(`Invalid chain: ${params.chain}`);
@@ -11198,19 +11529,26 @@ async function executeTxStatus(ctx2, params, opts = {}) {
   try {
     let result = await vault.getTxStatus({ chain: params.chain, txHash: params.txHash });
     if (!params.noWait && !isTerminal(result.status)) {
-      const deadline = Date.now() + resolveTimeoutMs(params.timeoutSec);
+      const timeoutMs = resolveTimeoutMs(params.timeoutSec);
       let waited = 0;
-      while (!isTerminal(result.status)) {
-        const remainingMs = deadline - Date.now();
-        if (remainingMs <= 0) {
-          spinner.fail(`Gave up waiting after ${Math.round(waited / 1e3)}s (status: ${result.status})`);
-          throw giveUpError(params, result, waited);
+      const outcome = await pollTxStatusUntilFinal({
+        chain: params.chain,
+        txHash: params.txHash,
+        initialResult: result,
+        timeoutMs,
+        intervalMs: pollIntervalMs,
+        getTxStatus: (pollParams) => vault.getTxStatus(pollParams),
+        isTerminal: (candidate) => isTerminal(candidate.status),
+        sleep: async (ms) => {
+          waited += ms;
+          spinner.text = `Transaction ${result.status}... (${Math.round(waited / 1e3)}s)`;
+          await sleep(ms);
         }
-        const sleepMs = Math.min(pollIntervalMs, remainingMs);
-        waited += sleepMs;
-        spinner.text = `Transaction ${result.status}... (${Math.round(waited / 1e3)}s)`;
-        await sleep(sleepMs);
-        result = await vault.getTxStatus({ chain: params.chain, txHash: params.txHash });
+      });
+      if (outcome.result) result = outcome.result;
+      if (outcome.timedOut) {
+        spinner.fail(`Gave up waiting after ${Math.round(outcome.elapsedMs / 1e3)}s (status: ${result.status})`);
+        throw giveUpError(params, result, outcome.elapsedMs);
       }
     }
     if (result.status === "success") {
@@ -12293,7 +12631,7 @@ init_stringify();
 init_base();
 var InvalidDomainError = class extends BaseError2 {
   constructor({ domain }) {
-    super(`Invalid domain "${stringify(domain)}".`, {
+    super(`Invalid domain "${stringify2(domain)}".`, {
       metaMessages: ["Must be a valid EIP-712 domain."]
     });
   }
@@ -13737,14 +14075,15 @@ import { getChainKind as getChainKind5 } from "@vultisig/sdk";
 // src/agent/executor.ts
 import {
   Chain as Chain11,
-  chainFeeCoin as chainFeeCoin2,
   computeEip712Hash,
   getChainKind as getChainKind4,
   getEvmRpcUrl,
   knownTokensIndex,
-  parseThorSwapMemo,
+  parseTxReadyEnvelope,
+  pollTxStatusUntilFinal as pollTxStatusUntilFinal2,
   resolveChainReference,
   toCanonicalEvmSignature,
+  TxReadyParseError,
   VaultError as VaultError3,
   VaultErrorCode as VaultErrorCode3,
   Vultisig as VultisigSdk
@@ -14162,6 +14501,18 @@ function decodeErc20Transfer(calldata) {
   }
 }
 var isEvmChain = (chain) => EVM_CHAINS.has(chain);
+function stripEmbeddedPayloadContract(value, disclosedContract) {
+  if (!disclosedContract) return value;
+  const escapedContract = disclosedContract.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const normalizedContract = disclosedContract.toLowerCase();
+  return value.replace(new RegExp(escapedContract, "gi"), "").replace(/0x([0-9a-fA-F]{2,8})(?:…|\.{3})([0-9a-fA-F]{2,8})/g, (match, prefix, suffix) => {
+    const normalizedPrefix = `0x${prefix}`.toLowerCase();
+    return normalizedContract.startsWith(normalizedPrefix) && normalizedContract.endsWith(suffix.toLowerCase()) ? "" : match;
+  }).replace(/\(\s*\)/g, "").replace(/\s{2,}/g, " ").trim();
+}
+function formatTokenContractDisclosure(disclosedContract) {
+  return disclosedContract ? ` (token contract ${disclosedContract})` : "";
+}
 var AgentExecutor = class {
   vault;
   /** Owning SDK (optional); used for address book backed by app storage */
@@ -14551,11 +14902,35 @@ var AgentExecutor = class {
     if (transfer) {
       return this.renderErc20TransferSummary(transfer.amount, contractTo, stored.chain, to);
     }
-    const amount = labels.resolved_amount ?? p?.txArgs?.amount ?? "?";
-    const symbol = labels.token_resolved || labels.token_symbol || "";
-    const amountWithSymbol = symbol && !amount.endsWith(` ${symbol}`) ? `${amount} ${symbol}` : amount;
-    const contractPart = isContractSend && contractTo.toLowerCase() !== to.toLowerCase() ? ` (token contract ${contractTo})` : "";
-    return `send ${amountWithSymbol} on ${stored.chain} to ${to}${contractPart}`;
+    const disclosedContract = isContractSend && contractTo.toLowerCase() !== to.toLowerCase() ? contractTo : "";
+    return this.renderLabelSendSummary(p, labels, stored.chain, to, disclosedContract);
+  }
+  /**
+   * Render the send summary from producer labels — the fallback for native,
+   * non-EVM, and non-transfer envelopes only (decoded ERC-20 transfers are
+   * rendered from calldata by renderErc20TransferSummary above). De-duplicates
+   * token/chain/contract details the label may repeat, anchored to the routed
+   * chain and the payload-derived contract disclosure.
+   */
+  renderLabelSendSummary(p, labels, chain, to, disclosedContract) {
+    const amount = stripEmbeddedPayloadContract(labels.resolved_amount ?? p?.txArgs?.amount ?? "?", disclosedContract);
+    const tokenLabel = stripEmbeddedPayloadContract(
+      (labels.token_resolved || labels.token_symbol || "").trim(),
+      disclosedContract
+    );
+    const symbol = tokenLabel.split(/\s+/, 1)[0];
+    const escapedChain = String(chain).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const routedChainPattern = new RegExp(`(?:^|\\s)(?:not\\s+)?on ${escapedChain}(?=\\s|$)`);
+    const positiveRoutedChainPattern = new RegExp(`(?:^|\\s)(?<!\\bnot\\s+)on ${escapedChain}(?=\\s|$)`);
+    const tokenContext = tokenLabel.slice(symbol.length);
+    const labelCarriesRoutedChain = positiveRoutedChainPattern.test(tokenContext);
+    const tokenDetail = tokenContext.replace(routedChainPattern, "").trim();
+    const amountEmbedsTokenLabel = tokenLabel.length > 0 && amount.endsWith(` ${tokenLabel}`);
+    const amountWithSymbol = symbol && !amount.endsWith(` ${symbol}`) && !amountEmbedsTokenLabel ? `${amount} ${symbol}` : amount;
+    const tokenDetailSuffix = amountEmbedsTokenLabel || !tokenDetail ? "" : ` ${tokenDetail}`;
+    const location = amountEmbedsTokenLabel && labelCarriesRoutedChain ? "" : `on ${chain}${tokenDetailSuffix}`;
+    const contractPart = formatTokenContractDisclosure(disclosedContract);
+    return `send ${amountWithSymbol}${location ? ` ${location}` : ""} to ${to}${contractPart}`;
   }
   /**
    * Render the consent amount for an ERC-20 transfer from the SIGNED calldata
@@ -14849,8 +15224,8 @@ var AgentExecutor = class {
     return this.signNonEvmServerTx(serverTxData, chain);
   }
   /**
-   * Non-EVM signing path: parse the agent's tx_ready envelope into a
-   * `vault.send`-shaped argument bag and call through. The SDK already
+   * Non-EVM signing path: parse the agent's tx_ready envelope through the
+   * SDK's canonical discriminated contract and call through. The SDK already
    * handles per-chain prepare/sign/broadcast internally via
    * `VaultBase.prepareSendTx` virtuals — sdk-cli only owns envelope
    * parsing here, not chain-specific signing logic.
@@ -14877,20 +15252,20 @@ var AgentExecutor = class {
         `signNonEvmServerTx: dispatcher chain '${chain}' disagrees with envelope chain '${txArgs.chain}'`
       );
     }
-    if (txArgs.msg_type === "deposit" && (chain === Chain11.THORChain || chain === Chain11.MayaChain)) {
-      const memo = typeof txArgs.memo === "string" ? txArgs.memo : "";
-      if (memo.startsWith("=:")) {
-        return this.signThorMsgDepositSwap(serverTxData, chain);
-      }
-      if (memo.startsWith("+:") || memo.startsWith("-:")) {
-        return this.signThorMsgDepositLp(serverTxData, chain);
-      }
+    const parsed = parseTxReadyForCli(serverTxData, chain, this.vault.getTokens?.(chain) ?? []);
+    if (parsed.kind === "thor-swap-deposit") {
+      return this.signThorMsgDepositSwap(parsed);
+    }
+    if (parsed.kind === "thor-lp-deposit") {
+      return this.signThorMsgDepositLp(parsed);
+    }
+    if (parsed.kind !== "send") {
       throw new VaultError3(
-        VaultErrorCode3.NotImplemented,
-        `signNonEvmServerTx: MsgDeposit memo prefix not supported on ${chain}: '${memo}'. Supported prefixes: '=:' (swap), '+:' (LP add), '-:' (LP remove). Loan / validator ops are out of scope.`
+        VaultErrorCode3.InvalidConfig,
+        `signNonEvmServerTx: expected a non-EVM send/deposit envelope, got ${parsed.kind}`
       );
     }
-    const args = parseNonEvmEnvelope(serverTxData, chain);
+    const args = parsed;
     if (this.verbose)
       process.stderr.write(
         `[sign_non_evm_server_tx] chain=${chain}, to=${args.to}, amount=${args.amount}${args.symbol ? ` ${args.symbol}` : ""}, memo=${args.memo ? `"${args.memo}"` : "(none)"}
@@ -14939,38 +15314,20 @@ var AgentExecutor = class {
    * cross-account route cannot be silently replaced with the vault's address.
    * An omitted destination keeps the existing self-swap default.
    */
-  async signThorMsgDepositSwap(serverTxData, chain) {
-    const txArgs = serverTxData?.txArgs ?? {};
-    const memo = typeof txArgs.memo === "string" ? txArgs.memo : "";
-    const parsed = parseThorSwapMemo(memo);
-    if (/\s/.test(parsed.destAddress)) {
-      throw new VaultError3(
-        VaultErrorCode3.InvalidConfig,
-        `signThorMsgDepositSwap: destination address in memo '${memo}' must not contain whitespace.`
-      );
-    }
-    const toChain = parsed.toChain;
-    const fromSymbol = chain === Chain11.THORChain ? "RUNE" : "CACAO";
-    const amountRaw = typeof txArgs.amount === "string" ? txArgs.amount : void 0;
-    if (!amountRaw) {
-      throw new VaultError3(
-        VaultErrorCode3.InvalidConfig,
-        `signThorMsgDepositSwap: missing or non-string 'amount' field on ${chain} envelope`
-      );
-    }
-    const amountDecimal = convertBaseUnitsToDecimal(chain, amountRaw, "signThorMsgDepositSwap");
+  async signThorMsgDepositSwap(parsed) {
+    const { amount, chain, fromSymbol, memo, recipient, toChain, toSymbol } = parsed;
     if (this.verbose)
       process.stderr.write(
-        `[sign_thor_msg_deposit_swap] ${fromSymbol}@${chain} \u2192 ${parsed.destAsset}@${toChain}, amount=${amountDecimal}, memo='${memo}'
+        `[sign_thor_msg_deposit_swap] ${fromSymbol}@${chain} \u2192 ${toSymbol}@${toChain}, amount=${amount}, memo='${memo}'
 `
       );
     const result = await this.vault.swap({
       fromChain: chain,
       fromSymbol,
       toChain,
-      toSymbol: parsed.destAsset,
-      amount: amountDecimal,
-      ...parsed.destAddress && { recipient: parsed.destAddress }
+      toSymbol,
+      amount,
+      ...recipient && { recipient }
     });
     if (result.dryRun) {
       throw new VaultError3(
@@ -15002,28 +15359,16 @@ var AgentExecutor = class {
    * as base units directly (no decimal conversion) since the agent
    * already emits RUNE / CACAO in base units.
    */
-  async signThorMsgDepositLp(serverTxData, chain) {
-    const txArgs = serverTxData?.txArgs ?? {};
-    const memo = typeof txArgs.memo === "string" ? txArgs.memo : "";
-    const amountRaw = typeof txArgs.amount === "string" ? txArgs.amount : void 0;
-    if (!amountRaw) {
-      throw new VaultError3(
-        VaultErrorCode3.InvalidConfig,
-        `signThorMsgDepositLp: missing or non-string 'amount' field on ${chain} envelope`
-      );
-    }
-    if (amountRaw.length > MAX_AMOUNT_DIGITS) {
-      throw new VaultError3(
-        VaultErrorCode3.InvalidAmount,
-        `signThorMsgDepositLp: amount '${amountRaw}' for ${chain} exceeds ${MAX_AMOUNT_DIGITS}-digit safety bound. Likely a quote-side bug. Refusing to sign.`
-      );
-    }
+  async signThorMsgDepositLp(parsed) {
+    const { amountBaseUnits, chain, memo } = parsed;
     if (this.verbose)
-      process.stderr.write(`[sign_thor_msg_deposit_lp] chain=${chain}, memo='${memo}', amountBaseUnits=${amountRaw}
-`);
+      process.stderr.write(
+        `[sign_thor_msg_deposit_lp] chain=${chain}, memo='${memo}', amountBaseUnits=${amountBaseUnits}
+`
+      );
     const result = await this.vault.signMsgDeposit({
       chain,
-      amountBaseUnits: amountRaw,
+      amountBaseUnits,
       memo
     });
     this.pendingPayloads.clear();
@@ -15211,20 +15556,20 @@ var AgentExecutor = class {
    * success.
    */
   async waitForEvmReceipt(chain, txHash, opts) {
-    const intervalMs = 3e3;
-    const deadline = Date.now() + opts.timeoutSec * 1e3;
-    while (Date.now() < deadline) {
-      try {
-        const result = await this.vault.getTxStatus({ chain, txHash });
-        if (result?.status === "success") return;
-        if (result?.status === "error") {
-          throw new VaultError3(VaultErrorCode3.BroadcastFailed, `approve tx reverted (${txHash})`);
-        }
-      } catch (e) {
-        if (e instanceof VaultError3 && e.code === VaultErrorCode3.BroadcastFailed) throw e;
-        if (e?.message?.includes("reverted")) throw e;
+    const outcome = await pollTxStatusUntilFinal2({
+      chain,
+      txHash,
+      timeoutMs: opts.timeoutSec * 1e3,
+      intervalMs: 3e3,
+      getTxStatus: (params) => this.vault.getTxStatus(params),
+      shouldRetryError: (error2) => {
+        if (error2 instanceof VaultError3 && error2.code === VaultErrorCode3.BroadcastFailed) return false;
+        return !error2?.message?.includes("reverted");
       }
-      await new Promise((r) => setTimeout(r, intervalMs));
+    });
+    if (outcome.result?.status === "success") return;
+    if (outcome.result?.status === "error") {
+      throw new VaultError3(VaultErrorCode3.BroadcastFailed, `approve tx reverted (${txHash})`);
     }
     throw new VaultError3(VaultErrorCode3.Timeout, `approve tx ${txHash} not confirmed within ${opts.timeoutSec}s`);
   }
@@ -15719,49 +16064,14 @@ function resolveChainFromTxReady(txReadyData) {
 function extractNestedTx(txReadyData) {
   return txReadyData?.swap_tx || txReadyData?.send_tx || txReadyData?.tx || txReadyData?.txArgs?.tx;
 }
-var MAX_AMOUNT_DIGITS = 26;
-function convertBaseUnitsToDecimal(chain, amountRaw, context) {
-  if (amountRaw.length > MAX_AMOUNT_DIGITS) {
-    throw new VaultError3(
-      VaultErrorCode3.InvalidAmount,
-      `${context}: amount '${amountRaw}' for ${chain} exceeds ${MAX_AMOUNT_DIGITS}-digit safety bound. Likely a quote-side bug. Refusing to sign.`
-    );
-  }
-  const decimals = chainFeeCoin2[chain]?.decimals;
-  if (decimals === void 0) {
-    throw new VaultError3(VaultErrorCode3.UnsupportedChain, `${context}: no native decimals registered for ${chain}`);
-  }
+function parseTxReadyForCli(serverTxData, defaultChain, tokens = []) {
   try {
-    return formatUnits(BigInt(amountRaw), decimals);
-  } catch (err) {
-    throw new VaultError3(
-      VaultErrorCode3.InvalidAmount,
-      `${context}: failed to convert amount '${amountRaw}' for ${chain}: ${err?.message ?? err}`
-    );
-  }
-}
-function parseNonEvmEnvelope(serverTxData, chain) {
-  const txArgs = serverTxData?.txArgs ?? serverTxData;
-  if (!txArgs || typeof txArgs !== "object") {
-    throw new VaultError3(VaultErrorCode3.InvalidConfig, "parseNonEvmEnvelope: envelope missing txArgs");
-  }
-  const to = typeof txArgs.to === "string" ? txArgs.to : void 0;
-  if (!to) {
-    throw new VaultError3(VaultErrorCode3.InvalidConfig, `parseNonEvmEnvelope: missing 'to' field for ${chain}`);
-  }
-  const amountRaw = typeof txArgs.amount === "string" ? txArgs.amount : void 0;
-  if (!amountRaw) {
-    throw new VaultError3(VaultErrorCode3.InvalidConfig, `parseNonEvmEnvelope: missing 'amount' field for ${chain}`);
-  }
-  const amountDecimal = convertBaseUnitsToDecimal(chain, amountRaw, "parseNonEvmEnvelope");
-  let symbol;
-  const tokenResolved = serverTxData?.resolved?.labels?.token_resolved;
-  const nativeTicker = chainFeeCoin2[chain]?.ticker;
-  if (typeof tokenResolved === "string" && tokenResolved !== nativeTicker) {
-    symbol = tokenResolved;
+    return parseTxReadyEnvelope(serverTxData, { defaultChain, tokens });
+  } catch (error2) {
+    if (!(error2 instanceof TxReadyParseError)) throw error2;
+    const code = error2.code === "INVALID_AMOUNT" ? VaultErrorCode3.InvalidAmount : error2.code === "UNKNOWN_CHAIN" ? VaultErrorCode3.UnsupportedChain : error2.code === "UNSUPPORTED_DEPOSIT" || error2.code === "UNSUPPORTED_ENVELOPE" ? VaultErrorCode3.NotImplemented : VaultErrorCode3.InvalidConfig;
+    throw new VaultError3(code, error2.message);
   }
-  const memo = typeof txArgs.memo === "string" && txArgs.memo.length > 0 ? txArgs.memo : void 0;
-  return { chain, to, amount: amountDecimal, symbol, memo };
 }
 function resolveChainId(chainId) {
   return resolveChainReference(chainId) ?? null;
@@ -16822,7 +17132,7 @@ var AgentClient = class {
 };
 
 // src/agent/context.ts
-import { chainFeeCoin as chainFeeCoin3 } from "@vultisig/sdk";
+import { chainFeeCoin as chainFeeCoin2 } from "@vultisig/sdk";
 function applyChainPublicKeys(vault, context) {
   const raw = vault.data.chainPublicKeys;
   if (!raw) return;
@@ -16883,7 +17193,7 @@ async function buildMessageContext(vault) {
     const coins = [];
     const chains = vault.chains;
     for (const chain of chains) {
-      const nativeCoin = chainFeeCoin3[chain];
+      const nativeCoin = chainFeeCoin2[chain];
       coins.push({
         chain: chain.toString(),
         ticker: nativeCoin?.ticker ?? chain.toString(),
@@ -19190,7 +19500,7 @@ var cachedVersion = null;
 function getVersion() {
   if (cachedVersion) return cachedVersion;
   if (true) {
-    cachedVersion = "5.1.0";
+    cachedVersion = "6.0.0";
     return cachedVersion;
   }
   try {
@@ -19347,6 +19657,35 @@ var COMMAND_EXAMPLES = {
   execute: {
     examples: [`vultisig execute THORChain <contract> '{"swap":{}}'`]
   },
+  "prep.contract-call": {
+    examples: [
+      `vultisig prep contract-call Ethereum <contractAddress> approve --sender <senderAddress> --abi '[{"type":"function","name":"approve","inputs":[{"type":"address","name":"spender"},{"type":"uint256","name":"amount"}]}]' --args '["<spenderAddress>","1000000"]'`
+    ]
+  },
+  "prep.ibc-transfer": {
+    examples: ["vultisig prep ibc-transfer Osmosis osmo1... cosmos1... uosmo 1000000 --to-chain Cosmos"]
+  },
+  "prep.spl-transfer": {
+    examples: ["vultisig prep spl-transfer <mint> <from> <to> 1000000 6"]
+  },
+  "prep.trc20-transfer": {
+    examples: ["vultisig prep trc20-transfer <contract> <from> <to> 1000000"]
+  },
+  "prep.jetton-transfer": {
+    examples: ["vultisig prep jetton-transfer <recipient> <senderJettonWallet> 1000000 5"]
+  },
+  "prep.sui-token-transfer": {
+    examples: ["vultisig prep sui-token-transfer <coinType> <from> <to> 1000000 --decimals 6"]
+  },
+  "prep.polkadot-asset-send": {
+    examples: ["vultisig prep polkadot-asset-send 1984 <from> <to> 1000000"]
+  },
+  "prep.cosmos-staking": {
+    examples: ["vultisig prep cosmos-staking delegate <delegator> <validator> 5000000 uosmo"]
+  },
+  "prep.cw20-transfer": {
+    examples: ["vultisig prep cw20-transfer osmo <contract> <recipient> 1000000 <sender>"]
+  },
   "swap-quote": {
     examples: ["vultisig swap-quote Ethereum Bitcoin 0.1 --output json"]
   },
@@ -19426,8 +19765,16 @@ function executeSchema(prog) {
       };
     })
   };
-  process.stdout.write(`${JSON.stringify(schema, null, 2)}
-`);
+  return new Promise((resolve, reject) => {
+    process.stdout.write(`${JSON.stringify(schema, null, 2)}
+`, (error2) => {
+      if (error2) {
+        reject(error2);
+        return;
+      }
+      resolve();
+    });
+  });
 }
 
 // src/core/server-endpoints.ts
@@ -20730,7 +21077,7 @@ Error: ${error2.message}`));
 
 // src/lib/completion.ts
 import { getVultisigConfigDir as getVultisigConfigDir5 } from "@vultisig/client-shared";
-import { SUPPORTED_CHAINS as SUPPORTED_CHAINS2 } from "@vultisig/sdk";
+import { SUPPORTED_CHAINS as SUPPORTED_CHAINS3 } from "@vultisig/sdk";
 import { program } from "commander";
 import { existsSync as existsSync3, readdirSync, readFileSync as readFileSync5 } from "fs";
 import { join as join5 } from "path";
@@ -20752,7 +21099,7 @@ function getCommands() {
   return program.commands.map((cmd) => cmd.name()).sort();
 }
 function getChains() {
-  return [...SUPPORTED_CHAINS2];
+  return [...SUPPORTED_CHAINS3];
 }
 function getVaultNames() {
   try {
@@ -21372,6 +21719,66 @@ See also: balance, tx-status`
     }
   )
 );
+var prepCmd = program2.command("prep").description("Build unsigned transaction payloads with SDK preparation helpers (never signs or broadcasts)");
+var loadPrepVault = async (identity) => {
+  if (identity !== void 0) return void 0;
+  const context = await init(program2.opts().vault);
+  return context.ensureActiveVault();
+};
+prepCmd.command("contract-call <chain> <contractAddress> <functionName>").description("Build an unsigned EVM contract-call KeysignPayload").requiredOption("--abi <json>", "Solidity ABI JSON array").requiredOption("--sender <address>", "Sender EVM address").option("--args <json>", "Function arguments as a JSON array").option("--value <baseUnits>", "Native value in base units", "0").option("--gas-limit <baseUnits>", "Custom EVM gas limit (requires --max-priority-fee-per-gas)").option("--max-priority-fee-per-gas <baseUnits>", "Custom EVM priority fee (requires --gas-limit)").option("--identity <json>", "Public VaultIdentity JSON; otherwise use the active vault").action(
+  withExit(async (chain, contractAddress, functionName, options) => {
+    const vault = await loadPrepVault(options.identity);
+    await executePrepContractCall(vault, resolveChainOrThrow(chain), contractAddress, functionName, options);
+  })
+);
+prepCmd.command("ibc-transfer <fromChain> <fromAddress> <toAddress> <denom> <amount>").description("Build an unsigned ICS-20 IBC MsgTransfer envelope").option("--to-chain <chainId>", "Destination chain ID or Vultisig chain name").option("--source-channel <channel>", "IBC source channel (channel-N)").option("--timeout-height <revision/height>", "IBC timeout height (default: 0/0)").option("--timeout-timestamp <nanoseconds>", "Future Unix timeout in nanoseconds").option("--account-number <number>", "Source-chain account number").option("--sequence <number>", "Source-chain account sequence").option("--memo <memo>", "IBC packet memo").option("--now-ms <milliseconds>", "Override current time for deterministic default timeout").action(
+  withExit(
+    async (fromChain, fromAddress, toAddress, denom, amount, options) => {
+      executePrepIbcTransfer(fromChain, fromAddress, toAddress, denom, amount, options);
+    }
+  )
+);
+prepCmd.command("spl-transfer <mint> <from> <to> <amount> <decimals>").description("Build an unsigned SPL transferChecked instruction with derived ATAs").option("--token-2022", "Use the Token-2022 program instead of the legacy SPL Token program").action(
+  withExit(async (mint, from, to, amount, decimals, options) => {
+    executePrepSplTransfer(mint, from, to, amount, decimals, options);
+  })
+);
+prepCmd.command("trc20-transfer <contractAddress> <from> <to> <amount>").description("Build an unsigned TRC-20 transfer descriptor").option("--memo <memo>", "Optional TRON transaction memo").option("--fee-limit-sun <amount>", "Energy/bandwidth ceiling in SUN").action(
+  withExit(async (contractAddress, from, to, amount, options) => {
+    executePrepTrc20Transfer(contractAddress, from, to, amount, options);
+  })
+);
+prepCmd.command("jetton-transfer <receiver> <jettonWalletAddress> <amount> <seqno>").description("Build an unsigned TON Jetton transfer signing payload").option("--memo <memo>", "Forward comment (up to 123 UTF-8 bytes)").option("--valid-until <seconds>", "Unix-seconds expiry").option("--workchain <number>", "Sender wallet workchain (default: 0)").option("--identity <json>", "Public VaultIdentity JSON; otherwise use the active vault").action(
+  withExit(async (receiver, jettonWalletAddress, amount, seqno, options) => {
+    const vault = await loadPrepVault(options.identity);
+    executePrepJettonTransfer(vault, receiver, jettonWalletAddress, amount, seqno, options);
+  })
+);
+prepCmd.command("sui-token-transfer <coinType> <from> <to> <amount>").description("Build an unsigned Sui coin-object token-transfer KeysignPayload").option("--decimals <number>", "Token decimals metadata").option("--ticker <symbol>", "Token ticker metadata").option("--identity <json>", "Public VaultIdentity JSON; otherwise use the active vault").action(
+  withExit(async (coinType, from, to, amount, options) => {
+    const vault = await loadPrepVault(options.identity);
+    await executePrepSuiTokenTransfer(vault, coinType, from, to, amount, options);
+  })
+);
+prepCmd.command("polkadot-asset-send <assetId> <from> <to> <amount>").description("Build an unsigned Polkadot Asset Hub transferKeepAlive call").option("--decimals <number>", "Asset decimals override").option("--ticker <symbol>", "Asset ticker override").action(
+  withExit(async (assetId, from, to, amount, options) => {
+    executePrepPolkadotAssetSend(assetId, from, to, amount, options);
+  })
+);
+prepCmd.command("cosmos-staking <action> <delegatorAddress> <validatorAddress> [amount] [denom]").description("Build an unsigned Cosmos delegate, undelegate, redelegate, or withdraw message").option("--validator-dst <address>", "Destination validator for redelegate").option("--account-prefix <prefix>", "Expected delegator bech32 prefix").option("--validator-prefix <prefix>", "Expected validator bech32 prefix").action(
+  withExit(
+    async (action, delegatorAddress, validatorAddress, amount, denom, options) => {
+      executePrepCosmosStaking(action, delegatorAddress, validatorAddress, amount, denom, options);
+    }
+  )
+);
+prepCmd.command("cw20-transfer <bech32Prefix> <contract> <recipient> <amount> <sender>").description("Build an unsigned CosmWasm CW-20 transfer message").option("--native-denoms <csv>", "Comma-separated native denoms to reject on this route").action(
+  withExit(
+    async (bech32Prefix, contract, recipient, amount, sender, options) => {
+      executePrepCw20Transfer(bech32Prefix, contract, recipient, amount, sender, options);
+    }
+  )
+);
 program2.command("execute <chain> <contract> <msg>").description("Execute a CosmWasm smart contract (THORChain, MayaChain)").option("--funds <funds>", 'Funds to send with execution (format: "denom:amount" or "denom:amount,denom2:amount2")').option("--memo <memo>", "Transaction memo").option("--dry-run", "Preview execution without signing or broadcasting").option("-y, --yes", "Skip confirmation prompt").option("--password <password>", "Vault password for signing").addHelpText(
   "after",
   `
@@ -21922,7 +22329,12 @@ authCmd.command("status").description("List configured vaults and their keyring
     const vaults = await executeAuthStatus();
     if (isJsonOutput()) {
       outputJson({
-        vaults: vaults.map((v) => ({ id: v.id, name: v.name, filePath: v.filePath, hasCredentials: v.hasCredentials }))
+        vaults: vaults.map((v) => ({
+          id: v.id,
+          name: v.name,
+          filePath: v.filePath,
+          hasCredentials: v.hasCredentials
+        }))
       });
       return;
     }
@@ -21941,7 +22353,11 @@ authCmd.command("logout").description("Clear keyring credentials for a vault").o
   withExit(async (options) => {
     await executeAuthLogout({ vaultId: options.vaultId, all: options.all });
     if (isJsonOutput()) {
-      outputJson({ cleared: true, vaultId: options.vaultId ?? null, all: !!options.all });
+      outputJson({
+        cleared: true,
+        vaultId: options.vaultId ?? null,
+        all: !!options.all
+      });
     } else {
       printResult(chalk16.green("Credentials cleared."));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vultisig/cli",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "description": "The self-custody MPC wallet CLI for AI coding agents (Claude Code, Cursor, OpenCode). Natural-language agent mode, 36+ chains, DKLS23 threshold signatures. Seedless.",
   "type": "module",
   "bin": {
@@ -67,17 +67,16 @@
   },
   "homepage": "https://vultisig.com",
   "dependencies": {
-    "@cosmjs/cosmwasm-stargate": "^0.39.0",
     "@cosmjs/encoding": "^0.39.0",
     "@cosmjs/proto-signing": "^0.39.0",
     "@cosmjs/stargate": "^0.39.0",
     "@msgpack/msgpack": "^3.1.2",
     "@napi-rs/keyring": "^1.3.0",
     "@noble/hashes": "^2.2.0",
-    "@vultisig/client-shared": "^0.3.4",
-    "@vultisig/core-chain": "^2.39.0",
-    "@vultisig/rujira": "^68.0.0",
-    "@vultisig/sdk": "^5.1.0",
+    "@vultisig/client-shared": "^0.3.5",
+    "@vultisig/core-chain": "^4.0.0",
+    "@vultisig/rujira": "^70.0.0",
+    "@vultisig/sdk": "^6.0.0",
     "chalk": "^5.6.2",
     "cli-table3": "^0.6.5",
     "commander": "^15.0.0",
@@ -95,7 +94,7 @@
     "@types/node": "^26.1.1",
     "@types/tabtab": "^3.0.4",
     "@types/ws": "^8.18.1",
-    "@vultisig/core-mpc": "^1.20.3",
+    "@vultisig/core-mpc": "^2.0.0",
     "esbuild": "^0.28.1",
     "ethers": "^6.17.0",
     "node-pty": "^1.1.0",
@@ -104,7 +103,7 @@
     "vitest": "^4.1.8"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=20.19.0"
   },
   "publishConfig": {
     "access": "public",