package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "bmad-method",
-  "version": "6.0.0-Beta.7",
+  "version": "6.0.0-Beta.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "bmad-method",
-      "version": "6.0.0-Beta.7",
+      "version": "6.0.0-Beta.6",
       "license": "MIT",
       "dependencies": {
         "@clack/core": "^1.0.0",

package.json

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

src/bmm/workflows/1-analysis/create-product-brief/steps/step-06-complete.md

@@ -128,7 +128,7 @@ Recap that the brief captures everything needed to guide subsequent product deve
 
 ### 5. Suggest next steps
 
-Product Brief complete. Read fully and follow: `_bmad/core/tasks/help.md` with argument `Validate PRD`.
+Product Brief complete. Read fully and follow: `_bmad/core/tasks/bmad-help.md` with argument `Validate PRD`.
 
 ---
 

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, 4]`
+- Update frontmatter: `stepsCompleted: [1, 2, 3]`
 - Load: `./step-05-implementation-research.md`
 
 ## APPEND TO DOCUMENT:

src/bmm/workflows/1-analysis/research/technical-steps/step-05-implementation-research.md

@@ -1,4 +1,4 @@
-# Technical Research Step 5: Implementation Research
+# Technical Research Step 4: 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, 5]` before completing workflow
+- 📖 Update frontmatter `stepsCompleted: [1, 2, 3, 4]` 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 step prepares for the final synthesis step
+- This is the final step in the technical research workflow
 
 ## YOUR TASK:
 
