bmad-method 6.0.0-alpha.7 → 6.0.0-alpha.9

package/tools/cli/installers/lib/core/config-collector.js

@@ -13,14 +13,56 @@ class ConfigCollector {
     this.currentProjectDir = null;
   }
 
+  /**
+   * Find the bmad installation directory in a project
+   * V6+ installations can use ANY folder name but ALWAYS have _cfg/manifest.yaml
+   * @param {string} projectDir - Project directory
+   * @returns {Promise<string>} Path to bmad directory
+   */
+  async findBmadDir(projectDir) {
+    // Check if project directory exists
+    if (!(await fs.pathExists(projectDir))) {
+      // Project doesn't exist yet, return default
+      return path.join(projectDir, 'bmad');
+    }
+
+    // V6+ strategy: Look for ANY directory with _cfg/manifest.yaml
+    // This is the definitive marker of a V6+ installation
+    try {
+      const entries = await fs.readdir(projectDir, { withFileTypes: true });
+      for (const entry of entries) {
+        if (entry.isDirectory()) {
+          const manifestPath = path.join(projectDir, entry.name, '_cfg', 'manifest.yaml');
+          if (await fs.pathExists(manifestPath)) {
+            // Found a V6+ installation
+            return path.join(projectDir, entry.name);
+          }
+        }
+      }
+    } catch {
+      // Ignore errors, fall through to default
+    }
+
+    // No V6+ installation found, return default
+    // This will be used for new installations
+    return path.join(projectDir, 'bmad');
+  }
+
   /**
    * Load existing config if it exists from module config files
    * @param {string} projectDir - Target project directory
    */
   async loadExistingConfig(projectDir) {
-    const bmadDir = path.join(projectDir, 'bmad');
     this.existingConfig = {};
 
+    // Check if project directory exists first
+    if (!(await fs.pathExists(projectDir))) {
+      return false;
+    }
+
+    // Find the actual bmad directory (handles custom folder names)
+    const bmadDir = await this.findBmadDir(projectDir);
+
     // Check if bmad directory exists
     if (!(await fs.pathExists(bmadDir))) {
       return false;
@@ -159,27 +201,25 @@ class ConfigCollector {
           this.allAnswers[`${moduleName}_${key}`] = value;
         }
       }
+      // Show "no config" message for modules with no new questions
+      CLIUtils.displayModuleNoConfig(moduleName, moduleConfig.header, moduleConfig.subheader);
       return false; // No new fields
     }
 
-    // If we have new fields, show prompt section and collect only new fields
+    // If we have new fields, build questions first
     if (newKeys.length > 0) {
-      console.log(chalk.yellow(`\n📋 New configuration options available for ${moduleName}`));
-      if (moduleConfig.prompt) {
-        const prompts = Array.isArray(moduleConfig.prompt) ? moduleConfig.prompt : [moduleConfig.prompt];
-        CLIUtils.displayPromptSection(prompts);
-      }
-
       const questions = [];
       for (const key of newKeys) {
         const item = moduleConfig[key];
-        const question = await this.buildQuestion(moduleName, key, item);
+        const question = await this.buildQuestion(moduleName, key, item, moduleConfig);
         if (question) {
           questions.push(question);
         }
       }
 
       if (questions.length > 0) {
+        // Only show header if we actually have questions
+        CLIUtils.displayModuleConfigHeader(moduleName, moduleConfig.header, moduleConfig.subheader);
         console.log(); // Line break before questions
         const answers = await inquirer.prompt(questions);
 
@@ -206,6 +246,9 @@ class ConfigCollector {
           }
           this.collectedConfig[moduleName][originalKey] = result;
         }
+      } else {
+        // New keys exist but no questions generated - show no config message
+        CLIUtils.displayModuleNoConfig(moduleName, moduleConfig.header, moduleConfig.subheader);
       }
     }
 
@@ -325,12 +368,6 @@ class ConfigCollector {
       return;
     }
 
-    // Display module prompts using better formatting
-    if (moduleConfig.prompt) {
-      const prompts = Array.isArray(moduleConfig.prompt) ? moduleConfig.prompt : [moduleConfig.prompt];
-      CLIUtils.displayPromptSection(prompts);
-    }
-
     // Process each config item
     const questions = [];
     const configKeys = Object.keys(moduleConfig).filter((key) => key !== 'prompt');
@@ -343,13 +380,15 @@ class ConfigCollector {
         continue;
       }
 
