hedgequantx 2.9.142 → 2.9.143

package/package.json

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

package/src/lib/smart-logs-engine.js

@@ -214,15 +214,25 @@ const SYMBOLS = {
   // S&P
   ES: { name: 'ES', floor: 'Spooz', asset: 'index', slang: 'the Spooz' },
   MES: { name: 'MES', floor: 'Micro S&P', asset: 'index', slang: 'micro spooz' },
+  // Dow
+  YM: { name: 'YM', floor: 'Dow', asset: 'index', slang: 'the Dow' },
+  MYM: { name: 'MYM', floor: 'Micro Dow', asset: 'index', slang: 'mini Dow' },
   // Crude
   CL: { name: 'CL', floor: 'Crude', asset: 'energy', slang: 'oil' },
   MCL: { name: 'MCL', floor: 'Micro Crude', asset: 'energy', slang: 'micro crude' },
   // Gold
   GC: { name: 'GC', floor: 'Gold', asset: 'metals', slang: 'yellow metal' },
   MGC: { name: 'MGC', floor: 'Micro Gold', asset: 'metals', slang: 'micro gold' },
+  '1OZ': { name: '1OZ', floor: 'Micro Gold', asset: 'metals', slang: '1oz gold' },
+  // Silver
+  SI: { name: 'SI', floor: 'Silver', asset: 'metals', slang: 'silver' },
+  SIL: { name: 'SIL', floor: 'Micro Silver', asset: 'metals', slang: 'micro silver' },
   // Bonds
   ZB: { name: 'ZB', floor: 'Bonds', asset: 'rates', slang: 'long bond' },
   ZN: { name: 'ZN', floor: '10Y', asset: 'rates', slang: 'tens' },
+  // Russell
+  RTY: { name: 'RTY', floor: 'Russell', asset: 'index', slang: 'small caps' },
+  M2K: { name: 'M2K', floor: 'Micro Russell', asset: 'index', slang: 'micro russell' },
   // Default
   DEFAULT: { name: 'Contract', floor: 'Futures', asset: 'futures', slang: 'contract' }
 };

package/src/pages/algo/algo-executor.js

@@ -362,7 +362,11 @@ const executeAlgo = async ({ service, account, contract, config, strategy: strat
     try {
       const accountResult = await service.getTradingAccounts();
       if (accountResult.success && accountResult.accounts) {
-        const acc = accountResult.accounts.find(a => a.accountId === account.accountId);
+        // Match by rithmicAccountId (original) or accountId (hashed)
+        const accId = account.rithmicAccountId || account.accountId;
+        const acc = accountResult.accounts.find(a => 
+          a.rithmicAccountId === accId || a.accountId === account.accountId
+        );
         if (acc && acc.profitAndLoss !== undefined) {
           if (startingPnL === null) startingPnL = acc.profitAndLoss;
           stats.pnl = acc.profitAndLoss - startingPnL;
@@ -370,7 +374,7 @@ const executeAlgo = async ({ service, account, contract, config, strategy: strat
         }
       }
       
-      const posResult = await service.getPositions(account.accountId);
+      const posResult = await service.getPositions(account.rithmicAccountId || account.accountId);
       if (posResult.success && posResult.positions) {
         const pos = posResult.positions.find(p => {
           const sym = p.contractId || p.symbol || '';

package/src/pages/algo/multi-symbol-executor.js

@@ -287,15 +287,24 @@ const executeMultiSymbol = async ({ service, account, contracts, config, strateg
     try {
       const accountResult = await service.getTradingAccounts();
       if (accountResult.success && accountResult.accounts) {
-        const acc = accountResult.accounts.find(a => a.accountId === account.accountId);
+        // Match by rithmicAccountId (original) or accountId (hashed)
+        const accId = account.rithmicAccountId || account.accountId;
+        const acc = accountResult.accounts.find(a => 
+          a.rithmicAccountId === accId || a.accountId === account.accountId
+        );
         if (acc && acc.profitAndLoss !== undefined) {
-          // For multi-symbol, we track total P&L
-          globalStats.pnl = acc.profitAndLoss;
+          // Track session P&L (relative to start)
+          const data = symbolData.values().next().value;
+          if (data && data.startingPnL === null) {
+            data.startingPnL = acc.profitAndLoss;
+          }
+          const startPnL = data?.startingPnL || 0;
+          globalStats.pnl = acc.profitAndLoss - startPnL;
         }
       }
       
       // Check positions per symbol
-      const posResult = await service.getPositions(account.accountId);
+      const posResult = await service.getPositions(account.rithmicAccountId || account.accountId);
       if (posResult.success && posResult.positions) {
         for (const [sym, data] of symbolData) {
           const pos = posResult.positions.find(p => (p.contractId || p.symbol || '').includes(sym));