hedgequantx 2.6.156 → 2.6.158

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "2.6.156",
+  "version": "2.6.158",
   "description": "HedgeQuantX - Prop Futures Trading CLI",
   "main": "src/app.js",
   "bin": {

package/src/pages/algo/custom-strategy.js

@@ -28,7 +28,7 @@ const { RithmicMarketDataFeed } = require('../../services/rithmic/market-data');
 const { algoLogger } = require('./logger');
 const { recoveryMath } = require('../../services/strategy/recovery-math');
 const aiService = require('../../services/ai');
-const { launchMultiSymbolRithmic } = require('./one-account');
+const { launchMultiSymbolRithmic, selectSymbol, configureAlgo } = require('./one-account');
 const aiClient = require('../../services/ai/client');
 
 // Strategy template that the AI will fill
@@ -391,109 +391,69 @@ const customStrategyMenu = async (service) => {
 
 /**
  * Execute trading with custom strategy
- * Same as one-account but uses the custom strategy class
+ * Uses same flow as one-account.js
  */
 async function executeWithCustomStrategy(service, StrategyClass, strategyName) {
-  const boxWidth = Math.max(getLogoWidth(), 98);
-  const innerWidth = boxWidth - 2;
+  const { connections } = require('../../services');
   
-  // Get accounts
-  const accountsResult = await service.getTradingAccounts();
-  if (!accountsResult.success || !accountsResult.accounts?.length) {
+  // Get all accounts (same as one-account.js)
+  const allAccounts = await connections.getAllAccounts();
+  if (!allAccounts || allAccounts.length === 0) {
     console.log(chalk.red('\n  No trading accounts available.\n'));
     await prompts.waitForEnter();
     return;
   }
-
-  // Account selection
-  console.log(chalk.cyan('\n  SELECT ACCOUNT:\n'));
-  accountsResult.accounts.forEach((acc, i) => {
-    const balance = acc.balance !== null ? `$${acc.balance.toLocaleString()}` : 'N/A';
-    console.log(chalk.cyan(`  [${i + 1}]`) + chalk.white(` ${acc.name || acc.accountId}`) + chalk.gray(` - ${balance}`));
-  });
-
-  const accChoice = await prompts.numberInput('\n  ACCOUNT #:', 1, 1, accountsResult.accounts.length);
-  if (accChoice === null) return;
-  const account = accountsResult.accounts[accChoice - 1];
-
-  // Symbol selection
-  const symbolInput = await prompts.textInput(chalk.cyan('  SYMBOL (e.g., MES, MNQ): '));
-  if (!symbolInput) return;
-  const symbols = symbolInput.toUpperCase().split(',').map(s => s.trim()).filter(Boolean);
-
-  // Target and Risk
-  const dailyTarget = await prompts.numberInput('  TARGET ($):', 1000, 100, 50000);
-  if (dailyTarget === null) return;
-
-  const maxRisk = await prompts.numberInput('  MAX RISK ($):', 500, 50, 10000);
-  if (maxRisk === null) return;
-
-  // Confirm
-  console.log(chalk.cyan('\n  ╔════════════════════════════════════════════════════════════╗'));
-  console.log(chalk.cyan('  ║') + chalk.yellow.bold('                    CONFIRM SETTINGS                        ') + chalk.cyan('║'));
-  console.log(chalk.cyan('  ╠════════════════════════════════════════════════════════════╣'));
-  console.log(chalk.cyan('  ║') + chalk.white(` Strategy: ${strategyName.substring(0, 47).padEnd(47)}`) + chalk.cyan('║'));
-  console.log(chalk.cyan('  ║') + chalk.white(` Account:  ${(account.name || account.accountId).substring(0, 47).padEnd(47)}`) + chalk.cyan('║'));
-  console.log(chalk.cyan('  ║') + chalk.white(` Symbols:  ${symbols.join(', ').substring(0, 47).padEnd(47)}`) + chalk.cyan('║'));
-  console.log(chalk.cyan('  ║') + chalk.green(` Target:   $${dailyTarget.toLocaleString().padEnd(46)}`) + chalk.cyan('║'));
-  console.log(chalk.cyan('  ║') + chalk.red(` Risk:     $${maxRisk.toLocaleString().padEnd(46)}`) + chalk.cyan('║'));
-  console.log(chalk.cyan('  ╚════════════════════════════════════════════════════════════╝\n'));
-
-  const startConfirm = await prompts.textInput(chalk.cyan('  START TRADING? (Y/n): '));
-  if (startConfirm.toLowerCase() === 'n') {
-    console.log(chalk.yellow('\n  Cancelled.\n'));
-    await prompts.waitForEnter();
-    return;
-  }
-
-  // Launch with custom strategy
-  console.log(chalk.green('\n  Starting custom strategy trading...\n'));
   
-  // Get front month contracts for each symbol
-  const contracts = [];
-  for (const symbol of symbols) {
-    // Get front month contract from Rithmic API
-    const frontMonth = await service.getFrontMonthContract(symbol);
-    if (frontMonth && frontMonth.success) {
-      contracts.push({
-        name: frontMonth.symbol || symbol,
-        symbol: frontMonth.symbol || symbol,
-        exchange: frontMonth.exchange || 'CME',
-        id: frontMonth.contractId || symbol,
-        tickSize: frontMonth.tickSize,
-        tickValue: frontMonth.tickValue,
-        qty: 1, // Default 1 contract per symbol
-      });
-    } else {
-      // Fallback - use symbol directly
-      contracts.push({
-        name: symbol,
-        symbol: symbol,
-        exchange: 'CME',
-        id: symbol,
-        tickSize: null,
-        tickValue: null,
-        qty: 1,
-      });
-    }
-  }
-
-  if (contracts.length === 0) {
-    console.log(chalk.red('\n  No valid contracts found.\n'));
+  // Filter active accounts
+  const activeAccounts = allAccounts.filter(acc => acc.status === 'active' || !acc.status);
+  if (activeAccounts.length === 0) {
+    console.log(chalk.red('\n  No active trading accounts.\n'));
     await prompts.waitForEnter();
     return;
   }
 
-  // Config for launchMultiSymbolRithmic
-  const config = {
-    dailyTarget,
-    maxRisk,
-    showName: true,
-    enableAI: false, // Custom strategy doesn't need AI supervisor (it IS the AI strategy)
-  };
-
+  // Account selection - same format as one-account.js
+  const options = activeAccounts.map(acc => {
+    const name = acc.accountName || acc.rithmicAccountId || acc.accountId;
+    const balance = acc.balance !== null && acc.balance !== undefined 
+      ? ` - $${acc.balance.toLocaleString()}` 
+      : '';
+    return {
+      label: `${name} (${acc.propfirm || acc.platform || 'Unknown'})${balance}`,
+      value: acc
+    };
+  });
+  options.push({ label: '< BACK', value: 'back' });
+  
+  const selectedAccount = await prompts.selectOption('SELECT ACCOUNT:', options);
+  if (!selectedAccount || selectedAccount === 'back') return;
+  
+  // Get the service for this account
+  const accountService = selectedAccount.service || connections.getServiceForAccount(selectedAccount.accountId) || service;
+  
+  // Select symbol(s) - same as one-account.js
+  console.log();
+  const useMultiSymbol = await prompts.confirmPrompt(chalk.cyan('MULTI-SYMBOL MODE? (up to 5 symbols)'), false);
+  if (useMultiSymbol === null) return;
+  
+  const contracts = await selectSymbol(accountService, selectedAccount, useMultiSymbol);
+  if (!contracts) return;
+  
+  // Normalize to array
+  const contractList = Array.isArray(contracts) ? contracts : [contracts];
+  
+  // Configure algo - same as one-account.js
+  const config = await configureAlgo(selectedAccount, contractList);
+  if (!config) return;
+  
+  // Override: Custom strategy doesn't need AI supervisor (it IS the AI strategy)
+  config.enableAI = false;
+  
+  // Show custom strategy info
+  console.log(chalk.magenta(`\n  CUSTOM STRATEGY: ${strategyName}\n`));
+  
   // Launch with custom strategy class
-  await launchMultiSymbolRithmic(service, account, contracts, config, StrategyClass);
+  await launchMultiSymbolRithmic(accountService, selectedAccount, contractList, config, StrategyClass);
 }
 
 module.exports = { customStrategyMenu, generateStrategyCode, validateStrategyCode };

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

@@ -2194,4 +2194,4 @@ const launchMultiSymbolRithmic = async (service, account, contracts, config, Cus
   await prompts.waitForEnter();
 };
 
-module.exports = { oneAccountMenu, launchMultiSymbolRithmic };
+module.exports = { oneAccountMenu, launchMultiSymbolRithmic, selectSymbol, configureAlgo };