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

package/src/modules/cis/workflows/innovation-strategy/workflow.yaml

@@ -4,7 +4,7 @@ description: "Identify disruption opportunities and architect business model inn
 author: "BMad"
 
 # Critical variables load from config_source
-config_source: "{project-root}/bmad/cis/config.yaml"
+config_source: "{project-root}/{bmad_folder}/cis/config.yaml"
 output_folder: "{config_source}:output_folder"
 user_name: "{config_source}:user_name"
 communication_language: "{config_source}:communication_language"
@@ -19,7 +19,7 @@ recommended_inputs:
 # Example: data="{path}/industry-analysis.md" provides market context
 
 # Module path and component files
-installed_path: "{project-root}/bmad/cis/workflows/innovation-strategy"
+installed_path: "{project-root}/{bmad_folder}/cis/workflows/innovation-strategy"
 template: "{installed_path}/template.md"
 instructions: "{installed_path}/instructions.md"
 
@@ -35,9 +35,9 @@ web_bundle:
   name: "innovation-strategy"
   description: "Identify disruption opportunities and architect business model innovation. This workflow guides strategic analysis of markets, competitive dynamics, and business model innovation to uncover sustainable competitive advantages and breakthrough opportunities."
   author: "BMad"
-  instructions: "bmad/cis/workflows/innovation-strategy/instructions.md"
-  template: "bmad/cis/workflows/innovation-strategy/template.md"
+  instructions: "{bmad_folder}/cis/workflows/innovation-strategy/instructions.md"
+  template: "{bmad_folder}/cis/workflows/innovation-strategy/template.md"
   web_bundle_files:
-    - "bmad/cis/workflows/innovation-strategy/instructions.md"
-    - "bmad/cis/workflows/innovation-strategy/template.md"
-    - "bmad/cis/workflows/innovation-strategy/innovation-frameworks.csv"
+    - "{bmad_folder}/cis/workflows/innovation-strategy/instructions.md"
+    - "{bmad_folder}/cis/workflows/innovation-strategy/template.md"
+    - "{bmad_folder}/cis/workflows/innovation-strategy/innovation-frameworks.csv"

package/src/modules/cis/workflows/problem-solving/instructions.md

@@ -1,7 +1,7 @@
 # Problem Solving Workflow Instructions
 
-<critical>The workflow execution engine is governed by: {project_root}/bmad/core/tasks/workflow.xml</critical>
-<critical>You MUST have already loaded and processed: {project_root}/bmad/cis/workflows/problem-solving/workflow.yaml</critical>
+<critical>The workflow execution engine is governed by: {project_root}/{bmad_folder}/core/tasks/workflow.xml</critical>
+<critical>You MUST have already loaded and processed: {project_root}/{bmad_folder}/cis/workflows/problem-solving/workflow.yaml</critical>
 <critical>Load and understand solving methods from: {solving_methods}</critical>
 
 <facilitation-principles>

package/src/modules/cis/workflows/problem-solving/workflow.yaml

@@ -4,7 +4,7 @@ description: "Apply systematic problem-solving methodologies to crack complex ch
 author: "BMad"
 
 # Critical variables load from config_source
-config_source: "{project-root}/bmad/cis/config.yaml"
+config_source: "{project-root}/{bmad_folder}/cis/config.yaml"
 output_folder: "{config_source}:output_folder"
 user_name: "{config_source}:user_name"
 communication_language: "{config_source}:communication_language"
@@ -19,7 +19,7 @@ recommended_inputs:
 # Example: data="{path}/problem-brief.md" provides context
 
 # Module path and component files
-installed_path: "{project-root}/bmad/cis/workflows/problem-solving"
+installed_path: "{project-root}/{bmad_folder}/cis/workflows/problem-solving"
 template: "{installed_path}/template.md"
 instructions: "{installed_path}/instructions.md"
 
@@ -35,9 +35,9 @@ web_bundle:
   name: "problem-solving"
   description: "Apply systematic problem-solving methodologies to crack complex challenges. This workflow guides through problem diagnosis, root cause analysis, creative solution generation, evaluation, and implementation planning using proven frameworks."
   author: "BMad"
-  instructions: "bmad/cis/workflows/problem-solving/instructions.md"
-  template: "bmad/cis/workflows/problem-solving/template.md"
+  instructions: "{bmad_folder}/cis/workflows/problem-solving/instructions.md"
+  template: "{bmad_folder}/cis/workflows/problem-solving/template.md"
   web_bundle_files:
