hedgequantx 2.9.19 → 2.9.21

package/package.json

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

package/src/app.js

@@ -7,7 +7,7 @@ const chalk = require('chalk');
 const ora = require('ora');
 
 const { connections } = require('./services');
-const { getLogoWidth, centerText, prepareStdin, clearScreen } = require('./ui');
+const { getLogoWidth, centerText, prepareStdin } = require('./ui');
 const { logger, prompts } = require('./utils');
 const { setCachedStats, clearCachedStats } = require('./services/stats-cache');
 
@@ -17,7 +17,6 @@ const log = logger.scope('App');
 const { showStats } = require('./pages/stats');
 const { showAccounts } = require('./pages/accounts');
 const { algoTradingMenu } = require('./pages/algo');
-const { aiAgentsMenu, getActiveAgentCount } = require('./pages/ai-agents');
 
 // Menus
 const { rithmicMenu, dashboardMenu, handleUpdate } = require('./menus');
@@ -30,7 +29,7 @@ let currentService = null;
 
 const restoreTerminal = () => {
   try {
-    // Show cursor
+    process.stdout.write('\x1B[?1049l');
     process.stdout.write('\x1B[?25h');
     if (process.stdin.isTTY && process.stdin.isRaw) {
       process.stdin.setRawMode(false);
@@ -42,15 +41,7 @@ const restoreTerminal = () => {
 };
 
 process.on('exit', restoreTerminal);
-process.on('SIGINT', () => { 
-  restoreTerminal();
-  // Draw bottom border before exit
-  const termWidth = process.stdout.columns || 100;
-  const boxWidth = termWidth < 60 ? Math.max(termWidth - 2, 40) : Math.max(getLogoWidth(), 98);
-  console.log(chalk.cyan('\n╚' + '═'.repeat(boxWidth - 2) + '╝'));
-  console.log(chalk.gray('GOODBYE!'));
-  process.exit(0);
-});
+process.on('SIGINT', () => { restoreTerminal(); process.exit(0); });
 process.on('SIGTERM', () => { restoreTerminal(); process.exit(0); });
 
 process.on('uncaughtException', (err) => {
@@ -101,7 +92,6 @@ const refreshStats = async () => {
       balance: hasBalanceData ? totalBalance : null,
       pnl: hasPnlData ? totalPnl : null,
       pnlPercent: null,
-      agents: getActiveAgentCount(),
     });
   } catch (err) {
     log.warn('Failed to refresh stats', { error: err.message });
@@ -111,7 +101,7 @@ const refreshStats = async () => {
 // ==================== BANNER ====================
 
 const banner = async () => {
-  clearScreen();
+  console.clear();
   
   const termWidth = process.stdout.columns || 100;
   const isMobile = termWidth < 60;
@@ -133,11 +123,8 @@ const banner = async () => {
 
   console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
   
-  const tagline = isMobile ? `HQX V${version}` : `PROP FUTURES ALGO TRADING  V${version}`;
-  console.log(chalk.cyan('║') + chalk.yellow(centerText(tagline, innerWidth)) + chalk.cyan('║'));
-  
-  // ALWAYS close the banner
-  console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
+  const tagline = isMobile ? `HQX v${version}` : `Prop Futures Algo Trading  v${version}`;
+  console.log(chalk.cyan('║') + chalk.white(centerText(tagline, innerWidth)) + chalk.cyan('║'));
 };
 
 const getFullLogo = () => [
@@ -158,37 +145,39 @@ const getMobileLogo = () => [
   ['╚═╝  ╚═╝ ╚══▀▀═╝ ', '╚═╝  ╚═╝'],
 ];
 
+const bannerClosed = async () => {
+  await banner();
+  const termWidth = process.stdout.columns || 100;
+  const boxWidth = termWidth < 60 ? Math.max(termWidth - 2, 40) : Math.max(getLogoWidth(), 98);
+  console.log(chalk.cyan('╚' + '═'.repeat(boxWidth - 2) + '╝'));
+};
+
 // ==================== MAIN LOOP ====================
 
 const run = async () => {
   try {
     log.info('Starting HQX CLI');
-    
-    // First launch - show banner then try restore session
-    await banner();
-    
-    const spinner = ora({ text: 'LOADING DASHBOARD...', color: 'yellow' }).start();
-    
+    await bannerClosed();
+
+    // Restore session
+    const spinner = ora({ text: 'Testing connections...', color: 'yellow' }).start();
     const restored = await connections.restoreFromStorage();
 
     if (restored) {
+      spinner.succeed('Connected');
       currentService = connections.getAll()[0].service;
       await refreshStats();
-      // Store spinner globally - dashboard will stop it when ready to display
-      global.__hqxSpinner = spinner;
     } else {
-      spinner.stop(); // Stop spinner - no session to restore
-      global.__hqxSpinner = null;
+      spinner.info('No saved connections');
     }
 
     // Main loop
     while (true) {
       try {
         prepareStdin();
+        await banner();
 
         if (!connections.isConnected()) {
-          // Not connected - show banner + propfirm selection
-          await banner();
           // Not connected - show propfirm selection directly
           const boxWidth = getLogoWidth();
           const innerWidth = boxWidth - 2;
@@ -199,14 +188,13 @@ const run = async () => {
           
           // Find max name length for alignment
           const maxNameLen = Math.max(...numbered.map(n => n.name.length));
-          const itemWidth = 4 + 1 + maxNameLen; // [##] + space + name
-          const gap = 3; // gap between columns
-          const totalContentWidth = (itemWidth * numCols) + (gap * (numCols - 1));
+          const colWidth = 4 + 1 + maxNameLen + 2; // [##] + space + name + gap
+          const totalContentWidth = numCols * colWidth;
+          const leftMargin = Math.max(2, Math.floor((innerWidth - totalContentWidth) / 2));
           
-          // New rectangle (banner is always closed)
-          console.log(chalk.cyan('╔' + '═'.repeat(innerWidth) + '╗'));
-          console.log(chalk.cyan('║') + chalk.white.bold(centerText('SELECT PROPFIRM', innerWidth)) + chalk.cyan('║'));
           console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
+          console.log(chalk.cyan('║') + chalk.white.bold(centerText('SELECT PROPFIRM', innerWidth)) + chalk.cyan('║'));
+          console.log(chalk.cyan('║') + ' '.repeat(innerWidth) + chalk.cyan('║'));
           
           const rows = Math.ceil(numbered.length / numCols);
           for (let row = 0; row < rows; row++) {
@@ -223,32 +211,29 @@ const run = async () => {
               }
             }
             
-            // Build line content
-            let content = '';
+            let line = ' '.repeat(leftMargin);
             for (let i = 0; i < lineParts.length; i++) {
               if (lineParts[i]) {
-                content += chalk.cyan(lineParts[i].num) + ' ' + chalk.white(lineParts[i].name);
+                line += chalk.cyan(lineParts[i].num) + ' ' + chalk.white(lineParts[i].name);
               } else {
-                content += ' '.repeat(itemWidth);
+                line += ' '.repeat(4 + 1 + maxNameLen);
               }
-              if (i < lineParts.length - 1) content += ' '.repeat(gap);
+              if (i < lineParts.length - 1) line += '  ';
             }
             
-            // Center the content
-            const contentLen = content.replace(/\x1b\[[0-9;]*m/g, '').length;
-            const leftPad = Math.floor((innerWidth - contentLen) / 2);
-            const rightPad = innerWidth - contentLen - leftPad;
-            console.log(chalk.cyan('║') + ' '.repeat(leftPad) + content + ' '.repeat(rightPad) + chalk.cyan('║'));
+            const lineLen = line.replace(/\x1b\[[0-9;]*m/g, '').length;
+            const rightPad = Math.max(0, innerWidth - lineLen);
+            console.log(chalk.cyan('║') + line + ' '.repeat(rightPad) + chalk.cyan('║'));
           }
           
           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 (1-' + numbered.length + '/X): '));
+          const input = await prompts.textInput(chalk.cyan('Select number (or X):'));
           
           if (!input || input.toLowerCase() === 'x') {
-            console.log(chalk.gray('GOODBYE!'));
+            console.log(chalk.gray('Goodbye!'));
             process.exit(0);
           }
           
@@ -259,26 +244,26 @@ const run = async () => {
             const credentials = await loginPrompt(selectedPropfirm.name);
             
             if (credentials) {
-              const spinner = ora({ text: 'CONNECTING TO RITHMIC...', color: 'yellow' }).start();
+              const spinner = ora({ text: 'Connecting to Rithmic...', color: 'yellow' }).start();
               try {
                 const { RithmicService } = require('./services/rithmic');
                 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.toUpperCase()} (${accResult.accounts?.length || 0} ACCOUNTS)`);
+                  spinner.succeed(`Connected to ${service.propfirm.name} (${accResult.accounts?.length || 0} accounts)`);
                   currentService = service;
                   await refreshStats();
                   await new Promise(r => setTimeout(r, 1500));
                 } else {
-                  spinner.fail((result.error || 'AUTHENTICATION FAILED').toUpperCase());
+                  spinner.fail(result.error || 'Authentication failed');
                   await new Promise(r => setTimeout(r, 2000));
                 }
               } catch (error) {
-                spinner.fail(`CONNECTION ERROR: ${error.message.toUpperCase()}`);
+                spinner.fail(`Connection error: ${error.message}`);
                 await new Promise(r => setTimeout(r, 2000));
               }
             }
@@ -311,20 +296,13 @@ const run = async () => {
               try {
                 await algoTradingMenu(currentService);
               } catch (err) {
-                console.log(chalk.red(`  ALGO ERROR: ${err.message.toUpperCase()}`));
+                console.log(chalk.red(`  Algo error: ${err.message}`));
                 prepareStdin();
               }
               break;
 
-            case 'aiagents':
-              await aiAgentsMenu();
-              break;
-
             case 'update':
-              const updateResult = await handleUpdate();
-              if (updateResult === 'exit') {
-                running = false;
-              }
+              await handleUpdate();
               break;
 
             case 'disconnect':

package/src/lib/m/hqx-2b.js

@@ -0,0 +1,7 @@
+'use strict';
+// Load from private sources (dev mode) or compiled (prod mode)
+try {
+  module.exports = require('../../../dist/lib/m/hqx-2b.jsc');
+} catch (e) {
+  module.exports = require('../../../private/strategies/hqx-2b-liquidity-sweep');
+}

package/src/lib/m/index.js

@@ -0,0 +1,138 @@
+/**
+ * Strategy Registry - Available Trading Strategies
+ * 
+ * All strategies are compiled to bytecode (.jsc) for protection.
+ * This module provides a unified interface to load strategies.
+ */
+
+const path = require('path');
+
+// =============================================================================
+// AVAILABLE STRATEGIES
+// =============================================================================
+
+const STRATEGIES = {
+  'ultra-scalping': {
+    id: 'ultra-scalping',
+    name: 'HQX Ultra Scalping',
+    description: '6 Mathematical Models (Z-Score, VPIN, Kyle, Kalman, Vol, OFI)',
+    version: '2.0',
+    backtest: {
+      pnl: '$2,012,373',
+      winRate: '71.1%',
+      trades: '146,685',
+      period: 'Jan 2020 - Nov 2025'
+    },
+    params: {
+      stopTicks: 8,
+      targetTicks: 16,
+      riskReward: '1:2'
+    },
+    loader: () => require('./ultra-scalping')
+  },
+  
+  'hqx-2b': {
+    id: 'hqx-2b',
+    name: 'HQX-2B Liquidity Sweep',
+    description: '2B Pattern with Liquidity Zone Sweeps (Optimized)',
+    version: '1.0',
+    backtest: {
+      pnl: '$6,601,305',
+      winRate: '82.8%',
+      trades: '100,220',
+      period: 'Dec 2020 - Nov 2025'
+    },
+    params: {
+      stopTicks: 10,
+      targetTicks: 40,
+      riskReward: '1:4'
+    },
+    loader: () => require('./hqx-2b')
+  }
+};
+
+// =============================================================================
+// EXPORTS
+// =============================================================================
+
+/**
+ * Get list of available strategies
+ * @returns {Array} List of strategy info objects
+ */
+function getAvailableStrategies() {
+  return Object.values(STRATEGIES).map(s => ({
+    id: s.id,
+    name: s.name,
+    description: s.description,
+    version: s.version,
+    backtest: s.backtest,
+    params: s.params
+  }));
+}
+
+/**
+ * Get strategy by ID
+ * @param {string} strategyId - Strategy identifier
+ * @returns {Object|null} Strategy info or null if not found
+ */
+function getStrategy(strategyId) {
+  return STRATEGIES[strategyId] || null;
+}
+
+/**
+ * Load strategy module by ID
+ * Returns normalized module with M1 as the strategy class
+ * @param {string} strategyId - Strategy identifier
+ * @returns {Object} Strategy module with M1 class
+ */
+function loadStrategy(strategyId) {
+  const strategy = STRATEGIES[strategyId];
+  if (!strategy) {
+    throw new Error(`Strategy not found: ${strategyId}`);
+  }
+  
+  let module;
+  try {
+    module = strategy.loader();
+  } catch (e) {
+    // If compiled bytecode not found, try to load from private sources (dev mode)
+    if (e.code === 'MODULE_NOT_FOUND') {
+      try {
+        const devPath = path.join(__dirname, '../../../private/strategies', 
+          strategyId === 'ultra-scalping' ? 'ultra-scalping.js' : 'hqx-2b-liquidity-sweep.js'
+        );
+        module = require(devPath);
+      } catch (devErr) {
+        throw new Error(`Failed to load strategy ${strategyId}: ${e.message}`);
+      }
+    } else {
+      throw e;
+    }
+  }
+  
+  // Normalize: always return { M1: StrategyClass }
+  // Ultra Scalping exports M1, HQX-2B exports M2
+  if (module.M1) {
+    return module;
+  } else if (module.M2) {
+    return { M1: module.M2, ...module };
+  } else {
+    throw new Error(`Strategy ${strategyId} has no valid strategy class (M1 or M2)`);
+  }
+}
+
+/**
+ * Get default strategy ID
+ * @returns {string} Default strategy ID
+ */
+function getDefaultStrategy() {
+  return 'ultra-scalping';
+}
+
+module.exports = {
+  STRATEGIES,
+  getAvailableStrategies,
+  getStrategy,
+  loadStrategy,
+  getDefaultStrategy
+};

package/src/lib/m/ultra-scalping.js

@@ -0,0 +1,7 @@
+'use strict';
+// Load from private sources (dev mode) or compiled (prod mode)
+try {
+  module.exports = require('../../../dist/lib/m/ultra-scalping.jsc');
+} catch (e) {
+  module.exports = require('../../../private/strategies/ultra-scalping');
+}

package/src/menus/connect.js

@@ -8,7 +8,7 @@ const ora = require('ora');
 const { connections } = require('../services');
 const { RithmicService } = require('../services/rithmic');
 const { PROPFIRM_CHOICES } = require('../config');
-const { getLogoWidth, centerText, prepareStdin, displayBanner , clearScreen } = require('../ui');
+const { getLogoWidth, centerText, prepareStdin } = require('../ui');
 const { validateUsername, validatePassword } = require('../security');
 const { prompts } = require('../utils');
 
@@ -18,16 +18,16 @@ const { prompts } = require('../utils');
 const loginPrompt = async (propfirmName) => {
   prepareStdin();
   console.log();
-  console.log(chalk.cyan(`CONNECTING TO ${propfirmName.toUpperCase()}...`));
+  console.log(chalk.cyan(`Connecting to ${propfirmName}...`));
   console.log();
 
-  const username = await prompts.textInput('USERNAME:', '', (input) => {
-    try { validateUsername(input); return undefined; } catch (e) { return e.message.toUpperCase(); }
+  const username = await prompts.textInput('Username:', '', (input) => {
+    try { validateUsername(input); return undefined; } catch (e) { return e.message; }
   });
   if (!username) return null;
   
-  const pwd = await prompts.passwordInput('PASSWORD:', (input) => {
-    try { validatePassword(input); return undefined; } catch (e) { return e.message.toUpperCase(); }
+  const pwd = await prompts.passwordInput('Password:', (input) => {
+    try { validatePassword(input); return undefined; } catch (e) { return e.message; }
   });
   if (!pwd) return null;
 
@@ -38,10 +38,6 @@ const loginPrompt = async (propfirmName) => {
  * Rithmic menu - Main connection menu
  */
 const rithmicMenu = async () => {
-  // Clear screen and show banner
-  clearScreen();
-  displayBanner();
-  
   const propfirms = PROPFIRM_CHOICES;
   const boxWidth = getLogoWidth();
   const innerWidth = boxWidth - 2;
@@ -50,6 +46,7 @@ const rithmicMenu = async () => {
   
   const numbered = propfirms.map((pf, i) => ({ num: i + 1, key: pf.value, name: pf.name }));
   
+  console.log();
   console.log(chalk.cyan('╔' + '═'.repeat(innerWidth) + '╗'));
   console.log(chalk.cyan('║') + chalk.white.bold(centerText('SELECT PROPFIRM', innerWidth)) + chalk.cyan('║'));
   console.log(chalk.cyan('║') + ' '.repeat(innerWidth) + chalk.cyan('║'));
@@ -74,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);
@@ -87,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.toUpperCase()} (${accResult.accounts?.length || 0} ACCOUNTS)`);
+      spinner.succeed(`Connected to ${service.propfirm.name} (${accResult.accounts?.length || 0} accounts)`);
       await new Promise(r => setTimeout(r, 1500));
       return service;
     } else {
-      spinner.fail((result.error || 'AUTHENTICATION FAILED').toUpperCase());
+      spinner.fail(result.error || 'Authentication failed');
       await new Promise(r => setTimeout(r, 2000));
       return null;
     }
   } catch (error) {
-    spinner.fail(`CONNECTION ERROR: ${error.message.toUpperCase()}`);
+    spinner.fail(`Connection error: ${error.message}`);
     await new Promise(r => setTimeout(r, 2000));
     return null;
   }