bmad-method 6.0.0-alpha.2 → 6.0.0-alpha.20

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

@@ -1,6 +1,6 @@
 const path = require('node:path');
 const fs = require('fs-extra');
-const yaml = require('js-yaml');
+const yaml = require('yaml');
 const chalk = require('chalk');
 const inquirer = require('inquirer');
 const { getProjectRoot, getModulePath } = require('../../../lib/project-root');
@@ -13,14 +13,86 @@ class ConfigCollector {
     this.currentProjectDir = null;
   }
 
+  /**
+   * Find the bmad installation directory in a project
+   * V6+ installations can use ANY folder name but ALWAYS have _config/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 _config/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, '_config', '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 _config/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, '_config', 'manifest.yaml');
+          if (await fs.pathExists(manifestPath)) {
+            // Found a V6+ installation, return just the folder name
+            return entry.name;
+          }
+        }
+      }
+    } catch {
+      // Ignore errors
+    }
+
+    return null;
+  }
+
   /**
    * 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;
@@ -33,11 +105,17 @@ class ConfigCollector {
 
     for (const entry of entries) {
       if (entry.isDirectory()) {
+        // Skip the _config directory - it's for system use
+        if (entry.name === '_config' || entry.name === '_memory') {
+          continue;
+        }
+
         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);
+            const moduleConfig = yaml.parse(content);
             if (moduleConfig) {
               this.existingConfig[entry.name] = moduleConfig;
               foundAny = true;
@@ -49,10 +127,6 @@ class ConfigCollector {
       }
     }
 
-    if (foundAny) {
-      console.log(chalk.cyan('\n📋 Found existing BMAD module configurations'));
-    }
-
     return foundAny;
   }
 
@@ -60,8 +134,12 @@ class ConfigCollector {
    * Collect configuration for all modules
    * @param {Array} modules - List of modules to configure (including 'core')
    * @param {string} projectDir - Target project directory
+   * @param {Object} options - Additional options
+   * @param {Map} options.customModulePaths - Map of module ID to source path for custom modules
    */
