hedgequantx 2.6.142 → 2.6.144

package/package.json

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

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

@@ -1528,7 +1528,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
+  // No disabled symbols - all symbols can trade until Target/Risk reached
   
   contracts.forEach(contract => {
     const symbolName = contract.name || contract.symbol;
@@ -1602,11 +1602,7 @@ 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;
+          // Symbol can trade again - no disable, continue until Target/Risk reached
         }
       } else if (pnlTicks !== null) {
         // Log with ticks only
@@ -1620,20 +1616,7 @@ 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);
-          stats.activeSymbols = contracts.length - disabledSymbols.size;
-          
-          // Check if ALL symbols are now disabled → stop algo
-          if (disabledSymbols.size >= contracts.length) {
-            ui.addLog('warning', `[${symbolName}] DISABLED - All symbols stopped`);
-            ui.addLog('info', '████ ALL SYMBOLS DISABLED - Session complete ████');
-            stopReason = 'all_disabled';
-            running = false;
-          } else {
-            ui.addLog('warning', `[${symbolName}] DISABLED - SL hit, ${stats.activeSymbols} symbols remaining`);
-          }
+          // Symbol can trade again - no disable, continue until Target/Risk reached
         }
       }
       stats.symbolStats[symbolName].position = 0;
@@ -1657,7 +1640,6 @@ 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;
       
@@ -1943,7 +1925,7 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
         // 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)}`);
+          // Baseline captured silently - no need to show to user
         }
         
         // stats.closedPnl shows ONLY this session's closed P&L (delta from baseline)
@@ -2011,20 +1993,27 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
     ui.addLog('warning', '████ EMERGENCY STOP ████');
     
     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') {
+      // Use Rithmic emergencyStop to flatten all positions with timeout
+      const stopPromise = (async () => {
+        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 if (service && typeof service.cancelAllOrders === 'function') {
           await service.cancelAllOrders(rithmicAccountId);
           ui.addLog('info', 'All orders cancelled');
         }
-      }
+      })();
+      
+      // Timeout after 3 seconds
+      const timeoutPromise = new Promise(resolve => setTimeout(() => {
+        ui.addLog('warning', 'Emergency stop timeout - proceeding to summary');
+        resolve();
+      }, 3000));
+      
+      await Promise.race([stopPromise, timeoutPromise]);
     } catch (e) {
       ui.addLog('error', `Emergency stop error: ${e.message}`);
     }
@@ -2084,8 +2073,12 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
     try { pm.stop(); } catch {}
   }
   
-  // Disconnect market feed
-  try { await marketFeed.disconnect(); } catch {}
+  // Disconnect market feed with timeout
+  try { 
+    const disconnectPromise = marketFeed.disconnect();
+    const timeoutPromise = new Promise(resolve => setTimeout(resolve, 2000));
+    await Promise.race([disconnectPromise, timeoutPromise]);
+  } catch {}
   
   // Cleanup keyboard
   try { if (cleanupKeys) cleanupKeys(); } catch {}