hedgequantx 2.9.44 → 2.9.46

package/package.json

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

package/src/pages/algo/algo-executor.js

@@ -6,7 +6,7 @@
 
 const readline = require('readline');
 const { AlgoUI, renderSessionSummary } = require('./ui');
-const { M1 } = require('../../lib/m/s1');
+const { loadStrategy } = require('../../lib/m');
 const { MarketDataFeed } = require('../../lib/data');
 const { SupervisionEngine } = require('../../services/ai-supervision');
 
@@ -17,12 +17,19 @@ const { SupervisionEngine } = require('../../services/ai-supervision');
  * @param {Object} params.account - Account object
  * @param {Object} params.contract - Contract object
  * @param {Object} params.config - Algo config (contracts, target, risk, showName)
+ * @param {Object} params.strategy - Strategy info object with id, name
  * @param {Object} params.options - Optional: supervisionConfig for multi-agent AI
  */
-const executeAlgo = async ({ service, account, contract, config, options = {} }) => {
+const executeAlgo = async ({ service, account, contract, config, strategy: strategyInfo, options = {} }) => {
   const { contracts, dailyTarget, maxRisk, showName } = config;
   const { supervisionConfig, subtitle } = options;
   
+  // Load the selected strategy module dynamically
+  const strategyId = strategyInfo?.id || 'ultra-scalping';
+  const strategyName = strategyInfo?.name || 'HQX Scalping';
+  const strategyModule = loadStrategy(strategyId);
+  const StrategyClass = strategyModule.M1; // loadStrategy normalizes to M1
+  
   // Initialize AI Supervision Engine if configured
   const supervisionEnabled = supervisionConfig?.supervisionEnabled && supervisionConfig?.agents?.length > 0;
   const supervisionEngine = supervisionEnabled ? new SupervisionEngine(supervisionConfig) : null;
@@ -35,7 +42,7 @@ const executeAlgo = async ({ service, account, contract, config, options = {} })
   const tickSize = contract.tickSize || 0.25;
   
   const ui = new AlgoUI({ 
-    subtitle: subtitle || (supervisionEnabled ? 'HQX + AI SUPERVISION' : 'HQX Ultra Scalping'), 
+    subtitle: subtitle || (supervisionEnabled ? `${strategyName} + AI` : strategyName), 
     mode: 'one-account' 
   });
   
@@ -67,14 +74,14 @@ const executeAlgo = async ({ service, account, contract, config, options = {} })
   const aiContext = { recentTicks: [], recentSignals: [], recentTrades: [], maxTicks: 100 };
   
   // Initialize Strategy
-  const strategy = new M1({ tickSize });
+  const strategy = new StrategyClass({ tickSize });
   strategy.initialize(contractId, tickSize);
   
   // Initialize Market Data Feed
   const marketFeed = new MarketDataFeed({ propfirm: account.propfirm });
   
   // Log startup
-  ui.addLog('info', `Strategy: ${supervisionEnabled ? 'HQX + AI Supervision' : 'HQX Ultra Scalping'}`);
+  ui.addLog('info', `Strategy: ${strategyName}${supervisionEnabled ? ' + AI' : ''}`);
   ui.addLog('info', `Account: ${accountName}`);
   ui.addLog('info', `Symbol: ${symbolName} | Qty: ${contracts}`);
   ui.addLog('info', `Target: $${dailyTarget} | Risk: $${maxRisk}`);

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

@@ -7,14 +7,20 @@ const readline = require('readline');
 const { connections } = require('../../services');
 const { AlgoUI, renderSessionSummary } = require('./ui');
 const { SupervisionEngine } = require('../../services/ai-supervision');
-const { M1 } = require('../../lib/m/s1');
+const { loadStrategy } = require('../../lib/m');
 const { MarketDataFeed } = require('../../lib/data');
 
 /**
  * Launch Copy Trading execution
  */
 const launchCopyTrading = async (config) => {
-  const { lead, followers, contract, dailyTarget, maxRisk, showNames, supervisionConfig } = config;
+  const { lead, followers, contract, dailyTarget, maxRisk, showNames, supervisionConfig, strategy: strategyInfo } = config;
+  
+  // Load the selected strategy module dynamically
+  const strategyId = strategyInfo?.id || 'ultra-scalping';
+  const strategyName = strategyInfo?.name || 'HQX Scalping';
+  const strategyModule = loadStrategy(strategyId);
+  const StrategyClass = strategyModule.M1;
   
   // Initialize AI Supervision if configured
   const supervisionEnabled = supervisionConfig?.supervisionEnabled && supervisionConfig?.agents?.length > 0;
@@ -35,7 +41,7 @@ const launchCopyTrading = async (config) => {
   );
   
   const ui = new AlgoUI({ 
-    subtitle: supervisionEnabled ? 'HQX Copy + AI' : 'HQX Copy Trading', 
+    subtitle: supervisionEnabled ? `${strategyName} Copy + AI` : `${strategyName} Copy`, 
     mode: 'copy-trading' 
   });
   
@@ -68,7 +74,7 @@ const launchCopyTrading = async (config) => {
   let tickCount = 0;
   
   // Initialize Strategy
-  const strategy = new M1({ tickSize });
+  const strategy = new StrategyClass({ tickSize });
   strategy.initialize(contractId, tickSize);
   
   // Initialize Market Data Feed

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

@@ -13,6 +13,7 @@ const { checkMarketHours } = require('../../services/rithmic/market');
 const { getActiveAgentCount, getSupervisionConfig, getActiveAgents } = require('../ai-agents');
 const { launchCopyTrading } = require('./copy-executor');
 const { runPreflightCheck, formatPreflightResults, getPreflightSummary } = require('../../services/ai-supervision');
+const { getAvailableStrategies } = require('../../lib/m');
 
 /**
  * Copy Trading Menu
@@ -125,6 +126,10 @@ const copyTradingMenu = async () => {
   const contract = await selectSymbol(leadService);
   if (!contract) return;
   
+  // Step 3b: Select Strategy
+  const strategy = await selectStrategy();
+  if (!strategy) return;
+  
   // Step 4: Configure Parameters
   console.log();
   console.log(chalk.cyan.bold('  STEP 4: CONFIGURE PARAMETERS'));
@@ -185,6 +190,7 @@ const copyTradingMenu = async () => {
   // Summary
   console.log();
   console.log(chalk.white.bold('  SUMMARY:'));
+  console.log(chalk.cyan(`  Strategy: ${strategy.name}`));
   console.log(chalk.cyan(`  Symbol: ${contract.name}`));
   console.log(chalk.cyan(`  Lead: ${leadAccount.propfirm} x${leadContracts}`));
   console.log(chalk.yellow(`  Followers (${followers.length}):`));
@@ -202,6 +208,7 @@ const copyTradingMenu = async () => {
     lead: { account: leadAccount, contracts: leadContracts },
     followers: followers.map(f => ({ account: f, contracts: followerContracts })),
     contract,
+    strategy,
     dailyTarget,
     maxRisk,
     showNames,
@@ -209,6 +216,34 @@ const copyTradingMenu = async () => {
   });
 };
 
+/**
+ * Select trading strategy
+ */
+const selectStrategy = async () => {
+  console.log();
+  console.log(chalk.cyan('  Select Strategy'));
+  console.log();
+  
+  const strategies = getAvailableStrategies();
+  
+  const options = strategies.map(s => ({
+    label: `${s.name} (${s.backtest.winRate} WR, R:R ${s.params.riskReward})`,
+    value: s
+  }));
+  options.push({ label: chalk.gray('< Back'), value: 'back' });
+  
+  // Show strategy details
+  for (const s of strategies) {
+    console.log(chalk.white(`  ${s.name}`));
+    console.log(chalk.gray(`    Backtest: ${s.backtest.pnl} | ${s.backtest.winRate} WR | ${s.backtest.trades} trades`));
+    console.log(chalk.gray(`    Stop: ${s.params.stopTicks} ticks | Target: ${s.params.targetTicks} ticks | R:R ${s.params.riskReward}`));
+    console.log();
+  }
+  
+  const selected = await prompts.selectOption(chalk.yellow('Select Strategy:'), options);
+  return selected === 'back' || selected === null ? null : selected;
+};
+
 /**
  * Symbol selection - sorted with popular indices first
  */