hedgequantx 1.8.12 → 1.8.14

package/package.json

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

@@ -10,6 +10,7 @@ const { connections } = require('../../services');
 const { HQXServerService } = require('../../services/hqx-server');
 const { AlgoUI } = require('./ui');
 const { logger, prompts } = require('../../utils');
+const { checkMarketHours } = require('../../services/projectx/market');
 
 const log = logger.scope('CopyTrading');
 
@@ -18,6 +19,18 @@ const log = logger.scope('CopyTrading');
  */
 const copyTradingMenu = async () => {
   log.info('Copy Trading menu opened');
+  
+  // Check if market is open
+  const market = checkMarketHours();
+  if (!market.isOpen) {
+    console.log();
+    console.log(chalk.red(`  ${market.message}`));
+    console.log(chalk.gray('  Algo trading is only available when market is open'));
+    console.log();
+    await prompts.waitForEnter();
+    return;
+  }
+  
   const allConns = connections.getAll();
   
   if (allConns.length < 2) {

package/src/pages/algo/one-account.js

@@ -10,11 +10,23 @@ const { connections } = require('../../services');
 const { HQXServerService } = require('../../services/hqx-server');
 const { AlgoUI } = require('./ui');
 const { prompts } = require('../../utils');
+const { checkMarketHours } = require('../../services/projectx/market');
 
 /**
  * One Account Menu
  */
 const oneAccountMenu = async (service) => {
+  // Check if market is open
+  const market = checkMarketHours();
+  if (!market.isOpen) {
+    console.log();
+    console.log(chalk.red(`  ${market.message}`));
+    console.log(chalk.gray('  Algo trading is only available when market is open'));
+    console.log();
+    await prompts.waitForEnter();
+    return;
+  }
+  
   const spinner = ora({ text: 'Fetching active accounts...', color: 'yellow' }).start();
   
   const allAccounts = await connections.getAllAccounts();
@@ -59,34 +71,27 @@ const oneAccountMenu = async (service) => {
 };
 
 /**
- * Symbol selection
+ * Symbol selection - same as copy-trading
  */
 const selectSymbol = async (service, account) => {
-  const spinner = ora({ text: 'Loading contracts...', color: 'yellow' }).start();
+  const spinner = ora({ text: 'Loading symbols...', color: 'yellow' }).start();
   
   const contractsResult = await service.getContracts();
-  if (!contractsResult.success) {
+  if (!contractsResult.success || !contractsResult.contracts?.length) {
     spinner.fail('Failed to load contracts');
     return null;
   }
   
-  spinner.succeed('Contracts loaded');
+  // Normalize contract structure - API returns { name: "ESH6", description: "E-mini S&P 500..." }
+  const contracts = contractsResult.contracts.map(c => ({
+    ...c,
+    symbol: c.name || c.symbol,
+    name: c.description || c.name || c.symbol
+  }));
   
-  // Group by category
-  const categories = {};
-  for (const c of contractsResult.contracts) {
-    const cat = c.group || 'Other';
-    if (!categories[cat]) categories[cat] = [];
-    categories[cat].push(c);
-  }
+  spinner.succeed(`Found ${contracts.length} contracts`);
   
-  // Flatten with categories as hints
-  const options = [];
-  for (const [cat, contracts] of Object.entries(categories)) {
-    for (const c of contracts.slice(0, 10)) {
-      options.push({ label: `[${cat}] ${c.name || c.symbol}`, value: c });
-    }
-  }
+  const options = contracts.map(c => ({ label: c.name, value: c }));
   options.push({ label: '< Back', value: 'back' });
   
   const contract = await prompts.selectOption('Select Symbol:', options);