hedgequantx 2.5.24 → 2.5.26

package/src/menus/ai-agent.js

@@ -10,7 +10,6 @@ const { getLogoWidth, drawBoxHeader, drawBoxHeaderContinue, drawBoxFooter, displ
 const { prompts } = require('../utils');
 const aiService = require('../services/ai');
 const { getCategories, getProvidersByCategory } = require('../services/ai/providers');
-const tokenScanner = require('../services/ai/token-scanner');
 const oauthAnthropic = require('../services/ai/oauth-anthropic');
 
 /**
@@ -39,7 +38,7 @@ const aiAgentMenu = async () => {
   const agentCount = agents.length;
   
   if (agentCount === 0) {
-    console.log(makeLine(chalk.gray('STATUS: NO AGENTS CONNECTED'), 'left'));
+    console.log(makeLine(chalk.white('STATUS: NO AGENTS CONNECTED'), 'left'));
   } else {
     console.log(makeLine(chalk.green(`STATUS: ${agentCount} AGENT${agentCount > 1 ? 'S' : ''} CONNECTED`), 'left'));
     console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
@@ -49,16 +48,26 @@ const aiAgentMenu = async () => {
       const agent = agents[i];
       // Show ACTIVE marker (if single agent, it's always active)
       const isActive = agent.isActive || agents.length === 1;
-      const activeMarker = isActive ? chalk.green(' [ACTIVE]') : '';
+      const activeMarker = isActive ? ' [ACTIVE]' : '';
       const providerColor = agent.providerId === 'anthropic' ? chalk.magenta :
                            agent.providerId === 'openai' ? chalk.green :
                            agent.providerId === 'openrouter' ? chalk.yellow : chalk.cyan;
       
+      // Calculate max lengths to fit in box
+      const prefix = `[${i + 1}] `;
+      const suffix = ` - ${agent.model || 'N/A'}`;
+      const maxNameLen = W - prefix.length - activeMarker.length - suffix.length - 2;
+      
+      // Truncate agent name if too long
+      const displayName = agent.name.length > maxNameLen 
+        ? agent.name.substring(0, maxNameLen - 3) + '...'
+        : agent.name;
+      
       console.log(makeLine(
-        chalk.white(`[${i + 1}] `) + 
-        providerColor(agent.name) + 
-        activeMarker + 
-        chalk.gray(` - ${agent.model}`)
+        chalk.white(prefix) + 
+        providerColor(displayName) + 
+        chalk.green(activeMarker) + 
+        chalk.white(suffix)
       ));
     }
   }
@@ -96,13 +105,13 @@ const aiAgentMenu = async () => {
     if (agentCount > 1) {
       menuRow2(menuItem('+', 'ADD AGENT', chalk.green), menuItem('S', 'SET ACTIVE', chalk.cyan));
       menuRow2(menuItem('M', 'CHANGE MODEL', chalk.yellow), menuItem('R', 'REMOVE AGENT', chalk.red));
-      menuRow2(menuItem('X', 'REMOVE ALL', chalk.red), menuItem('<', 'BACK', chalk.gray));
+      menuRow2(menuItem('X', 'REMOVE ALL', chalk.red), menuItem('<', 'BACK', chalk.white));
     } else {
       menuRow2(menuItem('+', 'ADD AGENT', chalk.green), menuItem('M', 'CHANGE MODEL', chalk.yellow));
-      menuRow2(menuItem('R', 'REMOVE AGENT', chalk.red), menuItem('<', 'BACK', chalk.gray));
+      menuRow2(menuItem('R', 'REMOVE AGENT', chalk.red), menuItem('<', 'BACK', chalk.white));
     }
   } else {
-    menuRow2(menuItem('+', 'ADD AGENT', chalk.green), menuItem('<', 'BACK', chalk.gray));
+    menuRow2(menuItem('+', 'ADD AGENT', chalk.green), menuItem('<', 'BACK', chalk.white));
   }
   
   drawBoxFooter(boxWidth);
@@ -118,7 +127,7 @@ const aiAgentMenu = async () => {
   
   switch (input) {
     case '+':
-      return await showExistingTokens();
+      return await selectCategory();
     case 's':
       if (agentCount > 1) {
         return await selectActiveAgent();
@@ -171,9 +180,9 @@ const showAgentDetails = async (agent) => {
                        agent.providerId === 'openrouter' ? chalk.yellow : chalk.cyan;
   
   console.log(makeLine(chalk.white('NAME: ') + providerColor(agent.name)));
-  console.log(makeLine(chalk.white('PROVIDER: ') + chalk.gray(agent.provider?.name || agent.providerId)));
-  console.log(makeLine(chalk.white('MODEL: ') + chalk.gray(agent.model)));
-  console.log(makeLine(chalk.white('STATUS: ') + (agent.isActive ? chalk.green('ACTIVE') : chalk.gray('STANDBY'))));
+  console.log(makeLine(chalk.white('PROVIDER: ') + chalk.white(agent.provider?.name || agent.providerId)));
+  console.log(makeLine(chalk.white('MODEL: ') + chalk.white(agent.model)));
+  console.log(makeLine(chalk.white('STATUS: ') + (agent.isActive ? chalk.green('ACTIVE') : chalk.white('STANDBY'))));
   
   console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
   
@@ -182,7 +191,7 @@ const showAgentDetails = async (agent) => {
   }
   console.log(makeLine(chalk.yellow('[M] CHANGE MODEL')));
   console.log(makeLine(chalk.red('[R] REMOVE')));
-  console.log(makeLine(chalk.gray('[<] BACK')));
+  console.log(makeLine(chalk.white('[<] BACK')));
   
   drawBoxFooter(boxWidth);
   
@@ -242,7 +251,7 @@ const selectActiveAgent = async () => {
   }
   
   console.log(makeLine(''));
-  console.log(makeLine(chalk.gray('[<] BACK')));
+  console.log(makeLine(chalk.white('[<] BACK')));
   
   drawBoxFooter(boxWidth);
   
@@ -289,12 +298,12 @@ const selectAgentForModelChange = async () => {
   for (let i = 0; i < agents.length; i++) {
     const agent = agents[i];
     console.log(makeLine(
-      chalk.white(`[${i + 1}] `) + chalk.cyan(agent.name) + chalk.gray(` - ${agent.model}`)
+      chalk.white(`[${i + 1}] `) + chalk.cyan(agent.name) + chalk.white(` - ${agent.model}`)
     ));
   }
   
   console.log(makeLine(''));
-  console.log(makeLine(chalk.gray('[<] BACK')));
+  console.log(makeLine(chalk.white('[<] BACK')));
   
   drawBoxFooter(boxWidth);
   
@@ -346,7 +355,7 @@ const selectAgentToRemove = async () => {
   }
   
   console.log(makeLine(''));
-  console.log(makeLine(chalk.gray('[<] BACK')));
+  console.log(makeLine(chalk.white('[<] BACK')));
   
   drawBoxFooter(boxWidth);
   
@@ -367,178 +376,6 @@ const selectAgentToRemove = async () => {
   return await aiAgentMenu();
 };
 
-// Cache for scanned tokens (avoid multiple Keychain prompts)
-let cachedTokens = null;
-let cacheTimestamp = 0;
-const CACHE_TTL = 60000; // 1 minute cache
-
-/**
- * Show existing tokens found on the system
- */
-const showExistingTokens = async () => {
-  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('║');
-  };
-  
-  // Check cache first
-  const now = Date.now();
-  let tokens;
-  
-  if (cachedTokens && (now - cacheTimestamp) < CACHE_TTL) {
-    tokens = cachedTokens;
-  } else {
-    console.clear();
-    displayBanner();
-    drawBoxHeaderContinue('SCANNING FOR EXISTING SESSIONS...', boxWidth);
-    console.log(makeLine(''));
-    console.log(makeLine(chalk.gray('CHECKING VS CODE, CURSOR, CLAUDE CLI, OPENCODE...')));
-    console.log(makeLine(''));
-    drawBoxFooter(boxWidth);
-    
-    // Scan for tokens and cache
-    tokens = tokenScanner.scanAllSources();
-    cachedTokens = tokens;
-    cacheTimestamp = now;
-  }
-  
-  if (tokens.length === 0) {
-    // No tokens found, go directly to category selection
-    return await selectCategory();
-  }
-  
-  // Show found tokens
-  console.clear();
-  displayBanner();
-  drawBoxHeaderContinue('EXISTING SESSIONS FOUND', boxWidth);
-  
-  console.log(makeLine(chalk.green(`FOUND ${tokens.length} EXISTING SESSION(S)`)));
-  console.log(makeLine(''));
-  
-  const formatted = tokenScanner.formatResults(tokens);
-  
-  for (const t of formatted) {
-    const providerColor = t.provider.includes('CLAUDE') ? chalk.magenta : 
-                          t.provider.includes('OPENAI') ? chalk.green :
-                          t.provider.includes('OPENROUTER') ? chalk.yellow : chalk.cyan;
-    
-    console.log(makeLine(
-      chalk.white(`[${t.index}] `) + 
-      providerColor(t.provider) + 
-      chalk.gray(` (${t.type})`)
-    ));
-    console.log(makeLine(
-      chalk.gray(`    ${t.icon} ${t.source} - ${t.lastUsed}`)
-    ));
-    console.log(makeLine(
-      chalk.gray(`    TOKEN: ${t.tokenPreview}`)
-    ));
-    console.log(makeLine(''));
-  }
-  
-  console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
-  console.log(makeLine(chalk.cyan('[N] CONNECT NEW PROVIDER')));
-  console.log(makeLine(chalk.gray('[<] BACK')));
-  
-  drawBoxFooter(boxWidth);
-  
-  const choice = await prompts.textInput(chalk.cyan('SELECT (1-' + tokens.length + '/N/<):'));
-  
-  if (choice === '<' || choice?.toLowerCase() === 'b') {
-    return await aiAgentMenu();
-  }
-  
-  if (choice?.toLowerCase() === 'n') {
-    return await selectCategory();
-  }
-  
-  const index = parseInt(choice) - 1;
-  if (isNaN(index) || index < 0 || index >= tokens.length) {
-    return await showExistingTokens();
-  }
-  
-  // Use selected token
-  const selectedToken = tokens[index];
-  
-  const spinner = ora({ text: 'VALIDATING TOKEN...', color: 'cyan' }).start();
-  
-  try {
-    // Validate the token - include metadata from scanner
-    const credentials = { 
-      apiKey: selectedToken.token,
-      sessionKey: selectedToken.token,
-      accessToken: selectedToken.token,
-      fromKeychain: selectedToken.sourceId === 'secureStorage' || selectedToken.sourceId === 'keychain',
-      subscriptionType: selectedToken.subscriptionType,
-      refreshToken: selectedToken.refreshToken,
-      expiresAt: selectedToken.expiresAt
-    };
-    const validation = await aiService.validateConnection(selectedToken.provider, selectedToken.type, credentials);
-    
-    if (!validation.valid) {
-      spinner.fail(`TOKEN INVALID OR EXPIRED: ${validation.error}`);
-      await prompts.waitForEnter();
-      return await showExistingTokens();
-    }
-    
-    // Get provider info
-    const { getProvider } = require('../services/ai/providers');
-    const provider = getProvider(selectedToken.provider);
-    
-    if (!provider) {
-      spinner.fail('PROVIDER NOT SUPPORTED');
-      await prompts.waitForEnter();
-      return await showExistingTokens();
-    }
-    
-    spinner.text = 'FETCHING AVAILABLE MODELS...';
-    
-    // Fetch models from API with the token
-    const { fetchAnthropicModels, fetchOpenAIModels } = require('../services/ai/client');
-    
-    let models = null;
-    if (selectedToken.provider === 'anthropic') {
-      models = await fetchAnthropicModels(credentials.apiKey);
-    } else {
-      models = await fetchOpenAIModels(provider.endpoint, credentials.apiKey);
-    }
-    
-    if (!models || models.length === 0) {
-      spinner.fail('COULD NOT FETCH MODELS FROM API');
-      await prompts.waitForEnter();
-      return await showExistingTokens();
-    }
-    
-    spinner.succeed(`FOUND ${models.length} MODELS`);
-    
-    // Let user select model
-    const selectedModel = await selectModelFromList(models, provider.name);
-    if (!selectedModel) {
-      return await showExistingTokens();
-    }
-    
-    // Add agent with selected model
-    const agentName = `${provider.name} (${selectedToken.source})`;
-    await aiService.addAgent(selectedToken.provider, 'api_key', credentials, selectedModel, agentName);
-    
-    console.log(chalk.green(`\n  AGENT ADDED: ${provider.name}`));
-    console.log(chalk.gray(`  SOURCE: ${selectedToken.source}`));
-    console.log(chalk.gray(`  MODEL: ${selectedModel}`));
-    
-    await prompts.waitForEnter();
-    return await aiAgentMenu();
-    
-  } catch (error) {
-    spinner.fail(`CONNECTION FAILED: ${error.message}`);
-    await prompts.waitForEnter();
-    return await showExistingTokens();
-  }
-};
-
 /**
  * Select provider category
  */
