hedgequantx 1.7.6 → 1.7.8

package/src/pages/algo/copy-trading.js

@@ -1,18 +1,15 @@
 /**
- * Copy Trading Mode - Mirror trades from Lead to Follower
- * Lightweight - UI + HQX Server handles all execution
+ * Copy Trading 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 } = require('./ui');
-const { logger } = require('../../utils');
+const { logger, prompts } = require('../../utils');
 
 const log = logger.scope('CopyTrading');
 
@@ -22,14 +19,13 @@ const log = logger.scope('CopyTrading');
 const copyTradingMenu = async () => {
   log.info('Copy Trading menu opened');
   const allConns = connections.getAll();
-  log.debug('Connections found', { count: allConns.length });
   
   if (allConns.length < 2) {
     console.log();
     console.log(chalk.yellow('  Copy Trading requires 2 connected accounts'));
     console.log(chalk.gray('  Connect to another PropFirm first'));
     console.log();
-    await inquirer.prompt([{ type: 'input', name: 'c', message: 'Press Enter...' }]);
+    await prompts.waitForEnter();
     return;
   }
   
@@ -37,7 +33,6 @@ const copyTradingMenu = async () => {
   console.log(chalk.magenta.bold('  Copy Trading Setup'));
   console.log();
   
-  // Get all active accounts from all connections
   const spinner = ora({ text: 'Fetching accounts...', color: 'yellow' }).start();
   
   const allAccounts = [];
@@ -47,86 +42,54 @@ const copyTradingMenu = async () => {
       if (result.success && result.accounts) {
         const active = result.accounts.filter(a => a.status === 0);
         for (const acc of active) {
-          allAccounts.push({
-            account: acc,
-            service: conn.service,
-            propfirm: conn.propfirm,
-            type: conn.type
-          });
+          allAccounts.push({ account: acc, service: conn.service, propfirm: conn.propfirm, type: conn.type });
         }
       }
-    } catch (e) { /* ignore */ }
+    } catch (e) {}
   }
   
   if (allAccounts.length < 2) {
     spinner.fail('Need at least 2 active accounts');
-    await inquirer.prompt([{ type: 'input', name: 'c', message: 'Press Enter...' }]);
+    await prompts.waitForEnter();
     return;
   }
   
   spinner.succeed(`Found ${allAccounts.length} active accounts`);
-  log.debug('Active accounts loaded', { count: allAccounts.length, accounts: allAccounts.map(a => ({ propfirm: a.propfirm, name: a.account.accountName })) });
   
   // Step 1: Select Lead Account
