minara 0.4.5 → 0.4.7

package/dist/api/crosschain.d.ts

@@ -1,4 +1,4 @@
-import type { CrossChainSwapDto, CrossChainTransferDto, CrossChainActivitiesDto, CrossChainAccount, WalletAsset, TransactionResult } from '../types.js';
+import type { CrossChainSwapDto, CrossChainTransferDto, CrossChainActivitiesDto, CrossChainAccount, WalletAsset, TransactionResult, CrossChainSwapsSimulateItem } from '../types.js';
 /** Get cross-chain account info */
 export declare function getAccount(token: string): Promise<import("../types.js").ApiResponse<CrossChainAccount>>;
 /** Get wallet assets */
@@ -8,7 +8,7 @@ export declare function swap(token: string, dto: CrossChainSwapDto): Promise<imp
 /** Execute multiple swaps */
 export declare function swaps(token: string, swapList: CrossChainSwapDto[]): Promise<import("../types.js").ApiResponse<TransactionResult[]>>;
 /** Simulate swaps (dry-run) */
-export declare function swapsSimulate(token: string, swapList: CrossChainSwapDto[]): Promise<import("../types.js").ApiResponse<TransactionResult[]>>;
+export declare function swapsSimulate(token: string, swapList: CrossChainSwapDto[]): Promise<import("../types.js").ApiResponse<CrossChainSwapsSimulateItem[]>>;
 /** Transfer tokens */
 export declare function transfer(token: string, dto: CrossChainTransferDto): Promise<import("../types.js").ApiResponse<TransactionResult>>;
 /** Get activities */

package/dist/commands/deposit.js

@@ -5,7 +5,7 @@ import { getAccount } from '../api/crosschain.js';
 import { getCurrentUser } from '../api/auth.js';
 import * as perpsApi from '../api/perps.js';
 import { requireAuth } from '../config.js';
-import { info, success, warn, spinner, assertApiOk, wrapAction, requireTransactionConfirmation, openBrowser } from '../utils.js';
+import { info, success, spinner, assertApiOk, wrapAction, requireTransactionConfirmation } from '../utils.js';
 import { requireTouchId } from '../touchid.js';
 import { printTxResult } from '../formatters.js';
 const EVM_CHAINS = 'Ethereum, Base, Arbitrum, Optimism, Polygon, Avalanche, BSC, Berachain, Blast';
@@ -52,65 +52,27 @@ async function showSpotDeposit(token) {
     console.log(chalk.red('  • Sending tokens on the wrong network may result in permanent loss.'));
     console.log('');
 }
-// ─── moonpay (credit card on-ramp) ───────────────────────────────────────
-const MOONPAY_PK = process.env.MOONPAY_PK ?? 'pk_live_yIf64w79W6ufwip4j51PWbymdwGtI';
-const MOONPAY_CURRENCIES = [
-    { name: 'USDC (Base)', code: 'usdc_base', network: 'base' },
-    { name: 'USDC (Ethereum)', code: 'usdc', network: 'ethereum' },
-    { name: 'USDC (Arbitrum)', code: 'usdc_arbitrum', network: 'arbitrum' },
-    { name: 'USDC (Polygon)', code: 'usdc_polygon', network: 'polygon' },
-    { name: 'ETH', code: 'eth', network: 'ethereum' },
-    { name: 'ETH (Base)', code: 'eth_base', network: 'base' },
-    { name: 'SOL', code: 'sol', network: 'solana' },
-];
-async function moonPayOnRamp(token) {
-    const addrSpin = spinner('Fetching wallet address…');
-    const accountRes = await getAccount(token);
-    addrSpin.stop();
-    const account = accountRes.data;
-    const evmAddr = account?.evmAddress;
-    const solAddr = account?.solanaAddress;
-    if (!evmAddr && !solAddr) {
-        warn('No wallet address found. Your account may not be fully initialized.');
-        return;
-    }
-    const currency = await select({
-        message: 'Currency to buy:',
-        choices: MOONPAY_CURRENCIES
-            .filter((c) => c.network === 'solana' ? !!solAddr : !!evmAddr)
-            .map((c) => ({ name: c.name, value: c })),
-    });
-    const walletAddress = currency.network === 'solana' ? solAddr : evmAddr;
-    // Build MoonPay buy URL (no walletAddress in URL — requires server-side signing
-    // which depends on backend MoonPay secret key config).
-    // User pastes their address in MoonPay's form instead.
-    const params = new URLSearchParams();
-    params.set('apiKey', MOONPAY_PK);
-    params.set('currencyCode', currency.code);
-    params.set('defaultCurrencyCode', currency.code);
-    const buyUrl = `https://buy.moonpay.com?${params.toString()}`;
-    console.log('');
-    console.log(chalk.bold('Buy Crypto with Credit Card (MoonPay)'));
-    console.log('');
-    console.log(`  Currency : ${chalk.cyan(currency.name)}`);
-    console.log(`  Wallet   : ${chalk.yellow(walletAddress)}`);
-    console.log(chalk.dim('  ↑ Copy this address and paste it in MoonPay when prompted.'));
-    console.log('');
-    info('Opening MoonPay in your browser…');
-    openBrowser(buyUrl);
-    console.log(chalk.dim('  Complete the purchase in your browser. Funds will arrive in your Minara wallet.'));
-    console.log('');
-}
 // ─── perps ───────────────────────────────────────────────────────────────
 const perpsCmd = new Command('perps')
     .description('Deposit USDC to perps account')