@@ -149,10 +149,10 @@ _Source: [URL]_
 [Success measurement framework]
 ```
 
-### 6. Present Analysis and Continue Option
+### 6. Present Analysis and Complete Option
 
-Show the generated implementation research and present continue option:
+Show the generated implementation research and present complete option:
-"I've completed the **implementation research and technology adoption** analysis for {{research_topic}}.
+"I've completed the **implementation research and technology adoption** analysis, finalizing our comprehensive technical research.
 
 **Implementation Highlights:**
 
@@ -162,24 +162,23 @@ Show the generated implementation research and present continue option:
 - Team organization and skill requirements identified
 - Cost optimization and resource management strategies provided
 
-**Technical research phases completed:**
+**This completes our technical research covering:**
 
-- Step 1: Research scope confirmation
+- Technical overview and landscape analysis
-- Step 2: Technology stack analysis
+- Architectural patterns and design decisions
-- Step 3: Integration patterns analysis
+- Implementation approaches and technology adoption
-- Step 4: Architectural patterns analysis
+- Practical recommendations and implementation roadmap
-- Step 5: Implementation research (current step)
 
-**Ready to proceed to the final synthesis step?**
+**Ready to complete the technical research report?**
-[C] Continue - Save this to document and proceed to synthesis
+[C] Complete Research - Save final document and conclude
 
-### 7. Handle Continue Selection
+### 7. Handle Complete Selection
 
-#### If 'C' (Continue):
+#### If 'C' (Complete Research):
 
 - Append the final content to the research document
-- Update frontmatter: `stepsCompleted: [1, 2, 3, 4, 5]`
+- Update frontmatter: `stepsCompleted: [1, 2, 3, 4]`
-- Load: `./step-06-research-synthesis.md`
+- Complete the technical research workflow
 
 ## APPEND TO DOCUMENT:
 
@@ -192,9 +191,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] continue option presented and handled correctly
+✅ [C] complete option presented and handled correctly
 ✅ Content properly appended to document when C selected
-✅ Proper routing to synthesis step (step-06)
+✅ Technical research workflow completed successfully
 
 ## FAILURE MODES:
 
@@ -203,9 +202,8 @@ 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 continue option to synthesis step
+❌ Not presenting completion option for research workflow
 ❌ 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
@@ -223,11 +221,19 @@ When user selects 'C', append the content directly to the research document usin
 
 When 'C' is selected:
 
-- Implementation research step completed
+- All technical research steps completed
-- Content appended to research document with source citations
+- Comprehensive technical research document generated
-- Frontmatter updated with stepsCompleted: [1, 2, 3, 4, 5]
+- All sections appended with source citations
-- Ready to proceed to final synthesis step
+- Technical research workflow status updated
+- Final implementation recommendations provided to user
 
-## NEXT STEP:
+## NEXT STEPS:
 
-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.
+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! 🎉

src/bmm/workflows/1-analysis/research/technical-steps/step-06-research-synthesis.md

@@ -1,4 +1,4 @@
-# Technical Research Step 6: Technical Synthesis and Completion
+# Technical Research Step 5: 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, 6]` before completing workflow
+- 📖 Update frontmatter `stepsCompleted: [1, 2, 3, 4, 5]` 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, 6]`
+- Update frontmatter: `stepsCompleted: [1, 2, 3, 4, 5]`
 - Complete the technical research workflow
 - Provide final technical document delivery confirmation
 

src/bmm/workflows/2-plan-workflows/create-prd/steps-c/step-12-complete.md

@@ -87,7 +87,7 @@ Offer validation workflows to ensure PRD is ready for implementation:
 
 ### 4. Suggest Next Workflows
 
-PRD complete. Read fully and follow: `_bmad/core/tasks/help.md` with argument `Create PRD`.
+PRD complete. Read fully and follow: `_bmad/core/tasks/bmad-help.md` with argument `Create PRD`.
 
 ### 5. Final Completion Confirmation
 

src/bmm/workflows/2-plan-workflows/create-prd/steps-v/step-v-13-report-complete.md

@@ -197,7 +197,7 @@ Display:
 - **IF X (Exit):**
   - Display: "**Validation Report Saved:** {validationReportPath}"
   - Display: "**Summary:** {overall status} - {recommendation}"
-  - PRD Validation complete. Read fully and follow: `_bmad/core/tasks/help.md` with argument `Validate PRD`.
+  - PRD Validation complete. Read fully and follow: `_bmad/core/tasks/bmad-help.md` with argument `Validate PRD`.
 
 - **IF Any other:** Help user, then redisplay menu
 

src/bmm/workflows/2-plan-workflows/create-ux-design/steps/step-14-complete.md

@@ -82,7 +82,7 @@ Update the main workflow status file:
 
 ### 3. Suggest Next Steps
 
-UX Design complete. Read fully and follow: `_bmad/core/tasks/help.md` with argument `Create UX`.
+UX Design complete. Read fully and follow: `_bmad/core/tasks/bmad-help.md` with argument `Create UX`.
 
 ### 5. Final Completion Confirmation
 

src/bmm/workflows/3-solutioning/check-implementation-readiness/steps/step-01-document-discovery.md

@@ -2,9 +2,15 @@
 name: 'step-01-document-discovery'
 description: 'Discover and inventory all project documents, handling duplicates and organizing file structure'
 
+# Path Definitions
+workflow_path: '{project-root}/_bmad/bmm/workflows/3-solutioning/implementation-readiness'
+
+# File References
+thisStepFile: './step-01-document-discovery.md'
 nextStepFile: './step-02-prd-analysis.md'
+workflowFile: '{workflow_path}/workflow.md'
 outputFile: '{planning_artifacts}/implementation-readiness-report-{{date}}.md'
-templateFile: '../templates/readiness-report-template.md'
+templateFile: '{workflow_path}/templates/readiness-report-template.md'
 ---
 
 # Step 1: Document Discovery

src/bmm/workflows/3-solutioning/check-implementation-readiness/steps/step-02-prd-analysis.md

@@ -2,7 +2,13 @@
 name: 'step-02-prd-analysis'
 description: 'Read and analyze PRD to extract all FRs and NFRs for coverage validation'
 
+# Path Definitions
+workflow_path: '{project-root}/_bmad/bmm/workflows/3-solutioning/implementation-readiness'
+
+# File References
+thisStepFile: './step-02-prd-analysis.md'
 nextStepFile: './step-03-epic-coverage-validation.md'
+workflowFile: '{workflow_path}/workflow.md'
 outputFile: '{planning_artifacts}/implementation-readiness-report-{{date}}.md'
 epicsFile: '{planning_artifacts}/*epic*.md' # Will be resolved to actual file
 ---

src/bmm/workflows/3-solutioning/check-implementation-readiness/steps/step-03-epic-coverage-validation.md

@@ -2,7 +2,13 @@
 name: 'step-03-epic-coverage-validation'
 description: 'Validate that all PRD FRs are covered in epics and stories'
 
+# Path Definitions
+workflow_path: '{project-root}/_bmad/bmm/workflows/3-solutioning/implementation-readiness'
+
+# File References
+thisStepFile: './step-03-epic-coverage-validation.md'
 nextStepFile: './step-04-ux-alignment.md'
+workflowFile: '{workflow_path}/workflow.md'
 outputFile: '{planning_artifacts}/implementation-readiness-report-{{date}}.md'
 ---
 

src/bmm/workflows/3-solutioning/check-implementation-readiness/steps/step-04-ux-alignment.md

@@ -2,7 +2,13 @@
 name: 'step-04-ux-alignment'
 description: 'Check for UX document and validate alignment with PRD and Architecture'
 
+# Path Definitions
+workflow_path: '{project-root}/_bmad/bmm/workflows/3-solutioning/implementation-readiness'
+
+# File References
+thisStepFile: './step-04-ux-alignment.md'
 nextStepFile: './step-05-epic-quality-review.md'
+workflowFile: '{workflow_path}/workflow.md'
 outputFile: '{planning_artifacts}/implementation-readiness-report-{{date}}.md'
 ---
 

src/bmm/workflows/3-solutioning/check-implementation-readiness/steps/step-05-epic-quality-review.md

@@ -2,8 +2,15 @@
 name: 'step-05-epic-quality-review'
 description: 'Validate epics and stories against create-epics-and-stories best practices'
 
+# Path Definitions
+workflow_path: '{project-root}/_bmad/bmm/workflows/3-solutioning/implementation-readiness'
+
+# File References
+thisStepFile: './step-05-epic-quality-review.md'
 nextStepFile: './step-06-final-assessment.md'
+workflowFile: '{workflow_path}/workflow.md'
 outputFile: '{planning_artifacts}/implementation-readiness-report-{{date}}.md'
+epicsBestPractices: '{project-root}/_bmad/bmm/workflows/3-solutioning/create-epics-and-stories'
 ---
 
 # Step 5: Epic Quality Review

src/bmm/workflows/3-solutioning/check-implementation-readiness/steps/step-06-final-assessment.md

@@ -2,6 +2,12 @@
 name: 'step-06-final-assessment'
 description: 'Compile final assessment and polish the readiness report'
 
+# Path Definitions
+workflow_path: '{project-root}/_bmad/bmm/workflows/3-solutioning/implementation-readiness'
+
+# File References
+thisStepFile: './step-06-final-assessment.md'
+workflowFile: '{workflow_path}/workflow.md'
 outputFile: '{planning_artifacts}/implementation-readiness-report-{{date}}.md'
 ---
 
@@ -109,7 +115,7 @@ The assessment found [number] issues requiring attention. Review the detailed re
 
 The implementation readiness workflow is now complete. The report contains all findings and recommendations for the user to consider.
 
-Implementation Readiness complete. Read fully and follow: `_bmad/core/tasks/help.md` with argument `implementation readiness`.
+Implementation Readiness complete. Read fully and follow: `_bmad/core/tasks/bmad-help.md` with argument `implementation readiness`.
 
 ---
 

src/bmm/workflows/3-solutioning/create-architecture/steps/step-08-complete.md

@@ -41,7 +41,7 @@ completedAt: '{{current_date}}'
 
 ### 3. Next Steps Guidance
 
-Architecture complete. Read fully and follow: `_bmad/core/tasks/help.md` with argument `Create Architecture`.
+Architecture complete. Read fully and follow: `_bmad/core/tasks/bmad-help.md` with argument `Create Architecture`.
 
 Upon Completion of task output: offer to answer any questions about the Architecture Document.
 

src/bmm/workflows/3-solutioning/create-epics-and-stories/steps/step-04-final-validation.md

@@ -144,6 +144,6 @@ If all validations pass:
 
 When C is selected, the workflow is complete and the epics.md is ready for development.
 
-Epics and Stories complete. Read fully and follow: `_bmad/core/tasks/help.md` with argument `Create Epics and Stories`.
+Epics and Stories complete. Read fully and follow: `_bmad/core/tasks/bmad-help.md` with argument `Create Epics and Stories`.
 
 Upon Completion of task output: offer to answer any questions about the Epics and Stories.

src/bmm/workflows/bmad-quick-flow/quick-dev/steps/step-01-mode-detection.md

@@ -2,6 +2,8 @@
 name: 'step-01-mode-detection'
 description: 'Determine execution mode (tech-spec vs direct), handle escalation, set state variables'
 
+workflow_path: '{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-dev'
+thisStepFile: './step-01-mode-detection.md'
 nextStepFile_modeA: './step-03-execute.md'
 nextStepFile_modeB: './step-02-context-gathering.md'
 ---

src/bmm/workflows/bmad-quick-flow/quick-dev/steps/step-02-context-gathering.md

@@ -2,6 +2,8 @@
 name: 'step-02-context-gathering'
 description: 'Quick context gathering for direct mode - identify files, patterns, dependencies'
 
+workflow_path: '{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-dev'
+thisStepFile: './step-02-context-gathering.md'
 nextStepFile: './step-03-execute.md'
 ---
 

src/bmm/workflows/bmad-quick-flow/quick-dev/steps/step-03-execute.md

@@ -2,6 +2,8 @@
 name: 'step-03-execute'
 description: 'Execute implementation - iterate through tasks, write code, run tests'
 
+workflow_path: '{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-dev'
+thisStepFile: './step-03-execute.md'
 nextStepFile: './step-04-self-check.md'
 ---
 

src/bmm/workflows/bmad-quick-flow/quick-dev/steps/step-04-self-check.md

@@ -2,6 +2,8 @@
 name: 'step-04-self-check'
 description: 'Self-audit implementation against tasks, tests, AC, and patterns'
 
+workflow_path: '{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-dev'
+thisStepFile: './step-04-self-check.md'
 nextStepFile: './step-05-adversarial-review.md'
 ---
 

src/bmm/workflows/bmad-quick-flow/quick-dev/steps/step-05-adversarial-review.md

@@ -2,6 +2,8 @@
 name: 'step-05-adversarial-review'
 description: 'Construct diff and invoke adversarial review task'
 
+workflow_path: '{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-dev'
+thisStepFile: './step-05-adversarial-review.md'
 nextStepFile: './step-06-resolve-findings.md'
 ---
 
@@ -57,7 +59,7 @@ Merge all changes into `{diff_output}`.
 
 ### 2. Invoke Adversarial Review
 
-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}`.
+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}`.
 
 ```xml
 <invoke-task>Review {diff_output} using {project-root}/_bmad/core/tasks/review-adversarial-general.xml</invoke-task>

