bmad-method 6.0.0-alpha.0 → 6.0.0-alpha.10

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

@@ -10,6 +10,72 @@ class ConfigCollector {
   constructor() {
     this.collectedConfig = {};
     this.existingConfig = null;
+    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');
+  }
+
+  /**
+   * Detect the existing BMAD folder name in a project
+   * @param {string} projectDir - Project directory
+   * @returns {Promise<string|null>} Folder name (just the name, not full path) or null if not found
+   */
+  async detectExistingBmadFolder(projectDir) {
+    // Check if project directory exists
+    if (!(await fs.pathExists(projectDir))) {
+      return null;
+    }
+
+    // Look for ANY directory with _cfg/manifest.yaml
+    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 just the folder name
+            return entry.name;
+          }
+        }
+      }
+    } catch {
+      // Ignore errors
+    }
+
+    return null;
   }
 
   /**
@@ -17,30 +83,40 @@ class ConfigCollector {
    * @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;
     }
 
-    // Try to load existing module configs
-    const modules = ['core', 'bmm', 'cis'];
+    // Dynamically discover all installed modules by scanning bmad directory
+    // A directory is a module ONLY if it contains a config.yaml file
     let foundAny = false;
-
-    for (const moduleName of modules) {
-      const moduleConfigPath = path.join(bmadDir, moduleName, 'config.yaml');
-      if (await fs.pathExists(moduleConfigPath)) {
-        try {
-          const content = await fs.readFile(moduleConfigPath, 'utf8');
-          const moduleConfig = yaml.load(content);
-          if (moduleConfig) {
-            this.existingConfig[moduleName] = moduleConfig;
-            foundAny = true;
+    const entries = await fs.readdir(bmadDir, { withFileTypes: true });
+
+    for (const entry of entries) {
+      if (entry.isDirectory()) {
+        const moduleConfigPath = path.join(bmadDir, entry.name, 'config.yaml');
+        if (await fs.pathExists(moduleConfigPath)) {
+          try {
+            const content = await fs.readFile(moduleConfigPath, 'utf8');
+            const moduleConfig = yaml.load(content);
+            if (moduleConfig) {
+              this.existingConfig[entry.name] = moduleConfig;
+              foundAny = true;
+            }
+          } catch {
+            // Ignore parse errors for individual modules
           }
-        } catch {
-          // Ignore parse errors for individual modules
         }
       }
     }
@@ -85,6 +161,204 @@ class ConfigCollector {
     return this.collectedConfig;
   }
 
+  /**
+   * Collect configuration for a single module (Quick Update mode - only new fields)
+   * @param {string} moduleName - Module name
+   * @param {string} projectDir - Target project directory
+   * @param {boolean} silentMode - If true, only prompt for new/missing fields
+   * @returns {boolean} True if new fields were prompted, false if all fields existed
+   */
+  async collectModuleConfigQuick(moduleName, projectDir, silentMode = true) {
+    this.currentProjectDir = projectDir;
+
+    // Load existing config if not already loaded
+    if (!this.existingConfig) {
+      await this.loadExistingConfig(projectDir);
+    }
+
+    // Initialize allAnswers if not already initialized
+    if (!this.allAnswers) {
+      this.allAnswers = {};
+    }
+
+    // Load module's install config schema
+    const installerConfigPath = path.join(getModulePath(moduleName), '_module-installer', 'install-config.yaml');
+    const legacyConfigPath = path.join(getModulePath(moduleName), 'config.yaml');
+
+    let configPath = null;
+    if (await fs.pathExists(installerConfigPath)) {
+      configPath = installerConfigPath;
+    } else if (await fs.pathExists(legacyConfigPath)) {
+      configPath = legacyConfigPath;
+    } else {
+      // No config schema for this module - use existing values
+      if (this.existingConfig && this.existingConfig[moduleName]) {
+        if (!this.collectedConfig[moduleName]) {
+          this.collectedConfig[moduleName] = {};
+        }
+        this.collectedConfig[moduleName] = { ...this.existingConfig[moduleName] };
+      }
+      return false;
+    }
+
+    const configContent = await fs.readFile(configPath, 'utf8');
+    const moduleConfig = yaml.load(configContent);
+
+    if (!moduleConfig) {
+      return false;
+    }
+
+    // Compare schema with existing config to find new/missing fields
+    const configKeys = Object.keys(moduleConfig).filter((key) => key !== 'prompt');
+    const existingKeys = this.existingConfig && this.existingConfig[moduleName] ? Object.keys(this.existingConfig[moduleName]) : [];
+
+    const newKeys = configKeys.filter((key) => {
+      const item = moduleConfig[key];
+      // Check if it's a config item and doesn't exist in existing config
+      return item && typeof item === 'object' && item.prompt && !existingKeys.includes(key);
+    });
+
+    // If in silent mode and no new keys, use existing config and skip prompts
+    if (silentMode && newKeys.length === 0) {
+      if (this.existingConfig && this.existingConfig[moduleName]) {
+        if (!this.collectedConfig[moduleName]) {
+          this.collectedConfig[moduleName] = {};
+        }
+        this.collectedConfig[moduleName] = { ...this.existingConfig[moduleName] };
+
+        // Also populate allAnswers for cross-referencing
+        for (const [key, value] of Object.entries(this.existingConfig[moduleName])) {
+          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, build questions first
+    if (newKeys.length > 0) {
+      const questions = [];
+      for (const key of newKeys) {
+        const item = moduleConfig[key];
+        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);
+
+        // Store answers for cross-referencing
+        Object.assign(this.allAnswers, answers);
+
+        // Process answers and build result values
+        for (const key of Object.keys(answers)) {
+          const originalKey = key.replace(`${moduleName}_`, '');
+          const item = moduleConfig[originalKey];
+          const value = answers[key];
+
+          let result;
+          if (Array.isArray(value)) {
+            result = value;
+          } else if (item.result) {
+            result = this.processResultTemplate(item.result, value);
+          } else {
+            result = value;
+          }
+
+          if (!this.collectedConfig[moduleName]) {
+            this.collectedConfig[moduleName] = {};
+          }
+          this.collectedConfig[moduleName][originalKey] = result;
+        }
+      } else {
+        // New keys exist but no questions generated - show no config message
+        CLIUtils.displayModuleNoConfig(moduleName, moduleConfig.header, moduleConfig.subheader);
+      }
+    }
+
+    // Copy over existing values for fields that weren't prompted
+    if (this.existingConfig && this.existingConfig[moduleName]) {
+      if (!this.collectedConfig[moduleName]) {
+        this.collectedConfig[moduleName] = {};
+      }
+      for (const [key, value] of Object.entries(this.existingConfig[moduleName])) {
+        if (!this.collectedConfig[moduleName][key]) {
+          this.collectedConfig[moduleName][key] = value;
+          this.allAnswers[`${moduleName}_${key}`] = value;
+        }
+      }
+    }
+
+    return newKeys.length > 0; // Return true if we prompted for new fields
+  }
+
+  /**
+   * Process a result template with value substitution
+   * @param {*} resultTemplate - The result template
+   * @param {*} value - The value to substitute
+   * @returns {*} Processed result
+   */
+  processResultTemplate(resultTemplate, value) {
+    let result = resultTemplate;
+
+    if (typeof result === 'string' && value !== undefined) {
+      if (typeof value === 'string') {
+        result = result.replace('{value}', value);
+      } else if (typeof value === 'boolean' || typeof value === 'number') {
+        if (result === '{value}') {
+          result = value;
+        } else {
+          result = result.replace('{value}', value);
+        }
+      } else {
+        result = value;
+      }
+
+      if (typeof result === 'string') {
+        result = result.replaceAll(/{([^}]+)}/g, (match, configKey) => {
+          if (configKey === 'project-root') {
+            return '{project-root}';
+          }
+          if (configKey === 'value') {
+            return match;
+          }
+
+          let configValue = this.allAnswers[configKey] || this.allAnswers[`${configKey}`];
+          if (!configValue) {
+            for (const [answerKey, answerValue] of Object.entries(this.allAnswers)) {
+              if (answerKey.endsWith(`_${configKey}`)) {
+                configValue = answerValue;
+                break;
+              }
+            }
+          }
+
+          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];
+                if (typeof configValue === 'string' && configValue.includes('{project-root}/')) {
+                  configValue = configValue.replace('{project-root}/', '');
+                }
+                break;
+              }
+            }
+          }
+
+          return configValue || match;
+        });
+      }
+    }
+
+    return result;
+  }
+
   /**
    * Collect configuration for a single module
    * @param {string} moduleName - Module name
@@ -93,6 +367,7 @@ class ConfigCollector {
    * @param {boolean} skipCompletion - Skip showing completion message (for early core collection)
    */
   async collectModuleConfig(moduleName, projectDir, skipLoadExisting = false, skipCompletion = false) {
+    this.currentProjectDir = projectDir;
     // Load existing config if needed and not already loaded
     if (!skipLoadExisting && !this.existingConfig) {
       await this.loadExistingConfig(projectDir);
@@ -103,7 +378,7 @@ class ConfigCollector {
       this.allAnswers = {};
     }
     // Load module's config.yaml (check new location first, then fallback)
-    const installerConfigPath = path.join(getModulePath(moduleName), '_module-installer', 'install-menu-config.yaml');
+    const installerConfigPath = path.join(getModulePath(moduleName), '_module-installer', 'install-config.yaml');
     const legacyConfigPath = path.join(getModulePath(moduleName), 'config.yaml');
 
     let configPath = null;
@@ -123,12 +398,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');
@@ -141,13 +410,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);
 
@@ -248,20 +519,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
@@ -276,29 +595,104 @@ class ConfigCollector {
       }
     }
 
