minara 0.1.5 → 0.2.0

package/dist/commands/perps.js

@@ -3,7 +3,9 @@ import { input, select, confirm, number as numberPrompt } from '@inquirer/prompt
 import chalk from 'chalk';
 import * as perpsApi from '../api/perps.js';
 import { requireAuth } from '../config.js';
-import { success, info, warn, spinner, assertApiOk, wrapAction } from '../utils.js';
+import { success, info, warn, spinner, assertApiOk, formatOrderSide, wrapAction, requireTransactionConfirmation } from '../utils.js';
+import { requireTouchId } from '../touchid.js';
+import { printTxResult, printTable, POSITION_COLUMNS } from '../formatters.js';
 // ─── deposit ─────────────────────────────────────────────────────────────
 const depositCmd = new Command('deposit')
     .description('Deposit USDC into Hyperliquid perps (min 5 USDC)')
@@ -24,13 +26,14 @@ const depositCmd = new Command('deposit')
         if (!ok)
             return;
     }
+    await requireTransactionConfirmation(`Deposit ${amount} USDC → Perps`);
+    await requireTouchId();
     const spin = spinner('Depositing…');
     const res = await perpsApi.deposit(creds.accessToken, { usdcAmount: amount });
     spin.stop();
     assertApiOk(res, 'Deposit failed');
     success(`Deposited ${amount} USDC`);
-    if (res.data)
-        console.log(JSON.stringify(res.data, null, 2));
+    printTxResult(res.data);
 }));
 // ─── withdraw ────────────────────────────────────────────────────────────
 const withdrawCmd = new Command('withdraw')
@@ -54,13 +57,14 @@ const withdrawCmd = new Command('withdraw')
         if (!ok)
             return;
     }
+    await requireTransactionConfirmation(`Withdraw ${amount} USDC → ${toAddress}`);
+    await requireTouchId();
     const spin = spinner('Withdrawing…');
     const res = await perpsApi.withdraw(creds.accessToken, { usdcAmount: amount, toAddress });
     spin.stop();
     assertApiOk(res, 'Withdrawal failed');
     success('Withdrawal submitted');
-    if (res.data)
-        console.log(JSON.stringify(res.data, null, 2));
+    printTxResult(res.data);
 }));
 // ─── positions ───────────────────────────────────────────────────────────
 const positionsCmd = new Command('positions')
@@ -72,7 +76,16 @@ const positionsCmd = new Command('positions')
     const res = await perpsApi.getPositions(creds.accessToken);
     spin.stop();
     assertApiOk(res, 'Failed to fetch positions');
-    console.log(JSON.stringify(res.data, null, 2));
+    const positions = res.data;
+    if (!positions || (Array.isArray(positions) && positions.length === 0)) {
+        console.log(chalk.dim('No open positions.'));
+    }
+    else {
+        console.log('');
+        console.log(chalk.bold('Open Positions:'));
+        printTable(positions, POSITION_COLUMNS);
+        console.log('');
+    }
 }));
 // ─── order ───────────────────────────────────────────────────────────────
 const orderCmd = new Command('order')
@@ -132,7 +145,13 @@ const orderCmd = new Command('order')
     };
     console.log('');
     console.log(chalk.bold('Order Preview:'));
-    console.log(JSON.stringify(order, null, 2));
+    console.log(`  Asset        : ${chalk.bold(order.a)}`);
+    console.log(`  Side         : ${formatOrderSide(order.b ? 'buy' : 'sell')}`);
+    console.log(`  Price        : ${chalk.yellow(order.p)}`);
+    console.log(`  Size         : ${chalk.bold(order.s)}`);
+    console.log(`  Reduce Only  : ${order.r ? chalk.yellow('Yes') : 'No'}`);
+    console.log(`  Type         : ${'limit' in order.t ? 'Limit (GTC)' : 'Trigger'}`);
+    console.log(`  Grouping     : ${grouping}`);
     console.log('');
     if (!opts.yes) {
         const ok = await confirm({ message: 'Submit order?', default: false });
@@ -141,13 +160,14 @@ const orderCmd = new Command('order')
             return;
         }
     }
