hedgequantx 1.2.87 → 1.2.89

package/package.json

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

package/src/config/constants.js

@@ -49,20 +49,45 @@ const ORDER_SIDE = {
   1: { text: 'Sell', color: 'red' }
 };
 
-// Popular Futures Symbols
+// Popular Futures Symbols - Complete list
 const FUTURES_SYMBOLS = [
-  { name: 'NQ - E-mini NASDAQ-100', value: 'NQ', searchText: 'NQ' },
-  { name: 'MNQ - Micro E-mini NASDAQ-100', value: 'MNQ', searchText: 'MNQ' },
-  { name: 'ES - E-mini S&P 500', value: 'ES', searchText: 'ES' },
-  { name: 'MES - Micro E-mini S&P 500', value: 'MES', searchText: 'MES' },
-  { name: 'YM - E-mini Dow Jones', value: 'YM', searchText: 'YM' },
-  { name: 'MYM - Micro E-mini Dow Jones', value: 'MYM', searchText: 'MYM' },
-  { name: 'RTY - E-mini Russell 2000', value: 'RTY', searchText: 'RTY' },
-  { name: 'M2K - Micro E-mini Russell 2000', value: 'M2K', searchText: 'M2K' },
-  { name: 'CL - Crude Oil', value: 'CL', searchText: 'CL' },
-  { name: 'MCL - Micro Crude Oil', value: 'MCL', searchText: 'MCL' },
-  { name: 'GC - Gold', value: 'GC', searchText: 'GC' },
-  { name: 'MGC - Micro Gold', value: 'MGC', searchText: 'MGC' }
+  // Index Futures
+  { name: 'NQ - E-mini NASDAQ-100', value: 'NQ', searchText: 'NQ', category: 'index' },
+  { name: 'MNQ - Micro E-mini NASDAQ-100', value: 'MNQ', searchText: 'MNQ', category: 'index' },
+  { name: 'ES - E-mini S&P 500', value: 'ES', searchText: 'ES', category: 'index' },
+  { name: 'MES - Micro E-mini S&P 500', value: 'MES', searchText: 'MES', category: 'index' },
+  { name: 'YM - E-mini Dow Jones', value: 'YM', searchText: 'YM', category: 'index' },
+  { name: 'MYM - Micro E-mini Dow Jones', value: 'MYM', searchText: 'MYM', category: 'index' },
+  { name: 'RTY - E-mini Russell 2000', value: 'RTY', searchText: 'RTY', category: 'index' },
+  { name: 'M2K - Micro E-mini Russell 2000', value: 'M2K', searchText: 'M2K', category: 'index' },
+  // Energy
+  { name: 'CL - Crude Oil WTI', value: 'CL', searchText: 'CL', category: 'energy' },
+  { name: 'MCL - Micro Crude Oil', value: 'MCL', searchText: 'MCL', category: 'energy' },
+  { name: 'NG - Natural Gas', value: 'NG', searchText: 'NG', category: 'energy' },
+  { name: 'QG - E-mini Natural Gas', value: 'QG', searchText: 'QG', category: 'energy' },
+  // Metals
+  { name: 'GC - Gold', value: 'GC', searchText: 'GC', category: 'metals' },
+  { name: 'MGC - Micro Gold', value: 'MGC', searchText: 'MGC', category: 'metals' },
+  { name: 'SI - Silver', value: 'SI', searchText: 'SI', category: 'metals' },
+  { name: 'SIL - Micro Silver', value: 'SIL', searchText: 'SIL', category: 'metals' },
+  { name: 'HG - Copper', value: 'HG', searchText: 'HG', category: 'metals' },
+  { name: 'PL - Platinum', value: 'PL', searchText: 'PL', category: 'metals' },
+  // Currencies
+  { name: '6E - Euro FX', value: '6E', searchText: '6E', category: 'currency' },
+  { name: 'M6E - Micro Euro FX', value: 'M6E', searchText: 'M6E', category: 'currency' },
+  { name: '6B - British Pound', value: '6B', searchText: '6B', category: 'currency' },
+  { name: '6J - Japanese Yen', value: '6J', searchText: '6J', category: 'currency' },
+  { name: '6A - Australian Dollar', value: '6A', searchText: '6A', category: 'currency' },
+  { name: '6C - Canadian Dollar', value: '6C', searchText: '6C', category: 'currency' },
+  // Bonds
+  { name: 'ZB - 30-Year T-Bond', value: 'ZB', searchText: 'ZB', category: 'bonds' },
+  { name: 'ZN - 10-Year T-Note', value: 'ZN', searchText: 'ZN', category: 'bonds' },
+  { name: 'ZF - 5-Year T-Note', value: 'ZF', searchText: 'ZF', category: 'bonds' },
+  { name: 'ZT - 2-Year T-Note', value: 'ZT', searchText: 'ZT', category: 'bonds' },
+  // Agriculture
+  { name: 'ZC - Corn', value: 'ZC', searchText: 'ZC', category: 'agriculture' },
+  { name: 'ZS - Soybeans', value: 'ZS', searchText: 'ZS', category: 'agriculture' },
+  { name: 'ZW - Wheat', value: 'ZW', searchText: 'ZW', category: 'agriculture' }
 ];
 
 module.exports = {

package/src/pages/algo.js

@@ -146,6 +146,7 @@ const oneAccountMenu = async (service) => {
 const selectSymbolMenu = async (service, account) => {
   const device = getDevice();
   const accountName = account.accountName || account.name || 'Account #' + account.accountId;
+  const propfirm = account.propfirm || 'projectx';
   
   console.log();
   console.log(chalk.gray(getSeparator()));
@@ -153,12 +154,69 @@ const selectSymbolMenu = async (service, account) => {
   console.log(chalk.gray(getSeparator()));
   console.log();
   
-  // Format symbols with aligned columns: "NQ  - E-mini NASDAQ-100"
-  const symbolChoices = FUTURES_SYMBOLS.map(symbol => {
-    const code = symbol.value.padEnd(4);
-    const desc = symbol.name.split(' - ')[1] || '';
+  // Fetch available symbols from API
+  const spinner = ora('Loading available symbols...').start();
+  
+  let availableSymbols = [];
+  
+  // Search for common symbols to get available contracts
+  const commonSearches = ['NQ', 'ES', 'YM', 'RTY', 'CL', 'GC', 'SI', '6E', 'ZB', 'NG'];
+  
+  try {
+    for (const search of commonSearches) {
+      const result = await service.searchContracts(search, false);
+      if (result.success && result.contracts && result.contracts.length > 0) {
+        for (const contract of result.contracts) {
+          // Only add active/front-month contracts
+          if (contract.activeContract || contract.name) {
+            const existing = availableSymbols.find(s => s.id === contract.id);
+            if (!existing) {
+              availableSymbols.push({
+                id: contract.id || contract.contractId,
+                name: contract.name || contract.symbol,
+                symbol: contract.symbol || search,
+                tickSize: contract.tickSize,
+                tickValue: contract.tickValue,
+                exchange: contract.exchange || 'CME'
+              });
+            }
+          }
+        }
+      }
+    }
+  } catch (e) {
+    // Fallback to static list
+  }
+  
+  // If no symbols found from API, use static list
+  if (availableSymbols.length === 0) {
+    spinner.warn('Using default symbol list');
+    availableSymbols = FUTURES_SYMBOLS.map(s => ({
+      id: s.value,
+      name: s.name,
+      symbol: s.value,
+      searchText: s.searchText
+    }));
+  } else {
+    spinner.succeed(`Found ${availableSymbols.length} available contracts`);
+  }
+  
+  console.log();
+  
+  // Format symbols for display
+  const symbolChoices = availableSymbols.map(symbol => {
+    // Extract short code and description
+    const name = symbol.name || symbol.symbol || symbol.id;
+    // Parse name like "E-mini NASDAQ-100 Mar26" or "NQH6"
+    let displayName = name;
+    let code = symbol.symbol || '';
+    
+    // Try to extract month/year from name
+    const monthMatch = name.match(/(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)(\d{2})/i);
+    const monthYear = monthMatch ? `${monthMatch[1]}${monthMatch[2]}` : '';
+    
     return {
-      name: chalk.yellow(code) + chalk.gray(' - ') + chalk.white(desc),
+      name: chalk.yellow(code.padEnd(5)) + chalk.cyan((monthYear || '').padEnd(7)) + chalk.white(displayName),
       value: symbol
     };
   });
@@ -172,7 +230,7 @@ const selectSymbolMenu = async (service, account) => {
       name: 'selectedSymbol',
       message: chalk.white.bold('Select Symbol:'),
       choices: symbolChoices,
-      pageSize: 15,
+      pageSize: 20,
       loop: false
     }
   ]);
@@ -181,24 +239,32 @@ const selectSymbolMenu = async (service, account) => {
     return;
   }
   
-  // Search contract via Gateway API
-  const spinner = ora(`Searching for ${selectedSymbol.value} contract...`).start();
-  const contractResult = await service.searchContracts(selectedSymbol.searchText, false);
+  // Use the selected contract directly (already fetched from API)
+  let contract = selectedSymbol;
   
-  let contract = null;
-  if (contractResult.success && contractResult.contracts && contractResult.contracts.length > 0) {
-    contract = contractResult.contracts.find(c => c.activeContract) || contractResult.contracts[0];
-    spinner.succeed(`Found: ${contract.name || selectedSymbol.value}`);
-    if (contract.tickSize && contract.tickValue) {
-      console.log(chalk.gray(`  Tick Size: ${contract.tickSize} | Tick Value: $${contract.tickValue}`));
+  console.log();
+  console.log(chalk.green(`  [OK] Selected: ${contract.name || contract.symbol}`));
+  if (contract.tickSize && contract.tickValue) {
+    console.log(chalk.gray(`  Tick Size: ${contract.tickSize} | Tick Value: $${contract.tickValue}`));
+  }
+  
+  // If contract doesn't have full details, search again
+  if (!contract.id || !contract.tickSize) {
+    const searchSpinner = ora(`Getting contract details...`).start();
+    const contractResult = await service.searchContracts(contract.symbol || contract.searchText, false);
+    
+    if (contractResult.success && contractResult.contracts && contractResult.contracts.length > 0) {
+      const found = contractResult.contracts.find(c => c.activeContract) || contractResult.contracts[0];
+      contract = { ...contract, ...found };
+      searchSpinner.succeed(`Contract: ${contract.name || contract.symbol}`);
+    } else {
+      searchSpinner.warn('Using basic contract info');
+      contract = {
+        id: contract.symbol || contract.id,
+        name: contract.name || contract.symbol,
+        symbol: contract.symbol || contract.id
+      };
     }
-  } else {
-    spinner.warn(`Using ${selectedSymbol.value} (contract details unavailable)`);
-    contract = {
-      id: selectedSymbol.value,
-      name: selectedSymbol.name,
-      symbol: selectedSymbol.value
-    };
   }
   
   console.log();
@@ -389,8 +455,17 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
   };
 
   // Display full UI with logs (newest first at top)
+  // Use ANSI escape codes to avoid flickering
+  let firstDraw = true;
   const displayUI = () => {
-    console.clear();
+    // First time: clear screen, after: just move cursor to top
+    if (firstDraw) {
+      console.clear();
+      firstDraw = false;
+    } else {
+      // Move cursor to top-left without clearing (avoids flicker)
+      process.stdout.write('\x1B[H');
+    }
     
     // Stats
     const pnlColor = stats.pnl >= 0 ? chalk.green : chalk.red;
@@ -518,16 +593,20 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
     // Logs (without borders) - newest first
     console.log();
     if (logs.length === 0) {
-      console.log(chalk.gray('  Waiting for activity...'));
+      console.log(chalk.gray('  Waiting for activity...') + '\x1B[K'); // Clear to end of line
     } else {
       // Reverse to show newest first
       const reversedLogs = [...logs].reverse();
       reversedLogs.forEach(log => {
         const color = typeColors[log.type] || chalk.white;
         const icon = getIcon(log.type);
-        console.log(color(`  [${log.timestamp}] ${icon} ${log.message}`));
+        // Pad message and clear to end of line to avoid artifacts
+        const logLine = `  [${log.timestamp}] ${icon} ${log.message}`;
+        console.log(color(logLine) + '\x1B[K');
       });
     }
+    // Clear remaining lines below logs
+    process.stdout.write('\x1B[J');
   };
   
   // Spinner interval to refresh UI