hedgequantx 1.2.147 → 1.3.1

package/README.md

@@ -11,7 +11,7 @@
 
 **Prop Futures Algo Trading CLI**
 
-A powerful command-line interface for connecting to prop trading firms and managing your futures trading accounts.
+A powerful command-line interface for connecting to prop trading firms and managing your futures trading accounts with automated algo trading capabilities.
 
 [![npm version](https://img.shields.io/npm/v/hedgequantx.svg)](https://www.npmjs.com/package/hedgequantx)
 [![npm downloads](https://img.shields.io/npm/dm/hedgequantx.svg)](https://www.npmjs.com/package/hedgequantx)
@@ -20,12 +20,14 @@ A powerful command-line interface for connecting to prop trading firms and manag
 
 ## Features
 
-- Multi-platform support (ProjectX, Tradovate, Rithmic)
-- 37 supported prop firms
-- Multi-account connections
-- Real-time stats (balance, P&L, positions)
-- Secure encrypted session storage
-- Auto-update with restart
+- **Multi-platform support** - ProjectX, Rithmic, Tradovate
+- **37+ supported prop firms**
+- **Multi-account connections** - Connect multiple accounts simultaneously
+- **Real-time stats** - Balance, P&L, positions, orders
+- **Algo Trading** - One Account & Copy Trading modes
+- **HQX Server** - Cloud-based execution engine
+- **Secure sessions** - AES-256-GCM encrypted storage
+- **Auto-update** - Built-in update with restart
 
 ---
 
@@ -63,11 +65,33 @@ hedgequantx version
 
 ---
 
-## Supported Prop Firms (37)
+## Algo Trading Modes
+
+### One Account Mode
+Trade on a single account with automated signals and risk management.
+
+- Symbol selection (ES, NQ, MNQ, etc.)
+- Configurable contracts quantity
+- Daily target and max risk limits
+- Real-time P&L tracking
+- Activity log with trade history
+
+### Copy Trading Mode
+Mirror trades from a Lead account to Follower accounts.
+
+- Lead -> Follower trade copying
+- Different symbols per account
+- Configurable contract ratios
+- Privacy mode (hide account names)
+- Low-latency execution via HQX Server
+
+---
+
+## Supported Prop Firms (37+)
 
 | ProjectX (19) | Rithmic (16) | Tradovate (2) |
 |---------------|--------------|---------------|
-| TopStep | Apex | Apex |
+| TopStep | Apex Trader Funding | Apex |
 | Alpha Futures | TopstepTrader | TakeProfitTrader |
 | TickTickTrader | MES Capital | |
 | Bulenox | Bulenox | |
@@ -87,51 +111,46 @@ hedgequantx version
 | Lucid Trading | | |
 | Tradeify | | |
 
-> **Note:** ProjectX firms are fully supported. Rithmic and Tradovate coming soon.
-
 ---
 
 ## Dashboard Features
 
 - **View Accounts** - List all trading accounts with balance and status
-- **View Positions** - Open positions with P&L
-- **View Orders** - Pending and filled orders
 - **View Stats** - Trading metrics, equity curve, P&L calendar
-- **User Info** - Account details
 - **Add Prop-Account** - Connect multiple prop firms
-- **Algo-Trading** - Automated trading (coming soon)
-- **Update HQX** - Auto-update with restart
+- **Algo-Trading** - One Account & Copy Trading modes
+- **Update HQX** - Auto-update with confirmation and restart
 
 ---
 
 ## Screenshots
 
+### Main Dashboard
 ```
-╔══════════════════════════════════════════════════════════════════════════════════════════════╗
-║██╗  ██╗███████╗██████╗  ██████╗ ███████╗ ██████╗ ██╗   ██╗ █████╗ ███╗   ██╗████████╗██╗  ██╗║
-║██║  ██║██╔════╝██╔══██╗██╔════╝ ██╔════╝██╔═══██╗██║   ██║██╔══██╗████╗  ██║╚══██╔══╝╚██╗██╔╝║
-║███████║█████╗  ██║  ██║██║  ███╗█████╗  ██║   ██║██║   ██║███████║██╔██╗ ██║   ██║    ╚███╔╝ ║
-║██╔══██║██╔══╝  ██║  ██║██║   ██║██╔══╝  ██║▄▄ ██║██║   ██║██╔══██║██║╚██╗██║   ██║    ██╔██╗ ║
-║██║  ██║███████╗██████╔╝╚██████╔╝███████╗╚██████╔╝╚██████╔╝██║  ██║██║ ╚████║   ██║   ██╔╝ ██╗║
-║╚═╝  ╚═╝╚══════╝╚═════╝  ╚═════╝ ╚══════╝ ╚══▀▀═╝  ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═══╝   ╚═╝   ╚═╝  ╚═╝║
-╠══════════════════════════════════════════════════════════════════════════════════════════════╣
-║                              Prop Futures Algo Trading  v1.2.0                               ║
-╠══════════════════════════════════════════════════════════════════════════════════════════════╣
-║         Connections: 1    Accounts: 2    Balance: $299,776    P&L: $-223 (-0.1%)             ║
-╚══════════════════════════════════════════════════════════════════════════════════════════════╝
-
-? Dashboard:
-  > View Accounts
-    View Positions
-    View Orders
-    View Stats
-    User Info
-    Add Prop-Account
-    ──────────────
-    Algo-Trading
-    ──────────────
-    Update HQX
-    Disconnect
+╔════════════════════════════════════════════════════════════════════════════════════════════════╗
+║ ██╗  ██╗███████╗██████╗  ██████╗ ███████╗ ██████╗ ██╗   ██╗ █████╗ ███╗   ██╗████████╗██╗  ██╗ ║
+║ ██║  ██║██╔════╝██╔══██╗██╔════╝ ██╔════╝██╔═══██╗██║   ██║██╔══██╗████╗  ██║╚══██╔══╝╚██╗██╔╝ ║
+║ ███████║█████╗  ██║  ██║██║  ███╗█████╗  ██║   ██║██║   ██║███████║██╔██╗ ██║   ██║    ╚███╔╝  ║
+║ ██╔══██║██╔══╝  ██║  ██║██║   ██║██╔══╝  ██║▄▄ ██║██║   ██║██╔══██║██║╚██╗██║   ██║    ██╔██╗  ║
+║ ██║  ██║███████╗██████╔╝╚██████╔╝███████╗╚██████╔╝╚██████╔╝██║  ██║██║ ╚████║   ██║   ██╔╝ ██╗ ║
+║ ╚═╝  ╚═╝╚══════╝╚═════╝  ╚═════╝ ╚══════╝ ╚══▀▀═╝  ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═══╝   ╚═╝   ╚═╝  ╚═╝ ║
+╠════════════════════════════════════════════════════════════════════════════════════════════════╣
+║                                Prop Futures Algo Trading  v1.3.0                               ║
+╠════════════════════════════════════════════════════════════════════════════════════════════════╣
+║         Connections: 2    Accounts: 3    Balance: $601,526    P&L: +$1,526 (+0.3%)             ║
+╚════════════════════════════════════════════════════════════════════════════════════════════════╝
+
+╔════════════════════════════════════════════════════════════════════════════════════════════════╗
+║                                      Welcome, HQX Trader!                                      ║
+╠════════════════════════════════════════════════════════════════════════════════════════════════╣
+║ ┌────────────────────────────────────────────┐  ┌────────────────────────────────────────────┐ ║
+║ │                  TopStep                   │  │            Apex Trader Funding             │ ║
+║ └────────────────────────────────────────────┘  └────────────────────────────────────────────┘ ║
+╠════════════════════════════════════════════════════════════════════════════════════════════════╣
+║  [1] View Accounts                               [2] View Stats                                ║
+║  [+] Add Prop-Account                            [A] Algo-Trading                              ║
+║  [U] Update HQX                                  [X] Disconnect                                ║
+╚════════════════════════════════════════════════════════════════════════════════════════════════╝
 ```
 
 ---
@@ -141,27 +160,32 @@ hedgequantx version
 ```
 HQX-CLI/
 ├── bin/
-│   └── cli.js                # Entry point
+│   └── cli.js                  # Entry point
 ├── src/
-│   ├── app.js                # Main router
+│   ├── app.js                  # Main router (380 lines)
 │   ├── config/
-│   │   ├── index.js
-│   │   ├── constants.js
-│   │   └── propfirms.js      # 37 PropFirms config
+│   │   ├── constants.js        # Futures symbols
+│   │   └── propfirms.js        # 37+ PropFirms config
+│   ├── menus/
+│   │   ├── connect.js          # Connection menus
+│   │   └── dashboard.js        # Dashboard & update
 │   ├── pages/
+│   │   ├── algo/
+│   │   │   ├── ui.js           # Algo trading UI
+│   │   │   ├── one-account.js  # One Account mode
+│   │   │   └── copy-trading.js # Copy Trading mode
 │   │   ├── accounts.js
-│   │   ├── orders.js
-│   │   ├── positions.js
-│   │   ├── stats.js
-│   │   └── user.js
+│   │   └── stats.js
 │   ├── security/
-│   │   ├── encryption.js     # AES-256-GCM
-│   │   ├── validation.js     # Input sanitization
-│   │   └── rateLimit.js      # API rate limiting
+│   │   ├── encryption.js       # AES-256-GCM
+│   │   ├── validation.js       # Input sanitization
+│   │   └── rateLimit.js        # API rate limiting
 │   ├── services/
-│   │   ├── projectx.js       # ProjectX API
-│   │   ├── session.js        # Encrypted sessions
-│   │   └── hqx-server.js     # HQX Server API
+│   │   ├── projectx/           # ProjectX API
+│   │   ├── rithmic/            # Rithmic API
+│   │   ├── tradovate/          # Tradovate API
+│   │   ├── hqx-server.js       # HQX Server API
+│   │   └── session.js          # Encrypted sessions
 │   └── ui/
 │       ├── box.js
 │       ├── table.js
@@ -179,6 +203,7 @@ HQX-CLI/
 - Input validation and sanitization
 - API rate limiting
 - Secure file permissions (0600)
+- No credentials stored in plain text
 
 ---
 
@@ -186,34 +211,53 @@ HQX-CLI/
 
 The CLI has a built-in update feature:
 
-1. Select **Update HQX** from the dashboard
-2. CLI pulls latest changes from GitHub
-3. Installs dependencies
-4. Auto-restarts with new version
+1. Select **[U] Update HQX** from the dashboard
+2. CLI checks npm registry for latest version
+3. Prompts for confirmation before updating
+4. Installs new version globally
+5. Auto-restarts with new version
 
 Or manually:
 
 ```bash
-cd ~/HQX-CLI && git pull origin main
+npm install -g hedgequantx@latest
 ```
 
 ---
 
+## Changelog
+
+### v1.3.0
+- Major refactoring for maintainability
+- Robust update function with confirmation
+- Fixed stdin leak in menus
+- Split services into modules
+- Algo UI: logs now show newest at bottom
+
+### v1.2.x
+- Algo Trading: One Account & Copy Trading modes
+- HQX Server integration
+- Rithmic full support
+- Multi-account dashboard
+- Privacy mode for account names
+
+---
+
 ## Roadmap
 
 - [x] ProjectX integration
-- [x] Multi-propfirm support (37 firms)
-- [x] Account viewing
-- [x] Position viewing
-- [x] Order viewing
+- [x] Rithmic integration
+- [x] Multi-propfirm support (37+ firms)
+- [x] Multi-account connections
 - [x] Stats with equity curve
 - [x] Encrypted sessions
-- [x] Multi-account connections
-- [ ] Rithmic integration
-- [ ] Tradovate integration
-- [ ] Algo trading engine
-- [ ] Real-time market data
-- [ ] Order placement
+- [x] Algo Trading - One Account mode
+- [x] Algo Trading - Copy Trading mode
+- [x] HQX Server integration
+- [ ] Tradovate full integration
+- [ ] Real-time market data streaming
+- [ ] Advanced order types
+- [ ] Mobile companion app
 
 ---
 

package/package.json

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

package/src/app.js

@@ -8,7 +8,7 @@ const inquirer = require('inquirer');
 const ora = require('ora');
 
 const { connections } = require('./services');
-const { getLogoWidth, centerText } = require('./ui');
+const { getLogoWidth, centerText, prepareStdin } = require('./ui');
 
 // Pages
 const { showStats } = require('./pages/stats');
@@ -42,27 +42,6 @@ const restoreTerminal = () => {
   }
 };
 
-/**
- * Ensure stdin is ready for inquirer prompts
- * This fixes input leaking to bash after session restore
- */
-const prepareStdin = () => {
-  try {
-    // Remove any raw mode that might be left from previous operations
-    if (process.stdin.isTTY && process.stdin.isRaw) {
-      process.stdin.setRawMode(false);
-    }
-    // Remove any lingering keypress listeners
-    process.stdin.removeAllListeners('keypress');
-    process.stdin.removeAllListeners('data');
-    // Pause stdin so inquirer can take control
-    process.stdin.pause();
-    // Small delay to let event loop settle
-  } catch (e) {
-    // Ignore errors
-  }
-};
-
 // Register global handlers to restore terminal on exit/crash
 process.on('exit', restoreTerminal);
 process.on('SIGINT', () => { restoreTerminal(); process.exit(0); });

package/src/menus/connect.js

@@ -11,7 +11,7 @@ const { ProjectXService, connections } = require('../services');
 const { RithmicService } = require('../services/rithmic');
 const { TradovateService } = require('../services/tradovate');
 const { getPropFirmsByPlatform } = require('../config');
-const { getDevice, getLogoWidth, centerText } = require('../ui');
+const { getDevice, getLogoWidth, centerText, prepareStdin } = require('../ui');
 const { validateUsername, validatePassword } = require('../security');
 
 /**
@@ -20,6 +20,7 @@ const { validateUsername, validatePassword } = require('../security');
  * @returns {Promise<{username: string, password: string}>}
  */
 const loginPrompt = async (propfirmName) => {
+  prepareStdin();
   const device = getDevice();
   console.log();
   console.log(chalk.cyan(`Connecting to ${propfirmName}...`));

package/src/menus/dashboard.js

@@ -9,13 +9,16 @@ const ora = require('ora');
 const { execSync, spawn } = require('child_process');
 
 const { connections } = require('../services');
-const { getLogoWidth, centerText } = require('../ui');
+const { getLogoWidth, centerText, prepareStdin } = require('../ui');
 
 /**
  * Dashboard menu after login
  * @param {Object} service - Connected service
  */
 const dashboardMenu = async (service) => {
+  // Ensure stdin is ready for prompts
+  prepareStdin();
+  
   const user = service.user;
   const boxWidth = getLogoWidth();
   const W = boxWidth - 2; // Same width as logo (inner width)
@@ -139,72 +142,173 @@ const dashboardMenu = async (service) => {
   return actionMap[action] || 'accounts';
 };
 
+/**
+ * Wait for user to press Enter
+ */
+const waitForEnter = async () => {
+  prepareStdin();
+  try {
+    await inquirer.prompt([{ type: 'input', name: 'c', message: 'Press Enter to continue...' }]);
+  } catch (e) {
+    // Ignore prompt errors
+  }
+};
+
 /**
  * Handles the update process with auto-restart
+ * Robust version that handles all edge cases
  */
 const handleUpdate = async () => {
-  const pkg = require('../../package.json');
-  const currentVersion = pkg.version;
-  const spinner = ora('Checking for updates...').start();
+  prepareStdin();
+  
+  let spinner = null;
+  let currentVersion = 'unknown';
+  let latestVersion = null;
   
   try {
-    // Check latest version on npm
+    // Get current version safely
+    try {
+      const pkg = require('../../package.json');
+      currentVersion = pkg.version || 'unknown';
+    } catch (e) {
+      currentVersion = 'unknown';
+    }
+    
+    spinner = ora('Checking for updates...').start();
+    
+    // Check latest version on npm with timeout
     spinner.text = 'Checking npm registry...';
-    let latestVersion;
     try {
-      latestVersion = execSync('npm view hedgequantx version', { stdio: 'pipe' }).toString().trim();
+      const result = execSync('npm view hedgequantx version 2>/dev/null', { 
+        stdio: 'pipe',
+        timeout: 15000,  // 15 second timeout
+        encoding: 'utf8'
+      });
+      latestVersion = (result || '').toString().trim();
+      
+      // Validate version format (x.y.z)
+      if (!latestVersion || !/^\d+\.\d+\.\d+/.test(latestVersion)) {
+        throw new Error('Invalid version format received');
+      }
     } catch (e) {
       spinner.fail('Cannot reach npm registry');
+      console.log(chalk.gray('  Check your internet connection'));
       console.log();
-      await inquirer.prompt([{ type: 'input', name: 'continue', message: 'Press Enter to continue...' }]);
+      await waitForEnter();
       return;
     }
     
+    // Compare versions
     if (currentVersion === latestVersion) {
       spinner.succeed('Already up to date!');
       console.log();
-      console.log(chalk.green(`  ✓ You have the latest version of HedgeQuantX CLI: v${currentVersion}`));
+      console.log(chalk.green(`  You have the latest version: v${currentVersion}`));
+      console.log();
+      await waitForEnter();
+      return;
+    }
+    
+    // Ask user before updating
+    spinner.stop();
+    console.log();
+    console.log(chalk.cyan(`  Current version: v${currentVersion}`));
+    console.log(chalk.green(`  Latest version:  v${latestVersion}`));
+    console.log();
+    
+    prepareStdin();
+    const { confirm } = await inquirer.prompt([{
+      type: 'confirm',
+      name: 'confirm',
+      message: 'Do you want to update now?',
+      default: true
+    }]);
+    
+    if (!confirm) {
+      console.log(chalk.gray('  Update cancelled'));
       console.log();
-      await inquirer.prompt([{ type: 'input', name: 'continue', message: 'Press Enter to continue...' }]);
+      await waitForEnter();
       return;
     }
     
     // Update via npm
-    spinner.text = `Updating v${currentVersion} -> v${latestVersion}...`;
+    spinner = ora(`Updating v${currentVersion} -> v${latestVersion}...`).start();
+    
     try {
-      execSync('npm install -g hedgequantx@latest', { stdio: 'pipe' });
+      execSync('npm install -g hedgequantx@latest 2>/dev/null', { 
+        stdio: 'pipe',
+        timeout: 120000,  // 2 minute timeout for install
+        encoding: 'utf8'
+      });
     } catch (e) {
-      spinner.fail('Update failed - try manually: npm install -g hedgequantx@latest');
-      console.log(chalk.gray(`  Error: ${e.message}`));
+      spinner.fail('Update failed');
       console.log();
-      await inquirer.prompt([{ type: 'input', name: 'continue', message: 'Press Enter to continue...' }]);
+      console.log(chalk.yellow('  Try manually:'));
+      console.log(chalk.white('  npm install -g hedgequantx@latest'));
+      console.log();
+      if (e.message) {
+        console.log(chalk.gray(`  Error: ${e.message.substring(0, 100)}`));
+        console.log();
+      }
+      await waitForEnter();
       return;
     }
     
-    spinner.succeed('CLI updated!');
-    console.log();
-    console.log(chalk.green(`  ✓ Updated: v${currentVersion} -> v${latestVersion}`));
+    spinner.succeed('Update complete!');
     console.log();
-    console.log(chalk.cyan('  Restarting HedgeQuantX CLI...'));
+    console.log(chalk.green(`  Updated: v${currentVersion} -> v${latestVersion}`));
     console.log();
     
-    // Small delay so user can see the message
-    await new Promise(resolve => setTimeout(resolve, 1500));
+    // Ask if user wants to restart
+    prepareStdin();
+    const { restart } = await inquirer.prompt([{
+      type: 'confirm',
+      name: 'restart',
+      message: 'Restart HQX now?',
+      default: true
+    }]);
     
-    // Restart the CLI automatically
-    const child = spawn('hedgequantx', [], {
-      stdio: 'inherit',
-      detached: true,
-      shell: true
-    });
-    child.unref();
-    process.exit(0);
+    if (restart) {
+      console.log();
+      console.log(chalk.cyan('  Restarting HedgeQuantX CLI...'));
+      console.log();
+      
+      // Small delay so user can see the message
+      await new Promise(resolve => setTimeout(resolve, 1000));
+      
+      // Restart the CLI
+      try {
+        const child = spawn('hedgequantx', [], {
+          stdio: 'inherit',
+          detached: true,
+          shell: true
+        });
+        child.unref();
+        process.exit(0);
+      } catch (e) {
+        console.log(chalk.yellow('  Could not auto-restart. Please run: hedgequantx'));
+        console.log();
+        await waitForEnter();
+      }
+    } else {
+      console.log(chalk.gray('  Run "hedgequantx" to use the new version'));
+      console.log();
+      await waitForEnter();
+    }
     
   } catch (error) {
-    spinner.fail('Update failed: ' + error.message);
+    // Catch-all for any unexpected errors
+    if (spinner) {
+      try { spinner.fail('Update error'); } catch (e) {}
+    }
+    console.log();
+    console.log(chalk.red('  An error occurred during update'));
+    if (error && error.message) {
+      console.log(chalk.gray(`  ${error.message.substring(0, 100)}`));
+    }
+    console.log();
     console.log(chalk.yellow('  Try manually: npm install -g hedgequantx@latest'));
     console.log();
-    await inquirer.prompt([{ type: 'input', name: 'continue', message: 'Press Enter to continue...' }]);
+    await waitForEnter();
   }
 };
 

package/src/services/index.js

@@ -3,7 +3,7 @@
  * @module services
  */
 
-const { ProjectXService } = require('./projectx');
+const { ProjectXService } = require('./projectx/index');
 const { storage, connections } = require('./session');
 
 module.exports = {