hedgequantx 1.3.3 → 1.3.5

package/package.json

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

package/src/services/projectx/index.js

@@ -7,6 +7,10 @@
 
 const https = require('https');
 const { PROPFIRMS } = require('../../config');
+
+// Debug mode - set HQX_DEBUG=1 to enable
+const DEBUG = process.env.HQX_DEBUG === '1';
+const debug = (...args) => DEBUG && console.log('[ProjectX]', ...args);
 const { 
   validateUsername, 
   validatePassword, 
@@ -148,52 +152,96 @@ class ProjectXService {
   // ==================== ACCOUNTS ====================
 
   /**
-   * Get trading accounts - ONLY returns values from API
-   * P&L comes from: today's trades + open positions (both from API)
+   * Get trading accounts with REAL P&L from API
+   * 
+   * Data sources (all from userApi):
+   * - /TradingAccount: accountId, accountName, balance, status, type
+   * - /AccountTemplate/userTemplates: startingBalance
+   * - /Position?accountId=X: profitAndLoss (unrealized P&L from open positions)
+   * 
+   * All values come from API. No estimation.
    */
   async getTradingAccounts() {
     try {
+      // 1. Get accounts
       const response = await this._request(this.propfirm.userApi, '/TradingAccount', 'GET');
+      debug('getTradingAccounts response:', JSON.stringify(response.data, null, 2));
+      
       if (response.statusCode !== 200) {
         return { success: false, accounts: [], error: 'Failed to get accounts' };
       }
 
       const accounts = Array.isArray(response.data) ? response.data : [];
+      
+      // 2. Get account templates (for startingBalance)
+      let templates = [];
+      try {
+        const templateRes = await this._request(this.propfirm.userApi, '/AccountTemplate/userTemplates', 'GET');
+        if (templateRes.statusCode === 200 && Array.isArray(templateRes.data)) {
+          templates = templateRes.data;
+          debug('Templates:', JSON.stringify(templates, null, 2));
+        }
+      } catch (e) {
+        debug('Failed to get templates:', e.message);
+      }
+
       const enrichedAccounts = [];
 
       for (const account of accounts) {
-        // Start with RAW API data only
+        // Find matching template for startingBalance
+        const template = templates.find(t => 
+          account.accountName && (
+            account.accountName.includes(t.title) || 
+            t.title.includes(account.accountName)
+          )
+        );
+        
         const enriched = {
           accountId: account.accountId,
           accountName: account.accountName,
-          balance: account.balance,  // From API
-          status: account.status,    // From API
-          type: account.type,        // From API
+          balance: account.balance,                              // From /TradingAccount
+          status: account.status,                                // From /TradingAccount
+          type: account.type,                                    // From /TradingAccount
+          startingBalance: template?.startingBalance || null,    // From /AccountTemplate
           platform: 'ProjectX',
           propfirm: this.propfirm.name,
-          // P&L fields - will be populated from API calls
-          todayPnL: null,
           openPnL: null,
           profitAndLoss: null,
-          startingBalance: null,
         };
 
-        // Only fetch P&L for active accounts
+        // Get P&L for active accounts only
         if (account.status === 0) {
-          // Get today's realized P&L from trades API
-          const todayPnL = await this._getTodayRealizedPnL(account.accountId);
-          enriched.todayPnL = todayPnL;
-
-          // Get unrealized P&L from open positions API
-          const openPnL = await this._getOpenPositionsPnL(account.accountId);
-          enriched.openPnL = openPnL;
-
-          // Total P&L = realized + unrealized (both from API)
-          if (todayPnL !== null || openPnL !== null) {
-            enriched.profitAndLoss = (todayPnL || 0) + (openPnL || 0);
+          // Get unrealized P&L from /Position endpoint (userApi)
+          try {
+            const posRes = await this._request(
+              this.propfirm.userApi, 
+              `/Position?accountId=${account.accountId}`, 
+              'GET'
+            );
+            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);
           }
         }
 
+        debug(`Account ${account.accountId}:`, {
+          balance: enriched.balance,
+          startingBalance: enriched.startingBalance,
+          openPnL: enriched.openPnL,
+          profitAndLoss: enriched.profitAndLoss
+        });
+
         enrichedAccounts.push(enriched);
       }
 
@@ -203,75 +251,6 @@ class ProjectXService {
     }
   }
 
-  /**
-   * Get today's realized P&L from Trade API
-   * Returns null if API fails (not 0)
-   * @private
-   */
-  async _getTodayRealizedPnL(accountId) {
-    try {
-      const now = new Date();
-      const startOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate());
-      
-      const response = await this._request(
-        this.propfirm.gatewayApi, '/api/Trade/search', 'POST',
-        { 
-          accountId: accountId, 
-          startTimestamp: startOfDay.toISOString(), 
-          endTimestamp: now.toISOString() 
-        }
-      );
-
-      if (response.statusCode === 200 && response.data) {
-        const trades = Array.isArray(response.data) 
-          ? response.data 
-          : (response.data.trades || []);
-        
-        // Sum P&L from API response only
-        let totalPnL = 0;
-        for (const trade of trades) {
-          if (trade.profitAndLoss !== undefined && trade.profitAndLoss !== null) {
-            totalPnL += trade.profitAndLoss;
-          }
-        }
-        return totalPnL;
-      }
-      return null; // API failed - return null, not 0
-    } catch (e) {
-      return null;
-    }
-  }
-
-  /**
-   * Get unrealized P&L from open positions API
-   * Returns null if API fails (not 0)
-   * @private
-   */
-  async _getOpenPositionsPnL(accountId) {
-    try {
-      const response = await this._request(
-        this.propfirm.gatewayApi, '/api/Position/searchOpen', 'POST',
-        { accountId: accountId }
-      );
-
-      if (response.statusCode === 200 && response.data) {
-        const positions = response.data.positions || response.data || [];
-        if (Array.isArray(positions)) {
-          let totalPnL = 0;
-          for (const pos of positions) {
-            if (pos.profitAndLoss !== undefined && pos.profitAndLoss !== null) {
-              totalPnL += pos.profitAndLoss;
-            }
-          }
-          return totalPnL;
-        }
-      }
-      return null;
-    } catch (e) {
-      return null;
-    }
-  }
-
   // ==================== TRADING ====================
 
   async getPositions(accountId) {

package/src/services/rithmic/accounts.js

@@ -7,6 +7,10 @@
 
 const { REQ } = require('./constants');
 
+// Debug mode - set HQX_DEBUG=1 to enable
+const DEBUG = process.env.HQX_DEBUG === '1';
+const debug = (...args) => DEBUG && console.log('[Rithmic]', ...args);
+
 /**
  * Hash account ID to numeric (for compatibility)
  */

package/src/ui/index.js

@@ -29,15 +29,8 @@ const { createBoxMenu } = require('./menu');
  * This fixes input leaking to bash after session restore or algo trading
  */
 const prepareStdin = () => {
+  // Minimal intervention - just ensure stdin is flowing
   try {
-    // Remove any raw mode that might be left from previous operations
-    if (process.stdin.isTTY && process.stdin.isRaw) {
-      process.stdin.setRawMode(false);
-    }
-    // Remove any lingering keypress listeners
-    process.stdin.removeAllListeners('keypress');
-    process.stdin.removeAllListeners('data');
-    // Resume stdin so inquirer can take control
     if (process.stdin.isPaused()) {
       process.stdin.resume();
     }