@vibescope/mcp-server 0.5.0 → 0.5.1

package/src/setup.ts

@@ -1,410 +1,410 @@
-/**
- * Vibescope Setup Wizard
- * Guides users through setting up Vibescope MCP integration
- *
- * Usage: vibescope-cli setup
- */
-
-import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
-import { createInterface } from 'node:readline';
-import { homedir, platform } from 'node:os';
-import { join, dirname } from 'node:path';
-import { exec } from 'node:child_process';
-
-const VIBESCOPE_SETTINGS_URL = 'https://vibescope.dev/dashboard/settings';
-const VIBESCOPE_API_URL = 'https://vibescope.dev';
-
-// ============================================================================
-// Types
-// ============================================================================
-
-export interface IdeConfig {
-	name: string;
-	displayName: string;
-	configPath: string;
-	detected: boolean;
-	configFormat: 'mcp-json' | 'settings-json';
-}
-
-// ============================================================================
-// Config Path Helpers
-// ============================================================================
-
-function getClaudeDesktopConfigPath(): string {
-	const plat = platform();
-	const home = homedir();
-
-	if (plat === 'darwin') {
-		return join(home, 'Library', 'Application Support', 'Claude', 'claude_desktop_config.json');
-	} else if (plat === 'win32') {
-		return join(home, 'AppData', 'Roaming', 'Claude', 'claude_desktop_config.json');
-	} else {
-		return join(home, '.config', 'Claude', 'claude_desktop_config.json');
-	}
-}
-
-function getCursorConfigPath(): string {
-	const plat = platform();
-	const home = homedir();
-
-	if (plat === 'darwin') {
-		return join(home, 'Library', 'Application Support', 'Cursor', 'User', 'globalStorage', 'saoudrizwan.claude-dev', 'settings', 'cline_mcp_settings.json');
-	} else if (plat === 'win32') {
-		return join(home, 'AppData', 'Roaming', 'Cursor', 'User', 'globalStorage', 'saoudrizwan.claude-dev', 'settings', 'cline_mcp_settings.json');
-	} else {
-		return join(home, '.config', 'Cursor', 'User', 'globalStorage', 'saoudrizwan.claude-dev', 'settings', 'cline_mcp_settings.json');
-	}
-}
-
-function getGeminiConfigPath(): string {
-	return join(homedir(), '.gemini', 'settings.json');
-}
-
-// ============================================================================
-// IDE Detection
-// ============================================================================
-
-export function detectIdes(): IdeConfig[] {
-	const ides: IdeConfig[] = [
-		{
-			name: 'claude-code',
-			displayName: 'Claude Code (CLI)',
-			configPath: '.mcp.json',
-			detected: true,
-			configFormat: 'mcp-json',
-		},
-		{
-			name: 'claude-desktop',
-			displayName: 'Claude Desktop',
-			configPath: getClaudeDesktopConfigPath(),
-			detected: existsSync(dirname(getClaudeDesktopConfigPath())),
-			configFormat: 'mcp-json',
-		},
-		{
-			name: 'cursor',
-			displayName: 'Cursor',
-			configPath: getCursorConfigPath(),
-			detected: existsSync(dirname(getCursorConfigPath())),
-			configFormat: 'mcp-json',
-		},
-		{
-			name: 'gemini',
-			displayName: 'Gemini CLI',
-			configPath: getGeminiConfigPath(),
-			detected: true,
-			configFormat: 'settings-json',
-		},
-	];
-
-	return ides;
-}
-
-// ============================================================================
-// User Prompts
-// ============================================================================
-
-async function prompt(question: string): Promise<string> {
-	const rl = createInterface({
-		input: process.stdin,
-		output: process.stdout,
-	});
-
-	return new Promise((resolve) => {
-		rl.question(question, (answer) => {
-			rl.close();
-			resolve(answer.trim());
-		});
-	});
-}
-
-async function promptSelect(question: string, options: { label: string; value: string }[]): Promise<string> {
-	console.log('\n' + question + '\n');
-	options.forEach((opt, i) => {
-		console.log('  ' + (i + 1) + ') ' + opt.label);
-	});
-
-	const answer = await prompt('\nEnter number: ');
-	const index = parseInt(answer, 10) - 1;
-
-	if (index >= 0 && index < options.length) {
-		return options[index].value;
-	}
-
-	console.log('Invalid selection, using first option.');
-	return options[0].value;
-}
-
-// ============================================================================
-// Browser & Validation
-// ============================================================================
-
-function openBrowser(url: string): Promise<void> {
-	return new Promise((resolve) => {
-		const plat = platform();
-		let cmd: string;
-
-		if (plat === 'darwin') {
-			cmd = 'open "' + url + '"';
-		} else if (plat === 'win32') {
-			cmd = 'start "" "' + url + '"';
-		} else {
-			cmd = 'xdg-open "' + url + '"';
-		}
-
-		exec(cmd, (error) => {
-			if (error) {
-				console.log('\nCould not open browser automatically.');
-				console.log('Please visit: ' + url + '\n');
-			}
-			resolve();
-		});
-	});
-}
-
-export async function validateApiKey(apiKey: string): Promise<{ valid: boolean; message: string }> {
-	try {
-		const response = await fetch(VIBESCOPE_API_URL + '/api/mcp/auth/validate', {
-			method: 'POST',
-			headers: {
-				'Content-Type': 'application/json',
-				'X-API-Key': apiKey,
-			},
-			body: JSON.stringify({ api_key: apiKey }),
-		});
-
-		const data = await response.json();
-
-		if (response.ok && data.valid) {
-			return { valid: true, message: 'API key validated successfully!' };
-		}
-
-		// Extract actual error message from server response
-		const errorMessage = data.error || 'API key appears to be invalid.';
-		return { valid: false, message: errorMessage };
-	} catch {
-		return { valid: true, message: 'Could not validate API key (network issue), but proceeding.' };
-	}
-}
-
-// ============================================================================
-// Config Management
-// ============================================================================
-
-export function readExistingConfig(configPath: string): Record<string, unknown> {
-	if (existsSync(configPath)) {
-		try {
-			return JSON.parse(readFileSync(configPath, 'utf-8'));
-		} catch {
-			return {};
-		}
-	}
-	return {};
-}
-
-export function writeConfig(configPath: string, config: Record<string, unknown>): void {
-	const dir = dirname(configPath);
-	if (!existsSync(dir)) {
-		mkdirSync(dir, { recursive: true });
-	}
-	writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n');
-}
-
-export function generateMcpConfig(apiKey: string, ide: IdeConfig): Record<string, unknown> {
-	// Prefer globally installed binary (instant start) with npx fallback
-	const isWindows = platform() === 'win32';
-	const vibescopeServer = isWindows
-		? {
-			command: 'cmd',
-			args: ['/c', 'where vibescope-mcp >nul 2>&1 && vibescope-mcp || npx -y -p @vibescope/mcp-server@latest vibescope-mcp'],
-			env: { VIBESCOPE_API_KEY: apiKey },
-		}
-		: {
-			command: 'bash',
-			args: ['-c', 'command -v vibescope-mcp >/dev/null 2>&1 && exec vibescope-mcp || exec npx -y -p @vibescope/mcp-server@latest vibescope-mcp'],
-			env: { VIBESCOPE_API_KEY: apiKey },
-		};
-
-	// Gemini CLI uses a different config format with additional options
-	if (ide.configFormat === 'settings-json') {
-		return {
-			mcpServers: {
-				vibescope: {
-					...vibescopeServer,
-					timeout: 30000,
-					trust: true,
-				},
-			},
-		};
-	}
-
-	// Standard MCP config for Claude Code, Claude Desktop, Cursor
-	return {
-		mcpServers: {
-			vibescope: vibescopeServer,
-		},
-	};
-}
-
-// ============================================================================
-// Main Setup Flow
-// ============================================================================
-
-export async function runSetup(): Promise<void> {
-	console.log('\n=================================');
-	console.log('   Vibescope Setup Wizard');
-	console.log('=================================\n');
-
-	// Step 1: Detect IDEs
-	const ides = detectIdes();
-	const detectedIdes = ides.filter(ide => ide.detected);
-
-	console.log('Available development environments:');
-	detectedIdes.forEach(ide => {
-		console.log('  - ' + ide.displayName);
-	});
-
-	// Step 2: Select IDE to configure
-	let selectedIde: IdeConfig;
-	if (detectedIdes.length === 1) {
-		selectedIde = detectedIdes[0];
-		console.log('\nConfiguring for ' + selectedIde.displayName + '...');
-	} else {
-		const ideChoice = await promptSelect(
-			'Which environment do you want to configure?',
-			detectedIdes.map(ide => ({ label: ide.displayName, value: ide.name }))
-		);
-		selectedIde = ides.find(ide => ide.name === ideChoice) || detectedIdes[0];
-	}
-
-	// Step 3: Check if config already exists
-	if (existsSync(selectedIde.configPath)) {
-		const existingConfig = readExistingConfig(selectedIde.configPath);
-		const hasMcpServers = 'mcpServers' in existingConfig;
-		const hasVibescope = hasMcpServers &&
-			typeof existingConfig.mcpServers === 'object' &&
-			existingConfig.mcpServers !== null &&
-			'vibescope' in (existingConfig.mcpServers as Record<string, unknown>);
-
-		if (hasVibescope) {
-			const overwrite = await prompt('\nVibescope is already configured. Reconfigure? (y/N): ');
-			if (overwrite.toLowerCase() !== 'y') {
-				console.log('\nSetup cancelled. Your existing configuration is preserved.');
-				return;
-			}
-		}
-	}
-
-	// Step 4: Get API key (with retry logic)
-	console.log('\n--- Step 1: Get your API key ---\n');
-	console.log('Opening Vibescope settings page in your browser...');
-	console.log("Create an API key if you don't have one, then copy it.\n");
-
-	await openBrowser(VIBESCOPE_SETTINGS_URL);
-
-	const MAX_ATTEMPTS = 3;
-	let apiKey = '';
-	let attempts = 0;
-
-	while (attempts < MAX_ATTEMPTS) {
-		attempts++;
-		const attemptsRemaining = MAX_ATTEMPTS - attempts;
-
-		apiKey = await prompt('Paste your Vibescope API key: ');
-
-		if (!apiKey) {
-			if (attemptsRemaining > 0) {
-				console.log('\nAPI key is required. Please try again. (' + attemptsRemaining + ' attempt' + (attemptsRemaining === 1 ? '' : 's') + ' remaining)\n');
-				continue;
-			} else {
-				console.error('\nError: API key is required. Setup cancelled.');
-				process.exit(1);
-			}
-		}
-
-		// Validate API key
-		console.log('\nValidating API key...');
-		const validation = await validateApiKey(apiKey);
-		console.log(validation.message);
-
-		if (validation.valid) {
-			break; // Success - exit the retry loop
-		}
-
-		// Invalid key
-		if (attemptsRemaining > 0) {
-			console.log('\nPlease check your API key and try again. (' + attemptsRemaining + ' attempt' + (attemptsRemaining === 1 ? '' : 's') + ' remaining)\n');
-		} else {
-			console.error('\nMaximum attempts reached. Please verify your API key at:');
-			console.error('  ' + VIBESCOPE_SETTINGS_URL);
-			console.error('\nSetup cancelled.');
-			process.exit(1);
-		}
-	}
-
-	// Step 5: Write configuration
-	console.log('\n--- Step 2: Writing Configuration ---\n');
-
-	const mcpConfig = generateMcpConfig(apiKey, selectedIde);
-
-	// Merge with existing config if present
-	const existingConfig = readExistingConfig(selectedIde.configPath);
-	const existingMcpServers = typeof existingConfig.mcpServers === 'object' && existingConfig.mcpServers !== null
-		? existingConfig.mcpServers as Record<string, unknown>
-		: {};
-	const newMcpServers = mcpConfig.mcpServers as Record<string, unknown>;
-
-	const mergedConfig = {
-		...existingConfig,
-		mcpServers: {
-			...existingMcpServers,
-			...newMcpServers,
-		},
-	};
-
-	writeConfig(selectedIde.configPath, mergedConfig);
-
-	console.log('Configuration written to: ' + selectedIde.configPath);
-
-	// Step 6: IDE-specific next steps
-	console.log('\n=================================');
-	console.log('   Setup Complete!');
-	console.log('=================================\n');
-
-	switch (selectedIde.name) {
-		case 'claude-code':
-			console.log('Next steps:');
-			console.log('  1. Restart Claude Code (or run: claude mcp reload)');
-			console.log('  2. Verify connection: claude mcp list');
-			console.log('  3. Start using Vibescope in your conversation');
-			break;
-		case 'claude-desktop':
-			console.log('Next steps:');
-			console.log('  1. Restart Claude Desktop');
-			console.log('  2. Vibescope tools will be available in your conversations');
-			break;
-		case 'cursor':
-			console.log('Next steps:');
-			console.log('  1. Restart Cursor');
-			console.log('  2. Open the MCP settings to verify Vibescope is connected');
-			break;
-		case 'gemini':
-			console.log('Next steps:');
-			console.log('  1. Restart Gemini CLI');
-			console.log('  2. Verify connection: gemini mcp list');
-			console.log('  3. In your conversation, call the MCP tool: start_work_session(git_url: "...", agent_type: "gemini")');
-			console.log('');
-			console.log('IMPORTANT: Vibescope tools are MCP tool calls, NOT CLI commands.');
-			console.log('Do NOT run "vibescope-cli start_work_session" - that command does not exist.');
-			console.log('');
-			console.log('NOTE: If you manually edit the config later, do NOT use $VAR_NAME syntax');
-			console.log('for environment variables - Gemini CLI has a bug where this does not work.');
-			console.log('Always hardcode API keys directly or use ~/.gemini/.env instead.');
-			break;
-		default:
-			console.log('Next steps:');
-			console.log('  1. Restart your IDE/CLI');
-			console.log('  2. Verify Vibescope is connected');
-	}
-
-	console.log('\nHappy building!\n');
-}
+/**
+ * Vibescope Setup Wizard
+ * Guides users through setting up Vibescope MCP integration
+ *
+ * Usage: vibescope-cli setup
+ */
+
+import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
+import { createInterface } from 'node:readline';
+import { homedir, platform } from 'node:os';
+import { join, dirname } from 'node:path';
+import { exec } from 'node:child_process';
+
+const VIBESCOPE_SETTINGS_URL = 'https://vibescope.dev/dashboard/settings';
+const VIBESCOPE_API_URL = 'https://vibescope.dev';
+
+// ============================================================================
+// Types
+// ============================================================================
+
+export interface IdeConfig {
+	name: string;
+	displayName: string;
+	configPath: string;
+	detected: boolean;
+	configFormat: 'mcp-json' | 'settings-json';
+}
+
+// ============================================================================
+// Config Path Helpers
+// ============================================================================
+
+function getClaudeDesktopConfigPath(): string {
+	const plat = platform();
+	const home = homedir();
+
+	if (plat === 'darwin') {
+		return join(home, 'Library', 'Application Support', 'Claude', 'claude_desktop_config.json');
+	} else if (plat === 'win32') {
+		return join(home, 'AppData', 'Roaming', 'Claude', 'claude_desktop_config.json');
+	} else {
+		return join(home, '.config', 'Claude', 'claude_desktop_config.json');
+	}
+}
+
+function getCursorConfigPath(): string {
+	const plat = platform();
+	const home = homedir();
+
+	if (plat === 'darwin') {
+		return join(home, 'Library', 'Application Support', 'Cursor', 'User', 'globalStorage', 'saoudrizwan.claude-dev', 'settings', 'cline_mcp_settings.json');
+	} else if (plat === 'win32') {
+		return join(home, 'AppData', 'Roaming', 'Cursor', 'User', 'globalStorage', 'saoudrizwan.claude-dev', 'settings', 'cline_mcp_settings.json');
+	} else {
+		return join(home, '.config', 'Cursor', 'User', 'globalStorage', 'saoudrizwan.claude-dev', 'settings', 'cline_mcp_settings.json');
+	}
+}
+
+function getGeminiConfigPath(): string {
+	return join(homedir(), '.gemini', 'settings.json');
+}
+
+// ============================================================================
+// IDE Detection
+// ============================================================================
+
+export function detectIdes(): IdeConfig[] {
+	const ides: IdeConfig[] = [
+		{
+			name: 'claude-code',
+			displayName: 'Claude Code (CLI)',
+			configPath: '.mcp.json',
+			detected: true,
+			configFormat: 'mcp-json',
+		},
+		{
+			name: 'claude-desktop',
+			displayName: 'Claude Desktop',
+			configPath: getClaudeDesktopConfigPath(),
+			detected: existsSync(dirname(getClaudeDesktopConfigPath())),
+			configFormat: 'mcp-json',
+		},
+		{
+			name: 'cursor',
+			displayName: 'Cursor',
+			configPath: getCursorConfigPath(),
+			detected: existsSync(dirname(getCursorConfigPath())),
+			configFormat: 'mcp-json',
+		},
+		{
+			name: 'gemini',
+			displayName: 'Gemini CLI',
+			configPath: getGeminiConfigPath(),
+			detected: true,
+			configFormat: 'settings-json',
+		},
+	];
+
+	return ides;
+}
+
+// ============================================================================
+// User Prompts
+// ============================================================================
+
+async function prompt(question: string): Promise<string> {
+	const rl = createInterface({
+		input: process.stdin,
+		output: process.stdout,
+	});
+
+	return new Promise((resolve) => {
+		rl.question(question, (answer) => {
+			rl.close();
+			resolve(answer.trim());
+		});
+	});
+}
+
+async function promptSelect(question: string, options: { label: string; value: string }[]): Promise<string> {
+	console.log('\n' + question + '\n');
+	options.forEach((opt, i) => {
+		console.log('  ' + (i + 1) + ') ' + opt.label);
+	});
+
+	const answer = await prompt('\nEnter number: ');
+	const index = parseInt(answer, 10) - 1;
+
+	if (index >= 0 && index < options.length) {
+		return options[index].value;
+	}
+
+	console.log('Invalid selection, using first option.');
+	return options[0].value;
+}
+
+// ============================================================================
+// Browser & Validation
+// ============================================================================
+
+function openBrowser(url: string): Promise<void> {
+	return new Promise((resolve) => {
+		const plat = platform();
+		let cmd: string;
+
+		if (plat === 'darwin') {
+			cmd = 'open "' + url + '"';
+		} else if (plat === 'win32') {
+			cmd = 'start "" "' + url + '"';
+		} else {
+			cmd = 'xdg-open "' + url + '"';
+		}
+
+		exec(cmd, (error) => {
+			if (error) {
+				console.log('\nCould not open browser automatically.');
+				console.log('Please visit: ' + url + '\n');
+			}
+			resolve();
+		});
+	});
+}
+
+export async function validateApiKey(apiKey: string): Promise<{ valid: boolean; message: string }> {
+	try {
+		const response = await fetch(VIBESCOPE_API_URL + '/api/mcp/auth/validate', {
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/json',
+				'X-API-Key': apiKey,
+			},
+			body: JSON.stringify({ api_key: apiKey }),
+		});
+
+		const data = await response.json();
+
+		if (response.ok && data.valid) {
+			return { valid: true, message: 'API key validated successfully!' };
+		}
+
+		// Extract actual error message from server response
+		const errorMessage = data.error || 'API key appears to be invalid.';
+		return { valid: false, message: errorMessage };
+	} catch {
+		return { valid: true, message: 'Could not validate API key (network issue), but proceeding.' };
+	}
+}
+
+// ============================================================================
+// Config Management
+// ============================================================================
+
+export function readExistingConfig(configPath: string): Record<string, unknown> {
+	if (existsSync(configPath)) {
+		try {
+			return JSON.parse(readFileSync(configPath, 'utf-8'));
+		} catch {
+			return {};
+		}
+	}
+	return {};
+}
+
+export function writeConfig(configPath: string, config: Record<string, unknown>): void {
+	const dir = dirname(configPath);
+	if (!existsSync(dir)) {
+		mkdirSync(dir, { recursive: true });
+	}
+	writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n');
+}
+
+export function generateMcpConfig(apiKey: string, ide: IdeConfig): Record<string, unknown> {
+	// Prefer globally installed binary (instant start) with npx fallback
+	const isWindows = platform() === 'win32';
+	const vibescopeServer = isWindows
+		? {
+			command: 'cmd',
+			args: ['/c', 'where vibescope-mcp >nul 2>&1 && vibescope-mcp || npx -y -p @vibescope/mcp-server@latest vibescope-mcp'],
+			env: { VIBESCOPE_API_KEY: apiKey },
+		}
+		: {
+			command: 'bash',
+			args: ['-c', 'command -v vibescope-mcp >/dev/null 2>&1 && exec vibescope-mcp || exec npx -y -p @vibescope/mcp-server@latest vibescope-mcp'],
+			env: { VIBESCOPE_API_KEY: apiKey },
+		};
+
+	// Gemini CLI uses a different config format with additional options
+	if (ide.configFormat === 'settings-json') {
+		return {
+			mcpServers: {
+				vibescope: {
+					...vibescopeServer,
+					timeout: 30000,
+					trust: true,
+				},
+			},
+		};
+	}
+
+	// Standard MCP config for Claude Code, Claude Desktop, Cursor
+	return {
+		mcpServers: {
+			vibescope: vibescopeServer,
+		},
+	};
+}
+
+// ============================================================================
+// Main Setup Flow
+// ============================================================================
+
+export async function runSetup(): Promise<void> {
+	console.log('\n=================================');
+	console.log('   Vibescope Setup Wizard');
+	console.log('=================================\n');
+
+	// Step 1: Detect IDEs
+	const ides = detectIdes();
+	const detectedIdes = ides.filter(ide => ide.detected);
+
+	console.log('Available development environments:');
+	detectedIdes.forEach(ide => {
+		console.log('  - ' + ide.displayName);
+	});
+
+	// Step 2: Select IDE to configure
+	let selectedIde: IdeConfig;
+	if (detectedIdes.length === 1) {
+		selectedIde = detectedIdes[0];
+		console.log('\nConfiguring for ' + selectedIde.displayName + '...');
+	} else {
+		const ideChoice = await promptSelect(
+			'Which environment do you want to configure?',
+			detectedIdes.map(ide => ({ label: ide.displayName, value: ide.name }))
+		);
+		selectedIde = ides.find(ide => ide.name === ideChoice) || detectedIdes[0];
+	}
+
+	// Step 3: Check if config already exists
+	if (existsSync(selectedIde.configPath)) {
+		const existingConfig = readExistingConfig(selectedIde.configPath);
+		const hasMcpServers = 'mcpServers' in existingConfig;
+		const hasVibescope = hasMcpServers &&
+			typeof existingConfig.mcpServers === 'object' &&
+			existingConfig.mcpServers !== null &&
+			'vibescope' in (existingConfig.mcpServers as Record<string, unknown>);
+
+		if (hasVibescope) {
+			const overwrite = await prompt('\nVibescope is already configured. Reconfigure? (y/N): ');
+			if (overwrite.toLowerCase() !== 'y') {
+				console.log('\nSetup cancelled. Your existing configuration is preserved.');
+				return;
+			}
+		}
+	}
+
+	// Step 4: Get API key (with retry logic)
+	console.log('\n--- Step 1: Get your API key ---\n');
+	console.log('Opening Vibescope settings page in your browser...');
+	console.log("Create an API key if you don't have one, then copy it.\n");
+
+	await openBrowser(VIBESCOPE_SETTINGS_URL);
+
+	const MAX_ATTEMPTS = 3;
+	let apiKey = '';
+	let attempts = 0;
+
+	while (attempts < MAX_ATTEMPTS) {
+		attempts++;
+		const attemptsRemaining = MAX_ATTEMPTS - attempts;
+
+		apiKey = await prompt('Paste your Vibescope API key: ');
+
+		if (!apiKey) {
+			if (attemptsRemaining > 0) {
+				console.log('\nAPI key is required. Please try again. (' + attemptsRemaining + ' attempt' + (attemptsRemaining === 1 ? '' : 's') + ' remaining)\n');
+				continue;
+			} else {
+				console.error('\nError: API key is required. Setup cancelled.');
+				process.exit(1);
+			}
+		}
+
+		// Validate API key
+		console.log('\nValidating API key...');
+		const validation = await validateApiKey(apiKey);
+		console.log(validation.message);
+
+		if (validation.valid) {
+			break; // Success - exit the retry loop
+		}
+
+		// Invalid key
+		if (attemptsRemaining > 0) {
+			console.log('\nPlease check your API key and try again. (' + attemptsRemaining + ' attempt' + (attemptsRemaining === 1 ? '' : 's') + ' remaining)\n');
+		} else {
+			console.error('\nMaximum attempts reached. Please verify your API key at:');
+			console.error('  ' + VIBESCOPE_SETTINGS_URL);
+			console.error('\nSetup cancelled.');
+			process.exit(1);
+		}
+	}
+
+	// Step 5: Write configuration
+	console.log('\n--- Step 2: Writing Configuration ---\n');
+
+	const mcpConfig = generateMcpConfig(apiKey, selectedIde);
+
+	// Merge with existing config if present
+	const existingConfig = readExistingConfig(selectedIde.configPath);
+	const existingMcpServers = typeof existingConfig.mcpServers === 'object' && existingConfig.mcpServers !== null
+		? existingConfig.mcpServers as Record<string, unknown>
+		: {};
+	const newMcpServers = mcpConfig.mcpServers as Record<string, unknown>;
+
+	const mergedConfig = {
+		...existingConfig,
+		mcpServers: {
+			...existingMcpServers,
+			...newMcpServers,
+		},
+	};
+
+	writeConfig(selectedIde.configPath, mergedConfig);
+
+	console.log('Configuration written to: ' + selectedIde.configPath);
+
+	// Step 6: IDE-specific next steps
+	console.log('\n=================================');
+	console.log('   Setup Complete!');
+	console.log('=================================\n');
+
+	switch (selectedIde.name) {
+		case 'claude-code':
+			console.log('Next steps:');
+			console.log('  1. Restart Claude Code (or run: claude mcp reload)');
+			console.log('  2. Verify connection: claude mcp list');
+			console.log('  3. Start using Vibescope in your conversation');
+			break;
+		case 'claude-desktop':
+			console.log('Next steps:');
+			console.log('  1. Restart Claude Desktop');
+			console.log('  2. Vibescope tools will be available in your conversations');
+			break;
+		case 'cursor':
+			console.log('Next steps:');
+			console.log('  1. Restart Cursor');
+			console.log('  2. Open the MCP settings to verify Vibescope is connected');
+			break;
+		case 'gemini':
+			console.log('Next steps:');
+			console.log('  1. Restart Gemini CLI');
+			console.log('  2. Verify connection: gemini mcp list');
+			console.log('  3. In your conversation, call the MCP tool: start_work_session(git_url: "...", agent_type: "gemini")');
+			console.log('');
+			console.log('IMPORTANT: Vibescope tools are MCP tool calls, NOT CLI commands.');
+			console.log('Do NOT run "vibescope-cli start_work_session" - that command does not exist.');
+			console.log('');
+			console.log('NOTE: If you manually edit the config later, do NOT use $VAR_NAME syntax');
+			console.log('for environment variables - Gemini CLI has a bug where this does not work.');
+			console.log('Always hardcode API keys directly or use ~/.gemini/.env instead.');
+			break;
+		default:
+			console.log('Next steps:');
+			console.log('  1. Restart your IDE/CLI');
+			console.log('  2. Verify Vibescope is connected');
+	}
+
+	console.log('\nHappy building!\n');
+}