hedgequantx 1.3.9 → 1.3.11

package/package.json

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

package/src/app.js

@@ -286,7 +286,7 @@ const run = async () => {
     await banner();
     
     // Try to restore session
-    const spinner = ora('Restoring session...').start();
+    const spinner = ora({ text: 'Restoring session...', color: 'yellow' }).start();
     const restored = await connections.restoreFromStorage();
     
     if (restored) {

package/src/menus/connect.js

@@ -136,7 +136,7 @@ const projectXMenu = async () => {
   const selectedPropfirm = numbered[selectedIdx];
 
   const credentials = await loginPrompt(selectedPropfirm.name);
-  const spinner = ora('Authenticating...').start();
+  const spinner = ora({ text: 'Authenticating...', color: 'yellow' }).start();
 
   try {
     const service = new ProjectXService(selectedPropfirm.key);
@@ -232,7 +232,7 @@ const rithmicMenu = async () => {
   const selectedPropfirm = numbered[selectedIdx];
 
   const credentials = await loginPrompt(selectedPropfirm.name);
-  const spinner = ora('Connecting to Rithmic...').start();
+  const spinner = ora({ text: 'Connecting to Rithmic...', color: 'yellow' }).start();
 
   try {
     const service = new RithmicService(selectedPropfirm.key);
@@ -317,7 +317,7 @@ const tradovateMenu = async () => {
   const selectedPropfirm = numbered[selectedIdx];
 
   const credentials = await loginPrompt(selectedPropfirm.name);
-  const spinner = ora('Connecting to Tradovate...').start();
+  const spinner = ora({ text: 'Connecting to Tradovate...', color: 'yellow' }).start();
 
   try {
     const service = new TradovateService(selectedPropfirm.key);

package/src/menus/dashboard.js

@@ -178,7 +178,7 @@ const handleUpdate = async () => {
       currentVersion = 'unknown';
     }
     
-    spinner = ora('Checking for updates...').start();
+    spinner = ora({ text: 'Checking for updates...', color: 'yellow' }).start();
     
     // Check latest version on npm with timeout
     spinner.text = 'Checking npm registry...';
@@ -235,7 +235,7 @@ const handleUpdate = async () => {
     }
     
     // Update via npm
-    spinner = ora(`Updating v${currentVersion} -> v${latestVersion}...`).start();
+    spinner = ora({ text: `Updating v${currentVersion} -> v${latestVersion}...`, color: 'yellow' }).start();
     
     try {
       execSync('npm install -g hedgequantx@latest 2>/dev/null', { 

package/src/pages/accounts.js

@@ -16,7 +16,7 @@ const { getLogoWidth, getColWidths, drawBoxHeader, drawBoxFooter, draw2ColHeader
  * @param {Object} service - Current service
  */
 const showAccounts = async (service) => {
-  const spinner = ora('Fetching accounts...').start();
+  const spinner = ora({ text: 'Fetching accounts...', color: 'yellow' }).start();
   const boxWidth = getLogoWidth();
   const { col1, col2 } = getColWidths(boxWidth);
 

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

@@ -249,7 +249,7 @@ const launchCopyTrading = async (config) => {
   // Connect to HQX Server
   const hqx = new HQXServerService();
   
-  const spinner = ora('Connecting to HQX Server...').start();
+  const spinner = ora({ text: 'Connecting to HQX Server...', color: 'yellow' }).start();
   
   try {
     const auth = await hqx.authenticate(lead.account.accountId.toString(), lead.propfirm || 'topstep');

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

@@ -17,7 +17,7 @@ const { AlgoUI, checkMarketStatus } = require('./ui');
  * One Account Menu - Select account and launch
  */
 const oneAccountMenu = async (service) => {
-  const spinner = ora('Fetching active accounts...').start();
+  const spinner = ora({ text: 'Fetching active accounts...', color: 'yellow' }).start();
   
   // Get ALL accounts from ALL connections
   const allAccounts = await connections.getAllAccounts();
@@ -76,7 +76,7 @@ const oneAccountMenu = async (service) => {
  * Symbol selection
  */
 const selectSymbol = async (service, account) => {
-  const spinner = ora('Loading contracts...').start();
+  const spinner = ora({ text: 'Loading contracts...', color: 'yellow' }).start();
   
   const contractsResult = await service.getContracts();
   if (!contractsResult.success) {
@@ -199,7 +199,7 @@ const launchAlgo = async (service, account, contract, config) => {
   // Connect to HQX Server
   const hqx = new HQXServerService();
   
-  const spinner = ora('Connecting to HQX Server...').start();
+  const spinner = ora({ text: 'Connecting to HQX Server...', color: 'yellow' }).start();
   
   try {
     const auth = await hqx.authenticate(account.accountId.toString(), account.propfirm || 'topstep');

package/src/pages/orders.js

@@ -16,7 +16,7 @@ const { getLogoWidth, drawBoxHeader, drawBoxFooter, drawBoxRow, drawBoxSeparator
  * @param {Object} service - Current service
  */
 const showOrders = async (service) => {
-  const spinner = ora('Fetching orders...').start();
+  const spinner = ora({ text: 'Fetching orders...', color: 'yellow' }).start();
   const boxWidth = getLogoWidth();
 
   // Get all accounts first

package/src/pages/positions.js

@@ -16,7 +16,7 @@ const { getLogoWidth, drawBoxHeader, drawBoxFooter, drawBoxRow, drawBoxSeparator
  * @param {Object} service - Current service
  */
 const showPositions = async (service) => {
-  const spinner = ora('Fetching positions...').start();
+  const spinner = ora({ text: 'Fetching positions...', color: 'yellow' }).start();
   const boxWidth = getLogoWidth();
   const innerWidth = boxWidth - 2;
 

package/src/pages/stats.js

@@ -24,7 +24,7 @@ const {
  * Show Stats Page
  */
 const showStats = async (service) => {
-  const spinner = ora('Fetching stats for all accounts...').start();
+  const spinner = ora({ text: 'Fetching stats for all accounts...', color: 'yellow' }).start();
   
   let allAccountsData = [];
   

package/src/pages/user.js

@@ -15,7 +15,7 @@ const { getLogoWidth, getColWidths, drawBoxHeader, drawBoxFooter, draw2ColHeader
  * @param {Object} service - Current service
  */
 const showUserInfo = async (service) => {
-  const spinner = ora('Fetching user info...').start();
+  const spinner = ora({ text: 'Fetching user info...', color: 'yellow' }).start();
   const boxWidth = getLogoWidth();
   const { col1, col2 } = getColWidths(boxWidth);
 

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}:`, {