hedgequantx 1.5.7 → 1.5.9

package/package.json

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

package/src/app.js

@@ -189,51 +189,15 @@ const banner = async () => {
   const tagline = isMobile ? `HQX v${version}` : `Prop Futures Algo Trading  v${version}`;
   console.log(chalk.cyan('║') + chalk.white(centerText(tagline, innerWidth)) + chalk.cyan('║'));
   
-  // Stats bar if connected
-  // STRICT: Only display verified values from API, show '--' for unavailable data
-  if (statsInfo) {
-    console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
-    
-    const connStr = `Connections: ${statsInfo.connections}`;
-    const accStr = `Accounts: ${statsInfo.accounts}`;
-    
-    // Balance: show '--' if not available from API
-    const balStr = statsInfo.balance !== null 
-      ? `Balance: $${statsInfo.balance.toLocaleString()}` 
-      : `Balance: --`;
-    const balColor = statsInfo.balance !== null ? chalk.green : chalk.gray;
-    
-    // P&L: show '--' if not available from API
-    let pnlDisplay;
-    let pnlColor;
-    if (statsInfo.pnl !== null) {
-      const pnlSign = statsInfo.pnl >= 0 ? '+' : '';
-      pnlColor = statsInfo.pnl >= 0 ? chalk.green : chalk.red;
-      pnlDisplay = `$${statsInfo.pnl.toLocaleString()} (${pnlSign}${statsInfo.pnl.toFixed(1)})`;
-    } else {
-      pnlColor = chalk.gray;
-      pnlDisplay = '--';
-    }
-    
-    // Build full stats text and calculate padding
-    const statsText = `${connStr}    ${accStr}    ${balStr}    P&L: ${pnlDisplay}`;
-    const statsLen = statsText.length;
-    const statsLeftPad = Math.floor((innerWidth - statsLen) / 2);
-    const statsRightPad = innerWidth - statsLen - statsLeftPad;
-    
-    console.log(chalk.cyan('║') + ' '.repeat(statsLeftPad) +
-      chalk.white(connStr) + '    ' +
-      chalk.white(accStr) + '    ' +
-      chalk.white('Balance: ') + balColor(statsInfo.balance !== null ? `$${statsInfo.balance.toLocaleString()}` : '--') + '    ' +
-      chalk.white('P&L: ') + pnlColor(pnlDisplay) + 
-      ' '.repeat(Math.max(0, statsRightPad)) + chalk.cyan('║')
-    );
-  }
-  
   console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
   console.log();
 };
 
+/**
+ * Get cached stats for dashboard
+ */
+const getCachedStats = () => cachedStats;
+
 /**
  * Main connection menu
  */
@@ -412,4 +376,4 @@ const run = async () => {
   }
 };
 
-module.exports = { run, banner, mainMenu, dashboardMenu };
+module.exports = { run, banner, mainMenu, dashboardMenu, getCachedStats };

package/src/config/contracts.js

