bmad-method 6.0.0-alpha.22 → 6.0.0-alpha.23

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

@@ -34,11 +34,13 @@ Validate Module agents meet BMAD quality standards.
 ### Module Agent Can Be Simple OR Expert
 
 **If Simple-structure Module Agent:**
+- [ ] `agent.metadata.hasSidecar` is `false` (no sidecar)
 - [ ] Single .agent.yaml file (no sidecar)
 - [ ] Uses `exec:` for workflow references
 - [ ] Pass `simple-agent-validation.md` first
 
 **If Expert-structure Module Agent:**
+- [ ] `agent.metadata.hasSidecar` is `true` (has sidecar)
 - [ ] Has sidecar folder
 - [ ] Uses `exec:` for workflow references
 - [ ] Sidecar paths use `{project-root}/_bmad/_memory/{sidecar-folder}/` format

package/src/modules/bmb/workflows/agent/data/reference/expert-examples/journal-keeper/journal-keeper.agent.yaml

@@ -5,6 +5,7 @@ agent:
     title: "Personal Journal Companion"
     icon: "📔"
     module: stand-alone
+    hasSidecar: false
 
   persona:
     role: "Thoughtful Journal Companion with Pattern Recognition"

package/src/modules/bmb/workflows/agent/data/reference/module-examples/architect.agent.yaml

@@ -7,6 +7,7 @@ agent:
     title: Architect
     icon: 🏗️
     module: bmm
+    hasSidecar: false
 
   persona:
     role: System Architect + Technical Design Leader

package/src/modules/bmb/workflows/agent/data/reference/module-examples/security-engineer.agent.yaml

@@ -15,6 +15,7 @@ agent:
     title: "Security Engineer"
     icon: "🔐"
     module: "bmm"
+    hasSidecar: false
 
   persona:
     role: Application Security Specialist + Threat Modeling Expert

package/src/modules/bmb/workflows/agent/data/reference/module-examples/trend-analyst.agent.yaml

@@ -15,6 +15,7 @@ agent:
     title: "Trend Analyst"
     icon: "📈"
     module: "cis"
+    hasSidecar: false
 
   persona:
     role: Cultural + Market Trend Intelligence Expert

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

@@ -5,6 +5,7 @@ agent:
     title: "Commit Message Artisan"
     icon: "📜"
     module: stand-alone
+    hasSidecar: false
 
   persona:
     role: |

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

@@ -7,7 +7,8 @@ Validate Simple agents meet BMAD quality standards.
 ## YAML Structure
 
 - [ ] YAML parses without errors
