hedgequantx 1.5.7 → 1.5.8

package/package.json

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

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

@@ -19,115 +19,78 @@ 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
-    
-    // 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
-    
-    // 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 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'));
   }
   
   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 +151,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}`));
+      spinner.succeed(`Already up to date! (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'));
-      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 +172,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/services/projectx/index.js

@@ -449,7 +449,7 @@ class ProjectXService {
   async getContracts() {
     try {
       // Search for popular futures symbols
-      const symbols = ['ES', 'NQ', 'MES', 'MNQ', 'CL', 'GC', 'RTY', 'YM'];
+      const symbols = ['ES', 'NQ', 'MES', 'MNQ', 'CL', 'GC', 'RTY', 'YM', 'SI', 'ZB', 'ZN', 'NG'];
       const allContracts = [];
       
       for (const sym of symbols) {
@@ -461,7 +461,12 @@ class ProjectXService {
           const contracts = response.data.contracts || response.data || [];
           // Take first contract for each symbol (front month)
           if (contracts.length > 0) {
-            allContracts.push(contracts[0]);
+            const contract = contracts[0];
+            // Ensure name is set properly
+            if (!contract.name || contract.name === contract.symbol) {
+              contract.name = this._getContractDisplayName(contract.symbol) || contract.symbol;
+            }
+            allContracts.push(contract);
           }
         }
       }
@@ -472,6 +477,46 @@ class ProjectXService {
     }
   }
 
+  /**
+   * Get display name for contract symbol
+   */
+  _getContractDisplayName(symbol) {
+    const baseSymbol = symbol.replace(/[A-Z][0-9]$/, '').replace(/[0-9]+$/, '');
+    const names = {
+      'ES': 'E-mini S&P 500',
+      'NQ': 'E-mini NASDAQ-100',
+      'MES': 'Micro E-mini S&P 500',
+      'MNQ': 'Micro E-mini NASDAQ-100',
+      'RTY': 'E-mini Russell 2000',
+      'M2K': 'Micro E-mini Russell 2000',
+      'YM': 'E-mini Dow Jones',
+      'MYM': 'Micro E-mini Dow Jones',
+      'CL': 'Crude Oil',
+      'MCL': 'Micro Crude Oil',
+      'GC': 'Gold',
+      'MGC': 'Micro Gold',
+      'SI': 'Silver',
+      'SIL': 'Micro Silver',
+      'NG': 'Natural Gas',
+      'ZB': '30-Year Treasury Bond',
+      'ZN': '10-Year Treasury Note',
+      'ZF': '5-Year Treasury Note',
+      'ZC': 'Corn',
+      'ZS': 'Soybeans',
+      'ZW': 'Wheat',
+      '6E': 'Euro FX',
+      '6B': 'British Pound',
+      '6J': 'Japanese Yen',
+    };
+    const baseName = names[baseSymbol];
+    if (baseName) {
+      // Extract month/year from symbol
+      const monthYear = symbol.slice(baseSymbol.length);
+      return `${baseName} (${monthYear})`;
+    }
+    return symbol;
+  }
+
   async searchContracts(searchText) {
     try {
       const response = await this._request(

package/src/services/rithmic/index.js

@@ -211,21 +211,59 @@ class RithmicService extends EventEmitter {
   }
 
   // All available contracts for Rithmic
+  // TODO: Fetch from TICKER_PLANT API instead of static list
   _getAvailableContracts() {
+    // Current front-month contracts (update monthly)
     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' },
+      // Index Futures
+      { symbol: 'ESH5', name: 'E-mini S&P 500 (Mar 25)', exchange: 'CME', group: 'Index' },
+      { symbol: 'NQH5', name: 'E-mini NASDAQ-100 (Mar 25)', exchange: 'CME', group: 'Index' },
+      { symbol: 'RTYH5', name: 'E-mini Russell 2000 (Mar 25)', exchange: 'CME', group: 'Index' },
+      { symbol: 'YMH5', name: 'E-mini Dow Jones (Mar 25)', exchange: 'CBOT', group: 'Index' },
+      
+      // Micro Index Futures
+      { symbol: 'MESH5', name: 'Micro E-mini S&P 500 (Mar 25)', exchange: 'CME', group: 'Micro Index' },
+      { symbol: 'MNQH5', name: 'Micro E-mini NASDAQ-100 (Mar 25)', exchange: 'CME', group: 'Micro Index' },
+      { symbol: 'M2KH5', name: 'Micro E-mini Russell 2000 (Mar 25)', exchange: 'CME', group: 'Micro Index' },
+      { symbol: 'MYMH5', name: 'Micro E-mini Dow Jones (Mar 25)', exchange: 'CBOT', group: 'Micro Index' },
+      
+      // Energy Futures
+      { symbol: 'CLG5', name: 'Crude Oil (Feb 25)', exchange: 'NYMEX', group: 'Energy' },
+      { symbol: 'CLH5', name: 'Crude Oil (Mar 25)', exchange: 'NYMEX', group: 'Energy' },
+      { symbol: 'NGG5', name: 'Natural Gas (Feb 25)', exchange: 'NYMEX', group: 'Energy' },
+      { symbol: 'NGH5', name: 'Natural Gas (Mar 25)', exchange: 'NYMEX', group: 'Energy' },
+      
+      // Micro Energy
+      { symbol: 'MCLG5', name: 'Micro Crude Oil (Feb 25)', exchange: 'NYMEX', group: 'Micro Energy' },
+      { symbol: 'MCLH5', name: 'Micro Crude Oil (Mar 25)', exchange: 'NYMEX', group: 'Micro Energy' },
+      
+      // Metals Futures
+      { symbol: 'GCG5', name: 'Gold (Feb 25)', exchange: 'COMEX', group: 'Metals' },
+      { symbol: 'GCJ5', name: 'Gold (Apr 25)', exchange: 'COMEX', group: 'Metals' },
+      { symbol: 'SIH5', name: 'Silver (Mar 25)', exchange: 'COMEX', group: 'Metals' },
+      { symbol: 'HGH5', name: 'Copper (Mar 25)', exchange: 'COMEX', group: 'Metals' },
+      
+      // Micro Metals
+      { symbol: 'MGCG5', name: 'Micro Gold (Feb 25)', exchange: 'COMEX', group: 'Micro Metals' },
+      { symbol: 'MGCJ5', name: 'Micro Gold (Apr 25)', exchange: 'COMEX', group: 'Micro Metals' },
+      { symbol: 'SILU5', name: 'Micro Silver (Sep 25)', exchange: 'COMEX', group: 'Micro Metals' },
+      
+      // Treasury Futures
+      { symbol: 'ZBH5', name: '30-Year US Treasury Bond (Mar 25)', exchange: 'CBOT', group: 'Bonds' },
+      { symbol: 'ZNH5', name: '10-Year US Treasury Note (Mar 25)', exchange: 'CBOT', group: 'Bonds' },
+      { symbol: 'ZFH5', name: '5-Year US Treasury Note (Mar 25)', exchange: 'CBOT', group: 'Bonds' },
+      { symbol: 'ZTH5', name: '2-Year US Treasury Note (Mar 25)', exchange: 'CBOT', group: 'Bonds' },
+      
+      // Agriculture Futures
+      { symbol: 'ZCH5', name: 'Corn (Mar 25)', exchange: 'CBOT', group: 'Agriculture' },
+      { symbol: 'ZSH5', name: 'Soybeans (Mar 25)', exchange: 'CBOT', group: 'Agriculture' },
+      { symbol: 'ZWH5', name: 'Wheat (Mar 25)', exchange: 'CBOT', group: 'Agriculture' },
+      
+      // Currency Futures
+      { symbol: '6EH5', name: 'Euro FX (Mar 25)', exchange: 'CME', group: 'Currency' },
+      { symbol: '6BH5', name: 'British Pound (Mar 25)', exchange: 'CME', group: 'Currency' },
+      { symbol: '6JH5', name: 'Japanese Yen (Mar 25)', exchange: 'CME', group: 'Currency' },
+      { symbol: '6AH5', name: 'Australian Dollar (Mar 25)', exchange: 'CME', group: 'Currency' },
     ];
   }