hedgequantx 2.7.35 → 2.7.37

package/package.json

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

package/src/app.js

@@ -132,7 +132,7 @@ const banner = async (withLoading = false) => {
 
   console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
   
-  const tagline = isMobile ? `HQX v${version}` : `Prop Futures Algo Trading  v${version}`;
+  const tagline = isMobile ? `HQX V${version}` : `PROP FUTURES ALGO TRADING  V${version}`;
   console.log(chalk.cyan('║') + chalk.white(centerText(tagline, innerWidth)) + chalk.cyan('║'));
   
   // Show loading message if requested

package/src/menus/connect.js

@@ -18,16 +18,16 @@ const { prompts } = require('../utils');
 const loginPrompt = async (propfirmName) => {
   prepareStdin();
   console.log();
-  console.log(chalk.cyan(`Connecting to ${propfirmName}...`));
+  console.log(chalk.cyan(`CONNECTING TO ${propfirmName.toUpperCase()}...`));
   console.log();
 
-  const username = await prompts.textInput('Username:', '', (input) => {
-    try { validateUsername(input); return undefined; } catch (e) { return e.message; }
+  const username = await prompts.textInput('USERNAME:', '', (input) => {
+    try { validateUsername(input); return undefined; } catch (e) { return e.message.toUpperCase(); }
   });
   if (!username) return null;
   
-  const pwd = await prompts.passwordInput('Password:', (input) => {
-    try { validatePassword(input); return undefined; } catch (e) { return e.message; }
+  const pwd = await prompts.passwordInput('PASSWORD:', (input) => {
+    try { validatePassword(input); return undefined; } catch (e) { return e.message.toUpperCase(); }
   });
   if (!pwd) return null;
 
@@ -71,10 +71,10 @@ const rithmicMenu = async () => {
   }
   
   console.log(chalk.cyan('╠' + '─'.repeat(innerWidth) + '╣'));
-  console.log(chalk.cyan('║') + chalk.red(centerText('[X] Exit', innerWidth)) + chalk.cyan('║'));
+  console.log(chalk.cyan('║') + chalk.red(centerText('[X] EXIT', innerWidth)) + chalk.cyan('║'));
   console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
 
-  const input = await prompts.textInput(chalk.cyan('Select number (or X):'));
+  const input = await prompts.textInput(chalk.cyan('SELECT NUMBER (OR X):'));
   if (!input || input.toLowerCase() === 'x') return null;
   
   const action = parseInt(input);
@@ -84,26 +84,26 @@ const rithmicMenu = async () => {
   const credentials = await loginPrompt(selectedPropfirm.name);
   if (!credentials) return null;
 
-  const spinner = ora({ text: 'Connecting to Rithmic...', color: 'yellow' }).start();
+  const spinner = ora({ text: 'CONNECTING TO RITHMIC...', color: 'yellow' }).start();
 
   try {
     const service = new RithmicService(selectedPropfirm.key);
     const result = await service.login(credentials.username, credentials.password);
 
     if (result.success) {
-      spinner.text = 'Fetching accounts...';
+      spinner.text = 'FETCHING ACCOUNTS...';
       const accResult = await service.getTradingAccounts();
       connections.add('rithmic', service, service.propfirm.name);
-      spinner.succeed(`Connected to ${service.propfirm.name} (${accResult.accounts?.length || 0} accounts)`);
+      spinner.succeed(`CONNECTED TO ${service.propfirm.name.toUpperCase()} (${accResult.accounts?.length || 0} ACCOUNTS)`);
       await new Promise(r => setTimeout(r, 1500));
       return service;
     } else {
-      spinner.fail(result.error || 'Authentication failed');
+      spinner.fail((result.error || 'AUTHENTICATION FAILED').toUpperCase());
       await new Promise(r => setTimeout(r, 2000));
       return null;
     }
   } catch (error) {
-    spinner.fail(`Connection error: ${error.message}`);
+    spinner.fail(`CONNECTION ERROR: ${error.message.toUpperCase()}`);
     await new Promise(r => setTimeout(r, 2000));
     return null;
   }

package/src/pages/accounts.js

@@ -29,12 +29,12 @@ const showAccounts = async (service) => {
 
   try {
     // Single spinner for loading (appears below the dashboard header)
-    spinner = ora({ text: 'Loading accounts...', color: 'yellow' }).start();
+    spinner = ora({ text: 'LOADING ACCOUNTS...', color: 'yellow' }).start();
     
     const allConns = connections.count() > 0 ? connections.getAll() : (service ? [{ service, propfirm: service.propfirm?.name || 'Unknown', type: 'single' }] : []);
     
     if (allConns.length === 0) {
-      spinner.fail('No connections found');
+      spinner.fail('NO CONNECTIONS FOUND');
       await prompts.waitForEnter();
       return;
     }
@@ -60,7 +60,7 @@ const showAccounts = async (service) => {
     }
 
     if (allAccounts.length === 0) {
-      spinner.fail('No accounts found');
+      spinner.fail('NO ACCOUNTS FOUND');
       await prompts.waitForEnter();
       return;
     }
@@ -78,7 +78,7 @@ const showAccounts = async (service) => {
       } catch (e) {}
     }
     
-    spinner.succeed('Accounts loaded');
+    spinner.succeed('ACCOUNTS LOADED');
     console.log();
 
     // Display accounts
@@ -162,7 +162,7 @@ const showAccounts = async (service) => {
     console.log();
 
   } catch (error) {
-    if (spinner) spinner.fail('Error loading accounts: ' + error.message);
+    if (spinner) spinner.fail('ERROR LOADING ACCOUNTS: ' + error.message.toUpperCase());
   }
 
   await prompts.waitForEnter();

package/src/pages/ai-agents-ui.js

@@ -8,26 +8,27 @@ const chalk = require('chalk');
 const { centerText, visibleLength } = require('../ui');
 
 /**
- * Draw a 2-column row
+ * Draw a 2-column row with perfect alignment
  * @param {string} leftText - Left column text
  * @param {string} rightText - Right column text
  * @param {number} W - Inner width
+ * @param {number} padding - Left padding for each column (default 3)
  */
-const draw2ColRow = (leftText, rightText, W) => {
-  const col1Width = Math.floor(W / 2);
-  const col2Width = W - col1Width;
+const draw2ColRow = (leftText, rightText, W, padding = 3) => {
+  const colWidth = Math.floor(W / 2);
   const leftLen = visibleLength(leftText);
-  const leftPad = col1Width - leftLen;
-  const leftPadL = Math.floor(leftPad / 2);
   const rightLen = visibleLength(rightText || '');
-  const rightPad = col2Width - rightLen;
-  const rightPadL = Math.floor(rightPad / 2);
-  console.log(
-    chalk.cyan('║') +
-    ' '.repeat(leftPadL) + leftText + ' '.repeat(leftPad - leftPadL) +
-    ' '.repeat(rightPadL) + (rightText || '') + ' '.repeat(rightPad - rightPadL) +
-    chalk.cyan('║')
-  );
+  
+  // Left column: padding + text + fill to colWidth
+  const leftFill = colWidth - padding - leftLen;
+  const leftCol = ' '.repeat(padding) + leftText + ' '.repeat(Math.max(0, leftFill));
+  
+  // Right column: padding + text + fill to remaining width
+  const rightColWidth = W - colWidth;
+  const rightFill = rightColWidth - padding - rightLen;
+  const rightCol = ' '.repeat(padding) + (rightText || '') + ' '.repeat(Math.max(0, rightFill));
+  
+  console.log(chalk.cyan('║') + leftCol + rightCol + chalk.cyan('║'));
 };
 
 /**
@@ -39,6 +40,7 @@ const draw2ColRow = (leftText, rightText, W) => {
  * @param {number} W - Inner width
  */
 const draw2ColTable = (title, titleColor, items, backText, W) => {
+  // New rectangle (banner is always closed)
   console.log(chalk.cyan('╔' + '═'.repeat(W) + '╗'));
   console.log(chalk.cyan('║') + titleColor(centerText(title, W)) + chalk.cyan('║'));
   console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
@@ -65,6 +67,7 @@ const draw2ColTable = (title, titleColor, items, backText, W) => {
 const drawProvidersTable = (providers, config, boxWidth, cliproxyUrl = null) => {
   const W = boxWidth - 2;
   
+  // New rectangle (banner is always closed)
   console.log(chalk.cyan('╔' + '═'.repeat(W) + '╗'));
   console.log(chalk.cyan('║') + chalk.yellow.bold(centerText('AI AGENTS CONFIGURATION', W)) + chalk.cyan('║'));
   
@@ -79,7 +82,7 @@ const drawProvidersTable = (providers, config, boxWidth, cliproxyUrl = null) =>
   
   const items = providers.map((p, i) => {
     const status = config.providers[p.id]?.active ? chalk.green(' ●') : '';
-    return chalk.cyan(`[${i + 1}]`) + ' ' + chalk[p.color](p.name) + status;
+    return chalk.cyan(`[${i + 1}]`) + ' ' + chalk[p.color](p.name.toUpperCase()) + status;
   });
   
   const rows = Math.ceil(items.length / 2);
@@ -90,9 +93,9 @@ const drawProvidersTable = (providers, config, boxWidth, cliproxyUrl = null) =>
   }
   
   console.log(chalk.cyan('╠' + '─'.repeat(W) + '╣'));
-  console.log(chalk.cyan('║') + chalk.gray(centerText('[S] CLIProxy Status', W)) + chalk.cyan('║'));
+  console.log(chalk.cyan('║') + chalk.gray(centerText('[S] CLIPROXY STATUS', W)) + chalk.cyan('║'));
   console.log(chalk.cyan('╠' + '─'.repeat(W) + '╣'));
-  console.log(chalk.cyan('║') + chalk.red(centerText('[B] Back to Menu', W)) + chalk.cyan('║'));
+  console.log(chalk.cyan('║') + chalk.red(centerText('[B] BACK TO MENU', W)) + chalk.cyan('║'));
   console.log(chalk.cyan('╚' + '═'.repeat(W) + '╝'));
 };
 
@@ -104,8 +107,8 @@ const drawProvidersTable = (providers, config, boxWidth, cliproxyUrl = null) =>
  */
 const drawModelsTable = (provider, models, boxWidth) => {
   const W = boxWidth - 2;
-  const items = models.map((m, i) => chalk.cyan(`[${i + 1}]`) + ' ' + chalk.white(m.name));
-  draw2ColTable(`${provider.name.toUpperCase()} - MODELS`, chalk[provider.color].bold, items, '[B] Back', W);
+  const items = models.map((m, i) => chalk.cyan(`[${i + 1}]`) + ' ' + chalk.white(m.name.toUpperCase()));
+  draw2ColTable(`${provider.name.toUpperCase()} - MODELS`, chalk[provider.color].bold, items, '[B] BACK', W);
 };
 
 /**
@@ -120,7 +123,7 @@ const drawProviderWindow = (provider, config, boxWidth) => {
   const col2Width = W - col1Width;
   const providerConfig = config.providers[provider.id] || {};
   
-  // Header
+  // New rectangle (banner is always closed)
   console.log(chalk.cyan('╔' + '═'.repeat(W) + '╗'));
   console.log(chalk.cyan('║') + chalk[provider.color].bold(centerText(provider.name.toUpperCase(), W)) + chalk.cyan('║'));
   console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
@@ -129,10 +132,10 @@ const drawProviderWindow = (provider, config, boxWidth) => {
   console.log(chalk.cyan('║') + ' '.repeat(W) + chalk.cyan('║'));
   
   // Options in 2 columns
-  const opt1Title = '[1] Connect via Paid Plan';
-  const opt1Desc = 'Uses CLIProxy - No API key needed';
-  const opt2Title = '[2] Connect via API Key';
-  const opt2Desc = 'Enter your own API key';
+  const opt1Title = '[1] CONNECT VIA PAID PLAN';
+  const opt1Desc = 'USES CLIPROXY - NO API KEY NEEDED';
+  const opt2Title = '[2] CONNECT VIA API KEY';
+  const opt2Desc = 'ENTER YOUR OWN API KEY';
   
   // Row 1: Titles
   const left1 = chalk.green(opt1Title);
@@ -180,11 +183,11 @@ const drawProviderWindow = (provider, config, boxWidth) => {
   
   let statusText = '';
   if (providerConfig.active) {
-    const connType = providerConfig.connectionType === 'cliproxy' ? 'CLIProxy' : 'API Key';
-    const modelName = providerConfig.modelName || 'N/A';
-    statusText = chalk.green('● ACTIVE') + chalk.gray('  Model: ') + chalk.yellow(modelName) + chalk.gray('  via ') + chalk.cyan(connType);
+    const connType = providerConfig.connectionType === 'cliproxy' ? 'CLIPROXY' : 'API KEY';
+    const modelName = (providerConfig.modelName || 'N/A').toUpperCase();
+    statusText = chalk.green('● ACTIVE') + chalk.gray('  MODEL: ') + chalk.yellow(modelName) + chalk.gray('  VIA ') + chalk.cyan(connType);
   } else if (providerConfig.apiKey || providerConfig.connectionType) {
-    statusText = chalk.yellow('● CONFIGURED') + chalk.gray(' (not active)');
+    statusText = chalk.yellow('● CONFIGURED') + chalk.gray(' (NOT ACTIVE)');
   } else {
     statusText = chalk.gray('○ NOT CONFIGURED');
   }
@@ -193,12 +196,12 @@ const drawProviderWindow = (provider, config, boxWidth) => {
   // Disconnect option if active
   if (providerConfig.active) {
     console.log(chalk.cyan('╠' + '─'.repeat(W) + '╣'));
-    console.log(chalk.cyan('║') + chalk.red(centerText('[D] Disconnect', W)) + chalk.cyan('║'));
+    console.log(chalk.cyan('║') + chalk.red(centerText('[D] DISCONNECT', W)) + chalk.cyan('║'));
   }
   
   // Back
   console.log(chalk.cyan('╠' + '─'.repeat(W) + '╣'));
-  console.log(chalk.cyan('║') + chalk.red(centerText('[B] Back', W)) + chalk.cyan('║'));
+  console.log(chalk.cyan('║') + chalk.red(centerText('[B] BACK', W)) + chalk.cyan('║'));
   console.log(chalk.cyan('╚' + '═'.repeat(W) + '╝'));
 };
 

package/src/pages/ai-agents.js

@@ -17,10 +17,10 @@ const { fetchModelsFromApi } = require('./ai-models');
 const { drawProvidersTable, drawModelsTable, drawProviderWindow } = require('./ai-agents-ui');
 const cliproxy = require('../services/cliproxy');
 
-/** Clear screen and show banner */
+/** Clear screen and show banner (always closed) */
 const clearWithBanner = () => {
   console.clear();
-  displayBanner();
+  displayBanner();  // Banner always closed
 };
 
 // Config file path
@@ -241,15 +241,46 @@ const handleCliProxyConnection = async (provider, config, boxWidth) => {
   }
   
   // Restart CLIProxyAPI to load new tokens
-  console.log(chalk.gray('  RESTARTING CLIPROXYAPI...'));
+  const restartSpinner = ora({ text: 'RESTARTING CLIPROXYAPI...', color: 'yellow' }).start();
   await cliproxy.stop();
-  await new Promise(r => setTimeout(r, 1000));
+  await new Promise(r => setTimeout(r, 1500));
   await cliproxy.start();
-  await new Promise(r => setTimeout(r, 2000));
   
-  // Try to fetch models after auth
+  // Wait for CLIProxyAPI to be fully ready (check health)
+  restartSpinner.text = 'WAITING FOR CLIPROXYAPI TO BE READY...';
+  let ready = false;
+  for (let i = 0; i < 10; i++) {
+    await new Promise(r => setTimeout(r, 1000));
+    const status = await cliproxy.isRunning();
+    if (status.running) {
+      // Try a simple fetch to verify it's responding
+      const test = await cliproxy.fetchModels();
+      if (test.success) {
+        ready = true;
+        break;
+      }
+    }
+    restartSpinner.text = `WAITING FOR CLIPROXYAPI (${i + 1}/10)...`;
+  }
+  
+  if (!ready) {
+    restartSpinner.warn('CLIPROXYAPI SLOW TO START - CONTINUING...');
+  } else {
+    restartSpinner.succeed('CLIPROXYAPI READY');
+  }
+  
+  // Fetch models (with retry for provider-specific)
   const modelSpinner = ora({ text: 'FETCHING AVAILABLE MODELS...', color: 'yellow' }).start();
-  const modelsResult = await cliproxy.fetchProviderModels(provider.id);
+  
+  let modelsResult = { success: false, models: [] };
+  for (let attempt = 1; attempt <= 5; attempt++) {
+    modelsResult = await cliproxy.fetchProviderModels(provider.id);
+    if (modelsResult.success && modelsResult.models.length > 0) break;
+    if (attempt < 5) {
+      modelSpinner.text = `FETCHING MODELS (ATTEMPT ${attempt + 1}/5)...`;
+      await new Promise(r => setTimeout(r, 1500));
+    }
+  }
   
   if (modelsResult.success && modelsResult.models.length > 0) {
     modelSpinner.succeed(`FOUND ${modelsResult.models.length} MODELS`);

package/src/pages/algo/ui.js

@@ -127,9 +127,9 @@ class AlgoUI {
     
     // Separator + title
     this._line(chalk.cyan(BOX.ML + BOX.H.repeat(W) + BOX.MR));
-    this._line(chalk.cyan(BOX.V) + chalk.white(center(`Prop Futures Algo Trading  v${version}`, W)) + chalk.cyan(BOX.V));
+    this._line(chalk.cyan(BOX.V) + chalk.white(center(`PROP FUTURES ALGO TRADING  V${version}`, W)) + chalk.cyan(BOX.V));
     this._line(chalk.cyan(BOX.ML + BOX.H.repeat(W) + BOX.MR));
-    this._line(chalk.cyan(BOX.V) + chalk.yellow(center(this.config.subtitle || 'HQX Algo Trading', W)) + chalk.cyan(BOX.V));
+    this._line(chalk.cyan(BOX.V) + chalk.yellow(center((this.config.subtitle || 'HQX ALGO TRADING').toUpperCase(), W)) + chalk.cyan(BOX.V));
   }
 
   _drawStats(stats) {
@@ -293,7 +293,7 @@ class AlgoUI {
     const visible = logs.slice(-maxLogs).reverse();
     
     if (visible.length === 0) {
-      this._line(chalk.cyan(BOX.V) + chalk.gray(fitToWidth(' Awaiting market signals...', W)) + chalk.cyan(BOX.V));
+      this._line(chalk.cyan(BOX.V) + chalk.gray(fitToWidth(' AWAITING MARKET SIGNALS...', W)) + chalk.cyan(BOX.V));
       for (let i = 0; i < maxLogs - 1; i++) {
         this._line(chalk.cyan(BOX.V) + ' '.repeat(W) + chalk.cyan(BOX.V));
       }
@@ -355,11 +355,11 @@ const checkMarketStatus = () => {
   const ctHour = (utcHour - ctOffset + 24) % 24;
   const ctDay = utcHour < ctOffset ? (utcDay + 6) % 7 : utcDay;
 
-  if (ctDay === 6) return { isOpen: false, message: 'Market closed (Saturday)' };
-  if (ctDay === 0 && ctHour < 17) return { isOpen: false, message: 'Market opens Sunday 5:00 PM CT' };
-  if (ctDay === 5 && ctHour >= 16) return { isOpen: false, message: 'Market closed (Friday after 4PM CT)' };
-  if (ctHour === 16 && ctDay >= 1 && ctDay <= 4) return { isOpen: false, message: 'Daily maintenance' };
-  return { isOpen: true, message: 'Market OPEN' };
+  if (ctDay === 6) return { isOpen: false, message: 'MARKET CLOSED (SATURDAY)' };
+  if (ctDay === 0 && ctHour < 17) return { isOpen: false, message: 'MARKET OPENS SUNDAY 5:00 PM CT' };
+  if (ctDay === 5 && ctHour >= 16) return { isOpen: false, message: 'MARKET CLOSED (FRIDAY AFTER 4PM CT)' };
+  if (ctHour === 16 && ctDay >= 1 && ctDay <= 4) return { isOpen: false, message: 'DAILY MAINTENANCE' };
+  return { isOpen: true, message: 'MARKET OPEN' };
 };
 
 /**
@@ -387,9 +387,9 @@ const renderSessionSummary = (stats, stopReason) => {
   
   // Separator + title
   console.log(chalk.cyan(BOX.ML + BOX.H.repeat(W) + BOX.MR));
-  console.log(chalk.cyan(BOX.V) + chalk.white(center(`Prop Futures Algo Trading  v${version}`, W)) + chalk.cyan(BOX.V));
+  console.log(chalk.cyan(BOX.V) + chalk.white(center(`PROP FUTURES ALGO TRADING  V${version}`, W)) + chalk.cyan(BOX.V));
   console.log(chalk.cyan(BOX.ML + BOX.H.repeat(W) + BOX.MR));
-  console.log(chalk.cyan(BOX.V) + chalk.yellow(center('Session Summary', W)) + chalk.cyan(BOX.V));
+  console.log(chalk.cyan(BOX.V) + chalk.yellow(center('SESSION SUMMARY', W)) + chalk.cyan(BOX.V));
   
   // Grid separators
   const GT = BOX.ML + BOX.H.repeat(colL) + BOX.TM + BOX.H.repeat(colR) + BOX.MR;
@@ -410,18 +410,18 @@ const renderSessionSummary = (stats, stopReason) => {
   // Row 1: Stop Reason | Duration
   const duration = stats.duration || '--';
   const reasonColor = stopReason === 'target' ? chalk.green : stopReason === 'risk' ? chalk.red : chalk.yellow;
-  row('Stop Reason', (stopReason || 'manual').toUpperCase(), reasonColor, 'Duration', duration, chalk.white);
+  row('STOP REASON', (stopReason || 'MANUAL').toUpperCase(), reasonColor, 'DURATION', duration, chalk.white);
   
   console.log(chalk.cyan(GM));
   
   // Row 2: Trades | Win Rate
   const winRate = stats.trades > 0 ? ((stats.wins / stats.trades) * 100).toFixed(1) + '%' : '0%';
-  row('Trades', String(stats.trades || 0), chalk.white, 'Win Rate', winRate, stats.wins >= stats.losses ? chalk.green : chalk.red);
+  row('TRADES', String(stats.trades || 0), chalk.white, 'WIN RATE', winRate, stats.wins >= stats.losses ? chalk.green : chalk.red);
   
   console.log(chalk.cyan(GM));
   
   // Row 3: Wins | Losses
-  row('Wins', String(stats.wins || 0), chalk.green, 'Losses', String(stats.losses || 0), chalk.red);
+  row('WINS', String(stats.wins || 0), chalk.green, 'LOSSES', String(stats.losses || 0), chalk.red);
   
   console.log(chalk.cyan(GM));
   
@@ -430,7 +430,7 @@ const renderSessionSummary = (stats, stopReason) => {
   const pnlStr = `${pnl >= 0 ? '+' : ''}$${Math.abs(pnl).toFixed(2)}`;
   const pnlColor = pnl >= 0 ? chalk.green : chalk.red;
   const targetStr = `$${(stats.target || 0).toFixed(2)}`;
-  row('P&L', pnlStr, pnlColor, 'Target', targetStr, chalk.cyan);
+  row('P&L', pnlStr, pnlColor, 'TARGET', targetStr, chalk.cyan);
   
   // Bottom border
   console.log(chalk.cyan(BOX.BOT + BOX.H.repeat(W) + BOX.BR));

package/src/pages/orders.js

@@ -19,25 +19,25 @@ const showOrders = async (service) => {
 
   try {
     // Step 1: Get connections
-    spinner = ora({ text: 'Loading connections...', color: 'yellow' }).start();
+    spinner = ora({ text: 'LOADING CONNECTIONS...', color: 'yellow' }).start();
     
     const allConns = connections.count() > 0 
       ? connections.getAll() 
       : (service ? [{ service, propfirm: service.propfirm?.name || 'Unknown', type: 'single' }] : []);
     
     if (allConns.length === 0) {
-      spinner.fail('No connections found');
+      spinner.fail('NO CONNECTIONS FOUND');
       await prompts.waitForEnter();
       return;
     }
-    spinner.succeed(`Found ${allConns.length} connection(s)`);
+    spinner.succeed(`FOUND ${allConns.length} CONNECTION(S)`);
 
     // Step 2: Fetch accounts
     let allAccounts = [];
     
     for (const conn of allConns) {
       const propfirmName = conn.propfirm || conn.type || 'Unknown';
-      spinner = ora({ text: `Fetching accounts from ${propfirmName}...`, color: 'yellow' }).start();
+      spinner = ora({ text: `FETCHING ACCOUNTS FROM ${propfirmName.toUpperCase()}...`, color: 'yellow' }).start();
       
       try {
         const result = await conn.service.getTradingAccounts();
@@ -49,17 +49,17 @@ const showOrders = async (service) => {
               service: conn.service 
             });
           });
-          spinner.succeed(`${propfirmName}: ${result.accounts.length} account(s)`);
+          spinner.succeed(`${propfirmName.toUpperCase()}: ${result.accounts.length} ACCOUNT(S)`);
         } else {
-          spinner.warn(`${propfirmName}: No accounts`);
+          spinner.warn(`${propfirmName.toUpperCase()}: NO ACCOUNTS`);
         }
       } catch (e) {
-        spinner.fail(`${propfirmName}: Failed`);
+        spinner.fail(`${propfirmName.toUpperCase()}: FAILED`);
       }
     }
 
     if (allAccounts.length === 0) {
-      console.log(chalk.yellow('\n  No accounts found.'));
+      console.log(chalk.yellow('\n  NO ACCOUNTS FOUND.'));
       await prompts.waitForEnter();
       return;
     }
@@ -69,7 +69,7 @@ const showOrders = async (service) => {
     
     for (const account of allAccounts) {
       const accName = String(account.accountName || account.rithmicAccountId || account.accountId || 'Unknown').substring(0, 20);
-      spinner = ora({ text: `Fetching orders for ${accName}...`, color: 'yellow' }).start();
+      spinner = ora({ text: `FETCHING ORDERS FOR ${accName.toUpperCase()}...`, color: 'yellow' }).start();
       
       try {
         const result = await account.service.getOrders(account.accountId);
@@ -81,26 +81,26 @@ const showOrders = async (service) => {
               propfirm: account.propfirm 
             });
           });
-          spinner.succeed(`${accName}: ${result.orders.length} order(s)`);
+          spinner.succeed(`${accName.toUpperCase()}: ${result.orders.length} ORDER(S)`);
         } else {
-          spinner.succeed(`${accName}: No orders`);
+          spinner.succeed(`${accName.toUpperCase()}: NO ORDERS`);
         }
       } catch (e) {
-        spinner.fail(`${accName}: Failed to fetch orders`);
+        spinner.fail(`${accName.toUpperCase()}: FAILED TO FETCH ORDERS`);
       }
     }
 
-    spinner = ora({ text: 'Preparing display...', color: 'yellow' }).start();
-    spinner.succeed(`Total: ${allOrders.length} order(s)`);
+    spinner = ora({ text: 'PREPARING DISPLAY...', color: 'yellow' }).start();
+    spinner.succeed(`TOTAL: ${allOrders.length} ORDER(S)`);
     console.log();
 
     // Display
     drawBoxHeader('ORDERS', boxWidth);
 
     if (allOrders.length === 0) {
-      drawBoxRow(chalk.gray('  No orders found'), boxWidth);
+      drawBoxRow(chalk.gray('  NO ORDERS FOUND'), boxWidth);
     } else {
-      const header = '  ' + 'Symbol'.padEnd(12) + 'Side'.padEnd(6) + 'Type'.padEnd(8) + 'Qty'.padEnd(6) + 'Price'.padEnd(10) + 'Status'.padEnd(12) + 'Account';
+      const header = '  ' + 'SYMBOL'.padEnd(12) + 'SIDE'.padEnd(6) + 'TYPE'.padEnd(8) + 'QTY'.padEnd(6) + 'PRICE'.padEnd(10) + 'STATUS'.padEnd(12) + 'ACCOUNT';
       drawBoxRow(chalk.white.bold(header), boxWidth);
       drawBoxSeparator(boxWidth);
 
@@ -130,7 +130,7 @@ const showOrders = async (service) => {
     console.log();
 
   } catch (error) {
-    if (spinner) spinner.fail('Error: ' + error.message);
+    if (spinner) spinner.fail('ERROR: ' + error.message.toUpperCase());
   }
 
   await prompts.waitForEnter();

package/src/pages/positions.js

@@ -19,25 +19,25 @@ const showPositions = async (service) => {
 
   try {
     // Step 1: Get connections
-    spinner = ora({ text: 'Loading connections...', color: 'yellow' }).start();
+    spinner = ora({ text: 'LOADING CONNECTIONS...', color: 'yellow' }).start();
     
     const allConns = connections.count() > 0 
       ? connections.getAll() 
       : (service ? [{ service, propfirm: service.propfirm?.name || 'Unknown', type: 'single' }] : []);
     
     if (allConns.length === 0) {
-      spinner.fail('No connections found');
+      spinner.fail('NO CONNECTIONS FOUND');
       await prompts.waitForEnter();
       return;
     }
-    spinner.succeed(`Found ${allConns.length} connection(s)`);
+    spinner.succeed(`FOUND ${allConns.length} CONNECTION(S)`);
 
     // Step 2: Fetch accounts
     let allAccounts = [];
     
     for (const conn of allConns) {
       const propfirmName = conn.propfirm || conn.type || 'Unknown';
-      spinner = ora({ text: `Fetching accounts from ${propfirmName}...`, color: 'yellow' }).start();
+      spinner = ora({ text: `FETCHING ACCOUNTS FROM ${propfirmName.toUpperCase()}...`, color: 'yellow' }).start();
       
       try {
         const result = await conn.service.getTradingAccounts();
@@ -49,17 +49,17 @@ const showPositions = async (service) => {
               service: conn.service 
             });
           });
-          spinner.succeed(`${propfirmName}: ${result.accounts.length} account(s)`);
+          spinner.succeed(`${propfirmName.toUpperCase()}: ${result.accounts.length} ACCOUNT(S)`);
         } else {
-          spinner.warn(`${propfirmName}: No accounts`);
+          spinner.warn(`${propfirmName.toUpperCase()}: NO ACCOUNTS`);
         }
       } catch (e) {
-        spinner.fail(`${propfirmName}: Failed`);
+        spinner.fail(`${propfirmName.toUpperCase()}: FAILED`);
       }
     }
 
     if (allAccounts.length === 0) {
-      console.log(chalk.yellow('\n  No accounts found.'));
+      console.log(chalk.yellow('\n  NO ACCOUNTS FOUND.'));
       await prompts.waitForEnter();
       return;
     }
@@ -69,7 +69,7 @@ const showPositions = async (service) => {
     
     for (const account of allAccounts) {
       const accName = String(account.accountName || account.rithmicAccountId || account.accountId || 'Unknown').substring(0, 20);
-      spinner = ora({ text: `Fetching positions for ${accName}...`, color: 'yellow' }).start();
+      spinner = ora({ text: `FETCHING POSITIONS FOR ${accName.toUpperCase()}...`, color: 'yellow' }).start();
       
       try {
         const result = await account.service.getPositions(account.accountId);
@@ -81,26 +81,26 @@ const showPositions = async (service) => {
               propfirm: account.propfirm 
             });
           });
-          spinner.succeed(`${accName}: ${result.positions.length} position(s)`);
+          spinner.succeed(`${accName.toUpperCase()}: ${result.positions.length} POSITION(S)`);
         } else {
-          spinner.succeed(`${accName}: No positions`);
+          spinner.succeed(`${accName.toUpperCase()}: NO POSITIONS`);
         }
       } catch (e) {
-        spinner.fail(`${accName}: Failed to fetch positions`);
+        spinner.fail(`${accName.toUpperCase()}: FAILED TO FETCH POSITIONS`);
       }
     }
 
-    spinner = ora({ text: 'Preparing display...', color: 'yellow' }).start();
-    spinner.succeed(`Total: ${allPositions.length} position(s)`);
+    spinner = ora({ text: 'PREPARING DISPLAY...', color: 'yellow' }).start();
+    spinner.succeed(`TOTAL: ${allPositions.length} POSITION(S)`);
     console.log();
 
     // Display
     drawBoxHeader('OPEN POSITIONS', boxWidth);
 
     if (allPositions.length === 0) {
-      drawBoxRow(chalk.gray('  No open positions'), boxWidth);
+      drawBoxRow(chalk.gray('  NO OPEN POSITIONS'), boxWidth);
     } else {
-      const header = '  ' + 'Symbol'.padEnd(15) + 'Side'.padEnd(8) + 'Size'.padEnd(8) + 'Entry'.padEnd(12) + 'P&L'.padEnd(12) + 'Account';
+      const header = '  ' + 'SYMBOL'.padEnd(15) + 'SIDE'.padEnd(8) + 'SIZE'.padEnd(8) + 'ENTRY'.padEnd(12) + 'P&L'.padEnd(12) + 'ACCOUNT';
       drawBoxRow(chalk.white.bold(header), boxWidth);
       drawBoxSeparator(boxWidth);
 
@@ -131,7 +131,7 @@ const showPositions = async (service) => {
     console.log();
 
   } catch (error) {
-    if (spinner) spinner.fail('Error: ' + error.message);
+    if (spinner) spinner.fail('ERROR: ' + error.message.toUpperCase());
   }
 
   await prompts.waitForEnter();

package/src/pages/stats/index.js

@@ -198,8 +198,7 @@ const showStats = async (service) => {
     
     spinner.succeed('Stats loaded');
     console.clear();
-    displayBanner();
-    console.log();
+    displayBanner();  // Banner always closed
     
     // Calculate stats from API data
     const stats = aggregateStats(activeAccounts, accountData.allTrades);

package/src/pages/user.js

@@ -26,7 +26,7 @@ const showUserInfo = async (service) => {
 
   try {
     // Step 1: Get user info
-    spinner = ora({ text: 'Loading user info...', color: 'yellow' }).start();
+    spinner = ora({ text: 'LOADING USER INFO...', color: 'yellow' }).start();
     
     let userInfo = null;
     
@@ -39,10 +39,10 @@ const showUserInfo = async (service) => {
       } catch (e) {}
     }
     
-    spinner.succeed('User info loaded');
+    spinner.succeed('USER INFO LOADED');
 
     // Step 2: Get account count
-    spinner = ora({ text: 'Counting accounts...', color: 'yellow' }).start();
+    spinner = ora({ text: 'COUNTING ACCOUNTS...', color: 'yellow' }).start();
     
     let accountCount = 0;
     
@@ -58,14 +58,14 @@ const showUserInfo = async (service) => {
       } catch (e) {}
     }
     
-    spinner.succeed(`Found ${accountCount} account(s)`);
+    spinner.succeed(`FOUND ${accountCount} ACCOUNT(S)`);
     console.log();
 
     // Display
     drawBoxHeader('USER INFO', boxWidth);
 
     if (!userInfo) {
-      console.log(chalk.cyan('║') + padText(chalk.gray('  No user info available'), boxWidth - 2) + chalk.cyan('║'));
+      console.log(chalk.cyan('║') + padText(chalk.gray('  NO USER INFO AVAILABLE'), boxWidth - 2) + chalk.cyan('║'));
     } else {
       draw2ColHeader('PROFILE', 'CONNECTIONS', boxWidth);
 
@@ -90,7 +90,7 @@ const showUserInfo = async (service) => {
     console.log();
 
   } catch (error) {
-    if (spinner) spinner.fail('Error: ' + error.message);
+    if (spinner) spinner.fail('ERROR: ' + error.message.toUpperCase());
   }
 
   await prompts.waitForEnter();

package/src/ui/box.js

@@ -10,23 +10,19 @@ let logoWidth = null;
 
 /**
  * Get logo width for consistent box sizing
+ * Fixed width of 98 to match HQX banner (logo 88 + X 8 + padding 2)
  * Adapts to terminal width for mobile devices
  */
 const getLogoWidth = () => {
-  const termWidth = process.stdout.columns || 80;
+  const termWidth = process.stdout.columns || 100;
   
   // Mobile: use terminal width
   if (termWidth < 60) {
     return Math.max(termWidth - 2, 40);
   }
   
-  // Desktop: use logo width
-  if (!logoWidth) {
-    const logoText = figlet.textSync('HEDGEQUANTX', { font: 'ANSI Shadow' });
-    const lines = logoText.split('\n').filter(line => line.trim().length > 0);
-    logoWidth = Math.max(...lines.map(line => line.length)) + 4;
-  }
-  return Math.min(logoWidth, termWidth - 2);
+  // Desktop: fixed width 98 to match banner
+  return Math.min(98, termWidth - 2);
 };
 
 /**
@@ -97,7 +93,7 @@ const drawBoxSeparator = (width) => {
 const printLogo = () => {
   const logoText = figlet.textSync('HEDGEQUANTX', { font: 'ANSI Shadow' });
   console.log(chalk.cyan(logoText));
-  console.log(chalk.gray.italic('  Prop Futures Algo Trading CLI'));
+  console.log(chalk.gray.italic('  PROP FUTURES ALGO TRADING CLI'));
   console.log();
 };
 

package/src/ui/index.js

@@ -26,10 +26,9 @@ const {
 const { createBoxMenu } = require('./menu');
 
 /**
- * Display HQX Banner (without closing border by default)
- * @param {boolean} closed - If true, add bottom border
+ * Display HQX Banner - ALWAYS closed with bottom border
  */
-const displayBanner = (closed = false) => {
+const displayBanner = () => {
   const termWidth = process.stdout.columns || 100;
   const isMobile = termWidth < 60;
   const boxWidth = isMobile ? Math.max(termWidth - 2, 40) : Math.max(getLogoWidth(), 98);
@@ -70,13 +69,11 @@ const displayBanner = (closed = false) => {
   }
   
   console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
-  const tagline = isMobile ? `HQX v${version}` : `Prop Futures Algo Trading  v${version}`;
+  const tagline = isMobile ? `HQX V${version}` : `PROP FUTURES ALGO TRADING  V${version}`;
   console.log(chalk.cyan('║') + chalk.white(centerText(tagline, innerWidth)) + chalk.cyan('║'));
   
-  // Close the box if requested
-  if (closed) {
-    console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
-  }
+  // ALWAYS close the banner
+  console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
 };
 
 /**

package/src/ui/menu.js

@@ -48,7 +48,7 @@ const createBoxMenu = async (title, items, options = {}) => {
     });
     
     console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
-    console.log(chalk.cyan('║') + chalk.white(centerText(`Prop Futures Algo Trading  v${version}`, innerWidth)) + chalk.cyan('║'));
+    console.log(chalk.cyan('║') + chalk.white(centerText(`PROP FUTURES ALGO TRADING  V${version}`, innerWidth)) + chalk.cyan('║'));
     
     // Stats bar if provided
     if (options.statsLine) {
@@ -81,7 +81,7 @@ const createBoxMenu = async (title, items, options = {}) => {
         const isSelected = index === selectedIndex;
         const prefix = isSelected ? chalk.white('▸ ') : '  ';
         const color = item.disabled ? chalk.gray : (item.color || chalk.cyan);
-        const label = item.label + (item.disabled ? ' (Coming Soon)' : '');
+        const label = item.label.toUpperCase() + (item.disabled ? ' (COMING SOON)' : '');
         const text = prefix + color(label);
         const visLen = text.replace(/\x1b\[[0-9;]*m/g, '').length;
         const padding = innerWidth - visLen;
@@ -96,8 +96,8 @@ const createBoxMenu = async (title, items, options = {}) => {
     
     // Footer
     console.log(chalk.cyan('╠' + '─'.repeat(innerWidth) + '╣'));
-    const footerText = options.footerText || 'Use ↑↓ arrows to navigate, Enter to select';
-    console.log(chalk.cyan('║') + chalk.gray(centerText(footerText, innerWidth)) + chalk.cyan('║'));
+    const footerText = options.footerText || 'USE ↑↓ ARROWS TO NAVIGATE, ENTER TO SELECT';
+    console.log(chalk.cyan('║') + chalk.gray(centerText(footerText.toUpperCase(), innerWidth)) + chalk.cyan('║'));
     console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
   };