hedgequantx 1.2.80 → 1.2.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "1.2.80",
+  "version": "1.2.82",
   "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

@@ -436,97 +436,64 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
     // Centered subtitle
     const title2 = 'HQX Ultra-Scalping Algorithm';
     console.log(chalk.cyan(V) + chalk.yellow(center(title2, W)) + chalk.cyan(V));
-    console.log(chalk.cyan(MID));
     
-    // Grid layout for metrics - each in its own cell
-    // Row 1: Account | Symbol | Qty | Server | Latency
-    // Row 2: Target | Risk | P&L | Trades | W/L
+    // Grid layout for metrics - 2 columns per row, 3 rows
+    // Row 1: Account | Symbol
+    // Row 2: Target | Risk  
+    // Row 3: P&L | Trades | Server | WS
     const VS = '\u2502'; // Vertical separator (thin)
     
-    // Prepare values with fixed widths
-    const accLabel = 'Account';
-    const accVal = accountName.length > 26 ? accountName.substring(0, 26) : accountName;
-    const symLabel = 'Symbol';
-    const symVal = symbolName.length > 10 ? symbolName.substring(0, 10) : symbolName;
-    const qtyLabel = 'Qty';
-    const qtyVal = numContracts.toString();
-    const srvLabel = 'Server';
-    const srvVal = serverStatus;
-    const latLabel = 'WS';
-    const latVal = latencyStr;
-    
-    // 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;
+    // 2 columns: 48 + 47 + 1 separator = 96
+    const colL = 48, colR = 47;
     
     // Safe padding function
     const safePad = (len) => ' '.repeat(Math.max(0, len));
     
-    const cell1 = ` ${accLabel}: ${chalk.cyan(accVal)}`;
-    const cell1plain = ` ${accLabel}: ${accVal}`;
-    const cell2 = ` ${symLabel}: ${chalk.yellow(symVal)}`;
-    const cell2plain = ` ${symLabel}: ${symVal}`;
-    const cell3 = ` ${qtyLabel}: ${chalk.cyan(qtyVal)}`;
-    const cell3plain = ` ${qtyLabel}: ${qtyVal}`;
-    const cell4 = ` ${srvLabel}: ${serverColor(srvVal)}`;
-    const cell4plain = ` ${srvLabel}: ${srvVal}`;
-    const cell5 = ` ${latLabel}: ${latencyColor(latVal)}`;
-    const cell5plain = ` ${latLabel}: ${latVal}`;
-    
-    const row1 = cell1 + safePad(c1w - cell1plain.length) + chalk.cyan(VS) +
-                 cell2 + safePad(c2w - cell2plain.length) + chalk.cyan(VS) +
-                 cell3 + safePad(c3w - cell3plain.length) + chalk.cyan(VS) +
-                 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));
+    // Build cell helper
+    const buildCell = (label, value, valueColor, width) => {
+      const text = ` ${label}: ${valueColor(value)}`;
+      const plain = ` ${label}: ${value}`;
+      return { text, plain, padded: text + safePad(width - plain.length) };
+    };
     
-    // 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 1: Account | Symbol + Qty
+    const accVal = accountName.length > 35 ? accountName.substring(0, 35) : accountName;
+    const symVal = symbolName.length > 12 ? symbolName.substring(0, 12) : symbolName;
+    const r1c1 = buildCell('Account', accVal, chalk.cyan, colL);
+    const r1c2text = ` Symbol: ${chalk.yellow(symVal)}  Qty: ${chalk.cyan(numContracts)}`;
+    const r1c2plain = ` Symbol: ${symVal}  Qty: ${numContracts}`;
+    const r1c2 = r1c2text + safePad(colR - r1c2plain.length);
     
-    // Row 2: Target | Risk | P&L | Trades | W/L
-    const tgtLabel = 'Target';
-    const tgtVal = '$' + dailyTarget.toFixed(2);
-    const rskLabel = 'Risk';
-    const rskVal = '$' + maxRisk.toFixed(2);
-    const pnlLabel = 'P&L';
-    const pnlVal = pnlStr;
-    const trdLabel = 'Trades';
-    const trdVal = stats.trades.toString();
-    const wlLabel = 'W/L';
-    const wlVal = `${stats.wins}/${stats.losses}`;
+    // Row 2: Target | Risk
+    const r2c1 = buildCell('Target', '$' + dailyTarget.toFixed(2), chalk.green, colL);
+    const r2c2 = buildCell('Risk', '$' + maxRisk.toFixed(2), chalk.red, colR);
     