src/bmm/workflows/bmad-quick-flow/quick-dev/steps/step-06-resolve-findings.md

@@ -1,6 +1,9 @@
 ---
 name: 'step-06-resolve-findings'
 description: 'Handle review findings interactively, apply fixes, update tech-spec with final status'
+
+workflow_path: '{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-dev'
+thisStepFile: './step-06-resolve-findings.md'
 ---
 
 # Step 6: Resolve Findings

src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-01-understand.md

@@ -2,9 +2,10 @@
 name: 'step-01-understand'
 description: 'Analyze the requirement delta between current state and what user wants to build'
 
+workflow_path: '{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-spec'
 nextStepFile: './step-02-investigate.md'
 skipToStepFile: './step-03-generate.md'
-templateFile: '../tech-spec-template.md'
+templateFile: '{workflow_path}/tech-spec-template.md'
 wipFile: '{implementation_artifacts}/tech-spec-wip.md'
 ---
 

src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-02-investigate.md

@@ -2,6 +2,7 @@
 name: 'step-02-investigate'
 description: 'Map technical constraints and anchor points within the codebase'
 
+workflow_path: '{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-spec'
 nextStepFile: './step-03-generate.md'
 wipFile: '{implementation_artifacts}/tech-spec-wip.md'
 ---

src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-03-generate.md

