perp-cli 0.6.2 → 0.6.4

package/dist/commands/account.js

@@ -687,9 +687,10 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
         .command("funding-history")
         .alias("funding")
         .description("Personal funding payment history")
-        .action(async () => {
+        .option("-n, --limit <n>", "Number of records", "200")
+        .action(async (opts) => {
         const adapter = await getAdapter();
-        const payments = await adapter.getFundingPayments(30);
+        const payments = await adapter.getFundingPayments(parseInt(opts.limit));
         if (isJson())
             return printJson(jsonOk(payments));
         if (payments.length === 0) {
@@ -964,12 +965,28 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                     "",
                 ]);
                 console.log(makeTable(["Exchange", "Equity", "Available", "Margin Used", "uPnL", "Status"], balRows));
-                // ── Positions ──
+                // ── Positions + Funding ──
+                // Fetch funding per exchange in parallel
+                const fundingByExSym = new Map();
+                await 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 */ }
+                }));
                 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),
@@ -978,17 +995,19 @@ 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 = [];
+                let totalSpotValue = 0;
                 for (const exName of exchanges) {
                     try {
                         const adapter = await getAdapterForExchange(exName);
@@ -1007,6 +1026,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                                 const value = price * Number(b.total);
                                 if (value < 1)
                                     continue; // skip dust
+                                totalSpotValue += value;
                                 spotRows.push([
                                     chalk.white.bold(base),
                                     chalk.gray("hyperliquid"),
@@ -1031,6 +1051,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                                 const value = price * Number(b.total);
                                 if (value < 1)
                                     continue;
+                                totalSpotValue += value;
                                 spotRows.push([
                                     chalk.white.bold(b.token),
                                     chalk.gray("lighter"),
@@ -1047,6 +1068,14 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                     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/arb/index.js

@@ -294,24 +294,34 @@ export function registerArbManageCommands(program, getAdapterForExchange, isJson
                     const annualPct = hourlyRate * 8760 * 100;
                     const perpNotional = shortPos.size * shortPos.markPrice;
                     const spotValueUsd = spotAmount * shortPos.markPrice; // approx using perp mark price
-                    // Funding income: spot has 0 funding, perp short receives when rate > 0
-                    let estimatedFundingIncome = 0;
-                    if (holdDurationMs && hourlyRate !== 0) {
-                        const holdHours = holdDurationMs / (1000 * 60 * 60);
-                        // Short position: pays when rate < 0, receives when rate > 0
-                        estimatedFundingIncome = Math.abs(hourlyRate) * perpNotional * holdHours;
-                        if (hourlyRate < 0)
-                            estimatedFundingIncome = -estimatedFundingIncome;
+                    // Funding income: fetch actual payments from exchange API
+                    let actualFundingIncome = 0;
+                    try {
+                        const perpAdapter = await getAdapterForExchange(shortPos.exchange);
+                        const payments = await perpAdapter.getFundingPayments(200);
+                        // Filter from entry time minus 1h buffer (multi-leg entry takes time)
+                        const entryTime = persisted ? new Date(persisted.entryTime).getTime() - 3600000 : 0;
+                        for (const p of payments) {
+                            if (p.symbol.toUpperCase().includes(perpSymbol) && (!entryTime || p.time >= entryTime)) {
+                                actualFundingIncome += Number(p.payment);
+                            }
+                        }
                     }
-                    // Add persisted accumulated funding
-                    if (persisted?.accumulatedFunding) {
-                        estimatedFundingIncome += persisted.accumulatedFunding;
+                    catch {
+                        // Fallback to estimate if API fails
+                        if (holdDurationMs && hourlyRate !== 0) {
+                            const holdHours = holdDurationMs / (1000 * 60 * 60);
+                            actualFundingIncome = Math.abs(hourlyRate) * perpNotional * holdHours;
+                            if (hourlyRate < 0)
+                                actualFundingIncome = -actualFundingIncome;
+                        }
                     }
-                    // Fees: spot buy + spot sell + perp short entry + perp buy to close
+                    const estimatedFundingIncome = actualFundingIncome;
+                    // Fees: entry only (exit not yet paid)
                     const { getTakerFee } = await import("../../constants.js");
                     const spotFee = getTakerFee(spotEx);
                     const perpFee = getTakerFee(shortPos.exchange);
-                    const totalFees = (spotValueUsd * spotFee * 2) + (perpNotional * perpFee * 2);
+                    const entryFees = (spotValueUsd * spotFee) + (perpNotional * perpFee);
                     const direction = hourlyRate >= 0 ? "long-spot-short-perp" : "sell-spot-long-perp";
                     const dailyFundingEstimate = Math.abs(hourlyRate) * perpNotional * 24;
                     spotPerpPositions.push({
@@ -334,8 +344,8 @@ export function registerArbManageCommands(program, getAdapterForExchange, isJson
                         holdDuration,
                         holdDurationMs,
                         estimatedFundingIncome,
-                        estimatedFees: totalFees,
-                        netPnl: shortPos.unrealizedPnl + estimatedFundingIncome - totalFees,
+                        estimatedFees: entryFees,
+                        netPnl: (spotValueUsd - shortPos.entryPrice * spotAmount) + shortPos.unrealizedPnl + estimatedFundingIncome - entryFees,
                         dailyFundingEstimate,
                     });
                 }
@@ -441,29 +451,50 @@ export function registerArbManageCommands(program, getAdapterForExchange, isJson
             });
             console.log(makeTable(["Symbol", "Long", "Short", "Size", "Entry", "Mark", "uPnL", "Funding", "Spread", "Basis", "Hold", "Net PnL"], rows));
         }
-        // ── Spot-Perp table ──
+        // ── Spot-Perp detailed view ──
         if (spotPerpPositions.length > 0) {
-            console.log(chalk.cyan.bold("  Spot-Perp Arb Positions\n"));
-            const spRows = spotPerpPositions.map(sp => {
-                const spotLabel = sp.spotToken !== sp.symbol
-                    ? `${sp.spotToken} (${sp.spotExchange})`
-                    : sp.spotExchange;
+            for (const sp of spotPerpPositions) {
+                const exAbbr = (e) => e === "pacifica" ? "PAC" : e === "hyperliquid" ? "HL" : "LT";
                 const spreadStr = sp.currentSpread !== null ? `${sp.currentSpread.toFixed(1)}%` : "-";
-                return [
-                    chalk.white.bold(sp.symbol),
-                    chalk.green(`${sp.spotAmount.toFixed(4)} ${sp.spotToken}`),
-                    spotLabel,
-                    chalk.red(sp.perpExchange),
-                    `$${formatUsd(sp.perpNotionalUsd)}`,
-                    `$${sp.perpMarkPrice.toFixed(2)}`,
-                    formatPnl(sp.perpUnrealizedPnl),
-                    chalk.yellow(`$${sp.estimatedFundingIncome.toFixed(4)}`),
-                    spreadStr,
-                    sp.holdDuration ?? "-",
-                    formatPnl(sp.netPnl),
+                const spotPriceEach = sp.spotAmount > 0 ? sp.spotValueUsd / sp.spotAmount : 0;
+                const spotPnl = sp.spotValueUsd - (sp.perpEntryPrice * sp.spotAmount); // spot value vs entry
+                const roi = sp.perpNotionalUsd > 0 ? (sp.netPnl / sp.perpNotionalUsd) * 100 : 0;
+                const dailyRoi = sp.holdDurationMs && sp.holdDurationMs > 0 ? roi / (sp.holdDurationMs / 86400000) : 0;
+                const annRoi = dailyRoi * 365;
+                console.log(chalk.cyan.bold(`\n  ${sp.symbol} spot-perp`) + chalk.gray(` (${exAbbr(sp.spotExchange)} ↔ ${exAbbr(sp.perpExchange)})`) + chalk.gray(`  ${sp.holdDuration ?? "-"}`));
+                console.log("");
+                // Leg details
+                const legRows = [
+                    [
+                        chalk.green("Spot"),
+                        `${sp.spotAmount.toFixed(4)} ${sp.spotToken}`,
+                        `$${sp.perpEntryPrice.toFixed(4)}`,
+                        `$${spotPriceEach.toFixed(4)}`,
+                        formatPnl(spotPnl),
+                    ],
+                    [
+                        chalk.red("Perp"),
+                        `${sp.perpSize.toFixed(4)} ${sp.symbol}`,
+                        `$${sp.perpEntryPrice.toFixed(4)}`,
+                        `$${sp.perpMarkPrice.toFixed(4)}`,
+                        formatPnl(sp.perpUnrealizedPnl),
+                    ],
                 ];
-            });
-            console.log(makeTable(["Symbol", "Spot Held", "Spot Ex", "Perp Ex", "Size", "Mark", "uPnL", "Funding", "Spread", "Hold", "Net PnL"], spRows));
+                console.log(makeTable(["Leg", "Qty", "Entry", "Current", "PnL"], legRows));
+                // Summary
+                console.log(chalk.white.bold("  PnL Breakdown:"));
+                console.log(`    Spot PnL:        ${formatPnl(spotPnl)}`);
+                console.log(`    Perp PnL:        ${formatPnl(sp.perpUnrealizedPnl)}`);
+                console.log(`    Funding Earned:  ${chalk.yellow(`$${sp.estimatedFundingIncome.toFixed(4)}`)}`);
+                console.log(`    Trading Fees:    ${chalk.red(`-$${sp.estimatedFees.toFixed(4)}`)}`);
+                console.log(`    ${chalk.white.bold("Total PnL:")}       ${formatPnl(sp.netPnl)}${roi !== 0 ? chalk.gray(` (ROI: ${roi >= 0 ? "+" : ""}${roi.toFixed(2)}%)`) : ""}`);
+                console.log("");
+                console.log(`    Current Spread:  ${spreadStr}`);
+                console.log(`    Daily Income:    ${chalk.cyan(`$${sp.dailyFundingEstimate.toFixed(4)}/day`)}`);
+                if (annRoi !== 0)
+                    console.log(`    Annualized ROI:  ${chalk.cyan(`${annRoi >= 0 ? "+" : ""}${annRoi.toFixed(1)}%`)}`);
+            }
+            console.log("");
         }
         // ── Combined Summary ──
         const totalUpnl = arbPairs.reduce((s, p) => s + p.unrealizedPnl, 0)

package/dist/exchanges/hyperliquid.js

@@ -703,18 +703,21 @@ export class HyperliquidAdapter {
             fee: String(f.fee ?? "0"),
         }));
     }
-    async getFundingPayments(limit = 30) {
+    async getFundingPayments(limit = 200) {
         this.ensureAddress();
-        const now = Date.now();
-        const history = await this.client.info.perpetuals.getUserFunding(this._address, now - 7 * 24 * 60 * 60 * 1000);
-        return (history ?? []).slice(0, limit).map((h) => {
-            const delta = (h.delta ?? {});
-            return {
-                time: Number(h.time ?? 0),
-                symbol: String(delta.coin ?? ""),
-                payment: String(delta.usdc ?? "0"),
-            };
+        // Direct API call — SDK's getUserFunding silently truncates results
+        const apiUrl = this._testnet ? "https://api.hyperliquid-testnet.xyz/info" : "https://api.hyperliquid.xyz/info";
+        const res = await fetch(apiUrl, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ type: "userFunding", user: this._address, startTime: Date.now() - 7 * 24 * 60 * 60 * 1000 }),
         });
+        const data = await res.json();
+        return (data ?? []).slice(0, limit).map((h) => ({
+            time: h.time,
+            symbol: h.delta.coin + "-PERP",
+            payment: h.delta.usdc,
+        }));
     }
     async getFundingHistory(symbol, limit = 10) {
         const now = Date.now();

package/dist/exchanges/lighter.js

@@ -669,7 +669,7 @@ export class LighterAdapter {
             fee: String(t.fee ?? "0"),
         }));
     }
-    async getFundingPayments(limit = 30) {
+    async getFundingPayments(limit = 200) {
         if (!this._address)
             throw new Error("No private key configured — account data unavailable. Run: perp init");
         const raw = await this._getPositionFundingRaw();
@@ -677,7 +677,7 @@ export class LighterAdapter {
         return items.slice(0, limit).map((f) => ({
             time: Number(f.timestamp ?? 0) * 1000,
             symbol: String(f.symbol ?? ""),
-            payment: String(f.amount ?? f.payment ?? "0"),
+            payment: String(f.change ?? f.amount ?? f.payment ?? "0"),
         }));
     }
     /**
@@ -799,8 +799,10 @@ export class LighterAdapter {
             return this.restGetAuth("/positionFunding", {
                 account_index: String(this._accountIndex),
                 market_id: String(marketId),
+                limit: "100",
+                side: "all",
             }).then((res) => {
-                const items = (res.funding ?? res.data ?? []);
+                const items = (res.position_fundings ?? res.funding ?? res.data ?? []);
                 return items.map((f) => ({ ...f, symbol: f.symbol ?? sym }));
             });
         }));

package/dist/exchanges/pacifica.js

@@ -281,7 +281,7 @@ export class PacificaAdapter {
             fee: String(t.fee ?? "0"),
         }));
     }
-    async getFundingPayments(limit = 30) {
+    async getFundingPayments(limit = 200) {
         if (!this._hasRealKey)
             throw new Error("No private key configured — account data unavailable. Run: perp init");
         const raw = await this.client.getFundingAccountHistory(this.account);

package/package.json

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