hedgequantx 2.6.96 → 2.6.98

package/package.json

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

package/src/menus/ai-agent.js

@@ -838,8 +838,8 @@ const setupOAuthConnection = async (provider) => {
 };
 
 /**
- * Setup OAuth via Remote Relay (for VPS/Server users)
- * Uses cli.hedgequantx.com to receive OAuth callbacks
+ * Setup OAuth via Manual Code Entry (unified flow for local and VPS)
+ * User copies the authorization code from the URL or page
  */
 const setupRemoteOAuth = async (provider, config) => {
   const boxWidth = getLogoWidth();
@@ -851,44 +851,29 @@ const setupRemoteOAuth = async (provider, config) => {
     return chalk.cyan('║') + ' ' + content + ' '.repeat(Math.max(0, padding - 1)) + chalk.cyan('║');
   };
   
-  console.clear();
-  displayBanner();
-  drawBoxHeaderContinue(`CONNECT ${config.name}`, boxWidth);
-  
-  console.log(makeLine(chalk.yellow('REMOTE AUTHENTICATION (VPS/SERVER)')));
-  console.log(makeLine(''));
-  console.log(makeLine(chalk.white('CREATING SECURE SESSION...')));
-  
-  drawBoxFooter(boxWidth);
-  
-  const spinner = ora({ text: 'Creating OAuth session...', color: 'cyan' }).start();
-  
-  let sessionData;
-  try {
-    sessionData = await proxyManager.createRemoteSession(provider.id);
-  } catch (error) {
-    spinner.fail(`Failed to create session: ${error.message}`);
-    await prompts.waitForEnter();
-    return await selectProviderOption(provider);
-  }
-  
-  spinner.stop();
+  // Generate OAuth URL using the existing oauth module
+  const authResult = oauthAnthropic.authorize('max');
+  const url = authResult.url;
+  const verifier = authResult.verifier;
   
-  // Show URL to user
+  // Show instructions
   console.clear();
   displayBanner();
   drawBoxHeaderContinue(`CONNECT ${config.name}`, boxWidth);
   
-  console.log(makeLine(chalk.yellow('LOGIN TO YOUR ACCOUNT')));
+  console.log(makeLine(chalk.yellow('CONNECT YOUR ACCOUNT')));
   console.log(makeLine(''));
-  console.log(makeLine(chalk.white('1. OPEN THE LINK BELOW IN ANY BROWSER')));
-  console.log(makeLine(chalk.white('   (Phone, laptop, any device)')));
+  console.log(makeLine(chalk.white('1. OPEN THE LINK BELOW IN YOUR BROWSER')));
   console.log(makeLine(''));
   console.log(makeLine(chalk.white(`2. LOGIN WITH YOUR ${config.accountName.toUpperCase()} ACCOUNT`)));
   console.log(makeLine(''));
-  console.log(makeLine(chalk.white('3. AUTHORIZE THE APPLICATION')));
+  console.log(makeLine(chalk.white('3. CLICK "AUTHORIZE"')));
   console.log(makeLine(''));
-  console.log(makeLine(chalk.green('THE CLI WILL DETECT WHEN YOU AUTHORIZE')));
+  console.log(makeLine(chalk.green('4. COPY THE CODE FROM THE URL BAR')));
+  console.log(makeLine(chalk.white('   Look for: code=XXXXXX in the URL')));
+  console.log(makeLine(chalk.white('   Copy everything after code= until &')));
+  console.log(makeLine(''));
+  console.log(makeLine(chalk.white('5. PASTE THE CODE BELOW')));
   console.log(makeLine(''));
   
   drawBoxFooter(boxWidth);
@@ -897,40 +882,61 @@ const setupRemoteOAuth = async (provider, config) => {
   console.log();
   console.log(chalk.yellow('  OPEN THIS URL IN YOUR BROWSER:'));
   console.log();
-  console.log(chalk.cyan(`  ${sessionData.authUrl}`));
+  console.log(chalk.cyan(`  ${url}`));
   console.log();
   
-  // Poll for completion
-  const authSpinner = ora({ text: 'Waiting for authorization...', color: 'cyan' }).start();
+  // Get code from user
+  const code = await prompts.textInput(chalk.cyan('PASTE AUTHORIZATION CODE:'));
   
-  let tokenData;
-  try {
-    tokenData = await proxyManager.waitForRemoteAuth(sessionData.sessionId, 300000, (msg) => {
-      authSpinner.text = msg;
-    });
-  } catch (error) {
-    authSpinner.fail(`Authorization failed: ${error.message}`);
+  if (!code || code.trim() === '<' || code.trim() === '') {
+    return await selectProviderOption(provider);
+  }
+  
+  // Exchange code for tokens
+  const spinner = ora({ text: 'Exchanging code for tokens...', color: 'cyan' }).start();
+  
+  const result = await oauthAnthropic.exchange(code.trim(), verifier);
+  
+  if (result.type === 'failed') {
+    spinner.fail(`Authentication failed: ${result.error || 'Invalid code'}`);
     await prompts.waitForEnter();
     return await selectProviderOption(provider);
   }
   
-  authSpinner.succeed('Authorization successful!');
+  spinner.succeed('Authorization successful!');
   
   // Save credentials
   const credentials = {
     oauth: {
-      access: tokenData.tokens.access,
-      refresh: tokenData.tokens.refresh,
-      expires: tokenData.tokens.expires || Date.now() + 3600000
-    },
-    useRemoteOAuth: true
+      access: result.access,
+      refresh: result.refresh,
+      expires: result.expires,
+      apiKey: result.apiKey,
+      email: result.email
+    }
   };
   
-  // For remote OAuth, we need to use the tokens directly with the provider API
-  // Let user select a model (use a default list since we can't query without local proxy)
-  const defaultModels = getDefaultModelsForProvider(provider.id);
+  // Try to fetch models with the new token
+  spinner.text = 'Fetching available models...';
+  spinner.start();
   
-  const selectedModel = await selectModelFromList(defaultModels, config.name);
+  let models = [];
+  try {
+    const { fetchAnthropicModelsOAuth } = require('../services/ai/client');
+    models = await fetchAnthropicModelsOAuth(result.access);
+  } catch (e) {
+    // Ignore - will use defaults
+  }
+  
+  // Use defaults if API doesn't return models
+  if (!models || models.length === 0) {
+    models = getDefaultModelsForProvider(provider.id);
+  }
+  
+  spinner.succeed(`Found ${models.length} models`);
+  
+  // Let user select model
+  const selectedModel = await selectModelFromList(models, config.name);
   if (!selectedModel) {
     return await selectProviderOption(provider);
   }
@@ -981,177 +987,12 @@ const getDefaultModelsForProvider = (providerId) => {
 };
 
 /**
- * Setup OAuth via CLIProxyAPI (automatic local proxy)
- * This is the simplified flow for users with subscription plans on local machines
+ * Setup OAuth via Manual Code Entry (unified flow for local and VPS)
+ * User copies the authorization code from the URL or page
  */
 const setupProxyOAuth = async (provider, config) => {
-  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(`CONNECT ${config.name}`, boxWidth);
-  
-  console.log(makeLine(chalk.yellow('AUTOMATIC SETUP')));
-  console.log(makeLine(''));
-  console.log(makeLine(chalk.white('PREPARING CONNECTION...')));
-  
-  drawBoxFooter(boxWidth);
-  
-  // Ensure proxy is running (will install if needed)
-  const spinner = ora({ text: 'Setting up AI connection...', color: 'cyan' }).start();
-  
-  try {
-    await proxyManager.ensureRunning((msg) => {
-      spinner.text = msg;
-    });
-  } catch (error) {
-    spinner.fail(`Setup failed: ${error.message}`);
-    await prompts.waitForEnter();
-    return await selectProviderOption(provider);
-  }
-  
-  // Get OAuth URL from proxy
-  spinner.text = 'Generating authorization link...';
-  
-  let authData;
-  try {
-    authData = await proxyManager.getAuthUrl(provider.id);
-  } catch (error) {
-    spinner.fail(`Failed to get auth URL: ${error.message}`);
-    await prompts.waitForEnter();
-    return await selectProviderOption(provider);
-  }
-  
-  spinner.stop();
-  
-  // Show URL to user
-  console.clear();
-  displayBanner();
-  drawBoxHeaderContinue(`CONNECT ${config.name}`, boxWidth);
-  
-  console.log(makeLine(chalk.yellow('LOGIN TO YOUR ACCOUNT')));
-  console.log(makeLine(''));
-  console.log(makeLine(chalk.white('1. OPEN THE LINK BELOW IN YOUR BROWSER')));
-  console.log(makeLine(chalk.white(`2. LOGIN WITH YOUR ${config.accountName.toUpperCase()} ACCOUNT`)));
-  console.log(makeLine(chalk.white('3. AUTHORIZE THE APPLICATION')));
-  console.log(makeLine(''));
-  console.log(makeLine(chalk.green('THE CONNECTION WILL BE AUTOMATIC!')));
-  console.log(makeLine(chalk.white('NO CODE TO COPY - JUST LOGIN AND AUTHORIZE')));
-  console.log(makeLine(''));
-  console.log(makeLine(chalk.white('PRESS ENTER AFTER YOU AUTHORIZED...')));
-  
-  drawBoxFooter(boxWidth);
-  
-  // Display URL outside the box for easy copy
-  console.log();
-  console.log(chalk.yellow('  OPEN THIS URL IN YOUR BROWSER:'));
-  console.log();
-  console.log(chalk.cyan(`  ${authData.url}`));
-  console.log();
-  
-  // Try to open browser automatically
-  const browserOpened = await openBrowser(authData.url);
-  if (browserOpened) {
-    console.log(chalk.green('  Browser opened automatically!'));
-    console.log();
-  }
-  
-  // Wait for user to press enter
-  await prompts.waitForEnter();
-  
-  // Check if auth was successful
-  const authSpinner = ora({ text: 'Checking authorization...', color: 'cyan' }).start();
-  
-  try {
-    // Poll for auth status (with timeout)
-    const startTime = Date.now();
-    const timeout = 60000; // 1 minute
-    
-    while (Date.now() - startTime < timeout) {
-      const status = await proxyManager.pollAuthStatus(authData.state);
-      
-      if (status.status === 'ok') {
-        authSpinner.succeed('Authorization successful!');
-        break;
-      } else if (status.status === 'error') {
-        authSpinner.fail(`Authorization failed: ${status.error}`);
-        await prompts.waitForEnter();
-        return await selectProviderOption(provider);
-      }
-      
-      // Still waiting
-      await new Promise(resolve => setTimeout(resolve, 2000));
-    }
-  } catch (error) {
-    // If polling fails, try to get models anyway (user might have authorized)
-    authSpinner.text = 'Verifying connection...';
-  }
-  
-  // Fetch available models from proxy
-  authSpinner.text = 'Fetching available models...';
-  
-  let models = [];
-  try {
-    models = await proxyManager.getModels();
-  } catch (e) {
-    // Try again
-    await new Promise(resolve => setTimeout(resolve, 2000));
-    models = await proxyManager.getModels();
-  }
-  
-  if (!models || models.length === 0) {
-    authSpinner.fail('No models available - authorization may have failed');
-    console.log(chalk.red('\n  Please try again and make sure to complete the login.'));
-    await prompts.waitForEnter();
-    return await selectProviderOption(provider);
-  }
-  
-  // Filter models for this provider
-  const providerModels = models.filter(m => {
-    const modelLower = m.toLowerCase();
-    if (provider.id === 'anthropic') return modelLower.includes('claude');
-    if (provider.id === 'openai') return modelLower.includes('gpt') || modelLower.includes('o1') || modelLower.includes('o3');
-    if (provider.id === 'gemini') return modelLower.includes('gemini');
-    if (provider.id === 'qwen') return modelLower.includes('qwen');
-    if (provider.id === 'iflow') return true; // iFlow has various models
-    return true;
-  });
-  
-  const finalModels = providerModels.length > 0 ? providerModels : models;
-  
-  authSpinner.succeed(`Found ${finalModels.length} models`);
-  
-  // Let user select model
-  const selectedModel = await selectModelFromList(finalModels, config.name);
-  if (!selectedModel) {
-    return await selectProviderOption(provider);
-  }
-  
-  // Save agent configuration (using proxy)
-  const credentials = {
-    useProxy: true,
-    proxyPort: proxyManager.PROXY_PORT
-  };
-  
-  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();
+  // Use the same flow as VPS - it works everywhere
+  return await setupRemoteOAuth(provider, config);
 };
 
 /**