hedgequantx 2.6.50 → 2.6.52

package/package.json

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

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

@@ -739,12 +739,14 @@ const launchAlgo = async (service, account, contract, config) => {
         const smartLogs = require('./smart-logs');
         const stateLog = smartLogs.getMarketStateLog(ofi, zscore, mom, delta);
         
-        if (currentPosition !== 0) {
+        // Use stats.position from Rithmic API (real-time WebSocket)
+        const positionQty = stats.position || 0;
+        if (positionQty !== 0) {
           // In position - show position status with varied messages
-          const side = currentPosition > 0 ? 'LONG' : 'SHORT';
+          const side = positionQty > 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);
+          const posLog = smartLogs.getPositionUpdateLog(side, Math.abs(positionQty), unrealizedPnl, stats.entryPrice, tickData.price, holdTime);
           ui.addLog('trade', `${posLog.message} - ${posLog.details}`);
         } else {
           // Not in position - show market state with varied messages

package/src/pages/algo/ui.js

@@ -102,11 +102,7 @@ class AlgoUI {
     this.config = config;
     this.W = 96; // Fixed width
     this.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.maxLogs = 40; // Fixed at 40 logs for one-account and copy-trading
     this.spinnerFrame = 0;
     this.firstDraw = true;
     this.isDrawing = false;
@@ -186,18 +182,7 @@ class AlgoUI {
     
     this._line(chalk.cyan(GM));
     
-    // Row 2: Position | P&L (like R Trader)
-    const posQty = stats.position || 0;
-    const posStr = posQty === 0 ? 'FLAT' : (posQty > 0 ? `+${posQty} LONG` : `${posQty} SHORT`);
-    const posColor = posQty === 0 ? chalk.gray : (posQty > 0 ? chalk.green : chalk.red);
-    const r2c1 = buildCell('POSITION', posStr, posColor, colL);
-    const r2c2 = buildCell('P&L', pnlStr, pnlColor, colR);
-    row(r2c1.padded, r2c2.padded);
-    
-    this._line(chalk.cyan(GM));
-    
-    // Row 3: Open P&L | Closed P&L (R Trader style breakdown)
-    // Data from Rithmic PNL_PLANT WebSocket - show '--' if null (no data from API)
+    // Row 2: Open P&L | Closed P&L (essential trading metrics)
     const openPnl = stats.openPnl;
     const closedPnl = stats.closedPnl;
     const openPnlStr = openPnl === null || openPnl === undefined 
@@ -208,61 +193,26 @@ class AlgoUI {
       : (closedPnl >= 0 ? `+$${closedPnl.toFixed(2)}` : `-$${Math.abs(closedPnl).toFixed(2)}`);
     const openPnlColor = (openPnl || 0) >= 0 ? chalk.green : chalk.red;
     const closedPnlColor = (closedPnl || 0) >= 0 ? chalk.green : chalk.red;
-    const r3c1 = buildCell('OPEN P&L', openPnlStr, openPnlColor, colL);
-    const r3c2 = buildCell('CLOSED P&L', closedPnlStr, closedPnlColor, colR);
-    row(r3c1.padded, r3c2.padded);
-    
-    this._line(chalk.cyan(GM));
-    
-    // Row 4: Balance | Net Liquidation (R Trader style)
-    const balanceStr = stats.balance !== null && stats.balance !== undefined 
-      ? '$' + stats.balance.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
-      : '--';
-    const netLiqStr = stats.netLiquidation !== null && stats.netLiquidation !== undefined
-      ? '$' + stats.netLiquidation.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
-      : '--';
-    const r4c1 = buildCell('BALANCE', balanceStr, chalk.white, colL);
-    const r4c2 = buildCell('NET LIQ', netLiqStr, chalk.cyan, colR);
-    row(r4c1.padded, r4c2.padded);
-    
-    this._line(chalk.cyan(GM));
-    
-    // Row 5: Buying Power | Margin (R Trader style)
-    const bpStr = stats.buyingPower !== null && stats.buyingPower !== undefined
-      ? '$' + stats.buyingPower.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
-      : '--';
-    const marginStr = stats.margin !== null && stats.margin !== undefined
-      ? '$' + stats.margin.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
-      : '--';
-    const r5c1 = buildCell('BUYING PWR', bpStr, chalk.green, colL);
-    const r5c2 = buildCell('MARGIN', marginStr, chalk.yellow, colR);
-    row(r5c1.padded, r5c2.padded);
+    const r2c1 = buildCell('OPEN P&L', openPnlStr, openPnlColor, colL);
+    const r2c2 = buildCell('CLOSED P&L', closedPnlStr, closedPnlColor, colR);
+    row(r2c1.padded, r2c2.padded);
     
     this._line(chalk.cyan(GM));
     
-    // Row 6: Target | Risk
+    // Row 3: Target | Risk
     const targetStr = stats.target !== null && stats.target !== undefined ? '$' + stats.target.toFixed(2) : '--';
     const riskStr = stats.risk !== null && stats.risk !== undefined ? '$' + stats.risk.toFixed(2) : '--';
-    const r6c1 = buildCell('TARGET', targetStr, chalk.green, colL);
-    const r6c2 = buildCell('RISK', riskStr, chalk.red, colR);
-    row(r6c1.padded, r6c2.padded);
-    
-    this._line(chalk.cyan(GM));
-    
-    // Row 7: Trades W/L | Entry Price (if in position)
-    const r7c1t = ` ${chalk.bold('TRADES')}: ${chalk.cyan.bold(stats.trades || 0)}  ${chalk.bold('W/L')}: ${chalk.green.bold(stats.wins || 0)}/${chalk.red.bold(stats.losses || 0)}`;
-    const r7c1p = ` TRADES: ${stats.trades || 0}  W/L: ${stats.wins || 0}/${stats.losses || 0}`;
-    const entryStr = stats.entryPrice > 0 ? stats.entryPrice.toFixed(2) : '--';
-    const r7c2 = buildCell('ENTRY', entryStr, chalk.yellow, colR);
-    row(r7c1t + pad(colL - r7c1p.length), r7c2.padded);
+    const r3c1 = buildCell('TARGET', targetStr, chalk.green, colL);
+    const r3c2 = buildCell('RISK', riskStr, chalk.red, colR);
+    row(r3c1.padded, r3c2.padded);
     
     this._line(chalk.cyan(GM));
     
-    // Row 8: Connection | Propfirm
-    const connection = stats.platform || 'ProjectX';
-    const r8c1 = buildCell('CONNECTION', connection, chalk.cyan, colL);
-    const r8c2 = buildCell('PROPFIRM', stats.propfirm || 'N/A', chalk.cyan, colR);
-    row(r8c1.padded, r8c2.padded);
+    // Row 4: Trades W/L | Propfirm
+    const r4c1t = ` ${chalk.bold('TRADES')}: ${chalk.cyan.bold(stats.trades || 0)}  ${chalk.bold('W/L')}: ${chalk.green.bold(stats.wins || 0)}/${chalk.red.bold(stats.losses || 0)}`;
+    const r4c1p = ` TRADES: ${stats.trades || 0}  W/L: ${stats.wins || 0}/${stats.losses || 0}`;
+    const r4c2 = buildCell('PROPFIRM', stats.propfirm || 'N/A', chalk.cyan, colR);
+    row(r4c1t + pad(colL - r4c1p.length), r4c2.padded);
     
     this._line(chalk.cyan(GB));
   }