hedgequantx 2.6.84 → 2.6.85

package/package.json

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

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

@@ -986,17 +986,163 @@ const launchAlgo = async (service, account, contract, config) => {
   const pnlInterval = setInterval(() => { if (running) pollPnL(); }, 10000);
   pollPnL(); // Initial poll
   
+  // ═══════════════════════════════════════════════════════════════════════════
+  // ULTRA SOLID EMERGENCY STOP FUNCTION
+  // Called when X is pressed - MUST cancel all orders and flatten positions
+  // ═══════════════════════════════════════════════════════════════════════════
+  const emergencyStopAll = async () => {
+    const accountId = account.rithmicAccountId || account.accountId;
+    const MAX_RETRIES = 3;
+    const TIMEOUT_MS = 5000;
+    
+    ui.addLog('warning', '████ EMERGENCY STOP INITIATED ████');
+    ui.render(stats);
+    
+    // Helper: run with timeout
+    const withTimeout = (promise, ms) => Promise.race([
+      promise,
+      new Promise((_, reject) => setTimeout(() => reject(new Error('TIMEOUT')), ms))
+    ]);
+    
+    // ─────────────────────────────────────────────────────────────────────────
+    // STEP 1: CANCEL ALL ORDERS (with retries)
+    // ─────────────────────────────────────────────────────────────────────────
+    for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
+      try {
+        ui.addLog('info', `[${attempt}/${MAX_RETRIES}] Cancelling all orders...`);
+        ui.render(stats);
+        
+        if (typeof service.cancelAllOrders === 'function') {
+          await withTimeout(service.cancelAllOrders(accountId), TIMEOUT_MS);
+          ui.addLog('success', 'All orders cancelled');
+          ui.render(stats);
+          break;
+        } else {
+          ui.addLog('info', 'No cancelAllOrders function - skipping');
+          break;
+        }
+      } catch (e) {
+        ui.addLog('error', `Cancel orders attempt ${attempt} failed: ${e.message}`);
+        ui.render(stats);
+        if (attempt === MAX_RETRIES) {
+          ui.addLog('error', 'FAILED TO CANCEL ORDERS AFTER 3 ATTEMPTS');
+        }
+        await new Promise(r => setTimeout(r, 500)); // Wait before retry
+      }
+    }
+    
+    // ─────────────────────────────────────────────────────────────────────────
+    // STEP 2: FLATTEN POSITION (with retries)
+    // ─────────────────────────────────────────────────────────────────────────
+    const posQty = Math.abs(currentPosition || stats.position || 0);
+    
+    if (posQty > 0) {
+      const closeSide = (currentPosition || stats.position) > 0 ? 1 : 0;
+      const sideStr = closeSide === 1 ? 'SELL' : 'BUY';
+      
+      for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
+        try {
+          ui.addLog('info', `[${attempt}/${MAX_RETRIES}] Flattening ${posQty}x position (${sideStr})...`);
+          ui.render(stats);
+          
+          // Method 1: Rithmic emergencyStop (best)
+          if (typeof service.emergencyStop === 'function') {
+            const result = await withTimeout(service.emergencyStop(accountId), TIMEOUT_MS);
+            if (result.success) {
+              ui.addLog('success', 'Position FLATTENED (Rithmic emergency stop)');
+              ui.render(stats);
+              break;
+            }
+          }
+          
+          // Method 2: Market order to close
+          if (typeof service.placeOrder === 'function') {
+            await withTimeout(service.placeOrder({
+              accountId: account.accountId,
+              contractId: contractId,
+              type: 2, // Market order
+              side: closeSide,
+              size: posQty
+            }), TIMEOUT_MS);
+            ui.addLog('success', `Position FLATTENED (market ${sideStr} ${posQty}x)`);
+            ui.render(stats);
+            break;
+          }
+          
+          // Method 3: Rithmic fastExit
+          if (typeof service.fastExit === 'function') {
+            await withTimeout(service.fastExit({
+              accountId: accountId,
+              symbol: symbolName,
+              exchange: contract.exchange || 'CME',
+              size: posQty,
+              side: closeSide
+            }), TIMEOUT_MS);
+            ui.addLog('success', `Position FLATTENED (fast exit ${sideStr} ${posQty}x)`);
+            ui.render(stats);
+            break;
+          }
+          
+        } catch (e) {
+          ui.addLog('error', `Flatten attempt ${attempt} failed: ${e.message}`);
+          ui.render(stats);
+          if (attempt === MAX_RETRIES) {
+            ui.addLog('error', '████ FAILED TO FLATTEN - CHECK MANUALLY! ████');
+          }
+          await new Promise(r => setTimeout(r, 500));
+        }
+      }
+    } else {
+      ui.addLog('success', 'No position to flatten - clean exit');
+      ui.render(stats);
+    }
+    
+    // ─────────────────────────────────────────────────────────────────────────
+    // STEP 3: VERIFY (optional - check position is actually flat)
+    // ─────────────────────────────────────────────────────────────────────────
+    try {
+      if (typeof service.getPositions === 'function') {
+        const posResult = await withTimeout(service.getPositions(account.accountId), 3000);
+        if (posResult.success && posResult.positions) {
+          const stillOpen = posResult.positions.find(p => {
+            const sym = p.contractId || p.symbol || '';
+            return (sym.includes(symbolName) || sym.includes(contractId)) && p.quantity !== 0;
+          });
+          if (stillOpen) {
+            ui.addLog('error', `████ POSITION STILL OPEN: ${stillOpen.quantity}x ████`);
+            ui.addLog('error', 'CLOSE MANUALLY IN R TRADER!');
+          } else {
+            ui.addLog('success', 'VERIFIED: Position is flat');
+          }
+        }
+      }
+    } catch (e) {
+      // Verification failed, but main stop was attempted
+      ui.addLog('warning', 'Could not verify position - check manually');
+    }
+    
+    ui.addLog('info', '════════════════════════════════════');
+    ui.render(stats);
+  };
+  
   // Keyboard handler
