hedgequantx 1.7.6 → 1.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "1.7.6",
+  "version": "1.7.8",
   "description": "Prop Futures Algo Trading CLI - Connect to Topstep, Alpha Futures, and other prop firms",
   "main": "src/app.js",
   "bin": {
@@ -45,7 +45,6 @@
     "chalk": "^4.1.2",
     "commander": "^11.1.0",
     "figlet": "^1.7.0",
-    "inquirer": "^7.3.3",
     "ora": "^5.4.1",
     "protobufjs": "^8.0.0",
     "ws": "^8.18.3"

package/src/app.js

@@ -4,12 +4,11 @@
  */
 
 const chalk = require('chalk');
-const inquirer = require('inquirer');
 const ora = require('ora');
 
 const { connections } = require('./services');
 const { getLogoWidth, centerText, prepareStdin } = require('./ui');
-const { logger } = require('./utils');
+const { logger, prompts } = require('./utils');
 const { setCachedStats, clearCachedStats } = require('./services/stats-cache');
 
 const log = logger.scope('App');
@@ -24,29 +23,21 @@ const { projectXMenu, rithmicMenu, tradovateMenu, addPropAccountMenu, dashboardM
 
 // Current service reference
 let currentService = null;
-let currentPlatform = null; // 'projectx' or 'rithmic'
 
 /**
- * Global terminal restoration - ensures terminal is always restored on exit
+ * Global terminal restoration
  */
 const restoreTerminal = () => {
   try {
-    // Exit alternate screen buffer
     process.stdout.write('\x1B[?1049l');
-    // Show cursor
     process.stdout.write('\x1B[?25h');
-    // Disable raw mode
     if (process.stdin.isTTY && process.stdin.isRaw) {
       process.stdin.setRawMode(false);
     }
-    // Remove all keypress listeners
     process.stdin.removeAllListeners('keypress');
-  } catch (e) {
-    // Ignore errors during cleanup
-  }
+  } catch (e) {}
 };
 
-// Register global handlers to restore terminal on exit/crash
 process.on('exit', restoreTerminal);
 process.on('SIGINT', () => { restoreTerminal(); process.exit(0); });
 process.on('SIGTERM', () => { restoreTerminal(); process.exit(0); });
@@ -62,7 +53,7 @@ process.on('unhandledRejection', (reason) => {
 });
 
 /**
- * Refresh cached stats (call after connection/disconnection/add account)
+ * Refresh cached stats
  */
 const refreshStats = async () => {
   if (connections.count() > 0) {
@@ -70,20 +61,14 @@ const refreshStats = async () => {
       const allAccounts = await connections.getAllAccounts();
       const activeAccounts = allAccounts.filter(acc => acc.status === 0);
       
-      // Sum only non-null values from API
-      let totalBalance = null;
-      let totalPnl = null;
-      let hasBalanceData = false;
-      let hasPnlData = false;
+      let totalBalance = null, totalPnl = null;
+      let hasBalanceData = false, hasPnlData = false;
       
       activeAccounts.forEach(account => {
-        // Balance: only sum if API returned a value
         if (account.balance !== null && account.balance !== undefined) {
           totalBalance = (totalBalance || 0) + account.balance;
           hasBalanceData = true;
         }
-        
-        // P&L: only sum if API returned a value
         if (account.profitAndLoss !== null && account.profitAndLoss !== undefined) {
           totalPnl = (totalPnl || 0) + account.profitAndLoss;
           hasPnlData = true;
@@ -97,59 +82,36 @@ const refreshStats = async () => {
         pnl: hasPnlData ? totalPnl : null,
         pnlPercent: null
       });
-    } catch (e) {
-      // Ignore errors
-    }
+    } catch (e) {}
   } else {
     clearCachedStats();
   }
 };
 
 /**
- * Displays the application banner with stats if connected
+ * Display banner
  */
 const banner = async () => {
   console.clear();
   const termWidth = process.stdout.columns || 100;
   const isMobile = termWidth < 60;
-  // Logo HEDGEQUANTX + X = 94 chars, need 98 for box (94 + 2 borders + 2 padding)
   const boxWidth = isMobile ? Math.max(termWidth - 2, 40) : Math.max(getLogoWidth(), 98);
   const innerWidth = boxWidth - 2;
   const version = require('../package.json').version;
   
-  // Draw logo - compact for mobile, full for desktop
-  
   console.log(chalk.cyan('╔' + '═'.repeat(innerWidth) + '╗'));
   
   if (isMobile) {
-    // Compact HQX logo for mobile - X in yellow
-    const logoHQ = [
-      '██╗  ██╗ ██████╗ ',
-      '██║  ██║██╔═══██╗',
-      '███████║██║   ██║',
-      '██╔══██║██║▄▄ ██║',
-      '██║  ██║╚██████╔╝',
-      '╚═╝  ╚═╝ ╚══▀▀═╝ '
-    ];
-    const logoX = [
-      '██╗  ██╗',
-      '╚██╗██╔╝',
-      ' ╚███╔╝ ',
-      ' ██╔██╗ ',
-      '██╔╝ ██╗',
-      '╚═╝  ╚═╝'
-    ];
-    
+    const logoHQ = ['██╗  ██╗ ██████╗ ','██║  ██║██╔═══██╗','███████║██║   ██║','██╔══██║██║▄▄ ██║','██║  ██║╚██████╔╝','╚═╝  ╚═╝ ╚══▀▀═╝ '];
+    const logoX = ['██╗  ██╗','╚██╗██╔╝',' ╚███╔╝ ',' ██╔██╗ ','██╔╝ ██╗','╚═╝  ╚═╝'];
     logoHQ.forEach((line, i) => {
       const fullLine = chalk.cyan(line) + chalk.yellow(logoX[i]);
       const totalLen = line.length + logoX[i].length;
       const padding = innerWidth - totalLen;
       const leftPad = Math.floor(padding / 2);
-      const rightPad = padding - leftPad;
-      console.log(chalk.cyan('║') + ' '.repeat(leftPad) + fullLine + ' '.repeat(rightPad) + chalk.cyan('║'));
+      console.log(chalk.cyan('║') + ' '.repeat(leftPad) + fullLine + ' '.repeat(padding - leftPad) + chalk.cyan('║'));
     });
   } else {
-    // Full HEDGEQUANTX logo for desktop
     const logo = [
       '██╗  ██╗███████╗██████╗  ██████╗ ███████╗ ██████╗ ██╗   ██╗ █████╗ ███╗   ██╗████████╗',
       '██║  ██║██╔════╝██╔══██╗██╔════╝ ██╔════╝██╔═══██╗██║   ██║██╔══██╗████╗  ██║╚══██╔══╝',
@@ -158,80 +120,58 @@ const banner = async () => {
       '██║  ██║███████╗██████╔╝╚██████╔╝███████╗╚██████╔╝╚██████╔╝██║  ██║██║ ╚████║   ██║   ',
       '╚═╝  ╚═╝╚══════╝╚═════╝  ╚═════╝ ╚══════╝ ╚══▀▀═╝  ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═══╝   ╚═╝   '
     ];
-    const logoX = [
-      '██╗  ██╗',
-      '╚██╗██╔╝',
-      ' ╚███╔╝ ',
-      ' ██╔██╗ ',
-      '██╔╝ ██╗',
-      '╚═╝  ╚═╝'
-    ];
-    
+    const logoX = ['██╗  ██╗','╚██╗██╔╝',' ╚███╔╝ ',' ██╔██╗ ','██╔╝ ██╗','╚═╝  ╚═╝'];
     logo.forEach((line, i) => {
-      const mainPart = chalk.cyan(line);
-      const xPart = chalk.yellow(logoX[i]);
-      const fullLine = mainPart + xPart;
+      const fullLine = chalk.cyan(line) + chalk.yellow(logoX[i]);
       const totalLen = line.length + logoX[i].length;
       const padding = innerWidth - totalLen;
       const leftPad = Math.floor(padding / 2);
-      const rightPad = padding - leftPad;
-      console.log(chalk.cyan('║') + ' '.repeat(leftPad) + fullLine + ' '.repeat(rightPad) + chalk.cyan('║'));
+      console.log(chalk.cyan('║') + ' '.repeat(leftPad) + fullLine + ' '.repeat(padding - leftPad) + chalk.cyan('║'));
     });
   }
   
-  // Tagline
   console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
   const tagline = isMobile ? `HQX v${version}` : `Prop Futures Algo Trading  v${version}`;
   console.log(chalk.cyan('║') + chalk.white(centerText(tagline, innerWidth)) + chalk.cyan('║'));
-  
-  console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
+  // No closing line - dashboard will continue the box
 };
 
 /**
- * Main connection menu
+ * Main menu
  */
 const mainMenu = async () => {
   const boxWidth = getLogoWidth();
   const innerWidth = boxWidth - 2;
   const col1Width = Math.floor(innerWidth / 2);
-  const col2Width = innerWidth - col1Width;
   
-  // Connection menu box
-  console.log(chalk.cyan('╔' + '═'.repeat(innerWidth) + '╗'));
+  const menuRow = (left, right) => {
+    const leftPlain = left.replace(/\x1b\[[0-9;]*m/g, '');
+    const rightPlain = right ? right.replace(/\x1b\[[0-9;]*m/g, '') : '';
+    const leftPadded = '  ' + left + ' '.repeat(Math.max(0, col1Width - leftPlain.length - 2));
+    const rightPadded = (right || '') + ' '.repeat(Math.max(0, innerWidth - col1Width - rightPlain.length));
+    console.log(chalk.cyan('║') + leftPadded + rightPadded + chalk.cyan('║'));
+  };
+  
+  // Continue from banner
+  console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
   console.log(chalk.cyan('║') + chalk.white.bold(centerText('SELECT PLATFORM', innerWidth)) + chalk.cyan('║'));
   console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
   
-  // Menu row helper (2 columns)
-  const menuRow = (left, right) => {
-    const leftText = '  ' + left;
-    const rightText = right ? '  ' + right : '';
-    const leftLen = leftText.replace(/\x1b\[[0-9;]*m/g, '').length;
-    const rightLen = rightText.replace(/\x1b\[[0-9;]*m/g, '').length;
-    const leftPad = col1Width - leftLen;
-    const rightPad = col2Width - rightLen;
-    console.log(chalk.cyan('║') + leftText + ' '.repeat(Math.max(0, leftPad)) + rightText + ' '.repeat(Math.max(0, rightPad)) + chalk.cyan('║'));
-  };
+  menuRow(chalk.cyan('[1] ProjectX'), chalk.cyan('[2] Rithmic'));
+  menuRow(chalk.cyan('[3] Tradovate'), chalk.red('[X] Exit'));
   
   console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
-  console.log();
 
-  // Use list type - more stable stdin handling
-  const { action } = await inquirer.prompt([
-    {
-      type: 'list',
-      name: 'action',
-      message: chalk.cyan('Select platform:'),
-      choices: [
-        { name: chalk.cyan('[1] ProjectX'), value: 'projectx' },
-        { name: chalk.cyan('[2] Rithmic'), value: 'rithmic' },
-        { name: chalk.cyan('[3] Tradovate'), value: 'tradovate' },
-        { name: chalk.red('[X] Exit'), value: 'exit' }
-      ],
-      loop: false
-    }
-  ]);
+  const input = await prompts.textInput('Select (1/2/3/X)');
+  
+  const actionMap = {
+    '1': 'projectx',
+    '2': 'rithmic',
+    '3': 'tradovate',
+    'x': 'exit'
+  };
 
-  return action;
+  return actionMap[(input || '').toLowerCase()] || 'exit';
 };
 
 /**
@@ -242,121 +182,76 @@ const run = async () => {
     log.info('Starting HQX CLI');
     await banner();
     
-    // Try to restore session
-    log.debug('Attempting to restore session');
     const spinner = ora({ text: 'Restoring session...', color: 'yellow' }).start();
     const restored = await connections.restoreFromStorage();
     
     if (restored) {
       spinner.succeed('Session restored');
       currentService = connections.getAll()[0].service;
-      log.info('Session restored', { connections: connections.count() });
-      // Refresh stats after session restore
       await refreshStats();
     } else {
       spinner.info('No active session');
-      log.debug('No session to restore');
     }
 
-    // Main loop
     while (true) {
       try {
-        // Ensure stdin is ready for prompts (fixes input leaking to bash)
         prepareStdin();
-        
-        // Display banner (uses cached stats, no refetch)
         await banner();
         
         if (!connections.isConnected()) {
           const choice = await mainMenu();
-          log.debug('Main menu choice', { choice });
           
           if (choice === 'exit') {
-            log.info('User exit');
             console.log(chalk.gray('Goodbye!'));
             process.exit(0);
           }
           
-          if (choice === 'projectx') {
-            const service = await projectXMenu();
-            if (service) {
-              currentService = service;
-              await refreshStats(); // Refresh after new connection
-            }
-          }
-          
-          if (choice === 'rithmic') {
-            const service = await rithmicMenu();
-            if (service) {
-              currentService = service;
-              await refreshStats(); // Refresh after new connection
-            }
-          }
+          let service = null;
+          if (choice === 'projectx') service = await projectXMenu();
+          else if (choice === 'rithmic') service = await rithmicMenu();
+          else if (choice === 'tradovate') service = await tradovateMenu();
           
-          if (choice === 'tradovate') {
-            const service = await tradovateMenu();
-            if (service) {
-              currentService = service;
-              await refreshStats(); // Refresh after new connection
-            }
+          if (service) {
+            currentService = service;
+            await refreshStats();
           }
         } else {
           const action = await dashboardMenu(currentService);
-          log.debug('Dashboard action', { action });
           
           switch (action) {
             case 'accounts':
               await showAccounts(currentService);
               break;
-
             case 'stats':
               await showStats(currentService);
               break;
             case 'add_prop_account':
-              // Show platform selection menu
               const platformChoice = await addPropAccountMenu();
-              if (platformChoice === 'projectx') {
-                const newService = await projectXMenu();
-                if (newService) {
-                  currentService = newService;
-                  await refreshStats(); // Refresh after adding account
-                }
-              } else if (platformChoice === 'rithmic') {
-                const newService = await rithmicMenu();
-                if (newService) {
-                  currentService = newService;
-                  await refreshStats(); // Refresh after adding account
-                }
-              } else if (platformChoice === 'tradovate') {
-                const newService = await tradovateMenu();
-                if (newService) {
-                  currentService = newService;
-                  await refreshStats(); // Refresh after adding account
-                }
+              let newService = null;
+              if (platformChoice === 'projectx') newService = await projectXMenu();
+              else if (platformChoice === 'rithmic') newService = await rithmicMenu();
+              else if (platformChoice === 'tradovate') newService = await tradovateMenu();
+              if (newService) {
+                currentService = newService;
+                await refreshStats();
               }
               break;
             case 'algotrading':
               await algoTradingMenu(currentService);
               break;
             case 'update':
-              const updateResult = await handleUpdate();
-              if (updateResult === 'restart') return; // Stop loop, new process spawned
+              await handleUpdate();
               break;
             case 'disconnect':
-              const connCount = connections.count();
               connections.disconnectAll();
               currentService = null;
               clearCachedStats();
-              console.log(chalk.yellow(`Disconnected ${connCount} connection${connCount > 1 ? 's' : ''}`));
+              console.log(chalk.yellow('Disconnected'));
               break;
-            case 'exit':
-              console.log(chalk.gray('Goodbye!'));
-              process.exit(0);
           }
         }
       } catch (loopError) {
-        console.error(chalk.red('Error in main loop:'), loopError.message);
-        // Continue the loop
+        console.error(chalk.red('Error:'), loopError.message);
       }
     }
   } catch (error) {