@vultisig/cli 0.15.0 → 0.15.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @vultisig/cli
 
+## 0.15.2
+
+### Patch Changes
+
+- [#263](https://github.com/vultisig/vultisig-sdk/pull/263) [`6585c38`](https://github.com/vultisig/vultisig-sdk/commit/6585c38431db063f600e133d1a23f84b7c19e934) Thanks [@rcoderdev](https://github.com/rcoderdev)! - fix(cli): align agent executor with backend payloads and harden action handling
+  - model `tx_ready` / non-streaming transaction payloads with `TxReadyPayload`
+  - optional `vultisig` on agent config for shared SDK state (e.g. address book)
+  - executor improvements (chain locks, calldata resolution, EVM gas refresh) and unit tests
+
+- Updated dependencies [[`6585c38`](https://github.com/vultisig/vultisig-sdk/commit/6585c38431db063f600e133d1a23f84b7c19e934)]:
+  - @vultisig/sdk@0.15.2
+  - @vultisig/rujira@10.0.0
+
 ## 0.15.0
 
 ### Patch Changes

package/dist/index.js

@@ -1452,7 +1452,7 @@ var init_formatUnits = __esm({
 // src/index.ts
 import "dotenv/config";
 import { promises as fs4 } from "node:fs";
-import { parseKeygenQR, Vultisig as Vultisig7 } from "@vultisig/sdk";
+import { parseKeygenQR, Vultisig as Vultisig6 } from "@vultisig/sdk";
 import chalk15 from "chalk";
 import { program } from "commander";
 import inquirer8 from "inquirer";
@@ -3934,7 +3934,12 @@ Address Book${options.chain ? ` (${options.chain})` : ""}:
 }
 
 // src/commands/rujira.ts
-import { getRoutesSummary, listEasyRoutes, RujiraClient, VultisigRujiraProvider } from "@vultisig/rujira";
+import {
+  getRoutesSummary,
+  listEasyRoutes,
+  RujiraClient,
+  VultisigRujiraProvider
+} from "@vultisig/rujira";
 async function createRujiraClient(ctx2, options = {}) {
   const vault = await ctx2.ensureActiveVault();
   const provider = new VultisigRujiraProvider(vault);
@@ -4566,8 +4571,11 @@ var AgentClient = class {
         case "tx_ready":
           if (this.verbose) process.stderr.write(`[SSE:tx_ready] raw: ${data.slice(0, 2e3)}
 `);
-          result.transactions.push(parsed);
-          callbacks.onTxReady?.(parsed);
+          {
+            const txReady = parsed;
+            result.transactions.push(txReady);
+            callbacks.onTxReady?.(txReady);
+          }
           break;
         case "message":
           result.message = parsed.message || parsed;
@@ -4782,7 +4790,7 @@ function getNativeTokenDecimals(chain) {
 }
 
 // src/agent/executor.ts
-import { Chain as Chain9, Vultisig as Vultisig6 } from "@vultisig/sdk";
+import { Chain as Chain9, evmCall, fiatCurrencies as fiatCurrencies3, Vultisig as VultisigSdk } from "@vultisig/sdk";
 
 // node_modules/viem/_esm/index.js
 init_formatUnits();
@@ -4999,6 +5007,8 @@ var EVM_GAS_RPC = {
 };
 var AgentExecutor = class {
   vault;
+  /** Owning SDK (optional); used for address book backed by app storage */
+  vultisig;
   pendingPayloads = /* @__PURE__ */ new Map();
   password = null;
   verbose;
@@ -5007,9 +5017,10 @@ var AgentExecutor = class {
   chainLockReleases = /* @__PURE__ */ new Map();
   /** Backend client for resolving calldata_id references. */
   backendClient = null;
-  constructor(vault, verbose = false, vaultId) {
+  constructor(vault, verbose = false, vaultId, vultisig) {
     this.vault = vault;
     this.verbose = verbose;
+    this.vultisig = vultisig;
     if (vaultId) {
       this.stateStore = new VaultStateStore(vaultId);
     }
@@ -5023,6 +5034,8 @@ var AgentExecutor = class {
   /**
    * Store a server-built transaction (from tx_ready SSE event).
    * This allows sign_tx to find and sign it when the backend requests signing.
+   *
+   * @returns true when a signable payload was stored; false for MCP errors or missing tx body
    */
   storeServerTransaction(txReadyData) {
     if (this.verbose)
@@ -5030,11 +5043,17 @@ var AgentExecutor = class {
         `[executor] storeServerTransaction called, keys: ${Object.keys(txReadyData || {}).join(",")}
 `
       );
-    const swapTx = txReadyData.swap_tx || txReadyData.send_tx || txReadyData.tx;
-    if (!swapTx) {
+    const nestedTx = txReadyData?.swap_tx || txReadyData?.send_tx || txReadyData?.tx;
+    if (nestedTx?.status === "error" || nestedTx?.error) {
+      if (this.verbose)
+        process.stderr.write(`[executor] skipping error tx_ready: ${nestedTx.error || "unknown error"}
+`);
+      return false;
+    }
+    if (!nestedTx) {
       if (this.verbose) process.stderr.write(`[executor] storeServerTransaction: no swap_tx/send_tx/tx found in data
 `);
-      return;
+      return false;
     }
     const chain = resolveChainFromTxReady(txReadyData) || Chain9.Ethereum;
     this.pendingPayloads.clear();
@@ -5049,6 +5068,7 @@ var AgentExecutor = class {
         `[executor] Stored server tx for chain ${chain}, pendingPayloads size=${this.pendingPayloads.size}
 `
       );
+    return true;
   }
   hasPendingTransaction() {
     return this.pendingPayloads.has("latest");
@@ -5107,7 +5127,7 @@ var AgentExecutor = class {
       case "sign_tx":
         return this.signTx(params);
       case "get_address_book":
-        return this.getAddressBook();
+        return this.getAddressBook(params);
       case "address_book_add":
         return this.addAddressBookEntry(params);
       case "address_book_remove":
@@ -5153,15 +5173,34 @@ var AgentExecutor = class {
     }
     return { balances: entries };
   }
-  async getPortfolio(_params) {
-    const balanceRecord = await this.vault.balances();
-    const entries = Object.entries(balanceRecord).map(([key, b]) => ({
-      chain: b.chainId || key.split(":")[0] || "",
+  async getPortfolio(params) {
+    const currencyRaw = String(params.currency ?? "USD").trim().toLowerCase();
+    const fiatCurrency = fiatCurrencies3.includes(currencyRaw) ? currencyRaw : "usd";
+    const portfolio = await this.vault.portfolio(fiatCurrency);
+    const chainFilter = params.chain;
+    const tickerFilter = params.ticker;
+    let rows = portfolio.balances.map((b) => ({
+      chain: b.chainId || "",
       symbol: b.symbol || "",
       amount: b.formattedAmount || b.amount?.toString() || "0",
-      decimals: b.decimals || 18
+      decimals: b.decimals ?? 18,
+      raw_amount: b.amount,
+      fiatValue: b.fiatValue,
+      fiatCurrency: b.fiatCurrency ?? portfolio.currency
     }));
-    return { balances: entries };
+    if (chainFilter) {
+      const chain = resolveChain(chainFilter);
+      if (!chain) throw new Error(`Unknown chain: ${chainFilter}`);
+      rows = rows.filter((r) => r.chain.toLowerCase() === chain.toLowerCase());
+    }
+    if (tickerFilter) {
+      rows = rows.filter((r) => r.symbol.toLowerCase() === String(tickerFilter).toLowerCase());
+    }
+    return {
+      balances: rows,
+      totalValue: portfolio.totalValue,
+      currency: portfolio.currency
+    };
   }
   // ============================================================================
   // Chain & Token Management
@@ -5261,13 +5300,28 @@ var AgentExecutor = class {
       };
       const amount = parseAmount(amountStr, balance.decimals);
       const memo = params.memo;
-      const payload = await this.vault.prepareSendTx({ coin, receiver: toAddress, amount, memo });
+      const payload = await this.vault.prepareSendTx({
+        coin,
+        receiver: toAddress,
+        amount,
+        memo
+      });
       await this.patchEvmNonce(chain, payload);
       const messageHashes = await this.vault.extractMessageHashes(payload);
       this.pendingPayloads.clear();
       const payloadId = `tx_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-      this.pendingPayloads.set(payloadId, { payload, coin, chain, timestamp: Date.now() });
-      this.pendingPayloads.set("latest", { payload, coin, chain, timestamp: Date.now() });
+      this.pendingPayloads.set(payloadId, {
+        payload,
+        coin,
+        chain,
+        timestamp: Date.now()
+      });
+      this.pendingPayloads.set("latest", {
+        payload,
+        coin,
+        chain,
+        timestamp: Date.now()
+      });
       return {
         keysign_payload: payloadId,
         from_chain: chain.toString(),
@@ -5307,7 +5361,10 @@ var AgentExecutor = class {
       const fromToken = params.from_contract || params.from_token_id;
       const toToken = params.to_contract || params.to_token_id;
       const fromCoin = { chain: fromChain, token: fromToken || void 0 };
-      const toCoin = { chain: toChain || fromChain, token: toToken || void 0 };
+      const toCoin = {
+        chain: toChain || fromChain,
+        token: toToken || void 0
+      };
       const quote = await this.vault.getSwapQuote({
         fromCoin,
         toCoin,
@@ -5377,11 +5434,14 @@ var AgentExecutor = class {
         chain: params.chain,
         chain_id: params.chain_id
       };
-      this.storeServerTransaction({
+      const stored = this.storeServerTransaction({
         tx: txData,
         chain: params.chain,
         from_chain: params.chain
       });
+      if (!stored) {
+        throw new Error("Could not stage calldata transaction for signing (invalid or empty tx payload)");
+      }
       const chain = resolveChain(params.chain) || Chain9.Ethereum;
       const address = await this.vault.address(chain);
       return {
@@ -5454,9 +5514,10 @@ var AgentExecutor = class {
     }
     const { payload, chain } = stored;
     if (payload.__serverTx) {
+      let result;
       if (chain === "Solana" && (payload.swap_tx || payload.provider)) {
         try {
-          return await this.buildAndSignSolanaSwapLocally(payload);
+          result = await this.buildAndSignSolanaSwapLocally(payload);
         } catch (e) {
           if (e._phase === "prepare") {
             if (this.verbose)
@@ -5467,7 +5528,9 @@ var AgentExecutor = class {
           }
         }
       }
-      return this.signServerTx(payload, chain, params);
+      if (!result) result = await this.signServerTx(payload, chain, params);
+      if (payload.sequence_id) result.sequence_id = payload.sequence_id;
+      return result;
     }
     return this.signSdkTx(payload, chain, payloadId);
   }
@@ -5503,7 +5566,7 @@ var AgentExecutor = class {
       }
       await this.releaseEvmLock(chain);
       this.pendingPayloads.clear();
-      const explorerUrl = Vultisig6.getTxExplorerUrl(chain, txHash);
+      const explorerUrl = VultisigSdk.getTxExplorerUrl(chain, txHash);
       return {
         tx_hash: txHash,
         chain: chain.toString(),
@@ -5600,7 +5663,7 @@ var AgentExecutor = class {
       }
       await this.releaseEvmLock(chain);
       this.pendingPayloads.clear();
-      const explorerUrl = Vultisig6.getTxExplorerUrl(chain, txHash);
+      const explorerUrl = VultisigSdk.getTxExplorerUrl(chain, txHash);
       return {
         tx_hash: txHash,
         chain: chain.toString(),
@@ -5625,9 +5688,15 @@ var AgentExecutor = class {
     const fromChainName = serverTxData.from_chain || serverTxData.chain || "Solana";
     const toChainName = serverTxData.to_chain;
     const fromChain = resolveChain(fromChainName);
-    if (!fromChain) throw Object.assign(new Error(`Unknown from_chain: ${fromChainName}`), { _phase: "prepare" });
+    if (!fromChain)
+      throw Object.assign(new Error(`Unknown from_chain: ${fromChainName}`), {
+        _phase: "prepare"
+      });
     const toChain = toChainName ? resolveChain(toChainName) : fromChain;
-    if (!toChain) throw Object.assign(new Error(`Unknown to_chain: ${toChainName}`), { _phase: "prepare" });
+    if (!toChain)
+      throw Object.assign(new Error(`Unknown to_chain: ${toChainName}`), {
+        _phase: "prepare"
+      });
     const amountStr = serverTxData.amount;
     if (!amountStr)
       throw Object.assign(new Error("Missing amount in tx_ready data for local Solana swap build"), {
@@ -5694,7 +5763,7 @@ var AgentExecutor = class {
       signature
     });
     this.pendingPayloads.clear();
-    const explorerUrl = Vultisig6.getTxExplorerUrl(chain, txHash);
+    const explorerUrl = VultisigSdk.getTxExplorerUrl(chain, txHash);
     return {
       tx_hash: txHash,
       chain: chain.toString(),
@@ -5942,8 +6011,18 @@ var AgentExecutor = class {
   // ============================================================================
   // Address Book
   // ============================================================================
-  async getAddressBook() {
-    throw new Error("get_address_book is not yet implemented locally. The backend may handle this action server-side.");
+  async getAddressBook(params) {
+    if (!this.vultisig) {
+      throw new Error(
+        "get_address_book requires the CLI SDK instance. Ensure AgentConfig.vultisig is set when creating the session."
+      );
+    }
+    const chainName = params.chain || params.chain_name;
+    const chain = chainName ? resolveChain(chainName) : void 0;
+    if (chainName && !chain) {
+      throw new Error(`Unknown chain: ${chainName}`);
+    }
+    return await this.vultisig.getAddressBook(chain);
   }
   async addAddressBookEntry(_params) {
     throw new Error("address_book_add is not yet implemented locally. The backend may handle this action server-side.");
@@ -5956,8 +6035,34 @@ var AgentExecutor = class {
   // ============================================================================
   // Token Search & Other
   // ============================================================================
-  async searchToken(_params) {
-    throw new Error("search_token is not yet implemented locally. The backend may handle this action server-side.");
+  async searchToken(params) {
+    const query = String(params.query ?? params.q ?? "").trim().toLowerCase();
+    if (!query) {
+      return { tokens: [] };
+    }
+    const limit = 20;
+    const chainName = params.chain;
+    const tokenMatchesQuery = (t) => {
+      const tick = t.ticker.toLowerCase();
+      const addr = (t.contractAddress ?? "").toLowerCase();
+      const pid = (t.priceProviderId ?? "").toLowerCase();
+      return tick.includes(query) || addr.includes(query) || pid.includes(query);
+    };
+    if (chainName) {
+      const chain = resolveChain(chainName);
+      if (!chain) throw new Error(`Unknown chain: ${chainName}`);
+      const tokens = VultisigSdk.getKnownTokens(chain).filter(tokenMatchesQuery).slice(0, limit);
+      return { tokens };
+    }
+    const out = [];
+    for (const c of Object.values(Chain9)) {
+      for (const t of VultisigSdk.getKnownTokens(c)) {
+        if (!tokenMatchesQuery(t)) continue;
+        out.push(t);
+        if (out.length >= limit) return { tokens: out };
+      }
+    }
+    return { tokens: out };
   }
   async listVaults() {
     return {
@@ -5974,8 +6079,25 @@ var AgentExecutor = class {
   async scanTx(_params) {
     throw new Error("scan_tx is not yet implemented locally. The backend may handle this action server-side.");
   }
-  async readEvmContract(_params) {
-    throw new Error("read_evm_contract is not yet implemented locally. The backend may handle this action server-side.");
+  async readEvmContract(params) {
+    const chainName = params.chain;
+    if (!chainName) throw new Error("read_evm_contract requires chain");
+    const contractRaw = params.contract_address || params.contractAddress;
+    if (!contractRaw) throw new Error("read_evm_contract requires contract_address");
+    const functionName = params.function_name || params.functionName;
+    if (!functionName) throw new Error("read_evm_contract requires function_name");
+    const chain = resolveChain(chainName);
+    if (!chain) throw new Error(`Unknown chain: ${chainName}`);
+    if (!EVM_CHAINS.has(chain)) {
+      throw new Error(`read_evm_contract only supports EVM chains (got ${chain})`);
+    }
+    const callParams = params.params ?? [];
+    const data = await encodeContractCall(functionName, callParams);
+    const addr = contractRaw.startsWith("0x") ? contractRaw : `0x${contractRaw}`;
+    const to = addr;
+    const from = params.from;
+    const result = await evmCall(chain, { to, data, from });
+    return { result };
   }
 };
 async function encodeContractCall(functionName, params) {
@@ -6249,7 +6371,10 @@ function parseDERSignature(sigHex) {
   }
   let offset = 0;
   if (raw.slice(offset, offset + 2) !== "30") {
-    return { r: raw.slice(0, 64).padStart(64, "0"), s: raw.slice(64).padStart(64, "0") };
+    return {
+      r: raw.slice(0, 64).padStart(64, "0"),
+      s: raw.slice(64).padStart(64, "0")
+    };
   }
   offset += 2;
   offset += 2;
@@ -6459,7 +6584,7 @@ var AgentSession = class {
     this.config = config;
     this.client = new AgentClient(config.backendUrl);
     this.client.verbose = !!config.verbose;
-    this.executor = new AgentExecutor(vault, !!config.verbose, vault.publicKeys.ecdsa);
+    this.executor = new AgentExecutor(vault, !!config.verbose, vault.publicKeys.ecdsa, config.vultisig);
     this.publicKey = vault.publicKeys.ecdsa;
     if (config.password) {
       this.executor.setPassword(config.password);
@@ -6616,6 +6741,7 @@ var AgentSession = class {
         error: result.error || ""
       };
     }
+    let serverTxStoredFromStream = 0;
     const streamResult = await this.client.sendMessageStream(
       this.conversationId,
       request,
@@ -6636,16 +6762,11 @@ var AgentSession = class {
           ui.onSuggestions(suggestions);
         },
         onTxReady: (tx) => {
-          const txData = tx?.swap_tx || tx?.send_tx || tx?.tx;
-          if (txData?.status === "error" || txData?.error) {
-            if (this.config.verbose)
-              process.stderr.write(`[session] skipping error tx_ready: ${txData.error || "unknown error"}
-`);
-            return;
-          }
-          this.executor.storeServerTransaction(tx);
-          if (this.config.password) {
-            this.executor.setPassword(this.config.password);
+          if (this.executor.storeServerTransaction(tx)) {
+            serverTxStoredFromStream++;
+            if (this.config.password) {
+              this.executor.setPassword(this.config.password);
+            }
           }
         },
         onMessage: (_msg) => {
@@ -6696,10 +6817,12 @@ var AgentSession = class {
         return;
       }
     }
-    if (streamResult.transactions.length > 0 && this.executor.hasPendingTransaction()) {
+    if (serverTxStoredFromStream > 0) {
       if (this.config.verbose)
-        process.stderr.write(`[session] ${streamResult.transactions.length} tx_ready events, signing client-side
-`);
+        process.stderr.write(
+          `[session] ${serverTxStoredFromStream} stored server tx from tx_ready, signing client-side
+`
+        );
       const signAction = {
         id: `tx_sign_${Date.now()}`,
         type: "sign_tx",
@@ -7214,6 +7337,7 @@ async function executeAgent(ctx2, options) {
   const config = {
     backendUrl: options.backendUrl || process.env.VULTISIG_AGENT_URL || "https://abe.vultisig.com",
     vaultName: vault.name,
+    vultisig: ctx2.sdk,
     password: options.password,
     viaAgent: options.viaAgent,
     sessionId: options.sessionId,
@@ -7255,6 +7379,7 @@ async function executeAgentAsk(ctx2, message, options) {
     const config = {
       backendUrl: options.backendUrl || process.env.VULTISIG_AGENT_URL || "https://abe.vultisig.com",
       vaultName: vault.name,
+      vultisig: ctx2.sdk,
       password: options.password,
       sessionId: options.session,
       verbose: options.verbose,
@@ -7759,7 +7884,7 @@ var EventBuffer = class {
 };
 
 // src/interactive/session.ts
-import { fiatCurrencies as fiatCurrencies3 } from "@vultisig/sdk";
+import { fiatCurrencies as fiatCurrencies4 } from "@vultisig/sdk";
 import chalk12 from "chalk";
 import ora3 from "ora";
 import * as readline3 from "readline";
@@ -8577,9 +8702,9 @@ Error: ${error2.message}`));
         i++;
       }
     }
-    if (!fiatCurrencies3.includes(currency)) {
+    if (!fiatCurrencies4.includes(currency)) {
       console.log(chalk12.red(`Invalid currency: ${currency}`));
-      console.log(chalk12.yellow(`Supported currencies: ${fiatCurrencies3.join(", ")}`));
+      console.log(chalk12.yellow(`Supported currencies: ${fiatCurrencies4.join(", ")}`));
       return;
     }
     const raw = args.includes("--raw");
@@ -8828,7 +8953,7 @@ var cachedVersion = null;
 function getVersion() {
   if (cachedVersion) return cachedVersion;
   if (true) {
-    cachedVersion = "0.15.0";
+    cachedVersion = "0.15.2";
     return cachedVersion;
   }
   try {
@@ -9323,7 +9448,7 @@ async function init(vaultOverride, unlockPassword, passwordTTL) {
     }
     const globalOptions = program.opts();
     const serverEndpoints = resolveServerEndpoints(globalOptions);
-    const sdk = new Vultisig7({
+    const sdk = new Vultisig6({
       onPasswordRequired: createPasswordCallback(),
       ...serverEndpoints ? { serverEndpoints } : {},
       ...passwordTTL !== void 0 ? { passwordCache: { defaultTTL: passwordTTL } } : {}
@@ -9940,7 +10065,7 @@ program.command("update").description("Check for updates and show update command
 setupCompletionCommand(program);
 async function startInteractiveMode() {
   const serverEndpoints = resolveServerEndpoints(parseServerEndpointOverridesFromArgv(process.argv.slice(2)));
-  const sdk = new Vultisig7({
+  const sdk = new Vultisig6({
     onPasswordRequired: createPasswordCallback(),
     ...serverEndpoints ? { serverEndpoints } : {}
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vultisig/cli",
-  "version": "0.15.0",
+  "version": "0.15.2",
   "description": "Command-line wallet for Vultisig - multi-chain MPC wallet management",
   "type": "module",
   "bin": {
@@ -55,7 +55,7 @@
     "@cosmjs/stargate": "^0.38.1",
     "@noble/hashes": "^2.0.1",
     "@vultisig/rujira": "^10.0.0",
-    "@vultisig/sdk": "^0.15.1",
+    "@vultisig/sdk": "^0.15.3",
     "chalk": "^5.6.2",
     "cli-table3": "^0.6.5",
     "commander": "^14.0.3",