hedgequantx 2.6.48 → 2.6.50

package/package.json

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

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

@@ -64,6 +64,8 @@ class CopyEngine {
     this.pollCount = 0;
     this.orderCount = 0;
     this.failedOrders = 0;
+    this.lastLogTime = 0;
+    this.positionEntryTime = null;
     
     // Retry configuration
     this.maxRetries = 3;
@@ -212,6 +214,9 @@ class CopyEngine {
     const size = Math.abs(position.quantity);
     const entry = position.averagePrice || 0;
     
+    // Track entry time for smart logs
+    this.positionEntryTime = Date.now();
+    
     algoLogger.positionOpened(this.ui, displaySymbol, side, size, entry);
     
     // Feed to AI supervisor
@@ -282,6 +287,9 @@ class CopyEngine {
     const displaySymbol = position.symbol || this.symbol.name;
     const size = Math.abs(position.quantity);
     
+    // Reset entry time
+    this.positionEntryTime = null;
+    
     algoLogger.positionClosed(this.ui, displaySymbol, side, size, exitPrice, pnl);
     
     // Feed to AI supervisor
@@ -432,6 +440,28 @@ class CopyEngine {
       
       this.pollCount++;
       
+      // Smart logs every second - non-repetitive status updates
+      const now = Date.now();
+      if (now - this.lastLogTime > 1000) {
+        const smartLogs = require('./smart-logs');
+        
+        if (this.leadPositions.size > 0) {
+          // In position - show position status
+          for (const [key, pos] of this.leadPositions) {
+            const side = pos.quantity > 0 ? 'LONG' : 'SHORT';
+            const unrealizedPnl = pos.profitAndLoss || 0;
+            const holdTime = Math.floor((now - (this.positionEntryTime || now)) / 1000);
+            const posLog = smartLogs.getPositionUpdateLog(side, Math.abs(pos.quantity), unrealizedPnl, pos.averagePrice || 0, pos.averagePrice || 0, holdTime);
+            algoLogger.trade(this.ui, posLog.message, posLog.details);
+          }
+        } else {
+          // No position - show scanning status
+          const scanLog = smartLogs.getScanningLog(true);
+          algoLogger.info(this.ui, scanLog.message, `poll #${this.pollCount} | ${pollTime}ms`);
+        }
+        this.lastLogTime = now;
+      }
+      
     } catch (err) {
       log.warn('Poll error', { error: err.message });
     }

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

@@ -430,10 +430,18 @@ const launchAlgo = async (service, account, contract, config) => {
     if (pos.symbol !== symbolName && !pos.symbol?.includes(symbolName.replace(/[A-Z]\d+$/, ''))) return;
     
     // Update position info (like R Trader Positions panel)
+    const wasFlat = stats.position === 0;
     stats.position = pos.quantity || 0;
     stats.entryPrice = pos.averagePrice || 0;
     currentPosition = pos.quantity || 0;
     
+    // Track entry time when opening a new position
+    if (wasFlat && stats.position !== 0) {
+      stats.entryTime = Date.now();
+    } else if (stats.position === 0) {
+      stats.entryTime = null;
+    }
+    
     // CRITICAL: Update Open P&L from instrument-level data (real-time, same as R Trader)
     // pos.openPnl comes from INSTRUMENT_PNL_UPDATE (450) - this is the unrealized P&L
     if (pos.openPnl !== undefined && pos.openPnl !== null) {
@@ -716,25 +724,43 @@ const launchAlgo = async (service, account, contract, config) => {
     
     stats.latency = Date.now() - latencyStart;
     
-    // Heartbeat every 15 seconds - show strategy model values
-    if (Date.now() - lastHeartbeat > 15000) {
-      // Try to get model values from strategy
+    // Smart logs every 1 second - non-repetitive, varied messages
+    const now = Date.now();
+    if (now - lastHeartbeat > 1000) {
       const modelValues = strategy.getModelValues?.() || strategy.getModelValues?.(contractId) || null;
       
       if (modelValues && modelValues.ofi !== undefined) {
-        // HFT Strategy - pure tick values
-        const ofi = (modelValues.ofi || 0).toFixed(2);
+        const ofi = modelValues.ofi || 0;
         const delta = modelValues.delta || 0;
-        const zscore = (modelValues.zscore || 0).toFixed(2);
-        const mom = (modelValues.momentum || 0).toFixed(1);
-        const signals = modelValues.signalCount || 0;
-        const deltaStr = delta >= 0 ? `+${delta}` : `${delta}`;
-        algoLogger.info(ui, strategyName, `OFI=${ofi} Z=${zscore} Mom=${mom} Δ=${deltaStr} | ${tps} t/15s | ${tickCount} total`);
+        const zscore = modelValues.zscore || 0;
+        const mom = modelValues.momentum || 0;
+        
+        // Get smart varied log based on market state
+        const smartLogs = require('./smart-logs');
+        const stateLog = smartLogs.getMarketStateLog(ofi, zscore, mom, delta);
+        
+        if (currentPosition !== 0) {
+          // In position - show position status with varied messages
+          const side = currentPosition > 0 ? 'LONG' : 'SHORT';
+          const unrealizedPnl = stats.openPnl || 0;
+          const holdTime = Math.floor((now - (stats.entryTime || now)) / 1000);
+          const posLog = smartLogs.getPositionUpdateLog(side, Math.abs(currentPosition), unrealizedPnl, stats.entryPrice, tickData.price, holdTime);
+          ui.addLog('trade', `${posLog.message} - ${posLog.details}`);
+        } else {
+          // Not in position - show market state with varied messages
+          if (stateLog.details) {
+            ui.addLog('analysis', `${stateLog.message} - ${stateLog.details}`);
+          } else {
+            ui.addLog('info', stateLog.message);
+          }
+        }
       } else {
-        // Fallback
-        algoLogger.info(ui, 'SCANNING', `${tps} ticks/15s | ${tickCount} total | price=${tickData.price}`);
+        // Waiting for data
+        const smartLogs = require('./smart-logs');
+        const scanLog = smartLogs.getScanningLog(true);
+        ui.addLog('info', `${scanLog.message} ${tps} ticks/s`);
       }
-      lastHeartbeat = Date.now();
+      lastHeartbeat = now;
       tps = 0;
     }
   });

package/src/pages/algo/smart-logs.js

@@ -0,0 +1,394 @@
+/**
+ * =============================================================================
+ * Smart Logging System - Non-repetitive, contextual, varied messages
+ * =============================================================================
+ * Copied from HQX-TG smart-logs.ts
+ * - Uses message pools to avoid repetition
+ * - Tracks recent messages to ensure variety
+ * - Provides market-context-aware messages
+ */
+
+'use strict';
+
+// Track recently used messages to avoid repetition
+const recentMessages = new Map();
+const MAX_RECENT = 5;
+
+/**
+ * Get a message from a pool, avoiding recent ones
+ */
+function getVariedMessage(category, pool, defaultMsg) {
+  const recent = recentMessages.get(category) || [];
+
+  // Filter out recently used messages
+  const available = pool.filter(msg => !recent.includes(msg));
+
+  // If all messages were recently used, reset
+  if (available.length === 0) {
+    recentMessages.set(category, []);
+    return pool[Math.floor(Math.random() * pool.length)] || defaultMsg;
+  }
+
+  // Pick a random available message
+  const chosen = available[Math.floor(Math.random() * available.length)] || defaultMsg;
+
+  // Track it
+  recent.push(chosen);
+  if (recent.length > MAX_RECENT) recent.shift();
+  recentMessages.set(category, recent);
+
+  return chosen;
+}
+
+// =============================================================================
+// MESSAGE POOLS - Market Flow
+// =============================================================================
+
+const LONG_BIAS_MESSAGES = [
+  'Bullish bias detected',
+  'Buyers in control',
+  'Long-side pressure',
+  'Bid accumulation',
+  'Buy programs active',
+];
+
+const SHORT_BIAS_MESSAGES = [
+  'Bearish bias detected',
+  'Sellers in control',
+  'Short-side pressure',
+  'Offer distribution',
+  'Sell programs active',
+];
+
+const FLAT_BIAS_MESSAGES = [
+  'Market balanced',
+  'Two-way flow',
+  'Consolidation mode',
+  'No clear direction',
+  'Mixed signals',
+];
+
+// =============================================================================
+// MESSAGE POOLS - Trading Events
+// =============================================================================
+
+const SIGNAL_LONG_MESSAGES = [
+  'Buy signal generated',
+  'Long opportunity detected',
+  'Bullish setup confirmed',
+  'Entry signal: LONG',
+  'Buy zone activated',
+];
+
+const SIGNAL_SHORT_MESSAGES = [
+  'Sell signal generated',
+  'Short opportunity detected',
+  'Bearish setup confirmed',
+  'Entry signal: SHORT',
+  'Sell zone activated',
+];
+
+const ENTRY_LONG_MESSAGES = [
+  'Long position opened',
+  'Buy order filled',
+  'Entered long',
+  'Long initiated',
+  'Position: LONG',
+];
+
+const ENTRY_SHORT_MESSAGES = [
+  'Short position opened',
+  'Sell order filled',
+  'Entered short',
+  'Short initiated',
+  'Position: SHORT',
+];
+
+const EXIT_PROFIT_MESSAGES = [
+  'Target reached',
+  'Profit taken',
+  'Winner closed',
+  'TP hit',
+  'Profit locked',
+];
+
+const EXIT_LOSS_MESSAGES = [
+  'Stop triggered',
+  'Loss taken',
+  'Loser closed',
+  'SL hit',
+  'Risk contained',
+];
+
+// =============================================================================
+// MESSAGE POOLS - Analysis
+// =============================================================================
+
+const MOMENTUM_UP_MESSAGES = [
+  'Momentum building up',
+  'Price accelerating',
+  'Bullish momentum',
+  'Upward thrust',
+  'Buying momentum',
+];
+
+const MOMENTUM_DOWN_MESSAGES = [
+  'Momentum building down',
+  'Price declining',
+  'Bearish momentum',
+  'Downward thrust',
+  'Selling momentum',
+];
+
+const OVERBOUGHT_MESSAGES = [
+  'Overbought condition',
+  'Extended to upside',
+  'Mean reversion setup (short)',
+  'Exhaustion detected',
+  'Stretched high',
+];
+
+const OVERSOLD_MESSAGES = [
+  'Oversold condition',
+  'Extended to downside',
+  'Mean reversion setup (long)',
+  'Capitulation detected',
+  'Stretched low',
+];
+
+const HIGH_VOLATILITY_MESSAGES = [
+  'Volatility elevated',
+  'High ATR detected',
+  'Wide swings',
+  'Market volatile',
+  'Increased range',
+];
+
+const LOW_VOLATILITY_MESSAGES = [
+  'Low volatility',
+  'Tight range',
+  'Compressed action',
+  'Market quiet',
+  'Narrow swings',
+];
+
+// =============================================================================
+// MESSAGE POOLS - Status
+// =============================================================================
+
+const SCANNING_MESSAGES = [
+  'Scanning market...',
+  'Analyzing flow...',
+  'Monitoring price action...',
+  'Watching for setups...',
+  'Evaluating conditions...',
+];
+
+const WAITING_MESSAGES = [
+  'Waiting for confirmation...',
+  'Pending trigger...',
+  'Standby mode...',
+  'Awaiting signal...',
+  'Ready to act...',
+];
+
+const IN_POSITION_PROFIT_MESSAGES = [
+  'Running profit',
+  'In the money',
+  'Trade working',
+  'Position profitable',
+  'Gains accumulating',
+];
+
+const IN_POSITION_LOSS_MESSAGES = [
+  'Managing drawdown',
+  'Underwater',
+  'Holding through',
+  'Defending position',
+  'Monitoring risk',
+];
+
+// =============================================================================
+// SMART LOG GENERATORS
+// =============================================================================
+
+/**
+ * Get a market bias log
+ */
+function getMarketBiasLog(direction, delta, ofi) {
+  let pool;
+  switch (direction) {
+    case 'LONG':
+      pool = LONG_BIAS_MESSAGES;
+      break;
+    case 'SHORT':
+      pool = SHORT_BIAS_MESSAGES;
+      break;
+    default:
+      pool = FLAT_BIAS_MESSAGES;
+  }
+
+  const message = getVariedMessage(`bias_${direction}`, pool, `${direction} bias`);
+  const arrow = direction === 'LONG' ? '▲' : direction === 'SHORT' ? '▼' : '=';
+
+  let details;
+  if (delta !== undefined && ofi !== undefined) {
+    const deltaStr = delta >= 0 ? `+${delta}` : `${delta}`;
+    details = `${arrow} Δ=${deltaStr} | OFI=${ofi.toFixed(2)}`;
+  }
+
+  return { message, details };
+}
+
+/**
+ * Get a momentum log
+ */
+function getMomentumLog(momentum, zscore) {
+  const isUp = momentum > 0;
+  const pool = isUp ? MOMENTUM_UP_MESSAGES : MOMENTUM_DOWN_MESSAGES;
+  const category = isUp ? 'mom_up' : 'mom_down';
+  const message = getVariedMessage(category, pool, isUp ? 'Momentum up' : 'Momentum down');
+  const arrow = isUp ? '▲' : '▼';
+
+  return {
+    message: `${arrow} ${message}`,
+    details: `Mom=${momentum.toFixed(1)} | Z=${zscore.toFixed(2)}`,
+  };
+}
+
+/**
+ * Get a mean reversion log
+ */
+function getMeanReversionLog(zscore) {
+  const isOverbought = zscore > 0;
+  const pool = isOverbought ? OVERBOUGHT_MESSAGES : OVERSOLD_MESSAGES;
+  const category = isOverbought ? 'mr_overbought' : 'mr_oversold';
+  const message = getVariedMessage(category, pool, isOverbought ? 'Overbought' : 'Oversold');
+  const arrow = isOverbought ? '▼' : '▲'; // Opposite - looking for reversal
+
+  return {
+    message: `${arrow} ${message}`,
+    details: `Z-Score: ${zscore.toFixed(2)} | Looking for ${isOverbought ? 'SHORT' : 'LONG'}`,
+  };
+}
+
+/**
+ * Get a signal log
+ */
+function getSignalLog(direction, symbol, confidence, strategy) {
+  const pool = direction === 'LONG' ? SIGNAL_LONG_MESSAGES : SIGNAL_SHORT_MESSAGES;
+  const message = getVariedMessage(`signal_${direction}`, pool, `${direction} signal`);
+  const arrow = direction === 'LONG' ? '▲' : '▼';
+
+  return {
+    message: `${arrow} ${message}`,
+    details: `${symbol} | ${confidence.toFixed(0)}% | ${strategy}`,
+  };
+}
+
+/**
+ * Get an entry log
+ */
+function getEntryLog(direction, symbol, size, price) {
+  const pool = direction === 'LONG' ? ENTRY_LONG_MESSAGES : ENTRY_SHORT_MESSAGES;
+  const message = getVariedMessage(`entry_${direction}`, pool, `${direction} entry`);
+  const arrow = direction === 'LONG' ? '▲' : '▼';
+
+  return {
+    message: `${arrow} ${message}`,
+    details: `${size}x ${symbol} @ ${price.toFixed(2)}`,
+  };
+}
+
+/**
+ * Get an exit log
+ */
+function getExitLog(isProfit, symbol, size, price, pnl) {
+  const pool = isProfit ? EXIT_PROFIT_MESSAGES : EXIT_LOSS_MESSAGES;
+  const category = isProfit ? 'exit_profit' : 'exit_loss';
+  const message = getVariedMessage(category, pool, isProfit ? 'Profit taken' : 'Loss taken');
+  const pnlStr = pnl >= 0 ? `+$${pnl.toFixed(2)}` : `-$${Math.abs(pnl).toFixed(2)}`;
+
+  return {
+    message,
+    details: `${size}x ${symbol} @ ${price.toFixed(2)} | ${pnlStr}`,
+  };
+}
+
+/**
+ * Get a volatility log
+ */
+function getVolatilityLog(isHigh, atr) {
+  const pool = isHigh ? HIGH_VOLATILITY_MESSAGES : LOW_VOLATILITY_MESSAGES;
+  const category = isHigh ? 'vol_high' : 'vol_low';
+  const message = getVariedMessage(category, pool, isHigh ? 'High volatility' : 'Low volatility');
+
+  return {
+    message,
+    details: atr ? `ATR: ${atr.toFixed(2)}` : undefined,
+  };
+}
+
+/**
+ * Get a scanning/waiting log
+ */
+function getScanningLog(isScanning) {
+  const pool = isScanning ? SCANNING_MESSAGES : WAITING_MESSAGES;
+  const category = isScanning ? 'scanning' : 'waiting';
+  const message = getVariedMessage(category, pool, isScanning ? 'Scanning...' : 'Waiting...');
+
+  return { message, details: undefined };
+}
+
+/**
+ * Get position update log with varied messaging
+ */
+function getPositionUpdateLog(side, size, unrealizedPnL, entryPrice, currentPrice, holdTime) {
+  const arrow = side === 'LONG' ? '▲' : '▼';
+  const pnlStr = unrealizedPnL >= 0 ? `+$${unrealizedPnL.toFixed(2)}` : `-$${Math.abs(unrealizedPnL).toFixed(2)}`;
+  const isProfit = unrealizedPnL >= 0;
+  
+  const pool = isProfit ? IN_POSITION_PROFIT_MESSAGES : IN_POSITION_LOSS_MESSAGES;
+  const category = isProfit ? 'pos_profit' : 'pos_loss';
+  const prefix = getVariedMessage(category, pool, isProfit ? 'In profit' : 'Managing');
+
+  return {
+    message: `${arrow} ${side} ${size}x`,
+    details: `${prefix} ${pnlStr} @ ${currentPrice.toFixed(2)} | ${holdTime}s`,
+  };
+}
+
+/**
+ * Get market state log based on model values
+ */
+function getMarketStateLog(ofi, zscore, momentum, delta) {
+  // Determine primary market state
+  const absZ = Math.abs(zscore);
+  const absOfi = Math.abs(ofi);
+  const absMom = Math.abs(momentum);
+  
+  // Priority: Mean reversion > OFI pressure > Momentum
+  if (absZ > 1.5) {
+    return getMeanReversionLog(zscore);
+  } else if (absOfi > 0.3) {
+    const direction = ofi > 0 ? 'LONG' : 'SHORT';
+    return getMarketBiasLog(direction, delta, ofi);
+  } else if (absMom > 2) {
+    return getMomentumLog(momentum, zscore);
+  } else {
+    return getScanningLog(true);
+  }
+}
+
+module.exports = {
+  getMarketBiasLog,
+  getMomentumLog,
+  getMeanReversionLog,
+  getSignalLog,
+  getEntryLog,
+  getExitLog,
+  getVolatilityLog,
+  getScanningLog,
+  getPositionUpdateLog,
+  getMarketStateLog,
+};

package/src/pages/algo/ui.js

@@ -102,7 +102,11 @@ class AlgoUI {
     this.config = config;
     this.W = 96; // Fixed width
     this.logs = [];
-    this.maxLogs = 45; // Max visible logs
+    // Calculate maxLogs based on terminal height
+    // Header (logo + titles): ~12 lines, Stats: ~12 lines, Log header: 2 lines, Bottom: 1 line = 27 fixed
+    const terminalHeight = process.stdout.rows || 50;
+    const fixedLines = 27;
+    this.maxLogs = Math.max(10, terminalHeight - fixedLines); // Min 10 logs
     this.spinnerFrame = 0;
     this.firstDraw = true;
     this.isDrawing = false;