perp-cli 0.4.9 → 0.4.11

package/dist/commands/account.js

@@ -101,30 +101,21 @@ function pac(adapter) {
 }
 export function registerAccountCommands(program, getAdapter, isJson, getAdapterForExchange) {
     const account = program.command("account").description("Account commands");
-    account
-        .command("balance")
-        .alias("info")
-        .description("Account overview: perp balance, spot holdings, and 24h funding")
-        .action(async () => {
-        const adapter = await getAdapter();
-        const exName = adapter.name.toLowerCase();
-        // Fetch perp balance + funding in parallel
+    async function fetchExchangeBalance(exName, adapter) {
+        const name = exName.toLowerCase();
         const [bal, fundingPayments] = await Promise.all([
             adapter.getBalance(),
             adapter.getFundingPayments(200).catch(() => []),
         ]);
-        // Spot balances (HL and LT only)
         let spotBalances = [];
         try {
-            if (exName === "hyperliquid") {
+            if (name === "hyperliquid") {
                 const { HyperliquidSpotAdapter } = await import("../exchanges/hyperliquid-spot.js");
                 const hlSpot = new HyperliquidSpotAdapter(adapter);
                 await hlSpot.init();
                 const raw = await hlSpot.getSpotBalances();
-                // Get spot prices for USD valuation
                 const markets = await hlSpot.getSpotMarkets();
                 const priceMap = new Map(markets.map(m => [m.baseToken.toUpperCase(), Number(m.markPrice)]));
-                // HL spot API returns token names with -SPOT suffix (e.g., "HYPE-SPOT", "USDC-SPOT")
                 const stripSuffix = (t) => t.replace(/-SPOT$/i, "").toUpperCase();
                 spotBalances = raw
                     .filter(b => Number(b.total) > 0)
@@ -136,7 +127,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                     };
                 });
             }
-            else if (exName === "lighter") {
+            else if (name === "lighter") {
                 const { LighterAdapter } = await import("../exchanges/lighter.js");
                 const { LighterSpotAdapter } = await import("../exchanges/lighter-spot.js");
                 const ltSpot = new LighterSpotAdapter(adapter);
@@ -155,33 +146,52 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
             }
         }
         catch { /* spot not available */ }
-        // 24h funding summary
+        // HL unified account: perp equity already includes spot USDC balance.
+        // Detect by checking if adapter is HL without a dex override.
+        const isUnified = name === "hyperliquid" && !adapter.dex;
         const cutoff24h = Date.now() - 24 * 60 * 60 * 1000;
         const recent = fundingPayments.filter(f => f.time >= cutoff24h);
         const funding24h = recent.reduce((sum, f) => sum + Number(f.payment), 0);
-        // Total spot value
         const totalSpotUsd = spotBalances.reduce((s, b) => s + (b.valueUsd ?? 0), 0);
-        if (isJson()) {
-            return printJson(jsonOk({
-                perp: bal,
-                spot: spotBalances,
-                funding24h,
-                fundingPayments24h: recent.length,
-                totalSpotValueUsd: totalSpotUsd,
-                totalAccountValueUsd: Number(bal.equity) + totalSpotUsd,
-            }));
-        }
-        // ── Perp Balance ──
-        console.log(chalk.cyan.bold(`\n  ${exName.toUpperCase()} Account Balance\n`));
-        console.log(chalk.white.bold("  Perp Account"));
-        console.log(`    Equity:       $${formatUsd(bal.equity)}`);
-        console.log(`    Available:    $${formatUsd(bal.available)}`);
-        console.log(`    Margin Used:  $${formatUsd(bal.marginUsed)}`);
-        console.log(`    Unreal. PnL:  ${formatPnl(bal.unrealizedPnl)}`);
-        // ── Spot Holdings ──
-        if (spotBalances.length > 0) {
+        // For unified accounts, equity already contains USDC spot value.
+        // Only add non-USDC spot token values to avoid double-counting.
+        const nonUsdcSpotUsd = isUnified
+            ? spotBalances
+                .filter(b => {
+                const tk = b.token.replace(/-SPOT$/i, "").toUpperCase();
+                return tk !== "USDC";
+            })
+                .reduce((s, b) => s + (b.valueUsd ?? 0), 0)
+            : totalSpotUsd;
+        return {
+            exchange: name,
+            perp: bal,
+            spot: spotBalances,
+            funding24h,
+            fundingPayments24h: recent.length,
+            totalSpotValueUsd: totalSpotUsd,
+            totalAccountValueUsd: Number(bal.equity) + nonUsdcSpotUsd,
+            unifiedAccount: isUnified,
+        };
+    }
+    function printSingleBalance(exName, r) {
+        console.log(chalk.cyan.bold(`\n  ${exName.toUpperCase()} Account Balance`));
+        if (r.unifiedAccount)
+            console.log(chalk.gray("  (Unified account — perp & spot share single balance)\n"));
+        else
+            console.log();
+        console.log(chalk.white.bold(r.unifiedAccount ? "  Account" : "  Perp Account"));
+        console.log(`    Equity:       $${formatUsd(r.perp.equity)}`);
+        console.log(`    Available:    $${formatUsd(r.perp.available)}`);
+        console.log(`    Margin Used:  $${formatUsd(r.perp.marginUsed)}`);
+        console.log(`    Unreal. PnL:  ${formatPnl(r.perp.unrealizedPnl)}`);
+        // For unified, show non-USDC spot holdings (USDC is already in equity)
+        const displaySpot = r.unifiedAccount
+            ? r.spot.filter(b => b.token.replace(/-SPOT$/i, "").toUpperCase() !== "USDC")
+            : r.spot;
+        if (displaySpot.length > 0) {
             console.log(chalk.white.bold("\n  Spot Holdings"));
-            const rows = spotBalances.map(b => [
+            const rows = displaySpot.map(b => [
                 chalk.white.bold(b.token),
                 b.total,
                 b.available,
@@ -190,27 +200,176 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
             ]);
             console.log(makeTable(["Token", "Total", "Available", "Held", "Value"], rows));
         }
-        else if (exName === "hyperliquid" || exName === "lighter") {
-            console.log(chalk.gray("\n  No spot holdings.\n"));
-        }
-        // ── Funding 24h ──
         console.log(chalk.white.bold("  Funding (24h)"));
-        console.log(`    Payments:     ${recent.length}`);
-        console.log(`    Total:        ${formatPnl(funding24h)}`);
-        // ── Total ──
-        const totalValue = Number(bal.equity) + totalSpotUsd;
-        if (totalSpotUsd > 0) {
+        console.log(`    Payments:     ${r.fundingPayments24h}`);
+        console.log(`    Total:        ${formatPnl(r.funding24h)}`);
+        // Only show Total breakdown when there are non-USDC spot tokens adding value
+        const nonUsdcSpotValue = displaySpot.reduce((s, b) => s + (b.valueUsd ?? 0), 0);
+        if (nonUsdcSpotValue > 0) {
             console.log(chalk.white.bold("\n  Total"));
-            console.log(`    Perp Equity:  $${formatUsd(bal.equity)}`);
-            console.log(`    Spot Value:   $${formatUsd(totalSpotUsd)}`);
-            console.log(`    Total Value:  $${formatUsd(totalValue)}`);
+            console.log(`    Equity:       $${formatUsd(r.perp.equity)}`);
+            console.log(`    Spot (other): $${formatUsd(nonUsdcSpotValue)}`);
+            console.log(`    Total Value:  $${formatUsd(r.totalAccountValueUsd)}`);
+        }
+    }
+    account
+        .command("balance")
+        .description("Account overview: perp balance, spot holdings, and 24h funding")
+        .action(async () => {
+        // Detect if user explicitly set -e (single exchange mode)
+        const explicitExchange = program.getOptionValueSource?.("exchange") === "cli";
+        // Multi-exchange mode: show all exchanges
+        if (!explicitExchange && getAdapterForExchange) {
+            const results = [];
+            const errors = {};
+            await Promise.all(EXCHANGES.map(async (ex) => {
+                try {
+                    const adapter = await getAdapterForExchange(ex);
+                    results.push(await fetchExchangeBalance(ex, adapter));
+                }
+                catch (err) {
+                    errors[ex] = err instanceof Error ? err.message : String(err);
+                }
+            }));
+            // Sort by equity desc
+            results.sort((a, b) => b.totalAccountValueUsd - a.totalAccountValueUsd);
+            if (isJson()) {
+                const grandTotal = results.reduce((s, r) => s + r.totalAccountValueUsd, 0);
+                return printJson(jsonOk({
+                    exchanges: results,
+                    errors: Object.keys(errors).length > 0 ? errors : undefined,
+                    totalEquity: results.reduce((s, r) => s + Number(r.perp.equity), 0),
+                    totalSpotValueUsd: results.reduce((s, r) => s + r.totalSpotValueUsd, 0),
+                    totalAccountValueUsd: grandTotal,
+                    totalFunding24h: results.reduce((s, r) => s + r.funding24h, 0),
+                }));
+            }
+            console.log(chalk.cyan.bold("\n  All Exchanges — Account Balance\n"));
+            // Summary table
+            // For unified accounts, Spot column shows non-USDC only (USDC already in Equity)
+            const balRows = results.map(r => {
+                const nonUsdcSpot = r.unifiedAccount
+                    ? r.spot
+                        .filter(b => b.token.replace(/-SPOT$/i, "").toUpperCase() !== "USDC")
+                        .reduce((s, b) => s + (b.valueUsd ?? 0), 0)
+                    : r.totalSpotValueUsd;
+                return [
+                    chalk.white.bold(r.exchange) + (r.unifiedAccount ? chalk.gray(" ★") : ""),
+                    `$${formatUsd(r.perp.equity)}`,
+                    `$${formatUsd(r.perp.available)}`,
+                    `$${formatUsd(r.perp.marginUsed)}`,
+                    nonUsdcSpot > 0 ? `$${formatUsd(nonUsdcSpot)}` : chalk.gray("-"),
+                    formatPnl(r.funding24h),
+                    `$${formatUsd(r.totalAccountValueUsd)}`,
+                ];
+            });
+            const grandEquity = results.reduce((s, r) => s + Number(r.perp.equity), 0);
+            const grandSpot = results.reduce((s, r) => {
+                if (r.unifiedAccount) {
+                    return s + r.spot
+                        .filter(b => b.token.replace(/-SPOT$/i, "").toUpperCase() !== "USDC")
+                        .reduce((ss, b) => ss + (b.valueUsd ?? 0), 0);
+                }
+                return s + r.totalSpotValueUsd;
+            }, 0);
+            const grandFunding = results.reduce((s, r) => s + r.funding24h, 0);
+            const grandTotal = results.reduce((s, r) => s + r.totalAccountValueUsd, 0);
+            balRows.push([
+                chalk.cyan.bold("TOTAL"),
+                chalk.cyan.bold(`$${formatUsd(grandEquity)}`),
+                "",
+                "",
+                grandSpot > 0 ? chalk.cyan.bold(`$${formatUsd(grandSpot)}`) : "",
+                formatPnl(grandFunding),
+                chalk.cyan.bold(`$${formatUsd(grandTotal)}`),
+            ]);
+            console.log(makeTable(["Exchange", "Equity", "Available", "Margin", "Spot", "Funding 24h", "Total"], balRows));
+            if (results.some(r => r.unifiedAccount)) {
+                console.log(chalk.gray("  ★ Unified account — Equity includes spot USDC, Spot shows non-USDC tokens only\n"));
+            }
+            // Spot details per exchange (for unified, skip USDC as it's in equity)
+            for (const r of results) {
+                const displaySpot = r.unifiedAccount
+                    ? r.spot.filter(b => b.token.replace(/-SPOT$/i, "").toUpperCase() !== "USDC")
+                    : r.spot;
+                if (displaySpot.length > 0) {
+                    console.log(chalk.white.bold(`  ${r.exchange.toUpperCase()} Spot Holdings`));
+                    const rows = displaySpot.map(b => [
+                        chalk.white.bold(b.token),
+                        b.total,
+                        b.valueUsd ? `$${formatUsd(b.valueUsd)}` : chalk.gray("-"),
+                    ]);
+                    console.log(makeTable(["Token", "Total", "Value"], rows));
+                }
+            }
+            // Errors
+            for (const [ex, msg] of Object.entries(errors)) {
+                console.log(chalk.gray(`  ${ex}: ${msg}`));
+            }
+            console.log();
+            return;
         }
+        // Single exchange mode (explicit -e or no getAdapterForExchange)
+        const adapter = await getAdapter();
+        const exName = adapter.name.toLowerCase();
+        const result = await fetchExchangeBalance(exName, adapter);
+        if (isJson())
+            return printJson(jsonOk(result));
+        printSingleBalance(exName, result);
         console.log();
     });
     account
         .command("positions")
         .description("Show open positions")
         .action(async () => {
+        const explicitExchange = program.getOptionValueSource?.("exchange") === "cli";
+        if (!explicitExchange && getAdapterForExchange) {
+            const allRows = [];
+            const errors = {};
+            await Promise.all(EXCHANGES.map(async (ex) => {
+                try {
+                    const adapter = await getAdapterForExchange(ex);
+                    const positions = await adapter.getPositions();
+                    for (const p of positions) {
+                        allRows.push([
+                            chalk.white.bold(p.symbol),
+                            chalk.gray(ex.slice(0, 3).toUpperCase()),
+                            p.side === "long" ? chalk.green("LONG") : chalk.red("SHORT"),
+                            p.size,
+                            `$${formatUsd(p.entryPrice)}`,
+                            `$${formatUsd(p.markPrice)}`,
+                            p.liquidationPrice === "N/A" ? chalk.gray("N/A") : `$${formatUsd(p.liquidationPrice)}`,
+                            formatPnl(p.unrealizedPnl),
+                            `${p.leverage}x`,
+                        ]);
+                    }
+                }
+                catch (err) {
+                    errors[ex] = err instanceof Error ? err.message : String(err);
+                }
+            }));
+            if (isJson()) {
+                const grouped = {};
+                await Promise.all(EXCHANGES.map(async (ex) => {
+                    try {
+                        const adapter = await getAdapterForExchange(ex);
+                        grouped[ex] = await adapter.getPositions();
+                    }
+                    catch { /* skip */ }
+                }));
+                return printJson(jsonOk({ exchanges: grouped, errors: Object.keys(errors).length > 0 ? errors : undefined }));
+            }
+            if (allRows.length === 0) {
+                console.log(chalk.gray("\n  No open positions across all exchanges.\n"));
+                for (const [ex, msg] of Object.entries(errors))
+                    console.log(chalk.gray(`  ${ex}: ${msg}`));
+                return;
+            }
+            console.log(makeTable(["Symbol", "Exch", "Side", "Size", "Entry", "Mark", "Liq", "PnL", "Lev"], allRows));
+            for (const [ex, msg] of Object.entries(errors))
+                console.log(chalk.gray(`  ${ex}: ${msg}`));
+            return;
+        }
         const adapter = await getAdapter();
         const positions = await adapter.getPositions();
         if (isJson())
@@ -235,6 +394,54 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
         .command("orders")
         .description("Show open orders")
         .action(async () => {
+        const explicitExchange = program.getOptionValueSource?.("exchange") === "cli";
+        if (!explicitExchange && getAdapterForExchange) {
+            const allRows = [];
+            const errors = {};
+            await Promise.all(EXCHANGES.map(async (ex) => {
+                try {
+                    const adapter = await getAdapterForExchange(ex);
+                    const orders = await adapter.getOpenOrders();
+                    for (const o of orders) {
+                        allRows.push([
+                            o.orderId,
+                            chalk.white.bold(o.symbol),
+                            chalk.gray(ex.slice(0, 3).toUpperCase()),
+                            o.side === "buy" ? chalk.green("BUY") : chalk.red("SELL"),
+                            o.type,
+                            `$${formatUsd(o.price)}`,
+                            o.size,
+                            o.filled,
+                            o.status,
+                        ]);
+                    }
+                }
+                catch (err) {
+                    errors[ex] = err instanceof Error ? err.message : String(err);
+                }
+            }));
+            if (isJson()) {
+                const grouped = {};
+                await Promise.all(EXCHANGES.map(async (ex) => {
+                    try {
+                        const adapter = await getAdapterForExchange(ex);
+                        grouped[ex] = await adapter.getOpenOrders();
+                    }
+                    catch { /* skip */ }
+                }));
+                return printJson(jsonOk({ exchanges: grouped, errors: Object.keys(errors).length > 0 ? errors : undefined }));
+            }
+            if (allRows.length === 0) {
+                console.log(chalk.gray("\n  No open orders across all exchanges.\n"));
+                for (const [ex, msg] of Object.entries(errors))
+                    console.log(chalk.gray(`  ${ex}: ${msg}`));
+                return;
+            }
+            console.log(makeTable(["ID", "Symbol", "Exch", "Side", "Type", "Price", "Size", "Filled", "Status"], allRows));
+            for (const [ex, msg] of Object.entries(errors))
+                console.log(chalk.gray(`  ${ex}: ${msg}`));
+            return;
+        }
         const adapter = await getAdapter();
         const orders = await adapter.getOpenOrders();
         if (isJson())

package/dist/commands/agent.js

@@ -136,7 +136,7 @@ export function registerAgentCommands(program, getAdapter, isJson) {
                 {
                     category: "account",
                     commands: [
-                        "perp account info --json",
+                        "perp account balance --json",
                         "perp account positions --json",
                         "perp account orders --json",
                         "perp account history --json",
@@ -338,12 +338,12 @@ export function registerAgentCommands(program, getAdapter, isJson) {
         if (g.includes("buy") || g.includes("long")) {
             const symbol = extractSymbol(g) || "BTC";
             const size = extractNumber(g) || "0.01";
-            steps.push({ step: 1, command: `perp market book ${symbol} --json`, description: `Check ${symbol} orderbook` }, { step: 2, command: `perp account info --json`, description: "Check available balance" }, { step: 3, command: `perp trade market ${symbol} buy ${size} --json`, description: `Buy ${size} ${symbol}` }, { step: 4, command: `perp account positions --json`, description: "Verify position opened" });
+            steps.push({ step: 1, command: `perp market book ${symbol} --json`, description: `Check ${symbol} orderbook` }, { step: 2, command: `perp account balance --json`, description: "Check available balance" }, { step: 3, command: `perp trade market ${symbol} buy ${size} --json`, description: `Buy ${size} ${symbol}` }, { step: 4, command: `perp account positions --json`, description: "Verify position opened" });
         }
         else if (g.includes("sell") || g.includes("short")) {
             const symbol = extractSymbol(g) || "BTC";
             const size = extractNumber(g) || "0.01";
-            steps.push({ step: 1, command: `perp market book ${symbol} --json`, description: `Check ${symbol} orderbook` }, { step: 2, command: `perp account info --json`, description: "Check available balance" }, { step: 3, command: `perp trade market ${symbol} sell ${size} --json`, description: `Sell ${size} ${symbol}` }, { step: 4, command: `perp account positions --json`, description: "Verify position opened" });
+            steps.push({ step: 1, command: `perp market book ${symbol} --json`, description: `Check ${symbol} orderbook` }, { step: 2, command: `perp account balance --json`, description: "Check available balance" }, { step: 3, command: `perp trade market ${symbol} sell ${size} --json`, description: `Sell ${size} ${symbol}` }, { step: 4, command: `perp account positions --json`, description: "Verify position opened" });
         }
         else if (g.includes("close") || g.includes("exit")) {
             const symbol = extractSymbol(g) || "ALL";
@@ -360,7 +360,7 @@ export function registerAgentCommands(program, getAdapter, isJson) {
         }
         else if (g.includes("deposit")) {
             const amount = extractNumber(g) || "100";
-            steps.push({ step: 1, command: "perp wallet balance --json", description: "Check wallet balance" }, { step: 2, command: `perp deposit pacifica ${amount} --json`, description: `Deposit $${amount} to Pacifica` }, { step: 3, command: "perp account info --json", description: "Verify deposit arrived" });
+            steps.push({ step: 1, command: "perp wallet balance --json", description: "Check wallet balance" }, { step: 2, command: `perp deposit pacifica ${amount} --json`, description: `Deposit $${amount} to Pacifica` }, { step: 3, command: "perp account balance --json", description: "Verify deposit arrived" });
         }
         else if (g.includes("price") || g.includes("market")) {
             const symbol = extractSymbol(g);

package/dist/commands/market.d.ts

@@ -1,3 +1,3 @@
 import { Command } from "commander";
 import type { ExchangeAdapter } from "../exchanges/interface.js";
-export declare function registerMarketCommands(program: Command, getAdapter: () => Promise<ExchangeAdapter>, isJson: () => boolean): void;
+export declare function registerMarketCommands(program: Command, getAdapter: () => Promise<ExchangeAdapter>, isJson: () => boolean, getAdapterForExchange?: (exchange: string) => Promise<ExchangeAdapter>): void;

package/dist/commands/market.js

@@ -2,12 +2,59 @@ import { PacificaAdapter } from "../exchanges/pacifica.js";
 import { HyperliquidAdapter } from "../exchanges/hyperliquid.js";
 import { makeTable, formatUsd, formatPercent, printJson, jsonOk, jsonError, withJsonErrors } from "../utils.js";
 import chalk from "chalk";
-export function registerMarketCommands(program, getAdapter, isJson) {
+const EXCHANGES = ["pacifica", "hyperliquid", "lighter"];
+export function registerMarketCommands(program, getAdapter, isJson, getAdapterForExchange) {
     const market = program.command("market").description("Market data commands");
     market
         .command("list")
         .description("List all available markets")
         .action(async () => {
+        const explicitExchange = program.getOptionValueSource?.("exchange") === "cli";
+        // Multi-exchange mode
+        if (!explicitExchange && getAdapterForExchange) {
+            const allRows = [];
+            const errors = {};
+            await Promise.all(EXCHANGES.map(async (ex) => {
+                try {
+                    const adapter = await getAdapterForExchange(ex);
+                    const markets = await adapter.getMarkets();
+                    for (const m of markets) {
+                        allRows.push([
+                            chalk.white.bold(m.symbol),
+                            chalk.gray(ex.slice(0, 3).toUpperCase()),
+                            `$${formatUsd(m.markPrice)}`,
+                            `$${formatUsd(m.indexPrice)}`,
+                            formatPercent(m.fundingRate),
+                            `$${formatUsd(m.volume24h)}`,
+                            `$${formatUsd(m.openInterest)}`,
+                            String(m.maxLeverage) + "x",
+                        ]);
+                    }
+                }
+                catch (err) {
+                    errors[ex] = err instanceof Error ? err.message : String(err);
+                }
+            }));
+            // Sort by symbol name
+            allRows.sort((a, b) => a[0].localeCompare(b[0]));
+            if (isJson()) {
+                const grouped = {};
+                await Promise.all(EXCHANGES.map(async (ex) => {
+                    try {
+                        const adapter = await getAdapterForExchange(ex);
+                        grouped[ex] = await adapter.getMarkets();
+                    }
+                    catch { /* skip */ }
+                }));
+                return printJson(jsonOk({ exchanges: grouped, errors: Object.keys(errors).length > 0 ? errors : undefined }));
+            }
+            console.log(makeTable(["Symbol", "Exch", "Mark", "Index", "Funding", "24h Vol", "OI", "Max Lev"], allRows));
+            for (const [ex, msg] of Object.entries(errors)) {
+                console.log(chalk.gray(`  ${ex}: ${msg}`));
+            }
+            return;
+        }
+        // Single exchange mode
         const adapter = await getAdapter();
         const markets = await adapter.getMarkets();
         if (isJson())
@@ -27,6 +74,45 @@ export function registerMarketCommands(program, getAdapter, isJson) {
         .command("prices")
         .description("Get current prices for all markets")
         .action(async () => {
+        const explicitExchange = program.getOptionValueSource?.("exchange") === "cli";
+        if (!explicitExchange && getAdapterForExchange) {
+            const allRows = [];
+            const errors = {};
+            await Promise.all(EXCHANGES.map(async (ex) => {
+                try {
+                    const adapter = await getAdapterForExchange(ex);
+                    const markets = await adapter.getMarkets();
+                    for (const m of markets) {
+                        allRows.push([
+                            chalk.white.bold(m.symbol),
+                            chalk.gray(ex.slice(0, 3).toUpperCase()),
+                            `$${formatUsd(m.markPrice)}`,
+                            `$${formatUsd(m.indexPrice)}`,
+                            formatPercent(m.fundingRate),
+                        ]);
+                    }
+                }
+                catch (err) {
+                    errors[ex] = err instanceof Error ? err.message : String(err);
+                }
+            }));
+            allRows.sort((a, b) => a[0].localeCompare(b[0]));
+            if (isJson()) {
+                const grouped = {};
+                await Promise.all(EXCHANGES.map(async (ex) => {
+                    try {
+                        const adapter = await getAdapterForExchange(ex);
+                        grouped[ex] = await adapter.getMarkets();
+                    }
+                    catch { /* skip */ }
+                }));
+                return printJson(jsonOk({ exchanges: grouped, errors: Object.keys(errors).length > 0 ? errors : undefined }));
+            }
+            console.log(makeTable(["Symbol", "Exch", "Mark", "Index", "Funding"], allRows));
+            for (const [ex, msg] of Object.entries(errors))
+                console.log(chalk.gray(`  ${ex}: ${msg}`));
+            return;
+        }
         const adapter = await getAdapter();
         if (adapter instanceof PacificaAdapter) {
             const prices = await adapter.sdk.getPrices();

package/dist/index.js

@@ -188,7 +188,7 @@ function getHLAdapter() {
     return _hlAdapter;
 }
 // Register command groups with async adapter getter
-registerMarketCommands(program, getAdapter, isJson);
+registerMarketCommands(program, getAdapter, isJson, getAdapterForExchange);
 registerAccountCommands(program, getAdapter, isJson, getAdapterForExchange);
 registerTradeCommands(program, getAdapter, isJson, isDryRun, getAdapterForExchange);
 registerManageCommands(program, getAdapter, isJson, getPacificaAdapter);

package/dist/mcp-server.d.ts

@@ -2,7 +2,7 @@
 /**
  * MCP (Model Context Protocol) server for perp-cli.
  *
- * Read-only advisor mode: provides market data, account info, and CLI command suggestions.
+ * Read-only advisor mode: provides market data, account balance, and CLI command suggestions.
  * Does NOT execute trades directly — instead suggests CLI commands for the user to run.
  * Adapters are created lazily from environment variables.
  */

package/dist/mcp-server.js

@@ -2,7 +2,7 @@
 /**
  * MCP (Model Context Protocol) server for perp-cli.
  *
- * Read-only advisor mode: provides market data, account info, and CLI command suggestions.
+ * Read-only advisor mode: provides market data, account balance, and CLI command suggestions.
  * Does NOT execute trades directly — instead suggests CLI commands for the user to run.
  * Adapters are created lazily from environment variables.
  */
@@ -270,18 +270,18 @@ server.tool("suggest_command", "Given a natural language trading goal, suggest t
         if (g.includes("buy") || g.includes("long")) {
             const symbol = extractSymbol(g) || "BTC";
             const size = extractNumber(g) || "<size>";
-            steps.push({ step: 1, command: `perp -e ${ex} --json market book ${symbol}`, description: `Check ${symbol} orderbook and liquidity` }, { step: 2, command: `perp -e ${ex} --json account info`, description: "Check available balance and margin" }, { step: 3, command: `perp -e ${ex} --json trade check ${symbol} buy ${size}`, description: "Pre-flight validation (dry run)" }, { step: 4, command: `perp -e ${ex} --json trade market ${symbol} buy ${size}`, description: `Buy ${size} ${symbol} at market`, dangerous: true }, { step: 5, command: `perp -e ${ex} --json account positions`, description: "Verify position opened" });
+            steps.push({ step: 1, command: `perp -e ${ex} --json market book ${symbol}`, description: `Check ${symbol} orderbook and liquidity` }, { step: 2, command: `perp -e ${ex} --json account balance`, description: "Check available balance and margin" }, { step: 3, command: `perp -e ${ex} --json trade check ${symbol} buy ${size}`, description: "Pre-flight validation (dry run)" }, { step: 4, command: `perp -e ${ex} --json trade market ${symbol} buy ${size}`, description: `Buy ${size} ${symbol} at market`, dangerous: true }, { step: 5, command: `perp -e ${ex} --json account positions`, description: "Verify position opened" });
         }
         else if (g.includes("sell") || g.includes("short")) {
             const symbol = extractSymbol(g) || "BTC";
             const size = extractNumber(g) || "<size>";
-            steps.push({ step: 1, command: `perp -e ${ex} --json market book ${symbol}`, description: `Check ${symbol} orderbook and liquidity` }, { step: 2, command: `perp -e ${ex} --json account info`, description: "Check available balance and margin" }, { step: 3, command: `perp -e ${ex} --json trade check ${symbol} sell ${size}`, description: "Pre-flight validation (dry run)" }, { step: 4, command: `perp -e ${ex} --json trade market ${symbol} sell ${size}`, description: `Sell ${size} ${symbol} at market`, dangerous: true }, { step: 5, command: `perp -e ${ex} --json account positions`, description: "Verify position opened" });
+            steps.push({ step: 1, command: `perp -e ${ex} --json market book ${symbol}`, description: `Check ${symbol} orderbook and liquidity` }, { step: 2, command: `perp -e ${ex} --json account balance`, description: "Check available balance and margin" }, { step: 3, command: `perp -e ${ex} --json trade check ${symbol} sell ${size}`, description: "Pre-flight validation (dry run)" }, { step: 4, command: `perp -e ${ex} --json trade market ${symbol} sell ${size}`, description: `Sell ${size} ${symbol} at market`, dangerous: true }, { step: 5, command: `perp -e ${ex} --json account positions`, description: "Verify position opened" });
         }
         else if (g.includes("limit")) {
             const symbol = extractSymbol(g) || "BTC";
             const size = extractNumber(g) || "<size>";
             const side = g.includes("sell") || g.includes("short") ? "sell" : "buy";
-            steps.push({ step: 1, command: `perp -e ${ex} --json market book ${symbol}`, description: `Check ${symbol} orderbook for price levels` }, { step: 2, command: `perp -e ${ex} --json account info`, description: "Check available balance" }, { step: 3, command: `perp -e ${ex} --json trade limit ${symbol} ${side} <price> ${size}`, description: `Place limit ${side} order`, dangerous: true }, { step: 4, command: `perp -e ${ex} --json account orders`, description: "Verify order placed" });
+            steps.push({ step: 1, command: `perp -e ${ex} --json market book ${symbol}`, description: `Check ${symbol} orderbook for price levels` }, { step: 2, command: `perp -e ${ex} --json account balance`, description: "Check available balance" }, { step: 3, command: `perp -e ${ex} --json trade limit ${symbol} ${side} <price> ${size}`, description: `Place limit ${side} order`, dangerous: true }, { step: 4, command: `perp -e ${ex} --json account orders`, description: "Verify order placed" });
         }
         else if (g.includes("close") || g.includes("exit") || g.includes("flatten")) {
             const symbol = extractSymbol(g);
@@ -303,7 +303,7 @@ server.tool("suggest_command", "Given a natural language trading goal, suggest t
         else if (g.includes("scale-in") || g.includes("scale in") || g.includes("dca in")) {
             const symbol = extractSymbol(g) || "<symbol>";
             const side = g.includes("sell") || g.includes("short") ? "sell" : "buy";
-            steps.push({ step: 1, command: `perp -e ${ex} --json market book ${symbol}`, description: "Check current prices" }, { step: 2, command: `perp -e ${ex} --json account info`, description: "Check available balance" }, { step: 3, command: `perp -e ${ex} --json trade scale-in ${symbol} ${side} --levels '<price1>:<size>,<price2>:<size>'`, description: "Place scaled entry orders at multiple levels", dangerous: true });
+            steps.push({ step: 1, command: `perp -e ${ex} --json market book ${symbol}`, description: "Check current prices" }, { step: 2, command: `perp -e ${ex} --json account balance`, description: "Check available balance" }, { step: 3, command: `perp -e ${ex} --json trade scale-in ${symbol} ${side} --levels '<price1>:<size>,<price2>:<size>'`, description: "Place scaled entry orders at multiple levels", dangerous: true });
         }
         else if (g.includes("tpsl") || g.includes("tp/sl") || g.includes("tp sl") || (g.includes("take profit") && g.includes("stop loss"))) {
             const symbol = extractSymbol(g) || "<symbol>";
@@ -322,13 +322,13 @@ server.tool("suggest_command", "Given a natural language trading goal, suggest t
             const symbol = extractSymbol(g) || "<symbol>";
             const amount = extractNumber(g) || "<usd>";
             const side = g.includes("sell") || g.includes("short") ? "sell" : "buy";
-            steps.push({ step: 1, command: `perp -e ${ex} --json market book ${symbol}`, description: `Check ${symbol} orderbook depth` }, { step: 2, command: `perp -e ${ex} --json account info`, description: "Check available balance" }, { step: 3, command: `perp -e ${ex} --json trade split ${symbol} ${side} ${amount}`, description: `Split ${side} $${amount} ${symbol} into depth-based slices`, dangerous: true }, { step: 4, command: `perp -e ${ex} --json account positions`, description: "Verify position opened" });
+            steps.push({ step: 1, command: `perp -e ${ex} --json market book ${symbol}`, description: `Check ${symbol} orderbook depth` }, { step: 2, command: `perp -e ${ex} --json account balance`, description: "Check available balance" }, { step: 3, command: `perp -e ${ex} --json trade split ${symbol} ${side} ${amount}`, description: `Split ${side} $${amount} ${symbol} into depth-based slices`, dangerous: true }, { step: 4, command: `perp -e ${ex} --json account positions`, description: "Verify position opened" });
         }
         else if (g.includes("twap")) {
             const symbol = extractSymbol(g) || "<symbol>";
             const size = extractNumber(g) || "<size>";
             const side = g.includes("sell") || g.includes("short") ? "sell" : "buy";
-            steps.push({ step: 1, command: `perp -e ${ex} --json account info`, description: "Check available balance" }, { step: 2, command: `perp -e ${ex} --json trade twap ${symbol} ${side} ${size} <duration>`, description: `TWAP ${side} ${size} ${symbol} over duration`, dangerous: true });
+            steps.push({ step: 1, command: `perp -e ${ex} --json account balance`, description: "Check available balance" }, { step: 2, command: `perp -e ${ex} --json trade twap ${symbol} ${side} ${size} <duration>`, description: `TWAP ${side} ${size} ${symbol} over duration`, dangerous: true });
         }
         else if (g.includes("reduce")) {
             const symbol = extractSymbol(g) || "<symbol>";
@@ -362,7 +362,7 @@ server.tool("suggest_command", "Given a natural language trading goal, suggest t
             else if (g.includes("dca")) {
                 const amount = extractNumber(g) || "<amount>";
                 const side = g.includes("sell") || g.includes("short") ? "sell" : "buy";
-                steps.push({ step: 1, command: `perp -e ${ex} --json account info`, description: "Check available balance" }, { step: 2, command: `perp -e ${ex} --json bot quick-dca ${symbol} ${side} ${amount} <interval>`, description: "Start DCA bot", dangerous: true }, { step: 3, command: "perp --json jobs list", description: "Verify bot is running" });
+                steps.push({ step: 1, command: `perp -e ${ex} --json account balance`, description: "Check available balance" }, { step: 2, command: `perp -e ${ex} --json bot quick-dca ${symbol} ${side} ${amount} <interval>`, description: "Start DCA bot", dangerous: true }, { step: 3, command: "perp --json jobs list", description: "Verify bot is running" });
             }
             else {
                 steps.push({ step: 1, command: "perp --json bot preset-list", description: "List available bot presets" }, { step: 2, command: `perp -e ${ex} --json bot quick-arb`, description: "Start arb bot", dangerous: true }, { step: 3, command: "perp --json jobs list", description: "Verify bot is running" });
@@ -420,11 +420,11 @@ server.tool("suggest_command", "Given a natural language trading goal, suggest t
         }
         else if (g.includes("deposit")) {
             const amount = extractNumber(g) || "<amount>";
-            steps.push({ step: 1, command: "perp --json wallet balance", description: "Check wallet balance" }, { step: 2, command: `perp --json funds deposit ${ex} ${amount}`, description: `Deposit $${amount} to ${ex}`, dangerous: true }, { step: 3, command: `perp -e ${ex} --json account info`, description: "Verify deposit arrived" });
+            steps.push({ step: 1, command: "perp --json wallet balance", description: "Check wallet balance" }, { step: 2, command: `perp --json funds deposit ${ex} ${amount}`, description: `Deposit $${amount} to ${ex}`, dangerous: true }, { step: 3, command: `perp -e ${ex} --json account balance`, description: "Verify deposit arrived" });
         }
         else if (g.includes("withdraw")) {
             const amount = extractNumber(g) || "<amount>";
-            steps.push({ step: 1, command: `perp -e ${ex} --json account info`, description: "Check available balance" }, { step: 2, command: `perp --json funds withdraw ${ex} ${amount}`, description: `Withdraw $${amount} from ${ex}`, dangerous: true }, { step: 3, command: "perp --json wallet balance", description: "Verify withdrawal received" });
+            steps.push({ step: 1, command: `perp -e ${ex} --json account balance`, description: "Check available balance" }, { step: 2, command: `perp --json funds withdraw ${ex} ${amount}`, description: `Withdraw $${amount} from ${ex}`, dangerous: true }, { step: 3, command: "perp --json wallet balance", description: "Verify withdrawal received" });
         }
         else if (g.includes("leverage")) {
             const symbol = extractSymbol(g) || "<symbol>";
@@ -523,7 +523,7 @@ server.tool("explain_command", "Explain what a perp CLI command does, its parame
                 relatedCommands: [
                     `perp trade check ${symbol} ${side} ${sizeOrPrice || "<size>"}`,
                     `perp market book ${symbol}`,
-                    `perp account info`,
+                    `perp account balance`,
                 ],
             };
         }
@@ -596,7 +596,7 @@ server.tool("explain_command", "Explain what a perp CLI command does, its parame
                     ? ["Places multiple reduce-only limit orders", "Total percentage should not exceed 100%"]
                     : ["Places multiple limit orders — total size uses margin", "Review available balance before placing"],
                 category: "write",
-                relatedCommands: isTP ? ["perp account positions", "perp trade tpsl"] : ["perp account info", "perp market book"],
+                relatedCommands: isTP ? ["perp account positions", "perp trade tpsl"] : ["perp account balance", "perp market book"],
             };
         }
         else if (category === "trade" && sub === "twap") {
@@ -611,7 +611,7 @@ server.tool("explain_command", "Explain what a perp CLI command does, its parame
                 ],
                 risks: ["Executes real trades over time — total size will be filled", "Market may move during execution"],
                 category: "write",
-                relatedCommands: ["perp account info", "perp trade cancel-twap"],
+                relatedCommands: ["perp account balance", "perp trade cancel-twap"],
             };
         }
         else if (category === "trade" && (sub === "trailing-stop" || sub === "pnl-track")) {
@@ -761,7 +761,7 @@ server.tool("explain_command", "Explain what a perp CLI command does, its parame
                 parameters: [{ name: "amount", value: args[3] || args[2], description: "Amount in USDC" }],
                 risks: ["Moves real funds — verify amount before executing"],
                 category: "write",
-                relatedCommands: ["perp wallet balance", "perp account info"],
+                relatedCommands: ["perp wallet balance", "perp account balance"],
             };
         }
         else if (category === "risk") {
@@ -971,7 +971,7 @@ server.resource("cli_schema", "perp://schema", { mimeType: "application/json", d
             account: {
                 description: "Account data (read-only)",
                 subcommands: {
-                    info: { usage: "perp account info", description: "Balance, equity, margin, PnL" },
+                    info: { usage: "perp account balance", description: "Balance, equity, margin, PnL" },
                     positions: { usage: "perp account positions", description: "Open positions" },
                     orders: { usage: "perp account orders", description: "Open/pending orders" },
                     history: { usage: "perp account history", description: "Order history" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "perp-cli",
-  "version": "0.4.9",
+  "version": "0.4.11",
   "description": "Multi-DEX Perpetual Futures CLI - Pacifica, Hyperliquid, Lighter",
   "bin": {
     "perp": "dist/index.js",

package/skills/perp-cli/references/agent-operations.md

@@ -17,7 +17,7 @@ perp --json wallet generate evm             # generate EVM wallet
 perp --json wallet generate solana          # generate Solana wallet
 perp --json wallet show                     # check configured wallets
 perp --json wallet balance                  # on-chain USDC balances
-perp --json -e <EX> account info            # exchange account info
+perp --json -e <EX> account balance            # exchange account balance
 perp --json -e <EX> account positions       # open positions
 perp --json -e <EX> market list             # available markets
 perp --json -e <EX> trade market ...        # execute trade
@@ -46,7 +46,7 @@ perp --json wallet show
 # → check "ok": true and address appears
 
 # 4. Check balance
-perp --json -e hl account info
+perp --json -e hl account balance
 # → if balance is 0, tell user to deposit USDC
 
 # 5. Ready to trade
@@ -68,8 +68,8 @@ perp --json wallet show
 # → should show both exchanges with addresses
 
 # 3. Check balances on both
-perp --json -e hl account info
-perp --json -e pac account info
+perp --json -e hl account balance
+perp --json -e pac account balance
 
 # 4. If one side needs funding, bridge USDC
 perp --json bridge quote --from solana --to arbitrum --amount 500
@@ -115,7 +115,7 @@ Aliases for exchange names:
 ### Check On-Chain vs Exchange Balance
 ```bash
 perp --json wallet balance               # on-chain USDC in your wallet
-perp --json -e hl account info           # USDC deposited on exchange
+perp --json -e hl account balance           # USDC deposited on exchange
 ```
 
 **On-chain balance ≠ exchange balance.** USDC in your wallet must be deposited to the exchange before trading.
@@ -237,7 +237,7 @@ Error case:
 
 ### Safe to retry (idempotent):
 - `wallet show`, `wallet balance` — read-only
-- `account info`, `account positions`, `account orders` — read-only
+- `account balance`, `account positions`, `account orders` — read-only
 - `market list`, `market mid`, `market book` — read-only
 - `arb scan` — read-only (`arb rates` is deprecated)
 - `portfolio`, `risk overview` — read-only
@@ -279,7 +279,7 @@ Symbols are auto-resolved by the CLI. **Always use bare symbols** (e.g., `BTC`,
 
 1. **Using `perp init`** — interactive, will hang forever. Use `wallet set` instead.
 2. **Forgetting `--json`** — output becomes unparseable human text.
-3. **Trading with zero balance** — check `account info` first, tell user to deposit.
+3. **Trading with zero balance** — check `account balance` first, tell user to deposit.
 4. **Retrying a trade without checking** — leads to double positions. Always check `account positions` after a trade, even if it seemed to fail.
 5. **Bridging without quoting** — always run `bridge quote` first to show the user fees and estimated time.
 6. **Assuming deposit is instant** — after `bridge send`, wait for `bridge status` to confirm completion before depositing to the destination exchange.

package/skills/perp-cli/references/commands.md

@@ -17,7 +17,7 @@ perp --json market hip3                    # list HIP-3 deployed perp dexes (Hyp
 
 ## Account (read-only, safe)
 ```bash
-perp --json account balance                # perp balance + spot holdings + 24h funding (alias: account info)
+perp --json account balance                # perp balance + spot holdings + 24h funding (alias: account balance)
 perp --json account positions              # open positions
 perp --json account orders                 # open/pending orders
 perp --json account history                # order history

package/skills/perp-cli/references/strategies.md

@@ -405,8 +405,8 @@ Rules of thumb:
 
 Each exchange holds its own separate balance. Before entering any arb:
 ```bash
-perp --json -e <EX_A> account info           # check available balance on exchange A
-perp --json -e <EX_B> account info           # check available balance on exchange B
+perp --json -e <EX_A> account balance           # check available balance on exchange A
+perp --json -e <EX_B> account balance           # check available balance on exchange B
 ```
 
 **Size each leg to fit the available balance on that exchange:**

package/skills/perp-cli/scripts/validate-arb.sh

@@ -53,8 +53,8 @@ else
 fi
 
 # 2. Balance check on both exchanges
-LONG_BAL=$($PERP --json -e "$LONG_EX" account info 2>/dev/null | jq -r '.data.available // .data.equity // "0"')
-SHORT_BAL=$($PERP --json -e "$SHORT_EX" account info 2>/dev/null | jq -r '.data.available // .data.equity // "0"')
+LONG_BAL=$($PERP --json -e "$LONG_EX" account balance 2>/dev/null | jq -r '.data.available // .data.equity // "0"')
+SHORT_BAL=$($PERP --json -e "$SHORT_EX" account balance 2>/dev/null | jq -r '.data.available // .data.equity // "0"')
 
 NEEDED=$(echo "$SIZE" | awk '{print $1}')
 if (( $(echo "$LONG_BAL < $NEEDED" | bc -l 2>/dev/null || echo 1) )); then