+    // Special handling for bmad_folder: detect existing folder name
+    if (moduleName === 'core' && key === 'bmad_folder' && !existingValue && this.currentProjectDir) {
+      // Try to detect the existing BMAD folder name
+      const detectedFolder = await this.detectExistingBmadFolder(this.currentProjectDir);
+      if (detectedFolder) {
+        existingValue = detectedFolder;
+      }
+    }
+
     // Determine question type and default value
     let questionType = 'input';
     let defaultValue = item.default;
     let choices = null;
 
+    // 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
     if (item['single-select']) {
       questionType = 'list';
-      choices = item['single-select'];
-      if (existingValue && choices.includes(existingValue)) {
+      choices = item['single-select'].map((choice) => {
+        // If choice is an object with label and value
+        if (typeof choice === 'object' && choice.label && choice.value !== undefined) {
+          return {
+            name: choice.label,
+            value: choice.value,
+          };
+        }
+        // Otherwise it's a simple string choice
+        return {
+          name: choice,
+          value: choice,
+        };
+      });
+      if (existingValue) {
         defaultValue = existingValue;
       }
     } else if (item['multi-select']) {
       questionType = 'checkbox';
-      choices = item['multi-select'].map((choice) => ({
-        name: choice,
-        value: choice,
-        checked: existingValue
-          ? existingValue.includes(choice)
-          : item.default && Array.isArray(item.default)
-            ? item.default.includes(choice)
-            : false,
-      }));
+      choices = item['multi-select'].map((choice) => {
+        // If choice is an object with label and value
+        if (typeof choice === 'object' && choice.label && choice.value !== undefined) {
+          return {
+            name: choice.label,
+            value: choice.value,
+            checked: existingValue
+              ? existingValue.includes(choice.value)
+              : item.default && Array.isArray(item.default)
+                ? item.default.includes(choice.value)
+                : false,
+          };
+        }
+        // Otherwise it's a simple string choice
+        return {
+          name: choice,
+          value: choice,
+          checked: existingValue
+            ? existingValue.includes(choice)
+            : item.default && Array.isArray(item.default)
+              ? item.default.includes(choice)
+              : false,
+        };
+      });
     } else if (typeof defaultValue === 'boolean') {
       questionType = 'confirm';
     }
@@ -313,31 +707,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;
@@ -349,6 +779,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/dependency-resolver.js

@@ -599,6 +599,7 @@ class DependencyResolver {
         organized[module] = {
           agents: [],
           tasks: [],
+          tools: [],
           templates: [],
           data: [],
           other: [],
@@ -626,6 +627,8 @@ class DependencyResolver {
         organized[module].agents.push(file);
       } else if (relative.startsWith('tasks/') || file.includes('/tasks/')) {
         organized[module].tasks.push(file);
+      } else if (relative.startsWith('tools/') || file.includes('/tools/')) {
+        organized[module].tools.push(file);
       } else if (relative.includes('template') || file.includes('/templates/')) {
         organized[module].templates.push(file);
       } else if (relative.includes('data/')) {
@@ -646,7 +649,8 @@ class DependencyResolver {
 
     for (const [module, files] of Object.entries(organized)) {
       const isSelected = selectedModules.includes(module) || module === 'core';
-      const totalFiles = files.agents.length + files.tasks.length + files.templates.length + files.data.length + files.other.length;
+      const totalFiles =
+        files.agents.length + files.tasks.length + files.tools.length + files.templates.length + files.data.length + files.other.length;
 
       if (totalFiles > 0) {
         console.log(chalk.cyan(`\n  ${module.toUpperCase()} module:`));