hedgequantx 2.6.130 → 2.6.132

package/package.json

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

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

@@ -10,7 +10,7 @@ const ora = require('ora');
 const readline = require('readline');
 
 const { connections } = require('../../services');
-const { AlgoUI, renderSessionSummary } = require('./ui');
+const { AlgoUI, renderSessionSummary, renderMultiSymbolSummary } = require('./ui');
 const { prompts } = require('../../utils');
 const { checkMarketHours } = require('../../services/projectx/market');
 const { FAST_SCALPING } = require('../../config/settings');
@@ -1477,6 +1477,7 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
       wins: 0, 
       losses: 0, 
       pnl: 0,
+      openPnl: 0, // Per-symbol unrealized P&L
       tickCount: 0,
     };
   });
@@ -1504,6 +1505,7 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
   const positionManagers = {};
   const strategies = {};
   const pendingOrders = {}; // Track pending orders per symbol
+  const disabledSymbols = new Set(); // Symbols disabled after SL hit
   
   contracts.forEach(contract => {
     const symbolName = contract.name || contract.symbol;
@@ -1577,6 +1579,11 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
           stats.losses++;
           stats.symbolStats[symbolName].losses++;
           ui.addLog('loss', `[${symbolName}] -$${Math.abs(pnlDollars).toFixed(2)} @ ${exitPrice} | ${holdSec}s`);
+          
+          // Disable symbol after loss (SL hit) - other symbols continue
+          disabledSymbols.add(symbolName);
+          ui.addLog('warning', `[${symbolName}] DISABLED - SL hit, other symbols continue`);
+          stats.activeSymbols = contracts.length - disabledSymbols.size;
         }
       } else if (pnlTicks !== null) {
         // Log with ticks only
@@ -1590,9 +1597,17 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
           stats.losses++;
           stats.symbolStats[symbolName].losses++;
           ui.addLog('loss', `[${symbolName}] ${pnlTicks} ticks | ${holdSec}s`);
+          
+          // Disable symbol after loss (SL hit) - other symbols continue
+          disabledSymbols.add(symbolName);
+          ui.addLog('warning', `[${symbolName}] DISABLED - SL hit, other symbols continue`);
+          stats.activeSymbols = contracts.length - disabledSymbols.size;
         }
       }
       stats.symbolStats[symbolName].position = 0;
+      stats.symbolStats[symbolName].openPnl = 0; // Reset open P&L when position closed
+      // Recalculate total Open P&L
+      stats.openPnl = Object.values(stats.symbolStats).reduce((sum, s) => sum + (s.openPnl || 0), 0);
       pendingOrders[symbolName] = false;
       ui.render(stats);
     });
@@ -1610,6 +1625,7 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
     // ═══════════════════════════════════════════════════════════════════════
     strategy.on('signal', async (signal) => {
       if (!running) return;
+      if (disabledSymbols.has(symbolName)) return; // Skip disabled symbols (SL hit)
       if (pendingOrders[symbolName]) return;
       if (!pm.canEnter(symbolName)) return;
       
@@ -1773,6 +1789,32 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
     algoLogger.error(ui, 'CONNECTION ERROR', e.message);
   }
   
+  // ═══════════════════════════════════════════════════════════════════════════
+  // TARGET/RISK CHECK - Stop algo when limits reached
+  // ═══════════════════════════════════════════════════════════════════════════
+  const checkTargetRisk = () => {
+    if (!running) return;
+    
+    const totalPnl = (stats.openPnl || 0) + (stats.closedPnl || 0);
+    
+    // Daily target reached - STOP with profit
+    if (totalPnl >= dailyTarget) {
+      stopReason = 'target';
+      running = false;
+      algoLogger.info(ui, 'TARGET REACHED', `+$${totalPnl.toFixed(2)} >= $${dailyTarget}`);
+      ui.addLog('success', `████ DAILY TARGET REACHED: +$${totalPnl.toFixed(2)} ████`);
+      emergencyStopAll(); // Close all positions
+    }
+    // Max risk reached - STOP to protect capital
+    else if (totalPnl <= -maxRisk) {
+      stopReason = 'risk';
+      running = false;
+      algoLogger.info(ui, 'MAX RISK HIT', `-$${Math.abs(totalPnl).toFixed(2)} <= -$${maxRisk}`);
+      ui.addLog('error', `████ MAX RISK REACHED: -$${Math.abs(totalPnl).toFixed(2)} ████`);
+      emergencyStopAll(); // Close all positions
+    }
+  };
+  
   // ═══════════════════════════════════════════════════════════════════════════
   // REAL-TIME P&L VIA WEBSOCKET (same as launchAlgo)
   // ═══════════════════════════════════════════════════════════════════════════
@@ -1800,10 +1842,14 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
       }
       
       stats.pnl = (stats.openPnl || 0) + (stats.closedPnl || 0);
