hedgequantx 2.6.151 → 2.6.152

package/package.json

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

package/src/pages/algo/custom-strategy.js

@@ -19,6 +19,7 @@ const readline = require('readline');
 
 const { connections } = require('../../services');
 const { AlgoUI, renderSessionSummary, renderMultiSymbolSummary } = require('./ui');
+const { displayBanner } = require('../../ui');
 const { prompts } = require('../../utils');
 const { checkMarketHours } = require('../../services/projectx/market');
 const { FAST_SCALPING } = require('../../config/settings');
@@ -28,6 +29,7 @@ const { algoLogger } = require('./logger');
 const { recoveryMath } = require('../../services/strategy/recovery-math');
 const aiService = require('../../services/ai');
 const { launchMultiSymbolRithmic } = require('./one-account');
+const aiClient = require('../../services/ai/client');
 
 // Strategy template that the AI will fill
 const STRATEGY_TEMPLATE = `/**
@@ -127,16 +129,21 @@ function getStrategyDir() {
  * Generate strategy code using AI agent
  */
 async function generateStrategyCode(description, agentName) {
-  const agent = aiService.getAgents().find(a => a.name === agentName || a.provider === agentName);
+  const agents = aiService.getAgents();
+  const agent = agents.find(a => a.name === agentName || a.provider === agentName);
   if (!agent) {
     return { success: false, error: 'No AI agent available' };
   }
 
-  const prompt = `You are a trading strategy code generator. Generate a trading strategy based on this description:
+  const systemPrompt = `You are a trading strategy code generator for HQX-CLI.
+Generate trading strategies based on user descriptions.
+You must output ONLY valid JSON with the strategy components, no markdown, no explanation.`;
+
+  const prompt = `Generate a trading strategy based on this description:
 
 "${description}"
 
-You must output ONLY valid JavaScript code that fills in these template sections:
+Fill in these template sections:
 
 1. STRATEGY_NAME: A short name for the strategy (string)
 2. STRATEGY_DESCRIPTION: One line description (string)
@@ -153,7 +160,7 @@ Available in processTick:
 - this.tickSize, this.tickValue (contract specs)
 - this.tickCount (number of ticks processed)
 
-Output format (JSON):
+Output format (JSON only):
 {
   "STRATEGY_NAME": "...",
   "STRATEGY_DESCRIPTION": "...",
@@ -161,29 +168,26 @@ Output format (JSON):
   "STRATEGY_LOGIC": "...",
   "STRATEGY_GET_STATE": "...",
   "STRATEGY_RESET": "..."
-}
-
-IMPORTANT: Output ONLY the JSON, no markdown, no explanation.`;
+}`;
 
   try {
-    const response = await aiService.chat(agentName, [
-      { role: 'user', content: prompt }
-    ]);
+    // Use aiClient.callAI which handles all providers correctly
+    const response = await aiClient.callAI(agent, prompt, systemPrompt);
 
-    if (!response.success) {
-      return { success: false, error: response.error || 'AI request failed' };
+    if (!response) {
+      return { success: false, error: 'AI request failed - no response' };
     }
 
     // Parse JSON response
     let strategyParts;
     try {
       // Extract JSON from response (might have markdown)
-      let jsonStr = response.content || response.message || '';
-      const jsonMatch = jsonStr.match(/\{[\s\S]*\}/);
+      const jsonMatch = response.match(/\{[\s\S]*\}/);
       if (jsonMatch) {
-        jsonStr = jsonMatch[0];
+        strategyParts = JSON.parse(jsonMatch[0]);
+      } else {
+        return { success: false, error: 'AI response did not contain valid JSON' };
       }
-      strategyParts = JSON.parse(jsonStr);
     } catch (parseError) {
       return { success: false, error: `Failed to parse AI response: ${parseError.message}` };
     }
@@ -288,6 +292,7 @@ async function validateStrategyCode(code, filepath) {
  */
 const customStrategyMenu = async (service) => {
   console.clear();
+  displayBanner();
   
   // Check if AI agent is connected
   const agents = aiService.getAgents();