ccraft 1.0.12 → 1.0.14

package/README.md

@@ -39,10 +39,10 @@ That's it. Your `.claude/` directory is now populated with agents, skills, rules
 ### Starting a New Project?
 
 ```bash
-ccraft create
+ccraft install --name my-app --description "REST API for inventory management"
 ```
 
-The `create` command scaffolds a new project from scratch, runs Claude Code's bootstrap, then generates the full `.claude/` configuration on top.
+`ccraft install` auto-detects whether you're working with an existing project or starting fresh. If the target directory is empty or doesn't exist, it switches to new-project mode — scaffolds the directory, runs Claude Code's bootstrap, then generates the full `.claude/` configuration on top.
 
 ## How It Works
 
@@ -106,7 +106,9 @@ ccraft auth sk-xxxxxxxxxxxx --server https://custom-server.example.com
 
 ### `ccraft install`
 
-Generate Claude Code configuration for an existing project. The main command most users need.
+Generate Claude Code configuration. Auto-detects whether you're configuring an existing project or creating a new one.
+
+**Existing project** (target directory has files):
 
 ```bash
 ccraft install                          # Interactive mode
@@ -115,18 +117,27 @@ ccraft install -p nextjs                # Apply a framework preset
 ccraft install -d /path/to/project      # Target a specific directory
 ```
 
-**Available presets:** `nextjs`, `go-api`, `python`, `rust`, `aspnet`, `cmake`
-
-### `ccraft create`
-
-Scaffold a new project from scratch with Claude Code configuration built in.
+**New project** (target directory is empty/missing, or `--name`/`--description` provided):
 
 ```bash
-ccraft create                           # Interactive mode
-ccraft create -y --name my-app          # Non-interactive with project name
-ccraft create -y --name my-app --description "REST API for inventory management"
+ccraft install --name my-app --description "REST API for inventory management"
+ccraft install -d ./new-project         # Empty dir triggers new-project mode
+ccraft install -y --name my-app         # Non-interactive new project
 ```
 
+In new-project mode, ccraft creates the directory, initializes git, generates `.claude/` configuration, then runs Claude Code's `/bootstrap:auto` to scaffold the project.
+
+**Options:**
+
+| Flag | Description |
+|------|-------------|
+| `-y, --yes` | Accept all defaults (non-interactive) |
+| `-n, --name <name>` | Project name (triggers new-project mode) |
+| `--description <text>` | Project description (triggers new-project mode) |
+| `-p, --preset <preset>` | Apply a framework preset (`nextjs`, `go-api`, `python`, `rust`, `aspnet`, `cmake`) |
+| `--pro` | Developer mode — skip persona selection, show all options |
+| `-d, --dir <path>` | Target directory (default: cwd) |
+
 ### `ccraft update`
 
 Re-analyze your project and install new components for any stack changes. Run this after adding new frameworks or dependencies.

package/bin/claude-craft.js

@@ -35,7 +35,6 @@ loadEnvFile(resolvePath(cliRoot, '.env'));
 import { Command } from 'commander';
 import { VERSION, PRESET_ALIASES } from '../src/constants.js';
 import { runInstall } from '../src/commands/install.js';
-import { runCreate } from '../src/commands/create.js';
 import { runUpdate } from '../src/commands/update.js';
 import { runAuth } from '../src/commands/auth.js';
 import { runLogout } from '../src/commands/logout.js';
@@ -58,20 +57,12 @@ program
   .description('Remove stored API key')
   .action(runLogout);
 
-program
-  .command('create')
-  .description('Create a new project from scratch with Claude scaffolding')
-  .option('-y, --yes', 'Accept all defaults (non-interactive)')
-  .option('-n, --name <name>', 'Project name (non-interactive mode)')
-  .option('--description <text>', 'Project description (non-interactive mode)')
-  .option('--pro', 'Developer mode — skip persona selection, show all options')
-  .option('-d, --dir <path>', 'Parent directory to create the project in (default: cwd)')
-  .action(runCreate);
-
 program
   .command('install')
-  .description('Generate Claude Code configuration files in the current project')
+  .description('Generate Claude Code configuration — auto-detects new vs existing projects')
   .option('-y, --yes', 'Accept all defaults (non-interactive)')
