hedgequantx 1.8.7 → 1.8.9

package/package.json

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

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

@@ -133,15 +133,10 @@ const copyTradingMenu = async () => {
   });
 };
 
-// Cached contracts from API
-let cachedContracts = null;
-
 /**
  * Get contracts from ProjectX API (shared for all services)
  */
 const getContractsFromAPI = async () => {
-  if (cachedContracts) return cachedContracts;
-  
   // Find a ProjectX connection to get contracts from API
   const allConns = connections.getAll();
   const projectxConn = allConns.find(c => c.type === 'projectx');
@@ -149,8 +144,12 @@ const getContractsFromAPI = async () => {
   if (projectxConn && typeof projectxConn.service.getContracts === 'function') {
     const result = await projectxConn.service.getContracts();
     if (result.success && result.contracts?.length > 0) {
-      cachedContracts = result.contracts;
-      return cachedContracts;
+      // Normalize contract structure - API returns { name: "ESH6", description: "E-mini S&P 500..." }
+      return result.contracts.map(c => ({
+        ...c,
+        symbol: c.name || c.symbol,
+        name: c.description || c.name || c.symbol
+      }));
     }
   }
   
@@ -162,6 +161,8 @@ const getContractsFromAPI = async () => {
  */
 const selectSymbol = async (service, label) => {
   try {
+    const spinner = ora({ text: 'Loading symbols...', color: 'yellow' }).start();
+    
     // Always use contracts from ProjectX API for consistency
     let contracts = await getContractsFromAPI();
     
@@ -174,15 +175,18 @@ const selectSymbol = async (service, label) => {
     }
     
     if (!contracts || contracts.length === 0) {
-      console.log(chalk.red('  No contracts available'));
+      spinner.fail('No contracts available');
       return null;
     }
     
+    spinner.succeed(`Found ${contracts.length} contracts`);
+    
     const options = contracts.map(c => ({ label: c.name || c.symbol, value: c }));
     options.push({ label: '< Cancel', value: null });
     
     return await prompts.selectOption(`${label} Symbol:`, options);
   } catch (e) {
+    console.log(chalk.red('  Error loading contracts'));
     return null;
   }
 };

package/src/services/projectx/index.js

@@ -444,29 +444,26 @@ class ProjectXService {
   // ==================== CONTRACTS ====================
 
   /**
-   * Get popular contracts for trading from API
+   * Get all available contracts from API
    */
   async getContracts() {
     try {
-      // Search for popular futures symbols from API
-      const symbols = ['ES', 'NQ', 'MES', 'MNQ', 'CL', 'GC', 'RTY', 'YM', 'SI', 'ZB', 'ZN', 'NG', 'MCL', 'MGC'];
-      const allContracts = [];
+      const response = await this._request(
+        this.propfirm.gatewayApi, '/api/Contract/available', 'POST',
+        { live: false }
+      );
       
-      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]);
-          }
-        }
+      if (response.statusCode === 200) {
+        const contracts = response.data.contracts || response.data || [];
+        // Filter only active contracts and sort by description
+        const activeContracts = contracts
+          .filter(c => c.activeContract === true)
+          .sort((a, b) => (a.description || '').localeCompare(b.description || ''));
+        
+        return { success: true, contracts: activeContracts };
       }
       
-      return { success: true, contracts: allContracts };
+      return { success: false, contracts: [], error: 'Failed to fetch contracts' };
     } catch (error) {
       return { success: false, contracts: [], error: error.message };
     }

package/src/utils/prompts.js

@@ -54,16 +54,21 @@ const passwordInput = async (message) => {
 };
 
 /**
- * Confirm Y/n
+ * Confirm - arrow keys selection
  */
 const confirmPrompt = async (message, defaultVal = true) => {
   prepareStdin();
+  const choices = defaultVal 
+    ? [{ name: 'Yes', value: true }, { name: 'No', value: false }]
+    : [{ name: 'No', value: false }, { name: 'Yes', value: true }];
+  
   const { value } = await inquirer.prompt([{
-    type: 'confirm',
+    type: 'list',
     name: 'value',
     message,
-    default: defaultVal,
-    prefix: ''
+    choices,
+    prefix: '',
+    loop: false
   }]);
   return value;
 };