hedgequantx 1.2.121 → 1.2.125

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "1.2.121",
+  "version": "1.2.125",
   "description": "Prop Futures Algo Trading CLI - Connect to Topstep, Alpha Futures, and other prop firms",
   "main": "src/app.js",
   "bin": {

package/src/pages/algo.js

@@ -221,8 +221,54 @@ const selectSymbolMenu = async (service, account) => {
     });
   }
   
-  // Sort by symbol code for better organization
+  // Sort by category: E-mini indices first, then Micro E-mini, then others
+  const getSymbolPriority = (contract) => {
+    const name = (contract.name || contract.symbol || '').toUpperCase();
+    const desc = (contract.description || '').toLowerCase();
+    
+    // E-mini indices (NQ, ES, YM, RTY) - highest priority
+    if (name.match(/^(NQ|ES|YM|RTY)[A-Z]\d/) && !name.startsWith('M')) {
+      if (name.startsWith('NQ')) return 10;
+      if (name.startsWith('ES')) return 11;
+      if (name.startsWith('YM')) return 12;
+      if (name.startsWith('RTY')) return 13;
+      return 15;
+    }
+    
+    // Micro E-mini indices (MNQ, MES, MYM, M2K)
+    if (name.match(/^(MNQ|MES|MYM|M2K)/)) {
+      if (name.startsWith('MNQ')) return 20;
+      if (name.startsWith('MES')) return 21;
+      if (name.startsWith('MYM')) return 22;
+      if (name.startsWith('M2K')) return 23;
+      return 25;
+    }
+    
+    // Energy (CL, MCL, NG)
+    if (name.match(/^(CL|MCL|NG|QG)/)) return 30;
+    
+    // Metals (GC, MGC, SI)
+    if (name.match(/^(GC|MGC|SI|HG|PL)/)) return 40;
+    
+    // Currencies (6E, 6B, etc)
+    if (name.match(/^(6E|6B|6J|6A|6C|M6E)/)) return 50;
+    
+    // Treasuries (ZB, ZN, ZF, ZT)
+    if (name.match(/^(ZB|ZN|ZF|ZT)/)) return 60;
+    
+    // Everything else
+    return 100;
+  };
+  
   symbolChoices.sort((a, b) => {
+    const priorityA = getSymbolPriority(a.value);
+    const priorityB = getSymbolPriority(b.value);
+    
+    if (priorityA !== priorityB) {
+      return priorityA - priorityB;
+    }
+    
+    // Same priority - sort alphabetically
     const aCode = a.value.name || a.value.symbol || '';
     const bCode = b.value.name || b.value.symbol || '';
     return aCode.localeCompare(bCode);
@@ -427,6 +473,7 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
     success: chalk.green,
     signal: chalk.yellow.bold,
     trade: chalk.green.bold,
+    loss: chalk.magenta.bold,
     error: chalk.red,
     warning: chalk.yellow
   };
@@ -453,10 +500,12 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
     if (logs.length > MAX_LOGS) logs.shift(); // Remove oldest from top
   };
   
-  // Print log and refresh display
+  // Print log - just add to buffer, spinner interval will refresh display
+  // This prevents display flicker from multiple concurrent displayUI() calls
   const printLog = (type, message) => {
     addLog(type, message);
-    displayUI();
+    // Don't call displayUI() here - let the spinner interval handle it
+    // This prevents flickering when logs arrive rapidly
   };
   
   // Check market hours
@@ -481,19 +530,38 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
   };
 
   // Display full UI with logs (newest first at top)
-  // Use ANSI escape codes to avoid flickering
   let firstDraw = true;
+  let isDrawing = false; // Mutex to prevent concurrent draws
+  
+  // Build entire screen as a single string buffer to write atomically
+  let screenBuffer = '';
+  
+  const bufferLine = (text) => {
+    screenBuffer += text + '\x1B[K\n'; // Add text + clear to EOL + newline
+  };
+  
+  // Legacy function for compatibility
+  const printLine = bufferLine;
+  
   const displayUI = () => {
-    // First time: clear screen and hide cursor, after: just move cursor to top
+    // Prevent concurrent draws
+    if (isDrawing) return;
+    isDrawing = true;
+    
+    // Reset buffer
+    screenBuffer = '';
+    
     if (firstDraw) {
-      console.clear();
-      process.stdout.write('\x1B[?25l'); // Hide cursor
+      // Switch to alternate screen buffer - isolates our display
+      screenBuffer += '\x1B[?1049h'; // Enter alternate screen
+      screenBuffer += '\x1B[?25l'; // Hide cursor
+      screenBuffer += '\x1B[2J'; // Clear screen
       firstDraw = false;
-    } else {
-      // Move cursor to top-left without clearing (avoids flicker)
-      process.stdout.write('\x1B[H');
     }
     
+    // Move cursor to home position
+    screenBuffer += '\x1B[H';
+    
     // Stats
     const pnlColor = stats.pnl >= 0 ? chalk.green : chalk.red;
     const pnlStr = (stats.pnl >= 0 ? '+$' : '-$') + Math.abs(stats.pnl).toFixed(2);
@@ -530,25 +598,25 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
       return text + ' '.repeat(width - text.length);
     };
     