-    .option('-a, --amount <amount>', 'USDC amount (for transfer)')
+    .option('-a, --amount <amount>', 'USDC amount (for transfer from Spot)')
+    .option('--address', 'Show perps deposit address (non-interactive)')
     .option('-y, --yes', 'Skip confirmation')
     .action(wrapAction(async (opts) => {
     const creds = requireAuth();
     await perpsDepositFlow(creds.accessToken, opts);
 }));
 async function perpsDepositFlow(token, opts) {
+    // Non-interactive mode: --address or --amount specified
+    if (opts?.address) {
+        await showPerpsDepositAddresses(token);
+        return;
+    }
+    if (opts?.amount) {
+        await transferSpotToPerps(token, opts);
+        return;
+    }
+    // Interactive mode
     const method = await select({
         message: 'How would you like to deposit to perps?',
         choices: [
@@ -177,35 +139,25 @@ async function transferSpotToPerps(token, opts) {
     printTxResult(res.data);
 }
 // ─── parent ──────────────────────────────────────────────────────────────
-const buyCmd = new Command('buy')
-    .description('Buy crypto with credit card via MoonPay')
-    .action(wrapAction(async () => {
-    const creds = requireAuth();
-    await moonPayOnRamp(creds.accessToken);
-}));
 export const depositCommand = new Command('deposit')
     .alias('receive')
-    .description('Deposit / receive to spot wallet or perps account, or buy with credit card')
+    .description('Deposit / receive to spot wallet or perps account')
     .addCommand(spotCmd)
     .addCommand(perpsCmd)
-    .addCommand(buyCmd)
+    .allowExcessArguments(false)
     .action(wrapAction(async () => {
     const action = await select({
         message: 'Deposit to:',
         choices: [
             { name: 'Spot wallet — view deposit addresses', value: 'spot' },
             { name: 'Perps wallet — view deposit address or transfer from Spot', value: 'perps' },
-            { name: `Buy crypto with credit card ${chalk.dim('(MoonPay)')}`, value: 'buy' },
         ],
     });
     const creds = requireAuth();
     if (action === 'spot') {
         await showSpotDeposit(creds.accessToken);
     }
-    else if (action === 'perps') {
-        await perpsDepositFlow(creds.accessToken);
-    }
     else {
-        await moonPayOnRamp(creds.accessToken);
+        await perpsDepositFlow(creds.accessToken);
     }
 }));

package/dist/commands/discover.js

@@ -20,11 +20,10 @@ function flattenStock(item) {
 // ─── trending ────────────────────────────────────────────────────────────
 const trendingCmd = new Command('trending')
     .description('View trending tokens or stocks')
-    .argument('[category]', 'tokens or stocks (default: interactive)')
     .option('-t, --type <category>', 'Trending type: tokens or stocks (skips interactive prompt)')
-    .action(wrapAction(async (categoryArg, options) => {
+    .action(wrapAction(async (options) => {
     let category;
-    const typeOpt = options?.type?.toLowerCase() || categoryArg?.toLowerCase();
+    const typeOpt = options?.type?.toLowerCase();
     if (typeOpt === 'tokens' || typeOpt === 'token') {
         category = 'tokens';
     }

package/dist/commands/limit-order.js

@@ -9,36 +9,73 @@ import { printTxResult, printTable, LIMIT_ORDER_COLUMNS } from '../formatters.js
 // ─── create ──────────────────────────────────────────────────────────────
 const createCmd = new Command('create')
     .description('Create a limit order')
-    .option('-y, --yes', 'Skip confirmation')
+    .option('-y, --yes', 'Skip transaction confirmation (Touch ID still required)')
+    .option('--chain <chain>', 'Blockchain (ethereum, base, solana, etc.)')
+    .option('--side <side>', 'buy or sell')
+    .option('--token <ticker|address>', 'Token symbol or contract address')
+    .option('--condition <condition>', 'Price condition (above or below)')
+    .option('--price <number>', 'Target price in USD')
+    .option('--amount <number>', 'Amount in USD')
+    .option('--expiry <hours>', 'Expiry time in hours')
     .action(wrapAction(async (opts) => {
     const creds = requireAuth();
-    const chain = await selectChain('Chain:', true);
-    const side = await select({
+    // Validate all flags upfront before any interactive prompts
+    if (opts.side && !['buy', 'sell'].includes(opts.side)) {
+        throw new Error(`Invalid side: ${opts.side}. Must be "buy" or "sell".`);
+    }
+    if (opts.condition && !['above', 'below'].includes(opts.condition)) {
+        throw new Error(`Invalid condition: ${opts.condition}. Must be "above" or "below".`);
+    }
+    if (opts.price !== undefined) {
+        const price = parseFloat(opts.price);
+        if (isNaN(price) || price <= 0) {
+            throw new Error('Target price must be a positive number.');
+        }
+    }
+    if (opts.amount !== undefined) {
+        const amountVal = parseFloat(opts.amount);
+        if (isNaN(amountVal) || amountVal <= 0) {
+            throw new Error('Amount must be a positive number.');
+        }
+    }
+    if (opts.expiry !== undefined) {
+        const expiryVal = parseFloat(opts.expiry);
+        if (isNaN(expiryVal) || expiryVal <= 0) {
+            throw new Error('Expiry must be a positive number of hours.');
+        }
+    }
+    const chain = opts.chain ?? await selectChain('Chain:', true);
+    const side = opts.side ?? await select({
         message: 'Side:',
         choices: [
             { name: 'Buy', value: 'buy' },
             { name: 'Sell', value: 'sell' },
         ],
     });
-    const tokenInput = await input({
+    const tokenInput = opts.token ?? await input({
         message: 'Target token (contract address or ticker):',
         validate: (v) => (v.length > 0 ? true : 'Required'),
     });
     const tokenInfo = await lookupToken(tokenInput);
-    const priceCondition = await select({
+    const priceCondition = opts.condition ?? await select({
         message: 'Trigger when price is:',
         choices: [
             { name: 'Above target price', value: 'above' },
             { name: 'Below target price', value: 'below' },
         ],
     });
-    const targetPrice = await numberPrompt({ message: 'Target price (USD):', required: true });
-    const amount = await input({
+    const targetPrice = opts.price ? parseFloat(opts.price) : await numberPrompt({ message: 'Target price (USD):', required: true });
+    const amountInput = opts.amount ?? await input({
         message: 'Amount (USD):',
         validate: (v) => (parseFloat(v) > 0 ? true : 'Enter positive number'),
     });
-    const expireHours = await numberPrompt({ message: 'Expire after (hours):', default: 24 });
-    const expiredAt = Math.floor(Date.now() / 1000) + (expireHours ?? 24) * 3600;
+    const amount = typeof amountInput === 'string' ? amountInput : String(amountInput);
+    const expireHoursRaw = opts.expiry ? parseFloat(opts.expiry) : await numberPrompt({ message: 'Expire after (hours):', default: 24 });
+    const expireHours = expireHoursRaw ?? 24;
+    if (isNaN(expireHours) || expireHours <= 0) {
+        throw new Error('Expiry must be a positive number of hours.');
+    }
+    const expiredAt = Math.floor(Date.now() / 1000) + expireHours * 3600;
     console.log('');
     console.log(chalk.bold('Limit Order:'));
     console.log(`  Chain     : ${chalk.cyan(chain)}`);
@@ -50,11 +87,8 @@ const createCmd = new Command('create')
     console.log(`  Expires   : ${new Date(expiredAt * 1000).toLocaleString()}`);
     console.log('');
     if (!opts.yes) {
-        const ok = await confirm({ message: 'Create this limit order?', default: false });
-        if (!ok)
-            return;
+        await requireTransactionConfirmation(`Limit ${side} · $${amount} · price ${priceCondition} $${targetPrice} · ${chain}`, tokenInfo, { chain, side, amount: `$${amount}` });
     }
-    await requireTransactionConfirmation(`Limit ${side} · $${amount} · price ${priceCondition} $${targetPrice} · ${chain}`, tokenInfo, { chain, side, amount: `$${amount}` });
     await requireTouchId();
     const spin = spinner('Creating limit order…');
     const res = await loApi.createLimitOrder(creds.accessToken, {

package/dist/commands/perps.js

@@ -957,10 +957,11 @@ const closeCmd = new Command('close')
     success(`Position closed — ${sideLabel} ${symbol} ${sz}`);
     printTxResult(orderRes.data);
 }));
-// ─── leverage ────────────────────────────────────────────────────────────
 const leverageCmd = new Command('leverage')
     .description('Update leverage for a symbol')
     .option(WALLET_OPT[0], WALLET_OPT[1])
+    .option('-s, --symbol <TOKEN>', 'Target token symbol (e.g. ETH, SOL, BTC)')
+    .option('-l, --leverage <VALUE>', 'Leverage multiplier (e.g. 2, 3, 5, 10)')
     .action(wrapAction(async (opts) => {
     const creds = requireAuth();
     const resolved = await resolveWallet(creds.accessToken, opts.wallet, 'Update leverage on which wallet?');
@@ -970,8 +971,18 @@ const leverageCmd = new Command('leverage')
     const metaSpin = spinner('Fetching available assets…');
     const assets = await perpsApi.getAssetMeta();
     metaSpin.stop();
+    // Validate symbol if provided via CLI
     let symbol;
-    if (assets.length > 0) {
+    if (opts.symbol) {
+        symbol = opts.symbol.toUpperCase();
+        const assetMeta = assets.find((a) => a.name.toUpperCase() === symbol);
+        if (!assetMeta) {
+            const validSymbols = assets.map((a) => a.name).join(', ');
+            console.error(chalk.red('✖'), `Invalid symbol: ${opts.symbol}. Supported: ${validSymbols}`);
+            process.exit(1);
+        }
+    }
+    else if (assets.length > 0) {
         symbol = await select({
             message: 'Asset:',
             choices: assets.map((a) => {
@@ -988,19 +999,42 @@ const leverageCmd = new Command('leverage')
     }
     const meta = assets.find((a) => a.name.toUpperCase() === symbol.toUpperCase());
     const maxLev = meta?.maxLeverage ?? 50;
-    const leverage = await numberPrompt({
-        message: `Leverage (1–${maxLev}x):`,
-        min: 1,
-        max: maxLev,
-        required: true,
-    });
-    const isCross = await select({
-        message: 'Margin mode:',
-        choices: [
-            { name: 'Cross', value: true },
-            { name: 'Isolated', value: false },
-        ],
-    });
+    // Validate and parse leverage
+    let leverage;
+    if (opts.leverage) {
+        leverage = parseFloat(opts.leverage);
+        if (isNaN(leverage) || leverage < 1) {
+            console.error(chalk.red('✖'), `Invalid leverage: ${opts.leverage}. Must be a number >= 1.`);
+            process.exit(1);
+        }
+        if (leverage > maxLev) {
+            console.error(chalk.red('✖'), `Leverage ${leverage}x exceeds maximum ${maxLev}x for ${symbol}.`);
+            process.exit(1);
+        }
+    }
+    else {
+        leverage = await numberPrompt({
+            message: `Leverage (1–${maxLev}x):`,
+            min: 1,
+            max: maxLev,
+            required: true,
+        });
+    }
+    // Determine margin mode (cross vs isolated)
+    // In non-interactive mode with both symbol and leverage, default to cross margin
+    let isCross;
+    if (opts.symbol && opts.leverage) {
+        isCross = true;
+    }
+    else {
+        isCross = await select({
+            message: 'Margin mode:',
+            choices: [
+                { name: 'Cross', value: true },
+                { name: 'Isolated', value: false },
+            ],
+        });
+    }
     const spin = spinner('Updating leverage…');
     const res = await perpsApi.updateLeverage(creds.accessToken, { symbol, isCross, leverage: leverage, subAccountId: walletId });
     spin.stop();

package/dist/commands/premium.js

@@ -288,81 +288,6 @@ async function handleCryptoCheckout(token, planId) {
         printKV(data);
     }
 }
-// ─── buy-credits ────────────────────────────────────────────────────────
-const buyCreditsCmd = new Command('buy-credits')
-    .description('Buy a one-time credit package')
-    .action(wrapAction(async () => {
-    const creds = requireAuth();
-    const spin = spinner('Fetching packages…');
-    const plansRes = await paymentApi.getPlans();
-    spin.stop();
-    assertApiOk(plansRes, 'Failed to fetch packages');
-    const { packages } = plansRes.data;
-    if (packages.length === 0) {
-        info('No credit packages available.');
-        return;
-    }
-    // Select package
-    const selectedPkgId = await select({
-        message: 'Select a credit package:',
-        choices: packages.map((pkg) => ({
-            name: `$${pkg.amount} — ${Number(pkg.credit).toLocaleString()} credits`,
-            value: pkg._id,
-        })),
-    });
-    const selectedPkg = packages.find((p) => p._id === selectedPkgId);
-    // Select payment method
-    const payMethod = await select({
-        message: 'Payment method:',
-        choices: [
-            { name: 'Credit Card (Stripe)', value: 'stripe' },
-            { name: 'Crypto (USDC on-chain)', value: 'crypto' },
-        ],
-    });
-    console.log('');
-    console.log(chalk.bold('Package Summary:'));
-    console.log(`  Price      : ${chalk.bold('$' + selectedPkg.amount)}`);
-    console.log(`  Credits    : ${Number(selectedPkg.credit).toLocaleString()}`);
-    console.log(`  Payment    : ${payMethod === 'stripe' ? 'Credit Card (Stripe)' : 'Crypto (USDC)'}`);
-    console.log('');
-    const ok = await confirm({ message: 'Proceed to checkout?', default: true });
-    if (!ok) {
-        console.log(chalk.dim('Cancelled.'));
-        return;
-    }
-    if (payMethod === 'stripe') {
-        const spin2 = spinner('Creating checkout session…');
-        const res = await paymentApi.checkoutPackage(creds.accessToken, selectedPkgId, 'https://minara.ai/payment/success', 'https://minara.ai/payment/cancel');
-        spin2.stop();
-        assertApiOk(res, 'Failed to create checkout');
-        const url = res.data?.url ?? res.data?.checkoutUrl;
-        if (url) {
-            success('Opening browser for payment…');
-            console.log(chalk.cyan(`  ${url}`));
-            openBrowser(url);
-        }
-        else {
-            success('Checkout created:');
-            printKV(res.data);
-        }
-    }
-    else {
-        const spin2 = spinner('Creating crypto checkout…');
-        const res = await paymentApi.cryptoCheckoutPackage(creds.accessToken, selectedPkgId);
-        spin2.stop();
-        assertApiOk(res, 'Failed to create crypto checkout');
-        const url = res.data?.url ?? res.data?.checkoutUrl;
-        if (url) {
-            success('Opening browser for crypto payment…');
-            console.log(chalk.cyan(`  ${url}`));
-            openBrowser(url);
-        }
-        else {
-            success('Crypto checkout:');
-            printKV(res.data);
-        }
-    }
-}));
 // ─── cancel ─────────────────────────────────────────────────────────────
 const cancelCmd = new Command('cancel')
     .description('Cancel your current subscription')
@@ -398,7 +323,6 @@ export const premiumCommand = new Command('premium')
     .addCommand(plansCmd)
     .addCommand(statusCmd)
     .addCommand(subscribeCmd)
-    .addCommand(buyCreditsCmd)
     .addCommand(cancelCmd)
     .action(wrapAction(async () => {
     const action = await select({
@@ -407,7 +331,6 @@ export const premiumCommand = new Command('premium')
             { name: 'View available plans', value: 'plans' },
             { name: 'View my subscription', value: 'status' },
             { name: 'Subscribe / Change plan', value: 'subscribe' },
-            { name: 'Buy credit package', value: 'buy-credits' },
             { name: 'Cancel subscription', value: 'cancel' },
         ],
     });

package/dist/commands/swap.js

@@ -6,16 +6,24 @@ import { get } from '../api/client.js';
 import { requireAuth } from '../config.js';
 import { success, info, warn, spinner, assertApiOk, wrapAction, requireTransactionConfirmation, lookupToken, normalizeChain } from '../utils.js';
 import { requireTouchId } from '../touchid.js';
-import { printTxResult, printKV } from '../formatters.js';
+import { printTxResult, printSwapSimulation } from '../formatters.js';
 export const swapCommand = new Command('swap')
     .description('Swap tokens (cross-chain spot trading)')
     .option('-s, --side <side>', 'buy or sell')
     .option('-t, --token <address|ticker>', 'Token contract address or ticker symbol')
     .option('-a, --amount <amount>', 'USD amount (buy) or token amount (sell)')
+    .option('-c, --chain <chain>', 'Blockchain (ethereum, base, solana, etc.)')
     .option('-y, --yes', 'Skip confirmation')
     .option('--dry-run', 'Simulate without executing')
     .action(wrapAction(async (opts) => {
     const creds = requireAuth();
+    // ── 0. Validate CLI options early ────────────────────────────────────
+    if (opts.amount) {
+        const amountNum = parseFloat(opts.amount);
+        if (opts.amount.toLowerCase() !== 'all' && (isNaN(amountNum) || amountNum <= 0)) {
+            throw new Error('Amount must be a positive number');
+        }
+    }
     // ── 1. Side ──────────────────────────────────────────────────────────
     let side = opts.side;
     if (!side) {
@@ -33,10 +41,17 @@ export const swapCommand = new Command('swap')
         validate: (v) => (v.length > 0 ? true : 'Please enter a token address or ticker'),
     });
     const tokenInfo = await lookupToken(tokenInput);
-    // ── 3. Chain (derived from token) ────────────────────────────────────
-    const chain = normalizeChain(tokenInfo.chain);
+    // ── 3. Chain (use explicit flag or derive from token) ────────────────
+    let chain = opts.chain ? normalizeChain(opts.chain) : undefined;
+    if (opts.chain && !chain) {
+        warn(`Unsupported chain: ${opts.chain}`);
+        return;
+    }
     if (!chain) {
-        warn(`Unable to determine chain for token. Raw chain value: ${tokenInfo.chain ?? 'unknown'}`);
+        chain = normalizeChain(tokenInfo.chain);
+    }
+    if (!chain) {
+        warn('Unable to determine chain. Use --chain to specify.');
         return;
     }
     // ── 4. Amount ────────────────────────────────────────────────────────
@@ -89,17 +104,11 @@ export const swapCommand = new Command('swap')
             }]);
         spin.stop();
         assertApiOk(simRes, 'Simulation failed');
-        console.log('');
-        console.log(chalk.bold('Simulation Result:'));
-        if (Array.isArray(simRes.data)) {
+        if (simRes.data && Array.isArray(simRes.data)) {
             for (const item of simRes.data) {
-                printKV(item);
-                console.log('');
+                printSwapSimulation(item);
             }
         }
-        else if (simRes.data) {
-            printKV(simRes.data);
-        }
         return;
     }
     // ── 7. Confirm & Touch ID ──────────────────────────────────────────

package/dist/commands/transfer.js

@@ -15,6 +15,22 @@ export const transferCommand = new Command('transfer')
     .option('-y, --yes', 'Skip confirmation')
     .action(wrapAction(async (opts) => {
     const creds = requireAuth();
+    // ── 0. Validate CLI options early ────────────────────────────────────
+    if (opts.amount) {
+        const amountNum = parseFloat(opts.amount);
+        if (isNaN(amountNum) || amountNum <= 0) {
+            throw new Error('Amount must be a positive number');
+        }
+    }
+    if (opts.to) {
+        if (!opts.chain) {
+            throw new Error('--chain is required when --to is provided');
+        }
+        const addrValidation = validateAddress(opts.to, opts.chain);
+        if (addrValidation !== true) {
+            throw new Error(addrValidation);
+        }
+    }
     // ── 1. Chain ─────────────────────────────────────────────────────────
     const chain = opts.chain ?? await selectChain();
     // ── 2. Token ─────────────────────────────────────────────────────────

package/dist/commands/withdraw.js

@@ -15,27 +15,45 @@ export const withdrawCommand = new Command('withdraw')
     .option('-y, --yes', 'Skip confirmation')
     .action(wrapAction(async (opts) => {
     const creds = requireAuth();
-    // ── 1. Show current assets for reference ─────────────────────────────
-    const assetsSpin = spinner('Fetching your assets…');
-    const assetsRes = await getAssets(creds.accessToken);
-    assetsSpin.stop();
-    if (assetsRes.success && assetsRes.data) {
-        const assets = assetsRes.data;
-        if (Array.isArray(assets) && assets.length > 0) {
-            console.log('');
-            console.log(chalk.dim('Your current assets:'));
-            for (const asset of assets.slice(0, 15)) {
-                const sym = asset.symbol ?? asset.tokenSymbol ?? '';
-                const bal = asset.balance ?? asset.amount ?? '';
-                const ch = asset.chain ?? asset.chainName ?? '';
-                if (sym || bal) {
-                    console.log(chalk.dim(`  ${sym}  ${bal}  (${ch})`));
+    // ── 0. Validate CLI options early ────────────────────────────────────
+    if (opts.amount) {
+        const amountNum = parseFloat(opts.amount);
+        if (isNaN(amountNum) || amountNum <= 0) {
+            throw new Error('Amount must be a positive number');
+        }
+    }
+    if (opts.to) {
+        if (!opts.chain) {
+            throw new Error('--chain is required when --to is provided');
+        }
+        const addrValidation = validateAddress(opts.to, opts.chain);
+        if (addrValidation !== true) {
+            throw new Error(addrValidation);
+        }
+    }
+    // ── 1. Show current assets for reference (only in interactive mode)
+    if (!opts.chain && !opts.token && !opts.amount && !opts.to) {
+        const assetsSpin = spinner('Fetching your assets…');
+        const assetsRes = await getAssets(creds.accessToken);
+        assetsSpin.stop();
+        if (assetsRes.success && assetsRes.data) {
+            const assets = assetsRes.data;
+            if (Array.isArray(assets) && assets.length > 0) {
+                console.log('');
+                console.log(chalk.dim('Your current assets:'));
+                for (const asset of assets.slice(0, 15)) {
+                    const sym = asset.symbol ?? asset.tokenSymbol ?? '';
+                    const bal = asset.balance ?? asset.amount ?? '';
+                    const ch = asset.chain ?? asset.chainName ?? '';
+                    if (sym || bal) {
+                        console.log(chalk.dim(`  ${sym}  ${bal}  (${ch})`));
+                    }
                 }
+                if (assets.length > 15) {
+                    console.log(chalk.dim(`  … and ${assets.length - 15} more`));
+                }
+                console.log('');
             }
-            if (assets.length > 15) {
-                console.log(chalk.dim(`  … and ${assets.length - 15} more`));
-            }
-            console.log('');
         }
     }
     // ── 2. Chain ─────────────────────────────────────────────────────────

package/dist/formatters.d.ts

@@ -1,3 +1,8 @@
+import type { CrossChainSwapsSimulateResultDto, CrossChainSwapsSimulateErrorDto } from './types.js';
+/** Convert wei (10^18) string to USD decimal string */
+export declare function formatWeiToUsd(weiStr: string): string;
+/** Convert BigInt amount string using token decimals */
+export declare function formatTokenAmount(amountStr: string, decimals: number): string;
 /** Enable raw JSON output (all formatters fall back to JSON.stringify). */
 export declare function setRawJson(enabled: boolean): void;
 /** Check if raw JSON output mode is active. */
@@ -57,3 +62,7 @@ export declare function printFearGreed(data: Record<string, unknown>): void;
  * Pretty-print BTC/crypto metrics — flatten currentQuote, skip ohlcvQuotes.
  */
 export declare function printCryptoMetrics(data: Record<string, unknown>): void;
+/** Check if a simulation result is an error */
+export declare function isSimulateError(item: CrossChainSwapsSimulateResultDto | CrossChainSwapsSimulateErrorDto): item is CrossChainSwapsSimulateErrorDto;
+/** Pretty-print swap simulation result with wei-to-USD conversion */
+export declare function printSwapSimulation(result: CrossChainSwapsSimulateResultDto | CrossChainSwapsSimulateErrorDto): void;

package/dist/formatters.js

@@ -5,6 +5,35 @@
 // ═══════════════════════════════════════════════════════════════════════════
 import chalk from 'chalk';
 import Table from 'cli-table3';
+// ─── Wei / BigInt formatting ──────────────────────────────────────────────
+/** Convert wei (10^18) string to USD decimal string */
+export function formatWeiToUsd(weiStr) {
+    try {
+        const wei = BigInt(weiStr);
+        // Divide by 10^18 (wei to ether conversion)
+        const dollars = Number(wei) / 1e18;
+        return dollars.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 6 });
+    }
+    catch {
+        return weiStr; // fallback to original if parsing fails
+    }
+}
+/** Convert BigInt amount string using token decimals */
+export function formatTokenAmount(amountStr, decimals) {
+    try {
+        const amount = BigInt(amountStr);
+        const value = Number(amount) / Math.pow(10, decimals);
+        return value.toLocaleString('en-US', { maximumFractionDigits: decimals });
+    }
+    catch {
+        return amountStr; // fallback to original if parsing fails
+    }
+}
+/** Check if a string looks like a wei value (large BigInt string) */
+function isWeiString(value) {
+    // Wei strings are typically large numbers (18+ digits)
+    return /^\d{15,}$/.test(value);
+}
 // ─── Raw JSON mode ───────────────────────────────────────────────────────
 let _rawJson = false;
 /** Enable raw JSON output (all formatters fall back to JSON.stringify). */
@@ -58,6 +87,10 @@ export function formatValue(value, key) {
         // Hex addresses — must check before numeric coercion (0x… is valid Number)
         if (/^0x[0-9a-fA-F]{20,}$/.test(value))
             return chalk.yellow(value);
+        // Wei-format USD fee strings (key contains "FeeInUsd" and value is large BigInt string)
+        if (key && /FeeInUsd$/i.test(key) && isWeiString(value)) {
+            return `$${formatWeiToUsd(value)}`;
+        }
         // Numeric string that looks like a price / amount
         const num = Number(value);
         if (!isNaN(num) && value.trim() !== '') {
@@ -452,6 +485,85 @@ export function printCryptoMetrics(data) {
         console.log(`  ${chalk.dim(label.padEnd(maxLen))} : ${val}`);
     }
 }
+// ─── Swap Simulation ─────────────────────────────────────────────────────
+/** Check if a simulation result is an error */
+export function isSimulateError(item) {
+    return 'error' in item;
+}
+/** Pretty-print swap simulation result with wei-to-USD conversion */
+export function printSwapSimulation(result) {
+    if (_rawJson) {
+        console.log(JSON.stringify(result, null, 2));
+        return;
+    }
+    // Handle error case
+    if (isSimulateError(result)) {
+        console.log(chalk.red.bold(`  Error: ${result.error}`));
+        if (result.message) {
+            console.log(chalk.dim(`  Message: ${result.message}`));
+        }
+        return;
+    }
+    // Convert wei fees to USD (fees are always in 10^18 format)
+    const totalFeeUsd = formatWeiToUsd(result.totalFeeInUsd);
+    const gasFeeUsd = formatWeiToUsd(result.gasFeeInUsd);
+    const serviceFeeUsd = formatWeiToUsd(result.serviceFeeInUsd);
+    const lpFeeUsd = formatWeiToUsd(result.lpFeeInUsd);
+    // Sanity check: warn if total fee exceeds $1000
+    const totalFeeNum = parseFloat(totalFeeUsd.replace(/,/g, ''));
+    const feeWarning = totalFeeNum > 1000 ? chalk.yellow(' ⚠️ (unusually high)') : '';
+    // Print header
+    console.log('');
+    console.log(chalk.bold('  Simulation Result:'));
+    // Print token changes (using token.decimals for amount conversion)
+    if (result.increased.length > 0) {
+        console.log(chalk.green.bold('  Tokens Received:'));
+        for (const change of result.increased) {
+            const token = change.token;
+            const decimals = token.decimals ?? 18;
+            const amountFormatted = formatTokenAmount(change.amount, decimals);
+            const amountUsd = change.amountInUSD ? formatWeiToUsd(change.amountInUSD) : null;
+            console.log(`    ${chalk.bold(`$${token.symbol}`)} — ${token.name}`);
+            console.log(`      ${chalk.dim('Address')}  : ${chalk.yellow(token.address)}`);
+            console.log(`      ${chalk.dim('Amount')}   : ${amountFormatted}`);
+            if (amountUsd)
+                console.log(`      ${chalk.dim('Value')}    : $${amountUsd}`);
+        }
+    }
+    if (result.decreased.length > 0) {
+        console.log(chalk.red.bold('  Tokens Spent:'));
+        for (const change of result.decreased) {
+            const token = change.token;
+            const decimals = token.decimals ?? 18;
+            const amountFormatted = formatTokenAmount(change.amount, decimals);
+            const amountUsd = change.amountInUSD ? formatWeiToUsd(change.amountInUSD) : null;
+            console.log(`    ${chalk.bold(`$${token.symbol}`)} — ${token.name}`);
+            console.log(`      ${chalk.dim('Address')}  : ${chalk.yellow(token.address)}`);
+            console.log(`      ${chalk.dim('Amount')}   : ${amountFormatted}`);
+            if (amountUsd)
+                console.log(`      ${chalk.dim('Value')}    : $${amountUsd}`);
+        }
+    }
+    // Print fees
+    console.log('');
+    console.log(chalk.bold('  Fees:'));
+    console.log(`    ${chalk.dim('Total Fee')}      : $${totalFeeUsd}${feeWarning}`);
+    console.log(`    ${chalk.dim('Gas Fee')}       : $${gasFeeUsd}`);
+    console.log(`    ${chalk.dim('Service Fee')}   : $${serviceFeeUsd}`);
+    console.log(`    ${chalk.dim('LP Fee')}        : $${lpFeeUsd}`);
+    // Print other info
+    console.log('');
+    console.log(`    ${chalk.dim('Slippage')}      : ${result.slippageBps} bps`);
+    if (result.priceImpact !== null && result.priceImpact !== undefined) {
+        // -1 means price impact could not be calculated or is negligible
+        const impactStr = String(result.priceImpact).trim();
+        const impactNum = parseFloat(impactStr);
+        const impactDisplay = impactNum === -1 || impactStr === '-1'
+            ? chalk.dim('— (negligible)')
+            : `${impactStr}%`;
+        console.log(`    ${chalk.dim('Price Impact')}  : ${impactDisplay}`);
+    }
+}
 // ─── Helpers ─────────────────────────────────────────────────────────────
 function truncate(str, len) {
     return str.length > len ? str.slice(0, len - 1) + '…' : str;

package/dist/types.d.ts

@@ -123,6 +123,54 @@ export interface TransactionResult {
     status?: string;
     [key: string]: unknown;
 }
+export interface TokenInfoDto {
+    name: string;
+    symbol: string;
+    address: string;
+    chainId: number;
+    decimals: number;
+    realDecimals: number;
+    price: number;
+    image?: string;
+    assetId?: string;
+    type?: string;
+    rank?: number | null;
+    slotIndex?: number | null;
+}
+export interface TokenChangeDto {
+    token: TokenInfoDto;
+    /** Amount of token changed (BigInt string, use token.decimals for conversion) */
+    amount: string;
+    /** Amount in USD (BigInt string in wei/10^18, may be null) */
+    amountInUSD: string | null;
+}
+export interface CrossChainSwapsSimulateResultDto {
+    /** Tokens that increased in balance */
+    increased: TokenChangeDto[];
+    /** Tokens that decreased in balance */
+    decreased: TokenChangeDto[];
+    /** Total fee in USD (BigInt string in wei/10^18) */
+    totalFeeInUsd: string;
+    /** Gas fee in USD (BigInt string in wei/10^18) */
+    gasFeeInUsd: string;
+    /** Service fee in USD (BigInt string in wei/10^18) */
+    serviceFeeInUsd: string;
+    /** LP fee in USD (BigInt string in wei/10^18) */
+    lpFeeInUsd: string;
+    /** Slippage in basis points */
+    slippageBps: number;
+    /** Price impact (may be null) */
+    priceImpact: string | null;
+}
+export interface CrossChainSwapsSimulateErrorDto {
+    error: string;
+    message?: string;
+}
+export type CrossChainSwapsSimulateItem = CrossChainSwapsSimulateResultDto | CrossChainSwapsSimulateErrorDto;
+export interface CrossChainSwapsSimulateResponseDto {
+    success: boolean;
+    data: CrossChainSwapsSimulateItem[];
+}
 export type SwapSide = 'buy' | 'sell';
 export interface CrossChainSwapDto {
     chain: Chain;

package/dist/utils.js

@@ -211,11 +211,11 @@ export async function lookupToken(tokenInput) {
         const { searchTokens } = await import('./api/tokens.js');
         const res = await searchTokens(keyword);
         spin.stop();
-        if (!res.success || !res.data || res.data.length === 0) {
-            if (isTicker) {
-                warn(`No token found for ticker $${keyword}`);
-            }
-            return { address: tokenInput };
+        if (!res.success) {
+            throw new Error(res.error?.message ?? 'Failed to lookup token');
+        }
+        if (!res.data || res.data.length === 0) {
+            throw new Error(`Unknown token: ${tokenInput}`);
         }
         let tokens = res.data;
         if (isTicker) {
@@ -276,9 +276,9 @@ export async function lookupToken(tokenInput) {
             chain: selected.chain,
         };
     }
-    catch {
+    catch (err) {
         spin.stop();
-        return { address: tokenInput };
+        throw err;
     }
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minara",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "CLI client for Minara.ai — login, trade, deposit/withdraw, chat and more from your terminal.",
   "type": "module",
   "main": "dist/index.js",