hedgequantx 1.7.6 → 1.7.7

package/src/pages/algo/one-account.js

@@ -1,30 +1,27 @@
 /**
- * One Account Mode - Single account algo trading
- * Lightweight - UI + HQX Server connection only
+ * One Account Mode
  */
 
 const chalk = require('chalk');
 const ora = require('ora');
-const inquirer = require('inquirer');
 const readline = require('readline');
 
 const { connections } = require('../../services');
 const { HQXServerService } = require('../../services/hqx-server');
-const { FUTURES_SYMBOLS } = require('../../config');
-const { AlgoUI, checkMarketStatus } = require('./ui');
+const { AlgoUI } = require('./ui');
+const { prompts } = require('../../utils');
 
 /**
- * One Account Menu - Select account and launch
+ * One Account Menu
  */
 const oneAccountMenu = async (service) => {
   const spinner = ora({ text: 'Fetching active accounts...', color: 'yellow' }).start();
   
-  // Get ALL accounts from ALL connections
   const allAccounts = await connections.getAllAccounts();
   
   if (!allAccounts?.length) {
     spinner.fail('No accounts found');
-    await inquirer.prompt([{ type: 'input', name: 'c', message: 'Press Enter...' }]);
+    await prompts.waitForEnter();
     return;
   }
   
@@ -32,32 +29,22 @@ const oneAccountMenu = async (service) => {
   
   if (!activeAccounts.length) {
     spinner.fail('No active accounts');
-    await inquirer.prompt([{ type: 'input', name: 'c', message: 'Press Enter...' }]);
+    await prompts.waitForEnter();
     return;
   }
   
   spinner.succeed(`Found ${activeAccounts.length} active account(s)`);
   
-  // Select account - show propfirm for clarity
-  const { selectedAccount } = await inquirer.prompt([{
-    type: 'list',
-    name: 'selectedAccount',
-    message: 'Select Account:',
-    choices: [
-      ...activeAccounts.map(acc => ({
-        name: chalk.cyan(`${acc.accountName || acc.accountId}`) + 
-              chalk.gray(` (${acc.propfirm || 'Unknown'})`) + 
-              chalk.white(` - $${(acc.balance || 0).toLocaleString()}`),
-        value: acc
-      })),
-      new inquirer.Separator(),
-      { name: chalk.yellow('< Back'), value: 'back' }
-    ]
-  }]);
-  
-  if (selectedAccount === 'back') return;
-  
-  // Find the service for this account
+  // Select account
+  const options = activeAccounts.map(acc => ({
+    label: `${acc.accountName || acc.accountId} (${acc.propfirm || 'Unknown'}) - $${(acc.balance || 0).toLocaleString()}`,
+    value: acc
+  }));
+  options.push({ label: '< Back', value: 'back' });
+  
+  const selectedAccount = await prompts.selectOption('Select Account:', options);
+  if (!selectedAccount || selectedAccount === 'back') return;
+  
   const accountService = connections.getServiceForAccount(selectedAccount.accountId) || service;
   
   // Select symbol
@@ -68,7 +55,6 @@ const oneAccountMenu = async (service) => {
   const config = await configureAlgo(selectedAccount, contract);
   if (!config) return;
   
-  // Launch with the correct service for this account
   await launchAlgo(accountService, selectedAccount, contract, config);
 };
 
@@ -94,74 +80,40 @@ const selectSymbol = async (service, account) => {
     categories[cat].push(c);
   }
   
-  // Build choices
-  const choices = [];
+  // Flatten with categories as hints
+  const options = [];
   for (const [cat, contracts] of Object.entries(categories)) {
-    choices.push(new inquirer.Separator(chalk.gray(`--- ${cat} ---`)));
     for (const c of contracts.slice(0, 10)) {
-      choices.push({ name: chalk.white(c.name || c.symbol), value: c });
+      options.push({ label: `[${cat}] ${c.name || c.symbol}`, value: c });
     }
   }
-  choices.push(new inquirer.Separator());
-  choices.push({ name: chalk.yellow('< Back'), value: 'back' });
-  
-  const { contract } = await inquirer.prompt([{
-    type: 'list',
-    name: 'contract',
-    message: 'Select Symbol:',
-    choices,
-    pageSize: 20
-  }]);
+  options.push({ label: '< Back', value: 'back' });
   
+  const contract = await prompts.selectOption('Select Symbol:', options);
   return contract === 'back' ? null : contract;
 };
 
 /**
- * Configure algo parameters
+ * Configure algo
  */
 const configureAlgo = async (account, contract) => {
   console.log();
   console.log(chalk.cyan('  Configure Algo Parameters'));
   console.log();
   
-  const { contracts } = await inquirer.prompt([{
-    type: 'number',
-    name: 'contracts',
-    message: 'Number of contracts:',
-    default: 1,
-    validate: v => v > 0 && v <= 10 ? true : 'Enter 1-10'
-  }]);
-  
-  const { dailyTarget } = await inquirer.prompt([{
-    type: 'number',
-    name: 'dailyTarget',
-    message: 'Daily target ($):',
-    default: 200,
-    validate: v => v > 0 ? true : 'Must be positive'
-  }]);
-  
-  const { maxRisk } = await inquirer.prompt([{
-    type: 'number',
-    name: 'maxRisk',
-    message: 'Max risk ($):',
-    default: 100,
-    validate: v => v > 0 ? true : 'Must be positive'
-  }]);
-  
-  const { showName } = await inquirer.prompt([{
-    type: 'confirm',
-    name: 'showName',
-    message: 'Show account name?',
-    default: true
-  }]);
-  
-  const { confirm } = await inquirer.prompt([{
-    type: 'confirm',
-    name: 'confirm',
-    message: chalk.yellow('Start algo trading?'),
-    default: true
-  }]);
+  const contracts = await prompts.numberInput('Number of contracts:', 1, 1, 10);
+  if (contracts === null) return null;
+  
+  const dailyTarget = await prompts.numberInput('Daily target ($):', 200, 1, 10000);
+  if (dailyTarget === null) return null;
   
+  const maxRisk = await prompts.numberInput('Max risk ($):', 100, 1, 5000);
+  if (maxRisk === null) return null;
+  
+  const showName = await prompts.confirmPrompt('Show account name?', true);
+  if (showName === null) return null;
+  
+  const confirm = await prompts.confirmPrompt('Start algo trading?', true);
   if (!confirm) return null;
   
   return { contracts, dailyTarget, maxRisk, showName };
@@ -175,30 +127,19 @@ const launchAlgo = async (service, account, contract, config) => {
   const accountName = showName ? (account.accountName || account.accountId) : 'HQX *****';
   const symbolName = contract.name || contract.symbol;
   
-  // Initialize UI
   const ui = new AlgoUI({ subtitle: 'HQX Ultra-Scalping' });
   
-  // Stats state
   const stats = {
-    accountName,
-    symbol: symbolName,
-    contracts,
-    target: dailyTarget,
-    risk: maxRisk,
-    pnl: 0,
-    trades: 0,
-    wins: 0,
-    losses: 0,
-    latency: 0,
-    connected: false
+    accountName, symbol: symbolName, contracts,
+    target: dailyTarget, risk: maxRisk,
+    pnl: 0, trades: 0, wins: 0, losses: 0,
+    latency: 0, connected: false
   };
   
   let running = true;
   let stopReason = null;
   
-  // Connect to HQX Server
   const hqx = new HQXServerService();
-  
   const spinner = ora({ text: 'Connecting to HQX Server...', color: 'yellow' }).start();
   
   try {
@@ -211,106 +152,72 @@ const launchAlgo = async (service, account, contract, config) => {
     
     spinner.succeed('Connected to HQX Server');
     stats.connected = true;
-    
   } catch (err) {
     spinner.warn('HQX Server unavailable - offline mode');
-    stats.connected = false;
   }
   
   // Event handlers
-  hqx.on('latency', (data) => { stats.latency = data.latency || 0; });
-  
-  hqx.on('log', (data) => {
-    let msg = data.message;
-    if (!showName && account.accountName) {
-      msg = msg.replace(new RegExp(account.accountName, 'gi'), 'HQX *****');
-    }
-    ui.addLog(data.type || 'info', msg);
+  hqx.on('latency', (d) => { stats.latency = d.latency || 0; });
+  hqx.on('log', (d) => {
+    let msg = d.message;
+    if (!showName && account.accountName) msg = msg.replace(new RegExp(account.accountName, 'gi'), 'HQX *****');
+    ui.addLog(d.type || 'info', msg);
   });
-  
-  hqx.on('signal', (data) => {
+  hqx.on('signal', (d) => {
     stats.signals = (stats.signals || 0) + 1;
-    const side = data.side === 'long' ? 'BUY' : 'SELL';
-    ui.addLog('signal', `${side} @ ${data.entry?.toFixed(2) || 'MKT'}`);
+    ui.addLog('signal', `${d.side === 'long' ? 'BUY' : 'SELL'} @ ${d.entry?.toFixed(2) || 'MKT'}`);
   });
-  
-  hqx.on('trade', (data) => {
+  hqx.on('trade', (d) => {
     stats.trades++;
-    stats.pnl += data.pnl || 0;
-    if (data.pnl >= 0) {
-      stats.wins++;
-      ui.addLog('trade', `+$${data.pnl.toFixed(2)}`);
-    } else {
-      stats.losses++;
-      ui.addLog('loss', `-$${Math.abs(data.pnl).toFixed(2)}`);
-    }
+    stats.pnl += d.pnl || 0;
+    if (d.pnl >= 0) { stats.wins++; ui.addLog('trade', `+$${d.pnl.toFixed(2)}`); }
+    else { stats.losses++; ui.addLog('loss', `-$${Math.abs(d.pnl).toFixed(2)}`); }
     
-    // Check targets
     if (stats.pnl >= dailyTarget) {
-      stopReason = 'target';
-      running = false;
-      ui.addLog('success', `TARGET REACHED! +$${stats.pnl.toFixed(2)}`);
+      stopReason = 'target'; running = false;
+      ui.addLog('success', `TARGET! +$${stats.pnl.toFixed(2)}`);
       hqx.stopAlgo();
     } else if (stats.pnl <= -maxRisk) {
-      stopReason = 'risk';
-      running = false;
+      stopReason = 'risk'; running = false;
       ui.addLog('error', `MAX RISK! -$${Math.abs(stats.pnl).toFixed(2)}`);
       hqx.stopAlgo();
     }
   });
+  hqx.on('error', (d) => { ui.addLog('error', d.message || 'Error'); });
+  hqx.on('disconnected', () => { stats.connected = false; ui.addLog('warning', 'Disconnected'); });
   
-  hqx.on('error', (data) => {
-    ui.addLog('error', data.message || 'Error');
-  });
-  
-  hqx.on('disconnected', () => {
-    stats.connected = false;
-    ui.addLog('warning', 'Server disconnected');
-  });
-  
-  // Start algo on server
+  // Start on server
   if (stats.connected) {
     ui.addLog('info', 'Starting algo...');
     
-    // Get credentials if Rithmic
     let rithmicCreds = null;
-    if (service.getRithmicCredentials) {
-      rithmicCreds = service.getRithmicCredentials();
-    }
+    if (service.getRithmicCredentials) rithmicCreds = service.getRithmicCredentials();
     
     hqx.startAlgo({
       accountId: account.accountId,
       contractId: contract.id || contract.contractId,
       symbol: contract.symbol || contract.name,
-      contracts,
-      dailyTarget,
-      maxRisk,
+      contracts, dailyTarget, maxRisk,
       propfirm: account.propfirm || 'topstep',
-      propfirmToken: service.getToken ? service.getToken() : null,
+      propfirmToken: service.getToken?.() || null,
       rithmicCredentials: rithmicCreds
     });
   }
   
-  // UI refresh interval
-  const refreshInterval = setInterval(() => {
-    if (running) ui.render(stats);
-  }, 250);
+  const refreshInterval = setInterval(() => { if (running) ui.render(stats); }, 250);
   
-  // Keyboard handler
+  // Keyboard
   const setupKeyHandler = () => {
     if (!process.stdin.isTTY) return;
-    
     readline.emitKeypressEvents(process.stdin);
     process.stdin.setRawMode(true);
     process.stdin.resume();
     
     const onKey = (str, key) => {
       if (key && (key.name === 'x' || key.name === 'X' || (key.ctrl && key.name === 'c'))) {
-        running = false;
-        stopReason = 'manual';
+        running = false; stopReason = 'manual';
       }
     };
-    
     process.stdin.on('keypress', onKey);
     return () => {
       process.stdin.removeListener('keypress', onKey);
@@ -320,39 +227,26 @@ const launchAlgo = async (service, account, contract, config) => {
   
   const cleanupKeys = setupKeyHandler();
   
-  // Wait for stop
   await new Promise(resolve => {
-    const check = setInterval(() => {
-      if (!running) {
-        clearInterval(check);
-        resolve();
-      }
-    }, 100);
+    const check = setInterval(() => { if (!running) { clearInterval(check); resolve(); } }, 100);
   });
   
-  // Cleanup
   clearInterval(refreshInterval);
   if (cleanupKeys) cleanupKeys();
-  
-  if (stats.connected) {
-    hqx.stopAlgo();
-    hqx.disconnect();
-  }
-  
+  if (stats.connected) { hqx.stopAlgo(); hqx.disconnect(); }
   ui.cleanup();
   
-  // Final summary
+  // Summary
   console.clear();
   console.log();
   console.log(chalk.cyan('  === Session Summary ==='));
   console.log();
   console.log(chalk.white(`  Stop Reason: ${stopReason || 'unknown'}`));
   console.log(chalk.white(`  Trades: ${stats.trades} (W: ${stats.wins} / L: ${stats.losses})`));
-  const pnlColor = stats.pnl >= 0 ? chalk.green : chalk.red;
-  console.log(pnlColor(`  P&L: ${stats.pnl >= 0 ? '+' : ''}$${stats.pnl.toFixed(2)}`));
+  console.log((stats.pnl >= 0 ? chalk.green : chalk.red)(`  P&L: ${stats.pnl >= 0 ? '+' : ''}$${stats.pnl.toFixed(2)}`));
   console.log();
   
-  await inquirer.prompt([{ type: 'input', name: 'c', message: 'Press Enter to continue...' }]);
+  await prompts.waitForEnter();
 };
 
 module.exports = { oneAccountMenu };

package/src/pages/orders.js

@@ -1,25 +1,22 @@
 /**
- * @fileoverview Orders page
- * @module pages/orders
+ * Orders page
  */
 
 const chalk = require('chalk');
 const ora = require('ora');
-const inquirer = require('inquirer');
 
 const { connections } = require('../services');
 const { ORDER_STATUS, ORDER_TYPE, ORDER_SIDE } = require('../config');
-const { getLogoWidth, drawBoxHeader, drawBoxFooter, drawBoxRow, drawBoxSeparator, visibleLength, padText } = require('../ui');
+const { getLogoWidth, drawBoxHeader, drawBoxFooter, drawBoxRow, drawBoxSeparator } = require('../ui');
+const { prompts } = require('../utils');
 
 /**
- * Shows all orders from all connections
- * @param {Object} service - Current service
+ * Show all orders
  */
 const showOrders = async (service) => {
   const spinner = ora({ text: 'Fetching orders...', color: 'yellow' }).start();
   const boxWidth = getLogoWidth();
 
-  // Get all accounts first
   let allAccounts = [];
   
   if (connections.count() > 0) {
@@ -28,14 +25,10 @@ const showOrders = async (service) => {
         const result = await conn.service.getTradingAccounts();
         if (result.success && result.accounts) {
           result.accounts.forEach(account => {
-            allAccounts.push({
-              ...account,
-              propfirm: conn.propfirm || conn.type,
-              service: conn.service
-            });
+            allAccounts.push({ ...account, propfirm: conn.propfirm || conn.type, service: conn.service });
           });
         }
-      } catch (e) { /* ignore */ }
+      } catch (e) {}
     }
   } else if (service) {
     const result = await service.getTradingAccounts();
@@ -44,22 +37,17 @@ const showOrders = async (service) => {
     }
   }
 
-  // Get orders for each account
   let allOrders = [];
   
   for (const account of allAccounts) {
     try {
       const result = await account.service.getOrders(account.accountId);
-      if (result.success && result.orders && result.orders.length > 0) {
+      if (result.success && result.orders?.length > 0) {
         result.orders.forEach(order => {
-          allOrders.push({
-            ...order,
-            accountName: account.accountName || account.name,
-            propfirm: account.propfirm
-          });
+          allOrders.push({ ...order, accountName: account.accountName || account.name, propfirm: account.propfirm });
         });
       }
-    } catch (e) { /* ignore */ }
+    } catch (e) {}
   }
 
   spinner.succeed(`Found ${allOrders.length} order(s)`);
@@ -70,19 +58,10 @@ const showOrders = async (service) => {
   if (allOrders.length === 0) {
     drawBoxRow(chalk.gray('  No orders found'), boxWidth);
   } else {
-    // Header row
-    const header = '  ' +
-      'Symbol'.padEnd(12) +
-      'Side'.padEnd(6) +
-      'Type'.padEnd(8) +
-      'Qty'.padEnd(6) +
-      'Price'.padEnd(10) +
-      'Status'.padEnd(12) +
-      'Account';
+    const header = '  ' + 'Symbol'.padEnd(12) + 'Side'.padEnd(6) + 'Type'.padEnd(8) + 'Qty'.padEnd(6) + 'Price'.padEnd(10) + 'Status'.padEnd(12) + 'Account';
     drawBoxRow(chalk.white.bold(header), boxWidth);
     drawBoxSeparator(boxWidth);
 
-    // Order rows
     for (const order of allOrders) {
       const symbol = (order.contractId || order.symbol || 'Unknown').substring(0, 11);
       const sideInfo = ORDER_SIDE[order.side] || { text: '?', color: 'white' };
@@ -108,7 +87,7 @@ const showOrders = async (service) => {
   drawBoxFooter(boxWidth);
   console.log();
 
-  await inquirer.prompt([{ type: 'input', name: 'c', message: 'Press Enter to continue...' }]);
+  await prompts.waitForEnter();
 };
 
 module.exports = { showOrders };

package/src/pages/positions.js

@@ -1,26 +1,22 @@
 /**
- * @fileoverview Positions page
- * @module pages/positions
+ * Positions page
  */
 
 const chalk = require('chalk');
 const ora = require('ora');
-const inquirer = require('inquirer');
 
 const { connections } = require('../services');
 const { ORDER_SIDE } = require('../config');
-const { getLogoWidth, drawBoxHeader, drawBoxFooter, drawBoxRow, drawBoxSeparator, visibleLength, padText } = require('../ui');
+const { getLogoWidth, drawBoxHeader, drawBoxFooter, drawBoxRow, drawBoxSeparator } = require('../ui');
+const { prompts } = require('../utils');
 
 /**
- * Shows all open positions from all connections
- * @param {Object} service - Current service
+ * Show all open positions
  */
 const showPositions = async (service) => {
   const spinner = ora({ text: 'Fetching positions...', color: 'yellow' }).start();
   const boxWidth = getLogoWidth();
-  const innerWidth = boxWidth - 2;
 
-  // Get all accounts first
   let allAccounts = [];
   
   if (connections.count() > 0) {
@@ -29,14 +25,10 @@ const showPositions = async (service) => {
         const result = await conn.service.getTradingAccounts();
         if (result.success && result.accounts) {
           result.accounts.forEach(account => {
-            allAccounts.push({
-              ...account,
-              propfirm: conn.propfirm || conn.type,
-              service: conn.service
-            });
+            allAccounts.push({ ...account, propfirm: conn.propfirm || conn.type, service: conn.service });
           });
         }
-      } catch (e) { /* ignore */ }
+      } catch (e) {}
     }
   } else if (service) {
     const result = await service.getTradingAccounts();
@@ -45,22 +37,17 @@ const showPositions = async (service) => {
     }
   }
 
-  // Get positions for each account
   let allPositions = [];
   
   for (const account of allAccounts) {
     try {
       const result = await account.service.getPositions(account.accountId);
-      if (result.success && result.positions && result.positions.length > 0) {
+      if (result.success && result.positions?.length > 0) {
         result.positions.forEach(pos => {
-          allPositions.push({
-            ...pos,
-            accountName: account.accountName || account.name,
-            propfirm: account.propfirm
-          });
+          allPositions.push({ ...pos, accountName: account.accountName || account.name, propfirm: account.propfirm });
         });
       }
-    } catch (e) { /* ignore */ }
+    } catch (e) {}
   }
 
   spinner.succeed(`Found ${allPositions.length} position(s)`);
@@ -71,18 +58,10 @@ const showPositions = async (service) => {
   if (allPositions.length === 0) {
     drawBoxRow(chalk.gray('  No open positions'), boxWidth);
   } else {
-    // Header row
-    const header = '  ' + 
-      'Symbol'.padEnd(15) + 
-      'Side'.padEnd(8) + 
-      'Size'.padEnd(8) + 
-      'Entry'.padEnd(12) + 
-      'P&L'.padEnd(12) + 
-      'Account';
+    const header = '  ' + 'Symbol'.padEnd(15) + 'Side'.padEnd(8) + 'Size'.padEnd(8) + 'Entry'.padEnd(12) + 'P&L'.padEnd(12) + 'Account';
     drawBoxRow(chalk.white.bold(header), boxWidth);
     drawBoxSeparator(boxWidth);
 
-    // Position rows
     for (const pos of allPositions) {
       const symbol = (pos.contractId || pos.symbol || 'Unknown').substring(0, 14);
       const sideInfo = ORDER_SIDE[pos.side] || { text: 'Unknown', color: 'white' };
@@ -109,7 +88,7 @@ const showPositions = async (service) => {
   drawBoxFooter(boxWidth);
   console.log();
 
-  await inquirer.prompt([{ type: 'input', name: 'c', message: 'Press Enter to continue...' }]);
+  await prompts.waitForEnter();
 };
 
 module.exports = { showPositions };

package/src/pages/stats.js

@@ -4,21 +4,12 @@
 
 const chalk = require('chalk');
 const ora = require('ora');
-const inquirer = require('inquirer');
 const asciichart = require('asciichart');
 
 const { connections } = require('../services');
 const { ACCOUNT_STATUS, ACCOUNT_TYPE } = require('../config');
-const {
-  getLogoWidth,
-  visibleLength,
-  drawBoxHeader,
-  drawBoxFooter,
-  getColWidths,
-  draw2ColHeader,
-  draw2ColSeparator,
-  fmtRow
-} = require('../ui');
+const { getLogoWidth, visibleLength, drawBoxHeader, drawBoxFooter, getColWidths, draw2ColHeader, draw2ColSeparator, fmtRow } = require('../ui');
+const { prompts } = require('../utils');
 
 /**
  * Show Stats Page
@@ -53,7 +44,7 @@ const showStats = async (service) => {
   
   if (allAccountsData.length === 0) {
     spinner.fail('No accounts found');
-    await inquirer.prompt([{ type: 'input', name: 'continue', message: 'Press Enter to continue...' }]);
+    await prompts.waitForEnter();
     return;
   }
 
@@ -70,7 +61,7 @@ const showStats = async (service) => {
   
   if (activeAccounts.length === 0) {
     spinner.fail('No active accounts found');
-    await inquirer.prompt([{ type: 'input', name: 'continue', message: 'Press Enter to continue...' }]);
+    await prompts.waitForEnter();
     return;
   }
 
@@ -498,7 +489,7 @@ const showStats = async (service) => {
   drawBoxFooter(boxWidth);
   console.log();
   
-  await inquirer.prompt([{ type: 'input', name: 'continue', message: 'Press Enter to continue...' }]);
+  await prompts.waitForEnter();
 };
 
 module.exports = { showStats };