+    await requireTransactionConfirmation(`Perps ${order.b ? 'LONG' : 'SHORT'} ${order.a} · size ${order.s} @ ${order.p}`);
+    await requireTouchId();
     const spin = spinner('Placing order…');
     const res = await perpsApi.placeOrders(creds.accessToken, { orders: [order], grouping });
     spin.stop();
     assertApiOk(res, 'Order placement failed');
     success('Order submitted!');
-    if (res.data)
-        console.log(JSON.stringify(res.data, null, 2));
+    printTxResult(res.data);
 }));
 // ─── cancel ──────────────────────────────────────────────────────────────
 const cancelCmd = new Command('cancel')
@@ -173,8 +193,7 @@ const cancelCmd = new Command('cancel')
     spin.stop();
     assertApiOk(res, 'Order cancellation failed');
     success('Order cancelled');
-    if (res.data)
-        console.log(JSON.stringify(res.data, null, 2));
+    printTxResult(res.data);
 }));
 // ─── leverage ────────────────────────────────────────────────────────────
 const leverageCmd = new Command('leverage')
@@ -205,7 +224,15 @@ const tradesCmd = new Command('trades')
     const res = await perpsApi.getCompletedTrades(creds.accessToken);
     spin.stop();
     assertApiOk(res, 'Failed to fetch trades');
-    console.log(JSON.stringify(res.data, null, 2));
+    console.log('');
+    console.log(chalk.bold('Completed Trades:'));
+    if (Array.isArray(res.data) && res.data.length > 0) {
+        printTable(res.data);
+    }
+    else {
+        console.log(chalk.dim('  No completed trades.'));
+    }
+    console.log('');
 }));
 // ─── fund-records ────────────────────────────────────────────────────────
 const fundRecordsCmd = new Command('fund-records')
@@ -218,7 +245,15 @@ const fundRecordsCmd = new Command('fund-records')
     const res = await perpsApi.getFundRecords(creds.accessToken, parseInt(opts.page, 10), parseInt(opts.limit, 10));
     spin.stop();
     assertApiOk(res, 'Failed to fetch fund records');
-    console.log(JSON.stringify(res.data, null, 2));
+    console.log('');
+    console.log(chalk.bold('Fund Records:'));
+    if (Array.isArray(res.data) && res.data.length > 0) {
+        printTable(res.data);
+    }
+    else {
+        console.log(chalk.dim('  No fund records.'));
+    }
+    console.log('');
 }));
 // ═════════════════════════════════════════════════════════════════════════
 //  Parent

package/dist/commands/premium.d.ts

@@ -0,0 +1,2 @@
+import { Command } from 'commander';
+export declare const premiumCommand: Command;

package/dist/commands/premium.js

