diff --git a/src/modules/bmm/workflows/4-implementation/create-story/instructions.md b/src/modules/bmm/workflows/4-implementation/create-story/instructions.md
index 8220f879..34a2e0b2 100644
--- a/src/modules/bmm/workflows/4-implementation/create-story/instructions.md
+++ b/src/modules/bmm/workflows/4-implementation/create-story/instructions.md
@@ -28,17 +28,43 @@
READ COMPLETE FILES for all items found in the prioritized set. Store content and paths for citation.
-
- List existing story markdown files in {{story_dir}} matching pattern: "story-..md"
- If none found → Set {{epic_num}}=1 and {{story_num}}=1
- If files found → Parse epic_num and story_num; pick the highest pair
- Open the latest story (if exists) and read Status
- If Status != Done/Approved and {{non_interactive}} == true → TARGET the latest story for update (do not create a new one)
- If Status == Done/Approved → Candidate next story is {{epic_num}}.{{story_num+1}}
- If creating a new story candidate: VERIFY planning in {{epics_file}}. Confirm that epic {{epic_num}} explicitly enumerates a next story matching {{story_num+1}} (or an equivalent next planned story entry). If epics.md is missing or does not enumerate another story for this epic, HALT with message:
- "No planned next story found in epics.md for epic {{epic_num}}. Please load either PM (Product Manager) agent at {project-root}/bmad/bmm/agents/pm.md or SM (Scrum Master) agent at {project-root}/bmad/bmm/agents/sm.md and run `*correct-course` to add/modify epic stories, then rerun create-story."
- If verification passes → Set {{story_num}} = {{story_num}} + 1
- If starting a new epic and {{non_interactive}} == false, ASK for {{epic_num}} and reset {{story_num}} to 1. In {{non_interactive}} == true, do NOT auto-advance epic; stay within current epic and continue incrementing story_num.
+
+ Query sprint-status for next backlog story:
+
+
+ action: get_next_story
+ filter_status: backlog
+
+
+
+
+ HALT
+
+
+ Parse {{result_story_key}} to extract epic_num, story_num, and story_title
+ Example: "1-2-user-authentication" → epic_num=1, story_num=2, title="user-authentication"
+
+ Set {{story_id}} = "{{epic_num}}.{{story_num}}"
+
+ Verify story is enumerated in {{epics_file}}. If not found, HALT with message:
+ "Story {{result_story_key}} not found in epics.md. Please load PM agent and run correct-course to sync epics, then rerun create-story."
+
+ Check if story file already exists at expected path in {{story_dir}}
+
+
+ Set update_mode = true
+
@@ -74,14 +100,31 @@
Validate against checklist at {installed_path}/checklist.md using bmad/core/tasks/validate-workflow.xml
Save document unconditionally (non-interactive default). In interactive mode, allow user confirmation.
+
+
+ action: update_story_status
+ story_key: {{result_story_key}}
+ new_status: drafted
+ validate: true
+
+
+
+
+
+
If {{auto_run_context}} == true → Pass {{story_path}} = {default_output_file}
Report created/updated story path
diff --git a/src/modules/bmm/workflows/4-implementation/epic-tech-context/instructions.md b/src/modules/bmm/workflows/4-implementation/epic-tech-context/instructions.md
index f7d94101..901dd7bd 100644
--- a/src/modules/bmm/workflows/4-implementation/epic-tech-context/instructions.md
+++ b/src/modules/bmm/workflows/4-implementation/epic-tech-context/instructions.md
@@ -16,6 +16,29 @@
Resolve output file path using workflow variables and initialize by writing the template.
+
+
+ action: get_epic_status
+ epic_id: {{epic_id}}
+
+
+
+
+ HALT
+
+
+
+
+
+
+
Read COMPLETE PRD and Architecture files.
@@ -68,18 +91,31 @@
Validate against checklist at {installed_path}/checklist.md using bmad/core/tasks/validate-workflow.xml
+
+
+ action: update_epic_status
+ epic_id: {{epic_id}}
+ new_status: contexted
+
+
+
+
+
+
diff --git a/src/modules/bmm/workflows/4-implementation/retrospective/instructions.md b/src/modules/bmm/workflows/4-implementation/retrospective/instructions.md
index b35680f5..b14c4cf0 100644
--- a/src/modules/bmm/workflows/4-implementation/retrospective/instructions.md
+++ b/src/modules/bmm/workflows/4-implementation/retrospective/instructions.md
@@ -26,6 +26,48 @@ FACILITATION NOTES:
If auto-detection succeeds, confirm with user: "It looks like Epic {{epic_number}} was just completed - is that correct?"
If auto-detection fails or user indicates different epic, ask them to share which epic they just completed
+Verify epic completion status in sprint-status:
+
+
+ action: check_epic_complete
+ epic_id: {{epic_number}}
+
+
+
+
+
+Epic is incomplete. Continue anyway? (yes/no)
+
+
+ HALT
+
+
+Set {{partial_retrospective}} = true
+
+
+
+
+
+
Load the completed epic from: {output_folder}/prd/epic-{{epic_number}}.md
Extract epic details:
@@ -361,6 +403,27 @@ See you at sprint planning once prep work is done!"
```
Save retrospective summary to: {output_folder}/retrospectives/epic-{{completed_number}}-retro-{{date}}.md
+
+
+ action: complete_retrospective
+ epic_id: {{completed_number}}
+
+
+
+
+
+
+
+
+
+
Confirm all action items have been captured
Remind user to schedule prep sprint if needed
-
+ - Load PM agent and run `epic-tech-context` for next epic
+ - Or continue with existing contexted epics
+
+
diff --git a/src/modules/bmm/workflows/4-implementation/review-story/instructions.md b/src/modules/bmm/workflows/4-implementation/review-story/instructions.md
index 55a97cd5..cc71a128 100644
--- a/src/modules/bmm/workflows/4-implementation/review-story/instructions.md
+++ b/src/modules/bmm/workflows/4-implementation/review-story/instructions.md
@@ -15,11 +15,49 @@
- If {{story_path}} was provided → use it. Else auto-discover from {{story_dir}} by listing files matching pattern: "story-*.md" (recursive), sort by last modified (newest first), present top {{story_selection_limit}}.
- Select a story (1-{{story_selection_limit}}) or enter a path:
- Resolve {{story_path}} and read the COMPLETE file.
- Extract {{epic_num}} and {{story_num}} from filename (e.g., story-2.3.*.md) and story metadata if available.
- Parse sections: Status, Story, Acceptance Criteria, Tasks/Subtasks (and completion states), Dev Notes, Dev Agent Record (Context Reference, Completion Notes, File List), Change Log.
+
+ Use {{story_path}} directly
+ Read COMPLETE file and parse sections
+ Extract story_key from filename or story metadata
+ verify_status
+
+
+ Query sprint-status for review stories:
+
+
+ action: list_stories
+ filter_status: review
+ limit: 10
+
+
+
+
+ HALT
+
+
+ Display available review stories:
+
+**Stories Ready for Review ({{result_count}} found):**
+
+{{result_story_list}}
+
+
+
+ Select story to review (enter story key or number):
+ Auto-select first story from result_stories
+
+ Resolve selected story_key and find file path in {{story_dir}}
+ Resolve {{story_path}} and read the COMPLETE file
+
+
+
+ Extract {{epic_num}} and {{story_num}} from filename (e.g., story-2.3.*.md) and story metadata if available
+ Parse sections: Status, Story, Acceptance Criteria, Tasks/Subtasks (and completion states), Dev Notes, Dev Agent Record (Context Reference, Completion Notes, File List), Change Log
HALT with message: "Story status must be 'Ready for Review' to proceed" (accept 'Review' as equivalent).
HALT.
@@ -80,6 +118,32 @@
Save the story file.
+
+ Determine target status based on review outcome:
+ - If {{outcome}} == "Approve" → target_status = "done"
+ - If {{outcome}} == "Changes Requested" → target_status = "in-progress"
+ - If {{outcome}} == "Blocked" → target_status = "review" (stay in review)
+
+
+
+ action: update_story_status
+ story_key: {{story_key}}
+ new_status: {{target_status}}
+ validate: true
+
+
+
+
+
+
+
+
+
+
+
Normalize Action Items into a structured list: description, severity (High/Med/Low), type (Bug/TechDebt/Enhancement), suggested owner (if known), related AC/file references.
@@ -104,13 +168,16 @@
**Story Details:**
- Story: {{epic_num}}.{{story_num}}
+- Story Key: {{story_key}}
- Review Outcome: {{outcome}}
+- Sprint Status: {{result_new_status}}
- Action Items: {{action_item_count}}
**Next Steps:**
1. Review the Senior Developer Review notes appended to story
-2. Address any action items or changes requested
-3. When ready, continue with implementation or mark story complete
+2. If approved: Story is marked done, continue with next story
+3. If changes requested: Address action items and re-run `dev-story`
+4. If blocked: Resolve blockers before proceeding
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 48ad46ec..d63276e7 100644
--- a/src/modules/bmm/workflows/4-implementation/story-done/instructions.md
+++ b/src/modules/bmm/workflows/4-implementation/story-done/instructions.md
@@ -10,25 +10,55 @@
This workflow is run by DEV agent AFTER user confirms a story is approved (Definition of Done is complete)
Workflow: Update story file status to Done
-
+
-If {{story_path}} explicitly provided → use it
-Otherwise list story-\*.md files from {{story_dir}}, sort by modified time
-Select the story to mark as Done, or enter path:
+If {{story_path}} is provided → use it directly; extract story_key from filename or metadata; GOTO mark_done
-Read the story file: {{story_path}}
-Extract story ID and title from the file
+Otherwise query sprint-status for reviewed stories:
+
+
+ action: list_stories
+ filter_status: review
+ limit: 10
+
+
+
+
+ HALT
+
+
+Display available reviewed stories:
+
+**Stories Ready to Mark Done ({{result_count}} found):**
+
+{{result_story_list}}
+
+
+
+Select the story to mark as Done (enter story key or number):
+
+Resolve selected story_key from user input
+Find matching story file in {{story_dir}} using story_key pattern
+
+
+
+Read the story file from resolved path
+Extract story_id and story_title from the file
Find the "Status:" line (usually at the top)
+Update story file: Change Status to "Done"
-Update story file:
-
-- Change: `Status: Ready for Review` or `Status: In Review` or similar
-- To: `Status: Done`
-
-Add completion notes if Dev Agent Record section exists:
-
-Find "## Dev Agent Record" section and add:
+Add completion notes to Dev Agent Record section:
+Find "## Dev Agent Record" section and add:
```
### Completion Notes
@@ -36,8 +66,24 @@ Find "## Dev Agent Record" section and add:
**Definition of Done:** All acceptance criteria met, code reviewed, tests passing
```
+
+
Save the story file
+
+ action: update_story_status
+ story_key: {{story_key}}
+ new_status: done
+ validate: true
+
+
+
+
+
+
@@ -45,10 +91,12 @@ Find "## Dev Agent Record" section and add:
+ - Run `create-story` for next backlog story
+ - Or run `dev-story` if ready stories exist
+2. Check epic completion status
+ - Run `retrospective` workflow to check if epic is complete
+ - Epic retrospective will verify all stories are done
+
diff --git a/src/modules/bmm/workflows/4-implementation/story-ready/instructions.md b/src/modules/bmm/workflows/4-implementation/story-ready/instructions.md
index 934810d2..c897aad7 100644
--- a/src/modules/bmm/workflows/4-implementation/story-ready/instructions.md
+++ b/src/modules/bmm/workflows/4-implementation/story-ready/instructions.md
@@ -10,24 +10,68 @@
This workflow is run by SM agent AFTER user reviews a drafted story and confirms it's ready for development
Simple workflow: Update story file status to Ready
-
+
-If {{story_path}} explicitly provided → use it
-Otherwise list story-\*.md files from {{story_dir}}, sort by modified time
-Select the drafted story to mark as Ready, or enter path:
+If {{story_path}} is provided → use it directly; extract story_key from filename or metadata; GOTO mark_ready
-Read the story file: {{story_path}}
-Extract story ID and title from the file
+Otherwise query sprint-status for drafted stories:
+
+
+ action: list_stories
+ filter_status: drafted
+ limit: 10
+
+
+
+
+ HALT
+
+
+Display available drafted stories:
+
+**Drafted Stories Available ({{result_count}} found):**
+
+{{result_story_list}}
+
+
+
+Select the drafted story to mark as Ready (enter story key or number):
+Auto-select first story from result_stories
+
+Resolve selected story_key from user input or auto-selection
+Find matching story file in {{story_dir}} using story_key pattern
+
+
+
+Read the story file from resolved path
+Extract story_id and story_title from the file
Find the "Status:" line (usually at the top)
-
-Update story file:
-
-- Change: `Status: Draft` or similar
-- To: `Status: Ready`
-
+Update story file: Change Status to "Ready"
Save the story file
+
+ action: update_story_status
+ story_key: {{story_key}}
+ new_status: ready-for-dev
+ validate: true
+
+
+
+
+
+
@@ -35,10 +79,12 @@