hedgequantx 2.9.144 → 2.9.145

package/package.json

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

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

@@ -358,45 +358,7 @@ class SmartLogsEngine {
     
     const t = [];
     
-    // === BULLISH FLOW ===
-    if (isBull) {
-      t.push({ type: 'bullish', message: `${S} ${P} heavy paper on the bid | Size lifting offers ${D} | Tape running` });
-      t.push({ type: 'bullish', message: `${SL} bid refreshing at ${P} | ${OFI} | Buyers in control` });
-      t.push({ type: 'bullish', message: `Large prints on ${S} ${P} | ${VPIN} toxic | Institutions lifting` });
-      t.push({ type: 'bullish', message: `${S} squeeze building at ${P} | Shorts underwater | ${D} accelerating` });
-      t.push({ type: 'bullish', message: `Block buyer ${SL} ${P} | ${IMB} buy tape | Iceberg absorbing supply` });
-      t.push({ type: 'bullish', message: `${S} momentum ignition at ${P} | DOM stacked bid | Offers lifted` });
-      t.push({ type: 'bullish', message: `Aggressive buying ${S} at ${P} | ${ZS} | Sellers capitulating` });
-      t.push({ type: 'bullish', message: `${S} ${P} bid wall holding | ${D} | Passive offers exhausted` });
-      t.push({ type: 'bullish', message: `Dark pool bid ${SL} ${P} | ${VPIN} | Smart money accumulating` });
-      t.push({ type: 'bullish', message: `${S} footprint bullish at ${P} | ${tps} tps | Institutional absorption` });
-    }
-    // === BEARISH FLOW ===
-    else if (isBear) {
-      t.push({ type: 'bearish', message: `${S} ${P} heavy paper on offer | Size hitting bids ${D} | Tape dumping` });
-      t.push({ type: 'bearish', message: `${SL} offer refreshing at ${P} | ${OFI} | Sellers in control` });
-      t.push({ type: 'bearish', message: `Large prints selling ${S} ${P} | ${VPIN} toxic | Institutions hitting` });
-      t.push({ type: 'bearish', message: `${S} breakdown at ${P} | Longs underwater | ${D} accelerating` });
-      t.push({ type: 'bearish', message: `Block seller ${SL} ${P} | ${IMB} sell tape | Iceberg absorbing demand` });
-      t.push({ type: 'bearish', message: `${S} momentum breakdown at ${P} | DOM stacked offer | Bids hit` });
-      t.push({ type: 'bearish', message: `Aggressive selling ${S} at ${P} | ${ZS} | Buyers capitulating` });
-      t.push({ type: 'bearish', message: `${S} ${P} offer wall capping | ${D} | Passive bids exhausted` });
-      t.push({ type: 'bearish', message: `Dark pool offer ${SL} ${P} | ${VPIN} | Smart money distributing` });
-      t.push({ type: 'bearish', message: `${S} footprint bearish at ${P} | ${tps} tps | Institutional distribution` });
-    }
-    // === NEUTRAL/CHOP ===
-    else {
-      t.push({ type: 'analysis', message: `${S} ${P} two-way paper | ${D} flat | Locals making markets` });
-      t.push({ type: 'analysis', message: `${SL} chopping at ${P} | Spread ${spd}t | No directional flow` });
-      t.push({ type: 'analysis', message: `${S} balanced at ${P} | ${VPIN} | Waiting for size to show` });
-      t.push({ type: 'analysis', message: `Range trade ${S} ${P} | Book symmetric | Mean reversion active` });
-      t.push({ type: 'analysis', message: `${S} consolidating at ${P} | ${ZS} | No edge either side` });
-      t.push({ type: 'analysis', message: `Quiet tape ${SL} ${P} | ${tps} tps | Institutions on sidelines` });
-      t.push({ type: 'analysis', message: `${S} ${P} fair value auction | ${D} | Algos scalping spread` });
-      t.push({ type: 'analysis', message: `Flow balanced ${S} at ${P} | ${OFI} | Awaiting catalyst` });
-    }
-    
-    // === HQX-2B: Liquidity Sweep ===
+    // === HQX-2B: Liquidity Sweep Strategy ===
     if (isHQX2B) {
       if (phase === 'ready' && zones > 0) {
         t.push({ type: 'signal', message: `${chalk.green.bold('SWEEP')} ${S} ${P} | ${zones} stops triggered | Reversal confirmed` });
@@ -406,12 +368,24 @@ class SmartLogsEngine {
         t.push({ type: 'analysis', message: `${S} ${P} approaching liquidity | ${zones} clusters mapped | Sweep imminent` });
         t.push({ type: 'analysis', message: `Stop hunt setup ${SL} ${P} | ${swings} swings | Watching penetration` });
         t.push({ type: 'analysis', message: `${S} zone test at ${P} | ${zones} targets | Monitoring rejection` });
+      } else if (isBull) {
+        t.push({ type: 'bullish', message: `${S} ${P} bid absorption | ${D} | Stops below being hunted` });
+        t.push({ type: 'bullish', message: `${SL} liquidity building at ${P} | Sweep setup forming | ${swings} pivots` });
+        t.push({ type: 'bullish', message: `Institutional bid ${S} ${P} | ${OFI} | Retail shorts trapped` });
+        t.push({ type: 'bullish', message: `${S} false breakdown at ${P} | ${D} | Smart money buying dip` });
+      } else if (isBear) {
+        t.push({ type: 'bearish', message: `${S} ${P} offer absorption | ${D} | Stops above being hunted` });
+        t.push({ type: 'bearish', message: `${SL} liquidity building at ${P} | Sweep setup forming | ${swings} pivots` });
+        t.push({ type: 'bearish', message: `Institutional offer ${S} ${P} | ${OFI} | Retail longs trapped` });
+        t.push({ type: 'bearish', message: `${S} false breakout at ${P} | ${D} | Smart money selling rally` });
       } else {
-        t.push({ type: 'system', message: `Mapping ${S} structure at ${P} | ${bars} bars | ${swings} swings | Zones` });
-        t.push({ type: 'system', message: `${SL} topology at ${P} | ${tickCount} ticks | Detecting clusters` });
+        t.push({ type: 'system', message: `Mapping ${S} structure at ${P} | ${bars} bars | ${swings} swings` });
+        t.push({ type: 'system', message: `${SL} scanning zones at ${P} | ${tickCount} ticks | Detecting clusters` });
+        t.push({ type: 'analysis', message: `${S} ${P} consolidating | ${D} | Liquidity pooling at extremes` });
+        t.push({ type: 'analysis', message: `${SL} range at ${P} | Stops accumulating | Sweep pending` });
       }
     }
-    // === ULTRA-SCALPING: Quant/Stats ===
+    // === ULTRA-SCALPING: Quant/Stats Strategy ===
     else {
       if (phase === 'ready') {
         t.push({ type: 'signal', message: `${chalk.green.bold('EDGE')} ${S} ${P} | ${ZS} breach | ${VPIN} | Execute` });
@@ -421,9 +395,19 @@ class SmartLogsEngine {
         t.push({ type: 'analysis', message: `${S} ${P} factors building | ${ZS} | Threshold proximity` });
         t.push({ type: 'analysis', message: `${SL} edge forming at ${P} | ${VPIN} | Monitoring` });
         t.push({ type: 'analysis', message: `Statistical setup ${S} ${P} | ${OFI} | Alignment ${IMB}` });
+      } else if (isBull) {
+        t.push({ type: 'bullish', message: `${S} ${P} heavy paper bid | ${D} | ${VPIN} rising` });
+        t.push({ type: 'bullish', message: `${SL} ${P} ${ZS} bullish | ${OFI} | Mean reversion long` });
+        t.push({ type: 'bullish', message: `${S} momentum ${P} | ${IMB} buy | Quant signal building` });
+      } else if (isBear) {
+        t.push({ type: 'bearish', message: `${S} ${P} heavy paper offer | ${D} | ${VPIN} rising` });
+        t.push({ type: 'bearish', message: `${SL} ${P} ${ZS} bearish | ${OFI} | Mean reversion short` });
+        t.push({ type: 'bearish', message: `${S} momentum ${P} | ${IMB} sell | Quant signal building` });
       } else {
         t.push({ type: 'system', message: `Calibrating ${S} models at ${P} | ${bars} bars | Computing factors` });
         t.push({ type: 'system', message: `${SL} tick analysis at ${P} | ${tickCount} samples | ${tps} tps` });
+        t.push({ type: 'analysis', message: `${S} ${P} neutral | ${ZS} | ${VPIN} | Awaiting edge` });
+        t.push({ type: 'analysis', message: `${SL} range at ${P} | ${D} | Statistical mean reversion` });
       }
     }
     

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

@@ -286,16 +286,22 @@ const executeMultiSymbol = async ({ service, account, contracts, config, strateg
   let startingPnL = null;
   const pollPnL = async () => {
     try {
-      // Get P&L from cache (no API call)
       const accId = account.rithmicAccountId || account.accountId;
-      const pnlData = service.getAccountPnL ? service.getAccountPnL(accId) : null;
       
-      if (pnlData && pnlData.pnl !== null) {
+      // Get P&L from cache (sync for RithmicService, async for BrokerClient)
+      let pnlData = null;
+      if (service.getAccountPnL) {
+        const result = service.getAccountPnL(accId);
+        pnlData = result && result.then ? await result : result; // Handle both sync/async
+      }
+      
+      if (pnlData && pnlData.pnl !== null && pnlData.pnl !== undefined && !isNaN(pnlData.pnl)) {
         if (startingPnL === null) startingPnL = pnlData.pnl;
-        globalStats.pnl = pnlData.pnl - startingPnL;
+        const newPnl = pnlData.pnl - startingPnL;
+        if (!isNaN(newPnl)) globalStats.pnl = newPnl;
       }
       
-      // Check positions (less frequent - every 10s instead of 2s)
+      // Check positions (less frequent - every 10s)
       if (Date.now() % 10000 < 2000) {
         const posResult = await service.getPositions(accId);
         if (posResult.success && posResult.positions) {
@@ -306,13 +312,15 @@ const executeMultiSymbol = async ({ service, account, contracts, config, strateg
         }
       }
       
-      // Risk checks
-      if (globalStats.pnl >= dailyTarget) {
-        stopReason = 'target'; running = false;
-        ui.addLog('fill_win', `TARGET REACHED! +$${globalStats.pnl.toFixed(2)}`);
-      } else if (globalStats.pnl <= -maxRisk) {
-        stopReason = 'risk'; running = false;
-        ui.addLog('fill_loss', `MAX RISK! -$${Math.abs(globalStats.pnl).toFixed(2)}`);
+      // Risk checks (only if pnl is valid)
+      if (!isNaN(globalStats.pnl)) {
+        if (globalStats.pnl >= dailyTarget) {
+          stopReason = 'target'; running = false;
+          ui.addLog('fill_win', `TARGET REACHED! +$${globalStats.pnl.toFixed(2)}`);
+        } else if (globalStats.pnl <= -maxRisk) {
+          stopReason = 'risk'; running = false;
+          ui.addLog('fill_loss', `MAX RISK! -$${Math.abs(globalStats.pnl).toFixed(2)}`);
+        }
       }
     } catch (e) { /* silent */ }
   };
@@ -321,23 +329,29 @@ const executeMultiSymbol = async ({ service, account, contracts, config, strateg
   const pnlInterval = setInterval(() => { if (running) pollPnL(); }, 2000);
   pollPnL();
   
-  // Live analysis logs every 1 second (rotates through symbols)
+  // Live analysis logs every 5 seconds (rotates through symbols with data)
   let liveLogSymbolIndex = 0;
-  let lastLiveLogSecond = 0;
+  let lastLiveLogTime = 0;
   const liveLogInterval = setInterval(() => {
     if (!running) return;
-    const now = Math.floor(Date.now() / 1000);
-    if (now === lastLiveLogSecond) return;
-    lastLiveLogSecond = now;
+    const now = Date.now();
+    if (now - lastLiveLogTime < 5000) return; // Every 5 seconds
+    lastLiveLogTime = now;
     
-    // Get a symbol to log (rotate through all)
+    // Get symbols with tick data (skip symbols without data)
     const symbolCodes = Array.from(symbolData.keys());
     if (symbolCodes.length === 0) return;
     
-    const symbolCode = symbolCodes[liveLogSymbolIndex % symbolCodes.length];
-    liveLogSymbolIndex++;
+    // Find next symbol with data
+    let attempts = 0;
+    let symbolCode, data;
+    do {
+      symbolCode = symbolCodes[liveLogSymbolIndex % symbolCodes.length];
+      liveLogSymbolIndex++;
+      data = symbolData.get(symbolCode);
+      attempts++;
+    } while ((!data || data.stats.tickCount === 0) && attempts < symbolCodes.length);
     
-    const data = symbolData.get(symbolCode);
     if (!data) return;
     
     const state = data.strategy.getAnalysisState?.(symbolCode, data.stats.lastPrice);
@@ -353,10 +367,13 @@ const executeMultiSymbol = async ({ service, account, contracts, config, strateg
       tickCount: data.stats.tickCount || 0,
     };
     
-    logsEngine.setSymbol(symbolCode);
-    const log = logsEngine.getLog(logState);
-    ui.addLog(log.type, log.message);
-    if (log.logToSession) sessionLogger.log('ANALYSIS', `[${symbolCode}] ${log.message}`);
+    // Only log if we have meaningful data
+    if (logState.price > 0 || logState.tickCount > 0) {
+      logsEngine.setSymbol(symbolCode);
+      const log = logsEngine.getLog(logState);
+      ui.addLog(log.type, log.message);
+      if (log.logToSession) sessionLogger.log('ANALYSIS', `[${symbolCode}] ${log.message}`);
+    }
   }, 1000);
   
   // Key handler

package/src/pages/algo/ui.js

@@ -188,9 +188,9 @@ class AlgoUI {
     // Row 1: Account | Symbol(s)
     const accountName = String(stats.accountName || 'N/A').substring(0, 40);
     const isMultiSymbol = stats.symbolCount && stats.symbolCount > 1;
-    const symbolDisplay = isMultiSymbol 
-      ? `${stats.symbolCount} symbols` 
-      : String(stats.symbol || stats.symbols || 'N/A').substring(0, 35);
+    // Show actual symbols list, truncate if too long
+    const symbolsStr = String(stats.symbols || stats.symbol || 'N/A');
+    const symbolDisplay = symbolsStr.length > 35 ? symbolsStr.substring(0, 32) + '...' : symbolsStr;
     const r1c1 = buildCell('Account', accountName, chalk.cyan, colL);
     const r1c2 = buildCell(isMultiSymbol ? 'Symbols' : 'Symbol', symbolDisplay, chalk.yellow, colR);
     row(r1c1.padded, r1c2.padded);

package/src/services/rithmic-broker/client.js

@@ -232,13 +232,13 @@ class RithmicBrokerClient extends EventEmitter {
    */
   getRithmicCredentials() {
     // Sync call - return cached credentials
-    // For async, use _request('getRithmicCredentials')
-    return this.credentials ? {
+    if (!this.credentials) return null;
+    return {
       userId: this.credentials.username,
       password: this.credentials.password,
       systemName: this.propfirm?.systemName || 'Apex',
-      gateway: 'wss://rituz.rithmic.com:443',
-    } : null;
+      gateway: 'wss://rprotocol.rithmic.com:443',
+    };
   }
 
   /**