hedgequantx 1.2.55 → 1.2.57

package/package.json

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

package/src/pages/algo.js

@@ -519,6 +519,55 @@ const copyTradingMenu = async () => {
   console.log(chalk.gray(getSeparator()));
   console.log();
 
+  // Check market status first
+  const marketSpinner = ora('Checking market status...').start();
+  
+  // Use a simple market hours check
+  const now = new Date();
+  const utcDay = now.getUTCDay();
+  const utcHour = now.getUTCHours();
+  const isDST = (() => {
+    const jan = new Date(now.getFullYear(), 0, 1);
+    const jul = new Date(now.getFullYear(), 6, 1);
+    return now.getTimezoneOffset() < Math.max(jan.getTimezoneOffset(), jul.getTimezoneOffset());
+  })();
+  const ctOffset = isDST ? 5 : 6;
+  const ctHour = (utcHour - ctOffset + 24) % 24;
+  const ctDay = utcHour < ctOffset ? (utcDay + 6) % 7 : utcDay;
+
+  let marketClosed = false;
+  let marketMessage = '';
+
+  if (ctDay === 6) {
+    marketClosed = true;
+    marketMessage = 'Market closed (Saturday)';
+  } else if (ctDay === 0 && ctHour < 17) {
+    marketClosed = true;
+    marketMessage = 'Market opens Sunday 5:00 PM CT';
+  } else if (ctDay === 5 && ctHour >= 16) {
+    marketClosed = true;
+    marketMessage = 'Market closed (Friday after 4PM CT)';
+  } else if (ctHour === 16 && ctDay >= 1 && ctDay <= 4) {
+    marketClosed = true;
+    marketMessage = 'Daily maintenance (4:00-5:00 PM CT)';
+  }
+
+  if (marketClosed) {
+    marketSpinner.fail('Market is CLOSED');
+    console.log();
+    console.log(chalk.red.bold('  [X] ' + marketMessage));
+    console.log();
+    console.log(chalk.gray('  Futures markets (CME) trading hours:'));
+    console.log(chalk.gray('  Sunday 5:00 PM CT - Friday 4:00 PM CT'));
+    console.log(chalk.gray('  Daily maintenance: 4:00 PM - 5:00 PM CT'));
+    console.log();
+    await inquirer.prompt([{ type: 'input', name: 'continue', message: 'Press Enter to continue...' }]);
+    return;
+  }
+
+  marketSpinner.succeed('Market is OPEN - Ready to trade!');
+  console.log();
+
   // Get all active accounts from all connections
   const allAccounts = await connections.getAllAccounts();
   const activeAccounts = allAccounts.filter(acc => acc.status === 0);
@@ -531,8 +580,52 @@ const copyTradingMenu = async () => {
     return;
   }
 
-  // Step 1: Select Lead Account
-  console.log(chalk.cyan.bold('  Step 1: Select Lead Account'));
+  // Step 1: Risk Management Settings
+  console.log(chalk.cyan.bold('  Step 1: Risk Management'));
+  console.log(chalk.gray('  Set your daily target and maximum risk to auto-stop copy trading.'));
+  console.log();
+
+  const { dailyTarget } = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'dailyTarget',
+      message: chalk.white.bold('Daily Target ($):'),
+      default: '500',
+      validate: (input) => {
+        const num = parseFloat(input);
+        if (isNaN(num) || num <= 0) {
+          return 'Please enter a valid amount greater than 0';
+        }
+        return true;
+      },
+      filter: (input) => parseFloat(input)
+    }
+  ]);
+
+  const { maxRisk } = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'maxRisk',
+      message: chalk.white.bold('Max Risk ($):'),
+      default: '200',
+      validate: (input) => {
+        const num = parseFloat(input);
+        if (isNaN(num) || num <= 0) {
+          return 'Please enter a valid amount greater than 0';
+        }
+        return true;
+      },
+      filter: (input) => parseFloat(input)
+    }
+  ]);
+
+  console.log();
+  console.log(chalk.gray('  Daily Target: ') + chalk.green('$' + dailyTarget.toFixed(2)));
+  console.log(chalk.gray('  Max Risk:     ') + chalk.red('$' + maxRisk.toFixed(2)));
+  console.log();
+
+  // Step 2: Select Lead Account
+  console.log(chalk.cyan.bold('  Step 2: Select Lead Account'));
   console.log(chalk.gray('  The lead account is the master account whose trades will be copied.'));
   console.log();
 
