hedgequantx 2.7.94 → 2.7.96

package/package.json

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

package/src/pages/accounts.js

@@ -130,13 +130,10 @@ const showAccounts = async (service) => {
       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(sep) + (acc2 ? fmtRow('P&L:', pnlColor2(pnlStr2), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
 
-      // Status - numeric 0 = Active for Rithmic
-      const getStatusDisplay = (status) => {
-        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' };
-        }
+      // Status - from Rithmic RMS API (field 154003), N/A if not available
+      const getStatusDisplay = (acc) => {
+        const status = acc.status;
+        if (status === null || status === undefined) return { text: 'N/A', color: 'gray' };
         if (typeof status === 'string') {
           const lowerStatus = status.toLowerCase();
           if (lowerStatus.includes('active') || lowerStatus.includes('open')) return { text: status, color: 'green' };
@@ -144,32 +141,28 @@ const showAccounts = async (service) => {
           if (lowerStatus.includes('halt')) return { text: status, color: 'red' };
           return { text: status, color: 'yellow' };
         }
-        return { text: '--', color: 'gray' };
+        return { text: String(status), color: 'yellow' };
       };
-      const status1 = getStatusDisplay(acc1.status);
-      const status2 = acc2 ? getStatusDisplay(acc2.status) : null;
+      const status1 = getStatusDisplay(acc1);
+      const status2 = acc2 ? getStatusDisplay(acc2) : null;
       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 - 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') {
-          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' };
-          if (lowerValue.includes('sim') || lowerValue.includes('demo')) return { text: value, color: 'gray' };
-          if (lowerValue.includes('express')) return { text: value, color: 'magenta' };
-          return { text: value, color: 'cyan' };
-        }
-        if (typeof value === 'number') {
-          return ACCOUNT_TYPE[value] || { text: `Type ${value}`, color: 'white' };
+      // Algorithm - from Rithmic RMS API (field 150142), N/A if not available
+      const getAlgorithmDisplay = (acc) => {
+        const algo = acc.algorithm;
+        if (algo === null || algo === undefined) return { text: 'N/A', color: 'gray' };
+        if (typeof algo === 'string') {
+          const lowerAlgo = algo.toLowerCase();
+          if (lowerAlgo.includes('eval')) return { text: algo, color: 'yellow' };
+          if (lowerAlgo.includes('live') || lowerAlgo.includes('funded')) return { text: algo, color: 'green' };
+          if (lowerAlgo.includes('sim') || lowerAlgo.includes('demo')) return { text: algo, color: 'gray' };
+          return { text: algo, color: 'cyan' };
         }
-        return { text: 'Live', color: 'green' };
+        return { text: String(algo), color: '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('║'));
+      const algo1 = getAlgorithmDisplay(acc1);
+      const algo2 = acc2 ? getAlgorithmDisplay(acc2) : null;
+      console.log(chalk.cyan('║') + fmtRow('Algorithm:', chalk[algo1.color](algo1.text), col1) + chalk.cyan(sep) + (acc2 ? fmtRow('Algorithm:', chalk[algo2.color](algo2.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('╣'));

package/src/services/rithmic/accounts.js

@@ -245,18 +245,16 @@ const getTradingAccounts = async (service) => {
       profitAndLoss: profitAndLoss,
       openPnL: openPnL,
       todayPnL: closedPnL,
-      // Status/Type: Rithmic API doesn't provide user-friendly values
-      // "admin only" and "Max Loss" are RMS internal values, not account status
-      // Set to null to show "--" in UI (per RULES.md - no fake data)
-      status: null,
-      type: null,
-      // Keep RMS data for reference
-      rmsStatus: rmsInfo.status || null,
-      rmsAlgorithm: rmsInfo.algorithm || null,
+      // Status from Rithmic RMS API (field 154003 - ACCOUNT_STATUS)
+      status: rmsInfo.status || null,
+      // Algorithm/Type from Rithmic RMS API (field 150142 - ALGORITHM)
+      algorithm: rmsInfo.algorithm || null,
+      // Additional RMS data from API
       lossLimit: rmsInfo.lossLimit || null,
       minAccountBalance: rmsInfo.minAccountBalance || null,
       buyLimit: rmsInfo.buyLimit || null,
       sellLimit: rmsInfo.sellLimit || null,
+      currency: rmsInfo.currency || acc.accountCurrency || null,
       platform: 'Rithmic',
       propfirm: service.propfirm.name,
     };