-    - "bmad/cis/workflows/problem-solving/instructions.md"
-    - "bmad/cis/workflows/problem-solving/template.md"
-    - "bmad/cis/workflows/problem-solving/solving-methods.csv"
+    - "{bmad_folder}/cis/workflows/problem-solving/instructions.md"
+    - "{bmad_folder}/cis/workflows/problem-solving/template.md"
+    - "{bmad_folder}/cis/workflows/problem-solving/solving-methods.csv"

package/src/modules/cis/workflows/storytelling/instructions.md

@@ -3,8 +3,8 @@
 ## Workflow
 
 <workflow>
-<critical>The workflow execution engine is governed by: {project_root}/bmad/core/tasks/workflow.xml</critical>
-<critical>You MUST have already loaded and processed: {project_root}/bmad/cis/workflows/storytelling/workflow.yaml</critical>
+<critical>The workflow execution engine is governed by: {project_root}/{bmad_folder}/core/tasks/workflow.xml</critical>
+<critical>You MUST have already loaded and processed: {project_root}/{bmad_folder}/cis/workflows/storytelling/workflow.yaml</critical>
 <critical>Communicate all responses in {communication_language}</critical>
 
 <step n="1" goal="Story Context Setup">

package/src/modules/cis/workflows/storytelling/workflow.yaml

@@ -4,7 +4,7 @@ description: "Craft compelling narratives using proven story frameworks and tech
 author: "BMad"
 
 # Critical variables load from config_source
-config_source: "{project-root}/bmad/cis/config.yaml"
+config_source: "{project-root}/{bmad_folder}/cis/config.yaml"
 output_folder: "{config_source}:output_folder"
 user_name: "{config_source}:user_name"
 communication_language: "{config_source}:communication_language"
@@ -19,7 +19,7 @@ recommended_inputs:
 # Example: data="{path}/brand-info.md" provides brand context
 
 # Module path and component files
-installed_path: "{project-root}/bmad/cis/workflows/storytelling"
+installed_path: "{project-root}/{bmad_folder}/cis/workflows/storytelling"
 template: "{installed_path}/template.md"
 instructions: "{installed_path}/instructions.md"
 
@@ -35,9 +35,9 @@ web_bundle:
   name: "storytelling"
   description: "Craft compelling narratives using proven story frameworks and techniques. This workflow guides users through structured narrative development, applying appropriate story frameworks to create emotionally resonant and engaging stories for any purpose."
   author: "BMad"
-  instructions: "bmad/cis/workflows/storytelling/instructions.md"
-  template: "bmad/cis/workflows/storytelling/template.md"
+  instructions: "{bmad_folder}/cis/workflows/storytelling/instructions.md"
+  template: "{bmad_folder}/cis/workflows/storytelling/template.md"
   web_bundle_files:
-    - "bmad/cis/workflows/storytelling/instructions.md"
-    - "bmad/cis/workflows/storytelling/template.md"
-    - "bmad/cis/workflows/storytelling/story-types.csv"
+    - "{bmad_folder}/cis/workflows/storytelling/instructions.md"
+    - "{bmad_folder}/cis/workflows/storytelling/template.md"
+    - "{bmad_folder}/cis/workflows/storytelling/story-types.csv"

package/src/utility/models/agent-activation-ide.xml

@@ -1,7 +1,7 @@
 <activation critical="MANDATORY">
   <init>
     <step n="1">Load persona from this current file containing this activation you are reading now</step>
-    <step n="2">Override with {project-root}/bmad/_cfg/agents/{agent-filename} if exists (replace, not merge)</step>
+    <step n="2">Override with {project-root}/{bmad_folder}/_cfg/agents/{agent-filename} if exists (replace, not merge)</step>
     <step n="3">Execute critical-actions section if present in current agent XML</step>
     <step n="4">Show greeting + numbered list of ALL commands IN ORDER from current agent's cmds section</step>
     <step n="5">CRITICAL HALT. AWAIT user input. NEVER continue without it.</step>
@@ -12,7 +12,7 @@
     <handlers>
       <handler type="run-workflow">
         When command has: run-workflow="path/to/x.yaml" You MUST:
-        1. CRITICAL: Always LOAD {project-root}/bmad/core/tasks/workflow.xml
+        1. CRITICAL: Always LOAD {project-root}/{bmad_folder}/core/tasks/workflow.xml
         2. READ its entire contents - the is the CORE OS for EXECUTING modules
         3. Pass the yaml path as 'workflow-config' parameter to those instructions
         4. Follow workflow.xml instructions EXACTLY as written
@@ -20,7 +20,7 @@
       </handler>
       <handler type="validate-workflow">
         When command has: validate-workflow="path/to/workflow.yaml" You MUST:
-        1. You MUST LOAD the file at: {project-root}/bmad/core/tasks/validate-workflow.xml
+        1. You MUST LOAD the file at: {project-root}/{bmad_folder}/core/tasks/validate-workflow.xml
         2. READ its entire contents and EXECUTE all instructions in that file
         3. Pass the workflow, and also check the workflow location for a checklist.md to pass as the checklist
         4. The workflow should try to identify the file to validate based on checklist context or else you will ask the user to specify

package/src/utility/models/agent-activation-web.xml

@@ -7,14 +7,14 @@
   <bundled-files critical="MANDATORY">
     <access-method>
       All dependencies are bundled within this XML file as &lt;file&gt; elements with CDATA content.
-      When you need to access a file path like "bmad/core/tasks/workflow.xml":
-      1. Find the &lt;file id="bmad/core/tasks/workflow.xml"&gt; element in this document
+      When you need to access a file path like "{bmad_folder}/core/tasks/workflow.xml":
+      1. Find the &lt;file id="{bmad_folder}/core/tasks/workflow.xml"&gt; element in this document
       2. Extract the content from within the CDATA section
       3. Use that content as if you read it from the filesystem
     </access-method>
     <rules>
       <rule>NEVER attempt to read files from filesystem - all files are bundled in this XML</rule>
-      <rule>File paths starting with "bmad/" or "{project-root}/bmad/" refer to &lt;file id="..."&gt; elements</rule>
+      <rule>File paths starting with "{bmad_folder}/" or "{project-root}/{bmad_folder}/" refer to &lt;file id="..."&gt; elements</rule>
       <rule>When instructions reference a file path, locate the corresponding &lt;file&gt; element by matching the id attribute</rule>
       <rule>YAML files are bundled with only their web_bundle section content (flattened to root level)</rule>
     </rules>
@@ -25,7 +25,7 @@
     <handlers>
       <handler type="run-workflow">
         When command has: run-workflow="path/to/x.yaml" You MUST:
-        1. CRITICAL: Locate &lt;file id="bmad/core/tasks/workflow.xml"&gt; in this XML bundle
+        1. CRITICAL: Locate &lt;file id="{bmad_folder}/core/tasks/workflow.xml"&gt; in this XML bundle
         2. Extract and READ its CDATA content - this is the CORE OS for EXECUTING workflows
         3. Locate &lt;file id="path/to/x.yaml"&gt; for the workflow config
         4. Pass the yaml content as 'workflow-config' parameter to workflow.xml instructions

package/src/utility/models/agent-command-header.md

@@ -0,0 +1 @@
+<critical>You must fully embody this agent's persona and follow all activation instructions, steps and rules exactly as specified. NEVER break character until given an exit command.</critical>

package/src/utility/models/fragments/activation-steps.xml

@@ -1,6 +1,6 @@
 <step n="1">Load persona from this current agent file (already in context)</step>
 <step n="2">🚨 IMMEDIATE ACTION REQUIRED - BEFORE ANY OUTPUT:
-    - Load and read {project-root}/bmad/{{module}}/config.yaml NOW
+    - Load and read {project-root}/{bmad_folder}/{{module}}/config.yaml NOW
     - Store ALL fields as session variables: {user_name}, {communication_language}, {output_folder}
     - VERIFY: If config not loaded, STOP and report error to user
     - DO NOT PROCEED to step 3 until config is successfully loaded and variables stored</step>
@@ -8,7 +8,8 @@
 {AGENT_SPECIFIC_STEPS}
 <step n="{MENU_STEP}">Show greeting using {user_name} from config, communicate in {communication_language}, then display numbered list of
     ALL menu items from menu section</step>
-<step n="{HALT_STEP}">STOP and WAIT for user input - do NOT execute menu items automatically - accept number or trigger text</step>
+<step n="{HALT_STEP}">STOP and WAIT for user input - do NOT execute menu items automatically - accept number or cmd trigger or fuzzy command
+    match</step>
 <step n="{INPUT_STEP}">On user input: Number → execute menu item[n] | Text → case-insensitive substring match | Multiple matches → ask user
     to clarify | No match → show "Not recognized"</step>
 <step n="{EXECUTE_STEP}">When executing a menu item: Check menu-handlers section below - extract any attributes from the selected menu item

package/src/utility/models/fragments/handler-validate-workflow.xml

@@ -1,6 +1,6 @@
 <handler type="validate-workflow">
   When command has: validate-workflow="path/to/workflow.yaml"