-      const question = await this.buildQuestion(moduleName, key, item);
+      const question = await this.buildQuestion(moduleName, key, item, moduleConfig);
       if (question) {
         questions.push(question);
       }
     }
 
+    // Display appropriate header based on whether there are questions
     if (questions.length > 0) {
+      CLIUtils.displayModuleConfigHeader(moduleName, moduleConfig.header, moduleConfig.subheader);
       console.log(); // Line break before questions
       const answers = await inquirer.prompt(questions);
 
@@ -450,20 +489,68 @@ class ConfigCollector {
         this.collectedConfig[moduleName][originalKey] = result;
       }
 
-      // Display module completion message after collecting all answers (unless skipped)
-      if (!skipCompletion) {
-        CLIUtils.displayModuleComplete(moduleName);
-      }
+      // No longer display completion boxes - keep output clean
+    } else {
+      // No questions for this module - show completion message
+      CLIUtils.displayModuleNoConfig(moduleName, moduleConfig.header, moduleConfig.subheader);
     }
   }
 
+  /**
+   * Replace placeholders in a string with collected config values
+   * @param {string} str - String with placeholders
+   * @param {string} currentModule - Current module name (to look up defaults in same module)
+   * @param {Object} moduleConfig - Current module's config schema (to look up defaults)
+   * @returns {string} String with placeholders replaced
+   */
+  replacePlaceholders(str, currentModule = null, moduleConfig = null) {
+    if (typeof str !== 'string') {
+      return str;
+    }
+
+    return str.replaceAll(/{([^}]+)}/g, (match, configKey) => {
+      // Preserve special placeholders
+      if (configKey === 'project-root' || configKey === 'value' || configKey === 'directory_name') {
+        return match;
+      }
+
+      // Look for the config value in allAnswers (already answered questions)
+      let configValue = this.allAnswers[configKey] || this.allAnswers[`core_${configKey}`];
+
+      // Check in already collected config
+      if (!configValue) {
+        for (const mod of Object.keys(this.collectedConfig)) {
+          if (mod !== '_meta' && this.collectedConfig[mod] && this.collectedConfig[mod][configKey]) {
+            configValue = this.collectedConfig[mod][configKey];
+            // Remove {project-root}/ prefix if present for cleaner display
+            if (typeof configValue === 'string' && configValue.includes('{project-root}/')) {
+              configValue = configValue.replace('{project-root}/', '');
+            }
+            break;
+          }
+        }
+      }
+
+      // If still not found and we're in the same module, use the default from the config schema
+      if (!configValue && currentModule && moduleConfig && moduleConfig[configKey]) {
+        const referencedItem = moduleConfig[configKey];
+        if (referencedItem && referencedItem.default !== undefined) {
+          configValue = referencedItem.default;
+        }
+      }
+
+      return configValue || match;
+    });
+  }
+
   /**
    * Build an inquirer question from a config item
    * @param {string} moduleName - Module name
    * @param {string} key - Config key
    * @param {Object} item - Config item definition
+   * @param {Object} moduleConfig - Full module config schema (for resolving defaults)
    */
