hedgequantx 2.7.92 → 2.7.94

package/package.json

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

package/src/app.js

@@ -199,9 +199,9 @@ const run = async () => {
           
           // Find max name length for alignment
           const maxNameLen = Math.max(...numbered.map(n => n.name.length));
-          const colWidth = 4 + 1 + maxNameLen + 2; // [##] + space + name + gap
-          const totalContentWidth = numCols * colWidth;
-          const leftMargin = Math.max(2, Math.floor((innerWidth - totalContentWidth) / 2));
+          const itemWidth = 4 + 1 + maxNameLen; // [##] + space + name
+          const gap = 3; // gap between columns
+          const totalContentWidth = (itemWidth * numCols) + (gap * (numCols - 1));
           
           // New rectangle (banner is always closed)
           console.log(chalk.cyan('╔' + '═'.repeat(innerWidth) + '╗'));
@@ -223,19 +223,22 @@ const run = async () => {
               }
             }
             
-            let line = ' '.repeat(leftMargin);
+            // Build line content
+            let content = '';
             for (let i = 0; i < lineParts.length; i++) {
               if (lineParts[i]) {
-                line += chalk.cyan(lineParts[i].num) + ' ' + chalk.white(lineParts[i].name);
+                content += chalk.cyan(lineParts[i].num) + ' ' + chalk.white(lineParts[i].name);
               } else {
-                line += ' '.repeat(4 + 1 + maxNameLen);
+                content += ' '.repeat(itemWidth);
               }
-              if (i < lineParts.length - 1) line += '  ';
+              if (i < lineParts.length - 1) content += ' '.repeat(gap);
             }
             
-            const lineLen = line.replace(/\x1b\[[0-9;]*m/g, '').length;
-            const rightPad = Math.max(0, innerWidth - lineLen);
-            console.log(chalk.cyan('║') + line + ' '.repeat(rightPad) + chalk.cyan('║'));
+            // Center the content
+            const contentLen = content.replace(/\x1b\[[0-9;]*m/g, '').length;
+            const leftPad = Math.floor((innerWidth - contentLen) / 2);
+            const rightPad = innerWidth - contentLen - leftPad;
+            console.log(chalk.cyan('║') + ' '.repeat(leftPad) + content + ' '.repeat(rightPad) + chalk.cyan('║'));
           }
           
           console.log(chalk.cyan('╠' + '─'.repeat(innerWidth) + '╣'));

package/src/pages/accounts.js

@@ -97,12 +97,20 @@ const showAccounts = async (service) => {
       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);
+      // For single account, use full width; for pairs, use 2-column layout
+      const sep = acc2 ? '│' : '║';
+      const rightCol = acc2 ? col2 : col2;
+      
+      // Header row with account name(s)
+      const h1 = centerText(name1.substring(0, col1 - 4), col1);
+      const h2 = acc2 ? centerText(name2.substring(0, col2 - 4), col2) : ' '.repeat(col2);
+      console.log(chalk.cyan('║') + chalk.cyan.bold(h1) + chalk.cyan(sep) + chalk.cyan.bold(h2) + chalk.cyan('║'));
+      console.log(chalk.cyan('╠') + chalk.cyan('─'.repeat(col1)) + chalk.cyan(acc2 ? '┼' : '┼') + chalk.cyan('─'.repeat(col2)) + chalk.cyan('╣'));
 
       // PropFirm
       const pf1 = chalk.magenta(acc1.propfirm || 'Unknown');
       const pf2 = acc2 ? chalk.magenta(acc2.propfirm || 'Unknown') : '';
-      console.log(chalk.cyan('║') + fmtRow('PropFirm:', pf1, col1) + chalk.cyan('│') + (acc2 ? fmtRow('PropFirm:', pf2, col2) : ' '.repeat(col2)) + chalk.cyan('║'));
+      console.log(chalk.cyan('║') + fmtRow('PropFirm:', pf1, col1) + chalk.cyan(sep) + (acc2 ? fmtRow('PropFirm:', pf2, col2) : ' '.repeat(col2)) + chalk.cyan('║'));
 
       // Balance
       const bal1 = acc1.balance;
@@ -111,7 +119,7 @@ const showAccounts = async (service) => {
       const balStr2 = bal2 !== null && bal2 !== undefined ? '$' + Number(bal2).toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2}) : '--';
       const balColor1 = bal1 === null || bal1 === undefined ? chalk.gray : (bal1 >= 0 ? chalk.green : chalk.red);
       const balColor2 = bal2 === null || bal2 === undefined ? chalk.gray : (bal2 >= 0 ? chalk.green : chalk.red);
