perp-cli 0.9.3 → 0.9.6

package/dist/bot/engine.js

@@ -76,10 +76,11 @@ mode = "headless") {
         tick: 0,
         log,
     };
-    // Pass extra adapters to strategy context for funding-arb
+    // Pass extra adapters and risk config to strategy context
     if (extraAdapters) {
         strategyCtx.state.set("extraAdapters", extraAdapters);
     }
+    strategyCtx.state.set("riskConfig", config.risk);
     const isDryRun = false; // TODO: wire up from config when dry-run mode is added
     let running = true;
     // ── TUI / JSON mode setup ──

package/dist/bot/strategies/funding-arb-v2-strategy.js

@@ -380,10 +380,16 @@ export class FundingArbV2Strategy {
             return cached.score;
         try {
             const history = await adapter.getFundingHistory(symbol, periods);
-            if (history.length === 0)
+            if (history.length < 2)
                 return null;
             const rates = history.map(h => parseFloat(h.rate));
-            const fH = getFundingHours(exchange);
+            // Compute actual funding period from timestamps (no static map dependency)
+            const times = history.map(h => h.time).sort((a, b) => a - b);
+            let totalInterval = 0;
+            for (let i = 1; i < times.length; i++)
+                totalInterval += times[i] - times[i - 1];
+            const avgIntervalH = totalInterval / (times.length - 1) / 3600000;
+            const fH = avgIntervalH < 1.5 ? 1 : avgIntervalH < 5 ? 4 : 8;
             const avgRate = rates.reduce((s, r) => s + r, 0) / rates.length;
             const consistency = rates.filter(r => r > 0).length / rates.length;
             const annualized = (avgRate / fH) * 8760 * 100;

package/dist/bot/strategies/spot-perp-arb-strategy.js

@@ -174,10 +174,10 @@ export class SpotPerpArbStrategy {
         }
         const display = positions.map(pos => {
             const ann = this.calcAnnualized(pos, ratesByExchange);
-            const sign = ann >= 0 ? "+" : "";
+            const annStr = ann !== null ? `${ann >= 0 ? "+" : ""}${ann.toFixed(1)}%` : "?%";
             const hist = pos.fundingHistory;
             const posCount = hist.filter(h => h.amount > 0).length;
-            return `${pos.symbol} ${pos.spotExchange}-spot<>${pos.perpExchange} ${sign}${ann.toFixed(1)}% (${posCount}/${hist.length} positive)`;
+            return `${pos.symbol} ${pos.spotExchange}-spot<>${pos.perpExchange} ${annStr} (${posCount}/${hist.length} positive)`;
         });
         ctx.state.set("arbPositionDetails", display);
         ctx.state.set("arbPositions", positions.length);
@@ -354,10 +354,16 @@ export class SpotPerpArbStrategy {
             return cached.score;
         try {
             const history = await adapter.getFundingHistory(symbol, p.history_periods);
-            if (history.length === 0)
+            if (history.length < 2)
                 return null;
             const rates = history.map(h => parseFloat(h.rate));
-            const fH = getFundingHours(exchangeName);
+            // Compute actual funding period from timestamps (no static map dependency)
+            const times = history.map(h => h.time).sort((a, b) => a - b);
+            let totalInterval = 0;
+            for (let i = 1; i < times.length; i++)
+                totalInterval += times[i] - times[i - 1];
+            const avgIntervalH = totalInterval / (times.length - 1) / 3600000;
+            const fH = avgIntervalH < 1.5 ? 1 : avgIntervalH < 5 ? 4 : 8;
             const avgRate = rates.reduce((s, r) => s + r, 0) / rates.length;
             const consistency = rates.filter(r => r > 0).length / rates.length;
             const annualized = (avgRate / fH) * 8760 * 100;
@@ -388,13 +394,18 @@ export class SpotPerpArbStrategy {
     calcAnnualized(pos, ratesByExchange) {
         const ri = findRate(ratesByExchange, pos.perpExchange, getPerpSymbol(pos.symbol, pos.perpExchange))
             ?? findRate(ratesByExchange, pos.perpExchange, pos.symbol);
-        const fH = ri?.fundingHours ?? getFundingHours(pos.perpExchange);
-        return ri ? (ri.rate / fH) * 8760 * 100 : 0;
+        if (!ri)
+            return null; // rate unknown — don't assume 0
+        const fH = ri.fundingHours ?? getFundingHours(pos.perpExchange);
+        return (ri.rate / fH) * 8760 * 100;
     }
     shouldClose(pos, ratesByExchange, p) {
         const minHoldMs = p.min_hold_hours * 60 * 60 * 1000;
         const holdTime = pos.entryTime > 0 ? Date.now() - pos.entryTime : Infinity;
         const ann = this.calcAnnualized(pos, ratesByExchange);
+        // Rate unknown — don't close (rate data not yet available)
+        if (ann === null)
+            return false;
         // Emergency close: instantaneous spread deeply negative
         if (ann < -50)
             return true;
@@ -442,8 +453,24 @@ export class SpotPerpArbStrategy {
                     return false;
                 }
             }
-            // Size decision
-            let targetSizeUsd = p.size_usd;
+            // Risk policy: enforce max_position_usd from risk config
+            const riskConfig = ctx.state.get("riskConfig");
+            const maxTotalPositionUsd = riskConfig?.max_position_usd ?? Infinity;
+            const positions = ctx.state.get("spaPositions");
+            let currentTotalUsd = 0;
+            for (const pos of positions) {
+                const ri = findRate(ratesByExchange, pos.perpExchange, getPerpSymbol(pos.symbol, pos.perpExchange))
+                    ?? findRate(ratesByExchange, pos.perpExchange, pos.symbol);
+                const price = ri?.price ?? 0;
+                currentTotalUsd += price * parseFloat(pos.size);
+            }
+            const remainingBudget = maxTotalPositionUsd - currentTotalUsd;
+            if (remainingBudget < 10) {
+                ctx.log(`  [SPA] Skip ${symbol}: risk limit — total positions $${currentTotalUsd.toFixed(0)}/$${maxTotalPositionUsd} (no budget)`);
+                return false;
+            }
+            // Size decision (capped by risk budget)
+            let targetSizeUsd = Math.min(p.size_usd, remainingBudget);
             const sameExchange = spotExchange === perpExchange;
             if (sameExchange) {
                 const perpBal = await perpAdapter.getBalance();

package/dist/bot/strategies/spot-perp-executor.js

@@ -118,6 +118,24 @@ export class SpotPerpExecutor {
                 }
                 return { success: false, error: `spot buy: ${msg}` };
             }
+            // Step 1b: Verify spot actually bought (safety net for "assuming executed" false positive)
+            try {
+                invalidateCache("acct");
+                const postBals = await spotAdapter.getSpotBalances();
+                const bought = postBals.find(b => b.token.toUpperCase().replace(/-SPOT$/, "") === symbol.toUpperCase());
+                const boughtAmt = bought ? parseFloat(bought.total) : 0;
+                if (boughtAmt < parseFloat(matched.size) * 0.5) {
+                    log(`  [SPA] Spot buy returned OK but ${symbol} balance too low (${boughtAmt.toFixed(4)}) — aborting`);
+                    if (actualTransferred > 0) {
+                        try {
+                            await transferUsdcToPerp(spotAdapter, spotExchange, actualTransferred);
+                        }
+                        catch { /* best effort */ }
+                    }
+                    return { success: false, error: "spot buy not confirmed by balance" };
+                }
+            }
+            catch { /* balance check failed, proceed optimistically */ }
             // Step 2: Short perp
             try {
                 await perpAdapter.marketOrder(perpSymbol, "sell", matched.size);
@@ -202,6 +220,24 @@ export class SpotPerpExecutor {
                 }
                 return false;
             }
+            // Step 2b: Verify spot actually sold (safety net for "assuming executed" false positive)
+            try {
+                invalidateCache("acct");
+                const postBals = await spotAdapter.getSpotBalances();
+                const remaining = postBals.find(b => b.token.toUpperCase().replace(/-SPOT$/, "") === symbol.toUpperCase());
+                const remainingAmt = remaining ? parseFloat(remaining.total) : 0;
+                if (remainingAmt >= parseFloat(size) * 0.5) {
+                    log(`  [SPA] CRITICAL: Spot sell returned OK but ${symbol} balance unchanged (${remainingAmt.toFixed(4)}) — re-hedging perp`);
+                    try {
+                        await perpAdapter.marketOrder(perpSym, "sell", size);
+                    }
+                    catch (rbErr) {
+                        log(`  [SPA] CRITICAL: Perp re-hedge failed: ${rbErr instanceof Error ? rbErr.message : String(rbErr)}`);
+                    }
+                    return false;
+                }
+            }
+            catch { /* balance check failed, proceed optimistically */ }
             // Step 3: Transfer USDC back to perp (always — lighter/HL both need this)
             try {
                 const spotBals = await spotAdapter.getSpotBalances();

package/dist/exchanges/lighter-spot.js

@@ -239,8 +239,8 @@ export class LighterSpotAdapter {
                 try {
                     const tx = await this._restGet("/tx", { by: "hash", value: txResult.tx_hash });
                     const status = Number(tx.status ?? 0);
-                    if (status === 3)
-                        return result; // executed
+                    if (status >= 2 && status <= 3)
+                        return result; // status 2=executed, 3=committed
                     if (status > 3)
                         throw new Error(`Spot ${side} ${symbol}: tx rejected (status=${status})`);
                 }

package/dist/exchanges/lighter.js

@@ -488,8 +488,8 @@ export class LighterAdapter {
                 try {
                     const tx = await this.restGet("/tx", { by: "hash", value: txResult.tx_hash });
                     const status = Number(tx.status ?? 0);
-                    if (status === 3) {
-                        // status 3 = executed. Parse event_info for fill details
+                    if (status >= 2 && status <= 3) {
+                        // status 2 = executed, 3 = committed. Parse event_info for fill details
                         try {
                             const eventInfo = JSON.parse(String(tx.event_info ?? "{}"));
                             const takerOrder = eventInfo.to;
@@ -507,7 +507,7 @@ export class LighterAdapter {
                         // status=3 means tx was executed (even if zero-fill IOC — strategy verifies position)
                         return result;
                     }
-                    if (status > 3) {
+                    if (status > 3) { // status 4+ = rejected/failed
                         // status > 3 likely means rejected/cancelled
                         throw new Error(`Market ${side} ${symbol}: tx rejected (status=${status}, hash=${txResult.tx_hash})`);
                     }

package/dist/exchanges/pacifica.js

@@ -194,7 +194,7 @@ export class PacificaAdapter {
         if (orderId && !(opts?.reduceOnly ?? false)) {
             // Poll order status via history_by_id
             let lastPollError = null;
-            for (let attempt = 0; attempt < 5; attempt++) {
+            for (let attempt = 0; attempt < 10; attempt++) {
                 await new Promise(r => setTimeout(r, 500));
                 try {
                     const history = await this.client.getOrderHistoryById(Number(orderId));
@@ -217,8 +217,9 @@ export class PacificaAdapter {
                     lastPollError = e;
                 }
             }
+            // Order was accepted but verification timed out — warn, don't throw
             const errDetail = lastPollError instanceof Error ? ` (poll error: ${lastPollError.message})` : "";
-            throw new Error(`Market ${side} ${symbol}: order ${orderId} not confirmed after 2.5s${errDetail}`);
+            console.error(`[pacifica] Warning: market ${side} ${symbol} order ${orderId} not confirmed after 5s${errDetail} — assuming executed`);
         }
         if (!(opts?.reduceOnly ?? false)) {
             console.error(`[pacifica] Warning: market ${side} ${symbol} accepted but no order_id in response — skipping fill verification`);

package/dist/funding/normalize.js

@@ -18,7 +18,7 @@ const EXCHANGE_FUNDING_HOURS = {
     hyperliquid: 1,
     pacifica: 1,
     lighter: 8,
-    aster: 1,
+    aster: 8,
 };
 /**
  * Get funding period in hours for an exchange.

package/dist/index.js

@@ -1,4 +1,6 @@
 #!/usr/bin/env node
+// Save original process.exit before any SDK (Go WASM) can patch it
+const _origExit = process.exit.bind(process);
 import { config } from "dotenv";
 import { resolve } from "path";
 import { createRequire } from "node:module";
@@ -733,14 +735,14 @@ if (rawArgs.length === 0 || (!hasSubcommand && !rawArgs.includes("-h") && !rawAr
         catch {
             program.help();
         }
-        setTimeout(() => process.exit(0), 500);
+        setTimeout(() => _origExit(0), 500);
     })();
 }
 else {
     program.parseAsync().then(() => {
         // Allow a short delay for any pending output, then exit cleanly.
         // Without this, HL SDK's WebSocket keeps the process alive indefinitely.
-        setTimeout(() => process.exit(0), 500);
+        setTimeout(() => _origExit(0), 500);
     }).catch(async (err) => {
         const msg = err instanceof Error ? err.message : String(err);
         if (isJson()) {
@@ -750,6 +752,6 @@ else {
         else {
             console.error(chalk.red(msg));
         }
-        process.exit(1);
+        _origExit(1);
     });
 }

package/package.json

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