-  async buildQuestion(moduleName, key, item) {
+  async buildQuestion(moduleName, key, item, moduleConfig = null) {
     const questionName = `${moduleName}_${key}`;
 
     // Check for existing value
@@ -483,9 +570,42 @@ class ConfigCollector {
     let defaultValue = item.default;
     let choices = null;
 
-    if (typeof defaultValue === 'string' && defaultValue.includes('{directory_name}') && this.currentProjectDir) {
-      const dirName = path.basename(this.currentProjectDir);
-      defaultValue = defaultValue.replaceAll('{directory_name}', dirName);
+    // Check if default contains references to other fields in the same module
+    const hasSameModuleReference = typeof defaultValue === 'string' && defaultValue.match(/{([^}]+)}/);
+    let dynamicDefault = false;
+
+    // Replace placeholders in default value with collected config values
+    if (typeof defaultValue === 'string') {
+      if (defaultValue.includes('{directory_name}') && this.currentProjectDir) {
+        const dirName = path.basename(this.currentProjectDir);
+        defaultValue = defaultValue.replaceAll('{directory_name}', dirName);
+      }
+
+      // Check if this references another field in the same module (for dynamic defaults)
+      if (hasSameModuleReference && moduleConfig) {
+        const matches = defaultValue.match(/{([^}]+)}/g);
+        if (matches) {
+          for (const match of matches) {
+            const fieldName = match.slice(1, -1); // Remove { }
+            // Check if this field exists in the same module config
+            if (moduleConfig[fieldName]) {
+              dynamicDefault = true;
+              break;
+            }
+          }
+        }
+      }
+
+      // If not dynamic, replace placeholders now
+      if (!dynamicDefault) {
+        defaultValue = this.replacePlaceholders(defaultValue, moduleName, moduleConfig);
+      }
+
+      // Strip {project-root}/ from defaults since it will be added back by result template
+      // This makes the display cleaner and user input simpler
+      if (defaultValue.includes('{project-root}/')) {
+        defaultValue = defaultValue.replace('{project-root}/', '');
+      }
     }
 
     // Handle different question types
@@ -548,31 +668,67 @@ class ConfigCollector {
       message = item.prompt;
     }
 
+    // Replace placeholders in prompt message with collected config values
+    if (typeof message === 'string') {
+      message = this.replacePlaceholders(message, moduleName, moduleConfig);
+    }
+
     // Add current value indicator for existing configs
     if (existingValue !== null && existingValue !== undefined) {
       if (typeof existingValue === 'boolean') {
         message += chalk.dim(` (current: ${existingValue ? 'true' : 'false'})`);
-        defaultValue = existingValue;
       } else if (Array.isArray(existingValue)) {
         message += chalk.dim(` (current: ${existingValue.join(', ')})`);
       } else if (questionType !== 'list') {
         // Show the cleaned value (without {project-root}/) for display
         message += chalk.dim(` (current: ${existingValue})`);
-        defaultValue = existingValue;
       }
     } else if (item.example && questionType === 'input') {
       // Show example for input fields
-      const exampleText = typeof item.example === 'string' ? item.example.replace('{project-root}/', '') : JSON.stringify(item.example);
+      let exampleText = typeof item.example === 'string' ? item.example : JSON.stringify(item.example);
+      // Replace placeholders in example
+      if (typeof exampleText === 'string') {
+        exampleText = this.replacePlaceholders(exampleText, moduleName, moduleConfig);
+        exampleText = exampleText.replace('{project-root}/', '');
+      }
       message += chalk.dim(` (e.g., ${exampleText})`);
     }
 
+    // Build the question object
     const question = {
       type: questionType,
       name: questionName,
       message: message,
-      default: defaultValue,
     };
 
+    // Set default - if it's dynamic, use a function that inquirer will evaluate with current answers
+    // But if we have an existing value, always use that instead
+    if (existingValue !== null && existingValue !== undefined && questionType !== 'list') {
+      question.default = existingValue;
+    } else if (dynamicDefault && typeof item.default === 'string') {
+      const originalDefault = item.default;
+      question.default = (answers) => {
+        // Replace placeholders using answers from previous questions in the same batch
+        let resolved = originalDefault;
+        resolved = resolved.replaceAll(/{([^}]+)}/g, (match, fieldName) => {
+          // Look for the answer in the current batch (prefixed with module name)
+          const answerKey = `${moduleName}_${fieldName}`;
+          if (answers[answerKey] !== undefined) {
+            return answers[answerKey];
+          }
+          // Fall back to collected config
+          return this.collectedConfig[moduleName]?.[fieldName] || match;
+        });
+        // Strip {project-root}/ for cleaner display
+        if (resolved.includes('{project-root}/')) {
+          resolved = resolved.replace('{project-root}/', '');
+        }
+        return resolved;
+      };
+    } else {
+      question.default = defaultValue;
+    }
+
     // Add choices for select types
     if (choices) {
       question.choices = choices;
@@ -584,6 +740,23 @@ class ConfigCollector {
         if (!input && item.required) {
           return 'This field is required';
         }
+        // Validate against regex pattern if provided
+        if (input && item.regex) {
+          const regex = new RegExp(item.regex);
+          if (!regex.test(input)) {
+            return `Invalid format. Must match pattern: ${item.regex}`;
+          }
+        }
+        return true;
+      };
+    }
+
+    // Add validation for checkbox (multi-select) fields
+    if (questionType === 'checkbox' && item.required) {
+      question.validate = (answers) => {
+        if (!answers || answers.length === 0) {
+          return 'At least one option must be selected';
+        }
         return true;
       };
     }

package/tools/cli/installers/lib/core/detector.js

@@ -199,6 +199,8 @@ class Detector {
 
   /**
    * Detect legacy BMAD v4 footprints (case-sensitive path checks)
+   * V4 used .bmad-method as default folder name
+   * V6+ uses configurable folder names and ALWAYS has _cfg/manifest.yaml with installation.version
    * @param {string} projectDir - Project directory to check
    * @returns {{ hasLegacyV4: boolean, offenders: string[] }}
    */
@@ -223,18 +225,62 @@ class Detector {
       return true;
     };
 
+    // Helper: check if a directory is a V6+ installation
+    const isV6Installation = async (dirPath) => {
+      const manifestPath = path.join(dirPath, '_cfg', 'manifest.yaml');
+      if (!(await fs.pathExists(manifestPath))) {
+        return false;
+      }
+      try {
+        const yaml = require('js-yaml');
+        const manifestContent = await fs.readFile(manifestPath, 'utf8');
+        const manifest = yaml.load(manifestContent);
+        // V6+ manifest has installation.version
+        return manifest && manifest.installation && manifest.installation.version;
+      } catch {
+        return false;
+      }
+    };
+
     const offenders = [];
 
-    // Find all directories starting with .bmad, bmad, or Bmad
+    // Strategy:
+    // 1. First scan for ANY V6+ installation (_cfg/manifest.yaml)
+    // 2. If V6+ found → don't flag anything (user is already on V6+)
+    // 3. If NO V6+ found → flag folders with "bmad" in name as potential V4 legacy
+
+    let hasV6Installation = false;
+    const potentialV4Folders = [];
+
     try {
       const entries = await fs.readdir(projectDir, { withFileTypes: true });
+
       for (const entry of entries) {
         if (entry.isDirectory()) {
           const name = entry.name;
-          // Match .bmad*, bmad* (lowercase), or Bmad* (capital B)
-          // BUT exclude 'bmad' exactly (that's the new v6 installation directory)
-          if ((name.startsWith('.bmad') || name.startsWith('bmad') || name.startsWith('Bmad')) && name !== 'bmad') {
-            offenders.push(path.join(projectDir, entry.name));
+          const fullPath = path.join(projectDir, entry.name);
+
+          // Check if directory is empty (skip empty leftover folders)
+          const dirContents = await fs.readdir(fullPath);
+          if (dirContents.length === 0) {
+            continue; // Skip empty folders
+          }
+
+          // Check if it's a V6+ installation by looking for _cfg/manifest.yaml
+          // This works for ANY folder name (not just bmad-prefixed)
+          const isV6 = await isV6Installation(fullPath);
+
+          if (isV6) {
+            // Found a V6+ installation - user is already on V6+
+            hasV6Installation = true;
+            // Don't break - continue scanning to be thorough
+          } else {
+            // Not V6+, check if folder name contains "bmad" (case insensitive)
+            const nameLower = name.toLowerCase();
+            if (nameLower.includes('bmad')) {
+              // Potential V4 legacy folder
+              potentialV4Folders.push(fullPath);
+            }
           }
         }
       }
@@ -242,8 +288,15 @@ class Detector {
       // Ignore errors reading directory
     }
 
+    // Only flag V4 folders if NO V6+ installation was found
+    if (!hasV6Installation && potentialV4Folders.length > 0) {
+      offenders.push(...potentialV4Folders);
+    }
+
     // Check inside various IDE command folders for legacy bmad folders
-    // List of IDE config folders that might have commands directories
+    // V4 used folders like 'bmad-method' or custom names in IDE commands
+    // V6+ uses 'bmad' in IDE commands (hardcoded in IDE handlers)
+    // Legacy V4 IDE command folders won't have a corresponding V6+ installation
     const ideConfigFolders = ['.opencode', '.claude', '.crush', '.continue', '.cursor', '.windsurf', '.cline', '.roo-cline'];
 
     for (const ideFolder of ideConfigFolders) {
@@ -255,7 +308,9 @@ class Detector {
           for (const entry of commandEntries) {
             if (entry.isDirectory()) {
               const name = entry.name;
-              // Find bmad-related folders (excluding exact 'bmad' if it exists)
+              // V4 used 'bmad-method' or similar in IDE commands folders
+              // V6+ uses 'bmad' (hardcoded)
+              // So anything that's NOT 'bmad' but starts with bmad/Bmad is likely V4
               if ((name.startsWith('bmad') || name.startsWith('Bmad') || name === 'BMad') && name !== 'bmad') {
                 offenders.push(path.join(commandsPath, entry.name));
               }