Merge branch 'main' into fix/sprint-status-issues-1116-1122

.vscode/settings.json

@@ -73,7 +73,7 @@
   "editor.formatOnSave": true,
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "[javascript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "vscode.typescript-language-features"
   },
   "[json]": {
     "editor.defaultFormatter": "vscode.json-language-features"

LICENSE

@@ -21,6 +21,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 TRADEMARK NOTICE:
-BMAD™, BMAD-CORE™ and BMAD-METHOD™ are trademarks of BMad Code, LLC. The use of these 
+BMad™ , BMAD-CORE™ and BMAD-METHOD™ are trademarks of BMad Code, LLC. The use of these 
 trademarks in this software does not grant any rights to use the trademarks 
 for any other purpose.

README.md

@@ -202,7 +202,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for full development guidelines.
 
 MIT License - See [LICENSE](LICENSE) for details.
 
-**Trademarks:** BMAD™ and BMAD-METHOD™ are trademarks of BMad Code, LLC.
+**Trademarks:** BMad™ and BMAD-METHOD™ are trademarks of BMad Code, LLC.
 
 ---
 

src/core/agents/bmad-master.agent.yaml

@@ -12,16 +12,14 @@ agent:
     role: "Master Task Executor + BMad Expert + Guiding Facilitator Orchestrator"
     identity: "Master-level expert in the BMAD Core Platform and all loaded modules with comprehensive knowledge of all resources, tasks, and workflows. Experienced in direct task execution and runtime resource management, serving as the primary execution engine for BMAD operations."
     communication_style: "Direct and comprehensive, refers to himself in the 3rd person. Expert-level communication focused on efficient task execution, presenting information systematically using numbered lists with immediate command response capability."
-    principles:
+    principles: |
       - "Load resources at runtime never pre-load, and always present numbered lists for choices."
 
-  # Agent-specific critical actions
   critical_actions:
     - "Load into memory {project-root}/_bmad/core/config.yaml and set variable project_name, output_folder, user_name, communication_language"
     - "Remember the users name is {user_name}"
     - "ALWAYS communicate in {communication_language}"
 
-  # Agent menu items
   menu:
     - trigger: "list-tasks"
       action: "list all tasks from {project-root}/_bmad/_config/task-manifest.csv"
@@ -34,5 +32,3 @@ agent:
     - trigger: "party-mode"
       exec: "{project-root}/_bmad/core/workflows/party-mode/workflow.md"
       description: "Group chat with all agents"
-
-  prompts: []

src/core/module.yaml

@@ -1,8 +1,8 @@
 code: core
-name: "BMAD™ Core Module"
+name: "BMad™  Core Module"
 
-header: "BMAD™ Core Configuration"
+header: "BMad™  Core Configuration"
-subheader: "Configure the core settings for your BMAD™ installation.\nThese settings will be used across all modules and agents."
+subheader: "Configure the core settings for your BMad™  installation.\nThese settings will be used across all modules and agents."
 
 user_name:
   prompt: "What shall the agents call you (TIP: Use a team name if using with a group)?"
@@ -16,7 +16,7 @@ communication_language:
 
 document_output_language:
   prompt: "Preferred document output language?"
-  default: "{communication_language}"
+  default: "English"
   result: "{value}"
 
 output_folder:

src/core/resources/excalidraw/README.md

@@ -71,7 +71,7 @@ Provides the **HOW** (universal knowledge) while agents provide the **WHAT** (do
 ### Example: Frame Expert (Technical Diagrams)
 
 ```yaml
-# workflows/diagrams/create-flowchart/workflow.yaml
+# workflows/excalidraw-diagrams/create-flowchart/workflow.yaml
 helpers: '{project-root}/_bmad/core/resources/excalidraw/excalidraw-helpers.md'
 json_validation: '{project-root}/_bmad/core/resources/excalidraw/validate-json-instructions.md'
 ```
@@ -79,7 +79,7 @@ json_validation: '{project-root}/_bmad/core/resources/excalidraw/validate-json-i
 **Domain-specific additions:**
 
 ```yaml
-# workflows/diagrams/_shared/flowchart-templates.yaml
+# workflows/excalidraw-diagrams/_shared/flowchart-templates.yaml
 flowchart:
   start_node:
     type: ellipse

src/core/workflows/brainstorming/workflow.md

@@ -1,5 +1,5 @@
 ---
-name: brainstorming-session
+name: brainstorming
 description: Facilitate interactive brainstorming sessions using diverse creative techniques and ideation methods
 context_file: '' # Optional context file path for project-specific guidance
 ---

src/modules/bmb/_module-installer/installer.js

@@ -1,76 +0,0 @@
-const fs = require('fs-extra');
-const path = require('node:path');
-const chalk = require('chalk');
-
-/**
- * BMB Module Installer
- * Sets up custom agent and workflow locations for the BMad Builder module
- *
- * @param {Object} options - Installation options
- * @param {string} options.projectRoot - The root directory of the target project
- * @param {Object} options.config - Module configuration from module.yaml
- * @param {Object} options.coreConfig - Core configuration containing user_name
- * @param {Array<string>} options.installedIDEs - Array of IDE codes that were installed
- * @param {Object} options.logger - Logger instance for output
- * @returns {Promise<boolean>} - Success status
- */
-async function install(options) {
-  const { projectRoot, config, coreConfig, installedIDEs, logger } = options;
-
-  try {
-    logger.log(chalk.blue('🔧 Setting up BMB Module...'));
-
-    // Generate custom.yaml in bmb_creations_output_folder
-    if (config['bmb_creations_output_folder']) {
-      // The config value contains {project-root} which needs to be resolved
-      const rawLocation = config['bmb_creations_output_folder'];
-      const customLocation = rawLocation.replace('{project-root}', projectRoot);
-      const customDestPath = path.join(customLocation, 'custom.yaml');
-
-      logger.log(chalk.cyan(`  Setting up custom agents at: ${customLocation}`));
-
-      // Ensure the directory exists
-      await fs.ensureDir(customLocation);
-
-      // Generate the custom.yaml content
-      const userName = (coreConfig && coreConfig.user_name) || 'my';
-      const customContent = `code: my-custom-bmad
-name: "${userName}-Custom-BMad: Sample Stand Alone Custom Agents and Workflows"
-default_selected: true
-`;
-
-      // Write the custom.yaml file (only if it doesn't exist to preserve user changes)
-      if (await fs.pathExists(customDestPath)) {
-        logger.log(chalk.yellow(`    ✓ custom.yaml already exists at ${customDestPath}`));
-      } else {
-        await fs.writeFile(customDestPath, customContent, 'utf8');
-        logger.log(chalk.green(`    ✓ Created custom.yaml at ${customDestPath}`));
-      }
-    }
-
-    // Set up custom module location if configured
-    if (config['bmb_creations_output_folder']) {
-      const rawModuleLocation = config['bmb_creations_output_folder'];
-      const moduleLocation = rawModuleLocation.replace('{project-root}', projectRoot);
-
-      logger.log(chalk.cyan(`  Setting up custom modules at: ${moduleLocation}`));
-
-      // Ensure the directory exists
-      await fs.ensureDir(moduleLocation);
-      logger.log(chalk.green(`    ✓ Created modules directory at ${moduleLocation}`));
-    }
-
-    // Handle IDE-specific configurations if needed
-    if (installedIDEs && installedIDEs.length > 0) {
-      logger.log(chalk.cyan(`  Configuring BMB for IDEs: ${installedIDEs.join(', ')}`));
-    }
-
-    logger.log(chalk.green('✓ BMB Module setup complete'));
-    return true;
-  } catch (error) {
-    logger.error(chalk.red(`Error setting up BMB module: ${error.message}`));
-    return false;
-  }
-}
-
-module.exports = { install };

src/modules/bmb/module.yaml

@@ -1,7 +1,7 @@
 code: bmb
 name: "BMB: BMad Builder - Agent, Workflow and Module Builder"
 header: "BMad Optimized Builder (BoMB) Module Configuration"
-subheader: "Configure the settings for the BoMB Factory!\nThe agent, workflow and module builder for BMAD™"
+subheader: "Configure the settings for the BoMB Factory!\nThe agent, workflow and module builder for BMad™ "
 default_selected: false # This module will not be selected by default for new installations
 
 # Variables from Core Config inserted:

src/modules/bmm/agents/analyst.agent.yaml

@@ -32,7 +32,7 @@ agent:
       description: Guided Research scoped to market, domain, competitive analysis, or technical research (optional)
 
     - trigger: product-brief
-      exec: "{project-root}/_bmad/bmm/workflows/1-analysis/product-brief/workflow.md"
+      exec: "{project-root}/_bmad/bmm/workflows/1-analysis/create-product-brief/workflow.md"
       description: Create a Product Brief (recommended input for PRD)
 
     - trigger: document-project

src/modules/bmm/agents/architect.agent.yaml

@@ -23,19 +23,19 @@ agent:
       description: Get workflow status or initialize a workflow if not already done (optional)
 
     - trigger: create-architecture
-      exec: "{project-root}/_bmad/bmm/workflows/3-solutioning/architecture/workflow.md"
+      exec: "{project-root}/_bmad/bmm/workflows/3-solutioning/create-architecture/workflow.md"
       description: Create an Architecture Document to Guide Development of a PRD (required for BMad Method projects)
 
     - trigger: implementation-readiness
-      exec: "{project-root}/_bmad/bmm/workflows/3-solutioning/implementation-readiness/workflow.md"
+      exec: "{project-root}/_bmad/bmm/workflows/3-solutioning/check-implementation-readiness/workflow.md"
       description: Validate PRD, UX, Architecture, Epics and stories aligned (Optional but recommended before development)
 
     - trigger: create-excalidraw-diagram
-      workflow: "{project-root}/_bmad/bmm/workflows/diagrams/create-diagram/workflow.yaml"
+      workflow: "{project-root}/_bmad/bmm/workflows/excalidraw-diagrams/create-diagram/workflow.yaml"
       description: Create system architecture or technical diagram (Excalidraw) (Use any time you need a diagram)
 
     - trigger: create-excalidraw-dataflow
-      workflow: "{project-root}/_bmad/bmm/workflows/diagrams/create-dataflow/workflow.yaml"
+      workflow: "{project-root}/_bmad/bmm/workflows/excalidraw-diagrams/create-dataflow/workflow.yaml"
       description: Create data flow diagram (Excalidraw) (Use any time you need a diagram)
 
     - trigger: party-mode

src/modules/bmm/agents/pm.agent.yaml

@@ -32,7 +32,7 @@ agent:
       description: Create Epics and User Stories from PRD (Required for BMad Method flow AFTER the Architecture is completed)
 
     - trigger: implementation-readiness
-      exec: "{project-root}/_bmad/bmm/workflows/3-solutioning/implementation-readiness/workflow.md"
+      exec: "{project-root}/_bmad/bmm/workflows/3-solutioning/check-implementation-readiness/workflow.md"
       description: Validate PRD, UX, Architecture, Epics and stories aligned (Optional but recommended before development)
 
     - trigger: correct-course

src/modules/bmm/agents/tech-writer.agent.yaml

@@ -30,15 +30,15 @@ agent:
       description: Generate Mermaid diagrams (architecture, sequence, flow, ER, class, state)
 
     - trigger: create-excalidraw-flowchart
-      workflow: "{project-root}/_bmad/bmm/workflows/diagrams/create-flowchart/workflow.yaml"
+      workflow: "{project-root}/_bmad/bmm/workflows/excalidraw-diagrams/create-flowchart/workflow.yaml"
       description: Create Excalidraw flowchart for processes and logic flows
 
     - trigger: create-excalidraw-diagram
-      workflow: "{project-root}/_bmad/bmm/workflows/diagrams/create-diagram/workflow.yaml"
+      workflow: "{project-root}/_bmad/bmm/workflows/excalidraw-diagrams/create-diagram/workflow.yaml"
       description: Create Excalidraw system architecture or technical diagram
 
     - trigger: create-excalidraw-dataflow
-      workflow: "{project-root}/_bmad/bmm/workflows/diagrams/create-dataflow/workflow.yaml"
+      workflow: "{project-root}/_bmad/bmm/workflows/excalidraw-diagrams/create-dataflow/workflow.yaml"
       description: Create Excalidraw data flow diagram
 
     - trigger: validate-doc

src/modules/bmm/agents/ux-designer.agent.yaml

@@ -32,7 +32,7 @@ agent:
       description: Validate UX Specification and Design Artifacts
 
     - trigger: create-excalidraw-wireframe
-      workflow: "{project-root}/_bmad/bmm/workflows/diagrams/create-wireframe/workflow.yaml"
+      workflow: "{project-root}/_bmad/bmm/workflows/excalidraw-diagrams/create-wireframe/workflow.yaml"
       description: Create website or app wireframe (Excalidraw)
 
     - trigger: party-mode

src/modules/bmm/module.yaml

@@ -35,23 +35,22 @@ planning_artifacts: # Phase 1-3 artifacts
   default: "{output_folder}/project-planning-artifacts"
   result: "{project-root}/{value}"
 
-implementation_artifacts: # Phase 4 artifacts
+implementation_artifacts: # Phase 4 artifacts and quick-dev flow output
-  prompt: "Where should implementation artifacts be stored?\n - Such as: (sprint status, individual story files and reviews, retrospectives, Quick Flow output)"
+  prompt: "Where should implementation artifacts be stored?\n(sprint status, individual story files and reviews, retrospectives, Quick Flow output)"
   default: "{output_folder}/implementation-artifacts"
   result: "{project-root}/{value}"
 
-project_knowledge: # Artifacts from research, document-project output, other long lived accurate kn
+project_knowledge: # Artifacts from research, document-project output, other long lived accurate knowledge
-  prompt: "Where should non-ephemeral project knowledge be stored (docs, research, references)?"
+  prompt: "Where should non-ephemeral project knowledge be searched for and stored\n(docs, research, references)?"
   default: "docs"
   result: "{project-root}/{value}"
+# tea_use_mcp_enhancements:
+#   prompt: "Test Architect Playwright MCP capabilities (healing, exploratory, verification) are optionally available.\nYou will have to setup your MCPs yourself; refer to test-architecture.md for hints.\nWould you like to enable MCP enhancements in Test Architect?"
+#   default: false
+#   result: "{value}"
 
-tea_use_mcp_enhancements:
+# tea_use_playwright_utils:
-  prompt: "Enable Test Architect Playwright MCP capabilities (healing, exploratory, verification)?\nYou have to setup your MCPs yourself; refer to test-architecture.md for hints."
+#   prompt:
-  default: false
+#     - "Are you using playwright-utils (@seontechnologies/playwright-utils) in your project?\nYou must install packages yourself, or use test architect's *framework command."
-  result: "{value}"
+#   default: false
-
+#   result: "{value}"
-tea_use_playwright_utils:
-  prompt:
-    - "Are you using playwright-utils (@seontechnologies/playwright-utils) in your project?\nYou must install packages yourself, or use test architect's *framework command."
-  default: false
-  result: "{value}"

src/modules/bmm/sub-modules/claude-code/config.yaml

@@ -1,4 +1,3 @@
-# Powered by BMAD™ Core
 name: bmmcc
 short-title: BMM Claude Code Sub Module
 author: Brian (BMad) Madison

src/modules/bmm/sub-modules/claude-code/injections.yaml

@@ -4,16 +4,16 @@
 #
 # The installer will:
 # 1. Ask users if they want to install subagents (all/selective/none)
-# 2. Ask where to install (project-level .claude/agents/{bmad_folder}/ or user-level ~/.claude/agents/{bmad_folder}/)
+# 2. Ask where to install (project-level .claude/agents/_bmad/ or user-level ~/.claude/agents/_bmad/)
 # 3. Only inject content related to selected subagents
-# 4. Templates stay in {bmad_folder}/ directory and are referenced from there
+# 4. Templates stay in _bmad/ directory and are referenced from there
 # 5. Injections are placed at specific sections where each subagent is most valuable
 
 injections:
   # ===== PRD WORKFLOW INJECTIONS =====
 
   # PRD Subagent Instructions
-  - file: "{bmad_folder}/bmm/workflows/prd/instructions.md"
+  - file: "_bmad/bmm/workflows/prd/instructions.md"
     point: "prd-subagent-instructions"
     requires: "all-prd-subagents"
     content: |
@@ -25,7 +25,7 @@ injections:
       - <CRITICAL>Use `bmm-technical-decisions-curator` to capture all technical mentions</CRITICAL>
 
   # PRD Requirements Analysis
-  - file: "{bmad_folder}/bmm/workflows/prd/instructions.md"
+  - file: "_bmad/bmm/workflows/prd/instructions.md"
     point: "prd-requirements-analysis"
     requires: "requirements-analyst"
     content: |
@@ -33,7 +33,7 @@ injections:
       **Subagent Hint**: Use `bmm-requirements-analyst` to validate requirements are testable and complete.
 
   # PRD User Journey Mapping
-  - file: "{bmad_folder}/bmm/workflows/prd/instructions.md"
+  - file: "_bmad/bmm/workflows/prd/instructions.md"
     point: "prd-user-journey"
     requires: "user-journey-mapper"
     content: |
@@ -41,7 +41,7 @@ injections:
       **Subagent Hint**: Use `bmm-user-journey-mapper` to map all user types and their value paths.
 
   # PRD Epic Optimization
-  - file: "{bmad_folder}/bmm/workflows/prd/instructions.md"
+  - file: "_bmad/bmm/workflows/prd/instructions.md"
     point: "prd-epic-optimization"
     requires: "epic-optimizer"
     content: |
@@ -49,7 +49,7 @@ injections:
       **Subagent Hint**: Use `bmm-epic-optimizer` to validate epic boundaries deliver coherent value.
 
   # PRD Document Review
-  - file: "{bmad_folder}/bmm/workflows/prd/instructions.md"
+  - file: "_bmad/bmm/workflows/prd/instructions.md"
     point: "prd-checklist-review"
     requires: "document-reviewer"
     content: |
@@ -57,7 +57,7 @@ injections:
       **Subagent Hint**: Use `bmm-document-reviewer` to validate PRD completeness before finalizing.
 
   # Technical Decisions Curator
-  - file: "{bmad_folder}/bmm/workflows/prd/instructions.md"
+  - file: "_bmad/bmm/workflows/prd/instructions.md"
     point: "technical-decisions-curator"
     requires: "technical-decisions-curator"
     content: |
@@ -71,7 +71,7 @@ injections:
   # ===== MARKET RESEARCH TEMPLATE INJECTIONS =====
 
   # Market TAM/SAM/SOM Calculations
-  - file: "{bmad_folder}/bmm/templates/market.md"
+  - file: "_bmad/bmm/templates/market.md"
     point: "market-tam-calculations"
     requires: "data-analyst"
     content: |
@@ -82,7 +82,7 @@ injections:
       </llm>
 
   # Market Trends Analysis
-  - file: "{bmad_folder}/bmm/templates/market.md"
+  - file: "_bmad/bmm/templates/market.md"
     point: "market-trends-analysis"
     requires: "trend-spotter"
     content: |
@@ -93,7 +93,7 @@ injections:
       </llm>
 
   # Market Customer Personas
-  - file: "{bmad_folder}/bmm/templates/market.md"
+  - file: "_bmad/bmm/templates/market.md"
     point: "market-customer-segments"
     requires: "user-researcher"
     content: |
@@ -104,7 +104,7 @@ injections:
       </llm>
 
   # Market Research Review
-  - file: "{bmad_folder}/bmm/templates/market.md"
+  - file: "_bmad/bmm/templates/market.md"
     point: "market-executive-summary"
     requires: "document-reviewer"
     content: |
@@ -116,7 +116,7 @@ injections:
   # ===== COMPETITOR ANALYSIS TEMPLATE INJECTIONS =====
 
   # Competitor Intelligence Gathering
-  - file: "{bmad_folder}/bmm/templates/competitor.md"
+  - file: "_bmad/bmm/templates/competitor.md"
     point: "competitor-intelligence"
     requires: "market-researcher"
     content: |
@@ -127,7 +127,7 @@ injections:
       </llm>
 
   # Competitor Technical Analysis
-  - file: "{bmad_folder}/bmm/templates/competitor.md"
+  - file: "_bmad/bmm/templates/competitor.md"
     point: "competitor-tech-stack"
     requires: "technical-evaluator"
     content: |
@@ -138,7 +138,7 @@ injections:
       </llm>
 
   # Competitor Metrics Analysis
-  - file: "{bmad_folder}/bmm/templates/competitor.md"
+  - file: "_bmad/bmm/templates/competitor.md"
     point: "competitor-metrics"
     requires: "data-analyst"
     content: |
@@ -148,7 +148,7 @@ injections:
       </llm>
 
   # Competitor Analysis Review
-  - file: "{bmad_folder}/bmm/templates/competitor.md"
+  - file: "_bmad/bmm/templates/competitor.md"
     point: "competitor-executive-summary"
     requires: "document-reviewer"
     content: |
@@ -160,7 +160,7 @@ injections:
   # ===== PROJECT BRIEF TEMPLATE INJECTIONS =====
 
   # Brief Problem Validation
-  - file: "{bmad_folder}/bmm/templates/brief.md"
+  - file: "_bmad/bmm/templates/brief.md"
     point: "brief-problem-validation"
     requires: "market-researcher"
     content: |
@@ -170,7 +170,7 @@ injections:
       </llm>
 
   # Brief Target User Analysis
-  - file: "{bmad_folder}/bmm/templates/brief.md"
+  - file: "_bmad/bmm/templates/brief.md"
     point: "brief-user-analysis"
     requires: "user-researcher"
     content: |
@@ -180,7 +180,7 @@ injections:
       </llm>
 
   # Brief Success Metrics
-  - file: "{bmad_folder}/bmm/templates/brief.md"
+  - file: "_bmad/bmm/templates/brief.md"
     point: "brief-success-metrics"
     requires: "data-analyst"
     content: |
@@ -190,7 +190,7 @@ injections:
       </llm>
 
   # Brief Technical Feasibility
-  - file: "{bmad_folder}/bmm/templates/brief.md"
+  - file: "_bmad/bmm/templates/brief.md"
     point: "brief-technical-feasibility"
     requires: "technical-evaluator"
     content: |
@@ -200,7 +200,7 @@ injections:
       </llm>
 
   # Brief Requirements Extraction
-  - file: "{bmad_folder}/bmm/templates/brief.md"
+  - file: "_bmad/bmm/templates/brief.md"
     point: "brief-requirements"
     requires: "requirements-analyst"
     content: |
@@ -210,7 +210,7 @@ injections:
       </llm>
 
   # Brief Document Review
-  - file: "{bmad_folder}/bmm/templates/brief.md"
+  - file: "_bmad/bmm/templates/brief.md"
     point: "brief-final-review"
     requires: "document-reviewer"
     content: |

src/modules/bmm/sub-modules/claude-code/readme.md

@@ -84,4 +84,4 @@ To test subagent installation:
 2. Select BMM module and Claude Code
 3. Verify prompts appear for subagent selection
 4. Check `.claude/agents/` for installed subagents
-5. Verify injection points are replaced in `.claude/commands/{bmad_folder}/` and the various tasks and templates under `{bmad_folder}/...`
+5. Verify injection points are replaced in `.claude/commands/_bmad/` and the various tasks and templates under `_bmad/...`

src/modules/bmm/workflows/3-solutioning/create-epics-and-stories/workflow.md

@@ -1,5 +1,5 @@
 ---
-name: create-epics-stories
+name: create-epics-and-stories
 description: 'Transform PRD requirements and Architecture decisions into comprehensive stories organized by user value. This workflow requires completed PRD + Architecture documents (UX recommended if UI exists) and breaks down requirements into implementation-ready epics and user stories that incorporate all available technical and design context. Creates detailed, actionable stories with complete acceptance criteria for development teams.'
 web_bundle: true
 ---

src/modules/bmm/workflows/excalidraw-diagrams/create-dataflow/workflow.yaml

@@ -7,8 +7,8 @@ config_source: "{project-root}/_bmad/bmm/config.yaml"
 output_folder: "{config_source}:output_folder"
 
 # Workflow components
-installed_path: "{project-root}/_bmad/bmm/workflows/diagrams/create-dataflow"
+installed_path: "{project-root}/_bmad/bmm/workflows/excalidraw-diagrams/create-dataflow"
-shared_path: "{project-root}/_bmad/bmm/workflows/diagrams/_shared"
+shared_path: "{project-root}/_bmad/bmm/workflows/excalidraw-diagrams/_shared"
 instructions: "{installed_path}/instructions.md"
 validation: "{installed_path}/checklist.md"
 
@@ -21,7 +21,7 @@ templates: "{shared_path}/excalidraw-templates.yaml"
 library: "{shared_path}/excalidraw-library.json"
 
 # Output file (respects user's configured output_folder)
-default_output_file: "{output_folder}/diagrams/dataflow-{timestamp}.excalidraw"
+default_output_file: "{output_folder}/excalidraw-diagrams/dataflow-{timestamp}.excalidraw"
 
 standalone: true
 web_bundle: false

src/modules/bmm/workflows/excalidraw-diagrams/create-diagram/workflow.yaml

@@ -7,8 +7,8 @@ config_source: "{project-root}/_bmad/bmm/config.yaml"
 output_folder: "{config_source}:output_folder"
 
 # Workflow components
-installed_path: "{project-root}/_bmad/bmm/workflows/diagrams/create-diagram"
+installed_path: "{project-root}/_bmad/bmm/workflows/excalidraw-diagrams/create-diagram"
-shared_path: "{project-root}/_bmad/bmm/workflows/diagrams/_shared"
+shared_path: "{project-root}/_bmad/bmm/workflows/excalidraw-diagrams/_shared"
 instructions: "{installed_path}/instructions.md"
 validation: "{installed_path}/checklist.md"
 
@@ -21,7 +21,7 @@ templates: "{shared_path}/excalidraw-templates.yaml"
 library: "{shared_path}/excalidraw-library.json"
 
 # Output file (respects user's configured output_folder)
-default_output_file: "{output_folder}/diagrams/diagram-{timestamp}.excalidraw"
+default_output_file: "{output_folder}/excalidraw-diagrams/diagram-{timestamp}.excalidraw"
 
 standalone: true
 web_bundle: false

src/modules/bmm/workflows/excalidraw-diagrams/create-flowchart/workflow.yaml

@@ -7,8 +7,8 @@ config_source: "{project-root}/_bmad/bmm/config.yaml"
 output_folder: "{config_source}:output_folder"
 
 # Workflow components
-installed_path: "{project-root}/_bmad/bmm/workflows/diagrams/create-flowchart"
+installed_path: "{project-root}/_bmad/bmm/workflows/excalidraw-diagrams/create-flowchart"
-shared_path: "{project-root}/_bmad/bmm/workflows/diagrams/_shared"
+shared_path: "{project-root}/_bmad/bmm/workflows/excalidraw-diagrams/_shared"
 instructions: "{installed_path}/instructions.md"
 validation: "{installed_path}/checklist.md"
 
@@ -21,7 +21,7 @@ templates: "{shared_path}/excalidraw-templates.yaml"
 library: "{shared_path}/excalidraw-library.json"
 
 # Output file (respects user's configured output_folder)
-default_output_file: "{output_folder}/diagrams/flowchart-{timestamp}.excalidraw"
+default_output_file: "{output_folder}/excalidraw-diagrams/flowchart-{timestamp}.excalidraw"
 
 standalone: true
 web_bundle: false

src/modules/bmm/workflows/excalidraw-diagrams/create-wireframe/workflow.yaml

@@ -7,8 +7,8 @@ config_source: "{project-root}/_bmad/bmm/config.yaml"
 output_folder: "{config_source}:output_folder"
 
 # Workflow components
-installed_path: "{project-root}/_bmad/bmm/workflows/diagrams/create-wireframe"
+installed_path: "{project-root}/_bmad/bmm/workflows/excalidraw-diagrams/create-wireframe"
-shared_path: "{project-root}/_bmad/bmm/workflows/diagrams/_shared"
+shared_path: "{project-root}/_bmad/bmm/workflows/excalidraw-diagrams/_shared"
 instructions: "{installed_path}/instructions.md"
 validation: "{installed_path}/checklist.md"
 
@@ -21,7 +21,7 @@ templates: "{shared_path}/excalidraw-templates.yaml"
 library: "{shared_path}/excalidraw-library.json"
 
 # Output file (respects user's configured output_folder)
-default_output_file: "{output_folder}/diagrams/wireframe-{timestamp}.excalidraw"
+default_output_file: "{output_folder}/excalidraw-diagrams/wireframe-{timestamp}.excalidraw"
 
 standalone: true
 web_bundle: false

src/modules/cis/agents/storyteller/storyteller-sidecar/stories-told.md

@@ -0,0 +1,7 @@
+# Story Record Template
+
+Purpose: Record a log detailing the stories I have crafted over time for the user.
+
+## Narratives Told Record
+
+<!-- track stories created metadata with the user over time -->

src/modules/cis/agents/storyteller/storyteller-sidecar/story-preferences.md

@@ -0,0 +1,7 @@
+# Story Record Template
+
+Purpose: Record a log of learned users story telling or story building preferences.
+
+## User Preferences
+
+<!-- record any user preferences about story crafting the user prefers -->

src/modules/cis/agents/storyteller/storyteller.agent.yaml

@@ -14,6 +14,10 @@ agent:
     communication_style: Speaks like a bard weaving an epic tale - flowery, whimsical, every sentence enraptures and draws you deeper
     principles: Powerful narratives leverage timeless human truths. Find the authentic story. Make the abstract concrete through vivid details.
 
+  critical_actions:
+    - "Load COMPLETE file {agent_sidecar_folder}/storyteller-sidecar/story-preferences.md and review remember the User Preferences"
+    - "Load COMPLETE file {agent_sidecar_folder}/storyteller-sidecar/stories-told.md and review the history of stories created for this user"
+
   menu:
     - trigger: story
       exec: "{project-root}/_bmad/cis/workflows/storytelling/workflow.yaml"

src/modules/cis/module.yaml

@@ -1,7 +1,7 @@
 code: cis
 name: "CIS: Creative Innovation Suite"
 header: "Creative Innovation Suite (CIS) Module"
-subheader: "No Configuration needed - uses Core Config only."
+subheader: "No custom configuration required - uses Core settings only"
 default_selected: false # This module will not be selected by default for new installations
 
 # Variables from Core Config inserted:

tools/cli/commands/install.js

@@ -21,15 +21,6 @@ module.exports = {
         return;
       }
 
-      // Handle agent compilation separately
-      if (config.actionType === 'compile') {
-        const result = await installer.compileAgents(config);
-        console.log(chalk.green('\n✨ Agent compilation complete!'));
-        console.log(chalk.cyan(`Rebuilt ${result.agentCount} agents and ${result.taskCount} tasks`));
-        process.exit(0);
-        return;
-      }
-
       // Handle quick update separately
       if (config.actionType === 'quick-update') {
         const result = await installer.quickUpdate(config);
@@ -39,11 +30,6 @@ module.exports = {
         return;
       }
 
-      // Handle reinstall by setting force flag
-      if (config.actionType === 'reinstall') {
-        config._requestedReinstall = true;
-      }
-
       // Regular install/update flow
       const result = await installer.install(config);
 
@@ -55,14 +41,11 @@ module.exports = {
 
       // Check if installation succeeded
       if (result && result.success) {
-        console.log(chalk.green('\n✨ Installation complete!'));
-        console.log(chalk.cyan('BMAD Core and Selected Modules have been installed to:'), chalk.bold(result.path));
-        console.log(chalk.yellow('\nThank you for helping test the early release version of the new BMad Core and BMad Method!'));
-        console.log(chalk.cyan('Stable Beta coming soon - please read the full README.md and linked documentation to get started!'));
-
         // Run AgentVibes installer if needed
         if (result.needsAgentVibes) {
-          console.log(chalk.magenta('\n🎙️  AgentVibes TTS Setup'));
+          // Add some spacing before AgentVibes setup
+          console.log('');
+          console.log(chalk.magenta('🎙️  AgentVibes TTS Setup'));
           console.log(chalk.cyan('AgentVibes provides voice synthesis for BMAD agents with:'));
           console.log(chalk.dim('  • ElevenLabs AI (150+ premium voices)'));
           console.log(chalk.dim('  • Piper TTS (50+ free voices)\n'));
@@ -91,6 +74,7 @@ module.exports = {
               shell: true,
             });
             console.log(chalk.green('\n✓ AgentVibes installation complete'));
+            console.log(chalk.cyan('\n✨ BMAD with TTS is ready to use!'));
           } catch {
             console.log(chalk.yellow('\n⚠ AgentVibes installation was interrupted or failed'));
             console.log(chalk.cyan('You can run it manually later with:'));

tools/cli/commands/list.js

@@ -9,7 +9,9 @@ module.exports = {
   options: [],
   action: async () => {
     try {
-      const modules = await installer.getAvailableModules();
+      const result = await installer.getAvailableModules();
+      const { modules, customModules } = result;
+
       console.log(chalk.cyan('\n📦 Available BMAD Modules:\n'));
 
       for (const module of modules) {
@@ -19,6 +21,16 @@ module.exports = {
         console.log();
       }
 
+      if (customModules && customModules.length > 0) {
+        console.log(chalk.cyan('\n🔧 Custom Modules:\n'));
+        for (const module of customModules) {
+          console.log(chalk.bold(`  ${module.id}`));
+          console.log(chalk.dim(`    ${module.description}`));
+          console.log(chalk.dim(`    Version: ${module.version}`));
+          console.log();
+        }
+      }
+
       process.exit(0);
     } catch (error) {
       console.error(chalk.red('Error:'), error.message);

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

@@ -127,10 +127,6 @@ class ConfigCollector {
       }
     }
 
-    if (foundAny) {
-      console.log(chalk.cyan('\n📋 Found existing BMAD module configurations'));
-    }
-
     return foundAny;
   }
 
@@ -254,6 +250,26 @@ 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];
@@ -302,11 +318,12 @@ class ConfigCollector {
           this.allAnswers[`${moduleName}_user_name`] = this.getDefaultUsername();
         }
       }
-      // Show "no config" message for modules with no new questions
-      CLIUtils.displayModuleNoConfig(moduleName, moduleConfig.header, moduleConfig.subheader);
-      return false; // No new fields
     }
 
+    // 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 (interactive or static), process them
     if (newKeys.length > 0 || newStaticKeys.length > 0) {
       const questions = [];
@@ -339,7 +356,7 @@ class ConfigCollector {
         Object.assign(allAnswers, promptedAnswers);
       } else if (newStaticKeys.length > 0) {
         // Only static fields, no questions - show no config message
-        CLIUtils.displayModuleNoConfig(moduleName, moduleConfig.header, moduleConfig.subheader);
+        console.log(chalk.dim(`  ✓ ${moduleName.toUpperCase()} module configuration updated`));
       }
 
       // Store all answers for cross-referencing
@@ -558,21 +575,60 @@ class ConfigCollector {
     // Collect all answers (static + prompted)
     let allAnswers = { ...staticAnswers };
 
-    // Display appropriate header based on whether there are questions
+    // If there are questions to ask, prompt for accepting defaults vs customizing
     if (questions.length > 0) {
-      CLIUtils.displayModuleConfigHeader(moduleName, moduleConfig.header, moduleConfig.subheader);
+      // Get friendly module name from config or use uppercase module name
-      console.log(); // Line break before questions
+      const moduleDisplayName = moduleConfig.header || `${moduleName.toUpperCase()} Module`;
-      const promptedAnswers = await inquirer.prompt(questions);
 
-      // Merge prompted answers with static answers
+      // Add blank line for better readability
-      Object.assign(allAnswers, promptedAnswers);
+      console.log();
+
+      // Display the module name in color first
+      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,
+        },
+      ]);
+
+      if (customize) {
+        // 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 {
+        // Customize - ask all questions
+        console.log(chalk.dim(`\n  Configuring ${moduleName.toUpperCase()}...`));
+        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)
-    if (Object.keys(allAnswers).length > 0) {
+    // 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
@@ -671,8 +727,68 @@ class ConfigCollector {
 
       // No longer display completion boxes - keep output clean
     } else {
-      // No questions for this module - show completion message
+      // No questions for this module - show completion message with header if available
-      CLIUtils.displayModuleNoConfig(moduleName, moduleConfig.header, moduleConfig.subheader);
+      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;
+            }
+          }
+        }
+      }
     }
   }
 

tools/cli/installers/lib/core/custom-module-cache.js

@@ -40,7 +40,10 @@ class CustomModuleCache {
    */
   async updateCacheManifest(manifest) {
     const yaml = require('yaml');
-    const content = yaml.stringify(manifest, {
+    // Clean the manifest to remove any non-serializable values
+    const cleanManifest = structuredClone(manifest);
+
+    const content = yaml.stringify(cleanManifest, {
       indent: 2,
       lineWidth: 0,
       sortKeys: false,
@@ -144,12 +147,18 @@ class CustomModuleCache {
     const sourceHash = await this.calculateHash(sourcePath);
     const cacheHash = await this.calculateHash(cacheDir);
 
-    // Update manifest - don't store originalPath for source control friendliness
+    // Update manifest - don't store absolute paths for portability
+    // Clean metadata to remove absolute paths
+    const cleanMetadata = { ...metadata };
+    if (cleanMetadata.sourcePath) {
+      delete cleanMetadata.sourcePath;
+    }
+
     cacheManifest[moduleId] = {
       originalHash: sourceHash,
       cacheHash: cacheHash,
       cachedAt: new Date().toISOString(),
-      ...metadata,
+      ...cleanMetadata,
     };
 
     await this.updateCacheManifest(cacheManifest);

tools/cli/installers/lib/core/ide-config-manager.js

@@ -61,7 +61,10 @@ class IdeConfigManager {
       configuration: configuration || {},
     };
 
-    const yamlContent = yaml.stringify(configData, {
+    // Clean the config to remove any non-serializable values (like functions)
+    const cleanConfig = structuredClone(configData);
+
+    const yamlContent = yaml.stringify(cleanConfig, {
       indent: 2,
       lineWidth: 0,
       sortKeys: false,

tools/cli/installers/lib/core/manifest-generator.js

@@ -38,14 +38,17 @@ class ManifestGenerator {
     // Scan the bmad directory to find all actually installed modules
     const installedModules = await this.scanInstalledModules(bmadDir);
 
-    // Deduplicate modules list to prevent duplicates
+    // Since custom modules are now installed the same way as regular modules,
-    this.modules = [...new Set(['core', ...selectedModules, ...preservedModules, ...installedModules])];
+    // we don't need to exclude them from manifest generation
-    this.updatedModules = [...new Set(['core', ...selectedModules, ...installedModules])]; // All installed modules get rescanned
+    const allModules = [...new Set(['core', ...selectedModules, ...preservedModules, ...installedModules])];
+
+    this.modules = allModules;
+    this.updatedModules = allModules; // Include ALL modules (including custom) for scanning
 
     // For CSV manifests, we need to include ALL modules that are installed
     // preservedModules controls which modules stay as-is in the CSV (don't get rescanned)
     // But all modules should be included in the final manifest
-    this.preservedModules = [...new Set([...preservedModules, ...selectedModules, ...installedModules])]; // Include all installed modules
+    this.preservedModules = allModules; // Include ALL modules (including custom)
     this.bmadDir = bmadDir;
     this.bmadFolderName = path.basename(bmadDir); // Get the actual folder name (e.g., '_bmad' or 'bmad')
     this.allInstalledFiles = installedFiles;
@@ -454,33 +457,20 @@ class ManifestGenerator {
   async writeMainManifest(cfgDir) {
     const manifestPath = path.join(cfgDir, 'manifest.yaml');
 
-    // Read existing manifest to preserve custom modules
-    let existingCustomModules = [];
-    if (await fs.pathExists(manifestPath)) {
-      try {
-        const existingContent = await fs.readFile(manifestPath, 'utf8');
-        const existingManifest = yaml.parse(existingContent);
-        if (existingManifest && existingManifest.customModules) {
-          existingCustomModules = existingManifest.customModules;
-        }
-      } catch {
-        // If we can't read the existing manifest, continue without preserving custom modules
-        console.warn('Warning: Could not read existing manifest to preserve custom modules');
-      }
-    }
-
     const manifest = {
       installation: {
         version: packageJson.version,
         installDate: new Date().toISOString(),
         lastUpdated: new Date().toISOString(),
       },
-      modules: this.modules,
+      modules: this.modules, // Include ALL modules (standard and custom)
-      customModules: existingCustomModules, // Preserve custom modules
       ides: this.selectedIdes,
     };
 
-    const yamlStr = yaml.stringify(manifest, {
+    // Clean the manifest to remove any non-serializable values
+    const cleanManifest = structuredClone(manifest);
+
+    const yamlStr = yaml.stringify(cleanManifest, {
       indent: 2,
       lineWidth: 0,
       sortKeys: false,

tools/cli/installers/lib/core/manifest.js

@@ -28,7 +28,10 @@ class Manifest {
     };
 
     // Write YAML manifest
-    const yamlContent = yaml.stringify(manifestData, {
+    // Clean the manifest data to remove any non-serializable values
+    const cleanManifestData = structuredClone(manifestData);
+
+    const yamlContent = yaml.stringify(cleanManifestData, {
       indent: 2,
       lineWidth: 0,
       sortKeys: false,
@@ -59,8 +62,8 @@ class Manifest {
           version: manifestData.installation?.version,
           installDate: manifestData.installation?.installDate,
           lastUpdated: manifestData.installation?.lastUpdated,
-          modules: manifestData.modules || [],
+          modules: manifestData.modules || [], // All modules (standard and custom)
-          customModules: manifestData.customModules || [],
+          customModules: manifestData.customModules || [], // Keep for backward compatibility
           ides: manifestData.ides || [],
         };
       } catch (error) {
@@ -92,15 +95,17 @@ class Manifest {
         installDate: manifest.installDate,
         lastUpdated: manifest.lastUpdated,
       },
-      modules: manifest.modules || [],
+      modules: manifest.modules || [], // All modules (standard and custom)
-      customModules: manifest.customModules || [],
       ides: manifest.ides || [],
     };
 
     const manifestPath = path.join(bmadDir, '_config', 'manifest.yaml');
     await fs.ensureDir(path.dirname(manifestPath));
 
-    const yamlContent = yaml.stringify(manifestData, {
+    // Clean the manifest data to remove any non-serializable values
+    const cleanManifestData = structuredClone(manifestData);
+
+    const yamlContent = yaml.stringify(cleanManifestData, {
       indent: 2,
       lineWidth: 0,
       sortKeys: false,

tools/cli/installers/lib/custom/handler.js

@@ -320,7 +320,10 @@ class CustomHandler {
           if (await fs.pathExists(genericTemplatePath)) {
             let templateContent = await fs.readFile(genericTemplatePath, 'utf8');
             await fs.writeFile(customizePath, templateContent, 'utf8');
-            console.log(chalk.dim(`  Created customize: custom-${agentName}.customize.yaml`));
+            // Only show customize creation in verbose mode
+            if (process.env.BMAD_VERBOSE_INSTALL === 'true') {
+              console.log(chalk.dim(`  Created customize: custom-${agentName}.customize.yaml`));
+            }
           }
         }
 
@@ -341,11 +344,14 @@ class CustomHandler {
           fileTrackingCallback(targetMdPath);
         }
 
-        console.log(
+        // Only show compilation details in verbose mode
-          chalk.dim(
+        if (process.env.BMAD_VERBOSE_INSTALL === 'true') {
-            `    Compiled agent: ${agentName} -> ${path.relative(targetAgentsPath, targetMdPath)}${hasSidecar ? ' (with sidecar)' : ''}`,
+          console.log(
-          ),
+            chalk.dim(
-        );
+              `    Compiled agent: ${agentName} -> ${path.relative(targetAgentsPath, targetMdPath)}${hasSidecar ? ' (with sidecar)' : ''}`,
+            ),
+          );
+        }
       } catch (error) {
         console.warn(chalk.yellow(`    Failed to compile agent ${agentName}:`, error.message));
         results.errors.push(`Failed to compile agent ${agentName}: ${error.message}`);

tools/cli/installers/lib/ide/_base-ide.js

@@ -34,7 +34,7 @@ class BaseIdeSetup {
    * @returns {string} The activation header text
    */
   async getAgentCommandHeader() {
-    const headerPath = path.join(getSourcePath(), 'src', 'utility', 'agent-components', 'agent-command-header.md');
+    const headerPath = getSourcePath('utility', 'agent-components', 'agent-command-header.md');
     return await fs.readFile(headerPath, 'utf8');
   }
 

tools/cli/installers/lib/ide/roo.js

@@ -45,12 +45,22 @@ class RooSetup extends BaseIdeSetup {
         continue;
       }
 
-      // Read the actual agent file from _bmad for metadata extraction (installed agents are .md files)
+      // artifact.sourcePath contains the full path to the agent file
-      const agentPath = path.join(bmadDir, artifact.module, 'agents', `${artifact.name}.md`);
+      if (!artifact.sourcePath) {
-      const content = await this.readFile(agentPath);
+        console.error(`Error: Missing sourcePath for artifact ${artifact.name} from module ${artifact.module}`);
+        console.error(`Artifact object:`, artifact);
+        throw new Error(`Missing sourcePath for agent: ${artifact.name}`);
+      }
+
+      const content = await this.readFile(artifact.sourcePath);
 
       // Create command file that references the actual _bmad agent
-      await this.createCommandFile({ module: artifact.module, name: artifact.name, path: agentPath }, content, commandPath, projectDir);
+      await this.createCommandFile(
+        { module: artifact.module, name: artifact.name, path: artifact.sourcePath },
+        content,
+        commandPath,
+        projectDir,
+      );
 
       addedCount++;
       console.log(chalk.green(`  ✓ Added command: ${commandName}`));

tools/cli/installers/lib/modules/manager.js

@@ -28,7 +28,7 @@ class ModuleManager {
     this.modulesSourcePath = getSourcePath('modules');
     this.xmlHandler = new XmlHandler();
     this.bmadFolderName = 'bmad'; // Default, can be overridden
-    this.scanProjectForModules = options.scanProjectForModules !== false; // Default to true for backward compatibility
+    this.customModulePaths = new Map(); // Initialize custom module paths
   }
 
   /**
@@ -47,6 +47,14 @@ class ModuleManager {
     this.coreConfig = coreConfig;
   }
 
+  /**
+   * Set custom module paths for priority lookup
+   * @param {Map<string, string>} customModulePaths - Map of module ID to source path
+   */
+  setCustomModulePaths(customModulePaths) {
+    this.customModulePaths = customModulePaths;
+  }
+
   /**
    * Copy a file and replace _bmad placeholder with actual folder name
    * @param {string} sourcePath - Source file path
@@ -107,76 +115,6 @@ class ModuleManager {
     }
   }
 
-  /**
-   * Find all modules in the project by searching for module.yaml files
-   * @returns {Array} List of module paths
-   */
-  async findModulesInProject() {
-    const projectRoot = getProjectRoot();
-    const modulePaths = new Set();
-
-    // Helper function to recursively scan directories
-    async function scanDirectory(dir, excludePaths = []) {
-      try {
-        const entries = await fs.readdir(dir, { withFileTypes: true });
-
-        for (const entry of entries) {
-          const fullPath = path.join(dir, entry.name);
-
-          // Skip hidden directories, node_modules, and literal placeholder directories
-          if (
-            entry.name.startsWith('.') ||
-            entry.name === 'node_modules' ||
-            entry.name === 'dist' ||
-            entry.name === 'build' ||
-            entry.name === '{project-root}'
-          ) {
-            continue;
-          }
-
-          // Skip excluded paths
-          if (excludePaths.some((exclude) => fullPath.startsWith(exclude))) {
-            continue;
-          }
-
-          if (entry.isDirectory()) {
-            // Skip core module - it's always installed first and not selectable
-            if (entry.name === 'core') {
-              continue;
-            }
-
-            // Check if this directory contains a module (module.yaml OR custom.yaml)
-            const moduleConfigPath = path.join(fullPath, 'module.yaml');
-            const installerConfigPath = path.join(fullPath, '_module-installer', 'module.yaml');
-            const customConfigPath = path.join(fullPath, '_module-installer', 'custom.yaml');
-            const rootCustomConfigPath = path.join(fullPath, 'custom.yaml');
-
-            if (
-              (await fs.pathExists(moduleConfigPath)) ||
-              (await fs.pathExists(installerConfigPath)) ||
-              (await fs.pathExists(customConfigPath)) ||
-              (await fs.pathExists(rootCustomConfigPath))
-            ) {
-              modulePaths.add(fullPath);
-              // Don't scan inside modules - they might have their own nested structures
-              continue;
-            }
-
-            // Recursively scan subdirectories
-            await scanDirectory(fullPath, excludePaths);
-          }
-        }
-      } catch {
-        // Ignore errors (e.g., permission denied)
-      }
-    }
-
-    // Scan the entire project, but exclude src/modules since we handle it separately
-    await scanDirectory(projectRoot, [this.modulesSourcePath]);
-
-    return [...modulePaths];
-  }
-
   /**
    * List all available modules (excluding core which is always installed)
    * @returns {Object} Object with modules array and customModules array
@@ -219,43 +157,19 @@ class ModuleManager {
       }
     }
 
-    // Then, find all other modules in the project (only if scanning is enabled)
+    // Check for cached custom modules in _config/custom/
-    if (this.scanProjectForModules) {
+    if (this.bmadDir) {
-      const otherModulePaths = await this.findModulesInProject();
+      const customCacheDir = path.join(this.bmadDir, '_config', 'custom');
-      for (const modulePath of otherModulePaths) {
+      if (await fs.pathExists(customCacheDir)) {
-        const moduleName = path.basename(modulePath);
+        const cacheEntries = await fs.readdir(customCacheDir, { withFileTypes: true });
-        const relativePath = path.relative(getProjectRoot(), modulePath);
+        for (const entry of cacheEntries) {
-
+          if (entry.isDirectory()) {
-        // Skip core module - it's always installed first and not selectable
+            const cachePath = path.join(customCacheDir, entry.name);
-        if (moduleName === 'core') {
+            const moduleInfo = await this.getModuleInfo(cachePath, entry.name, '_config/custom');
-          continue;
+            if (moduleInfo && !modules.some((m) => m.id === moduleInfo.id) && !customModules.some((m) => m.id === moduleInfo.id)) {
-        }
+              moduleInfo.isCustom = true;
-
+              moduleInfo.fromCache = true;
-        const moduleInfo = await this.getModuleInfo(modulePath, moduleName, relativePath);
+              customModules.push(moduleInfo);
-        if (moduleInfo && !modules.some((m) => m.id === moduleInfo.id) && !customModules.some((m) => m.id === moduleInfo.id)) {
-          // Avoid duplicates - skip if we already have this module ID
-          if (moduleInfo.isCustom) {
-            customModules.push(moduleInfo);
-          } else {
-            modules.push(moduleInfo);
-          }
-        }
-      }
-
-      // Also check for cached custom modules in _config/custom/
-      if (this.bmadDir) {
-        const customCacheDir = path.join(this.bmadDir, '_config', 'custom');
-        if (await fs.pathExists(customCacheDir)) {
-          const cacheEntries = await fs.readdir(customCacheDir, { withFileTypes: true });
-          for (const entry of cacheEntries) {
-            if (entry.isDirectory()) {
-              const cachePath = path.join(customCacheDir, entry.name);
-              const moduleInfo = await this.getModuleInfo(cachePath, entry.name, '_config/custom');
-              if (moduleInfo && !modules.some((m) => m.id === moduleInfo.id) && !customModules.some((m) => m.id === moduleInfo.id)) {
-                moduleInfo.isCustom = true;
-                moduleInfo.fromCache = true;
-                customModules.push(moduleInfo);
-              }
             }
           }
         }
@@ -334,66 +248,50 @@ class ModuleManager {
 
   /**
    * Find the source path for a module by searching all possible locations
-   * @param {string} moduleName - Name of the module to find
+   * @param {string} moduleCode - Code of the module to find (from module.yaml)
    * @returns {string|null} Path to the module source or null if not found
    */
-  async findModuleSource(moduleName) {
+  async findModuleSource(moduleCode) {
     const projectRoot = getProjectRoot();
 
-    // First, check src/modules
+    // First check custom module paths if they exist
-    const srcModulePath = path.join(this.modulesSourcePath, moduleName);
+    if (this.customModulePaths && this.customModulePaths.has(moduleCode)) {
-    if (await fs.pathExists(srcModulePath)) {
+      return this.customModulePaths.get(moduleCode);
-      // Check if this looks like a module (has module.yaml)
-      const moduleConfigPath = path.join(srcModulePath, 'module.yaml');
-      const installerConfigPath = path.join(srcModulePath, '_module-installer', 'module.yaml');
-
-      if ((await fs.pathExists(moduleConfigPath)) || (await fs.pathExists(installerConfigPath))) {
-        return srcModulePath;
-      }
-
-      // Also check for custom.yaml in src/modules/_module-installer
-      const customConfigPath = path.join(srcModulePath, '_module-installer', 'custom.yaml');
-      if (await fs.pathExists(customConfigPath)) {
-        return srcModulePath;
-      }
     }
 
-    // If not found in src/modules, search the entire project
+    // Search in src/modules by READING module.yaml files to match by code
-    const allModulePaths = await this.findModulesInProject();
+    if (await fs.pathExists(this.modulesSourcePath)) {
-    for (const modulePath of allModulePaths) {
+      const entries = await fs.readdir(this.modulesSourcePath, { withFileTypes: true });
-      if (path.basename(modulePath) === moduleName) {
+      for (const entry of entries) {
-        return modulePath;
+        if (entry.isDirectory()) {
-      }
+          const modulePath = path.join(this.modulesSourcePath, entry.name);
-    }
 
-    // Also check by module ID (not just folder name)
+          // Read module.yaml to get the code
-    // Need to read configs to match by ID
+          const moduleConfigPath = path.join(modulePath, 'module.yaml');
-    for (const modulePath of allModulePaths) {
+          const installerConfigPath = path.join(modulePath, '_module-installer', 'module.yaml');
-      const moduleConfigPath = path.join(modulePath, 'module.yaml');
+          const customConfigPath = path.join(modulePath, '_module-installer', 'custom.yaml');
-      const installerConfigPath = path.join(modulePath, '_module-installer', 'module.yaml');
-      const customConfigPath = path.join(modulePath, '_module-installer', 'custom.yaml');
-      const rootCustomConfigPath = path.join(modulePath, 'custom.yaml');
 
-      let configPath = null;
+          let configPath = null;
-      if (await fs.pathExists(moduleConfigPath)) {
+          if (await fs.pathExists(moduleConfigPath)) {
-        configPath = moduleConfigPath;
+            configPath = moduleConfigPath;
-      } else if (await fs.pathExists(installerConfigPath)) {
+          } else if (await fs.pathExists(installerConfigPath)) {
-        configPath = installerConfigPath;
+            configPath = installerConfigPath;
-      } else if (await fs.pathExists(customConfigPath)) {
+          } else if (await fs.pathExists(customConfigPath)) {
-        configPath = customConfigPath;
+            configPath = customConfigPath;
-      } else if (await fs.pathExists(rootCustomConfigPath)) {
+          }
-        configPath = rootCustomConfigPath;
+
-      }
+          if (configPath) {
-
+            try {
-      if (configPath) {
+              const configContent = await fs.readFile(configPath, 'utf8');
-        try {
+              const config = yaml.parse(configContent);
-          const configContent = await fs.readFile(configPath, 'utf8');
+              if (config.code === moduleCode) {
-          const config = yaml.parse(configContent);
+                return modulePath;
-          if (config.code === moduleName) {
+              }
-            return modulePath;
+            } catch (error) {
+              // Continue to next module if parse fails
+              console.warn(`Warning: Failed to parse module config at ${configPath}: ${error.message}`);
+            }
           }
-        } catch (error) {
-          throw new Error(`Failed to parse module.yaml at ${configPath}: ${error.message}`);
         }
       }
     }
@@ -403,7 +301,7 @@ class ModuleManager {
 
   /**
    * Install a module
-   * @param {string} moduleName - Name of the module to install
+   * @param {string} moduleName - Code of the module to install (from module.yaml)
    * @param {string} bmadDir - Target bmad directory
    * @param {Function} fileTrackingCallback - Optional callback to track installed files
    * @param {Object} options - Additional installation options
@@ -417,7 +315,10 @@ class ModuleManager {
 
     // Check if source module exists
     if (!sourcePath) {
-      throw new Error(`Module '${moduleName}' not found in any source location`);
+      // Provide a more user-friendly error message
+      throw new Error(
+        `Source for module '${moduleName}' is not available. It will be retained but cannot be updated without its source files.`,
+      );
     }
 
     // Check if this is a custom module and read its custom.yaml values
@@ -451,7 +352,6 @@ class ModuleManager {
 
     // Check if already installed
     if (await fs.pathExists(targetPath)) {
-      console.log(chalk.yellow(`Module '${moduleName}' already installed, updating...`));
       await fs.remove(targetPath);
     }
 
@@ -507,6 +407,10 @@ class ModuleManager {
     } else {
       // Selective update - preserve user modifications
       await this.syncModule(sourcePath, targetPath);
+
+      // Recompile agents (#1133)
+      await this.compileModuleAgents(sourcePath, targetPath, moduleName, bmadDir);
+      await this.processAgentFiles(targetPath, moduleName);
     }
 
     return {
@@ -819,7 +723,10 @@ class ModuleManager {
           const genericTemplatePath = getSourcePath('utility', 'agent-components', 'agent.customize.template.yaml');
           if (await fs.pathExists(genericTemplatePath)) {
             await this.copyFileWithPlaceholderReplacement(genericTemplatePath, customizePath);
-            console.log(chalk.dim(`  Created customize: ${moduleName}-${agentName}.customize.yaml`));
+            // Only show customize creation in verbose mode
+            if (process.env.BMAD_VERBOSE_INSTALL === 'true') {
+              console.log(chalk.dim(`  Created customize: ${moduleName}-${agentName}.customize.yaml`));
+            }
 
             // Store original hash for modification detection
             const crypto = require('node:crypto');
@@ -841,7 +748,10 @@ class ModuleManager {
 
             // Write back to manifest
             const yaml = require('yaml');
-            const updatedContent = yaml.stringify(manifestData, {
+            // Clean the manifest data to remove any non-serializable values
+            const cleanManifestData = structuredClone(manifestData);
+
+            const updatedContent = yaml.stringify(cleanManifestData, {
               indent: 2,
               lineWidth: 0,
             });
@@ -905,9 +815,14 @@ class ModuleManager {
           await fs.writeFile(targetMdPath, xml, 'utf8');
         }
 
-        console.log(
+        // Only show compilation details in verbose mode
-          chalk.dim(`    Compiled agent: ${agentName} -> ${path.relative(targetPath, targetMdPath)}${hasSidecar ? ' (with sidecar)' : ''}`),
+        if (process.env.BMAD_VERBOSE_INSTALL === 'true') {
-        );
+          console.log(
+            chalk.dim(
+              `    Compiled agent: ${agentName} -> ${path.relative(targetPath, targetMdPath)}${hasSidecar ? ' (with sidecar)' : ''}`,
+            ),
+          );
+        }
       } catch (error) {
         console.warn(chalk.yellow(`    Failed to compile agent ${agentName}:`, error.message));
       }

tools/cli/lib/agent/compiler.js

@@ -346,6 +346,12 @@ async function compileAgent(yamlContent, answers = {}, agentName = '', targetPat
 
   // Replace {bmad_memory} in XML content
   let xml = await compileToXml(cleanYaml, agentName, targetPath);
+
+  // Ensure xml is a string before attempting replaceAll
+  if (typeof xml !== 'string') {
+    throw new TypeError('compileToXml did not return a string');
+  }
+
   if (finalAnswers.bmad_memory) {
     xml = xml.replaceAll('{bmad_memory}', finalAnswers.bmad_memory);
   }

tools/cli/lib/ui.js

@@ -18,8 +18,6 @@ class UI {
    */
   async promptInstall() {
     CLIUtils.displayLogo();
-    const version = CLIUtils.getVersion();
-    CLIUtils.displaySection('BMAD™ Setup', `Build More, Architect Dreams v${version}`);
 
     const confirmedDirectory = await this.getConfirmedDirectory();
 
@@ -40,19 +38,22 @@ class UI {
     let legacyBmadPath = null;
 
     // First check for legacy .bmad folder (instead of _bmad)
-    const entries = await fs.readdir(confirmedDirectory, { withFileTypes: true });
+    // Only check if directory exists
-    for (const entry of entries) {
+    if (await fs.pathExists(confirmedDirectory)) {
-      if (entry.isDirectory() && entry.name === '.bmad') {
+      const entries = await fs.readdir(confirmedDirectory, { withFileTypes: true });
-        hasLegacyBmadFolder = true;
+      for (const entry of entries) {
-        legacyBmadPath = path.join(confirmedDirectory, '.bmad');
+        if (entry.isDirectory() && entry.name === '.bmad') {
-        bmadDir = legacyBmadPath;
+          hasLegacyBmadFolder = true;
+          legacyBmadPath = path.join(confirmedDirectory, '.bmad');
+          bmadDir = legacyBmadPath;
 
-        // Check if it has _cfg folder
+          // Check if it has _cfg folder
-        const cfgPath = path.join(legacyBmadPath, '_cfg');
+          const cfgPath = path.join(legacyBmadPath, '_cfg');
-        if (await fs.pathExists(cfgPath)) {
+          if (await fs.pathExists(cfgPath)) {
-          hasLegacyCfg = true;
+            hasLegacyCfg = true;
+          }
+          break;
         }
-        break;
       }
     }
 
@@ -130,6 +131,36 @@ class UI {
     // Check if there's an existing BMAD installation (after any folder renames)
     const hasExistingInstall = await fs.pathExists(bmadDir);
 
+    // Collect IDE tool selection early - we need this to know if we should ask about TTS
+    let toolSelection;
+    let agentVibesConfig = { enabled: false, alreadyInstalled: false };
+    let claudeCodeSelected = false;
+
+    if (!hasExistingInstall) {
+      // For new installations, collect IDE selection first
+      // We don't have modules yet, so pass empty array
+      toolSelection = await this.promptToolSelection(confirmedDirectory, []);
+
+      // Check if Claude Code was selected
+      claudeCodeSelected = toolSelection.ides && toolSelection.ides.includes('claude-code');
+
+      // If Claude Code was selected, ask about TTS
+      if (claudeCodeSelected) {
+        const { enableTts } = await inquirer.prompt([
+          {
+            type: 'confirm',
+            name: 'enableTts',
+            message: 'Claude Code supports TTS (Text-to-Speech). Would you like to enable it?',
+            default: false,
+          },
+        ]);
+
+        if (enableTts) {
+          agentVibesConfig = { enabled: true, alreadyInstalled: false };
+        }
+      }
+    }
+
     // Always ask for custom content, but we'll handle it differently for new installs
     let customContentConfig = { hasCustomContent: false };
     if (hasExistingInstall) {
@@ -146,19 +177,33 @@ class UI {
 
     // Only show action menu if there's an existing installation
     if (hasExistingInstall) {
+      // Get version information
+      const { existingInstall } = await this.getExistingInstallation(confirmedDirectory);
+      const packageJsonPath = path.join(__dirname, '../../../package.json');
+      const currentVersion = require(packageJsonPath).version;
+      const installedVersion = existingInstall.version || 'unknown';
+
+      // Build menu choices dynamically
+      const choices = [];
+
+      // Always show Quick Update first (allows refreshing installation even on same version)
+      if (installedVersion !== 'unknown') {
+        choices.push({
+          name: `Quick Update (v${installedVersion} → v${currentVersion})`,
+          value: 'quick-update',
+        });
+      }
+
+      // Common actions
+      choices.push({ name: 'Modify BMAD Installation', value: 'update' });
+
       const promptResult = await inquirer.prompt([
         {
           type: 'list',
           name: 'actionType',
           message: 'What would you like to do?',
-          choices: [
+          choices: choices,
-            { name: 'Quick Update (Settings Preserved)', value: 'quick-update' },
+          default: choices[0].value, // Use the first option as default
-            { name: 'Modify BMAD Installation (Confirm or change each setting)', value: 'update' },
-            { name: 'Remove BMad Folder and Reinstall (Full clean install - BMad Customization Will Be Lost)', value: 'reinstall' },
-            { name: 'Compile Agents (Quick rebuild of all agent .md files)', value: 'compile' },
-            { name: 'Cancel', value: 'cancel' },
-          ],
-          default: 'quick-update',
         },
       ]);
 
@@ -175,94 +220,141 @@ class UI {
         };
       }
 
-      // Handle agent compilation separately
+      // If actionType === 'update', handle it with the new flow
-      if (actionType === 'compile') {
+      // Return early with modify configuration
+      if (actionType === 'update') {
+        // Get existing installation info
+        const { installedModuleIds } = await this.getExistingInstallation(confirmedDirectory);
+
+        console.log(chalk.dim(`  Found existing modules: ${[...installedModuleIds].join(', ')}`));
+        const { changeModuleSelection } = await inquirer.prompt([
+          {
+            type: 'confirm',
+            name: 'changeModuleSelection',
+            message: 'Modify official module selection (BMad Method, BMad Builder, Creative Innovation Suite)?',
+            default: false,
+          },
+        ]);
+
+        let selectedModules = [];
+        if (changeModuleSelection) {
+          // Show module selection with existing modules pre-selected
+          const moduleChoices = await this.getModuleChoices(new Set(installedModuleIds), { hasCustomContent: false });
+          selectedModules = await this.selectModules(moduleChoices, [...installedModuleIds]);
+        } else {
+          selectedModules = [...installedModuleIds];
+        }
+
+        // After module selection, ask about custom modules
+        const customModuleResult = await this.handleCustomModulesInModifyFlow(confirmedDirectory, selectedModules);
+
+        // Merge any selected custom modules
+        if (customModuleResult.selectedCustomModules.length > 0) {
+          selectedModules.push(...customModuleResult.selectedCustomModules);
+        }
+
+        // Get tool selection
+        const toolSelection = await this.promptToolSelection(confirmedDirectory, selectedModules);
+
+        // TTS configuration - ask right after tool selection (matches new install flow)
+        const hasClaudeCode = toolSelection.ides && toolSelection.ides.includes('claude-code');
+        let enableTts = false;
+
+        if (hasClaudeCode) {
+          const { enableTts: enable } = await inquirer.prompt([
+            {
+              type: 'confirm',
+              name: 'enableTts',
+              message: 'Claude Code supports TTS (Text-to-Speech). Would you like to enable it?',
+              default: false,
+            },
+          ]);
+          enableTts = enable;
+        }
+
+        // Core config with existing defaults (ask after TTS)
+        const coreConfig = await this.collectCoreConfig(confirmedDirectory);
+
         return {
-          actionType: 'compile',
+          actionType: 'update',
           directory: confirmedDirectory,
+          installCore: true,
+          modules: selectedModules,
+          ides: toolSelection.ides,
+          skipIde: toolSelection.skipIde,
+          coreConfig: coreConfig,
+          customContent: customModuleResult.customContentConfig,
+          enableAgentVibes: enableTts,
+          agentVibesInstalled: false,
         };
       }
-
-      // Handle cancel
-      if (actionType === 'cancel') {
-        return {
-          actionType: 'cancel',
-          directory: confirmedDirectory,
-        };
-      }
-
-      // Handle reinstall - DON'T return early, let it flow through configuration collection
-      // The installer will handle deletion when it sees actionType === 'reinstall'
-      // For now, just note that we're in reinstall mode and continue below
-
-      // If actionType === 'update' or 'reinstall', continue with normal flow below
     }
 
+    // This section is only for new installations (update returns early above)
     const { installedModuleIds } = await this.getExistingInstallation(confirmedDirectory);
+
+    // Ask about official modules for new installations
+    const { wantsOfficialModules } = await inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'wantsOfficialModules',
+        message: 'Will you be installing any official BMad modules (BMad Method, BMad Builder, Creative Innovation Suite)?',
+        default: true,
+      },
+    ]);
+
+    let selectedOfficialModules = [];
+    if (wantsOfficialModules) {
+      const moduleChoices = await this.getModuleChoices(installedModuleIds, { hasCustomContent: false });
+      selectedOfficialModules = await this.selectModules(moduleChoices);
+    }
+
+    // Ask about custom content
+    const { wantsCustomContent } = await inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'wantsCustomContent',
+        message: 'Would you like to install a local custom module (this includes custom agents and workflows also)?',
+        default: false,
+      },
+    ]);
+
+    if (wantsCustomContent) {
+      customContentConfig = await this.promptCustomContentSource();
+    }
+
+    // Store the selected modules for later
+    customContentConfig._selectedOfficialModules = selectedOfficialModules;
+
+    // Build the final list of selected modules
+    let selectedModules = customContentConfig._selectedOfficialModules || [];
+
+    // Add custom content modules if any were selected
+    if (customContentConfig && customContentConfig.selectedModuleIds) {
+      selectedModules = [...selectedModules, ...customContentConfig.selectedModuleIds];
+    }
+
+    // Remove core if it's in the list (it's always installed)
+    selectedModules = selectedModules.filter((m) => m !== 'core');
+
+    // Tool selection (already done for new installs at the beginning)
+    if (!toolSelection) {
+      toolSelection = await this.promptToolSelection(confirmedDirectory, selectedModules);
+    }
+
+    // Collect configurations for new installations
     const coreConfig = await this.collectCoreConfig(confirmedDirectory);
 
-    // Custom content will be handled during installation phase
+    // TTS already handled at the beginning for new installs
-    // Store the custom content config for later use
-    if (customContentConfig._shouldAsk) {
-      delete customContentConfig._shouldAsk;
-    }
-
-    // Skip module selection during update/reinstall - keep existing modules
-    let selectedModules;
-    if (actionType === 'update' || actionType === 'reinstall') {
-      // Keep all existing installed modules during update/reinstall
-      selectedModules = [...installedModuleIds];
-      console.log(chalk.cyan('\n📦 Keeping existing modules: ') + selectedModules.join(', '));
-    } else {
-      // Only show module selection for new installs
-      const moduleChoices = await this.getModuleChoices(installedModuleIds, customContentConfig);
-      selectedModules = await this.selectModules(moduleChoices);
-
-      // Check which custom content items were selected
-      const selectedCustomContent = selectedModules.filter((mod) => mod.startsWith('__CUSTOM_CONTENT__'));
-
-      if (selectedCustomContent.length > 0) {
-        customContentConfig.selected = true;
-        customContentConfig.selectedFiles = selectedCustomContent.map((mod) => mod.replace('__CUSTOM_CONTENT__', ''));
-
-        // Convert custom content to module IDs for installation
-        const customContentModuleIds = [];
-        const customHandler = new CustomHandler();
-        for (const customFile of customContentConfig.selectedFiles) {
-          // Get the module info to extract the ID
-          const customInfo = await customHandler.getCustomInfo(customFile);
-          if (customInfo) {
-            customContentModuleIds.push(customInfo.id);
-          }
-        }
-        // Filter out custom content markers and add module IDs
-        selectedModules = [...selectedModules.filter((mod) => !mod.startsWith('__CUSTOM_CONTENT__')), ...customContentModuleIds];
-      } else if (customContentConfig.hasCustomContent) {
-        // User provided custom content but didn't select any
-        customContentConfig.selected = false;
-        customContentConfig.selectedFiles = [];
-      }
-    }
-
-    // Prompt for AgentVibes TTS integration
-    const agentVibesConfig = await this.promptAgentVibes(confirmedDirectory);
-
-    // Collect IDE tool selection AFTER configuration prompts (fixes Windows/PowerShell hang)
-    // This allows text-based prompts to complete before the checkbox prompt
-    const toolSelection = await this.promptToolSelection(confirmedDirectory, selectedModules);
-
-    // No more screen clearing - keep output flowing
 
     return {
-      actionType: actionType || 'update', // Preserve reinstall or update action
+      actionType: 'install',
       directory: confirmedDirectory,
-      installCore: true, // Always install core
+      installCore: true,
       modules: selectedModules,
-      // IDE selection collected after config, will be configured later
       ides: toolSelection.ides,
       skipIde: toolSelection.skipIde,
-      coreConfig: coreConfig, // Pass collected core config to installer
+      coreConfig: coreConfig,
-      // Custom content configuration
       customContent: customContentConfig,
       enableAgentVibes: agentVibesConfig.enabled,
       agentVibesInstalled: agentVibesConfig.alreadyInstalled,
@@ -352,8 +444,6 @@ class UI {
       }
     }
 
-    CLIUtils.displaySection('Tool Integration', 'Select AI coding assistants and IDEs to configure');
-
     let answers;
     let userConfirmedNoTools = false;
 
@@ -365,7 +455,7 @@ class UI {
           name: 'ides',
           message: 'Select tools to configure:',
           choices: ideChoices,
-          pageSize: 15,
+          pageSize: 30,
         },
       ]);
 
@@ -391,9 +481,8 @@ class UI {
       ]);
 
       if (goBack) {
-        // Re-display the section header before looping back
+        // Re-display a message before looping back
         console.log();
-        CLIUtils.displaySection('Tool Integration', 'Select AI coding assistants and IDEs to configure');
       } else {
         // User explicitly chose to proceed without tools
         userConfirmedNoTools = true;
@@ -483,69 +572,26 @@ class UI {
    * @param {Object} result - Installation result
    */
   showInstallSummary(result) {
-    CLIUtils.displaySection('Installation Complete', 'BMAD™ has been successfully installed');
+    // Clean, simple completion message
-
-    const summary = [
-      `📁 Installation Path: ${result.path}`,
-      `📦 Modules Installed: ${result.modules?.length > 0 ? result.modules.join(', ') : 'core only'}`,
-      `🔧 Tools Configured: ${result.ides?.length > 0 ? result.ides.join(', ') : 'none'}`,
-    ];
-
-    // Add AgentVibes TTS info if enabled
-    if (result.agentVibesEnabled) {
-      summary.push(`🎤 AgentVibes TTS: Enabled`);
-    }
-
-    CLIUtils.displayBox(summary.join('\n\n'), {
-      borderColor: 'green',
-      borderStyle: 'round',
-    });
-
-    // Display TTS injection details if present
-    if (result.ttsInjectedFiles && result.ttsInjectedFiles.length > 0) {
-      console.log('\n' + chalk.cyan.bold('═══════════════════════════════════════════════════'));
-      console.log(chalk.cyan.bold('            AgentVibes TTS Injection Summary'));
-      console.log(chalk.cyan.bold('═══════════════════════════════════════════════════\n'));
-
-      // Explain what TTS injection is
-      console.log(chalk.white.bold('What is TTS Injection?\n'));
-      console.log(chalk.dim('  TTS (Text-to-Speech) injection adds voice instructions to BMAD agents,'));
-      console.log(chalk.dim('  enabling them to speak their responses aloud using AgentVibes.\n'));
-      console.log(chalk.dim('  Example: When you activate the PM agent, it will greet you with'));
-      console.log(chalk.dim('  spoken audio like "Hey! I\'m your Project Manager. How can I help?"\n'));
-
-      console.log(chalk.green(`✅ TTS injection applied to ${result.ttsInjectedFiles.length} file(s):\n`));
-
-      // Group by type
-      const partyModeFiles = result.ttsInjectedFiles.filter((f) => f.type === 'party-mode');
-      const agentTTSFiles = result.ttsInjectedFiles.filter((f) => f.type === 'agent-tts');
-
-      if (partyModeFiles.length > 0) {
-        console.log(chalk.yellow('  Party Mode (multi-agent conversations):'));
-        for (const file of partyModeFiles) {
-          console.log(chalk.dim(`    • ${file.path}`));
-        }
-      }
-
-      if (agentTTSFiles.length > 0) {
-        console.log(chalk.yellow('  Agent TTS (individual agent voices):'));
-        for (const file of agentTTSFiles) {
-          console.log(chalk.dim(`    • ${file.path}`));
-        }
-      }
-
-      // Show backup info and restore command
-      console.log('\n' + chalk.white.bold('Backups & Recovery:\n'));
-      console.log(chalk.dim('  Pre-injection backups are stored in:'));
-      console.log(chalk.cyan('    ~/_bmad-tts-backups/\n'));
-      console.log(chalk.dim('  To restore original files (removes TTS instructions):'));
-      console.log(chalk.cyan(`    bmad-tts-injector.sh --restore ${result.path}\n`));
-
-      console.log(chalk.cyan('💡 BMAD agents will now speak when activated!'));
-      console.log(chalk.dim('   Ensure AgentVibes is installed: https://agentvibes.org'));
-    }
-
     console.log('\n' + chalk.green.bold('✨ BMAD is ready to use!'));
+
+    // Show installation summary in a simple format
+    console.log(chalk.dim(`Installed to: ${result.path}`));
+    if (result.modules && result.modules.length > 0) {
+      console.log(chalk.dim(`Modules: ${result.modules.join(', ')}`));
+    }
+    if (result.agentVibesEnabled) {
+      console.log(chalk.dim(`TTS: Enabled`));
+    }
+
+    // TTS injection info (simplified)
+    if (result.ttsInjectedFiles && result.ttsInjectedFiles.length > 0) {
+      console.log(chalk.dim(`\n💡 TTS enabled for ${result.ttsInjectedFiles.length} agent(s)`));
+      console.log(chalk.dim('   Agents will now speak when using AgentVibes'));
+    }
+
+    console.log(chalk.yellow('\nThank you for helping test the early release version of the new BMad Core and BMad Method!'));
+    console.log(chalk.cyan('Stable Beta coming soon - please read the full README.md and linked documentation to get started!'));
   }
 
   /**
@@ -575,8 +621,8 @@ class UI {
     const { Installer } = require('../installers/lib/core/installer');
     const detector = new Detector();
     const installer = new Installer();
-    const bmadDir = await installer.findBmadDir(directory);
+    const bmadDirResult = await installer.findBmadDir(directory);
-    const existingInstall = await detector.detect(bmadDir);
+    const existingInstall = await detector.detect(bmadDirResult.bmadDir);
     const installedModuleIds = new Set(existingInstall.modules.map((mod) => mod.id));
 
     return { existingInstall, installedModuleIds };
@@ -595,7 +641,9 @@ class UI {
     // Now collect with existing values as defaults (false = don't skip loading, true = skip completion message)
     await configCollector.collectModuleConfig('core', directory, false, true);
 
-    return configCollector.collectedConfig.core;
+    const coreConfig = configCollector.collectedConfig.core;
+    // Ensure we always have a core config object, even if empty
+    return coreConfig || {};
   }
 
   /**
@@ -632,14 +680,8 @@ class UI {
 
     // Add official modules
     const { ModuleManager } = require('../installers/lib/modules/manager');
-    // For new installations, don't scan project yet (will do after custom content is discovered)
+    const moduleManager = new ModuleManager();
-    // For existing installations, scan if user selected custom content
+    const { modules: availableModules, customModules: customModulesFromCache } = await moduleManager.listAvailable();
-    const shouldScanProject =
-      !isNewInstallation && customContentConfig && customContentConfig.hasCustomContent && customContentConfig.selected;
-    const moduleManager = new ModuleManager({
-      scanProjectForModules: shouldScanProject,
-    });
-    const { modules: availableModules, customModules: customModulesFromProject } = await moduleManager.listAvailable();
 
     // First, add all items to appropriate sections
     const allCustomModules = [];
@@ -647,14 +689,14 @@ class UI {
     // Add custom content items from directory
     allCustomModules.push(...customContentItems);
 
-    // Add custom modules from project scan (if scanning is enabled)
+    // Add custom modules from cache
-    for (const mod of customModulesFromProject) {
+    for (const mod of customModulesFromCache) {
       // Skip if this module is already in customContentItems (by path)
       const isDuplicate = allCustomModules.some((item) => item.path && mod.path && path.resolve(item.path) === path.resolve(mod.path));
 
       if (!isDuplicate) {
         allCustomModules.push({
-          name: `${chalk.cyan('✓')} ${mod.name} ${chalk.gray(`(${mod.source})`)}`,
+          name: `${chalk.cyan('✓')} ${mod.name} ${chalk.gray(`(cached)`)}`,
           value: mod.id,
           checked: isNewInstallation ? mod.defaultSelected || false : installedModuleIds.has(mod.id),
         });
@@ -690,19 +732,20 @@ class UI {
    * @param {Array} moduleChoices - Available module choices
    * @returns {Array} Selected module IDs
    */
-  async selectModules(moduleChoices) {
+  async selectModules(moduleChoices, defaultSelections = []) {
-    CLIUtils.displaySection('Module Selection', 'Choose the BMAD modules to install');
-
     const moduleAnswer = await inquirer.prompt([
       {
         type: 'checkbox',
         name: 'modules',
         message: 'Select modules to install:',
         choices: moduleChoices,
+        default: defaultSelections,
       },
     ]);
 
-    return moduleAnswer.modules || [];
+    const selected = moduleAnswer.modules || [];
+
+    return selected;
   }
 
   /**
@@ -745,12 +788,13 @@ class UI {
           // Check for any bmad installation (any folder with _config/manifest.yaml)
           const { Installer } = require('../installers/lib/core/installer');
           const installer = new Installer();
-          const bmadDir = await installer.findBmadDir(directory);
+          const bmadResult = await installer.findBmadDir(directory);
-          const hasBmadInstall = (await fs.pathExists(bmadDir)) && (await fs.pathExists(path.join(bmadDir, '_config', 'manifest.yaml')));
+          const hasBmadInstall =
+            (await fs.pathExists(bmadResult.bmadDir)) && (await fs.pathExists(path.join(bmadResult.bmadDir, '_config', 'manifest.yaml')));
 
           console.log(
             chalk.gray(`Directory exists and contains ${files.length} item(s)`) +
-              (hasBmadInstall ? chalk.yellow(` including existing BMAD installation (${path.basename(bmadDir)})`) : ''),
+              (hasBmadInstall ? chalk.yellow(` including existing BMAD installation (${path.basename(bmadResult.bmadDir)})`) : ''),
           );
         } else {
           console.log(chalk.gray('Directory exists and is empty'));
@@ -1045,6 +1089,57 @@ class UI {
     return (await fs.pathExists(hookPath)) && (await fs.pathExists(playTtsPath));
   }
 
+  /**
+   * Load existing configurations to use as defaults
+   * @param {string} directory - Installation directory
+   * @returns {Object} Existing configurations
+   */
+  async loadExistingConfigurations(directory) {
+    const configs = {
+      hasCustomContent: false,
+      coreConfig: {},
+      ideConfig: { ides: [], skipIde: false },
+      agentVibesConfig: { enabled: false, alreadyInstalled: false },
+    };
+
+    try {
+      // Load core config
+      configs.coreConfig = await this.collectCoreConfig(directory);
+
+      // Load IDE configuration
+      const configuredIdes = await this.getConfiguredIdes(directory);
+      if (configuredIdes.length > 0) {
+        configs.ideConfig.ides = configuredIdes;
+        configs.ideConfig.skipIde = false;
+      }
+
+      // Load AgentVibes configuration
+      const agentVibesInstalled = await this.checkAgentVibesInstalled(directory);
+      configs.agentVibesConfig = { enabled: agentVibesInstalled, alreadyInstalled: agentVibesInstalled };
+
+      return configs;
+    } catch {
+      // If loading fails, return empty configs
+      console.warn('Warning: Could not load existing configurations');
+      return configs;
+    }
+  }
+
+  /**
+   * Get configured IDEs from existing installation
+   * @param {string} directory - Installation directory
+   * @returns {Array} List of configured IDEs
+   */
+  async getConfiguredIdes(directory) {
+    const { Detector } = require('../installers/lib/core/detector');
+    const { Installer } = require('../installers/lib/core/installer');
+    const detector = new Detector();
+    const installer = new Installer();
+    const bmadResult = await installer.findBmadDir(directory);
+    const existingInstall = await detector.detect(bmadResult.bmadDir);
+    return existingInstall.ides || [];
+  }
+
   /**
    * Prompt for custom content for existing installations
    * @returns {Object} Custom content configuration
@@ -1184,6 +1279,271 @@ class UI {
       return { hasCustomContent: false };
     }
   }
+
+  /**
+   * Prompt user for custom content source location
+   * @returns {Object} Custom content configuration
+   */
+  async promptCustomContentSource() {
+    const customContentConfig = { hasCustomContent: true, sources: [] };
+
+    // Keep asking for more sources until user is done
+    while (true) {
+      // First ask if user wants to add another module or continue
+      if (customContentConfig.sources.length > 0) {
+        const { action } = await inquirer.prompt([
+          {
+            type: 'list',
+            name: 'action',
+            message: 'Would you like to:',
+            choices: [
+              { name: 'Add another custom module', value: 'add' },
+              { name: 'Continue with installation', value: 'continue' },
+            ],
+            default: 'continue',
+          },
+        ]);
+
+        if (action === 'continue') {
+          break;
+        }
+      }
+
+      let sourcePath;
+      let isValid = false;
+
+      while (!isValid) {
+        const { path: inputPath } = await inquirer.prompt([
+          {
+            type: 'input',
+            name: 'path',
+            message: 'Enter the path to your custom content folder (or press Enter to cancel):',
+            validate: async (input) => {
+              // Allow empty input to cancel
+              if (!input || input.trim() === '') {
+                return true; // Allow empty to exit
+              }
+
+              try {
+                // Expand the path
+                const expandedPath = this.expandUserPath(input.trim());
+
+                // Check if path exists
+                if (!(await fs.pathExists(expandedPath))) {
+                  return 'Path does not exist';
+                }
+
+                // Check if it's a directory
+                const stat = await fs.stat(expandedPath);
+                if (!stat.isDirectory()) {
+                  return 'Path must be a directory';
+                }
+
+                // Check for module.yaml in the root
+                const moduleYamlPath = path.join(expandedPath, 'module.yaml');
+                if (!(await fs.pathExists(moduleYamlPath))) {
+                  return 'Directory must contain a module.yaml file in the root';
+                }
+
+                // Try to parse the module.yaml to get the module ID
+                try {
+                  const yaml = require('yaml');
+                  const content = await fs.readFile(moduleYamlPath, 'utf8');
+                  const moduleData = yaml.parse(content);
+                  if (!moduleData.code) {
+                    return 'module.yaml must contain a "code" field for the module ID';
+                  }
+                } catch (error) {
+                  return 'Invalid module.yaml file: ' + error.message;
+                }
+
+                return true;
+              } catch (error) {
+                return 'Error validating path: ' + error.message;
+              }
+            },
+          },
+        ]);
+
+        // If user pressed Enter without typing anything, exit the loop
+        if (!inputPath || inputPath.trim() === '') {
+          // If we have no modules yet, return false for no custom content
+          if (customContentConfig.sources.length === 0) {
+            return { hasCustomContent: false };
+          }
+          return customContentConfig;
+        }
+
+        sourcePath = this.expandUserPath(inputPath);
+        isValid = true;
+      }
+
+      // Read module.yaml to get module info
+      const yaml = require('yaml');
+      const moduleYamlPath = path.join(sourcePath, 'module.yaml');
+      const moduleContent = await fs.readFile(moduleYamlPath, 'utf8');
+      const moduleData = yaml.parse(moduleContent);
+
+      // Add to sources
+      customContentConfig.sources.push({
+        path: sourcePath,
+        id: moduleData.code,
+        name: moduleData.name || moduleData.code,
+      });
+
+      console.log(chalk.green(`✓ Confirmed local custom module: ${moduleData.name || moduleData.code}`));
+    }
+
+    // Ask if user wants to add these to the installation
+    const { shouldInstall } = await inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'shouldInstall',
+        message: `Install ${customContentConfig.sources.length} custom module(s) now?`,
+        default: true,
+      },
+    ]);
+
+    if (shouldInstall) {
+      customContentConfig.selected = true;
+      // Store paths to module.yaml files, not directories
+      customContentConfig.selectedFiles = customContentConfig.sources.map((s) => path.join(s.path, 'module.yaml'));
+      // Also include module IDs for installation
+      customContentConfig.selectedModuleIds = customContentConfig.sources.map((s) => s.id);
+    }
+
+    return customContentConfig;
+  }
+
+  /**
+   * Handle custom modules in the modify flow
+   * @param {string} directory - Installation directory
+   * @param {Array} selectedModules - Currently selected modules
+   * @returns {Object} Result with selected custom modules and custom content config
+   */
+  async handleCustomModulesInModifyFlow(directory, selectedModules) {
+    // Get existing installation to find custom modules
+    const { existingInstall } = await this.getExistingInstallation(directory);
+
+    // Check if there are any custom modules in cache
+    const { Installer } = require('../installers/lib/core/installer');
+    const installer = new Installer();
+    const { bmadDir } = await installer.findBmadDir(directory);
+
+    const cacheDir = path.join(bmadDir, '_config', 'custom');
+    const cachedCustomModules = [];
+
+    if (await fs.pathExists(cacheDir)) {
+      const entries = await fs.readdir(cacheDir, { withFileTypes: true });
+      for (const entry of entries) {
+        if (entry.isDirectory()) {
+          const moduleYamlPath = path.join(cacheDir, entry.name, 'module.yaml');
+          if (await fs.pathExists(moduleYamlPath)) {
+            const yaml = require('yaml');
+            const content = await fs.readFile(moduleYamlPath, 'utf8');
+            const moduleData = yaml.parse(content);
+
+            cachedCustomModules.push({
+              id: entry.name,
+              name: moduleData.name || entry.name,
+              description: moduleData.description || 'Custom module from cache',
+              checked: selectedModules.includes(entry.name),
+              fromCache: true,
+            });
+          }
+        }
+      }
+    }
+
+    const result = {
+      selectedCustomModules: [],
+      customContentConfig: { hasCustomContent: false },
+    };
+
+    if (cachedCustomModules.length === 0) {
+      return result;
+    }
+
+    // Ask user about custom modules
+    console.log(chalk.cyan('\n⚙️  Custom Modules'));
+    console.log(chalk.dim('Found custom modules in your installation:'));
+
+    const { customAction } = await inquirer.prompt([
+      {
+        type: 'list',
+        name: 'customAction',
+        message: 'What would you like to do with custom modules?',
+        choices: [
+          { name: 'Keep all existing custom modules', value: 'keep' },
+          { name: 'Select which custom modules to keep', value: 'select' },
+          { name: 'Add new custom modules', value: 'add' },
+          { name: 'Remove all custom modules', value: 'remove' },
+        ],
+        default: 'keep',
+      },
+    ]);
+
+    switch (customAction) {
+      case 'keep': {
+        // Keep all existing custom modules
+        result.selectedCustomModules = cachedCustomModules.map((m) => m.id);
+        console.log(chalk.dim(`Keeping ${result.selectedCustomModules.length} custom module(s)`));
+        break;
+      }
+
+      case 'select': {
+        // Let user choose which to keep
+        const choices = cachedCustomModules.map((m) => ({
+          name: `${m.name} ${chalk.gray(`(${m.id})`)}`,
+          value: m.id,
+        }));
+
+        const { keepModules } = await inquirer.prompt([
+          {
+            type: 'checkbox',
+            name: 'keepModules',
+            message: 'Select custom modules to keep:',
+            choices: choices,
+            default: cachedCustomModules.filter((m) => m.checked).map((m) => m.id),
+          },
+        ]);
+        result.selectedCustomModules = keepModules;
+        break;
+      }
+
+      case 'add': {
+        // First ask to keep existing ones
+        const { keepExisting } = await inquirer.prompt([
+          {
+            type: 'confirm',
+            name: 'keepExisting',
+            message: 'Keep existing custom modules?',
+            default: true,
+          },
+        ]);
+
+        if (keepExisting) {
+          result.selectedCustomModules = cachedCustomModules.map((m) => m.id);
+        }
+
+        // Then prompt for new ones (reuse existing method)
+        const newCustomContent = await this.promptCustomContentSource();
+        if (newCustomContent.hasCustomContent && newCustomContent.selected) {
+          result.selectedCustomModules.push(...newCustomContent.selectedModuleIds);
+          result.customContentConfig = newCustomContent;
+        }
+        break;
+      }
+
+      case 'remove': {
+        // Remove all custom modules
+        console.log(chalk.yellow('All custom modules will be removed from the installation'));
+        break;
+      }
+    }
+
+    return result;
+  }
 }
 
 module.exports = { UI };