bmad-method 6.0.0-alpha.16 → 6.0.0-alpha.18

package/src/modules/bmb/workflows/create-agent/data/reference/agents/simple-examples/commit-poet.agent.yaml

@@ -1,6 +1,6 @@
 agent:
   metadata:
-    id: .bmad/agents/commit-poet/commit-poet.md
+    id: _bmad/agents/commit-poet/commit-poet.md
     name: "Inkwell Von Comitizen"
     title: "Commit Message Artisan"
     icon: "📜"

package/src/modules/bmb/workflows/create-agent/data/reference/workflows/meal-prep-nutrition/steps/step-01-init.md

@@ -3,7 +3,7 @@ name: 'step-01-init'
 description: 'Initialize the nutrition plan workflow by detecting continuation state and creating output document'
 
 # Path Definitions
-workflow_path: '{project-root}/.bmad/bmb/reference/workflows/meal-prep-nutrition'
+workflow_path: '{project-root}/_bmad/bmb/reference/workflows/meal-prep-nutrition'
 
 # File References
 thisStepFile: '{workflow_path}/steps/step-01-init.md'

package/src/modules/bmb/workflows/create-agent/data/reference/workflows/meal-prep-nutrition/steps/step-01b-continue.md

@@ -3,7 +3,7 @@ name: 'step-01b-continue'
 description: 'Handle workflow continuation from previous session'
 
 # Path Definitions
-workflow_path: '{project-root}/.bmad/bmb/reference/workflows/meal-prep-nutrition'
+workflow_path: '{project-root}/_bmad/bmb/reference/workflows/meal-prep-nutrition'
 
 # File References
 thisStepFile: '{workflow_path}/steps/step-01b-continue.md'

package/src/modules/bmb/workflows/create-agent/data/reference/workflows/meal-prep-nutrition/steps/step-02-profile.md

@@ -3,7 +3,7 @@ name: 'step-02-profile'
 description: 'Gather comprehensive user profile information through collaborative conversation'
 
 # Path Definitions
-workflow_path: '{project-root}/.bmad/bmb/reference/workflows/meal-prep-nutrition'
+workflow_path: '{project-root}/_bmad/bmb/reference/workflows/meal-prep-nutrition'
 
 # File References (all use {variable} format in file)
 thisStepFile: '{workflow_path}/steps/step-02-profile.md'
@@ -12,8 +12,8 @@ workflowFile: '{workflow_path}/workflow.md'
 outputFile: '{output_folder}/nutrition-plan-{project_name}.md'
 
 # Task References
-advancedElicitationTask: '{project-root}/.bmad/core/tasks/advanced-elicitation.xml'
-partyModeWorkflow: '{project-root}/.bmad/core/workflows/party-mode/workflow.md'
+advancedElicitationTask: '{project-root}/_bmad/core/tasks/advanced-elicitation.xml'
+partyModeWorkflow: '{project-root}/_bmad/core/workflows/party-mode/workflow.md'
 
 # Template References
 profileTemplate: '{workflow_path}/templates/profile-section.md'

package/src/modules/bmb/workflows/create-agent/data/reference/workflows/meal-prep-nutrition/steps/step-03-assessment.md

@@ -3,7 +3,7 @@ name: 'step-03-assessment'
 description: 'Analyze nutritional requirements, identify restrictions, and calculate target macros'
 
 # Path Definitions
-workflow_path: '{project-root}/.bmad/bmb/reference/workflows/meal-prep-nutrition'
+workflow_path: '{project-root}/_bmad/bmb/reference/workflows/meal-prep-nutrition'
 
 # File References
 thisStepFile: '{workflow_path}/steps/step-03-assessment.md'
@@ -12,8 +12,8 @@ workflowFile: '{workflow_path}/workflow.md'
 outputFile: '{output_folder}/nutrition-plan-{project_name}.md'
 
 # Task References
-advancedElicitationTask: '{project-root}/.bmad/core/tasks/advanced-elicitation.xml'
-partyModeWorkflow: '{project-root}/.bmad/core/workflows/party-mode/workflow.md'
+advancedElicitationTask: '{project-root}/_bmad/core/tasks/advanced-elicitation.xml'
+partyModeWorkflow: '{project-root}/_bmad/core/workflows/party-mode/workflow.md'
 
 # Data References
 dietaryRestrictionsDB: '{workflow_path}/data/dietary-restrictions.csv'