-    const cell6 = ` ${tgtLabel}: ${chalk.green(tgtVal)}`;
-    const cell6plain = ` ${tgtLabel}: ${tgtVal}`;
-    const cell7 = ` ${rskLabel}: ${chalk.red(rskVal)}`;
-    const cell7plain = ` ${rskLabel}: ${rskVal}`;
-    const cell8 = ` ${pnlLabel}: ${pnlColor(pnlVal)}`;
-    const cell8plain = ` ${pnlLabel}: ${pnlVal}`;
-    const cell9 = ` ${trdLabel}: ${chalk.cyan(trdVal)}`;
-    const cell9plain = ` ${trdLabel}: ${trdVal}`;
-    const cell10 = ` ${wlLabel}: ${chalk.green(stats.wins.toString())}/${chalk.red(stats.losses.toString())}`;
-    const cell10plain = ` ${wlLabel}: ${wlVal}`;
+    // Row 3: P&L | Trades | Server | WS (4 items in 2 columns)
+    const r3c1text = ` P&L: ${pnlColor(pnlStr)}  Trades: ${chalk.cyan(stats.trades)}  W/L: ${chalk.green(stats.wins)}/${chalk.red(stats.losses)}`;
+    const r3c1plain = ` P&L: ${pnlStr}  Trades: ${stats.trades}  W/L: ${stats.wins}/${stats.losses}`;
+    const r3c1 = r3c1text + safePad(colL - r3c1plain.length);
+    const r3c2text = ` Server: ${serverColor(serverStatus)}  WS: ${latencyColor(latencyStr)}`;
+    const r3c2plain = ` Server: ${serverStatus}  WS: ${latencyStr}`;
+    const r3c2 = r3c2text + safePad(colR - r3c2plain.length);
     
-    const row2 = cell6 + safePad(c1w - cell6plain.length) + chalk.cyan(VS) +
-                 cell7 + safePad(c2w - cell7plain.length) + chalk.cyan(VS) +
-                 cell8 + safePad(c3w - cell8plain.length) + chalk.cyan(VS) +
-                 cell9 + safePad(c4w - cell9plain.length) + chalk.cyan(VS) +
-                 cell10 + safePad(c5w - cell10plain.length);
+    // Grid separators
+    const GRID_TOP = '\u2560' + '\u2550'.repeat(colL) + '\u2564' + '\u2550'.repeat(colR) + '\u2563';
+    const GRID_MID = '\u2560' + '\u2550'.repeat(colL) + '\u256A' + '\u2550'.repeat(colR) + '\u2563';
+    const GRID_BOT = '\u2560' + '\u2550'.repeat(colL) + '\u2567' + '\u2550'.repeat(colR) + '\u2563';
     
+    // Print grid
+    console.log(chalk.cyan(GRID_TOP));
+    console.log(chalk.cyan(V) + r1c1.padded + chalk.cyan(VS) + r1c2 + chalk.cyan(V));
     console.log(chalk.cyan(GRID_MID));
-    console.log(chalk.cyan(V) + row2 + chalk.cyan(V));
-    
-    // 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(V) + r2c1.padded + chalk.cyan(VS) + r2c2.padded + chalk.cyan(V));
+    console.log(chalk.cyan(GRID_MID));
+    console.log(chalk.cyan(V) + r3c1 + chalk.cyan(VS) + r3c2 + chalk.cyan(V));
     console.log(chalk.cyan(GRID_BOT));
     
     // Activity log header with spinner and centered date
     spinnerFrame = (spinnerFrame + 1) % spinnerChars.length;
     const spinnerChar = spinnerChars[spinnerFrame];
-    const actLeft = ` Activity Log ${chalk.cyan(spinnerChar)}`;
+    const actLeft = ` Activity Log ${chalk.yellow(spinnerChar)}`;
     const actLeftPlain = ` Activity Log ${spinnerChar}`;
     const actRight = 'Press X to stop ';
     const dateCentered = `- ${dateStr} -`;