hedgequantx 2.6.44 → 2.6.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "2.6.44",
+  "version": "2.6.45",
   "description": "HedgeQuantX - Prop Futures Trading CLI",
   "main": "src/app.js",
   "bin": {

package/src/pages/algo/one-account.js

@@ -379,17 +379,20 @@ const launchAlgo = async (service, account, contract, config) => {
     // Only update for our account
     if (pnlData.accountId !== rithmicAccountId) return;
     
-    // R Trader style P&L breakdown
-    const openPnl = parseFloat(pnlData.openPositionPnl || 0);
+    // ACCOUNT_PNL_UPDATE (451) provides account-level totals
+    // closedPositionPnl = realized P&L from all closed trades today
     const closedPnl = parseFloat(pnlData.closedPositionPnl || 0);
     
-    // Update stats (like R Trader display)
-    stats.openPnl = openPnl;      // Unrealized
-    stats.closedPnl = closedPnl;  // Realized
-    stats.pnl = openPnl + closedPnl;  // Total (same as R Trader "Today's P&L")
+    // Update closed P&L (realized) from account-level data
+    stats.closedPnl = closedPnl;
+    
+    // Total P&L = openPnl (from positionUpdate) + closedPnl (from pnlUpdate)
+    // This matches R Trader's "Today's P&L" calculation
+    stats.pnl = (stats.openPnl || 0) + (stats.closedPnl || 0);
   });
   
   // Listen to position updates for real-time position tracking (like R Trader)
+  // INSTRUMENT_PNL_UPDATE (450) provides per-instrument P&L in real-time
   service.on('positionUpdate', (pos) => {
     if (!pos || pos.accountId !== rithmicAccountId) return;
     if (pos.symbol !== symbolName && !pos.symbol?.includes(symbolName.replace(/[A-Z]\d+$/, ''))) return;
@@ -398,6 +401,17 @@ const launchAlgo = async (service, account, contract, config) => {
     stats.position = pos.quantity || 0;
     stats.entryPrice = pos.averagePrice || 0;
     currentPosition = pos.quantity || 0;
+    
+    // CRITICAL: Update Open P&L from instrument-level data (real-time, same as R Trader)
+    // pos.openPnl comes from INSTRUMENT_PNL_UPDATE (450) - this is the unrealized P&L
+    if (pos.openPnl !== undefined && pos.openPnl !== null) {
+      stats.openPnl = pos.openPnl;
+    }
+    // Update day P&L if available
+    if (pos.dayPnl !== undefined && pos.dayPnl !== null) {
+      // Total P&L = openPnl + closedPnl (same formula as R Trader)
+      stats.pnl = (stats.openPnl || 0) + (stats.closedPnl || 0);
+    }
   });
   
   // Initialize AI Strategy Supervisor - agents observe, learn & optimize