hedgequantx 2.6.149 → 2.6.150

package/package.json

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

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

@@ -2022,78 +2022,58 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
     ]);
     
     try {
-      // Step 1: Cancel all pending orders
+      // CRITICAL: Use ONLY Rithmic API to get REAL positions from exchange
+      // DO NOT use local stats which can be corrupted
+      
+      // Step 1: Cancel all pending orders first
       ui.addLog('info', 'Cancelling all orders...');
       ui.render(stats);
       try {
         if (service && typeof service.cancelAllOrders === 'function') {
           await withTimeout(service.cancelAllOrders(rithmicAccountId), TIMEOUT_MS);
+          ui.addLog('success', 'All orders cancelled');
         }
       } 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...');
+      // Step 2: Use Rithmic flattenAll - reads REAL positions from exchange
+      ui.addLog('info', 'Flattening all positions via Rithmic API...');
       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}`);
+      try {
+        if (service && typeof service.flattenAll === 'function') {
+          const result = await withTimeout(service.flattenAll(rithmicAccountId), TIMEOUT_MS);
+          if (result && result.results) {
+            for (const r of result.results) {
+              if (r.success) {
+                ui.addLog('success', `[${r.symbol}] FLATTENED`);
+              } else {
+                ui.addLog('error', `[${r.symbol}] ${r.error || 'Failed'}`);
+              }
             }
           }
-        } catch (e) {
-          ui.addLog('error', `[${symbolName}] Exit error: ${e.message}`);
+          ui.addLog('success', 'Flatten all complete');
+        } else if (service && typeof service.emergencyStop === 'function') {
+          // Fallback to emergencyStop
+          await withTimeout(service.emergencyStop(rithmicAccountId), TIMEOUT_MS);
+          ui.addLog('success', 'Emergency stop complete');
         }
+      } catch (e) {
+        ui.addLog('warning', `Flatten: ${e.message}`);
       }
       
-      // Step 3: Fallback - call service.emergencyStop for any remaining
-      try {
-        if (service && typeof service.emergencyStop === 'function') {
-          await withTimeout(service.emergencyStop(rithmicAccountId), TIMEOUT_MS);
+      // Step 3: Reset local state
+      for (const [symbolName, symStats] of Object.entries(stats.symbolStats)) {
+        symStats.position = 0;
+        symStats.openPnl = 0;
+        // Also reset position manager
+        const pm = positionManagers[symbolName];
+        if (pm) {
+          try { pm.reset?.(); } catch {}
         }
-      } catch (e) {
-        // Silent - already tried individual closes
       }
+      stats.openPnl = 0;
       
       ui.addLog('success', '████ EMERGENCY STOP COMPLETE ████');