-  console.log(chalk.cyan('  Step 1: Select LEAD Account (source of trades)'));
-  const leadChoices = allAccounts.map((a, i) => ({
-    name: `${a.propfirm} - ${a.account.accountName || a.account.accountId} ($${a.account.balance.toLocaleString()})`,
+  console.log(chalk.cyan('  Step 1: Select LEAD Account'));
+  const leadOptions = allAccounts.map((a, i) => ({
+    label: `${a.propfirm} - ${a.account.accountName || a.account.accountId} ($${a.account.balance.toLocaleString()})`,
     value: i
   }));
-  leadChoices.push({ name: chalk.yellow('< Cancel'), value: -1 });
+  leadOptions.push({ label: '< Cancel', value: -1 });
   
-  const { leadIdx } = await inquirer.prompt([{
-    type: 'list',
-    name: 'leadIdx',
-    message: 'Lead Account:',
-    choices: leadChoices
-  }]);
-  
-  if (leadIdx === -1) {
-    log.debug('User cancelled at lead selection');
-    return;
-  }
+  const leadIdx = await prompts.selectOption('Lead Account:', leadOptions);
+  if (leadIdx === null || leadIdx === -1) return;
   const lead = allAccounts[leadIdx];
-  log.debug('Lead account selected', { propfirm: lead.propfirm, account: lead.account.accountName });
   
   // Step 2: Select Follower Account
   console.log();
-  console.log(chalk.cyan('  Step 2: Select FOLLOWER Account (copies trades)'));
-  const followerChoices = allAccounts
+  console.log(chalk.cyan('  Step 2: Select FOLLOWER Account'));
+  const followerOptions = allAccounts
     .map((a, i) => ({ a, i }))
     .filter(x => x.i !== leadIdx)
     .map(x => ({
-      name: `${x.a.propfirm} - ${x.a.account.accountName || x.a.account.accountId} ($${x.a.account.balance.toLocaleString()})`,
+      label: `${x.a.propfirm} - ${x.a.account.accountName || x.a.account.accountId} ($${x.a.account.balance.toLocaleString()})`,
       value: x.i
     }));
-  followerChoices.push({ name: chalk.yellow('< Cancel'), value: -1 });
-  
-  const { followerIdx } = await inquirer.prompt([{
-    type: 'list',
-    name: 'followerIdx',
-    message: 'Follower Account:',
-    choices: followerChoices
-  }]);
+  followerOptions.push({ label: '< Cancel', value: -1 });
   
-  if (followerIdx === -1) {
-    log.debug('User cancelled at follower selection');
-    return;
-  }
+  const followerIdx = await prompts.selectOption('Follower Account:', followerOptions);
+  if (followerIdx === null || followerIdx === -1) return;
   const follower = allAccounts[followerIdx];
-  log.debug('Follower account selected', { propfirm: follower.propfirm, account: follower.account.accountName });
   
-  // Step 3: Select Symbol for Lead
+  // Step 3-4: Select Symbols
   console.log();
   console.log(chalk.cyan('  Step 3: Select Symbol for LEAD'));
-  log.debug('Selecting symbol for lead', { serviceType: lead.type });
   const leadSymbol = await selectSymbol(lead.service, 'Lead');
-  if (!leadSymbol) {
-    log.debug('Lead symbol selection failed or cancelled');
-    return;
-  }
-  log.debug('Lead symbol selected', { symbol: leadSymbol.name || leadSymbol.symbol });
+  if (!leadSymbol) return;
   
-  // Step 4: Select Symbol for Follower
   console.log();
   console.log(chalk.cyan('  Step 4: Select Symbol for FOLLOWER'));
   const followerSymbol = await selectSymbol(follower.service, 'Follower');
@@ -136,53 +99,24 @@ const copyTradingMenu = async () => {
   console.log();
   console.log(chalk.cyan('  Step 5: Configure Parameters'));
   
-  const { leadContractsInput } = await inquirer.prompt([{
-    type: 'input',
-    name: 'leadContractsInput',
-    message: 'Lead contracts:',
-    default: '1',
-    validate: v => !isNaN(parseInt(v)) && parseInt(v) > 0 ? true : 'Enter a positive number'
-  }]);
-  const leadContracts = parseInt(leadContractsInput) || 1;
-  
-  const { followerContractsInput } = await inquirer.prompt([{
-    type: 'input',
-    name: 'followerContractsInput',
-    message: 'Follower contracts:',
-    default: String(leadContracts),
-    validate: v => !isNaN(parseInt(v)) && parseInt(v) > 0 ? true : 'Enter a positive number'
-  }]);
-  const followerContracts = parseInt(followerContractsInput) || leadContracts;
-  
-  const { dailyTargetInput } = await inquirer.prompt([{
-    type: 'input',
-    name: 'dailyTargetInput',
-    message: 'Daily target ($):',
-    default: '400',
-    validate: v => !isNaN(parseInt(v)) && parseInt(v) > 0 ? true : 'Enter a positive number'
-  }]);
-  const dailyTarget = parseInt(dailyTargetInput) || 400;
-  
-  const { maxRiskInput } = await inquirer.prompt([{
-    type: 'input',
-    name: 'maxRiskInput',
-    message: 'Max risk ($):',
-    default: '200',
-    validate: v => !isNaN(parseInt(v)) && parseInt(v) > 0 ? true : 'Enter a positive number'
-  }]);
-  const maxRisk = parseInt(maxRiskInput) || 200;
+  const leadContracts = await prompts.numberInput('Lead contracts:', 1, 1, 10);
+  if (leadContracts === null) return;
+  
+  const followerContracts = await prompts.numberInput('Follower contracts:', leadContracts, 1, 10);
+  if (followerContracts === null) return;
+  
+  const dailyTarget = await prompts.numberInput('Daily target ($):', 400, 1, 10000);
+  if (dailyTarget === null) return;
+  
+  const maxRisk = await prompts.numberInput('Max risk ($):', 200, 1, 5000);
+  if (maxRisk === null) return;
   
   // Step 6: Privacy
-  const { privacyChoice } = await inquirer.prompt([{
-    type: 'list',
-    name: 'privacyChoice',
-    message: 'Account names:',
-    choices: [
-      { name: 'Hide account names', value: false },
-      { name: 'Show account names', value: true }
-    ]
-  }]);
-  const showNames = privacyChoice;
+  const showNames = await prompts.selectOption('Account names:', [
+    { label: 'Hide account names', value: false },
+    { label: 'Show account names', value: true }
+  ]);
+  if (showNames === null) return;
   
   // Confirm
   console.log();
@@ -192,22 +126,14 @@ const copyTradingMenu = async () => {
   console.log(chalk.gray(`  Target: $${dailyTarget} | Risk: $${maxRisk}`));
   console.log();
   
-  const { confirm } = await inquirer.prompt([{
-    type: 'confirm',
-    name: 'confirm',
-    message: chalk.yellow('Start Copy Trading?'),
-    default: true
-  }]);
-  
+  const confirm = await prompts.confirmPrompt('Start Copy Trading?', true);
   if (!confirm) return;
   
   // Launch
   await launchCopyTrading({
     lead: { ...lead, symbol: leadSymbol, contracts: leadContracts },
     follower: { ...follower, symbol: followerSymbol, contracts: followerContracts },
-    dailyTarget,
-    maxRisk,
-    showNames
+    dailyTarget, maxRisk, showNames
   });
 };
 
@@ -215,59 +141,31 @@ const copyTradingMenu = async () => {
  * Symbol selection helper
  */
 const selectSymbol = async (service, label) => {
-  log.debug('selectSymbol called', { label, hasGetContracts: typeof service.getContracts === 'function' });
   try {
     let contracts = [];
     
-    // Try getContracts first
     if (typeof service.getContracts === 'function') {
       const result = await service.getContracts();
-      log.debug('getContracts result', { success: result?.success, count: result?.contracts?.length });
       if (result.success && result.contracts?.length > 0) {
         contracts = result.contracts;
       }
     }
     
-    // Fallback to searchContracts if no contracts yet
     if (contracts.length === 0 && typeof service.searchContracts === 'function') {
-      log.debug('Trying searchContracts fallback');
-      // For Rithmic, searchContracts returns array directly
       const searchResult = await service.searchContracts('ES');
-      log.debug('searchContracts result', { result: searchResult });
-      
-      if (Array.isArray(searchResult)) {
-        contracts = searchResult;
-      } else if (searchResult?.contracts) {
-        contracts = searchResult.contracts;
-      }
+      if (Array.isArray(searchResult)) contracts = searchResult;
+      else if (searchResult?.contracts) contracts = searchResult.contracts;
     }
     
-    // If still no contracts, show error
     if (!contracts || contracts.length === 0) {
-      log.error('No contracts available');
-      console.log(chalk.red('  No contracts available for this service'));
+      console.log(chalk.red('  No contracts available'));
       return null;
     }
     
-    log.debug('Contracts loaded', { count: contracts.length });
-    
-    // Build choices - simple list without categories
-    const choices = contracts.map(c => ({ 
-      name: c.name || c.symbol, 
-      value: c 
-    }));
-    choices.push(new inquirer.Separator());
-    choices.push({ name: chalk.yellow('< Cancel'), value: null });
-    
-    const { symbol } = await inquirer.prompt([{
-      type: 'list',
-      name: 'symbol',
-      message: `${label} Symbol:`,
-      choices,
-      pageSize: 15
-    }]);
+    const options = contracts.map(c => ({ label: c.name || c.symbol, value: c }));
+    options.push({ label: '< Cancel', value: null });
     
-    return symbol;
+    return await prompts.selectOption(`${label} Symbol:`, options);
   } catch (e) {
     return null;
   }
@@ -282,33 +180,23 @@ const launchCopyTrading = async (config) => {
   const leadName = showNames ? (lead.account.accountName || lead.account.accountId) : 'HQX Lead *****';
   const followerName = showNames ? (follower.account.accountName || follower.account.accountId) : 'HQX Follower *****';
   
-  // UI with copy trading subtitle
   const ui = new AlgoUI({ subtitle: 'HQX Copy Trading' });
   
-  // Combined stats
   const stats = {
-    leadName,
-    followerName,
+    leadName, followerName,
     leadSymbol: lead.symbol.name,
     followerSymbol: follower.symbol.name,
     leadQty: lead.contracts,
     followerQty: follower.contracts,
-    target: dailyTarget,
-    risk: maxRisk,
-    pnl: 0,
-    trades: 0,
-    wins: 0,
-    losses: 0,
-    latency: 0,
-    connected: false
+    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 {
@@ -326,7 +214,6 @@ const launchCopyTrading = async (config) => {
   
   // Event handlers
   hqx.on('latency', (d) => { stats.latency = d.latency || 0; });
-  
   hqx.on('log', (d) => {
     let msg = d.message;
     if (!showNames) {
@@ -335,7 +222,6 @@ const launchCopyTrading = async (config) => {
     }
     ui.addLog(d.type || 'info', msg);
   });
-  
   hqx.on('trade', (d) => {
     stats.trades++;
     stats.pnl += d.pnl || 0;
@@ -343,68 +229,47 @@ const launchCopyTrading = async (config) => {
     ui.addLog(d.pnl >= 0 ? 'trade' : 'loss', `${d.pnl >= 0 ? '+' : ''}$${d.pnl.toFixed(2)}`);
     
     if (stats.pnl >= dailyTarget) {
-      stopReason = 'target';
-      running = false;
+      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('copy', (d) => {
-    ui.addLog('trade', `COPIED: ${d.side} ${d.quantity}x to Follower`);
-  });
-  
+  hqx.on('copy', (d) => { ui.addLog('trade', `COPIED: ${d.side} ${d.quantity}x`); });
   hqx.on('error', (d) => { ui.addLog('error', d.message); });
   hqx.on('disconnected', () => { stats.connected = false; });
   
-  // Start copy trading on server
+  // Start on server
   if (stats.connected) {
     ui.addLog('info', 'Starting Copy Trading...');
     
-    // Get credentials
     let leadCreds = null, followerCreds = null;
-    
-    if (lead.service.getRithmicCredentials) {
-      leadCreds = lead.service.getRithmicCredentials();
-    }
-    if (follower.service.getRithmicCredentials) {
-      followerCreds = follower.service.getRithmicCredentials();
-    }
+    if (lead.service.getRithmicCredentials) leadCreds = lead.service.getRithmicCredentials();
+    if (follower.service.getRithmicCredentials) followerCreds = follower.service.getRithmicCredentials();
     
     hqx.startCopyTrading({
-      // Lead config
       leadAccountId: lead.account.accountId,
       leadContractId: lead.symbol.id || lead.symbol.contractId,
       leadSymbol: lead.symbol.symbol || lead.symbol.name,
       leadContracts: lead.contracts,
       leadPropfirm: lead.propfirm,
-      leadToken: lead.service.getToken ? lead.service.getToken() : null,
+      leadToken: lead.service.getToken?.() || null,
       leadRithmicCredentials: leadCreds,
-      
-      // Follower config
       followerAccountId: follower.account.accountId,
       followerContractId: follower.symbol.id || follower.symbol.contractId,
       followerSymbol: follower.symbol.symbol || follower.symbol.name,
       followerContracts: follower.contracts,
       followerPropfirm: follower.propfirm,
-      followerToken: follower.service.getToken ? follower.service.getToken() : null,
+      followerToken: follower.service.getToken?.() || null,
       followerRithmicCredentials: followerCreds,
-      
-      // Targets
-      dailyTarget,
-      maxRisk
+      dailyTarget, maxRisk
     });
   }
   
-  // UI refresh
-  const refreshInterval = setInterval(() => {
-    if (running) ui.render(stats);
-  }, 250);
+  const refreshInterval = setInterval(() => { if (running) ui.render(stats); }, 250);
   
   // Keyboard
   const setupKeys = () => {
@@ -415,12 +280,10 @@ const launchCopyTrading = async (config) => {
     
     const handler = (str, key) => {
       if (key && (key.name === 'x' || (key.ctrl && key.name === 'c'))) {
-        running = false;
-        stopReason = 'manual';
+        running = false; stopReason = 'manual';
       }
     };
     process.stdin.on('keypress', handler);
-    
     return () => {
       process.stdin.removeListener('keypress', handler);
       if (process.stdin.isTTY) process.stdin.setRawMode(false);
@@ -429,22 +292,13 @@ const launchCopyTrading = async (config) => {
   
   const cleanupKeys = setupKeys();
   
-  // Wait
   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();
   
   // Summary
@@ -454,11 +308,10 @@ const launchCopyTrading = async (config) => {
   console.log();
   console.log(chalk.white(`  Stop: ${stopReason || 'unknown'}`));
   console.log(chalk.white(`  Trades: ${stats.trades} (W: ${stats.wins} / L: ${stats.losses})`));
-  const c = stats.pnl >= 0 ? chalk.green : chalk.red;
-  console.log(c(`  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...' }]);
+  await prompts.waitForEnter();
 };
 
 module.exports = { copyTradingMenu };

package/src/pages/algo/index.js

@@ -1,12 +1,10 @@
 /**
  * Algo Trading - Main Menu
- * Lightweight entry point
  */
 
 const chalk = require('chalk');
-const inquirer = require('inquirer');
 const { getSeparator } = require('../../ui');
-const { logger } = require('../../utils');
+const { logger, prompts } = require('../../utils');
 
 const log = logger.scope('AlgoMenu');
 
@@ -25,22 +23,17 @@ const algoTradingMenu = async (service) => {
   console.log(chalk.gray(getSeparator()));
   console.log();
 
-  const { action } = await inquirer.prompt([
-    {
-      type: 'list',
-      name: 'action',
-      message: chalk.white.bold('Select Mode:'),
-      choices: [
-        { name: chalk.cyan('One Account'), value: 'one_account' },
-        { name: chalk.green('Copy Trading'), value: 'copy_trading' },
-        new inquirer.Separator(),
-        { name: chalk.yellow('< Back'), value: 'back' }
-      ],
-      pageSize: 10,
-      loop: false
-    }
+  const action = await prompts.selectOption('Select Mode:', [
+    { value: 'one_account', label: 'One Account' },
+    { value: 'copy_trading', label: 'Copy Trading' },
+    { value: 'back', label: '< Back' }
   ]);
 
+  if (!action || action === 'back') {
+    log.debug('User went back');
+    return 'back';
+  }
+
   log.debug('Algo mode selected', { action });
 
   switch (action) {
@@ -52,9 +45,6 @@ const algoTradingMenu = async (service) => {
       log.info('Starting Copy Trading mode');
       await copyTradingMenu();
       break;
-    case 'back':
-      log.debug('User went back');
-      break;
   }
   
   return action;