hedgequantx 2.9.19 → 2.9.20

package/src/menus/dashboard.js

@@ -7,10 +7,9 @@ const ora = require('ora');
 const { execSync, spawn } = require('child_process');
 
 const { connections } = require('../services');
-const { getLogoWidth, centerText, prepareStdin, displayBanner, clearScreen } = require('../ui');
+const { getLogoWidth, centerText, prepareStdin } = require('../ui');
 const { getCachedStats } = require('../services/stats-cache');
 const { prompts } = require('../utils');
-const { getActiveAgentCount } = require('../pages/ai-agents');
 
 /**
  * Dashboard menu after login
@@ -18,16 +17,6 @@ const { getActiveAgentCount } = require('../pages/ai-agents');
 const dashboardMenu = async (service) => {
   prepareStdin();
   
-  // Stop any global spinner before clearing
-  if (global.__hqxSpinner) {
-    global.__hqxSpinner.stop();
-    global.__hqxSpinner = null;
-  }
-  
-  // Clear screen and show banner (always closed)
-  clearScreen();
-  displayBanner();
-  
   const boxWidth = getLogoWidth();
   const W = boxWidth - 2;
   
@@ -41,9 +30,9 @@ const dashboardMenu = async (service) => {
     return chalk.cyan('║') + content + ' '.repeat(Math.max(0, padding)) + chalk.cyan('║');
   };
   
-  // New rectangle (banner is always closed)
-  console.log(chalk.cyan('╔' + '═'.repeat(W) + '╗'));
-  console.log(makeLine(chalk.yellow.bold('WELCOME, HQX TRADER!'), 'center'));
+  // Continue from banner (use ╠ not ╔)
+  console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
+  console.log(makeLine(chalk.yellow.bold('Welcome, HQX Trader!'), 'center'));
   console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
   
   // Show connected propfirms
@@ -62,8 +51,8 @@ const dashboardMenu = async (service) => {
     const balStr = statsInfo.balance !== null ? `$${statsInfo.balance.toLocaleString()}` : '--';
     const balColor = statsInfo.balance !== null ? chalk.green : chalk.gray;
     
-    // AI Agents status - get fresh count, not from cache
-    const agentCount = getActiveAgentCount();
+    // AI Agents status
+    const agentCount = statsInfo.agents || 0;
     const agentDisplay = agentCount > 0 ? 'ON' : 'OFF';
     const agentColor = agentCount > 0 ? chalk.green : chalk.red;
     
@@ -98,9 +87,9 @@ const dashboardMenu = async (service) => {
   
   // Find max width for alignment
   const menuItems = [
-    { left: '[1] VIEW ACCOUNTS', right: '[2] VIEW STATS' },
-    { left: '[+] ADD PROP-ACCOUNT', right: '[A] ALGO-TRADING' },
-    { left: '[I] AI AGENTS', right: '[U] UPDATE HQX' },
+    { left: '[1] View Accounts', right: '[2] View Stats' },
+    { left: '[+] Add Prop-Account', right: '[A] Algo-Trading' },
+    { left: '[U] Update HQX', right: '[X] Disconnect' },
   ];
   
   const maxLeftLen = Math.max(...menuItems.map(m => m.left.length));
@@ -130,25 +119,20 @@ const dashboardMenu = async (service) => {
     );
   };
   
-  menuRow('[1] VIEW ACCOUNTS', '[2] VIEW STATS', chalk.cyan, chalk.cyan);
-  menuRow('[+] ADD PROP-ACCOUNT', '[A] ALGO-TRADING', chalk.cyan, chalk.magenta);
-  menuRow('[I] AI AGENTS', '[U] UPDATE HQX', chalk.green, chalk.yellow);
-  
-  // Separator and centered Disconnect button
-  console.log(chalk.cyan('╠' + '─'.repeat(W) + '╣'));
-  console.log(makeLine(chalk.red('[X] DISCONNECT'), 'center'));
+  menuRow('[1] View Accounts', '[2] View Stats', chalk.cyan, chalk.cyan);
+  menuRow('[+] Add Prop-Account', '[A] Algo-Trading', chalk.cyan, chalk.magenta);
+  menuRow('[U] Update HQX', '[X] Disconnect', chalk.yellow, chalk.red);
   
   console.log(chalk.cyan('╚' + '═'.repeat(W) + '╝'));
   
   // Simple input - no duplicate menu
-  const input = await prompts.textInput(chalk.cyan('SELECT (1/2/+/A/I/U/X):'));
+  const input = await prompts.textInput(chalk.cyan('Select (1/2/+/A/U/X)'));
   
   const actionMap = {
     '1': 'accounts',
     '2': 'stats',
     '+': 'add_prop_account',
     'a': 'algotrading',
-    'i': 'aiagents',
     'u': 'update',
     'x': 'disconnect'
   };
@@ -160,95 +144,93 @@ const dashboardMenu = async (service) => {
  * Handle update process
  */
 const handleUpdate = async () => {
-  clearScreen();
-  displayBanner();
   prepareStdin();
   
-  const boxWidth = getLogoWidth();
-  const W = boxWidth - 2;
-  
-  console.log(chalk.cyan('╔' + '═'.repeat(W) + '╗'));
-  console.log(chalk.cyan('║') + chalk.yellow.bold(centerText('UPDATE HQX', W)) + chalk.cyan('║'));
-  console.log(chalk.cyan('╚' + '═'.repeat(W) + '╝'));
-  
   let spinner = null;
   let currentVersion = 'unknown';
   
   try {
-    // Get current version
     try {
       currentVersion = require('../../package.json').version || 'unknown';
     } catch (e) {}
     
-    console.log(chalk.cyan(`\n  CURRENT VERSION: V${currentVersion.toUpperCase()}`));
-    spinner = ora({ text: 'CHECKING FOR UPDATES...', color: 'yellow' }).start();
+    console.log(chalk.cyan(`\n  Current version: v${currentVersion}`));
+    spinner = ora({ text: 'Checking for updates...', color: 'yellow' }).start();
     
-    // Check latest version from npm
     let latestVersion;
     try {
-      latestVersion = execSync('npm view hedgequantx version 2>/dev/null', { 
+      latestVersion = execSync('npm view hedgequantx version', { 
         stdio: ['pipe', 'pipe', 'pipe'], 
         timeout: 30000, 
         encoding: 'utf8'
       }).trim();
       
       if (!latestVersion || !/^\d+\.\d+\.\d+/.test(latestVersion)) {
-        throw new Error('INVALID VERSION FORMAT');
+        throw new Error('Invalid version format');
       }
     } catch (e) {
-      spinner.fail('CANNOT REACH NPM REGISTRY');
-      console.log(chalk.yellow('\n  TRY MANUALLY: npm update -g hedgequantx'));
+      spinner.fail('Cannot reach npm registry');
+      console.log(chalk.gray(`  Error: ${e.message}`));
+      console.log(chalk.yellow('  Try manually: npm install -g hedgequantx@latest'));
       await prompts.waitForEnter();
       return;
     }
     
-    spinner.succeed(`LATEST VERSION: V${latestVersion.toUpperCase()}`);
+    spinner.succeed(`Latest version: v${latestVersion}`);
     
-    // Already up to date
     if (currentVersion === latestVersion) {
-      console.log(chalk.green('\n  ✓ ALREADY UP TO DATE!'));
+      console.log(chalk.green('  Already up to date!'));
       await prompts.waitForEnter();
       return;
     }
     
-    // Update available
-    console.log(chalk.yellow(`\n  UPDATE AVAILABLE: V${currentVersion} → V${latestVersion}`));
-    spinner = ora({ text: 'INSTALLING UPDATE...', color: 'yellow' }).start();
+    console.log(chalk.yellow(`  Update available: v${currentVersion} → v${latestVersion}`));
+    spinner = ora({ text: 'Installing update...', color: 'yellow' }).start();
     
-    // Try to install update
     try {
-      execSync('npm update -g hedgequantx 2>/dev/null', { 
+      // Try with sudo first on Unix systems
+      const isWindows = process.platform === 'win32';
+      const cmd = isWindows 
+        ? 'npm install -g hedgequantx@latest'
+        : 'npm install -g hedgequantx@latest';
+      
+      execSync(cmd, { 
         stdio: ['pipe', 'pipe', 'pipe'], 
         timeout: 180000, 
         encoding: 'utf8'
       });
     } catch (e) {
-      // Try without redirecting stderr
-      try {
-        execSync('npm update -g hedgequantx', { 
-          stdio: ['pipe', 'pipe', 'pipe'], 
-          timeout: 180000, 
-          encoding: 'utf8'
-        });
-      } catch (e2) {
-        spinner.fail('UPDATE FAILED');
-        console.log(chalk.yellow('\n  TRY MANUALLY:'));
-        console.log(chalk.white('  npm update -g hedgequantx'));
-        console.log(chalk.gray('  OR WITH SUDO:'));
-        console.log(chalk.white('  sudo npm update -g hedgequantx'));
-        await prompts.waitForEnter();
-        return;
-      }
+      spinner.fail('Update failed - permission denied?');
+      console.log(chalk.gray(`  Error: ${e.message}`));
+      console.log(chalk.yellow('  Try manually with sudo:'));
+      console.log(chalk.white('  sudo npm install -g hedgequantx@latest'));
+      await prompts.waitForEnter();
+      return;
     }
     
-    spinner.succeed(`UPDATED TO V${latestVersion}!`);
-    console.log(chalk.green('\n  ✓ UPDATE SUCCESSFUL!'));
-    console.log(chalk.yellow('\n  Run ') + chalk.cyan('hqx') + chalk.yellow(' to start the new version.\n'));
-    process.exit(0);
+    spinner.succeed(`Updated to v${latestVersion}!`);
+    console.log(chalk.cyan('  Restarting HQX...'));
+    
+    await new Promise(r => setTimeout(r, 1500));
+    
+    try {
+      const child = spawn('hqx', [], { 
+        stdio: 'inherit', 
+        detached: true, 
+        shell: true 
+      });
+      child.unref();
+      process.exit(0);
+    } catch (e) {
+      console.log(chalk.yellow('\n  Please restart HQX manually:'));
+      console.log(chalk.white('  hqx'));
+      await prompts.waitForEnter();
+    }
     
   } catch (error) {
-    if (spinner) spinner.fail('UPDATE ERROR');
-    console.log(chalk.yellow('\n  TRY MANUALLY: npm update -g hedgequantx'));
+    if (spinner) spinner.fail('Update error');
+    console.log(chalk.gray(`  Error: ${error.message}`));
+    console.log(chalk.yellow('  Try manually: npm install -g hedgequantx@latest'));
     await prompts.waitForEnter();
   }
 };

package/src/pages/accounts.js

@@ -7,17 +7,13 @@ const ora = require('ora');
 
 const { connections } = require('../services');
 const { ACCOUNT_STATUS, ACCOUNT_TYPE } = require('../config');
-const { getLogoWidth, getColWidths, drawBoxHeader, drawBoxFooter, draw2ColHeader, visibleLength, displayBanner, clearScreen } = require('../ui');
+const { getLogoWidth, getColWidths, drawBoxHeader, drawBoxFooter, draw2ColHeader, visibleLength, displayBanner } = require('../ui');
 const { prompts } = require('../utils');
 
 /**
  * Show all accounts
  */
 const showAccounts = async (service) => {
-  // Clear screen and show banner
-  clearScreen();
-  displayBanner();
-  
   const boxWidth = getLogoWidth();
   const { col1, col2 } = getColWidths(boxWidth);
 
@@ -32,12 +28,13 @@ const showAccounts = async (service) => {
   let spinner;
 
   try {
-    spinner = ora({ text: 'LOADING ACCOUNTS...', color: 'yellow' }).start();
+    // Single spinner for loading (appears below the dashboard header)
+    spinner = ora({ text: 'Loading accounts...', color: 'yellow' }).start();
     
     const allConns = connections.count() > 0 ? connections.getAll() : (service ? [{ service, propfirm: service.propfirm?.name || 'Unknown', type: 'single' }] : []);
     
     if (allConns.length === 0) {
-      spinner.fail('NO CONNECTIONS FOUND');
+      spinner.fail('No connections found');
       await prompts.waitForEnter();
       return;
     }
@@ -63,7 +60,7 @@ const showAccounts = async (service) => {
     }
 
     if (allAccounts.length === 0) {
-      spinner.fail('NO ACCOUNTS FOUND');
+      spinner.fail('No accounts found');
       await prompts.waitForEnter();
       return;
     }
@@ -81,11 +78,8 @@ const showAccounts = async (service) => {
       } catch (e) {}
     }
     
-    spinner.stop();
-    
-    // Clear and show banner again before displaying accounts
-    clearScreen();
-    displayBanner();
+    spinner.succeed('Accounts loaded');
+    console.log();
 
     // Display accounts
     drawBoxHeader('TRADING ACCOUNTS', boxWidth);
@@ -97,20 +91,12 @@ const showAccounts = async (service) => {
       const name1 = String(acc1.accountName || acc1.rithmicAccountId || acc1.accountId || `Account #${i + 1}`);
       const name2 = acc2 ? String(acc2.accountName || acc2.rithmicAccountId || acc2.accountId || `Account #${i + 2}`) : '';
 
-      // For single account, use full width; for pairs, use 2-column layout
-      const sep = acc2 ? '│' : '║';
-      const rightCol = acc2 ? col2 : col2;
-      
-      // Header row with account name(s)
-      const h1 = centerText(name1.substring(0, col1 - 4), col1);
-      const h2 = acc2 ? centerText(name2.substring(0, col2 - 4), col2) : ' '.repeat(col2);
-      console.log(chalk.cyan('║') + chalk.cyan.bold(h1) + chalk.cyan(sep) + chalk.cyan.bold(h2) + chalk.cyan('║'));
-      console.log(chalk.cyan('╠') + chalk.cyan('─'.repeat(col1)) + chalk.cyan(acc2 ? '┼' : '┼') + chalk.cyan('─'.repeat(col2)) + chalk.cyan('╣'));
+      draw2ColHeader(name1.substring(0, col1 - 4), name2 ? name2.substring(0, col2 - 4) : '', boxWidth);
 
       // PropFirm
       const pf1 = chalk.magenta(acc1.propfirm || 'Unknown');
       const pf2 = acc2 ? chalk.magenta(acc2.propfirm || 'Unknown') : '';
-      console.log(chalk.cyan('║') + fmtRow('PropFirm:', pf1, col1) + chalk.cyan(sep) + (acc2 ? fmtRow('PropFirm:', pf2, col2) : ' '.repeat(col2)) + chalk.cyan('║'));
+      console.log(chalk.cyan('║') + fmtRow('PropFirm:', pf1, col1) + chalk.cyan('│') + (acc2 ? fmtRow('PropFirm:', pf2, col2) : ' '.repeat(col2)) + chalk.cyan('║'));
 
       // Balance
       const bal1 = acc1.balance;
@@ -119,7 +105,7 @@ const showAccounts = async (service) => {
       const balStr2 = bal2 !== null && bal2 !== undefined ? '$' + Number(bal2).toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2}) : '--';
       const balColor1 = bal1 === null || bal1 === undefined ? chalk.gray : (bal1 >= 0 ? chalk.green : chalk.red);
       const balColor2 = bal2 === null || bal2 === undefined ? chalk.gray : (bal2 >= 0 ? chalk.green : chalk.red);
-      console.log(chalk.cyan('║') + fmtRow('Balance:', balColor1(balStr1), col1) + chalk.cyan(sep) + (acc2 ? fmtRow('Balance:', balColor2(balStr2), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
+      console.log(chalk.cyan('║') + fmtRow('Balance:', balColor1(balStr1), col1) + chalk.cyan('│') + (acc2 ? fmtRow('Balance:', balColor2(balStr2), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
 
       // P&L
       const pnl1 = acc1.profitAndLoss;
@@ -128,41 +114,44 @@ const showAccounts = async (service) => {
       const pnlStr2 = pnl2 !== null && pnl2 !== undefined ? (pnl2 >= 0 ? '+' : '') + '$' + Number(pnl2).toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2}) : '--';
       const pnlColor1 = pnl1 === null || pnl1 === undefined ? chalk.gray : (pnl1 >= 0 ? chalk.green : chalk.red);
       const pnlColor2 = pnl2 === null || pnl2 === undefined ? chalk.gray : (pnl2 >= 0 ? chalk.green : chalk.red);
-      console.log(chalk.cyan('║') + fmtRow('P&L:', pnlColor1(pnlStr1), col1) + chalk.cyan(sep) + (acc2 ? fmtRow('P&L:', pnlColor2(pnlStr2), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
+      console.log(chalk.cyan('║') + fmtRow('P&L:', pnlColor1(pnlStr1), col1) + chalk.cyan('│') + (acc2 ? fmtRow('P&L:', pnlColor2(pnlStr2), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
 
-      // Status - from Rithmic RMS API (field 154003), N/A if not available
-      const getStatusDisplay = (acc) => {
-        const status = acc.status;
-        if (status === null || status === undefined) return { text: 'N/A', color: 'gray' };
+      // Status - handle both string from API and numeric lookup
+      const getStatusDisplay = (status) => {
+        if (!status && status !== 0) return { text: '--', color: 'gray' };
         if (typeof status === 'string') {
+          // Direct string from Rithmic API (e.g., "Active", "Disabled")
           const lowerStatus = status.toLowerCase();
           if (lowerStatus.includes('active') || lowerStatus.includes('open')) return { text: status, color: 'green' };
           if (lowerStatus.includes('disabled') || lowerStatus.includes('closed')) return { text: status, color: 'red' };
           if (lowerStatus.includes('halt')) return { text: status, color: 'red' };
           return { text: status, color: 'yellow' };
         }
-        return { text: String(status), color: 'yellow' };
+        return ACCOUNT_STATUS[status] || { text: 'Unknown', color: 'gray' };
       };
-      const status1 = getStatusDisplay(acc1);
-      const status2 = acc2 ? getStatusDisplay(acc2) : null;
-      console.log(chalk.cyan('║') + fmtRow('Status:', chalk[status1.color](status1.text), col1) + chalk.cyan(sep) + (acc2 ? fmtRow('Status:', chalk[status2.color](status2.text), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
-
-      // Algorithm - from Rithmic RMS API (field 150142), N/A if not available
-      const getAlgorithmDisplay = (acc) => {
-        const algo = acc.algorithm;
-        if (algo === null || algo === undefined) return { text: 'N/A', color: 'gray' };
-        if (typeof algo === 'string') {
-          const lowerAlgo = algo.toLowerCase();
-          if (lowerAlgo.includes('eval')) return { text: algo, color: 'yellow' };
-          if (lowerAlgo.includes('live') || lowerAlgo.includes('funded')) return { text: algo, color: 'green' };
-          if (lowerAlgo.includes('sim') || lowerAlgo.includes('demo')) return { text: algo, color: 'gray' };
-          return { text: algo, color: 'cyan' };
+      const status1 = getStatusDisplay(acc1.status);
+      const status2 = acc2 ? getStatusDisplay(acc2.status) : null;
+      console.log(chalk.cyan('║') + fmtRow('Status:', chalk[status1.color](status1.text), col1) + chalk.cyan('│') + (acc2 ? fmtRow('Status:', chalk[status2.color](status2.text), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
+
+      // Type/Algorithm - handle both string from API and numeric lookup
+      const getTypeDisplay = (type, algorithm) => {
+        // Prefer algorithm from RMS info if available
+        const value = algorithm || type;
+        if (!value && value !== 0) return { text: '--', color: 'gray' };
+        if (typeof value === 'string') {
+          // Direct string from Rithmic API
+          const lowerValue = value.toLowerCase();
+          if (lowerValue.includes('eval')) return { text: value, color: 'yellow' };
+          if (lowerValue.includes('live') || lowerValue.includes('funded')) return { text: value, color: 'green' };
+          if (lowerValue.includes('sim') || lowerValue.includes('demo')) return { text: value, color: 'gray' };
+          if (lowerValue.includes('express')) return { text: value, color: 'magenta' };
+          return { text: value, color: 'cyan' };
         }
-        return { text: String(algo), color: 'cyan' };
+        return ACCOUNT_TYPE[value] || { text: 'Unknown', color: 'white' };
       };
-      const algo1 = getAlgorithmDisplay(acc1);
-      const algo2 = acc2 ? getAlgorithmDisplay(acc2) : null;
-      console.log(chalk.cyan('║') + fmtRow('Algorithm:', chalk[algo1.color](algo1.text), col1) + chalk.cyan(sep) + (acc2 ? fmtRow('Algorithm:', chalk[algo2.color](algo2.text), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
+      const type1 = getTypeDisplay(acc1.type, acc1.algorithm);
+      const type2 = acc2 ? getTypeDisplay(acc2.type, acc2.algorithm) : null;
+      console.log(chalk.cyan('║') + fmtRow('Type:', chalk[type1.color](type1.text), col1) + chalk.cyan('│') + (acc2 ? fmtRow('Type:', chalk[type2.color](type2.text), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
 
       if (i + 2 < allAccounts.length) {
         console.log(chalk.cyan('╠') + chalk.cyan('═'.repeat(col1)) + chalk.cyan('╪') + chalk.cyan('═'.repeat(col2)) + chalk.cyan('╣'));
@@ -173,7 +162,7 @@ const showAccounts = async (service) => {
     console.log();
 
   } catch (error) {
-    if (spinner) spinner.fail('ERROR LOADING ACCOUNTS: ' + error.message.toUpperCase());
+    if (spinner) spinner.fail('Error loading accounts: ' + error.message);
   }
 
   await prompts.waitForEnter();