-      console.log(chalk.cyan('║') + fmtRow('Balance:', balColor1(balStr1), col1) + chalk.cyan('│') + (acc2 ? fmtRow('Balance:', balColor2(balStr2), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
+      console.log(chalk.cyan('║') + fmtRow('Balance:', balColor1(balStr1), col1) + chalk.cyan(sep) + (acc2 ? fmtRow('Balance:', balColor2(balStr2), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
 
       // P&L
       const pnl1 = acc1.profitAndLoss;
@@ -120,32 +128,33 @@ const showAccounts = async (service) => {
       const pnlStr2 = pnl2 !== null && pnl2 !== undefined ? (pnl2 >= 0 ? '+' : '') + '$' + Number(pnl2).toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2}) : '--';
       const pnlColor1 = pnl1 === null || pnl1 === undefined ? chalk.gray : (pnl1 >= 0 ? chalk.green : chalk.red);
       const pnlColor2 = pnl2 === null || pnl2 === undefined ? chalk.gray : (pnl2 >= 0 ? chalk.green : chalk.red);
-      console.log(chalk.cyan('║') + fmtRow('P&L:', pnlColor1(pnlStr1), col1) + chalk.cyan('│') + (acc2 ? fmtRow('P&L:', pnlColor2(pnlStr2), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
+      console.log(chalk.cyan('║') + fmtRow('P&L:', pnlColor1(pnlStr1), col1) + chalk.cyan(sep) + (acc2 ? fmtRow('P&L:', pnlColor2(pnlStr2), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
 
-      // Status - handle both string from API and numeric lookup
+      // Status - numeric 0 = Active for Rithmic
       const getStatusDisplay = (status) => {
-        if (!status && status !== 0) return { text: '--', color: 'gray' };
+        if (status === null || status === undefined) return { text: '--', color: 'gray' };
+        if (status === 0) return { text: 'Active', color: 'green' };
+        if (typeof status === 'number') {
+          return ACCOUNT_STATUS[status] || { text: `Status ${status}`, color: 'yellow' };
+        }
         if (typeof status === 'string') {
-          // Direct string from Rithmic API (e.g., "Active", "Disabled")
           const lowerStatus = status.toLowerCase();
           if (lowerStatus.includes('active') || lowerStatus.includes('open')) return { text: status, color: 'green' };
           if (lowerStatus.includes('disabled') || lowerStatus.includes('closed')) return { text: status, color: 'red' };
           if (lowerStatus.includes('halt')) return { text: status, color: 'red' };
           return { text: status, color: 'yellow' };
         }
-        return ACCOUNT_STATUS[status] || { text: 'Unknown', color: 'gray' };
+        return { text: '--', color: 'gray' };
       };
       const status1 = getStatusDisplay(acc1.status);
       const status2 = acc2 ? getStatusDisplay(acc2.status) : null;
-      console.log(chalk.cyan('║') + fmtRow('Status:', chalk[status1.color](status1.text), col1) + chalk.cyan('│') + (acc2 ? fmtRow('Status:', chalk[status2.color](status2.text), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
+      console.log(chalk.cyan('║') + fmtRow('Status:', chalk[status1.color](status1.text), col1) + chalk.cyan(sep) + (acc2 ? fmtRow('Status:', chalk[status2.color](status2.text), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
 
-      // Type/Algorithm - handle both string from API and numeric lookup
-      const getTypeDisplay = (type, algorithm) => {
-        // Prefer algorithm from RMS info if available
-        const value = algorithm || type;
-        if (!value && value !== 0) return { text: '--', color: 'gray' };
+      // Type - from accountType or algorithm field
+      const getTypeDisplay = (acc) => {
+        const value = acc.algorithm || acc.accountType || acc.type;
+        if (value === null || value === undefined) return { text: 'Live', color: 'green' }; // Default for Rithmic
         if (typeof value === 'string') {
-          // Direct string from Rithmic API
           const lowerValue = value.toLowerCase();
           if (lowerValue.includes('eval')) return { text: value, color: 'yellow' };
           if (lowerValue.includes('live') || lowerValue.includes('funded')) return { text: value, color: 'green' };
@@ -153,11 +162,14 @@ const showAccounts = async (service) => {
           if (lowerValue.includes('express')) return { text: value, color: 'magenta' };
           return { text: value, color: 'cyan' };
         }
-        return ACCOUNT_TYPE[value] || { text: 'Unknown', color: 'white' };
+        if (typeof value === 'number') {
+          return ACCOUNT_TYPE[value] || { text: `Type ${value}`, color: 'white' };
+        }
+        return { text: 'Live', color: 'green' };
       };
-      const type1 = getTypeDisplay(acc1.type, acc1.algorithm);
-      const type2 = acc2 ? getTypeDisplay(acc2.type, acc2.algorithm) : null;
-      console.log(chalk.cyan('║') + fmtRow('Type:', chalk[type1.color](type1.text), col1) + chalk.cyan('│') + (acc2 ? fmtRow('Type:', chalk[type2.color](type2.text), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
+      const type1 = getTypeDisplay(acc1);
+      const type2 = acc2 ? getTypeDisplay(acc2) : null;
+      console.log(chalk.cyan('║') + fmtRow('Type:', chalk[type1.color](type1.text), col1) + chalk.cyan(sep) + (acc2 ? fmtRow('Type:', chalk[type2.color](type2.text), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
 
       if (i + 2 < allAccounts.length) {
         console.log(chalk.cyan('╠') + chalk.cyan('═'.repeat(col1)) + chalk.cyan('╪') + chalk.cyan('═'.repeat(col2)) + chalk.cyan('╣'));