@@ -0,0 +1,398 @@
+import { Command } from 'commander';
+import { select, confirm } from '@inquirer/prompts';
+import chalk from 'chalk';
+import * as paymentApi from '../api/payment.js';
+import { getCurrentUser } from '../api/auth.js';
+import { requireAuth } from '../config.js';
+import { success, info, warn, spinner, assertApiOk, wrapAction } from '../utils.js';
+import { openBrowser } from '../utils.js';
+import { printKV, isRawJson } from '../formatters.js';
+// ─── helpers ────────────────────────────────────────────────────────────
+function formatPrice(plan) {
+    if (plan.price === 0)
+        return chalk.green('Free');
+    const price = `$${plan.price}`;
+    const period = plan.interval === 'month' ? '/mo' : '/yr';
+    return chalk.bold(price) + chalk.dim(period);
+}
+function formatCredits(rules) {
+    const credits = rules.limitCredit ? Number(rules.limitCredit).toLocaleString() : '—';
+    return credits;
+}
+/** Group plans by tier name and display monthly + yearly side-by-side */
+function groupPlansByTier(plans) {
+    const tiers = new Map();
+    for (const p of plans) {
+        if (p.status !== 'active')
+            continue;
+        const existing = tiers.get(p.name) ?? {};
+        if (p.interval === 'month')
+            existing.monthly = p;
+        else
+            existing.yearly = p;
+        tiers.set(p.name, existing);
+    }
+    return tiers;
+}
+// ─── plans ──────────────────────────────────────────────────────────────
+const plansCmd = new Command('plans')
+    .description('View all available subscription plans')
+    .action(wrapAction(async () => {
+    const spin = spinner('Fetching plans…');
+    const res = await paymentApi.getPlans();
+    spin.stop();
+    assertApiOk(res, 'Failed to fetch plans');
+    const { plans, packages } = res.data;
+    if (isRawJson()) {
+        console.log(JSON.stringify(res.data, null, 2));
+        return;
+    }
+    // ── Subscription Plans ──────────────────────────────────────────
+    console.log('');
+    console.log(chalk.bold('Subscription Plans:'));
+    console.log('');
+    const tiers = groupPlansByTier(plans);
+    // Table header
+    const header = [
+        chalk.white.bold('Plan'),
+        chalk.white.bold('Monthly'),
+        chalk.white.bold('Yearly'),
+        chalk.white.bold('Credits'),
+        chalk.white.bold('Workflows'),
+        chalk.white.bold('Invites'),
+    ];
+    const rows = [];
+    for (const [tierName, tier] of tiers) {
+        const ref = tier.monthly ?? tier.yearly;
+        const monthly = tier.monthly ? formatPrice(tier.monthly) : chalk.dim('—');
+        const yearly = tier.yearly ? formatPrice(tier.yearly) : chalk.dim('—');
+        const savings = tier.monthly && tier.yearly
+            ? chalk.green(` (save ${Math.round((1 - tier.yearly.price / (tier.monthly.price * 12)) * 100)}%)`)
+            : '';
+        rows.push([
+            chalk.bold(tierName),
+            monthly,
+            yearly + savings,
+            formatCredits(ref.rules),
+            String(ref.rules.limitWorkflows ?? 0),
+            String(ref.inviteCount ?? 0),
+        ]);
+    }
+    // Print using cli-table3 directly for custom layout
+    const Table = (await import('cli-table3')).default;
+    const table = new Table({
+        head: header,
+        style: { head: [], border: ['dim'] },
+    });
+    for (const row of rows)
+        table.push(row);
+    console.log(table.toString());
+    // ── Credit Packages ─────────────────────────────────────────────
+    if (packages.length > 0) {
+        console.log('');
+        console.log(chalk.bold('Credit Packages (one-time):'));
+        console.log('');
+        const pkgTable = new Table({
+            head: [
+                chalk.white.bold('Price'),
+                chalk.white.bold('Credits'),
+            ],
+            style: { head: [], border: ['dim'] },
+        });
+        for (const pkg of packages) {
+            pkgTable.push([
+                chalk.bold(`$${pkg.amount}`),
+                Number(pkg.credit).toLocaleString(),
+            ]);
+        }
+        console.log(pkgTable.toString());
+    }
+    console.log('');
+    console.log(chalk.dim('  Subscribe: ') + chalk.cyan('minara premium subscribe'));
+    console.log('');
+}));
+// ─── status ─────────────────────────────────────────────────────────────
+const statusCmd = new Command('status')
+    .description('View your current subscription status')
+    .action(wrapAction(async () => {
+    const creds = requireAuth();
+    const spin = spinner('Fetching subscription status…');
+    const [userRes, plansRes] = await Promise.all([
+        getCurrentUser(creds.accessToken),
+        paymentApi.getPlans(),
+    ]);
+    spin.stop();
+    assertApiOk(userRes, 'Failed to fetch account info');
+    const user = userRes.data;
+    if (isRawJson()) {
+        console.log(JSON.stringify({
+            subscription: user.subscription ?? null,
+            plan: user.plan ?? null,
+        }, null, 2));
+        return;
+    }
+    console.log('');
+    console.log(chalk.bold('Subscription Status:'));
+    console.log('');
+    // Try to extract subscription info from various possible response shapes
+    const sub = user.subscription;
+    const userPlan = user.plan;
+    if (sub && Object.keys(sub).length > 0) {
+        const planName = sub.planName ?? sub.plan ?? sub.name ?? '—';
+        const status = sub.status ?? '—';
+        const interval = sub.interval ?? '—';
+        const cancelAt = sub.cancelAtPeriodEnd;
+        const periodEnd = sub.currentPeriodEnd;
+        console.log(`  ${chalk.dim('Plan'.padEnd(16))} : ${chalk.bold(String(planName))}`);
+        console.log(`  ${chalk.dim('Status'.padEnd(16))} : ${status === 'active' ? chalk.green('Active') : chalk.yellow(String(status))}`);
+        console.log(`  ${chalk.dim('Billing'.padEnd(16))} : ${String(interval)}`);
+        if (periodEnd) {
+            console.log(`  ${chalk.dim('Renews On'.padEnd(16))} : ${new Date(periodEnd).toLocaleDateString()}`);
+        }
+        if (cancelAt) {
+            console.log(`  ${chalk.dim(''.padEnd(16))}   ${chalk.yellow('⚠ Will cancel at end of billing period')}`);
+        }
+    }
+    else if (userPlan && Object.keys(userPlan).length > 0) {
+        printKV(userPlan);
+    }
+    else {
+        // No subscription info found — assume free plan
+        console.log(`  ${chalk.dim('Plan'.padEnd(16))} : ${chalk.bold('Free')}`);
+        console.log(`  ${chalk.dim('Status'.padEnd(16))} : ${chalk.green('Active')}`);
+        console.log('');
+        console.log(chalk.dim('  Upgrade with: ') + chalk.cyan('minara premium subscribe'));
+    }
+    console.log('');
+}));
+// ─── subscribe ──────────────────────────────────────────────────────────
+const subscribeCmd = new Command('subscribe')
+    .description('Subscribe to a plan or change your plan (upgrade / downgrade)')
+    .action(wrapAction(async () => {
+    const creds = requireAuth();
+    // 1. Fetch plans
+    const spin = spinner('Fetching plans…');
+    const plansRes = await paymentApi.getPlans();
+    spin.stop();
+    assertApiOk(plansRes, 'Failed to fetch plans');
+    const { plans } = plansRes.data;
+    const activePlans = plans.filter((p) => p.status === 'active' && p.price > 0);
+    if (activePlans.length === 0) {
+        info('No paid plans available.');
+        return;
+    }
+    // 2. Select plan
+    const selectedPlanId = await select({
+        message: 'Select a plan:',
+        choices: activePlans.map((p) => ({
+            name: `${p.name} (${p.interval === 'month' ? 'Monthly' : 'Yearly'}) — ${formatPrice(p)}  [${formatCredits(p.rules)} credits, ${p.rules.limitWorkflows ?? 0} workflows]`,
+            value: p._id,
+        })),
+    });
+    const selectedPlan = activePlans.find((p) => p._id === selectedPlanId);
+    // 3. Select payment method
+    const payMethod = await select({
+        message: 'Payment method:',
+        choices: [
+            { name: 'Credit Card (Stripe)', value: 'stripe' },
+            { name: 'Crypto (USDC on-chain)', value: 'crypto' },
+        ],
+    });
+    // 4. Confirm
+    const priceStr = `$${selectedPlan.price}/${selectedPlan.interval === 'month' ? 'mo' : 'yr'}`;
+    console.log('');
+    console.log(chalk.bold('Order Summary:'));
+    console.log(`  Plan    : ${chalk.bold(selectedPlan.name)} (${selectedPlan.interval === 'month' ? 'Monthly' : 'Yearly'})`);
+    console.log(`  Price   : ${chalk.bold(priceStr)}`);
+    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;
+    }
+    // 5. Create checkout
+    if (payMethod === 'stripe') {
+        await handleStripeCheckout(creds.accessToken, selectedPlanId);
+    }
+    else {
+        await handleCryptoCheckout(creds.accessToken, selectedPlanId);
+    }
+}));
+async function handleStripeCheckout(token, planId) {
+    const spin = spinner('Creating checkout session…');
+    const res = await paymentApi.checkoutPlan(token, planId, 'https://minara.ai/payment/success', 'https://minara.ai/payment/cancel');
+    spin.stop();
+    assertApiOk(res, 'Failed to create checkout session');
+    const data = res.data;
+    const url = data.url ?? data.checkoutUrl;
+    if (url) {
+        success('Checkout session created!');
+        console.log('');
+        console.log(chalk.dim('  Opening browser for payment…'));
+        console.log(chalk.cyan(`  ${url}`));
+        console.log('');
+        openBrowser(url);
+        info('Complete the payment in your browser. Your subscription will activate automatically.');
+    }
+    else {
+        // Fallback: show all returned data
+        success('Checkout session created:');
+        printKV(data);
+    }
+}
+async function handleCryptoCheckout(token, planId) {
+    const spin = spinner('Creating crypto checkout…');
+    const res = await paymentApi.cryptoCheckoutPlan(token, planId);
+    spin.stop();
+    assertApiOk(res, 'Failed to create crypto checkout');
+    const data = res.data;
+    const url = data.url ?? data.checkoutUrl;
+    if (url) {
+        success('Crypto checkout created!');
+        console.log('');
+        console.log(chalk.dim('  Opening browser for crypto payment…'));
+        console.log(chalk.cyan(`  ${url}`));
+        console.log('');
+        openBrowser(url);
+        info('Complete the crypto payment in your browser. Your subscription will activate after confirmation.');
+    }
+    else if (data.address) {
+        success('Crypto payment details:');
+        console.log('');
+        printKV(data);
+        console.log('');
+        info('Send the exact amount to the address above. Your subscription will activate after on-chain confirmation.');
+    }
+    else {
+        success('Crypto checkout created:');
+        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')
+    .option('-y, --yes', 'Skip confirmation')
+    .action(wrapAction(async (opts) => {
+    const creds = requireAuth();
+    if (!opts.yes) {
+        warn('Cancelling your subscription will downgrade you to the Free plan at the end of your billing period.');
+        console.log('');
+        const ok = await confirm({
+            message: 'Are you sure you want to cancel your subscription?',
+            default: false,
+        });
+        if (!ok) {
+            console.log(chalk.dim('Kept your subscription.'));
+            return;
+        }
+    }
+    const spin = spinner('Cancelling subscription…');
+    const res = await paymentApi.cancelSubscription(creds.accessToken);
+    spin.stop();
+    assertApiOk(res, 'Failed to cancel subscription');
+    success('Subscription cancelled.');
+    info('You will continue to have access until the end of your current billing period.');
+    if (res.data && typeof res.data === 'object' && Object.keys(res.data).length > 0) {
+        console.log('');
+        printKV(res.data);
+    }
+}));
+// ─── parent ─────────────────────────────────────────────────────────────
+export const premiumCommand = new Command('premium')
+    .description('Manage your Minara subscription — plans, subscribe, cancel')
+    .addCommand(plansCmd)
+    .addCommand(statusCmd)
+    .addCommand(subscribeCmd)
+    .addCommand(buyCreditsCmd)
+    .addCommand(cancelCmd)
+    .action(wrapAction(async () => {
+    const action = await select({
+        message: 'Premium:',
+        choices: [
+            { 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' },
+        ],
+    });
+    const sub = premiumCommand.commands.find((c) => c.name() === action);
+    if (sub)
+        await sub.parseAsync([], { from: 'user' });
+}));

package/dist/commands/swap.js

@@ -3,12 +3,14 @@ import { input, select, confirm } from '@inquirer/prompts';
 import chalk from 'chalk';
 import { swap, swapsSimulate } from '../api/crosschain.js';
 import { requireAuth } from '../config.js';
-import { success, info, spinner, formatOrderSide, assertApiOk, selectChain, wrapAction } from '../utils.js';
+import { success, info, spinner, formatOrderSide, assertApiOk, selectChain, wrapAction, requireTransactionConfirmation, lookupToken, formatTokenLabel } from '../utils.js';
+import { requireTouchId } from '../touchid.js';
+import { printTxResult, printKV } from '../formatters.js';
 export const swapCommand = new Command('swap')
     .description('Swap tokens (cross-chain spot trading)')
     .option('-c, --chain <chain>', 'Blockchain (e.g. solana, base, ethereum)')
     .option('-s, --side <side>', 'buy or sell')
-    .option('-t, --token <address>', 'Token contract address')
+    .option('-t, --token <address|ticker>', 'Token contract address or ticker symbol')
     .option('-a, --amount <amount>', 'USD amount (buy) or token amount (sell)')
     .option('-y, --yes', 'Skip confirmation')
     .option('--dry-run', 'Simulate without executing')
@@ -27,11 +29,12 @@ export const swapCommand = new Command('swap')
             ],
         });
     }
