@qazuor/claude-code-config 0.6.1 → 0.6.2

package/dist/bin.js

@@ -6042,29 +6042,6 @@ function showReplacementReport(report) {
 // src/lib/scaffold/claude-md-generator.ts
 init_esm_shims();
 init_fs();
-
-// src/lib/utils/paths.ts
-init_esm_shims();
-import fs3 from "fs";
-import path5 from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
-function getPackageRoot() {
-  const currentFilePath = fileURLToPath2(import.meta.url);
-  let currentDir = path5.dirname(currentFilePath);
-  while (currentDir !== path5.dirname(currentDir)) {
-    const packageJsonPath = path5.join(currentDir, "package.json");
-    if (fs3.existsSync(packageJsonPath)) {
-      return currentDir;
-    }
-    currentDir = path5.dirname(currentDir);
-  }
-  throw new Error("Could not find package root (no package.json found in parent directories)");
-}
-function getTemplatesPath() {
-  return path5.join(getPackageRoot(), "templates");
-}
-
-// src/lib/scaffold/claude-md-generator.ts
 async function generateClaudeMd(projectPath, projectInfo, options) {
   const claudeMdPath = joinPath(projectPath, "CLAUDE.md");
   const exists = await pathExists(claudeMdPath);
@@ -6076,18 +6053,12 @@ async function generateClaudeMd(projectPath, projectInfo, options) {
     };
   }
   try {
-    let template;
+    let content;
     if (options?.customTemplate) {
-      template = options.customTemplate;
+      content = processCustomTemplate(options.customTemplate, projectInfo);
     } else {
-      const templatePath = joinPath(getTemplatesPath(), "CLAUDE.md.template");
-      if (await pathExists(templatePath)) {
-        template = await readFile(templatePath);
-      } else {
-        template = getMinimalTemplate();
-      }
+      content = generateClaudeMdContent(projectInfo, options);
     }
-    const content = processTemplate(template, projectInfo, options);
     await writeFile(claudeMdPath, content);
     return {
       created: true,
@@ -6112,41 +6083,165 @@ async function generateClaudeMdWithSpinner(projectPath, projectInfo, options) {
     }
   );
 }
-function processTemplate(template, projectInfo, options) {
-  let content = template;
+function processCustomTemplate(template, projectInfo) {
+  return template.replace(/\{\{PROJECT_NAME\}\}/g, projectInfo.name).replace(/\{\{PROJECT_DESCRIPTION\}\}/g, projectInfo.description).replace(/\{\{ORG\}\}/g, projectInfo.org).replace(/\{\{REPO\}\}/g, projectInfo.repo).replace(/\{\{ENTITY_TYPE\}\}/g, projectInfo.entityType).replace(/\{\{ENTITY_TYPE_PLURAL\}\}/g, projectInfo.entityTypePlural).replace(/\{\{DOMAIN\}\}/g, projectInfo.domain || "").replace(/\{\{LOCATION\}\}/g, projectInfo.location || "");
+}
+function generateClaudeMdContent(projectInfo, options) {
   const techStack = options?.templateConfig?.techStack;
   const commands = options?.templateConfig?.commands;
   const targets = options?.templateConfig?.targets;
   const preferences = options?.claudeConfig?.preferences;
   const standards = options?.claudeConfig?.extras?.standards;
-  content = content.replace(/\{\{PROJECT_NAME\}\}/g, projectInfo.name).replace(/\{\{PROJECT_DESCRIPTION\}\}/g, projectInfo.description).replace(/\{\{ORG\}\}/g, projectInfo.org).replace(/\{\{REPO\}\}/g, projectInfo.repo).replace(/\{\{ENTITY_TYPE\}\}/g, projectInfo.entityType).replace(/\{\{ENTITY_TYPE_PLURAL\}\}/g, projectInfo.entityTypePlural).replace(/\{\{LOCATION\}\}/g, projectInfo.location || "");
   const packageManager = preferences?.packageManager || "pnpm";
-  content = content.replace(/\{\{PACKAGE_MANAGER\}\}/g, packageManager);
-  const coverageTarget = standards?.testing?.coverageTarget ? String(standards.testing.coverageTarget) : targets && "coverage" in targets ? String(targets.coverage) : "90";
-  content = content.replace(/\{\{COVERAGE_TARGET\}\}/g, coverageTarget);
-  content = processStandardsPlaceholders(content, standards, preferences);
+  const lines = [];
+  lines.push("# CLAUDE.md");
+  lines.push("");
+  lines.push("## Project Overview");
+  lines.push("");
+  lines.push(`**${projectInfo.name}** - ${projectInfo.description}`);
+  lines.push("");
+  lines.push("## Repository");
+  lines.push("");
+  lines.push(`- **Organization:** ${projectInfo.org}`);
+  lines.push(`- **Repository:** ${projectInfo.repo}`);
+  lines.push(`- **GitHub:** https://github.com/${projectInfo.org}/${projectInfo.repo}`);
   if (projectInfo.domain) {
-    content = content.replace(/\{\{#if DOMAIN\}\}/g, "").replace(/\{\{\/if\}\}/g, "").replace(/\{\{DOMAIN\}\}/g, projectInfo.domain);
-  } else {
-    content = content.replace(/\{\{#if DOMAIN\}\}[\s\S]*?\{\{\/if\}\}/g, "");
+    lines.push(`- **Domain:** ${projectInfo.domain}`);
   }
-  if (techStack && Object.keys(techStack).length > 0) {
-    const techStackContent = generateTechStackSection(techStack);
-    content = content.replace(/\{\{#if TECH_STACK\}\}/g, "").replace(/\{\{TECH_STACK\}\}\n\{\{else\}\}[\s\S]*?\{\{\/if\}\}/g, techStackContent);
-  } else {
-    content = content.replace(/\{\{#if TECH_STACK\}\}[\s\S]*?\{\{else\}\}/g, "").replace(/\{\{\/if\}\}/g, "");
+  lines.push("");
+  lines.push("## Tech Stack");
+  lines.push("");
+  lines.push(generateTechStackSection(techStack));
+  lines.push("## Project Structure");
+  lines.push("");
+  lines.push("```text");
+  lines.push(`${projectInfo.name}/`);
+  lines.push("\u251C\u2500\u2500 src/              # Source code");
+  lines.push("\u251C\u2500\u2500 tests/            # Test files");
+  lines.push("\u251C\u2500\u2500 docs/             # Documentation");
+  lines.push("\u2514\u2500\u2500 .claude/          # Claude configuration");
+  lines.push("    \u251C\u2500\u2500 agents/       # AI agent definitions");
+  lines.push("    \u251C\u2500\u2500 commands/     # Custom slash commands");
+  lines.push("    \u251C\u2500\u2500 skills/       # Specialized skills");
+  lines.push("    \u2514\u2500\u2500 docs/         # AI-specific documentation");
+  lines.push("```");
+  lines.push("");
+  lines.push("## Quick Commands");
+  lines.push("");
+  lines.push(generateCommandsSection(commands, packageManager));
+  lines.push("## Development Guidelines");
+  lines.push("");
+  lines.push("### Code Standards");
+  lines.push("");
+  lines.push("- Primary language: TypeScript");
+  lines.push("- Follow TypeScript best practices");
+  if (standards?.code?.namedExportsOnly) {
+    lines.push("- Use named exports only (no default exports)");
+  }
+  const maxLines = standards?.code?.maxFileLines || 500;
+  lines.push(`- Maximum ${maxLines} lines per file`);
+  if (standards?.code?.jsDocRequired) {
+    lines.push("- Document all exports with JSDoc");
   }
-  if (commands && Object.keys(commands).length > 0) {
-    const commandsContent = generateCommandsSection(commands, packageManager);
-    content = content.replace(/\{\{#if COMMANDS\}\}/g, "").replace(/\{\{COMMANDS\}\}\n\{\{else\}\}[\s\S]*?\{\{\/if\}\}/g, commandsContent);
+  if (standards?.code?.roroPattern) {
+    lines.push("- Use RO-RO pattern (Receive Object, Return Object)");
+  }
+  lines.push("");
+  lines.push("### Testing");
+  lines.push("");
+  if (standards?.testing?.tddRequired) {
+    lines.push("- Methodology: TDD (Test-Driven Development)");
+    lines.push("- Write tests first: Red -> Green -> Refactor");
   } else {
-    content = content.replace(/\{\{#if COMMANDS\}\}[\s\S]*?\{\{else\}\}/g, "").replace(/\{\{\/if\}\}/g, "");
+    lines.push("- Write comprehensive tests for all features");
   }
-  content = content.replace(/\{\{#if PROJECT_STRUCTURE\}\}[\s\S]*?\{\{else\}\}/g, "").replace(/\{\{\/if\}\}/g, "");
-  return content;
+  const coverageTarget = standards?.testing?.coverageTarget || (targets && "coverage" in targets ? targets.coverage : 90);
+  lines.push(`- Maintain ${coverageTarget}%+ code coverage`);
+  const testPattern = standards?.testing?.testPattern === "gwt" ? "GWT (Given-When-Then)" : "AAA (Arrange, Act, Assert)";
+  lines.push(`- Test pattern: ${testPattern}`);
+  if (standards?.testing?.testLocation) {
+    const testLocationText = standards.testing.testLocation === "colocated" ? "Co-located with source" : "Separate test directory";
+    lines.push(`- Test location: ${testLocationText}`);
+  }
+  lines.push("");
+  lines.push("### Git Workflow");
+  lines.push("");
+  lines.push("- Use conventional commits: `type(scope): description`");
+  lines.push("- Types: feat, fix, docs, style, refactor, test, chore");
+  lines.push("- Keep commits atomic and focused");
+  if (preferences?.includeCoAuthor) {
+    lines.push("");
+    lines.push("#### Commit Attribution");
+    lines.push("");
+    lines.push("Include the following in commit messages:");
+    lines.push("```");
+    lines.push("\u{1F916} Generated with [Claude Code](https://claude.com/claude-code)");
+    lines.push("");
+    lines.push("Co-Authored-By: Claude <noreply@anthropic.com>");
+    lines.push("```");
+  }
+  lines.push("");
+  lines.push("## Claude Behavior Guidelines");
+  lines.push("");
+  lines.push("### Critical Thinking");
+  lines.push("");
+  lines.push("- You are an expert who double-checks things, you are skeptical and do research");
+  lines.push("- Neither the user nor you are always right, but both strive for accuracy");
+  lines.push("- When the user asks something, reason with these questions:");
+  lines.push('  - "Why might the user be wrong?"');
+  lines.push('  - "What arguments exist against what the user thinks?"');
+  lines.push(`  - "Act as devil's advocate - why might this proposal fail?"`);
+  lines.push(`  - "Imagine you're in a debate - how would you refute this?"`);
+  lines.push(
+    "- Always ask to better understand the context of the requested change before implementing"
+  );
+  lines.push("");
+  lines.push("### Communication Style");
+  lines.push("");
+  if (preferences?.responseLanguage) {
+    const langDisplay = preferences.responseLanguage === "es" ? "Spanish" : preferences.responseLanguage === "en" ? "English" : preferences.responseLanguage;
+    lines.push(`- Respond in ${langDisplay}`);
+  }
+  lines.push("- Code and comments should always be in English");
+  lines.push("- Be direct and concise");
+  lines.push('- Explain the "why" behind decisions when relevant');
+  lines.push("");
+  lines.push("### Writing Style");
+  lines.push("");
+  lines.push(
+    '- Systematically replace em-dashes ("\u2014") with a period (".") to start a new sentence, or a comma (",") to continue the sentence'
+  );
+  lines.push("- Avoid unnecessary filler words");
+  lines.push("- Use clear, technical language");
+  lines.push("");
+  lines.push("## Claude Configuration");
+  lines.push("");
+  lines.push("This project uses `@qazuor/claude-code-config` for AI-assisted development.");
+  lines.push("");
+  lines.push("### Available Commands");
+  lines.push("");
+  lines.push("Run `/help` in Claude to see all available commands.");
+  lines.push("");
+  lines.push("### Documentation");
+  lines.push("");
+  lines.push("- Quick Start: `.claude/docs/quick-start.md`");
+  lines.push("- Workflows: `.claude/docs/workflows/README.md`");
+  lines.push("- Standards: `.claude/docs/standards/`");
+  lines.push("");
+  lines.push("---");
+  lines.push("");
+  lines.push(
+    "*Generated by [@qazuor/claude-code-config](https://github.com/qazuor/claude-code-config)*"
+  );
+  lines.push("");
+  return lines.join("\n");
 }
 function generateTechStackSection(techStack) {
+  if (!techStack) {
+    return getDefaultTechStack();
+  }
   const lines = [];
+  let hasContent = false;
   if (techStack.frontendFramework && techStack.frontendFramework !== "None") {
     lines.push("**Frontend:**");
     lines.push(`- Framework: ${techStack.frontendFramework}`);
@@ -6154,6 +6249,7 @@ function generateTechStackSection(techStack) {
       lines.push(`- State: ${techStack.stateManagement}`);
     }
     lines.push("");
+    hasContent = true;
   }
   if (techStack.apiFramework && techStack.apiFramework !== "None") {
     lines.push("**Backend:**");
@@ -6162,145 +6258,89 @@ function generateTechStackSection(techStack) {
       lines.push(`- Validation: ${techStack.validationLibrary}`);
     }
     lines.push("");
+    hasContent = true;
   }
   if (techStack.databaseOrm && techStack.databaseOrm !== "None") {
     lines.push("**Database:**");
     lines.push(`- ORM: ${techStack.databaseOrm}`);
     lines.push("");
+    hasContent = true;
   }
   if (techStack.authPattern && techStack.authPattern !== "None") {
     lines.push("**Authentication:**");
     lines.push(`- Provider: ${techStack.authPattern}`);
     lines.push("");
+    hasContent = true;
   }
   if (techStack.testFramework && techStack.testFramework !== "None") {
     lines.push("**Testing:**");
     lines.push(`- Framework: ${techStack.testFramework}`);
     lines.push("");
+    hasContent = true;
   }
   if (techStack.bundler && techStack.bundler !== "None") {
     lines.push("**Build:**");
     lines.push(`- Bundler: ${techStack.bundler}`);
     lines.push("");
+    hasContent = true;
+  }
+  if (!hasContent) {
+    return getDefaultTechStack();
   }
   return lines.join("\n");
 }
-function generateCommandsSection(commands, packageManager) {
+function getDefaultTechStack() {
+  return `**Frontend:**
+- Framework: Not configured
+
+**Backend:**
+- API: Not configured
+
+**Database:**
+- ORM: Not configured
+
+**Testing:**
+- Framework: Not configured
+
+`;
+}
+function generateCommandsSection(commands, packageManager = "pnpm") {
   const lines = ["```bash"];
   lines.push("# Development");
   lines.push(`${packageManager} dev              # Start development server`);
   lines.push("");
   lines.push("# Testing");
-  if (commands.test) {
+  if (commands?.test) {
     lines.push(`${commands.test}           # Run tests`);
   } else {
     lines.push(`${packageManager} test             # Run tests`);
   }
-  if (commands.coverage) {
+  if (commands?.coverage) {
     lines.push(`${commands.coverage}  # Run tests with coverage`);
   } else {
     lines.push(`${packageManager} test:coverage    # Run tests with coverage`);
   }
   lines.push("");
   lines.push("# Quality");
-  if (commands.lint) {
+  if (commands?.lint) {
     lines.push(`${commands.lint}           # Run linter`);
   } else {
     lines.push(`${packageManager} lint             # Run linter`);
   }
-  if (commands.typecheck) {
+  if (commands?.typecheck) {
     lines.push(`${commands.typecheck}      # Type checking`);
   } else {
     lines.push(`${packageManager} typecheck        # Type checking`);
   }
-  if (commands.build) {
+  if (commands?.build) {
     lines.push("");
     lines.push("# Build");
     lines.push(`${commands.build}          # Build for production`);
   }
   lines.push("```");
+  lines.push("");
   return lines.join("\n");
 }
-function processStandardsPlaceholders(content, standards, preferences) {
-  let result = content;
-  const primaryLanguage = "TypeScript";
-  result = result.replace(/\{\{PRIMARY_LANGUAGE\}\}/g, primaryLanguage);
-  const maxFileLines = standards?.code?.maxFileLines?.toString() || "500";
-  result = result.replace(/\{\{MAX_FILE_LINES\}\}/g, maxFileLines);
-  const testPattern = standards?.testing?.testPattern === "gwt" ? "GWT (Given-When-Then)" : "AAA (Arrange, Act, Assert)";
-  result = result.replace(/\{\{TEST_PATTERN\}\}/g, testPattern);
-  const responseLanguage = preferences?.responseLanguage === "es" ? "Spanish" : preferences?.responseLanguage === "en" ? "English" : "Spanish";
-  result = result.replace(/\{\{RESPONSE_LANGUAGE\}\}/g, responseLanguage);
-  if (standards?.code?.namedExportsOnly) {
-    result = result.replace(/\{\{#if NAMED_EXPORTS_ONLY\}\}/g, "").replace(/\{\{\/if\}\}/g, "");
-  } else {
-    result = result.replace(/\{\{#if NAMED_EXPORTS_ONLY\}\}[\s\S]*?\{\{\/if\}\}/g, "");
-  }
-  if (standards?.code?.jsDocRequired) {
-    result = result.replace(/\{\{#if JSDOC_REQUIRED\}\}/g, "").replace(/\{\{\/if\}\}/g, "");
-  } else {
-    result = result.replace(/\{\{#if JSDOC_REQUIRED\}\}[\s\S]*?\{\{\/if\}\}/g, "");
-  }
-  if (standards?.code?.roroPattern) {
-    result = result.replace(/\{\{#if RORO_PATTERN\}\}/g, "").replace(/\{\{\/if\}\}/g, "");
-  } else {
-    result = result.replace(/\{\{#if RORO_PATTERN\}\}[\s\S]*?\{\{\/if\}\}/g, "");
-  }
-  if (standards?.testing?.tddRequired) {
-    result = result.replace(/\{\{#if TDD_REQUIRED\}\}/g, "").replace(/\{\{else\}\}[\s\S]*?\{\{\/if\}\}/g, "");
-  } else {
-    result = result.replace(/\{\{#if TDD_REQUIRED\}\}[\s\S]*?\{\{else\}\}/g, "").replace(/\{\{\/if\}\}/g, "");
-  }
-  const testLocation = standards?.testing?.testLocation;
-  if (testLocation) {
-    const testLocationText = testLocation === "colocated" ? "Co-located with source" : "Separate test directory";
-    result = result.replace(/\{\{#if TEST_LOCATION\}\}/g, "").replace(/\{\{\/if\}\}/g, "").replace(/\{\{TEST_LOCATION\}\}/g, testLocationText);
-  } else {
-    result = result.replace(/\{\{#if TEST_LOCATION\}\}[\s\S]*?\{\{\/if\}\}/g, "");
-  }
-  if (preferences?.includeCoAuthor) {
-    result = result.replace(/\{\{#if INCLUDE_CO_AUTHOR\}\}/g, "").replace(/\{\{\/if\}\}/g, "");
-  } else {
-    result = result.replace(/\{\{#if INCLUDE_CO_AUTHOR\}\}[\s\S]*?\{\{\/if\}\}/g, "");
-  }
-  if (preferences?.responseLanguage) {
-    result = result.replace(/\{\{#if RESPONSE_LANGUAGE\}\}/g, "").replace(/\{\{\/if\}\}/g, "");
-  } else {
-    result = result.replace(/\{\{#if RESPONSE_LANGUAGE\}\}[\s\S]*?\{\{\/if\}\}/g, "");
-  }
-  return result;
-}
-function getMinimalTemplate() {
-  return `# CLAUDE.md
-
-## Project Overview
-
-**{{PROJECT_NAME}}** - {{PROJECT_DESCRIPTION}}
-
-## Repository
-
-- **GitHub:** https://github.com/{{ORG}}/{{REPO}}
-
-## Quick Commands
-
-\`\`\`bash
-{{PACKAGE_MANAGER}} dev        # Start development
-{{PACKAGE_MANAGER}} test       # Run tests
-{{PACKAGE_MANAGER}} lint       # Run linter
-{{PACKAGE_MANAGER}} build      # Build project
-\`\`\`
-
-## Claude Configuration
-
-This project uses \`@qazuor/claude-code-config\` for AI-assisted development.
-
-See \`.claude/docs/quick-start.md\` for getting started.
-
----
-
-*Generated by [@qazuor/claude-code-config](https://github.com/qazuor/claude-code-config)*
-`;
-}
 
 // src/lib/scaffold/index.ts
 init_esm_shims();
@@ -7053,8 +7093,8 @@ function buildSettingsLocalJson(options) {
 
 // src/lib/templates/config-replacer.ts
 init_esm_shims();
-import * as fs4 from "fs/promises";
-import * as path6 from "path";
+import * as fs3 from "fs/promises";
+import * as path5 from "path";
 import ora2 from "ora";
 
 // src/constants/template-placeholders.ts
@@ -7962,7 +8002,7 @@ function flattenTemplateConfig(config) {
   return flattened;
 }
 function shouldProcessFile(filePath) {
-  const ext = path6.extname(filePath).toLowerCase();
+  const ext = path5.extname(filePath).toLowerCase();
   return PROCESSABLE_EXTENSIONS.includes(ext);
 }
 function shouldSkipDirectory(dirName) {
@@ -7971,9 +8011,9 @@ function shouldSkipDirectory(dirName) {
 async function getAllFiles(dir) {
   const files = [];
   try {
-    const entries = await fs4.readdir(dir, { withFileTypes: true });
+    const entries = await fs3.readdir(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = path6.join(dir, entry.name);
+      const fullPath = path5.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (!shouldSkipDirectory(entry.name)) {
           const subFiles = await getAllFiles(fullPath);
@@ -7990,7 +8030,7 @@ async function getAllFiles(dir) {
 async function replaceInFile2(filePath, replacements) {
   const changes = [];
   try {
-    let content = await fs4.readFile(filePath, "utf-8");
+    let content = await fs3.readFile(filePath, "utf-8");
     let modified = false;
     for (const [placeholder, value] of Object.entries(replacements)) {
       if (content.includes(placeholder)) {
@@ -8000,7 +8040,7 @@ async function replaceInFile2(filePath, replacements) {
       }
     }
     if (modified) {
-      await fs4.writeFile(filePath, content, "utf-8");
+      await fs3.writeFile(filePath, content, "utf-8");
     }
   } catch {
   }
@@ -8021,7 +8061,7 @@ async function replaceTemplatePlaceholders(dir, config) {
       report.filesModified++;
       for (const change of changes) {
         report.replacements.push({
-          file: path6.relative(dir, file),
+          file: path5.relative(dir, file),
           placeholder: change.placeholder,
           value: change.value
         });
@@ -8092,11 +8132,11 @@ async function previewReplacements(dir, config) {
   const preview = [];
   for (const file of files) {
     try {
-      const content = await fs4.readFile(file, "utf-8");
+      const content = await fs3.readFile(file, "utf-8");
       for (const [placeholder, value] of Object.entries(replacements)) {
         if (content.includes(placeholder)) {
           preview.push({
-            file: path6.relative(dir, file),
+            file: path5.relative(dir, file),
             placeholder,
             value
           });
@@ -8111,6 +8151,27 @@ async function previewReplacements(dir, config) {
 // src/cli/commands/init.ts
 init_fs();
 
+// src/lib/utils/paths.ts
+init_esm_shims();
+import fs4 from "fs";
+import path6 from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+function getPackageRoot() {
+  const currentFilePath = fileURLToPath2(import.meta.url);
+  let currentDir = path6.dirname(currentFilePath);
+  while (currentDir !== path6.dirname(currentDir)) {
+    const packageJsonPath = path6.join(currentDir, "package.json");
+    if (fs4.existsSync(packageJsonPath)) {
+      return currentDir;
+    }
+    currentDir = path6.dirname(currentDir);
+  }
+  throw new Error("Could not find package root (no package.json found in parent directories)");
+}
+function getTemplatesPath() {
+  return path6.join(getPackageRoot(), "templates");
+}
+
 // src/lib/utils/prompt-cancel.ts
 init_esm_shims();
 import * as readline from "readline";
@@ -10647,6 +10708,61 @@ async function promptMcpConfig(options) {
   const installedServers = await getInstalledMcpServers(projectPath);
   const userInstalledSet = new Set(installedServers.user);
   const projectInstalledSet = new Set(installedServers.project);
+  const availableServers = MCP_SERVERS.filter(
+    (s) => !userInstalledSet.has(s.id) && !projectInstalledSet.has(s.id)
+  );
+  if (availableServers.length === 0) {
+    logger.newline();
+    logger.success("All MCP servers are already installed!");
+    const parts = [];
+    if (userInstalledSet.size > 0) {
+      parts.push(`${userInstalledSet.size} at user level`);
+    }
+    if (projectInstalledSet.size > 0) {
+      parts.push(`${projectInstalledSet.size} at project level`);
+    }
+    logger.info(colors.muted(`  (${parts.join(", ")})`));
+    logger.newline();
+    const wantCustom2 = await confirm({
+      message: "Do you want to add a custom MCP server?",
+      default: false
+    });
+    if (wantCustom2) {
+      const level2 = await select({
+        message: "Where should the custom server be configured?",
+        choices: [
+          {
+            name: "Project level (.claude/settings.local.json)",
+            value: "project",
+            description: "Specific to this project"
+          },
+          {
+            name: "User level (~/.claude/settings.json)",
+            value: "user",
+            description: "Available in all projects"
+          }
+        ],
+        default: options?.defaults?.level || "project"
+      });
+      const customInstallation = await promptCustomServer(level2);
+      if (customInstallation) {
+        return {
+          config: {
+            level: level2,
+            servers: [customInstallation]
+          },
+          skippedConfigs: []
+        };
+      }
+    }
+    return {
+      config: {
+        level: "project",
+        servers: []
+      },
+      skippedConfigs: []
+    };
+  }
   const level = await select({
     message: "Where should MCP servers be configured?",
     choices: [
@@ -10680,37 +10796,18 @@ async function promptMcpConfig(options) {
   }
   logger.newline();
   for (const [category, servers] of Object.entries(serversByCategory)) {
-    const choices = servers.map((s) => {
-      const isInstalledAtUserLevel = userInstalledSet.has(s.id);
-      const isInstalledAtProjectLevel = projectInstalledSet.has(s.id);
-      if (isInstalledAtUserLevel) {
-        return {
-          name: `${s.name} - ${s.description} ${colors.muted("(already installed at user level)")}`,
-          value: s.id,
-          checked: false,
-          disabled: "already installed at user level"
-        };
-      }
-      if (isInstalledAtProjectLevel) {
-        return {
-          name: `${s.name} - ${s.description} ${colors.muted("(already installed at project level)")}`,
-          value: s.id,
-          checked: false,
-          disabled: "already installed at project level"
-        };
-      }
-      return {
-        name: `${s.name} - ${s.description}`,
-        value: s.id,
-        checked: options?.defaults?.servers?.some((i) => i.serverId === s.id) ?? false
-      };
-    });
-    const hasEnabledChoices = choices.some((choice) => !choice.disabled);
-    const categoryLabel = formatCategory(category);
-    if (!hasEnabledChoices) {
-      logger.info(colors.muted(`${categoryLabel}: All servers already installed`));
+    const availableInCategory = servers.filter(
+      (s) => !userInstalledSet.has(s.id) && !projectInstalledSet.has(s.id)
+    );
+    if (availableInCategory.length === 0) {
       continue;
     }
+    const choices = availableInCategory.map((s) => ({
+      name: `${s.name} - ${s.description}`,
+      value: s.id,
+      checked: options?.defaults?.servers?.some((i) => i.serverId === s.id) ?? false
+    }));
+    const categoryLabel = formatCategory(category);
     const selected = await checkbox({
       message: `${categoryLabel}:`,
       choices