-  async collectAllConfigurations(modules, projectDir) {
+  async collectAllConfigurations(modules, projectDir, options = {}) {
+    // Store custom module paths for use in collectModuleConfig
+    this.customModulePaths = options.customModulePaths || new Map();
     await this.loadExistingConfig(projectDir);
 
     // Check if core was already collected (e.g., in early collection phase)
@@ -110,15 +188,47 @@ class ConfigCollector {
     }
 
     // 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');
+    // First, try the standard src/modules location
+    let installerConfigPath = path.join(getModulePath(moduleName), '_module-installer', 'module.yaml');
+    let moduleConfigPath = path.join(getModulePath(moduleName), 'module.yaml');
+
+    // If not found in src/modules, we need to find it by searching the project
+    if (!(await fs.pathExists(installerConfigPath)) && !(await fs.pathExists(moduleConfigPath))) {
+      // Use the module manager to find the module source
+      const { ModuleManager } = require('../modules/manager');
+      const moduleManager = new ModuleManager();
+      const moduleSourcePath = await moduleManager.findModuleSource(moduleName);
+
+      if (moduleSourcePath) {
+        installerConfigPath = path.join(moduleSourcePath, '_module-installer', 'module.yaml');
+        moduleConfigPath = path.join(moduleSourcePath, 'module.yaml');
+      }
+    }
 
     let configPath = null;
-    if (await fs.pathExists(installerConfigPath)) {
+    let isCustomModule = false;
+
+    if (await fs.pathExists(moduleConfigPath)) {
+      configPath = moduleConfigPath;
+    } else if (await fs.pathExists(installerConfigPath)) {
       configPath = installerConfigPath;
-    } else if (await fs.pathExists(legacyConfigPath)) {
-      configPath = legacyConfigPath;
     } else {
+      // Check if this is a custom module with custom.yaml
+      const { ModuleManager } = require('../modules/manager');
+      const moduleManager = new ModuleManager();
+      const moduleSourcePath = await moduleManager.findModuleSource(moduleName);
+
+      if (moduleSourcePath) {
+        const rootCustomConfigPath = path.join(moduleSourcePath, 'custom.yaml');
+        const moduleInstallerCustomPath = path.join(moduleSourcePath, '_module-installer', 'custom.yaml');
+
+        if ((await fs.pathExists(rootCustomConfigPath)) || (await fs.pathExists(moduleInstallerCustomPath))) {
+          isCustomModule = true;
+          // For custom modules, we don't have an install-config schema, so just use existing values
+          // The custom.yaml values will be loaded and merged during installation
+        }
+      }
+
       // No config schema for this module - use existing values
       if (this.existingConfig && this.existingConfig[moduleName]) {
         if (!this.collectedConfig[moduleName]) {
@@ -130,7 +240,7 @@ class ConfigCollector {
     }
 
     const configContent = await fs.readFile(configPath, 'utf8');
-    const moduleConfig = yaml.load(configContent);
+    const moduleConfig = yaml.parse(configContent);
 
     if (!moduleConfig) {
       return false;
@@ -140,72 +250,142 @@ class ConfigCollector {
     const configKeys = Object.keys(moduleConfig).filter((key) => key !== 'prompt');
     const existingKeys = this.existingConfig && this.existingConfig[moduleName] ? Object.keys(this.existingConfig[moduleName]) : [];
 
+    // Check if this module has no configuration keys at all (like CIS)
+    // Filter out metadata fields and only count actual config objects
+    const metadataFields = new Set(['code', 'name', 'header', 'subheader', 'default_selected']);
+    const actualConfigKeys = configKeys.filter((key) => !metadataFields.has(key));
+    const hasNoConfig = actualConfigKeys.length === 0;
+
+    // If module has no config keys at all, handle it specially
+    if (hasNoConfig && moduleConfig.subheader) {
+      // Add blank line for better readability (matches other modules)
+      console.log();
+      const moduleDisplayName = moduleConfig.header || `${moduleName.toUpperCase()} Module`;
+
+      // Display the module name in color first (matches other modules)
+      console.log(chalk.cyan('?') + ' ' + chalk.magenta(moduleDisplayName));
+
+      // Show the subheader since there's no configuration to ask about
+      console.log(chalk.dim(`  ✓ ${moduleConfig.subheader}`));
+      return false; // No new fields
+    }
+
+    // Find new interactive fields (with prompt)
     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) {
+    // Find new static fields (without prompt, just result)
+    const newStaticKeys = configKeys.filter((key) => {
+      const item = moduleConfig[key];
+      return item && typeof item === 'object' && !item.prompt && item.result && !existingKeys.includes(key);
+    });
+
+    // If in silent mode and no new keys (neither interactive nor static), use existing config and skip prompts
+    if (silentMode && newKeys.length === 0 && newStaticKeys.length === 0) {
       if (this.existingConfig && this.existingConfig[moduleName]) {
         if (!this.collectedConfig[moduleName]) {
           this.collectedConfig[moduleName] = {};
         }
         this.collectedConfig[moduleName] = { ...this.existingConfig[moduleName] };
 
+        // Special handling for user_name: ensure it has a value
+        if (
+          moduleName === 'core' &&
+          (!this.collectedConfig[moduleName].user_name || this.collectedConfig[moduleName].user_name === '[USER_NAME]')
+        ) {
+          this.collectedConfig[moduleName].user_name = this.getDefaultUsername();
+        }
+
         // Also populate allAnswers for cross-referencing
         for (const [key, value] of Object.entries(this.existingConfig[moduleName])) {
-          this.allAnswers[`${moduleName}_${key}`] = value;
+          // Ensure user_name is properly set in allAnswers too
+          let finalValue = value;
+          if (moduleName === 'core' && key === 'user_name' && (!value || value === '[USER_NAME]')) {
+            finalValue = this.getDefaultUsername();
+          }
+          this.allAnswers[`${moduleName}_${key}`] = finalValue;
+        }
+      } else if (moduleName === 'core') {
+        // No existing core config - ensure we at least have user_name
+        if (!this.collectedConfig[moduleName]) {
+          this.collectedConfig[moduleName] = {};
+        }
+        if (!this.collectedConfig[moduleName].user_name) {
+          this.collectedConfig[moduleName].user_name = this.getDefaultUsername();
+          this.allAnswers[`${moduleName}_user_name`] = this.getDefaultUsername();
         }
       }
+
+      // Show "no config" message for modules with no new questions (that have config keys)
+      console.log(chalk.dim(`  ✓ ${moduleName.toUpperCase()} module already up to date`));
       return false; // No new fields
     }
 
-    // If we have new fields, show prompt section and collect only new fields
-    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);
-      }
-
+    // If we have new fields (interactive or static), process them
+    if (newKeys.length > 0 || newStaticKeys.length > 0) {
       const questions = [];
+      const staticAnswers = {};
+
+      // Build questions for interactive fields
       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);
         }
       }
 
+      // Prepare static answers (no prompt, just result)
+      for (const key of newStaticKeys) {
+        staticAnswers[`${moduleName}_${key}`] = undefined;
+      }
+
+      // Collect all answers (static + prompted)
+      let allAnswers = { ...staticAnswers };
+
       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;
-          }
+        const promptedAnswers = await inquirer.prompt(questions);
 
-          if (!this.collectedConfig[moduleName]) {
-            this.collectedConfig[moduleName] = {};
-          }
-          this.collectedConfig[moduleName][originalKey] = result;
+        // Merge prompted answers with static answers
+        Object.assign(allAnswers, promptedAnswers);
+      } else if (newStaticKeys.length > 0) {
+        // Only static fields, no questions - show no config message
+        console.log(chalk.dim(`  ✓ ${moduleName.toUpperCase()} module configuration updated`));
+      }
+
+      // Store all answers for cross-referencing
+      Object.assign(this.allAnswers, allAnswers);
+
+      // Process all answers (both static and prompted)
+      // First, copy existing config to preserve values that aren't being updated
+      if (this.existingConfig && this.existingConfig[moduleName]) {
+        this.collectedConfig[moduleName] = { ...this.existingConfig[moduleName] };
+      } else {
+        this.collectedConfig[moduleName] = {};
+      }
+
+      for (const key of Object.keys(allAnswers)) {
+        const originalKey = key.replace(`${moduleName}_`, '');
+        const item = moduleConfig[originalKey];
+        const value = allAnswers[key];
+
+        let result;
+        if (Array.isArray(value)) {
+          result = value;
+        } else if (item.result) {
+          result = this.processResultTemplate(item.result, value);
+        } else {
+          result = value;
         }
+
+        // Update the collected config with new/updated values
+        this.collectedConfig[moduleName][originalKey] = result;
       }
     }
 
@@ -222,7 +402,7 @@ class ConfigCollector {
       }
     }
 