package/src/modules/bmb/workflows/create-agent/data/reference/workflows/meal-prep-nutrition/steps/step-04-strategy.md

@@ -3,7 +3,7 @@ name: 'step-04-strategy'
 description: 'Design a personalized meal strategy that meets nutritional needs and fits lifestyle'
 
 # Path Definitions
-workflow_path: '{project-root}/.bmad/bmb/reference/workflows/meal-prep-nutrition'
+workflow_path: '{project-root}/_bmad/bmb/reference/workflows/meal-prep-nutrition'
 
 # File References
 thisStepFile: '{workflow_path}/steps/step-04-strategy.md'
@@ -13,8 +13,8 @@ workflowFile: '{workflow_path}/workflow.md'
 outputFile: '{output_folder}/nutrition-plan-{project_name}.md'
 
 # Task References
-advancedElicitationTask: '{project-root}/.bmad/core/tasks/advanced-elicitation.xml'
-partyModeWorkflow: '{project-root}/.bmad/core/workflows/party-mode/workflow.md'
+advancedElicitationTask: '{project-root}/_bmad/core/tasks/advanced-elicitation.xml'
+partyModeWorkflow: '{project-root}/_bmad/core/workflows/party-mode/workflow.md'
 
 # Data References
 recipeDatabase: '{workflow_path}/data/recipe-database.csv'
@@ -167,8 +167,8 @@ Display: **Select an Option:** [A] Meal Variety Optimization [P] Chef & Dietitia
 #### Menu Handling Logic:
 
 - HALT and AWAIT ANSWER
-- IF A: Execute `{project-root}/.bmad/core/tasks/advanced-elicitation.xml`
-- IF P: Execute `{project-root}/.bmad/core/workflows/party-mode/workflow.md`
+- IF A: Execute `{project-root}/_bmad/core/tasks/advanced-elicitation.xml`
+- IF P: Execute `{project-root}/_bmad/core/workflows/party-mode/workflow.md`
 - IF C: Save content to nutrition-plan.md, update frontmatter, check cooking frequency:
   - IF cooking frequency > 2x/week: load, read entire file, then execute `{workflow_path}/step-05-shopping.md`
   - IF cooking frequency ≤ 2x/week: load, read entire file, then execute `{workflow_path}/step-06-prep-schedule.md`

package/src/modules/bmb/workflows/create-agent/data/reference/workflows/meal-prep-nutrition/steps/step-05-shopping.md

@@ -3,7 +3,7 @@ name: 'step-05-shopping'
 description: 'Create a comprehensive shopping list that supports the meal strategy'
 
 # Path Definitions
-workflow_path: '{project-root}/.bmad/bmb/reference/workflows/meal-prep-nutrition'
+workflow_path: '{project-root}/_bmad/bmb/reference/workflows/meal-prep-nutrition'
 
 # File References
 thisStepFile: '{workflow_path}/steps/step-05-shopping.md'
@@ -12,8 +12,8 @@ workflowFile: '{workflow_path}/workflow.md'
 outputFile: '{output_folder}/nutrition-plan-{project_name}.md'
 
 # Task References
-advancedElicitationTask: '{project-root}/.bmad/core/tasks/advanced-elicitation.xml'
-partyModeWorkflow: '{project-root}/.bmad/core/workflows/party-mode/workflow.md'
+advancedElicitationTask: '{project-root}/_bmad/core/tasks/advanced-elicitation.xml'
+partyModeWorkflow: '{project-root}/_bmad/core/workflows/party-mode/workflow.md'
 
 # Template References
 shoppingTemplate: '{workflow_path}/templates/shopping-section.md'
@@ -157,8 +157,8 @@ Display: **Select an Option:** [A] Budget Optimization Strategies [P] Shopping P
 #### Menu Handling Logic:
 
 - HALT and AWAIT ANSWER