-  1. You MUST LOAD the file at: {project-root}/bmad/core/tasks/validate-workflow.xml
+  1. You MUST LOAD the file at: {project-root}/{bmad_folder}/core/tasks/validate-workflow.xml
   2. READ its entire contents and EXECUTE all instructions in that file
   3. Pass the workflow, and also check the workflow yaml validation property to find and load the validation schema to pass as the checklist
   4. The workflow should try to identify the file to validate based on checklist context or else you will ask the user to specify

package/src/utility/models/fragments/handler-workflow.xml

@@ -1,6 +1,6 @@
 <handler type="workflow">
   When menu item has: workflow="path/to/workflow.yaml"
-  1. CRITICAL: Always LOAD {project-root}/bmad/core/tasks/workflow.xml
+  1. CRITICAL: Always LOAD {project-root}/{bmad_folder}/core/tasks/workflow.xml
   2. Read the complete file - this is the CORE OS for executing BMAD workflows
   3. Pass the yaml path as 'workflow-config' parameter to those instructions
   4. Execute workflow.xml instructions precisely following all steps

package/src/utility/models/fragments/web-bundle-activation-steps.xml

@@ -10,14 +10,14 @@
 <bundled-files critical="MANDATORY">
   <access-method>
     All dependencies are bundled within this XML file as &lt;file&gt; elements with CDATA content.
-    When you need to access a file path like "bmad/core/tasks/workflow.xml":
-    1. Find the &lt;file id="bmad/core/tasks/workflow.xml"&gt; element in this document
+    When you need to access a file path like "{bmad_folder}/core/tasks/workflow.xml":
+    1. Find the &lt;file id="{bmad_folder}/core/tasks/workflow.xml"&gt; element in this document
     2. Extract the content from within the CDATA section
     3. Use that content as if you read it from the filesystem
   </access-method>
   <rules>
     <rule>NEVER attempt to read files from filesystem - all files are bundled in this XML</rule>
-    <rule>File paths starting with "bmad/" or "{project-root}/bmad/" refer to &lt;file id="..."&gt; elements</rule>
+    <rule>File paths starting with "{bmad_folder}/" refer to &lt;file id="..."&gt; elements</rule>
     <rule>When instructions reference a file path, locate the corresponding &lt;file&gt; element by matching the id attribute</rule>
     <rule>YAML files are bundled with only their web_bundle section content (flattened to root level)</rule>
   </rules>

package/tools/cli/README.md

@@ -4,19 +4,37 @@ The BMad CLI handles installation and web bundling for the BMAD-METHOD framework
 
 ## Table of Contents
 