-    console.log();
-    console.log(chalk.cyan(TOP));
+    printLine('');
+    printLine(chalk.cyan(TOP));
     // Logo = 87 chars cyan + 9 chars yellow = 96 total
-    console.log(chalk.cyan(V) + chalk.cyan(' ██╗  ██╗███████╗██████╗  ██████╗ ███████╗ ██████╗ ██╗   ██╗ █████╗ ███╗   ██╗████████╗') + chalk.yellow('██╗  ██╗') + ' ' + chalk.cyan(V));
-    console.log(chalk.cyan(V) + chalk.cyan(' ██║  ██║██╔════╝██╔══██╗██╔════╝ ██╔════╝██╔═══██╗██║   ██║██╔══██╗████╗  ██║╚══██╔══╝') + chalk.yellow('╚██╗██╔╝') + ' ' + chalk.cyan(V));
-    console.log(chalk.cyan(V) + chalk.cyan(' ███████║█████╗  ██║  ██║██║  ███╗█████╗  ██║   ██║██║   ██║███████║██╔██╗ ██║   ██║   ') + chalk.yellow(' ╚███╔╝ ') + ' ' + chalk.cyan(V));
-    console.log(chalk.cyan(V) + chalk.cyan(' ██╔══██║██╔══╝  ██║  ██║██║   ██║██╔══╝  ██║▄▄ ██║██║   ██║██╔══██║██║╚██╗██║   ██║   ') + chalk.yellow(' ██╔██╗ ') + ' ' + chalk.cyan(V));
-    console.log(chalk.cyan(V) + chalk.cyan(' ██║  ██║███████╗██████╔╝╚██████╔╝███████╗╚██████╔╝╚██████╔╝██║  ██║██║ ╚████║   ██║   ') + chalk.yellow('██╔╝ ██╗') + ' ' + chalk.cyan(V));
-    console.log(chalk.cyan(V) + chalk.cyan(' ╚═╝  ╚═╝╚══════╝╚═════╝  ╚═════╝ ╚══════╝ ╚══▀▀═╝  ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═══╝   ╚═╝   ') + chalk.yellow('╚═╝  ╚═╝') + ' ' + chalk.cyan(V));
-    console.log(chalk.cyan(MID));
+    printLine(chalk.cyan(V) + chalk.cyan(' ██╗  ██╗███████╗██████╗  ██████╗ ███████╗ ██████╗ ██╗   ██╗ █████╗ ███╗   ██╗████████╗') + chalk.yellow('██╗  ██╗') + ' ' + chalk.cyan(V));
+    printLine(chalk.cyan(V) + chalk.cyan(' ██║  ██║██╔════╝██╔══██╗██╔════╝ ██╔════╝██╔═══██╗██║   ██║██╔══██╗████╗  ██║╚══██╔══╝') + chalk.yellow('╚██╗██╔╝') + ' ' + chalk.cyan(V));
+    printLine(chalk.cyan(V) + chalk.cyan(' ███████║█████╗  ██║  ██║██║  ███╗█████╗  ██║   ██║██║   ██║███████║██╔██╗ ██║   ██║   ') + chalk.yellow(' ╚███╔╝ ') + ' ' + chalk.cyan(V));
+    printLine(chalk.cyan(V) + chalk.cyan(' ██╔══██║██╔══╝  ██║  ██║██║   ██║██╔══╝  ██║▄▄ ██║██║   ██║██╔══██║██║╚██╗██║   ██║   ') + chalk.yellow(' ██╔██╗ ') + ' ' + chalk.cyan(V));
+    printLine(chalk.cyan(V) + chalk.cyan(' ██║  ██║███████╗██████╔╝╚██████╔╝███████╗╚██████╔╝╚██████╔╝██║  ██║██║ ╚████║   ██║   ') + chalk.yellow('██╔╝ ██╗') + ' ' + chalk.cyan(V));
+    printLine(chalk.cyan(V) + chalk.cyan(' ╚═╝  ╚═╝╚══════╝╚═════╝  ╚═════╝ ╚══════╝ ╚══▀▀═╝  ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═══╝   ╚═╝   ') + chalk.yellow('╚═╝  ╚═╝') + ' ' + chalk.cyan(V));
+    printLine(chalk.cyan(MID));
     
     // Centered title
     const title1 = `Prop Futures Algo Trading  v${version}`;
