hedgequantx 2.6.146 → 2.6.148

package/package.json

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

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

@@ -2009,33 +2009,94 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
   }
   
   // ═══════════════════════════════════════════════════════════════════════════
-  // EMERGENCY STOP
+  // EMERGENCY STOP - Force close ALL positions
   // ═══════════════════════════════════════════════════════════════════════════
   const emergencyStopAll = async () => {
-    ui.addLog('warning', '████ EMERGENCY STOP ████');
+    ui.addLog('warning', '████ EMERGENCY STOP INITIATED ████');
+    ui.render(stats);
+    
+    const TIMEOUT_MS = 5000;
+    const withTimeout = (promise, ms) => Promise.race([
+      promise,
+      new Promise((_, reject) => setTimeout(() => reject(new Error('TIMEOUT')), ms))
+    ]);
     
     try {
-      // Use Rithmic emergencyStop to flatten all positions with timeout
-      const stopPromise = (async () => {
+      // Step 1: Cancel all pending orders
+      ui.addLog('info', 'Cancelling all orders...');
+      ui.render(stats);
+      try {
+        if (service && typeof service.cancelAllOrders === 'function') {
+          await withTimeout(service.cancelAllOrders(rithmicAccountId), TIMEOUT_MS);
+        }
+      } catch (e) {
+        ui.addLog('warning', `Cancel orders: ${e.message}`);
+      }
+      
+      // Step 2: Force close each symbol's position via fastExit
+      ui.addLog('info', 'Closing all positions...');
+      ui.render(stats);
+      
+      for (const [symbolName, symStats] of Object.entries(stats.symbolStats)) {
+        // Get position from positionManager (more reliable than stats)
+        const pm = positionManagers[symbolName];
+        const pmPosition = pm?.currentPosition;
+        
+        // Use PM position if available, otherwise fallback to stats
+        let posQty = 0;
+        let closeSide = 0;
+        
+        if (pmPosition && pmPosition.size > 0) {
+          posQty = pmPosition.size;
+          closeSide = pmPosition.side === 0 ? 1 : 0; // Sell if long (0), Buy if short (1)
+        } else if (symStats.position && symStats.position !== 0) {
+          // Fallback: use stats but sanitize the value
+          posQty = Math.min(Math.abs(Number(symStats.position) || 0), 10); // Max 10 contracts safety
+          if (posQty === 0) posQty = 1; // Default to 1 if we think there's a position
+          closeSide = symStats.position > 0 ? 1 : 0;
+        }
+        
+        if (posQty === 0) continue;
+        
+        const sideStr = closeSide === 1 ? 'SELL' : 'BUY';
+        
+        ui.addLog('info', `Closing [${symbolName}] ${sideStr} ${posQty}x...`);
+        ui.render(stats);
+        
+        try {
+          // Try fastExit first (fastest)
+          if (service && typeof service.fastExit === 'function') {
+            const result = await withTimeout(service.fastExit({
+              accountId: rithmicAccountId,
+              symbol: symbolName,
+              exchange: contractInfoMap[symbolName]?.exchange || 'CME',
+              size: posQty,
+              side: closeSide,
+            }), TIMEOUT_MS);
+            
+            if (result.success) {
+              ui.addLog('success', `[${symbolName}] FLATTENED`);
+              symStats.position = 0;
+            } else {
+              ui.addLog('error', `[${symbolName}] Exit failed: ${result.error}`);
+            }
+          }
+        } catch (e) {
+          ui.addLog('error', `[${symbolName}] Exit error: ${e.message}`);
+        }
+      }
+      
+      // Step 3: Fallback - call service.emergencyStop for any remaining
+      try {
         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');
+          await withTimeout(service.emergencyStop(rithmicAccountId), TIMEOUT_MS);
         }
-      })();
+      } catch (e) {
+        // Silent - already tried individual closes
+      }
       
-      // Timeout after 3 seconds
-      const timeoutPromise = new Promise(resolve => setTimeout(() => {
-        ui.addLog('warning', 'Emergency stop timeout - proceeding to summary');
-        resolve();
-      }, 3000));
+      ui.addLog('success', '████ EMERGENCY STOP COMPLETE ████');
       
-      await Promise.race([stopPromise, timeoutPromise]);
     } catch (e) {
       ui.addLog('error', `Emergency stop error: ${e.message}`);
     }