-- IF A: Execute `{project-root}/.bmad/core/tasks/advanced-elicitation.xml`
-- IF P: Execute `{project-root}/.bmad/core/workflows/party-mode/workflow.md`
+- IF A: Execute `{project-root}/_bmad/core/tasks/advanced-elicitation.xml`
+- IF P: Execute `{project-root}/_bmad/core/workflows/party-mode/workflow.md`
 - IF C: Save content to nutrition-plan.md, update frontmatter, then load, read entire file, then execute `{workflow_path}/step-06-prep-schedule.md`
 - IF Any other comments or queries: help user respond then [Redisplay Menu Options](#5-present-menu-options)
 

package/src/modules/bmb/workflows/create-agent/data/reference/workflows/meal-prep-nutrition/steps/step-06-prep-schedule.md

@@ -3,7 +3,7 @@ name: 'step-06-prep-schedule'
 description: "Create a realistic meal prep schedule that fits the user's lifestyle"
 
 # Path Definitions
-workflow_path: '{project-root}/.bmad/bmb/reference/workflows/meal-prep-nutrition'
+workflow_path: '{project-root}/_bmad/bmb/reference/workflows/meal-prep-nutrition'
 
 # File References
 thisStepFile: '{workflow_path}/steps/step-06-prep-schedule.md'
@@ -11,8 +11,8 @@ workflowFile: '{workflow_path}/workflow.md'
 outputFile: '{output_folder}/nutrition-plan-{project_name}.md'
 
 # Task References
-advancedElicitationTask: '{project-root}/.bmad/core/tasks/advanced-elicitation.xml'
-partyModeWorkflow: '{project-root}/.bmad/core/workflows/party-mode/workflow.md'
+advancedElicitationTask: '{project-root}/_bmad/core/tasks/advanced-elicitation.xml'
+partyModeWorkflow: '{project-root}/_bmad/core/workflows/party-mode/workflow.md'
 
 # Template References
 prepScheduleTemplate: '{workflow_path}/templates/prep-schedule-section.md'
@@ -178,8 +178,8 @@ Display: **Select an Option:** [A] Advanced Prep Techniques [P] Coach Perspectiv
 #### Menu Handling Logic:
 
 - HALT and AWAIT ANSWER
-- IF A: Execute `{project-root}/.bmad/core/tasks/advanced-elicitation.xml`
-- IF P: Execute `{project-root}/.bmad/core/workflows/party-mode/workflow.md`
+- IF A: Execute `{project-root}/_bmad/core/tasks/advanced-elicitation.xml`
+- IF P: Execute `{project-root}/_bmad/core/workflows/party-mode/workflow.md`
 - IF C: Update frontmatter with all steps completed, mark workflow complete, display final message
 - IF Any other comments or queries: help user respond then [Redisplay Menu Options](#6-present-menu-options)
 

package/src/modules/bmb/workflows/create-agent/data/reference/workflows/meal-prep-nutrition/workflow.md

@@ -49,10 +49,10 @@ This uses **step-file architecture** for disciplined execution:
 
 ### 1. Configuration Loading
 
-Load and read full config from {project-root}/.bmad/bmm/config.yaml and resolve:
+Load and read full config from {project-root}/\_bmad/bmm/config.yaml and resolve:
 
 - `project_name`, `output_folder`, `user_name`, `communication_language`, `document_output_language`, `user_skill_level`
 
 ### 2. First Step EXECUTION
 
-Load, read the full file and then execute `{project-root}/.bmad/bmb/reference/workflows/meal-prep-nutrition/steps/step-01-init.md` to begin the workflow.
+Load, read the full file and then execute `{project-root}/_bmad/bmb/reference/workflows/meal-prep-nutrition/steps/step-01-init.md` to begin the workflow.

package/src/modules/bmb/workflows/create-agent/data/validation-complete.md

@@ -81,10 +81,10 @@
 
 **Agent Documentation References**
 
-- Agent compilation guide: `{project-root}/.bmad/bmb/docs/agents/agent-compilation.md`
-- Agent types guide: `{project-root}/.bmad/bmb/docs/agents/understanding-agent-types.md`
+- Agent compilation guide: `{project-root}/_bmad/bmb/docs/agents/agent-compilation.md`
+- Agent types guide: `{project-root}/_bmad/bmb/docs/agents/understanding-agent-types.md`
 - Architecture docs: simple, expert, module agent architectures
-- Menu patterns guide: `{project-root}/.bmad/bmb/docs/agents/agent-menu-patterns.md`
+- Menu patterns guide: `{project-root}/_bmad/bmb/docs/agents/agent-menu-patterns.md`
 - Status: ✅ ALL REFERENCES PRESERVED
 
 **Communication Presets**

package/src/modules/bmb/workflows/create-agent/steps/step-01-brainstorm.md

@@ -10,11 +10,11 @@ thisStepFile: '{workflow_path}/steps/step-01-brainstorm.md'
 nextStepFile: '{workflow_path}/steps/step-02-discover.md'
 workflowFile: '{workflow_path}/workflow.md'
 brainstormContext: '{workflow_path}/data/brainstorm-context.md'
-brainstormWorkflow: '{project-root}/.bmad/core/workflows/brainstorming/workflow.md'
+brainstormWorkflow: '{project-root}/_bmad/core/workflows/brainstorming/workflow.md'
 
 # Task References
-advancedElicitationTask: '{project-root}/.bmad/core/tasks/advanced-elicitation.xml'
-partyModeWorkflow: '{project-root}/.bmad/core/workflows/party-mode/workflow.md'
+advancedElicitationTask: '{project-root}/_bmad/core/tasks/advanced-elicitation.xml'
+partyModeWorkflow: '{project-root}/_bmad/core/workflows/party-mode/workflow.md'
 ---
 
 # Step 1: Optional Brainstorming
@@ -90,7 +90,7 @@ Wait for clear user response (yes/no or y/n).
 
 - Load brainstorming workflow: `{brainstormWorkflow}`
 - Pass context data: `{brainstormContext}`
-- Execute brainstorming session
+- Execute brainstorming session scoped specifically to brainstorming a new agent.
 - Capture all brainstorming output for next step
 - Return to this step after brainstorming completes
 

package/src/modules/bmb/workflows/create-agent/steps/step-02-discover.md

@@ -9,8 +9,8 @@ workflow_path: '{project-root}/bmb/workflows/create-agent/create-agent'
 thisStepFile: '{workflow_path}/steps/step-02-discover.md'
 nextStepFile: '{workflow_path}/steps/step-03-persona.md'
 workflowFile: '{workflow_path}/workflow.md'
-outputFile: '{output_folder}/agent-purpose-{project_name}.md'
-agentTypesGuide: '{project-root}/.bmad/bmb/docs/agents/understanding-agent-types.md'
+agentPlan: '{bmb_creations_output_folder}/agent-plan-{agent_name}.md'
+agentTypesGuide: '{project-root}/_bmad/bmb/docs/agents/understanding-agent-types.md'
 simpleExamples: '{workflow_path}/data/reference/agents/simple-examples/'
 expertExamples: '{workflow_path}/data/reference/agents/expert-examples/'
 moduleExamples: '{workflow_path}/data/reference/agents/module-examples/'
@@ -19,8 +19,8 @@ moduleExamples: '{workflow_path}/data/reference/agents/module-examples/'
 agentPurposeTemplate: '{workflow_path}/templates/agent-purpose-and-type.md'
 
 # Task References
-advancedElicitationTask: '{project-root}/.bmad/core/tasks/advanced-elicitation.xml'
-partyModeWorkflow: '{project-root}/.bmad/core/workflows/party-mode/workflow.md'
+advancedElicitationTask: '{project-root}/_bmad/core/tasks/advanced-elicitation.xml'
+partyModeWorkflow: '{project-root}/_bmad/core/workflows/party-mode/workflow.md'
 ---
 
 # Step 2: Discover Agent Purpose and Type
@@ -112,10 +112,6 @@ As purpose becomes clear, analyze and recommend appropriate agent type.
   - Choose when: Needs to remember across sessions, personal knowledge base, learning over time
   - CAN have personal workflows in sidecar if critical_actions loads workflow engine
   - Example: Personal research assistant, domain expert advisor, learning companion
-
-- **Module Agent** - Workflow orchestration, team integration, shared infrastructure
-  - Choose when: Coordinates workflows, works with other agents, professional operations
-  - CAN invoke module workflows and coordinate with team agents
   - Example: Project coordinator, workflow manager, team orchestrator
 
 **Type Selection Process:**
@@ -162,7 +158,7 @@ As purpose becomes clear, analyze and recommend appropriate agent type.
 [Any relevant insights from previous brainstorming session]
 ```
 
-Save this content to `{outputFile}` for reference in subsequent steps.
+Save this content to {agentPlan} for reference in subsequent steps.
 
 ### 6. Present MENU OPTIONS
 
@@ -172,7 +168,7 @@ Display: "**Select an Option:** [A] Advanced Elicitation [P] Party Mode [C] Cont
 
 - IF A: Execute {advancedElicitationTask}
 - IF P: Execute {partyModeWorkflow}
-- IF C: Save content to {outputFile}, update frontmatter, then only then load, read entire file, then execute {nextStepFile}
+- IF C: Save content to {agentPlan}, update frontmatter, then only then load, read entire file, then execute {nextStepFile}
 - IF Any other comments or queries: help user respond then [Redisplay Menu Options](#6-present-menu-options)
 
 #### EXECUTION RULES:

package/src/modules/bmb/workflows/create-agent/steps/step-03-persona.md

@@ -9,16 +9,16 @@ workflow_path: '{project-root}/bmb/workflows/create-agent/create-agent'
 thisStepFile: '{workflow_path}/steps/step-03-persona.md'
 nextStepFile: '{workflow_path}/steps/step-04-commands.md'
 workflowFile: '{workflow_path}/workflow.md'
-outputFile: '{output_folder}/agent-persona-{project_name}.md'
+agentPlan: '{bmb_creations_output_folder}/agent-plan-{agent_name}.md'
 communicationPresets: '{workflow_path}/data/communication-presets.csv'
-agentMenuPatterns: '{project-root}/.bmad/bmb/docs/agents/agent-menu-patterns.md'
+agentMenuPatterns: '{project-root}/_bmad/bmb/docs/agents/agent-menu-patterns.md'
 
 # Template References
 personaTemplate: '{workflow_path}/templates/agent-persona.md'
 
 # Task References
-advancedElicitationTask: '{project-root}/.bmad/core/tasks/advanced-elicitation.xml'
-partyModeWorkflow: '{project-root}/.bmad/core/workflows/party-mode/workflow.md'
+advancedElicitationTask: '{project-root}/_bmad/core/tasks/advanced-elicitation.xml'
+partyModeWorkflow: '{project-root}/_bmad/core/workflows/party-mode/workflow.md'
 ---
 
 # Step 3: Shape Agent's Personality
@@ -211,7 +211,7 @@ Ask: "How should this agent guide users - with adaptive conversation (intent-bas
 [Intent-based or Prescriptive with rationale]
 ```
 
-Save this content to `{outputFile}` for reference in subsequent steps.
+Append this content to {agentPlan} for reference in subsequent steps.
 
 ### 8. Present MENU OPTIONS
 
@@ -221,7 +221,7 @@ Display: "**Select an Option:** [A] Advanced Elicitation [P] Party Mode [C] Cont
 
 - IF A: Execute {advancedElicitationTask}
 - IF P: Execute {partyModeWorkflow}
-- IF C: Save content to {outputFile}, update frontmatter, then only then load, read entire file, then execute {nextStepFile}
+- IF C: Save content to {agentPlan}, update frontmatter, then only then load, read entire file, then execute {nextStepFile}
 - IF Any other comments or queries: help user respond then [Redisplay Menu Options](#8-present-menu-options)
 
 #### EXECUTION RULES:

package/src/modules/bmb/workflows/create-agent/steps/step-04-commands.md

@@ -9,18 +9,18 @@ workflow_path: '{project-root}/bmb/workflows/create-agent/create-agent'
 thisStepFile: '{workflow_path}/steps/step-04-commands.md'
 nextStepFile: '{workflow_path}/steps/step-05-name.md'
 workflowFile: '{workflow_path}/workflow.md'
-outputFile: '{output_folder}/agent-commands-{project_name}.md'
-agentMenuPatterns: '{project-root}/.bmad/bmb/docs/agents/agent-menu-patterns.md'
-simpleArchitecture: '{project-root}/.bmad/bmb/docs/agents/simple-agent-architecture.md'
-expertArchitecture: '{project-root}/.bmad/bmb/docs/agents/expert-agent-architecture.md'
-moduleArchitecture: '{project-root}/.bmad/bmb/docs/agents/module-agent-architecture.md'
+agentPlan: '{bmb_creations_output_folder}/agent-plan-{agent_name}.md'
+agentMenuPatterns: '{project-root}/_bmad/bmb/docs/agents/agent-menu-patterns.md'
+simpleArchitecture: '{project-root}/_bmad/bmb/docs/agents/simple-agent-architecture.md'
+expertArchitecture: '{project-root}/_bmad/bmb/docs/agents/expert-agent-architecture.md'
+moduleArchitecture: '{project-root}/_bmad/bmb/docs/agents/module-agent-architecture.md'
 
 # Template References
 commandsTemplate: '{workflow_path}/templates/agent-commands.md'
 
 # Task References
-advancedElicitationTask: '{project-root}/.bmad/core/tasks/advanced-elicitation.xml'
-partyModeWorkflow: '{project-root}/.bmad/core/workflows/party-mode/workflow.md'
+advancedElicitationTask: '{project-root}/_bmad/core/tasks/advanced-elicitation.xml'
+partyModeWorkflow: '{project-root}/_bmad/core/workflows/party-mode/workflow.md'
 ---
 
 # Step 4: Build Capabilities and Commands
@@ -187,7 +187,7 @@ If user seems engaged, explore special features:
 [Architecture-specific considerations and technical requirements]
 ```
 
-Save this content to `{outputFile}` for reference in subsequent steps.
+Save this content to {agentPlan} for reference in subsequent steps.
 
 ### 7. Present MENU OPTIONS
 
@@ -197,7 +197,7 @@ Display: "**Select an Option:** [A] Advanced Elicitation [P] Party Mode [C] Cont
 
 - IF A: Execute {advancedElicitationTask}
 - IF P: Execute {partyModeWorkflow}
-- IF C: Save content to {outputFile}, update frontmatter, then only then load, read entire file, then execute {nextStepFile}
+- IF C: Save content to {agentPlan}, update frontmatter, then only then load, read entire file, then execute {nextStepFile}
 - IF Any other comments or queries: help user respond then [Redisplay Menu Options](#7-present-menu-options)
 
 #### EXECUTION RULES:

package/src/modules/bmb/workflows/create-agent/steps/step-05-name.md

@@ -9,14 +9,15 @@ workflow_path: '{project-root}/bmb/workflows/create-agent/create-agent'
 thisStepFile: '{workflow_path}/steps/step-05-name.md'
 nextStepFile: '{workflow_path}/steps/step-06-build.md'
 workflowFile: '{workflow_path}/workflow.md'
-outputFile: '{output_folder}/agent-identity-{project_name}.md'
+
+agentPlan: '{bmb_creations_output_folder}/agent-plan-{agent_name}.md'
 
 # Template References
 identityTemplate: '{workflow_path}/templates/agent-identity.md'
 
 # Task References
-advancedElicitationTask: '{project-root}/.bmad/core/tasks/advanced-elicitation.xml'
-partyModeWorkflow: '{project-root}/.bmad/core/workflows/party-mode/workflow.md'
+advancedElicitationTask: '{project-root}/_bmad/core/tasks/advanced-elicitation.xml'
+partyModeWorkflow: '{project-root}/_bmad/core/workflows/party-mode/workflow.md'
 ---
 
 # Step 5: Agent Naming and Identity
@@ -182,7 +183,7 @@ Once name is selected, confirm the complete identity package:
 [User confirmation that identity package feels right]
 ```
 
-Save this content to `{outputFile}` for reference in subsequent steps.
+Save this content to {agentPlan} for reference in subsequent steps.
 
 ### 6. Present MENU OPTIONS
 
@@ -192,7 +193,7 @@ Display: "**Select an Option:** [A] Advanced Elicitation [P] Party Mode [C] Cont
 
 - IF A: Execute {advancedElicitationTask}
 - IF P: Execute {partyModeWorkflow}
-- IF C: Save content to {outputFile}, update frontmatter, then only then load, read entire file, then execute {nextStepFile}
+- IF C: Save content to {agentPlan}, update frontmatter, then only then load, read entire file, then execute {nextStepFile}
 - IF Any other comments or queries: help user respond then [Redisplay Menu Options](#6-present-menu-options)
 
 #### EXECUTION RULES:

package/src/modules/bmb/workflows/create-agent/steps/step-06-build.md

@@ -9,23 +9,23 @@ workflow_path: '{project-root}/bmb/workflows/create-agent/create-agent'
 thisStepFile: '{workflow_path}/steps/step-06-build.md'
 nextStepFile: '{workflow_path}/steps/step-07-validate.md'
 workflowFile: '{workflow_path}/workflow.md'
-outputFile: '{output_folder}/agent-yaml-{project_name}.md'
-moduleOutputFile: '{project-root}/.bmad/{target_module}/agents/{agent_filename}.agent.yaml'
-standaloneOutputFile: '{workflow_path}/data/{agent_filename}/{agent_filename}.agent.yaml'
+agentPlan: '{bmb_creations_output_folder}/agent-plan-{agent_name}.md'
+agentBuildOutput: '{bmb_creations_output_folder}/{agent-name}'
 
 # Template References
-completeAgentTemplate: '{workflow_path}/templates/agent-complete-{agent_type}.md'
+simpleAgentTemplate: '{workflow_path}/templates/simple-agent.template.md'
+expertAgentTemplate: '{workflow_path}/templates/expert-agent.template.md'
 
 # Task References
-advancedElicitationTask: '{project-root}/.bmad/core/tasks/advanced-elicitation.xml'
-partyModeWorkflow: '{project-root}/.bmad/core/workflows/party-mode/workflow.md'
+advancedElicitationTask: '{project-root}/_bmad/core/tasks/advanced-elicitation.xml'
+partyModeWorkflow: '{project-root}/_bmad/core/workflows/party-mode/workflow.md'
 ---
 
 # Step 6: Build Complete Agent YAML
 
 ## STEP GOAL:
 
-Generate the complete YAML agent file incorporating all discovered elements: purpose, persona, capabilities, name, and identity while maintaining the collaborative creation journey.
+Generate the complete YAML agent folder, yaml file and sidecar content to the specification defined in {agentBuildOutput} completely.
 
 ## MANDATORY EXECUTION RULES (READ FIRST):
 
@@ -46,10 +46,10 @@ Generate the complete YAML agent file incorporating all discovered elements: pur
 
 ### Step-Specific Rules:
 
-- 🎯 Focus only on generating complete YAML structure based on discovered elements
-- 🚫 FORBIDDEN to duplicate auto-injected features (help, exit, activation handlers)
+- 🎯 Focus only on generating complete YAML and sidecar content structure based on discovered elements
+- 🚫 FORBIDDEN to duplicate auto-injected features (help and exit menu items, activation handler instructions)
 - 💬 Approach: Present the journey of collaborative creation while building technical structure
-- 📋 Generate YAML that accurately reflects all discoveries from previous steps
+- 📋 Generate YAML and sidecar files that accurately reflects all discoveries from previous steps
 
 ## EXECUTION PROTOCOLS:
 
@@ -85,19 +85,15 @@ Present this to the user:
 
 Based on determined agent type, load appropriate template:
 
-- Simple Agent: `agent-complete-simple.md`
-- Expert Agent: `agent-complete-expert.md`
-- Module Agent: `agent-complete-module.md`
+- If (agent will have memories and optionally its own knowledge, separate prompt files, or data in separate files)
+  - Utilize {expertAgentTemplate} to generate the agent output file {agentBuildOutput}/{agent-name}.agent.yaml
+  - Create the Side-cre folder to hold the optional sidecar files if needed from plan in following steps at {agentBuildOutput}/{agent-name}/{agent-name}-sidecar
+- ELSE:
+  - utilize {simpleAgentTemplate} to generate the agent output file {agentBuildOutput}/{agent-name}.agent.yaml
 
-### 3. YAML Structure Generation
+### 4. Generate Complete YAML and sidecar content if applicable
 
-Explain the core structure to user:
-
-"I'll now generate the complete YAML that incorporates everything we've discovered. This will include your agent's metadata, persona, capabilities, and configuration."
-
-### 4. Generate Complete YAML
-
-Create the complete YAML incorporating all discovered elements:
+Create the complete YAML incorporating all discovered elements from the plan:
 
 **Core Structure:**
 
@@ -140,41 +136,7 @@ Ensure proper implementation based on agent type:
 - Memory integration points
 - Personal workflow capabilities
 
-**Module Agent:**
-
-- Workflow orchestration capabilities
-- Team integration references
-- Cross-agent coordination
-
-### 6. Document Complete YAML
-
-#### Content to Append (if applicable):
-
-```markdown
-## Complete Agent YAML
-
-### Agent Type
-
-[Simple/Expert/Module as determined]
-
-### Generated Configuration
-
-[Complete YAML structure with all discovered elements]
-
-### Key Features Integrated
-
-- Purpose and role from discovery phase
-- Complete persona with four-field system
-- All capabilities and commands developed
-- Agent name and identity established
-- Type-specific optimizations applied
-
-### Output Configuration
-
-[Proper file paths and configuration based on agent type]
-```
-
-Save this content to `{outputFile}` for reference.
+Ensure all files generated are complete, and nothing from the plan has not been skipped, and then give a creational summary of what was done to the user in chat.
 
 ### 7. Present MENU OPTIONS
 
@@ -184,7 +146,7 @@ Display: "**Select an Option:** [A] Advanced Elicitation [P] Party Mode [C] Cont
 
 - IF A: Execute {advancedElicitationTask}
 - IF P: Execute {partyModeWorkflow}
-- IF C: Save content to {outputFile}, update frontmatter, then only then load, read entire file, then execute {nextStepFile}
+- IF C: Save content to {agentBuildOutput}, update frontmatter, then only then load, read entire file, then execute {nextStepFile}
 - IF Any other comments or queries: help user respond then [Redisplay Menu Options](#7-present-menu-options)
 
 #### EXECUTION RULES:

package/src/modules/bmb/workflows/create-agent/steps/step-07-validate.md

@@ -7,18 +7,18 @@ workflow_path: '{project-root}/bmb/workflows/create-agent/create-agent'
 
 # File References
 thisStepFile: '{workflow_path}/steps/step-07-validate.md'
-nextStepFile: '{workflow_path}/steps/step-08-setup.md'
+nextStepFile: '{workflow_path}/steps/step-08-celebrate.md'
 workflowFile: '{workflow_path}/workflow.md'
-outputFile: '{output_folder}/agent-validation-{project_name}.md'
-agentValidationChecklist: '{project-root}/.bmad/bmb/workflows/create-agent/agent-validation-checklist.md'
+outputFile: '{bmb_creations_output_folder}/agent-validation-{project_name}.md'
+agentValidationChecklist: '{project-root}/_bmad/bmb/workflows/create-agent/agent-validation-checklist.md'
 agentFile: '{{output_file_path}}'
 
 # Template References
 validationTemplate: '{workflow_path}/templates/validation-results.md'
 
 # Task References
-advancedElicitationTask: '{project-root}/.bmad/core/tasks/advanced-elicitation.xml'
-partyModeWorkflow: '{project-root}/.bmad/core/workflows/party-mode/workflow.md'
+advancedElicitationTask: '{project-root}/_bmad/core/tasks/advanced-elicitation.xml'
+partyModeWorkflow: '{project-root}/_bmad/core/workflows/party-mode/workflow.md'
 ---
 
 # Step 7: Quality Check and Validation

package/src/modules/bmb/workflows/create-agent/steps/{step-11-celebrate.md → step-08-celebrate.md}

@@ -10,14 +10,10 @@ thisStepFile: '{workflow_path}/steps/step-11-celebrate.md'
 workflowFile: '{workflow_path}/workflow.md'
 outputFile: '{output_folder}/agent-completion-{project_name}.md'
 agentFile: '{{output_file_path}}'
-compiledAgentFile: '{{compiled_agent_path}}'
-
-# Template References
-completionTemplate: '{workflow_path}/templates/completion-summary.md'
 
 # Task References
-advancedElicitationTask: '{project-root}/.bmad/core/tasks/advanced-elicitation.xml'
-partyModeWorkflow: '{project-root}/.bmad/core/workflows/party-mode/workflow.md'
+advancedElicitationTask: '{project-root}/_bmad/core/tasks/advanced-elicitation.xml'
+partyModeWorkflow: '{project-root}/_bmad/core/workflows/party-mode/workflow.md'
 ---
 
 # Step 11: Celebration and Next Steps

package/src/modules/bmb/workflows/create-agent/templates/agent-plan.template.md

@@ -0,0 +1,3 @@
+---
+stepsCompleted: []
+---