hedgequantx 2.6.136 → 2.6.138

package/package.json

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

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

@@ -1431,6 +1431,9 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
   // Calculate total qty across all symbols
   const totalQty = contracts.reduce((sum, c) => sum + (c.qty || 1), 0);
   
+  // Baseline P&L captured at session start (to show only THIS session's P&L)
+  let baselineClosedPnl = null; // Will be set on first pnlUpdate
+  
   // Shared stats (same structure as launchAlgo)
   const stats = {
     accountName,
@@ -1441,8 +1444,8 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
     propfirm: account.propfirm || 'Unknown',
     platform: 'RITHMIC',
     pnl: null,
-    openPnl: null,
-    closedPnl: null,
+    openPnl: 0,      // Start at 0 for session
+    closedPnl: 0,    // Start at 0 for session (will show delta from baseline)
     balance: null,
     buyingPower: null,
     margin: null,
@@ -1839,29 +1842,45 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
   // ═══════════════════════════════════════════════════════════════════════════
   // TARGET/RISK CHECK - Stop algo when limits reached
   // Uses SESSION P&L (trades from this HQX session only) + Open P&L
-  // NOT account-wide closedPnl which includes all trades from today
+  // Risk triggers if: closedPnl hits risk OR openPnl hits risk OR total hits risk
   // ═══════════════════════════════════════════════════════════════════════════
   const checkTargetRisk = () => {
     if (!running) return;
     
-    // Session P&L = closed trades from THIS session + current open P&L
-    const sessionTotalPnl = (stats.sessionPnl || 0) + (stats.openPnl || 0);
+    const closedPnl = stats.closedPnl || 0;  // Session closed P&L
+    const openPnl = stats.openPnl || 0;      // Current open P&L
+    const totalPnl = closedPnl + openPnl;    // Total session P&L
     
     // Daily target reached - STOP with profit
-    if (sessionTotalPnl >= dailyTarget) {
+    if (totalPnl >= dailyTarget) {
       stopReason = 'target';
       running = false;
-      algoLogger.info(ui, 'TARGET REACHED', `+$${sessionTotalPnl.toFixed(2)} >= $${dailyTarget}`);
-      ui.addLog('success', `████ DAILY TARGET REACHED: +$${sessionTotalPnl.toFixed(2)} ████`);
-      emergencyStopAll(); // Close all positions
+      algoLogger.info(ui, 'TARGET REACHED', `+$${totalPnl.toFixed(2)} >= $${dailyTarget}`);
+      ui.addLog('success', `████ DAILY TARGET REACHED: +$${totalPnl.toFixed(2)} ████`);
+      emergencyStopAll();
+      return;
     }
+    
     // Max risk reached - STOP to protect capital
-    else if (sessionTotalPnl <= -maxRisk) {
+    // Trigger if: closed P&L hits risk OR open P&L hits risk OR total hits risk
+    if (closedPnl <= -maxRisk) {
       stopReason = 'risk';
       running = false;
-      algoLogger.info(ui, 'MAX RISK HIT', `-$${Math.abs(sessionTotalPnl).toFixed(2)} <= -$${maxRisk}`);
-      ui.addLog('error', `████ MAX RISK REACHED: -$${Math.abs(sessionTotalPnl).toFixed(2)} ████`);
-      emergencyStopAll(); // Close all positions
+      algoLogger.info(ui, 'CLOSED P&L RISK', `Closed: -$${Math.abs(closedPnl).toFixed(2)} <= -$${maxRisk}`);
+      ui.addLog('error', `████ MAX RISK (CLOSED): -$${Math.abs(closedPnl).toFixed(2)} ████`);
+      emergencyStopAll();
+    } else if (openPnl <= -maxRisk) {
+      stopReason = 'risk';
+      running = false;
+      algoLogger.info(ui, 'OPEN P&L RISK', `Open: -$${Math.abs(openPnl).toFixed(2)} <= -$${maxRisk}`);
+      ui.addLog('error', `████ MAX RISK (OPEN): -$${Math.abs(openPnl).toFixed(2)} ████`);
+      emergencyStopAll();
+    } else if (totalPnl <= -maxRisk) {
+      stopReason = 'risk';
+      running = false;
+      algoLogger.info(ui, 'TOTAL P&L RISK', `Total: -$${Math.abs(totalPnl).toFixed(2)} <= -$${maxRisk}`);
+      ui.addLog('error', `████ MAX RISK (TOTAL): -$${Math.abs(totalPnl).toFixed(2)} ████`);
+      emergencyStopAll();
     }
   };
   
@@ -1874,7 +1893,16 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
       if (pnlData.accountId !== rithmicAccountId) return;
       
       if (pnlData.closedPositionPnl !== undefined) {
-        stats.closedPnl = parseFloat(pnlData.closedPositionPnl);
+        const accountClosedPnl = parseFloat(pnlData.closedPositionPnl);
+        
+        // Capture baseline on first update (P&L at session start)
+        if (baselineClosedPnl === null) {
+          baselineClosedPnl = accountClosedPnl;
+          algoLogger.info(ui, 'SESSION START', `Baseline P&L: $${baselineClosedPnl.toFixed(2)}`);
+        }
+        
+        // stats.closedPnl shows ONLY this session's closed P&L (delta from baseline)
+        stats.closedPnl = accountClosedPnl - baselineClosedPnl;
       }
       if (pnlData.accountBalance !== undefined) {
         stats.balance = parseFloat(pnlData.accountBalance);