@@ -0,0 +1,100 @@
+/**
+ * Shared contracts configuration
+ * Used by both Rithmic and ProjectX services
+ */
+
+// Current front-month contracts (update monthly as contracts expire)
+const CONTRACTS = [
+  // Index Futures - Most Popular
+  { symbol: 'ES', name: 'E-mini S&P 500', exchange: 'CME', group: 'Index' },
+  { symbol: 'NQ', name: 'E-mini NASDAQ-100', exchange: 'CME', group: 'Index' },
+  { symbol: 'RTY', name: 'E-mini Russell 2000', exchange: 'CME', group: 'Index' },
+  { symbol: 'YM', name: 'E-mini Dow Jones', exchange: 'CBOT', group: 'Index' },
+  
+  // Micro Index Futures
+  { symbol: 'MES', name: 'Micro E-mini S&P 500', exchange: 'CME', group: 'Micro' },
+  { symbol: 'MNQ', name: 'Micro E-mini NASDAQ-100', exchange: 'CME', group: 'Micro' },
+  { symbol: 'M2K', name: 'Micro E-mini Russell 2000', exchange: 'CME', group: 'Micro' },
+  { symbol: 'MYM', name: 'Micro E-mini Dow Jones', exchange: 'CBOT', group: 'Micro' },
+  
+  // Energy Futures
+  { symbol: 'CL', name: 'Crude Oil', exchange: 'NYMEX', group: 'Energy' },
+  { symbol: 'NG', name: 'Natural Gas', exchange: 'NYMEX', group: 'Energy' },
+  { symbol: 'MCL', name: 'Micro Crude Oil', exchange: 'NYMEX', group: 'Energy' },
+  
+  // Metals Futures
+  { symbol: 'GC', name: 'Gold', exchange: 'COMEX', group: 'Metals' },
+  { symbol: 'SI', name: 'Silver', exchange: 'COMEX', group: 'Metals' },
+  { symbol: 'HG', name: 'Copper', exchange: 'COMEX', group: 'Metals' },
+  { symbol: 'MGC', name: 'Micro Gold', exchange: 'COMEX', group: 'Metals' },
+  
+  // Treasury Futures
+  { symbol: 'ZB', name: '30-Year Treasury Bond', exchange: 'CBOT', group: 'Bonds' },
+  { symbol: 'ZN', name: '10-Year Treasury Note', exchange: 'CBOT', group: 'Bonds' },
+  { symbol: 'ZF', name: '5-Year Treasury Note', exchange: 'CBOT', group: 'Bonds' },
+  
+  // Agriculture Futures
+  { symbol: 'ZC', name: 'Corn', exchange: 'CBOT', group: 'Agriculture' },
+  { symbol: 'ZS', name: 'Soybeans', exchange: 'CBOT', group: 'Agriculture' },
+  { symbol: 'ZW', name: 'Wheat', exchange: 'CBOT', group: 'Agriculture' },
+  
+  // Currency Futures
+  { symbol: '6E', name: 'Euro FX', exchange: 'CME', group: 'Currency' },
+  { symbol: '6B', name: 'British Pound', exchange: 'CME', group: 'Currency' },
+  { symbol: '6J', name: 'Japanese Yen', exchange: 'CME', group: 'Currency' },
+];
+
+/**
+ * Get current front-month code based on date
+ * Futures months: F(Jan), G(Feb), H(Mar), J(Apr), K(May), M(Jun), 
+ *                 N(Jul), Q(Aug), U(Sep), V(Oct), X(Nov), Z(Dec)
+ */
+const getMonthCode = (monthsAhead = 0) => {
+  const codes = ['F', 'G', 'H', 'J', 'K', 'M', 'N', 'Q', 'U', 'V', 'X', 'Z'];
+  const now = new Date();
+  const month = (now.getMonth() + monthsAhead) % 12;
+  return codes[month];
+};
+
+/**
+ * Get year code (last digit)
+ */
+const getYearCode = (monthsAhead = 0) => {
+  const now = new Date();
+  const futureDate = new Date(now.getFullYear(), now.getMonth() + monthsAhead, 1);
+  return futureDate.getFullYear() % 10;
+};
+
+/**
+ * Get contracts with current front-month symbols
+ * @param {number} monthsAhead - How many months ahead for the contract (default 2 for front month)
+ */
+const getContractsWithMonthCode = (monthsAhead = 2) => {
+  const monthCode = getMonthCode(monthsAhead);
+  const yearCode = getYearCode(monthsAhead);
+  
+  return CONTRACTS.map(c => ({
+    ...c,
+    symbol: `${c.symbol}${monthCode}${yearCode}`,
+    name: `${c.name}`,
+    baseSymbol: c.symbol
+  }));
+};
+
+/**
+ * Get display name for a symbol
+ */
+const getContractDisplayName = (symbol) => {
+  // Extract base symbol (remove month/year code)
+  const baseSymbol = symbol.replace(/[A-Z][0-9]$/, '').replace(/[FGHJKMNQUVXZ][0-9]+$/, '');
+  const contract = CONTRACTS.find(c => c.symbol === baseSymbol);
+  return contract ? contract.name : symbol;
+};
+
+module.exports = {
+  CONTRACTS,
+  getMonthCode,
+  getYearCode,
+  getContractsWithMonthCode,
+  getContractDisplayName
+};

package/src/menus/connect.js

