hedgequantx 1.2.56 → 1.2.58

package/package.json

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

@@ -215,15 +215,57 @@ const selectSymbolMenu = async (service, account) => {
       filter: (input) => parseInt(input)
     }
   ]);
+
+  // Risk Management
+  console.log();
+  console.log(chalk.cyan.bold('  Risk Management'));
+  console.log(chalk.gray('  Set your daily target and maximum risk to auto-stop the algo.'));
+  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)
+    }
+  ]);
   
   // Confirmation
   console.log();
   console.log(chalk.gray(getSeparator()));
   console.log(chalk.white.bold('  Algo Configuration:'));
   console.log(chalk.gray(getSeparator()));
-  console.log(chalk.white(`  Account:   ${chalk.cyan(accountName)}`));
-  console.log(chalk.white(`  Symbol:    ${chalk.cyan(contract.name || selectedSymbol.value)}`));
-  console.log(chalk.white(`  Contracts: ${chalk.cyan(contracts)}`));
+  console.log(chalk.white(`  Account:      ${chalk.cyan(accountName)}`));
+  console.log(chalk.white(`  Symbol:       ${chalk.cyan(contract.name || selectedSymbol.value)}`));
+  console.log(chalk.white(`  Contracts:    ${chalk.cyan(contracts)}`));
+  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.gray(getSeparator()));
   console.log();
   
@@ -244,13 +286,13 @@ const selectSymbolMenu = async (service, account) => {
     return;
   }
   
-  await launchAlgo(service, account, contract, contracts);
+  await launchAlgo(service, account, contract, contracts, dailyTarget, maxRisk);
 };
 
 /**
  * Launch Algo with HQX Server Connection
  */
