hedgequantx 2.6.151 → 2.6.153

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "2.6.151",
+  "version": "2.6.153",
   "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, drawBoxHeaderContinue, drawBoxFooter, drawBoxRow, getLogoWidth, centerText } = 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();
@@ -299,11 +304,13 @@ const customStrategyMenu = async (service) => {
   }
 
   const agentName = agents[0].name || agents[0].provider;
-  console.log(chalk.cyan('\n  ╔════════════════════════════════════════════════════════════╗'));
-  console.log(chalk.cyan('  ║') + chalk.yellow.bold('              CUSTOM STRATEGY - AI GENERATED                ') + chalk.cyan('║'));
-  console.log(chalk.cyan('  ╠════════════════════════════════════════════════════════════╣'));
-  console.log(chalk.cyan('  ║') + chalk.gray(` Agent: ${agentName.padEnd(51)}`) + chalk.cyan('║'));
-  console.log(chalk.cyan('  ╚════════════════════════════════════════════════════════════╝\n'));
+  const boxWidth = Math.max(getLogoWidth(), 98);
+  const innerWidth = boxWidth - 2;
+  
+  // Header aligned with main banner
+  drawBoxHeaderContinue('CUSTOM STRATEGY - AI GENERATED');
+  drawBoxRow(`Agent: ${agentName}`, innerWidth);
+  drawBoxFooter();
 
   // Step 1: Get strategy description from user
   console.log(chalk.yellow('  Describe your trading strategy in natural language:'));