@@ -65,9 +65,8 @@ const loginPrompt = async (propfirmName) => {
 const projectXMenu = async () => {
   const propfirms = getPropFirmsByPlatform('ProjectX');
   const boxWidth = getLogoWidth();
-  const innerWidth = boxWidth - 2;
-  const numCols = 3;
-  const colWidth = Math.floor(innerWidth / numCols);
+  const W = boxWidth - 2; // Inner width
+  const col1Width = Math.floor(W / 2);
   
   // Build numbered list
   const numbered = propfirms.map((pf, i) => ({
@@ -78,61 +77,50 @@ const projectXMenu = async () => {
   
   // PropFirm selection box
   console.log();
-  console.log(chalk.cyan('╔' + '═'.repeat(innerWidth) + '╗'));
-  console.log(chalk.cyan('║') + chalk.white.bold(centerText('SELECT PROPFIRM', innerWidth)) + chalk.cyan('║'));
-  console.log(chalk.cyan('║') + ' '.repeat(innerWidth) + chalk.cyan('║'));
+  console.log(chalk.cyan('╔' + '═'.repeat(W) + '╗'));
+  console.log(chalk.cyan('║') + chalk.white.bold(centerText('SELECT PROPFIRM (ProjectX)', W)) + chalk.cyan('║'));
+  console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
   
-  // Display in 3 columns with fixed width alignment
-  const rows = Math.ceil(numbered.length / numCols);
-  const maxNum = numbered.length;
-  const numWidth = maxNum >= 10 ? 4 : 3; // [XX] or [X]
+  // Display in 2 columns
+  const menuRow = (left, right) => {
+    const leftPlain = left ? 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, W - col1Width - rightPlain.length));
+    console.log(chalk.cyan('║') + leftPadded + rightPadded + chalk.cyan('║'));
+  };
   
-  for (let row = 0; row < rows; row++) {
-    let line = '';
-    for (let col = 0; col < numCols; col++) {
-      const idx = row + col * rows;
-      if (idx < numbered.length) {
-        const item = numbered[idx];
-        const numStr = item.num.toString().padStart(2, ' ');
-        const coloredText = chalk.cyan(`[${numStr}]`) + ' ' + chalk.white(item.name);
-        const textLen = 4 + 1 + item.name.length; // [XX] + space + name
-        const padding = colWidth - textLen - 2;
-        line += '  ' + coloredText + ' '.repeat(Math.max(0, padding));
-      } else {
-        line += ' '.repeat(colWidth);
-      }
-    }
-    // Adjust for exact width
-    const lineLen = line.replace(/\x1b\[[0-9;]*m/g, '').length;
-    const adjust = innerWidth - lineLen;
-    console.log(chalk.cyan('║') + line + ' '.repeat(Math.max(0, adjust)) + chalk.cyan('║'));
+  // Display propfirms in 2 columns
+  for (let i = 0; i < numbered.length; i += 2) {
+    const left = numbered[i];
+    const right = numbered[i + 1];
+    const leftText = chalk.cyan(`[${left.num.toString().padStart(2, ' ')}]`) + ' ' + chalk.white(left.name);
+    const rightText = right ? chalk.cyan(`[${right.num.toString().padStart(2, ' ')}]`) + ' ' + chalk.white(right.name) : '';
+    menuRow(leftText, rightText);
   }
   
-  console.log(chalk.cyan('║') + ' '.repeat(innerWidth) + chalk.cyan('║'));
-  const backText = '  ' + chalk.red('[X] Back');
-  const backLen = '[X] Back'.length + 2;
-  console.log(chalk.cyan('║') + backText + ' '.repeat(innerWidth - backLen) + chalk.cyan('║'));
-  console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
+  // Back option
+  console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
+  const backLine = '  ' + chalk.red('[X] Back') + ' '.repeat(W - 10);
+  console.log(chalk.cyan('║') + backLine + chalk.cyan('║'));
+  console.log(chalk.cyan('╚' + '═'.repeat(W) + '╝'));
   console.log();
 
-  const validInputs = numbered.map(n => n.num.toString());
-  validInputs.push('x', 'X');
-  
   const { action } = await inquirer.prompt([
     {
       type: 'input',
       name: 'action',
-      message: chalk.cyan(`Enter choice (1-${numbered.length}/X):`),
-      validate: (input) => {
-        if (validInputs.includes(input)) return true;
-        return `Please enter 1-${numbered.length} or X`;
-      }
+      message: chalk.cyan('Select:'),
+      prefix: ''
     }
   ]);
 
-  if (action.toLowerCase() === 'x') return null;
+  const input = (action || '').toLowerCase().trim();
+  if (input === 'x') return null;
+  
+  const selectedIdx = parseInt(input) - 1;
+  if (isNaN(selectedIdx) || selectedIdx < 0 || selectedIdx >= numbered.length) return null;
   
-  const selectedIdx = parseInt(action) - 1;
   const selectedPropfirm = numbered[selectedIdx];
 
   const credentials = await loginPrompt(selectedPropfirm.name);
@@ -345,53 +333,46 @@ const tradovateMenu = async () => {
  */
 const addPropAccountMenu = async () => {
   const boxWidth = getLogoWidth();
-  const innerWidth = boxWidth - 2;
-  const col1Width = Math.floor(innerWidth / 2);
-  const col2Width = innerWidth - col1Width;
+  const W = boxWidth - 2; // Inner width
+  const col1Width = Math.floor(W / 2);
   
   console.log();
-  console.log(chalk.cyan('╔' + '═'.repeat(innerWidth) + '╗'));
-  console.log(chalk.cyan('║') + chalk.white.bold(centerText('ADD PROP ACCOUNT', innerWidth)) + chalk.cyan('║'));
-  console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
+  console.log(chalk.cyan('╔' + '═'.repeat(W) + '╗'));
+  console.log(chalk.cyan('║') + chalk.white.bold(centerText('ADD PROP ACCOUNT', W)) + chalk.cyan('║'));
+  console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
   
   const menuRow = (left, right) => {
-    const leftText = '  ' + left;
-    const rightText = right ? '  ' + right : '';
-    const leftLen = leftText.replace(/\x1b\[[0-9;]*m/g, '').length;
-    const rightLen = rightText.replace(/\x1b\[[0-9;]*m/g, '').length;
-    const leftPad = col1Width - leftLen;
-    const rightPad = col2Width - rightLen;
-    console.log(chalk.cyan('║') + leftText + ' '.repeat(Math.max(0, leftPad)) + rightText + ' '.repeat(Math.max(0, rightPad)) + chalk.cyan('║'));
+    const leftPlain = left.replace(/\x1b\[[0-9;]*m/g, '');
+    const rightPlain = 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, W - col1Width - rightPlain.length));
+    console.log(chalk.cyan('║') + leftPadded + rightPadded + chalk.cyan('║'));
   };
   
   menuRow(chalk.cyan('[1] ProjectX'), chalk.cyan('[2] Rithmic'));
   menuRow(chalk.cyan('[3] Tradovate'), chalk.red('[X] Back'));
   
-  console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
+  console.log(chalk.cyan('╚' + '═'.repeat(W) + '╝'));
   console.log();
 
   const { action } = await inquirer.prompt([
     {
       type: 'input',
       name: 'action',
-      message: chalk.cyan('Enter choice (1/2/3/X):'),
-      validate: (input) => {
-        const valid = ['1', '2', '3', 'x', 'X'];
-        if (valid.includes(input)) return true;
-        return 'Please enter 1, 2, 3 or X';
-      }
+      message: chalk.cyan('Select:'),
+      prefix: ''
     }
   ]);
 
+  const input = (action || '').toLowerCase().trim();
   const actionMap = {
     '1': 'projectx',
     '2': 'rithmic',
     '3': 'tradovate',
-    'x': null,
-    'X': null
+    'x': null
   };
 
-  return actionMap[action];
+  return actionMap[input] || null;
 };
 
 module.exports = {

package/src/menus/dashboard.js

@@ -10,6 +10,7 @@ const { execSync, spawn } = require('child_process');
 
 const { connections } = require('../services');
 const { getLogoWidth, centerText, prepareStdin } = require('../ui');
+const { getCachedStats } = require('../app');
 
 /**
  * Dashboard menu after login
@@ -19,115 +20,116 @@ const dashboardMenu = async (service) => {
   // Ensure stdin is ready for prompts
   prepareStdin();
   
-  const user = service.user;
   const boxWidth = getLogoWidth();
-  const W = boxWidth - 2; // Same width as logo (inner width)
+  const W = boxWidth - 2; // Inner width (without borders)
   
-  // Helper to center text
-  const centerLine = (text, width) => {
-    const pad = Math.floor((width - text.length) / 2);
-    return ' '.repeat(Math.max(0, pad)) + text + ' '.repeat(Math.max(0, width - pad - text.length));
-  };
-  
-  // Helper to pad text left
-  const padLine = (text, width) => {
-    return ' ' + text + ' '.repeat(Math.max(0, width - text.length - 1));
+  // Helper to create a line that fits exactly in the box
+  const makeLine = (content, align = 'left') => {
+    const plainLen = content.replace(/\x1b\[[0-9;]*m/g, '').length;
+    const padding = W - plainLen;
+    if (align === 'center') {
+      const leftPad = Math.floor(padding / 2);
+      const rightPad = padding - leftPad;
+      return chalk.cyan('║') + ' '.repeat(leftPad) + content + ' '.repeat(rightPad) + chalk.cyan('║');
+    }
+    return chalk.cyan('║') + content + ' '.repeat(Math.max(0, padding)) + chalk.cyan('║');
   };
   
   // Dashboard box header
   console.log();
   console.log(chalk.cyan('╔' + '═'.repeat(W) + '╗'));
-  console.log(chalk.cyan('║') + chalk.yellow.bold(centerLine('Welcome, HQX Trader!', W)) + chalk.cyan('║'));
+  console.log(makeLine(chalk.yellow.bold('Welcome, HQX Trader!'), 'center'));
   console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
   
-  // Connection info - show all active connections in boxes (max 3 per row)
+  // Show connected propfirms centered on one line (max 3)
   const allConns = connections.getAll();
   if (allConns.length > 0) {
-    const maxPerRow = 3;
-    const boxPadding = 2; // padding inside each mini-box
-    const gap = 2; // gap between boxes
+    const propfirms = allConns.slice(0, 3).map(c => c.propfirm || c.type || 'Connected');
+    const propfirmText = propfirms.map(p => chalk.green('● ') + chalk.white(p)).join('    ');
+    console.log(makeLine(propfirmText, 'center'));
+  }
+  
+  // Show stats bar (Connections, Accounts, Balance, P&L)
+  let statsInfo = null;
+  try { statsInfo = getCachedStats(); } catch (e) {}
+  
+  if (statsInfo) {
+    console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
     
-    // Calculate box width based on number of connections (max 3)
-    const numBoxes = Math.min(allConns.length, maxPerRow);
-    const totalGaps = (numBoxes - 1) * gap;
-    const connBoxWidth = Math.floor((W - totalGaps - 2) / numBoxes); // -2 for outer padding
+    const connStr = `Connections: ${statsInfo.connections}`;
+    const accStr = `Accounts: ${statsInfo.accounts}`;
     
-    // Process connections in rows of 3
-    for (let rowStart = 0; rowStart < allConns.length; rowStart += maxPerRow) {
-      const rowConns = allConns.slice(rowStart, rowStart + maxPerRow);
-      const numInRow = rowConns.length;
-      const rowBoxWidth = Math.floor((W - (numInRow - 1) * gap - 2) / numInRow);
-      
-      // Top border of boxes
-      let topLine = ' ';
-      for (let i = 0; i < numInRow; i++) {
-        topLine += '┌' + '─'.repeat(rowBoxWidth - 2) + '┐';
-        if (i < numInRow - 1) topLine += ' '.repeat(gap);
-      }
-      const topPad = W - topLine.length;
-      console.log(chalk.cyan('║') + chalk.green(topLine) + ' '.repeat(Math.max(0, topPad)) + chalk.cyan('║'));
-      
-      // Content of boxes
-      let contentLine = ' ';
-      for (let i = 0; i < numInRow; i++) {
-        const connText = rowConns[i].propfirm || rowConns[i].type || 'Connected';
-        const truncated = connText.length > rowBoxWidth - 4 ? connText.slice(0, rowBoxWidth - 7) + '...' : connText;
-        const innerWidth = rowBoxWidth - 4; // -2 for borders, -2 for padding
-        const textPad = Math.floor((innerWidth - truncated.length) / 2);
-        const textPadRight = innerWidth - truncated.length - textPad;
-        contentLine += '│ ' + ' '.repeat(textPad) + truncated + ' '.repeat(textPadRight) + ' │';
-        if (i < numInRow - 1) contentLine += ' '.repeat(gap);
-      }
-      const contentPad = W - contentLine.length;
-      console.log(chalk.cyan('║') + chalk.green(contentLine) + ' '.repeat(Math.max(0, contentPad)) + chalk.cyan('║'));
-      
-      // Bottom border of boxes
-      let bottomLine = ' ';
-      for (let i = 0; i < numInRow; i++) {
-        bottomLine += '└' + '─'.repeat(rowBoxWidth - 2) + '┘';
-        if (i < numInRow - 1) bottomLine += ' '.repeat(gap);
-      }
-      const bottomPad = W - bottomLine.length;
-      console.log(chalk.cyan('║') + chalk.green(bottomLine) + ' '.repeat(Math.max(0, bottomPad)) + chalk.cyan('║'));
+    const balStr = statsInfo.balance !== null 
+      ? `$${statsInfo.balance.toLocaleString()}` 
+      : '--';
+    const balColor = statsInfo.balance !== null ? chalk.green : chalk.gray;
+    
+    let pnlDisplay, pnlColor;
+    if (statsInfo.pnl !== null) {
+      const pnlSign = statsInfo.pnl >= 0 ? '+' : '';
+      pnlColor = statsInfo.pnl >= 0 ? chalk.green : chalk.red;
+      pnlDisplay = `${pnlSign}$${Math.abs(statsInfo.pnl).toLocaleString()}`;
+    } else {
+      pnlColor = chalk.gray;
+      pnlDisplay = '--';
     }
+    
+    const statsText = connStr + '    ' + accStr + '    Balance: ' + balStr + '    P&L: ' + pnlDisplay;
+    const statsPlain = `${connStr}    ${accStr}    Balance: ${balStr}    P&L: ${pnlDisplay}`;
+    const statsLeftPad = Math.floor((W - statsPlain.length) / 2);
+    const statsRightPad = W - statsPlain.length - statsLeftPad;
+    
+    console.log(chalk.cyan('║') + ' '.repeat(statsLeftPad) +
+      chalk.white(connStr) + '    ' +
+      chalk.white(accStr) + '    ' +
+      chalk.white('Balance: ') + balColor(balStr) + '    ' +
+      chalk.white('P&L: ') + pnlColor(pnlDisplay) +
+      ' '.repeat(Math.max(0, statsRightPad)) + chalk.cyan('║'));
   }
   
   console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
   
   // Menu options in 2 columns
   const col1Width = Math.floor(W / 2);
-  const col2Width = W - col1Width;
   
   const menuRow = (left, right) => {
     const leftPlain = left.replace(/\x1b\[[0-9;]*m/g, '');
-    const rightPlain = right ? right.replace(/\x1b\[[0-9;]*m/g, '') : '';
-    const leftPad = ' '.repeat(Math.max(0, col1Width - leftPlain.length - 2));
-    const rightPad = ' '.repeat(Math.max(0, col2Width - rightPlain.length - 2));
-    console.log(chalk.cyan('║') + '  ' + left + leftPad + '  ' + (right || '') + rightPad + chalk.cyan('║'));
+    const rightPlain = 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, W - col1Width - rightPlain.length));
+    console.log(chalk.cyan('║') + leftPadded + rightPadded + chalk.cyan('║'));
   };
   
+  // Display menu items in 2 columns inside the box
+  menuRow(chalk.cyan('[1] View Accounts'), chalk.cyan('[2] View Stats'));
+  menuRow(chalk.cyan('[+] Add Prop-Account'), chalk.magenta('[A] Algo-Trading'));
+  menuRow(chalk.yellow('[U] Update HQX'), chalk.red('[X] Disconnect'));
+  
   console.log(chalk.cyan('╚' + '═'.repeat(W) + '╝'));
   console.log();
-
-  // Use list type instead of input - more stable stdin handling
-  const { action } = await inquirer.prompt([
+  
+  // Input prompt
+  const { choice } = await inquirer.prompt([
     {
-      type: 'list',
-      name: 'action',
-      message: chalk.cyan('Select action:'),
-      choices: [
-        { name: chalk.cyan('[1] View Accounts'), value: 'accounts' },
-        { name: chalk.cyan('[2] View Stats'), value: 'stats' },
-        { name: chalk.cyan('[+] Add Prop-Account'), value: 'add_prop_account' },
-        { name: chalk.magenta('[A] Algo-Trading'), value: 'algotrading' },
-        { name: chalk.yellow('[U] Update HQX'), value: 'update' },
-        { name: chalk.red('[X] Disconnect'), value: 'disconnect' }
-      ],
-      loop: false
+      type: 'input',
+      name: 'choice',
+      message: chalk.cyan('Select:'),
+      prefix: ''
     }
   ]);
-
-  return action;
+  
+  // Map input to action
+  const input = (choice || '').toString().toLowerCase().trim();
+  const actionMap = {
+    '1': 'accounts',
+    '2': 'stats',
+    '+': 'add_prop_account',
+    'a': 'algotrading',
+    'u': 'update',
+    'x': 'disconnect'
+  };
+  
+  return actionMap[input] || null;
 };
 
 /**
@@ -188,43 +190,19 @@ const handleUpdate = async () => {
     
     // Compare versions
     if (currentVersion === latestVersion) {
-      spinner.succeed('Already up to date!');
-      console.log();
-      console.log(chalk.green(`  You have the latest version: v${currentVersion}`));
-      console.log();
-      await waitForEnter();
-      return;
-    }
-    
-    // Ask user before updating
-    spinner.stop();
-    console.log();
-    console.log(chalk.cyan(`  Current version: v${currentVersion}`));
-    console.log(chalk.green(`  Latest version:  v${latestVersion}`));
-    console.log();
-    
-    prepareStdin();
-    const { confirm } = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'confirm',
-      message: 'Do you want to update now?',
-      default: true
-    }]);
-    
-    if (!confirm) {
-      console.log(chalk.gray('  Update cancelled'));
+      spinner.succeed(`Already up to date! (v${currentVersion})`);
       console.log();
-      await waitForEnter();
+      await new Promise(r => setTimeout(r, 2000));
       return;
     }
     
-    // Update via npm
-    spinner = ora({ text: `Updating v${currentVersion} -> v${latestVersion}...`, color: 'yellow' }).start();
+    // Show version info and update automatically
+    spinner.text = `Updating v${currentVersion} → v${latestVersion}...`;
     
     try {
       execSync('npm install -g hedgequantx@latest 2>/dev/null', { 
         stdio: 'pipe',
-        timeout: 120000,  // 2 minute timeout for install
+        timeout: 120000,
         encoding: 'utf8'
       });
     } catch (e) {
@@ -233,52 +211,29 @@ const handleUpdate = async () => {
       console.log(chalk.yellow('  Try manually:'));
       console.log(chalk.white('  npm install -g hedgequantx@latest'));
       console.log();
-      if (e.message) {
-        console.log(chalk.gray(`  Error: ${e.message.substring(0, 100)}`));
-        console.log();
-      }
       await waitForEnter();
       return;
     }
     
-    spinner.succeed('Update complete!');
+    spinner.succeed(`Updated: v${currentVersion} → v${latestVersion}`);
     console.log();
-    console.log(chalk.green(`  Updated: v${currentVersion} -> v${latestVersion}`));
+    console.log(chalk.cyan('  Restarting HedgeQuantX CLI...'));
     console.log();
     
-    // Ask if user wants to restart
-    prepareStdin();
-    const { restart } = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'restart',
-      message: 'Restart HQX now?',
-      default: true
-    }]);
+    // Auto restart after 2 seconds
+    await new Promise(r => setTimeout(r, 2000));
     
-    if (restart) {
-      console.log();
-      console.log(chalk.cyan('  Restarting HedgeQuantX CLI...'));
-      console.log();
-      
-      // Small delay so user can see the message
-      await new Promise(resolve => setTimeout(resolve, 1000));
-      
-      // Restart the CLI
-      try {
-        const child = spawn('hedgequantx', [], {
-          stdio: 'inherit',
-          detached: true,
-          shell: true
-        });
-        child.unref();
-        process.exit(0);
-      } catch (e) {
-        console.log(chalk.yellow('  Could not auto-restart. Please run: hedgequantx'));
-        console.log();
-        await waitForEnter();
-      }
-    } else {
-      console.log(chalk.gray('  Run "hedgequantx" to use the new version'));
+    // Restart the CLI
+    try {
+      const child = spawn('hedgequantx', [], {
+        stdio: 'inherit',
+        detached: true,
+        shell: true
+      });
+      child.unref();
+      process.exit(0);
+    } catch (e) {
+      console.log(chalk.yellow('  Could not auto-restart. Please run: hedgequantx'));
       console.log();
       await waitForEnter();
     }

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

@@ -173,12 +173,16 @@ const copyTradingMenu = async () => {
   const maxRisk = parseInt(maxRiskInput) || 200;
   
   // Step 6: Privacy
-  const { showNames } = await inquirer.prompt([{
-    type: 'confirm',
-    name: 'showNames',
-    message: 'Show account names?',
-    default: false
+  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;
   
   // Confirm
   console.log();
@@ -283,9 +287,12 @@ const launchCopyTrading = async (config) => {
   
   // Combined stats
   const stats = {
-    accountName: `${leadName} -> ${followerName}`,
-    symbol: `${lead.symbol.name} / ${follower.symbol.name}`,
-    contracts: `${lead.contracts}/${follower.contracts}`,
+    leadName,
+    followerName,
+    leadSymbol: lead.symbol.name,
+    followerSymbol: follower.symbol.name,
+    leadQty: lead.contracts,
+    followerQty: follower.contracts,
     target: dailyTarget,
     risk: maxRisk,
     pnl: 0,

package/src/pages/algo/ui.js

@@ -146,37 +146,55 @@ class AlgoUI {
     
     this._line(chalk.cyan(GT));
     
-    // Row 1: Account | Symbol (truncate long values)
-    const accName = (stats.accountName || 'N/A').substring(0, 35);
-    const symName = (stats.symbol || 'N/A').substring(0, 25);
-    const qtyStr = stats.contracts || '1/1';
+    // Row 1: Lead Account | Follower Account
+    const leadName = (stats.leadName || stats.accountName || 'N/A').substring(0, 40);
+    const followerName = (stats.followerName || 'N/A').substring(0, 40);
     
-    const r1c1 = buildCell('Account', accName, chalk.cyan, colL);
-    const r1c2t = ` Symbol: ${chalk.yellow(symName)}  Qty: ${chalk.cyan(qtyStr)}`;
-    const r1c2p = ` Symbol: ${symName}  Qty: ${qtyStr}`;
-    row(r1c1.padded, r1c2t + pad(Math.max(0, colR - r1c2p.length)));
+    const r1c1 = buildCell('Lead', leadName, chalk.cyan, colL);
+    const r1c2 = buildCell('Follower', followerName, chalk.magenta, colR);
+    row(r1c1.padded, r1c2.padded);
     
     this._line(chalk.cyan(GM));
     
-    // Row 2: Target | Risk
-    const r2c1 = buildCell('Target', '$' + (stats.target || 0).toFixed(2), chalk.green, colL);
-    const r2c2 = buildCell('Risk', '$' + (stats.risk || 0).toFixed(2), chalk.red, colR);
+    // Row 2: Lead Symbol | Follower Symbol
+    const leadSymbol = (stats.leadSymbol || stats.symbol || 'N/A').substring(0, 35);
+    const followerSymbol = (stats.followerSymbol || 'N/A').substring(0, 35);
+    
+    const r2c1 = buildCell('Symbol', leadSymbol, chalk.yellow, colL);
+    const r2c2 = buildCell('Symbol', followerSymbol, chalk.yellow, colR);
     row(r2c1.padded, r2c2.padded);
     
     this._line(chalk.cyan(GM));
     
-    // Row 3: P&L | Server
-    const r3c1 = buildCell('P&L', pnlStr, pnlColor, colL);
-    const r3c2 = buildCell('Server', stats.connected ? 'ON' : 'OFF', serverColor, colR);
+    // Row 3: Lead Qty | Follower Qty
+    const leadQty = stats.leadQty || '1';
+    const followerQty = stats.followerQty || '1';
+    
+    const r3c1 = buildCell('Qty', leadQty.toString(), chalk.cyan, colL);
+    const r3c2 = buildCell('Qty', followerQty.toString(), chalk.cyan, colR);
     row(r3c1.padded, r3c2.padded);
     
     this._line(chalk.cyan(GM));
     
-    // Row 4: Trades | Latency
-    const r4c1t = ` Trades: ${chalk.cyan(stats.trades || 0)}  W/L: ${chalk.green(stats.wins || 0)}/${chalk.red(stats.losses || 0)}`;
-    const r4c1p = ` Trades: ${stats.trades || 0}  W/L: ${stats.wins || 0}/${stats.losses || 0}`;
-    const r4c2 = buildCell('Latency', `${stats.latency || 0}ms`, latencyColor, colR);
-    row(r4c1t + pad(colL - r4c1p.length), r4c2.padded);
+    // Row 4: Target | Risk
+    const r4c1 = buildCell('Target', '$' + (stats.target || 0).toFixed(2), chalk.green, colL);
+    const r4c2 = buildCell('Risk', '$' + (stats.risk || 0).toFixed(2), chalk.red, colR);
+    row(r4c1.padded, r4c2.padded);
+    
+    this._line(chalk.cyan(GM));
+    
+    // Row 5: P&L | Server
+    const r5c1 = buildCell('P&L', pnlStr, pnlColor, colL);
+    const r5c2 = buildCell('Server', stats.connected ? 'ON' : 'OFF', serverColor, colR);
+    row(r5c1.padded, r5c2.padded);
+    
+    this._line(chalk.cyan(GM));
+    
+    // Row 6: Trades | Latency
+    const r6c1t = ` Trades: ${chalk.cyan(stats.trades || 0)}  W/L: ${chalk.green(stats.wins || 0)}/${chalk.red(stats.losses || 0)}`;
+    const r6c1p = ` Trades: ${stats.trades || 0}  W/L: ${stats.wins || 0}/${stats.losses || 0}`;
+    const r6c2 = buildCell('Latency', `${stats.latency || 0}ms`, latencyColor, colR);
+    row(r6c1t + pad(colL - r6c1p.length), r6c2.padded);
     
     this._line(chalk.cyan(GB));
   }

package/src/services/projectx/index.js

@@ -445,31 +445,11 @@ class ProjectXService {
 
   /**
    * Get popular contracts for trading
+   * Uses shared contract list for consistency with Rithmic
    */
   async getContracts() {
-    try {
-      // Search for popular futures symbols
-      const symbols = ['ES', 'NQ', 'MES', 'MNQ', 'CL', 'GC', 'RTY', 'YM'];
-      const allContracts = [];
-      
-      for (const sym of symbols) {
-        const response = await this._request(
-          this.propfirm.gatewayApi, '/api/Contract/search', 'POST',
-          { searchText: sym, live: false }
-        );
-        if (response.statusCode === 200) {
-          const contracts = response.data.contracts || response.data || [];
-          // Take first contract for each symbol (front month)
-          if (contracts.length > 0) {
-            allContracts.push(contracts[0]);
-          }
-        }
-      }
-      
-      return { success: true, contracts: allContracts };
-    } catch (error) {
-      return { success: false, contracts: [], error: error.message };
-    }
+    const { getContractsWithMonthCode } = require('../../config/contracts');
+    return { success: true, contracts: getContractsWithMonthCode() };
   }
 
   async searchContracts(searchText) {

package/src/services/rithmic/index.js

@@ -210,31 +210,14 @@ class RithmicService extends EventEmitter {
     };
   }
 
-  // All available contracts for Rithmic
-  _getAvailableContracts() {
-    return [
-      { symbol: 'ESH5', name: 'E-mini S&P 500 Mar 2025', exchange: 'CME', group: 'Index' },
-      { symbol: 'NQH5', name: 'E-mini NASDAQ-100 Mar 2025', exchange: 'CME', group: 'Index' },
-      { symbol: 'MESH5', name: 'Micro E-mini S&P 500 Mar 2025', exchange: 'CME', group: 'Micro' },
-      { symbol: 'MNQH5', name: 'Micro E-mini NASDAQ-100 Mar 2025', exchange: 'CME', group: 'Micro' },
-      { symbol: 'MCLE5', name: 'Micro Crude Oil Mar 2025', exchange: 'NYMEX', group: 'Micro' },
-      { symbol: 'MGCG5', name: 'Micro Gold Feb 2025', exchange: 'COMEX', group: 'Micro' },
-      { symbol: 'CLH5', name: 'Crude Oil Mar 2025', exchange: 'NYMEX', group: 'Energy' },
-      { symbol: 'GCG5', name: 'Gold Feb 2025', exchange: 'COMEX', group: 'Metals' },
-      { symbol: 'SIH5', name: 'Silver Mar 2025', exchange: 'COMEX', group: 'Metals' },
-      { symbol: 'RTYH5', name: 'E-mini Russell 2000 Mar 2025', exchange: 'CME', group: 'Index' },
-      { symbol: 'YMH5', name: 'E-mini Dow Jones Mar 2025', exchange: 'CBOT', group: 'Index' },
-      { symbol: 'ZBH5', name: '30-Year US Treasury Bond Mar 2025', exchange: 'CBOT', group: 'Bonds' },
-      { symbol: 'ZNH5', name: '10-Year US Treasury Note Mar 2025', exchange: 'CBOT', group: 'Bonds' },
-    ];
-  }
-
   async getContracts() {
-    return { success: true, contracts: this._getAvailableContracts() };
+    const { getContractsWithMonthCode } = require('../../config/contracts');
+    return { success: true, contracts: getContractsWithMonthCode() };
   }
 
   async searchContracts(searchText) {
-    const contracts = this._getAvailableContracts();
+    const { getContractsWithMonthCode } = require('../../config/contracts');
+    const contracts = getContractsWithMonthCode();
     if (!searchText) return contracts;
     const search = searchText.toUpperCase();
     return contracts.filter(c => c.symbol.includes(search) || c.name.toUpperCase().includes(search));