@polymorphism-tech/morph-spec 7.9.0 → 7.9.1

package/src/commands/mcp/mcp-setup.js

@@ -1,519 +1,519 @@
-/**
- * MCP Setup Command
- *
- * Install and configure MCP servers for morph-spec projects.
- *
- * Usage:
- *   morph-spec mcp setup              — Interactive wizard showing all MCPs
- *   morph-spec mcp setup <name>       — Setup a specific MCP
- *   morph-spec mcp setup --list       — Show MCP install status
- *   morph-spec mcp setup --auto       — Non-interactive auto-install credential-free MCPs
- */
-
-import chalk from 'chalk';
-import inquirer from 'inquirer';
-import ora from 'ora';
-import { readFileSync, existsSync } from 'fs';
-import { join } from 'path';
-import {
-  orchestrateMcpSetup,
-  installAutoMcps,
-  installCompanionSkills,
-  installMcpWithCredentials,
-  generateSetupInstructions,
-  formatMcpStatusTable,
-  loadMcpRegistry,
-  isRemoteMcp,
-  generateStitchProxy,
-  patchConfigForPlatform,
-  setupStitch
-} from '../../lib/installers/mcp-installer.js';
-import { detectClaudeConfig } from '../../lib/detectors/claude-config-detector.js';
-import { detectProject } from '../../lib/detectors/index.js';
-
-/**
- * Detect the current project's stack.
- * Prefers .morph/config/config.json (set during morph-spec init) over filesystem re-detection.
- */
-async function detectStack(targetPath) {
-  // 1. Prefer the authoritative config (handles compound stacks like nextjs+dotnet)
-  try {
-    const configPath = join(targetPath, '.morph', 'config', 'config.json');
-    if (existsSync(configPath)) {
-      const config = JSON.parse(readFileSync(configPath, 'utf-8'));
-      const configStack = config.project?.stack;
-      if (configStack && configStack !== 'unknown') {
-        return configStack;
-      }
-    }
-  } catch {
-    // Fall through to filesystem detection
-  }
-
-  // 2. Fallback: detect from filesystem
-  try {
-    const results = await detectProject(targetPath, { conversation: false, generateStandards: false });
-    return results.structure?.stack || 'unknown';
-  } catch {
-    return 'unknown';
-  }
-}
-
-export async function mcpSetupCommand(name, options) {
-  const targetPath = process.cwd();
-
-  try {
-    // Detect current environment
-    const stack = await detectStack(targetPath);
-    const claudeConfig = await detectClaudeConfig(targetPath);
-    const existingMcps = claudeConfig.mcpServers || [];
-
-    if (options.list) {
-      return showStatusList(targetPath, stack, existingMcps);
-    }
-
-    if (options.auto) {
-      return autoInstall(targetPath, stack, existingMcps);
-    }
-
-    if (name) {
-      return setupSpecificMcp(targetPath, name, stack, existingMcps);
-    }
-
-    // Interactive wizard
-    return interactiveWizard(targetPath, stack, existingMcps);
-  } catch (err) {
-    console.error(chalk.red(`Error: ${err.message}`));
-    process.exit(1);
-  }
-}
-
-/**
- * Show MCP status list (--list)
- */
-async function showStatusList(targetPath, stack, existingMcps) {
-  const orchestration = orchestrateMcpSetup(targetPath, stack, existingMcps);
-  const statusRows = formatMcpStatusTable(orchestration, {});
-
-  console.log(chalk.cyan('\n  MCP Server Status\n'));
-  console.log(`  Stack: ${chalk.bold(stack)}`);
-  console.log('  ' + '─'.repeat(60));
-
-  const STATUS_ICONS = {
-    installed: chalk.green('✓'),
-    available: chalk.cyan('○'),
-    already_configured: chalk.green('✓'),
-    needs_setup: chalk.yellow('⚠'),
-    prereq_missing: chalk.red('✗'),
-    not_relevant: chalk.gray('─')
-  };
-
-  if (statusRows.length === 0) {
-    console.log(chalk.gray('\n  No MCPs in registry.\n'));
-    return;
-  }
-
-  for (const row of statusRows) {
-    const icon = STATUS_ICONS[row.status] || '?';
-    const statusLabel = row.status.replace(/_/g, ' ');
-    console.log(`  ${icon} ${row.name.padEnd(15)} ${statusLabel.padEnd(20)} ${chalk.gray(row.detail)}`);
-  }
-
-  console.log('');
-}
-
-/**
- * Auto-install credential-free MCPs (--auto)
- */
-async function autoInstall(targetPath, stack, existingMcps) {
-  const orchestration = orchestrateMcpSetup(targetPath, stack, existingMcps, { autoOnly: true });
-  const autoNames = Object.keys(orchestration.autoInstallable);
-
-  if (autoNames.length === 0) {
-    console.log(chalk.green('\n  ✓ All auto-installable MCPs are already configured.\n'));
-    return;
-  }
-
-  const spinner = ora(`Installing ${autoNames.join(', ')}...`).start();
-  const result = await installAutoMcps(targetPath, orchestration.autoInstallable);
-  spinner.succeed(`Installed ${result.added.length} MCP server(s): ${result.added.join(', ')}`);
-
-  if (result.skipped.length > 0) {
-    console.log(chalk.gray(`  Skipped (already configured): ${result.skipped.join(', ')}`));
-  }
-
-  // Install companion skills for MCPs that define them
-  const skillResults = installCompanionSkills(orchestration.autoInstallable);
-  for (const r of skillResults) {
-    if (r.success) {
-      console.log(chalk.green(`  ✓ Companion skills installed: ${r.repo}`));
-    } else {
-      console.log(chalk.yellow(`  ⚠ Failed to install companion skills: ${r.repo}`));
-    }
-  }
-
-  console.log('');
-}
-
-/**
- * Setup a specific MCP by name
- */
-async function setupSpecificMcp(targetPath, name, stack, existingMcps) {
-  const registry = loadMcpRegistry();
-  const mcpEntry = registry.mcps[name];
-
-  if (!mcpEntry) {
-    console.log(chalk.red(`\n  Unknown MCP: ${name}`));
-    console.log(chalk.gray(`  Available: ${Object.keys(registry.mcps).join(', ')}`));
-    console.log('');
-    return;
-  }
-
-  if (!mcpEntry.install) {
-    console.log(chalk.red(`\n  MCP "${name}" has no install configuration.\n`));
-    return;
-  }
-
-  // Check if already installed
-  const isInstalled = existingMcps.some(s => s.name.toLowerCase().includes(name));
-  if (isInstalled) {
-    const { reconfigure } = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'reconfigure',
-      message: `${name} is already configured. Reconfigure?`,
-      default: false
-    }]);
-    if (!reconfigure) return;
-  }
-
-  // Check prerequisites
-  const prereqs = mcpEntry.install.prerequisites || [];
-  for (const prereq of prereqs) {
-    try {
-      const { execSync } = await import('child_process');
-      execSync(prereq.checkCommand, { stdio: 'ignore', timeout: 5000 });
-    } catch {
-      console.log(chalk.red(`\n  Missing prerequisite: ${prereq.name}`));
-      console.log(chalk.gray(`  Install: ${prereq.installUrl}`));
-      console.log('');
-      return;
-    }
-  }
-
-  // Show warnings
-  for (const warning of mcpEntry.install.warnings || []) {
-    console.log(chalk.yellow(`\n  ⚠ ${warning}`));
-  }
-
-  const credentials = mcpEntry.install.credentials || [];
-
-  // Stitch MCP — automated setup via setupStitch()
-  if (name === 'stitch' && !mcpEntry.install.autoInstall) {
-    console.log(chalk.cyan(`\n  Setting up Stitch MCP (automated)\n`));
-    console.log(chalk.gray(`  Usage: ${mcpEntry.usage}`));
-    console.log('');
-
-    // Allow user to provide GCP project if auto-detection might fail
-    let gcpProject;
-    const gcpCred = credentials.find(c => c.envVar === 'STITCH_GCP_PROJECT');
-    const { gcpProjectInput } = await inquirer.prompt([{
-      type: 'input',
-      name: 'gcpProjectInput',
-      message: gcpCred ? `${gcpCred.name} (leave blank for auto-detect):` : 'GCP Project ID (blank for auto-detect):',
-    }]);
-    if (gcpProjectInput?.trim()) gcpProject = gcpProjectInput.trim();
-
-    const spinner = ora('Setting up Stitch MCP...').start();
-    const result = await setupStitch(targetPath, { gcpProject });
-
-    // Report step-by-step results
-    for (const step of result.steps) {
-      if (step.success) {
-        switch (step.step) {
-          case 'find-gcloud': spinner.text = `gcloud found (${step.source})`; break;
-          case 'verify-adc': spinner.text = 'ADC credentials verified'; break;
-          case 'detect-project': spinner.text = `GCP project: ${step.gcpProject}`; break;
-          case 'enable-api': spinner.text = 'Stitch API enabled'; break;
-          case 'generate-proxy': spinner.text = `Proxy generated: ${step.proxyPath}`; break;
-          case 'install-mcp': spinner.text = 'MCP config installed in .mcp.json'; break;
-          case 'health-check': spinner.text = `Health-check passed (protocol ${step.protocolVersion})`; break;
-        }
-      }
-    }
-
-    if (result.success) {
-      spinner.succeed('Stitch MCP setup complete');
-      for (const step of result.steps) {
-        if (step.step === 'health-check' && step.success) {
-          console.log(chalk.green(`  ✓ Health-check passed (protocol ${step.protocolVersion})`));
-        }
-      }
-    } else {
-      const failedStep = result.steps.find(s => !s.success && s.step !== 'enable-api' && s.step !== 'health-check');
-      spinner.fail(`Stitch setup failed at: ${failedStep?.step || 'unknown'}`);
-      if (failedStep?.error) {
-        console.log(chalk.red(`  ${failedStep.error}`));
-      }
-      // Show health-check warning if it failed but setup otherwise succeeded
-      const healthStep = result.steps.find(s => s.step === 'health-check');
-      if (healthStep && !healthStep.success) {
-        console.log(chalk.yellow(`  ⚠ Health-check: ${healthStep.error}`));
-      }
-    }
-
-    if (mcpEntry.companionSkills?.installCommand) {
-      const { installSkills } = await inquirer.prompt([{
-        type: 'confirm',
-        name: 'installSkills',
-        message: 'Install Stitch companion skills (design, loop, etc.)?',
-        default: true
-      }]);
-      if (installSkills) {
-        const skillResults = installCompanionSkills({ stitch: mcpEntry });
-        for (const r of skillResults) {
-          if (r.success) {
-            console.log(chalk.green(`  ✓ Companion skills installed: ${r.repo}`));
-          } else {
-            console.log(chalk.yellow(`  ⚠ Failed to install companion skills: ${r.repo}`));
-          }
-        }
-      }
-    }
-
-    console.log('');
-    return;
-  }
-
-  // Auto-installable — just install
-  if (mcpEntry.install.autoInstall) {
-    const spinner = ora(`Installing ${name}...`).start();
-    const result = await installAutoMcps(targetPath, { [name]: mcpEntry });
-    if (result.added.length > 0) {
-      spinner.succeed(`${name} MCP installed`);
-    } else {
-      spinner.info(`${name} MCP already configured`);
-    }
-    console.log('');
-    return;
-  }
-
-  // Remote HTTP MCP — show setup command and optionally auto-configure
-  if (isRemoteMcp(mcpEntry.install.config)) {
-    console.log(chalk.cyan(`\n  Setting up ${name} MCP (remote)\n`));
-    console.log(chalk.gray(`  Usage: ${mcpEntry.usage}`));
-    console.log('');
-
-    const instructions = generateSetupInstructions(name, mcpEntry);
-    console.log(chalk.white(`  Run this command to add the MCP:`));
-    console.log(chalk.cyan(`  ${instructions.cliCommand}`));
-    console.log('');
-
-    for (const warning of mcpEntry.install.warnings || []) {
-      console.log(chalk.yellow(`  ⚠ ${warning}`));
-    }
-
-    const { installNow } = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'installNow',
-      message: 'Add to .mcp.json now?',
-      default: true
-    }]);
-
-    if (installNow) {
-      console.log(chalk.cyan(`  Launching ${name} OAuth authentication...`));
-      try {
-        const { execSync } = await import('child_process');
-        execSync(`claude mcp add --transport http ${name} ${mcpEntry.install.config.url}`, {
-          stdio: 'inherit',
-          timeout: 120000
-        });
-        console.log(chalk.green(`  ✓ ${name} MCP configured via OAuth`));
-      } catch {
-        const instructions = generateSetupInstructions(name, mcpEntry);
-        console.log(chalk.yellow(`  Setup cancelled. Run later: ${instructions.cliCommand}`));
-      }
-    }
-
-    console.log('');
-    return;
-  }
-
-  // Needs credentials (stdio MCPs)
-  console.log(chalk.cyan(`\n  Setting up ${name} MCP\n`));
-  console.log(chalk.gray(`  Usage: ${mcpEntry.usage}`));
-  console.log('');
-
-  const { enterCredentials } = await inquirer.prompt([{
-    type: 'confirm',
-    name: 'enterCredentials',
-    message: 'Enter credentials now?',
-    default: true
-  }]);
-
-  if (enterCredentials) {
-    const credentialValues = {};
-    for (const cred of credentials) {
-      const { value } = await inquirer.prompt([{
-        type: cred.secret ? 'password' : 'input',
-        name: 'value',
-        message: `${cred.name}:`,
-        mask: cred.secret ? '*' : undefined
-      }]);
-      credentialValues[cred.envVar] = value;
-    }
-
-    const spinner = ora(`Configuring ${name}...`).start();
-    await installMcpWithCredentials(targetPath, name, mcpEntry, credentialValues);
-    spinner.succeed(`${name} MCP configured`);
-  } else {
-    // Show config snippet
-    const instructions = generateSetupInstructions(name, mcpEntry);
-    console.log(chalk.gray('\n  Add to .mcp.json → mcpServers:'));
-    console.log(chalk.gray('  ' + '─'.repeat(55)));
-    for (const line of instructions.configSnippet.split('\n')) {
-      console.log(chalk.gray(`  ${line}`));
-    }
-    console.log(chalk.gray('  ' + '─'.repeat(55)));
-
-    for (const cred of instructions.credentialUrls) {
-      console.log(chalk.gray(`  Get ${cred.name}: ${cred.helpUrl}`));
-    }
-  }
-
-  console.log('');
-}
-
-/**
- * Interactive wizard showing all MCPs
- */
-async function interactiveWizard(targetPath, stack, existingMcps) {
-  const orchestration = orchestrateMcpSetup(targetPath, stack, existingMcps);
-
-  console.log(chalk.cyan('\n  MCP Setup Wizard'));
-  console.log(chalk.gray(`  Stack: ${stack}`));
-  console.log('');
-
-  const autoNames = Object.keys(orchestration.autoInstallable);
-  const manualNames = Object.keys(orchestration.needsManualSetup);
-  const alreadyNames = Object.keys(orchestration.alreadyInstalled);
-
-  if (alreadyNames.length > 0) {
-    console.log(chalk.green(`  Already configured: ${alreadyNames.join(', ')}`));
-  }
-
-  // Auto-install
-  if (autoNames.length > 0) {
-    const { installAuto } = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'installAuto',
-      message: `Install credential-free MCPs? (${autoNames.join(', ')})`,
-      default: true
-    }]);
-
-    if (installAuto) {
-      const spinner = ora('Installing...').start();
-      const result = await installAutoMcps(targetPath, orchestration.autoInstallable);
-      spinner.succeed(`Installed: ${result.added.join(', ')}`);
-
-      // Install companion skills for MCPs that define them
-      const skillResults = installCompanionSkills(orchestration.autoInstallable);
-      for (const r of skillResults) {
-        if (r.success) {
-          console.log(chalk.green(`  ✓ Companion skills: ${r.repo}`));
-        } else {
-          console.log(chalk.yellow(`  ⚠ Companion skills failed: ${r.repo}`));
-        }
-      }
-    }
-  }
-
-  // Credential MCPs
-  if (manualNames.length > 0) {
-    console.log(chalk.cyan('\n  Credential-requiring MCPs:'));
-
-    for (const name of manualNames) {
-      const entry = orchestration.needsManualSetup[name];
-
-      for (const warning of entry.install.warnings || []) {
-        console.log(chalk.yellow(`  ⚠ ${warning}`));
-      }
-
-      const capitalizedName = name.charAt(0).toUpperCase() + name.slice(1);
-      const { setupNow } = await inquirer.prompt([{
-        type: 'confirm',
-        name: 'setupNow',
-        message: `Set up ${capitalizedName}? (${entry.usage})`,
-        default: false
-      }]);
-
-      if (setupNow) {
-        // Stitch — automated setup via setupStitch()
-        if (name === 'stitch' && !entry.install.autoInstall) {
-          const gcpCred = entry.install.credentials?.find(c => c.envVar === 'STITCH_GCP_PROJECT');
-          const { gcpProject } = await inquirer.prompt([{
-            type: 'input',
-            name: 'gcpProject',
-            message: gcpCred ? `${gcpCred.name} (blank for auto-detect):` : 'GCP Project ID (blank for auto-detect):',
-          }]);
-
-          const stitchSpinner = ora('Setting up Stitch MCP...').start();
-          const stitchResult = await setupStitch(targetPath, { gcpProject: gcpProject?.trim() || undefined });
-          if (stitchResult.success) {
-            stitchSpinner.succeed('Stitch MCP setup complete');
-          } else {
-            const failedStep = stitchResult.steps.find(s => !s.success && s.step !== 'enable-api' && s.step !== 'health-check');
-            stitchSpinner.fail(`Stitch setup failed: ${failedStep?.error || 'unknown'}`);
-          }
-          if (entry.companionSkills?.installCommand) {
-            const skillResults = installCompanionSkills({ stitch: entry });
-            for (const r of skillResults) {
-              if (r.success) console.log(chalk.green(`  ✓ Companion skills: ${r.repo}`));
-            }
-          }
-          continue;
-        }
-
-        // Remote MCPs — launch OAuth via claude mcp add
-        if (isRemoteMcp(entry.install.config)) {
-          console.log(chalk.cyan(`  Launching ${capitalizedName} OAuth...`));
-          try {
-            const { execSync } = await import('child_process');
-            execSync(`claude mcp add --transport http ${name} ${entry.install.config.url}`, {
-              stdio: 'inherit',
-              timeout: 120000
-            });
-            console.log(chalk.green(`  ✓ ${capitalizedName} configured via OAuth`));
-          } catch {
-            const instructions = generateSetupInstructions(name, entry);
-            console.log(chalk.yellow(`  Setup cancelled. Run later: ${instructions.cliCommand}`));
-          }
-          continue;
-        }
-
-        const credentialValues = {};
-        for (const cred of entry.install.credentials) {
-          const { value } = await inquirer.prompt([{
-            type: cred.secret ? 'password' : 'input',
-            name: 'value',
-            message: `${cred.name}:`,
-            mask: cred.secret ? '*' : undefined
-          }]);
-          credentialValues[cred.envVar] = value;
-        }
-
-        const spinner = ora(`Configuring ${name}...`).start();
-        await installMcpWithCredentials(targetPath, name, entry, credentialValues);
-        spinner.succeed(`${capitalizedName} configured`);
-      } else {
-        const instructions = generateSetupInstructions(name, entry);
-        console.log(chalk.gray(`  Run later: ${instructions.cliCommand}`));
-      }
-    }
-  }
-
-  if (autoNames.length === 0 && manualNames.length === 0) {
-    console.log(chalk.green('  ✓ All relevant MCPs are already configured.\n'));
-  } else {
-    console.log('');
-  }
-}
+/**
+ * MCP Setup Command
+ *
+ * Install and configure MCP servers for morph-spec projects.
+ *
+ * Usage:
+ *   morph-spec mcp setup              — Interactive wizard showing all MCPs
+ *   morph-spec mcp setup <name>       — Setup a specific MCP
+ *   morph-spec mcp setup --list       — Show MCP install status
+ *   morph-spec mcp setup --auto       — Non-interactive auto-install credential-free MCPs
+ */
+
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import ora from 'ora';
+import { readFileSync, existsSync } from 'fs';
+import { join } from 'path';
+import {
+  orchestrateMcpSetup,
+  installAutoMcps,
+  installCompanionSkills,
+  installMcpWithCredentials,
+  generateSetupInstructions,
+  formatMcpStatusTable,
+  loadMcpRegistry,
+  isRemoteMcp,
+  generateStitchProxy,
+  patchConfigForPlatform,
+  setupStitch
+} from '../../lib/installers/mcp-installer.js';
+import { detectClaudeConfig } from '../../lib/detectors/claude-config-detector.js';
+import { detectProject } from '../../lib/detectors/index.js';
+
+/**
+ * Detect the current project's stack.
+ * Prefers .morph/config/config.json (set during morph-spec init) over filesystem re-detection.
+ */
+async function detectStack(targetPath) {
+  // 1. Prefer the authoritative config (handles compound stacks like nextjs+dotnet)
+  try {
+    const configPath = join(targetPath, '.morph', 'config', 'config.json');
+    if (existsSync(configPath)) {
+      const config = JSON.parse(readFileSync(configPath, 'utf-8'));
+      const configStack = config.project?.stack;
+      if (configStack && configStack !== 'unknown') {
+        return configStack;
+      }
+    }
+  } catch {
+    // Fall through to filesystem detection
+  }
+
+  // 2. Fallback: detect from filesystem
+  try {
+    const results = await detectProject(targetPath, { conversation: false, generateStandards: false });
+    return results.structure?.stack || 'unknown';
+  } catch {
+    return 'unknown';
+  }
+}
+
+export async function mcpSetupCommand(name, options) {
+  const targetPath = process.cwd();
+
+  try {
+    // Detect current environment
+    const stack = await detectStack(targetPath);
+    const claudeConfig = await detectClaudeConfig(targetPath);
+    const existingMcps = claudeConfig.mcpServers || [];
+
+    if (options.list) {
+      return showStatusList(targetPath, stack, existingMcps);
+    }
+
+    if (options.auto) {
+      return autoInstall(targetPath, stack, existingMcps);
+    }
+
+    if (name) {
+      return setupSpecificMcp(targetPath, name, stack, existingMcps);
+    }
+
+    // Interactive wizard
+    return interactiveWizard(targetPath, stack, existingMcps);
+  } catch (err) {
+    console.error(chalk.red(`Error: ${err.message}`));
+    process.exit(1);
+  }
+}
+
+/**
+ * Show MCP status list (--list)
+ */
+async function showStatusList(targetPath, stack, existingMcps) {
+  const orchestration = orchestrateMcpSetup(targetPath, stack, existingMcps);
+  const statusRows = formatMcpStatusTable(orchestration, {});
+
+  console.log(chalk.cyan('\n  MCP Server Status\n'));
+  console.log(`  Stack: ${chalk.bold(stack)}`);
+  console.log('  ' + '─'.repeat(60));
+
+  const STATUS_ICONS = {
+    installed: chalk.green('✓'),
+    available: chalk.cyan('○'),
+    already_configured: chalk.green('✓'),
+    needs_setup: chalk.yellow('⚠'),
+    prereq_missing: chalk.red('✗'),
+    not_relevant: chalk.gray('─')
+  };
+
+  if (statusRows.length === 0) {
+    console.log(chalk.gray('\n  No MCPs in registry.\n'));
+    return;
+  }
+
+  for (const row of statusRows) {
+    const icon = STATUS_ICONS[row.status] || '?';
+    const statusLabel = row.status.replace(/_/g, ' ');
+    console.log(`  ${icon} ${row.name.padEnd(15)} ${statusLabel.padEnd(20)} ${chalk.gray(row.detail)}`);
+  }
+
+  console.log('');
+}
+
+/**
+ * Auto-install credential-free MCPs (--auto)
+ */
+async function autoInstall(targetPath, stack, existingMcps) {
+  const orchestration = orchestrateMcpSetup(targetPath, stack, existingMcps, { autoOnly: true });
+  const autoNames = Object.keys(orchestration.autoInstallable);
+
+  if (autoNames.length === 0) {
+    console.log(chalk.green('\n  ✓ All auto-installable MCPs are already configured.\n'));
+    return;
+  }
+
+  const spinner = ora(`Installing ${autoNames.join(', ')}...`).start();
+  const result = await installAutoMcps(targetPath, orchestration.autoInstallable);
+  spinner.succeed(`Installed ${result.added.length} MCP server(s): ${result.added.join(', ')}`);
+
+  if (result.skipped.length > 0) {
+    console.log(chalk.gray(`  Skipped (already configured): ${result.skipped.join(', ')}`));
+  }
+
+  // Install companion skills for MCPs that define them
+  const skillResults = installCompanionSkills(orchestration.autoInstallable);
+  for (const r of skillResults) {
+    if (r.success) {
+      console.log(chalk.green(`  ✓ Companion skills installed: ${r.repo}`));
+    } else {
+      console.log(chalk.yellow(`  ⚠ Failed to install companion skills: ${r.repo}`));
+    }
+  }
+
+  console.log('');
+}
+
+/**
+ * Setup a specific MCP by name
+ */
+async function setupSpecificMcp(targetPath, name, stack, existingMcps) {
+  const registry = loadMcpRegistry();
+  const mcpEntry = registry.mcps[name];
+
+  if (!mcpEntry) {
+    console.log(chalk.red(`\n  Unknown MCP: ${name}`));
+    console.log(chalk.gray(`  Available: ${Object.keys(registry.mcps).join(', ')}`));
+    console.log('');
+    return;
+  }
+
+  if (!mcpEntry.install) {
+    console.log(chalk.red(`\n  MCP "${name}" has no install configuration.\n`));
+    return;
+  }
+
+  // Check if already installed
+  const isInstalled = existingMcps.some(s => s.name.toLowerCase().includes(name));
+  if (isInstalled) {
+    const { reconfigure } = await inquirer.prompt([{
+      type: 'confirm',
+      name: 'reconfigure',
+      message: `${name} is already configured. Reconfigure?`,
+      default: false
+    }]);
+    if (!reconfigure) return;
+  }
+
+  // Check prerequisites
+  const prereqs = mcpEntry.install.prerequisites || [];
+  for (const prereq of prereqs) {
+    try {
+      const { execSync } = await import('child_process');
+      execSync(prereq.checkCommand, { stdio: 'ignore', timeout: 5000 });
+    } catch {
+      console.log(chalk.red(`\n  Missing prerequisite: ${prereq.name}`));
+      console.log(chalk.gray(`  Install: ${prereq.installUrl}`));
+      console.log('');
+      return;
+    }
+  }
+
+  // Show warnings
+  for (const warning of mcpEntry.install.warnings || []) {
+    console.log(chalk.yellow(`\n  ⚠ ${warning}`));
+  }
+
+  const credentials = mcpEntry.install.credentials || [];
+
+  // Stitch MCP — automated setup via setupStitch()
+  if (name === 'stitch' && !mcpEntry.install.autoInstall) {
+    console.log(chalk.cyan(`\n  Setting up Stitch MCP (automated)\n`));
+    console.log(chalk.gray(`  Usage: ${mcpEntry.usage}`));
+    console.log('');
+
+    // Allow user to provide GCP project if auto-detection might fail
+    let gcpProject;
+    const gcpCred = credentials.find(c => c.envVar === 'STITCH_GCP_PROJECT');
+    const { gcpProjectInput } = await inquirer.prompt([{
+      type: 'input',
+      name: 'gcpProjectInput',
+      message: gcpCred ? `${gcpCred.name} (leave blank for auto-detect):` : 'GCP Project ID (blank for auto-detect):',
+    }]);
+    if (gcpProjectInput?.trim()) gcpProject = gcpProjectInput.trim();
+
+    const spinner = ora('Setting up Stitch MCP...').start();
+    const result = await setupStitch(targetPath, { gcpProject });
+
+    // Report step-by-step results
+    for (const step of result.steps) {
+      if (step.success) {
+        switch (step.step) {
+          case 'find-gcloud': spinner.text = `gcloud found (${step.source})`; break;
+          case 'verify-adc': spinner.text = 'ADC credentials verified'; break;
+          case 'detect-project': spinner.text = `GCP project: ${step.gcpProject}`; break;
+          case 'enable-api': spinner.text = 'Stitch API enabled'; break;
+          case 'generate-proxy': spinner.text = `Proxy generated: ${step.proxyPath}`; break;
+          case 'install-mcp': spinner.text = 'MCP config installed in .mcp.json'; break;
+          case 'health-check': spinner.text = `Health-check passed (protocol ${step.protocolVersion})`; break;
+        }
+      }
+    }
+
+    if (result.success) {
+      spinner.succeed('Stitch MCP setup complete');
+      for (const step of result.steps) {
+        if (step.step === 'health-check' && step.success) {
+          console.log(chalk.green(`  ✓ Health-check passed (protocol ${step.protocolVersion})`));
+        }
+      }
+    } else {
+      const failedStep = result.steps.find(s => !s.success && s.step !== 'enable-api' && s.step !== 'health-check');
+      spinner.fail(`Stitch setup failed at: ${failedStep?.step || 'unknown'}`);
+      if (failedStep?.error) {
+        console.log(chalk.red(`  ${failedStep.error}`));
+      }
+      // Show health-check warning if it failed but setup otherwise succeeded
+      const healthStep = result.steps.find(s => s.step === 'health-check');
+      if (healthStep && !healthStep.success) {
+        console.log(chalk.yellow(`  ⚠ Health-check: ${healthStep.error}`));
+      }
+    }
+
+    if (mcpEntry.companionSkills?.installCommand) {
+      const { installSkills } = await inquirer.prompt([{
+        type: 'confirm',
+        name: 'installSkills',
+        message: 'Install Stitch companion skills (design, loop, etc.)?',
+        default: true
+      }]);
+      if (installSkills) {
+        const skillResults = installCompanionSkills({ stitch: mcpEntry });
+        for (const r of skillResults) {
+          if (r.success) {
+            console.log(chalk.green(`  ✓ Companion skills installed: ${r.repo}`));
+          } else {
+            console.log(chalk.yellow(`  ⚠ Failed to install companion skills: ${r.repo}`));
+          }
+        }
+      }
+    }
+
+    console.log('');
+    return;
+  }
+
+  // Auto-installable — just install
+  if (mcpEntry.install.autoInstall) {
+    const spinner = ora(`Installing ${name}...`).start();
+    const result = await installAutoMcps(targetPath, { [name]: mcpEntry });
+    if (result.added.length > 0) {
+      spinner.succeed(`${name} MCP installed`);
+    } else {
+      spinner.info(`${name} MCP already configured`);
+    }
+    console.log('');
+    return;
+  }
+
+  // Remote HTTP MCP — show setup command and optionally auto-configure
+  if (isRemoteMcp(mcpEntry.install.config)) {
+    console.log(chalk.cyan(`\n  Setting up ${name} MCP (remote)\n`));
+    console.log(chalk.gray(`  Usage: ${mcpEntry.usage}`));
+    console.log('');
+
+    const instructions = generateSetupInstructions(name, mcpEntry);
+    console.log(chalk.white(`  Run this command to add the MCP:`));
+    console.log(chalk.cyan(`  ${instructions.cliCommand}`));
+    console.log('');
+
+    for (const warning of mcpEntry.install.warnings || []) {
+      console.log(chalk.yellow(`  ⚠ ${warning}`));
+    }
+
+    const { installNow } = await inquirer.prompt([{
+      type: 'confirm',
+      name: 'installNow',
+      message: 'Add to .mcp.json now?',
+      default: true
+    }]);
+
+    if (installNow) {
+      console.log(chalk.cyan(`  Launching ${name} OAuth authentication...`));
+      try {
+        const { execSync } = await import('child_process');
+        execSync(`claude mcp add --transport http ${name} ${mcpEntry.install.config.url}`, {
+          stdio: 'inherit',
+          timeout: 120000
+        });
+        console.log(chalk.green(`  ✓ ${name} MCP configured via OAuth`));
+      } catch {
+        const instructions = generateSetupInstructions(name, mcpEntry);
+        console.log(chalk.yellow(`  Setup cancelled. Run later: ${instructions.cliCommand}`));
+      }
+    }
+
+    console.log('');
+    return;
+  }
+
+  // Needs credentials (stdio MCPs)
+  console.log(chalk.cyan(`\n  Setting up ${name} MCP\n`));
+  console.log(chalk.gray(`  Usage: ${mcpEntry.usage}`));
+  console.log('');
+
+  const { enterCredentials } = await inquirer.prompt([{
+    type: 'confirm',
+    name: 'enterCredentials',
+    message: 'Enter credentials now?',
+    default: true
+  }]);
+
+  if (enterCredentials) {
+    const credentialValues = {};
+    for (const cred of credentials) {
+      const { value } = await inquirer.prompt([{
+        type: cred.secret ? 'password' : 'input',
+        name: 'value',
+        message: `${cred.name}:`,
+        mask: cred.secret ? '*' : undefined
+      }]);
+      credentialValues[cred.envVar] = value;
+    }
+
+    const spinner = ora(`Configuring ${name}...`).start();
+    await installMcpWithCredentials(targetPath, name, mcpEntry, credentialValues);
+    spinner.succeed(`${name} MCP configured`);
+  } else {
+    // Show config snippet
+    const instructions = generateSetupInstructions(name, mcpEntry);
+    console.log(chalk.gray('\n  Add to .mcp.json → mcpServers:'));
+    console.log(chalk.gray('  ' + '─'.repeat(55)));
+    for (const line of instructions.configSnippet.split('\n')) {
+      console.log(chalk.gray(`  ${line}`));
+    }
+    console.log(chalk.gray('  ' + '─'.repeat(55)));
+
+    for (const cred of instructions.credentialUrls) {
+      console.log(chalk.gray(`  Get ${cred.name}: ${cred.helpUrl}`));
+    }
+  }
+
+  console.log('');
+}
+
+/**
+ * Interactive wizard showing all MCPs
+ */
+async function interactiveWizard(targetPath, stack, existingMcps) {
+  const orchestration = orchestrateMcpSetup(targetPath, stack, existingMcps);
+
+  console.log(chalk.cyan('\n  MCP Setup Wizard'));
+  console.log(chalk.gray(`  Stack: ${stack}`));
+  console.log('');
+
+  const autoNames = Object.keys(orchestration.autoInstallable);
+  const manualNames = Object.keys(orchestration.needsManualSetup);
+  const alreadyNames = Object.keys(orchestration.alreadyInstalled);
+
+  if (alreadyNames.length > 0) {
+    console.log(chalk.green(`  Already configured: ${alreadyNames.join(', ')}`));
+  }
+
+  // Auto-install
+  if (autoNames.length > 0) {
+    const { installAuto } = await inquirer.prompt([{
+      type: 'confirm',
+      name: 'installAuto',
+      message: `Install credential-free MCPs? (${autoNames.join(', ')})`,
+      default: true
+    }]);
+
+    if (installAuto) {
+      const spinner = ora('Installing...').start();
+      const result = await installAutoMcps(targetPath, orchestration.autoInstallable);
+      spinner.succeed(`Installed: ${result.added.join(', ')}`);
+
+      // Install companion skills for MCPs that define them
+      const skillResults = installCompanionSkills(orchestration.autoInstallable);
+      for (const r of skillResults) {
+        if (r.success) {
+          console.log(chalk.green(`  ✓ Companion skills: ${r.repo}`));
+        } else {
+          console.log(chalk.yellow(`  ⚠ Companion skills failed: ${r.repo}`));
+        }
+      }
+    }
+  }
+
+  // Credential MCPs
+  if (manualNames.length > 0) {
+    console.log(chalk.cyan('\n  Credential-requiring MCPs:'));
+
+    for (const name of manualNames) {
+      const entry = orchestration.needsManualSetup[name];
+
+      for (const warning of entry.install.warnings || []) {
+        console.log(chalk.yellow(`  ⚠ ${warning}`));
+      }
+
+      const capitalizedName = name.charAt(0).toUpperCase() + name.slice(1);
+      const { setupNow } = await inquirer.prompt([{
+        type: 'confirm',
+        name: 'setupNow',
+        message: `Set up ${capitalizedName}? (${entry.usage})`,
+        default: false
+      }]);
+
+      if (setupNow) {
+        // Stitch — automated setup via setupStitch()
+        if (name === 'stitch' && !entry.install.autoInstall) {
+          const gcpCred = entry.install.credentials?.find(c => c.envVar === 'STITCH_GCP_PROJECT');
+          const { gcpProject } = await inquirer.prompt([{
+            type: 'input',
+            name: 'gcpProject',
+            message: gcpCred ? `${gcpCred.name} (blank for auto-detect):` : 'GCP Project ID (blank for auto-detect):',
+          }]);
+
+          const stitchSpinner = ora('Setting up Stitch MCP...').start();
+          const stitchResult = await setupStitch(targetPath, { gcpProject: gcpProject?.trim() || undefined });
+          if (stitchResult.success) {
+            stitchSpinner.succeed('Stitch MCP setup complete');
+          } else {
+            const failedStep = stitchResult.steps.find(s => !s.success && s.step !== 'enable-api' && s.step !== 'health-check');
+            stitchSpinner.fail(`Stitch setup failed: ${failedStep?.error || 'unknown'}`);
+          }
+          if (entry.companionSkills?.installCommand) {
+            const skillResults = installCompanionSkills({ stitch: entry });
+            for (const r of skillResults) {
+              if (r.success) console.log(chalk.green(`  ✓ Companion skills: ${r.repo}`));
+            }
+          }
+          continue;
+        }
+
+        // Remote MCPs — launch OAuth via claude mcp add
+        if (isRemoteMcp(entry.install.config)) {
+          console.log(chalk.cyan(`  Launching ${capitalizedName} OAuth...`));
+          try {
+            const { execSync } = await import('child_process');
+            execSync(`claude mcp add --transport http ${name} ${entry.install.config.url}`, {
+              stdio: 'inherit',
+              timeout: 120000
+            });
+            console.log(chalk.green(`  ✓ ${capitalizedName} configured via OAuth`));
+          } catch {
+            const instructions = generateSetupInstructions(name, entry);
+            console.log(chalk.yellow(`  Setup cancelled. Run later: ${instructions.cliCommand}`));
+          }
+          continue;
+        }
+
+        const credentialValues = {};
+        for (const cred of entry.install.credentials) {
+          const { value } = await inquirer.prompt([{
+            type: cred.secret ? 'password' : 'input',
+            name: 'value',
+            message: `${cred.name}:`,
+            mask: cred.secret ? '*' : undefined
+          }]);
+          credentialValues[cred.envVar] = value;
+        }
+
+        const spinner = ora(`Configuring ${name}...`).start();
+        await installMcpWithCredentials(targetPath, name, entry, credentialValues);
+        spinner.succeed(`${capitalizedName} configured`);
+      } else {
+        const instructions = generateSetupInstructions(name, entry);
+        console.log(chalk.gray(`  Run later: ${instructions.cliCommand}`));
+      }
+    }
+  }
+
+  if (autoNames.length === 0 && manualNames.length === 0) {
+    console.log(chalk.green('  ✓ All relevant MCPs are already configured.\n'));
+  } else {
+    console.log('');
+  }
+}