hedgequantx 2.6.96 → 2.6.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "2.6.96",
+  "version": "2.6.97",
   "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 (for VPS/Server users)
+ * User copies the authorization code from the browser
  */
 const setupRemoteOAuth = async (provider, config) => {
   const boxWidth = getLogoWidth();
@@ -851,45 +851,31 @@ 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);
+  drawBoxHeaderContinue(`CONNECT ${config.name} (VPS MODE)`, boxWidth);
   
-  console.log(makeLine(chalk.yellow('LOGIN TO YOUR ACCOUNT')));
+  console.log(makeLine(chalk.yellow('MANUAL AUTHORIZATION')));
   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(''));
   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('4. COPY THE CODE SHOWN ON SCREEN')));
+  console.log(makeLine(chalk.white('   (Format: abc123...#xyz789...)')));
   console.log(makeLine(''));
-  console.log(makeLine(chalk.green('THE CLI WILL DETECT WHEN YOU AUTHORIZE')));
+  console.log(makeLine(chalk.white('5. PASTE THE CODE BELOW')));
   console.log(makeLine(''));
+  console.log(makeLine(chalk.white('TYPE < TO CANCEL')));
   
   drawBoxFooter(boxWidth);
   
@@ -897,40 +883,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);
   }