+  .option('-n, --name <name>', 'Project name (triggers new-project mode)')
+  .option('--description <text>', 'Project description (triggers new-project mode)')
   .option(`-p, --preset <preset>`, `Apply a framework preset (${Object.keys(PRESET_ALIASES).join(', ')})`)
   .option('--pro', 'Developer mode — skip persona selection, show all options')
   .option('-d, --dir <path>', 'Target directory (default: cwd)')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccraft",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "Intelligent Claude Code project configurator — role-aware agents, skills, rules, MCPs, and workflows",
   "type": "module",
   "bin": {

package/src/commands/install.js

@@ -1,4 +1,6 @@
-import { resolve } from 'path';
+import { resolve, join, basename } from 'path';
+import { mkdirSync, existsSync, writeFileSync, readdirSync } from 'fs';
+import { execFileSync } from 'child_process';
 import chalk from 'chalk';
 import ora from 'ora';
 import { detectProject } from '../utils/detect-project.js';
@@ -11,13 +13,17 @@ import {
 } from '../utils/existing-setup.js';
 import {
   gatherProjectPath,
+  gatherCreateProfile,
+  gatherMcpKeys,
   confirmInstallation,
 } from '../prompts/gather.js';
+import { themedInput } from '../ui/prompts.js';
 import { callGenerate, ApiError } from '../utils/api-client.js';
 import { writeApiFiles, buildFileList } from '../utils/api-file-writer.js';
 import { setupMcps } from '../utils/mcp-setup.js';
 import { optimizeSettings } from '../utils/claude-optimizer.js';
 import { runPreflight } from '../utils/preflight.js';
+import { platformCmd } from '../utils/run-claude.js';
 import {
   writeAnalysisCache,
   updateManifest,
@@ -35,17 +41,47 @@ import { renderProjectCard, renderSuccessCard } from '../ui/cards.js';
 import { renderComponentBreakdown, renderMcpStatus, renderFileResults } from '../ui/tables.js';
 import { runExistingSetupTasks, runAnalysisTasks, runInstallTasks, runVerifyTasks, runFinalizeTasks } from '../ui/tasks.js';
 
+// ── Create-mode detection ───────────────────────────────────────────────────
+
+const IGNORED_ENTRIES = new Set(['.git', '.DS_Store', 'Thumbs.db', '.gitkeep']);
+
+/**
+ * Returns true if the directory doesn't exist or contains only ignored files.
+ */
+function isEmptyDir(dirPath) {
+  if (!existsSync(dirPath)) return true;
+  const entries = readdirSync(dirPath).filter((f) => !IGNORED_ENTRIES.has(f));
+  return entries.length === 0;
+}
+
 /**
- * Main install command — 5-phase orchestrator.
+ * Determine whether we're in create mode (new project) or install mode (existing project).
  *
- * Phase 1: Preflight (env check + project path)
- * Phase 2: Project Discovery (Claude analysis + filesystem scan)
- * Phase 3: Generate & Install (server API + confirmation + file writing)
- * Phase 4: MCP Verification
- * Phase 5: Finalization (settings optimization + CLAUDE.md rewrite + success)
+ * Create mode triggers when:
+ * - --name or --description flag is provided (explicit intent)
+ * - Target directory doesn't exist
+ * - Target directory is empty (ignoring .git, .DS_Store, etc.)
+ */
+function isCreateMode(dirPath, options) {
+  if (options.name || options.description) return true;
+  return isEmptyDir(dirPath);
+}
+
+/**
+ * Main install command — unified orchestrator for both new and existing projects.
+ *
+ * Auto-detects mode:
+ * - Create mode (empty/missing dir): gather profile → mkdir → git init → synthetic
+ *   analysis → server → write files → bootstrap → re-analyze → finalize
+ * - Install mode (existing project): discover → analyze → server → confirm →
+ *   write files → MCP verify → finalize
  */
 export async function runInstall(options = {}) {
   let targetDir;
+  let createMode = false;
+  let createName = '';
+  let createDescription = '';
+
   try {
     // ================================================================
     // PHASE 1: Welcome & Setup
@@ -58,61 +94,230 @@ export async function runInstall(options = {}) {
       requireClaude: true,
     });
 
-    // ── Project path ────────────────────────────────────────────────
-    if (!options.yes && !options.dir) {
+    // ── Resolve target directory + detect mode ──────────────────────
+    if (!options.yes && !options.dir && !options.name && !options.description) {
+      // Interactive, no flags — ask for path first, then detect mode
       targetDir = await gatherProjectPath();
     } else {
       targetDir = resolve(options.dir || process.cwd());
     }
 
+    createMode = isCreateMode(targetDir, options);
+
+    if (createMode) {
+      // ── Create mode: gather profile + mkdir + git init ────────────
+      let name, description, projectType;
+
+      if (options.yes) {
+        name = options.name || 'my-project';
+        description = options.description || 'A new project';
+        projectType = 'monolith';
+        logger.info(`New project mode — creating ${chalk.bold(name)} (monolith).`);
+      } else if (options.name || options.description) {
+        // Partial flags provided — fill in the rest interactively
+        const profile = await gatherCreateProfile();
+        name = options.name || profile.name;
+        description = options.description || profile.description;
+        projectType = profile.projectType;
+      } else {
+        // Empty dir detected — prompt for project details
+        logger.info('Empty directory detected — switching to new project mode.');
+        const profile = await gatherCreateProfile();
+        name = profile.name;
+        description = profile.description;
+        projectType = profile.projectType;
+      }
+
+      // Resolve target directory for new project
+      const parentDir = resolve(options.dir || process.cwd());
+      let useCurrentDir = false;
+
+      if (!name) {
+        // Empty name = use current directory
+        targetDir = parentDir;
+        useCurrentDir = true;
+        const contents = readdirSync(targetDir).filter((f) => !IGNORED_ENTRIES.has(f));
+        if (contents.length > 0) {
+          logger.error(`Current directory ${chalk.bold(targetDir)} is not empty. Cannot create a project here.`);
+          process.exit(1);
+        }
+        name = basename(targetDir) || 'my-project';
+      } else {
+        // Named project — re-prompt if directory already exists and is non-empty
+        targetDir = join(parentDir, name);
+        while (existsSync(targetDir) && !isEmptyDir(targetDir)) {
+          logger.warn(`Directory ${chalk.bold(name)} already exists and is not empty.`);
+          const newName = await themedInput({
+            message: 'Enter a different project name:',
+            hint: 'Letters, numbers, dots, hyphens, underscores only.',
+            validate: (v) => {
+              const t = v.trim();
+              if (!t) return 'Name is required.';
+              if (!/^[a-zA-Z0-9._-]+$/.test(t)) return 'Only letters, numbers, dots, hyphens, and underscores allowed.';
+              return true;
+            },
+          });
+          name = newName.trim();
+          targetDir = join(parentDir, name);
+        }
+      }
+
+      // Create directory + git init
+      const spinner1 = ora(useCurrentDir ? 'Initializing project in current directory...' : 'Creating project directory...').start();
+      if (!useCurrentDir && !existsSync(targetDir)) {
+        mkdirSync(targetDir, { recursive: true });
+      }
+
+      writeFileSync(
+        join(targetDir, '.gitignore'),
+        'node_modules/\ndist/\nbuild/\n.env\n.env.*\n!.env.example\n*.log\n.DS_Store\nThumbs.db\n',
+        'utf8',
+      );
+
+      try {
+        const { file, args } = platformCmd('git', ['init']);
+        execFileSync(file, args, { cwd: targetDir, stdio: 'pipe', windowsHide: true });
+        spinner1.succeed(useCurrentDir
+          ? `Initialized project in ${chalk.bold(targetDir)} with git.`
+          : `Created ${chalk.bold(name)}/ with git initialized.`);
+      } catch {
+        spinner1.succeed(useCurrentDir
+          ? `Initialized project in ${chalk.bold(targetDir)} (git init skipped — git not available).`
+          : `Created ${chalk.bold(name)}/ (git init skipped — git not available).`);
+      }
+
+      createName = name;
+      createDescription = description;
+      // projectType is captured in the closure for Phase 2
+      options._createProjectType = projectType;
+    }
+
     // ================================================================
     // PHASE 2: Project Discovery
     // ================================================================
-    renderPhaseHeader(2);
-
-    // ── Check for existing Claude setup ─────────────────────────────
-    let existingContext = null;
-    try {
-      const setupCtx = await runExistingSetupTasks(targetDir, {
-        detectExistingSetup,
-        extractExistingContext,
-        removeExistingSetup,
-      });
-      existingContext = setupCtx.existingContext || null;
-    } catch (setupErr) {
-      logger.debug(`Existing setup check failed: ${setupErr.message}`);
-    }
+    const phaseOpts = createMode ? { totalPhases: 6 } : {};
+    renderPhaseHeader(2, phaseOpts);
 
-    // ── Project analysis ────────────────────────────────────────────
     let projectInfo;
     let detected;
+    let existingContext = null;
 
-    try {
-      const ctx = await runAnalysisTasks(targetDir, { analyzeWithClaude, detectProject, existingContext });
+    if (createMode) {
+      // ── Create mode: synthetic analysis from description ──────────
+      const { analyzeDescription } = await import('../utils/description-analyzer.js');
+
+      let descAnalysis = null;
+      {
+        const spinnerAnalyze = ora('Analyzing your requirements...').start();
+        const { analysis, failReason } = await analyzeDescription(createDescription, options._createProjectType);
+        if (analysis) {
+          descAnalysis = analysis;
+          const parts = [];
+          if (analysis.frameworks.length) parts.push(analysis.frameworks.join(', '));
+          if (analysis.languages.length) parts.push(analysis.languages.join(', '));
+          if (analysis.databases.length) parts.push(analysis.databases.join(', '));
+          spinnerAnalyze.succeed(
+            parts.length
+              ? `Detected stack: ${chalk.bold(parts.join(' + '))}`
+              : 'Requirements analyzed.',
+          );
+        } else {
+          spinnerAnalyze.info(`Stack inference skipped${failReason ? ` (${failReason})` : ''} — using defaults.`);
+        }
+      }
 
-      const { claudeAnalysis, claudeFailReason, fsDetected } = ctx;
+      projectInfo = {
+        name: createName,
+        description: createDescription,
+        projectType: options._createProjectType || 'monolith',
+        languages: descAnalysis?.languages?.length ? descAnalysis.languages : [],
+        frameworks: descAnalysis?.frameworks?.length ? descAnalysis.frameworks : [],
+        codeStyle: descAnalysis?.codeStyle?.length ? descAnalysis.codeStyle : [],
+        cicd: descAnalysis?.cicd?.length ? descAnalysis.cicd : [],
+        subprojects: descAnalysis?.subprojects?.length ? descAnalysis.subprojects : [],
+        architecture: descAnalysis?.architecture || '',
+        buildCommands: descAnalysis?.buildCommands || {},
+        complexity: descAnalysis?.complexity ?? 0.3,
+        metrics: descAnalysis?.metrics || null,
+        entryPoints: descAnalysis?.entryPoints || [],
+        coreModules: descAnalysis?.coreModules || [],
+        testFramework: descAnalysis?.testFramework || '',
+        packageManager: descAnalysis?.packageManager || '',
+        languageDistribution: descAnalysis?.languageDistribution || null,
+      };
 
-      if (claudeAnalysis) {
-        projectInfo = {
-          name: claudeAnalysis.name || fsDetected.name || 'my-project',
-          description: claudeAnalysis.description || fsDetected.description || '',
-          projectType: claudeAnalysis.projectType || fsDetected.projectType || 'monolith',
-          languages: claudeAnalysis.languages.length ? claudeAnalysis.languages : (fsDetected.languages.length ? fsDetected.languages : ['JavaScript']),
-          frameworks: claudeAnalysis.frameworks.length ? claudeAnalysis.frameworks : fsDetected.frameworks,
-          codeStyle: claudeAnalysis.codeStyle.length ? claudeAnalysis.codeStyle : fsDetected.codeStyle,
-          cicd: claudeAnalysis.cicd.length ? claudeAnalysis.cicd : fsDetected.cicd,
-          subprojects: claudeAnalysis.subprojects.length ? claudeAnalysis.subprojects : fsDetected.subprojects,
-          architecture: claudeAnalysis.architecture || '',
-          buildCommands: claudeAnalysis.buildCommands || {},
-          complexity: claudeAnalysis.complexity ?? 0.5,
-          metrics: claudeAnalysis.metrics || null,
-          entryPoints: claudeAnalysis.entryPoints || [],
-          coreModules: claudeAnalysis.coreModules || [],
-          testFramework: claudeAnalysis.testFramework || '',
-          packageManager: claudeAnalysis.packageManager || fsDetected.packageManager || '',
-          languageDistribution: claudeAnalysis.languageDistribution || fsDetected.languageDistribution || null,
-        };
-      } else {
+      detected = {
+        ...projectInfo,
+        sensitiveFiles: { found: [], gitignoreCovers: true },
+        _rootFiles: [],
+        databases: descAnalysis?.databases?.length ? descAnalysis.databases : [],
+      };
+    } else {
+      // ── Install mode: real project analysis ───────────────────────
+      try {
+        const setupCtx = await runExistingSetupTasks(targetDir, {
+          detectExistingSetup,
+          extractExistingContext,
+          removeExistingSetup,
+        });
+        existingContext = setupCtx.existingContext || null;
+      } catch (setupErr) {
+        logger.debug(`Existing setup check failed: ${setupErr.message}`);
+      }
+
+      try {
+        const ctx = await runAnalysisTasks(targetDir, { analyzeWithClaude, detectProject, existingContext });
+
+        const { claudeAnalysis, claudeFailReason, fsDetected } = ctx;
+
+        if (claudeAnalysis) {
+          projectInfo = {
+            name: claudeAnalysis.name || fsDetected.name || 'my-project',
+            description: claudeAnalysis.description || fsDetected.description || '',
+            projectType: claudeAnalysis.projectType || fsDetected.projectType || 'monolith',
+            languages: claudeAnalysis.languages.length ? claudeAnalysis.languages : (fsDetected.languages.length ? fsDetected.languages : ['JavaScript']),
+            frameworks: claudeAnalysis.frameworks.length ? claudeAnalysis.frameworks : fsDetected.frameworks,
+            codeStyle: claudeAnalysis.codeStyle.length ? claudeAnalysis.codeStyle : fsDetected.codeStyle,
+            cicd: claudeAnalysis.cicd.length ? claudeAnalysis.cicd : fsDetected.cicd,
+            subprojects: claudeAnalysis.subprojects.length ? claudeAnalysis.subprojects : fsDetected.subprojects,
+            architecture: claudeAnalysis.architecture || '',
+            buildCommands: claudeAnalysis.buildCommands || {},
+            complexity: claudeAnalysis.complexity ?? 0.5,
+            metrics: claudeAnalysis.metrics || null,
+            entryPoints: claudeAnalysis.entryPoints || [],
+            coreModules: claudeAnalysis.coreModules || [],
+            testFramework: claudeAnalysis.testFramework || '',
+            packageManager: claudeAnalysis.packageManager || fsDetected.packageManager || '',
+            languageDistribution: claudeAnalysis.languageDistribution || fsDetected.languageDistribution || null,
+          };
+        } else {
+          projectInfo = {
+            name: fsDetected.name || targetDir.split(/[/\\]/).filter(Boolean).pop() || 'my-project',
+            description: fsDetected.description || '',
+            projectType: fsDetected.projectType || 'monolith',
+            languages: fsDetected.languages.length ? fsDetected.languages : ['JavaScript'],
+            frameworks: fsDetected.frameworks,
+            codeStyle: fsDetected.codeStyle,
+            cicd: fsDetected.cicd,
+            subprojects: fsDetected.subprojects,
+            architecture: '',
+            buildCommands: {},
+            complexity: 0.5,
+            metrics: null,
+            entryPoints: [],
+            coreModules: [],
+            testFramework: '',
+            packageManager: fsDetected.packageManager || '',
+            languageDistribution: fsDetected.languageDistribution || null,
+          };
+        }
+
+        detected = { ...fsDetected, ...projectInfo };
+      } catch (analysisErr) {
+        // Fallback if task runner fails — run sequentially with spinner
+        const spinner = ora('Analyzing project...').start();
+        const fsDetected = await detectProject(targetDir);
+        spinner.succeed('Project scanned.');
         projectInfo = {
           name: fsDetected.name || targetDir.split(/[/\\]/).filter(Boolean).pop() || 'my-project',
           description: fsDetected.description || '',
@@ -132,34 +337,12 @@ export async function runInstall(options = {}) {
           packageManager: fsDetected.packageManager || '',
           languageDistribution: fsDetected.languageDistribution || null,
         };
+        detected = { ...fsDetected, ...projectInfo };
       }
 
-      detected = { ...fsDetected, ...projectInfo };
-    } catch (analysisErr) {
-      // Fallback if task runner fails — run sequentially with spinner
-      const spinner = ora('Analyzing project...').start();
-      const fsDetected = await detectProject(targetDir);
-      spinner.succeed('Project scanned.');
-      projectInfo = {
-        name: fsDetected.name || targetDir.split(/[/\\]/).filter(Boolean).pop() || 'my-project',
-        description: fsDetected.description || '',
-        projectType: fsDetected.projectType || 'monolith',
-        languages: fsDetected.languages.length ? fsDetected.languages : ['JavaScript'],
-        frameworks: fsDetected.frameworks,
-        codeStyle: fsDetected.codeStyle,
-        cicd: fsDetected.cicd,
-        subprojects: fsDetected.subprojects,
-        architecture: '',
-        buildCommands: {},
-        complexity: 0.5,
-        metrics: null,
-        entryPoints: [],
-        coreModules: [],
-        testFramework: '',
-        packageManager: fsDetected.packageManager || '',
-        languageDistribution: fsDetected.languageDistribution || null,
-      };
-      detected = { ...fsDetected, ...projectInfo };
+      // Display results (install mode only — create mode has no real project to show)
+      console.log();
+      renderProjectCard(projectInfo);
     }
 
     // Cache analysis for later phases and future update runs
@@ -169,14 +352,10 @@ export async function runInstall(options = {}) {
       logger.debug(`Analysis cache write failed: ${cacheErr.message}`);
     }
 
-    // Display results
-    console.log();
-    renderProjectCard(projectInfo);
-
     // ================================================================
     // PHASE 3: Configuration
     // ================================================================
-    renderPhaseHeader(3);
+    renderPhaseHeader(3, phaseOpts);
 
     const spinner3 = ora('Calling claude-craft server...').start();
 
@@ -223,11 +402,11 @@ export async function runInstall(options = {}) {
 
     // All MCPs are auto-installed; no interactive selection
     const selectedMcps = mcpConfigs || [];
-    const mcpKeys = {};
+    let mcpKeys = {};
     const securityConfig = { addSecurityGitignore: true };
 
-    // Confirmation gate (skipped in non-interactive mode)
-    if (!options.yes) {
+    // Confirmation gate (skipped in create mode and non-interactive mode)
+    if (!createMode && !options.yes) {
       const finalSummary = { ...summary, mcps: selectedMcps.map((m) => ({ id: m.id, tier: m.tier })) };
       const proceed = await confirmInstallation(finalSummary);
       if (!proceed) {
@@ -240,7 +419,12 @@ export async function runInstall(options = {}) {
     // ================================================================
     // PHASE 4: Installation
     // ================================================================
-    renderPhaseHeader(4);
+    renderPhaseHeader(4, phaseOpts);
+
+    // Prompt for API keys for MCPs that need them
+    if (!options.yes) {
+      mcpKeys = await gatherMcpKeys(selectedMcps);
+    }
 
     let results;
     let filesToWrite;
@@ -309,10 +493,81 @@ export async function runInstall(options = {}) {
     }
 
     // ================================================================
-    // PHASE 5: Finalization
+    // CREATE MODE: Bootstrap
     // ================================================================
-    renderPhaseHeader(5);
+    let bootstrapSucceeded = true;
+
+    if (createMode) {
+      renderPhaseHeader(5, { totalPhases: 6, name: 'Bootstrap' });
 
+      console.log(chalk.dim('  Handing off to Claude to scaffold your project...'));
+      console.log(chalk.dim('  This may take several minutes. Activity log:'));
+      console.log();
+
+      try {
+        const { runBootstrap } = await import('../utils/bootstrap-runner.js');
+        await runBootstrap(targetDir, createDescription);
+      } catch (err) {
+        bootstrapSucceeded = false;
+        console.log();
+        logger.warn('Bootstrap did not complete: ' + err.message);
+        logger.info('Your .claude/ configuration is still intact. You can run /bootstrap:auto manually inside the project.');
+        console.log();
+      }
+    }
+
+    // ================================================================
+    // FINALIZATION
+    // ================================================================
+    renderPhaseHeader(createMode ? 6 : 5, createMode ? { totalPhases: 6, name: 'Finalization' } : {});
+
+    // Create mode: re-analyze after bootstrap
+    if (createMode && bootstrapSucceeded) {
+      try {
+        const spinnerReanalyze = ora('Re-analyzing project...').start();
+        const fsDetected = await detectProject(targetDir);
+
+        let reanalyzedInfo;
+        try {
+          const { analysis } = await analyzeWithClaude(targetDir);
+          if (analysis) {
+            reanalyzedInfo = {
+              name: analysis.name || fsDetected.name || createName,
+              description: analysis.description || fsDetected.description || createDescription,
+              projectType: analysis.projectType || fsDetected.projectType || options._createProjectType,
+              languages: analysis.languages?.length ? analysis.languages : fsDetected.languages,
+              frameworks: analysis.frameworks?.length ? analysis.frameworks : fsDetected.frameworks,
+              codeStyle: analysis.codeStyle?.length ? analysis.codeStyle : fsDetected.codeStyle,
+              cicd: analysis.cicd?.length ? analysis.cicd : fsDetected.cicd,
+              subprojects: analysis.subprojects?.length ? analysis.subprojects : fsDetected.subprojects,
+              architecture: analysis.architecture || '',
+              buildCommands: analysis.buildCommands || {},
+              complexity: analysis.complexity ?? 0.5,
+              metrics: analysis.metrics || null,
+              entryPoints: analysis.entryPoints || [],
+              coreModules: analysis.coreModules || [],
+              testFramework: analysis.testFramework || '',
+              packageManager: analysis.packageManager || fsDetected.packageManager || '',
+              languageDistribution: analysis.languageDistribution || fsDetected.languageDistribution || null,
+            };
+          } else {
+            reanalyzedInfo = buildProjectInfoFromFs(fsDetected, createName, createDescription, options._createProjectType);
+          }
+        } catch {
+          reanalyzedInfo = buildProjectInfoFromFs(fsDetected, createName, createDescription, options._createProjectType);
+        }
+
+        spinnerReanalyze.succeed('Project re-analyzed.');
+
+        // Overwrite cache with real data
+        const reanalyzedDetected = { ...fsDetected, ...reanalyzedInfo };
+        writeAnalysisCache(targetDir, reanalyzedInfo, reanalyzedDetected, null);
+      } catch (err) {
+        logger.debug(`Post-bootstrap analysis failed: ${err.message}`);
+      }
+    }
+
+    // Shared finalization — optimize settings + rewrite CLAUDE.md
     try {
       const finCtx = await runFinalizeTasks({
         targetDir,
@@ -321,7 +576,6 @@ export async function runInstall(options = {}) {
         rewriteClaudeMd,
       });
 
-      // Show what was replaced
       const opt = finCtx.optimizationResult;
       if (opt?.status === 'ok' && opt.applied > 0 && opt.replacements?.length > 0) {
         for (const label of opt.replacements) {
@@ -329,9 +583,6 @@ export async function runInstall(options = {}) {
         }
       }
     } catch {
-      // Fallback to sequential
-      // toolkit-usage.md no longer generated — capability-map.md covers routing
-
       const spinner7 = ora('Optimizing settings...').start();
       const optResult = optimizeSettings(targetDir);
 
@@ -362,7 +613,17 @@ export async function runInstall(options = {}) {
     });
 
     console.log();
-    logger.success('Done! Claude Code is ready.');
+    if (createMode) {
+      if (bootstrapSucceeded) {
+        logger.success(`Project ${chalk.bold(createName)} created and bootstrapped!`);
+        console.log(chalk.dim(`  cd ${createName} && claude`));
+      } else {
+        logger.success(`Project ${chalk.bold(createName)} created with Claude configuration.`);
+        console.log(chalk.dim(`  cd ${createName} && claude -p "/bootstrap:auto ${createDescription}"`));
+      }
+    } else {
+      logger.success('Done! Claude Code is ready.');
+    }
     console.log();
   } catch (err) {
     if (
@@ -405,3 +666,28 @@ function countTotalItems(summary) {
 
   return countBucket(summary.guaranteed) + countBucket(summary.candidates);
 }
+
+/**
+ * Build projectInfo from filesystem detection only (fallback for create mode re-analysis).
+ */
+function buildProjectInfoFromFs(fsDetected, name, description, projectType) {
+  return {
+    name: fsDetected.name || name,
+    description: fsDetected.description || description,
+    projectType: fsDetected.projectType || projectType,
+    languages: fsDetected.languages?.length ? fsDetected.languages : [],
+    frameworks: fsDetected.frameworks || [],
+    codeStyle: fsDetected.codeStyle || [],
+    cicd: fsDetected.cicd || [],
+    subprojects: fsDetected.subprojects || [],
+    architecture: '',
+    buildCommands: {},
+    complexity: 0.5,
+    metrics: null,
+    entryPoints: [],
+    coreModules: [],
+    testFramework: '',
+    packageManager: fsDetected.packageManager || '',
+    languageDistribution: fsDetected.languageDistribution || null,
+  };
+}

package/src/prompts/gather.js

@@ -227,6 +227,49 @@ export async function gatherMcpConfig(scoredMcps) {
   return { selectedMcps, mcpKeys };
 }
 
+// ── MCP API key collection (standalone) ──────────────────────────────
+
+/**
+ * Prompt the user for API keys for MCPs that require them.
+ * Returns { [mcpId]: { KEY_NAME: 'value' } }.
+ */
+export async function gatherMcpKeys(selectedMcps) {
+  const mcpKeys = {};
+  const needKeys = selectedMcps.filter((m) => m.requiresKey);
+
+  if (needKeys.length === 0) return mcpKeys;
+
+  console.log(chalk.dim('\n  Some MCP servers require API keys.\n'));
+
+  for (const mcp of needKeys) {
+    const keyDefs = mcp.keyNames || [{ name: mcp.keyName, description: mcp.keyDescription }];
+    const collected = {};
+
+    for (const keyDef of keyDefs) {
+      const key = await themedPassword({
+        message: `${mcp.id} — ${keyDef.description}:`,
+        hint: `Press Enter to skip. You can set ${keyDef.name} as an env variable later.`,
+        mask: '*',
+      });
+      if (key && key.trim()) {
+        const { warning } = validateApiKeyFormat(mcp.id, keyDef.name, key.trim());
+        if (warning) {
+          console.log(chalk.yellow(`    ⚠ ${warning}`));
+        }
+        collected[keyDef.name] = key.trim();
+      } else {
+        console.log(chalk.dim(`    Skipped — set ${keyDef.name} env var later`));
+      }
+    }
+
+    if (Object.keys(collected).length > 0) {
+      mcpKeys[mcp.id] = collected;
+    }
+  }
+
+  return mcpKeys;
+}
+
 // ── Security configuration ────────────────────────────────────────────
 
 export function gatherSecurityConfig(detected) {

package/src/ui/phase-header.js

@@ -4,11 +4,17 @@ import { PHASES, TOTAL_PHASES, getTerminalWidth } from './theme.js';
 /**
  * Render a phase header like:
  *   ── Phase 2 of 5 ── Project Discovery ──────────────────
+ *
+ * @param {number} phaseNumber — current phase number
+ * @param {object} [opts] — optional overrides
+ * @param {number} [opts.totalPhases] — override total phase count (default: TOTAL_PHASES)
+ * @param {string} [opts.name] — override phase name
  */
-export function renderPhaseHeader(phaseNumber) {
+export function renderPhaseHeader(phaseNumber, opts = {}) {
+  const total = opts.totalPhases || TOTAL_PHASES;
   const phase = PHASES.find((p) => p.number === phaseNumber);
-  const name = phase ? phase.name : `Phase ${phaseNumber}`;
-  const label = `Phase ${phaseNumber} of ${TOTAL_PHASES}`;
+  const name = opts.name || (phase ? phase.name : `Phase ${phaseNumber}`);
+  const label = `Phase ${phaseNumber} of ${total}`;
 
   const w = Math.min(getTerminalWidth() - 4, 56);
   const inner = ` ${label} ── ${name} `;

package/src/commands/create.js

@@ -1,501 +0,0 @@
-import { resolve, join, basename } from 'path';
-import { mkdirSync, existsSync, writeFileSync, readdirSync } from 'fs';
-import { execFileSync } from 'child_process';
-import chalk from 'chalk';
-import ora from 'ora';
-import { gatherCreateProfile } from '../prompts/gather.js';
-import { themedInput } from '../ui/prompts.js';
-import { callGenerate, ApiError } from '../utils/api-client.js';
-import { runPreflight } from '../utils/preflight.js';
-import { writeApiFiles, buildFileList } from '../utils/api-file-writer.js';
-import { setupMcps } from '../utils/mcp-setup.js';
-import { optimizeSettings } from '../utils/claude-optimizer.js';
-import { rewriteClaudeMd } from '../utils/claude-rewriter.js';
-import { detectProject } from '../utils/detect-project.js';
-import { analyzeWithClaude } from '../utils/claude-analyzer.js';
-import { analyzeDescription } from '../utils/description-analyzer.js';
-import { platformCmd } from '../utils/run-claude.js';
-import { runBootstrap } from '../utils/bootstrap-runner.js';
-import {
-  writeAnalysisCache,
-  updateManifest,
-  readAnalysisCache,
-  promoteCache,
-  cleanupAnalysisCache,
-} from '../utils/analysis-cache.js';
-import { VERSION } from '../constants.js';
-import * as logger from '../utils/logger.js';
-
-// UI modules
-import { renderBanner } from '../ui/brand.js';
-import { renderComponentBreakdown, renderMcpStatus, renderFileResults } from '../ui/tables.js';
-import { renderSuccessCard } from '../ui/cards.js';
-import { runInstallTasks, runVerifyTasks, runFinalizeTasks } from '../ui/tasks.js';
-
-// ── Helpers ──────────────────────────────────────────────────────────────────
-
-function renderCreatePhase(number, name, totalPhases) {
-  const w = Math.min((process.stdout.columns || 80) - 4, 56);
-  const label = `Phase ${number} of ${totalPhases}`;
-  const inner = ` ${label} \u2500\u2500 ${name} `;
-  const tailLen = Math.max(2, w - inner.length - 2);
-  console.log();
-  console.log(chalk.bold.cyan(`  \u2500\u2500${inner}${'\u2500'.repeat(tailLen)}`));
-  console.log();
-}
-
-function countTotalItems(summary) {
-  const countBucket = (bucket) => {
-    if (!bucket) return 0;
-    return Object.values(bucket).reduce(
-      (sum, arr) => sum + (Array.isArray(arr) ? arr.length : 0),
-      0,
-    );
-  };
-  return countBucket(summary.guaranteed) + countBucket(summary.candidates);
-}
-
-// ── Main command ─────────────────────────────────────────────────────────────
-
-/**
- * Create command — build a new project from scratch.
- *
- * Step 1: Welcome & Setup (env check + API key)
- * Step 2: Project Setup (name, description, mkdir, git init)
- * Step 3: Configuration & Install (synthetic analysis → server → write .claude/)
- * Step 4: Bootstrap (hand off to Claude CLI /bootstrap:auto)
- * Step 5: Post-bootstrap Sync (re-analyze, rewrite CLAUDE.md, finalize)
- */
-export async function runCreate(options = {}) {
-  const TOTAL_PHASES = 5;
-  let targetDir;
-
-  try {
-    // ================================================================
-    // STEP 1: Welcome & Setup
-    // ================================================================
-    renderBanner(VERSION);
-    renderCreatePhase(1, 'Welcome & Setup', TOTAL_PHASES);
-
-    // ── Pre-flight checks (Claude Code + API key + server) ──────
-    await runPreflight({
-      interactive: !options.yes,
-      requireClaude: true,
-    });
-
-    // ================================================================
-    // STEP 2: Project Setup
-    // ================================================================
-    renderCreatePhase(2, 'Project Setup', TOTAL_PHASES);
-
-    let createProfile;
-    if (options.yes) {
-      createProfile = {
-        name: options.name || 'my-project',
-        description: options.description || 'A new project',
-        projectType: 'monolith',
-      };
-      logger.info(`Non-interactive mode — creating ${chalk.bold(createProfile.name)} (monolith).`);
-    } else {
-      createProfile = await gatherCreateProfile();
-    }
-
-    let { name, description, projectType } = createProfile;
-
-    // Resolve target directory
-    const parentDir = resolve(options.dir || process.cwd());
-    let useCurrentDir = false;
-
-    if (!name) {
-      // Empty name = use current directory — must be empty
-      targetDir = parentDir;
-      useCurrentDir = true;
-      const contents = readdirSync(targetDir).filter((f) => f !== '.git');
-      if (contents.length > 0) {
-        logger.error(`Current directory ${chalk.bold(targetDir)} is not empty. Cannot create a project here.`);
-        process.exit(1);
-      }
-      name = basename(targetDir) || 'my-project';
-    } else {
-      // Named project — re-prompt if directory already exists
-      targetDir = join(parentDir, name);
-      while (existsSync(targetDir)) {
-        logger.warn(`Directory ${chalk.bold(name)} already exists.`);
-        const newName = await themedInput({
-          message: 'Enter a different project name:',
-          hint: 'Letters, numbers, dots, hyphens, underscores only.',
-          validate: (v) => {
-            const t = v.trim();
-            if (!t) return 'Name is required.';
-            if (!/^[a-zA-Z0-9._-]+$/.test(t)) return 'Only letters, numbers, dots, hyphens, and underscores allowed.';
-            return true;
-          },
-        });
-        name = newName.trim();
-        targetDir = join(parentDir, name);
-      }
-    }
-
-    // Create directory + git init
-    const spinner1 = ora(useCurrentDir ? 'Initializing project in current directory...' : 'Creating project directory...').start();
-    if (!useCurrentDir) {
-      mkdirSync(targetDir, { recursive: true });
-    }
-
-    // Write a minimal .gitignore
-    writeFileSync(
-      join(targetDir, '.gitignore'),
-      'node_modules/\ndist/\nbuild/\n.env\n.env.*\n!.env.example\n*.log\n.DS_Store\nThumbs.db\n',
-      'utf8',
-    );
-
-    // git init
-    try {
-      const { file, args } = platformCmd('git', ['init']);
-      execFileSync(file, args, { cwd: targetDir, stdio: 'pipe', windowsHide: true });
-      spinner1.succeed(useCurrentDir
-        ? `Initialized project in ${chalk.bold(targetDir)} with git.`
-        : `Created ${chalk.bold(name)}/ with git initialized.`);
-    } catch {
-      spinner1.succeed(useCurrentDir
-        ? `Initialized project in ${chalk.bold(targetDir)} (git init skipped — git not available).`
-        : `Created ${chalk.bold(name)}/ (git init skipped — git not available).`);
-    }
-
-    // ================================================================
-    // STEP 3: Configuration & Install
-    // ================================================================
-    renderCreatePhase(3, 'Configuration', TOTAL_PHASES);
-
-    // Analyze description with Claude to infer tech stack
-    let descAnalysis = null;
-    {
-      const spinnerAnalyze = ora('Analyzing your requirements...').start();
-      const { analysis, failReason } = await analyzeDescription(description, projectType);
-      if (analysis) {
-        descAnalysis = analysis;
-        const parts = [];
-        if (analysis.frameworks.length) parts.push(analysis.frameworks.join(', '));
-        if (analysis.languages.length) parts.push(analysis.languages.join(', '));
-        if (analysis.databases.length) parts.push(analysis.databases.join(', '));
-        spinnerAnalyze.succeed(
-          parts.length
-            ? `Detected stack: ${chalk.bold(parts.join(' + '))}`
-            : 'Requirements analyzed.',
-        );
-      } else {
-        spinnerAnalyze.info(`Stack inference skipped${failReason ? ` (${failReason})` : ''} — using defaults.`);
-      }
-    }
-
-    // Build project info — enriched with description analysis if available
-    const syntheticProjectInfo = {
-      name,
-      description,
-      projectType,
-      languages: descAnalysis?.languages?.length ? descAnalysis.languages : [],
-      frameworks: descAnalysis?.frameworks?.length ? descAnalysis.frameworks : [],
-      codeStyle: descAnalysis?.codeStyle?.length ? descAnalysis.codeStyle : [],
-      cicd: descAnalysis?.cicd?.length ? descAnalysis.cicd : [],
-      subprojects: descAnalysis?.subprojects?.length ? descAnalysis.subprojects : [],
-      architecture: descAnalysis?.architecture || '',
-      buildCommands: descAnalysis?.buildCommands || {},
-      complexity: descAnalysis?.complexity ?? 0.3,
-      metrics: descAnalysis?.metrics || null,
-      entryPoints: descAnalysis?.entryPoints || [],
-      coreModules: descAnalysis?.coreModules || [],
-      testFramework: descAnalysis?.testFramework || '',
-      packageManager: descAnalysis?.packageManager || '',
-      languageDistribution: descAnalysis?.languageDistribution || null,
-    };
-
-    const syntheticDetected = {
-      ...syntheticProjectInfo,
-      sensitiveFiles: { found: [], gitignoreCovers: true },
-      _rootFiles: [],
-      databases: descAnalysis?.databases?.length ? descAnalysis.databases : [],
-    };
-
-    // Call server
-    const spinner3 = ora('Calling claude-craft server...').start();
-
-    let apiResponse;
-    try {
-      apiResponse = await callGenerate(
-        {
-          ...syntheticProjectInfo,
-          detectedFiles: [],
-          databases: syntheticDetected.databases,
-        },
-        { projectPath: targetDir },
-      );
-      spinner3.succeed('Server returned configuration.');
-    } catch (err) {
-      spinner3.fail('Server request failed.');
-      if (err instanceof ApiError) {
-        logger.error(err.message);
-        process.exit(1);
-      }
-      throw err;
-    }
-
-    const { summary, mcpConfigs } = apiResponse;
-
-    // Validate we got components
-    const guaranteedCount = summary?.guaranteed
-      ? Object.values(summary.guaranteed).reduce((s, arr) => s + (Array.isArray(arr) ? arr.length : 0), 0)
-      : 0;
-
-    if (guaranteedCount === 0) {
-      logger.warn('Server returned zero guaranteed components. Continuing with core defaults.');
-    }
-
-    // Display scoring summary
-    console.log();
-    renderComponentBreakdown(summary);
-
-    // Auto-install all MCPs returned by the server
-    const selectedMcps = mcpConfigs || [];
-    const mcpKeys = {};
-    const securityConfig = { addSecurityGitignore: true };
-
-    // Cache analysis
-    try {
-      writeAnalysisCache(targetDir, syntheticProjectInfo, syntheticDetected, null);
-    } catch (cacheErr) {
-      logger.debug(`Analysis cache write failed: ${cacheErr.message}`);
-    }
-
-    // Write files
-    let results;
-    let filesToWrite;
-
-    try {
-      const installCtx = await runInstallTasks({
-        apiResponse,
-        targetDir,
-        selectedMcps,
-        mcpKeys,
-        securityConfig,
-        detected: syntheticDetected,
-        buildFileList,
-        writeApiFiles,
-      });
-
-      results = installCtx.results;
-      filesToWrite = installCtx.filesToWrite;
-    } catch {
-      // Fallback to direct write
-      const spinnerWrite = ora('Writing configuration files...').start();
-      filesToWrite = buildFileList(apiResponse);
-      results = await writeApiFiles(filesToWrite, targetDir, {
-        force: true,
-        selectedMcpIds: selectedMcps.map((m) => m.id),
-        mcpKeys,
-        securityConfig,
-        detected: syntheticDetected,
-      });
-      spinnerWrite.succeed('Configuration generated.');
-    }
-
-    // Update manifest
-    try {
-      if (filesToWrite) updateManifest(targetDir, results, filesToWrite);
-    } catch (cacheErr) {
-      logger.debug(`Manifest update failed: ${cacheErr.message}`);
-    }
-
-    // Display file results
-    renderFileResults(results);
-
-    // MCP verification
-    let mcpResults = [];
-    if (selectedMcps.length > 0) {
-      console.log();
-      try {
-        const verifyCtx = await runVerifyTasks(selectedMcps, mcpKeys, { setupMcps, targetDir });
-        mcpResults = verifyCtx.mcpResults;
-      } catch {
-        const spinnerMcp = ora('Verifying MCP servers...').start();
-        mcpResults = await setupMcps(selectedMcps, mcpKeys, {
-          healthCheck: true,
-          targetDir,
-          onStatus: (id, status) => {
-            if (status === 'verifying') spinnerMcp.text = `Verifying ${id}...`;
-            else if (status === 'testing') spinnerMcp.text = `Health-checking ${id}...`;
-          },
-        });
-        spinnerMcp.succeed('MCP verification complete.');
-      }
-
-      renderMcpStatus(mcpResults);
-    }
-
-    // ================================================================
-    // STEP 4: Bootstrap
-    // ================================================================
-    renderCreatePhase(4, 'Bootstrap', TOTAL_PHASES);
-
-    console.log(chalk.dim('  Handing off to Claude to scaffold your project...'));
-    console.log(chalk.dim('  This may take several minutes. Activity log:'));
-    console.log();
-
-    let bootstrapSucceeded = true;
-    try {
-      await runBootstrap(targetDir, description);
-    } catch (err) {
-      bootstrapSucceeded = false;
-      console.log();
-      logger.warn('Bootstrap did not complete: ' + err.message);
-      logger.info('Your .claude/ configuration is still intact. You can run /bootstrap:auto manually inside the project.');
-      console.log();
-    }
-
-    // ================================================================
-    // STEP 5: Post-Bootstrap Sync
-    // ================================================================
-    renderCreatePhase(5, 'Finalization', TOTAL_PHASES);
-
-    if (bootstrapSucceeded) {
-      // Re-analyze the now-real project
-      try {
-        const spinner5 = ora('Re-analyzing project...').start();
-        const fsDetected = await detectProject(targetDir);
-
-        let projectInfo;
-        try {
-          const { analysis } = await analyzeWithClaude(targetDir);
-          if (analysis) {
-            projectInfo = {
-              name: analysis.name || fsDetected.name || name,
-              description: analysis.description || fsDetected.description || description,
-              projectType: analysis.projectType || fsDetected.projectType || projectType,
-              languages: analysis.languages?.length ? analysis.languages : fsDetected.languages,
-              frameworks: analysis.frameworks?.length ? analysis.frameworks : fsDetected.frameworks,
-              codeStyle: analysis.codeStyle?.length ? analysis.codeStyle : fsDetected.codeStyle,
-              cicd: analysis.cicd?.length ? analysis.cicd : fsDetected.cicd,
-              subprojects: analysis.subprojects?.length ? analysis.subprojects : fsDetected.subprojects,
-              architecture: analysis.architecture || '',
-              buildCommands: analysis.buildCommands || {},
-              complexity: analysis.complexity ?? 0.5,
-              metrics: analysis.metrics || null,
-              entryPoints: analysis.entryPoints || [],
-              coreModules: analysis.coreModules || [],
-              testFramework: analysis.testFramework || '',
-              packageManager: analysis.packageManager || fsDetected.packageManager || '',
-              languageDistribution: analysis.languageDistribution || fsDetected.languageDistribution || null,
-            };
-          } else {
-            projectInfo = buildProjectInfoFromFs(fsDetected, name, description, projectType);
-          }
-        } catch {
-          projectInfo = buildProjectInfoFromFs(fsDetected, name, description, projectType);
-        }
-
-        spinner5.succeed('Project re-analyzed.');
-
-        // Overwrite cache with real data
-        const detected = { ...fsDetected, ...projectInfo };
-        writeAnalysisCache(targetDir, projectInfo, detected, null);
-      } catch (err) {
-        logger.debug(`Post-bootstrap analysis failed: ${err.message}`);
-      }
-    }
-
-    // Finalize — optimize settings + rewrite CLAUDE.md
-    try {
-      await runFinalizeTasks({
-        targetDir,
-        readAnalysisCache,
-        optimizeSettings,
-        rewriteClaudeMd,
-      });
-    } catch {
-      // Fallback to sequential
-      const spinnerOpt = ora('Optimizing settings...').start();
-      const optResult = optimizeSettings(targetDir);
-      if (optResult.status === 'ok' && optResult.applied > 0) {
-        spinnerOpt.succeed(`Optimized ${optResult.applied} setting(s).`);
-      } else {
-        spinnerOpt.succeed('Settings reviewed \u2014 no changes needed.');
-      }
-
-      const spinnerMd = ora('Rewriting CLAUDE.md...').start();
-      const cache = readAnalysisCache(targetDir);
-      const rewritten = await rewriteClaudeMd(targetDir, cache);
-      if (rewritten) {
-        spinnerMd.succeed('CLAUDE.md rewritten.');
-      } else {
-        spinnerMd.warn('CLAUDE.md rewrite skipped \u2014 using template version.');
-      }
-    }
-
-    // ── Success ──────────────────────────────────────────────────────
-    const totalItems = countTotalItems(summary);
-    const mcpsNeedingKeys = mcpResults.filter((r) => r.status === 'needs-key');
-
-    renderSuccessCard({
-      totalItems,
-      mcpCount: selectedMcps.length,
-      mcpsNeedingKeys,
-    });
-
-    console.log();
-    if (bootstrapSucceeded) {
-      logger.success(`Project ${chalk.bold(name)} created and bootstrapped!`);
-      console.log(chalk.dim(`  cd ${name} && claude`));
-    } else {
-      logger.success(`Project ${chalk.bold(name)} created with Claude configuration.`);
-      console.log(chalk.dim(`  cd ${name} && claude -p "/bootstrap:auto ${description}"`));
-    }
-    console.log();
-  } catch (err) {
-    if (
-      err &&
-      (err.name === 'ExitPromptError' ||
-        err.constructor?.name === 'ExitPromptError' ||
-        err.message?.includes('User force closed'))
-    ) {
-      console.log();
-      logger.info('Cancelled.');
-      process.exit(0);
-    }
-
-    console.log();
-    logger.error(err.message || String(err));
-    process.exit(1);
-  } finally {
-    if (targetDir) {
-      try {
-        promoteCache(targetDir);
-        cleanupAnalysisCache(targetDir);
-      } catch {
-        // Ignore cleanup errors
-      }
-    }
-  }
-}
-
-// ── Helper: build projectInfo from filesystem detection only ─────────────────
-
-function buildProjectInfoFromFs(fsDetected, name, description, projectType) {
-  return {
-    name: fsDetected.name || name,
-    description: fsDetected.description || description,
-    projectType: fsDetected.projectType || projectType,
-    languages: fsDetected.languages?.length ? fsDetected.languages : [],
-    frameworks: fsDetected.frameworks || [],
-    codeStyle: fsDetected.codeStyle || [],
-    cicd: fsDetected.cicd || [],
-    subprojects: fsDetected.subprojects || [],
-    architecture: '',
-    buildCommands: {},
-    complexity: 0.5,
-    metrics: null,
-    entryPoints: [],
-    coreModules: [],
-    testFramework: '',
-    packageManager: fsDetected.packageManager || '',
-    languageDistribution: fsDetected.languageDistribution || null,
-  };
-}