hedgequantx 1.8.25 → 1.8.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "1.8.25",
+  "version": "1.8.27",
   "description": "Prop Futures Algo Trading CLI - Connect to Topstep, Alpha Futures, and other prop firms",
   "main": "src/app.js",
   "bin": {

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

@@ -8,7 +8,7 @@ const readline = require('readline');
 
 const { connections } = require('../../services');
 const { HQXServerService } = require('../../services/hqx-server');
-const { AlgoUI } = require('./ui');
+const { AlgoUI, renderSessionSummary } = require('./ui');
 const { logger, prompts } = require('../../utils');
 const { checkMarketHours } = require('../../services/projectx/market');
 
@@ -35,7 +35,7 @@ const copyTradingMenu = async () => {
   
   if (allConns.length < 2) {
     console.log();
-    console.log(chalk.yellow('  Copy Trading requires 2 connected accounts'));
+    console.log(chalk.yellow(`  Copy Trading requires 2 connected accounts (found: ${allConns.length})`));
     console.log(chalk.gray('  Connect to another PropFirm first'));
     console.log();
     await prompts.waitForEnter();
@@ -43,7 +43,7 @@ const copyTradingMenu = async () => {
   }
   
   console.log();
-  console.log(chalk.magenta.bold('  Copy Trading Setup'));
+  console.log(chalk.yellow.bold('  Copy Trading Setup'));
   console.log();
   
   const spinner = ora({ text: 'Fetching accounts...', color: 'yellow' }).start();
@@ -192,6 +192,19 @@ const selectSymbol = async (service, label) => {
       return null;
     }
     
+    // Sort: Popular indices first (ES, NQ, YM, RTY, MES, MNQ)
+    const prioritySymbols = ['ES', 'NQ', 'YM', 'RTY', 'MES', 'MNQ', 'MYM', 'M2K', 'NKD', 'CL', 'GC'];
+    contracts.sort((a, b) => {
+      const aSymbol = (a.symbol || a.name || '').toUpperCase();
+      const bSymbol = (b.symbol || b.name || '').toUpperCase();
+      const aIdx = prioritySymbols.findIndex(p => aSymbol.startsWith(p));
+      const bIdx = prioritySymbols.findIndex(p => bSymbol.startsWith(p));
+      if (aIdx !== -1 && bIdx !== -1) return aIdx - bIdx;
+      if (aIdx !== -1) return -1;
+      if (bIdx !== -1) return 1;
+      return (a.name || '').localeCompare(b.name || '');
+    });
+    
     spinner.succeed(`Found ${contracts.length} contracts`);
     
     const options = contracts.map(c => ({ label: c.name || c.symbol, value: c }));
@@ -335,18 +348,7 @@ const launchCopyTrading = async (config) => {
   ui.cleanup();
   
   // Summary
-  console.clear();
-  console.log();
-  console.log(chalk.cyan('╔════════════════════════════════════════════════════════════════╗'));
-  console.log(chalk.cyan('║') + chalk.white('                      Copy Trading Summary                     ') + chalk.cyan('║'));
-  console.log(chalk.cyan('╠════════════════════════════════════════════════════════════════╣'));
-  console.log(chalk.cyan('║') + chalk.white(`  Stop Reason: ${(stopReason || 'unknown').padEnd(47)}`) + chalk.cyan('║'));
-  console.log(chalk.cyan('║') + chalk.white(`  Trades: ${String(stats.trades).padEnd(10)} Wins: ${String(stats.wins).padEnd(10)} Losses: ${String(stats.losses).padEnd(10)}`) + chalk.cyan('║'));
-  const pnlColor = stats.pnl >= 0 ? chalk.green : chalk.red;
-  const pnlStr = `${stats.pnl >= 0 ? '+' : ''}$${stats.pnl.toFixed(2)}`;
-  console.log(chalk.cyan('║') + chalk.white('  P&L: ') + pnlColor(pnlStr.padEnd(55)) + chalk.cyan('║'));
-  console.log(chalk.cyan('╚════════════════════════════════════════════════════════════════╝'));
-  console.log();
+  renderSessionSummary(stats, stopReason);
   
   await prompts.waitForEnter();
 };

package/src/pages/algo/index.js

@@ -19,11 +19,11 @@ const algoTradingMenu = async (service) => {
   
   console.log();
   console.log(chalk.gray(getSeparator()));
-  console.log(chalk.magenta.bold('  Algo-Trading'));
+  console.log(chalk.yellow.bold('  Algo-Trading'));
   console.log(chalk.gray(getSeparator()));
   console.log();
 
-  const action = await prompts.selectOption('Select Mode:', [
+  const action = await prompts.selectOption(chalk.yellow('Select Mode:'), [
     { value: 'one_account', label: 'One Account' },
     { value: 'copy_trading', label: 'Copy Trading' },
     { value: 'back', label: '< Back' }

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

@@ -8,7 +8,7 @@ const readline = require('readline');
 
 const { connections } = require('../../services');
 const { HQXServerService } = require('../../services/hqx-server');
-const { AlgoUI } = require('./ui');
+const { AlgoUI, renderSessionSummary } = require('./ui');
 const { prompts } = require('../../utils');
 const { checkMarketHours } = require('../../services/projectx/market');
 
@@ -89,12 +89,25 @@ const selectSymbol = async (service, account) => {
     name: c.description || c.name || c.symbol
   }));
   
+  // Sort: Popular indices first (ES, NQ, YM, RTY, MES, MNQ)
+  const prioritySymbols = ['ES', 'NQ', 'YM', 'RTY', 'MES', 'MNQ', 'MYM', 'M2K', 'NKD', 'CL', 'GC'];
+  contracts.sort((a, b) => {
+    const aSymbol = (a.symbol || '').toUpperCase();
+    const bSymbol = (b.symbol || '').toUpperCase();
+    const aIdx = prioritySymbols.findIndex(p => aSymbol.startsWith(p));
+    const bIdx = prioritySymbols.findIndex(p => bSymbol.startsWith(p));
+    if (aIdx !== -1 && bIdx !== -1) return aIdx - bIdx;
+    if (aIdx !== -1) return -1;
+    if (bIdx !== -1) return 1;
+    return (a.name || '').localeCompare(b.name || '');
+  });
+  
   spinner.succeed(`Found ${contracts.length} contracts`);
   
   const options = contracts.map(c => ({ label: c.name, value: c }));
   options.push({ label: '< Back', value: 'back' });
   
-  const contract = await prompts.selectOption('Select Symbol:', options);
+  const contract = await prompts.selectOption(chalk.yellow('Select Symbol:'), options);
   return contract === 'back' ? null : contract;
 };
 
@@ -242,18 +255,7 @@ const launchAlgo = async (service, account, contract, config) => {
   ui.cleanup();
   
   // Summary
-  console.clear();
-  console.log();
-  console.log(chalk.cyan('╔════════════════════════════════════════════════════════════════╗'));
-  console.log(chalk.cyan('║') + chalk.white('                        Session Summary                        ') + chalk.cyan('║'));
-  console.log(chalk.cyan('╠════════════════════════════════════════════════════════════════╣'));
-  console.log(chalk.cyan('║') + chalk.white(`  Stop Reason: ${(stopReason || 'unknown').padEnd(47)}`) + chalk.cyan('║'));
-  console.log(chalk.cyan('║') + chalk.white(`  Trades: ${String(stats.trades).padEnd(10)} Wins: ${String(stats.wins).padEnd(10)} Losses: ${String(stats.losses).padEnd(10)}`) + chalk.cyan('║'));
-  const pnlColor = stats.pnl >= 0 ? chalk.green : chalk.red;
-  const pnlStr = `${stats.pnl >= 0 ? '+' : ''}$${stats.pnl.toFixed(2)}`;
-  console.log(chalk.cyan('║') + chalk.white('  P&L: ') + pnlColor(pnlStr.padEnd(55)) + chalk.cyan('║'));
-  console.log(chalk.cyan('╚════════════════════════════════════════════════════════════════╝'));
-  console.log();
+  renderSessionSummary(stats, stopReason);
   
   await prompts.waitForEnter();
 };

package/src/pages/algo/ui.js

@@ -350,4 +350,79 @@ const checkMarketStatus = () => {
   return { isOpen: true, message: 'Market OPEN' };
 };
 
-module.exports = { AlgoUI, checkMarketStatus, LOG_COLORS, LOG_ICONS, stripAnsi, center, fitToWidth };
+/**
+ * Render Session Summary - Same style as dashboard
+ */
+const renderSessionSummary = (stats, stopReason) => {
+  const W = 96; // Same width as dashboard
+  const colL = Math.floor(W / 2) - 1;
+  const colR = W - colL - 1;
+  const version = require('../../../package.json').version;
+  
+  console.clear();
+  console.log();
+  
+  // Top border
+  console.log(chalk.cyan(BOX.TOP + BOX.H.repeat(W) + BOX.TR));
+  
+  // Logo
+  console.log(chalk.cyan(BOX.V) + chalk.cyan(' ██╗  ██╗███████╗██████╗  ██████╗ ███████╗ ██████╗ ██╗   ██╗ █████╗ ███╗   ██╗████████╗') + chalk.yellow('██╗  ██╗') + ' ' + chalk.cyan(BOX.V));
+  console.log(chalk.cyan(BOX.V) + chalk.cyan(' ██║  ██║██╔════╝██╔══██╗██╔════╝ ██╔════╝██╔═══██╗██║   ██║██╔══██╗████╗  ██║╚══██╔══╝') + chalk.yellow('╚██╗██╔╝') + ' ' + chalk.cyan(BOX.V));
+  console.log(chalk.cyan(BOX.V) + chalk.cyan(' ███████║█████╗  ██║  ██║██║  ███╗█████╗  ██║   ██║██║   ██║███████║██╔██╗ ██║   ██║   ') + chalk.yellow(' ╚███╔╝ ') + ' ' + chalk.cyan(BOX.V));
+  console.log(chalk.cyan(BOX.V) + chalk.cyan(' ██╔══██║██╔══╝  ██║  ██║██║   ██║██╔══╝  ██║▄▄ ██║██║   ██║██╔══██║██║╚██╗██║   ██║   ') + chalk.yellow(' ██╔██╗ ') + ' ' + chalk.cyan(BOX.V));
+  console.log(chalk.cyan(BOX.V) + chalk.cyan(' ██║  ██║███████╗██████╔╝╚██████╔╝███████╗╚██████╔╝╚██████╔╝██║  ██║██║ ╚████║   ██║   ') + chalk.yellow('██╔╝ ██╗') + ' ' + chalk.cyan(BOX.V));
+  console.log(chalk.cyan(BOX.V) + chalk.cyan(' ╚═╝  ╚═╝╚══════╝╚═════╝  ╚═════╝ ╚══════╝ ╚══▀▀═╝  ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═══╝   ╚═╝   ') + chalk.yellow('╚═╝  ╚═╝') + ' ' + chalk.cyan(BOX.V));
+  
+  // Separator + title
+  console.log(chalk.cyan(BOX.ML + BOX.H.repeat(W) + BOX.MR));
+  console.log(chalk.cyan(BOX.V) + chalk.white(center(`Prop Futures Algo Trading  v${version}`, W)) + chalk.cyan(BOX.V));
+  console.log(chalk.cyan(BOX.ML + BOX.H.repeat(W) + BOX.MR));
+  console.log(chalk.cyan(BOX.V) + chalk.yellow(center('Session Summary', W)) + chalk.cyan(BOX.V));
+  
+  // Grid separators
+  const GT = BOX.ML + BOX.H.repeat(colL) + BOX.TM + BOX.H.repeat(colR) + BOX.MR;
+  const GM = BOX.ML + BOX.H.repeat(colL) + BOX.MM + BOX.H.repeat(colR) + BOX.MR;
+  
+  const row = (label1, value1, color1, label2, value2, color2) => {
+    const c1 = ` ${label1}: ${color1(value1)}`;
+    const c2 = ` ${label2}: ${color2(value2)}`;
+    const p1 = ` ${label1}: ${value1}`;
+    const p2 = ` ${label2}: ${value2}`;
+    const padded1 = c1 + ' '.repeat(Math.max(0, colL - p1.length));
+    const padded2 = c2 + ' '.repeat(Math.max(0, colR - p2.length));
+    console.log(chalk.cyan(BOX.V) + padded1 + chalk.cyan(BOX.VS) + padded2 + chalk.cyan(BOX.V));
+  };
+  
+  console.log(chalk.cyan(GT));
+  
+  // Row 1: Stop Reason | Duration
+  const duration = stats.duration || '--';
+  const reasonColor = stopReason === 'target' ? chalk.green : stopReason === 'risk' ? chalk.red : chalk.yellow;
+  row('Stop Reason', (stopReason || 'manual').toUpperCase(), reasonColor, 'Duration', duration, chalk.white);
+  
+  console.log(chalk.cyan(GM));
+  
+  // Row 2: Trades | Win Rate
+  const winRate = stats.trades > 0 ? ((stats.wins / stats.trades) * 100).toFixed(1) + '%' : '0%';
+  row('Trades', String(stats.trades || 0), chalk.white, 'Win Rate', winRate, stats.wins >= stats.losses ? chalk.green : chalk.red);
+  
+  console.log(chalk.cyan(GM));
+  
+  // Row 3: Wins | Losses
+  row('Wins', String(stats.wins || 0), chalk.green, 'Losses', String(stats.losses || 0), chalk.red);
+  
+  console.log(chalk.cyan(GM));
+  
+  // Row 4: P&L | Target
+  const pnl = stats.pnl || 0;
+  const pnlStr = `${pnl >= 0 ? '+' : ''}$${Math.abs(pnl).toFixed(2)}`;
+  const pnlColor = pnl >= 0 ? chalk.green : chalk.red;
+  const targetStr = `$${(stats.target || 0).toFixed(2)}`;
+  row('P&L', pnlStr, pnlColor, 'Target', targetStr, chalk.cyan);
+  
+  // Bottom border
+  console.log(chalk.cyan(BOX.BOT + BOX.H.repeat(W) + BOX.BR));
+  console.log();
+};
+
+module.exports = { AlgoUI, checkMarketStatus, renderSessionSummary, LOG_COLORS, LOG_ICONS, stripAnsi, center, fitToWidth };