-    console.log(chalk.cyan(V) + chalk.white(center(title1, W)) + chalk.cyan(V));
-    console.log(chalk.cyan(MID));
+    printLine(chalk.cyan(V) + chalk.white(center(title1, W)) + chalk.cyan(V));
+    printLine(chalk.cyan(MID));
     
     // Centered subtitle
     const title2 = 'HQX Ultra-Scalping Algorithm';
-    console.log(chalk.cyan(V) + chalk.yellow(center(title2, W)) + chalk.cyan(V));
+    printLine(chalk.cyan(V) + chalk.yellow(center(title2, W)) + chalk.cyan(V));
     
     // Grid layout for metrics - 2 columns per row, 4 rows
     // Row 1: Account | Symbol + Qty
@@ -598,15 +666,15 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
     const GRID_BOT = '\u2560' + '\u2550'.repeat(colL) + '\u2567' + '\u2550'.repeat(colR) + '\u2563';
     
     // Print grid
-    console.log(chalk.cyan(GRID_TOP));
-    console.log(chalk.cyan(V) + r1c1.padded + chalk.cyan(VS) + r1c2 + chalk.cyan(V));
-    console.log(chalk.cyan(GRID_MID));
-    console.log(chalk.cyan(V) + r2c1.padded + chalk.cyan(VS) + r2c2.padded + chalk.cyan(V));
-    console.log(chalk.cyan(GRID_MID));
-    console.log(chalk.cyan(V) + r3c1.padded + chalk.cyan(VS) + r3c2.padded + chalk.cyan(V));
-    console.log(chalk.cyan(GRID_MID));
-    console.log(chalk.cyan(V) + r4c1 + chalk.cyan(VS) + r4c2.padded + chalk.cyan(V));
-    console.log(chalk.cyan(GRID_BOT));
+    printLine(chalk.cyan(GRID_TOP));
+    printLine(chalk.cyan(V) + r1c1.padded + chalk.cyan(VS) + r1c2 + chalk.cyan(V));
+    printLine(chalk.cyan(GRID_MID));
+    printLine(chalk.cyan(V) + r2c1.padded + chalk.cyan(VS) + r2c2.padded + chalk.cyan(V));
+    printLine(chalk.cyan(GRID_MID));
+    printLine(chalk.cyan(V) + r3c1.padded + chalk.cyan(VS) + r3c2.padded + chalk.cyan(V));
+    printLine(chalk.cyan(GRID_MID));
+    printLine(chalk.cyan(V) + r4c1 + chalk.cyan(VS) + r4c2.padded + chalk.cyan(V));
+    printLine(chalk.cyan(GRID_BOT));
     
     // Activity log header with spinner and centered date
     spinnerFrame = (spinnerFrame + 1) % spinnerChars.length;
@@ -621,19 +689,42 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
     const datePad = Math.max(0, Math.floor((midSpace - dateCentered.length) / 2));
     const remainingPad = Math.max(0, midSpace - datePad - dateCentered.length);
     const dateSection = ' '.repeat(datePad) + chalk.cyan(dateCentered) + ' '.repeat(remainingPad);
