hedgequantx 1.2.95 → 1.2.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "1.2.95",
+  "version": "1.2.97",
   "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

@@ -203,13 +203,50 @@ const selectSymbolMenu = async (service, account) => {
   
   console.log();
   
+  // Symbol name descriptions
+  const symbolDescriptions = {
+    'NQ': 'E-mini NASDAQ-100',
+    'MNQ': 'Micro E-mini NASDAQ-100',
+    'ES': 'E-mini S&P 500',
+    'MES': 'Micro E-mini S&P 500',
+    'YM': 'E-mini Dow Jones',
+    'MYM': 'Micro E-mini Dow Jones',
+    'RTY': 'E-mini Russell 2000',
+    'M2K': 'Micro E-mini Russell 2000',
+    'CL': 'Crude Oil WTI',
+    'MCL': 'Micro Crude Oil',
+    'NG': 'Natural Gas',
+    'QG': 'E-mini Natural Gas',
+    'QM': 'E-mini Crude Oil',
+    'GC': 'Gold',
+    'MGC': 'Micro Gold',
+    'SI': 'Silver',
+    'SIL': 'Micro Silver',
+    'HG': 'Copper',
+    'PL': 'Platinum',
+    '6E': 'Euro FX',
+    'M6E': 'Micro Euro FX',
+    '6B': 'British Pound',
+    '6J': 'Japanese Yen',
+    '6A': 'Australian Dollar',
+    '6C': 'Canadian Dollar',
+    '6M': 'Mexican Peso',
+    '6S': 'Swiss Franc',
+    'ZB': '30-Year T-Bond',
+    'ZN': '10-Year T-Note',
+    'ZF': '5-Year T-Note',
+    'ZT': '2-Year T-Note',
+    'ZC': 'Corn',
+    'ZS': 'Soybeans',
+    'ZW': 'Wheat'
+  };
+  
   // Format symbols for display
   const symbolChoices = availableSymbols.map(symbol => {
-    const name = symbol.name || symbol.symbol || symbol.id;
     const symbolCode = symbol.symbol || symbol.id || '';
     
     // Extract base symbol (e.g., NQ from NQH6) and month code
-    const baseMatch = symbolCode.match(/^([A-Z]{1,4})([FGHJKMNQUVXZ])(\d{1,2})$/i);
+    const baseMatch = symbolCode.match(/^([A-Z0-9]{1,4})([FGHJKMNQUVXZ])(\d{1,2})$/i);
     let baseSymbol = symbolCode;
     let monthYear = '';
     
@@ -221,9 +258,12 @@ const selectSymbolMenu = async (service, account) => {
       monthYear = (monthCodes[monthCode] || monthCode) + year;
     }
     
-    // Format: "NQ   Mar26  E-mini NASDAQ-100 Mar26"
+    // Get descriptive name from mapping
+    const description = symbolDescriptions[baseSymbol] || symbol.name || baseSymbol;
+    
+    // Format: "NQ   Mar26  E-mini NASDAQ-100"
     return {
-      name: chalk.yellow(baseSymbol.padEnd(5)) + chalk.cyan(monthYear.padEnd(7)) + chalk.white(name),
+      name: chalk.yellow(baseSymbol.padEnd(5)) + chalk.cyan(monthYear.padEnd(7)) + chalk.white(description),
       value: symbol
     };
   });
@@ -747,11 +787,14 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
   
   hqxServer.on('disconnected', () => {
     hqxConnected = false;
-    printLog('error', 'Connection lost - Stopping algo');
-    // Stop algo on disconnect
-    if (!stopReason) {
-      stopReason = 'disconnected';
-      algoRunning = false;
+    // Only log error if not intentionally stopped by user
+    if (!stopReason || stopReason === 'user') {
+      // Don't show error for user-initiated stop
+      if (!stopReason) {
+        printLog('error', 'Connection lost - Stopping algo');
+        stopReason = 'disconnected';
+        algoRunning = false;
+      }
     }
   });
   
@@ -814,6 +857,7 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
           if (!key) return;
           const keyName = key.name?.toLowerCase();
           if (keyName === 'x' || (key.ctrl && keyName === 'c')) {
+            stopReason = 'user'; // Set stop reason before cleanup
             cleanup();
           }
         });
@@ -880,6 +924,9 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
   hqxServer.disconnect();
   algoRunning = false;
   
+  // Clear screen and show final result
+  console.clear();
+  
   console.log();
   if (stopReason === 'target') {
     console.log(chalk.green.bold('  [OK] Daily target reached! Algo stopped.'));
@@ -887,6 +934,8 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
     console.log(chalk.red.bold('  [X] Max risk reached! Algo stopped.'));
   } else if (stopReason === 'disconnected' || stopReason === 'connection_error') {
     console.log(chalk.red.bold('  [X] Connection lost! Algo stopped.'));
+  } else if (stopReason === 'user') {
+    console.log(chalk.yellow('  [OK] Algo stopped by user'));
   } else {
     console.log(chalk.yellow('  [OK] Algo stopped by user'));
   }