hedgequantx 1.2.113 → 1.2.115

package/package.json

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

package/src/pages/algo.js

@@ -178,29 +178,31 @@ const selectSymbolMenu = async (service, account) => {
       const result = await service.searchContracts(search, false);
       if (result.success && result.contracts && result.contracts.length > 0) {
         for (const contract of result.contracts) {
-          // Only add contracts that have valid data
-          if (contract.id || contract.contractId || contract.name) {
-            const contractId = contract.id || contract.contractId;
-            const existing = availableSymbols.find(s => s.id === contractId);
-            if (!existing) {
-              // Extract symbol from name if not provided (e.g., "NQH6" from "CON.F.US.ENQ.H26")
-              let symbolCode = contract.symbol || search;
-              if (contract.name && contract.name.includes(' ')) {
-                // Try to extract from name like "E-mini NASDAQ-100 Mar 2026"
-                symbolCode = search;
-              }
-              
-              availableSymbols.push({
-                id: contractId,
-                name: contract.name || contract.symbol || search,
-                symbol: symbolCode,
-                tickSize: contract.tickSize,
-                tickValue: contract.tickValue,
-                exchange: contract.exchange || 'CME',
-                activeContract: contract.activeContract || false
-              });
-            }
-          }
+          // ProjectX API returns:
+          // id: "CON.F.US.ENQ.H26" (contract ID)
+          // name: "NQH6" (short symbol with month/year)
+          // description: "E-mini NASDAQ-100: March 2026"
+          
+          const contractId = contract.id || contract.contractId;
+          if (!contractId) continue;
+          
+          const existing = availableSymbols.find(s => s.id === contractId);
+          if (existing) continue;
+          
+          // Use 'name' field which contains the symbol code like "NQH6", "ESH6", "MNQH6"
+          const symbolCode = contract.name || contract.symbol || '';
+          if (!symbolCode) continue;
+          
+          availableSymbols.push({
+            id: contractId,
+            name: symbolCode,
+            symbol: symbolCode,
+            description: contract.description || '',
+            tickSize: contract.tickSize,
+            tickValue: contract.tickValue,
+            exchange: contract.exchange || 'CME',
+            activeContract: contract.activeContract || false
+          });
         }
       }
     }
@@ -208,22 +210,6 @@ const selectSymbolMenu = async (service, account) => {
     // Fallback to static list
   }
   
-  // Add micro contracts if not found from API
-  const microContracts = [
-    { symbol: 'MNQ', name: 'Micro E-mini NASDAQ-100' },
-    { symbol: 'MES', name: 'Micro E-mini S&P 500' },
-    { symbol: 'MYM', name: 'Micro E-mini Dow Jones' },
-    { symbol: 'M2K', name: 'Micro E-mini Russell 2000' },
-    { symbol: 'MCL', name: 'Micro Crude Oil' },
-    { symbol: 'MGC', name: 'Micro Gold' }
-  ];
-  
-  // Get current month code for front month
-  const now = new Date();
-  const monthCodes = ['F', 'G', 'H', 'J', 'K', 'M', 'N', 'Q', 'U', 'V', 'X', 'Z'];
-  const currentMonthCode = monthCodes[now.getMonth()];
-  const yearCode = (now.getFullYear() % 100).toString();
-  
   for (const micro of microContracts) {
     const hasMicro = availableSymbols.some(s => 
       (s.symbol && s.symbol.toUpperCase().startsWith(micro.symbol)) ||
@@ -294,42 +280,49 @@ const selectSymbolMenu = async (service, account) => {
     'ZW': 'Wheat'
   };
   
-  // Format symbols for display - deduplicate by base symbol + month
-  const seenSymbols = new Set();
+  // Format symbols for display - show ALL contracts from API
+  const seenIds = new Set();
   const symbolChoices = [];
   
-  for (const symbol of availableSymbols) {
-    const symbolCode = symbol.symbol || symbol.id || '';
+  for (const contract of availableSymbols) {
+    // Skip duplicates by contract ID
+    const contractId = contract.id || '';
+    if (seenIds.has(contractId)) continue;
+    seenIds.add(contractId);
     
-    // Extract base symbol (e.g., NQ from NQH6) and month code
-    const baseMatch = symbolCode.match(/^([A-Z0-9]{1,4})([FGHJKMNQUVXZ])(\d{1,2})$/i);
-    let baseSymbol = symbolCode;
-    let monthYear = '';
+    // Get the symbol code - API returns 'name' field with code like "NQH6"
+    const symbolCode = contract.name || contract.symbol || '';
+    if (!symbolCode) continue;
     
-    if (baseMatch) {
-      baseSymbol = baseMatch[1];
-      const monthCodes = { 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 monthCode = baseMatch[2].toUpperCase();
-      const year = baseMatch[3].length === 1 ? '2' + baseMatch[3] : baseMatch[3];
-      monthYear = (monthCodes[monthCode] || monthCode) + year;
+    // Get description from API or our mapping
+    let description = '';
+    if (contract.description) {
+      // API format: "E-mini NASDAQ-100: March 2026" -> extract instrument name
+      description = contract.description.split(':')[0].trim();
     }
     
-    // Create unique key to deduplicate
-    const uniqueKey = `${baseSymbol}-${monthYear}`;
-    if (seenSymbols.has(uniqueKey)) continue;
-    seenSymbols.add(uniqueKey);
-    
-    // Get descriptive name from mapping
-    const description = symbolDescriptions[baseSymbol] || symbol.name || baseSymbol;
+    // Fallback to our symbol descriptions
+    if (!description) {
+      // Extract base symbol (NQ from NQH6)
+      const baseMatch = symbolCode.match(/^([A-Z0-9]{1,4})[FGHJKMNQUVXZ]\d{1,2}$/i);
+      const baseSymbol = baseMatch ? baseMatch[1] : symbolCode;
+      description = symbolDescriptions[baseSymbol] || symbolCode;
+    }
     
-    // Format: "NQ.Mar26     E-mini NASDAQ-100"
-    const symbolDisplay = monthYear ? `${baseSymbol}.${monthYear}` : baseSymbol;
+    // Format: "NQH6         E-mini NASDAQ-100"
     symbolChoices.push({
-      name: chalk.yellow(symbolDisplay.padEnd(12)) + chalk.white(description),
-      value: symbol
+      name: chalk.yellow(symbolCode.padEnd(12)) + chalk.white(description),
+      value: contract
     });
   }
   
+  // Sort by symbol code for better organization
+  symbolChoices.sort((a, b) => {
+    const aCode = a.value.name || a.value.symbol || '';
+    const bCode = b.value.name || b.value.symbol || '';
+    return aCode.localeCompare(bCode);
+  });
+  
   symbolChoices.push(new inquirer.Separator());
   symbolChoices.push({ name: chalk.yellow('< Back'), value: 'back' });