@@ -573,20 +410,20 @@ const selectCategory = async () => {
     chalk.cyan('[2] DIRECT PROVIDERS')
   ));
   console.log(make2ColRow(
-    chalk.gray('    1 API = 100+ models'),
-    chalk.gray('    Connect to each provider')
+    chalk.white('    1 API = 100+ models'),
+    chalk.white('    Connect to each provider')
   ));
   console.log(makeLine(''));
   console.log(make2ColRow(
     chalk.yellow('[3] LOCAL (FREE)'),
-    chalk.gray('[4] CUSTOM')
+    chalk.white('[4] CUSTOM')
   ));
   console.log(make2ColRow(
-    chalk.gray('    Run on your machine'),
-    chalk.gray('    Self-hosted solutions')
+    chalk.white('    Run on your machine'),
+    chalk.white('    Self-hosted solutions')
   ));
   console.log(makeLine(''));
-  console.log(makeLine(chalk.gray('[<] BACK')));
+  console.log(makeLine(chalk.white('[<] BACK')));
   
   drawBoxFooter(boxWidth);
   
@@ -637,7 +474,7 @@ const selectProvider = async (categoryId) => {
   const providers = getProvidersByCategory(categoryId);
   
   if (providers.length === 0) {
-    console.log(makeLine(chalk.gray('NO PROVIDERS IN THIS CATEGORY')));
+    console.log(makeLine(chalk.white('NO PROVIDERS IN THIS CATEGORY')));
     drawBoxFooter(boxWidth);
     await prompts.waitForEnter();
     return await selectCategory();
@@ -662,14 +499,14 @@ const selectProvider = async (categoryId) => {
     const rightDesc = right ? '    ' + right.description : '';
     
     console.log(make2ColRow(
-      chalk.gray(leftDesc.length > col1Width - 3 ? leftDesc.substring(0, col1Width - 6) + '...' : leftDesc),
-      chalk.gray(rightDesc.length > col1Width - 3 ? rightDesc.substring(0, col1Width - 6) + '...' : rightDesc)
+      chalk.white(leftDesc.length > col1Width - 3 ? leftDesc.substring(0, col1Width - 6) + '...' : leftDesc),
+      chalk.white(rightDesc.length > col1Width - 3 ? rightDesc.substring(0, col1Width - 6) + '...' : rightDesc)
     ));
     
     console.log(makeLine(''));
   }
   
-  console.log(makeLine(chalk.gray('[<] BACK')));
+  console.log(makeLine(chalk.white('[<] BACK')));
   
   drawBoxFooter(boxWidth);
   
@@ -738,8 +575,8 @@ const selectProviderOption = async (provider) => {
     const leftDesc1 = left.description[0] ? '    ' + left.description[0] : '';
     const rightDesc1 = right?.description[0] ? '    ' + right.description[0] : '';
     console.log(make2ColRow(
-      chalk.gray(leftDesc1.length > col1Width - 2 ? leftDesc1.substring(0, col1Width - 5) + '...' : leftDesc1),
-      chalk.gray(rightDesc1.length > col1Width - 2 ? rightDesc1.substring(0, col1Width - 5) + '...' : rightDesc1)
+      chalk.white(leftDesc1.length > col1Width - 2 ? leftDesc1.substring(0, col1Width - 5) + '...' : leftDesc1),
+      chalk.white(rightDesc1.length > col1Width - 2 ? rightDesc1.substring(0, col1Width - 5) + '...' : rightDesc1)
     ));
     
     // Second description line if exists
@@ -747,15 +584,15 @@ const selectProviderOption = async (provider) => {
     const rightDesc2 = right?.description[1] ? '    ' + right.description[1] : '';
     if (leftDesc2 || rightDesc2) {
       console.log(make2ColRow(
-        chalk.gray(leftDesc2.length > col1Width - 2 ? leftDesc2.substring(0, col1Width - 5) + '...' : leftDesc2),
-        chalk.gray(rightDesc2.length > col1Width - 2 ? rightDesc2.substring(0, col1Width - 5) + '...' : rightDesc2)
+        chalk.white(leftDesc2.length > col1Width - 2 ? leftDesc2.substring(0, col1Width - 5) + '...' : leftDesc2),
+        chalk.white(rightDesc2.length > col1Width - 2 ? rightDesc2.substring(0, col1Width - 5) + '...' : rightDesc2)
       ));
     }
     
     console.log(makeLine(''));
   }
   
-  console.log(makeLine(chalk.gray('[<] BACK')));
+  console.log(makeLine(chalk.white('[<] BACK')));
   
   drawBoxFooter(boxWidth);
   
@@ -787,7 +624,7 @@ const openBrowser = (url) => {
   else cmd = `xdg-open "${url}"`;
   
   exec(cmd, (err) => {
-    if (err) console.log(chalk.gray('  Could not open browser automatically'));
+    if (err) console.log(chalk.white('  Could not open browser automatically'));
   });
 };
 
@@ -870,7 +707,7 @@ const setupOAuthConnection = async (provider) => {
   console.log(makeLine(chalk.white('3. COPY THE AUTHORIZATION CODE')));
   console.log(makeLine(chalk.white('4. PASTE IT HERE')));
   console.log(makeLine(''));
-  console.log(makeLine(chalk.gray('OPENING BROWSER IN 3 SECONDS...')));
+  console.log(makeLine(chalk.white('OPENING BROWSER IN 3 SECONDS...')));
   
   drawBoxFooter(boxWidth);
   
@@ -891,9 +728,9 @@ const setupOAuthConnection = async (provider) => {
   console.log(makeLine(chalk.white('AFTER LOGGING IN, YOU WILL SEE A CODE')));
   console.log(makeLine(chalk.white('COPY THE ENTIRE CODE AND PASTE IT BELOW')));
   console.log(makeLine(''));
-  console.log(makeLine(chalk.gray('THE CODE LOOKS LIKE: abc123...#xyz789...')));
+  console.log(makeLine(chalk.white('THE CODE LOOKS LIKE: abc123...#xyz789...')));
   console.log(makeLine(''));
-  console.log(makeLine(chalk.gray('TYPE < TO CANCEL')));
+  console.log(makeLine(chalk.white('TYPE < TO CANCEL')));
   
   drawBoxFooter(boxWidth);
   console.log();
@@ -937,16 +774,18 @@ const setupOAuthConnection = async (provider) => {
     spinner.succeed(`FOUND ${models.length} MODELS`);
   }
   
+  if (!models || models.length === 0) {
+    spinner.fail('COULD NOT FETCH MODELS FROM API');
+    console.log(chalk.white('  OAuth authentication may not support model listing.'));
+    console.log(chalk.white('  Please use API KEY authentication instead.'));
+    await prompts.waitForEnter();
+    return await selectProviderOption(provider);
+  }
+  
+  spinner.succeed(`FOUND ${models.length} MODELS`);
+  
   // Let user select model
-  const availableModels = models && models.length > 0 ? models : [
-    'claude-sonnet-4-20250514',
-    'claude-sonnet-4-5-20250514',
-    'claude-3-5-sonnet-20241022',
-    'claude-3-5-haiku-20241022',
-    'claude-3-opus-20240229'
-  ];
-  
-  const selectedModel = await selectModelFromList(availableModels, 'CLAUDE PRO/MAX');
+  const selectedModel = await selectModelFromList(models, 'CLAUDE PRO/MAX');
   if (!selectedModel) {
     return await selectProviderOption(provider);
   }
@@ -956,8 +795,8 @@ const setupOAuthConnection = async (provider) => {
     await aiService.addAgent('anthropic', 'oauth_max', credentials, selectedModel, 'Claude Pro/Max');
     
     console.log(chalk.green('\n  CONNECTED TO CLAUDE PRO/MAX'));
-    console.log(chalk.gray(`  MODEL: ${selectedModel}`));
-    console.log(chalk.gray('  UNLIMITED USAGE WITH YOUR SUBSCRIPTION'));
+    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}`));
   }
@@ -1009,17 +848,17 @@ const setupConnection = async (provider, option) => {
     if (option.url && (field === 'apiKey' || field === 'sessionKey' || field === 'accessToken')) {
       console.log(makeLine(chalk.cyan('LINK: ') + chalk.green(option.url)));
       console.log(makeLine(''));
-      console.log(makeLine(chalk.gray('OPENING BROWSER...')));
+      console.log(makeLine(chalk.white('OPENING BROWSER...')));
       openBrowser(option.url);
     }
     
     // Show default for endpoint
     if (field === 'endpoint' && option.defaultEndpoint) {
-      console.log(makeLine(chalk.gray(`DEFAULT: ${option.defaultEndpoint}`)));
+      console.log(makeLine(chalk.white(`DEFAULT: ${option.defaultEndpoint}`)));
     }
     
     console.log(makeLine(''));
-    console.log(makeLine(chalk.gray('TYPE < TO GO BACK')));
+    console.log(makeLine(chalk.white('TYPE < TO GO BACK')));
     
     drawBoxFooter(boxWidth);
     console.log();
@@ -1029,33 +868,33 @@ const setupConnection = async (provider, option) => {
     switch (field) {
       case 'apiKey':
         value = await prompts.textInput(chalk.cyan('PASTE API KEY:'));
-        if (!value || value === '<') return await selectProviderOption(provider);
+        if (!value || value.trim() === '<' || value.trim() === '') return await selectProviderOption(provider);
         credentials.apiKey = value.trim();
         break;
         
       case 'sessionKey':
         value = await prompts.textInput(chalk.cyan('PASTE SESSION KEY:'));
-        if (!value || value === '<') return await selectProviderOption(provider);
+        if (!value || value.trim() === '<' || value.trim() === '') return await selectProviderOption(provider);
         credentials.sessionKey = value.trim();
         break;
         
       case 'accessToken':
         value = await prompts.textInput(chalk.cyan('PASTE ACCESS TOKEN:'));
-        if (!value || value === '<') return await selectProviderOption(provider);
+        if (!value || value.trim() === '<' || value.trim() === '') return await selectProviderOption(provider);
         credentials.accessToken = value.trim();
         break;
         
       case 'endpoint':
         const defaultEndpoint = option.defaultEndpoint || '';
         value = await prompts.textInput(chalk.cyan(`ENDPOINT [${defaultEndpoint || 'required'}]:`));
-        if (value === '<') return await selectProviderOption(provider);
+        if (value && value.trim() === '<') return await selectProviderOption(provider);
         credentials.endpoint = (value || defaultEndpoint).trim();
         if (!credentials.endpoint) return await selectProviderOption(provider);
         break;
         
       case 'model':
         value = await prompts.textInput(chalk.cyan('MODEL NAME:'));
-        if (!value || value === '<') return await selectProviderOption(provider);
+        if (!value || value.trim() === '<' || value.trim() === '') return await selectProviderOption(provider);
         credentials.model = value.trim();
         break;
     }
@@ -1081,10 +920,10 @@ const setupConnection = async (provider, option) => {
     
     // Show available models for local providers
     if (validation.models && validation.models.length > 0) {
-      console.log(chalk.gray(`  AVAILABLE MODELS: ${validation.models.slice(0, 5).join(', ')}`));
+      console.log(chalk.white(`  AVAILABLE MODELS: ${validation.models.slice(0, 5).join(', ')}`));
     }
     
-    console.log(chalk.gray(`  USING MODEL: ${model}`));
+    console.log(chalk.white(`  USING MODEL: ${model}`));
   } catch (error) {
     spinner.fail(`FAILED TO SAVE: ${error.message}`);
   }
@@ -1117,7 +956,7 @@ const selectModelFromList = async (models, providerName) => {
   
   if (!models || models.length === 0) {
     console.log(makeLine(chalk.red('NO MODELS AVAILABLE')));
-    console.log(makeLine(chalk.gray('[<] BACK')));
+    console.log(makeLine(chalk.white('[<] BACK')));
     drawBoxFooter(boxWidth);
     await prompts.waitForEnter();
     return null;
@@ -1126,14 +965,44 @@ const selectModelFromList = async (models, providerName) => {
   // Sort models (newest first)
   const sortedModels = [...models].sort((a, b) => b.localeCompare(a));
   
-  // Display models from API
-  sortedModels.forEach((model, index) => {
-    const displayModel = model.length > W - 10 ? model.substring(0, W - 13) + '...' : model;
-    console.log(makeLine(chalk.cyan(`[${index + 1}] ${displayModel}`)));
-  });
+  // Display models in 2 columns
+  const rows = Math.ceil(sortedModels.length / 2);
+  const colWidth = Math.floor((W - 4) / 2);
+  
+  for (let i = 0; i < rows; i++) {
+    const leftIndex = i;
+    const rightIndex = i + rows;
+    
+    // Left column
+    const leftModel = sortedModels[leftIndex];
+    const leftNum = chalk.cyan(`[${leftIndex + 1}]`);
+    const leftName = leftModel.length > colWidth - 6 
+      ? leftModel.substring(0, colWidth - 9) + '...' 
+      : leftModel;
+    const leftText = `${leftNum} ${chalk.yellow(leftName)}`;
+    const leftPlain = `[${leftIndex + 1}] ${leftName}`;
+    
+    // Right column (if exists)
+    let rightText = '';
+    let rightPlain = '';
+    if (rightIndex < sortedModels.length) {
+      const rightModel = sortedModels[rightIndex];
+      const rightNum = chalk.cyan(`[${rightIndex + 1}]`);
+      const rightName = rightModel.length > colWidth - 6 
+        ? rightModel.substring(0, colWidth - 9) + '...' 
+        : rightModel;
+      rightText = `${rightNum} ${chalk.yellow(rightName)}`;
+      rightPlain = `[${rightIndex + 1}] ${rightName}`;
+    }
+    
+    // Pad left column and combine
+    const leftPadding = colWidth - leftPlain.length;
+    const line = leftText + ' '.repeat(Math.max(2, leftPadding)) + rightText;
+    console.log(makeLine(line));
+  }
   
   console.log(makeLine(''));
-  console.log(makeLine(chalk.gray('[<] BACK')));
+  console.log(makeLine(chalk.white('[<] BACK')));
   
   drawBoxFooter(boxWidth);
   
@@ -1169,17 +1038,28 @@ const selectModel = async (agent) => {
   displayBanner();
   drawBoxHeaderContinue(`SELECT MODEL - ${agent.name}`, boxWidth);
   
-  console.log(makeLine(chalk.gray('FETCHING AVAILABLE MODELS FROM API...')));
+  console.log(makeLine(chalk.white('FETCHING AVAILABLE MODELS FROM API...')));
   drawBoxFooter(boxWidth);
   
   // Fetch models from real API
-  const { fetchAnthropicModels, fetchOpenAIModels } = require('../services/ai/client');
+  const { fetchAnthropicModels, fetchAnthropicModelsOAuth, fetchOpenAIModels } = require('../services/ai/client');
   
   let models = null;
   const agentCredentials = aiService.getAgentCredentials(agent.id);
   
   if (agent.providerId === 'anthropic') {
-    models = await fetchAnthropicModels(agentCredentials?.apiKey);
+    // Check if OAuth credentials or OAuth-like token (sk-ant-oat...)
+    const token = agentCredentials?.apiKey || agentCredentials?.accessToken || agentCredentials?.sessionKey;
+    const isOAuthToken = agentCredentials?.oauth?.access || (token && token.startsWith('sk-ant-oat'));
+    
+    if (isOAuthToken) {
+      // Use OAuth endpoint with Bearer token
+      const accessToken = agentCredentials?.oauth?.access || token;
+      models = await fetchAnthropicModelsOAuth(accessToken);
+    } else {
+      // Standard API key
+      models = await fetchAnthropicModels(token);
+    }
   } else {
     // OpenAI-compatible providers
     const endpoint = agentCredentials?.endpoint || agent.provider?.endpoint;
@@ -1193,9 +1073,9 @@ const selectModel = async (agent) => {
   
   if (!models || models.length === 0) {
     console.log(makeLine(chalk.red('COULD NOT FETCH MODELS FROM API')));
-    console.log(makeLine(chalk.gray('Check your API key or network connection.')));
+    console.log(makeLine(chalk.white('Check your API key or network connection.')));
     console.log(makeLine(''));
-    console.log(makeLine(chalk.gray('[<] BACK')));
+    console.log(makeLine(chalk.white('[<] BACK')));
     drawBoxFooter(boxWidth);
     
     await prompts.waitForEnter();
@@ -1205,15 +1085,46 @@ const selectModel = async (agent) => {
   // Sort models (newest first typically)
   models.sort((a, b) => b.localeCompare(a));
   
-  // Display models from API
-  models.forEach((model, index) => {
-    const displayModel = model.length > W - 10 ? model.substring(0, W - 13) + '...' : model;
-    const currentMarker = model === agent.model ? chalk.yellow(' (CURRENT)') : '';
-    console.log(makeLine(chalk.cyan(`[${index + 1}] ${displayModel}`) + currentMarker));
-  });
+  // Display models in 2 columns
+  const rows = Math.ceil(models.length / 2);
+  const colWidth = Math.floor((W - 4) / 2);
+  
+  for (let i = 0; i < rows; i++) {
+    const leftIndex = i;
+    const rightIndex = i + rows;
+    
+    // Left column
+    const leftModel = models[leftIndex];
+    const leftNum = chalk.cyan(`[${leftIndex + 1}]`);
+    const leftCurrent = leftModel === agent.model ? chalk.green(' *') : '';
+    const leftName = leftModel.length > colWidth - 8 
+      ? leftModel.substring(0, colWidth - 11) + '...' 
+      : leftModel;
+    const leftText = `${leftNum} ${chalk.yellow(leftName)}${leftCurrent}`;
+    const leftPlain = `[${leftIndex + 1}] ${leftName}${leftModel === agent.model ? ' *' : ''}`;
+    
+    // Right column (if exists)
+    let rightText = '';
+    let rightPlain = '';
+    if (rightIndex < models.length) {
+      const rightModel = models[rightIndex];
+      const rightNum = chalk.cyan(`[${rightIndex + 1}]`);
+      const rightCurrent = rightModel === agent.model ? chalk.green(' *') : '';
+      const rightName = rightModel.length > colWidth - 8 
+        ? rightModel.substring(0, colWidth - 11) + '...' 
+        : rightModel;
+      rightText = `${rightNum} ${chalk.yellow(rightName)}${rightCurrent}`;
+      rightPlain = `[${rightIndex + 1}] ${rightName}${rightModel === agent.model ? ' *' : ''}`;
+    }
+    
+    // Pad left column and combine
+    const leftPadding = colWidth - leftPlain.length;
+    const line = leftText + ' '.repeat(Math.max(2, leftPadding)) + rightText;
+    console.log(makeLine(line));
+  }
   
   console.log(makeLine(''));
-  console.log(makeLine(chalk.gray('[<] BACK')));
+  console.log(makeLine(chalk.white('[<] BACK') + chalk.white('                                        * = CURRENT')));
   
   drawBoxFooter(boxWidth);