hedgequantx 2.6.98 → 2.6.100

package/package.json

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

package/src/menus/ai-agent.js

@@ -782,9 +782,7 @@ const getOAuthConfig = (providerId) => {
 
 /**
  * Setup OAuth connection for any provider with OAuth support
- * Automatically detects environment and uses the appropriate method:
- * - Local (PC/Mac): Uses CLIProxyAPI for automatic token management
- * - Remote (VPS/Server): Uses cli.hedgequantx.com as OAuth relay
+ * Unified flow: copy code from URL (works on local and VPS)
  */
 const setupOAuthConnection = async (provider) => {
   const config = getOAuthConfig(provider.id);
@@ -794,47 +792,8 @@ const setupOAuthConnection = async (provider) => {
     return await selectProviderOption(provider);
   }
   
-  // Check if we can open a browser locally
-  const canUseBrowser = proxyManager.canOpenBrowser();
-  const isServer = proxyManager.isServerEnvironment();
-  
-  // If on server or can't open browser, use remote OAuth
-  if (isServer || !canUseBrowser) {
-    // Only anthropic is supported for remote OAuth currently
-    if (provider.id === 'anthropic') {
-      return await setupRemoteOAuth(provider, config);
-    } else {
-      // For other providers on VPS, show message
-      const boxWidth = getLogoWidth();
-      const W = boxWidth - 2;
-      const makeLine = (content) => {
-        const plainLen = content.replace(/\x1b\[[0-9;]*m/g, '').length;
-        const padding = W - plainLen;
-        return chalk.cyan('║') + ' ' + content + ' '.repeat(Math.max(0, padding - 1)) + chalk.cyan('║');
-      };
-      
-      console.clear();
-      displayBanner();
-      drawBoxHeaderContinue('SERVER DETECTED', boxWidth);
-      
-      console.log(makeLine(chalk.yellow('VPS/SERVER ENVIRONMENT DETECTED')));
-      console.log(makeLine(''));
-      console.log(makeLine(chalk.white('OAuth for this provider requires a browser.')));
-      console.log(makeLine(''));
-      console.log(makeLine(chalk.white('OPTIONS:')));
-      console.log(makeLine(chalk.cyan('1. Use Claude (supports remote OAuth)')));
-      console.log(makeLine(chalk.cyan('2. Use API Key instead of OAuth')));
-      console.log(makeLine(chalk.cyan('3. Run this on a local machine first')));
-      console.log(makeLine(''));
-      
-      drawBoxFooter(boxWidth);
-      await prompts.waitForEnter();
-      return await selectProviderOption(provider);
-    }
-  }
-  
-  // Local machine - use CLIProxyAPI
-  return await setupProxyOAuth(provider, config);
+  // Use unified manual flow for all providers and environments
+  return await setupRemoteOAuth(provider, config);
 };
 
 /**
@@ -851,8 +810,24 @@ const setupRemoteOAuth = async (provider, config) => {
     return chalk.cyan('║') + ' ' + content + ' '.repeat(Math.max(0, padding - 1)) + chalk.cyan('║');
   };
   
-  // Generate OAuth URL using the existing oauth module
-  const authResult = oauthAnthropic.authorize('max');
+  // Get the right OAuth module for this provider
+  const oauthModules = {
+    anthropic: oauthAnthropic,
+    openai: oauthOpenai,
+    gemini: oauthGemini,
+    qwen: oauthQwen,
+    iflow: oauthIflow
+  };
+  
+  const oauthModule = oauthModules[provider.id];
+  if (!oauthModule) {
+    console.log(chalk.red(`OAuth not supported for ${provider.id}`));
+    await prompts.waitForEnter();
+    return await selectProviderOption(provider);
+  }
+  
+  // Generate OAuth URL using the provider's oauth module
+  const authResult = oauthModule.authorize(config.optionId || 'max');
   const url = authResult.url;
   const verifier = authResult.verifier;
   
@@ -895,7 +870,7 @@ const setupRemoteOAuth = async (provider, config) => {
   // Exchange code for tokens
   const spinner = ora({ text: 'Exchanging code for tokens...', color: 'cyan' }).start();
   
-  const result = await oauthAnthropic.exchange(code.trim(), verifier);
+  const result = await oauthModule.exchange(code.trim(), verifier);
   
   if (result.type === 'failed') {
     spinner.fail(`Authentication failed: ${result.error || 'Invalid code'}`);
@@ -922,23 +897,30 @@ const setupRemoteOAuth = async (provider, config) => {
   
   let models = [];
   try {
-    const { fetchAnthropicModelsOAuth } = require('../services/ai/client');
-    models = await fetchAnthropicModelsOAuth(result.access);
+    const { fetchModelsWithOAuth } = require('../services/ai/client');
+    models = await fetchModelsWithOAuth(provider.id, result.access);
   } catch (e) {
-    // Ignore - will use defaults
+    // API failed - will prompt for manual input
   }
   
-  // Use defaults if API doesn't return models
-  if (!models || models.length === 0) {
-    models = getDefaultModelsForProvider(provider.id);
-  }
-  
-  spinner.succeed(`Found ${models.length} models`);
+  let selectedModel;
   
-  // Let user select model
-  const selectedModel = await selectModelFromList(models, config.name);
-  if (!selectedModel) {
-    return await selectProviderOption(provider);
+  if (!models || models.length === 0) {
+    spinner.warn('Could not fetch models from API');
+    
+    // Prompt user to enter model name manually
+    selectedModel = await promptForModelName(config.name);
+    if (!selectedModel) {
+      return await selectProviderOption(provider);
+    }
+  } else {
+    spinner.succeed(`Found ${models.length} models`);
+    
+    // Let user select model from list
+    selectedModel = await selectModelFromList(models, config.name);
+    if (!selectedModel) {
+      return await selectProviderOption(provider);
+    }
   }
   
   // Add agent
@@ -957,33 +939,22 @@ const setupRemoteOAuth = async (provider, config) => {
 };
 
 /**
- * Get default models for a provider (used when we can't query the API)
+ * Prompt user to enter model name manually when API doesn't return models
  */
-const getDefaultModelsForProvider = (providerId) => {
-  // These are fetched from provider APIs - not hardcoded fallbacks
-  // They represent the known model IDs that the provider supports
-  const models = {
-    anthropic: [
-      'claude-sonnet-4-20250514',
-      'claude-opus-4-20250514', 
-      'claude-3-5-sonnet-20241022',
-      'claude-3-5-haiku-20241022',
-      'claude-3-opus-20240229'
-    ],
-    openai: [
-      'gpt-4o',
-      'gpt-4o-mini',
-      'gpt-4-turbo',
-      'o1-preview',
-      'o1-mini'
-    ],
-    gemini: [
-      'gemini-2.0-flash-exp',
-      'gemini-1.5-pro',
-      'gemini-1.5-flash'
-    ]
-  };
-  return models[providerId] || [];
+const promptForModelName = async (providerName) => {
+  console.log();
+  console.log(chalk.yellow('  Could not fetch models from API.'));
+  console.log(chalk.white('  Please enter the model name manually.'));
+  console.log(chalk.gray('  (Check provider docs for available models)'));
+  console.log();
+  
+  const modelName = await prompts.textInput(chalk.cyan('MODEL NAME:'));
+  
+  if (!modelName || modelName.trim() === '' || modelName.trim() === '<') {
+    return null;
+  }
+  
+  return modelName.trim();
 };
 
 /**