hedgequantx 2.7.13 → 2.7.15

package/package.json

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

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

@@ -219,8 +219,8 @@ const selectSymbol = async (service) => {
         });
       }
 
-      // Use RAW API fields: name (symbol), description (full name), exchange
-      const label = `  ${c.name} - ${c.description} (${c.exchange})`;
+      // Use RAW API fields: symbol (trading symbol), name (product name), exchange
+      const label = `  ${c.symbol} - ${c.name} (${c.exchange})`;
       options.push({ label, value: c });
     }
 

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

@@ -101,12 +101,12 @@ const selectSymbol = async (service, account) => {
   const popularPrefixes = ['ES', 'NQ', 'MES', 'MNQ', 'M2K', 'RTY', 'YM', 'MYM', 'NKD', 'GC', 'SI', 'CL'];
   
   contracts.sort((a, b) => {
-    const nameA = a.name || '';
-    const nameB = b.name || '';
+    const baseA = a.baseSymbol || a.symbol || '';
+    const baseB = b.baseSymbol || b.symbol || '';
     
-    // Check if names start with popular prefixes
-    const idxA = popularPrefixes.findIndex(p => nameA.startsWith(p));
-    const idxB = popularPrefixes.findIndex(p => nameB.startsWith(p));
+    // Check if baseSymbol matches popular prefixes
+    const idxA = popularPrefixes.findIndex(p => baseA === p || baseA.startsWith(p));
+    const idxB = popularPrefixes.findIndex(p => baseB === p || baseB.startsWith(p));
     
     // Both are popular - sort by popularity order
     if (idxA !== -1 && idxB !== -1) return idxA - idxB;
@@ -114,15 +114,15 @@ const selectSymbol = async (service, account) => {
     if (idxA !== -1) return -1;
     // Only B is popular - B first
     if (idxB !== -1) return 1;
-    // Neither - alphabetical
-    return nameA.localeCompare(nameB);
+    // Neither - alphabetical by baseSymbol
+    return baseA.localeCompare(baseB);
   });
   
   spinner.succeed(`Found ${contracts.length} contracts`);
   
-  // Display sorted contracts from API
+  // Display sorted contracts from API: symbol - name (exchange)
   const options = contracts.map(c => ({
-    label: `${c.name} - ${c.description}`,
+    label: `${c.symbol} - ${c.name} (${c.exchange})`,
     value: c
   }));
   

package/src/services/rithmic/accounts.js

@@ -222,10 +222,19 @@ const getTradingAccounts = async (service) => {
     debug(`Account ${acc.accountId} rmsInfo:`, JSON.stringify(rmsInfo));
     
     // REAL DATA FROM RITHMIC ONLY - NO DEFAULTS
-    const accountBalance = pnlData.accountBalance ? parseFloat(pnlData.accountBalance) : null;
-    const openPnL = pnlData.openPositionPnl ? parseFloat(pnlData.openPositionPnl) : null;
-    const closedPnL = pnlData.closedPositionPnl ? parseFloat(pnlData.closedPositionPnl) : null;
-    const dayPnL = pnlData.dayPnl ? parseFloat(pnlData.dayPnl) : null;
+    // Use !== undefined to handle 0 values correctly
+    const accountBalance = pnlData.accountBalance !== undefined ? parseFloat(pnlData.accountBalance) : null;
+    const openPnL = pnlData.openPositionPnl !== undefined ? parseFloat(pnlData.openPositionPnl) : null;
+    const closedPnL = pnlData.closedPositionPnl !== undefined ? parseFloat(pnlData.closedPositionPnl) : null;
+    const dayPnL = pnlData.dayPnl !== undefined ? parseFloat(pnlData.dayPnl) : null;
+
+    // Calculate P&L: prefer dayPnl, fallback to open+closed
+    let profitAndLoss = null;
+    if (dayPnL !== null) {
+      profitAndLoss = dayPnL;
+    } else if (openPnL !== null || closedPnL !== null) {
+      profitAndLoss = (openPnL || 0) + (closedPnL || 0);
+    }
 
     return {
       accountId: hashAccountId(acc.accountId),
@@ -233,11 +242,17 @@ const getTradingAccounts = async (service) => {
       accountName: acc.accountId,  // Never expose real name - only account ID
       name: acc.accountId,         // Never expose real name - only account ID
       balance: accountBalance,
-      profitAndLoss: dayPnL !== null ? dayPnL : (openPnL !== null || closedPnL !== null ? (openPnL || 0) + (closedPnL || 0) : null),
+      profitAndLoss: profitAndLoss,
       openPnL: openPnL,
       todayPnL: closedPnL,
-      status: rmsInfo.status || null,  // Real status from API
-      algorithm: rmsInfo.algorithm || null,  // Trading algorithm/type
+      // 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,
       lossLimit: rmsInfo.lossLimit || null,
       minAccountBalance: rmsInfo.minAccountBalance || null,
       buyLimit: rmsInfo.buyLimit || null,