+      
+      // Check target/risk on every P&L update
+      checkTargetRisk();
+      
       ui.render(stats);
     });
     
-    // Position-level updates (for Open P&L)
+    // Position-level updates (for Open P&L per symbol)
     service.on('positionUpdate', (pos) => {
       if (!pos || pos.accountId !== rithmicAccountId) return;
       
@@ -1813,14 +1859,20 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
         if (posSymbol === baseSymbol || posSymbol === symbolName || symbolName.startsWith(posSymbol)) {
           stats.symbolStats[symbolName].position = pos.quantity || 0;
           
-          // Update Open P&L from position
+          // Update Open P&L for this symbol
           if (pos.openPnl !== undefined && pos.openPnl !== null) {
-            stats.openPnl = pos.openPnl;
+            stats.symbolStats[symbolName].openPnl = pos.openPnl;
+            
+            // Calculate total Open P&L from all symbols
+            stats.openPnl = Object.values(stats.symbolStats).reduce((sum, s) => sum + (s.openPnl || 0), 0);
             stats.pnl = (stats.openPnl || 0) + (stats.closedPnl || 0);
             
             if (stats.balance !== null) {
               stats.netLiquidation = stats.balance + stats.openPnl;
             }
+            
+            // Check target/risk on Open P&L changes too
+            checkTargetRisk();
           }
           break;
         }
@@ -1922,32 +1974,14 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config) =>
   const hours = Math.floor(durationMs / 3600000);
   const minutes = Math.floor((durationMs % 3600000) / 60000);
   const seconds = Math.floor((durationMs % 60000) / 1000);
-  const duration = hours > 0 
+  stats.duration = hours > 0 
     ? `${hours}h ${minutes}m ${seconds}s`
     : minutes > 0 
       ? `${minutes}m ${seconds}s`
       : `${seconds}s`;
   
-  console.log();
-  console.log(chalk.cyan('═══════════════════════════════════════════════════════════════'));
-  console.log(chalk.cyan('                 MULTI-SYMBOL SESSION SUMMARY'));
-  console.log(chalk.cyan('═══════════════════════════════════════════════════════════════'));
-  console.log();
-  
-  for (const [symbol, symStats] of Object.entries(stats.symbolStats)) {
-    const winRate = symStats.trades > 0 ? ((symStats.wins / symStats.trades) * 100).toFixed(0) : 0;
-    const pnlColor = symStats.pnl >= 0 ? chalk.green : chalk.red;
-    console.log(chalk.white(`  ${symbol}:`));
-    console.log(`    Trades: ${symStats.trades} | WR: ${winRate}% | P&L: ${pnlColor('$' + symStats.pnl.toFixed(2))}`);
-  }
-  
-  console.log();
-  const totalPnlColor = stats.sessionPnl >= 0 ? chalk.green : chalk.red;
-  console.log(chalk.white(`  TOTAL: ${stats.trades} trades | ${stats.wins}W/${stats.losses}L`));
-  console.log(chalk.white(`  Session P&L: ${totalPnlColor('$' + stats.sessionPnl.toFixed(2))}`));
-  console.log(chalk.white(`  Duration: ${duration}`));
-  console.log();
-  console.log(chalk.cyan('═══════════════════════════════════════════════════════════════'));
+  // Render multi-symbol summary with same style as single-symbol
+  renderMultiSymbolSummary(stats, stopReason, stats.symbolStats);
   
   await prompts.waitForEnter();
 };

package/src/pages/algo/ui.js

@@ -547,4 +547,123 @@ const renderSessionSummary = (stats, stopReason) => {
   console.log();
 };
 
