hedgequantx 1.8.29 → 1.8.31

package/package.json

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

package/src/menus/connect.js

@@ -71,11 +71,11 @@ const projectXMenu = async () => {
   console.log(chalk.cyan('║') + '  ' + chalk.red('[X] Back') + ' '.repeat(W - 10) + chalk.cyan('║'));
   console.log(chalk.cyan('╚' + '═'.repeat(W) + '╝'));
 
-  const options = numbered.map(pf => ({ value: pf.num, label: `[${pf.num}] ${pf.name}` }));
-  options.push({ value: -1, label: '[X] Back' });
+  const input = await prompts.textInput(chalk.cyan('Select number (or X):'));
+  if (!input || input.toLowerCase() === 'x') return null;
   
-  const action = await prompts.selectOption('Select:', options);
-  if (!action || action === -1) return null;
+  const action = parseInt(input);
+  if (isNaN(action) || action < 1 || action > numbered.length) return null;
   
   const selectedPropfirm = numbered[action - 1];
   const credentials = await loginPrompt(selectedPropfirm.name);
@@ -142,11 +142,11 @@ const rithmicMenu = async () => {
   console.log(chalk.cyan('║') + '  ' + chalk.red('[X] Back') + ' '.repeat(innerWidth - 10) + chalk.cyan('║'));
   console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
 
-  const options = numbered.map(pf => ({ value: pf.num, label: `[${pf.num}] ${pf.name}` }));
-  options.push({ value: -1, label: '[X] Back' });
+  const input = await prompts.textInput(chalk.cyan('Select number (or X):'));
+  if (!input || input.toLowerCase() === 'x') return null;
   
-  const action = await prompts.selectOption('Select:', options);
-  if (!action || action === -1) return null;
+  const action = parseInt(input);
+  if (isNaN(action) || action < 1 || action > numbered.length) return null;
   
   const selectedPropfirm = numbered[action - 1];
   const credentials = await loginPrompt(selectedPropfirm.name);
@@ -203,11 +203,11 @@ const tradovateMenu = async () => {
   console.log(chalk.cyan('║') + '  ' + chalk.red('[X] Back') + ' '.repeat(innerWidth - 10) + chalk.cyan('║'));
   console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
 
-  const options = numbered.map(pf => ({ value: pf.num, label: `[${pf.num}] ${pf.name}` }));
-  options.push({ value: -1, label: '[X] Back' });
+  const input = await prompts.textInput(chalk.cyan('Select number (or X):'));
+  if (!input || input.toLowerCase() === 'x') return null;
   
-  const action = await prompts.selectOption('Select:', options);
-  if (!action || action === -1) return null;
+  const action = parseInt(input);
+  if (isNaN(action) || action < 1 || action > numbered.length) return null;
   
   const selectedPropfirm = numbered[action - 1];
   const credentials = await loginPrompt(selectedPropfirm.name);
@@ -261,12 +261,14 @@ const addPropAccountMenu = async () => {
   
   console.log(chalk.cyan('╚' + '═'.repeat(W) + '╝'));
 
-  return await prompts.selectOption('Select:', [
-    { value: 'projectx', label: '[1] ProjectX' },
-    { value: 'rithmic', label: '[2] Rithmic' },
-    { value: 'tradovate', label: '[3] Tradovate' },
-    { value: null, label: '[X] Back' }
-  ]);
+  const input = await prompts.textInput(chalk.cyan('Select (1/2/3/X):'));
+  if (!input || input.toLowerCase() === 'x') return null;
+  
+  const num = parseInt(input);
+  if (num === 1) return 'projectx';
+  if (num === 2) return 'rithmic';
+  if (num === 3) return 'tradovate';
+  return null;
 };
 
 module.exports = { loginPrompt, projectXMenu, rithmicMenu, tradovateMenu, addPropAccountMenu };

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

@@ -57,7 +57,8 @@ const oneAccountMenu = async (service) => {
   const selectedAccount = await prompts.selectOption('Select Account:', options);
   if (!selectedAccount || selectedAccount === 'back') return;
   
-  const accountService = connections.getServiceForAccount(selectedAccount.accountId) || service;
+  // Use the service attached to the account (from getAllAccounts), fallback to getServiceForAccount
+  const accountService = selectedAccount.service || connections.getServiceForAccount(selectedAccount.accountId) || service;
   
   // Select symbol
   const contract = await selectSymbol(accountService, selectedAccount);
@@ -150,6 +151,7 @@ const launchAlgo = async (service, account, contract, config) => {
   const stats = {
     accountName, symbol: symbolName, contracts,
     target: dailyTarget, risk: maxRisk,
+    propfirm: account.propfirm || 'Unknown',
     pnl: 0, trades: 0, wins: 0, losses: 0,
     latency: 0, connected: false
   };
@@ -208,8 +210,11 @@ const launchAlgo = async (service, account, contract, config) => {
   if (stats.connected) {
     ui.addLog('info', 'Starting algo...');
     
+    // Get Rithmic credentials from the account's service
     let rithmicCreds = null;
-    if (service.getRithmicCredentials) rithmicCreds = service.getRithmicCredentials();
+    if (service && service.getRithmicCredentials) {
+      rithmicCreds = service.getRithmicCredentials();
+    }
     
     hqx.startAlgo({
       accountId: account.accountId,

package/src/services/rithmic/index.js

@@ -216,18 +216,46 @@ class RithmicService extends EventEmitter {
    * For now, returns common futures contracts that are available on Rithmic
    */
   async getContracts() {
-    // Standard futures contracts - same list as ProjectX for consistency
+    // Calculate current front month dynamically
+    const now = new Date();
+    const month = now.getMonth();
+    const year = now.getFullYear() % 100;
+    
+    // Quarterly months for index futures: H=Mar, M=Jun, U=Sep, Z=Dec
+    const quarterlyMonths = ['H', 'M', 'U', 'Z'];
+    const monthNames = ['Mar', 'Jun', 'Sep', 'Dec'];
+    const quarterIndex = Math.floor(month / 3);
+    
+    // If past 15th of expiry month, use next quarter
+    let frontMonth = quarterlyMonths[quarterIndex];
+    let frontMonthName = monthNames[quarterIndex];
+    let frontYear = year;
+    
+    if (now.getDate() > 15 && [2, 5, 8, 11].includes(month)) {
+      const nextIdx = (quarterIndex + 1) % 4;
+      frontMonth = quarterlyMonths[nextIdx];
+      frontMonthName = monthNames[nextIdx];
+      if (nextIdx === 0) frontYear++;
+    }
+    
+    const y = frontYear; // e.g., 26 for 2026
+    const fy = `${frontYear}`; // full year string
+    
     const contracts = [
-      { symbol: 'ESH5', name: 'E-mini S&P 500 (Mar 25)', exchange: 'CME' },
-      { symbol: 'NQH5', name: 'E-mini NASDAQ-100 (Mar 25)', exchange: 'CME' },
-      { symbol: 'MESH5', name: 'Micro E-mini S&P 500 (Mar 25)', exchange: 'CME' },
-      { symbol: 'MNQH5', name: 'Micro E-mini NASDAQ-100 (Mar 25)', exchange: 'CME' },
-      { symbol: 'CLG5', name: 'Crude Oil (Feb 25)', exchange: 'NYMEX' },
-      { symbol: 'GCG5', name: 'Gold (Feb 25)', exchange: 'COMEX' },
-      { symbol: 'RTYH5', name: 'E-mini Russell 2000 (Mar 25)', exchange: 'CME' },
-      { symbol: 'YMH5', name: 'E-mini Dow Jones (Mar 25)', exchange: 'CBOT' },
-      { symbol: 'SIH5', name: 'Silver (Mar 25)', exchange: 'COMEX' },
-      { symbol: 'NGG5', name: 'Natural Gas (Feb 25)', exchange: 'NYMEX' },
+      { symbol: `ES${frontMonth}${y}`, name: `E-mini S&P 500 (${frontMonthName} ${fy})`, exchange: 'CME' },
+      { symbol: `NQ${frontMonth}${y}`, name: `E-mini NASDAQ-100 (${frontMonthName} ${fy})`, exchange: 'CME' },
+      { symbol: `MES${frontMonth}${y}`, name: `Micro E-mini S&P 500 (${frontMonthName} ${fy})`, exchange: 'CME' },
+      { symbol: `MNQ${frontMonth}${y}`, name: `Micro E-mini NASDAQ-100 (${frontMonthName} ${fy})`, exchange: 'CME' },
+      { symbol: `RTY${frontMonth}${y}`, name: `E-mini Russell 2000 (${frontMonthName} ${fy})`, exchange: 'CME' },
+      { symbol: `M2K${frontMonth}${y}`, name: `Micro E-mini Russell 2000 (${frontMonthName} ${fy})`, exchange: 'CME' },
+      { symbol: `YM${frontMonth}${y}`, name: `E-mini Dow Jones (${frontMonthName} ${fy})`, exchange: 'CBOT' },
+      { symbol: `MYM${frontMonth}${y}`, name: `Micro E-mini Dow Jones (${frontMonthName} ${fy})`, exchange: 'CBOT' },
+      { symbol: `CL${frontMonth}${y}`, name: `Crude Oil (${frontMonthName} ${fy})`, exchange: 'NYMEX' },
+      { symbol: `MCL${frontMonth}${y}`, name: `Micro Crude Oil (${frontMonthName} ${fy})`, exchange: 'NYMEX' },
+      { symbol: `GC${frontMonth}${y}`, name: `Gold (${frontMonthName} ${fy})`, exchange: 'COMEX' },
+      { symbol: `MGC${frontMonth}${y}`, name: `Micro Gold (${frontMonthName} ${fy})`, exchange: 'COMEX' },
+      { symbol: `SI${frontMonth}${y}`, name: `Silver (${frontMonthName} ${fy})`, exchange: 'COMEX' },
+      { symbol: `NG${frontMonth}${y}`, name: `Natural Gas (${frontMonthName} ${fy})`, exchange: 'NYMEX' },
     ];
     return { success: true, contracts };
   }