hedgequantx 1.2.77 → 1.2.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "1.2.77",
+  "version": "1.2.79",
   "description": "Prop Futures Algo Trading CLI - Connect to Topstep, Alpha Futures, and other prop firms",
   "main": "src/app.js",
   "bin": {

package/src/pages/algo.js

@@ -455,8 +455,8 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
     const latLabel = 'WS';
     const latVal = latencyStr;
     
-    // Row 1 cells: widths = 36 + 18 + 10 + 14 + 14 = 92 + 4 separators = 96
-    const c1w = 36, c2w = 18, c3w = 10, c4w = 14, c5w = 14;
+    // Row 1 cells: widths = 36 + 17 + 9 + 13 + 13 = 88 + 4 separators + 4 spaces = 96
+    const c1w = 36, c2w = 17, c3w = 9, c4w = 13, c5w = 17;
     
     // Safe padding function
     const safePad = (len) => ' '.repeat(Math.max(0, len));
@@ -478,11 +478,14 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
                  cell4 + safePad(c4w - cell4plain.length) + chalk.cyan(VS) +
                  cell5 + safePad(c5w - cell5plain.length);
     
+    // Top separator for grid (after HQX Ultra-Scalping)
+    const GRID_TOP = '\u2560' + '\u2550'.repeat(c1w) + '\u2564' + '\u2550'.repeat(c2w) + '\u2564' + '\u2550'.repeat(c3w) + '\u2564' + '\u2550'.repeat(c4w) + '\u2564' + '\u2550'.repeat(c5w) + '\u2563';
+    console.log(chalk.cyan(GRID_TOP));
+    
     console.log(chalk.cyan(V) + row1 + chalk.cyan(V));
     
-    // Separator with intersections
-    const SEP = '\u2560' + '\u2550'.repeat(c1w) + '\u256A' + '\u2550'.repeat(c2w) + '\u256A' + '\u2550'.repeat(c3w) + '\u256A' + '\u2550'.repeat(c4w) + '\u256A' + '\u2550'.repeat(c5w) + '\u2563';
-    console.log(chalk.cyan(SEP));
+    // Middle separator with intersections (between row1 and row2)
+    const GRID_MID = '\u2560' + '\u2550'.repeat(c1w) + '\u256A' + '\u2550'.repeat(c2w) + '\u256A' + '\u2550'.repeat(c3w) + '\u256A' + '\u2550'.repeat(c4w) + '\u256A' + '\u2550'.repeat(c5w) + '\u2563';
     
     // Row 2: Target | Risk | P&L | Trades | W/L
     const tgtLabel = 'Target';
@@ -513,8 +516,12 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
                  cell9 + safePad(c4w - cell9plain.length) + chalk.cyan(VS) +
                  cell10 + safePad(c5w - cell10plain.length);
     
+    console.log(chalk.cyan(GRID_MID));
     console.log(chalk.cyan(V) + row2 + chalk.cyan(V));
-    console.log(chalk.cyan(MID));
+    
+    // Bottom of grid (before Activity Log)
+    const GRID_BOT = '\u2560' + '\u2550'.repeat(c1w) + '\u2567' + '\u2550'.repeat(c2w) + '\u2567' + '\u2550'.repeat(c3w) + '\u2567' + '\u2550'.repeat(c4w) + '\u2567' + '\u2550'.repeat(c5w) + '\u2563';
+    console.log(chalk.cyan(GRID_BOT));
     
     // Activity log header with spinner and centered date
     spinnerFrame = (spinnerFrame + 1) % spinnerChars.length;
@@ -653,11 +660,21 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
   
   hqxServer.on('error', (data) => {
     printLog('error', data.message || 'Unknown error');
+    // Stop algo on connection error
+    if (!stopReason) {
+      stopReason = 'connection_error';
+      algoRunning = false;
+    }
   });
   
   hqxServer.on('disconnected', () => {
     hqxConnected = false;
-    printLog('warning', 'Disconnected from HQX Server');
+    printLog('error', 'Connection lost - Stopping algo');
+    // Stop algo on disconnect
+    if (!stopReason) {
+      stopReason = 'disconnected';
+      algoRunning = false;
+    }
   });
   
   // Display header once
@@ -790,15 +807,18 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
     console.log(chalk.green.bold('  [OK] Daily target reached! Algo stopped.'));
   } else if (stopReason === 'risk') {
     console.log(chalk.red.bold('  [X] Max risk reached! Algo stopped.'));
+  } else if (stopReason === 'disconnected' || stopReason === 'connection_error') {
+    console.log(chalk.red.bold('  [X] Connection lost! Algo stopped.'));
   } else {
     console.log(chalk.yellow('  [OK] Algo stopped by user'));
   }
   console.log();
   
