hedgequantx 2.6.137 → 2.6.139

package/package.json

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

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

@@ -1416,11 +1416,13 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
     : 'HQX *****';
   const rithmicAccountId = account.rithmicAccountId || account.accountId;
   
-  // Build symbols string for UI (with quantities)
+  // Build symbols string for UI (clean names without X1 suffix, show qty only if > 1)
   const symbolsDisplay = contracts.map(c => {
-    const name = c.name || c.symbol;
+    let name = c.name || c.symbol;
+    // Remove X1, X2 suffix (Rithmic internal suffixes)
+    name = name.replace(/X\d+$/, '');
     const qty = c.qty || 1;
-    return `${name}x${qty}`;
+    return qty > 1 ? `${name}x${qty}` : name;
   }).join(', ');
   
   const ui = new AlgoUI({ 
@@ -1502,6 +1504,22 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
     };
   });
   
+  // ═══════════════════════════════════════════════════════════════════════════
+  // AI SUPERVISOR INITIALIZATION (same as single-symbol)
+  // ═══════════════════════════════════════════════════════════════════════════
+  let aiAgentCount = 0;
+  if (enableAI) {
+    const aiAgents = aiService.getAgents();
+    aiAgentCount = aiAgents.length;
+    stats.agentCount = aiAgentCount;
+    if (aiAgents.length > 0) {
+      // Use first symbol's strategy for AI supervisor
+      const firstContract = contracts[0];
+      const firstSymbolName = firstContract.name || firstContract.symbol;
+      // Strategy will be created below, so we init supervisor after strategies
+    }
+  }
+  
   // ═══════════════════════════════════════════════════════════════════════════
   // POSITION MANAGERS & STRATEGIES - One per symbol
   // ═══════════════════════════════════════════════════════════════════════════
@@ -1675,6 +1693,22 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
     });
   });
   
+  // ═══════════════════════════════════════════════════════════════════════════
+  // AI SUPERVISOR - Initialize after strategies are created
+  // ═══════════════════════════════════════════════════════════════════════════
+  if (enableAI && aiAgentCount > 0) {
+    const aiAgents = aiService.getAgents();
+    const firstSymbol = Object.keys(strategies)[0];
+    const firstStrategy = strategies[firstSymbol];
+    const supervisorResult = StrategySupervisor.initialize(firstStrategy, aiAgents, service, rithmicAccountId);
+    stats.aiSupervision = supervisorResult.success;
+    stats.aiMode = supervisorResult.mode;
+    
+    if (stats.aiSupervision) {
+      algoLogger.info(ui, 'AI SUPERVISION', `${aiAgentCount} agent(s) - ${stats.aiMode} mode - LEARNING ACTIVE`);
+    }
+  }
+  
   // ═══════════════════════════════════════════════════════════════════════════
   // MARKET DATA FEED - Single connection, multiple subscriptions
   // ═══════════════════════════════════════════════════════════════════════════
@@ -1842,29 +1876,45 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
   // ═══════════════════════════════════════════════════════════════════════════
   // TARGET/RISK CHECK - Stop algo when limits reached
   // Uses SESSION P&L (trades from this HQX session only) + Open P&L
-  // NOT account-wide closedPnl which includes all trades from today
+  // Risk triggers if: closedPnl hits risk OR openPnl hits risk OR total hits risk
   // ═══════════════════════════════════════════════════════════════════════════
   const checkTargetRisk = () => {
     if (!running) return;
     
-    // Session P&L = closed trades from THIS session + current open P&L
-    const sessionTotalPnl = (stats.sessionPnl || 0) + (stats.openPnl || 0);
+    const closedPnl = stats.closedPnl || 0;  // Session closed P&L
+    const openPnl = stats.openPnl || 0;      // Current open P&L
+    const totalPnl = closedPnl + openPnl;    // Total session P&L
     
     // Daily target reached - STOP with profit
-    if (sessionTotalPnl >= dailyTarget) {
+    if (totalPnl >= dailyTarget) {
       stopReason = 'target';
       running = false;
-      algoLogger.info(ui, 'TARGET REACHED', `+$${sessionTotalPnl.toFixed(2)} >= $${dailyTarget}`);
-      ui.addLog('success', `████ DAILY TARGET REACHED: +$${sessionTotalPnl.toFixed(2)} ████`);
-      emergencyStopAll(); // Close all positions
+      algoLogger.info(ui, 'TARGET REACHED', `+$${totalPnl.toFixed(2)} >= $${dailyTarget}`);
+      ui.addLog('success', `████ DAILY TARGET REACHED: +$${totalPnl.toFixed(2)} ████`);
+      emergencyStopAll();
+      return;
     }
+    
     // Max risk reached - STOP to protect capital
-    else if (sessionTotalPnl <= -maxRisk) {
+    // Trigger if: closed P&L hits risk OR open P&L hits risk OR total hits risk
+    if (closedPnl <= -maxRisk) {
+      stopReason = 'risk';
+      running = false;
+      algoLogger.info(ui, 'CLOSED P&L RISK', `Closed: -$${Math.abs(closedPnl).toFixed(2)} <= -$${maxRisk}`);
+      ui.addLog('error', `████ MAX RISK (CLOSED): -$${Math.abs(closedPnl).toFixed(2)} ████`);
+      emergencyStopAll();
+    } else if (openPnl <= -maxRisk) {
+      stopReason = 'risk';
+      running = false;
+      algoLogger.info(ui, 'OPEN P&L RISK', `Open: -$${Math.abs(openPnl).toFixed(2)} <= -$${maxRisk}`);
+      ui.addLog('error', `████ MAX RISK (OPEN): -$${Math.abs(openPnl).toFixed(2)} ████`);
+      emergencyStopAll();
+    } else if (totalPnl <= -maxRisk) {
       stopReason = 'risk';
       running = false;
-      algoLogger.info(ui, 'MAX RISK HIT', `-$${Math.abs(sessionTotalPnl).toFixed(2)} <= -$${maxRisk}`);
-      ui.addLog('error', `████ MAX RISK REACHED: -$${Math.abs(sessionTotalPnl).toFixed(2)} ████`);
-      emergencyStopAll(); // Close all positions
+      algoLogger.info(ui, 'TOTAL P&L RISK', `Total: -$${Math.abs(totalPnl).toFixed(2)} <= -$${maxRisk}`);
+      ui.addLog('error', `████ MAX RISK (TOTAL): -$${Math.abs(totalPnl).toFixed(2)} ████`);
+      emergencyStopAll();
     }
   };