hedgequantx 2.6.119 → 2.6.121

package/package.json

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

package/src/menus/ai-agent.js

@@ -1104,71 +1104,82 @@ const setupProxyOAuth = async (provider, config) => {
     return await selectProviderOption(provider);
   }
   
-  // Step 5: Fetch models from CLIProxyAPI
-  const modelSpinner = ora({ text: 'Fetching available models from API...', color: 'cyan' }).start();
-  
-  let models = [];
+  // Wrap entire post-auth flow in try-catch to catch any uncaught errors
   try {
-    models = await proxyManager.getModels();
-    modelSpinner.succeed(`Found ${models.length} models`);
-  } catch (error) {
-    modelSpinner.fail(`Failed to fetch models: ${error.message}`);
+    // Step 5: Fetch models from CLIProxyAPI
+    const modelSpinner = ora({ text: 'Fetching available models from API...', color: 'cyan' }).start();
+    
+    let models = [];
+    try {
+      models = await proxyManager.getModels();
+      modelSpinner.succeed(`Found ${models.length} models`);
+    } catch (error) {
+      modelSpinner.fail(`Failed to fetch models: ${error.message}`);
+      await prompts.waitForEnter();
+      return await selectProviderOption(provider);
+    }
+    
+    // Filter models for this provider
+    const providerPrefixes = {
+      anthropic: ['claude'],
+      openai: ['gpt', 'o1', 'o3', 'o4'],
+      gemini: ['gemini'],
+      qwen: ['qwen'],
+      iflow: ['deepseek', 'kimi', 'glm']
+    };
+    
+    const prefixes = providerPrefixes[provider.id] || [];
+    const filteredModels = models.filter(m => {
+      const modelLower = m.toLowerCase();
+      return prefixes.some(p => modelLower.includes(p));
+    });
+    
+    // Use filtered models if available, otherwise use all models
+    const availableModels = filteredModels.length > 0 ? filteredModels : models;
+    
+    if (!availableModels || availableModels.length === 0) {
+      console.log();
+      console.log(chalk.red('  ERROR: No models found for this provider'));
+      console.log(chalk.gray('  Make sure your subscription is active.'));
+      console.log();
+      await prompts.waitForEnter();
+      return await selectProviderOption(provider);
+    }
+    
+    // Step 6: Let user select model
+    const selectedModel = await selectModelFromList(availableModels, config.name);
+    if (!selectedModel) {
+      return await selectProviderOption(provider);
+    }
+    
+    // Step 7: Save agent config (CLIProxyAPI stores the actual tokens)
+    // We just save a reference to use the proxy
+    const credentials = {
+      useProxy: true,
+      provider: provider.id
+    };
+    
+    try {
+      await aiService.addAgent(provider.id, config.optionId, credentials, selectedModel, config.agentName);
+      
+      console.log(chalk.green(`\n  CONNECTED TO ${config.name}`));
+      console.log(chalk.white(`  MODEL: ${selectedModel}`));
+      console.log(chalk.white('  UNLIMITED USAGE WITH YOUR SUBSCRIPTION'));
+    } catch (error) {
+      console.log(chalk.red(`\n  FAILED TO SAVE: ${error.message}`));
+    }
+    
     await prompts.waitForEnter();
-    return await selectProviderOption(provider);
-  }
-  
-  // Filter models for this provider
-  const providerPrefixes = {
-    anthropic: ['claude'],
-    openai: ['gpt', 'o1', 'o3', 'o4'],
-    gemini: ['gemini'],
-    qwen: ['qwen'],
-    iflow: ['deepseek', 'kimi', 'glm']
-  };
-  
-  const prefixes = providerPrefixes[provider.id] || [];
-  const filteredModels = models.filter(m => {
-    const modelLower = m.toLowerCase();
-    return prefixes.some(p => modelLower.includes(p));
-  });
-  
-  // Use filtered models if available, otherwise use all models
-  const availableModels = filteredModels.length > 0 ? filteredModels : models;
-  
-  if (!availableModels || availableModels.length === 0) {
+    return await aiAgentMenu();
+  } catch (unexpectedError) {
+    // Catch any uncaught errors in the post-auth flow
     console.log();
-    console.log(chalk.red('  ERROR: No models found for this provider'));
-    console.log(chalk.gray('  Make sure your subscription is active.'));
+    console.log(chalk.red(`  UNEXPECTED ERROR: ${unexpectedError.message}`));
+    console.log(chalk.gray(`  Stack: ${unexpectedError.stack}`));
     console.log();
     await prompts.waitForEnter();
     return await selectProviderOption(provider);
   }
