Merge branch 'main' into tech/ignoring-web-bundles

.vscode/settings.json

@@ -21,6 +21,7 @@
     "Decisioning",
     "eksctl",
     "elicitations",
+    "Excalidraw",
     "filecomplete",
     "fintech",
     "fluxcd",

CHANGELOG.md

@@ -2,6 +2,227 @@
 
 ## [Unreleased]
 
+## [6.0.0-alpha.10]
+
+**Release: November 16, 2025**
+
+This alpha release introduces a new specialized agent for visual diagramming, major epic creation workflow improvements, platform-specific filtering capabilities, and critical time estimate prohibition guidance across all workflows.
+
+### 🎯 MAJOR MILESTONE: Epics & Stories Now Generated AFTER Architecture
+
+**A Key v6 Goal Realized!**
+
+One of the most important goals for BMad Method v6 has been achieved: **epic and story generation now occurs AFTER architecture completion** in the full BMad Method flow.
+
+**Why This Matters:**
+
+- Stories are now **technically informed** - they reference actual architectural decisions, patterns, and constraints
+- No more architectural surprises mid-implementation - stories already account for the chosen tech stack
+- Better story estimation (complexity-based, not time-based) because technical approach is known
+- Acceptance criteria can reference specific architectural patterns and integration points
+- Reduces story rewrites that previously occurred when architecture revealed new complexity
+
+**Workflow Sequence (Full BMad Method):**
+
+```
+PRD → UX Design → Architecture → Epics & Stories
+                                      ↑
+                               NOW HERE (informed by all prior context)
+```
+
+**Flexibility Preserved:**
+
+You can still generate epics at earlier stages if your project requires it:
+
+- After PRD (basic structure, feature-focused)
+- After UX Design (with interaction context)
+- After Architecture (RECOMMENDED - fully informed)
+
+The workflow now supports progressive enhancement, allowing you to create basic epics early and enrich them as more context becomes available. However, for most projects, **waiting until after architecture completion** produces the highest quality, most actionable stories.
+
+This represents a fundamental shift from "plan everything upfront" to "plan informed by technical reality."
+
+### 🎨 New Agent Saif the Frame Expert (Excalidraw Specialist)
+
+Thank you Saif for the new initial addition of this new agent, that will soon be further integrated into other workflows for the BMad Method and the CIS. This works great also if you install the excalidraw VSCode plugin to view the files easily.
+
+**Visual Diagramming Specialist:**
+
+- New frame-expert agent specialized in Excalidraw visual representations - use this agent or the workflows at any point to produce architcure visualizations, mock ups, visual ideas to share with the other agents and so much more. Many udpates will come to further integrate this powerful tool.
+- **Four specialized workflows:**
+  - `create-flowchart` - Process flow visualization
+  - `create-diagram` - General architectural diagrams
+  - `create-dataflow` - Data flow and pipeline visualization
+  - `create-wireframe` - UI/UX wireframe creation
+- Includes shared Excalidraw helpers, templates, and validation
+- Integrated into default-party.csv and team-fullstack configurations
+- Icon: 📐 with webskip flag for IDE-only functionality
+
+### 🚀 Epic Creation Workflow Revolution
+
+**User-Value Focused Epic Structure:**
+
+- Added comprehensive principles for user-value focused epic breakdown
+- Explicit anti-pattern examples showing wrong vs right epic structure
+- **NO technical layer breakdown** - epics must deliver user value
+- Multi-mode detection: CONTINUE, REPLACE, or UPDATE existing epics
+- Epics now created AFTER architecture for technically-informed story breakdown
+- Added checkpoint protocol for interactive workflow progression
+
+**Progressive Enhancement Pattern:**
+
+- Intelligent UPDATE vs CREATE mode detection
+- Detects available context (UX, Architecture, Domain brief, Product brief)
+- Living document approach with continuous updates
+- Creates basic epics, then enriches with UX/Architecture context
+
+### ⏰ Time Estimate Prohibition (Critical Update)
+
+**AI-Age Development Reality:**
+
+- Added **critical warnings** against providing ANY time estimates (hours/days/weeks/months)
+- Applied across **33 workflow instruction files** in BMB, BMGD, BMM, and CIS modules
+- Acknowledges AI has fundamentally changed development speed
+- Updated workflow creation guide with prohibition guidelines
+- Recognizes traditional estimation methods are obsolete in AI-augmented development
+
+**Rationale:** Time estimates based on pre-AI development patterns are actively harmful and misleading. AI-driven development exhibits non-linear productivity patterns that make traditional estimation unreliable.
+
+### 🎯 Platform-Specific Command Filtering
+
+**IDE-Only and Web-Only Support:**
+
+- New `ide-only` and `web-only` boolean fields in agent menu schema
+- Menu items filtered based on build target (web bundle vs local IDE)
+- Examples:
+  - `workflow-init` and `correct-course` marked as IDE-only
+  - `advanced-elicitation` marked as web-only
+- Enables platform-appropriate functionality across different environments
+
+**Agent Updates:**
+
+- PM: workflow-init and correct-course as ide-only
+- UX Designer: Renamed trigger to create-ux-design
+- SM: Renamed triggers for consistency (story-context → create-story-context)
+- Analyst: Added research workflow after brainstorm
+- Architect: Removed document field from validate-architecture
+- Dev: Updated persona and critical actions for clarity
+- Tech-writer: Added party-mode workflow
+- All agents: Standardized party-mode descriptions
+
+### 🔧 Agent Customization Enhancement
+
+**Prompts and Memories Merging:**
+
+- Added merging logic for `customizeYaml.prompts` and `customizeYaml.memories` in agent loading
+- New `buildMemoriesXml()` method for XML output
+- Updated `buildPromptsXml()` to use `<content>` wrapper for better compatibility
+- Memories output integrated between persona and prompts sections
+- Users can now customize agents via `bmad/_cfg/agents/*.customize.yaml` with:
+  - `prompts`: Array of {id, content} objects for action handlers
+  - `memories`: Array of strings for persistent agent memories
+
+### 📋 Workflow Configuration Standardization
+
+**Input File Patterns Cleanup:**
+
+- Removed 32 `recommended_inputs:` sections (redundant with input_file_patterns)
+- Added `description:` fields to all input_file_patterns (25 workflows)
+- Added missing `load_strategy` fields (5 workflows)
+- Fixed BMB workflows with proper reference doc variables
+- Updated BMB instructions to use new variables
+
+**Workflow Path Enhancements:**
+
+- Updated all 4 workflow paths (enterprise/method × brownfield/greenfield)
+- Added multiple optional epic creation steps at different phases:
+  - After PRD (basic structure)
+  - After UX Design (with interaction context)
+  - After Architecture (final with full context)
+- Changed PRD output description from "with epics and stories" to "with FRs and NFRs"
+
+### 🗂️ Documentation & Architecture Updates
+
+**Solutioning Gate Check Removal:**
+
+- Deleted entire solutioning-gate-check workflow (682 lines)
+- Replaced by new implementation-readiness pattern
+- Cleaner separation of concerns in solutioning phase
+
+**PRD Template Simplification:**
+
+- Removed hardcoded "Implementation Planning", "References", and "Next Steps" sections
+- PRD now focuses purely on requirements, not workflow orchestration
+- Epics/stories created as separate step after architecture
+
+**Documentation Overhaul:**
+
+- 15+ documentation files updated across modules
+- Updated quick-start guide with v6 workflow sequence
+- Clarified that epics are created AFTER architecture, not during PRD
+- Updated solutioning docs to reflect implementation-readiness pattern
+- Improved agents-guide, brownfield-guide, enterprise docs
+- Enhanced glossary, FAQ, and workflow reference documentation
+
+### 🐛 Bug Fixes & Installer Improvements
+
+**Critical Fixes:**
+
+- Fixed installer blocking issues when folder name is changed during install
+- Updated file paths in agent and workflow configurations to use `{bmad_folder}` variable (#917)
+- Fixed shard-doc to use proper command for markdown-tree-parser (#911)
+- PRD workflow now properly uses project-types CSV
+- Web bundler fixes and bundle link updates in documentation
+
+**Architecture Workflow:**
+
+- Made epics input optional (falls back to PRD FRs)
+- Updated innovation strategy phases to remove time-based language
+- Phases now: Immediate Impact → Foundation Building → Scale & Optimization
+
+### 📊 Impact Summary
+
+- **65+ files modified** across all modules
+- **682 lines removed** from deprecated solutioning-gate-check workflow
+- **33 instruction files** updated with time estimate prohibition
+- **4 new workflows** added for frame-expert agent
+- **32 recommended_inputs sections** cleaned up for standardization
+- **Net reduction of ~500+ lines** through consolidation and cleanup
+
+### ⚠️ Breaking Changes
+
+**Workflow Changes:**
+
+- Solutioning-gate-check workflow removed (replaced by implementation-readiness)
+- PRD no longer includes epic/story generation (separate workflow step)
+- Some workflow triggers renamed for consistency
+
+**Variable Updates:**
+
+- Agent and workflow configurations now require `{bmad_folder}` variable support
+- PRD output format changed (FRs and NFRs focus, not epics/stories)
+
+### 🔄 Migration Notes
+
+**For Existing Projects:**
+
+1. **Epic Creation:** Epics are now created as a separate workflow step AFTER architecture
+   - Update any automation scripts that expected epics in PRD output
+   - Use `create-epics-and-stories` workflow explicitly
+
+2. **Time Estimates:** Focus on value delivery, not time predictions
+
+3. **Agent Customization:** New customization options available
+   - Add memories via `*.customize.yaml` files
+   - Custom prompts can extend agent capabilities
+
+4. **Platform-Specific Commands:** Some commands now platform-restricted
+   - workflow-init only available in IDE environments
+
+5. **Frame Expert:** New agent available for visual diagramming
+   - Install/reinstall to get new workflows
+   - Four specialized Excalidraw workflows available
+
 ## [6.0.0-alpha.9]
 
 **Release: November 12, 2025**

docs/document-sharding-guide.md

@@ -176,10 +176,11 @@ Workflows load entire sharded documents:
 - `product-brief` - Research, brainstorming docs
 - `prd` - Product brief, research
 - `gdd` - Game brief, research
-- `create-ux-design` - PRD, brief, epics
+- `create-ux-design` - PRD, brief, architecture (if available)
 - `tech-spec` - Brief, research
-- `architecture` - PRD, epics, UX design
+- `architecture` - PRD, UX design (if available)
-- `solutioning-gate-check` - All planning docs
+- `create-epics-and-stories` - PRD, architecture
+- `implementation-readiness` - All planning docs
 
 #### Phase 4 (Selective Load)
 
@@ -284,8 +285,8 @@ input_file_patterns:
 
 ```
 Every workflow loads entire 45k token PRD
-Epic-tech-context for Epic 3: 45k tokens
+Architecture workflow: 45k tokens
-Create-story for Epic 3: 45k tokens
+UX design workflow: 45k tokens
 ```
 
 **After Sharding:**
@@ -298,17 +299,18 @@ Destination: docs/prd/
 Created:
   prd/index.md
   prd/overview.md (3k tokens)
-  prd/epic-1-auth.md (3k tokens)
+  prd/functional-requirements.md (8k tokens)
-  prd/epic-2-dashboard.md (3k tokens)
+  prd/non-functional-requirements.md (6k tokens)
-  prd/epic-3-reports.md (3k tokens)
+  prd/user-personas.md (4k tokens)
-  ...15 epic files
+  ...additional FR/NFR sections
 ```
 
 **Result:**
 
 ```
-Epic-tech-context for Epic 3: 3k tokens (93% reduction!)
+Architecture workflow: Can load specific sections needed
-Create-story for Epic 3: 3k tokens (93% reduction!)
+UX design workflow: Can load specific sections needed
+Significant token reduction for large requirement docs!
 ```
 
 ### Example 2: Sharding Epics File

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "bmad-method",
-  "version": "6.0.0-alpha.6",
+  "version": "6.0.0-alpha.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "bmad-method",
-      "version": "6.0.0-alpha.6",
+      "version": "6.0.0-alpha.10",
       "license": "MIT",
       "dependencies": {
         "@kayvan/markdown-tree-parser": "^1.6.1",

package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "bmad-method",
-  "version": "6.0.0-alpha.9",
+  "version": "6.0.0-alpha.10",
   "description": "Breakthrough Method of Agile AI-driven Development",
   "keywords": [
     "agile",

src/modules/bmb/workflows/create-workflow/workflow-creation-guide.md

@@ -1088,7 +1088,7 @@ input_file_patterns:
     sharded: '{output_folder}/*architecture*/index.md'
 
   document_project:
-    sharded: '{output_folder}/docs/index.md' # Brownfield always uses index
+    sharded: '{output_folder}/index.md' # Brownfield always uses index
 ```
 
 #### 2. Add Discovery Instructions to instructions.md
@@ -1108,7 +1108,7 @@ This workflow requires: [list required documents]
    - Read `index.md` to understand the document structure
    - Read ALL section files listed in the index (or specific sections for selective load)
    - Treat the combined content as if it were a single document
-4. **Brownfield projects**: The `document-project` workflow creates `{output_folder}/docs/index.md`
+4. **Brownfield projects**: The `document-project` workflow creates `{output_folder}/index.md`
 
 **Priority**: If both whole and sharded versions exist, use the whole document.
 

src/modules/bmgd/workflows/1-preproduction/brainstorm-game/instructions.md

@@ -3,6 +3,7 @@
 <critical>Communicate all responses in {communication_language}</critical>
 <critical>This is a meta-workflow that orchestrates the CIS brainstorming workflow with game-specific context and additional game design techniques</critical>
 <critical>⚠️ ABSOLUTELY NO TIME ESTIMATES - NEVER mention hours, days, weeks, months, or ANY time-based predictions. AI has fundamentally changed development speed - what once took teams weeks/months can now be done by one person in hours. DO NOT give ANY time estimates whatsoever.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <workflow>
 

src/modules/bmgd/workflows/1-preproduction/game-brief/instructions.md

@@ -7,6 +7,7 @@
 <critical>⚠️ ABSOLUTELY NO TIME ESTIMATES - NEVER mention hours, days, weeks, months, or ANY time-based predictions. AI has fundamentally changed development speed - what once took teams weeks/months can now be done by one person in hours. DO NOT give ANY time estimates whatsoever.</critical>
 
 <critical>DOCUMENT OUTPUT: Concise, professional, game-design focused. Use tables/lists over prose. User skill level ({user_skill_level}) affects conversation style ONLY, not document content.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <workflow>
 

src/modules/bmgd/workflows/2-design/gdd/instructions-gdd.md

@@ -13,6 +13,7 @@
 <critical>If users mention technical details, append to technical_preferences with timestamp</critical>
 
 <critical>DOCUMENT OUTPUT: Concise, clear, actionable game design specs. Use tables/lists over prose. User skill level ({user_skill_level}) affects conversation style ONLY, not document content.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 ## Input Document Discovery
 
@@ -26,7 +27,7 @@ This workflow requires: game brief, and may reference market research or brownfi
    - Read `index.md` to understand the document structure
    - Read ALL section files listed in the index
    - Treat the combined content as if it were a single document
-4. **Brownfield projects**: The `document-project` workflow always creates `{output_folder}/docs/index.md`
+4. **Brownfield projects**: The `document-project` workflow always creates `{output_folder}/index.md`
 
 **Priority**: If both whole and sharded versions exist, use the whole document.
 

src/modules/bmgd/workflows/2-design/gdd/workflow.yaml

@@ -41,7 +41,7 @@ input_file_patterns:
 
   document_project:
     description: "Brownfield project documentation (optional)"
-    sharded: "{output_folder}/docs/index.md"
+    sharded: "{output_folder}/index.md"
     load_strategy: "INDEX_GUIDED"
 
 standalone: true

src/modules/bmgd/workflows/2-design/narrative/instructions-narrative.md

@@ -9,6 +9,7 @@
 <critical>Uses narrative_template for output</critical>
 <critical>If users mention gameplay mechanics, note them but keep focus on narrative</critical>
 <critical>Facilitate good brainstorming techniques throughout with the user, pushing them to come up with much of the narrative you will help weave together. The goal is for the user to feel that they crafted the narrative and story arc unless they push you to do it all or indicate YOLO</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <step n="0" goal="Check for workflow status" tag="workflow-status">
 <action>Check if {output_folder}/bmm-workflow-status.yaml exists</action>

src/modules/bmgd/workflows/3-technical/game-architecture/checklist.md

@@ -2,7 +2,7 @@
 
 **Purpose**: Validate the architecture document itself is complete, implementable, and provides clear guidance for AI agents.
 
-**Note**: This checklist validates the ARCHITECTURE DOCUMENT only. For cross-workflow validation (PRD → Architecture → Stories alignment), use the solutioning-gate-check workflow.
+**Note**: This checklist validates the ARCHITECTURE DOCUMENT only. For cross-workflow validation (PRD → Architecture → Stories alignment), use the implementation-readiness workflow.
 
 ---
 
@@ -233,8 +233,8 @@
 
 ---
 
-**Next Step**: Run the **solutioning-gate-check** workflow to validate alignment between PRD, Architecture, and Stories before beginning implementation.
+**Next Step**: Run the **implementation-readiness** workflow to validate alignment between PRD, Architecture, and Stories before beginning implementation.
 
 ---
 
-_This checklist validates architecture document quality only. Use solutioning-gate-check for comprehensive readiness validation._
+_This checklist validates architecture document quality only. Use implementation-readiness for comprehensive readiness validation._

src/modules/bmgd/workflows/3-technical/game-architecture/instructions.md

@@ -12,6 +12,7 @@
 <critical>Input documents specified in workflow.yaml input_file_patterns - workflow engine handles fuzzy matching, whole vs sharded document discovery automatically</critical>
 <critical>ELICITATION POINTS: After completing each major architectural decision area (identified by template-output tags for decision_record, project_structure, novel_pattern_designs, implementation_patterns, and architecture_document), invoke advanced elicitation to refine decisions before proceeding</critical>
 <critical>⚠️ ABSOLUTELY NO TIME ESTIMATES - NEVER mention hours, days, weeks, months, or ANY time-based predictions. AI has fundamentally changed development speed - what once took teams weeks/months can now be done by one person in hours. DO NOT give ANY time estimates whatsoever.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <step n="0" goal="Validate workflow readiness" tag="workflow-status">
 <action>Check if {output_folder}/bmm-workflow-status.yaml exists</action>

src/modules/bmgd/workflows/3-technical/game-architecture/workflow.yaml

@@ -35,7 +35,7 @@ input_file_patterns:
 
   document_project:
     description: "Brownfield project documentation (optional)"
-    sharded: "{output_folder}/docs/index.md"
+    sharded: "{output_folder}/index.md"
     load_strategy: "INDEX_GUIDED"
 
 # Module path and component files

src/modules/bmgd/workflows/4-production/code-review/workflow.yaml

@@ -54,7 +54,7 @@ input_file_patterns:
     load_strategy: "SELECTIVE_LOAD"
   document_project:
     description: "Brownfield project documentation (optional)"
-    sharded: "{output_folder}/docs/index.md"
+    sharded: "{output_folder}/index.md"
     load_strategy: "INDEX_GUIDED"
 
 standalone: true

src/modules/bmgd/workflows/4-production/correct-course/workflow.yaml

@@ -43,7 +43,7 @@ input_file_patterns:
     load_strategy: "FULL_LOAD"
   document_project:
     description: "Brownfield project documentation (optional)"
-    sharded: "{output_folder}/docs/index.md"
+    sharded: "{output_folder}/index.md"
     load_strategy: "INDEX_GUIDED"
 
 installed_path: "{project-root}/{bmad_folder}/bmm/workflows/4-implementation/correct-course"

src/modules/bmgd/workflows/4-production/dev-story/workflow.yaml

@@ -45,7 +45,7 @@ input_file_patterns:
     load_strategy: "SELECTIVE_LOAD"
   document_project:
     description: "Brownfield project documentation (optional)"
-    sharded: "{output_folder}/docs/index.md"
+    sharded: "{output_folder}/index.md"
     load_strategy: "INDEX_GUIDED"
 
 # Workflow components

src/modules/bmgd/workflows/4-production/story-context/workflow.yaml

@@ -51,7 +51,7 @@ input_file_patterns:
     load_strategy: "SELECTIVE_LOAD"
   document_project:
     description: "Brownfield project documentation (optional)"
-    sharded: "{output_folder}/docs/index.md"
+    sharded: "{output_folder}/index.md"
     load_strategy: "INDEX_GUIDED"
 
 # Output configuration

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

@@ -25,24 +25,25 @@ agent:
 
     - trigger: brainstorm-project
       workflow: "{project-root}/{bmad_folder}/bmm/workflows/1-analysis/brainstorm-project/workflow.yaml"
-      description: Guide me through Brainstorming
+      description: Guided Brainstorming
+
+    - trigger: research
+      workflow: "{project-root}/{bmad_folder}/bmm/workflows/1-analysis/research/workflow.yaml"
+      description: Guided Research
 
     - trigger: product-brief
       workflow: "{project-root}/{bmad_folder}/bmm/workflows/1-analysis/product-brief/workflow.yaml"
-      description: Produce Project Brief
+      description: Create a Project Brief
 
     - trigger: document-project
       workflow: "{project-root}/{bmad_folder}/bmm/workflows/document-project/workflow.yaml"
       description: Generate comprehensive documentation of an existing Project
 
-    - trigger: research
-      workflow: "{project-root}/{bmad_folder}/bmm/workflows/1-analysis/research/workflow.yaml"
-      description: Guide me through Research
-
     - trigger: party-mode
       workflow: "{project-root}/{bmad_folder}/core/workflows/party-mode/workflow.yaml"
-      description: Consult with other expert agents from the party
+      description: Bring the whole team in to chat with other expert agents from the party
 
     - trigger: advanced-elicitation
       exec: "{project-root}/{bmad_folder}/core/tasks/advanced-elicitation.xml"
       description: Advanced elicitation techniques to challenge the LLM to get better results
+      web-only: true

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

@@ -26,17 +26,17 @@ agent:
     - trigger: validate-architecture
       validate-workflow: "{project-root}/{bmad_folder}/bmm/workflows/3-solutioning/architecture/workflow.yaml"
       checklist: "{project-root}/{bmad_folder}/bmm/workflows/3-solutioning/architecture/checklist.md"
-      document: "{output_folder}/architecture.md"
       description: Validate Architecture Document
 
-    - trigger: solutioning-gate-check
+    - trigger: implementation-readiness
-      workflow: "{project-root}/{bmad_folder}/bmm/workflows/3-solutioning/solutioning-gate-check/workflow.yaml"
+      workflow: "{project-root}/{bmad_folder}/bmm/workflows/3-solutioning/implementation-readiness/workflow.yaml"
-      description: Validate solutioning complete, ready for Phase 4 (Level 2-4 only)
+      description: Validate implementation readiness - PRD, UX, Architecture, Epics aligned
 
     - trigger: party-mode
       workflow: "{project-root}/{bmad_folder}/core/workflows/party-mode/workflow.yaml"
-      description: Consult with other expert agents from the party
+      description: Bring the whole team in to chat with other expert agents from the party
 
     - trigger: advanced-elicitation
       exec: "{project-root}/{bmad_folder}/core/tasks/advanced-elicitation.xml"
       description: Advanced elicitation techniques to challenge the LLM to get better results
+      web-only: true

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

@@ -10,15 +10,15 @@ agent:
     module: bmm
 
   persona:
-    role: Senior Implementation Engineer
+    role: Senior Software Engineer
     identity: Executes approved stories with strict adherence to acceptance criteria, using Story Context XML and existing code to minimize rework and hallucinations.
-    communication_style: Succinct and checklist-driven. Cites specific paths and AC IDs. Asks clarifying questions only when inputs missing. Refuses to invent when info lacking.
+    communication_style: Succinct. Cites specific paths and AC IDs. Asks clarifying questions only when inputs missing. Refuses to invent when info lacking.
-    principles: Story Context XML is the single source of truth. Reuse existing interfaces over rebuilding. Every change maps to specific AC. Tests pass 100% or story isn't done.
+    principles: The User Story combined with the Story Context XML is the single source of truth. Reuse existing interfaces over rebuilding. Every change maps to specific AC. ALL past and current tests pass 100% or story isn't ready for review.
 
   critical_actions:
     - "DO NOT start implementation until a story is loaded and Status == Approved"
-    - "When a story is loaded, READ the entire story markdown"
+    - "When a story is loaded, READ the entire story markdown, it is all CRITICAL information you must adhere to when implementing the software solution. Do not skip any sections."
-    - "Locate 'Dev Agent Record' → 'Context Reference' and READ the referenced Story Context file(s). If none present, HALT and ask user to run @spec-context → *story-context"
+    - "Locate 'Dev Agent Record' → 'Context Reference' and READ the referenced Story Context file(s). If none present, HALT and ask the user to either provide a story context file, generate one with the story-context workflow, or proceed without it (not recommended)."
     - "Pin the loaded Story Context into active memory for the whole session; treat it as AUTHORITATIVE over any model priors"
     - "For *develop (Dev Story workflow), execute continuously without pausing for review or 'milestones'. Only halt for explicit blocker conditions (e.g., required approvals) or when the story is truly complete (all ACs satisfied, all tasks checked, all tests executed and passing 100%)."
 

src/modules/bmm/agents/frame-expert.agent.yaml

@@ -1,18 +1,24 @@
 # Frame Expert Agent Definition
 
 agent:
+  webskip: true
   metadata:
     id: "{bmad_folder}/bmm/agents/frame-expert.md"
-    name: Saif Ullah
+    name: Saif
     title: Visual Design & Diagramming Expert
-    icon: 🎨
+    icon: 📐
     module: bmm
 
   persona:
     role: Expert Visual Designer & Diagramming Specialist
-    identity: Expert who creates visual representations using Excalidraw with optimized, reusable components. Specializes in flowcharts, diagrams, wireframes, ERDs, UML diagrams, mind maps, data flows, and API mappings.
+    identity: Expert who creates visual representations using Excalidraw with optimized, reusable components. Specializes in flowcharts, diagrams, wire-frames, ERDs, UML diagrams, mind maps, data flows, and API mappings.
     communication_style: Visual-first, structured, detail-oriented, composition-focused. Presents options as numbered lists for easy selection.
-    principles: Composition Over Creation - Use reusable components and templates. Minimal Payload - Strip unnecessary metadata, optimize serialization. Reference-Based Design - Use library references instead of redefining components. Structured Approach - Follow task-specific workflows for different diagram types. Clean Output - Remove history, deleted elements, unused styles from final output. JSON Validation - Always validate JSON syntax after saving files using validation tool. Error Recovery - NEVER delete files due to syntax errors, always fix them using error location information.
+    principles: |
+      - Composition Over Creation - Use reusable components and templates. Minimal Payload - Strip unnecessary metadata, optimize serialization.
+      - Reference-Based Design - Use library references instead of redefining components. Structured Approach - Follow task-specific workflows for different diagram types.
+      - Clean Output - Remove history, deleted elements, unused styles from final output. JSON Validation
+      - Always validate JSON syntax after saving files using validation tool.
+      - Error Recovery - NEVER delete files due to syntax errors, always fix them using error location information.
 
   menu:
     - trigger: flowchart
@@ -30,3 +36,7 @@ agent:
     - trigger: wireframe
       workflow: "{project-root}/{bmad_folder}/bmm/workflows/frame-expert/create-wireframe/workflow.yaml"
       description: Create website or app wireframe
+
+    - trigger: party-mode
+      workflow: "{project-root}/{bmad_folder}/core/workflows/party-mode/workflow.yaml"
+      description: Bring the whole team in to chat with other expert agents from the party

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

@@ -18,7 +18,8 @@ agent:
   menu:
     - trigger: workflow-init
       workflow: "{project-root}/{bmad_folder}/bmm/workflows/workflow-status/init/workflow.yaml"
-      description: Start a new sequenced workflow path (START HERE!)
+      description: Start a new sequenced workflow path
+      ide-only: true
 
     - trigger: workflow-status
       workflow: "{project-root}/{bmad_folder}/bmm/workflows/workflow-status/workflow.yaml"
@@ -26,7 +27,7 @@ agent:
 
     - trigger: create-prd
       workflow: "{project-root}/{bmad_folder}/bmm/workflows/2-plan-workflows/prd/workflow.yaml"
-      description: Create Product Requirements Document (PRD) for Level 2-4 projects
+      description: Create Product Requirements Document (PRD)
 
     - trigger: create-epics-and-stories
       workflow: "{project-root}/{bmad_folder}/bmm/workflows/2-plan-workflows/create-epics-and-stories/workflow.yaml"
@@ -40,7 +41,7 @@ agent:
 
     - trigger: tech-spec
       workflow: "{project-root}/{bmad_folder}/bmm/workflows/2-plan-workflows/tech-spec/workflow.yaml"
-      description: Create Tech Spec for Level 0-1 (sometimes Level 2) projects
+      description: Create Tech Spec (Simple work efforts, no PRD or Architecture docs)
 
     - trigger: validate-tech-spec
       validate-workflow: "{project-root}/{bmad_folder}/bmm/workflows/2-plan-workflows/tech-spec/workflow.yaml"
@@ -51,11 +52,13 @@ agent:
     - trigger: correct-course
       workflow: "{project-root}/{bmad_folder}/bmm/workflows/4-implementation/correct-course/workflow.yaml"
       description: Course Correction Analysis
+      ide-only: true
 
     - trigger: party-mode
       workflow: "{project-root}/{bmad_folder}/core/workflows/party-mode/workflow.yaml"
-      description: Consult with other expert agents from the party
+      description: Bring the whole team in to chat with other expert agents from the party
 
     - trigger: advanced-elicitation
       exec: "{project-root}/{bmad_folder}/core/tasks/advanced-elicitation.xml"
       description: Advanced elicitation techniques to challenge the LLM to get better results
+      web-only: true

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

@@ -15,7 +15,7 @@ agent:
     principles: Strict boundaries between story prep and implementation. Stories are single source of truth. Perfect alignment between PRD and dev execution. Enable efficient sprints.
 
   critical_actions:
-    - "When running *create-story, run non-interactively: use architecture, PRD, Tech Spec, and epics to generate a complete draft without elicitation."
+    - "When running *create-story, always run as *yolo. Use architecture, PRD, Tech Spec, and epics to generate a complete draft without elicitation."
 
   menu:
     - trigger: workflow-status
@@ -26,7 +26,7 @@ agent:
       workflow: "{project-root}/{bmad_folder}/bmm/workflows/4-implementation/sprint-planning/workflow.yaml"
       description: Generate or update sprint-status.yaml from epic files
 
-    - trigger: epic-tech-context
+    - trigger: create-epic-tech-context
       workflow: "{project-root}/{bmad_folder}/bmm/workflows/4-implementation/epic-tech-context/workflow.yaml"
       description: (Optional) Use the PRD and Architecture to create a Epic-Tech-Spec for a specific epic
 
@@ -42,11 +42,11 @@ agent:
       validate-workflow: "{project-root}/{bmad_folder}/bmm/workflows/4-implementation/create-story/workflow.yaml"
       description: (Optional) Validate Story Draft with Independent Review
 
-    - trigger: story-context
+    - trigger: create-story-context
       workflow: "{project-root}/{bmad_folder}/bmm/workflows/4-implementation/story-context/workflow.yaml"
       description: (Optional) Assemble dynamic Story Context (XML) from latest docs and code and mark story ready for dev
 
-    - trigger: validate-story-context
+    - trigger: validate-create-story-context
       validate-workflow: "{project-root}/{bmad_folder}/bmm/workflows/4-implementation/story-context/workflow.yaml"
       description: (Optional) Validate latest Story Context XML against checklist
 
@@ -65,8 +65,9 @@ agent:
 
     - trigger: party-mode
       workflow: "{project-root}/{bmad_folder}/core/workflows/party-mode/workflow.yaml"
-      description: Consult with other expert agents from the party
+      description: Bring the whole team in to chat with other expert agents from the party
 
     - trigger: advanced-elicitation
       exec: "{project-root}/{bmad_folder}/core/tasks/advanced-elicitation.xml"
       description: Advanced elicitation techniques to challenge the LLM to get better results
+      web-only: true

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

@@ -59,8 +59,9 @@ agent:
 
     - trigger: party-mode
       workflow: "{project-root}/{bmad_folder}/core/workflows/party-mode/workflow.yaml"
-      description: Consult with other expert agents from the party
+      description: Bring the whole team in to chat with other expert agents from the party
 
     - trigger: advanced-elicitation
       exec: "{project-root}/{bmad_folder}/core/tasks/advanced-elicitation.xml"
       description: Advanced elicitation techniques to challenge the LLM to get better results
+      web-only: true

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

@@ -60,8 +60,9 @@ agent:
 
     - trigger: party-mode
       workflow: "{project-root}/{bmad_folder}/core/workflows/party-mode/workflow.yaml"
-      description: Consult with other expert agents from the party
+      description: Bring the whole team in to chat with other expert agents from the party
 
     - trigger: advanced-elicitation
       exec: "{project-root}/{bmad_folder}/core/tasks/advanced-elicitation.xml"
       description: Advanced elicitation techniques to challenge the LLM to get better results
+      web-only: true

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

@@ -19,7 +19,7 @@ agent:
       workflow: "{project-root}/{bmad_folder}/bmm/workflows/workflow-status/workflow.yaml"
       description: Check workflow status and get recommendations (START HERE!)
 
-    - trigger: create-design
+    - trigger: create-ux-design
       workflow: "{project-root}/{bmad_folder}/bmm/workflows/2-plan-workflows/create-ux-design/workflow.yaml"
       description: Conduct Design Thinking Workshop to Define the User Specification
 
@@ -31,8 +31,9 @@ agent:
 
     - trigger: party-mode
       workflow: "{project-root}/{bmad_folder}/core/workflows/party-mode/workflow.yaml"
-      description: Consult with other expert agents from the party
+      description: Bring the whole team in to chat with other expert agents from the party
 
     - trigger: advanced-elicitation
       exec: "{project-root}/{bmad_folder}/core/tasks/advanced-elicitation.xml"
       description: Advanced elicitation techniques to challenge the LLM to get better results
+      web-only: true

src/modules/bmm/docs/README.md

@@ -117,7 +117,8 @@ Comprehensive documentation for all BMM workflows organized by phase:
   - Which planning workflow to use
 
 - **[Phase 3: Solutioning Workflows](./workflows-solutioning.md)** - Architecture and validation (638 lines)
-  - architecture, solutioning-gate-check
+  - architecture, create-epics-and-stories, implementation-readiness
+  - V6: Epics created AFTER architecture for better quality
   - Required for BMad Method and Enterprise Method tracks
   - Preventing agent conflicts
 

src/modules/bmm/docs/agents-guide.md

@@ -63,7 +63,7 @@ The BMad Method Module (BMM) provides a comprehensive team of specialized AI age
 
 - Creating Product Requirements Documents (PRD) for Level 2-4 projects
 - Creating technical specifications for small projects (Level 0-1)
-- Breaking down requirements into epics and stories
+- Breaking down requirements into epics and stories (after architecture)
 - Validating planning documents
 - Course correction during implementation
 
@@ -72,10 +72,10 @@ The BMad Method Module (BMM) provides a comprehensive team of specialized AI age
 **Workflows:**
 
 - `workflow-status` - Check what to do next
-- `create-prd` - Create PRD for Level 2-4 projects
+- `create-prd` - Create PRD for Level 2-4 projects (creates FRs/NFRs only)
 - `tech-spec` - Quick spec for Level 0-1 projects
-- `create-epics-and-stories` - Break PRD into implementable pieces
+- `create-epics-and-stories` - Break PRD into implementable pieces (runs AFTER architecture)
-- `validate-prd` - Validate PRD + Epics completeness
+- `validate-prd` - Validate PRD completeness
 - `validate-tech-spec` - Validate Technical Specification
 - `correct-course` - Handle mid-project changes
 - `workflow-init` - Initialize workflow tracking
@@ -136,7 +136,7 @@ The BMad Method Module (BMM) provides a comprehensive team of specialized AI age
 - Creating system architecture for Level 2-4 projects
 - Making technical design decisions
 - Validating architecture documents
-- Solutioning gate checks (Phase 3→4 transition)
+- Validating readiness for implementation phase (Phase 3→4 transition)
 - Course correction during implementation
 
 **Primary Phase:** Phase 3 (Solutioning)
@@ -146,7 +146,7 @@ The BMad Method Module (BMM) provides a comprehensive team of specialized AI age
 - `workflow-status` - Check what to do next
 - `create-architecture` - Produce a Scale Adaptive Architecture
 - `validate-architecture` - Validate architecture document
-- `solutioning-gate-check` - Validate readiness for Phase 4
+- `implementation-readiness` - Validate readiness for Phase 4
 
 **Communication Style:** Comprehensive yet pragmatic. Uses architectural metaphors. Balances technical depth with accessibility. Connects decisions to business value.
 
@@ -482,7 +482,7 @@ The BMad Method Module (BMM) provides a comprehensive team of specialized AI age
 
 - Game system architecture
 - Technical foundation design for games
-- Solutioning gate checks for game projects
+- Validating readiness for implementation phase (game projects)
 - Course correction during game development
 
 **Primary Phase:** Phase 3 (Solutioning - Games)
@@ -491,7 +491,7 @@ The BMad Method Module (BMM) provides a comprehensive team of specialized AI age
 
 - `workflow-status` - Check what to do next
 - `create-architecture` - Game systems architecture
-- `solutioning-gate-check` - Validate Phase 3→4 transition
+- `implementation-readiness` - Validate Phase 3→4 transition
 - `correct-course` - Handle technical changes
 
 **Communication Style:** Calm and measured. Systematic thinking about complex systems. Uses chess metaphors and military strategy. Emphasizes balance and elegance.
@@ -605,8 +605,8 @@ Some workflows are available to multiple agents:
 Many workflows have optional validation workflows that perform independent review:
 
 | Validation                   | Agent       | Validates                        |
-| ---------------------------- | ----------- | ---------------------------------- |
+| ---------------------------- | ----------- | -------------------------------- |
-| `validate-prd`               | PM          | PRD + Epics + Stories completeness |
+| `validate-prd`               | PM          | PRD completeness (FRs/NFRs only) |
 | `validate-tech-spec`         | PM          | Technical specification quality  |
 | `validate-architecture`      | Architect   | Architecture document            |
 | `validate-design`            | UX Designer | UX specification and artifacts   |
@@ -849,7 +849,8 @@ Load the customized agent and verify the changes are reflected in its behavior a
 2. Analyst: *brainstorm-project or *product-brief (optional)
 3. PM: *create-prd (Level 2-4) or *tech-spec (Level 0-1)
 4. Architect: *create-architecture (Level 3-4 only)
-5. SM: *sprint-planning
+5. PM: *create-epics-and-stories (after architecture)
+6. SM: *sprint-planning
 ```
 
 **Starting with Existing Code (Brownfield):**
@@ -859,7 +860,8 @@ Load the customized agent and verify the changes are reflected in its behavior a
 2. PM or Analyst: *workflow-init
 3. PM: *create-prd or *tech-spec
 4. Architect: *create-architecture (if needed)
-5. SM: *sprint-planning
+5. PM: *create-epics-and-stories (after architecture)
+6. SM: *sprint-planning
 ```
 
 **Story Development Cycle:**
@@ -911,7 +913,7 @@ Agent analyzes project state → recommends next workflow
 ```
 Each phase has validation gates:
 - Phase 2→3: validate-prd, validate-tech-spec
-- Phase 3→4: solutioning-gate-check
+- Phase 3→4: implementation-readiness
 Run validation before advancing
 ```
 
@@ -943,14 +945,14 @@ Quick reference for agent selection:
 | **Analyst**             | 📊   | 1 (Analysis)       | brainstorm, brief, research, document-project | Discovery, requirements, brownfield   |
 | **PM**                  | 📋   | 2 (Planning)       | prd, tech-spec, epics-stories                 | Planning, requirements docs           |
 | **UX Designer**         | 🎨   | 2 (Planning)       | create-design, validate-design                | UX-heavy projects, design             |
-| **Architect**           | 🏗️   | 3 (Solutioning)    | architecture, gate-check                      | Technical design, architecture        |
+| **Architect**           | 🏗️   | 3 (Solutioning)    | architecture, implementation-readiness        | Technical design, architecture        |
 | **SM**                  | 🏃   | 4 (Implementation) | sprint-planning, create-story, story-context  | Story management, sprint coordination |
 | **DEV**                 | 💻   | 4 (Implementation) | develop-story, code-review, story-done        | Implementation, coding                |
 | **TEA**                 | 🧪   | All Phases         | framework, atdd, automate, trace, ci          | Testing, quality assurance            |
 | **Paige (Tech Writer)** | 📚   | All Phases         | document-project, diagrams, validation        | Documentation, diagrams               |
 | **Game Designer**       | 🎲   | 1-2 (Games)        | brainstorm-game, gdd, narrative               | Game design, creative vision          |
 | **Game Developer**      | 🕹️   | 4 (Games)          | develop-story, story-done, code-review        | Game implementation                   |
-| **Game Architect**      | 🏛️   | 3 (Games)          | architecture, gate-check                      | Game systems architecture             |
+| **Game Architect**      | 🏛️   | 3 (Games)          | architecture, implementation-readiness        | Game systems architecture             |
 | **BMad Master**         | 🧙   | Meta               | party-mode, list tasks/workflows              | Orchestration, multi-agent            |
 
 ### Agent Capabilities Summary

src/modules/bmm/docs/brownfield-guide.md

@@ -291,9 +291,10 @@ See the [Workflows section in BMM README](../README.md) for details.
 
 **BMad Method/Enterprise:** Use `prd` workflow
 
-- Creates PRD.md + epic breakdown
+- Creates PRD.md with FRs/NFRs only
 - References existing architecture
 - Plans integration points
+- Epics+Stories created AFTER architecture phase
 
 **Brownfield-specific:** See [Scale Adaptive System](./scale-adaptive-system.md) for complete workflow paths by track.
 
@@ -309,7 +310,8 @@ See the [Workflows section in BMM README](../README.md) for details.
 **Workflows:**
 
 - `create-architecture` - Extend architecture docs (BMad Method/Enterprise)
-- `solutioning-gate-check` - Validate before implementation (BMad Method/Enterprise)
+- `create-epics-and-stories` - Create epics and stories AFTER architecture
+- `implementation-readiness` - Validate before implementation (BMad Method/Enterprise)
 
 ### Phase 4: Implementation (All Tracks)
 
@@ -473,8 +475,8 @@ Document in tech-spec/architecture:
 
 1. **Document:** Run `document-project` (Deep scan) - Critical for understanding existing UI patterns
 2. **Analyze:** Load Analyst → `research` (if evaluating analytics libraries)
-3. **Plan:** Load PM → `prd`
+3. **Plan:** Load PM → `prd` (creates FRs/NFRs)
-4. **Solution:** Load Architect → `create-architecture` → `solutioning-gate-check`
+4. **Solution:** Load Architect → `create-architecture` → `create-epics-and-stories` → `implementation-readiness`
 5. **Implement:** Sprint-based (10-15 stories)
    - Load SM → `sprint-planning`
    - Per epic: `epic-tech-context` → stories
@@ -495,10 +497,11 @@ Document in tech-spec/architecture:
 
 1. **Document:** Run `document-project` (Exhaustive if not documented) - **Mandatory**
 2. **Analyze:** Load Analyst → `research` (WebSocket vs WebRTC vs CRDT)
-3. **Plan:** Load PM → `prd`
+3. **Plan:** Load PM → `prd` (creates FRs/NFRs)
 4. **Solution:**
    - Load Architect → `create-architecture` (extend for real-time layer)
-   - Load Architect → `solutioning-gate-check`
+   - Load Architect → `create-epics-and-stories`
+   - Load Architect → `implementation-readiness`
 5. **Implement:** Sprint-based (20-30 stories)
 
 **Time:** 3-6 weeks
@@ -518,13 +521,14 @@ Document in tech-spec/architecture:
    - `brainstorm-project` - Explore multi-tenancy approaches
    - `research` - Database sharding, tenant isolation, pricing
    - `product-brief` - Strategic document
-3. **Plan:** Load PM → `prd` (comprehensive)
+3. **Plan:** Load PM → `prd` (comprehensive FRs/NFRs)
 4. **Solution:**
    - `create-architecture` - Full system architecture
    - `integration-planning` - Phased migration strategy
    - `create-architecture` - Multi-tenancy architecture
    - `validate-architecture` - External review
-   - `solutioning-gate-check` - Executive approval
+   - `create-epics-and-stories` - Create epics and stories
+   - `implementation-readiness` - Executive approval
 5. **Implement:** Phased sprint-based (50+ stories)
 
 **Time:** 3-6 months
@@ -634,7 +638,8 @@ prd                     # BMad Method/Enterprise tracks
 # Phase 3: Solutioning (BMad Method/Enterprise)
 # Architect agent:
 create-architecture          # Extend architecture
-solutioning-gate-check       # Final validation
+create-epics-and-stories     # Create epics and stories (after architecture)
+implementation-readiness       # Final validation
 
 # Phase 4: Implementation (All Tracks)
 # SM agent:
@@ -668,8 +673,11 @@ correct-course               # If issues
 **Phase 2 Planning:**
 
 - `docs/tech-spec.md` (Quick Flow track)
-- `docs/PRD.md` (BMad Method/Enterprise tracks)
+- `docs/PRD.md` (BMad Method/Enterprise tracks - FRs/NFRs only)
-- Epic breakdown
+
+**Phase 3 Solutioning:**
+
+- Epic breakdown (created after architecture)
 
 **Phase 3 Architecture:**
 

src/modules/bmm/docs/enterprise-agentic-development.md

@@ -140,34 +140,15 @@ bmad pm *create-prd
 **BMad produces:**
 
 - Structured, machine-readable requirements
-- Testable acceptance criteria per requirement
+- Functional Requirements (FRs) with testable acceptance criteria
-- Clear epic/story decomposition
+- Non-Functional Requirements (NFRs) with measurable targets
 - Technical context for AI agents
 
-**Why it matters:** Traditional PRDs are human-readable prose. BMad PRDs are **AI-executable work packages**.
+**Why it matters:** Traditional PRDs are human-readable prose. BMad PRDs are **AI-executable requirement specifications**.
 
-**PM Value:** Write once, automatically translated into agent-ready stories. No engineering bottleneck for translation.
+**PM Value:** Clear requirements that feed into architecture decisions, then into story breakdown. No ambiguity.
 
-### 2. Automated Epic/Story Breakdown
+### 2. Human-in-the-Loop Architecture
-
-**PM Workflow:**
-
-```bash
-bmad pm *create-epics-and-stories
-```
-
-**BMad produces:**
-
-- Epic files with clear objectives
-- Story files with acceptance criteria, context, technical guidance
-- Priority assignments (P0-P3)
-- Dependency mapping
-
-**Why it matters:** Stories become **work packages for cloud AI agents**. Each story is self-contained with full context.
-
-**PM Value:** No more "story refinement sessions" with engineering. AI agents execute directly from BMad stories.
-
-### 3. Human-in-the-Loop Architecture
 
 **Architect/PM Workflow:**
 
@@ -177,23 +158,46 @@ bmad architect *create-architecture
 
 **BMad produces:**
 
-- System architecture aligned with PRD
+- System architecture aligned with PRD's FRs/NFRs
 - Architecture Decision Records (ADRs)
-- Epic-specific technical guidance
+- FR/NFR-specific technical guidance
 - Integration patterns and standards
 
 **Why it matters:** PMs can **understand and validate** technical decisions. Architecture is conversational, not template-driven.
 
 **PM Value:** Technical fluency built through guided architecture process. PMs learn while creating.
 
+### 3. Automated Epic/Story Breakdown (AFTER Architecture)
+
+**PM Workflow:**
+
+```bash
+bmad pm *create-epics-and-stories
+```
+
+**V6 Improvement:** Epics and stories are now created AFTER architecture for better quality. The workflow uses both PRD (FRs/NFRs) and Architecture to create technically-informed stories.
+
+**BMad produces:**
+
+- Epic files with clear objectives
+- Story files with acceptance criteria, context, technical guidance
+- Priority assignments (P0-P3)
+- Dependency mapping informed by architectural decisions
+
+**Why it matters:** Stories become **work packages for cloud AI agents**. Each story is self-contained with full context AND aligned with architecture.
+
+**PM Value:** No more "story refinement sessions" with engineering. Stories are technically grounded from the start.
+
 ### 4. Cloud Agentic Pipeline (Emerging Pattern)
 
 **Current State (2025):**
 
 ```
-PM writes BMad PRD
+PM writes BMad PRD (FRs/NFRs)
    ↓
-create-epics-and-stories generates story queue
+Architect creates architecture (technical decisions)
+   ↓
+create-epics-and-stories generates story queue (informed by architecture)
    ↓
 Stories loaded by human developers + BMad agents
    ↓
@@ -207,9 +211,11 @@ Merge and deploy
 **Near Future (2026):**
 
 ```
-PM writes BMad PRD
+PM writes BMad PRD (FRs/NFRs)
    ↓
-create-epics-and-stories generates story queue
+Architecture auto-generated with PM approval
+   ↓
+create-epics-and-stories generates story queue (informed by architecture)
    ↓
 Stories automatically fed to cloud AI agent pool
    ↓

src/modules/bmm/docs/faq.md

@@ -147,7 +147,7 @@ If status file exists, use workflow-status. If not, use workflow-init.
 
 ### Q: How do I know when Phase 3 is complete and I can start Phase 4?
 
-**A:** For Level 3-4, run the solutioning-gate-check workflow. It validates that PRD, architecture, and UX (if applicable) are cohesive before implementation. Pass the gate check = ready for Phase 4.
+**A:** For Level 3-4, run the implementation-readiness workflow. It validates that PRD (FRs/NFRs), architecture, epics+stories, and UX (if applicable) are cohesive before implementation. Pass the gate check = ready for Phase 4.
 
 ### Q: Can I run workflows in parallel or do they have to be sequential?
 
@@ -155,7 +155,7 @@ If status file exists, use workflow-status. If not, use workflow-init.
 
 - Phase 1: brainstorm → research → product-brief (optional order)
 - Phase 2: PRD must complete before moving forward
-- Phase 3: architecture → validate → gate-check (sequential)
+- Phase 3: architecture → epics+stories → implementation-readiness (sequential)
 - Phase 4: Stories within an epic should generally be sequential, but stories in different epics can be parallel if you have capacity
 
 ---
@@ -175,8 +175,9 @@ Think of it as: tech-spec is for small projects (replaces PRD and architecture),
 
 **A:** Level 2+ projects need product-level planning (PRD) and system-level design (Architecture), which tech-spec doesn't provide. Tech-spec is too narrow for coordinating multiple features. Instead, Level 2-4 uses:
 
-- PRD (product vision, requirements, epics)
+- PRD (product vision, functional requirements, non-functional requirements)
 - Architecture (system design)
+- Epics+Stories (created AFTER architecture is complete)
 - Epic-tech-context (detailed implementation per epic, created just-in-time)
 
 ### Q: When do I create epic-tech-context?

src/modules/bmm/docs/glossary.md

@@ -77,7 +77,7 @@ The methodology path (Quick Flow, BMad Method, or Enterprise Method) chosen for
 
 ### PRD (Product Requirements Document)
 
-**BMad Method/Enterprise tracks.** Product-level planning document containing vision, goals, feature requirements, epic breakdown, success criteria, and UX considerations. Replaces tech-spec for larger projects that need product planning.
+**BMad Method/Enterprise tracks.** Product-level planning document containing vision, goals, Functional Requirements (FRs), Non-Functional Requirements (NFRs), success criteria, and UX considerations. Replaces tech-spec for larger projects that need product planning. **V6 Note:** PRD focuses on WHAT to build (requirements). Epic+Stories are created separately AFTER architecture via create-epics-and-stories workflow.
 
 ### Architecture Document
 
@@ -263,7 +263,7 @@ Workflow that initializes Phase 4 implementation by creating sprint-status.yaml,
 
 ### Gate Check
 
-Validation workflow (solutioning-gate-check) run before Phase 4 to ensure PRD, architecture, and UX documents are cohesive with no gaps or contradictions. Required for BMad Method and Enterprise Method tracks.
+Validation workflow (implementation-readiness) run before Phase 4 to ensure PRD, architecture, and UX documents are cohesive with no gaps or contradictions. Required for BMad Method and Enterprise Method tracks.
 
 ### DoD (Definition of Done)
 

src/modules/bmm/docs/quick-start.md

@@ -122,7 +122,7 @@ For v4 users or those who prefer to skip workflow-status guidance:
 
 - **Analyst** → Brainstorming, Product Brief
 - **PM** → PRD (BMad Method/Enterprise tracks) OR tech-spec (Quick Flow track)
-- **UX-Designer** → UX Design Document (if UI-heavy)
+- **UX-Designer** → UX Design Document (if UI part of the project)
 - **Architect** → Architecture (BMad Method/Enterprise tracks)
 
 #### Phase 2: Planning - Creating the PRD
@@ -133,7 +133,6 @@ For v4 users or those who prefer to skip workflow-status guidance:
 2. Tell it to run the PRD workflow
 3. Once complete, you'll have:
    - **PRD.md** - Your Product Requirements Document
-   - Epic breakdown
 
 **For Quick Flow track:**
 
@@ -145,7 +144,7 @@ If your project has a user interface:
 
 1. Load the **UX-Designer agent** in a new chat
 2. Tell it to run the UX design workflow
-3. After completion, run validations to ensure the Epics file stays updated
+3. After completion, you'll have your UX specification document
 
 #### Phase 3: Architecture
 
@@ -153,14 +152,25 @@ If your project has a user interface:
 
 1. Load the **Architect agent** in a new chat
 2. Tell it to run the create-architecture workflow
-3. After completion, run validations to ensure the Epics file stays updated
+3. After completion, you'll have your architecture document with technical decisions
 
-#### Phase 3: Solutioning Gate Check (Highly Recommended)
+#### Phase 3: Create Epics and Stories (REQUIRED after Architecture)
 
-Once architecture is complete:
+**V6 Improvement:** Epics and stories are now created AFTER architecture for better quality!
+
+1. Load the **PM agent** in a new chat
+2. Tell it to run "create-epics-and-stories"
+3. This breaks down your PRD's FRs/NFRs into implementable epics and stories
+4. The workflow uses both PRD and Architecture to create technically-informed stories
+
+**Why after architecture?** Architecture decisions (database, API patterns, tech stack) directly affect how stories should be broken down and sequenced.
+
+#### Phase 3: Implementation Readiness Check (Highly Recommended)
+
+Once epics and stories are created:
 
 1. Load the **Architect agent** in a new chat
-2. Tell it to run "solutioning-gate-check"
+2. Tell it to run "implementation-readiness"
 3. This validates cohesion across all your planning documents (PRD, UX, Architecture, Epics)
 4. This was called the "PO Master Checklist" in v4
 

src/modules/bmm/docs/scale-adaptive-system.md

@@ -154,10 +154,10 @@ Tech-Spec → Implement
 
 **Planning Docs**:
 
-- PRD.md (product requirements)
+- PRD.md (functional and non-functional requirements)
 - Architecture.md (system design)
 - UX Design (if UI components)
-- Epic breakdown with stories
+- Epics and Stories (created after architecture)
 
 **Workflow Path**:
 
@@ -166,7 +166,7 @@ Tech-Spec → Implement
 ↓
 (Optional: Analysis phase - brainstorm, research, product brief)
 ↓
-PRD → (Optional UX) → Architecture → Gate Check → Implement
+PRD → (Optional UX) → Architecture → Create Epics and Stories → Implementation Readiness Check → Implement
 ```
 
 **Use For**:
@@ -228,9 +228,11 @@ Your brownfield documentation might be huge. Architecture workflow distills mass
 ↓
 Analysis (recommended/required) → PRD → UX → Architecture
 ↓
+Create Epics and Stories
+↓
 Security Architecture → DevOps Strategy → Test Strategy
 ↓
-Gate Check → Implement
+Implementation Readiness Check → Implement
 ```
 
 **Use For**:
@@ -287,12 +289,14 @@ Gate Check → Implement
 **PRD (Product Requirements Document)**:
 
 - Product vision and goals
-- Feature requirements
+- Functional requirements (FRs)
-- Epic breakdown with stories
+- Non-functional requirements (NFRs)
 - Success criteria
 - User experience considerations
 - Business context
 
+**Note**: Epics and stories are created AFTER architecture in the create-epics-and-stories workflow
+
 **Architecture Document**:
 
 - System components and responsibilities
@@ -444,11 +448,12 @@ flowchart TD
 **Workflow**:
 
 1. (Recommended) Product Brief
-2. PRD with epics
+2. PRD (FRs/NFRs)
 3. (If UI) UX Design
 4. Architecture (system design)
-5. Gate Check
+5. Create Epics and Stories
-6. Implement with sprint planning
+6. Implementation Readiness Check
+7. Implement with sprint planning
 
 **Time**: 1-2 weeks
 
@@ -465,11 +470,12 @@ flowchart TD
 **Workflow**:
 
 1. Research + Product Brief
-2. Comprehensive PRD
+2. Comprehensive PRD (FRs/NFRs)
 3. UX Design (recommended)
 4. System Architecture (required)
-5. Gate check
+5. Create Epics and Stories
-6. Implement with phased approach
+6. Implementation Readiness Check
+7. Implement with phased approach
 
 **Time**: 3-6 weeks
 
@@ -487,7 +493,13 @@ flowchart TD
 
 1. **Run document-project** to analyze existing codebase
 
-**Then Workflow**: 2. PRD for search feature 3. Architecture (integration design - highly recommended) 4. Implement following existing patterns
+**Then Workflow**:
+
+2. PRD for search feature (FRs/NFRs)
+3. Architecture (integration design - highly recommended)
+4. Create Epics and Stories
+5. Implementation Readiness Check
+6. Implement following existing patterns
 
 **Time**: 1-2 weeks
 
@@ -507,13 +519,14 @@ flowchart TD
 
 1. Document-project (mandatory)
 2. Research (compliance, security)
-3. PRD (multi-tenancy requirements)
+3. PRD (multi-tenancy requirements - FRs/NFRs)
 4. Architecture (tenant isolation design)
-5. Security Architecture (data isolation, auth)
+5. Create Epics and Stories
-6. DevOps Strategy (tenant provisioning, monitoring)
+6. Security Architecture (data isolation, auth)
-7. Test Strategy (tenant isolation testing)
+7. DevOps Strategy (tenant provisioning, monitoring)
-8. Gate check
+8. Test Strategy (tenant isolation testing)
-9. Phased implementation
+9. Implementation Readiness Check
+10. Phased implementation
 
 **Time**: 3-6 months
 
@@ -533,9 +546,9 @@ If `workflow-init` suggests BMad Method, there's probably complexity you haven't
 
 Uncertain between Quick Flow and Method? Start with Quick Flow. You can create PRD later if needed.
 
-### 4. Don't Skip Gate Checks
+### 4. Don't Skip Implementation Readiness Check
 
-For BMad Method and Enterprise, gate checks prevent costly mistakes. Invest the time.
+For BMad Method and Enterprise, implementation readiness checks prevent costly mistakes. Invest the time.
 
 ### 5. Architecture is Optional but Recommended for Brownfield
 

src/modules/bmm/docs/test-architecture.md

@@ -18,21 +18,23 @@ TEA integrates into the BMad development lifecycle during Solutioning (Phase 3)
 %%{init: {'theme':'base', 'themeVariables': { 'primaryColor':'#fff','primaryTextColor':'#000','primaryBorderColor':'#000','lineColor':'#000','secondaryColor':'#fff','tertiaryColor':'#fff','fontSize':'16px','fontFamily':'arial'}}}%%
 graph TB
     subgraph Phase2["<b>Phase 2: PLANNING</b>"]
-        PM["<b>PM: *prd (creates PRD + epics)</b>"]
+        PM["<b>PM: *prd (creates PRD with FRs/NFRs)</b>"]
         PlanNote["<b>Business requirements phase</b>"]
         PM -.-> PlanNote
     end
 
     subgraph Phase3["<b>Phase 3: SOLUTIONING</b>"]
         Architecture["<b>Architect: *architecture</b>"]
+        EpicsStories["<b>PM/Architect: *create-epics-and-stories</b>"]
         Framework["<b>TEA: *framework</b>"]
         CI["<b>TEA: *ci</b>"]
-        GateCheck["<b>Architect: *solutioning-gate-check</b>"]
+        GateCheck["<b>Architect: *implementation-readiness</b>"]
-        Architecture --> Framework
+        Architecture --> EpicsStories
+        EpicsStories --> Framework
         Framework --> CI
         CI --> GateCheck
-        Phase3Note["<b>Test infrastructure AFTER architecture</b><br/>defines technology stack"]
+        Phase3Note["<b>Epics created AFTER architecture,</b><br/><b>then test infrastructure setup</b>"]
-        Framework -.-> Phase3Note
+        EpicsStories -.-> Phase3Note
     end
 
     subgraph Phase4["<b>Phase 4: IMPLEMENTATION - Per Epic Cycle</b>"]
@@ -90,8 +92,8 @@ graph TB
 
 - **Phase 0** (Optional): Documentation (brownfield prerequisite - `*document-project`)
 - **Phase 1** (Optional): Discovery/Analysis (`*brainstorm`, `*research`, `*product-brief`)
-- **Phase 2** (Required): Planning (`*prd` creates PRD + epics)
+- **Phase 2** (Required): Planning (`*prd` creates PRD with FRs/NFRs)
-- **Phase 3** (Track-dependent): Solutioning (`*architecture` → TEA: `*framework`, `*ci` → `*solutioning-gate-check`)
+- **Phase 3** (Track-dependent): Solutioning (`*architecture` → `*create-epics-and-stories` → TEA: `*framework`, `*ci` → `*implementation-readiness`)
 - **Phase 4** (Required): Implementation (`*sprint-planning` → per-epic: `*test-design` → per-story: dev workflows)
 
 **TEA workflows:** `*framework` and `*ci` run once in Phase 3 after architecture. `*test-design` runs per-epic in Phase 4. Output: `test-design-epic-N.md`.
@@ -192,10 +194,10 @@ These cheat sheets map TEA workflows to the **BMad Method and Enterprise tracks*
 **Use Case:** New projects with standard complexity
 
 | Workflow Stage             | Test Architect                                                    | Dev / Team                                                                          | Outputs                                                    |
-| -------------------------- | ----------------------------------------------------------------- | ---------------------------------------------------- | ---------------------------------------------------------- |
+| -------------------------- | ----------------------------------------------------------------- | ----------------------------------------------------------------------------------- | ---------------------------------------------------------- |
 | **Phase 1**: Discovery     | -                                                                 | Analyst `*product-brief` (optional)                                                 | `product-brief.md`                                         |
-| **Phase 2**: Planning      | -                                                                 | PM `*prd` (creates PRD + epics)                      | PRD, epics                                                 |
+| **Phase 2**: Planning      | -                                                                 | PM `*prd` (creates PRD with FRs/NFRs)                                               | PRD with functional/non-functional requirements            |
-| **Phase 3**: Solutioning   | Run `*framework`, `*ci` AFTER architecture                        | Architect `*architecture`, `*solutioning-gate-check` | Architecture, test scaffold, CI pipeline                   |
+| **Phase 3**: Solutioning   | Run `*framework`, `*ci` AFTER architecture and epic creation      | Architect `*architecture`, `*create-epics-and-stories`, `*implementation-readiness` | Architecture, epics/stories, test scaffold, CI pipeline    |
 | **Phase 4**: Sprint Start  | -                                                                 | SM `*sprint-planning`                                                               | Sprint status file with all epics and stories              |
 | **Phase 4**: Epic Planning | Run `*test-design` for THIS epic (per-epic test plan)             | Review epic scope                                                                   | `test-design-epic-N.md` with risk assessment and test plan |
 | **Phase 4**: Story Dev     | (Optional) `*atdd` before dev, then `*automate` after             | SM `*create-story`, DEV implements                                                  | Tests, story implementation                                |
@@ -218,8 +220,8 @@ These cheat sheets map TEA workflows to the **BMad Method and Enterprise tracks*
 <details>
 <summary>Worked Example – “Nova CRM” Greenfield Feature</summary>
 
-1. **Planning (Phase 2):** Analyst runs `*product-brief`; PM executes `*prd` to produce PRD and epics.
+1. **Planning (Phase 2):** Analyst runs `*product-brief`; PM executes `*prd` to produce PRD with FRs/NFRs.
-2. **Solutioning (Phase 3):** Architect completes `*architecture` for the new module; TEA sets up test infrastructure via `*framework` and `*ci` based on architectural decisions; gate check validates planning completeness.
+2. **Solutioning (Phase 3):** Architect completes `*architecture` for the new module; `*create-epics-and-stories` generates epics/stories based on architecture; TEA sets up test infrastructure via `*framework` and `*ci` based on architectural decisions; gate check validates planning completeness.
 3. **Sprint Start (Phase 4):** Scrum Master runs `*sprint-planning` to load all epics into sprint status.
 4. **Epic 1 Planning (Phase 4):** TEA runs `*test-design` to create test plan for Epic 1, producing `test-design-epic-1.md` with risk assessment.
 5. **Story Implementation (Phase 4):** For each story in Epic 1, SM generates story via `*create-story`; TEA optionally runs `*atdd`; Dev implements with guidance from failing tests.
@@ -241,11 +243,11 @@ These cheat sheets map TEA workflows to the **BMad Method and Enterprise tracks*
 - 🔄 Phase 4: Story Review - May include `*nfr-assess` if not done earlier
 
 | Workflow Stage                | Test Architect                                                               | Dev / Team                                                                          | Outputs                                                                |
-| ----------------------------- | ---------------------------------------------------------------------------- | ---------------------------------------------------- | ---------------------------------------------------------------------- |
+| ----------------------------- | ---------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- | ---------------------------------------------------------------------- |
 | **Phase 0**: Documentation ➕ | -                                                                            | Analyst `*document-project` (if undocumented)                                       | Comprehensive project documentation                                    |
 | **Phase 1**: Discovery        | -                                                                            | Analyst/PM/Architect rerun planning workflows                                       | Updated planning artifacts in `{output_folder}`                        |
-| **Phase 2**: Planning         | Run ➕ `*trace` (baseline coverage)                                          | PM `*prd` (creates PRD + epics)                      | PRD, epics, ➕ coverage baseline                                       |
+| **Phase 2**: Planning         | Run ➕ `*trace` (baseline coverage)                                          | PM `*prd` (creates PRD with FRs/NFRs)                                               | PRD with FRs/NFRs, ➕ coverage baseline                                |
-| **Phase 3**: Solutioning      | Run `*framework`, `*ci` AFTER architecture                                   | Architect `*architecture`, `*solutioning-gate-check` | Architecture, test framework, CI pipeline                              |
+| **Phase 3**: Solutioning      | Run `*framework`, `*ci` AFTER architecture and epic creation                 | Architect `*architecture`, `*create-epics-and-stories`, `*implementation-readiness` | Architecture, epics/stories, test framework, CI pipeline               |
 | **Phase 4**: Sprint Start     | -                                                                            | SM `*sprint-planning`                                                               | Sprint status file with all epics and stories                          |
 | **Phase 4**: Epic Planning    | Run `*test-design` for THIS epic 🔄 (regression hotspots)                    | Review epic scope and brownfield risks                                              | `test-design-epic-N.md` with brownfield risk assessment and mitigation |
 | **Phase 4**: Story Dev        | (Optional) `*atdd` before dev, then `*automate` after                        | SM `*create-story`, DEV implements                                                  | Tests, story implementation                                            |
@@ -268,8 +270,8 @@ These cheat sheets map TEA workflows to the **BMad Method and Enterprise tracks*
 <details>
 <summary>Worked Example – “Atlas Payments” Brownfield Story</summary>
 
-1. **Planning (Phase 2):** PM executes `*prd` to update PRD and `epics.md` (Epic 1: Payment Processing); TEA runs `*trace` to baseline existing coverage.
+1. **Planning (Phase 2):** PM executes `*prd` to create PRD with FRs/NFRs; TEA runs `*trace` to baseline existing coverage.
-2. **Solutioning (Phase 3):** Architect triggers `*architecture` capturing legacy payment flows and integration architecture; TEA sets up `*framework` and `*ci` based on architectural decisions; gate check validates planning.
+2. **Solutioning (Phase 3):** Architect triggers `*architecture` capturing legacy payment flows and integration architecture; `*create-epics-and-stories` generates Epic 1 (Payment Processing) based on architecture; TEA sets up `*framework` and `*ci` based on architectural decisions; gate check validates planning.
 3. **Sprint Start (Phase 4):** Scrum Master runs `*sprint-planning` to load Epic 1 into sprint status.
 4. **Epic 1 Planning (Phase 4):** TEA runs `*test-design` for Epic 1 (Payment Processing), producing `test-design-epic-1.md` that flags settlement edge cases, regression hotspots, and mitigation plans.
 5. **Story Implementation (Phase 4):** For each story in Epic 1, SM generates story via `*create-story`; TEA runs `*atdd` producing failing Playwright specs; Dev implements with guidance from tests and checklist.
@@ -291,10 +293,10 @@ These cheat sheets map TEA workflows to the **BMad Method and Enterprise tracks*
 - 📦 Release Gate - Archive artifacts and compliance evidence for audits
 
 | Workflow Stage             | Test Architect                                                           | Dev / Team                                                                          | Outputs                                                            |
-| -------------------------- | ------------------------------------------------------------------------ | ---------------------------------------------------- | ------------------------------------------------------------------ |
+| -------------------------- | ------------------------------------------------------------------------ | ----------------------------------------------------------------------------------- | ------------------------------------------------------------------ |
 | **Phase 1**: Discovery     | -                                                                        | Analyst ➕ `*research`, `*product-brief`                                            | Domain research, compliance analysis, product brief                |
-| **Phase 2**: Planning      | Run ➕ `*nfr-assess`                                                     | PM `*prd` (creates PRD + epics), UX `*create-design` | Enterprise PRD, epics, UX design, ➕ NFR documentation             |
+| **Phase 2**: Planning      | Run ➕ `*nfr-assess`                                                     | PM `*prd` (creates PRD with FRs/NFRs), UX `*create-design`                          | Enterprise PRD with FRs/NFRs, UX design, ➕ NFR documentation      |
-| **Phase 3**: Solutioning   | Run `*framework`, `*ci` AFTER architecture                               | Architect `*architecture`, `*solutioning-gate-check` | Architecture, test framework, CI pipeline                          |
+| **Phase 3**: Solutioning   | Run `*framework`, `*ci` AFTER architecture and epic creation             | Architect `*architecture`, `*create-epics-and-stories`, `*implementation-readiness` | Architecture, epics/stories, test framework, CI pipeline           |
 | **Phase 4**: Sprint Start  | -                                                                        | SM `*sprint-planning`                                                               | Sprint plan with all epics                                         |
 | **Phase 4**: Epic Planning | Run `*test-design` for THIS epic 🔄 (compliance focus)                   | Review epic scope and compliance requirements                                       | `test-design-epic-N.md` with security/performance/compliance focus |
 | **Phase 4**: Story Dev     | (Optional) `*atdd`, `*automate`, `*test-review`, `*trace` per story      | SM `*create-story`, DEV implements                                                  | Tests, fixtures, quality reports, coverage matrices                |
@@ -316,8 +318,8 @@ These cheat sheets map TEA workflows to the **BMad Method and Enterprise tracks*
 <details>
 <summary>Worked Example – “Helios Ledger” Enterprise Release</summary>
 
-1. **Planning (Phase 2):** Analyst runs `*research` and `*product-brief`; PM completes `*prd` creating PRD and epics; TEA runs `*nfr-assess` to establish NFR targets.
+1. **Planning (Phase 2):** Analyst runs `*research` and `*product-brief`; PM completes `*prd` creating PRD with FRs/NFRs; TEA runs `*nfr-assess` to establish NFR targets.
-2. **Solutioning (Phase 3):** Architect completes `*architecture` with enterprise considerations; TEA sets up `*framework` and `*ci` with enterprise-grade configurations based on architectural decisions; gate check validates planning completeness.
+2. **Solutioning (Phase 3):** Architect completes `*architecture` with enterprise considerations; `*create-epics-and-stories` generates epics/stories based on architecture; TEA sets up `*framework` and `*ci` with enterprise-grade configurations based on architectural decisions; gate check validates planning completeness.
 3. **Sprint Start (Phase 4):** Scrum Master runs `*sprint-planning` to load all epics into sprint status.
 4. **Per-Epic (Phase 4):** For each epic, TEA runs `*test-design` to create epic-specific test plan (e.g., `test-design-epic-1.md`, `test-design-epic-2.md`) with compliance-focused risk assessment.
 5. **Per-Story (Phase 4):** For each story, TEA uses `*atdd`, `*automate`, `*test-review`, and `*trace`; Dev teams iterate on the findings.

src/modules/bmm/docs/workflow-architecture-reference.md

@@ -72,7 +72,7 @@ The Decision Architecture workflow is a complete reimagining of how architectura
 ```
 Step 0: Validate workflow and extract project configuration
 Step 0.5: Validate workflow sequencing
-Step 1: Load PRD and understand project context
+Step 1: Load PRD (with FRs/NFRs) and understand project context
 Step 2: Discover and evaluate starter templates ⭐ NEW
 Step 3: Adapt facilitation style and identify remaining decisions
 Step 4: Facilitate collaborative decision making (with version verification)
@@ -122,11 +122,6 @@ Step 12: Final review and update workflow status
   - Non-Functional Requirements
   - Performance and compliance needs
 
-- **Epics** file with:
-  - User stories
-  - Acceptance criteria
-  - Dependencies
-
 - **UX Spec** (Optional but valuable) with:
   - Interface designs and interaction patterns
   - Accessibility requirements (WCAG levels)
@@ -280,7 +275,7 @@ workflow architecture
 
 The AI agent will:
 
-1. Load your PRD and epics
+1. Load your PRD (with FRs/NFRs)
 2. Identify critical decisions needed
 3. Facilitate discussion on each decision
 4. Generate a comprehensive architecture document

src/modules/bmm/docs/workflow-document-project-reference.md

@@ -202,7 +202,9 @@ PRD Workflow: Loads docs/index.md
 → Understands existing architecture
 → Identifies reusable components
 → Plans integration with existing APIs
-→ Creates contextual PRD with epics and stories
+→ Creates contextual PRD with FRs and NFRs
+Architecture Workflow: Creates architecture design
+Create-Epics-and-Stories Workflow: Breaks down into epics and stories
 ```
 
 ### Other Use Cases

src/modules/bmm/docs/workflows-implementation.md

@@ -162,7 +162,8 @@ Stories move through these states in the sprint status file:
 ### Sprint 0 (Planning Phase)
 
 - Complete Phases 1-3 (Analysis, Planning, Solutioning)
-- PRD/GDD + Architecture + Epics ready
+- PRD/GDD + Architecture complete
+- **V6: Epics+Stories created via create-epics-and-stories workflow (runs AFTER architecture)**
 
 ### Sprint 1+ (Implementation Phase)
 
@@ -235,8 +236,9 @@ tech-spec (PM)
 ### Level 2-4 (BMad Method / Enterprise)
 
 ```
-PRD + Architecture (PM/Architect)
+PRD (PM) → Architecture (Architect)
-  → solutioning-gate-check (Architect)
+  → create-epics-and-stories (PM)  ← V6: After architecture!
+  → implementation-readiness (Architect)
   → sprint-planning (SM, once)
   → [Per Epic]:
       epic-tech-context (SM)

src/modules/bmm/docs/workflows-planning.md

@@ -26,13 +26,17 @@ graph TB
 
     subgraph BMadMethod["<b>BMAD METHOD (Recommended)</b>"]
         direction TB
-        PRD["<b>PM: prd</b><br/>Strategic PRD"]
+        PRD["<b>PM: prd</b><br/>Strategic PRD with FRs/NFRs"]
         GDD["<b>Game Designer: gdd</b><br/>Game design doc"]
         Narrative["<b>Game Designer: narrative</b><br/>Story-driven design"]
 
-        Epics["<b>PM: create-epics-and-stories</b><br/>Epic+Stories breakdown<br/>10-50+ stories typically"]
+        UXDesign["<b>UX Designer: create-ux-design</b><br/>Optional UX specification"]
+    end
 
-        UXDesign["<b>UX Designer: ux</b><br/>Optional UX specification"]
+    subgraph Solutioning["<b>PHASE 3: SOLUTIONING</b>"]
+        direction TB
+        Architecture["<b>Architect: architecture</b><br/>System design + decisions"]
+        Epics["<b>PM: create-epics-and-stories</b><br/>Epic+Stories breakdown<br/>(10-50+ stories typically)"]
     end
 
     subgraph Enterprise["<b>ENTERPRISE METHOD</b>"]
@@ -51,17 +55,20 @@ graph TB
     Start -->|Story-driven| Narrative
     Start -->|Enterprise needs| Enterprise
 
-    PRD --> Epics
+    PRD -.->|Optional| UXDesign
-    GDD --> Epics
+    GDD -.->|Optional| UXDesign
-    Narrative --> Epics
+    Narrative -.->|Optional| UXDesign
-    Epics -.->|Optional| UXDesign
+    PRD --> Architecture
-    UXDesign -.->|May update| Epics
+    GDD --> Architecture
+    Narrative --> Architecture
+    UXDesign --> Architecture
+    Architecture --> Epics
 
     QuickFlow --> Phase4["<b>Phase 4: Implementation</b>"]
-    Epics --> Phase3["<b>Phase 3: Architecture</b>"]
+    Epics --> ReadinessCheck["<b>Architect: implementation-readiness</b><br/>Gate check"]
-    Enterprise -.->|Uses BMad planning| Epics
+    Enterprise -.->|Uses BMad planning| Architecture
     Enterprise --> Phase3Ext["<b>Phase 3: Extended</b><br/>(Arch + Sec + DevOps)"]
-    Phase3 --> Phase4
+    ReadinessCheck --> Phase4
     Phase3Ext --> Phase4
 
     Phase4 -.->|Significant changes| CorrectCourse
@@ -91,17 +98,17 @@ graph TB
 ## Quick Reference
 
 | Workflow                     | Agent         | Track       | Purpose                                                   | Typical Stories |
-| ---------------------------- | ------------- | ----------- | ------------------------------------------ | --------------- |
+| ---------------------------- | ------------- | ----------- | --------------------------------------------------------- | --------------- |
 | **workflow-init**            | PM/Analyst    | All         | Entry point: discovery + routing                          | N/A             |
 | **tech-spec**                | PM            | Quick Flow  | Technical document → Story or Epic+Stories                | 1-15            |
-| **prd**                      | PM            | BMad Method | Strategic PRD                              | 10-50+          |
+| **prd**                      | PM            | BMad Method | Strategic PRD with FRs/NFRs (no epic breakdown)           | 10-50+          |
-| **gdd**                      | Game Designer | BMad Method | Game Design Document                       | 10-50+          |
+| **gdd**                      | Game Designer | BMad Method | Game Design Document with requirements                    | 10-50+          |
 | **narrative**                | Game Designer | BMad Method | Story-driven game/experience design                       | 10-50+          |
-| **create-epics-and-stories** | PM            | BMad Method | Break PRD/GDD into Epic+Stories            | N/A             |
+| **create-ux-design**         | UX Designer   | BMad Method | Optional UX specification (after PRD)                     | N/A             |
-| **ux**                       | UX Designer   | BMad Method | Optional UX specification                  | N/A             |
+| **create-epics-and-stories** | PM            | BMad Method | Break requirements into Epic+Stories (AFTER architecture) | N/A             |
 | **correct-course**           | PM/SM         | All         | Mid-stream requirement changes                            | N/A             |
 
-**Note:** Story counts are guidance based on typical usage, not strict definitions.
+**Note:** Story counts are guidance. V6 improvement: Epic+Stories are created AFTER architecture for better quality.
 
 ---
 
@@ -135,11 +142,11 @@ BMM uses three distinct planning tracks that adapt to project complexity:
 
 **Story Count:** Typically 10-50+ (guidance)
 
-**Documents:** PRD.md (or GDD.md) + architecture.md + epic files + story files
+**Documents:** PRD.md (FRs/NFRs) + architecture.md + epics.md + epic files
 
-**Greenfield:** Product Brief (optional) → PRD → UX (optional) → Architecture → Implementation
+**Greenfield:** Product Brief (optional) → PRD (FRs/NFRs) → UX (optional) → Architecture → Epics+Stories → Implementation
 
-**Brownfield:** document-project → PRD → Architecture (recommended) → Implementation
+**Brownfield:** document-project → PRD (FRs/NFRs) → Architecture (recommended) → Epics+Stories → Implementation
 
 **Example:** "Customer dashboard", "E-commerce platform", "Add search to existing app"
 
@@ -151,17 +158,17 @@ BMM uses three distinct planning tracks that adapt to project complexity:
 
 **Best For:** Enterprise requirements, multi-tenant, compliance, security-sensitive
 
-**Planning (Phase 2):** Uses BMad Method planning (PRD + Epic+Stories)
+**Planning (Phase 2):** Uses BMad Method planning (PRD with FRs/NFRs)
 
-**Solutioning (Phase 3):** Extended workflows (Architecture + Security + DevOps + SecOps as optional additions)
+**Solutioning (Phase 3):** Extended workflows (Architecture + Security + DevOps + SecOps as optional additions) → Epics+Stories
 
 **Time:** 3-7 days total (1-3 days planning + 2-4 days extended solutioning)
 
 **Story Count:** Typically 30+ (but defined by enterprise needs)
 
-**Documents Phase 2:** PRD.md + epics + epic files + story files
+**Documents Phase 2:** PRD.md (FRs/NFRs)
 
-**Documents Phase 3:** architecture.md + security-architecture.md (optional) + devops-strategy.md (optional) + secops-strategy.md (optional)
+**Documents Phase 3:** architecture.md + epics.md + epic files + security-architecture.md (optional) + devops-strategy.md (optional) + secops-strategy.md (optional)
 
 **Example:** "Multi-tenant SaaS", "HIPAA-compliant portal", "Add SOC2 audit logging"
 
@@ -231,7 +238,7 @@ The system guides but never forces. You can override recommendations.
 
 ### prd (Product Requirements Document)
 
-**Purpose:** Strategic PRD with epic breakdown for software products (BMad Method track).
+**Purpose:** Strategic PRD with Functional Requirements (FRs) and Non-Functional Requirements (NFRs) for software products (BMad Method track).
 
 **Agent:** PM (with Architect and Analyst support)
 
@@ -245,19 +252,19 @@ The system guides but never forces. You can override recommendations.
 
 **Scale-Adaptive Structure:**
 
-- **Light:** Single epic, 5-10 stories, simplified analysis (10-15 pages)
+- **Light:** Focused FRs/NFRs, simplified analysis (10-15 pages)
-- **Standard:** 2-4 epics, 15-30 stories, comprehensive analysis (20-30 pages)
+- **Standard:** Comprehensive FRs/NFRs, thorough analysis (20-30 pages)
-- **Comprehensive:** 5+ epics, 30-50+ stories, multi-phase, extensive stakeholder analysis (30-50+ pages)
+- **Comprehensive:** Extensive FRs/NFRs, multi-phase, stakeholder analysis (30-50+ pages)
 
 **Key Outputs:**
 
-- PRD.md (complete requirements)
+- PRD.md (complete requirements with FRs and NFRs)
-- epics.md (epic breakdown)
+
-- Epic files (epic-1-_.md, epic-2-_.md, etc.)
+**Note:** V6 improvement - PRD focuses on WHAT to build (requirements). Epic+Stories are created AFTER architecture via `create-epics-and-stories` workflow for better quality.
 
 **Integration:** Feeds into Architecture (Phase 3)
 
-**Example:** E-commerce checkout → 3 epics (Guest Checkout, Payment Processing, Order Management), 21 stories, 4-6 week delivery.
+**Example:** E-commerce checkout → PRD with 15 FRs (user account, cart management, payment flow) and 8 NFRs (performance, security, scalability).
 
 ---
 
@@ -362,22 +369,26 @@ The system guides but never forces. You can override recommendations.
 
 ### create-epics-and-stories
 
-**Purpose:** Break PRD/GDD requirements into bite-sized stories organized in epics (BMad Method track).
+**Purpose:** Break requirements into bite-sized stories organized in epics (BMad Method track).
 
 **Agent:** PM
 
 **When to Use:**
 
-- After PRD/GDD complete (often run automatically)
+- **REQUIRED:** After Architecture workflow is complete (Phase 3)
-- Can also run standalone later to re-generate epics/stories
+- After PRD defines FRs/NFRs and Architecture defines HOW to build
-- When planning story breakdown outside main PRD workflow
+- Optional: Can also run earlier (after PRD, after UX) for basic structure, then refined after Architecture
 
 **Key Outputs:**
 
 - epics.md (all epics with story breakdown)
 - Epic files (epic-1-\*.md, etc.)
 
-**Note:** PRD workflow often creates epics automatically. This workflow can be run standalone if needed later.
+**V6 Improvement:** Epics+Stories are now created AFTER architecture for better quality:
+
+- Architecture decisions inform story breakdown (tech choices affect implementation)
+- Stories have full context (PRD + UX + Architecture)
+- Better sequencing with technical dependencies considered
 
 ---
 

src/modules/bmm/docs/workflows-solutioning.md

@@ -19,7 +19,7 @@ Phase 3 (Solutioning) workflows translate **what** to build (from Planning) into
 ```mermaid
 %%{init: {'theme':'base', 'themeVariables': { 'primaryColor':'#fff','primaryTextColor':'#000','primaryBorderColor':'#000','lineColor':'#000','fontSize':'16px','fontFamily':'arial'}}}%%
 graph TB
-    FromPlanning["<b>FROM Phase 2 Planning</b><br/>PRD/GDD/Tech-Spec complete"]
+    FromPlanning["<b>FROM Phase 2 Planning</b><br/>PRD (FRs/NFRs) complete"]
 
     subgraph QuickFlow["<b>QUICK FLOW PATH</b>"]
         direction TB
@@ -28,6 +28,7 @@ graph TB
 
     subgraph BMadEnterprise["<b>BMAD METHOD + ENTERPRISE (Same Start)</b>"]
         direction TB
+        OptionalUX["<b>UX Designer: create-ux-design</b><br/>(Optional)"]
         Architecture["<b>Architect: architecture</b><br/>System design + ADRs"]
 
         subgraph Optional["<b>ENTERPRISE ADDITIONS (Optional)</b>"]
@@ -36,11 +37,14 @@ graph TB
             DevOps["<b>Architect: devops-strategy</b><br/>(Future)"]
         end
 
-        GateCheck["<b>Architect: solutioning-gate-check</b><br/>Validation before Phase 4"]
+        EpicsStories["<b>PM: create-epics-and-stories</b><br/>Break down FRs/NFRs into epics"]
+        GateCheck["<b>Architect: implementation-readiness</b><br/>Validation before Phase 4"]
 
+        OptionalUX -.-> Architecture
         Architecture -.->|Enterprise only| Optional
-        Architecture --> GateCheck
+        Architecture --> EpicsStories
-        Optional -.-> GateCheck
+        Optional -.-> EpicsStories
+        EpicsStories --> GateCheck
     end
 
     subgraph Result["<b>GATE CHECK RESULTS</b>"]
@@ -51,7 +55,7 @@ graph TB
     end
 
     FromPlanning -->|Quick Flow| QuickFlow
-    FromPlanning -->|BMad Method<br/>or Enterprise| Architecture
+    FromPlanning -->|BMad Method<br/>or Enterprise| OptionalUX
 
     QuickFlow --> Phase4["<b>Phase 4: Implementation</b>"]
     GateCheck --> Result
@@ -67,9 +71,11 @@ graph TB
     style Phase4 fill:#ffcc80,stroke:#e65100,stroke-width:2px,color:#000
 
     style SkipArch fill:#aed581,stroke:#1b5e20,stroke-width:2px,color:#000
+    style OptionalUX fill:#64b5f6,stroke:#0d47a1,stroke-width:2px,color:#000
     style Architecture fill:#42a5f5,stroke:#0d47a1,stroke-width:2px,color:#000
     style SecArch fill:#ef9a9a,stroke:#c62828,stroke-width:2px,color:#000
     style DevOps fill:#ef9a9a,stroke:#c62828,stroke-width:2px,color:#000
+    style EpicsStories fill:#42a5f5,stroke:#0d47a1,stroke-width:2px,color:#000
     style GateCheck fill:#42a5f5,stroke:#0d47a1,stroke-width:2px,color:#000
     style Pass fill:#81c784,stroke:#388e3c,stroke-width:2px,color:#000
     style Concerns fill:#ffb74d,stroke:#f57f17,stroke-width:2px,color:#000
@@ -81,9 +87,11 @@ graph TB
 ## Quick Reference
 
 | Workflow                     | Agent       | Track                    | Purpose                                      |
-| -------------------------- | --------- | ------------------------ | ------------------------------------------- |
+| ---------------------------- | ----------- | ------------------------ | -------------------------------------------- |
+| **create-ux-design**         | UX Designer | BMad Method, Enterprise  | Optional UX design (after PRD, before arch)  |
 | **architecture**             | Architect   | BMad Method, Enterprise  | Technical architecture and design decisions  |
-| **solutioning-gate-check** | Architect | BMad Complex, Enterprise | Validate planning/solutioning completeness  |
+| **create-epics-and-stories** | PM          | BMad Method, Enterprise  | Break FRs/NFRs into epics after architecture |
+| **implementation-readiness** | Architect   | BMad Complex, Enterprise | Validate planning/solutioning completeness   |
 
 **When to Skip Solutioning:**
 
@@ -117,13 +125,13 @@ Result: Consistent implementation, no conflicts
 ### Solutioning vs Planning
 
 | Aspect   | Planning (Phase 2)      | Solutioning (Phase 3)             |
-| -------- | ------------------ | ------------------------ |
+| -------- | ----------------------- | --------------------------------- |
-| Question | What and Why?      | How?                     |
+| Question | What and Why?           | How? Then What units of work?     |
-| Output   | Requirements       | Technical Design         |
+| Output   | FRs/NFRs (Requirements) | Architecture + Epics/Stories      |
-| Agent    | PM                 | Architect                |
+| Agent    | PM                      | Architect → PM                    |
 | Audience | Stakeholders            | Developers                        |
-| Document | PRD/GDD            | Architecture + Tech Spec |
+| Document | PRD (FRs/NFRs)          | Architecture + Epic Files         |
-| Level    | Business logic     | Implementation detail    |
+| Level    | Business logic          | Technical design + Work breakdown |
 
 ---
 
@@ -171,7 +179,7 @@ This is NOT a template filler. The architecture workflow:
 7. **Security Architecture** - Auth/authorization, data protection, security boundaries
 8. **Deployment Architecture** - Deployment model, CI/CD, environment strategy, monitoring
 9. **Architecture Decision Records (ADRs)** - Key decisions with context, options, trade-offs, rationale
-10. **Epic-Specific Guidance** - Technical notes per epic, implementation priorities, dependencies
+10. **FR/NFR-Specific Guidance** - Technical approach per functional requirement, implementation priorities, dependencies
 11. **Standards and Conventions** - Directory structure, naming conventions, code organization, testing
 
 **ADR Format (Brief):**
@@ -203,28 +211,69 @@ This is NOT a template filler. The architecture workflow:
 - Negative: Caching complexity, N+1 query risk
 - Mitigation: Use DataLoader for batching
 
-**Implications for Epics:**
+**Implications for FRs:**
 
-- Epic 1: User Management → GraphQL mutations
+- FR-001: User Management → GraphQL mutations
-- Epic 2: Mobile App → Optimized queries
+- FR-002: Mobile App → Optimized queries
 ```
 
-**Example:** E-commerce platform → Monolith + PostgreSQL + Redis + Next.js + GraphQL, with ADRs explaining each choice and epic-specific guidance.
+**Example:** E-commerce platform → Monolith + PostgreSQL + Redis + Next.js + GraphQL, with ADRs explaining each choice and FR/NFR-specific guidance.
 
-**Integration:** Feeds into Phase 4 (Implementation). All dev agents reference architecture during implementation.
+**Integration:** Feeds into create-epics-and-stories workflow. Architecture provides the technical context needed for breaking FRs/NFRs into implementable epics and stories. All dev agents reference architecture during Phase 4 implementation.
 
 ---
 
-### solutioning-gate-check
+### create-epics-and-stories
 
-**Purpose:** Systematically validate that planning and solutioning are complete and aligned before Phase 4 implementation. Ensures PRD, architecture, and stories are cohesive with no gaps.
+**Purpose:** Transform PRD's functional and non-functional requirements into bite-sized stories organized into deliverable functional epics. This workflow runs AFTER architecture so epics/stories are informed by technical decisions.
+
+**Agent:** PM (Product Manager)
+
+**When to Use:**
+
+- After architecture workflow completes
+- When PRD contains FRs/NFRs ready for implementation breakdown
+- Before implementation-readiness gate check
+
+**Key Inputs:**
+
+- PRD (FRs/NFRs) from Phase 2 Planning
+- architecture.md with ADRs and technical decisions
+- Optional: UX design artifacts
+
+**Why After Architecture:**
+
+The create-epics-and-stories workflow runs AFTER architecture because:
+
+1. **Informed Story Sizing:** Architecture decisions (database choice, API style, etc.) affect story complexity
+2. **Dependency Awareness:** Architecture reveals technical dependencies between stories
+3. **Technical Feasibility:** Stories can be properly scoped knowing the tech stack
+4. **Consistency:** All stories align with documented architectural patterns
+
+**Key Outputs:**
+
+Epic files (one per epic) containing:
+
+1. Epic objective and scope
+2. User stories with acceptance criteria
+3. Story priorities (P0/P1/P2/P3)
+4. Dependencies between stories
+5. Technical notes referencing architecture decisions
+
+**Example:** E-commerce PRD with FR-001 (User Registration), FR-002 (Product Catalog) → Epic 1: User Management (3 stories), Epic 2: Product Display (4 stories), each story referencing relevant ADRs.
+
+---
+
+### implementation-readiness
+
+**Purpose:** Systematically validate that planning and solutioning are complete and aligned before Phase 4 implementation. Ensures PRD, architecture, and epics are cohesive with no gaps.
 
 **Agent:** Architect
 
 **When to Use:**
 
 - **Always** before Phase 4 for BMad Complex and Enterprise projects
-- After architecture workflow completes
+- After create-epics-and-stories workflow completes
 - Before sprint-planning workflow
 - When stakeholders request readiness check
 
@@ -237,14 +286,14 @@ This is NOT a template filler. The architecture workflow:
 
 **Prevents:**
 
-- ❌ Architecture doesn't address all epics
+- ❌ Architecture doesn't address all FRs/NFRs
-- ❌ Stories conflict with architecture decisions
+- ❌ Epics conflict with architecture decisions
 - ❌ Requirements ambiguous or contradictory
 - ❌ Missing critical dependencies
 
 **Ensures:**
 
-- ✅ PRD → Architecture → Stories alignment
+- ✅ PRD → Architecture → Epics alignment
 - ✅ All epics have clear technical approach
 - ✅ No contradictions or gaps
 - ✅ Team ready to implement
@@ -256,8 +305,7 @@ This is NOT a template filler. The architecture workflow:
 - Problem statement clear and evidence-based
 - Success metrics defined
 - User personas identified
-- Feature requirements complete
+- Functional requirements (FRs) complete
-- All epics defined with objectives
 - Non-functional requirements (NFRs) specified
 - Risks and assumptions documented
 
@@ -268,7 +316,7 @@ This is NOT a template filler. The architecture workflow:
 - API architecture decided
 - Key ADRs documented
 - Security architecture addressed
-- Epic-specific guidance provided
+- FR/NFR-specific guidance provided
 - Standards and conventions defined
 
 **Epic/Story Completeness:**
@@ -281,8 +329,8 @@ This is NOT a template filler. The architecture workflow:
 
 **Alignment Checks:**
 
-- Architecture addresses all PRD requirements
+- Architecture addresses all PRD FRs/NFRs
-- Stories align with architecture decisions
+- Epics align with architecture decisions
 - No contradictions between epics
 - NFRs have technical approach
 - Integration points clear
@@ -305,16 +353,16 @@ This is NOT a template filler. The architecture workflow:
 
 - Critical gaps or contradictions
 - Architecture missing key decisions
-- Stories conflict with PRD/architecture
+- Epics conflict with PRD/architecture
 - **Action:** BLOCK Phase 4, resolve issues first
 
 **Key Outputs:**
 
-**solutioning-gate-check.md** containing:
+**implementation-readiness.md** containing:
 
 1. Executive Summary (PASS/CONCERNS/FAIL)
 2. Completeness Assessment (scores for PRD, Architecture, Epics)
-3. Alignment Assessment (PRD↔Architecture, Architecture↔Epics, cross-epic consistency)
+3. Alignment Assessment (PRD↔Architecture, Architecture↔Epics/Stories, cross-epic consistency)
 4. Quality Assessment (story quality, dependencies, risks)
 5. Gaps and Recommendations (critical/minor gaps, remediation)
 6. Gate Decision with rationale
@@ -339,26 +387,30 @@ Planning (tech-spec by PM)
 **BMad Method:**
 
 ```
-Planning (prd by PM)
+Planning (prd by PM - FRs/NFRs only)
+  → Optional: create-ux-design (UX Designer)
   → architecture (Architect)
-  → solutioning-gate-check (Architect)
+  → create-epics-and-stories (PM)
+  → implementation-readiness (Architect)
   → Phase 4 (Implementation)
 ```
 
 **Enterprise:**
 
 ```
-Planning (prd by PM - same as BMad Method)
+Planning (prd by PM - FRs/NFRs only)
+  → Optional: create-ux-design (UX Designer)
   → architecture (Architect)
   → Optional: security-architecture (Architect, future)
   → Optional: devops-strategy (Architect, future)
-  → solutioning-gate-check (Architect)
+  → create-epics-and-stories (PM)
+  → implementation-readiness (Architect)
   → Phase 4 (Implementation)
 ```
 
 **Note on TEA (Test Architect):** TEA is fully operational with 8 workflows across all phases. TEA validates architecture testability during Phase 3 reviews but does not have a dedicated solutioning workflow. TEA's primary setup occurs in Phase 2 (`*framework`, `*ci`, `*test-design`) and testing execution in Phase 4 (`*atdd`, `*automate`, `*test-review`, `*trace`, `*nfr-assess`).
 
-**Note:** Enterprise uses the same planning and architecture as BMad Method. The only difference is optional extended workflows added AFTER architecture but BEFORE gate check.
+**Note:** Enterprise uses the same planning and architecture as BMad Method. The only difference is optional extended workflows added AFTER architecture but BEFORE create-epics-and-stories.
 
 ### Solutioning → Implementation Handoff
 
@@ -366,11 +418,12 @@ Planning (prd by PM - same as BMad Method)
 
 1. **architecture.md** → Guides all dev agents during implementation
 2. **ADRs** (in architecture) → Referenced by agents for technical decisions
-3. **solutioning-gate-check.md** → Confirms readiness for Phase 4
+3. **Epic files** (from create-epics-and-stories) → Work breakdown into implementable units
+4. **implementation-readiness.md** → Confirms readiness for Phase 4
 
 **How Implementation Uses Solutioning:**
 
-- **sprint-planning** - Loads architecture for epic sequencing
+- **sprint-planning** - Loads architecture and epic files for sprint organization
 - **dev-story** - References architecture decisions and ADRs
 - **code-review** - Validates code follows architectural standards
 
@@ -414,17 +467,17 @@ Architecture documents are living. Update them as you learn during implementatio
 
 ### BMad Method
 
-- **Planning:** prd (PM)
+- **Planning:** prd (PM) - creates FRs/NFRs only, NOT epics
-- **Solutioning:** architecture (Architect) → solutioning-gate-check (Architect)
+- **Solutioning:** Optional UX → architecture (Architect) → create-epics-and-stories (PM) → implementation-readiness (Architect)
 - **Implementation:** sprint-planning → epic-tech-context → dev-story
 
 ### Enterprise
 
-- **Planning:** prd (PM) - same as BMad Method
+- **Planning:** prd (PM) - creates FRs/NFRs only (same as BMad Method)
-- **Solutioning:** architecture (Architect) → Optional extended workflows (security-architecture, devops-strategy) → solutioning-gate-check (Architect)
+- **Solutioning:** Optional UX → architecture (Architect) → Optional extended workflows (security-architecture, devops-strategy) → create-epics-and-stories (PM) → implementation-readiness (Architect)
 - **Implementation:** sprint-planning → epic-tech-context → dev-story
 
-**Key Difference:** Enterprise adds optional extended workflows AFTER architecture but BEFORE gate check. Everything else is identical to BMad Method.
+**Key Difference:** Enterprise adds optional extended workflows AFTER architecture but BEFORE create-epics-and-stories. Everything else is identical to BMad Method.
 
 **Note:** TEA (Test Architect) operates across all phases and validates architecture testability but is not a Phase 3-specific workflow. See [Test Architecture Guide](./test-architecture.md) for TEA's full lifecycle integration.
 

src/modules/bmm/workflows/1-analysis/brainstorm-project/instructions.md

@@ -6,6 +6,7 @@
 <critical>Communicate all responses in {communication_language}</critical>
 <critical>This is a meta-workflow that orchestrates the CIS brainstorming workflow with project-specific context</critical>
 <critical>⚠️ ABSOLUTELY NO TIME ESTIMATES - NEVER mention hours, days, weeks, months, or ANY time-based predictions. AI has fundamentally changed development speed - what once took teams weeks/months can now be done by one person in hours. DO NOT give ANY time estimates whatsoever.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <workflow>
 

src/modules/bmm/workflows/1-analysis/domain-research/instructions.md

@@ -8,6 +8,7 @@
 <critical>Generate all documents in {document_output_language}</critical>
 <critical>LIVING DOCUMENT: Write to domain-brief.md continuously as you discover - never wait until the end</critical>
 <critical>⚠️ ABSOLUTELY NO TIME ESTIMATES - NEVER mention hours, days, weeks, months, or ANY time-based predictions. AI has fundamentally changed development speed - what once took teams weeks/months can now be done by one person in hours. DO NOT give ANY time estimates whatsoever.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <workflow>
 

src/modules/bmm/workflows/1-analysis/product-brief/instructions.md

@@ -8,6 +8,7 @@
 <critical>Generate all documents in {document_output_language}</critical>
 <critical>LIVING DOCUMENT: Write to the document continuously as you discover - never wait until the end</critical>
 <critical>⚠️ ABSOLUTELY NO TIME ESTIMATES - NEVER mention hours, days, weeks, months, or ANY time-based predictions. AI has fundamentally changed development speed - what once took teams weeks/months can now be done by one person in hours. DO NOT give ANY time estimates whatsoever.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 ## Input Document Discovery
 

src/modules/bmm/workflows/1-analysis/product-brief/workflow.yaml

@@ -30,7 +30,7 @@ input_file_patterns:
 
   document_project:
     description: "Brownfield project documentation (optional)"
-    sharded: "{output_folder}/docs/index.md"
+    sharded: "{output_folder}/index.md"
     load_strategy: "INDEX_GUIDED"
 
 # Module path and component files

src/modules/bmm/workflows/1-analysis/research/instructions-deep-prompt.md

@@ -14,6 +14,7 @@
 <critical>Add explicit instructions: "If you cannot find reliable data, state 'No verified data found for [X]'"</critical>
 <critical>Require confidence indicators in prompts: "Mark each claim with confidence level and source quality"</critical>
 <critical>Include fact-checking instructions: "Distinguish between verified facts, analysis, and speculation"</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <workflow>
 

src/modules/bmm/workflows/1-analysis/research/instructions-market.md

@@ -17,6 +17,7 @@
 <critical>Clearly label: FACT (sourced data), ANALYSIS (your interpretation), PROJECTION (forecast/speculation)</critical>
 <critical>After each WebSearch, extract and store source URLs - include them in the report</critical>
 <critical>If a claim seems suspicious or too convenient, STOP and cross-verify with additional searches</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <!-- IDE-INJECT-POINT: market-research-subagents -->
 

src/modules/bmm/workflows/1-analysis/research/instructions-router.md

@@ -13,6 +13,7 @@
 <critical>Flag any data you are uncertain about with confidence levels: [High Confidence], [Medium Confidence], [Low Confidence - verify]</critical>
 <critical>Distinguish clearly between: FACTS (from sources), ANALYSIS (your interpretation), and SPECULATION (educated guesses)</critical>
 <critical>When using WebSearch results, ALWAYS extract and include the source URL for every claim</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <!-- IDE-INJECT-POINT: research-subagents -->
 

src/modules/bmm/workflows/1-analysis/research/instructions-technical.md

@@ -18,6 +18,7 @@
 <critical>Distinguish: FACT (from official docs/sources), OPINION (from community/reviews), SPECULATION (your analysis)</critical>
 <critical>If you cannot find current information about a technology, state: "I could not find recent {{current_year}} data on [X]"</critical>
 <critical>Extract and include source URLs in all technology profiles and comparisons</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <workflow>
 

src/modules/bmm/workflows/2-plan-workflows/create-epics-and-stories/instructions.md

@@ -4,16 +4,16 @@
 <critical>You MUST have already loaded and processed: {installed_path}/workflow.yaml</critical>
 <critical>This workflow transforms requirements into BITE-SIZED STORIES for development agents</critical>
 <critical>EVERY story must be completable by a single dev agent in one focused session</critical>
-<critical>BMAD METHOD WORKFLOW POSITION: This is the FIRST PASS at epic breakdown</critical>
+<critical>⚠️ EPIC STRUCTURE PRINCIPLE: Each epic MUST deliver USER VALUE, not just technical capability. Epics are NOT organized by technical layers (database, API, frontend). Each epic should result in something USERS can actually use or benefit from. Exception: Foundation/setup stories at the start of first epic are acceptable. Another valid exception: API-first epic ONLY when the API itself has standalone value (e.g., will be consumed by third parties or multiple frontends).</critical>
-<critical>After this workflow: UX Design will add interaction details → UPDATE epics.md</critical>
+<critical>BMAD METHOD WORKFLOW POSITION: This workflow can be invoked at multiple points - after PRD only, after PRD+UX, after PRD+UX+Architecture, or to update existing epics. If epics.md already exists, ASK the user: (1) CONTINUING - previous run was incomplete, (2) REPLACING - starting fresh/discarding old, (3) UPDATING - new planning document created since last epic generation</critical>
-<critical>After UX: Architecture will add technical decisions → UPDATE epics.md AGAIN</critical>
-<critical>Phase 4 Implementation pulls context from: PRD + epics.md + UX + Architecture</critical>
 <critical>This is a LIVING DOCUMENT that evolves through the BMad Method workflow chain</critical>
+<critical>Phase 4 Implementation pulls context from: PRD + epics.md + UX + Architecture</critical>
 <critical>Communicate all responses in {communication_language} and adapt to {user_skill_level}</critical>
 <critical>Generate all documents in {document_output_language}</critical>
 <critical>LIVING DOCUMENT: Write to epics.md continuously as you work - never wait until the end</critical>
 <critical>Input documents specified in workflow.yaml input_file_patterns - workflow engine handles fuzzy matching, whole vs sharded document discovery automatically</critical>
 <critical>⚠️ ABSOLUTELY NO TIME ESTIMATES - NEVER mention hours, days, weeks, months, or ANY time-based predictions. AI has fundamentally changed development speed - what once took teams weeks/months can now be done by one person in hours. DO NOT give ANY time estimates whatsoever.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <workflow>
 
@@ -26,7 +26,6 @@
 <action>Check if {default_output_file} exists (epics.md)</action>
 
 <check if="epics.md exists">
-  <action>Set mode = "UPDATE"</action>
   <action>Load existing epics.md completely</action>
   <action>Extract existing:
   - Epic structure and titles
@@ -35,15 +34,28 @@
   - Existing acceptance criteria
   </action>
 
-<output>📝 **UPDATE MODE DETECTED**
+<output>📝 **Existing epics.md found!**
 
-Found existing epics.md - I'll enhance it with newly available context.
+Current structure:
-
-Existing structure:
 
 - {{epic_count}} epics defined
 - {{story_count}} total stories
   </output>
+
+<ask>What would you like to do?
+
+1. **CONTINUING** - Previous run was incomplete, continue where we left off
+2. **REPLACING** - Start fresh, discard existing epic structure
+3. **UPDATING** - New planning document created (UX/Architecture), enhance existing epics
+
+Enter your choice (1-3):</ask>
+
+<action>Set mode based on user choice:
+
+- Choice 1: mode = "CONTINUE" (resume incomplete work)
+- Choice 2: mode = "CREATE" (start fresh, ignore existing)
+- Choice 3: mode = "UPDATE" (enhance with new context)
+  </action>
   </check>
 
 <check if="epics.md does not exist">
@@ -211,6 +223,31 @@ Name epics based on VALUE, not technical layers:
 - Good: "User Onboarding", "Content Discovery", "Compliance Framework"
 - Avoid: "Database Layer", "API Endpoints", "Frontend"
 
+**⚠️ ANTI-PATTERN EXAMPLES (DO NOT DO THIS):**
+
+❌ **WRONG - Technical Layer Breakdown:**
+
+- Epic 1: Database Schema & Models
+- Epic 2: API Layer / Backend Services
+- Epic 3: Frontend UI Components
+- Epic 4: Integration & Testing
+
+WHY IT'S WRONG: User gets ZERO value until ALL epics complete. No incremental delivery.
+
+✅ **CORRECT - User Value Breakdown:**
+
+- Epic 1: Foundation (project setup - necessary exception)
+- Epic 2: User Authentication (user can register/login - VALUE DELIVERED)
+- Epic 3: Content Management (user can create/edit content - VALUE DELIVERED)
+- Epic 4: Social Features (user can share/interact - VALUE DELIVERED)
+
+WHY IT'S RIGHT: Each epic delivers something users can USE. Incremental value.
+
+**Valid Exceptions:**
+
+1. **Foundation Epic**: First epic CAN be setup/infrastructure (greenfield projects need this)
+2. **API-First Epic**: ONLY valid if the API has standalone value (third-party consumers, multiple frontends, API-as-product). If it's just "backend for our frontend", that's the WRONG pattern.
+
 Each epic should:
 
 - Have clear business goal and user value
@@ -391,6 +428,34 @@ For each story in epic {{N}}, output variables following this pattern:
 <template-output>story-title-{{N}}-{{M}}</template-output>
 </check>
 
+<action>**EPIC {{N}} REVIEW - Present for Checkpoint:**
+
+Summarize the COMPLETE epic breakdown:
+
+**Epic {{N}}: {{epic_title}}**
+Goal: {{epic_goal}}
+
+Stories ({{count}} total):
+{{for each story, show:}}
+
+- Story {{N}}.{{M}}: {{story_title}}
+  - User Story: As a... I want... So that...
+  - Acceptance Criteria: (BDD format summary)
+  - Prerequisites: {{list}}
+
+**Review Questions to Consider:**
+
+- Is the story sequence logical?
+- Are acceptance criteria clear and testable?
+- Are there any missing stories for the FRs this epic covers?
+- Are the stories sized appropriately (single dev agent session)?
+- FRs covered by this epic: {{FR_list}}
+
+**NOTE:** At the checkpoint prompt, select [a] for Advanced Elicitation if you want to refine stories, add missing ones, or reorder. Select [c] to approve this epic and continue to the next one.
+</action>
+
+<template-output>epic\_{{N}}\_complete_breakdown</template-output>
+
 </step>
 
 <step n="4" goal="Review epic breakdown and completion">
@@ -445,6 +510,23 @@ The epic breakdown now includes all available context for Phase 4 implementation
 <check if="mode == 'CREATE'">
 <action>Review the complete epic breakdown for quality and completeness
 
+**Validate Epic Structure (USER VALUE CHECK):**
+
+For each epic, answer: "What can USERS do after this epic is complete that they couldn't do before?"
+
+- Epic 1: [Must have clear user value OR be Foundation exception]
+- Epic 2: [Must deliver user-facing capability]
+- Epic N: [Must deliver user-facing capability]
+
+⚠️ RED FLAG: If an epic only delivers technical infrastructure (database layer, API without users, component library without features), RESTRUCTURE IT. Each epic should enable users to accomplish something.
+
+Exception validation:
+
+- Foundation epic: Acceptable as first epic for greenfield projects
+- API-first epic: Acceptable ONLY if API has standalone consumers (third-party integrations, multiple frontends, API-as-product)
+
+If any epic fails this check, restructure before proceeding.
+
 **Validate FR Coverage:**
 
 Create FR Coverage Matrix showing each FR mapped to epic(s) and story(ies):

src/modules/bmm/workflows/2-plan-workflows/create-ux-design/instructions.md

@@ -12,6 +12,7 @@
 <critical>DOCUMENT OUTPUT: Professional, specific, actionable UX design decisions WITH RATIONALE. User skill level ({user_skill_level}) affects conversation style ONLY, not document content.</critical>
 <critical>Input documents specified in workflow.yaml input_file_patterns - workflow engine handles fuzzy matching, whole vs sharded document discovery automatically</critical>
 <critical>⚠️ ABSOLUTELY NO TIME ESTIMATES - NEVER mention hours, days, weeks, months, or ANY time-based predictions. AI has fundamentally changed development speed - what once took teams weeks/months can now be done by one person in hours. DO NOT give ANY time estimates whatsoever.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <step n="0" goal="Validate workflow readiness" tag="workflow-status">
 <action>Check if {output_folder}/bmm-workflow-status.yaml exists</action>

src/modules/bmm/workflows/2-plan-workflows/create-ux-design/workflow.yaml

@@ -42,7 +42,7 @@ input_file_patterns:
 
   document_project:
     description: "Brownfield project documentation (optional)"
-    sharded: "{output_folder}/docs/index.md"
+    sharded: "{output_folder}/index.md"
     load_strategy: "INDEX_GUIDED"
 
 # Module path and component files

src/modules/bmm/workflows/2-plan-workflows/prd/instructions.md

@@ -9,6 +9,7 @@
 <critical>GUIDING PRINCIPLE: Identify what makes this product special and ensure it's reflected throughout the PRD</critical>
 <critical>Input documents specified in workflow.yaml input_file_patterns - workflow engine handles fuzzy matching, whole vs sharded document discovery automatically</critical>
 <critical>⚠️ ABSOLUTELY NO TIME ESTIMATES - NEVER mention hours, days, weeks, months, or ANY time-based predictions. AI has fundamentally changed development speed - what once took teams weeks/months can now be done by one person in hours. DO NOT give ANY time estimates whatsoever.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <workflow>
 

src/modules/bmm/workflows/2-plan-workflows/prd/prd-template.md

@@ -199,37 +199,6 @@ _No specific non-functional requirements identified for this project type._
 
 ---
 
-## Implementation Planning
-
-### Epic Breakdown Required
-
-**Next Step:** Run `workflow create-epics-and-stories` to create the implementation breakdown.
-
----
-
-## References
-
-{{#if product_brief_path}}
-
-- Product Brief: {{product_brief_path}}
-  {{/if}}
-  {{#if domain_brief_path}}
-- Domain Brief: {{domain_brief_path}}
-  {{/if}}
-  {{#if research_documents}}
-- Research: {{research_documents}}
-  {{/if}}
-
----
-
-## Next Steps
-
-1. **Epic & Story Breakdown** - Run: `workflow epics-stories`
-2. **UX Design** (if UI) - Run: `workflow ux-design`
-3. **Architecture** - Run: `workflow create-architecture`
-
----
-
 _This PRD captures the essence of {{project_name}} - {{product_value_summary}}_
 
 _Created through collaborative discovery between {{user_name}} and AI facilitator._

src/modules/bmm/workflows/2-plan-workflows/tech-spec/checklist.md

@@ -28,7 +28,7 @@
 ### Document Discovery
 
 - [ ] **Existing documents loaded**: Product brief, research docs found and incorporated (if they exist)
-- [ ] **Document-project output**: Checked for {output_folder}/docs/index.md (brownfield codebase map)
+- [ ] **Document-project output**: Checked for {output_folder}/index.md (brownfield codebase map)
 - [ ] **Sharded documents**: If sharded versions found, ALL sections loaded and synthesized
 - [ ] **Context summary**: loaded_documents_summary lists all sources used
 

src/modules/bmm/workflows/2-plan-workflows/tech-spec/instructions-generate-stories.md

@@ -1,5 +1,7 @@
 # Unified Epic and Story Generation
 
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
+
 <workflow>
 
 <critical>This generates epic + stories for ALL quick-flow projects</critical>

src/modules/bmm/workflows/2-plan-workflows/tech-spec/instructions.md

@@ -13,6 +13,7 @@
 <critical>DOCUMENT OUTPUT: Technical, precise, definitive. Specific versions only. User skill level ({user_skill_level}) affects conversation style ONLY, not document content.</critical>
 <critical>Input documents specified in workflow.yaml input_file_patterns - workflow engine handles fuzzy matching, whole vs sharded document discovery automatically</critical>
 <critical>⚠️ ABSOLUTELY NO TIME ESTIMATES - NEVER mention hours, days, weeks, months, or ANY time-based predictions. AI has fundamentally changed development speed - what once took teams weeks/months can now be done by one person in hours. DO NOT give ANY time estimates whatsoever.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <step n="0" goal="Validate workflow readiness and detect project level" tag="workflow-status">
 <action>Check if {output_folder}/bmm-workflow-status.yaml exists</action>
@@ -135,7 +136,7 @@ Search for and load (using dual-strategy: whole first, then sharded):
    - If found: Load completely and extract insights
 
 3. **Document-Project Output (CRITICAL for brownfield):**
-   - Always check: {output_folder}/docs/index.md
+   - Always check: {output_folder}/index.md
    - If found: This is the brownfield codebase map - load ALL shards!
    - Extract: File structure, key modules, existing patterns, naming conventions
 

src/modules/bmm/workflows/2-plan-workflows/tech-spec/workflow.yaml

@@ -52,7 +52,7 @@ input_file_patterns:
     load_strategy: "FULL_LOAD"
   document_project:
     description: "Brownfield project documentation (optional)"
-    sharded: "{output_folder}/docs/index.md"
+    sharded: "{output_folder}/index.md"
     load_strategy: "INDEX_GUIDED"
 
 standalone: true

src/modules/bmm/workflows/3-solutioning/architecture/checklist.md

@@ -2,7 +2,7 @@
 
 **Purpose**: Validate the architecture document itself is complete, implementable, and provides clear guidance for AI agents.
 
-**Note**: This checklist validates the ARCHITECTURE DOCUMENT only. For cross-workflow validation (PRD → Architecture → Stories alignment), use the solutioning-gate-check workflow.
+**Note**: This checklist validates the ARCHITECTURE DOCUMENT only. For cross-workflow validation (PRD → Architecture → Stories alignment), use the implementation-readiness workflow.
 
 ---
 
@@ -233,8 +233,8 @@
 
 ---
 
-**Next Step**: Run the **solutioning-gate-check** workflow to validate alignment between PRD, UX, Architecture, and Stories before beginning implementation.
+**Next Step**: Run the **implementation-readiness** workflow to validate alignment between PRD, UX, Architecture, and Stories before beginning implementation.
 
 ---
 
-_This checklist validates architecture document quality only. Use solutioning-gate-check for comprehensive readiness validation._
+_This checklist validates architecture document quality only. Use implementation-readiness for comprehensive readiness validation._

src/modules/bmm/workflows/3-solutioning/architecture/instructions.md

@@ -12,6 +12,7 @@
 <critical>Input documents specified in workflow.yaml input_file_patterns - workflow engine handles fuzzy matching, whole vs sharded document discovery automatically</critical>
 <critical>ELICITATION POINTS: After completing each major architectural decision area (identified by template-output tags for decision_record, project_structure, novel_pattern_designs, implementation_patterns, and architecture_document), invoke advanced elicitation to refine decisions before proceeding</critical>
 <critical>⚠️ ABSOLUTELY NO TIME ESTIMATES - NEVER mention hours, days, weeks, months, or ANY time-based predictions. AI has fundamentally changed development speed - what once took teams weeks/months can now be done by one person in hours. DO NOT give ANY time estimates whatsoever.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <step n="0" goal="Validate workflow readiness" tag="workflow-status">
 <action>Check if {output_folder}/bmm-workflow-status.yaml exists</action>

src/modules/bmm/workflows/3-solutioning/implementation-readiness/instructions.md

@@ -1,10 +1,11 @@
-# Implementation Ready Check - Workflow Instructions
+# Implementation Readiness - Workflow Instructions
 
 <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}/bmm/workflows/3-solutioning/solutioning-gate-check/workflow.yaml</critical>
+<critical>You MUST have already loaded and processed: {project-root}/{bmad_folder}/bmm/workflows/3-solutioning/implementation-readiness/workflow.yaml</critical>
 <critical>Communicate all findings and analysis in {communication_language} throughout the assessment</critical>
 <critical>Input documents specified in workflow.yaml input_file_patterns - workflow engine handles fuzzy matching, whole vs sharded document discovery automatically</critical>
 <critical>⚠️ ABSOLUTELY NO TIME ESTIMATES - NEVER mention hours, days, weeks, months, or ANY time-based predictions. AI has fundamentally changed development speed - what once took teams weeks/months can now be done by one person in hours. DO NOT give ANY time estimates whatsoever.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <workflow>
 
@@ -12,7 +13,7 @@
 <action>Check if {workflow_status_file} exists</action>
 
 <check if="status file not found">
-  <output>No workflow status file found. Implementation Ready Check can run standalone or as part of BMM workflow path.</output>
+  <output>No workflow status file found. Implementation Readiness check can run standalone or as part of BMM workflow path.</output>
   <output>**Recommended:** Run `workflow-init` first for project context tracking and workflow sequencing.</output>
   <ask>Continue in standalone mode or exit to run workflow-init? (continue/exit)</ask>
   <check if="continue">
@@ -26,14 +27,14 @@
 <check if="status file found">
   <action>Load the FULL file:  {workflow_status_file}</action>
   <action>Parse workflow_status section</action>
-  <action>Check status of "solutioning-gate-check" workflow</action>
+  <action>Check status of "implementation-readiness" workflow</action>
   <action>Get {selected_track} (quick-flow, bmad-method, or enterprise-bmad-method)</action>
   <action>Find first non-completed workflow (next expected workflow)</action>
 
-<action>Based on the selected_track, understand what artifacts should exist: - quick-flow: Tech spec and simple stories in an epic only (no PRD, minimal solutioning) - bmad-method and enterprise-bmad-method: PRD, tech spec, epics/stories, architecture, possible UX artifacts</action>
+<action>Based on the selected_track, understand what artifacts should exist: - quick-flow: Tech spec and simple stories in an epic only (no PRD, minimal solutioning) - bmad-method and enterprise-bmad-method: PRD, UX design, epics/stories, architecture</action>
 
-  <check if="solutioning-gate-check status is file path (already completed)">
+  <check if="implementation-readiness status is file path (already completed)">
-    <output>⚠️ Gate check already completed: {{solutioning-gate-check status}}</output>
+    <output>⚠️ Implementation readiness check already completed: {{implementation-readiness status}}</output>
     <ask>Re-running will create a new validation report. Continue? (y/n)</ask>
     <check if="n">
       <output>Exiting. Use workflow-status to see your next step.</output>
@@ -41,9 +42,9 @@
     </check>
   </check>
 
-  <check if="solutioning-gate-check is not the next expected workflow">
+  <check if="implementation-readiness is not the next expected workflow">
-    <output>⚠️ Next expected workflow: {{next_workflow}}. Gate check is out of sequence.</output>
+    <output>⚠️ Next expected workflow: {{next_workflow}}. Implementation readiness check is out of sequence.</output>
-    <ask>Continue with gate check anyway? (y/n)</ask>
+    <ask>Continue with readiness check anyway? (y/n)</ask>
     <check if="n">
       <output>Exiting. Run {{next_workflow}} instead.</output>
       <action>Exit workflow</action>
@@ -257,25 +258,27 @@
 <step n="7" goal="Update status and complete" tag="workflow-status">
 <check if="standalone_mode != true">
   <action>Load the FULL file: {workflow_status_file}</action>
-  <action>Find workflow_status key "solutioning-gate-check"</action>
+  <action>Find workflow_status key "implementation-readiness"</action>
   <critical>ONLY write the file path as the status value - no other text, notes, or metadata</critical>
-  <action>Update workflow_status["solutioning-gate-check"] = "{output_folder}/bmm-readiness-assessment-{{date}}.md"</action>
+  <action>Update workflow_status["implementation-readiness"] = "{output_folder}/implementation-readiness-report-{{date}}.md"</action>
   <action>Save file, preserving ALL comments and structure including STATUS DEFINITIONS</action>
 
 <action>Find first non-completed workflow in workflow_status (next workflow to do)</action>
 <action>Determine next agent from path file based on next workflow</action>
 </check>
 
-<output>**✅ Implementation Ready Check Complete!**
+<action>Determine overall readiness status from the readiness_assessment (Ready, Ready with Conditions, or Not Ready)</action>
+
+<output>**✅ Implementation Readiness Check Complete!**
 
 **Assessment Report:**
 
-- Readiness assessment saved to: {output_folder}/bmm-readiness-assessment-{{date}}.md
+- Readiness assessment saved to: {output_folder}/implementation-readiness-report-{{date}}.md
 
 {{#if standalone_mode != true}}
 **Status Updated:**
 
-- Progress tracking updated: solutioning-gate-check marked complete
+- Progress tracking updated: implementation-readiness marked complete
 - Next workflow: {{next_workflow}}
   {{else}}
   **Note:** Running in standalone mode (no progress tracking)
@@ -297,6 +300,32 @@ Since no workflow is in progress:
   {{/if}}
   </output>
 
+<check if="overall readiness status is Ready OR Ready with Conditions">
+  <output>**🚀 Ready for Implementation!**
+
+Your project artifacts are aligned and complete. You can now proceed to Phase 4: Implementation.
+</output>
+
+<ask>Would you like to run the **sprint-planning** workflow to initialize your sprint tracking and prepare for development? (yes/no)</ask>
+
+  <check if="yes">
+    <action>Inform user that sprint-planning workflow will be invoked</action>
+    <invoke-workflow path="{project-root}/{bmad_folder}/bmm/workflows/4-implementation/sprint-planning/workflow.yaml" />
+  </check>
+  <check if="no">
+    <output>You can run sprint-planning later when ready: `sprint-planning`</output>
+  </check>
+</check>
+
+<check if="overall readiness status is Not Ready">
+  <output>**⚠️ Not Ready for Implementation**
+
+Critical issues must be resolved before proceeding. Review the assessment report and address the identified gaps.
+
+Once issues are resolved, re-run implementation-readiness to validate again.
+</output>
+</check>
+
 <template-output>status_update_result</template-output>
 </step>
 

src/modules/bmm/workflows/3-solutioning/implementation-readiness/template.md

@@ -143,4 +143,4 @@ _Minor items for consideration_
 
 ---
 
-_This readiness assessment was generated using the BMad Method Implementation Ready Check workflow (v6-alpha)_
+_This readiness assessment was generated using the BMad Method Implementation Readiness workflow (v6-alpha)_

src/modules/bmm/workflows/3-solutioning/implementation-readiness/workflow.yaml

@@ -1,7 +1,7 @@
-# Implementation Ready Check - Workflow Configuration
+# Implementation Readiness - Workflow Configuration
-name: solutioning-gate-check
+name: implementation-readiness
-description: "Systematically validate that all planning and solutioning phases are complete and properly aligned before transitioning to Phase 4 implementation. Ensures PRD, architecture, and stories are cohesive with no gaps or contradictions."
+description: "Validate that PRD, UX Design, Architecture, Epics and Stories are complete and aligned before Phase 4 implementation. Ensures all artifacts cover the MVP requirements with no gaps or contradictions."
-author: "BMad Builder"
+author: "BMad"
 
 # Critical variables from config
 config_source: "{project-root}/{bmad_folder}/bmm/config.yaml"
@@ -17,7 +17,7 @@ workflow_paths_dir: "{project-root}/{bmad_folder}/bmm/workflows/workflow-status/
 workflow_status_file: "{output_folder}/bmm-workflow-status.yaml"
 
 # Module path and component files
-installed_path: "{project-root}/{bmad_folder}/bmm/workflows/3-solutioning/solutioning-gate-check"
+installed_path: "{project-root}/{bmad_folder}/bmm/workflows/3-solutioning/implementation-readiness"
 template: "{installed_path}/template.md"
 instructions: "{installed_path}/instructions.md"
 validation: "{installed_path}/checklist.md"
@@ -56,7 +56,7 @@ input_file_patterns:
     load_strategy: "FULL_LOAD"
   document_project:
     description: "Brownfield project documentation (optional)"
-    sharded: "{output_folder}/docs/index.md"
+    sharded: "{output_folder}/index.md"
     load_strategy: "INDEX_GUIDED"
 
 standalone: true

src/modules/bmm/workflows/4-implementation/code-review/workflow.yaml

@@ -54,7 +54,7 @@ input_file_patterns:
     load_strategy: "SELECTIVE_LOAD"
   document_project:
     description: "Brownfield project documentation (optional)"
-    sharded: "{output_folder}/docs/index.md"
+    sharded: "{output_folder}/index.md"
     load_strategy: "INDEX_GUIDED"
 
 standalone: true

src/modules/bmm/workflows/4-implementation/correct-course/workflow.yaml

@@ -43,7 +43,7 @@ input_file_patterns:
     load_strategy: "FULL_LOAD"
   document_project:
     description: "Brownfield project documentation (optional)"
-    sharded: "{output_folder}/docs/index.md"
+    sharded: "{output_folder}/index.md"
     load_strategy: "INDEX_GUIDED"
 
 installed_path: "{project-root}/{bmad_folder}/bmm/workflows/4-implementation/correct-course"

src/modules/bmm/workflows/4-implementation/dev-story/workflow.yaml

@@ -45,7 +45,7 @@ input_file_patterns:
     load_strategy: "SELECTIVE_LOAD"
   document_project:
     description: "Brownfield project documentation (optional)"
-    sharded: "{output_folder}/docs/index.md"
+    sharded: "{output_folder}/index.md"
     load_strategy: "INDEX_GUIDED"
 
 # Workflow components

src/modules/bmm/workflows/4-implementation/story-context/workflow.yaml

@@ -51,7 +51,7 @@ input_file_patterns:
     load_strategy: "SELECTIVE_LOAD"
   document_project:
     description: "Brownfield project documentation (optional)"
-    sharded: "{output_folder}/docs/index.md"
+    sharded: "{output_folder}/index.md"
     load_strategy: "INDEX_GUIDED"
 
 # Output configuration

src/modules/bmm/workflows/testarch/test-design/instructions.md

@@ -30,7 +30,7 @@ The workflow auto-detects which mode to use based on project phase.
 
 2. **Check workflow-status.yaml**
    - Read `{output_folder}/bmm-workflow-status.yaml`
-   - If `solutioning-gate-check: required` or `solutioning-gate-check: recommended` → **System-Level Mode** (Phase 3)
+   - If `implementation-readiness: required` or `implementation-readiness: recommended` → **System-Level Mode** (Phase 3)
    - Otherwise → **Epic-Level Mode** (Phase 4 without sprint status yet)
 
 3. **Mode-Specific Requirements**

src/modules/bmm/workflows/workflow-status/paths/enterprise-brownfield.yaml

@@ -121,10 +121,10 @@ phases:
         command: "create-epics-and-stories"
         note: "Required: Create final epic breakdown with full context (PRD + UX + Architecture)"
 
-      - id: "solutioning-gate-check"
+      - id: "implementation-readiness"
         required: true
         agent: "architect"
-        command: "solutioning-gate-check"
+        command: "implementation-readiness"
         note: "Critical gate - validates all planning + Epics before touching production system"
 
   - phase: 3

src/modules/bmm/workflows/workflow-status/paths/enterprise-greenfield.yaml

@@ -109,10 +109,10 @@ phases:
         command: "create-epics-and-stories"
         note: "Required: Create final epic breakdown with full context (PRD + UX + Architecture)"
 
-      - id: "solutioning-gate-check"
+      - id: "implementation-readiness"
         required: true
         agent: "architect"
-        command: "solutioning-gate-check"
+        command: "implementation-readiness"
         note: "Validates all planning artifacts + Epics + testability align before implementation"
 
   - phase: 3

src/modules/bmm/workflows/workflow-status/paths/method-brownfield.yaml

@@ -105,11 +105,11 @@ phases:
         agent: "architect"
         command: "validate-architecture"
 
-      - id: "solutioning-gate-check"
+      - id: "implementation-readiness"
         required: true
         agent: "architect"
-        command: "solutioning-gate-check"
+        command: "implementation-readiness"
-        note: "Validates PRD + UX + Architecture + Epics (if created) cohesion"
+        note: "Validates PRD + UX + Architecture + Epics cohesion before implementation"
 
   - phase: 3
     name: "Implementation"

src/modules/bmm/workflows/workflow-status/paths/method-greenfield.yaml

@@ -96,10 +96,10 @@ phases:
         command: "validate-architecture"
         note: "Quality check for architecture completeness"
 
-      - id: "solutioning-gate-check"
+      - id: "implementation-readiness"
         required: true
         agent: "architect"
-        command: "solutioning-gate-check"
+        command: "implementation-readiness"
         note: "Validates PRD + UX + Architecture + Epics + Testability cohesion before implementation"
 
   - phase: 3

src/modules/cis/workflows/design-thinking/instructions.md

@@ -4,6 +4,7 @@
 <critical>You MUST have already loaded and processed: {project_root}/{bmad_folder}/cis/workflows/design-thinking/workflow.yaml</critical>
 <critical>Load and understand design methods from: {design_methods}</critical>
 <critical>⚠️ ABSOLUTELY NO TIME ESTIMATES - NEVER mention hours, days, weeks, months, or ANY time-based predictions. AI has fundamentally changed development speed - what once took teams weeks/months can now be done by one person in hours. DO NOT give ANY time estimates whatsoever.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <facilitation-principles>
   YOU ARE A HUMAN-CENTERED DESIGN FACILITATOR:

src/modules/cis/workflows/innovation-strategy/instructions.md

@@ -4,6 +4,7 @@
 <critical>You MUST have already loaded and processed: {project_root}/{bmad_folder}/cis/workflows/innovation-strategy/workflow.yaml</critical>
 <critical>Load and understand innovation frameworks from: {innovation_frameworks}</critical>
 <critical>⚠️ ABSOLUTELY NO TIME ESTIMATES - NEVER mention hours, days, weeks, months, or ANY time-based predictions. AI has fundamentally changed development speed - what once took teams weeks/months can now be done by one person in hours. DO NOT give ANY time estimates whatsoever.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <facilitation-principles>
   YOU ARE A STRATEGIC INNOVATION ADVISOR:

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

@@ -4,6 +4,7 @@
 <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>
 <critical>⚠️ ABSOLUTELY NO TIME ESTIMATES - NEVER mention hours, days, weeks, months, or ANY time-based predictions. AI has fundamentally changed development speed - what once took teams weeks/months can now be done by one person in hours. DO NOT give ANY time estimates whatsoever.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <facilitation-principles>
   YOU ARE A SYSTEMATIC PROBLEM-SOLVING FACILITATOR:

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

@@ -7,6 +7,7 @@
 <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>
 <critical>⚠️ ABSOLUTELY NO TIME ESTIMATES - NEVER mention hours, days, weeks, months, or ANY time-based predictions. AI has fundamentally changed development speed - what once took teams weeks/months can now be done by one person in hours. DO NOT give ANY time estimates whatsoever.</critical>
+<critical>⚠️ CHECKPOINT PROTOCOL: After EVERY <template-output> tag, you MUST follow workflow.xml substep 2c: SAVE content to file immediately → SHOW checkpoint separator (━━━━━━━━━━━━━━━━━━━━━━━) → DISPLAY generated content → PRESENT options [a]Advanced Elicitation/[c]Continue/[p]Party-Mode/[y]YOLO → WAIT for user response. Never batch saves or skip checkpoints.</critical>
 
 <step n="1" goal="Story Context Setup">
 

tools/cli/lib/xml-handler.js

@@ -203,6 +203,7 @@ class XmlHandler {
         customizeHash: customizePath ? await this.yamlBuilder.calculateFileHash(customizePath) : null,
         builderVersion: '1.0.0',
         includeMetadata: metadata.includeMetadata !== false,
+        forWebBundle: metadata.forWebBundle || false, // Pass through forWebBundle flag
       };
 
       // Convert to XML

tools/cli/lib/yaml-xml-builder.js

@@ -119,6 +119,16 @@ class YamlXmlBuilder {
         if (customizeYaml.critical_actions) {
           merged.agent.critical_actions = [...(merged.agent.critical_actions || []), ...customizeYaml.critical_actions];
         }
+
+        // Append prompts
+        if (customizeYaml.prompts) {
+          merged.agent.prompts = [...(merged.agent.prompts || []), ...customizeYaml.prompts];
+        }
+
+        // Append memories
+        if (customizeYaml.memories) {
+          merged.agent.memories = [...(merged.agent.memories || []), ...customizeYaml.memories];
+        }
       }
     }
 
@@ -202,6 +212,11 @@ class YamlXmlBuilder {
     // Persona section
     xml += this.buildPersonaXml(agent.persona);
 
+    // Memories section (if exists)
+    if (agent.memories) {
+      xml += this.buildMemoriesXml(agent.memories);
+    }
+
     // Prompts section (if exists)
     if (agent.prompts) {
       xml += this.buildPromptsXml(agent.prompts);
@@ -209,7 +224,7 @@ class YamlXmlBuilder {
 
     // Menu section (support both 'menu' and legacy 'commands')
     const menuItems = agent.menu || agent.commands || [];
-    xml += this.buildCommandsXml(menuItems);
+    xml += this.buildCommandsXml(menuItems, buildMetadata.forWebBundle);
 
     xml += '</agent>\n';
     xml += '```\n';
@@ -268,6 +283,23 @@ class YamlXmlBuilder {
     return xml;
   }
 
+  /**
+   * Build memories XML section
+   */
+  buildMemoriesXml(memories) {
+    if (!memories || memories.length === 0) return '';
+
+    let xml = '  <memories>\n';
+
+    for (const memory of memories) {
+      xml += `    <memory>${this.escapeXml(memory)}</memory>\n`;
+    }
+
+    xml += '  </memories>\n';
+
+    return xml;
+  }
+
   /**
    * Build prompts XML section
    * Handles both array format and object/dictionary format
@@ -296,9 +328,9 @@ class YamlXmlBuilder {
 
     for (const prompt of promptsArray) {
       xml += `    <prompt id="${prompt.id || ''}">\n`;
-      xml += `      <![CDATA[\n`;
+      xml += `      <content>\n`;
-      xml += `      ${prompt.content || ''}\n`;
+      xml += `${this.escapeXml(prompt.content || '')}\n`;
-      xml += `      ]]>\n`;
+      xml += `      </content>\n`;
       xml += `    </prompt>\n`;
     }
 
@@ -310,8 +342,10 @@ class YamlXmlBuilder {
   /**
    * Build menu XML section (renamed from commands for clarity)
    * Auto-injects *help and *exit, adds * prefix to all triggers
+   * @param {Array} menuItems - Menu items from YAML
+   * @param {boolean} forWebBundle - Whether building for web bundle
    */
-  buildCommandsXml(menuItems) {
+  buildCommandsXml(menuItems, forWebBundle = false) {
     let xml = '  <menu>\n';
 
     // Always inject *help first
@@ -320,6 +354,14 @@ class YamlXmlBuilder {
     // Add user-defined menu items with * prefix
     if (menuItems && menuItems.length > 0) {
       for (const item of menuItems) {
+        // Skip ide-only items when building for web bundles
+        if (forWebBundle && item['ide-only'] === true) {
+          continue;
+        }
+        // Skip web-only items when NOT building for web bundles (i.e., IDE/local installation)
+        if (!forWebBundle && item['web-only'] === true) {
+          continue;
+        }
         // Build command attributes - add * prefix if not present
         let trigger = item.trigger || '';
         if (!trigger.startsWith('*')) {

tools/schema/agent.js

@@ -183,6 +183,8 @@ function buildMenuItemSchema() {
       'run-workflow': createNonEmptyString('agent.menu[].run-workflow').optional(),
       checklist: createNonEmptyString('agent.menu[].checklist').optional(),
       document: createNonEmptyString('agent.menu[].document').optional(),
+      'ide-only': z.boolean().optional(),
+      'web-only': z.boolean().optional(),
     })
     .strict()
     .superRefine((value, ctx) => {