+  let emergencyStopInProgress = false;
+  
   const setupKeyHandler = () => {
     if (!process.stdin.isTTY) return;
     readline.emitKeypressEvents(process.stdin);
     process.stdin.setRawMode(true);
     process.stdin.resume();
     
-    const onKey = (str, key) => {
+    const onKey = async (str, key) => {
       if (key && (key.name === 'x' || key.name === 'X' || (key.ctrl && key.name === 'c'))) {
+        if (emergencyStopInProgress) return; // Prevent double-trigger
+        emergencyStopInProgress = true;
         running = false;
         stopReason = 'manual';
+        
+        // Run emergency stop IMMEDIATELY on keypress (don't wait for main loop)
+        await emergencyStopAll();
       }
     };
     process.stdin.on('keypress', onKey);
@@ -1022,53 +1168,6 @@ const launchAlgo = async (service, account, contract, config) => {
   clearInterval(refreshInterval);
   clearInterval(pnlInterval);
   
-  // EMERGENCY STOP: Cancel all orders and flatten all positions
-  // Works for BOTH Rithmic (fast path) and ProjectX (slow path)
-  ui.addLog('warning', 'STOPPING - Cancelling orders & flattening positions...');
-  ui.render(stats); // Force render to show message
-  
-  try {
-    const accountId = account.rithmicAccountId || account.accountId;
-    
-    // 1. Cancel ALL open orders first
-    if (typeof service.cancelAllOrders === 'function') {
-      await service.cancelAllOrders(accountId);
-      ui.addLog('info', 'All orders cancelled');
-    }
-    
-    // 2. Flatten position if we have one
-    if (currentPosition !== 0 || stats.position !== 0) {
-      const posQty = Math.abs(currentPosition || stats.position);
-      const closeSide = (currentPosition || stats.position) > 0 ? 1 : 0; // 1=Sell to close long, 0=Buy to close short
-      
-      // Try emergency stop first (Rithmic)
-      if (typeof service.emergencyStop === 'function') {
-        const stopResult = await service.emergencyStop(accountId);
-        if (stopResult.success) {
-          ui.addLog('success', 'Position flattened (emergency stop)');
-        }
-      } 
-      // Fallback: place market order to close (ProjectX)
-      else if (typeof service.placeOrder === 'function') {
-        await service.placeOrder({
-          accountId: account.accountId,
-          contractId: contractId,
-          type: 2, // Market order
-          side: closeSide,
-          size: posQty
-        });
-        ui.addLog('success', `Position flattened (market order ${posQty}x)`);
-      }
-    } else {
-      ui.addLog('success', 'No open position - clean exit');
-    }
-  } catch (e) {
-    ui.addLog('error', `Emergency stop error: ${e.message}`);
-    ui.addLog('warning', 'CHECK POSITIONS MANUALLY!');
-  }
-  
-  ui.render(stats); // Force render to show final status
-  
   // Stop Position Manager (fast path)
   if (positionManager) {
     positionManager.stop();