hedgequantx 2.3.7 → 2.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "2.3.7",
+  "version": "2.3.9",
   "description": "HedgeQuantX - Prop Futures Trading CLI",
   "main": "src/app.js",
   "bin": {

package/src/pages/accounts.js

@@ -88,8 +88,8 @@ const showAccounts = async (service) => {
       const acc1 = allAccounts[i];
       const acc2 = allAccounts[i + 1];
 
-      const name1 = String(acc1.accountId || acc1.accountName || `Account #${i + 1}`);
-      const name2 = acc2 ? String(acc2.accountId || acc2.accountName || `Account #${i + 2}`) : '';
+      const name1 = String(acc1.accountName || acc1.rithmicAccountId || acc1.accountId || `Account #${i + 1}`);
+      const name2 = acc2 ? String(acc2.accountName || acc2.rithmicAccountId || acc2.accountId || `Account #${i + 2}`) : '';
 
       draw2ColHeader(name1.substring(0, col1 - 4), name2 ? name2.substring(0, col2 - 4) : '', boxWidth);
 

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

@@ -168,7 +168,7 @@ const selectAccount = async (message, accounts, excludeIdx) => {
       const acc = x.a.account;
       const balance = acc.balance !== null ? ` ($${acc.balance.toLocaleString()})` : '';
       return {
-        label: `${x.a.propfirm} - ${acc.rithmicAccountId || acc.name || acc.accountId}${balance}`,
+        label: `${x.a.propfirm} - ${acc.accountName || acc.rithmicAccountId || acc.name || acc.accountId}${balance}`,
         value: x.i,
       };
     });

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

@@ -48,8 +48,9 @@ const oneAccountMenu = async (service) => {
   spinner.succeed(`Found ${activeAccounts.length} active account(s)`);
   
   // Select account
+  // Display name priority: accountName (ProjectX) > rithmicAccountId (Rithmic) > name > accountId
   const options = activeAccounts.map(acc => ({
-    label: `${acc.rithmicAccountId || acc.name || acc.accountId} (${acc.propfirm || 'Unknown'})${acc.balance !== null ? ` - $${acc.balance.toLocaleString()}` : ''}`,
+    label: `${acc.accountName || acc.rithmicAccountId || acc.name || acc.accountId} (${acc.propfirm || 'Unknown'})${acc.balance !== null ? ` - $${acc.balance.toLocaleString()}` : ''}`,
     value: acc
   }));
   options.push({ label: '< Back', value: 'back' });

package/src/pages/orders.js

@@ -68,7 +68,7 @@ const showOrders = async (service) => {
     let allOrders = [];
     
     for (const account of allAccounts) {
-      const accName = String(account.accountId || account.accountName || 'Unknown').substring(0, 20);
+      const accName = String(account.accountName || account.rithmicAccountId || account.accountId || 'Unknown').substring(0, 20);
       spinner = ora({ text: `Fetching orders for ${accName}...`, color: 'yellow' }).start();
       
       try {
@@ -77,7 +77,7 @@ const showOrders = async (service) => {
           result.orders.forEach(order => {
             allOrders.push({ 
               ...order, 
-              accountName: account.accountId, 
+              accountName: account.accountName || account.rithmicAccountId || account.accountId, 
               propfirm: account.propfirm 
             });
           });

package/src/pages/positions.js

@@ -68,7 +68,7 @@ const showPositions = async (service) => {
     let allPositions = [];
     
     for (const account of allAccounts) {
-      const accName = String(account.accountId || account.accountName || 'Unknown').substring(0, 20);
+      const accName = String(account.accountName || account.rithmicAccountId || account.accountId || 'Unknown').substring(0, 20);
       spinner = ora({ text: `Fetching positions for ${accName}...`, color: 'yellow' }).start();
       
       try {
@@ -77,7 +77,7 @@ const showPositions = async (service) => {
           result.positions.forEach(pos => {
             allPositions.push({ 
               ...pos, 
-              accountName: account.accountId, 
+              accountName: account.accountName || account.rithmicAccountId || account.accountId, 
               propfirm: account.propfirm 
             });
           });

package/src/pages/stats.js

@@ -449,8 +449,21 @@ const showStats = async (service) => {
     };
     
     if (allTrades.length > 0) {
-      const header = ' Time      | Symbol    | Price      | P&L        | Side  ';
-      console.log(chalk.cyan('\u2551') + chalk.white(header.padEnd(innerWidth)) + chalk.cyan('\u2551'));
+      // Calculate column widths to fill the entire row
+      // Fixed columns: Time(10), Symbol(12), Price(12), P&L(12), Side(6) = 52 + separators(4*3=12) + padding(2) = 66
+      // Remaining space goes to Account column
+      const colTime = 10;
+      const colSymbol = 12;
+      const colPrice = 12;
+      const colPnl = 12;
+      const colSide = 6;
+      const separators = 15; // 5 separators " | " = 5*3
+      const fixedWidth = colTime + colSymbol + colPrice + colPnl + colSide + separators;
+      const colAccount = Math.max(10, innerWidth - fixedWidth);
+      
+      // Header
+      const header = ` ${'Time'.padEnd(colTime)}| ${'Symbol'.padEnd(colSymbol)}| ${'Price'.padEnd(colPrice)}| ${'P&L'.padEnd(colPnl)}| ${'Side'.padEnd(colSide)}| ${'Account'.padEnd(colAccount - 2)}`;
+      console.log(chalk.cyan('\u2551') + chalk.white(header) + chalk.cyan('\u2551'));
       console.log(chalk.cyan('\u2551') + chalk.gray('\u2500'.repeat(innerWidth)) + chalk.cyan('\u2551'));
       
       const recentTrades = allTrades.slice(-10).reverse();
@@ -462,22 +475,28 @@ const showStats = async (service) => {
         const price = (trade.price || 0).toFixed(2);
         const pnl = trade.profitAndLoss || trade.pnl || 0;
         const pnlText = pnl >= 0 ? `+$${pnl.toFixed(0)}` : `-$${Math.abs(pnl).toFixed(0)}`;
-        const pnlColored = pnl >= 0 ? chalk.green(pnlText.padEnd(10)) : chalk.red(pnlText.padEnd(10));
         const side = trade.side === 0 ? 'BUY' : trade.side === 1 ? 'SELL' : 'N/A';
-        const sideColored = trade.side === 0 ? chalk.green(side.padEnd(6)) : chalk.red(side.padEnd(6));
+        const accountName = (trade.accountName || 'N/A').substring(0, colAccount - 3);
         
-        const row = ` ${time.padEnd(9)} | ${symbol.padEnd(9)} | ${price.padEnd(10)} | ${pnlText.padEnd(10)} | ${side.padEnd(6)}`;
-        const coloredRow = ` ${time.padEnd(9)} | ${symbol.padEnd(9)} | ${price.padEnd(10)} | ${pnlColored} | ${sideColored}`;
+        // Build row with exact widths
+        const timeStr = time.padEnd(colTime);
+        const symbolStr = symbol.padEnd(colSymbol);
+        const priceStr = price.padEnd(colPrice);
+        const pnlStr = pnlText.padEnd(colPnl);
+        const sideStr = side.padEnd(colSide);
+        const accountStr = accountName.padEnd(colAccount - 2);
         
-        const visLen = row.length;
-        const padding = Math.max(0, innerWidth - visLen);
+        // Colored versions
+        const pnlColored = pnl >= 0 ? chalk.green(pnlStr) : chalk.red(pnlStr);
+        const sideColored = trade.side === 0 ? chalk.green(sideStr) : chalk.red(sideStr);
         
-        console.log(chalk.cyan('\u2551') + coloredRow + ' '.repeat(padding) + chalk.cyan('\u2551'));
+        const row = ` ${timeStr}| ${symbolStr}| ${priceStr}| ${pnlColored}| ${sideColored}| ${accountStr}`;
+        console.log(chalk.cyan('\u2551') + row + chalk.cyan('\u2551'));
       }
       
       if (allTrades.length > 10) {
         const moreMsg = `  ... and ${allTrades.length - 10} more trades`;
-        console.log(chalk.cyan('\u2551') + chalk.gray(moreMsg.padEnd(innerWidth)) + chalk.cyan('\u2551'));
+        console.log(chalk.cyan('\u2551') + moreMsg.padEnd(innerWidth) + chalk.cyan('\u2551'));
       }
     } else {
       const msg = connectionTypes.rithmic > 0