-- [ ] `agent.metadata` includes: `id`, `name`, `title`, `icon`, `module`
+- [ ] `agent.metadata` includes: `id`, `name`, `title`, `icon`, `module`, `hasSidecar`
+- [ ] `agent.metadata.hasSidecar` is `false` (Simple agents don't have sidecars)
 - [ ] `agent.metadata.module` is `stand-alone` or module code (`bmm`, `cis`, `bmgd`, etc.)
 - [ ] `agent.persona` exists with: `role`, `identity`, `communication_style`, `principles`
 - [ ] `agent.menu` exists with at least one item

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

@@ -46,7 +46,9 @@ Optional creative exploration to generate agent ideas through structured brainst
 - Limits: No mandatory brainstorming, no pressure tactics
 - Dependencies: User choice to participate or skip brainstorming
 
-## Sequence of Instructions (Do not deviate, skip, or optimize)
+## MANDATORY SEQUENCE
+
+**CRITICAL:** Follow this sequence exactly. Do not skip, reorder, or improvise unless user explicitly requests a change.
 
 ### 1. Present Brainstorming Opportunity
 

package/src/modules/bmb/workflows/agent/steps-c/step-02-discovery.md

@@ -108,7 +108,9 @@ After documentation, present menu:
 - Clear articulation of value proposition
 - Comprehensive capability mapping
 
-# EXECUTION SEQUENCE
+## MANDATORY SEQUENCE
+
+**CRITICAL:** Follow this sequence exactly. Do not skip, reorder, or improvise unless user explicitly requests a change.
 
 1. **Load Previous Context**
    - Check for brainstormContext file

package/src/modules/bmb/workflows/agent/steps-c/step-03-type-metadata.md

@@ -1,5 +1,5 @@
 ---
-name: 'step-02-type-metadata'
+name: 'step-03-type-metadata'
 description: 'Determine agent type and define metadata'
 
 # File References
@@ -27,7 +27,7 @@ Determine the agent's classification (Simple/Expert/Module) and define all manda
 # MANDATORY EXECUTION RULES
 
 ## Universal Rules
-- ALWAYS use `{agent-language}` for all conversational text
+- ALWAYS use `{communication_language}` for all conversational text
 - MAINTAIN step boundaries - complete THIS step only
 - DOCUMENT all decisions to agent plan file
 - HONOR user's creative control throughout
@@ -125,7 +125,9 @@ Present structured options:
 
 ---
 
-# INSTRUCTION SEQUENCE
+## MANDATORY SEQUENCE
+
+**CRITICAL:** Follow this sequence exactly. Do not skip, reorder, or improvise unless user explicitly requests a change.
 
 ## 1. Load Documentation
 Read and internalize:
@@ -134,7 +136,7 @@ Read and internalize:
 - Keep examples accessible for reference
 
 ## 2. Purpose Discovery Conversation
-Engage user with questions in `{agent-language}`:
+Engage user with questions in `{communication_language}`:
 - "What is the primary function this agent will perform?"
 - "How complex are the tasks this agent will handle?"
 - "Will this agent need to manage workflows or other agents?"

package/src/modules/bmb/workflows/agent/steps-c/step-04-persona.md

@@ -1,5 +1,5 @@
 ---
-name: 'step-03-persona'
+name: 'step-04-persona'
 description: 'Shape the agent personality through four-field persona system'
 
 # File References
@@ -156,7 +156,9 @@ principles:
 - Workflow steps (belongs in orchestration)
 - Data structures (belongs in implementation)
 
-# EXECUTION SEQUENCE
+## MANDATORY SEQUENCE
+
+**CRITICAL:** Follow this sequence exactly. Do not skip, reorder, or improvise unless user explicitly requests a change.
 
 1. **LOAD** personaProperties.md and principlesCrafting.md
 2. **EXPLAIN** four-field system with clear examples

package/src/modules/bmb/workflows/agent/steps-c/step-05-commands-menu.md

@@ -1,5 +1,5 @@
 ---
-name: 'step-04-commands-menu'
+name: 'step-05-commands-menu'
 description: 'Build capabilities and command structure'
 
 # File References
@@ -121,7 +121,9 @@ menu:
 - **User-facing perspective** - triggers should feel natural
 - **Capability alignment** - every command maps to a capability
 
-# EXECUTION SEQUENCE
+## MANDATORY SEQUENCE
+
+**CRITICAL:** Follow this sequence exactly. Do not skip, reorder, or improvise unless user explicitly requests a change.
 
 1. Load agent-menu-patterns.md to understand structure
 2. Review capabilities from agent-plan step 3

package/src/modules/bmb/workflows/agent/steps-c/step-06-activation.md

@@ -1,5 +1,5 @@
 ---
-name: 'step-05-activation'
+name: 'step-06-activation'
 description: 'Plan activation behavior and route to build'
 
 # File References
@@ -30,7 +30,7 @@ Define activation behavior through critical_actions and route to the appropriate
    - These are non-negotiable prerequisites
 
 2. **MUST Determine Route Before Activation Discussion**
-   - Check hasSidecar from plan metadata
+   - Check `module` and `hasSidecar` from plan metadata
    - Determine destination build step FIRST
    - Inform user of routing decision
 
@@ -41,10 +41,12 @@ Define activation behavior through critical_actions and route to the appropriate
 
 4. **MUST Follow Routing Logic Exactly**
    ```yaml
-   # Route determination based on hasSidecar and module
-   hasSidecar: false → step-06-build-simple.md
-   hasSidecar: true + module: "stand-alone" → step-06-build-expert.md
-   hasSidecar: true + module: ≠ "stand-alone" → step-06-build-module.md
+   # Route determination based on module and hasSidecar
+   # Module agents: any module value other than "stand-alone"
+   module ≠ "stand-alone" → step-07c-build-module.md
+   # Stand-alone agents: determined by hasSidecar
+   module = "stand-alone" + hasSidecar: true → step-07b-build-expert.md
+   module = "stand-alone" + hasSidecar: false → step-07a-build-simple.md
    ```
 
 5. **NEVER Skip Documentation**
@@ -129,7 +131,9 @@ routing:
 - Expert agents: Sidecar + stand-alone module
 - Module agents: Sidecar + parent module integration
 
-# EXECUTION SEQUENCE
+## MANDATORY SEQUENCE
+
+**CRITICAL:** Follow this sequence exactly. Do not skip, reorder, or improvise unless user explicitly requests a change.
 
 ## 1. Load Reference Documents
 ```bash

package/src/modules/bmb/workflows/agent/steps-c/step-07a-build-simple.md

@@ -1,9 +1,9 @@
 ---
-name: 'step-06-build-simple'
+name: 'step-07a-build-simple'
 description: 'Generate Simple agent YAML from plan'
 
 # File References
-nextStepFile: './step-08a-plan-traceability.md'
+nextStepFile: './step-08-celebrate.md'
 agentPlan: '{bmb_creations_output_folder}/agent-plan-{agent_name}.md'
 agentBuildOutput: '{bmb_creations_output_folder}/{agent-name}.agent.yaml'
 
@@ -60,7 +60,9 @@ Assemble the agent plan content into a Simple agent YAML configuration using the
 - Template placeholders (replace with actual content)
 - Comments or notes in final YAML
 
-## EXECUTION SEQUENCE
+## MANDATORY SEQUENCE
+
+**CRITICAL:** Follow this sequence exactly. Do not skip, reorder, or improvise unless user explicitly requests a change.
 
 ### 1. Load Template and Architecture Files
 
@@ -141,7 +143,7 @@ Display: "**Select an Option:** [A] Advanced Elicitation [P] Party Mode [C] Cont
 ### 6. Route Based on User Choice
 
 **If user chooses "one-at-a-time":**
-- Proceed to `nextStepFile` (step-07a-plan-traceability.md)
+- Proceed to `nextStepFile` (step-08-celebrate.md)
 - Continue through each validation step sequentially
 - Allow review between each validation
 
@@ -153,7 +155,7 @@ Display: "**Select an Option:** [A] Advanced Elicitation [P] Party Mode [C] Cont
 
 ## CRITICAL STEP COMPLETION NOTE
 
-ONLY WHEN [C continue option] is selected and [complete YAML generated and written to output], will you then load and read fully `{nextStepFile}` to execute and begin validation.
+ONLY WHEN [C continue option] is selected and [complete YAML generated and written to output], will you then load and read fully `{nextStepFile}` to execute and celebrate completion.
 
 ## SUCCESS METRICS
 

package/src/modules/bmb/workflows/agent/steps-c/step-07b-build-expert.md

@@ -3,7 +3,7 @@ name: 'step-06-build-expert'
 description: 'Generate Expert agent YAML with sidecar from plan'
 
 # File References
-nextStepFile: './step-08a-plan-traceability.md'
+nextStepFile: './step-08-celebrate.md'
 agentPlan: '{bmb_creations_output_folder}/agent-plan-{agent_name}.md'
 agentBuildOutput: '{bmb_creations_output_folder}/{agent-name}/'
 agentYamlOutput: '{bmb_creations_output_folder}/{agent-name}/{agent-name}.agent.yaml'
@@ -21,12 +21,12 @@ partyModeWorkflow: '{project-root}/_bmad/core/workflows/party-mode/workflow.md'
 
 # STEP GOAL
 
-Assemble the agent plan content into a complete Expert agent YAML file with sidecar folder structure. Expert agents require persistent memory storage for specialized operations, accessed via `{project-root}/_bmad/_memory/{sidecar-folder}/` paths in critical_actions.
+Assemble the agent plan content into a complete Expert agent YAML file with sidecar folder structure. Expert agents require persistent memory storage, so the build creates a sidecar folder next to the agent.yaml (which gets installed to `_bmad/_memory/` during BMAD installation).
 
 ## MANDATORY EXECUTION RULES
 
-1. **EXPERT AGENT = SIDECAR REQUIRED**: Every Expert agent MUST have a sidecar folder created under `_bmad/_memory/`
-2. **CRITICAL_ACTIONS FORMAT**: All critical_actions MUST use `{project-root}/_bmad/_memory/{sidecar-folder}/` for file operations
+1. **EXPERT AGENT = SIDECAR REQUIRED**: Every Expert agent MUST have a sidecar folder created next to agent.yaml (build location), which will be installed to `_bmad/_memory/` during BMAD installation
+2. **CRITICAL_ACTIONS FORMAT**: All critical_actions MUST use `{project-root}/_bmad/_memory/{sidecar-folder}/` for file operations (runtime path)
 3. **TEMPLATE COMPLIANCE**: Follow expert-agent-template.md structure exactly
 4. **YAML VALIDATION**: Ensure valid YAML syntax with proper indentation (2-space)
 5. **EXISTING CHECK**: If agentYamlOutput exists, ask user before overwriting
@@ -55,8 +55,6 @@ Using expertTemplate as structure:
 ```yaml
 name: '{agent-name}'
 description: '{short-description}'
-type: 'expert'
-version: '1.0.0'
 
 author:
   name: '{author}'
@@ -109,19 +107,20 @@ metadata:
 
 ### Phase 4: Create Sidecar Structure
 
-1. **Create Sidecar Directory**:
-   - Path: `{project-root}/_bmad/_memory/{sidecar-folder}/`
+1. **Create Sidecar Directory** (NEXT TO agent.yaml):
+   - Path: `{agentBuildOutput}/{agent-name}-sidecar/`
    - Use `mkdir -p` to create full path
+   - Note: This folder gets installed to `_bmad/_memory/` during BMAD installation
 
 2. **Create Starter Files** (if specified in critical_actions):
    ```bash
-   touch _bmad/_memory/{sidecar-folder}/{file1}.md
-   touch _bmad/_memory/{sidecar-folder}/{file2}.md
+   touch {agentBuildOutput}/{agent-name}-sidecar/{file1}.md
+   touch {agentBuildOutput}/{agent-name}-sidecar/{file2}.md
    ```
 
 3. **Add README to Sidecar**:
    ```markdown
-   # {sidecar-folder} Memory
+   # {sidecar-folder} Sidecar
 
    This folder stores persistent memory for the **{agent-name}** Expert agent.
 
@@ -132,8 +131,9 @@ metadata:
    - {file1}.md: {description}
    - {file2}.md: {description}
 
-   ## Access Pattern
-   Agent accesses these files via: `{project-root}/_bmad/_memory/{sidecar-folder}/{filename}.md`
+   ## Runtime Access
+   After BMAD installation, this folder will be accessible at:
+   `{project-root}/_bmad/_memory/{sidecar-folder}/{filename}.md`
    ```
 
 ### Phase 5: Write Agent YAML
@@ -171,11 +171,11 @@ Display: "**Select an Option:** [A] Advanced Elicitation [P] Party Mode [C] Cont
 
 ## CRITICAL STEP COMPLETION NOTE
 
-ONLY WHEN [C continue option] is selected and [complete YAML generated and written to output], will you then load and read fully `{nextStepFile}` to execute and begin validation.
+ONLY WHEN [C continue option] is selected and [complete YAML generated and written to output], will you then load and read fully `{nextStepFile}` to execute and celebrate completion.
 
 This step produces TWO artifacts:
 1. **Agent YAML**: Complete expert agent definition at `{agentYamlOutput}`
-2. **Sidecar Structure**: Folder and files at `{project-root}/_bmad/_memory/{sidecar-folder}/`
+2. **Sidecar Structure**: Folder and files at `{agentBuildOutput}/{agent-name}-sidecar/` (build location, installs to `_bmad/_memory/` during BMAD installation)
 
 Both must exist before proceeding to validation.
 
@@ -184,7 +184,7 @@ Both must exist before proceeding to validation.
 ✅ Agent YAML file created at expected location
 ✅ Valid YAML syntax (no parse errors)
 ✅ All template fields populated
-✅ Sidecar folder created under `_bmad/_memory/`
+✅ Sidecar folder created at `{agentBuildOutput}/{agent-name}-sidecar/` (build location)
 ✅ Sidecar folder contains starter files from critical_actions
 ✅ critical_actions reference `{project-root}/_bmad/_memory/{sidecar-folder}/` paths
 ✅ metadata.sidecar-folder populated

package/src/modules/bmb/workflows/agent/steps-c/step-07c-build-module.md

@@ -3,7 +3,7 @@ name: 'step-06-build-module'
 description: 'Generate Module agent YAML from plan'
 
 # File References
-nextStepFile: './step-08a-plan-traceability.md'
+nextStepFile: './step-08-celebrate.md'
 agentPlan: '{bmb_creations_output_folder}/agent-plan-{agent_name}.md'
 agentBuildOutput: '{bmb_creations_output_folder}/{agent-name}/'
 agentYamlOutput: '{bmb_creations_output_folder}/{agent-name}/{agent-name}.agent.yaml'
@@ -205,7 +205,7 @@ Display: "**Select an Option:** [A] Advanced Elicitation [P] Party Mode [C] Cont
 
 # CRITICAL STEP COMPLETION NOTE
 
-ONLY WHEN [C continue option] is selected and [complete YAML generated and written to output], will you then load and read fully `{nextStepFile}` to execute and begin validation.
+ONLY WHEN [C continue option] is selected and [complete YAML generated and written to output], will you then load and read fully `{nextStepFile}` to execute and celebrate completion.
 
 **THIS STEP IS COMPLETE WHEN:**
 1. Module agent YAML file exists at agentYamlOutput path

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

@@ -1,9 +1,9 @@
 ---
-name: 'step-09-celebrate'
+name: 'step-08-celebrate'
 description: 'Celebrate completion and guide next steps for using the agent'
 
 # File References
-thisStepFile: ./step-09-celebrate.md
+thisStepFile: ./step-08-celebrate.md
 workflowFile: ../workflow.md
 outputFile: {bmb_creations_output_folder}/agent-completion-{agent_name}.md
 
@@ -11,9 +11,10 @@ outputFile: {bmb_creations_output_folder}/agent-completion-{agent_name}.md
 advancedElicitationTask: '{project-root}/_bmad/core/workflows/advanced-elicitation/workflow.xml'
 partyModeWorkflow: '{project-root}/_bmad/core/workflows/party-mode/workflow.md'
 installationDocs: 'https://github.com/bmad-code-org/BMAD-METHOD/blob/main/docs/modules/bmb-bmad-builder/custom-content-installation.md#standalone-content-agents-workflows-tasks-tools-templates-prompts'
+validationWorkflow: '{project-root}/src/modules/bmb/workflows/agent/steps-v/v-01-load-review.md'
 ---
 
-# Step 9: Celebration and Installation Guidance
+# Step 8: Celebration and Installation Guidance
 
 ## STEP GOAL:
 
@@ -59,7 +60,9 @@ Celebrate the successful agent creation, recap the agent's capabilities, provide
 - Limits: No agent modifications, only installation guidance and celebration
 - Dependencies: Complete agent ready for installation
 
-## Sequence of Instructions (Do not deviate, skip, or optimize)
+## MANDATORY SEQUENCE
+
+**CRITICAL:** Follow this sequence exactly. Do not skip, reorder, or improvise unless user explicitly requests a change. (Do not deviate, skip, or optimize)
 
 ### 1. Grand Celebration
 
@@ -196,25 +199,27 @@ Save this content to `{outputFile}` for reference.
 
 ### 7. Present MENU OPTIONS
 
-Display: "**Select an Option:** [A] Advanced Elicitation [P] Party Mode [X] Exit Workflow"
+Display: "**✅ Agent Build Complete! Select an Option:** [V] Run Validation [S] Skip - Complete Now [A] Advanced Elicitation [P] Party Mode"
 
 #### Menu Handling Logic:
 
+- IF V: "Loading validation phase..." → Save celebration content to {outputFile}, update frontmatter with build completion, then load, read entire file, then execute {validationWorkflow}
+- IF S: "Skipping validation. Completing workflow..." → Save content to {outputFile}, update frontmatter with workflow completion, then end workflow gracefully
 - IF A: Execute {advancedElicitationTask}, and when finished redisplay the menu
 - IF P: Execute {partyModeWorkflow}, and when finished redisplay the menu
-- IF X: Save content to {outputFile}, update frontmatter with workflow completion, then end workflow gracefully
 - IF Any other comments or queries: help user respond then [Redisplay Menu Options](#7-present-menu-options)
 
 #### EXECUTION RULES:
 
 - ALWAYS halt and wait for user input after presenting menu
-- ONLY complete workflow when user selects 'X'
-- After other menu items execution, return to this menu
+- User can choose validation (V), skip to complete (S), or use advanced elicitation (A) or party mode (P)
+- After other menu items execution (A/P), return to this menu
 - User can chat or ask questions - always respond and then end with display again of the menu options
 
 ## CRITICAL STEP COMPLETION NOTE
 
-ONLY WHEN [X exit option] is selected and [workflow completion marked in frontmatter], will the workflow end gracefully with agent ready for installation.
+ONLY WHEN [S skip option] is selected and [workflow completion marked in frontmatter], will the workflow end gracefully with agent ready for installation.
+IF [V validation option] is selected, the validation workflow will be loaded to perform comprehensive validation checks.
 
 ---
 

package/src/modules/bmb/workflows/agent/steps-e/e-01-load-existing.md

@@ -59,7 +59,9 @@ Load the existing agent file, parse its structure, and create an edit plan track
 - Limits: Analysis only, no modifications
 - Dependencies: Agent file must exist and be valid YAML
 
-## Sequence of Instructions (Do not deviate, skip, or optimize)
+## MANDATORY SEQUENCE
+
+**CRITICAL:** Follow this sequence exactly. Do not skip, reorder, or improvise unless user explicitly requests a change.
 
 ### 1. Load Agent File
 
@@ -74,14 +76,20 @@ Expected format: `{path-to-agent}/{agent-name}.agent.yaml`"
 
 ### 2. Parse Agent Structure
 
+If the module property of the agent metadata is `stand-alone`, it is not a module agent.
+If the module property of the agent is a module code (like bmm, bmb, etc...) it is a module agent.
+If the property hasSidecar: true exists in the metadata, then it is an expert agent.
+Else it is a simple agent.
+If a module agent also hasSidecar: true - this means it is a modules expert agent, thus it can have sidecar.
+
 **Extract and categorize all agent components:**
 
 ```yaml
 # Basic Metadata
 - name: {agent-name}
 - description: {agent-description}
-- type: {simple|expert|module}
-- version: {version}
+- module: {stand-alone|bmm|cis|bmgd|custom}
+- hasSidecar: {true|false}
 
 # Persona
 - persona: {full persona text}
@@ -104,8 +112,7 @@ Expected format: `{path-to-agent}/{agent-name}.agent.yaml`"
 ```markdown
 ## Agent Analysis: {agent-name}
 
-**Type:** {simple|expert|module}
-**Version:** {version}
+**Type:** {simple|expert|module}  (derived from module + hasSidecar)
 **Status:** ready-for-edit
 
 ### Current Structure:

package/src/modules/bmb/workflows/agent/steps-e/e-02-discover-edits.md

@@ -2,7 +2,7 @@
 name: 'e-02-discover-edits'
 description: 'Discover what user wants to change about the agent'
 
-nextStepFile: './e-03a-validate-metadata.md'
+nextStepFile: './e-04-type-metadata.md'
 editPlan: '{bmb_creations_output_folder}/edit-plan-{agent-name}.md'
 
 advancedElicitationTask: '{project-root}/_bmad/core/workflows/advanced-elicitation/workflow.xml'
@@ -54,7 +54,9 @@ Conduct targeted discovery to understand exactly what the user wants to change a
 - Limits: Discovery and documentation only, no implementation
 - Dependencies: Agent must be loaded in editPlan
 
-## Sequence of Instructions (Do not deviate, skip, or optimize)
+## MANDATORY SEQUENCE
+
+**CRITICAL:** Follow this sequence exactly. Do not skip, reorder, or improvise unless user explicitly requests a change.
 
 ### 1. Read Edit Plan Context
 
@@ -168,7 +170,7 @@ Display: "**Select an Option:** [A] Advanced Elicitation [P] Party Mode [C] Cont
 
 ## CRITICAL STEP COMPLETION NOTE
 
-ONLY WHEN [C continue option] is selected and [all edits documented and confirmed by user], will you then load and read fully `{nextStepFile}` to execute and begin validation.
+ONLY WHEN [C continue option] is selected and [all edits documented and confirmed by user], will you then load and read fully `{nextStepFile}` to execute and checks.
 
 ---
 

package/src/modules/bmb/workflows/agent/steps-e/e-03-placeholder.md

@@ -0,0 +1 @@
+# Placeholder - do not load this step.

package/src/modules/bmb/workflows/agent/steps-e/e-04-type-metadata.md

@@ -36,7 +36,9 @@ Review the agent's type and metadata, and plan any changes. If edits involve typ
 - 💾 Document planned metadata changes
 - 🚫 FORBIDDEN to proceed without documenting changes
 
-## Sequence of Instructions:
+## MANDATORY SEQUENCE
+
+**CRITICAL:** Follow this sequence exactly. Do not skip, reorder, or improvise unless user explicitly requests a change.
 
 ### 1. Load Reference Documents
 

package/src/modules/bmb/workflows/agent/steps-e/e-05-persona.md

@@ -37,7 +37,9 @@ Review the agent's persona and plan any changes using the four-field persona sys
 - 💾 Document planned persona changes
 - 🚫 FORBIDDEN to proceed without documenting changes
 
-## Sequence of Instructions:
+## MANDATORY SEQUENCE
+
+**CRITICAL:** Follow this sequence exactly. Do not skip, reorder, or improvise unless user explicitly requests a change.
 
 ### 1. Load Reference Documents
 

package/src/modules/bmb/workflows/agent/steps-e/e-06-commands-menu.md

@@ -35,7 +35,9 @@ Review the agent's command menu and plan any additions, modifications, or remova
 - 💾 Document planned command changes
 - 🚫 FORBIDDEN to proceed without documenting changes
 
-## Sequence of Instructions:
+## MANDATORY SEQUENCE
+
+**CRITICAL:** Follow this sequence exactly. Do not skip, reorder, or improvise unless user explicitly requests a change.
 
 ### 1. Load Reference Documents
 

package/src/modules/bmb/workflows/agent/steps-e/e-07-activation.md

@@ -39,7 +39,9 @@ Review critical_actions and route to the appropriate type-specific edit step (Si
 - 💾 Route to appropriate type-specific edit step
 - ➡️ Auto-advance to type-specific edit on [C]
 
-## Sequence of Instructions:
+## MANDATORY SEQUENCE
+
+**CRITICAL:** Follow this sequence exactly. Do not skip, reorder, or improvise unless user explicitly requests a change.
 
 ### 1. Load Reference Documents
 
@@ -56,12 +58,13 @@ If user wants to add/modify critical_actions:
 
 ### 3. Determine Routing
 
-Check `{editPlan}` metadataEdits.typeConversion.to or current agentType:
+Check `{editPlan}` for agent metadata (module and hasSidecar):
 
 ```yaml
-agentType: simple → route to e-08a-edit-simple.md
-agentType: expert → route to e-08b-edit-expert.md
-agentType: module → route to e-08c-edit-module.md
+# Determine agent type from module + hasSidecar combination
+module ≠ "stand-alone" → route to e-08c-edit-module.md
+module = "stand-alone" + hasSidecar: true → route to e-08b-edit-expert.md
+module = "stand-alone" + hasSidecar: false → route to e-08a-edit-simple.md
 ```
 
 ### 4. Document to Edit Plan
@@ -75,7 +78,7 @@ activationEdits:
     modifications: []
 routing:
   destinationEdit: {e-08a|e-08b|e-08c}
-  targetType: {simple|expert|module}
+  sourceType: {simple|expert|module}  # Derived from module + hasSidecar
 ```
 
 ### 5. Present MENU OPTIONS
@@ -86,7 +89,7 @@ Display: "**Select an Option:** [A] Advanced Elicitation [P] Party Mode [C] Cont
 
 - IF A: Execute {advancedElicitationTask}, and when finished redisplay the menu
 - IF P: Execute {partyModeWorkflow}, and when finished redisplay the menu
-- IF C: Save to {editPlan}, determine routing based on targetType, then only then load and execute the appropriate type-specific edit step
+- IF C: Save to {editPlan}, determine routing based on module + hasSidecar, then only then load and execute the appropriate type-specific edit step
 - IF Any other comments or queries: help user respond then [Redisplay Menu Options](#5-present-menu-options)
 
 #### EXECUTION RULES:
@@ -99,9 +102,9 @@ Display: "**Select an Option:** [A] Advanced Elicitation [P] Party Mode [C] Cont
 
 This is the **ROUTING HUB** for edit flow. ONLY WHEN [C continue option] is selected and [routing determined], load and execute the appropriate type-specific edit step:
 
-- targetType: simple → e-08a-edit-simple.md
-- targetType: expert → e-08b-edit-expert.md
-- targetType: module → e-08c-edit-module.md
+- module ≠ "stand-alone" → e-08c-edit-module.md (Module agent)
+- module = "stand-alone" + hasSidecar: true → e-08b-edit-expert.md (Expert agent)
+- module = "stand-alone" + hasSidecar: false → e-08a-edit-simple.md (Simple agent)
 
 ---
 

package/src/modules/bmb/workflows/agent/steps-e/e-08a-edit-simple.md

@@ -2,7 +2,7 @@
 name: 'e-08a-edit-simple'
 description: 'Apply edits to Simple agent'
 
-nextStepFile: './e-09a-validate-metadata.md'
+nextStepFile: './e-09-celebrate.md'
 editPlan: '{bmb_creations_output_folder}/edit-plan-{agent-name}.md'
 agentFile: '{original-agent-path}'
 agentBackup: '{original-agent-path}.backup'
@@ -47,7 +47,9 @@ Apply all planned edits to the Simple agent YAML file using templates and archit
 - ✅ Validate YAML syntax
 - ➡️ Auto-advance to next validation step
 
-## Sequence of Instructions:
+## MANDATORY SEQUENCE
+
+**CRITICAL:** Follow this sequence exactly. Do not skip, reorder, or improvise unless user explicitly requests a change.
 
 ### 1. Load Reference Documents
 
@@ -74,9 +76,10 @@ Confirm: "Backup created at: `{agentBackup}`"
 
 For each planned edit:
 
-**Type Conversion:**
-- Update `type:` field if converting
-- Add/remove type-specific fields
+**Type Conversion (Simple ← Expert/Module):**
+- Converting TO Simple: Remove `metadata.sidecar-folder`, remove all sidecar references
+- Set `module: stand-alone` and `hasSidecar: false`
+- Remove type-specific fields from source type
 
 **Metadata Edits:**
 - Apply each field change from metadataEdits