-- [Overview](#overview)
-- [Commands](#commands)
-- [Installation System](#installation-system)
-  - [Installation Flow](#installation-flow)
-  - [IDE Support](#ide-support)
-  - [Custom Module Configuration](#custom-module-configuration)
-  - [Platform Specifics](#platform-specifics)
-  - [Manifest System](#manifest-system)
-  - [Advanced Features](#advanced-features)
-- [Bundling System](#bundling-system)
-- [Agent Compilation](#agent-compilation)
-- [Architecture](#architecture)
-- [Key Differences: Installation vs Bundling](#key-differences-installation-vs-bundling)
+- [BMad CLI Tool](#bmad-cli-tool)
+  - [Table of Contents](#table-of-contents)
+  - [Overview](#overview)
+  - [Commands](#commands)
+    - [Installation](#installation)
+    - [Bundling](#bundling)
+    - [Utilities](#utilities)
+  - [Installation System](#installation-system)
+    - [Installation Flow](#installation-flow)
+    - [IDE Support](#ide-support)
+    - [Custom Module Configuration](#custom-module-configuration)
+    - [Platform Specifics](#platform-specifics)
+    - [Manifest System](#manifest-system)
+    - [Advanced Features](#advanced-features)
+  - [Bundling System](#bundling-system)
+    - [Bundling Flow](#bundling-flow)
+  - [Agent Compilation](#agent-compilation)
+    - [Compilation Engine](#compilation-engine)
+    - [Fragment System](#fragment-system)
+    - [Input: Agent YAML](#input-agent-yaml)
+    - [Output: IDE (Markdown with XML)](#output-ide-markdown-with-xml)
+  - [Architecture](#architecture)
+    - [Directory Structure](#directory-structure)
+    - [Fragment Library](#fragment-library)
+  - [Key Differences: Installation vs Bundling](#key-differences-installation-vs-bundling)
+  - [Development Workflows](#development-workflows)
+    - [Testing Compilation](#testing-compilation)
+    - [Adding New Menu Handlers](#adding-new-menu-handlers)
+    - [Regenerating Manifests](#regenerating-manifests)
+  - [Related Documentation](#related-documentation)
+  - [Support](#support)
 
 ---
 
@@ -87,7 +105,7 @@ The installer is a multi-stage system that handles agent compilation, IDE integr
    - Resolve module dependencies (4-pass system)
 
 3. Install Core + Modules
-   - Copy files to {target}/bmad/
+   - Copy files to {target}/{bmad_folder}/
    - Compile agents: YAML → Markdown/XML (forWebBundle: false)
    - Merge customize.yaml files if they exist
    - Inject activation blocks based on agent capabilities
@@ -113,7 +131,7 @@ The installer is a multi-stage system that handles agent compilation, IDE integr
 
 ```
 {target}/
-├── bmad/
+├── {bmad_folder}/
 │   ├── core/              # Always installed
 │   ├── {module}/          # Selected modules
 │   │   ├── agents/        # Compiled .md files
@@ -220,7 +238,7 @@ Platform specifics are **IDE+module combination hooks** that execute custom logi
 
 ### Manifest System
 
-The installer generates **5 manifest files** in `{target}/bmad/_cfg/`:
+The installer generates **5 manifest files** in `{target}/{bmad_folder}/_cfg/`:
 
 **1. Installation Manifest** (`manifest.yaml`)
 
@@ -409,7 +427,7 @@ agent:
     identity: 'You are an experienced PM...'
   menu:
     - trigger: '*create-brief'
-      workflow: '{project-root}/bmad/bmm/workflows/.../workflow.yaml'
+      workflow: '{project-root}/{bmad_folder}/bmm/workflows/.../workflow.yaml'
 ```
 
 ### Output: IDE (Markdown with XML)
@@ -422,7 +440,7 @@ agent:
 ```xml
 <agent id="..." name="PM">
   <activation critical="MANDATORY">
-    <step n="2">Load {project-root}/bmad/bmm/config.yaml at runtime</step>
+    <step n="2">Load {project-root}/{bmad_folder}/bmm/config.yaml at runtime</step>
     ...
   </activation>
   <persona>...</persona>
@@ -514,20 +532,20 @@ src/utility/models/fragments/
 
 ## Key Differences: Installation vs Bundling
 
-| Aspect                  | Installation (IDE)            | Bundling (Web)                    |
-| ----------------------- | ----------------------------- | --------------------------------- |
-| **Trigger**             | `npm run install:bmad`        | `npm run bundle`                  |
-| **Entry Point**         | `commands/install.js`         | `bundlers/bundle-web.js`          |
-| **Compiler Flag**       | `forWebBundle: false`         | `forWebBundle: true`              |
-| **Output Format**       | Markdown `.md`                | Standalone XML `.xml`             |
-| **Output Location**     | `{target}/bmad/` + IDE dirs   | `web-bundles/`                    |
-| **Customization**       | Merges `customize.yaml`       | Base agents only                  |
-| **Dependencies**        | Referenced by path            | Bundled inline (CDATA)            |
-| **Activation Fragment** | `activation-steps.xml`        | `web-bundle-activation-steps.xml` |
-| **Filesystem Access**   | Required                      | Not needed                        |
-| **Build Metadata**      | Included (hash)               | Excluded                          |
-| **Path Format**         | `{project-root}` placeholders | Stripped, wrapped as `<file>`     |
-| **Use Case**            | Local IDE development         | Web deployment                    |
+| Aspect                  | Installation (IDE)                   | Bundling (Web)                    |
+| ----------------------- | ------------------------------------ | --------------------------------- |
+| **Trigger**             | `npm run install:bmad`               | `npm run bundle`                  |
+| **Entry Point**         | `commands/install.js`                | `bundlers/bundle-web.js`          |
+| **Compiler Flag**       | `forWebBundle: false`                | `forWebBundle: true`              |
+| **Output Format**       | Markdown `.md`                       | Standalone XML `.xml`             |
+| **Output Location**     | `{target}/{bmad_folder}/` + IDE dirs | `web-bundles/`                    |
+| **Customization**       | Merges `customize.yaml`              | Base agents only                  |
+| **Dependencies**        | Referenced by path                   | Bundled inline (CDATA)            |
+| **Activation Fragment** | `activation-steps.xml`               | `web-bundle-activation-steps.xml` |
+| **Filesystem Access**   | Required                             | Not needed                        |
+| **Build Metadata**      | Included (hash)                      | Excluded                          |
+| **Path Format**         | `{project-root}` placeholders        | Stripped, wrapped as `<file>`     |
+| **Use Case**            | Local IDE development                | Web deployment                    |
 
 **Activation Differences**:
 

package/tools/cli/bundlers/web-bundler.js

@@ -205,6 +205,18 @@ class WebBundler {
       this.stats.warnings.push({ agent: agentName, warnings: dependencyWarnings });
     }
 
+    // Check for module's default-party.csv and include it as agent manifest
+    const defaultPartyPath = path.join(this.modulesPath, moduleName, 'teams', 'default-party.csv');
+    if (await fs.pathExists(defaultPartyPath)) {
+      const partyContent = await fs.readFile(defaultPartyPath, 'utf8');
+      // Process any placeholders in the CSV content
+      const processedPartyContent = this.processProjectRootReferences(partyContent);
+      // Wrap as text to preserve raw CSV format in CDATA
+      const wrappedParty = this.wrapContentInXml(processedPartyContent, 'bmad/_cfg/agent-manifest.csv', 'text');
+      dependencies.set('bmad/_cfg/agent-manifest.csv', wrappedParty);
+      console.log(chalk.gray(`    + Added party manifest from module default-party.csv`));
+    }
+
     // Remove commands for skipped workflows from agent XML
     if (skippedWorkflows.length > 0) {
       agentXml = this.removeSkippedWorkflowCommands(agentXml, skippedWorkflows);
@@ -260,6 +272,24 @@ class WebBundler {
     const allAgentXmls = [];
     const warnings = [];
 
+    // Check if team has a party CSV file (agent manifest)
+    const hasPartyFile = teamConfig.party && teamConfig.party.endsWith('.csv');
+    if (hasPartyFile) {
+      // Load the party CSV and add it as bmad/_cfg/agent-manifest.csv
+      const partyPath = path.join(path.dirname(teamPath), teamConfig.party.replace(/^\.\//, ''));
+      if (await fs.pathExists(partyPath)) {
+        const partyContent = await fs.readFile(partyPath, 'utf8');
+        // Process any placeholders in the CSV content
+        const processedPartyContent = this.processProjectRootReferences(partyContent);
+        // Wrap as text/csv to preserve raw CSV format in CDATA
+        const wrappedParty = this.wrapContentInXml(processedPartyContent, 'bmad/_cfg/agent-manifest.csv', 'text');
+        dependencies.set('bmad/_cfg/agent-manifest.csv', wrappedParty);
+        console.log(chalk.gray(`    + Added agent manifest from: ${teamConfig.party}`));
+      } else {
+        console.log(chalk.yellow(`    ⚠ Party file not found: ${partyPath}`));
+      }
+    }
+
     // 1. First, always add the bmad-web-orchestrator (XML file only, no transformation needed)
     const orchestratorXmlPath = path.join(this.sourceDir, 'core', 'agents', 'bmad-web-orchestrator.agent.xml');
 
@@ -476,8 +506,9 @@ class WebBundler {
         }
 
         // Parse paths to extract module and workflow location
-        const sourceMatch = sourceWorkflowPath.match(/\{project-root\}\/bmad\/([^/]+)\/workflows\/(.+)/);
-        const installMatch = installWorkflowPath.match(/\{project-root\}\/bmad\/([^/]+)\/workflows\/(.+)/);
+        // Support both {project-root}/bmad/... and {project-root}/{bmad_folder}/... patterns
+        const sourceMatch = sourceWorkflowPath.match(/\{project-root\}\/(?:\{bmad_folder\}|bmad)\/([^/]+)\/workflows\/(.+)/);
+        const installMatch = installWorkflowPath.match(/\{project-root\}\/(?:\{bmad_folder\}|bmad)\/([^/]+)\/workflows\/(.+)/);
 
         if (!sourceMatch || !installMatch) {
           continue;
@@ -528,8 +559,9 @@ class WebBundler {
     let yamlContent = await fs.readFile(workflowYamlPath, 'utf8');
 
     // Replace config_source with new module reference
-    const configSourcePattern = /config_source:\s*["']?\{project-root\}\/bmad\/[^/]+\/config\.yaml["']?/g;
-    const newConfigSource = `config_source: "{project-root}/bmad/${newModuleName}/config.yaml"`;
+    // Support both old format (bmad) and new format ({bmad_folder})
+    const configSourcePattern = /config_source:\s*["']?\{project-root\}\/(?:\{bmad_folder\}|bmad)\/[^/]+\/config\.yaml["']?/g;
+    const newConfigSource = `config_source: "{project-root}/{bmad_folder}/${newModuleName}/config.yaml"`;
 
     const updatedYaml = yamlContent.replaceAll(configSourcePattern, newConfigSource);
     await fs.writeFile(workflowYamlPath, updatedYaml, 'utf8');
@@ -651,7 +683,8 @@ class WebBundler {
       /system-prompts="([^"]+)"/g,
       /tools="([^"]+)"/g,
       /knowledge="([^"]+)"/g,
-      /{project-root}\/([^"'\s<>]+)/g,
+      /{project-root}\/([^"'\s<>]+)/g, // Legacy {project-root} paths
+      /\bbmad\/([^"'\s<>]+)/g, // Direct bmad/ paths (after {bmad_folder} replacement)
     ];
 
     for (const pattern of patterns) {
@@ -660,9 +693,16 @@ class WebBundler {
         let filePath = match[1];
         // Remove {project-root} prefix if present
         filePath = filePath.replace(/^{project-root}\//, '');
+        // Remove {bmad_folder} prefix if present (should be rare, mostly replaced already)
+        filePath = filePath.replace(/^{bmad_folder}\//, 'bmad/');
+
+        // For bmad/ pattern, prepend 'bmad/' since it was captured without it
+        if (pattern.source.includes(String.raw`\bbmad\/`)) {
+          filePath = 'bmad/' + filePath;
+        }
 
         // Skip obvious placeholder/example paths
-        if (filePath && !filePath.includes('path/to/') && !filePath.includes('example')) {
+        if (filePath && !filePath.includes('path/to/') && !filePath.includes('example') && !filePath.includes('...')) {
           refs.add(filePath);
         }
       }
@@ -680,6 +720,8 @@ class WebBundler {
       while ((match = pattern.exec(xml)) !== null) {
         let workflowPath = match[1];
         workflowPath = workflowPath.replace(/^{project-root}\//, '');
+        // Remove {bmad_folder} prefix if present and replace with bmad
+        workflowPath = workflowPath.replace(/^{bmad_folder}\//, 'bmad/');
 
         // Skip obvious placeholder/example paths
         if (workflowPath && workflowPath.endsWith('.yaml') && !workflowPath.includes('path/to/') && !workflowPath.includes('example')) {
@@ -725,6 +767,11 @@ class WebBundler {
    * Process a file dependency recursively
    */
   async processFileDependency(filePath, dependencies, processed, moduleName, warnings = []) {
+    // Skip workflow YAML files - they're handled by processWorkflowDependency
+    if (filePath.includes('/workflow') && filePath.endsWith('workflow.yaml')) {
+      return;
+    }
+
     // Skip if already processed
     if (processed.has(filePath)) {
       return;
@@ -766,7 +813,8 @@ class WebBundler {
         const deps = depMatch[1].match(/['"]([^'"]+)['"]/g);
         if (deps) {
           for (const dep of deps) {
-            const depPath = dep.replaceAll(/['"]/g, '').replace(/^{project-root}\//, '');
+            let depPath = dep.replaceAll(/['"]/g, '').replace(/^{project-root}\//, '');
+            depPath = depPath.replace(/^{bmad_folder}\//, 'bmad/');
             if (depPath && !processed.has(depPath)) {
               await this.processFileDependency(depPath, dependencies, processed, moduleName, warnings);
             }
@@ -779,7 +827,8 @@ class WebBundler {
         const templates = templateMatch[1].match(/['"]([^'"]+)['"]/g);
         if (templates) {
           for (const template of templates) {
-            const templatePath = template.replaceAll(/['"]/g, '').replace(/^{project-root}\//, '');
+            let templatePath = template.replaceAll(/['"]/g, '').replace(/^{project-root}\//, '');
+            templatePath = templatePath.replace(/^{bmad_folder}\//, 'bmad/');
             if (templatePath && !processed.has(templatePath)) {
               await this.processFileDependency(templatePath, dependencies, processed, moduleName, warnings);
             }
@@ -967,8 +1016,13 @@ class WebBundler {
       bundleYamlContent = yamlContent;
     }
 
+    // Process {project-root} and {bmad_folder} references in the YAML content
+    bundleYamlContent = this.processProjectRootReferences(bundleYamlContent);
+
     // Include the YAML file with only web_bundle content, wrapped in XML
-    const yamlId = workflowPath.replace(/^{project-root}\//, '');
+    // Process the workflow path to create a clean ID
+    let yamlId = workflowPath.replace(/^{project-root}\//, '');
+    yamlId = yamlId.replace(/^{bmad_folder}\//, 'bmad/');
     const wrappedYaml = this.wrapContentInXml(bundleYamlContent, yamlId, 'yaml');
     dependencies.set(yamlId, wrappedYaml);
 
@@ -985,7 +1039,11 @@ class WebBundler {
       const bundleFiles = workflowConfig.web_bundle.web_bundle_files;
 
       for (const bundleFilePath of bundleFiles) {
-        if (processed.has(bundleFilePath)) {
+        // Process the file path to create a clean ID for checking if already processed
+        let cleanFilePath = bundleFilePath.replace(/^{project-root}\//, '');
+        cleanFilePath = cleanFilePath.replace(/^{bmad_folder}\//, 'bmad/');
+
+        if (processed.has(cleanFilePath)) {
           continue;
         }
 
@@ -1002,7 +1060,7 @@ class WebBundler {
           await this.processWorkflowDependency(bundleFilePath, dependencies, processed, moduleName, warnings);
         } else {
           // Regular file - process normally
-          processed.add(bundleFilePath);
+          processed.add(cleanFilePath);
 
           // Read the file content
           let fileContent = await fs.readFile(bundleActualPath, 'utf8');
@@ -1012,8 +1070,8 @@ class WebBundler {
           fileContent = this.processProjectRootReferences(fileContent);
 
           // Wrap in XML with proper escaping
-          const wrappedContent = this.wrapContentInXml(fileContent, bundleFilePath, fileExt);
-          dependencies.set(bundleFilePath, wrappedContent);
+          const wrappedContent = this.wrapContentInXml(fileContent, cleanFilePath, fileExt);
+          dependencies.set(cleanFilePath, wrappedContent);
         }
       }
     }
@@ -1039,7 +1097,9 @@ class WebBundler {
       return;
     }
 
-    const fileContent = await fs.readFile(actualPath, 'utf8');
+    let fileContent = await fs.readFile(actualPath, 'utf8');
+    // Process {project-root} and {bmad_folder} references
+    fileContent = this.processProjectRootReferences(fileContent);
     const wrappedContent = this.wrapContentInXml(fileContent, coreWorkflowPath, 'xml');
     dependencies.set(coreWorkflowPath, wrappedContent);
   }
@@ -1048,7 +1108,7 @@ class WebBundler {
    * Include advanced elicitation files
    */
   async includeAdvancedElicitationFiles(dependencies, processed, moduleName, warnings = []) {
-    const elicitationFiles = ['bmad/core/tasks/adv-elicit.xml', 'bmad/core/tasks/adv-elicit-methods.csv'];
+    const elicitationFiles = ['bmad/core/tasks/advanced-elicitation.xml', 'bmad/core/tasks/advanced-elicitation-methods.csv'];
 
     for (const filePath of elicitationFiles) {
       if (processed.has(filePath)) {
@@ -1063,7 +1123,9 @@ class WebBundler {
         continue;
       }
 
-      const fileContent = await fs.readFile(actualPath, 'utf8');
+      let fileContent = await fs.readFile(actualPath, 'utf8');
+      // Process {project-root} and {bmad_folder} references
+      fileContent = this.processProjectRootReferences(fileContent);
       const fileExt = path.extname(actualPath).toLowerCase().replace('.', '');
       const wrappedContent = this.wrapContentInXml(fileContent, filePath, fileExt);
       dependencies.set(filePath, wrappedContent);
@@ -1096,6 +1158,8 @@ class WebBundler {
   async processWildcardDependency(pattern, dependencies, processed, moduleName, warnings = []) {
     // Remove {project-root} prefix
     pattern = pattern.replace(/^{project-root}\//, '');
+    // Replace {bmad_folder} with bmad
+    pattern = pattern.replace(/^{bmad_folder}\//, 'bmad/');
 
     // Get directory and file pattern
     const lastSlash = pattern.lastIndexOf('/');
@@ -1163,6 +1227,9 @@ class WebBundler {
   resolveFilePath(filePath, moduleName) {
     // Remove {project-root} prefix
     filePath = filePath.replace(/^{project-root}\//, '');
+    // Replace {bmad_folder} with bmad
+    filePath = filePath.replace(/^{bmad_folder}\//, 'bmad/');
+    filePath = filePath.replace(/^{bmad_folder}$/, 'bmad');
 
     // Check temp directory first for _cfg files
     if (filePath.startsWith('bmad/_cfg/')) {
@@ -1229,13 +1296,15 @@ class WebBundler {
   }
 
   /**
-   * Process and remove {project-root} references
+   * Process and remove {project-root} references and replace {bmad_folder} with bmad
    */
   processProjectRootReferences(content) {
     // Remove {project-root}/ prefix (with slash)
     content = content.replaceAll('{project-root}/', '');
     // Also remove {project-root} without slash
     content = content.replaceAll('{project-root}', '');
+    // Replace {bmad_folder} with bmad
+    content = content.replaceAll('{bmad_folder}', 'bmad');
     return content;
   }
 

package/tools/cli/commands/install.js

@@ -56,10 +56,7 @@ 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 || path.resolve(config.directory, 'bmad')),
-        );
+        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!'));
         process.exit(0);