hedgequantx 1.7.7 → 1.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "1.7.7",
+  "version": "1.7.8",
   "description": "Prop Futures Algo Trading CLI - Connect to Topstep, Alpha Futures, and other prop firms",
   "main": "src/app.js",
   "bin": {
@@ -41,7 +41,6 @@
     "src/"
   ],
   "dependencies": {
-    "@clack/prompts": "^0.11.0",
     "asciichart": "^1.5.25",
     "chalk": "^4.1.2",
     "commander": "^11.1.0",

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,80 +1,189 @@
 /**
- * Centralized prompts utility using @clack/prompts
- * Replaces inquirer throughout the app
+ * Centralized prompts utility - lightweight, no external UI
+ * Uses readline for simple input, keeps our custom box design
  */
 
-const { select, text, password, confirm, isCancel } = require('@clack/prompts');
 const readline = require('readline');
 
+/**
+ * Create readline interface
+ */
+const createRL = () => readline.createInterface({ 
+  input: process.stdin, 
+  output: process.stdout 
+});
+
 /**
  * Wait for Enter key
  */
 const waitForEnter = (message = 'Press Enter to continue...') => new Promise(resolve => {
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  const rl = createRL();
   rl.question(message, () => { rl.close(); resolve(); });
 });
 
 /**
- * Select from list
+ * Simple text input
  */
-const selectOption = async (message, options) => {
-  const result = await select({ message, options });
-  if (isCancel(result)) return null;
-  return result;
-};
+const textInput = (message, defaultVal = '') => new Promise(resolve => {
+  const rl = createRL();
+  const prompt = defaultVal ? `${message} (${defaultVal}): ` : `${message}: `;
+  rl.question(prompt, (answer) => {
+    rl.close();
+    resolve(answer.trim() || defaultVal);
+  });
+});
 
 /**
- * Text input
+ * Password input (hidden)
  */
-const textInput = async (message, initialValue = '', validate = null) => {
-  const opts = { message };
-  if (initialValue) opts.initialValue = initialValue;
-  if (validate) opts.validate = validate;
+const passwordInput = (message) => new Promise(resolve => {
+  const rl = createRL();
+  process.stdout.write(`${message}: `);
   
-  const result = await text(opts);
-  if (isCancel(result)) return null;
-  return result;
-};
+  if (process.stdin.isTTY) {
+    process.stdin.setRawMode(true);
+  }
+  
+  let password = '';
+  const onData = (char) => {
+    char = char.toString();
+    
+    if (char === '\n' || char === '\r') {
+      if (process.stdin.isTTY) process.stdin.setRawMode(false);
+      process.stdin.removeListener('data', onData);
+      console.log();
+      rl.close();
+      resolve(password);
+    } else if (char === '\u0003') { // Ctrl+C
+      if (process.stdin.isTTY) process.stdin.setRawMode(false);
+      process.stdin.removeListener('data', onData);
+      rl.close();
+      resolve(null);
+    } else if (char === '\u007F' || char === '\b') { // Backspace
+      if (password.length > 0) {
+        password = password.slice(0, -1);
+        process.stdout.write('\b \b');
+      }
+    } else {
+      password += char;
+      process.stdout.write('*');
+    }
+  };
+  
+  process.stdin.on('data', onData);
+  process.stdin.resume();
+});
 
 /**
- * Password input
+ * Select from options using arrow keys
  */
-const passwordInput = async (message, validate = null) => {
-  const opts = { message };
-  if (validate) opts.validate = validate;
+const selectOption = (message, options) => new Promise(resolve => {
+  if (!process.stdin.isTTY) {
+    // Fallback for non-TTY
+    const rl = createRL();
+    console.log(message);
+    options.forEach((opt, i) => console.log(`  ${i + 1}. ${opt.label}`));
+    rl.question('Enter number: ', (answer) => {
+      rl.close();
+      const idx = parseInt(answer) - 1;
+      resolve(options[idx]?.value || null);
+    });
+    return;
+  }
   
-  const result = await password(opts);
-  if (isCancel(result)) return null;
-  return result;
-};
+  let selectedIndex = 0;
+  const maxIndex = options.length - 1;
+  
+  const render = () => {
+    // Move cursor up and clear lines
+    if (selectedIndex > 0 || options.length > 1) {
+      process.stdout.write(`\x1B[${options.length}A`);
+    }
+    
+    options.forEach((opt, i) => {
+      const prefix = i === selectedIndex ? '› ' : '  ';
+      const style = i === selectedIndex ? '\x1B[36m' : '\x1B[90m'; // cyan : gray
+      process.stdout.write(`\x1B[2K${style}${prefix}${opt.label}\x1B[0m\n`);
+    });
+  };
+  
+  // Initial render
+  console.log(`\x1B[36m${message}\x1B[0m`);
+  options.forEach((opt, i) => {
+    const prefix = i === selectedIndex ? '› ' : '  ';
+    const style = i === selectedIndex ? '\x1B[36m' : '\x1B[90m';
+    console.log(`${style}${prefix}${opt.label}\x1B[0m`);
+  });
+  
+  readline.emitKeypressEvents(process.stdin);
+  process.stdin.setRawMode(true);
+  process.stdin.resume();
+  
+  const onKeypress = (str, key) => {
+    if (key.name === 'up' || key.name === 'k') {
+      selectedIndex = selectedIndex > 0 ? selectedIndex - 1 : maxIndex;
+      render();
+    } else if (key.name === 'down' || key.name === 'j') {
+      selectedIndex = selectedIndex < maxIndex ? selectedIndex + 1 : 0;
+      render();
+    } else if (key.name === 'return') {
+      cleanup();
+      resolve(options[selectedIndex].value);
+    } else if (key.name === 'escape' || (key.ctrl && key.name === 'c')) {
+      cleanup();
+      resolve(null);
+    } else if (str >= '1' && str <= '9') {
+      const idx = parseInt(str) - 1;
+      if (idx <= maxIndex) {
+        cleanup();
+        resolve(options[idx].value);
+      }
+    }
+  };
+  
+  const cleanup = () => {
+    process.stdin.removeListener('keypress', onKeypress);
+    if (process.stdin.isTTY) process.stdin.setRawMode(false);
+    // Clear the menu display
+    process.stdout.write(`\x1B[${options.length + 1}A`);
+    for (let i = 0; i <= options.length; i++) {
+      process.stdout.write('\x1B[2K\n');
+    }
+    process.stdout.write(`\x1B[${options.length + 1}A`);
+  };
+  
+  process.stdin.on('keypress', onKeypress);
+});
 
 /**
  * Confirm yes/no
  */
-const confirmPrompt = async (message, initial = true) => {
-  const result = await confirm({ message, initialValue: initial });
-  if (isCancel(result)) return null;
-  return result;
-};
+const confirmPrompt = (message, defaultVal = true) => new Promise(resolve => {
+  const rl = createRL();
+  const hint = defaultVal ? '(Y/n)' : '(y/N)';
+  rl.question(`${message} ${hint}: `, (answer) => {
+    rl.close();
+    const a = answer.toLowerCase().trim();
+    if (a === '') resolve(defaultVal);
+    else if (a === 'y' || a === 'yes') resolve(true);
+    else if (a === 'n' || a === 'no') resolve(false);
+    else resolve(defaultVal);
+  });
+});
 
 /**
- * Number input with validation
+ * Number input
  */
-const numberInput = async (message, defaultVal = 1, min = 1, max = 1000) => {
-  const result = await text({
-    message,
-    initialValue: String(defaultVal),
-    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;
-    }
+const numberInput = (message, defaultVal = 1, min = 1, max = 1000) => new Promise(resolve => {
+  const rl = createRL();
+  rl.question(`${message} (${defaultVal}): `, (answer) => {
+    rl.close();
+    const n = parseInt(answer) || defaultVal;
+    if (n < min) resolve(min);
+    else if (n > max) resolve(max);
+    else resolve(n);
   });
-  if (isCancel(result)) return null;
-  return parseInt(result);
-};
+});
 
 module.exports = {
   waitForEnter,
@@ -82,6 +191,5 @@ module.exports = {
   textInput,
   passwordInput,
   confirmPrompt,
-  numberInput,
-  isCancel
+  numberInput
 };