hedgequantx 2.6.130 → 2.6.131

package/package.json

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

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

@@ -1477,6 +1477,7 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
       wins: 0, 
       losses: 0, 
       pnl: 0,
+      openPnl: 0, // Per-symbol unrealized P&L
       tickCount: 0,
     };
   });
@@ -1504,6 +1505,7 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
   const positionManagers = {};
   const strategies = {};
   const pendingOrders = {}; // Track pending orders per symbol
+  const disabledSymbols = new Set(); // Symbols disabled after SL hit
   
   contracts.forEach(contract => {
     const symbolName = contract.name || contract.symbol;
@@ -1577,6 +1579,11 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
           stats.losses++;
           stats.symbolStats[symbolName].losses++;
           ui.addLog('loss', `[${symbolName}] -$${Math.abs(pnlDollars).toFixed(2)} @ ${exitPrice} | ${holdSec}s`);
+          
+          // Disable symbol after loss (SL hit) - other symbols continue
+          disabledSymbols.add(symbolName);
+          ui.addLog('warning', `[${symbolName}] DISABLED - SL hit, other symbols continue`);
+          stats.activeSymbols = contracts.length - disabledSymbols.size;
         }
       } else if (pnlTicks !== null) {
         // Log with ticks only
@@ -1590,9 +1597,17 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
           stats.losses++;
           stats.symbolStats[symbolName].losses++;
           ui.addLog('loss', `[${symbolName}] ${pnlTicks} ticks | ${holdSec}s`);
+          
+          // Disable symbol after loss (SL hit) - other symbols continue
+          disabledSymbols.add(symbolName);
+          ui.addLog('warning', `[${symbolName}] DISABLED - SL hit, other symbols continue`);
+          stats.activeSymbols = contracts.length - disabledSymbols.size;
         }
       }
       stats.symbolStats[symbolName].position = 0;
+      stats.symbolStats[symbolName].openPnl = 0; // Reset open P&L when position closed
+      // Recalculate total Open P&L
+      stats.openPnl = Object.values(stats.symbolStats).reduce((sum, s) => sum + (s.openPnl || 0), 0);
       pendingOrders[symbolName] = false;
       ui.render(stats);
     });
@@ -1610,6 +1625,7 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
     // ═══════════════════════════════════════════════════════════════════════
     strategy.on('signal', async (signal) => {
       if (!running) return;
+      if (disabledSymbols.has(symbolName)) return; // Skip disabled symbols (SL hit)
       if (pendingOrders[symbolName]) return;
       if (!pm.canEnter(symbolName)) return;
       
@@ -1773,6 +1789,32 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
     algoLogger.error(ui, 'CONNECTION ERROR', e.message);
   }
   
+  // ═══════════════════════════════════════════════════════════════════════════
+  // TARGET/RISK CHECK - Stop algo when limits reached
+  // ═══════════════════════════════════════════════════════════════════════════
+  const checkTargetRisk = () => {
+    if (!running) return;
+    
+    const totalPnl = (stats.openPnl || 0) + (stats.closedPnl || 0);
+    
+    // Daily target reached - STOP with profit
+    if (totalPnl >= dailyTarget) {
+      stopReason = 'target';
+      running = false;
+      algoLogger.info(ui, 'TARGET REACHED', `+$${totalPnl.toFixed(2)} >= $${dailyTarget}`);
+      ui.addLog('success', `████ DAILY TARGET REACHED: +$${totalPnl.toFixed(2)} ████`);
+      emergencyStopAll(); // Close all positions
+    }
+    // Max risk reached - STOP to protect capital
+    else if (totalPnl <= -maxRisk) {
+      stopReason = 'risk';
+      running = false;
+      algoLogger.info(ui, 'MAX RISK HIT', `-$${Math.abs(totalPnl).toFixed(2)} <= -$${maxRisk}`);
+      ui.addLog('error', `████ MAX RISK REACHED: -$${Math.abs(totalPnl).toFixed(2)} ████`);
+      emergencyStopAll(); // Close all positions
+    }
+  };
+  
   // ═══════════════════════════════════════════════════════════════════════════
   // REAL-TIME P&L VIA WEBSOCKET (same as launchAlgo)
   // ═══════════════════════════════════════════════════════════════════════════
@@ -1800,10 +1842,14 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
       }
       
       stats.pnl = (stats.openPnl || 0) + (stats.closedPnl || 0);
+      
+      // Check target/risk on every P&L update
+      checkTargetRisk();
+      
       ui.render(stats);
     });
     
-    // Position-level updates (for Open P&L)
+    // Position-level updates (for Open P&L per symbol)
     service.on('positionUpdate', (pos) => {
       if (!pos || pos.accountId !== rithmicAccountId) return;
       
@@ -1813,14 +1859,20 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
         if (posSymbol === baseSymbol || posSymbol === symbolName || symbolName.startsWith(posSymbol)) {
           stats.symbolStats[symbolName].position = pos.quantity || 0;
           
-          // Update Open P&L from position
+          // Update Open P&L for this symbol
           if (pos.openPnl !== undefined && pos.openPnl !== null) {
-            stats.openPnl = pos.openPnl;
+            stats.symbolStats[symbolName].openPnl = pos.openPnl;
+            
+            // Calculate total Open P&L from all symbols
+            stats.openPnl = Object.values(stats.symbolStats).reduce((sum, s) => sum + (s.openPnl || 0), 0);
             stats.pnl = (stats.openPnl || 0) + (stats.closedPnl || 0);
             
             if (stats.balance !== null) {
               stats.netLiquidation = stats.balance + stats.openPnl;
             }
+            
+            // Check target/risk on Open P&L changes too
+            checkTargetRisk();
           }
           break;
         }