-const launchAlgo = async (service, account, contract, numContracts) => {
+const launchAlgo = async (service, account, contract, numContracts, dailyTarget, maxRisk) => {
   const accountName = account.accountName || account.name || 'Account #' + account.accountId;
   const symbolName = contract.name || contract.symbol || contract.id;
   const symbol = contract.symbol || contract.id;
@@ -263,10 +305,11 @@ const launchAlgo = async (service, account, contract, numContracts) => {
   const hqxServer = new HQXServerService();
   let hqxConnected = false;
   let algoRunning = false;
+  let stopReason = null;
   
   // Activity logs
   const logs = [];
-  const MAX_LOGS = 12;
+  const MAX_LOGS = 10;
   
   // Stats
   let stats = {
@@ -300,6 +343,15 @@ const launchAlgo = async (service, account, contract, numContracts) => {
     console.log(chalk.white(`  Contracts: ${chalk.cyan(numContracts)}`));
     console.log(chalk.white(`  Mode:      ${hqxConnected ? chalk.green('LIVE') : chalk.yellow('OFFLINE')}`));
     console.log(chalk.gray(getSeparator()));
+
+    // Risk Management
+    console.log();
+    const targetProgress = Math.min(100, Math.max(0, (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)) + 
+      chalk.gray(' | Progress: ') + (targetProgress >= 100 ? chalk.green.bold(targetProgress.toFixed(1) + '%') : chalk.yellow(targetProgress.toFixed(1) + '%')));
+    console.log(chalk.white('  Risk:    ') + chalk.red('$' + maxRisk.toFixed(2)) + 
+      chalk.gray(' | Used: ') + (riskProgress >= 100 ? chalk.red.bold(riskProgress.toFixed(1) + '%') : chalk.cyan(riskProgress.toFixed(1) + '%')));
     
     // Stats bar
     console.log();
@@ -308,7 +360,7 @@ const launchAlgo = async (service, account, contract, numContracts) => {
       chalk.gray(' | Wins: ') + chalk.green(stats.wins) + 
       chalk.gray(' | Losses: ') + chalk.red(stats.losses) + 
       chalk.gray(' | Win Rate: ') + chalk.yellow(stats.winRate + '%') +
-      chalk.gray(' | P&L: ') + (stats.pnl >= 0 ? chalk.green('$' + stats.pnl.toFixed(2)) : chalk.red('-$' + Math.abs(stats.pnl).toFixed(2)))
+      chalk.gray(' | P&L: ') + (stats.pnl >= 0 ? chalk.green('+$' + stats.pnl.toFixed(2)) : chalk.red('-$' + Math.abs(stats.pnl).toFixed(2)))
     );
     console.log();
     
@@ -409,6 +461,27 @@ const launchAlgo = async (service, account, contract, numContracts) => {
       addLog('trade', `Closed -$${Math.abs(data.pnl).toFixed(2)} (${data.reason || 'stop_loss'})`);
     }
     stats.winRate = stats.trades > 0 ? ((stats.wins / stats.trades) * 100).toFixed(1) : '0.0';
+    
+    // Check daily target
+    if (stats.pnl >= dailyTarget) {
+      stopReason = 'target';
+      addLog('success', `Daily target reached! +$${stats.pnl.toFixed(2)}`);
+      algoRunning = false;
+      if (hqxConnected) {
+        hqxServer.stopAlgo();
+      }
+    }
+    
+    // Check max risk
+    if (stats.pnl <= -maxRisk) {
+      stopReason = 'risk';
+      addLog('error', `Max risk reached! -$${Math.abs(stats.pnl).toFixed(2)}`);
+      algoRunning = false;
+      if (hqxConnected) {
+        hqxServer.stopAlgo();
+      }
+    }
+    
     displayUI();
   });
   
@@ -431,13 +504,14 @@ const launchAlgo = async (service, account, contract, numContracts) => {
   // Start algo
   if (hqxConnected) {
     addLog('info', 'Starting HQX Ultra-Scalping...');
+    addLog('info', `Target: $${dailyTarget.toFixed(2)} | Risk: $${maxRisk.toFixed(2)}`);
     hqxServer.startAlgo({
       accountId: account.accountId,
       contractId: contract.id || contract.contractId,
       symbol: symbol,
       contracts: numContracts,
-      dailyTarget: 500,  // Default daily target
-      maxRisk: 200,      // Default max risk
+      dailyTarget: dailyTarget,
+      maxRisk: maxRisk,
       propfirm: account.propfirm || 'projectx',
       propfirmToken: service.getToken ? service.getToken() : null
     });
@@ -450,14 +524,44 @@ const launchAlgo = async (service, account, contract, numContracts) => {
   
   displayUI();
   
-  // Wait for X key to stop
-  await waitForStopKey();
+  // Wait for X key OR auto-stop (target/risk reached)
+  await new Promise((resolve) => {
+    // Check for auto-stop every 500ms
+    const checkInterval = setInterval(() => {
+      if (!algoRunning || stopReason) {
+        clearInterval(checkInterval);
+        if (process.stdin.isTTY && process.stdin.isRaw) {
+          process.stdin.setRawMode(false);
+        }
+        resolve();
+      }
+    }, 500);
+
+    // Also listen for X key
+    if (process.stdin.isTTY) {
+      readline.emitKeypressEvents(process.stdin);
+      process.stdin.setRawMode(true);
+      
+      const onKeypress = (str, key) => {
+        if (key && (key.name === 'x' || key.name === 'X' || (key.ctrl && key.name === 'c'))) {
+          clearInterval(checkInterval);
+          process.stdin.setRawMode(false);
+          process.stdin.removeListener('keypress', onKeypress);
+          resolve();
+        }
+      };
+      
+      process.stdin.on('keypress', onKeypress);
+    }
+  });
   
   // Stop algo
-  addLog('warning', 'Stopping algo...');
-  displayUI();
+  if (!stopReason) {
+    addLog('warning', 'Stopping algo...');
+    displayUI();
+  }
   
-  if (hqxConnected) {
+  if (hqxConnected && algoRunning) {
     hqxServer.stopAlgo();
   }
   
@@ -465,18 +569,27 @@ const launchAlgo = async (service, account, contract, numContracts) => {
   algoRunning = false;
   
   console.log();
-  console.log(chalk.green('  [OK] Algo stopped successfully'));
+  if (stopReason === 'target') {
+    console.log(chalk.green.bold('  [OK] Daily target reached! Algo stopped.'));
+  } else if (stopReason === 'risk') {
+    console.log(chalk.red.bold('  [X] Max risk reached! Algo stopped.'));
+  } else {
+    console.log(chalk.yellow('  [OK] Algo stopped by user'));
+  }
   console.log();
   
   // Final stats
   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(`  Total Trades:  ${chalk.cyan(stats.trades)}`));
   console.log(chalk.white(`  Wins:          ${chalk.green(stats.wins)}`));
   console.log(chalk.white(`  Losses:        ${chalk.red(stats.losses)}`));
   console.log(chalk.white(`  Win Rate:      ${chalk.yellow(stats.winRate + '%')}`));
-  console.log(chalk.white(`  Total 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();
   
@@ -580,8 +693,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();
 
@@ -605,9 +762,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();
 
@@ -633,9 +790,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([
@@ -669,9 +826,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([
@@ -711,6 +868,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)}`));
@@ -743,6 +904,8 @@ const copyTradingMenu = async () => {
 
   // Launch Copy Trading
   await launchCopyTrading({
+    dailyTarget,
+    maxRisk,
     lead: {
       account: leadAccount,
       symbol: leadSymbol,
@@ -762,22 +925,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) => {
@@ -796,6 +961,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)}`));
@@ -858,6 +1032,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);
       
@@ -914,19 +1145,58 @@ const launchCopyTrading = async (config) => {
     }
   }, 2000); // Check every 2 seconds
 
-  // Wait for stop key
-  await waitForStopKey();
+  // Wait for X key OR auto-stop (target/risk reached)
+  await new Promise((resolve) => {
+    // Check for auto-stop every 500ms
+    const checkInterval = setInterval(() => {
+      if (!isRunning || stopReason) {
+        clearInterval(checkInterval);
+        clearInterval(monitorInterval);
+        if (process.stdin.isTTY && process.stdin.isRaw) {
+          process.stdin.setRawMode(false);
+        }
+        resolve();
+      }
+    }, 500);
+
+    // Also listen for X key
+    if (process.stdin.isTTY) {
+      readline.emitKeypressEvents(process.stdin);
+      process.stdin.setRawMode(true);
+      
+      const onKeypress = (str, key) => {
+        if (key && (key.name === 'x' || key.name === 'X' || (key.ctrl && key.name === 'c'))) {
+          clearInterval(checkInterval);
+          clearInterval(monitorInterval);
+          process.stdin.setRawMode(false);
+          process.stdin.removeListener('keypress', onKeypress);
+          resolve();
+        }
+      };
+      
+      process.stdin.on('keypress', onKeypress);
+    }
+  });
 
   // Cleanup
   isRunning = false;
-  clearInterval(monitorInterval);
 
   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)}`));