-    console.log(chalk.cyan(V) + chalk.white(actLeft) + dateSection + chalk.yellow(actRight) + chalk.cyan(V));
-    console.log(chalk.cyan(BOT));
+    bufferLine(chalk.cyan(V) + chalk.white(actLeft) + dateSection + chalk.yellow(actRight) + chalk.cyan(V));
+    bufferLine(chalk.cyan(MID));
+    
+    // Helper to strip ANSI codes for length calculation
+    const stripAnsi = (str) => str.replace(/\x1B\[[0-9;]*m/g, '');
+    
+    // Helper to truncate and pad text to exact width W
+    const fitToWidth = (text, width) => {
+      const plainText = stripAnsi(text);
+      if (plainText.length > width) {
+        // Truncate - find where to cut in original string
+        let count = 0;
+        let cutIndex = 0;
+        for (let i = 0; i < text.length && count < width - 3; i++) {
+          if (text[i] === '\x1B') {
+            // Skip ANSI sequence
+            while (i < text.length && text[i] !== 'm') i++;
+          } else {
+            count++;
+            cutIndex = i + 1;
+          }
+        }
+        return text.substring(0, cutIndex) + '...';
+      }
+      return text + ' '.repeat(width - plainText.length);
+    };
     
-    // Logs (without borders) - newest first, show more logs
-    // Align with left border of rectangle above (║ = 1 char + 1 space)
+    // Logs inside the rectangle - newest first, max 50 lines
     const MAX_VISIBLE_LOGS = 50;
-    console.log();
     
     if (logs.length === 0) {
-      console.log(chalk.gray(' Waiting for activity...') + '\x1B[K');
-      // Fill remaining lines with empty
+      const emptyLine = ' Waiting for activity...';
+      bufferLine(chalk.cyan(V) + chalk.gray(fitToWidth(emptyLine, W)) + chalk.cyan(V));
+      // Fill remaining lines
       for (let i = 0; i < MAX_VISIBLE_LOGS - 1; i++) {
-        console.log('\x1B[K');
+        bufferLine(chalk.cyan(V) + ' '.repeat(W) + chalk.cyan(V));
       }
     } else {
       // Show newest first (reverse), limited to MAX_VISIBLE_LOGS
@@ -641,25 +732,33 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
       reversedLogs.forEach(log => {
         const color = typeColors[log.type] || chalk.white;
         const icon = getIcon(log.type);
-        // Align with rectangle: 1 space to match content after ║
-        const logLine = ` [${log.timestamp}] ${icon} ${log.message}`;
-        console.log(color(logLine) + '\x1B[K');
+        // Build log line content (plain text, no color yet)
+        const logContent = ` [${log.timestamp}] ${icon} ${log.message}`;
+        // Fit to width then apply color
+        const fitted = fitToWidth(logContent, W);
+        bufferLine(chalk.cyan(V) + color(fitted) + chalk.cyan(V));
       });
       // Fill remaining lines with empty to keep fixed height
       for (let i = reversedLogs.length; i < MAX_VISIBLE_LOGS; i++) {
-        console.log('\x1B[K');
+        bufferLine(chalk.cyan(V) + ' '.repeat(W) + chalk.cyan(V));
       }
     }
-    // Clear anything below
-    process.stdout.write('\x1B[J');
+    
+    // Bottom border to close the rectangle
+    bufferLine(chalk.cyan(BOT));
+    
+    // Write entire buffer atomically
+    process.stdout.write(screenBuffer);
+    
+    isDrawing = false;
   };
   
-  // Spinner interval to refresh UI
+  // Spinner interval to refresh UI - 250ms for stability
   const spinnerInterval = setInterval(() => {
-    if (algoRunning) {
+    if (algoRunning && !isDrawing) {
       displayUI();
     }
-  }, 100);
+  }, 250);
   
   // Connect to HQX Server
   const spinner = ora('Authenticating with HQX Server...').start();
@@ -699,7 +798,7 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
   // Setup event handlers - logs scroll down naturally
   hqxServer.on('latency', (data) => {
     latency = data.latency || 0;
-    displayUI(); // Refresh UI with new latency
+    // Don't call displayUI() - spinner interval will refresh
   });
   
   hqxServer.on('log', (data) => {
@@ -730,12 +829,13 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
       printLog('trade', `Closed +$${data.pnl.toFixed(2)} (${data.reason || 'take_profit'})`);
     } else {
       stats.losses++;
-      printLog('trade', `Closed -$${Math.abs(data.pnl).toFixed(2)} (${data.reason || 'stop_loss'})`);
+      printLog('loss', `Closed -$${Math.abs(data.pnl).toFixed(2)} (${data.reason || 'stop_loss'})`);
     }
     stats.winRate = stats.trades > 0 ? ((stats.wins / stats.trades) * 100).toFixed(1) : '0.0';
     
     // Print updated stats
-    printLog('info', `Stats: Trades: ${stats.trades} | Wins: ${stats.wins} | P&L: $${stats.pnl.toFixed(2)}`);
+    const statsType = stats.pnl >= 0 ? 'info' : 'loss';
+    printLog(statsType, `Stats: Trades: ${stats.trades} | Wins: ${stats.wins} | P&L: $${stats.pnl.toFixed(2)}`);
     
     // Check daily target
     if (stats.pnl >= dailyTarget) {
@@ -759,8 +859,17 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
   });
   
   hqxServer.on('stats', (data) => {
-    stats = { ...stats, ...data };
-    // Don't print stats every time, only on trades
+    // Update stats from server
+    stats.trades = data.trades || stats.trades;
+    stats.wins = data.wins || stats.wins;
+    stats.losses = data.losses || stats.losses;
+    stats.signals = data.signals || stats.signals;
+    stats.winRate = data.winRate || stats.winRate;
+    
+    // P&L = realized P&L + unrealized P&L from open position
+    const realizedPnl = data.pnl || 0;
+    const unrealizedPnl = data.position?.pnl || 0;
+    stats.pnl = realizedPnl + unrealizedPnl;
   });
   
   hqxServer.on('error', (data) => {
@@ -862,8 +971,9 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
   // Clear spinner interval
   clearInterval(spinnerInterval);
   
-  // Show cursor again
-  process.stdout.write('\x1B[?25h');
+  // Exit alternate screen buffer and show cursor
+  process.stdout.write('\x1B[?1049l'); // Exit alternate screen
+  process.stdout.write('\x1B[?25h'); // Show cursor
   
   // Stop algo
   console.log();