perp-cli 0.6.3 → 0.7.1

package/dist/commands/account.js

@@ -1,8 +1,7 @@
-import { PacificaAdapter } from "../exchanges/pacifica.js";
-import { HyperliquidAdapter } from "../exchanges/hyperliquid.js";
 import { makeTable, formatUsd, formatPnl, printJson, jsonOk, jsonError, symbolMatch, withJsonErrors } from "../utils.js";
 import chalk from "chalk";
 import { assessRisk } from "../risk.js";
+import { hasPacificaSdk, isDexCapable } from "../exchanges/capabilities.js";
 const EXCHANGES = ["pacifica", "hyperliquid", "lighter"];
 async function fetchExchangeSnapshot(name, getAdapter) {
     try {
@@ -96,7 +95,7 @@ function buildSummary(snapshots) {
     };
 }
 function pac(adapter) {
-    if (!(adapter instanceof PacificaAdapter))
+    if (!hasPacificaSdk(adapter))
         throw new Error("Market settings are only available on Pacifica.");
     return adapter;
 }
@@ -112,6 +111,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
         try {
             if (name === "hyperliquid") {
                 const { HyperliquidSpotAdapter } = await import("../exchanges/hyperliquid-spot.js");
+                const { HyperliquidAdapter } = await import("../exchanges/hyperliquid.js");
                 const hlSpot = new HyperliquidSpotAdapter(adapter);
                 await hlSpot.init();
                 const raw = await hlSpot.getSpotBalances();
@@ -149,7 +149,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
         catch { /* spot not available */ }
         // 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 isUnified = name === "hyperliquid" && (!isDexCapable(adapter) || !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);
@@ -368,7 +368,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                         ]);
                     }
                     // --hip3: fetch HIP-3 dex positions for HL
