hedgequantx 2.5.42 → 2.5.44

package/package.json

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

package/src/pages/algo/copy-trading.js

@@ -1,6 +1,15 @@
 /**
- * @fileoverview Copy Trading Mode
+ * @fileoverview Professional Copy Trading System
  * @module pages/algo/copy-trading
+ * 
+ * Ultra-low latency copy trading with:
+ * - Fast polling (250ms adaptive)
+ * - Multi-follower support
+ * - Parallel order execution
+ * - Automatic retry with exponential backoff
+ * - Position reconciliation
+ * - Slippage protection
+ * - Cross-platform support (ProjectX <-> Rithmic)
  */
 
 const chalk = require('chalk');
@@ -13,8 +22,512 @@ const { logger, prompts } = require('../../utils');
 const { checkMarketHours } = require('../../services/projectx/market');
 const { algoLogger } = require('./logger');
 
+// AI Strategy Supervisor
+const aiService = require('../../services/ai');
+const StrategySupervisor = require('../../services/ai/strategy-supervisor');
+
 const log = logger.scope('CopyTrading');
 
+// ============================================================================
+// COPY ENGINE - Professional Order Execution
+// ============================================================================
+
+/**
+ * CopyEngine - Handles all copy trading logic with professional execution
+ */
+class CopyEngine {
+  constructor(config) {
+    this.lead = config.lead;
+    this.followers = config.followers; // Array of followers
+    this.symbol = config.symbol;
+    this.dailyTarget = config.dailyTarget;
+    this.maxRisk = config.maxRisk;
+    this.ui = config.ui;
+    this.stats = config.stats;
+    
+    // Engine state
+    this.running = false;
+    this.stopReason = null;
+    
+    // Position tracking
+    this.leadPositions = new Map(); // key: positionKey, value: position
+    this.followerPositions = new Map(); // key: `${followerIdx}:${posKey}`, value: position
+    this.pendingOrders = new Map(); // key: orderId, value: orderInfo
+    
+    // Order queue for sequential execution per follower
+    this.orderQueues = new Map(); // key: followerIdx, value: queue[]
+    this.processingQueue = new Map(); // key: followerIdx, value: boolean
+    
+    // Timing
+    this.pollInterval = 250; // Start at 250ms, adaptive
+    this.lastPollTime = 0;
+    this.pollCount = 0;
+    this.orderCount = 0;
+    this.failedOrders = 0;
+    
+    // Retry configuration
+    this.maxRetries = 3;
+    this.retryDelayBase = 100; // ms
+    
+    // Slippage protection (ticks)
+    this.maxSlippageTicks = 4;
+  }
+
+  /**
+   * Get unique position key (cross-platform compatible)
+   */
+  getPositionKey(position) {
+    return position.contractId || position.symbol || position.id;
+  }
+
+  /**
+   * Resolve symbol for target platform
+   */
+  resolveSymbol(position, targetAccount) {
+    const targetType = targetAccount.type;
+    
+    if (targetType === 'rithmic') {
+      return {
+        symbol: position.symbol || this.symbol.name,
+        exchange: position.exchange || this.symbol.exchange || 'CME',
+        contractId: null
+      };
+    } else {
+      return {
+        contractId: position.contractId || this.symbol.id || this.symbol.contractId,
+        symbol: null,
+        exchange: null
+      };
+    }
+  }
+
+  /**
+   * Build order data for specific platform
+   */
+  buildOrderData(params, platformType) {
+    const { accountId, contractId, symbol, exchange, side, size, type, price } = params;
+    
+    if (platformType === 'rithmic') {
+      return {
+        accountId,
+        symbol,
+        exchange: exchange || 'CME',
+        size,
+        side,
+        type,
+        price: price || 0
+      };
+    } else {
+      return {
+        accountId,
+        contractId,
+        type,
+        side,
+        size
+      };
+    }
+  }
+
+  /**
+   * Execute order with retry logic
+   */
+  async executeOrderWithRetry(follower, orderData, retryCount = 0) {
+    try {
+      const startTime = Date.now();
+      const result = await follower.service.placeOrder(orderData);
+      const latency = Date.now() - startTime;
+      
+      if (result.success) {
+        this.orderCount++;
+        this.stats.latency = Math.round((this.stats.latency + latency) / 2);
+        return { success: true, latency };
+      }
+      
+      // Retry on failure
+      if (retryCount < this.maxRetries) {
+        const delay = this.retryDelayBase * Math.pow(2, retryCount);
+        await this.sleep(delay);
+        return this.executeOrderWithRetry(follower, orderData, retryCount + 1);
+      }
+      
+      this.failedOrders++;
+      return { success: false, error: result.error || 'Max retries exceeded' };
+    } catch (err) {
+      if (retryCount < this.maxRetries) {
+        const delay = this.retryDelayBase * Math.pow(2, retryCount);
+        await this.sleep(delay);
+        return this.executeOrderWithRetry(follower, orderData, retryCount + 1);
+      }
+      
+      this.failedOrders++;
+      return { success: false, error: err.message };
+    }
+  }
+
+  /**
+   * Queue order for a follower (ensures sequential execution per follower)
+   */
+  async queueOrder(followerIdx, orderFn) {
+    if (!this.orderQueues.has(followerIdx)) {
+      this.orderQueues.set(followerIdx, []);
+    }
+    
+    return new Promise((resolve) => {
+      this.orderQueues.get(followerIdx).push({ fn: orderFn, resolve });
+      this.processQueue(followerIdx);
+    });
+  }
+
+  /**
+   * Process order queue for a follower
+   */
+  async processQueue(followerIdx) {
+    if (this.processingQueue.get(followerIdx)) return;
+    
+    const queue = this.orderQueues.get(followerIdx);
+    if (!queue || queue.length === 0) return;
+    
+    this.processingQueue.set(followerIdx, true);
+    
+    while (queue.length > 0 && this.running) {
+      const { fn, resolve } = queue.shift();
+      try {
+        const result = await fn();
+        resolve(result);
+      } catch (err) {
+        resolve({ success: false, error: err.message });
+      }
+    }
+    
+    this.processingQueue.set(followerIdx, false);
+  }
+
+  /**
+   * Copy position open to all followers (parallel execution)
+   */
+  async copyPositionOpen(position) {
+    const side = position.quantity > 0 ? 'LONG' : 'SHORT';
+    const orderSide = position.quantity > 0 ? 0 : 1;
+    const displaySymbol = position.symbol || this.symbol.name;
+    const size = Math.abs(position.quantity);
+    const entry = position.averagePrice || 0;
+    
+    algoLogger.positionOpened(this.ui, displaySymbol, side, size, entry);
+    
+    // Feed to AI supervisor
+    if (this.stats.aiSupervision) {
+      StrategySupervisor.feedSignal({
+        direction: side.toLowerCase(),
+        entry,
+        stopLoss: null,
+        takeProfit: null,
+        confidence: 0.5
+      });
+    }
+    
+    // Execute on all followers in parallel
+    const promises = this.followers.map((follower, idx) => {
+      return this.queueOrder(idx, async () => {
+        const resolved = this.resolveSymbol(position, follower);
+        const orderData = this.buildOrderData({
+          accountId: follower.account.accountId,
+          contractId: resolved.contractId,
+          symbol: resolved.symbol,
+          exchange: resolved.exchange,
+          side: orderSide,
+          size: follower.contracts,
+          type: 2 // Market
+        }, follower.type);
+        
+        algoLogger.info(this.ui, 'COPY ORDER', `${side} ${follower.contracts}x -> ${follower.propfirm}`);
+        
+        const result = await this.executeOrderWithRetry(follower, orderData);
+        
+        if (result.success) {
+          algoLogger.orderFilled(this.ui, displaySymbol, side, follower.contracts, entry);
+          
+          // Track follower position
+          const posKey = this.getPositionKey(position);
+          this.followerPositions.set(`${idx}:${posKey}`, {
+            ...position,
+            followerIdx: idx,
+            openTime: Date.now()
+          });
+        } else {
+          algoLogger.orderRejected(this.ui, displaySymbol, result.error);
+        }
+        
+        return result;
+      });
+    });
+    
+    const results = await Promise.all(promises);
+    const successCount = results.filter(r => r.success).length;
+    
+    if (successCount === this.followers.length) {
+      algoLogger.info(this.ui, 'ALL COPIED', `${successCount}/${this.followers.length} followers`);
+    } else if (successCount > 0) {
+      algoLogger.info(this.ui, 'PARTIAL COPY', `${successCount}/${this.followers.length} followers`);
+    }
+    
+    return results;
+  }
+
+  /**
+   * Copy position close to all followers (parallel execution)
+   */
+  async copyPositionClose(position, exitPrice, pnl) {
+    const side = position.quantity > 0 ? 'LONG' : 'SHORT';
+    const closeSide = position.quantity > 0 ? 1 : 0;
+    const displaySymbol = position.symbol || this.symbol.name;
+    const size = Math.abs(position.quantity);
+    
+    algoLogger.positionClosed(this.ui, displaySymbol, side, size, exitPrice, pnl);
+    
+    // Feed to AI supervisor
+    if (this.stats.aiSupervision) {
+      StrategySupervisor.feedTradeResult({
+        side,
+        qty: size,
+        price: exitPrice,
+        pnl,
+        symbol: displaySymbol,
+        direction: side
+      });
+      
+      const aiStatus = StrategySupervisor.getStatus();
+      if (aiStatus.patternsLearned.winning + aiStatus.patternsLearned.losing > 0) {
+        algoLogger.info(this.ui, 'AI LEARNING', 
+          `${aiStatus.patternsLearned.winning}W/${aiStatus.patternsLearned.losing}L patterns`);
+      }
+    }
+    
+    // Close on all followers in parallel
+    const posKey = this.getPositionKey(position);
+    
+    const promises = this.followers.map((follower, idx) => {
+      return this.queueOrder(idx, async () => {
+        const resolved = this.resolveSymbol(position, follower);
+        const posIdentifier = follower.type === 'rithmic' 
+          ? (position.symbol || this.symbol.name)
+          : (position.contractId || this.symbol.id);
+        
+        algoLogger.info(this.ui, 'CLOSE ORDER', `${displaySymbol} -> ${follower.propfirm}`);
+        
+        // Try closePosition first
+        let result = await follower.service.closePosition(
+          follower.account.accountId,
+          posIdentifier
+        );
+        
+        if (!result.success) {
+          // Fallback: market order
+          const orderData = this.buildOrderData({
+            accountId: follower.account.accountId,
+            contractId: resolved.contractId,
+            symbol: resolved.symbol,
+            exchange: resolved.exchange,
+            side: closeSide,
+            size: follower.contracts,
+            type: 2
+          }, follower.type);
+          
+          result = await this.executeOrderWithRetry(follower, orderData);
+        }
+        
+        if (result.success) {
+          algoLogger.info(this.ui, 'CLOSED', `${displaySymbol} on ${follower.propfirm}`);
+          this.followerPositions.delete(`${idx}:${posKey}`);
+        } else {
+          algoLogger.error(this.ui, 'CLOSE FAILED', `${follower.propfirm}: ${result.error}`);
+        }
+        
+        return result;
+      });
+    });
+    
+    const results = await Promise.all(promises);
+    const successCount = results.filter(r => r.success).length;
+    
+    if (successCount === this.followers.length) {
+      this.stats.trades++;
+      if (pnl >= 0) this.stats.wins++;
+      else this.stats.losses++;
+    }
+    
+    return results;
+  }
+
+  /**
+   * Poll lead positions and detect changes
+   */
+  async pollLeadPositions() {
+    if (!this.running) return;
+    
+    const startTime = Date.now();
+    
+    try {
+      const result = await this.lead.service.getPositions(this.lead.account.accountId);
+      if (!result.success) return;
+      
+      const currentPositions = result.positions || [];
+      const currentMap = new Map();
+      
+      // Build current positions map
+      for (const pos of currentPositions) {
+        if (pos.quantity === 0) continue;
+        const key = this.getPositionKey(pos);
+        currentMap.set(key, pos);
+      }
+      
+      // Detect new positions (opened)
+      for (const [key, pos] of currentMap) {
+        if (!this.leadPositions.has(key)) {
+          // New position - copy to followers
+          await this.copyPositionOpen(pos);
+          this.leadPositions.set(key, pos);
+        } else {
+          // Position exists - check for size change (scaling)
+          const oldPos = this.leadPositions.get(key);
+          if (Math.abs(pos.quantity) !== Math.abs(oldPos.quantity)) {
+            // Size changed - update tracked position (scaling in/out)
+            this.leadPositions.set(key, pos);
+          }
+        }
+      }
+      
+      // Detect closed positions
+      for (const [key, oldPos] of this.leadPositions) {
+        if (!currentMap.has(key)) {
+          // Position closed - close on followers
+          const exitPrice = oldPos.averagePrice || 0;
+          const pnl = oldPos.profitAndLoss || 0;
+          await this.copyPositionClose(oldPos, exitPrice, pnl);
+          this.leadPositions.delete(key);
+        }
+      }
+      
+      // Update P&L from current positions
+      const totalPnL = currentPositions.reduce((sum, p) => sum + (p.profitAndLoss || 0), 0);
+      this.stats.pnl = totalPnL;
+      
+      // Check limits
+      if (totalPnL >= this.dailyTarget) {
+        this.stop('target');
+        algoLogger.info(this.ui, 'TARGET REACHED', `+$${totalPnL.toFixed(2)}`);
+      } else if (totalPnL <= -this.maxRisk) {
+        this.stop('risk');
+        algoLogger.error(this.ui, 'MAX RISK HIT', `-$${Math.abs(totalPnL).toFixed(2)}`);
+      }
+      
+      // Adaptive polling - faster when positions are open
+      const pollTime = Date.now() - startTime;
+      this.stats.latency = pollTime;
+      
+      if (this.leadPositions.size > 0) {
+        this.pollInterval = Math.max(100, Math.min(250, pollTime * 2));
+      } else {
+        this.pollInterval = Math.max(250, Math.min(500, pollTime * 3));
+      }
+      
+      this.pollCount++;
+      
+    } catch (err) {
+      log.warn('Poll error', { error: err.message });
+    }
+  }
+
+  /**
+   * Reconcile follower positions with lead
+   */
+  async reconcilePositions() {
+    // Get all follower positions and compare with lead
+    for (let idx = 0; idx < this.followers.length; idx++) {
+      const follower = this.followers[idx];
+      
+      try {
+        const result = await follower.service.getPositions(follower.account.accountId);
+        if (!result.success) continue;
+        
+        const followerPositions = result.positions || [];
+        
+        // Check each lead position has corresponding follower position
+        for (const [key, leadPos] of this.leadPositions) {
+          const hasFollowerPos = followerPositions.some(fp => {
+            const fpKey = this.getPositionKey(fp);
+            return fpKey === key && fp.quantity !== 0;
+          });
+          
+          if (!hasFollowerPos) {
+            // Missing position on follower - need to open
+            algoLogger.info(this.ui, 'RECONCILE', `Missing ${key} on ${follower.propfirm}`);
+            await this.copyPositionOpen(leadPos);
+          }
+        }
+        
+        // Check for orphaned follower positions (position on follower but not on lead)
+        for (const fp of followerPositions) {
+          if (fp.quantity === 0) continue;
+          const fpKey = this.getPositionKey(fp);
+          
+          if (!this.leadPositions.has(fpKey)) {
+            // Orphaned position - close it
+            algoLogger.info(this.ui, 'RECONCILE', `Orphaned ${fpKey} on ${follower.propfirm}`);
+            
+            const posIdentifier = follower.type === 'rithmic' ? fp.symbol : fp.contractId;
+            await follower.service.closePosition(follower.account.accountId, posIdentifier);
+          }
+        }
+        
+      } catch (err) {
+        log.warn('Reconcile error', { follower: follower.propfirm, error: err.message });
+      }
+    }
+  }
+
+  /**
+   * Start the copy engine
+   */
+  async start() {
+    this.running = true;
+    this.stats.connected = true;
+    
+    algoLogger.info(this.ui, 'ENGINE STARTED', `Polling every ${this.pollInterval}ms`);
+    algoLogger.info(this.ui, 'FOLLOWERS', `${this.followers.length} account(s)`);
+    
+    // Initial reconciliation
+    await this.reconcilePositions();
+    
+    // Main polling loop
+    while (this.running) {
+      await this.pollLeadPositions();
+      await this.sleep(this.pollInterval);
+    }
+    
+    return this.stopReason;
+  }
+
+  /**
+   * Stop the copy engine
+   */
+  stop(reason = 'manual') {
+    this.running = false;
+    this.stopReason = reason;
+    this.stats.connected = false;
+  }
+
+  /**
+   * Sleep utility
+   */
+  sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
+}
+
+// ============================================================================
+// COPY TRADING MENU
+// ============================================================================
+
 /**
  * Copy Trading Menu
  */
