diff --git a/docs/bmad-brownfield-guide.md b/docs/bmad-brownfield-guide.md
index b4b7045d..b024dfd7 100644
--- a/docs/bmad-brownfield-guide.md
+++ b/docs/bmad-brownfield-guide.md
@@ -451,7 +451,7 @@ Phase Transition → sprint-planning
┌──────────────────┴──────────────────┐
│ │
↓ ↓
-create-story → story-context → dev-story → review-story
+create-story → story-context → dev-story → code-review
│ │ │ │
↓ ↓ ↓ ↓
drafted ready-for-dev in-progress review
@@ -488,7 +488,7 @@ backlog → drafted → ready-for-dev → in-progress → review → done
| `create-story` | SM | Draft individual story | Story: backlog → drafted |
| `story-context` | SM | Generate implementation context | Story: drafted → ready-for-dev |
| `dev-story` | DEV | Implement story | Story: ready-for-dev → in-progress → review |
-| `review-story` | SM/SR | Quality validation | Manual state management |
+| `code-review` | SM/SR | Quality validation | Manual state management |
| `retrospective` | SM | Capture epic learnings | Retrospective: optional → completed |
| `correct-course` | SM | Handle issues/scope changes | Adaptive based on situation |
@@ -832,7 +832,7 @@ Use the Test Architect (TEA) workflows:
3. `tech-spec` → analyzes bug, plans fix, creates single story
4. `sprint-planning` → creates sprint status
5. `dev-story` → implement fix
-6. `review-story` → validate fix + test regression
+6. `code-review` → validate fix + test regression
**Time:** ~2-4 hours total
@@ -1006,7 +1006,7 @@ Use the Test Architect (TEA) workflows:
1. Ensure `document-project` captured existing patterns
2. Review architecture documentation before Phase 4
3. Use `story-context` to inject pattern guidance
-4. Include pattern adherence in `review-story` checklist
+4. Include pattern adherence in `code-review` checklist
5. Run retrospectives to identify pattern deviations
## Test Architect Integration
@@ -1094,7 +1094,7 @@ bmad sm epic-tech-context # Create epic context
bmad sm create-story # Draft story
bmad sm story-context # Create story context
bmad dev dev-story # Implement story
-bmad sm review-story # Review implementation
+bmad sm code-review # Review implementation
# (Manually update sprint-status.yaml to 'done')
bmad sm retrospective # After epic completion
bmad sm correct-course # If issues arise
diff --git a/src/modules/bmm/README.md b/src/modules/bmm/README.md
index ed92f354..823eed5b 100644
--- a/src/modules/bmm/README.md
+++ b/src/modules/bmm/README.md
@@ -53,7 +53,7 @@ The heart of BMM - structured workflows for the four development phases:
- `story-context` - Expertise injection (SM agent)
- `dev-story` - Implementation (DEV agent)
- `story-done` - Mark story done (DEV agent)
- - `review-story` - Quality validation (DEV/SR agent)
+ - `code-review` - Quality validation (DEV/SR agent)
- `correct-course` - Issue resolution
- `retrospective` - Continuous improvement
diff --git a/src/modules/bmm/agents/dev.agent.yaml b/src/modules/bmm/agents/dev.agent.yaml
index 9ea37292..78e1babc 100644
--- a/src/modules/bmm/agents/dev.agent.yaml
+++ b/src/modules/bmm/agents/dev.agent.yaml
@@ -38,6 +38,6 @@ agent:
workflow: "{project-root}/bmad/bmm/workflows/4-implementation/story-done/workflow.yaml"
description: Mark story done after DoD complete
- - trigger: review
- workflow: "{project-root}/bmad/bmm/workflows/4-implementation/review-story/workflow.yaml"
+ - trigger: code-review
+ workflow: "{project-root}/bmad/bmm/workflows/4-implementation/code-review/workflow.yaml"
description: "Perform a thorough clean context review on a story flagged Ready for Review, and appends review notes to story file"
diff --git a/src/modules/bmm/agents/game-dev.agent.yaml b/src/modules/bmm/agents/game-dev.agent.yaml
index 96988be4..e027b875 100644
--- a/src/modules/bmm/agents/game-dev.agent.yaml
+++ b/src/modules/bmm/agents/game-dev.agent.yaml
@@ -30,8 +30,8 @@ agent:
workflow: "{project-root}/bmad/bmm/workflows/4-implementation/dev-story/workflow.yaml"
description: Implement Story with Context
- - trigger: review-story
- workflow: "{project-root}/bmad/bmm/workflows/4-implementation/review-story/workflow.yaml"
+ - trigger: code-review
+ workflow: "{project-root}/bmad/bmm/workflows/4-implementation/code-review/workflow.yaml"
description: Review Story Implementation
- trigger: retro
diff --git a/src/modules/bmm/workflows/4-implementation/README.md b/src/modules/bmm/workflows/4-implementation/README.md
index 774108af..f3bcf53d 100644
--- a/src/modules/bmm/workflows/4-implementation/README.md
+++ b/src/modules/bmm/workflows/4-implementation/README.md
@@ -30,7 +30,7 @@ Stories progress through a six-state flow representing their journey from idea t
| **drafted** | Story file has been created via `create-story` workflow | SM Agent | ready-for-dev |
| **ready-for-dev** | Story has been drafted, approved, and context created via `story-context` workflow | SM Agent | in-progress |
| **in-progress** | Developer is actively implementing the story | Dev Agent | review |
-| **review** | Implementation complete, under SM review via `review-story` workflow | Dev Agent | done |
+| **review** | Implementation complete, under SM review via `code-review` workflow | Dev Agent | done |
| **done** | Story has been reviewed and completed | Dev Agent | - |
**File Indicators:**
@@ -65,7 +65,7 @@ graph LR
backlog --> drafted[drafted via create-story]
drafted --> ready[ready-for-dev via story-context]
ready --> progress[in-progress - dev starts]
- progress --> review[review via review-story]
+ progress --> review[review via code-review]
review --> done[done - dev completes]
```
@@ -110,7 +110,7 @@ development_status:
| **create-story** | Draft a story from epics/PRD | story: backlog → drafted |
| **story-context** | Add implementation context to story | story: drafted → ready-for-dev |
| **dev-story** | Developer implements the story | story: ready-for-dev → in-progress |
-| **review-story** | SM reviews implementation | story: in-progress → review |
+| **code-review** | SM reviews implementation | story: in-progress → review |
| **retrospective** | Conduct epic retrospective | retrospective: optional → completed |
| **correct-course** | Course correction when needed | Various status updates |
@@ -150,7 +150,7 @@ Run this workflow:
- Create epic contexts (`epic-tech-context`)
- Draft stories (`create-story`)
- Create story contexts (`story-context`)
-- Review completed work (`review-story`)
+- Review completed work (`code-review`)
- Update status in sprint-status.yaml
### Developer Agent
diff --git a/src/modules/bmm/workflows/4-implementation/create-story/README.md b/src/modules/bmm/workflows/4-implementation/create-story/README.md
index 7160ad2b..e9627d6c 100644
--- a/src/modules/bmm/workflows/4-implementation/create-story/README.md
+++ b/src/modules/bmm/workflows/4-implementation/create-story/README.md
@@ -85,7 +85,7 @@ The create-story workflow is step 1 in the v6 implementation cycle:
1. **SM: create-story** ← You are here
2. SM: story-context (adds JIT technical expertise)
3. DEV: dev-story (implements with generated context)
-4. DEV/SR: review-story (validates completion)
+4. DEV/SR: code-review (validates completion)
5. If needed: correct-course (adjusts direction)
6. After epic: retrospective (captures learnings)
diff --git a/src/modules/bmm/workflows/4-implementation/dev-story/README.md b/src/modules/bmm/workflows/4-implementation/dev-story/README.md
index 8562f2a9..da3ed655 100644
--- a/src/modules/bmm/workflows/4-implementation/dev-story/README.md
+++ b/src/modules/bmm/workflows/4-implementation/dev-story/README.md
@@ -4,7 +4,7 @@ The dev-story workflow is where v6's just-in-time context approach delivers its
The workflow operates with two critical inputs: the story file (created by SM's create-story) containing acceptance criteria, tasks, and requirements; and the story-context XML (generated by SM's story-context) providing just-in-time expertise injection tailored to the story's technical needs. This dual-input approach ensures the developer has both the "what" (from the story) and the "how" (from the context) needed for successful implementation. The workflow iterates through tasks sequentially, implementing code, writing tests, and updating the story document's allowed sections until all tasks are complete.
-A critical aspect of v6 flow is that dev-story may be run multiple times for the same story. Initially run to implement the story, it may be run again after review-story identifies issues that need correction. The workflow intelligently resumes from incomplete tasks, making it ideal for both initial implementation and post-review fixes. The DEV agent maintains strict boundaries on what can be modified in the story file—only Tasks/Subtasks checkboxes, Dev Agent Record, File List, Change Log, and Status may be updated, preserving the story's requirements integrity.
+A critical aspect of v6 flow is that dev-story may be run multiple times for the same story. Initially run to implement the story, it may be run again after code-review identifies issues that need correction. The workflow intelligently resumes from incomplete tasks, making it ideal for both initial implementation and post-review fixes. The DEV agent maintains strict boundaries on what can be modified in the story file—only Tasks/Subtasks checkboxes, Dev Agent Record, File List, Change Log, and Status may be updated, preserving the story's requirements integrity.
## Usage
@@ -20,7 +20,7 @@ The DEV runs this workflow:
- After SM completes both create-story and story-context
- When a story status is "Draft" or "Approved" (ready for development)
-- After review-story identifies issues requiring fixes
+- After code-review identifies issues requiring fixes
- To resume work on a partially completed story
## Inputs
@@ -82,7 +82,7 @@ The DEV runs this workflow:
**Test-Driven Approach**: For each task, the workflow emphasizes writing tests that verify acceptance criteria before or alongside implementation, ensuring requirements are actually met.
-**Resumable Implementation**: If the workflow is run again on a story with incomplete tasks (e.g., after review-story finds issues), it intelligently resumes from where it left off rather than starting over.
+**Resumable Implementation**: If the workflow is run again on a story with incomplete tasks (e.g., after code-review finds issues), it intelligently resumes from where it left off rather than starting over.
## Integration with v6 Flow
@@ -91,7 +91,7 @@ The dev-story workflow is step 3 in the v6 implementation cycle:
1. SM: create-story (generates the story specification)
2. SM: story-context (adds JIT technical expertise)
3. **DEV: dev-story** ← You are here (initial implementation)
-4. DEV/SR: review-story (validates completion)
+4. DEV/SR: code-review (validates completion)
5. If issues found: **DEV: dev-story** ← May return here for fixes
6. After epic: retrospective (captures learnings)
@@ -182,7 +182,7 @@ As a {role}, I want to {action} so that {benefit}
**Update Incrementally**: Update the story file after each task completion rather than batching updates at the end.
-**Respect Boundaries**: Never modify acceptance criteria or story description. If they seem wrong, that's a review-story or correct-course issue, not a dev-story fix.
+**Respect Boundaries**: Never modify acceptance criteria or story description. If they seem wrong, that's a code-review or correct-course issue, not a dev-story fix.
**Use Context Guidance**: Actively reference the story-context for patterns, gotchas, and best practices. It's there to help you succeed.
@@ -196,11 +196,11 @@ As a {role}, I want to {action} so that {benefit}
**Can't Modify Story Section**: Remember only Tasks, Dev Agent Record, File List, Change Log, and Status can be modified. Other sections are immutable.
-**Resuming After Review**: If review-story found issues, the workflow automatically picks up from incomplete tasks when run again.
+**Resuming After Review**: If code-review found issues, the workflow automatically picks up from incomplete tasks when run again.
## Related Workflows
- **create-story**: Creates the story specification (run by SM)
- **story-context**: Generates the context XML (run by SM)
-- **review-story**: Validates implementation (run by SR/DEV)
+- **code-review**: Validates implementation (run by SR/DEV)
- **correct-course**: Handles major issues or scope changes (run by SM)
diff --git a/src/modules/bmm/workflows/4-implementation/dev-story/instructions.md b/src/modules/bmm/workflows/4-implementation/dev-story/instructions.md
index 723be762..e254f648 100644
--- a/src/modules/bmm/workflows/4-implementation/dev-story/instructions.md
+++ b/src/modules/bmm/workflows/4-implementation/dev-story/instructions.md
@@ -188,7 +188,7 @@ Story is marked Ready for Review in file, but sprint-status.yaml may be out of s
- Review the implemented story yourself and test the changes
- Verify all acceptance criteria are met
- Ensure deployment readiness if applicable
- - Run `review-story` workflow for peer review
+ - Run `code-review` workflow for peer review
- Check sprint-status.yaml to see project progress
Remain flexible - allow user to choose their own path or ask for other assistance
diff --git a/src/modules/bmm/workflows/4-implementation/review-story/README.md b/src/modules/bmm/workflows/4-implementation/review-story/README.md
index 7ba80052..b98c086c 100644
--- a/src/modules/bmm/workflows/4-implementation/review-story/README.md
+++ b/src/modules/bmm/workflows/4-implementation/review-story/README.md
@@ -17,9 +17,9 @@ Perform an AI-driven Senior Developer Review on a story flagged "Ready for Revie
## How to Invoke
- By workflow name (if supported):
- - `workflow review-story`
+ - `workflow code-review`
- By path:
- - `workflow {project-root}/bmad/bmm/workflows/4-implementation/review-story/workflow.yaml`
+ - `workflow {project-root}/bmad/bmm/workflows/4-implementation/code-review/workflow.yaml`
## Inputs and Variables
diff --git a/src/modules/bmm/workflows/4-implementation/review-story/workflow.yaml b/src/modules/bmm/workflows/4-implementation/review-story/workflow.yaml
index 20422d34..b0b1e5b0 100644
--- a/src/modules/bmm/workflows/4-implementation/review-story/workflow.yaml
+++ b/src/modules/bmm/workflows/4-implementation/review-story/workflow.yaml
@@ -1,5 +1,5 @@
# Review Story Workflow
-name: review-story
+name: code-review
description: "Perform a Senior Developer Review on a completed story flagged Ready for Review, leveraging story-context, epic tech-spec, repo docs, MCP servers for latest best-practices, and web search as fallback. Appends structured review notes to the story."
author: "BMad"
@@ -13,7 +13,7 @@ document_output_language: "{config_source}:document_output_language"
date: system-generated
# Workflow components
-installed_path: "{project-root}/bmad/bmm/workflows/4-implementation/review-story"
+installed_path: "{project-root}/bmad/bmm/workflows/4-implementation/code-review"
instructions: "{installed_path}/instructions.md"
validation: "{installed_path}/checklist.md"
diff --git a/src/modules/bmm/workflows/4-implementation/sprint-planning/README.md b/src/modules/bmm/workflows/4-implementation/sprint-planning/README.md
index 28f87ea5..38d25935 100644
--- a/src/modules/bmm/workflows/4-implementation/sprint-planning/README.md
+++ b/src/modules/bmm/workflows/4-implementation/sprint-planning/README.md
@@ -136,7 +136,7 @@ This workflow is part of Phase 4 (Implementation) and integrates with:
2. **create-story** - Drafts individual story files
3. **story-context** - Adds implementation context to stories
4. **dev-story** - Developer implements the story
-5. **review-story** - SM reviews implementation
+5. **code-review** - SM reviews implementation
6. **retrospective** - Optional epic retrospective
## Benefits
diff --git a/src/modules/bmm/workflows/4-implementation/sprint-planning/instructions.md b/src/modules/bmm/workflows/4-implementation/sprint-planning/instructions.md
index 8745eb04..75326322 100644
--- a/src/modules/bmm/workflows/4-implementation/sprint-planning/instructions.md
+++ b/src/modules/bmm/workflows/4-implementation/sprint-planning/instructions.md
@@ -99,7 +99,7 @@ development_status:
# - drafted: Story file created in stories folder
# - ready-for-dev: Draft approved and story context created
# - in-progress: Developer actively working on implementation
-# - review: Under SM review (via review-story workflow)
+# - review: Under SM review (via code-review workflow)
# - done: Story completed
#
# Retrospective Status:
@@ -193,7 +193,7 @@ backlog → drafted → ready-for-dev → in-progress → review → done
- **drafted**: Story file created (e.g., `stories/1-3-plant-naming.md`)
- **ready-for-dev**: Draft approved + story context created
- **in-progress**: Developer actively working
-- **review**: Under SM review (via review-story workflow)
+- **review**: Under SM review (via code-review workflow)
- **done**: Completed
**Retrospective Status:**
diff --git a/src/modules/bmm/workflows/4-implementation/sprint-planning/sprint-status-template.yaml b/src/modules/bmm/workflows/4-implementation/sprint-planning/sprint-status-template.yaml
index 5bea7544..a35f50c3 100644
--- a/src/modules/bmm/workflows/4-implementation/sprint-planning/sprint-status-template.yaml
+++ b/src/modules/bmm/workflows/4-implementation/sprint-planning/sprint-status-template.yaml
@@ -19,7 +19,7 @@
# - drafted: Story file created in stories folder by *create-story
# - ready-for-dev: Draft approved and story context created by *story-ready
# - in-progress: Developer actively working on implementation by *dev-story
-# - review: Implementation complete, ready for review by *review-story
+# - review: Implementation complete, ready for review by *code-review
# - done: Story completed by *story-done
#
# Retrospective Status:
diff --git a/src/modules/bmm/workflows/4-implementation/story-done/instructions.md b/src/modules/bmm/workflows/4-implementation/story-done/instructions.md
index 98f28078..2827c8f7 100644
--- a/src/modules/bmm/workflows/4-implementation/story-done/instructions.md
+++ b/src/modules/bmm/workflows/4-implementation/story-done/instructions.md
@@ -35,7 +35,7 @@ All stories are either still in development or already done.
**Next Steps:**
1. Run `dev-story` to implement stories
-2. Run `review-story` if stories need review first
+2. Run `code-review` if stories need review first
3. Check sprint-status.yaml for current story states
HALT
diff --git a/src/modules/bmm/workflows/README.md b/src/modules/bmm/workflows/README.md
index 825c622e..375d1dd1 100644
--- a/src/modules/bmm/workflows/README.md
+++ b/src/modules/bmm/workflows/README.md
@@ -66,7 +66,7 @@ The BMM (BMAD Method Module) orchestrates software development through four dist
│ │ ↓ │
│ │ create-story ──→ story-context ──→ dev-story ─┐ │
│ │ ↓ │
-│ │ retrospective ←── [epic done] ←─── review-story │
+│ │ retrospective ←── [epic done] ←─── code-review │
│ │ ↓ │
│ └──────────── correct-course ←──[if issues]───────┘ │
└──────────────────────────────────────────────────────────────┘
@@ -245,7 +245,7 @@ optional ↔ completed
- **drafted**: Story file created (e.g., `stories/1-3-plant-naming.md`)
- **ready-for-dev**: Draft approved + story context created
- **in-progress**: Developer actively working on implementation
-- **review**: Under SM review (via review-story workflow)
+- **review**: Under SM review (via code-review workflow)
- **done**: Story completed and deployed
**Retrospective Statuses:**
@@ -290,7 +290,7 @@ Phase Transition (Phase 2 or 3 → Phase 4)
└───────────────────┬─────────────────────────────┘
↓
┌─────────────────────────────────────────────────┐
-│ SM: review-story (validates implementation) │
+│ DEV: code-review (validates implementation) │
│ Reviews: Code changes against DoD │
│ Feedback: Iteration or approval │
└───────────────────┬─────────────────────────────┘
@@ -324,7 +324,7 @@ Phase Transition (Phase 2 or 3 → Phase 4)
| **create-story** | SM | Draft individual story files | Story: backlog → drafted |
| **story-context** | SM | Generate implementation context/XML | Story: drafted → ready-for-dev |
| **dev-story** | DEV | Implement story | Story: ready-for-dev → in-progress → review |
-| **review-story** | SM/SR | Quality validation and feedback | (No automatic state change) |
+| **code-review** | SM/SR | Quality validation and feedback | (No automatic state change) |
| **retrospective** | SM | Capture epic learnings | Retrospective: optional → completed |
| **correct-course** | SM | Handle issues/scope changes | (Adaptive based on situation) |
@@ -380,7 +380,7 @@ workflow-status/workflow-init
| **1: Analysis** | Analyst, Game Designer | PM, Researcher | brainstorm-_, research, _-brief |
| **2: Planning** | PM | UX Designer, Analyst | prd, tech-spec, gdd, narrative |
| **3: Solutioning** | Architect | PM, Tech Lead | create-architecture, solutioning-gate-check |
-| **4: Implementation** | SM, DEV | SR (review-story) | sprint-planning, create-story, dev-story |
+| **4: Implementation** | SM, DEV | SR (code-review) | sprint-planning, create-story, dev-story |
## Key Files and Artifacts
@@ -509,7 +509,7 @@ bmad sm epic-tech-context # Create epic context (per epic)
bmad sm create-story # Draft story file
bmad sm story-context # Create story context
bmad dev dev-story # Implement story
-bmad sm review-story # Quality validation
+bmad sm code-review # Quality validation
# (Update sprint-status.yaml to 'done' manually or via workflow)
bmad sm retrospective # After epic complete
bmad sm correct-course # If issues arise