hedgequantx 2.6.134 → 2.6.136

package/package.json

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

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

@@ -1838,26 +1838,29 @@ 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
   // ═══════════════════════════════════════════════════════════════════════════
   const checkTargetRisk = () => {
     if (!running) return;
     
-    const totalPnl = (stats.openPnl || 0) + (stats.closedPnl || 0);
+    // Session P&L = closed trades from THIS session + current open P&L
+    const sessionTotalPnl = (stats.sessionPnl || 0) + (stats.openPnl || 0);
     
     // Daily target reached - STOP with profit
-    if (totalPnl >= dailyTarget) {
+    if (sessionTotalPnl >= dailyTarget) {
       stopReason = 'target';
       running = false;
-      algoLogger.info(ui, 'TARGET REACHED', `+$${totalPnl.toFixed(2)} >= $${dailyTarget}`);
-      ui.addLog('success', `████ DAILY TARGET REACHED: +$${totalPnl.toFixed(2)} ████`);
+      algoLogger.info(ui, 'TARGET REACHED', `+$${sessionTotalPnl.toFixed(2)} >= $${dailyTarget}`);
+      ui.addLog('success', `████ DAILY TARGET REACHED: +$${sessionTotalPnl.toFixed(2)} ████`);
       emergencyStopAll(); // Close all positions
     }
     // Max risk reached - STOP to protect capital
-    else if (totalPnl <= -maxRisk) {
+    else if (sessionTotalPnl <= -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)} ████`);
+      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
     }
   };
@@ -1934,19 +1937,25 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
   const emergencyStopAll = async () => {
     ui.addLog('warning', '████ EMERGENCY STOP ████');
     
-    // Close all positions
-    for (const [symbolName, pm] of Object.entries(positionManagers)) {
-      try {
-        if (pm.hasPosition(symbolName)) {
-          pm.closePosition(symbolName);
-          ui.addLog('info', `[${symbolName}] Closing position...`);
+    try {
+      // Use Rithmic emergencyStop to flatten all positions
+      if (service && typeof service.emergencyStop === 'function') {
+        await service.emergencyStop(rithmicAccountId);
+        ui.addLog('info', 'Emergency stop executed - all positions flattened');
+      } else if (service && typeof service.flattenAll === 'function') {
+        await service.flattenAll(rithmicAccountId);
+        ui.addLog('info', 'Flatten all executed - all positions closed');
+      } else {
+        // Fallback: cancel all orders
+        if (service && typeof service.cancelAllOrders === 'function') {
+          await service.cancelAllOrders(rithmicAccountId);
+          ui.addLog('info', 'All orders cancelled');
         }
-      } catch (e) {
-        ui.addLog('error', `[${symbolName}] Close failed: ${e.message}`);
       }
+    } catch (e) {
+      ui.addLog('error', `Emergency stop error: ${e.message}`);
     }
     
-    ui.addLog('info', 'All close orders sent');
     ui.render(stats);
   };