-    return newKeys.length > 0; // Return true if we prompted for new fields
+    return newKeys.length > 0 || newStaticKeys.length > 0; // Return true if we had any new fields (interactive or static)
   }
 
   /**
@@ -286,6 +466,25 @@ class ConfigCollector {
     return result;
   }
 
+  /**
+   * Get the default username from the system
+   * @returns {string} Capitalized username\
+   */
+  getDefaultUsername() {
+    let result = 'BMad';
+    try {
+      const os = require('node:os');
+      const userInfo = os.userInfo();
+      if (userInfo && userInfo.username) {
+        const username = userInfo.username;
+        result = username.charAt(0).toUpperCase() + username.slice(1);
+      }
+    } catch {
+      // Do nothing, just return 'BMad'
+    }
+    return result;
+  }
+
   /**
    * Collect configuration for a single module
    * @param {string} moduleName - Module name
@@ -304,57 +503,133 @@ class ConfigCollector {
     if (!this.allAnswers) {
       this.allAnswers = {};
     }
-    // Load module's config.yaml (check new location first, then fallback)
-    const installerConfigPath = path.join(getModulePath(moduleName), '_module-installer', 'install-config.yaml');
-    const legacyConfigPath = path.join(getModulePath(moduleName), 'config.yaml');
+    // Load module's config
+    // First, check if we have a custom module path for this module
+    let installerConfigPath = null;
+    let moduleConfigPath = null;
+
+    if (this.customModulePaths && this.customModulePaths.has(moduleName)) {
+      const customPath = this.customModulePaths.get(moduleName);
+      installerConfigPath = path.join(customPath, '_module-installer', 'module.yaml');
+      moduleConfigPath = path.join(customPath, 'module.yaml');
+    } else {
+      // Try the standard src/modules location
+      installerConfigPath = path.join(getModulePath(moduleName), '_module-installer', 'module.yaml');
+      moduleConfigPath = path.join(getModulePath(moduleName), 'module.yaml');
+    }
+
+    // If not found in src/modules or custom paths, search the project
+    if (!(await fs.pathExists(installerConfigPath)) && !(await fs.pathExists(moduleConfigPath))) {
+      // Use the module manager to find the module source
+      const { ModuleManager } = require('../modules/manager');
+      const moduleManager = new ModuleManager();
+      const moduleSourcePath = await moduleManager.findModuleSource(moduleName);
+
+      if (moduleSourcePath) {
+        installerConfigPath = path.join(moduleSourcePath, '_module-installer', 'module.yaml');
+        moduleConfigPath = path.join(moduleSourcePath, 'module.yaml');
+      }
+    }
 
     let configPath = null;
-    if (await fs.pathExists(installerConfigPath)) {
+    if (await fs.pathExists(moduleConfigPath)) {
+      configPath = moduleConfigPath;
+    } else if (await fs.pathExists(installerConfigPath)) {
       configPath = installerConfigPath;
-    } else if (await fs.pathExists(legacyConfigPath)) {
-      configPath = legacyConfigPath;
     } else {
       // No config for this module
       return;
     }
 
     const configContent = await fs.readFile(configPath, 'utf8');
-    const moduleConfig = yaml.load(configContent);
+    const moduleConfig = yaml.parse(configContent);
 
     if (!moduleConfig) {
       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 staticAnswers = {};
     const configKeys = Object.keys(moduleConfig).filter((key) => key !== 'prompt');
 
     for (const key of configKeys) {
       const item = moduleConfig[key];
 
       // Skip if not a config object
-      if (!item || typeof item !== 'object' || !item.prompt) {
+      if (!item || typeof item !== 'object') {
         continue;
       }
 
-      const question = await this.buildQuestion(moduleName, key, item);
-      if (question) {
-        questions.push(question);
+      // Handle static values (no prompt, just result)
+      if (!item.prompt && item.result) {
+        // Add to static answers with a marker value
+        staticAnswers[`${moduleName}_${key}`] = undefined;
+        continue;
+      }
+
+      // Handle interactive values (with prompt)
+      if (item.prompt) {
+        const question = await this.buildQuestion(moduleName, key, item, moduleConfig);
+        if (question) {
+          questions.push(question);
+        }
       }
     }
 
+    // Collect all answers (static + prompted)
+    let allAnswers = { ...staticAnswers };
+
+    // If there are questions to ask, prompt for accepting defaults vs customizing
     if (questions.length > 0) {
-      console.log(); // Line break before questions
-      const answers = await inquirer.prompt(questions);
+      const moduleDisplayName = moduleConfig.header || `${moduleName.toUpperCase()} Module`;
+      console.log();
+      console.log(chalk.cyan('?') + ' ' + chalk.magenta(moduleDisplayName));
+      let customize = true;
+      if (moduleName !== 'core') {
+        const customizeAnswer = await inquirer.prompt([
+          {
+            type: 'confirm',
+            name: 'customize',
+            message: 'Accept Defaults (no to customize)?',
+            default: true,
+          },
+        ]);
+        customize = customizeAnswer.customize;
+      }
 
-      // Store answers for cross-referencing
-      Object.assign(this.allAnswers, answers);
+      if (customize && moduleName !== 'core') {
+        // Accept defaults - only ask questions that have NO default value
+        const questionsWithoutDefaults = questions.filter((q) => q.default === undefined || q.default === null || q.default === '');
+
+        if (questionsWithoutDefaults.length > 0) {
+          console.log(chalk.dim(`\n  Asking required questions for ${moduleName.toUpperCase()}...`));
+          const promptedAnswers = await inquirer.prompt(questionsWithoutDefaults);
+          Object.assign(allAnswers, promptedAnswers);
+        }
+
+        // For questions with defaults that weren't asked, we need to process them with their default values
+        const questionsWithDefaults = questions.filter((q) => q.default !== undefined && q.default !== null && q.default !== '');
+        for (const question of questionsWithDefaults) {
+          // Skip function defaults - these are dynamic and will be evaluated later
+          if (typeof question.default === 'function') {
+            continue;
+          }
+          allAnswers[question.name] = question.default;
+        }
+      } else {
+        const promptedAnswers = await inquirer.prompt(questions);
+        Object.assign(allAnswers, promptedAnswers);
+      }
+    }
+
+    // Store all answers for cross-referencing
+    Object.assign(this.allAnswers, allAnswers);
+
+    // Process all answers (both static and prompted)
+    // Always process if we have any answers or static answers
+    if (Object.keys(allAnswers).length > 0 || Object.keys(staticAnswers).length > 0) {
+      const answers = allAnswers;
 
       // Process answers and build result values
       for (const key of Object.keys(answers)) {
@@ -367,8 +642,6 @@ class ConfigCollector {
 
         // For arrays (multi-select), handle differently
         if (Array.isArray(value)) {
-          // If there's a result template and it's a string, don't use it for arrays
-          // Just use the array value directly
           result = value;
         } else if (item.result) {
           result = item.result;
@@ -383,11 +656,9 @@ class ConfigCollector {
               if (result === '{value}') {
                 result = value;
               } else {
-                // Otherwise replace in the string
                 result = result.replace('{value}', value);
               }
             } else {
-              // For non-string values, use directly
               result = value;
             }
 
@@ -439,7 +710,6 @@ class ConfigCollector {
             }
           }
         } else {
-          // No result template, use value directly
           result = value;
         }
 
@@ -450,20 +720,128 @@ 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 with header if available
+      const moduleDisplayName = moduleConfig.header || `${moduleName.toUpperCase()} Module`;
+
+      // Check if this module has NO configuration keys at all (like CIS)
+      // Filter out metadata fields and only count actual config objects
+      const metadataFields = new Set(['code', 'name', 'header', 'subheader', 'default_selected']);
+      const actualConfigKeys = configKeys.filter((key) => !metadataFields.has(key));
+      const hasNoConfig = actualConfigKeys.length === 0;
+
+      if (hasNoConfig && (moduleConfig.subheader || moduleConfig.header)) {
+        // Module explicitly has no configuration - show with special styling
+        // Add blank line for better readability (matches other modules)
+        console.log();
+
+        // Display the module name in color first (matches other modules)
+        console.log(chalk.cyan('?') + ' ' + chalk.magenta(moduleDisplayName));
+
+        // Ask user if they want to accept defaults or customize on the next line
+        const { customize } = await inquirer.prompt([
+          {
+            type: 'confirm',
+            name: 'customize',
+            message: 'Accept Defaults (no to customize)?',
+            default: true,
+          },
+        ]);
+
+        // Show the subheader if available, otherwise show a default message
+        if (moduleConfig.subheader) {
+          console.log(chalk.dim(`  ✓ ${moduleConfig.subheader}`));
+        } else {
+          console.log(chalk.dim(`  ✓ No custom configuration required`));
+        }
+      } else {
+        // Module has config but just no questions to ask
+        console.log(chalk.dim(`  ✓ ${moduleName.toUpperCase()} module configured`));
+      }
+    }
+
+    // If we have no collected config for this module, but we have a module schema,
+    // ensure we have at least an empty object
+    if (!this.collectedConfig[moduleName]) {
+      this.collectedConfig[moduleName] = {};
+
+      // If we accepted defaults and have no answers, we still need to check
+      // if there are any static values in the schema that should be applied
+      if (moduleConfig) {
+        for (const key of Object.keys(moduleConfig)) {
+          if (key !== 'prompt' && moduleConfig[key] && typeof moduleConfig[key] === 'object') {
+            const item = moduleConfig[key];
+            // For static items (no prompt, just result), apply the result
+            if (!item.prompt && item.result) {
+              // Apply any placeholder replacements to the result
+              let result = item.result;
+              if (typeof result === 'string') {
+                result = this.replacePlaceholders(result, moduleName, moduleConfig);
+              }
+              this.collectedConfig[moduleName][key] = result;
+            }
+          }
+        }
       }
     }
   }
 
+  /**
+   * 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
@@ -478,34 +856,100 @@ class ConfigCollector {
       }
     }
 
+    // Special handling for user_name: default to system user
+    if (moduleName === 'core' && key === 'user_name' && !existingValue) {
+      item.default = this.getDefaultUsername();
+    }
+
     // Determine question type and default value
     let questionType = 'input';
     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
     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';
     }
@@ -520,31 +964,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;
@@ -556,6 +1036,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;
       };
     }