hedgequantx 2.6.83 → 2.6.84

package/package.json

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

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

@@ -1023,20 +1023,52 @@ const launchAlgo = async (service, account, contract, config) => {
   clearInterval(pnlInterval);
   
   // EMERGENCY STOP: Cancel all orders and flatten all positions
-  if (useFastPath && service && account.rithmicAccountId) {
-    try {
-      ui.addLog('warning', 'EMERGENCY STOP - Cancelling orders & flattening positions...');
-      const stopResult = await service.emergencyStop(account.rithmicAccountId);
-      if (stopResult.success) {
-        ui.addLog('success', 'All orders cancelled, positions flattened');
-      } else {
-        ui.addLog('error', 'Emergency stop partial - check positions manually');
+  // 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)`);
       }
-    } catch (e) {
-      ui.addLog('error', `Emergency stop failed: ${e.message}`);
+    } 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();