-    // ── 3. Token address ─────────────────────────────────────────────────
-    const tokenAddress = opts.token ?? await input({
-        message: 'Token contract address:',
-        validate: (v) => (v.length > 5 ? true : 'Please enter a valid address'),
+    // ── 3. Token ───────────────────────────────────────────────────────────
+    const tokenInput = opts.token ?? await input({
+        message: 'Token (contract address or ticker):',
+        validate: (v) => (v.length > 0 ? true : 'Please enter a token address or ticker'),
     });
+    const tokenInfo = await lookupToken(tokenInput);
     // ── 4. Amount ────────────────────────────────────────────────────────
     const amountLabel = side === 'buy' ? 'USD amount to spend' : 'Token amount to sell';
     const amount = opts.amount ?? await input({
@@ -46,7 +49,8 @@ export const swapCommand = new Command('swap')
     console.log(chalk.bold('Swap Summary:'));
     console.log(`  Chain   : ${chalk.cyan(chain)}`);
     console.log(`  Action  : ${formatOrderSide(side)}`);
-    console.log(`  Token   : ${chalk.yellow(tokenAddress)}`);
+    console.log(`  Token   : ${formatTokenLabel(tokenInfo)}`);
+    console.log(`  Address : ${chalk.yellow(tokenInfo.address)}`);
     console.log(`  Amount  : ${chalk.bold(amount)} ${side === 'buy' ? 'USD' : '(token)'}`);
     console.log('');
     // ── 6. Dry run ───────────────────────────────────────────────────────
@@ -54,11 +58,21 @@ export const swapCommand = new Command('swap')
         info('Simulating swap (dry-run)…');
         const spin = spinner('Simulating…');
         const simRes = await swapsSimulate(creds.accessToken, [{
-                chain, side, tokenAddress, buyUsdAmountOrSellTokenAmount: amount,
+                chain, side, tokenAddress: tokenInfo.address, buyUsdAmountOrSellTokenAmount: amount,
             }]);
         spin.stop();
         assertApiOk(simRes, 'Simulation failed');
-        console.log(JSON.stringify(simRes.data, null, 2));
+        console.log('');
+        console.log(chalk.bold('Simulation Result:'));
+        if (Array.isArray(simRes.data)) {
+            for (const item of simRes.data) {
+                printKV(item);
+                console.log('');
+            }
+        }
+        else if (simRes.data) {
+            printKV(simRes.data);
+        }
         return;
     }
     // ── 7. Confirm ───────────────────────────────────────────────────────
@@ -72,14 +86,16 @@ export const swapCommand = new Command('swap')
             return;
         }
     }
-    // ── 8. Execute ───────────────────────────────────────────────────────
+    // ── 8. Transaction confirmation & Touch ID ────────────────────────────
+    await requireTransactionConfirmation(`${side.toUpperCase()} swap · ${amount} ${side === 'buy' ? 'USD' : 'tokens'} · ${chain}`, tokenInfo);
+    await requireTouchId();
+    // ── 9. Execute ───────────────────────────────────────────────────────
     const spin = spinner('Executing swap…');
     const res = await swap(creds.accessToken, {
-        chain, side, tokenAddress, buyUsdAmountOrSellTokenAmount: amount,
+        chain, side, tokenAddress: tokenInfo.address, buyUsdAmountOrSellTokenAmount: amount,
     });
     spin.stop();
     assertApiOk(res, 'Swap failed');
     success('Swap submitted!');
-    if (res.data)
-        console.log(JSON.stringify(res.data, null, 2));
+    printTxResult(res.data);
 }));