-                    if (opts.hip3 && ex === "hyperliquid" && adapter instanceof HyperliquidAdapter) {
+                    if (opts.hip3 && ex === "hyperliquid" && isDexCapable(adapter)) {
                         const hip3 = await fetchHip3Data(adapter, a => a.getPositions());
                         for (const { dex, items } of hip3) {
                             for (const p of items) {
@@ -397,7 +397,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                     try {
                         const adapter = await getAdapterForExchange(ex);
                         grouped[ex] = await adapter.getPositions();
-                        if (opts.hip3 && ex === "hyperliquid" && adapter instanceof HyperliquidAdapter) {
+                        if (opts.hip3 && ex === "hyperliquid" && isDexCapable(adapter)) {
                             const hip3 = await fetchHip3Data(adapter, a => a.getPositions());
                             for (const { dex, items } of hip3)
                                 grouped[`hip3:${dex}`] = items;
@@ -423,7 +423,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
         const positions = await adapter.getPositions();
         // --hip3: append HIP-3 dex positions
         const hip3Positions = [];
-        if (opts.hip3 && adapter instanceof HyperliquidAdapter) {
+        if (opts.hip3 && isDexCapable(adapter)) {
             hip3Positions.push(...await fetchHip3Data(adapter, a => a.getPositions()));
         }
         if (isJson()) {
@@ -494,7 +494,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                         ]);
                     }
                     // --hip3: fetch HIP-3 dex orders for HL
-                    if (opts.hip3 && ex === "hyperliquid" && adapter instanceof HyperliquidAdapter) {
+                    if (opts.hip3 && ex === "hyperliquid" && isDexCapable(adapter)) {
                         const hip3 = await fetchHip3Data(adapter, a => a.getOpenOrders());
                         for (const { dex, items } of hip3) {
                             for (const o of items) {
@@ -523,7 +523,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                     try {
                         const adapter = await getAdapterForExchange(ex);
                         grouped[ex] = await adapter.getOpenOrders();
-                        if (opts.hip3 && ex === "hyperliquid" && adapter instanceof HyperliquidAdapter) {
+                        if (opts.hip3 && ex === "hyperliquid" && isDexCapable(adapter)) {
                             const hip3 = await fetchHip3Data(adapter, a => a.getOpenOrders());
                             for (const { dex, items } of hip3)
                                 grouped[`hip3:${dex}`] = items;
@@ -549,7 +549,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
         const orders = await adapter.getOpenOrders();
         // --hip3: append HIP-3 dex orders
         const hip3Orders = [];
-        if (opts.hip3 && adapter instanceof HyperliquidAdapter) {
+        if (opts.hip3 && isDexCapable(adapter)) {
             hip3Orders.push(...await fetchHip3Data(adapter, a => a.getOpenOrders()));
         }
         if (isJson()) {
@@ -623,8 +623,9 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
         .action(async () => {
         const adapter = await getAdapter();
         // Pacifica: use dedicated SDK endpoint
-        if (adapter instanceof PacificaAdapter) {
-            const settings = await adapter.sdk.getAccountSettings(adapter.publicKey);
+        if (hasPacificaSdk(adapter)) {
+            const sdk = adapter.sdk;
+            const settings = await sdk.getAccountSettings(adapter.publicKey);
             if (isJson())
                 return printJson(jsonOk(settings));
             if (!Array.isArray(settings) || settings.length === 0) {
@@ -902,9 +903,19 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
         .command("twap-orders")
         .description("Active TWAP orders")
         .action(async () => {
-        const adapter = await getAdapter();
-        const p = pac(adapter);
-        const orders = await p.sdk.getTWAPOrders(p.publicKey);
+        let p;
+        try {
+            const adapter = await getAdapter();
+            p = pac(adapter);
+        }
+        catch (err) {
+            if (isJson())
+                return printJson(jsonError("EXCHANGE_ERROR", err instanceof Error ? err.message : String(err)));
+            console.error(chalk.red(`\n  ${err instanceof Error ? err.message : String(err)}\n`));
+            return;
+        }
+        const sdk = p.sdk;
+        const orders = await sdk.getTWAPOrders(p.publicKey);
         if (isJson())
             return printJson(jsonOk(orders));
         if (!orders || orders.length === 0) {
@@ -932,7 +943,73 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                 const exchanges = opts.exchange
                     ? opts.exchange.split(",").map(e => e.trim())
                     : [...EXCHANGES];
-                const snapshots = await Promise.all(exchanges.map(ex => fetchExchangeSnapshot(ex, getAdapterForExchange)));
+                // Fetch snapshots + funding + spot ALL in parallel
+                const fundingByExSym = new Map();
+                const spotRows = [];
+                let totalSpotValue = 0;
+                const [snapshots] = await Promise.all([
+                    // Phase 1: balance + positions + orders
+                    Promise.all(exchanges.map(ex => fetchExchangeSnapshot(ex, getAdapterForExchange))),
+                    // Phase 2: funding payments (parallel with Phase 1)
+                    Promise.allSettled(exchanges.map(async (exName) => {
+                        try {
+                            const adapter = await getAdapterForExchange(exName);
+                            const payments = await adapter.getFundingPayments(200);
+                            for (const p of payments) {
+                                const sym = p.symbol.replace("-PERP", "").toUpperCase();
+                                const key = `${exName}:${sym}`;
+                                fundingByExSym.set(key, (fundingByExSym.get(key) ?? 0) + Number(p.payment));
+                            }
+                        }
+                        catch { /* skip */ }
+                    })),
+                    // Phase 3: spot balances (parallel with Phase 1+2)
+                    Promise.allSettled(exchanges.map(async (exName) => {
+                        try {
+                            const adapter = await getAdapterForExchange(exName);
+                            if (exName === "hyperliquid") {
+                                const { HyperliquidSpotAdapter } = await import("../exchanges/hyperliquid-spot.js");
+                                const { HyperliquidAdapter } = await import("../exchanges/hyperliquid.js");
+                                const hlSpot = new HyperliquidSpotAdapter(adapter);
+                                await hlSpot.init();
+                                const bals = await hlSpot.getSpotBalances();
+                                const markets = await hlSpot.getSpotMarkets();
+                                const priceMap = new Map(markets.map(m => [m.baseToken.toUpperCase(), Number(m.markPrice)]));
+                                for (const b of bals) {
+                                    const base = b.token.replace(/-SPOT$/i, "").toUpperCase();
+                                    if (base === "USDC" || Number(b.total) <= 0)
+                                        continue;
+                                    const price = priceMap.get(base) ?? 0;
+                                    const value = price * Number(b.total);
+                                    if (value < 1)
+                                        continue;
+                                    totalSpotValue += value;
+                                    spotRows.push([chalk.white.bold(base), chalk.gray("hyperliquid"), b.total, `$${formatUsd(price)}`, `$${formatUsd(value)}`]);
+                                }
+                            }
+                            else if (exName === "lighter") {
+                                const { LighterAdapter } = await import("../exchanges/lighter.js");
+                                const { LighterSpotAdapter } = await import("../exchanges/lighter-spot.js");
+                                const ltSpot = new LighterSpotAdapter(adapter);
+                                await ltSpot.init();
+                                const bals = await ltSpot.getSpotBalances();
+                                const markets = await ltSpot.getSpotMarkets();
+                                const priceMap = new Map(markets.map(m => [m.baseToken.toUpperCase(), Number(m.markPrice)]));
+                                for (const b of bals) {
+                                    if (b.token === "USDC" || b.token === "USDC_SPOT" || Number(b.total) <= 0)
+                                        continue;
+                                    const price = priceMap.get(b.token.toUpperCase()) ?? 0;
+                                    const value = price * Number(b.total);
+                                    if (value < 1)
+                                        continue;
+                                    totalSpotValue += value;
+                                    spotRows.push([chalk.white.bold(b.token), chalk.gray("lighter"), b.total, `$${formatUsd(price)}`, `$${formatUsd(value)}`]);
+                                }
+                            }
+                        }
+                        catch { /* spot not available */ }
+                    })),
+                ]);
                 const summary = buildSummary(snapshots);
                 if (isJson()) {
                     return printJson(jsonOk(summary));
@@ -955,7 +1032,6 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                         chalk.green("connected"),
                     ];
                 });
-                // Totals row
                 balRows.push([
                     chalk.cyan.bold("TOTAL"),
                     chalk.cyan.bold(`$${formatUsd(summary.totalEquity)}`),
@@ -965,12 +1041,13 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                     "",
                 ]);
                 console.log(makeTable(["Exchange", "Equity", "Available", "Margin Used", "uPnL", "Status"], balRows));
-                // ── Positions ──
                 if (summary.positions.length > 0) {
                     console.log(chalk.white.bold("\n  Open Positions"));
                     const posRows = summary.positions.map(p => {
                         const sideColor = p.side === "long" ? chalk.green : chalk.red;
                         const notional = Math.abs(Number(p.size) * Number(p.markPrice));
+                        const sym = p.symbol.replace("-PERP", "").toUpperCase();
+                        const funding = fundingByExSym.get(`${p.exchange}:${sym}`) ?? 0;
                         return [
                             chalk.white.bold(p.symbol),
                             chalk.gray(p.exchange),
@@ -979,75 +1056,29 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                             `$${formatUsd(p.entryPrice)}`,
                             `$${formatUsd(p.markPrice)}`,
                             formatPnl(p.unrealizedPnl),
+                            formatPnl(funding),
                             `$${formatUsd(notional)}`,
                             `${p.leverage}x`,
                         ];
                     });
-                    console.log(makeTable(["Symbol", "Exchange", "Side", "Size", "Entry", "Mark", "uPnL", "Notional", "Lev"], posRows));
+                    console.log(makeTable(["Symbol", "Exchange", "Side", "Size", "Entry", "Mark", "uPnL", "Funding", "Notional", "Lev"], posRows));
                 }
                 else {
                     console.log(chalk.gray("\n  No open positions.\n"));
                 }
-                // ── Spot Holdings ──
-                const spotRows = [];
-                for (const exName of exchanges) {
-                    try {
-                        const adapter = await getAdapterForExchange(exName);
-                        if (exName === "hyperliquid") {
-                            const { HyperliquidSpotAdapter } = await import("../exchanges/hyperliquid-spot.js");
-                            const hlSpot = new HyperliquidSpotAdapter(adapter);
-                            await hlSpot.init();
-                            const bals = await hlSpot.getSpotBalances();
-                            const markets = await hlSpot.getSpotMarkets();
-                            const priceMap = new Map(markets.map(m => [m.baseToken.toUpperCase(), Number(m.markPrice)]));
-                            for (const b of bals) {
-                                const base = b.token.replace(/-SPOT$/i, "").toUpperCase();
-                                if (base === "USDC" || Number(b.total) <= 0)
-                                    continue;
-                                const price = priceMap.get(base) ?? 0;
-                                const value = price * Number(b.total);
-                                if (value < 1)
-                                    continue; // skip dust
-                                spotRows.push([
-                                    chalk.white.bold(base),
-                                    chalk.gray("hyperliquid"),
-                                    b.total,
-                                    `$${formatUsd(price)}`,
-                                    `$${formatUsd(value)}`,
-                                ]);
-                            }
-                        }
-                        else if (exName === "lighter") {
-                            const { LighterAdapter } = await import("../exchanges/lighter.js");
-                            const { LighterSpotAdapter } = await import("../exchanges/lighter-spot.js");
-                            const ltSpot = new LighterSpotAdapter(adapter);
-                            await ltSpot.init();
-                            const bals = await ltSpot.getSpotBalances();
-                            const markets = await ltSpot.getSpotMarkets();
-                            const priceMap = new Map(markets.map(m => [m.baseToken.toUpperCase(), Number(m.markPrice)]));
-                            for (const b of bals) {
-                                if (b.token === "USDC" || b.token === "USDC_SPOT" || Number(b.total) <= 0)
-                                    continue;
-                                const price = priceMap.get(b.token.toUpperCase()) ?? 0;
-                                const value = price * Number(b.total);
-                                if (value < 1)
-                                    continue;
-                                spotRows.push([
-                                    chalk.white.bold(b.token),
-                                    chalk.gray("lighter"),
-                                    b.total,
-                                    `$${formatUsd(price)}`,
-                                    `$${formatUsd(value)}`,
-                                ]);
-                            }
-                        }
-                    }
-                    catch { /* spot not available */ }
-                }
+                // ── Spot Holdings (already fetched in parallel above) ──
                 if (spotRows.length > 0) {
                     console.log(chalk.white.bold("\n  Spot Holdings"));
                     console.log(makeTable(["Token", "Exchange", "Amount", "Price", "Value"], spotRows));
                 }
+                // ── Total (perp + spot) ──
+                if (totalSpotValue > 0) {
+                    const totalValue = summary.totalEquity + totalSpotValue;
+                    console.log(chalk.white.bold("  Total Account Value"));
+                    console.log(`    Perp Equity:   $${formatUsd(summary.totalEquity)}`);
+                    console.log(`    Spot Value:    $${formatUsd(totalSpotValue)}`);
+                    console.log(`    ${chalk.cyan.bold(`Total:         $${formatUsd(totalValue)}`)}`);
+                }
                 // ── Risk Metrics ──
                 console.log(chalk.white.bold("\n  Risk Metrics"));
                 const levelColor = {

package/dist/commands/agent.d.ts

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

package/dist/commands/arb/index.d.ts

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

package/dist/commands/arb/index.js

@@ -1,12 +1,12 @@
 import chalk from "chalk";
 import { makeTable, formatUsd, formatPnl, printJson, jsonOk } from "../../utils.js";
+import { SPOT_PERP_TOKEN_MAP } from "../../exchanges/index.js";
 import { readExecutionLog, logExecution } from "../../execution-log.js";
 import { toHourlyRate, computeAnnualSpread } from "../../funding.js";
 import { fetchPacificaPrices, fetchHyperliquidMeta, fetchLighterOrderBookDetails, fetchLighterFundingRates, } from "../../shared-api.js";
 import { computeBasisRisk } from "../../arb-utils.js";
 import { smartOrder } from "../../smart-order.js";
 import { removePosition as persistRemovePosition, getPositions as getArbStatePositions, loadArbState } from "../../arb-state.js";
-import { SPOT_PERP_TOKEN_MAP } from "../../exchanges/spot-interface.js";
 import { fetchAllBalances, computeRebalancePlan } from "../../rebalance.js";
 import { EXCHANGE_TO_CHAIN, getBestQuote } from "../../bridge-engine.js";
 import { computeEnhancedStats } from "../../arb-history-stats.js";

package/dist/commands/arb-auto.d.ts

@@ -1,5 +1,5 @@
 import { Command } from "commander";
-import type { ExchangeAdapter } from "../exchanges/interface.js";
+import type { ExchangeAdapter } from "../exchanges/index.js";
 interface FundingSnapshot {
     symbol: string;
     pacRate: number;

package/dist/commands/arb-auto.js

@@ -1,7 +1,7 @@
 import chalk from "chalk";
 import { formatUsd, printJson, jsonOk, makeTable } from "../utils.js";
 import { computeExecutableSize } from "../liquidity.js";
-import { computeMatchedSize, computeSpotPerpMatchedSize } from "../arb/sizing.js";
+import { computeMatchedSize, computeSpotPerpMatchedSize } from "../arb/index.js";
 import { computeAnnualSpread, toHourlyRate } from "../funding.js";
 import { fetchPacificaPricesRaw, parsePacificaRaw, fetchHyperliquidMetaRaw, parseHyperliquidMetaRaw, fetchLighterOrderBookDetailsRaw, fetchLighterFundingRatesRaw, parseLighterRaw, } from "../shared-api.js";
 import { scanDexArb } from "../dex-asset-map.js";

package/dist/commands/arb.d.ts

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

package/dist/commands/bot.d.ts

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