hedgequantx 1.7.7 → 1.7.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "1.7.7",
+  "version": "1.7.9",
   "description": "Prop Futures Algo Trading CLI - Connect to Topstep, Alpha Futures, and other prop firms",
   "main": "src/app.js",
   "bin": {
@@ -41,11 +41,11 @@
     "src/"
   ],
   "dependencies": {
-    "@clack/prompts": "^0.11.0",
     "asciichart": "^1.5.25",
     "chalk": "^4.1.2",
     "commander": "^11.1.0",
     "figlet": "^1.7.0",
+    "inquirer": "^8.2.7",
     "ora": "^5.4.1",
     "protobufjs": "^8.0.0",
     "ws": "^8.18.3"

package/src/app.js

@@ -133,7 +133,7 @@ const banner = async () => {
   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
 };
 
 /**
@@ -142,20 +142,36 @@ const banner = async () => {
 const mainMenu = async () => {
   const boxWidth = getLogoWidth();
   const innerWidth = boxWidth - 2;
+  const col1Width = Math.floor(innerWidth / 2);
   
-  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) + '╣'));
+  
+  menuRow(chalk.cyan('[1] ProjectX'), chalk.cyan('[2] Rithmic'));
+  menuRow(chalk.cyan('[3] Tradovate'), chalk.red('[X] Exit'));
+  
   console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
 
-  const action = await prompts.selectOption('Select platform:', [
-    { value: 'projectx', label: '[1] ProjectX' },
-    { value: 'rithmic', label: '[2] Rithmic' },
-    { value: 'tradovate', label: '[3] Tradovate' },
-    { value: 'exit', label: '[X] Exit' }
-  ]);
+  const input = await prompts.textInput('Select (1/2/3/X)');
+  
+  const actionMap = {
+    '1': 'projectx',
+    '2': 'rithmic',
+    '3': 'tradovate',
+    'x': 'exit'
+  };
 
-  return action || 'exit';
+  return actionMap[(input || '').toLowerCase()] || 'exit';
 };
 
 /**

package/src/menus/dashboard.js

@@ -30,7 +30,8 @@ const dashboardMenu = async (service) => {
     return chalk.cyan('║') + content + ' '.repeat(Math.max(0, padding)) + chalk.cyan('║');
   };
   
-  console.log(chalk.cyan('╔' + '═'.repeat(W) + '╗'));
+  // Continue from banner (no top border)
+  console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
   console.log(makeLine(chalk.yellow.bold('Welcome, HQX Trader!'), 'center'));
   console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
   
@@ -89,16 +90,19 @@ const dashboardMenu = async (service) => {
   
   console.log(chalk.cyan('╚' + '═'.repeat(W) + '╝'));
   
-  const action = await prompts.selectOption('Select:', [
-    { value: 'accounts', label: '[1] View Accounts' },
-    { value: 'stats', label: '[2] View Stats' },
-    { value: 'add_prop_account', label: '[+] Add Prop-Account' },
-    { value: 'algotrading', label: '[A] Algo-Trading' },
-    { value: 'update', label: '[U] Update HQX' },
-    { value: 'disconnect', label: '[X] Disconnect' }
-  ]);
+  // Simple input - no duplicate menu
+  const input = await prompts.textInput('Select (1/2/+/A/U/X)');
+  
+  const actionMap = {
+    '1': 'accounts',
+    '2': 'stats',
+    '+': 'add_prop_account',
+    'a': 'algotrading',
+    'u': 'update',
+    'x': 'disconnect'
+  };
   
-  return action || 'disconnect';
+  return actionMap[(input || '').toLowerCase()] || null;
 };
 
 /**

package/src/utils/prompts.js

@@ -1,87 +1,127 @@
 /**
- * Centralized prompts utility using @clack/prompts
- * Replaces inquirer throughout the app
+ * Centralized prompts utility
+ * Uses inquirer for reliable stdin handling
  */
 
-const { select, text, password, confirm, isCancel } = require('@clack/prompts');
-const readline = require('readline');
+const inquirer = require('inquirer');
 
 /**
- * Wait for Enter key
+ * Ensure stdin is ready
  */
-const waitForEnter = (message = 'Press Enter to continue...') => new Promise(resolve => {
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  rl.question(message, () => { rl.close(); resolve(); });
-});
+const prepareStdin = () => {
+  try {
+    if (process.stdin.isPaused()) process.stdin.resume();
+    if (process.stdin.isTTY && process.stdin.isRaw) process.stdin.setRawMode(false);
+  } catch (e) {}
+};
 
 /**
- * Select from list
+ * Wait for Enter
  */
-const selectOption = async (message, options) => {
-  const result = await select({ message, options });
-  if (isCancel(result)) return null;
-  return result;
+const waitForEnter = async (message = 'Press Enter to continue...') => {
+  prepareStdin();
+  await inquirer.prompt([{ type: 'input', name: '_', message, prefix: '' }]);
 };
 
 /**
  * Text input
  */
-const textInput = async (message, initialValue = '', validate = null) => {
-  const opts = { message };
-  if (initialValue) opts.initialValue = initialValue;
-  if (validate) opts.validate = validate;
-  
-  const result = await text(opts);
-  if (isCancel(result)) return null;
-  return result;
+const textInput = async (message, defaultVal = '') => {
+  prepareStdin();
+  const { value } = await inquirer.prompt([{
+    type: 'input',
+    name: 'value',
+    message,
+    default: defaultVal,
+    prefix: ''
+  }]);
+  return value;
 };
 
 /**
  * Password input
  */
-const passwordInput = async (message, validate = null) => {
-  const opts = { message };
-  if (validate) opts.validate = validate;
-  
-  const result = await password(opts);
-  if (isCancel(result)) return null;
-  return result;
+const passwordInput = async (message) => {
+  prepareStdin();
+  const { value } = await inquirer.prompt([{
+    type: 'password',
+    name: 'value',
+    message,
+    mask: '*',
+    prefix: ''
+  }]);
+  return value;
 };
 
 /**
- * Confirm yes/no
+ * Confirm Y/n
  */
-const confirmPrompt = async (message, initial = true) => {
-  const result = await confirm({ message, initialValue: initial });
-  if (isCancel(result)) return null;
-  return result;
+const confirmPrompt = async (message, defaultVal = true) => {
+  prepareStdin();
+  const { value } = await inquirer.prompt([{
+    type: 'confirm',
+    name: 'value',
+    message,
+    default: defaultVal,
+    prefix: ''
+  }]);
+  return value;
 };
 
 /**
- * Number input with validation
+ * Number input
  */
 const numberInput = async (message, defaultVal = 1, min = 1, max = 1000) => {
-  const result = await text({
+  prepareStdin();
+  const { value } = await inquirer.prompt([{
+    type: 'input',
+    name: 'value',
     message,
-    initialValue: String(defaultVal),
-    validate: v => {
+    default: String(defaultVal),
+    prefix: '',
+    validate: (v) => {
       const n = parseInt(v);
       if (isNaN(n)) return 'Enter a number';
-      if (n < min) return `Minimum is ${min}`;
-      if (n > max) return `Maximum is ${max}`;
-      return undefined;
+      if (n < min) return `Min: ${min}`;
+      if (n > max) return `Max: ${max}`;
+      return true;
     }
-  });
-  if (isCancel(result)) return null;
-  return parseInt(result);
+  }]);
+  return parseInt(value) || defaultVal;
+};
+
+/**
+ * Select - just text input, map to value
+ */
+const selectOption = async (message, options) => {
+  prepareStdin();
+  const { value } = await inquirer.prompt([{
+    type: 'input',
+    name: 'value',
+    message,
+    prefix: ''
+  }]);
+  
+  const input = (value || '').toLowerCase().trim();
+  
+  // Find by value
+  for (const opt of options) {
+    if (String(opt.value).toLowerCase() === input) return opt.value;
+  }
+  
+  // Find by index (1-based)
+  const idx = parseInt(input) - 1;
+  if (idx >= 0 && idx < options.length) return options[idx].value;
+  
+  return null;
 };
 
 module.exports = {
+  prepareStdin,
   waitForEnter,
-  selectOption,
   textInput,
   passwordInput,
   confirmPrompt,
   numberInput,
-  isCancel
+  selectOption
 };