diff --git a/package-lock.json b/package-lock.json
index ba768eff9..d03230bf0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "bmad-method",
- "version": "6.0.0-Beta.6",
+ "version": "6.0.0-Beta.7",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "bmad-method",
- "version": "6.0.0-Beta.6",
+ "version": "6.0.0-Beta.7",
"license": "MIT",
"dependencies": {
"@clack/core": "^1.0.0",
diff --git a/package.json b/package.json
index 7b5fd9a29..3d66a3be3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/package.json",
"name": "bmad-method",
- "version": "6.0.0-Beta.6",
+ "version": "6.0.0-Beta.7",
"description": "Breakthrough Method of Agile AI-driven Development",
"keywords": [
"agile",
diff --git a/src/bmm/workflows/1-analysis/research/technical-steps/step-04-architectural-patterns.md b/src/bmm/workflows/1-analysis/research/technical-steps/step-04-architectural-patterns.md
index 426cc6623..3d0e66ab3 100644
--- a/src/bmm/workflows/1-analysis/research/technical-steps/step-04-architectural-patterns.md
+++ b/src/bmm/workflows/1-analysis/research/technical-steps/step-04-architectural-patterns.md
@@ -155,7 +155,7 @@ Show the generated architectural patterns and present continue option:
#### If 'C' (Continue):
- Append the final content to the research document
-- Update frontmatter: `stepsCompleted: [1, 2, 3]`
+- Update frontmatter: `stepsCompleted: [1, 2, 3, 4]`
- Load: `./step-05-implementation-research.md`
## APPEND TO DOCUMENT:
diff --git a/src/bmm/workflows/1-analysis/research/technical-steps/step-05-implementation-research.md b/src/bmm/workflows/1-analysis/research/technical-steps/step-05-implementation-research.md
index 7117d5251..994537356 100644
--- a/src/bmm/workflows/1-analysis/research/technical-steps/step-05-implementation-research.md
+++ b/src/bmm/workflows/1-analysis/research/technical-steps/step-05-implementation-research.md
@@ -1,4 +1,4 @@
-# Technical Research Step 4: Implementation Research
+# Technical Research Step 5: Implementation Research
## MANDATORY EXECUTION RULES (READ FIRST):
@@ -17,7 +17,7 @@
- 🎯 Show web search analysis before presenting findings
- ⚠️ Present [C] complete option after implementation research content generation
- 💾 ONLY save when user chooses C (Complete)
-- 📖 Update frontmatter `stepsCompleted: [1, 2, 3, 4]` before completing workflow
+- 📖 Update frontmatter `stepsCompleted: [1, 2, 3, 4, 5]` before completing workflow
- 🚫 FORBIDDEN to complete workflow until C is selected
## CONTEXT BOUNDARIES:
@@ -25,7 +25,7 @@
- Current document and frontmatter from previous steps are available
- Focus on implementation approaches and technology adoption strategies
- Web search capabilities with source verification are enabled
-- This is the final step in the technical research workflow
+- This step prepares for the final synthesis step
## YOUR TASK:
@@ -149,10 +149,10 @@ _Source: [URL]_
[Success measurement framework]
```
-### 6. Present Analysis and Complete Option
+### 6. Present Analysis and Continue Option
-Show the generated implementation research and present complete option:
-"I've completed the **implementation research and technology adoption** analysis, finalizing our comprehensive technical research.
+Show the generated implementation research and present continue option:
+"I've completed the **implementation research and technology adoption** analysis for {{research_topic}}.
**Implementation Highlights:**
@@ -162,23 +162,24 @@ Show the generated implementation research and present complete option:
- Team organization and skill requirements identified
- Cost optimization and resource management strategies provided
-**This completes our technical research covering:**
+**Technical research phases completed:**
-- Technical overview and landscape analysis
-- Architectural patterns and design decisions
-- Implementation approaches and technology adoption
-- Practical recommendations and implementation roadmap
+- Step 1: Research scope confirmation
+- Step 2: Technology stack analysis
+- Step 3: Integration patterns analysis
+- Step 4: Architectural patterns analysis
+- Step 5: Implementation research (current step)
-**Ready to complete the technical research report?**
-[C] Complete Research - Save final document and conclude
+**Ready to proceed to the final synthesis step?**
+[C] Continue - Save this to document and proceed to synthesis
-### 7. Handle Complete Selection
+### 7. Handle Continue Selection
-#### If 'C' (Complete Research):
+#### If 'C' (Continue):
- Append the final content to the research document
-- Update frontmatter: `stepsCompleted: [1, 2, 3, 4]`
-- Complete the technical research workflow
+- Update frontmatter: `stepsCompleted: [1, 2, 3, 4, 5]`
+- Load: `./step-06-research-synthesis.md`
## APPEND TO DOCUMENT:
@@ -191,9 +192,9 @@ When user selects 'C', append the content directly to the research document usin
✅ Testing and deployment practices clearly documented
✅ Team organization and skill requirements mapped
✅ Cost optimization and risk mitigation strategies provided
-✅ [C] complete option presented and handled correctly
+✅ [C] continue option presented and handled correctly
✅ Content properly appended to document when C selected
-✅ Technical research workflow completed successfully
+✅ Proper routing to synthesis step (step-06)
## FAILURE MODES:
@@ -202,8 +203,9 @@ When user selects 'C', append the content directly to the research document usin
❌ Missing critical technology adoption strategies
❌ Not providing practical implementation guidance
❌ Incomplete development workflows or operational practices analysis
-❌ Not presenting completion option for research workflow
+❌ Not presenting continue option to synthesis step
❌ Appending content without user selecting 'C'
+❌ Not routing to step-06-research-synthesis.md
❌ **CRITICAL**: Reading only partial step file - leads to incomplete understanding and poor decisions
❌ **CRITICAL**: Proceeding with 'C' without fully reading and understanding the next step file
@@ -221,19 +223,11 @@ When user selects 'C', append the content directly to the research document usin
When 'C' is selected:
-- All technical research steps completed
-- Comprehensive technical research document generated
-- All sections appended with source citations
-- Technical research workflow status updated
-- Final implementation recommendations provided to user
+- Implementation research step completed
+- Content appended to research document with source citations
+- Frontmatter updated with stepsCompleted: [1, 2, 3, 4, 5]
+- Ready to proceed to final synthesis step
-## NEXT STEPS:
+## NEXT STEP:
-Technical research workflow complete. User may:
-
-- Use technical research to inform architecture decisions
-- Conduct additional research on specific technologies
-- Combine technical research with other research types for comprehensive insights
-- Move forward with implementation based on technical insights
-
-Congratulations on completing comprehensive technical research! 🎉
+After user selects 'C', load `./step-06-research-synthesis.md` to produce the comprehensive technical research document with narrative introduction, detailed TOC, and executive summary.
diff --git a/src/bmm/workflows/1-analysis/research/technical-steps/step-06-research-synthesis.md b/src/bmm/workflows/1-analysis/research/technical-steps/step-06-research-synthesis.md
index 7dc28a2d9..27331f667 100644
--- a/src/bmm/workflows/1-analysis/research/technical-steps/step-06-research-synthesis.md
+++ b/src/bmm/workflows/1-analysis/research/technical-steps/step-06-research-synthesis.md
@@ -1,4 +1,4 @@
-# Technical Research Step 5: Technical Synthesis and Completion
+# Technical Research Step 6: Technical Synthesis and Completion
## MANDATORY EXECUTION RULES (READ FIRST):
@@ -18,7 +18,7 @@
- 🎯 Show web search analysis before presenting findings
- ⚠️ Present [C] complete option after synthesis content generation
- 💾 ONLY save when user chooses C (Complete)
-- 📖 Update frontmatter `stepsCompleted: [1, 2, 3, 4, 5]` before completing workflow
+- 📖 Update frontmatter `stepsCompleted: [1, 2, 3, 4, 5, 6]` before completing workflow
- 🚫 FORBIDDEN to complete workflow until C is selected
- 📚 GENERATE COMPLETE DOCUMENT STRUCTURE with intro, TOC, and summary
@@ -417,7 +417,7 @@ _This comprehensive technical research document serves as an authoritative techn
#### If 'C' (Complete Research):
- Append the complete technical document to the research file
-- Update frontmatter: `stepsCompleted: [1, 2, 3, 4, 5]`
+- Update frontmatter: `stepsCompleted: [1, 2, 3, 4, 5, 6]`
- Complete the technical research workflow
- Provide final technical document delivery confirmation
diff --git a/src/bmm/workflows/bmad-quick-flow/quick-dev/steps/step-05-adversarial-review.md b/src/bmm/workflows/bmad-quick-flow/quick-dev/steps/step-05-adversarial-review.md
index 50c786d04..659553215 100644
--- a/src/bmm/workflows/bmad-quick-flow/quick-dev/steps/step-05-adversarial-review.md
+++ b/src/bmm/workflows/bmad-quick-flow/quick-dev/steps/step-05-adversarial-review.md
@@ -59,7 +59,7 @@ Merge all changes into `{diff_output}`.
### 2. Invoke Adversarial Review
-With `{diff_output}` constructed, invoke the review task. If possible, use information asymmetry: run this step, and only it, in a separate subagent or process with read access to the project, but no context except the `{diff_output}`.
+With `{diff_output}` constructed, load and follow the review task. If possible, use information asymmetry: load this step, and only it, in a separate subagent or process with read access to the project, but no context except the `{diff_output}`.
```xml
Review {diff_output} using {project-root}/_bmad/core/tasks/review-adversarial-general.xml
diff --git a/src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-04-review.md b/src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-04-review.md
index a223a2e4f..29e5a59d6 100644
--- a/src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-04-review.md
+++ b/src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-04-review.md
@@ -153,7 +153,7 @@ b) **HALT and wait for user selection.**
#### Adversarial Review [R] Process:
1. **Invoke Adversarial Review Task**:
- > With `{finalFile}` constructed, invoke the review task. If possible, use information asymmetry: run this task, and only it, in a separate subagent or process with read access to the project, but no context except the `{finalFile}`.
+ > With `{finalFile}` constructed, load and follow the review task. If possible, use information asymmetry: load this task, and only it, in a separate subagent or process with read access to the project, but no context except the `{finalFile}`.
Review {finalFile} using {project-root}/_bmad/core/tasks/review-adversarial-general.xml
> **Platform fallback:** If task invocation not available, load the task file and follow its instructions inline, passing `{finalFile}` as the content.
> The task should: review `{finalFile}` and return a list of findings.
diff --git a/src/core/workflows/party-mode/steps/step-03-graceful-exit.md b/src/core/workflows/party-mode/steps/step-03-graceful-exit.md
index eef378774..92274a382 100644
--- a/src/core/workflows/party-mode/steps/step-03-graceful-exit.md
+++ b/src/core/workflows/party-mode/steps/step-03-graceful-exit.md
@@ -142,6 +142,17 @@ Thank you for using BMAD Party Mode for collaborative multi-agent discussions!"
- Express genuine appreciation for user's participation and engagement
- Leave user with encouragement for future collaborative sessions
+## RETURN PROTOCOL:
+
+If this workflow was invoked from within a parent workflow:
+
+1. Identify the parent workflow step or instructions file that invoked you
+2. Re-read that file now to restore context
+3. Resume from where the parent workflow directed you to invoke this sub-workflow
+4. Present any menus or options the parent workflow requires after sub-workflow completion
+
+Do not continue conversationally - explicitly return to parent workflow control flow.
+
## WORKFLOW COMPLETION:
After farewell sequence and final closure: