hedgequantx 2.6.161 → 2.6.163

package/src/menus/ai-agent.js

@@ -1,38 +1,17 @@
-/**
- * AI Agent Menu
- * Configure multiple AI provider connections
- */
-
+/** AI Agent Menu - Configure multiple AI provider connections */
 const chalk = require('chalk');
-const ora = require('ora');
-
-const { getLogoWidth, drawBoxHeader, drawBoxHeaderContinue, drawBoxFooter, displayBanner } = require('../ui');
+const { getLogoWidth, drawBoxHeaderContinue, drawBoxFooter, displayBanner } = require('../ui');
 const { prompts } = require('../utils');
 const aiService = require('../services/ai');
 const { getCategories, getProvidersByCategory } = require('../services/ai/providers');
-const oauthAnthropic = require('../services/ai/oauth-anthropic');
-const oauthOpenai = require('../services/ai/oauth-openai');
-const oauthGemini = require('../services/ai/oauth-gemini');
-const oauthQwen = require('../services/ai/oauth-qwen');
-const oauthIflow = require('../services/ai/oauth-iflow');
-const proxyManager = require('../services/ai/proxy-manager');
+const { makeLine, make2ColRow, menuRow2, menuItem, getProviderColor, getBoxDimensions } = require('./ai-agent-ui');
+const { setupOAuthConnection, getOAuthConfig } = require('./ai-agent-oauth');
+const { selectModelFromList, selectModel } = require('./ai-agent-models');
+const { collectCredentials, validateAndFetchModels, addConnectedAgent } = require('./ai-agent-connect');
 
