diff --git a/src/bmm/agents/dev.agent.yaml b/src/bmm/agents/dev.agent.yaml
index c707124d0..27266e483 100644
--- a/src/bmm/agents/dev.agent.yaml
+++ b/src/bmm/agents/dev.agent.yaml
@@ -34,5 +34,5 @@ agent:
description: "[DS] Dev Story: Write the next or specified stories tests and code."
- trigger: CR or fuzzy match on code-review
- workflow: "{project-root}/_bmad/bmm/workflows/4-implementation/code-review/workflow.yaml"
+ workflow: "{project-root}/_bmad/bmm/workflows/4-implementation/code-review/workflow.md"
description: "[CR] Code Review: Initiate a comprehensive code review across multiple quality facets. For best results, use a fresh context and a different quality LLM if available"
diff --git a/src/bmm/agents/quick-flow-solo-dev.agent.yaml b/src/bmm/agents/quick-flow-solo-dev.agent.yaml
index 553cc9d4d..72f861e8e 100644
--- a/src/bmm/agents/quick-flow-solo-dev.agent.yaml
+++ b/src/bmm/agents/quick-flow-solo-dev.agent.yaml
@@ -32,5 +32,5 @@ agent:
description: "[QQ] Quick Dev New (Preview): Unified quick flow â clarify intent, plan, implement, review, present (experimental)"
- trigger: CR or fuzzy match on code-review
- workflow: "{project-root}/_bmad/bmm/workflows/4-implementation/code-review/workflow.yaml"
+ workflow: "{project-root}/_bmad/bmm/workflows/4-implementation/code-review/workflow.md"
description: "[CR] Code Review: Initiate a comprehensive code review across multiple quality facets. For best results, use a fresh context and a different quality LLM if available"
diff --git a/src/bmm/module-help.csv b/src/bmm/module-help.csv
index 7a04cfdbd..df43c84cb 100644
--- a/src/bmm/module-help.csv
+++ b/src/bmm/module-help.csv
@@ -27,6 +27,6 @@ bmm,4-implementation,Sprint Status,SS,20,_bmad/bmm/workflows/4-implementation/sp
bmm,4-implementation,Validate Story,VS,35,_bmad/bmm/workflows/4-implementation/create-story/workflow.yaml,bmad-bmm-create-story,false,sm,Validate Mode,"Validates story readiness and completeness before development work begins",implementation_artifacts,"story validation report",
bmm,4-implementation,Create Story,CS,30,_bmad/bmm/workflows/4-implementation/create-story/workflow.yaml,bmad-bmm-create-story,true,sm,Create Mode,"Story cycle start: Prepare first found story in the sprint plan that is next, or if the command is run with a specific epic and story designation with context. Once complete, then VS then DS then CR then back to DS if needed or next CS or ER",implementation_artifacts,story,
bmm,4-implementation,Dev Story,DS,40,_bmad/bmm/workflows/4-implementation/dev-story/workflow.yaml,bmad-bmm-dev-story,true,dev,Create Mode,"Story cycle: Execute story implementation tasks and tests then CR then back to DS if fixes needed",,,
-bmm,4-implementation,Code Review,CR,50,_bmad/bmm/workflows/4-implementation/code-review/workflow.yaml,bmad-bmm-code-review,false,dev,Create Mode,"Story cycle: If issues back to DS if approved then next CS or ER if epic complete",,,
+bmm,4-implementation,Code Review,CR,50,_bmad/bmm/workflows/4-implementation/code-review/workflow.md,bmad-bmm-code-review,false,dev,Create Mode,"Story cycle: If issues back to DS if approved then next CS or ER if epic complete",,,
bmm,4-implementation,QA Automation Test,QA,45,_bmad/bmm/workflows/qa-generate-e2e-tests/workflow.md,bmad-bmm-qa-automate,false,qa,Create Mode,"Generate automated API and E2E tests for implemented code using the project's existing test framework (detects existing well known in use test frameworks). Use after implementation to add test coverage. NOT for code review or story validation - use CR for that.",implementation_artifacts,"test suite",
bmm,4-implementation,Retrospective,ER,60,_bmad/bmm/workflows/4-implementation/retrospective/workflow.md,bmad-bmm-retrospective,false,sm,Create Mode,"Optional at epic end: Review completed work lessons learned and next epic or if major issues consider CC",implementation_artifacts,retrospective,
diff --git a/src/bmm/workflows/4-implementation/code-review/instructions.xml b/src/bmm/workflows/4-implementation/code-review/instructions.xml
deleted file mode 100644
index 37b3eb63f..000000000
--- a/src/bmm/workflows/4-implementation/code-review/instructions.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-
- The workflow execution engine is governed by: {project-root}/_bmad/core/tasks/workflow.xml
- You MUST have already loaded and processed: {installed_path}/workflow.yaml
- Communicate all responses in {communication_language} and language MUST be tailored to {user_skill_level}
- Generate all documents in {document_output_language}
-
- đĨ YOU ARE AN ADVERSARIAL CODE REVIEWER - Find what's wrong or missing! đĨ
- Your purpose: Validate story file claims against actual implementation
- Challenge everything: Are tasks marked [x] actually done? Are ACs really implemented?
- Find 3-10 specific issues in every review minimum - no lazy "looks good" reviews - YOU are so much better than the dev agent
- that wrote this slop
- Read EVERY file in the File List - verify implementation against story requirements
- Tasks marked complete but not done = CRITICAL finding
- Acceptance Criteria not implemented = HIGH severity finding
- Do not review files that are not part of the application's source code. Always exclude the _bmad/ and _bmad-output/ folders from the review. Always exclude IDE and CLI configuration folders like .cursor/ and .windsurf/ and .claude/
-
-
-
- Use provided {{story_path}} or ask user which story file to review
- Read COMPLETE story file
- Set {{story_key}} = extracted key from filename (e.g., "1-2-user-authentication.md" â "1-2-user-authentication") or story
- metadata
- Parse sections: Story, Acceptance Criteria, Tasks/Subtasks, Dev Agent Record â File List, Change Log
-
-
- Check if git repository detected in current directory
-
- Run `git status --porcelain` to find uncommitted changes
- Run `git diff --name-only` to see modified files
- Run `git diff --cached --name-only` to see staged files
- Compile list of actually changed files from git output
-
-
-
- Compare story's Dev Agent Record â File List with actual git changes
- Note discrepancies:
- - Files in git but not in story File List
- - Files in story File List but no git changes
- - Missing documentation of what was actually changed
-
-
-
- Load {project_context} for coding standards (if exists)
-
-
-
- Extract ALL Acceptance Criteria from story
- Extract ALL Tasks/Subtasks with completion status ([x] vs [ ])
- From Dev Agent Record â File List, compile list of claimed changes
-
- Create review plan:
- 1. **AC Validation**: Verify each AC is actually implemented
- 2. **Task Audit**: Verify each [x] task is really done
- 3. **Code Quality**: Security, performance, maintainability
- 4. **Test Quality**: Real tests vs placeholder bullshit
-
-
-
-
- VALIDATE EVERY CLAIM - Check git reality vs story claims
-
-
- Review git vs story File List discrepancies:
- 1. **Files changed but not in story File List** â MEDIUM finding (incomplete documentation)
- 2. **Story lists files but no git changes** â HIGH finding (false claims)
- 3. **Uncommitted changes not documented** â MEDIUM finding (transparency issue)
-
-
-
- Create comprehensive review file list from story File List and git changes
-
-
- For EACH Acceptance Criterion:
- 1. Read the AC requirement
- 2. Search implementation files for evidence
- 3. Determine: IMPLEMENTED, PARTIAL, or MISSING
- 4. If MISSING/PARTIAL â HIGH SEVERITY finding
-
-
-
- For EACH task marked [x]:
- 1. Read the task description
- 2. Search files for evidence it was actually done
- 3. **CRITICAL**: If marked [x] but NOT DONE â CRITICAL finding
- 4. Record specific proof (file:line)
-
-
-
- For EACH file in comprehensive review list:
- 1. **Security**: Look for injection risks, missing validation, auth issues
- 2. **Performance**: N+1 queries, inefficient loops, missing caching
- 3. **Error Handling**: Missing try/catch, poor error messages
- 4. **Code Quality**: Complex functions, magic numbers, poor naming
- 5. **Test Quality**: Are tests real assertions or placeholders?
-
-
-
- NOT LOOKING HARD ENOUGH - Find more problems!
- Re-examine code for:
- - Edge cases and null handling
- - Architecture violations
- - Documentation gaps
- - Integration issues
- - Dependency problems
- - Git commit message quality (if applicable)
-
- Find at least 3 more specific, actionable issues
-
-
-
-
- Categorize findings: HIGH (must fix), MEDIUM (should fix), LOW (nice to fix)
- Set {{fixed_count}} = 0
- Set {{action_count}} = 0
-
-
-
- What should I do with these issues?
-
- 1. **Fix them automatically** - I'll update the code and tests
- 2. **Create action items** - Add to story Tasks/Subtasks for later
- 3. **Show me details** - Deep dive into specific issues
-
- Choose [1], [2], or specify which issue to examine:
-
-
- Fix all HIGH and MEDIUM issues in the code
- Add/update tests as needed
- Update File List in story if files changed
- Update story Dev Agent Record with fixes applied
- Set {{fixed_count}} = number of HIGH and MEDIUM issues fixed
- Set {{action_count}} = 0
-
-
-
- Add "Review Follow-ups (AI)" subsection to Tasks/Subtasks
- For each issue: `- [ ] [AI-Review][Severity] Description [file:line]`
- Set {{action_count}} = number of action items created
- Set {{fixed_count}} = 0
-
-
-
- Show detailed explanation with code examples
- Return to fix decision
-
-
-
-
-
-
- Set {{new_status}} = "done"
- Update story Status field to "done"
-
-
- Set {{new_status}} = "in-progress"
- Update story Status field to "in-progress"
-
- Save story file
-
-
-
- Set {{current_sprint_status}} = "enabled"
-
-
- Set {{current_sprint_status}} = "no-sprint-tracking"
-
-
-
-
- Load the FULL file: {sprint_status}
- Find development_status key matching {{story_key}}
-
-
- Update development_status[{{story_key}}] = "done"
- Update last_updated field to current date
- Save file, preserving ALL comments and structure
-
-
-
-
- Update development_status[{{story_key}}] = "in-progress"
- Update last_updated field to current date
- Save file, preserving ALL comments and structure
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/bmm/workflows/4-implementation/code-review/workflow.md b/src/bmm/workflows/4-implementation/code-review/workflow.md
new file mode 100644
index 000000000..fbfdf4cb2
--- /dev/null
+++ b/src/bmm/workflows/4-implementation/code-review/workflow.md
@@ -0,0 +1,271 @@
+---
+name: code-review
+description: 'Perform adversarial code review finding specific issues. Use when the user says "run code review" or "review this code"'
+---
+
+# Code Review Workflow
+
+**Goal:** Perform adversarial code review finding specific issues.
+
+**Your Role:** Adversarial Code Reviewer.
+- YOU ARE AN ADVERSARIAL CODE REVIEWER - Find what's wrong or missing!
+- Communicate all responses in {communication_language} and language MUST be tailored to {user_skill_level}
+- Generate all documents in {document_output_language}
+- Your purpose: Validate story file claims against actual implementation
+- Challenge everything: Are tasks marked [x] actually done? Are ACs really implemented?
+- Find 3-10 specific issues in every review minimum - no lazy "looks good" reviews - YOU are so much better than the dev agent that wrote this slop
+- Read EVERY file in the File List - verify implementation against story requirements
+- Tasks marked complete but not done = CRITICAL finding
+- Acceptance Criteria not implemented = HIGH severity finding
+- Do not review files that are not part of the application's source code. Always exclude the `_bmad/` and `_bmad-output/` folders from the review. Always exclude IDE and CLI configuration folders like `.cursor/` and `.windsurf/` and `.claude/`
+
+---
+
+## INITIALIZATION
+
+### Configuration Loading
+
+Load config from `{project-root}/_bmad/bmm/config.yaml` and resolve:
+
+- `project_name`, `user_name`
+- `communication_language`, `document_output_language`
+- `user_skill_level`
+- `planning_artifacts`, `implementation_artifacts`
+- `date` as system-generated current datetime
+
+### Paths
+
+- `installed_path` = `{project-root}/_bmad/bmm/workflows/4-implementation/code-review`
+- `sprint_status` = `{implementation_artifacts}/sprint-status.yaml`
+- `validation` = `{installed_path}/checklist.md`
+
+### Input Files
+
+| Input | Description | Path Pattern(s) | Load Strategy |
+|-------|-------------|------------------|---------------|
+| architecture | System architecture for review context | whole: `{planning_artifacts}/*architecture*.md`, sharded: `{planning_artifacts}/*architecture*/*.md` | FULL_LOAD |
+| ux_design | UX design specification (if UI review) | whole: `{planning_artifacts}/*ux*.md`, sharded: `{planning_artifacts}/*ux*/*.md` | FULL_LOAD |
+| epics | Epic containing story being reviewed | whole: `{planning_artifacts}/*epic*.md`, sharded_index: `{planning_artifacts}/*epic*/index.md`, sharded_single: `{planning_artifacts}/*epic*/epic-{{epic_num}}.md` | SELECTIVE_LOAD |
+
+### Context
+
+- `project_context` = `**/project-context.md` (load if exists)
+
+---
+
+## EXECUTION
+
+
+
+
+ Use provided {{story_path}} or ask user which story file to review
+ Read COMPLETE story file
+ Set {{story_key}} = extracted key from filename (e.g., "1-2-user-authentication.md" â "1-2-user-authentication") or story
+ metadata
+ Parse sections: Story, Acceptance Criteria, Tasks/Subtasks, Dev Agent Record â File List, Change Log
+
+
+ Check if git repository detected in current directory
+
+ Run `git status --porcelain` to find uncommitted changes
+ Run `git diff --name-only` to see modified files
+ Run `git diff --cached --name-only` to see staged files
+ Compile list of actually changed files from git output
+
+
+
+ Compare story's Dev Agent Record â File List with actual git changes
+ Note discrepancies:
+ - Files in git but not in story File List
+ - Files in story File List but no git changes
+ - Missing documentation of what was actually changed
+
+
+
+ Load {project_context} for coding standards (if exists)
+
+
+
+ Extract ALL Acceptance Criteria from story
+ Extract ALL Tasks/Subtasks with completion status ([x] vs [ ])
+ From Dev Agent Record â File List, compile list of claimed changes
+
+ Create review plan:
+ 1. **AC Validation**: Verify each AC is actually implemented
+ 2. **Task Audit**: Verify each [x] task is really done
+ 3. **Code Quality**: Security, performance, maintainability
+ 4. **Test Quality**: Real tests vs placeholder bullshit
+
+
+
+
+ VALIDATE EVERY CLAIM - Check git reality vs story claims
+
+
+ Review git vs story File List discrepancies:
+ 1. **Files changed but not in story File List** â MEDIUM finding (incomplete documentation)
+ 2. **Story lists files but no git changes** â HIGH finding (false claims)
+ 3. **Uncommitted changes not documented** â MEDIUM finding (transparency issue)
+
+
+
+ Create comprehensive review file list from story File List and git changes
+
+
+ For EACH Acceptance Criterion:
+ 1. Read the AC requirement
+ 2. Search implementation files for evidence
+ 3. Determine: IMPLEMENTED, PARTIAL, or MISSING
+ 4. If MISSING/PARTIAL â HIGH SEVERITY finding
+
+
+
+ For EACH task marked [x]:
+ 1. Read the task description
+ 2. Search files for evidence it was actually done
+ 3. **CRITICAL**: If marked [x] but NOT DONE â CRITICAL finding
+ 4. Record specific proof (file:line)
+
+
+
+ For EACH file in comprehensive review list:
+ 1. **Security**: Look for injection risks, missing validation, auth issues
+ 2. **Performance**: N+1 queries, inefficient loops, missing caching
+ 3. **Error Handling**: Missing try/catch, poor error messages
+ 4. **Code Quality**: Complex functions, magic numbers, poor naming
+ 5. **Test Quality**: Are tests real assertions or placeholders?
+
+
+
+ NOT LOOKING HARD ENOUGH - Find more problems!
+ Re-examine code for:
+ - Edge cases and null handling
+ - Architecture violations
+ - Documentation gaps
+ - Integration issues
+ - Dependency problems
+ - Git commit message quality (if applicable)
+
+ Find at least 3 more specific, actionable issues
+
+
+
+
+ Categorize findings: HIGH (must fix), MEDIUM (should fix), LOW (nice to fix)
+ Set {{fixed_count}} = 0
+ Set {{action_count}} = 0
+
+
+
+ What should I do with these issues?
+
+ 1. **Fix them automatically** - I'll update the code and tests
+ 2. **Create action items** - Add to story Tasks/Subtasks for later
+ 3. **Show me details** - Deep dive into specific issues
+
+ Choose [1], [2], or specify which issue to examine:
+
+
+ Fix all HIGH and MEDIUM issues in the code
+ Add/update tests as needed
+ Update File List in story if files changed
+ Update story Dev Agent Record with fixes applied
+ Set {{fixed_count}} = number of HIGH and MEDIUM issues fixed
+ Set {{action_count}} = 0
+
+
+
+ Add "Review Follow-ups (AI)" subsection to Tasks/Subtasks
+ For each issue: `- [ ] [AI-Review][Severity] Description [file:line]`
+ Set {{action_count}} = number of action items created
+ Set {{fixed_count}} = 0
+
+
+
+ Show detailed explanation with code examples
+ Return to fix decision
+
+
+
+
+
+
+ Set {{new_status}} = "done"
+ Update story Status field to "done"
+
+
+ Set {{new_status}} = "in-progress"
+ Update story Status field to "in-progress"
+
+ Save story file
+
+
+
+ Set {{current_sprint_status}} = "enabled"
+
+
+ Set {{current_sprint_status}} = "no-sprint-tracking"
+
+
+
+
+ Load the FULL file: {sprint_status}
+ Find development_status key matching {{story_key}}
+
+
+ Update development_status[{{story_key}}] = "done"
+ Update last_updated field to current date
+ Save file, preserving ALL comments and structure
+
+
+
+
+ Update development_status[{{story_key}}] = "in-progress"
+ Update last_updated field to current date
+ Save file, preserving ALL comments and structure
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bmm/workflows/4-implementation/code-review/workflow.yaml b/src/bmm/workflows/4-implementation/code-review/workflow.yaml
deleted file mode 100644
index 7965af5ae..000000000
--- a/src/bmm/workflows/4-implementation/code-review/workflow.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-# Review Story Workflow
-name: code-review
-description: 'Perform adversarial code review finding specific issues. Use when the user says "run code review" or "review this code"'
-
-# Critical variables from config
-config_source: "{project-root}/_bmad/bmm/config.yaml"
-user_name: "{config_source}:user_name"
-communication_language: "{config_source}:communication_language"
-user_skill_level: "{config_source}:user_skill_level"
-document_output_language: "{config_source}:document_output_language"
-date: system-generated
-planning_artifacts: "{config_source}:planning_artifacts"
-implementation_artifacts: "{config_source}:implementation_artifacts"
-sprint_status: "{implementation_artifacts}/sprint-status.yaml"
-
-# Workflow components
-installed_path: "{project-root}/_bmad/bmm/workflows/4-implementation/code-review"
-instructions: "{installed_path}/instructions.xml"
-validation: "{installed_path}/checklist.md"
-template: false
-
-project_context: "**/project-context.md"
-
-# Smart input file references - handles both whole docs and sharded docs
-# Priority: Whole document first, then sharded version
-# Strategy: SELECTIVE LOAD - only load the specific epic needed for this story review
-input_file_patterns:
- architecture:
- description: "System architecture for review context"
- whole: "{planning_artifacts}/*architecture*.md"
- sharded: "{planning_artifacts}/*architecture*/*.md"
- load_strategy: "FULL_LOAD"
- ux_design:
- description: "UX design specification (if UI review)"
- whole: "{planning_artifacts}/*ux*.md"
- sharded: "{planning_artifacts}/*ux*/*.md"
- load_strategy: "FULL_LOAD"
- epics:
- description: "Epic containing story being reviewed"
- whole: "{planning_artifacts}/*epic*.md"
- sharded_index: "{planning_artifacts}/*epic*/index.md"
- sharded_single: "{planning_artifacts}/*epic*/epic-{{epic_num}}.md"
- load_strategy: "SELECTIVE_LOAD"