-module.exports = { AlgoUI, checkMarketStatus, renderSessionSummary, LOG_COLORS, LOG_ICONS, stripAnsi, center, fitToWidth };
+/**
+ * Render Multi-Symbol Session Summary - Same style as single-symbol
+ */
+const renderMultiSymbolSummary = (stats, stopReason, symbolStats) => {
+  const W = 96;
+  const version = require('../../../package.json').version;
+  
+  console.clear();
+  console.log();
+  
+  // Top border
+  console.log(chalk.cyan(BOX.TOP + BOX.H.repeat(W) + BOX.TR));
+  
+  // Logo
+  console.log(chalk.cyan(BOX.V) + chalk.cyan(' ██╗  ██╗███████╗██████╗  ██████╗ ███████╗ ██████╗ ██╗   ██╗ █████╗ ███╗   ██╗████████╗') + chalk.yellow('██╗  ██╗') + ' ' + chalk.cyan(BOX.V));
+  console.log(chalk.cyan(BOX.V) + chalk.cyan(' ██║  ██║██╔════╝██╔══██╗██╔════╝ ██╔════╝██╔═══██╗██║   ██║██╔══██╗████╗  ██║╚══██╔══╝') + chalk.yellow('╚██╗██╔╝') + ' ' + chalk.cyan(BOX.V));
+  console.log(chalk.cyan(BOX.V) + chalk.cyan(' ███████║█████╗  ██║  ██║██║  ███╗█████╗  ██║   ██║██║   ██║███████║██╔██╗ ██║   ██║   ') + chalk.yellow(' ╚███╔╝ ') + ' ' + chalk.cyan(BOX.V));
+  console.log(chalk.cyan(BOX.V) + chalk.cyan(' ██╔══██║██╔══╝  ██║  ██║██║   ██║██╔══╝  ██║▄▄ ██║██║   ██║██╔══██║██║╚██╗██║   ██║   ') + chalk.yellow(' ██╔██╗ ') + ' ' + chalk.cyan(BOX.V));
+  console.log(chalk.cyan(BOX.V) + chalk.cyan(' ██║  ██║███████╗██████╔╝╚██████╔╝███████╗╚██████╔╝╚██████╔╝██║  ██║██║ ╚████║   ██║   ') + chalk.yellow('██╔╝ ██╗') + ' ' + chalk.cyan(BOX.V));
+  console.log(chalk.cyan(BOX.V) + chalk.cyan(' ╚═╝  ╚═╝╚══════╝╚═════╝  ╚═════╝ ╚══════╝ ╚══▀▀═╝  ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═══╝   ╚═╝   ') + chalk.yellow('╚═╝  ╚═╝') + ' ' + chalk.cyan(BOX.V));
+  
+  // Separator + title
+  console.log(chalk.cyan(BOX.ML + BOX.H.repeat(W) + BOX.MR));
+  console.log(chalk.cyan(BOX.V) + chalk.white(center(`PROP FUTURES ALGO TRADING  v${version}`, W)) + chalk.cyan(BOX.V));
+  console.log(chalk.cyan(BOX.ML + BOX.H.repeat(W) + BOX.MR));
+  console.log(chalk.cyan(BOX.V) + chalk.yellow.bold(center('MULTI-SYMBOL SESSION SUMMARY', W)) + chalk.cyan(BOX.V));
+  console.log(chalk.cyan(BOX.ML + BOX.H.repeat(W) + BOX.MR));
+  
+  // Per-symbol stats header
+  const colSymbol = 12;
+  const colTrades = 10;
+  const colWR = 10;
+  const colWins = 8;
+  const colLosses = 8;
+  const colPnL = 14;
+  const remaining = W - colSymbol - colTrades - colWR - colWins - colLosses - colPnL - 5; // 5 separators
+  
+  // Header row
+  const headerSymbol = ' SYMBOL'.padEnd(colSymbol);
+  const headerTrades = 'TRADES'.padEnd(colTrades);
+  const headerWR = 'WIN RATE'.padEnd(colWR);
+  const headerWins = 'WINS'.padEnd(colWins);
+  const headerLosses = 'LOSSES'.padEnd(colLosses);
+  const headerPnL = 'P&L'.padEnd(colPnL + remaining);
+  
+  console.log(chalk.cyan(BOX.V) + chalk.bold.white(headerSymbol) + chalk.cyan(BOX.VS) + 
+    chalk.bold.white(headerTrades) + chalk.cyan(BOX.VS) + 
+    chalk.bold.white(headerWR) + chalk.cyan(BOX.VS) + 
+    chalk.bold.white(headerWins) + chalk.cyan(BOX.VS) + 
+    chalk.bold.white(headerLosses) + chalk.cyan(BOX.VS) + 
+    chalk.bold.white(headerPnL) + chalk.cyan(BOX.V));
+  
+  console.log(chalk.cyan(BOX.ML + BOX.H.repeat(W) + BOX.MR));
+  
+  // Per-symbol rows
+  for (const [symbol, symStats] of Object.entries(symbolStats)) {
+    const winRate = symStats.trades > 0 ? ((symStats.wins / symStats.trades) * 100).toFixed(0) + '%' : '0%';
+    const pnl = symStats.pnl || 0;
+    const pnlStr = (pnl >= 0 ? '+$' : '-$') + Math.abs(pnl).toFixed(2);
+    const pnlColor = pnl >= 0 ? chalk.green : chalk.red;
+    const wrColor = symStats.wins >= symStats.losses ? chalk.green : chalk.red;
+    
+    const cellSymbol = (' ' + symbol).padEnd(colSymbol);
+    const cellTrades = String(symStats.trades || 0).padEnd(colTrades);
+    const cellWR = winRate.padEnd(colWR);
+    const cellWins = String(symStats.wins || 0).padEnd(colWins);
+    const cellLosses = String(symStats.losses || 0).padEnd(colLosses);
+    const cellPnL = pnlStr.padEnd(colPnL + remaining);
+    
+    console.log(chalk.cyan(BOX.V) + chalk.yellow(cellSymbol) + chalk.cyan(BOX.VS) + 
+      chalk.white(cellTrades) + chalk.cyan(BOX.VS) + 
+      wrColor(cellWR) + chalk.cyan(BOX.VS) + 
+      chalk.green(cellWins) + chalk.cyan(BOX.VS) + 
+      chalk.red(cellLosses) + chalk.cyan(BOX.VS) + 
+      pnlColor.bold(cellPnL) + chalk.cyan(BOX.V));
+  }
+  
+  // Separator before totals
+  console.log(chalk.cyan(BOX.ML + BOX.H.repeat(W) + BOX.MR));
+  
+  // Total row
+  const totalWinRate = stats.trades > 0 ? ((stats.wins / stats.trades) * 100).toFixed(0) + '%' : '0%';
+  const totalPnl = stats.sessionPnl || 0;
+  const totalPnlStr = (totalPnl >= 0 ? '+$' : '-$') + Math.abs(totalPnl).toFixed(2);
+  const totalPnlColor = totalPnl >= 0 ? chalk.green : chalk.red;
+  const totalWrColor = stats.wins >= stats.losses ? chalk.green : chalk.red;
+  
+  const totalCellSymbol = ' TOTAL'.padEnd(colSymbol);
+  const totalCellTrades = String(stats.trades || 0).padEnd(colTrades);
+  const totalCellWR = totalWinRate.padEnd(colWR);
+  const totalCellWins = String(stats.wins || 0).padEnd(colWins);
+  const totalCellLosses = String(stats.losses || 0).padEnd(colLosses);
+  const totalCellPnL = totalPnlStr.padEnd(colPnL + remaining);
+  
+  console.log(chalk.cyan(BOX.V) + chalk.bold.white(totalCellSymbol) + chalk.cyan(BOX.VS) + 
+    chalk.bold.white(totalCellTrades) + chalk.cyan(BOX.VS) + 
+    totalWrColor.bold(totalCellWR) + chalk.cyan(BOX.VS) + 
+    chalk.bold.green(totalCellWins) + chalk.cyan(BOX.VS) + 
+    chalk.bold.red(totalCellLosses) + chalk.cyan(BOX.VS) + 
+    totalPnlColor.bold(totalCellPnL) + chalk.cyan(BOX.V));
+  
+  // Separator
+  console.log(chalk.cyan(BOX.ML + BOX.H.repeat(W) + BOX.MR));
+  
+  // Stop Reason & Duration row
+  const duration = stats.duration || '--';
+  const reasonColor = stopReason === 'target' ? chalk.green : stopReason === 'risk' ? chalk.red : chalk.yellow;
+  const reasonStr = (stopReason || 'manual').toUpperCase();
+  const infoText = ` STOP: ${reasonStr}  |  DURATION: ${duration}  |  TARGET: $${(stats.target || 0).toFixed(2)}  |  RISK: $${(stats.risk || 0).toFixed(2)}`;
+  const infoPlain = ` STOP: ${reasonStr}  |  DURATION: ${duration}  |  TARGET: $${(stats.target || 0).toFixed(2)}  |  RISK: $${(stats.risk || 0).toFixed(2)}`;
+  const infoColored = ` ${chalk.bold('STOP')}: ${reasonColor.bold(reasonStr)}  |  ${chalk.bold('DURATION')}: ${chalk.white(duration)}  |  ${chalk.bold('TARGET')}: ${chalk.cyan('$' + (stats.target || 0).toFixed(2))}  |  ${chalk.bold('RISK')}: ${chalk.red('$' + (stats.risk || 0).toFixed(2))}`;
+  
+  console.log(chalk.cyan(BOX.V) + infoColored + ' '.repeat(Math.max(0, W - infoPlain.length)) + chalk.cyan(BOX.V));
+  
+  // Bottom border
+  console.log(chalk.cyan(BOX.BOT + BOX.H.repeat(W) + BOX.BR));
+  console.log();
+};
+
+module.exports = { AlgoUI, checkMarketStatus, renderSessionSummary, renderMultiSymbolSummary, LOG_COLORS, LOG_ICONS, stripAnsi, center, fitToWidth };