-/**
- * Main AI Agent menu
- */
+/** Main AI Agent menu */
 const aiAgentMenu = async () => {
-  const boxWidth = getLogoWidth();
-  const W = boxWidth - 2;
-  
-  const makeLine = (content, align = 'left') => {
-    const plainLen = content.replace(/\x1b\[[0-9;]*m/g, '').length;
-    const padding = W - plainLen;
-    if (align === 'center') {
-      const leftPad = Math.floor(padding / 2);
-      return chalk.cyan('║') + ' '.repeat(leftPad) + content + ' '.repeat(padding - leftPad) + chalk.cyan('║');
-    }
-    return chalk.cyan('║') + ' ' + content + ' '.repeat(Math.max(0, padding - 1)) + chalk.cyan('║');
-  };
+  const { boxWidth, W } = getBoxDimensions();
   
   console.clear();
   displayBanner();
@@ -43,32 +22,27 @@ const aiAgentMenu = async () => {
   const agentCount = agents.length;
   
   if (agentCount === 0) {
-    console.log(makeLine(chalk.white('STATUS: NO AGENTS CONNECTED'), 'left'));
+    console.log(makeLine(W, chalk.white('STATUS: NO AGENTS CONNECTED')));
   } else {
-    console.log(makeLine(chalk.green(`STATUS: ${agentCount} AGENT${agentCount > 1 ? 'S' : ''} CONNECTED`), 'left'));
+    console.log(makeLine(W, chalk.green(`STATUS: ${agentCount} AGENT${agentCount > 1 ? 'S' : ''} CONNECTED`)));
     console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
     
     // List all agents
     for (let i = 0; i < agents.length; i++) {
       const agent = agents[i];
-      // Show ACTIVE marker (if single agent, it's always active)
       const isActive = agent.isActive || agents.length === 1;
       const activeMarker = isActive ? ' [ACTIVE]' : '';
-      const providerColor = agent.providerId === 'anthropic' ? chalk.magenta :
-                           agent.providerId === 'openai' ? chalk.green :
-                           agent.providerId === 'openrouter' ? chalk.yellow : chalk.cyan;
+      const providerColor = getProviderColor(agent.providerId);
       
-      // 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(
+      console.log(makeLine(W, 
         chalk.white(prefix) + 
         providerColor(displayName) + 
         chalk.green(activeMarker) + 
@@ -79,44 +53,18 @@ const aiAgentMenu = async () => {
   
   console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
   
-  // Menu in 2 columns
-  const colWidth = Math.floor(W / 2);
-  
-  const menuRow2 = (col1, col2 = '') => {
-    const c1Plain = col1.replace(/\x1b\[[0-9;]*m/g, '');
-    const c2Plain = col2.replace(/\x1b\[[0-9;]*m/g, '');
-    
-    const pad1Left = Math.floor((colWidth - c1Plain.length) / 2);
-    const pad1Right = colWidth - c1Plain.length - pad1Left;
-    
-    const col2Width = W - colWidth;
-    const pad2Left = Math.floor((col2Width - c2Plain.length) / 2);
-    const pad2Right = col2Width - c2Plain.length - pad2Left;
-    
-    const line = 
-      ' '.repeat(pad1Left) + col1 + ' '.repeat(pad1Right) +
-      ' '.repeat(pad2Left) + col2 + ' '.repeat(pad2Right);
-    
-    console.log(chalk.cyan('║') + line + chalk.cyan('║'));
-  };
-  
-  const menuItem = (key, label, color) => {
-    const text = `[${key}] ${label.padEnd(14)}`;
-    return color(text);
-  };
-  
   // Menu options in 2 columns
   if (agentCount > 0) {
     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.white));
+      console.log(menuRow2(W, menuItem('+', 'ADD AGENT', chalk.green), menuItem('S', 'SET ACTIVE', chalk.cyan)));
+      console.log(menuRow2(W, menuItem('M', 'CHANGE MODEL', chalk.yellow), menuItem('R', 'REMOVE AGENT', chalk.red)));
+      console.log(menuRow2(W, 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.white));
+      console.log(menuRow2(W, menuItem('+', 'ADD AGENT', chalk.green), menuItem('M', 'CHANGE MODEL', chalk.yellow)));
+      console.log(menuRow2(W, menuItem('R', 'REMOVE AGENT', chalk.red), menuItem('<', 'BACK', chalk.white)));
     }
   } else {
-    menuRow2(menuItem('+', 'ADD AGENT', chalk.green), menuItem('<', 'BACK', chalk.white));
+    console.log(menuRow2(W, menuItem('+', 'ADD AGENT', chalk.green), menuItem('<', 'BACK', chalk.white)));
   }
   
   drawBoxFooter(boxWidth);
@@ -134,19 +82,13 @@ const aiAgentMenu = async () => {
     case '+':
       return await selectCategory();
     case 's':
-      if (agentCount > 1) {
-        return await selectActiveAgent();
-      }
+      if (agentCount > 1) return await selectActiveAgent();
       return await aiAgentMenu();
     case 'm':
-      if (agentCount > 0) {
-        return await selectAgentForModelChange();
-      }
+      if (agentCount > 0) return await selectAgentForModelChange();
       return await aiAgentMenu();
     case 'r':
-      if (agentCount > 0) {
-        return await selectAgentToRemove();
-      }
+      if (agentCount > 0) return await selectAgentToRemove();
       return await aiAgentMenu();
     case 'x':
       if (agentCount > 1) {
@@ -163,67 +105,34 @@ const aiAgentMenu = async () => {
   }
 };
 
-/**
- * Show agent details
- */
+/** Show agent details */
 const showAgentDetails = async (agent) => {
-  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('║');
-  };
+  const { boxWidth, W } = getBoxDimensions();
   
   console.clear();
   displayBanner();
   drawBoxHeaderContinue('AGENT DETAILS', boxWidth);
   
-  const providerColor = agent.providerId === 'anthropic' ? chalk.magenta :
-                       agent.providerId === 'openai' ? chalk.green :
-                       agent.providerId === 'openrouter' ? chalk.yellow : chalk.cyan;
+  const providerColor = getProviderColor(agent.providerId);
   
-  console.log(makeLine(chalk.white('NAME: ') + providerColor(agent.name)));
-  console.log(makeLine(chalk.white('PROVIDER: ') + chalk.white(agent.provider?.name || agent.providerId)));
-  console.log(makeLine(chalk.white('MODEL: ') + chalk.white(agent.model || 'N/A')));
-  console.log(makeLine(chalk.white('STATUS: ') + (agent.isActive ? chalk.green('ACTIVE') : chalk.white('STANDBY'))));
+  console.log(makeLine(W, chalk.white('NAME: ') + providerColor(agent.name)));
+  console.log(makeLine(W, chalk.white('PROVIDER: ') + chalk.white(agent.provider?.name || agent.providerId)));
+  console.log(makeLine(W, chalk.white('MODEL: ') + chalk.white(agent.model || 'N/A')));
+  console.log(makeLine(W, chalk.white('STATUS: ') + (agent.isActive ? chalk.green('ACTIVE') : chalk.white('STANDBY'))));
   
   console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
   
-  // Menu in 2 columns
-  const colWidth = Math.floor(W / 2);
-  
-  const menuRow = (col1, col2 = '') => {
-    const c1Plain = col1.replace(/\x1b\[[0-9;]*m/g, '');
-    const c2Plain = col2.replace(/\x1b\[[0-9;]*m/g, '');
-    
-    const pad1Left = Math.floor((colWidth - c1Plain.length) / 2);
-    const pad1Right = colWidth - c1Plain.length - pad1Left;
-    
-    const col2Width = W - colWidth;
-    const pad2Left = Math.floor((col2Width - c2Plain.length) / 2);
-    const pad2Right = col2Width - c2Plain.length - pad2Left;
-    
-    const line = 
-      ' '.repeat(pad1Left) + col1 + ' '.repeat(pad1Right) +
-      ' '.repeat(pad2Left) + col2 + ' '.repeat(pad2Right);
-    
-    console.log(chalk.cyan('║') + line + chalk.cyan('║'));
-  };
-  
   if (!agent.isActive) {
-    menuRow(chalk.cyan('[A] SET AS ACTIVE'), chalk.yellow('[M] CHANGE MODEL'));
-    menuRow(chalk.red('[R] REMOVE'), chalk.white('[<] BACK'));
+    console.log(menuRow2(W, chalk.cyan('[A] SET AS ACTIVE'), chalk.yellow('[M] CHANGE MODEL')));
+    console.log(menuRow2(W, chalk.red('[R] REMOVE'), chalk.white('[<] BACK')));
   } else {
-    menuRow(chalk.yellow('[M] CHANGE MODEL'), chalk.red('[R] REMOVE'));
-    menuRow(chalk.white('[<] BACK'), '');
+    console.log(menuRow2(W, chalk.yellow('[M] CHANGE MODEL'), chalk.red('[R] REMOVE')));
+    console.log(menuRow2(W, chalk.white('[<] BACK'), ''));
   }
   
   drawBoxFooter(boxWidth);
   
   const choice = await prompts.textInput(chalk.cyan('SELECT:'));
-  
   const agentDisplayName = agent.model ? `${agent.name} (${agent.model})` : agent.name;
   
   switch ((choice || '').toLowerCase()) {
@@ -235,7 +144,7 @@ const showAgentDetails = async (agent) => {
       }
       return await aiAgentMenu();
     case 'm':
-      return await selectModel(agent);
+      return await selectModel(agent, aiAgentMenu);
     case 'r':
       aiService.removeAgent(agent.id);
       console.log(chalk.yellow(`\n  ${agentDisplayName} REMOVED`));
@@ -249,18 +158,9 @@ const showAgentDetails = async (agent) => {
   }
 };
 
-/**
- * Select active agent
- */
+/** Select active agent */
 const selectActiveAgent = 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('║');
-  };
+  const { boxWidth, W } = getBoxDimensions();
   
   console.clear();
   displayBanner();
@@ -271,23 +171,18 @@ const selectActiveAgent = async () => {
   for (let i = 0; i < agents.length; i++) {
     const agent = agents[i];
     const activeMarker = agent.isActive ? chalk.yellow(' (CURRENT)') : '';
-    const providerColor = agent.providerId === 'anthropic' ? chalk.magenta :
-                         agent.providerId === 'openai' ? chalk.green : chalk.cyan;
-    
+    const providerColor = getProviderColor(agent.providerId);
     const modelDisplay = agent.model ? chalk.gray(` (${agent.model})`) : '';
-    console.log(makeLine(
-      chalk.white(`[${i + 1}] `) + providerColor(agent.name) + modelDisplay + activeMarker
-    ));
+    console.log(makeLine(W, chalk.white(`[${i + 1}] `) + providerColor(agent.name) + modelDisplay + activeMarker));
   }
   
-  console.log(makeLine(''));
-  console.log(makeLine(chalk.white('[<] BACK')));
+  console.log(makeLine(W, ''));
+  console.log(makeLine(W, chalk.white('[<] BACK')));
   
   drawBoxFooter(boxWidth);
   
   const choice = await prompts.textInput(chalk.cyan('SELECT AGENT:'));
   
-  // Empty input or < = go back
   if (!choice || choice.trim() === '' || choice === '<' || choice?.toLowerCase() === 'b') {
     return await aiAgentMenu();
   }
@@ -305,24 +200,15 @@ const selectActiveAgent = async () => {
   return await aiAgentMenu();
 };
 
-/**
- * Select agent to change model
- */
+/** Select agent to change model */
 const selectAgentForModelChange = async () => {
   const agents = aiService.getAgents();
   
   if (agents.length === 1) {
-    return await selectModel(agents[0]);
+    return await selectModel(agents[0], aiAgentMenu);
   }
   
-  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('║');
-  };
+  const { boxWidth, W } = getBoxDimensions();
   
   console.clear();
   displayBanner();
@@ -330,19 +216,16 @@ 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.white(` - ${agent.model}`)
-    ));
+    console.log(makeLine(W, chalk.white(`[${i + 1}] `) + chalk.cyan(agent.name) + chalk.white(` - ${agent.model}`)));
   }
   
-  console.log(makeLine(''));
-  console.log(makeLine(chalk.white('[<] BACK')));
+  console.log(makeLine(W, ''));
+  console.log(makeLine(W, chalk.white('[<] BACK')));
   
   drawBoxFooter(boxWidth);
   
   const choice = await prompts.textInput(chalk.cyan('SELECT AGENT:'));
   
-  // Empty input or < = go back
   if (!choice || choice.trim() === '' || choice === '<' || choice?.toLowerCase() === 'b') {
     return await aiAgentMenu();
   }
@@ -352,12 +235,10 @@ const selectAgentForModelChange = async () => {
     return await aiAgentMenu();
   }
   
-  return await selectModel(agents[index]);
+  return await selectModel(agents[index], aiAgentMenu);
 };
 
-/**
- * Select agent to remove
- */
+/** Select agent to remove */
 const selectAgentToRemove = async () => {
   const agents = aiService.getAgents();
   
@@ -368,14 +249,7 @@ const selectAgentToRemove = async () => {
     return await aiAgentMenu();
   }
   
-  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('║');
-  };
+  const { boxWidth, W } = getBoxDimensions();
   
   console.clear();
   displayBanner();
@@ -384,19 +258,16 @@ const selectAgentToRemove = async () => {
   for (let i = 0; i < agents.length; i++) {
     const agent = agents[i];
     const modelDisplay = agent.model ? chalk.gray(` (${agent.model})`) : '';
-    console.log(makeLine(
-      chalk.white(`[${i + 1}] `) + chalk.red(agent.name) + modelDisplay
-    ));
+    console.log(makeLine(W, chalk.white(`[${i + 1}] `) + chalk.red(agent.name) + modelDisplay));
   }
   
-  console.log(makeLine(''));
-  console.log(makeLine(chalk.white('[<] BACK')));
+  console.log(makeLine(W, ''));
+  console.log(makeLine(W, chalk.white('[<] BACK')));
   
   drawBoxFooter(boxWidth);
   
   const choice = await prompts.textInput(chalk.cyan('SELECT AGENT TO REMOVE:'));
   
-  // Empty input or < = go back
   if (!choice || choice.trim() === '' || choice === '<' || choice?.toLowerCase() === 'b') {
     return await aiAgentMenu();
   }
@@ -414,27 +285,9 @@ const selectAgentToRemove = async () => {
   return await aiAgentMenu();
 };
 
-/**
- * Select provider category
- */
+/** Select provider category */
 const selectCategory = async () => {
-  const boxWidth = getLogoWidth();
-  const W = boxWidth - 2;
-  const col1Width = Math.floor(W / 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('║');
-  };
-  
-  const make2ColRow = (left, right) => {
-    const leftPlain = left.replace(/\x1b\[[0-9;]*m/g, '').length;
-    const rightPlain = right.replace(/\x1b\[[0-9;]*m/g, '').length;
-    const leftPadded = ' ' + left + ' '.repeat(Math.max(0, col1Width - leftPlain - 1));
-    const rightPadded = right + ' '.repeat(Math.max(0, W - col1Width - rightPlain));
-    return chalk.cyan('║') + leftPadded + rightPadded + chalk.cyan('║');
-  };
+  const { boxWidth, W } = getBoxDimensions();
   
   console.clear();
   displayBanner();
@@ -442,30 +295,22 @@ const selectCategory = async () => {
   
   const categories = getCategories();
   
-  // Display in 2 columns - Numbers in cyan, titles in yellow
-  console.log(make2ColRow(
+  console.log(make2ColRow(W, 
     chalk.cyan('[1]') + chalk.yellow(' UNIFIED (RECOMMENDED)'),
     chalk.cyan('[2]') + chalk.yellow(' DIRECT PROVIDERS')
   ));
-  console.log(make2ColRow(
-    chalk.white('    1 API = 100+ models'),
-    chalk.white('    Connect to each provider')
-  ));
-  console.log(makeLine(''));
-  console.log(make2ColRow(
+  console.log(make2ColRow(W, chalk.white('    1 API = 100+ models'), chalk.white('    Connect to each provider')));
+  console.log(makeLine(W, ''));
+  console.log(make2ColRow(W, 
     chalk.cyan('[3]') + chalk.yellow(' LOCAL (FREE)'),
     chalk.cyan('[4]') + chalk.yellow(' CUSTOM')
   ));
-  console.log(make2ColRow(
-    chalk.white('    Run on your machine'),
-    chalk.white('    Self-hosted solutions')
-  ));
+  console.log(make2ColRow(W, chalk.white('    Run on your machine'), chalk.white('    Self-hosted solutions')));
   
   drawBoxFooter(boxWidth);
   
   const choice = await prompts.textInput(chalk.cyan('SELECT (1-4):'));
   
-  // Empty input = go back
   if (!choice || choice.trim() === '' || choice === '<' || choice?.toLowerCase() === 'b') {
     return await aiAgentMenu();
   }
@@ -475,32 +320,14 @@ const selectCategory = async () => {
     return await aiAgentMenu();
   }
   
-  const selectedCategory = categories[index];
-  return await selectProvider(selectedCategory.id);
+  return await selectProvider(categories[index].id);
 };
 
-/**
- * Select AI provider from category
- */
+/** Select AI provider from category */
 const selectProvider = async (categoryId) => {
-  const boxWidth = getLogoWidth();
-  const W = boxWidth - 2;
+  const { boxWidth, W } = getBoxDimensions();
   const col1Width = Math.floor(W / 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('║');
-  };
-  
-  const make2ColRow = (left, right) => {
-    const leftPlain = left.replace(/\x1b\[[0-9;]*m/g, '').length;
-    const rightPlain = right.replace(/\x1b\[[0-9;]*m/g, '').length;
-    const leftPadded = ' ' + left + ' '.repeat(Math.max(0, col1Width - leftPlain - 1));
-    const rightPadded = right + ' '.repeat(Math.max(0, W - col1Width - rightPlain));
-    return chalk.cyan('║') + leftPadded + rightPadded + chalk.cyan('║');
-  };
-  
   console.clear();
   displayBanner();
   
@@ -511,49 +338,42 @@ const selectProvider = async (categoryId) => {
   const providers = getProvidersByCategory(categoryId);
   
   if (providers.length === 0) {
-    console.log(makeLine(chalk.white('NO PROVIDERS IN THIS CATEGORY')));
+    console.log(makeLine(W, chalk.white('NO PROVIDERS IN THIS CATEGORY')));
     drawBoxFooter(boxWidth);
     await prompts.waitForEnter();
     return await selectCategory();
   }
   
-  // Display providers in 2 columns - Numbers in cyan, names in yellow
+  // Display providers in 2 columns
   for (let i = 0; i < providers.length; i += 2) {
     const left = providers[i];
     const right = providers[i + 1];
     
-    // Provider names - number in cyan, name in yellow
     const leftNum = `[${i + 1}]`;
     const rightNum = right ? `[${i + 2}]` : '';
     const leftName = ` ${left.name}`;
     const rightName = right ? ` ${right.name}` : '';
     
-    const leftFull = leftNum + leftName;
-    const rightFull = rightNum + rightName;
-    
-    console.log(make2ColRow(
+    console.log(make2ColRow(W,
       chalk.cyan(leftNum) + chalk.yellow(leftName.length > col1Width - leftNum.length - 3 ? leftName.substring(0, col1Width - leftNum.length - 6) + '...' : leftName),
       right ? chalk.cyan(rightNum) + chalk.yellow(rightName.length > col1Width - rightNum.length - 3 ? rightName.substring(0, col1Width - rightNum.length - 6) + '...' : rightName) : ''
     ));
     
-    // Descriptions (truncated)
     const leftDesc = '    ' + left.description;
     const rightDesc = right ? '    ' + right.description : '';
     
-    console.log(make2ColRow(
+    console.log(make2ColRow(W,
       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(W, ''));
   }
   
   drawBoxFooter(boxWidth);
   
-  const maxNum = providers.length;
-  const choice = await prompts.textInput(chalk.cyan(`SELECT (1-${maxNum}):`));
+  const choice = await prompts.textInput(chalk.cyan(`SELECT (1-${providers.length}):`));
   
-  // Empty input = go back
   if (!choice || choice.trim() === '' || choice === '<' || choice?.toLowerCase() === 'b') {
     return await selectCategory();
   }
@@ -563,32 +383,14 @@ const selectProvider = async (categoryId) => {
     return await selectCategory();
   }
   
-  const selectedProvider = providers[index];
-  return await selectProviderOption(selectedProvider);
+  return await selectProviderOption(providers[index]);
 };
 
-/**
- * Select connection option for provider
- */
+/** Select connection option for provider */
 const selectProviderOption = async (provider) => {
-  const boxWidth = getLogoWidth();
-  const W = boxWidth - 2;
+  const { boxWidth, W } = getBoxDimensions();
   const col1Width = Math.floor(W / 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('║');
-  };
-  
-  const make2ColRow = (left, right) => {
-    const leftPlain = left.replace(/\x1b\[[0-9;]*m/g, '').length;
-    const rightPlain = right.replace(/\x1b\[[0-9;]*m/g, '').length;
-    const leftPadded = ' ' + left + ' '.repeat(Math.max(0, col1Width - leftPlain - 1));
-    const rightPadded = right + ' '.repeat(Math.max(0, W - col1Width - rightPlain));
-    return chalk.cyan('║') + leftPadded + rightPadded + chalk.cyan('║');
-  };
-  
   // If only one option, skip selection
   if (provider.options.length === 1) {
     return await setupConnection(provider, provider.options[0]);
@@ -598,46 +400,42 @@ const selectProviderOption = async (provider) => {
   displayBanner();
   drawBoxHeaderContinue(provider.name, boxWidth);
   
-  console.log(makeLine(chalk.white('SELECT CONNECTION METHOD:')));
-  console.log(makeLine(''));
+  console.log(makeLine(W, chalk.white('SELECT CONNECTION METHOD:')));
+  console.log(makeLine(W, ''));
   
-  // Display options in 2 columns - Numbers in cyan, labels in yellow
+  // Display options in 2 columns
   for (let i = 0; i < provider.options.length; i += 2) {
     const left = provider.options[i];
     const right = provider.options[i + 1];
     
-    // Option labels - number in cyan, label in yellow
-    console.log(make2ColRow(
+    console.log(make2ColRow(W,
       chalk.cyan(`[${i + 1}]`) + chalk.yellow(` ${left.label}`),
       right ? chalk.cyan(`[${i + 2}]`) + chalk.yellow(` ${right.label}`) : ''
     ));
     
-    // First description line
     const leftDesc1 = left.description[0] ? '    ' + left.description[0] : '';
     const rightDesc1 = right?.description[0] ? '    ' + right.description[0] : '';
-    console.log(make2ColRow(
+    console.log(make2ColRow(W,
       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
     const leftDesc2 = left.description[1] ? '    ' + left.description[1] : '';
     const rightDesc2 = right?.description[1] ? '    ' + right.description[1] : '';
     if (leftDesc2 || rightDesc2) {
-      console.log(make2ColRow(
+      console.log(make2ColRow(W,
         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(W, ''));
   }
   
   drawBoxFooter(boxWidth);
   
   const choice = await prompts.textInput(chalk.cyan('SELECT:'));
   
-  // Empty input = go back
   if (!choice || choice.trim() === '' || choice === '<' || choice?.toLowerCase() === 'b') {
     return await selectProvider(provider.category);
   }
@@ -647,1237 +445,38 @@ const selectProviderOption = async (provider) => {
     return await selectProvider(provider.category);
   }
   
-  const selectedOption = provider.options[index];
-  return await setupConnection(provider, selectedOption);
-};
-
-/**
- * Open URL in default browser
- * @returns {Promise<boolean>} true if browser opened, false if failed
- */
-const openBrowser = (url) => {
-  return new Promise((resolve) => {
-    const { exec } = require('child_process');
-    const platform = process.platform;
-    
-    let cmd;
-    if (platform === 'darwin') cmd = `open "${url}"`;
-    else if (platform === 'win32') cmd = `start "" "${url}"`;
-    else cmd = `xdg-open "${url}"`;
-    
-    exec(cmd, (err) => {
-      resolve(!err);
-    });
-  });
-};
-
-/**
- * Get instructions for each credential type
- */
-const getCredentialInstructions = (provider, option, field) => {
-  const instructions = {
-    apiKey: {
-      title: 'API KEY REQUIRED',
-      steps: [
-        '1. CLICK THE LINK BELOW TO OPEN IN BROWSER',
-        '2. SIGN IN OR CREATE AN ACCOUNT',
-        '3. GENERATE A NEW API KEY',
-        '4. COPY AND PASTE IT HERE'
-      ]
-    },
-    sessionKey: {
-      title: 'SESSION KEY REQUIRED (SUBSCRIPTION PLAN)',
-      steps: [
-        '1. OPEN THE LINK BELOW IN YOUR BROWSER',
-        '2. SIGN IN WITH YOUR SUBSCRIPTION ACCOUNT',
-        '3. OPEN DEVELOPER TOOLS (F12 OR CMD+OPT+I)',
-        '4. GO TO APPLICATION > COOKIES',
-        '5. FIND "sessionKey" OR SIMILAR TOKEN',
-        '6. COPY THE VALUE AND PASTE IT HERE'
-      ]
-    },
-    accessToken: {
-      title: 'ACCESS TOKEN REQUIRED (SUBSCRIPTION PLAN)',
-      steps: [
-        '1. OPEN THE LINK BELOW IN YOUR BROWSER',
-        '2. SIGN IN WITH YOUR SUBSCRIPTION ACCOUNT',
-        '3. OPEN DEVELOPER TOOLS (F12 OR CMD+OPT+I)',
-        '4. GO TO APPLICATION > COOKIES OR LOCAL STORAGE',
-        '5. FIND "accessToken" OR "token"',
-        '6. COPY THE VALUE AND PASTE IT HERE'
-      ]
-    },
-    endpoint: {
-      title: 'ENDPOINT URL',
-      steps: [
-        '1. ENTER THE API ENDPOINT URL',
-        '2. USUALLY http://localhost:PORT FOR LOCAL'
-      ]
-    },
-    model: {
-      title: 'MODEL NAME',
-      steps: [
-        '1. ENTER THE MODEL NAME TO USE',
-        '2. CHECK PROVIDER DOCS FOR AVAILABLE MODELS'
-      ]
-    }
-  };
-  
-  return instructions[field] || { title: field.toUpperCase(), steps: [] };
-};
-
-/**
- * Get OAuth config for provider
- */
-const getOAuthConfig = (providerId) => {
-  const configs = {
-    anthropic: {
-      name: 'CLAUDE PRO/MAX',
-      accountName: 'Claude',
-      oauthModule: oauthAnthropic,
-      authorizeArgs: ['max'],
-      optionId: 'oauth_max',
-      agentName: 'Claude Pro/Max',
-      codeFormat: 'abc123...#xyz789...'
-    },
-    openai: {
-      name: 'CHATGPT PLUS/PRO',
-      accountName: 'ChatGPT',
-      oauthModule: oauthOpenai,
-      authorizeArgs: [],
-      optionId: 'oauth_plus',
-      agentName: 'ChatGPT Plus/Pro',
-      codeFormat: 'authorization_code'
-    },
-    gemini: {
-      name: 'GEMINI ADVANCED',
-      accountName: 'Google',
-      oauthModule: oauthGemini,
-      authorizeArgs: [],
-      optionId: 'oauth_advanced',
-      agentName: 'Gemini Advanced',
-      codeFormat: 'authorization_code'
-    },
-    qwen: {
-      name: 'QWEN CHAT',
-      accountName: 'Qwen',
-      oauthModule: oauthQwen,
-      authorizeArgs: [],
-      optionId: 'oauth_chat',
-      agentName: 'Qwen Chat',
-      isDeviceFlow: true
-    },
-    iflow: {
-      name: 'IFLOW',
-      accountName: 'iFlow',
-      oauthModule: oauthIflow,
-      authorizeArgs: [],
-      optionId: 'oauth_sub',
-      agentName: 'iFlow',
-      codeFormat: 'authorization_code'
-    }
-  };
-  return configs[providerId];
-};
-
-/**
- * Setup OAuth connection for any provider with OAuth support
- * Uses CLIProxyAPI for proper OAuth handling and API access
- */
-const setupOAuthConnection = async (provider) => {
-  const config = getOAuthConfig(provider.id);
-  if (!config) {
-    console.log(chalk.red('OAuth not supported for this provider'));
-    await prompts.waitForEnter();
-    return await selectProviderOption(provider);
-  }
-  
-  // Use CLIProxyAPI for OAuth flow - it handles token exchange and API calls
-  return await setupProxyOAuth(provider, config);
+  return await setupConnection(provider, provider.options[index]);
 };
 
-/**
- * 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();
-  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('║');
-  };
-  
-  // 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;
-  
-  // Show instructions
-  console.clear();
-  displayBanner();
-  drawBoxHeaderContinue(`CONNECT ${config.name}`, boxWidth);
-  
-  console.log(makeLine(chalk.yellow('CONNECT YOUR ACCOUNT')));
-  console.log(makeLine(''));
-  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. CLICK "AUTHORIZE"')));
-  console.log(makeLine(''));
-  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);
-  
-  // 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(`  ${url}`));
-  console.log();
-  
-  // Get code from user
-  const code = await prompts.textInput(chalk.cyan('PASTE AUTHORIZATION CODE:'));
-  
-  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 oauthModule.exchange(code.trim(), verifier);
-  
-  if (result.type === 'failed') {
-    spinner.fail(`Authentication failed: ${result.error || 'Invalid code'}`);
-    await prompts.waitForEnter();
-    return await selectProviderOption(provider);
-  }
-  
-  spinner.succeed('Authorization successful!');
-  
-  // Save credentials
-  const credentials = {
-    oauth: {
-      access: result.access,
-      refresh: result.refresh,
-      expires: result.expires,
-      apiKey: result.apiKey,
-      email: result.email
-    }
-  };
-  
-  // Try to fetch models with the new token
-  spinner.text = 'Fetching available models from API...';
-  spinner.start();
-  
-  let models = [];
-  let fetchError = null;
-  try {
-    const { fetchModelsWithOAuth } = require('../services/ai/client');
-    models = await fetchModelsWithOAuth(provider.id, result.access);
-  } catch (e) {
-    fetchError = e.message;
-  }
-  
-  // RULE: Models MUST come from API - no hardcoded fallback
-  if (!models || models.length === 0) {
-    spinner.fail('Could not fetch models from API');
-    console.log();
-    console.log(chalk.red('  ERROR: Unable to retrieve models from provider API'));
-    console.log(chalk.white('  Possible causes:'));
-    console.log(chalk.gray('  - OAuth token may not have permission to list models'));
-    console.log(chalk.gray('  - Network issue or API temporarily unavailable'));
-    console.log(chalk.gray('  - Provider API may have changed'));
-    if (fetchError) {
-      console.log(chalk.gray(`  - Error: ${fetchError}`));
-    }
-    console.log();
-    console.log(chalk.yellow('  Please try again or use API Key authentication instead.'));
-    await prompts.waitForEnter();
-    return await selectProviderOption(provider);
-  }
-  
-  spinner.succeed(`Found ${models.length} models`);
-  
-  // Let user select model from list
-  const selectedModel = await selectModelFromList(models, config.name);
-  if (!selectedModel) {
-    return await selectProviderOption(provider);
-  }
-  
-  // Add agent
-  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();
-};
-
-// NOTE: promptForModelName was removed - models MUST come from API (RULES.md)
-
-/**
- * Setup OAuth using CLIProxyAPI
- * CLIProxyAPI handles OAuth flow, token storage, and API calls
- * Models are fetched from CLIProxyAPI /v1/models endpoint
- */
-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('║');
-  };
-  
-  // Step 1: Ensure CLIProxyAPI is installed and running
-  const spinner = ora({ text: 'Setting up CLIProxyAPI...', color: 'cyan' }).start();
-  
-  try {
-    await proxyManager.ensureRunning();
-    spinner.succeed('CLIProxyAPI ready');
-  } catch (error) {
-    spinner.fail(`Failed to start CLIProxyAPI: ${error.message}`);
-    console.log();
-    console.log(chalk.yellow('  CLIProxyAPI is required for OAuth authentication.'));
-    console.log(chalk.gray('  It will be downloaded automatically on first use.'));
-    console.log();
-    await prompts.waitForEnter();
-    return await selectProviderOption(provider);
-  }
-  
-  // Step 2: Get OAuth URL from CLIProxyAPI
-  spinner.text = 'Getting authorization URL...';
-  spinner.start();
-  
-  let authUrl, authState;
-  try {
-    const authInfo = await proxyManager.getAuthUrl(provider.id);
-    authUrl = authInfo.url;
-    authState = authInfo.state;
-    spinner.succeed('Authorization URL ready');
-  } catch (error) {
-    spinner.fail(`Failed to get auth URL: ${error.message}`);
-    await prompts.waitForEnter();
-    return await selectProviderOption(provider);
-  }
-  
-  // Step 3: Show instructions to user
-  console.clear();
-  displayBanner();
-  drawBoxHeaderContinue(`CONNECT ${config.name}`, boxWidth);
-  
-  console.log(makeLine(chalk.yellow('CONNECT YOUR ACCOUNT')));
-  console.log(makeLine(''));
-  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. CLICK "AUTHORIZE"')));
-  console.log(makeLine(''));
-  console.log(makeLine(chalk.green('4. WAIT FOR CONFIRMATION HERE')));
-  console.log(makeLine(chalk.white('   (The page will close automatically)')));
-  console.log(makeLine(''));
-  
-  drawBoxFooter(boxWidth);
-  
-  // Display URL
-  console.log();
-  console.log(chalk.yellow('  OPEN THIS URL IN YOUR BROWSER:'));
-  console.log();
-  console.log(chalk.cyan(`  ${authUrl}`));
-  console.log();
-  
-  // Try to open browser automatically
-  const browserOpened = await openBrowser(authUrl);
-  if (browserOpened) {
-    console.log(chalk.gray('  (Browser opened automatically)'));
-  } else {
-    console.log(chalk.gray('  (Copy and paste the URL in your browser)'));
-  }
-  console.log();
-  
-  // Step 4: Wait for OAuth callback
-  // Detect if we're on a remote server (SSH) - callback won't work automatically
-  const isRemote = process.env.SSH_CONNECTION || process.env.SSH_CLIENT || 
-                   (process.env.DISPLAY === undefined && process.platform === 'linux');
-  
-  let authSuccess = false;
-  
-  if (isRemote) {
-    // Remote/VPS: Ask for callback URL directly (no point waiting)
-    console.log(chalk.yellow('  After authorizing, paste the callback URL from your browser:'));
-    console.log(chalk.gray('  (The page showing http://localhost:54545/callback?code=...)'));
-    console.log();
-    
-    // Use inquirer directly for reliable input on VPS
-    const inquirer = require('inquirer');
-    let callbackUrl = '';
-    try {
-      const result = await inquirer.prompt([{
-        type: 'input',
-        name: 'callbackUrl',
-        message: 'Callback URL:',
-        prefix: ' '
-      }]);
-      callbackUrl = result.callbackUrl || '';
-    } catch (e) {
-      // Inquirer failed, try readline directly
-      const readline = require('readline');
-      const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-      callbackUrl = await new Promise(resolve => {
-        rl.question('  Callback URL: ', answer => {
-          rl.close();
-          resolve(answer || '');
-        });
-      });
-    }
-    
-    if (callbackUrl && callbackUrl.trim()) {
-      const submitSpinner = ora({ text: 'Submitting callback...', color: 'cyan' }).start();
-      try {
-        await proxyManager.submitCallback(callbackUrl.trim(), provider.id);
-        // Callback succeeded - CLIProxyAPI handles the token exchange
-        await new Promise(resolve => setTimeout(resolve, 500));
-        authSuccess = true;
-        submitSpinner.succeed('Authorization successful!');
-      } catch (submitError) {
-        submitSpinner.fail(`Failed: ${submitError.message}`);
-        await prompts.waitForEnter();
-        return await selectProviderOption(provider);
-      }
-    } else {
-      console.log(chalk.gray('  Cancelled.'));
-      await prompts.waitForEnter();
-      return await selectProviderOption(provider);
-    }
-  } else {
-    // Local: Wait for automatic callback
-    const waitSpinner = ora({ text: 'Waiting for authorization...', color: 'cyan' }).start();
-    
-    try {
-      await proxyManager.waitForAuth(authState, 300000, (status) => {
-        waitSpinner.text = status;
-      });
-      authSuccess = true;
-      waitSpinner.succeed('Authorization successful!');
-    } catch (error) {
-      waitSpinner.fail(`Authorization failed: ${error.message}`);
-      await prompts.waitForEnter();
-      return await selectProviderOption(provider);
-    }
-  }
-  
-  if (!authSuccess) {
-    return await selectProviderOption(provider);
-  }
-  
-  // Wrap entire post-auth flow in try-catch to catch any uncaught errors
-  try {
-    // Step 5: Fetch models from CLIProxyAPI (filtered by provider)
-    const modelSpinner = ora({ text: 'Fetching available models from API...', color: 'cyan' }).start();
-    
-    let models = [];
-    try {
-      // Get models filtered by provider using owned_by field from API
-      models = await proxyManager.getModels(provider.id);
-      modelSpinner.succeed(`Found ${models.length} models for ${provider.name}`);
-    } catch (error) {
-      modelSpinner.fail(`Failed to fetch models: ${error.message}`);
-      await prompts.waitForEnter();
-      return await selectProviderOption(provider);
-    }
-    
-    if (!models || models.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 and authorization completed.'));
-      console.log();
-      await prompts.waitForEnter();
-      return await selectProviderOption(provider);
-    }
-    
-    // Step 6: Let user select model
-    const selectedModel = await selectModelFromList(models, 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();
-  } catch (unexpectedError) {
-    // Catch any uncaught errors in the post-auth flow
-    console.log();
-    console.log(chalk.red(`  UNEXPECTED ERROR: ${unexpectedError.message}`));
-    console.log(chalk.gray(`  Stack: ${unexpectedError.stack}`));
-    console.log();
-    await prompts.waitForEnter();
-    return await selectProviderOption(provider);
-  }
-};
-
-/**
- * Setup OAuth with browser redirect flow (Claude, OpenAI, Gemini, iFlow)
- * Legacy method - kept for API key users
- */
-const setupBrowserOAuth = 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(`${config.name} LOGIN`, boxWidth);
-  
-  console.log(makeLine(chalk.yellow('OAUTH AUTHENTICATION')));
-  console.log(makeLine(''));
-  console.log(makeLine(chalk.white('1. A BROWSER WINDOW WILL OPEN')));
-  console.log(makeLine(chalk.white(`2. LOGIN WITH YOUR ${config.accountName.toUpperCase()} ACCOUNT`)));
-  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.white('OPENING BROWSER IN 3 SECONDS...')));
-  
-  drawBoxFooter(boxWidth);
-  
-  // Generate OAuth URL
-  const authResult = config.oauthModule.authorize(...config.authorizeArgs);
-  const url = authResult.url;
-  const verifier = authResult.verifier;
-  const state = authResult.state;
-  const redirectUri = authResult.redirectUri;
-  
-  // Wait a moment then open browser
-  await new Promise(resolve => setTimeout(resolve, 3000));
-  const browserOpened = await openBrowser(url);
-  
-  // Redraw with code input
-  console.clear();
-  displayBanner();
-  drawBoxHeaderContinue(`${config.name} LOGIN`, boxWidth);
-  
-  if (browserOpened) {
-    console.log(makeLine(chalk.green('BROWSER OPENED')));
-    console.log(makeLine(''));
-    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(''));
-    if (config.codeFormat) {
-      console.log(makeLine(chalk.white(`THE CODE LOOKS LIKE: ${config.codeFormat}`)));
-      console.log(makeLine(''));
-    }
-    console.log(makeLine(chalk.white('TYPE < TO CANCEL')));
-    drawBoxFooter(boxWidth);
-    console.log();
-  } else {
-    console.log(makeLine(chalk.yellow('COULD NOT OPEN BROWSER (VPS/SSH?)')));
-    console.log(makeLine(''));
-    
-    // Different instructions for different providers
-    if (provider.id === 'anthropic') {
-      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.white('THE CODE LOOKS LIKE: abc123...#xyz789...')));
-    } else {
-      // Gemini, OpenAI, iFlow redirect to localhost - need full URL
-      console.log(makeLine(chalk.white('AFTER LOGGING IN, YOU WILL SEE A BLANK PAGE')));
-      console.log(makeLine(chalk.white('THE URL WILL START WITH: localhost:...')));
-      console.log(makeLine(''));
-      console.log(makeLine(chalk.green('COPY THE ENTIRE URL FROM THE ADDRESS BAR')));
-      console.log(makeLine(chalk.white('AND PASTE IT BELOW')));
-    }
-    console.log(makeLine(''));
-    console.log(makeLine(chalk.white('TYPE < TO CANCEL')));
-    drawBoxFooter(boxWidth);
-    // Display URL outside the box for easy copy-paste (no line breaks)
-    console.log();
-    console.log(chalk.yellow('  OPEN THIS URL IN YOUR BROWSER:'));
-    console.log();
-    console.log(chalk.cyan(`  ${url}`));
-    console.log();
-  }
-  
-  const promptText = provider.id === 'anthropic' 
-    ? 'PASTE AUTHORIZATION CODE:' 
-    : 'PASTE FULL CALLBACK URL:';
-  
-  const input = await prompts.textInput(chalk.cyan(promptText));
-  
-  if (!input || input === '<') {
-    return await selectProviderOption(provider);
-  }
-  
-  // Extract code from URL if user pasted full callback URL
-  let code = input.trim();
-  if (code.includes('code=')) {
-    try {
-      const urlObj = new URL(code.replace('localhost', 'http://localhost'));
-      code = urlObj.searchParams.get('code') || code;
-    } catch (e) {
-      // Try regex extraction as fallback
-      const match = code.match(/[?&]code=([^&]+)/);
-      if (match) code = match[1];
-    }
-  }
-  
-  // Exchange code for tokens
-  const spinner = ora({ text: 'EXCHANGING CODE FOR TOKENS...', color: 'cyan' }).start();
-  
-  let result;
-  if (provider.id === 'anthropic') {
-    result = await config.oauthModule.exchange(code, verifier);
-  } else if (provider.id === 'gemini') {
-    result = await config.oauthModule.exchange(code);
-  } else if (provider.id === 'iflow') {
-    result = await config.oauthModule.exchange(code, redirectUri);
-  } else {
-    result = await config.oauthModule.exchange(code, verifier);
-  }
-  
-  if (result.type === 'failed') {
-    spinner.fail(`AUTHENTICATION FAILED: ${result.error || 'Invalid code'}`);
-    await prompts.waitForEnter();
-    return await selectProviderOption(provider);
-  }
-  
-  spinner.text = 'FETCHING AVAILABLE MODELS...';
-  
-  // Store OAuth credentials
-  const credentials = {
-    oauth: {
-      access: result.access,
-      refresh: result.refresh,
-      expires: result.expires,
-      apiKey: result.apiKey,
-      email: result.email
-    }
-  };
-  
-  // For iFlow, the API key is the main credential
-  if (provider.id === 'iflow' && result.apiKey) {
-    credentials.apiKey = result.apiKey;
-  }
-  
-  // Fetch available models for the provider
-  let models = [];
-  try {
-    const { fetchModelsWithOAuth } = require('../services/ai/client');
-    models = await fetchModelsWithOAuth(provider.id, result.access);
-  } catch (e) {
-    // Fallback to default models if fetch fails
-  }
-  
-  // NO hardcoded fallback - models MUST come from API
-  // Rule: ZERO fake/mock data - API only
-  if (!models || models.length === 0) {
-    spinner.fail('NO MODELS AVAILABLE FROM API');
-    console.log(chalk.red('\n  Could not fetch models from provider API'));
-    console.log(chalk.gray('  Please check your OAuth credentials or try again'));
-    await prompts.waitForEnter();
-    return await selectProviderOption(provider);
-  } else {
-    spinner.succeed(`FOUND ${models.length} MODELS`);
-  }
-  
-  // Let user select model
-  const selectedModel = await selectModelFromList(models, config.name);
-  if (!selectedModel) {
-    return await selectProviderOption(provider);
-  }
-  
-  // Add agent with OAuth credentials
-  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();
-};
-
-/**
- * Setup OAuth with device flow (Qwen)
- */
-const setupDeviceFlowOAuth = 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(`${config.name} LOGIN`, boxWidth);
-  
-  console.log(makeLine(chalk.yellow('DEVICE FLOW AUTHENTICATION')));
-  console.log(makeLine(''));
-  console.log(makeLine(chalk.white('INITIATING DEVICE AUTHORIZATION...')));
-  
-  drawBoxFooter(boxWidth);
-  
-  // Initiate device flow
-  const spinner = ora({ text: 'GETTING DEVICE CODE...', color: 'cyan' }).start();
-  
-  const deviceResult = await config.oauthModule.initiateDeviceFlow();
-  
-  if (deviceResult.type === 'failed') {
-    spinner.fail(`FAILED: ${deviceResult.error}`);
-    await prompts.waitForEnter();
-    return await selectProviderOption(provider);
-  }
-  
-  spinner.stop();
-  
-  // Show user code and verification URL
-  console.clear();
-  displayBanner();
-  drawBoxHeaderContinue(`${config.name} LOGIN`, boxWidth);
-  
-  console.log(makeLine(chalk.yellow('DEVICE FLOW AUTHENTICATION')));
-  console.log(makeLine(''));
-  console.log(makeLine(chalk.white('1. OPEN THE URL BELOW IN YOUR BROWSER')));
-  console.log(makeLine(''));
-  console.log(makeLine(chalk.white('2. ENTER THIS CODE WHEN PROMPTED:')));
-  console.log(makeLine(''));
-  console.log(makeLine(chalk.green.bold(`   ${deviceResult.userCode}`)));
-  console.log(makeLine(''));
-  console.log(makeLine(chalk.white('3. AUTHORIZE THE APPLICATION')));
-  console.log(makeLine(''));
-  console.log(makeLine(chalk.white('WAITING FOR AUTHORIZATION...')));
-  console.log(makeLine(chalk.white('(THIS WILL AUTO-DETECT WHEN YOU AUTHORIZE)')));
-  
-  drawBoxFooter(boxWidth);
-  
-  // Display URL outside the box for easy copy-paste
-  const verificationUrl = deviceResult.verificationUriComplete || deviceResult.verificationUri;
-  console.log();
-  console.log(chalk.yellow('  OPEN THIS URL IN YOUR BROWSER:'));
-  console.log();
-  console.log(chalk.cyan(`  ${verificationUrl}`));
-  console.log();
-  
-  // Poll for token
-  const pollSpinner = ora({ text: 'WAITING FOR AUTHORIZATION...', color: 'cyan' }).start();
-  
-  let pollResult;
-  const maxAttempts = 60;
-  let interval = deviceResult.interval || 5;
-  
-  for (let attempt = 0; attempt < maxAttempts; attempt++) {
-    await new Promise(resolve => setTimeout(resolve, interval * 1000));
-    
-    pollResult = await config.oauthModule.pollForToken(deviceResult.deviceCode, deviceResult.verifier);
-    
-    if (pollResult.type === 'success') {
-      break;
-    } else if (pollResult.type === 'slow_down') {
-      interval = Math.min(interval + 2, 10);
-      pollSpinner.text = `WAITING FOR AUTHORIZATION... (slowing down)`;
-    } else if (pollResult.type === 'failed') {
-      pollSpinner.fail(`AUTHENTICATION FAILED: ${pollResult.error}`);
-      await prompts.waitForEnter();
-      return await selectProviderOption(provider);
-    }
-    
-    pollSpinner.text = `WAITING FOR AUTHORIZATION... (${attempt + 1}/${maxAttempts})`;
-  }
-  
-  if (!pollResult || pollResult.type !== 'success') {
-    pollSpinner.fail('AUTHENTICATION TIMED OUT');
-    await prompts.waitForEnter();
-    return await selectProviderOption(provider);
-  }
-  
-  pollSpinner.text = 'FETCHING AVAILABLE MODELS FROM API...';
-  
-  // Store OAuth credentials
-  const credentials = {
-    oauth: {
-      access: pollResult.access,
-      refresh: pollResult.refresh,
-      expires: pollResult.expires,
-      resourceUrl: pollResult.resourceUrl
-    }
-  };
-  
-  // Fetch models from API - NO hardcoded fallback (RULES.md)
-  let models = [];
-  let fetchError = null;
-  try {
-    const { fetchModelsWithOAuth } = require('../services/ai/client');
-    models = await fetchModelsWithOAuth(provider.id, pollResult.access);
-  } catch (e) {
-    fetchError = e.message;
-  }
-  
-  if (!models || models.length === 0) {
-    pollSpinner.fail('Could not fetch models from API');
-    console.log();
-    console.log(chalk.red('  ERROR: Unable to retrieve models from provider API'));
-    console.log(chalk.white('  Possible causes:'));
-    console.log(chalk.gray('  - OAuth token may not have permission to list models'));
-    console.log(chalk.gray('  - Network issue or API temporarily unavailable'));
-    if (fetchError) {
-      console.log(chalk.gray(`  - Error: ${fetchError}`));
-    }
-    console.log();
-    console.log(chalk.yellow('  Please try again or use API Key authentication instead.'));
-    await prompts.waitForEnter();
-    return await selectProviderOption(provider);
-  }
-  
-  pollSpinner.succeed(`Found ${models.length} models`);
-  
-  // Let user select model from API list
-  const selectedModel = await selectModelFromList(models, config.name);
-  if (!selectedModel) {
-    return await selectProviderOption(provider);
-  }
-  
-  // Add agent with OAuth credentials
-  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();
-};
-
-/**
- * Setup connection with credentials
- */
+/** Setup connection with credentials */
 const setupConnection = async (provider, option) => {
   // Handle OAuth flow separately
   if (option.authType === 'oauth') {
-    return await setupOAuthConnection(provider);
-  }
-  
-  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('║');
-  };
-  
-  // Collect credentials based on fields
-  const credentials = {};
-  
-  for (const field of option.fields) {
-    // Show instructions for this field
-    console.clear();
-    displayBanner();
-    drawBoxHeaderContinue(`CONNECT TO ${provider.name}`, boxWidth);
-    
-    const instructions = getCredentialInstructions(provider, option, field);
-    
-    console.log(makeLine(chalk.yellow(instructions.title)));
-    console.log(makeLine(''));
-    
-    // Show steps
-    for (const step of instructions.steps) {
-      console.log(makeLine(chalk.white(step)));
-    }
-    
-    console.log(makeLine(''));
-    
-    // Show URL for reference (no browser needed - user already has API key)
-    if (option.url && (field === 'apiKey' || field === 'sessionKey' || field === 'accessToken')) {
-      console.log(makeLine(chalk.cyan('GET KEY: ') + chalk.white(option.url)));
-    }
-    
-    // Show default for endpoint
-    if (field === 'endpoint' && option.defaultEndpoint) {
-      console.log(makeLine(chalk.white(`DEFAULT: ${option.defaultEndpoint}`)));
-    }
-    
-    console.log(makeLine(''));
-    console.log(makeLine(chalk.white('TYPE < TO GO BACK')));
-    
-    drawBoxFooter(boxWidth);
-    console.log();
-    
-    let value;
-    
-    switch (field) {
-      case 'apiKey':
-        value = await prompts.textInput(chalk.cyan('PASTE API KEY:'));
-        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.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.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 || value.trim() === '<' || value.trim() === '') {
-          if (!defaultEndpoint) return await selectProviderOption(provider);
-        }
-        credentials.endpoint = (value && value.trim() !== '<' ? value : defaultEndpoint).trim();
-        if (!credentials.endpoint) return await selectProviderOption(provider);
-        break;
-        
-      case 'model':
-        value = await prompts.textInput(chalk.cyan('MODEL NAME:'));
-        if (!value || value.trim() === '<' || value.trim() === '') return await selectProviderOption(provider);
-        credentials.model = value.trim();
-        break;
-    }
+    return await setupOAuthConnection(provider, selectProviderOption, selectModelFromList, aiAgentMenu);
   }
   
-  // Validate connection
-  console.log();
-  const spinner = ora({ text: 'VALIDATING CONNECTION...', color: 'cyan' }).start();
-  
-  const validation = await aiService.validateConnection(provider.id, option.id, credentials);
-  
-  if (!validation.valid) {
-    spinner.fail(`CONNECTION FAILED: ${validation.error}`);
-    await prompts.waitForEnter();
+  // Collect credentials
+  const credentials = await collectCredentials(provider, option);
+  if (!credentials) {
     return await selectProviderOption(provider);
   }
   
-  spinner.text = 'FETCHING AVAILABLE MODELS...';
-  
-  // Fetch models from real API
-  const { fetchAnthropicModels, fetchGeminiModels, fetchOpenAIModels } = require('../services/ai/client');
-  
-  let models = null;
-  if (provider.id === 'anthropic') {
-    models = await fetchAnthropicModels(credentials.apiKey);
-  } else if (provider.id === 'gemini') {
-    models = await fetchGeminiModels(credentials.apiKey);
-  } else {
-    const endpoint = credentials.endpoint || provider.endpoint;
-    models = await fetchOpenAIModels(endpoint, credentials.apiKey);
-  }
-  
-  if (!models || models.length === 0) {
-    spinner.fail('COULD NOT FETCH MODELS FROM API');
-    console.log(chalk.white('  Check your API key or network connection.'));
+  // Validate and fetch models
+  const result = await validateAndFetchModels(provider, option, credentials);
+  if (!result.valid) {
     await prompts.waitForEnter();
     return await selectProviderOption(provider);
   }
   
-  spinner.succeed(`FOUND ${models.length} MODELS`);
-  
   // Let user select a model
-  const selectedModel = await selectModelFromList(models, provider.name);
+  const selectedModel = await selectModelFromList(result.models, provider.name);
   if (!selectedModel) {
     return await selectProviderOption(provider);
   }
   
   // Add as new agent with selected model
-  try {
-    await aiService.addAgent(provider.id, option.id, credentials, selectedModel, provider.name);
-    
-    console.log(chalk.green(`\n  AGENT ADDED: ${provider.name}`));
-    console.log(chalk.white(`  MODEL: ${selectedModel}`));
-  } catch (error) {
-    console.log(chalk.red(`\n  FAILED TO SAVE: ${error.message}`));
-  }
-  
-  await prompts.waitForEnter();
-  return await aiAgentMenu();
-};
-
-/**
- * Select model from a list (used when adding new agent)
- * @param {Array} models - Array of model IDs from API
- * @param {string} providerName - Provider name for display
- * @returns {string|null} Selected model ID or null if cancelled
- * 
- * Data source: models array comes from provider API (/v1/models)
- */
-const selectModelFromList = async (models, providerName) => {
-  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(`SELECT MODEL - ${providerName}`, boxWidth);
-  
-  if (!models || models.length === 0) {
-    console.log(makeLine(chalk.red('NO MODELS AVAILABLE')));
-    console.log(makeLine(chalk.white('[<] BACK')));
-    drawBoxFooter(boxWidth);
-    await prompts.waitForEnter();
-    return null;
-  }
-  
-  // Sort models (newest first)
-  const sortedModels = [...models].sort((a, b) => b.localeCompare(a));
-  
-  // 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.white('[<] BACK')));
-  
-  drawBoxFooter(boxWidth);
-  
-  const choice = await prompts.textInput(chalk.cyan('SELECT MODEL:'));
-  
-  // Empty input or < = go back
-  if (!choice || choice.trim() === '' || choice === '<' || choice?.toLowerCase() === 'b') {
-    return null;
-  }
-  
-  const index = parseInt(choice) - 1;
-  if (isNaN(index) || index < 0 || index >= sortedModels.length) {
-    return await selectModelFromList(models, providerName);
-  }
-  
-  return sortedModels[index];
-};
-
-/**
- * Select/change model for an agent
- * Fetches available models from the provider's API
- */
-const selectModel = async (agent) => {
-  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(`SELECT MODEL - ${agent.name}`, boxWidth);
-  
-  console.log(makeLine(chalk.white('FETCHING AVAILABLE MODELS FROM API...')));
-  drawBoxFooter(boxWidth);
-  
-  // Fetch models from real API
-  const { fetchAnthropicModels, fetchAnthropicModelsOAuth, fetchGeminiModels, fetchOpenAIModels } = require('../services/ai/client');
-  
-  let models = null;
-  const agentCredentials = aiService.getAgentCredentials(agent.id);
-  
-  if (agent.providerId === 'anthropic') {
-    // 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 if (agent.providerId === 'gemini') {
-    // Google Gemini API
-    models = await fetchGeminiModels(agentCredentials?.apiKey);
-  } else {
-    // OpenAI-compatible providers
-    const endpoint = agentCredentials?.endpoint || agent.provider?.endpoint;
-    models = await fetchOpenAIModels(endpoint, agentCredentials?.apiKey);
-  }
-  
-  // Redraw with results
-  console.clear();
-  displayBanner();
-  drawBoxHeaderContinue(`SELECT MODEL - ${agent.name}`, boxWidth);
-  
-  if (!models || models.length === 0) {
-    console.log(makeLine(chalk.red('COULD NOT FETCH MODELS FROM API')));
-    console.log(makeLine(chalk.white('Check your API key or network connection.')));
-    console.log(makeLine(''));
-    console.log(makeLine(chalk.white('[<] BACK')));
-    drawBoxFooter(boxWidth);
-    
-    await prompts.waitForEnter();
-    return await aiAgentMenu();
-  }
-  
-  // Sort models (newest first typically)
-  models.sort((a, b) => b.localeCompare(a));
-  
-  // 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.white('[<] BACK') + chalk.white('                                        * = CURRENT')));
-  
-  drawBoxFooter(boxWidth);
-  
-  const choice = await prompts.textInput(chalk.cyan('SELECT MODEL:'));
-  
-  // Empty input or < = go back
-  if (!choice || choice.trim() === '' || choice === '<' || choice?.toLowerCase() === 'b') {
-    return await aiAgentMenu();
-  }
-  
-  const index = parseInt(choice) - 1;
-  if (isNaN(index) || index < 0 || index >= models.length) {
-    return await selectModel(agent);
-  }
-  
-  const selectedModel = models[index];
-  aiService.updateAgent(agent.id, { model: selectedModel });
+  await addConnectedAgent(provider, option, credentials, selectedModel);
   
-  console.log(chalk.green(`\n  MODEL CHANGED TO: ${selectedModel}`));
   await prompts.waitForEnter();
   return await aiAgentMenu();
 };