@@ -2,6 +2,7 @@
 name: 'step-03-generate'
 description: 'Build the implementation plan based on the technical mapping of constraints'
 
+workflow_path: '{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-spec'
 nextStepFile: './step-04-review.md'
 wipFile: '{implementation_artifacts}/tech-spec-wip.md'
 ---

src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-04-review.md

@@ -2,6 +2,7 @@
 name: 'step-04-review'
 description: 'Review and finalize the tech-spec'
 
+workflow_path: '{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-spec'
 wipFile: '{implementation_artifacts}/tech-spec-wip.md'
 ---
 
@@ -152,7 +153,7 @@ b) **HALT and wait for user selection.**
 #### Adversarial Review [R] Process:
 
 1. **Invoke Adversarial Review Task**:
-       > 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}`.
+       > 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}`.
        <invoke-task>Review {finalFile} using {project-root}/_bmad/core/tasks/review-adversarial-general.xml</invoke-task>
        > **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.

src/core/workflows/party-mode/steps/step-03-graceful-exit.md

@@ -142,17 +142,6 @@ 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:

tools/cli/installers/lib/ide/shared/task-tool-command-generator.js

@@ -224,7 +224,7 @@ Follow all instructions in the ${type} file exactly as written.
 
   /**
    * Generate task and tool commands using underscore format (Windows-compatible)
-   * Creates flat files like: bmad_bmm_help.md
+   * Creates flat files like: bmad_bmm_bmad-help.md
    *
    * @param {string} projectDir - Project directory
    * @param {string} bmadDir - BMAD installation directory
@@ -268,7 +268,7 @@ Follow all instructions in the ${type} file exactly as written.
 
   /**
    * Generate task and tool commands using underscore format (Windows-compatible)
-   * Creates flat files like: bmad_bmm_help.md
+   * Creates flat files like: bmad_bmm_bmad-help.md
    *
    * @param {string} projectDir - Project directory
    * @param {string} bmadDir - BMAD installation directory
@@ -312,7 +312,7 @@ Follow all instructions in the ${type} file exactly as written.
 
   /**
    * Write task/tool artifacts using underscore format (Windows-compatible)
-   * Creates flat files like: bmad_bmm_help.md
+   * Creates flat files like: bmad_bmm_bmad-help.md
    *
    * @param {string} baseCommandsDir - Base commands directory for the IDE
    * @param {Array} artifacts - Task/tool artifacts with relativePath
@@ -338,7 +338,7 @@ Follow all instructions in the ${type} file exactly as written.
 
   /**
    * Write task/tool artifacts using dash format (NEW STANDARD)
-   * Creates flat files like: bmad-bmm-help.md
+   * Creates flat files like: bmad-bmm-bmad-help.md
    *
    * Note: Tasks/tools do NOT have bmad-agent- prefix - only agents do.
    *