hedgequantx 2.5.41 → 2.5.43

package/package.json

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

package/src/pages/stats.js

@@ -481,7 +481,7 @@ const showStats = async (service) => {
       
       drawBoxFooter(boxWidth);
       
-      // ========== AI BEHAVIOR DIAGRAM ==========
+      // ========== AI BEHAVIOR DIAGRAM (HORIZONTAL BARS) ==========
       const behaviorData = StrategySupervisor.getBehaviorHistory(100);
       const learningStats = StrategySupervisor.getLearningStats();
       
@@ -511,28 +511,10 @@ const showStats = async (service) => {
         PAUSE: Math.round((behaviorCounts.PAUSE / total) * 100)
       };
       
-      // Bar chart configuration
-      const labelWidth = 12;
-      const percentWidth = 6;
-      const barMaxWidth = behaviorInnerWidth - labelWidth - percentWidth - 6;
-      
       // Get current behavior
       const currentValue = behaviorData.values.length > 0 ? behaviorData.values[behaviorData.values.length - 1] : 2;
       const currentAction = valueToAction[Math.round(currentValue)] || 'NORMAL';
       
-      // Draw vertical bar chart (bars going up)
-      const chartHeight = 8;
-      const barWidth = Math.floor((barMaxWidth - 12) / 4); // 4 bars with spacing
-      
-      // Calculate bar heights (max height = chartHeight)
-      const maxPercent = Math.max(...Object.values(percentages), 1);
-      const barHeights = {
-        AGGRESSIVE: Math.round((percentages.AGGRESSIVE / 100) * chartHeight),
-        NORMAL: Math.round((percentages.NORMAL / 100) * chartHeight),
-        CAUTIOUS: Math.round((percentages.CAUTIOUS / 100) * chartHeight),
-        PAUSE: Math.round((percentages.PAUSE / 100) * chartHeight)
-      };
-      
       // Colors for each behavior
       const barColors = {
         AGGRESSIVE: chalk.green,
@@ -541,70 +523,50 @@ const showStats = async (service) => {
         PAUSE: chalk.red
       };
       
-      // Draw bars from top to bottom
+      // Horizontal bar chart configuration
       const barLabels = ['AGGRESSIVE', 'NORMAL', 'CAUTIOUS', 'PAUSE'];
       const shortLabels = ['AGR', 'NOR', 'CAU', 'PAU'];
+      const labelWidth = 6; // "AGR  " etc.
+      const pctWidth = 6;   // "100% "
+      const spacing = 4;    // spaces between bars
+      
+      // Calculate bar width for each category (total 4 bars with spacing)
+      const availableWidth = behaviorInnerWidth - (labelWidth * 4) - (pctWidth * 4) - (spacing * 3) - 4;
+      const maxBarWidth = Math.floor(availableWidth / 4);
+      
+      // Calculate bar widths based on percentage (max 100% = maxBarWidth)
+      const barWidths = {
+        AGGRESSIVE: Math.round((percentages.AGGRESSIVE / 100) * maxBarWidth),
+        NORMAL: Math.round((percentages.NORMAL / 100) * maxBarWidth),
+        CAUTIOUS: Math.round((percentages.CAUTIOUS / 100) * maxBarWidth),
+        PAUSE: Math.round((percentages.PAUSE / 100) * maxBarWidth)
+      };
       
-      // Calculate left padding to center the chart
-      const totalBarWidth = (barWidth * 4) + 9; // 4 bars + 3 spaces of 3 chars
-      const leftPad = Math.floor((behaviorInnerWidth - totalBarWidth - 4) / 2);
-      
-      for (let row = chartHeight; row >= 1; row--) {
-        let line = ' '.repeat(leftPad);
+      // Draw horizontal bars (each bar is a row)
+      for (let i = 0; i < 4; i++) {
+        const label = barLabels[i];
+        const shortLabel = shortLabels[i];
+        const pct = percentages[label];
+        const barWidth = barWidths[label];
+        const color = barColors[label];
+        const isCurrent = label === currentAction;
         
-        for (let i = 0; i < 4; i++) {
-          const label = barLabels[i];
-          const height = barHeights[label];
-          const color = barColors[label];
-          const isCurrent = label === currentAction;
-          
-          if (row <= height) {
-            // Draw filled bar
-            const block = isCurrent ? '█' : '▓';
-            line += color(block.repeat(barWidth));
-          } else {
-            // Empty space
-            line += ' '.repeat(barWidth);
-          }
-          
-          if (i < 3) line += '   '; // Space between bars
-        }
+        // Build the bar
+        const block = isCurrent ? '█' : '▓';
+        const bar = barWidth > 0 ? color(block.repeat(barWidth)) : '';
+        const emptySpace = ' '.repeat(Math.max(0, maxBarWidth - barWidth));
         
+        // Format: "  AGR  ████████████████  100%  "
+        const labelPart = '  ' + color(shortLabel.padEnd(labelWidth));
+        const barPart = bar + emptySpace;
+        const pctPart = chalk.white((pct + '%').padStart(pctWidth));
+        
+        let line = labelPart + barPart + pctPart;
         const lineLen = line.replace(/\x1b\[[0-9;]*m/g, '').length;
         line += ' '.repeat(Math.max(0, behaviorInnerWidth - lineLen));
         console.log(chalk.cyan('\u2551') + line + chalk.cyan('\u2551'));
       }
       
-      // Draw baseline
-      let baseLine = ' '.repeat(leftPad) + '─'.repeat(totalBarWidth);
-      const baseLen = baseLine.length;
-      baseLine += ' '.repeat(Math.max(0, behaviorInnerWidth - baseLen));
-      console.log(chalk.cyan('\u2551') + chalk.white(baseLine) + chalk.cyan('\u2551'));
-      
-      // Draw labels
-      let labelLine = ' '.repeat(leftPad);
-      for (let i = 0; i < 4; i++) {
-        const lbl = shortLabels[i];
-        const pad = Math.floor((barWidth - lbl.length) / 2);
-        labelLine += ' '.repeat(pad) + barColors[barLabels[i]](lbl) + ' '.repeat(barWidth - pad - lbl.length);
-        if (i < 3) labelLine += '   ';
-      }
-      const lblLen = labelLine.replace(/\x1b\[[0-9;]*m/g, '').length;
-      labelLine += ' '.repeat(Math.max(0, behaviorInnerWidth - lblLen));
-      console.log(chalk.cyan('\u2551') + labelLine + chalk.cyan('\u2551'));
-      
-      // Draw percentages
-      let pctLine = ' '.repeat(leftPad);
-      for (let i = 0; i < 4; i++) {
-        const pct = percentages[barLabels[i]] + '%';
-        const pad = Math.floor((barWidth - pct.length) / 2);
-        pctLine += ' '.repeat(pad) + chalk.white(pct) + ' '.repeat(barWidth - pad - pct.length);
-        if (i < 3) pctLine += '   ';
-      }
-      const pctLen = pctLine.replace(/\x1b\[[0-9;]*m/g, '').length;
-      pctLine += ' '.repeat(Math.max(0, behaviorInnerWidth - pctLen));
-      console.log(chalk.cyan('\u2551') + pctLine + chalk.cyan('\u2551'));
-      
       // Empty line
       console.log(chalk.cyan('\u2551') + ' '.repeat(behaviorInnerWidth) + chalk.cyan('\u2551'));
       

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
 };