hedgequantx 2.6.43 → 2.6.45

package/package.json

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

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

@@ -246,6 +246,13 @@ const launchAlgo = async (service, account, contract, config) => {
     propfirm: account.propfirm || 'Unknown',
     platform: connectionType,
     pnl: 0,
+    // R Trader style P&L breakdown
+    openPnl: 0,      // Unrealized P&L (current position)
+    closedPnl: 0,    // Realized P&L (closed trades today)
+    // Position info (like R Trader)
+    position: 0,     // Current position qty (+ long, - short)
+    entryPrice: 0,   // Average entry price
+    lastPrice: 0,    // Last market price
     trades: 0,
     wins: 0,
     losses: 0,
@@ -372,21 +379,39 @@ const launchAlgo = async (service, account, contract, config) => {
     // Only update for our account
     if (pnlData.accountId !== rithmicAccountId) return;
     
-    // Calculate P&L exactly like R Trader: openPositionPnl + closedPositionPnl
-    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);
     
-    // R Trader "Today's P&L" = unrealized + realized
-    stats.pnl = openPnl + closedPnl;
+    // 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);
   });
   
-  // Also listen to position updates for real-time position tracking
+  // 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;
     
-    // Update current position from WebSocket
+    // Update position info (like R Trader Positions panel)
+    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
@@ -624,6 +649,9 @@ const launchAlgo = async (service, account, contract, config) => {
       timestamp: tick.timestamp || Date.now()
     };
     
+    // Update last price for UI (like R Trader)
+    stats.lastPrice = tickData.price;
+    
     // Feed tick to AI supervisor (agents observe same data as strategy)
     if (stats.aiSupervision) {
       StrategySupervisor.feedTick(tickData);

package/src/pages/algo/ui.js

@@ -182,35 +182,57 @@ class AlgoUI {
     
     this._line(chalk.cyan(GM));
     
-    // Row 2: Qty | P&L
-    const r2c1 = buildCell('QTY', (stats.qty || '1').toString(), chalk.cyan, colL);
+    // Row 2: Position | P&L (like R Trader)
+    const posQty = stats.position || 0;
+    const posStr = posQty === 0 ? 'FLAT' : (posQty > 0 ? `+${posQty} LONG` : `${posQty} SHORT`);
+    const posColor = posQty === 0 ? chalk.gray : (posQty > 0 ? chalk.green : chalk.red);
+    const r2c1 = buildCell('POSITION', posStr, posColor, colL);
     const r2c2 = buildCell('P&L', pnlStr, pnlColor, colR);
     row(r2c1.padded, r2c2.padded);
     
     this._line(chalk.cyan(GM));
     
-    // Row 3: Target | Risk
+    // Row 3: Open P&L | Closed P&L (R Trader style breakdown)
+    // Data from Rithmic PNL_PLANT WebSocket - show '--' if null (no data from API)
+    const openPnl = stats.openPnl;
+    const closedPnl = stats.closedPnl;
+    const openPnlStr = openPnl === null || openPnl === undefined 
+      ? '--' 
+      : (openPnl >= 0 ? `+$${openPnl.toFixed(2)}` : `-$${Math.abs(openPnl).toFixed(2)}`);
+    const closedPnlStr = closedPnl === null || closedPnl === undefined 
+      ? '--' 
+      : (closedPnl >= 0 ? `+$${closedPnl.toFixed(2)}` : `-$${Math.abs(closedPnl).toFixed(2)}`);
+    const openPnlColor = (openPnl || 0) >= 0 ? chalk.green : chalk.red;
+    const closedPnlColor = (closedPnl || 0) >= 0 ? chalk.green : chalk.red;
+    const r3c1 = buildCell('OPEN P&L', openPnlStr, openPnlColor, colL);
+    const r3c2 = buildCell('CLOSED P&L', closedPnlStr, closedPnlColor, colR);
+    row(r3c1.padded, r3c2.padded);
+    
+    this._line(chalk.cyan(GM));
+    
+    // Row 4: Target | Risk
     const targetStr = stats.target !== null && stats.target !== undefined ? '$' + stats.target.toFixed(2) : '--';
     const riskStr = stats.risk !== null && stats.risk !== undefined ? '$' + stats.risk.toFixed(2) : '--';
-    const r3c1 = buildCell('TARGET', targetStr, chalk.green, colL);
-    const r3c2 = buildCell('RISK', riskStr, chalk.red, colR);
-    row(r3c1.padded, r3c2.padded);
+    const r4c1 = buildCell('TARGET', targetStr, chalk.green, colL);
+    const r4c2 = buildCell('RISK', riskStr, chalk.red, colR);
+    row(r4c1.padded, r4c2.padded);
     
     this._line(chalk.cyan(GM));
     
-    // Row 4: Trades | Latency (API response time) - UPPERCASE BOLD
-    const r4c1t = ` ${chalk.bold('TRADES')}: ${chalk.cyan.bold(stats.trades || 0)}  ${chalk.bold('W/L')}: ${chalk.green.bold(stats.wins || 0)}/${chalk.red.bold(stats.losses || 0)}`;
-    const r4c1p = ` TRADES: ${stats.trades || 0}  W/L: ${stats.wins || 0}/${stats.losses || 0}`;
-    const r4c2 = buildCell('LATENCY', `${stats.latency || 0}MS`, latencyColor, colR);
-    row(r4c1t + pad(colL - r4c1p.length), r4c2.padded);
+    // Row 5: Trades W/L | Entry Price (if in position)
+    const r5c1t = ` ${chalk.bold('TRADES')}: ${chalk.cyan.bold(stats.trades || 0)}  ${chalk.bold('W/L')}: ${chalk.green.bold(stats.wins || 0)}/${chalk.red.bold(stats.losses || 0)}`;
+    const r5c1p = ` TRADES: ${stats.trades || 0}  W/L: ${stats.wins || 0}/${stats.losses || 0}`;
+    const entryStr = stats.entryPrice > 0 ? stats.entryPrice.toFixed(2) : '--';
+    const r5c2 = buildCell('ENTRY', entryStr, chalk.yellow, colR);
+    row(r5c1t + pad(colL - r5c1p.length), r5c2.padded);
     
     this._line(chalk.cyan(GM));
     
-    // Row 5: Connection | Propfirm
+    // Row 6: Connection | Propfirm
     const connection = stats.platform || 'ProjectX';
-    const r5c1 = buildCell('CONNECTION', connection, chalk.cyan, colL);
-    const r5c2 = buildCell('PROPFIRM', stats.propfirm || 'N/A', chalk.cyan, colR);
-    row(r5c1.padded, r5c2.padded);
+    const r6c1 = buildCell('CONNECTION', connection, chalk.cyan, colL);
+    const r6c2 = buildCell('PROPFIRM', stats.propfirm || 'N/A', chalk.cyan, colR);
+    row(r6c1.padded, r6c2.padded);
     
     this._line(chalk.cyan(GB));
   }