-  // Final stats in a grid box
-  const V = '\u2551';
-  const VS = '\u2502';
-  const H = '\u2550';
+  // Final stats in a grid box - must match main UI width of 96
+  const summaryV = '\u2551';
+  const summaryVS = '\u2502';
+  const summaryH = '\u2550';
+  const summaryW = 96; // Same as main UI
   
   // Calculate session duration
   const sessionDuration = Date.now() - sessionStartTime;
@@ -811,50 +831,53 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
       ? `${durationMin}m ${durationSec % 60}s`
       : `${durationSec}s`;
   
-  // Cell widths: 4 cells of 24 each = 96
-  const cw = 24;
-  const W = cw * 4;
+  // 4 cells + 3 separators = 96 inner chars
+  // 96 - 3 separators = 93, divided by 4 = 23.25, so use 24+23+24+23 = 94... need 96
+  // Let's use: 24 + 24 + 24 + 21 = 93 + 3 sep = 96
+  const sc1 = 24, sc2 = 24, sc3 = 24, sc4 = 21;
   
-  const TOP = '\u2554' + H.repeat(cw) + '\u2564' + H.repeat(cw) + '\u2564' + H.repeat(cw) + '\u2564' + H.repeat(cw) + '\u2557';
-  const MID = '\u2560' + H.repeat(cw) + '\u256A' + H.repeat(cw) + '\u256A' + H.repeat(cw) + '\u256A' + H.repeat(cw) + '\u2563';
-  const BOT = '\u255A' + H.repeat(cw) + '\u2567' + H.repeat(cw) + '\u2567' + H.repeat(cw) + '\u2567' + H.repeat(cw) + '\u255D';
-  
-  const cell = (label, value, width) => {
+  const summaryCell = (label, value, width) => {
     const text = ` ${label}: ${value}`;
     const stripped = text.replace(/\x1b\[[0-9;]*m/g, '');
     const padding = Math.max(0, width - stripped.length);
     return text + ' '.repeat(padding);
   };
   
-  const centerTitle = (text, width) => {
+  const centerSummaryTitle = (text, width) => {
     const pad = Math.floor((width - text.length) / 2);
     return ' '.repeat(pad) + text + ' '.repeat(width - pad - text.length);
   };
   
   const pnlValue = stats.pnl >= 0 ? chalk.green('+$' + stats.pnl.toFixed(2)) : chalk.red('-$' + Math.abs(stats.pnl).toFixed(2));
   
+  // Build separator lines
+  const SUMMARY_TOP = '\u2554' + summaryH.repeat(summaryW) + '\u2557';
+  const SUMMARY_GRID_TOP = '\u2560' + summaryH.repeat(sc1) + '\u2564' + summaryH.repeat(sc2) + '\u2564' + summaryH.repeat(sc3) + '\u2564' + summaryH.repeat(sc4) + '\u2563';
+  const SUMMARY_GRID_MID = '\u2560' + summaryH.repeat(sc1) + '\u256A' + summaryH.repeat(sc2) + '\u256A' + summaryH.repeat(sc3) + '\u256A' + summaryH.repeat(sc4) + '\u2563';
+  const SUMMARY_BOT = '\u255A' + summaryH.repeat(sc1) + '\u2567' + summaryH.repeat(sc2) + '\u2567' + summaryH.repeat(sc3) + '\u2567' + summaryH.repeat(sc4) + '\u255D';
+  
   console.log();
-  console.log(chalk.cyan('\u2554' + H.repeat(W) + '\u2557'));
-  console.log(chalk.cyan(V) + chalk.white.bold(centerTitle('Session Summary', W)) + chalk.cyan(V));
-  console.log(chalk.cyan(TOP.replace('\u2554', '\u2560').replace('\u2557', '\u2563')));
+  console.log(chalk.cyan(SUMMARY_TOP));
+  console.log(chalk.cyan(summaryV) + chalk.white.bold(centerSummaryTitle('Session Summary', summaryW)) + chalk.cyan(summaryV));
+  console.log(chalk.cyan(SUMMARY_GRID_TOP));
   
   // Row 1: Target | Risk | P&L | Win Rate
-  const r1c1 = cell('Target', chalk.green('$' + dailyTarget.toFixed(2)), cw);
-  const r1c2 = cell('Risk', chalk.red('$' + maxRisk.toFixed(2)), cw);
-  const r1c3 = cell('P&L', pnlValue, cw);
-  const r1c4 = cell('Win Rate', chalk.yellow(stats.winRate + '%'), cw);
-  console.log(chalk.cyan(V) + r1c1 + chalk.cyan(VS) + r1c2 + chalk.cyan(VS) + r1c3 + chalk.cyan(VS) + r1c4 + chalk.cyan(V));
+  const r1c1 = summaryCell('Target', chalk.green('$' + dailyTarget.toFixed(2)), sc1);
+  const r1c2 = summaryCell('Risk', chalk.red('$' + maxRisk.toFixed(2)), sc2);
+  const r1c3 = summaryCell('P&L', pnlValue, sc3);
+  const r1c4 = summaryCell('Win Rate', chalk.yellow(stats.winRate + '%'), sc4);
+  console.log(chalk.cyan(summaryV) + r1c1 + chalk.cyan(summaryVS) + r1c2 + chalk.cyan(summaryVS) + r1c3 + chalk.cyan(summaryVS) + r1c4 + chalk.cyan(summaryV));
   
-  console.log(chalk.cyan(MID));
+  console.log(chalk.cyan(SUMMARY_GRID_MID));
   
   // Row 2: Trades | Wins | Losses | Duration
-  const r2c1 = cell('Trades', chalk.cyan(stats.trades.toString()), cw);
-  const r2c2 = cell('Wins', chalk.green(stats.wins.toString()), cw);
-  const r2c3 = cell('Losses', chalk.red(stats.losses.toString()), cw);
-  const r2c4 = cell('Duration', chalk.white(durationStr), cw);
-  console.log(chalk.cyan(V) + r2c1 + chalk.cyan(VS) + r2c2 + chalk.cyan(VS) + r2c3 + chalk.cyan(VS) + r2c4 + chalk.cyan(V));
+  const r2c1 = summaryCell('Trades', chalk.cyan(stats.trades.toString()), sc1);
+  const r2c2 = summaryCell('Wins', chalk.green(stats.wins.toString()), sc2);
+  const r2c3 = summaryCell('Losses', chalk.red(stats.losses.toString()), sc3);
+  const r2c4 = summaryCell('Duration', chalk.white(durationStr), sc4);
+  console.log(chalk.cyan(summaryV) + r2c1 + chalk.cyan(summaryVS) + r2c2 + chalk.cyan(summaryVS) + r2c3 + chalk.cyan(summaryVS) + r2c4 + chalk.cyan(summaryV));
   
-  console.log(chalk.cyan(BOT));
+  console.log(chalk.cyan(SUMMARY_BOT));
   console.log();
   
   await inquirer.prompt([{ type: 'input', name: 'continue', message: 'Press Enter to continue...' }]);