@@ -556,9 +649,9 @@ const copyTradingMenu = async () => {
 
   if (leadAccount === 'back') return;
 
-  // Step 2: Select Follower Account
+  // Step 3: Select Follower Account
   console.log();
-  console.log(chalk.cyan.bold('  Step 2: Select Follower Account'));
+  console.log(chalk.cyan.bold('  Step 3: Select Follower Account'));
   console.log(chalk.gray('  The follower account will copy trades from the lead account.'));
   console.log();
 
@@ -584,9 +677,9 @@ const copyTradingMenu = async () => {
 
   if (followerAccount === 'back') return;
 
-  // Step 3: Select Lead Symbol
+  // Step 4: Select Lead Symbol
   console.log();
-  console.log(chalk.cyan.bold('  Step 3: Configure Lead Symbol'));
+  console.log(chalk.cyan.bold('  Step 4: Configure Lead Symbol'));
   console.log();
 
   const { leadSymbol } = await inquirer.prompt([
@@ -620,9 +713,9 @@ const copyTradingMenu = async () => {
     }
   ]);
 
-  // Step 4: Select Follower Symbol
+  // Step 5: Select Follower Symbol
   console.log();
-  console.log(chalk.cyan.bold('  Step 4: Configure Follower Symbol'));
+  console.log(chalk.cyan.bold('  Step 5: Configure Follower Symbol'));
   console.log();
 
   const { followerSymbol } = await inquirer.prompt([
@@ -662,6 +755,10 @@ const copyTradingMenu = async () => {
   console.log(chalk.white.bold('  Copy Trading Configuration'));
   console.log(chalk.gray(getSeparator()));
   console.log();
+  console.log(chalk.white('  RISK MANAGEMENT'));
+  console.log(chalk.white(`    Daily Target: ${chalk.green('$' + dailyTarget.toFixed(2))}`));
+  console.log(chalk.white(`    Max Risk:     ${chalk.red('$' + maxRisk.toFixed(2))}`));
+  console.log();
   console.log(chalk.white('  LEAD ACCOUNT'));
   console.log(chalk.white(`    Account:   ${chalk.cyan(leadAccount.accountName || leadAccount.name)}`));
   console.log(chalk.white(`    PropFirm:  ${chalk.magenta(leadAccount.propfirm)}`));
@@ -694,6 +791,8 @@ const copyTradingMenu = async () => {
 
   // Launch Copy Trading
   await launchCopyTrading({
+    dailyTarget,
+    maxRisk,
     lead: {
       account: leadAccount,
       symbol: leadSymbol,
@@ -713,22 +812,24 @@ const copyTradingMenu = async () => {
  * Launch Copy Trading
  */
 const launchCopyTrading = async (config) => {
-  const { lead, follower } = config;
+  const { lead, follower, dailyTarget, maxRisk } = config;
 
   console.log();
   console.log(chalk.green.bold('  [>] Launching Copy Trading...'));
   console.log();
 
   let isRunning = true;
+  let stopReason = null;
   let lastLeadPosition = null;
   const logs = [];
-  const MAX_LOGS = 15;
+  const MAX_LOGS = 12;
 
   const stats = {
     copiedTrades: 0,
     leadTrades: 0,
     followerTrades: 0,
-    errors: 0
+    errors: 0,
+    pnl: 0
   };
 
   const addLog = (type, message) => {
@@ -747,6 +848,15 @@ const launchCopyTrading = async (config) => {
     console.log(chalk.gray(getSeparator()));
     console.log();
 
+    // Risk Management
+    console.log(chalk.white.bold('  RISK MANAGEMENT'));
+    const targetProgress = Math.min(100, (stats.pnl / dailyTarget) * 100);
+    const riskProgress = Math.min(100, (Math.abs(Math.min(0, stats.pnl)) / maxRisk) * 100);
+    console.log(chalk.white(`    Target:  ${chalk.green('$' + dailyTarget.toFixed(2))} | Progress: ${targetProgress >= 100 ? chalk.green.bold(targetProgress.toFixed(1) + '%') : chalk.yellow(targetProgress.toFixed(1) + '%')}`));
+    console.log(chalk.white(`    Risk:    ${chalk.red('$' + maxRisk.toFixed(2))} | Used: ${riskProgress >= 100 ? chalk.red.bold(riskProgress.toFixed(1) + '%') : chalk.cyan(riskProgress.toFixed(1) + '%')}`));
+    console.log(chalk.white(`    P&L:     ${stats.pnl >= 0 ? chalk.green('+$' + stats.pnl.toFixed(2)) : chalk.red('-$' + Math.abs(stats.pnl).toFixed(2))}`));
+    console.log();
+
     // Lead info
     console.log(chalk.white.bold('  LEAD'));
     console.log(chalk.white(`    ${chalk.cyan(lead.account.accountName)} @ ${chalk.magenta(lead.account.propfirm)}`));
@@ -809,6 +919,63 @@ const launchCopyTrading = async (config) => {
     if (!isRunning) return;
 
     try {
+      // Get follower positions for P&L tracking
+      const followerPositions = await follower.service.getPositions(follower.account.rithmicAccountId || follower.account.accountId);
+      
+      if (followerPositions.success && followerPositions.positions) {
+        const followerPos = followerPositions.positions.find(p => 
+          p.symbol === follower.symbol.value || 
+          p.symbol?.includes(follower.symbol.searchText)
+        );
+        
+        // Update P&L from follower position
+        if (followerPos && typeof followerPos.unrealizedPnl === 'number') {
+          stats.pnl = followerPos.unrealizedPnl;
+        }
+      }
+
+      // Check if daily target reached
+      if (stats.pnl >= dailyTarget) {
+        isRunning = false;
+        stopReason = 'target';
+        addLog('success', `Daily target reached! +$${stats.pnl.toFixed(2)}`);
+        
+        // Close follower position
+        try {
+          await follower.service.closePosition(
+            follower.account.rithmicAccountId || follower.account.accountId,
+            follower.symbol.value
+          );
+          addLog('info', 'Follower position closed');
+        } catch (e) {
+          // Position may already be closed
+        }
+        
+        displayUI();
+        return;
+      }
+
+      // Check if max risk reached
+      if (stats.pnl <= -maxRisk) {
+        isRunning = false;
+        stopReason = 'risk';
+        addLog('error', `Max risk reached! -$${Math.abs(stats.pnl).toFixed(2)}`);
+        
+        // Close follower position
+        try {
+          await follower.service.closePosition(
+            follower.account.rithmicAccountId || follower.account.accountId,
+            follower.symbol.value
+          );
+          addLog('info', 'Follower position closed');
+        } catch (e) {
+          // Position may already be closed
+        }
+        
+        displayUI();
+        return;
+      }
+
       // Get lead positions
       const leadPositions = await lead.service.getPositions(lead.account.rithmicAccountId || lead.account.accountId);
       
@@ -869,15 +1036,25 @@ const launchCopyTrading = async (config) => {
   await waitForStopKey();
 
   // Cleanup
-  isRunning = false;
   clearInterval(monitorInterval);
+  isRunning = false;
 
   console.log();
-  console.log(chalk.green('  [OK] Copy trading stopped'));
+  if (stopReason === 'target') {
+    console.log(chalk.green.bold('  [OK] Daily target reached! Copy trading stopped.'));
+  } else if (stopReason === 'risk') {
+    console.log(chalk.red.bold('  [X] Max risk reached! Copy trading stopped.'));
+  } else {
+    console.log(chalk.yellow('  [OK] Copy trading stopped by user'));
+  }
   console.log();
   console.log(chalk.gray(getSeparator()));
   console.log(chalk.white.bold('  Session Summary'));
   console.log(chalk.gray(getSeparator()));
+  console.log(chalk.white(`  Daily Target:  ${chalk.green('$' + dailyTarget.toFixed(2))}`));
+  console.log(chalk.white(`  Max Risk:      ${chalk.red('$' + maxRisk.toFixed(2))}`));
+  console.log(chalk.white(`  Final P&L:     ${stats.pnl >= 0 ? chalk.green('+$' + stats.pnl.toFixed(2)) : chalk.red('-$' + Math.abs(stats.pnl).toFixed(2))}`));
+  console.log(chalk.gray(getSeparator()));
   console.log(chalk.white(`  Lead Trades:   ${chalk.cyan(stats.leadTrades)}`));
   console.log(chalk.white(`  Copied Trades: ${chalk.green(stats.copiedTrades)}`));
   console.log(chalk.white(`  Errors:        ${chalk.red(stats.errors)}`));