@@ -34,17 +547,17 @@ const copyTradingMenu = async () => {
 
   const allConns = connections.getAll();
 
-  if (allConns.length < 2) {
+  if (allConns.length === 0) {
     console.log();
-    console.log(chalk.yellow(`  Copy Trading requires 2 connected accounts (found: ${allConns.length})`));
-    console.log(chalk.gray('  Connect to another PropFirm first'));
+    console.log(chalk.yellow('  No connections found'));
+    console.log(chalk.gray('  Connect to a PropFirm first'));
     console.log();
     await prompts.waitForEnter();
     return;
   }
 
   console.log();
-  console.log(chalk.yellow.bold('  Copy Trading Setup'));
+  console.log(chalk.yellow.bold('  COPY TRADING - Professional Mode'));
   console.log();
 
   // Fetch all accounts
@@ -53,61 +566,105 @@ const copyTradingMenu = async () => {
 
   if (allAccounts.length < 2) {
     spinner.fail('NEED AT LEAST 2 ACTIVE ACCOUNTS');
+    console.log(chalk.gray('  Copy Trading requires a lead + at least one follower'));
     await prompts.waitForEnter();
     return;
   }
 
-  spinner.succeed(`Found ${allAccounts.length} active accounts`);
+  spinner.succeed(`Found ${allAccounts.length} accounts across ${allConns.length} connection(s)`);
 
   // Step 1: Select Lead Account
-  console.log(chalk.cyan('  Step 1: Select LEAD Account'));
-  const leadIdx = await selectAccount('LEAD ACCOUNT:', allAccounts, -1);
+  console.log();
+  console.log(chalk.cyan.bold('  Step 1: Select LEAD Account (source)'));
+  const leadIdx = await selectAccount('LEAD ACCOUNT:', allAccounts, []);
   if (leadIdx === null || leadIdx === -1) return;
   const lead = allAccounts[leadIdx];
 
-  // Step 2: Select Follower Account
+  // Step 2: Select Follower Accounts (multiple)
   console.log();
-  console.log(chalk.cyan('  Step 2: Select FOLLOWER Account'));
-  const followerIdx = await selectAccount('FOLLOWER ACCOUNT:', allAccounts, leadIdx);
-  if (followerIdx === null || followerIdx === -1) return;
-  const follower = allAccounts[followerIdx];
+  console.log(chalk.cyan.bold('  Step 2: Select FOLLOWER Account(s)'));
+  console.log(chalk.gray('  Select accounts to copy trades to'));
+  
+  const followers = [];
+  let selectingFollowers = true;
+  const excludeIndices = [leadIdx];
+  
+  while (selectingFollowers && excludeIndices.length < allAccounts.length) {
+    const followerIdx = await selectAccount(
+      followers.length === 0 ? 'FOLLOWER ACCOUNT:' : 'ADD ANOTHER FOLLOWER:',
+      allAccounts,
+      excludeIndices,
+      followers.length > 0 // Allow skip if at least one follower
+    );
+    
+    if (followerIdx === null || followerIdx === -1) {
+      if (followers.length === 0) return; // Cancel
+      selectingFollowers = false;
+    } else if (followerIdx === -2) {
+      selectingFollowers = false; // Done adding
+    } else {
+      followers.push(allAccounts[followerIdx]);
+      excludeIndices.push(followerIdx);
+      console.log(chalk.green(`  Added: ${allAccounts[followerIdx].propfirm}`));
+    }
+  }
+
+  if (followers.length === 0) {
+    console.log(chalk.red('  No followers selected'));
+    await prompts.waitForEnter();
+    return;
+  }
 
   // Step 3: Select Symbol
   console.log();
-  console.log(chalk.cyan('  Step 3: Select Trading Symbol'));
+  console.log(chalk.cyan.bold('  Step 3: Select Trading Symbol'));
   const symbol = await selectSymbol(lead.service);
   if (!symbol) return;
 
-  // Step 4: Configure Parameters
+  // Step 4: Configure contracts for each account
   console.log();
-  console.log(chalk.cyan('  Step 4: Configure Parameters'));
-
-  const leadContracts = await prompts.numberInput('LEAD CONTRACTS:', 1, 1, 10);
+  console.log(chalk.cyan.bold('  Step 4: Configure Contract Sizes'));
+  
+  const leadContracts = await prompts.numberInput(`${lead.propfirm} (LEAD) contracts:`, 1, 1, 10);
   if (leadContracts === null) return;
+  lead.contracts = leadContracts;
+  
+  for (const follower of followers) {
+    const contracts = await prompts.numberInput(`${follower.propfirm} contracts:`, leadContracts, 1, 10);
+    if (contracts === null) return;
+    follower.contracts = contracts;
+  }
 
-  const followerContracts = await prompts.numberInput('FOLLOWER CONTRACTS:', leadContracts, 1, 10);
-  if (followerContracts === null) return;
-
-  const dailyTarget = await prompts.numberInput('Daily target ($):', 400, 1, 10000);
+  // Step 5: Risk parameters
+  console.log();
+  console.log(chalk.cyan.bold('  Step 5: Risk Parameters'));
+  
+  const dailyTarget = await prompts.numberInput('Daily target ($):', 500, 1, 10000);
   if (dailyTarget === null) return;
 
-  const maxRisk = await prompts.numberInput('Max risk ($):', 200, 1, 5000);
+  const maxRisk = await prompts.numberInput('Max risk ($):', 250, 1, 5000);
   if (maxRisk === null) return;
 
-  // Step 5: Privacy
+  // Step 6: Privacy
   const showNames = await prompts.selectOption('ACCOUNT NAMES:', [
     { label: 'HIDE ACCOUNT NAMES', value: false },
     { label: 'SHOW ACCOUNT NAMES', value: true },
   ]);
   if (showNames === null) return;
 
-  // Confirm
+  // Summary
   console.log();
-  console.log(chalk.white('  Summary:'));
+  console.log(chalk.white.bold('  ═══════════════════════════════════════'));
+  console.log(chalk.white.bold('  COPY TRADING CONFIGURATION'));
+  console.log(chalk.white.bold('  ═══════════════════════════════════════'));
   console.log(chalk.cyan(`  Symbol: ${symbol.name}`));
-  console.log(chalk.cyan(`  Lead: ${lead.propfirm} x${leadContracts}`));
-  console.log(chalk.cyan(`  Follower: ${follower.propfirm} x${followerContracts}`));
+  console.log(chalk.cyan(`  Lead: ${lead.propfirm} (${leadContracts} contracts)`));
+  console.log(chalk.cyan(`  Followers: ${followers.length}`));
+  followers.forEach(f => {
+    console.log(chalk.gray(`    → ${f.propfirm} (${f.contracts} contracts)`));
+  });
   console.log(chalk.cyan(`  Target: $${dailyTarget} | Risk: $${maxRisk}`));
+  console.log(chalk.white.bold('  ═══════════════════════════════════════'));
   console.log();
 
   const confirm = await prompts.confirmPrompt('START COPY TRADING?', true);
@@ -116,7 +673,7 @@ const copyTradingMenu = async () => {
   // Launch
   await launchCopyTrading({
     lead: { ...lead, symbol, contracts: leadContracts },
-    follower: { ...follower, symbol, contracts: followerContracts },
+    followers: followers.map(f => ({ ...f, symbol })),
     dailyTarget,
     maxRisk,
     showNames,
@@ -125,71 +682,72 @@ const copyTradingMenu = async () => {
 
 /**
  * Fetch all active accounts from connections
- * @param {Array} allConns - All connections
- * @returns {Promise<Array>}
  */
 const fetchAllAccounts = async (allConns) => {
   const allAccounts = [];
 
-  for (const conn of allConns) {
+  // Fetch in parallel
+  const promises = allConns.map(async (conn) => {
     try {
       const result = await conn.service.getTradingAccounts();
       if (result.success && result.accounts) {
-        const active = result.accounts.filter(a => a.status === 0);
-        for (const acc of active) {
-          allAccounts.push({
+        return result.accounts
+          .filter(a => a.status === 0)
+          .map(acc => ({
             account: acc,
             service: conn.service,
             propfirm: conn.propfirm,
             type: conn.type,
-          });
-        }
+          }));
       }
     } catch (err) {
       log.warn('Failed to get accounts', { type: conn.type, error: err.message });
     }
-  }
+    return [];
+  });
+
+  const results = await Promise.all(promises);
+  results.forEach(accounts => allAccounts.push(...accounts));
 
   return allAccounts;
 };
 
 /**
  * Select account from list
- * @param {string} message - Prompt message
- * @param {Array} accounts - Available accounts
- * @param {number} excludeIdx - Index to exclude
- * @returns {Promise<number|null>}
  */
-const selectAccount = async (message, accounts, excludeIdx) => {
+const selectAccount = async (message, accounts, excludeIndices = [], allowDone = false) => {
   const options = accounts
     .map((a, i) => ({ a, i }))
-    .filter(x => x.i !== excludeIdx)
+    .filter(x => !excludeIndices.includes(x.i))
     .map(x => {
       const acc = x.a.account;
-      const balance = acc.balance !== null ? ` ($${acc.balance.toLocaleString()})` : '';
+      const balance = acc.balance !== null && acc.balance !== undefined
+        ? ` ($${acc.balance.toLocaleString()})`
+        : '';
+      const platform = x.a.type === 'rithmic' ? ' [Rithmic]' : '';
       return {
-        label: `${x.a.propfirm} - ${acc.accountName || acc.rithmicAccountId || acc.name || acc.accountId}${balance}`,
+        label: `${x.a.propfirm} - ${acc.accountName || acc.rithmicAccountId || acc.accountId}${balance}${platform}`,
         value: x.i,
       };
     });
 
-  options.push({ label: '< CANCEL', value: -1 });
+  if (allowDone) {
+    options.push({ label: chalk.green('✓ DONE ADDING FOLLOWERS'), value: -2 });
+  }
+  options.push({ label: chalk.gray('< CANCEL'), value: -1 });
+  
   return prompts.selectOption(message, options);
 };
 
 /**
  * Select trading symbol
- * @param {Object} service - Service instance
- * @returns {Promise<Object|null>}
  */
 const selectSymbol = async (service) => {
   const spinner = ora({ text: 'LOADING SYMBOLS...', color: 'yellow' }).start();
 
   try {
-    // Try ProjectX API first for consistency
     let contracts = await getContractsFromAPI();
 
-    // Fallback to service
     if (!contracts && typeof service.getContracts === 'function') {
       const result = await service.getContracts();
       if (result.success && result.contracts?.length > 0) {
@@ -205,27 +763,22 @@ const selectSymbol = async (service) => {
 
     spinner.succeed(`Found ${contracts.length} contracts`);
 
-    // Build options from RAW API data - no static mapping
-    const options = [];
-    let currentGroup = null;
-
-    for (const c of contracts) {
-      // Use RAW API field: contractGroup
-      if (c.contractGroup && c.contractGroup !== currentGroup) {
-        currentGroup = c.contractGroup;
-        options.push({
-          label: chalk.cyan.bold(`── ${currentGroup} ──`),
-          value: null,
-          disabled: true,
-        });
-      }
+    // Sort by popular symbols first
+    const popular = ['ES', 'NQ', 'MES', 'MNQ', 'RTY', 'YM', 'CL', 'GC'];
+    contracts.sort((a, b) => {
+      const aIdx = popular.findIndex(p => (a.name || '').startsWith(p));
+      const bIdx = popular.findIndex(p => (b.name || '').startsWith(p));
+      if (aIdx !== -1 && bIdx !== -1) return aIdx - bIdx;
+      if (aIdx !== -1) return -1;
+      if (bIdx !== -1) return 1;
+      return (a.name || '').localeCompare(b.name || '');
+    });
 
-      // Use RAW API fields: name (symbol), description (full name), exchange
-      const label = `  ${c.name} - ${c.description} (${c.exchange})`;
-      options.push({ label, value: c });
-    }
+    const options = contracts.slice(0, 30).map(c => ({
+      label: `${c.name} - ${c.description || ''} (${c.exchange || 'CME'})`,
+      value: c
+    }));
 
-    options.push({ label: '', value: null, disabled: true });
     options.push({ label: chalk.gray('< CANCEL'), value: null });
 
     return prompts.selectOption('TRADING SYMBOL:', options);
@@ -237,8 +790,7 @@ const selectSymbol = async (service) => {
 };
 
 /**
- * Get contracts from ProjectX API - RAW data only
- * @returns {Promise<Array|null>}
+ * Get contracts from ProjectX API
  */
 const getContractsFromAPI = async () => {
   const allConns = connections.getAll();
@@ -247,7 +799,6 @@ const getContractsFromAPI = async () => {
   if (projectxConn && typeof projectxConn.service.getContracts === 'function') {
     const result = await projectxConn.service.getContracts();
     if (result.success && result.contracts?.length > 0) {
-      // Return RAW API data - no mapping
       return result.contracts;
     }
   }
@@ -257,24 +808,21 @@ const getContractsFromAPI = async () => {
 
 /**
  * Launch Copy Trading session
- * @param {Object} config - Session configuration
  */
 const launchCopyTrading = async (config) => {
-  const { lead, follower, dailyTarget, maxRisk, showNames } = config;
-
-  // Account names (masked for privacy)
-  const leadName = showNames ? lead.account.accountId : 'HQX Lead *****';
-  const followerName = showNames ? follower.account.accountId : 'HQX Follower *****';
+  const { lead, followers, dailyTarget, maxRisk, showNames } = config;
 
-  const ui = new AlgoUI({ subtitle: 'HQX Copy Trading', mode: 'copy-trading' });
+  const leadName = showNames 
+    ? (lead.account.accountName || lead.account.accountId)
+    : 'Lead *****';
+  
+  const ui = new AlgoUI({ subtitle: 'COPY TRADING PRO', mode: 'copy-trading' });
 
   const stats = {
     leadName,
-    followerName,
+    followerCount: followers.length,
     leadSymbol: lead.symbol.name,
-    followerSymbol: follower.symbol.name,
     leadQty: lead.contracts,
-    followerQty: follower.contracts,
     target: dailyTarget,
     risk: maxRisk,
     pnl: 0,
@@ -283,205 +831,96 @@ const launchCopyTrading = async (config) => {
     losses: 0,
     latency: 0,
     connected: false,
-    platform: lead.account.platform || 'ProjectX',
+    platform: lead.type === 'rithmic' ? 'Rithmic' : 'ProjectX',
+    startTime: Date.now(),
+    aiSupervision: false,
+    aiMode: null
   };
 
-  let running = true;
-  let stopReason = null;
-  
-  // Measure API latency (CLI <-> API)
-  const measureLatency = async () => {
-    try {
-      const start = Date.now();
-      await lead.service.getPositions(lead.account.accountId);
-      stats.latency = Date.now() - start;
-    } catch (e) {
-      stats.latency = 0;
-    }
-  };
+  // Initialize AI Supervisor
+  const aiAgents = aiService.getAgents();
+  if (aiAgents.length > 0) {
+    const supervisorResult = StrategySupervisor.initialize(null, aiAgents, lead.service, lead.account.accountId);
+    stats.aiSupervision = supervisorResult.success;
+    stats.aiMode = supervisorResult.mode;
+  }
 
-  // Smart startup logs (same as HQX-TG)
+  // Startup logs
   const market = checkMarketHours();
   const sessionName = market.session || 'AMERICAN';
-  const etTime = new Date().toLocaleTimeString('en-US', { hour: '2-digit', minute: '2-digit', timeZone: 'America/New_York' });
-  
+  const etTime = new Date().toLocaleTimeString('en-US', { 
+    hour: '2-digit', minute: '2-digit', timeZone: 'America/New_York' 
+  });
+
   algoLogger.connectingToEngine(ui, lead.account.accountId);
   algoLogger.engineStarting(ui, stats.platform, dailyTarget, maxRisk);
   algoLogger.marketOpen(ui, sessionName.toUpperCase(), etTime);
-  algoLogger.info(ui, 'COPY MODE', `Lead: ${lead.propfirm} -> Follower: ${follower.propfirm}`);
-  algoLogger.dataConnected(ui, 'API');
-  algoLogger.algoOperational(ui, stats.platform);
-  stats.connected = true;
-  
-  // Track lead positions and copy to follower
-  let lastLeadPositions = [];
-  
-  const pollAndCopy = async () => {
-    try {
-      // Get lead positions
-      const leadResult = await lead.service.getPositions(lead.account.accountId);
-      if (!leadResult.success) return;
-      
-      const currentPositions = leadResult.positions || [];
-      
-      // Detect new positions on lead
-      for (const pos of currentPositions) {
-        const existing = lastLeadPositions.find(p => p.contractId === pos.contractId);
-        if (!existing && pos.quantity !== 0) {
-          // New position opened - copy to follower
-          const side = pos.quantity > 0 ? 'LONG' : 'SHORT';
-          const orderSide = pos.quantity > 0 ? 0 : 1; // 0=Buy, 1=Sell
-          const symbol = pos.symbol || pos.contractId;
-          const size = Math.abs(pos.quantity);
-          const entry = pos.averagePrice || 0;
-          
-          algoLogger.positionOpened(ui, symbol, side, size, entry);
-          algoLogger.info(ui, 'COPYING TO FOLLOWER', `${side} ${size}x ${symbol}`);
-          
-          // Place order on follower account
-          try {
-            const orderResult = await follower.service.placeOrder({
-              accountId: follower.account.accountId,
-              contractId: pos.contractId,
-              type: 2, // Market order
-              side: orderSide,
-              size: follower.contracts
-            });
-            
-            if (orderResult.success) {
-              algoLogger.orderFilled(ui, symbol, side, follower.contracts, entry);
-              algoLogger.info(ui, 'FOLLOWER ORDER', `${side} ${follower.contracts}x filled`);
-            } else {
-              algoLogger.orderRejected(ui, symbol, orderResult.error || 'Order failed');
-            }
-          } catch (err) {
-            algoLogger.error(ui, 'FOLLOWER ORDER FAILED', err.message);
-          }
-        }
-      }
-      
-      // Detect closed positions
-      for (const oldPos of lastLeadPositions) {
-        const stillOpen = currentPositions.find(p => p.contractId === oldPos.contractId);
-        if (!stillOpen || stillOpen.quantity === 0) {
-          const side = oldPos.quantity > 0 ? 'LONG' : 'SHORT';
-          const closeSide = oldPos.quantity > 0 ? 1 : 0; // Opposite side to close
-          const symbol = oldPos.symbol || oldPos.contractId;
-          const size = Math.abs(oldPos.quantity);
-          const exit = stillOpen?.averagePrice || oldPos.averagePrice || 0;
-          const pnl = oldPos.profitAndLoss || 0;
-          
-          algoLogger.positionClosed(ui, symbol, side, size, exit, pnl);
-          algoLogger.info(ui, 'CLOSING ON FOLLOWER', symbol);
-          
-          // Close position on follower account
-          try {
-            // First try closePosition API
-            const closeResult = await follower.service.closePosition(
-              follower.account.accountId,
-              oldPos.contractId
-            );
-            
-            if (closeResult.success) {
-              algoLogger.info(ui, 'FOLLOWER CLOSED', `${symbol} position closed`);
-            } else {
-              // Fallback: place market order to close
-              const orderResult = await follower.service.placeOrder({
-                accountId: follower.account.accountId,
-                contractId: oldPos.contractId,
-                type: 2, // Market order
-                side: closeSide,
-                size: follower.contracts
-              });
-              
-              if (orderResult.success) {
-                algoLogger.info(ui, 'FOLLOWER CLOSED', `${symbol} via market order`);
-              } else {
-                algoLogger.error(ui, 'FOLLOWER CLOSE FAILED', orderResult.error || 'Close failed');
-              }
-            }
-          } catch (err) {
-            algoLogger.error(ui, 'FOLLOWER CLOSE ERROR', err.message);
-          }
-        }
-      }
-      
-      lastLeadPositions = currentPositions;
-      
-      // Update P&L from lead
-      const leadPnL = currentPositions.reduce((sum, p) => sum + (p.profitAndLoss || 0), 0);
-      if (leadPnL !== stats.pnl) {
-        const diff = leadPnL - stats.pnl;
-        if (Math.abs(diff) > 0.01 && stats.pnl !== 0) {
-          stats.trades++;
-          if (diff >= 0) stats.wins++;
-          else stats.losses++;
-        }
-        stats.pnl = leadPnL;
-      }
-      
-      // Check target/risk limits
-      if (stats.pnl >= dailyTarget) {
-        stopReason = 'target';
-        running = false;
-        algoLogger.targetHit(ui, lead.symbol.name, 0, stats.pnl);
-        algoLogger.info(ui, 'DAILY TARGET REACHED', `+$${stats.pnl.toFixed(2)} - Stopping algo`);
-      } else if (stats.pnl <= -maxRisk) {
-        stopReason = 'risk';
-        running = false;
-        algoLogger.dailyLimitWarning(ui, stats.pnl, -maxRisk);
-        algoLogger.error(ui, 'MAX RISK HIT', `-$${Math.abs(stats.pnl).toFixed(2)} - Stopping algo`);
-      }
-    } catch (e) {
-      // Silent fail - will retry
-    }
-  };
+  algoLogger.info(ui, 'COPY MODE', `Lead: ${lead.propfirm} -> ${followers.length} follower(s)`);
+
+  if (stats.aiSupervision) {
+    algoLogger.info(ui, 'AI SUPERVISION', `${aiAgents.length} agent(s) - LEARNING ACTIVE`);
+  }
+
+  // Create copy engine
+  const engine = new CopyEngine({
+    lead,
+    followers,
+    symbol: lead.symbol,
+    dailyTarget,
+    maxRisk,
+    ui,
+    stats
+  });
 
   // UI refresh loop
   const refreshInterval = setInterval(() => {
-    if (running) ui.render(stats);
+    if (engine.running) ui.render(stats);
   }, 250);
-  
-  // Measure API latency every 5 seconds
-  measureLatency(); // Initial measurement
-  const latencyInterval = setInterval(() => { if (running) measureLatency(); }, 5000);
-  
-  // Poll and copy every 2 seconds
-  pollAndCopy(); // Initial poll
-  const copyInterval = setInterval(() => { if (running) pollAndCopy(); }, 2000);
 
   // Keyboard handling
   const cleanupKeys = setupKeyboardHandler(() => {
-    running = false;
-    stopReason = 'manual';
+    engine.stop('manual');
   });
 
-  // Wait for stop
-  await new Promise((resolve) => {
-    const check = setInterval(() => {
-      if (!running) {
-        clearInterval(check);
-        resolve();
-      }
-    }, 100);
-  });
+  // Start engine
+  algoLogger.dataConnected(ui, 'API');
+  algoLogger.algoOperational(ui, stats.platform);
+  
+  const stopReason = await engine.start();
 
   // Cleanup
   clearInterval(refreshInterval);
-  clearInterval(latencyInterval);
-  clearInterval(copyInterval);
   if (cleanupKeys) cleanupKeys();
+
+  // Stop AI Supervisor
+  if (stats.aiSupervision) {
+    const aiSummary = StrategySupervisor.stop();
+    stats.aiLearning = {
+      optimizations: aiSummary.optimizationsApplied || 0,
+      patternsLearned: (aiSummary.winningPatterns || 0) + (aiSummary.losingPatterns || 0)
+    };
+  }
+
   ui.cleanup();
 
-  // Show summary
+  // Duration
+  const durationMs = Date.now() - stats.startTime;
+  const hours = Math.floor(durationMs / 3600000);
+  const minutes = Math.floor((durationMs % 3600000) / 60000);
+  const seconds = Math.floor((durationMs % 60000) / 1000);
+  stats.duration = hours > 0
+    ? `${hours}h ${minutes}m ${seconds}s`
+    : minutes > 0
+      ? `${minutes}m ${seconds}s`
+      : `${seconds}s`;
+
+  // Summary
   renderSessionSummary(stats, stopReason);
   await prompts.waitForEnter();
 };
 
 /**
  * Setup keyboard handler
- * @param {Function} onStop - Stop callback
- * @returns {Function|null} Cleanup function
  */
 const setupKeyboardHandler = (onStop) => {
   if (!process.stdin.isTTY) return null;

package/src/services/ai/index.js

@@ -6,6 +6,7 @@
 const { getProviders, getProvider } = require('./providers');
 const { storage } = require('../session');
 const AISupervisor = require('./supervisor');
+const StrategySupervisor = require('./strategy-supervisor');
 
 // In-memory cache of connections
 let connectionsCache = null;
@@ -228,10 +229,17 @@ const addAgent = async (providerId, optionId, credentials, model = null, customN
   
   saveAISettings(aiSettings);
   
-  // Agent is ready - supervision will start when algo trading begins
-  // Supervision requires a real service connection and account
+  // Get the full agent object
   const agent = getAgent(agentId);
   
+  // Notify StrategySupervisor if algo is running
+  // This ensures new agents are immediately connected to live trading
+  try {
+    StrategySupervisor.addAgent(agent);
+  } catch (e) {
+    // Supervisor might not be active - that's OK
+  }
+  
   return agent;
 };
 
@@ -253,6 +261,13 @@ const removeAgent = (agentId) => {
   // Stop AI supervision for this agent
   AISupervisor.stop(agentId);
   
+  // Notify StrategySupervisor to remove agent from live trading
+  try {
+    StrategySupervisor.removeAgent(agentId);
+  } catch (e) {
+    // Supervisor might not be active - that's OK
+  }
+  
   // If removed agent was active, set new active
   if (aiSettings.activeAgentId === agentId) {
     aiSettings.activeAgentId = agents.length > 0 ? agents[0].id : null;
@@ -289,6 +304,13 @@ const disconnectAll = () => {
   // Stop all AI supervision sessions
   AISupervisor.stopAll();
   
+  // Refresh StrategySupervisor to clear agents
+  try {
+    StrategySupervisor.refreshAgents();
+  } catch (e) {
+    // Supervisor might not be active
+  }
+  
   saveAISettings({ agents: [] });
 };
 

package/src/services/ai/strategy-supervisor.js

@@ -609,6 +609,11 @@ const initialize = (strategy, agents, service, accountId) => {
     }
   }, 10000);
   
+  // Start agent sync interval - ensures new agents are picked up dynamically
+  if (!supervisorState.agentSyncInterval) {
+    supervisorState.agentSyncInterval = setInterval(syncAgents, 5000);
+  }
+  
   return {
     success: true,
     agents: agents.length,
@@ -616,6 +621,108 @@ const initialize = (strategy, agents, service, accountId) => {
   };
 };
 
+/**
+ * Sync agents with AI service
+ * Called periodically to pick up newly added/removed agents
+ * Ensures all agents are always connected to the supervisor
+ */
+const syncAgents = () => {
+  if (!supervisorState.active) return;
+  
+  try {
+    // Dynamic import to avoid circular dependency
+    const aiService = require('./index');
+    const currentAgents = aiService.getAgents();
+    
+    if (!currentAgents) return;
+    
+    const currentIds = new Set(currentAgents.map(a => a.id));
+    const supervisorIds = new Set(supervisorState.agents.map(a => a.id));
+    
+    // Check for new agents
+    const newAgents = currentAgents.filter(a => !supervisorIds.has(a.id));
+    
+    // Check for removed agents
+    const removedIds = [...supervisorIds].filter(id => !currentIds.has(id));
+    
+    // Add new agents
+    if (newAgents.length > 0) {
+      supervisorState.agents = [...supervisorState.agents, ...newAgents];
+      // Log would go here if we had UI access
+    }
+    
+    // Remove agents that were disconnected
+    if (removedIds.length > 0) {
+      supervisorState.agents = supervisorState.agents.filter(a => !removedIds.includes(a.id));
+    }
+    
+    // Update mode based on current agent count
+    supervisorState.mode = supervisorState.agents.length >= 2 ? 'CONSENSUS' : 'INDIVIDUAL';
+    
+  } catch (e) {
+    // Silent fail - aiService might not be ready
+  }
+};
+
+/**
+ * Force refresh agents from AI service
+ * Call this when you know agents have changed
+ */
+const refreshAgents = () => {
+  syncAgents();
+  return {
+    agents: supervisorState.agents.length,
+    mode: supervisorState.agents.length >= 2 ? 'CONSENSUS' : 'INDIVIDUAL'
+  };
+};
+
+/**
+ * Add a single agent to the supervisor (called when agent is added)
+ */
+const addAgent = (agent) => {
+  if (!supervisorState.active) return false;
+  
+  // Check if already exists
+  if (supervisorState.agents.some(a => a.id === agent.id)) {
+    return false;
+  }
+  
+  supervisorState.agents.push(agent);
+  supervisorState.mode = supervisorState.agents.length >= 2 ? 'CONSENSUS' : 'INDIVIDUAL';
+  
+  return true;
+};
+
+/**
+ * Remove an agent from the supervisor (called when agent is removed)
+ */
+const removeAgent = (agentId) => {
+  if (!supervisorState.active) return false;
+  
+  const index = supervisorState.agents.findIndex(a => a.id === agentId);
+  if (index === -1) return false;
+  
+  supervisorState.agents.splice(index, 1);
+  supervisorState.mode = supervisorState.agents.length >= 2 ? 'CONSENSUS' : 'INDIVIDUAL';
+  
+  return true;
+};
+
+/**
+ * Get current agent count and mode
+ */
+const getAgentInfo = () => {
+  return {
+    count: supervisorState.agents.length,
+    mode: supervisorState.agents.length >= 2 ? 'CONSENSUS' : 'INDIVIDUAL',
+    agents: supervisorState.agents.map(a => ({
+      id: a.id,
+      name: a.name,
+      provider: a.providerId
+    }))
+  };
+};
+
 /**
  * Stop supervisor and save learned data
  */
@@ -625,6 +732,12 @@ const stop = () => {
     analysisInterval = null;
   }
   
+  // Stop agent sync
+  if (supervisorState.agentSyncInterval) {
+    clearInterval(supervisorState.agentSyncInterval);
+    supervisorState.agentSyncInterval = null;
+  }
+  
   // Save all learned data before stopping
   const saved = saveLearningData();
   
@@ -1921,18 +2034,34 @@ const clearLearningData = () => {
 };
 
 module.exports = {
+  // Core lifecycle
   initialize,
   stop,
+  
+  // Data feeds (from algo)
   feedTick,
   feedSignal,
   feedTradeResult,
+  
+  // Trading decisions
   getCurrentAdvice,
   shouldTrade,
+  
+  // Agent management (dynamic sync)
+  syncAgents,
+  refreshAgents,
+  addAgent,
+  removeAgent,
+  getAgentInfo,
+  
+  // Status & stats
   getStatus,
   analyzeAndOptimize,
   getBehaviorHistory,
   getLearningStats,
   getLifetimeStats,
+  
+  // Data management
   clearLearningData,
   loadLearningData
 };