hedgequantx 1.2.143 → 1.2.145

package/package.json

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

package/src/app.js

@@ -46,6 +46,27 @@ const restoreTerminal = () => {
   }
 };
 
+/**
+ * Ensure stdin is ready for inquirer prompts
+ * This fixes input leaking to bash after session restore
+ */
+const prepareStdin = () => {
+  try {
+    // Remove any raw mode that might be left from previous operations
+    if (process.stdin.isTTY && process.stdin.isRaw) {
+      process.stdin.setRawMode(false);
+    }
+    // Remove any lingering keypress listeners
+    process.stdin.removeAllListeners('keypress');
+    process.stdin.removeAllListeners('data');
+    // Pause stdin so inquirer can take control
+    process.stdin.pause();
+    // Small delay to let event loop settle
+  } catch (e) {
+    // Ignore errors
+  }
+};
+
 // Register global handlers to restore terminal on exit/crash
 process.on('exit', restoreTerminal);
 process.on('SIGINT', () => { restoreTerminal(); process.exit(0); });
@@ -668,13 +689,56 @@ const dashboardMenu = async (service) => {
   console.log(chalk.cyan('║') + chalk.yellow.bold(centerLine('Welcome, HQX Trader!', W)) + chalk.cyan('║'));
   console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
   
-  // Connection info - show all active connections
+  // Connection info - show all active connections in boxes (max 3 per row)
   const allConns = connections.getAll();
   if (allConns.length > 0) {
-    allConns.forEach(c => {
-      const connText = c.propfirm || c.type || 'Connected';
-      console.log(chalk.cyan('║') + chalk.green(padLine(` ${connText}`, W)) + chalk.cyan('║'));
-    });
+    const maxPerRow = 3;
+    const boxPadding = 2; // padding inside each mini-box
+    const gap = 2; // gap between boxes
+    
+    // Calculate box width based on number of connections (max 3)
+    const numBoxes = Math.min(allConns.length, maxPerRow);
+    const totalGaps = (numBoxes - 1) * gap;
+    const boxWidth = Math.floor((W - totalGaps - 2) / numBoxes); // -2 for outer padding
+    
+    // Process connections in rows of 3
+    for (let rowStart = 0; rowStart < allConns.length; rowStart += maxPerRow) {
+      const rowConns = allConns.slice(rowStart, rowStart + maxPerRow);
+      const numInRow = rowConns.length;
+      const rowBoxWidth = Math.floor((W - (numInRow - 1) * gap - 2) / numInRow);
+      
+      // Top border of boxes
+      let topLine = ' ';
+      for (let i = 0; i < numInRow; i++) {
+        topLine += '┌' + '─'.repeat(rowBoxWidth - 2) + '┐';
+        if (i < numInRow - 1) topLine += ' '.repeat(gap);
+      }
+      const topPad = W - topLine.length;
+      console.log(chalk.cyan('║') + chalk.green(topLine) + ' '.repeat(Math.max(0, topPad)) + chalk.cyan('║'));
+      
+      // Content of boxes
+      let contentLine = ' ';
+      for (let i = 0; i < numInRow; i++) {
+        const connText = rowConns[i].propfirm || rowConns[i].type || 'Connected';
+        const truncated = connText.length > rowBoxWidth - 4 ? connText.slice(0, rowBoxWidth - 7) + '...' : connText;
+        const innerWidth = rowBoxWidth - 4; // -2 for borders, -2 for padding
+        const textPad = Math.floor((innerWidth - truncated.length) / 2);
+        const textPadRight = innerWidth - truncated.length - textPad;
+        contentLine += '│ ' + ' '.repeat(textPad) + truncated + ' '.repeat(textPadRight) + ' │';
+        if (i < numInRow - 1) contentLine += ' '.repeat(gap);
+      }
+      const contentPad = W - contentLine.length;
+      console.log(chalk.cyan('║') + chalk.green(contentLine) + ' '.repeat(Math.max(0, contentPad)) + chalk.cyan('║'));
+      
+      // Bottom border of boxes
+      let bottomLine = ' ';
+      for (let i = 0; i < numInRow; i++) {
+        bottomLine += '└' + '─'.repeat(rowBoxWidth - 2) + '┘';
+        if (i < numInRow - 1) bottomLine += ' '.repeat(gap);
+      }
+      const bottomPad = W - bottomLine.length;
+      console.log(chalk.cyan('║') + chalk.green(bottomLine) + ' '.repeat(Math.max(0, bottomPad)) + chalk.cyan('║'));
+    }
   }
   
   console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
@@ -802,89 +866,102 @@ const handleUpdate = async () => {
  * Main application loop
  */
 const run = async () => {
-  await banner();
-  
-  // Try to restore session
-  const spinner = ora('Restoring session...').start();
-  const restored = await connections.restoreFromStorage();
-  
-  if (restored) {
-    spinner.succeed('Session restored');
-    currentService = connections.getAll()[0].service;
-  } else {
-    spinner.info('No active session');
-  }
-
-  // Main loop
-  while (true) {
-    // Refresh banner with stats
+  try {
     await banner();
     
-    if (!connections.isConnected()) {
-      const choice = await mainMenu();
-      
-      if (choice === 'exit') {
-        console.log(chalk.gray('Goodbye!'));
-        process.exit(0);
-      }
-      
-      if (choice === 'projectx') {
-        const service = await projectXMenu();
-        if (service) currentService = service;
-      }
-      
-      if (choice === 'rithmic') {
-        const service = await rithmicMenu();
-        if (service) currentService = service;
-      }
-      
-      if (choice === 'tradovate') {
-        const service = await tradovateMenu();
-        if (service) currentService = service;
-      }
+    // Try to restore session
+    const spinner = ora('Restoring session...').start();
+    const restored = await connections.restoreFromStorage();
+    
+    if (restored) {
+      spinner.succeed('Session restored');
+      currentService = connections.getAll()[0].service;
     } else {
-      const action = await dashboardMenu(currentService);
-      
-      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;
-          } else if (platformChoice === 'rithmic') {
-            const newService = await rithmicMenu();
-            if (newService) currentService = newService;
-          } else if (platformChoice === 'tradovate') {
-            const newService = await tradovateMenu();
-            if (newService) currentService = newService;
+      spinner.info('No active session');
+    }
+
+    // Main loop
+    while (true) {
+      try {
+        // Ensure stdin is ready for prompts (fixes input leaking to bash)
+        prepareStdin();
+        
+        // Refresh banner with stats
+        await banner();
+        
+        if (!connections.isConnected()) {
+          const choice = await mainMenu();
+          
+          if (choice === 'exit') {
+            console.log(chalk.gray('Goodbye!'));
+            process.exit(0);
+          }
+          
+          if (choice === 'projectx') {
+            const service = await projectXMenu();
+            if (service) currentService = service;
           }
-          break;
-        case 'algotrading':
-          await algoTradingMenu(currentService);
-          break;
-        case 'update':
-          const updateResult = await handleUpdate();
-          if (updateResult === 'restart') return; // Stop loop, new process spawned
-          break;
-        case 'disconnect':
-          const connCount = connections.count();
-          connections.disconnectAll();
-          currentService = null;
-          console.log(chalk.yellow(`Disconnected ${connCount} connection${connCount > 1 ? 's' : ''}`));
-          break;
-        case 'exit':
-          console.log(chalk.gray('Goodbye!'));
-          process.exit(0);
+          
+          if (choice === 'rithmic') {
+            const service = await rithmicMenu();
+            if (service) currentService = service;
+          }
+          
+          if (choice === 'tradovate') {
+            const service = await tradovateMenu();
+            if (service) currentService = service;
+          }
+        } else {
+          const action = await dashboardMenu(currentService);
+          
+          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;
+              } else if (platformChoice === 'rithmic') {
+                const newService = await rithmicMenu();
+                if (newService) currentService = newService;
+              } else if (platformChoice === 'tradovate') {
+                const newService = await tradovateMenu();
+                if (newService) currentService = newService;
+              }
+              break;
+            case 'algotrading':
+              await algoTradingMenu(currentService);
+              break;
+            case 'update':
+              const updateResult = await handleUpdate();
+              if (updateResult === 'restart') return; // Stop loop, new process spawned
+              break;
+            case 'disconnect':
+              const connCount = connections.count();
+              connections.disconnectAll();
+              currentService = null;
+              console.log(chalk.yellow(`Disconnected ${connCount} connection${connCount > 1 ? 's' : ''}`));
+              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
       }
     }
+  } catch (error) {
+    console.error(chalk.red('Fatal error:'), error.message);
+    process.exit(1);
   }
 };