@@ -361,12 +368,11 @@ const customStrategyMenu = async (service) => {
   console.log(chalk.gray(`  Saved to: ${filepath}\n`));
 
   // Step 4: Show strategy summary and confirm
-  console.log(chalk.cyan('  ╔════════════════════════════════════════════════════════════╗'));
-  console.log(chalk.cyan('  ║') + chalk.green.bold('                    STRATEGY READY                          ') + chalk.cyan('║'));
-  console.log(chalk.cyan('  ╠════════════════════════════════════════════════════════════╣'));
-  console.log(chalk.cyan('  ║') + chalk.white(` Name: ${genResult.name.substring(0, 51).padEnd(51)}`) + chalk.cyan('║'));
-  console.log(chalk.cyan('  ║') + chalk.gray(` File: ${filename.padEnd(51)}`) + chalk.cyan('║'));
-  console.log(chalk.cyan('  ╚════════════════════════════════════════════════════════════╝\n'));
+  console.log('');
+  drawBoxHeaderContinue('STRATEGY READY');
+  drawBoxRow(`Name: ${genResult.name}`, innerWidth);
+  drawBoxRow(`File: ${filename}`, innerWidth);
+  drawBoxFooter();
 
   const confirm = await prompts.textInput(chalk.cyan('  Continue with this strategy? (Y/n): '));
   if (confirm.toLowerCase() === 'n') {
@@ -388,8 +394,8 @@ const customStrategyMenu = async (service) => {
  * Same as one-account but uses the custom strategy class
  */
 async function executeWithCustomStrategy(service, StrategyClass, strategyName) {
-  // Import one-account's configuration prompts
-  const { getLogoWidth, drawBoxHeaderContinue, drawBoxFooter, displayBanner } = require('../../ui');
+  const boxWidth = Math.max(getLogoWidth(), 98);
+  const innerWidth = boxWidth - 2;
   
   // Get accounts
   const accountsResult = await service.getTradingAccounts();

package/src/services/ai/client.js

@@ -61,9 +61,10 @@ const makeRequest = (url, options) => {
  * @param {Object} agent - Agent configuration
  * @param {string} prompt - User prompt
  * @param {string} systemPrompt - System prompt
+ * @param {Object} options - Optional settings { maxTokens, temperature, timeout }
  * @returns {Promise<string|null>} Response text or null on error
  */
-const callOpenAICompatible = async (agent, prompt, systemPrompt) => {
+const callOpenAICompatible = async (agent, prompt, systemPrompt, options = {}) => {
   const provider = getProvider(agent.providerId);
   if (!provider) return null;
   
@@ -97,12 +98,12 @@ const callOpenAICompatible = async (agent, prompt, systemPrompt) => {
       { role: 'system', content: systemPrompt },
       { role: 'user', content: prompt }
     ],
-    temperature: 0.3,
-    max_tokens: 500
+    temperature: options.temperature || 0.3
   };
   
   try {
-    const response = await makeRequest(url, { headers, body, timeout: 30000 });
+    const timeout = options.timeout || 30000;
+    const response = await makeRequest(url, { headers, body, timeout });
     return response.choices?.[0]?.message?.content || null;
   } catch (error) {
     return null;
@@ -138,9 +139,10 @@ const getValidOAuthToken = async (credentials) => {
  * @param {Object} agent - Agent configuration
  * @param {string} prompt - User prompt
  * @param {string} systemPrompt - System prompt
+ * @param {Object} options - Optional settings { maxTokens, temperature, timeout }
  * @returns {Promise<string|null>} Response text or null on error
  */
-const callAnthropic = async (agent, prompt, systemPrompt) => {
+const callAnthropic = async (agent, prompt, systemPrompt, options = {}) => {
   const provider = getProvider('anthropic');
   if (!provider) return null;
   
@@ -171,7 +173,7 @@ const callAnthropic = async (agent, prompt, systemPrompt) => {
   
   const body = {
     model,
-    max_tokens: 500,
+    max_tokens: 8192,
     system: systemPrompt,
     messages: [
       { role: 'user', content: prompt }
@@ -179,7 +181,8 @@ const callAnthropic = async (agent, prompt, systemPrompt) => {
   };
   
   try {
-    const response = await makeRequest(url, { headers, body, timeout: 30000 });
+    const timeout = options.timeout || 30000;
+    const response = await makeRequest(url, { headers, body, timeout });
     return response.content?.[0]?.text || null;
   } catch (error) {
     return null;
@@ -193,7 +196,7 @@ const callAnthropic = async (agent, prompt, systemPrompt) => {
  * @param {string} systemPrompt - System prompt
  * @returns {Promise<string|null>} Response text or null on error
  */
-const callGemini = async (agent, prompt, systemPrompt) => {
+const callGemini = async (agent, prompt, systemPrompt, options = {}) => {
   const provider = getProvider('gemini');
   if (!provider) return null;
   
@@ -213,13 +216,13 @@ const callGemini = async (agent, prompt, systemPrompt) => {
       { role: 'user', parts: [{ text: `${systemPrompt}\n\n${prompt}` }] }
     ],
     generationConfig: {
-      temperature: 0.3,
-      maxOutputTokens: 500
+      temperature: 0.3
     }
   };
   
   try {
-    const response = await makeRequest(url, { headers, body, timeout: 30000 });
+    const timeout = options.timeout || 60000;
+    const response = await makeRequest(url, { headers, body, timeout });
     return response.candidates?.[0]?.content?.parts?.[0]?.text || null;
   } catch (error) {
     return null;
@@ -234,7 +237,7 @@ const callGemini = async (agent, prompt, systemPrompt) => {
  * @param {string} systemPrompt - System prompt
  * @returns {Promise<string|null>} Response text or null on error
  */
-const callViaProxy = async (agent, prompt, systemPrompt) => {
+const callViaProxy = async (agent, prompt, systemPrompt, options = {}) => {
   const proxyPort = agent.credentials?.proxyPort || 8317;
   const model = agent.model;
   
@@ -253,12 +256,12 @@ const callViaProxy = async (agent, prompt, systemPrompt) => {
       { role: 'system', content: systemPrompt },
       { role: 'user', content: prompt }
     ],
-    temperature: 0.3,
-    max_tokens: 500
+    temperature: 0.3
   };
   
   try {
-    const response = await makeRequest(url, { headers, body, timeout: 30000 });
+    const timeout = options.timeout || 60000;
+    const response = await makeRequest(url, { headers, body, timeout });
     return response.choices?.[0]?.message?.content || null;
   } catch (error) {
     return null;
@@ -270,22 +273,26 @@ const callViaProxy = async (agent, prompt, systemPrompt) => {
  * @param {Object} agent - Agent with providerId and credentials
  * @param {string} prompt - User prompt
  * @param {string} systemPrompt - System prompt
+ * @param {Object} options - Optional settings { maxTokens, temperature, timeout }
  * @returns {Promise<string|null>} AI response or null on error
  */
-const callAI = async (agent, prompt, systemPrompt = '') => {
+const callAI = async (agent, prompt, systemPrompt = '', options = {}) => {
   if (!agent || !agent.providerId) return null;
   
+  // Default timeout 60s for code generation
+  const opts = { timeout: 60000, ...options };
+  
   // Check if using proxy mode (subscription accounts)
   if (agent.credentials?.useProxy) {
-    return callViaProxy(agent, prompt, systemPrompt);
+    return callViaProxy(agent, prompt, systemPrompt, opts);
   }
   
   switch (agent.providerId) {
     case 'anthropic':
-      return callAnthropic(agent, prompt, systemPrompt);
+      return callAnthropic(agent, prompt, systemPrompt, opts);
     
     case 'gemini':
-      return callGemini(agent, prompt, systemPrompt);
+      return callGemini(agent, prompt, systemPrompt, opts);
     
     // All OpenAI-compatible APIs
     case 'openai':
@@ -304,7 +311,7 @@ const callAI = async (agent, prompt, systemPrompt = '') => {
     case 'ollama':
     case 'lmstudio':
     case 'custom':
-      return callOpenAICompatible(agent, prompt, systemPrompt);
+      return callOpenAICompatible(agent, prompt, systemPrompt, opts);
     
     default:
       return null;