-  
-  // Step 6: Let user select model
-  const selectedModel = await selectModelFromList(availableModels, config.name);
-  if (!selectedModel) {
-    return await selectProviderOption(provider);
-  }
-  
-  // Step 7: Save agent config (CLIProxyAPI stores the actual tokens)
-  // We just save a reference to use the proxy
-  const credentials = {
-    useProxy: true,
-    provider: provider.id
-  };
-  
-  try {
-    await aiService.addAgent(provider.id, config.optionId, credentials, selectedModel, config.agentName);
-    
-    console.log(chalk.green(`\n  CONNECTED TO ${config.name}`));
-    console.log(chalk.white(`  MODEL: ${selectedModel}`));
-    console.log(chalk.white('  UNLIMITED USAGE WITH YOUR SUBSCRIPTION'));
-  } catch (error) {
-    console.log(chalk.red(`\n  FAILED TO SAVE: ${error.message}`));
-  }
-  
-  await prompts.waitForEnter();
-  return await aiAgentMenu();
 };
 
 /**

package/src/services/ai/proxy-manager.js

@@ -495,13 +495,72 @@ const getAuthUrl = async (provider) => {
 };
 
 /**
- * Poll for OAuth authentication status
- * @param {string} state - OAuth state from getAuthUrl
- * @returns {Promise<{status: string, error?: string}>}
+ * @param {string} callbackUrl - Full callback URL (http://localhost:54545/callback?code=xxx&state=yyy)
+ * @param {string} provider - Provider ID (anthropic, openai, gemini, qwen, iflow)
+ * @returns {Promise<boolean>}
  */
-const pollAuthStatus = async (state) => {
-  const response = await managementRequest('GET', `/v0/management/get-auth-status?state=${state}`);
-  return response;
+const submitCallback = async (callbackUrl, provider = 'anthropic') => {
+  // Parse the callback URL
+  let url;
+  try {
+    url = new URL(callbackUrl);
+  } catch (e) {
+    throw new Error('Invalid callback URL format');
+  }
+  
+  const code = url.searchParams.get('code');
+  const state = url.searchParams.get('state');
+  
+  if (!code || !state) {
+    throw new Error('Missing code or state in callback URL');
+  }
+  
+  // Each provider has its own OAuth callback port and path in CLIProxyAPI
+  // We need to submit the callback to the correct port
+  const providerConfig = {
+    anthropic: { port: 54545, path: '/callback' },
+    openai: { port: 16168, path: '/callback' },
+    gemini: { port: 8085, path: '/oauth2callback' },
+    qwen: { port: 8087, path: '/oauth2callback' },
+    iflow: { port: 8088, path: '/callback' }
+  };
+  
+  const config = providerConfig[provider] || providerConfig.anthropic;
+  
+  // Submit to the provider's OAuth callback port directly
+  return new Promise((resolve, reject) => {
+    const callbackPath = `${config.path}?code=${encodeURIComponent(code)}&state=${encodeURIComponent(state)}`;
+    
+    const req = http.request({
+      hostname: '127.0.0.1',
+      port: config.port,
+      path: callbackPath,
+      method: 'GET',
+      timeout: 30000
+    }, (res) => {
+      let data = '';
+      res.on('data', chunk => data += chunk);
+      res.on('end', () => {
+        // Success if we get a redirect or success page
+        if (res.statusCode === 200 || res.statusCode === 302 || res.statusCode === 301) {
+          resolve(true);
+        } else {
+          reject(new Error(`Callback failed with status ${res.statusCode}`));
+        }
+      });
+    });
+    
+    req.on('error', (e) => {
+      reject(new Error(`Failed to submit callback: ${e.message}`));
+    });
+    
+    req.on('timeout', () => {
+      req.destroy();
+      reject(new Error('Callback request timeout'));
+    });
+    
+    req.end();
+  });
 };
 
 /**