hedgequantx 1.3.8 → 1.3.10

package/package.json

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

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

@@ -19,15 +19,16 @@ const { AlgoUI, checkMarketStatus } = require('./ui');
 const oneAccountMenu = async (service) => {
   const spinner = ora('Fetching active accounts...').start();
   
-  const result = await service.getTradingAccounts();
+  // Get ALL accounts from ALL connections
+  const allAccounts = await connections.getAllAccounts();
   
-  if (!result.success || !result.accounts?.length) {
+  if (!allAccounts?.length) {
     spinner.fail('No accounts found');
     await inquirer.prompt([{ type: 'input', name: 'c', message: 'Press Enter...' }]);
     return;
   }
   
-  const activeAccounts = result.accounts.filter(acc => acc.status === 0);
+  const activeAccounts = allAccounts.filter(acc => acc.status === 0);
   
   if (!activeAccounts.length) {
     spinner.fail('No active accounts');
@@ -37,14 +38,16 @@ const oneAccountMenu = async (service) => {
   
   spinner.succeed(`Found ${activeAccounts.length} active account(s)`);
   
-  // Select account
+  // Select account - show propfirm for clarity
   const { selectedAccount } = await inquirer.prompt([{
     type: 'list',
     name: 'selectedAccount',
     message: 'Select Account:',
     choices: [
       ...activeAccounts.map(acc => ({
-        name: chalk.cyan(`${acc.accountName || acc.accountId} - $${acc.balance.toLocaleString()}`),
+        name: chalk.cyan(`${acc.accountName || acc.accountId}`) + 
+              chalk.gray(` (${acc.propfirm || 'Unknown'})`) + 
+              chalk.white(` - $${(acc.balance || 0).toLocaleString()}`),
         value: acc
       })),
       new inquirer.Separator(),
@@ -54,16 +57,19 @@ const oneAccountMenu = async (service) => {
   
   if (selectedAccount === 'back') return;
   
+  // Find the service for this account
+  const accountService = connections.getServiceForAccount(selectedAccount.accountId) || service;
+  
   // Select symbol
-  const contract = await selectSymbol(service, selectedAccount);
+  const contract = await selectSymbol(accountService, selectedAccount);
   if (!contract) return;
   
   // Configure algo
   const config = await configureAlgo(selectedAccount, contract);
   if (!config) return;
   
-  // Launch
-  await launchAlgo(service, selectedAccount, contract, config);
+  // Launch with the correct service for this account
+  await launchAlgo(accountService, selectedAccount, contract, config);
 };
 
 /**

package/src/services/projectx/index.js

@@ -211,7 +211,10 @@ class ProjectXService {
 
         // Get P&L for active accounts only
         if (account.status === 0) {
-          // Get unrealized P&L from /Position endpoint (userApi)
+          let openPnL = 0;
+          let todayPnL = 0;
+          
+          // 1. Get unrealized P&L from open positions
           try {
             const posRes = await this._request(
               this.propfirm.userApi, 
@@ -221,18 +224,49 @@ class ProjectXService {
             debug(`Positions for ${account.accountId}:`, JSON.stringify(posRes.data, null, 2));
             
             if (posRes.statusCode === 200 && Array.isArray(posRes.data)) {
-              let openPnL = 0;
               for (const pos of posRes.data) {
                 if (pos.profitAndLoss !== undefined && pos.profitAndLoss !== null) {
                   openPnL += pos.profitAndLoss;
                 }
               }
-              enriched.openPnL = openPnL;
-              enriched.profitAndLoss = openPnL;  // Open P&L from positions
             }
           } catch (e) {
             debug('Failed to get positions:', e.message);
           }
+          
+          // 2. Get realized P&L from today's closed trades
+          try {
+            const today = new Date();
+            today.setHours(0, 0, 0, 0);
+            const now = new Date();
+            
+            const tradesRes = await this._request(
+              this.propfirm.gatewayApi, 
+              '/api/Trade/search', 
+              'POST',
+              { 
+                accountId: account.accountId, 
+                startTimestamp: today.toISOString(), 
+                endTimestamp: now.toISOString() 
+              }
+            );
+            debug(`Today trades for ${account.accountId}:`, JSON.stringify(tradesRes.data, null, 2));
+            
+            if (tradesRes.statusCode === 200) {
+              const trades = Array.isArray(tradesRes.data) ? tradesRes.data : (tradesRes.data.trades || []);
+              for (const trade of trades) {
+                if (trade.profitAndLoss !== undefined && trade.profitAndLoss !== null) {
+                  todayPnL += trade.profitAndLoss;
+                }
+              }
+            }
+          } catch (e) {
+            debug('Failed to get today trades:', e.message);
+          }
+          
+          enriched.openPnL = openPnL;
+          enriched.todayPnL = todayPnL;
+          enriched.profitAndLoss = openPnL + todayPnL;  // Total day P&L = unrealized + realized
         }
 
         debug(`Account ${account.accountId}:`, {

package/src/services/session.js

@@ -261,6 +261,30 @@ const connections = {
     return allAccounts;
   },
 
+  /**
+   * Gets the service for a specific account
+   * @param {string|number} accountId - Account ID to find
+   * @returns {Object|null} Service instance or null
+   */
+  getServiceForAccount(accountId) {
+    for (const conn of this.services) {
+      try {
+        // Check if this service has this account
+        if (conn.service && conn.service.accounts) {
+          const found = conn.service.accounts.find(acc => 
+            acc.accountId == accountId || 
+            acc.rithmicAccountId == accountId ||
+            acc.accountName == accountId
+          );
+          if (found) return conn.service;
+        }
+      } catch (e) {
+        // Skip
+      }
+    }
+    return null;
+  },
+
   /**
    * Checks if any connection is active
    * @returns {boolean} True if connected