From d050711b07f80f51401df4b506cbab0cc7b96296 Mon Sep 17 00:00:00 2001
From: Alex Verkhovsky <alexey.verkhovsky@gmail.com>
Date: Thu, 12 Mar 2026 15:07:21 -0600
Subject: [PATCH 1/7] feat(bmm): convert quick-spec workflow to native skill
 package

---
 src/bmm/agents/quick-flow-solo-dev.agent.yaml             | 2 +-
 src/bmm/module-help.csv                                   | 2 +-
 .../workflows/bmad-quick-flow/bmad-quick-dev/workflow.md  | 2 +-
 .../workflows/bmad-quick-flow/bmad-quick-spec/SKILL.md    | 6 ++++++
 .../bmad-quick-spec/bmad-skill-manifest.yaml              | 1 +
 .../steps/step-01-understand.md                           | 8 ++++----
 .../steps/step-02-investigate.md                          | 2 +-
 .../steps/step-03-generate.md                             | 2 +-
 .../steps/step-04-review.md                               | 0
 .../{quick-spec => bmad-quick-spec}/tech-spec-template.md | 0
 .../{quick-spec => bmad-quick-spec}/workflow.md           | 4 +---
 .../bmad-quick-flow/quick-spec/bmad-skill-manifest.yaml   | 3 ---
 12 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/SKILL.md
 create mode 100644 src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/bmad-skill-manifest.yaml
 rename src/bmm/workflows/bmad-quick-flow/{quick-spec => bmad-quick-spec}/steps/step-01-understand.md (92%)
 rename src/bmm/workflows/bmad-quick-flow/{quick-spec => bmad-quick-spec}/steps/step-02-investigate.md (97%)
 rename src/bmm/workflows/bmad-quick-flow/{quick-spec => bmad-quick-spec}/steps/step-03-generate.md (96%)
 rename src/bmm/workflows/bmad-quick-flow/{quick-spec => bmad-quick-spec}/steps/step-04-review.md (100%)
 rename src/bmm/workflows/bmad-quick-flow/{quick-spec => bmad-quick-spec}/tech-spec-template.md (100%)
 rename src/bmm/workflows/bmad-quick-flow/{quick-spec => bmad-quick-spec}/workflow.md (90%)
 delete mode 100644 src/bmm/workflows/bmad-quick-flow/quick-spec/bmad-skill-manifest.yaml

diff --git a/src/bmm/agents/quick-flow-solo-dev.agent.yaml b/src/bmm/agents/quick-flow-solo-dev.agent.yaml
index e9e789be7..f88f33c68 100644
--- a/src/bmm/agents/quick-flow-solo-dev.agent.yaml
+++ b/src/bmm/agents/quick-flow-solo-dev.agent.yaml
@@ -20,7 +20,7 @@ agent:
 
   menu:
     - trigger: QS or fuzzy match on quick-spec
-      exec: "{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-spec/workflow.md"
+      exec: "{project-root}/_bmad/bmm/workflows/bmad-quick-flow/bmad-quick-spec/workflow.md"
       description: "[QS] Quick Spec: Architect a quick but complete technical spec with implementation-ready stories/specs"
 
     - trigger: QD or fuzzy match on quick-dev
diff --git a/src/bmm/module-help.csv b/src/bmm/module-help.csv
index bc4241f8f..82dad1aa0 100644
--- a/src/bmm/module-help.csv
+++ b/src/bmm/module-help.csv
@@ -1,7 +1,7 @@
 module,phase,name,code,sequence,workflow-file,command,required,agent,options,description,output-location,outputs,
 bmm,anytime,Document Project,DP,,skill:bmad-document-project,bmad-bmm-document-project,false,analyst,Create Mode,"Analyze an existing project to produce useful documentation",project-knowledge,*,
 bmm,anytime,Generate Project Context,GPC,,skill:bmad-generate-project-context,bmad-bmm-generate-project-context,false,analyst,Create Mode,"Scan existing codebase to generate a lean LLM-optimized project-context.md containing critical implementation rules patterns and conventions for AI agents. Essential for brownfield projects and quick-flow.",output_folder,"project context",
-bmm,anytime,Quick Spec,QS,,_bmad/bmm/workflows/bmad-quick-flow/quick-spec/workflow.md,bmad-bmm-quick-spec,false,quick-flow-solo-dev,Create Mode,"Do not suggest for potentially very complex things unless requested or if the user complains that they do not want to follow the extensive planning of the bmad method. Quick one-off tasks small changes simple apps brownfield additions to well established patterns utilities without extensive planning",planning_artifacts,"tech spec",
+bmm,anytime,Quick Spec,QS,,skill:bmad-quick-spec,bmad-bmm-quick-spec,false,quick-flow-solo-dev,Create Mode,"Do not suggest for potentially very complex things unless requested or if the user complains that they do not want to follow the extensive planning of the bmad method. Quick one-off tasks small changes simple apps brownfield additions to well established patterns utilities without extensive planning",planning_artifacts,"tech spec",
 bmm,anytime,Quick Dev,QD,,skill:bmad-quick-dev,bmad-bmm-quick-dev,false,quick-flow-solo-dev,Create Mode,"Quick one-off tasks small changes simple apps utilities without extensive planning - Do not suggest for potentially very complex things unless requested or if the user complains that they do not want to follow the extensive planning of the bmad method, unless the user is already working through the implementation phase and just requests a 1 off things not already in the plan",,,
 bmm,anytime,Quick Dev New Preview,QQ,,skill:bmad-quick-dev-new-preview,bmad-bmm-quick-dev-new-preview,false,quick-flow-solo-dev,Create Mode,"Unified quick flow (experimental): clarify intent plan implement review and present in a single workflow",implementation_artifacts,"tech spec implementation",
 bmm,anytime,Correct Course,CC,,skill:bmad-correct-course,bmad-bmm-correct-course,false,sm,Create Mode,"Anytime: Navigate significant changes. May recommend start over update PRD redo architecture sprint planning or correct epics and stories",planning_artifacts,"change proposal",
diff --git a/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/workflow.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/workflow.md
index 0ad096c52..d76f51804 100644
--- a/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/workflow.md
+++ b/src/bmm/workflows/bmad-quick-flow/bmad-quick-dev/workflow.md
@@ -33,7 +33,7 @@ Load config from `{project-root}/_bmad/bmm/config.yaml` and resolve:
 
 ### Related Workflows
 
-- `quick_spec_workflow` = `../quick-spec/workflow.md`
+- `quick_spec_workflow` = `skill:bmad-quick-spec`
 - `party_mode_exec` = `{project-root}/_bmad/core/workflows/bmad-party-mode/workflow.md`
 - `advanced_elicitation` = `skill:bmad-advanced-elicitation`
 
diff --git a/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/SKILL.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/SKILL.md
new file mode 100644
index 000000000..18cab1a26
--- /dev/null
+++ b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: bmad-quick-spec
+description: 'Very quick process to create implementation-ready quick specs for small changes or features. Use when the user says "create a quick spec" or "generate a quick tech spec"'
+---
+
+Follow the instructions in [workflow.md](workflow.md).
diff --git a/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/bmad-skill-manifest.yaml b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/bmad-skill-manifest.yaml
new file mode 100644
index 000000000..d0f08abdb
--- /dev/null
+++ b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/bmad-skill-manifest.yaml
@@ -0,0 +1 @@
+type: skill
diff --git a/src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-01-understand.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-01-understand.md
similarity index 92%
rename from src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-01-understand.md
rename to src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-01-understand.md
index fecac560a..37d0b332a 100644
--- a/src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-01-understand.md
+++ b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-01-understand.md
@@ -54,9 +54,9 @@ a) **Menu Handling:**
 
 - **[Y] Continue existing:**
   - Jump directly to the appropriate step based on `stepsCompleted`:
-    - `[1]` → Read fully and follow: `{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-02-investigate.md` (Step 2)
-    - `[1, 2]` → Read fully and follow: `{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-03-generate.md` (Step 3)
-    - `[1, 2, 3]` → Read fully and follow: `{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-04-review.md` (Step 4)
+    - `[1]` → Read fully and follow: `./steps/step-02-investigate.md` (Step 2)
+    - `[1, 2]` → Read fully and follow: `./steps/step-03-generate.md` (Step 3)
+    - `[1, 2, 3]` → Read fully and follow: `./steps/step-04-review.md` (Step 4)
 - **[N] Archive and start fresh:**
   - Rename `{wipFile}` to `{implementation_artifacts}/tech-spec-{slug}-archived-{date}.md`
 
@@ -167,7 +167,7 @@ b) **HALT and wait for user selection.**
 
 - IF A: Read fully and follow: `{advanced_elicitation}` with current tech-spec content, process enhanced insights, ask user "Accept improvements? (y/n)", if yes update WIP file then redisplay menu, if no keep original then redisplay menu
 - IF P: Read fully and follow: `{party_mode_exec}` with current tech-spec content, process collaborative insights, ask user "Accept changes? (y/n)", if yes update WIP file then redisplay menu, if no keep original then redisplay menu
-- IF C: Verify `{wipFile}` has `stepsCompleted: [1]`, then read fully and follow: `{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-02-investigate.md`
+- IF C: Verify `{wipFile}` has `stepsCompleted: [1]`, then read fully and follow: `./steps/step-02-investigate.md`
 - IF Any other comments or queries: respond helpfully then redisplay menu
 
 #### EXECUTION RULES:
diff --git a/src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-02-investigate.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-02-investigate.md
similarity index 97%
rename from src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-02-investigate.md
rename to src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-02-investigate.md
index 5e749a3ff..0aa770fd1 100644
--- a/src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-02-investigate.md
+++ b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-02-investigate.md
@@ -121,7 +121,7 @@ Display: "**Select:** [A] Advanced Elicitation [P] Party Mode [C] Continue to Ge
 
 - IF A: Read fully and follow: `{advanced_elicitation}` with current tech-spec content, process enhanced insights, ask user "Accept improvements? (y/n)", if yes update WIP file then redisplay menu, if no keep original then redisplay menu
 - IF P: Read fully and follow: `{party_mode_exec}` with current tech-spec content, process collaborative insights, ask user "Accept changes? (y/n)", if yes update WIP file then redisplay menu, if no keep original then redisplay menu
-- IF C: Verify frontmatter updated with `stepsCompleted: [1, 2]`, then read fully and follow: `{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-03-generate.md`
+- IF C: Verify frontmatter updated with `stepsCompleted: [1, 2]`, then read fully and follow: `./steps/step-03-generate.md`
 - IF Any other comments or queries: respond helpfully then redisplay menu
 
 #### EXECUTION RULES:
diff --git a/src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-03-generate.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-03-generate.md
similarity index 96%
rename from src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-03-generate.md
rename to src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-03-generate.md
index 2a8ee18e1..5aa7d7fa2 100644
--- a/src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-03-generate.md
+++ b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-03-generate.md
@@ -112,7 +112,7 @@ stepsCompleted: [1, 2, 3]
 ---
 ```
 
-c) **Read fully and follow: `{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-04-review.md` (Step 4)**
+c) **Read fully and follow: `./steps/step-04-review.md` (Step 4)**
 
 ## REQUIRED OUTPUTS:
 
diff --git a/src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-04-review.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-04-review.md
similarity index 100%
rename from src/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-04-review.md
rename to src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-04-review.md
diff --git a/src/bmm/workflows/bmad-quick-flow/quick-spec/tech-spec-template.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/tech-spec-template.md
similarity index 100%
rename from src/bmm/workflows/bmad-quick-flow/quick-spec/tech-spec-template.md
rename to src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/tech-spec-template.md
diff --git a/src/bmm/workflows/bmad-quick-flow/quick-spec/workflow.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/workflow.md
similarity index 90%
rename from src/bmm/workflows/bmad-quick-flow/quick-spec/workflow.md
rename to src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/workflow.md
index 02e231fe5..9d86ffbe2 100644
--- a/src/bmm/workflows/bmad-quick-flow/quick-spec/workflow.md
+++ b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/workflow.md
@@ -1,6 +1,4 @@
 ---
-name: quick-spec
-description: 'Very quick process to create implementation-ready quick specs for small changes or features. Use when the user says "create a quick spec" or "generate a quick tech spec"'
 main_config: '{project-root}/_bmad/bmm/config.yaml'
 
 # Checkpoint handler references
@@ -75,4 +73,4 @@ Load and read full config from `{main_config}` and resolve:
 
 ### 2. First Step Execution
 
-Read fully and follow: `{project-root}/_bmad/bmm/workflows/bmad-quick-flow/quick-spec/steps/step-01-understand.md` to begin the workflow.
+Read fully and follow: `./steps/step-01-understand.md` to begin the workflow.
diff --git a/src/bmm/workflows/bmad-quick-flow/quick-spec/bmad-skill-manifest.yaml b/src/bmm/workflows/bmad-quick-flow/quick-spec/bmad-skill-manifest.yaml
deleted file mode 100644
index 1a383135c..000000000
--- a/src/bmm/workflows/bmad-quick-flow/quick-spec/bmad-skill-manifest.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-canonicalId: bmad-quick-spec
-type: workflow
-description: "Very quick process to create implementation-ready quick specs for small changes or features"

From 40bb9abd3175e42f3f933d41ba05863cd57fdbb5 Mon Sep 17 00:00:00 2001
From: Alex Verkhovsky <alexey.verkhovsky@gmail.com>
Date: Sat, 14 Mar 2026 11:23:40 -0600
Subject: [PATCH 2/7] fix: use skill: URI for quick-spec in agent menu

The agent menu entry for QS was still using a raw file path
instead of the skill dispatcher, inconsistent with module-help.csv.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/bmm/agents/quick-flow-solo-dev.agent.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bmm/agents/quick-flow-solo-dev.agent.yaml b/src/bmm/agents/quick-flow-solo-dev.agent.yaml
index f88f33c68..6cebb3cf1 100644
--- a/src/bmm/agents/quick-flow-solo-dev.agent.yaml
+++ b/src/bmm/agents/quick-flow-solo-dev.agent.yaml
@@ -20,7 +20,7 @@ agent:
 
   menu:
     - trigger: QS or fuzzy match on quick-spec
-      exec: "{project-root}/_bmad/bmm/workflows/bmad-quick-flow/bmad-quick-spec/workflow.md"
+      exec: "skill:bmad-quick-spec"
       description: "[QS] Quick Spec: Architect a quick but complete technical spec with implementation-ready stories/specs"
 
     - trigger: QD or fuzzy match on quick-dev

From 3678dbe3ff3bdb046ffaaac55f5b5df97e748bb0 Mon Sep 17 00:00:00 2001
From: Alex Verkhovsky <alexey.verkhovsky@gmail.com>
Date: Sat, 14 Mar 2026 11:27:14 -0600
Subject: [PATCH 3/7] fix: correct relative step paths to resolve from
 originating file

Step files are inside steps/ so inter-step references must be
./step-NN.md not ./steps/step-NN.md (which would double-nest).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../bmad-quick-spec/steps/step-01-understand.md           | 8 ++++----
 .../bmad-quick-spec/steps/step-02-investigate.md          | 2 +-
 .../bmad-quick-spec/steps/step-03-generate.md             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-01-understand.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-01-understand.md
index 37d0b332a..855c2c3c4 100644
--- a/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-01-understand.md
+++ b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-01-understand.md
@@ -54,9 +54,9 @@ a) **Menu Handling:**
 
 - **[Y] Continue existing:**
   - Jump directly to the appropriate step based on `stepsCompleted`:
-    - `[1]` → Read fully and follow: `./steps/step-02-investigate.md` (Step 2)
-    - `[1, 2]` → Read fully and follow: `./steps/step-03-generate.md` (Step 3)
-    - `[1, 2, 3]` → Read fully and follow: `./steps/step-04-review.md` (Step 4)
+    - `[1]` → Read fully and follow: `./step-02-investigate.md` (Step 2)
+    - `[1, 2]` → Read fully and follow: `./step-03-generate.md` (Step 3)
+    - `[1, 2, 3]` → Read fully and follow: `./step-04-review.md` (Step 4)
 - **[N] Archive and start fresh:**
   - Rename `{wipFile}` to `{implementation_artifacts}/tech-spec-{slug}-archived-{date}.md`
 
@@ -167,7 +167,7 @@ b) **HALT and wait for user selection.**
 
 - IF A: Read fully and follow: `{advanced_elicitation}` with current tech-spec content, process enhanced insights, ask user "Accept improvements? (y/n)", if yes update WIP file then redisplay menu, if no keep original then redisplay menu
 - IF P: Read fully and follow: `{party_mode_exec}` with current tech-spec content, process collaborative insights, ask user "Accept changes? (y/n)", if yes update WIP file then redisplay menu, if no keep original then redisplay menu
-- IF C: Verify `{wipFile}` has `stepsCompleted: [1]`, then read fully and follow: `./steps/step-02-investigate.md`
+- IF C: Verify `{wipFile}` has `stepsCompleted: [1]`, then read fully and follow: `./step-02-investigate.md`
 - IF Any other comments or queries: respond helpfully then redisplay menu
 
 #### EXECUTION RULES:
diff --git a/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-02-investigate.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-02-investigate.md
index 0aa770fd1..48d9aa7f8 100644
--- a/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-02-investigate.md
+++ b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-02-investigate.md
@@ -121,7 +121,7 @@ Display: "**Select:** [A] Advanced Elicitation [P] Party Mode [C] Continue to Ge
 
 - IF A: Read fully and follow: `{advanced_elicitation}` with current tech-spec content, process enhanced insights, ask user "Accept improvements? (y/n)", if yes update WIP file then redisplay menu, if no keep original then redisplay menu
 - IF P: Read fully and follow: `{party_mode_exec}` with current tech-spec content, process collaborative insights, ask user "Accept changes? (y/n)", if yes update WIP file then redisplay menu, if no keep original then redisplay menu
-- IF C: Verify frontmatter updated with `stepsCompleted: [1, 2]`, then read fully and follow: `./steps/step-03-generate.md`
+- IF C: Verify frontmatter updated with `stepsCompleted: [1, 2]`, then read fully and follow: `./step-03-generate.md`
 - IF Any other comments or queries: respond helpfully then redisplay menu
 
 #### EXECUTION RULES:
diff --git a/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-03-generate.md b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-03-generate.md
index 5aa7d7fa2..42dc43dd1 100644
--- a/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-03-generate.md
+++ b/src/bmm/workflows/bmad-quick-flow/bmad-quick-spec/steps/step-03-generate.md
@@ -112,7 +112,7 @@ stepsCompleted: [1, 2, 3]
 ---
 ```
 
-c) **Read fully and follow: `./steps/step-04-review.md` (Step 4)**
+c) **Read fully and follow: `./step-04-review.md` (Step 4)**
 
 ## REQUIRED OUTPUTS:
 

From b93d0087db95fc709f7e0f3d9a0eeec4368b8bad Mon Sep 17 00:00:00 2001
From: Alex Verkhovsky <alexey.verkhovsky@gmail.com>
Date: Sat, 14 Mar 2026 15:49:07 -0600
Subject: [PATCH 4/7] fix(skill): clean up bmad-create-product-brief validation
 findings

Remove name/description from step frontmatter (STEP-06), inline
intra-skill path variables (PATH-04), prefix bare external path
with {project-root} (PATH-03), and normalize template placeholders
to double-curly convention (REF-01).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../product-brief.template.md                     |  4 ++--
 .../steps/step-01-init.md                         | 15 ++++-----------
 .../steps/step-01b-continue.md                    |  3 ---
 .../steps/step-02-vision.md                       |  8 ++------
 .../steps/step-03-users.md                        |  8 ++------
 .../steps/step-04-metrics.md                      |  8 ++------
 .../steps/step-05-scope.md                        |  8 ++------
 .../steps/step-06-complete.md                     |  3 ---
 8 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/src/bmm/workflows/1-analysis/bmad-create-product-brief/product-brief.template.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/product-brief.template.md
index d41d5620c..9f6189c2c 100644
--- a/src/bmm/workflows/1-analysis/bmad-create-product-brief/product-brief.template.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/product-brief.template.md
@@ -1,8 +1,8 @@
 ---
 stepsCompleted: []
 inputDocuments: []
-date: { system-date }
-author: { user }
+date: {{system-date}}
+author: {{user_name}}
 ---
 
 # Product Brief: {{project_name}}
diff --git a/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01-init.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01-init.md
index 496180933..479811f1b 100644
--- a/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01-init.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01-init.md
@@ -1,13 +1,6 @@
 ---
-name: 'step-01-init'
-description: 'Initialize the product brief workflow by detecting continuation state and setting up the document'
-
 # File References
-nextStepFile: './step-02-vision.md'
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
-
-# Template References
-productBriefTemplate: '../product-brief.template.md'
 ---
 
 # Step 1: Product Brief Initialization
@@ -88,7 +81,7 @@ load context documents using smart discovery. Documents can be in the following
 - {planning_artifacts}/**
 - {output_folder}/**
 - {product_knowledge}/**
-- docs/**
+- {project-root}/docs/**
 
 Also - when searching - documents can be a single markdown file, or a folder with an index and multiple files. For Example, if searching for `*foo*.md` and not found, also search for a folder called *foo*/index.md (which indicates sharded content)
 
@@ -112,7 +105,7 @@ Try to discover the following:
 
 **Document Setup:**
 
-- Copy the template from `{productBriefTemplate}` to `{outputFile}`, and update the frontmatter fields
+- Copy the template from `../product-brief.template.md` to `{outputFile}`, and update the frontmatter fields
 
 #### C. Present Initialization Results
 
@@ -141,7 +134,7 @@ Display: "**Proceeding to product vision discovery...**"
 
 #### Menu Handling Logic:
 
-- After setup report is presented, without delay, read fully and follow: {nextStepFile}
+- After setup report is presented, without delay, read fully and follow: ./step-02-vision.md
 
 #### EXECUTION RULES:
 
@@ -150,7 +143,7 @@ Display: "**Proceeding to product vision discovery...**"
 
 ## CRITICAL STEP COMPLETION NOTE
 
-ONLY WHEN [setup completion is achieved and frontmatter properly updated], will you then read fully and follow: `{nextStepFile}` to begin product vision discovery.
+ONLY WHEN [setup completion is achieved and frontmatter properly updated], will you then read fully and follow: `./step-02-vision.md` to begin product vision discovery.
 
 ---
 
diff --git a/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01b-continue.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01b-continue.md
index 99b2495fe..bd2af1be6 100644
--- a/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01b-continue.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-01b-continue.md
@@ -1,7 +1,4 @@
 ---
-name: 'step-01b-continue'
-description: 'Resume the product brief workflow from where it was left off, ensuring smooth continuation'
-
 # File References
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
 ---
diff --git a/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-02-vision.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-02-vision.md
index dfc263814..4729aaf3d 100644
--- a/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-02-vision.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-02-vision.md
@@ -1,9 +1,5 @@
 ---
-name: 'step-02-vision'
-description: 'Discover and define the core product vision, problem statement, and unique value proposition'
-
 # File References
-nextStepFile: './step-03-users.md'
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
 
 # Task References
@@ -159,7 +155,7 @@ Prepare the following structure for document append:
 
 - IF A: Read fully and follow: {advancedElicitationTask} with current vision content to dive deeper and refine
 - IF P: Read fully and follow: {partyModeWorkflow} to bring different perspectives to positioning and differentiation
-- IF C: Save content to {outputFile}, update frontmatter with stepsCompleted: [1, 2], then read fully and follow: {nextStepFile}
+- IF C: Save content to {outputFile}, update frontmatter with stepsCompleted: [1, 2], then read fully and follow: ./step-03-users.md
 - IF Any other comments or queries: help user respond then [Redisplay Menu Options](#7-present-menu-options)
 
 #### EXECUTION RULES:
@@ -171,7 +167,7 @@ Prepare the following structure for document append:
 
 ## CRITICAL STEP COMPLETION NOTE
 
-ONLY WHEN [C continue option] is selected and [vision content finalized and saved to document with frontmatter updated], will you then read fully and follow: `{nextStepFile}` to begin target user discovery.
+ONLY WHEN [C continue option] is selected and [vision content finalized and saved to document with frontmatter updated], will you then read fully and follow: `./step-03-users.md` to begin target user discovery.
 
 ---
 
diff --git a/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-03-users.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-03-users.md
index 3125cad69..2c4f8f71e 100644
--- a/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-03-users.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-03-users.md
@@ -1,9 +1,5 @@
 ---
-name: 'step-03-users'
-description: 'Define target users with rich personas and map their key interactions with the product'
-
 # File References
-nextStepFile: './step-04-metrics.md'
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
 
 # Task References
@@ -162,7 +158,7 @@ Prepare the following structure for document append:
 
 - IF A: Read fully and follow: {advancedElicitationTask} with current user content to dive deeper into personas and journeys
 - IF P: Read fully and follow: {partyModeWorkflow} to bring different perspectives to validate user understanding
-- IF C: Save content to {outputFile}, update frontmatter with stepsCompleted: [1, 2, 3], then read fully and follow: {nextStepFile}
+- IF C: Save content to {outputFile}, update frontmatter with stepsCompleted: [1, 2, 3], then read fully and follow: ./step-04-metrics.md
 - IF Any other comments or queries: help user respond then [Redisplay Menu Options](#6-present-menu-options)
 
 #### EXECUTION RULES:
@@ -174,7 +170,7 @@ Prepare the following structure for document append:
 
 ## CRITICAL STEP COMPLETION NOTE
 
-ONLY WHEN [C continue option] is selected and [user personas finalized and saved to document with frontmatter updated], will you then read fully and follow: `{nextStepFile}` to begin success metrics definition.
+ONLY WHEN [C continue option] is selected and [user personas finalized and saved to document with frontmatter updated], will you then read fully and follow: `./step-04-metrics.md` to begin success metrics definition.
 
 ---
 
diff --git a/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-04-metrics.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-04-metrics.md
index 30b32b9df..55c29cf0e 100644
--- a/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-04-metrics.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-04-metrics.md
@@ -1,9 +1,5 @@
 ---
-name: 'step-04-metrics'
-description: 'Define comprehensive success metrics that include user success, business objectives, and key performance indicators'
-
 # File References
-nextStepFile: './step-05-scope.md'
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
 
 # Task References
@@ -165,7 +161,7 @@ Prepare the following structure for document append:
 
 - IF A: Read fully and follow: {advancedElicitationTask} with current metrics content to dive deeper into success metric insights
 - IF P: Read fully and follow: {partyModeWorkflow} to bring different perspectives to validate comprehensive metrics
-- IF C: Save content to {outputFile}, update frontmatter with stepsCompleted: [1, 2, 3, 4], then read fully and follow: {nextStepFile}
+- IF C: Save content to {outputFile}, update frontmatter with stepsCompleted: [1, 2, 3, 4], then read fully and follow: ./step-05-scope.md
 - IF Any other comments or queries: help user respond then [Redisplay Menu Options](#7-present-menu-options)
 
 #### EXECUTION RULES:
@@ -177,7 +173,7 @@ Prepare the following structure for document append:
 
 ## CRITICAL STEP COMPLETION NOTE
 
-ONLY WHEN [C continue option] is selected and [success metrics finalized and saved to document with frontmatter updated], will you then read fully and follow: `{nextStepFile}` to begin MVP scope definition.
+ONLY WHEN [C continue option] is selected and [success metrics finalized and saved to document with frontmatter updated], will you then read fully and follow: `./step-05-scope.md` to begin MVP scope definition.
 
 ---
 
diff --git a/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-05-scope.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-05-scope.md
index 9073f76dd..c8b5d6115 100644
--- a/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-05-scope.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-05-scope.md
@@ -1,9 +1,5 @@
 ---
-name: 'step-05-scope'
-description: 'Define MVP scope with clear boundaries and outline future vision while managing scope creep'
-
 # File References
-nextStepFile: './step-06-complete.md'
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
 
 # Task References
@@ -179,7 +175,7 @@ Prepare the following structure for document append:
 
 - IF A: Read fully and follow: {advancedElicitationTask} with current scope content to optimize scope definition
 - IF P: Read fully and follow: {partyModeWorkflow} to bring different perspectives to validate MVP scope
-- IF C: Save content to {outputFile}, update frontmatter with stepsCompleted: [1, 2, 3, 4, 5], then read fully and follow: {nextStepFile}
+- IF C: Save content to {outputFile}, update frontmatter with stepsCompleted: [1, 2, 3, 4, 5], then read fully and follow: ./step-06-complete.md
 - IF Any other comments or queries: help user respond then [Redisplay Menu Options](#7-present-menu-options)
 
 #### EXECUTION RULES:
@@ -191,7 +187,7 @@ Prepare the following structure for document append:
 
 ## CRITICAL STEP COMPLETION NOTE
 
-ONLY WHEN [C continue option] is selected and [MVP scope finalized and saved to document with frontmatter updated], will you then read fully and follow: `{nextStepFile}` to complete the product brief workflow.
+ONLY WHEN [C continue option] is selected and [MVP scope finalized and saved to document with frontmatter updated], will you then read fully and follow: `./step-06-complete.md` to complete the product brief workflow.
 
 ---
 
diff --git a/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-06-complete.md b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-06-complete.md
index 7363f7c95..f1f5c302c 100644
--- a/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-06-complete.md
+++ b/src/bmm/workflows/1-analysis/bmad-create-product-brief/steps/step-06-complete.md
@@ -1,7 +1,4 @@
 ---
-name: 'step-06-complete'
-description: 'Complete the product brief workflow, update status files, and suggest next steps for the project'
-
 # File References
 outputFile: '{planning_artifacts}/product-brief-{{project_name}}-{{date}}.md'
 ---

From f3d6ee2cb83499de82dabc985e48e3ae279df80a Mon Sep 17 00:00:00 2001
From: Alex Verkhovsky <alexey.verkhovsky@gmail.com>
Date: Sat, 14 Mar 2026 16:04:03 -0600
Subject: [PATCH 5/7] fix(skill): clean up bmad-create-ux-design validation
 findings

Remove installed_path and intra-skill template_path variable (PATH-02,
PATH-04), prefix bare docs/** with {project-root} (PATH-03), inline
undefined variable references (REF-01), fix wrong config variable in
output path (REF-02).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../bmad-create-ux-design/steps/step-01-init.md               | 4 ++--
 .../bmad-create-ux-design/steps/step-01b-continue.md          | 2 +-
 .../bmad-create-ux-design/steps/step-14-complete.md           | 4 ++--
 .../2-plan-workflows/bmad-create-ux-design/workflow.md        | 2 --
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-01-init.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-01-init.md
index 62969bafd..2ec7ecb36 100644
--- a/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-01-init.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-01-init.md
@@ -58,7 +58,7 @@ Discover and load context documents using smart discovery. Documents can be in t
 - {planning_artifacts}/**
 - {output_folder}/**
 - {product_knowledge}/**
-- docs/**
+- {project-root}/docs/**
 
 Also - when searching - documents can be a single markdown file, or a folder with an index and multiple files. For Example, if searching for `*foo*.md` and not found, also search for a folder called *foo*/index.md (which indicates sharded content)
 
@@ -80,7 +80,7 @@ Try to discover the following:
 
 #### B. Create Initial Document
 
-Copy the template from `{installed_path}/ux-design-template.md` to `{planning_artifacts}/ux-design-specification.md`
+Copy the template from `../ux-design-template.md` to `{planning_artifacts}/ux-design-specification.md`
 Initialize frontmatter in the template.
 
 #### C. Complete Initialization and Report
diff --git a/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-01b-continue.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-01b-continue.md
index 3d0f647e2..cd1df25f0 100644
--- a/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-01b-continue.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-01b-continue.md
@@ -108,7 +108,7 @@ After presenting current progress, ask:
 If `lastStep` indicates the final step is completed:
 "Great news! It looks like we've already completed the UX design workflow for {{project_name}}.
 
-The final UX design specification is ready at {output_folder}/ux-design-specification.md with all sections completed through step {finalStepNumber}.
+The final UX design specification is ready at {planning_artifacts}/ux-design-specification.md with all sections completed through step {finalStepNumber}.
 
 The complete UX design includes visual foundations, user flows, and design specifications ready for implementation.
 
diff --git a/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-14-complete.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-14-complete.md
index 73b07217d..67d99c427 100644
--- a/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-14-complete.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/steps/step-14-complete.md
@@ -75,8 +75,8 @@ This specification is now ready to guide visual design, implementation, and deve
 
 Update the main workflow status file:
 
-- Load `{status_file}` from workflow configuration (if exists)
-- Update workflow_status["create-ux-design"] = "{default_output_file}"
+- Load the project's workflow status file (if one exists)
+- Update workflow_status["create-ux-design"] = `{planning_artifacts}/ux-design-specification.md`
 - Save file, preserving all comments and structure
 - Mark current timestamp as completion time
 
diff --git a/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/workflow.md b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/workflow.md
index c039c170e..04be36641 100644
--- a/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/workflow.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-create-ux-design/workflow.md
@@ -27,8 +27,6 @@ Load config from `{project-root}/_bmad/bmm/config.yaml` and resolve:
 
 ### Paths
 
-- `installed_path` = `.`
-- `template_path` = `{installed_path}/ux-design-template.md`
 - `default_output_file` = `{planning_artifacts}/ux-design-specification.md`
 
 ## EXECUTION

From 516557451ac20dda760b6d77b6d7da98b566fa19 Mon Sep 17 00:00:00 2001
From: Alex Verkhovsky <alexey.verkhovsky@gmail.com>
Date: Sat, 14 Mar 2026 16:05:57 -0600
Subject: [PATCH 6/7] refactor: convert bmad-edit-prd from shared workflow to
 standalone skill

Move edit-prd workflow and steps-e/ out of the shared create-prd directory
into its own bmad-edit-prd skill directory with SKILL.md, workflow.md, and
bmad-skill-manifest.yaml. Update pm.agent.yaml and module-help.csv to use
skill:bmad-edit-prd. Fix validationWorkflow path in step-e-04 to use
absolute {project-root} reference since relative path breaks after move.
---
 src/bmm/agents/pm.agent.yaml                                | 2 +-
 src/bmm/module-help.csv                                     | 2 +-
 src/bmm/workflows/2-plan-workflows/bmad-edit-prd/SKILL.md   | 6 ++++++
 .../2-plan-workflows/bmad-edit-prd/bmad-skill-manifest.yaml | 1 +
 .../steps-e/step-e-01-discovery.md                          | 0
 .../steps-e/step-e-01b-legacy-conversion.md                 | 0
 .../steps-e/step-e-02-review.md                             | 0
 .../{create-prd => bmad-edit-prd}/steps-e/step-e-03-edit.md | 0
 .../steps-e/step-e-04-complete.md                           | 2 +-
 .../workflow-edit-prd.md => bmad-edit-prd/workflow.md}      | 2 --
 .../2-plan-workflows/create-prd/bmad-skill-manifest.yaml    | 5 -----
 11 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 src/bmm/workflows/2-plan-workflows/bmad-edit-prd/SKILL.md
 create mode 100644 src/bmm/workflows/2-plan-workflows/bmad-edit-prd/bmad-skill-manifest.yaml
 rename src/bmm/workflows/2-plan-workflows/{create-prd => bmad-edit-prd}/steps-e/step-e-01-discovery.md (100%)
 rename src/bmm/workflows/2-plan-workflows/{create-prd => bmad-edit-prd}/steps-e/step-e-01b-legacy-conversion.md (100%)
 rename src/bmm/workflows/2-plan-workflows/{create-prd => bmad-edit-prd}/steps-e/step-e-02-review.md (100%)
 rename src/bmm/workflows/2-plan-workflows/{create-prd => bmad-edit-prd}/steps-e/step-e-03-edit.md (100%)
 rename src/bmm/workflows/2-plan-workflows/{create-prd => bmad-edit-prd}/steps-e/step-e-04-complete.md (97%)
 rename src/bmm/workflows/2-plan-workflows/{create-prd/workflow-edit-prd.md => bmad-edit-prd/workflow.md} (96%)

diff --git a/src/bmm/agents/pm.agent.yaml b/src/bmm/agents/pm.agent.yaml
index 6fcb9774d..c8fc271cd 100644
--- a/src/bmm/agents/pm.agent.yaml
+++ b/src/bmm/agents/pm.agent.yaml
@@ -28,7 +28,7 @@ agent:
       description: "[VP] Validate PRD: Validate a Product Requirements Document is comprehensive, lean, well organized and cohesive"
 
     - trigger: EP or fuzzy match on edit-prd
-      exec: "{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-prd/workflow-edit-prd.md"
+      exec: "skill:bmad-edit-prd"
       description: "[EP] Edit PRD: Update an existing Product Requirements Document"
 
     - trigger: CE or fuzzy match on epics-stories
diff --git a/src/bmm/module-help.csv b/src/bmm/module-help.csv
index 82dad1aa0..1c21ac015 100644
--- a/src/bmm/module-help.csv
+++ b/src/bmm/module-help.csv
@@ -17,7 +17,7 @@ bmm,1-analysis,Technical Research,TR,22,skill:bmad-technical-research,bmad-bmm-t
 bmm,1-analysis,Create Brief,CB,30,skill:bmad-create-product-brief,bmad-bmm-create-product-brief,false,analyst,Create Mode,"A guided experience to nail down your product idea",planning_artifacts,"product brief",
 bmm,2-planning,Create PRD,CP,10,_bmad/bmm/workflows/2-plan-workflows/create-prd/workflow-create-prd.md,bmad-bmm-create-prd,true,pm,Create Mode,"Expert led facilitation to produce your Product Requirements Document",planning_artifacts,prd,
 bmm,2-planning,Validate PRD,VP,20,_bmad/bmm/workflows/2-plan-workflows/create-prd/workflow-validate-prd.md,bmad-bmm-validate-prd,false,pm,Validate Mode,"Validate PRD is comprehensive lean well organized and cohesive",planning_artifacts,"prd validation report",
-bmm,2-planning,Edit PRD,EP,25,_bmad/bmm/workflows/2-plan-workflows/create-prd/workflow-edit-prd.md,bmad-bmm-edit-prd,false,pm,Edit Mode,"Improve and enhance an existing PRD",planning_artifacts,"updated prd",
+bmm,2-planning,Edit PRD,EP,25,skill:bmad-edit-prd,bmad-bmm-edit-prd,false,pm,Edit Mode,"Improve and enhance an existing PRD",planning_artifacts,"updated prd",
 bmm,2-planning,Create UX,CU,30,skill:bmad-create-ux-design,bmad-bmm-create-ux-design,false,ux-designer,Create Mode,"Guidance through realizing the plan for your UX, strongly recommended if a UI is a primary piece of the proposed project",planning_artifacts,"ux design",
 bmm,3-solutioning,Create Architecture,CA,10,skill:bmad-create-architecture,bmad-bmm-create-architecture,true,architect,Create Mode,"Guided Workflow to document technical decisions",planning_artifacts,architecture,
 bmm,3-solutioning,Create Epics and Stories,CE,30,skill:bmad-create-epics-and-stories,bmad-bmm-create-epics-and-stories,true,pm,Create Mode,"Create the Epics and Stories Listing",planning_artifacts,"epics and stories",
diff --git a/src/bmm/workflows/2-plan-workflows/bmad-edit-prd/SKILL.md b/src/bmm/workflows/2-plan-workflows/bmad-edit-prd/SKILL.md
new file mode 100644
index 000000000..43f6e3181
--- /dev/null
+++ b/src/bmm/workflows/2-plan-workflows/bmad-edit-prd/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: bmad-edit-prd
+description: 'Edit an existing PRD. Use when the user says "edit this PRD".'
+---
+
+Follow the instructions in [workflow.md](workflow.md).
diff --git a/src/bmm/workflows/2-plan-workflows/bmad-edit-prd/bmad-skill-manifest.yaml b/src/bmm/workflows/2-plan-workflows/bmad-edit-prd/bmad-skill-manifest.yaml
new file mode 100644
index 000000000..d0f08abdb
--- /dev/null
+++ b/src/bmm/workflows/2-plan-workflows/bmad-edit-prd/bmad-skill-manifest.yaml
@@ -0,0 +1 @@
+type: skill
diff --git a/src/bmm/workflows/2-plan-workflows/create-prd/steps-e/step-e-01-discovery.md b/src/bmm/workflows/2-plan-workflows/bmad-edit-prd/steps-e/step-e-01-discovery.md
similarity index 100%
rename from src/bmm/workflows/2-plan-workflows/create-prd/steps-e/step-e-01-discovery.md
rename to src/bmm/workflows/2-plan-workflows/bmad-edit-prd/steps-e/step-e-01-discovery.md
diff --git a/src/bmm/workflows/2-plan-workflows/create-prd/steps-e/step-e-01b-legacy-conversion.md b/src/bmm/workflows/2-plan-workflows/bmad-edit-prd/steps-e/step-e-01b-legacy-conversion.md
similarity index 100%
rename from src/bmm/workflows/2-plan-workflows/create-prd/steps-e/step-e-01b-legacy-conversion.md
rename to src/bmm/workflows/2-plan-workflows/bmad-edit-prd/steps-e/step-e-01b-legacy-conversion.md
diff --git a/src/bmm/workflows/2-plan-workflows/create-prd/steps-e/step-e-02-review.md b/src/bmm/workflows/2-plan-workflows/bmad-edit-prd/steps-e/step-e-02-review.md
similarity index 100%
rename from src/bmm/workflows/2-plan-workflows/create-prd/steps-e/step-e-02-review.md
rename to src/bmm/workflows/2-plan-workflows/bmad-edit-prd/steps-e/step-e-02-review.md
diff --git a/src/bmm/workflows/2-plan-workflows/create-prd/steps-e/step-e-03-edit.md b/src/bmm/workflows/2-plan-workflows/bmad-edit-prd/steps-e/step-e-03-edit.md
similarity index 100%
rename from src/bmm/workflows/2-plan-workflows/create-prd/steps-e/step-e-03-edit.md
rename to src/bmm/workflows/2-plan-workflows/bmad-edit-prd/steps-e/step-e-03-edit.md
diff --git a/src/bmm/workflows/2-plan-workflows/create-prd/steps-e/step-e-04-complete.md b/src/bmm/workflows/2-plan-workflows/bmad-edit-prd/steps-e/step-e-04-complete.md
similarity index 97%
rename from src/bmm/workflows/2-plan-workflows/create-prd/steps-e/step-e-04-complete.md
rename to src/bmm/workflows/2-plan-workflows/bmad-edit-prd/steps-e/step-e-04-complete.md
index 5d681feed..ad394488e 100644
--- a/src/bmm/workflows/2-plan-workflows/create-prd/steps-e/step-e-04-complete.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-edit-prd/steps-e/step-e-04-complete.md
@@ -4,7 +4,7 @@ description: 'Complete & Validate - Present options for next steps including ful
 
 # File references (ONLY variables used in this step)
 prdFile: '{prd_file_path}'
-validationWorkflow: '../steps-v/step-v-01-discovery.md'
+validationWorkflow: '{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-prd/steps-v/step-v-01-discovery.md'
 ---
 
 # Step E-4: Complete & Validate
diff --git a/src/bmm/workflows/2-plan-workflows/create-prd/workflow-edit-prd.md b/src/bmm/workflows/2-plan-workflows/bmad-edit-prd/workflow.md
similarity index 96%
rename from src/bmm/workflows/2-plan-workflows/create-prd/workflow-edit-prd.md
rename to src/bmm/workflows/2-plan-workflows/bmad-edit-prd/workflow.md
index cdf6b938d..a765a5459 100644
--- a/src/bmm/workflows/2-plan-workflows/create-prd/workflow-edit-prd.md
+++ b/src/bmm/workflows/2-plan-workflows/bmad-edit-prd/workflow.md
@@ -1,6 +1,4 @@
 ---
-name: edit-prd
-description: 'Edit an existing PRD. Use when the user says "edit this PRD".'
 main_config: '{project-root}/_bmad/bmm/config.yaml'
 editWorkflow: './steps-e/step-e-01-discovery.md'
 ---
diff --git a/src/bmm/workflows/2-plan-workflows/create-prd/bmad-skill-manifest.yaml b/src/bmm/workflows/2-plan-workflows/create-prd/bmad-skill-manifest.yaml
index aea9910a2..32464dcc8 100644
--- a/src/bmm/workflows/2-plan-workflows/create-prd/bmad-skill-manifest.yaml
+++ b/src/bmm/workflows/2-plan-workflows/create-prd/bmad-skill-manifest.yaml
@@ -3,11 +3,6 @@ workflow-create-prd.md:
   type: workflow
   description: "Create a PRD from scratch. Use when the user says 'lets create a product requirements document' or 'I want to create a new PRD'"
 
-workflow-edit-prd.md:
-  canonicalId: bmad-edit-prd
-  type: workflow
-  description: "Edit an existing PRD. Use when the user says 'edit this PRD'"
-
 workflow-validate-prd.md:
   canonicalId: bmad-validate-prd
   type: workflow

From b9926e1c4a72ffb4ee8c2960097dfe55cdaef12e Mon Sep 17 00:00:00 2001
From: Alex Verkhovsky <alexey.verkhovsky@gmail.com>
Date: Sat, 14 Mar 2026 16:16:34 -0600
Subject: [PATCH 7/7] fix(skill): clean up bmad-check-implementation-readiness
 validation findings

Remove name/description from step frontmatter (STEP-06) and inline
nextStepFile/templateFile path variables as literal relative paths
(PATH-04).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../steps/step-01-document-discovery.md               | 11 +++--------
 .../steps/step-02-prd-analysis.md                     |  6 +-----
 .../steps/step-03-epic-coverage-validation.md         |  6 +-----
 .../steps/step-04-ux-alignment.md                     |  6 +-----
 .../steps/step-05-epic-quality-review.md              |  8 ++------
 .../steps/step-06-final-assessment.md                 |  3 ---
 6 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-01-document-discovery.md b/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-01-document-discovery.md
index 877193f3d..a4c524cfd 100644
--- a/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-01-document-discovery.md
+++ b/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-01-document-discovery.md
@@ -1,10 +1,5 @@
 ---
-name: 'step-01-document-discovery'
-description: 'Discover and inventory all project documents, handling duplicates and organizing file structure'
-
-nextStepFile: './step-02-prd-analysis.md'
 outputFile: '{planning_artifacts}/implementation-readiness-report-{{date}}.md'
-templateFile: '../templates/readiness-report-template.md'
 ---
 
 # Step 1: Document Discovery
@@ -122,7 +117,7 @@ If required documents not found:
 
 ### 5. Add Initial Report Section
 
-Initialize {outputFile} with {templateFile}.
+Initialize {outputFile} with ../templates/readiness-report-template.md.
 
 ### 6. Present Findings and Get Confirmation
 
@@ -156,12 +151,12 @@ Display: **Select an Option:** [C] Continue to File Validation
 
 #### Menu Handling Logic:
 
-- IF C: Save document inventory to {outputFile}, update frontmatter with completed step and files being included, and then read fully and follow: {nextStepFile}
+- IF C: Save document inventory to {outputFile}, update frontmatter with completed step and files being included, and then read fully and follow: ./step-02-prd-analysis.md
 - IF Any other comments or queries: help user respond then redisplay menu
 
 ## CRITICAL STEP COMPLETION NOTE
 
-ONLY WHEN C is selected and document inventory is saved will you load {nextStepFile} to begin file validation.
+ONLY WHEN C is selected and document inventory is saved will you load ./step-02-prd-analysis.md to begin file validation.
 
 ---
 
diff --git a/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-02-prd-analysis.md b/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-02-prd-analysis.md
index 4d22e7da9..85cadc4d4 100644
--- a/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-02-prd-analysis.md
+++ b/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-02-prd-analysis.md
@@ -1,8 +1,4 @@
 ---
-name: 'step-02-prd-analysis'
-description: 'Read and analyze PRD to extract all FRs and NFRs for coverage validation'
-
-nextStepFile: './step-03-epic-coverage-validation.md'
 outputFile: '{planning_artifacts}/implementation-readiness-report-{{date}}.md'
 epicsFile: '{planning_artifacts}/*epic*.md' # Will be resolved to actual file
 ---
@@ -149,7 +145,7 @@ After PRD analysis complete, immediately load next step for epic coverage valida
 
 ## PROCEEDING TO EPIC COVERAGE VALIDATION
 
-PRD analysis complete. Loading next step to validate epic coverage.
+PRD analysis complete. Read fully and follow: `./step-03-epic-coverage-validation.md`
 
 ---
 
diff --git a/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-03-epic-coverage-validation.md b/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-03-epic-coverage-validation.md
index b73511bea..961ee740c 100644
--- a/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-03-epic-coverage-validation.md
+++ b/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-03-epic-coverage-validation.md
@@ -1,8 +1,4 @@
 ---
-name: 'step-03-epic-coverage-validation'
-description: 'Validate that all PRD FRs are covered in epics and stories'
-
-nextStepFile: './step-04-ux-alignment.md'
 outputFile: '{planning_artifacts}/implementation-readiness-report-{{date}}.md'
 ---
 
@@ -150,7 +146,7 @@ After coverage validation complete, immediately load next step.
 
 ## PROCEEDING TO UX ALIGNMENT
 
-Epic coverage validation complete. Loading next step for UX alignment.
+Epic coverage validation complete. Read fully and follow: `./step-04-ux-alignment.md`
 
 ---
 
diff --git a/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-04-ux-alignment.md b/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-04-ux-alignment.md
index 236ad3b51..05718abe4 100644
--- a/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-04-ux-alignment.md
+++ b/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-04-ux-alignment.md
@@ -1,8 +1,4 @@
 ---
-name: 'step-04-ux-alignment'
-description: 'Check for UX document and validate alignment with PRD and Architecture'
-
-nextStepFile: './step-05-epic-quality-review.md'
 outputFile: '{planning_artifacts}/implementation-readiness-report-{{date}}.md'
 ---
 
@@ -113,7 +109,7 @@ After UX assessment complete, immediately load next step.
 
 ## PROCEEDING TO EPIC QUALITY REVIEW
 
-UX alignment assessment complete. Loading next step for epic quality review.
+UX alignment assessment complete. Read fully and follow: `./step-05-epic-quality-review.md`
 
 ---
 
diff --git a/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-05-epic-quality-review.md b/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-05-epic-quality-review.md
index 9f6d087f8..2e088f9b1 100644
--- a/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-05-epic-quality-review.md
+++ b/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-05-epic-quality-review.md
@@ -1,8 +1,4 @@
 ---
-name: 'step-05-epic-quality-review'
-description: 'Validate epics and stories against create-epics-and-stories best practices'
-
-nextStepFile: './step-06-final-assessment.md'
 outputFile: '{planning_artifacts}/implementation-readiness-report-{{date}}.md'
 ---
 
@@ -217,11 +213,11 @@ After completing epic quality review:
 - Update {outputFile} with all quality findings
 - Document specific best practices violations
 - Provide actionable recommendations
-- Load {nextStepFile} for final readiness assessment
+- Load ./step-06-final-assessment.md for final readiness assessment
 
 ## CRITICAL STEP COMPLETION NOTE
 
-This step executes autonomously. Load {nextStepFile} only after complete epic quality review is documented.
+This step executes autonomously. Load ./step-06-final-assessment.md only after complete epic quality review is documented.
 
 ---
 
diff --git a/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-06-final-assessment.md b/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-06-final-assessment.md
index 548aa8f6d..467864215 100644
--- a/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-06-final-assessment.md
+++ b/src/bmm/workflows/3-solutioning/bmad-check-implementation-readiness/steps/step-06-final-assessment.md
@@ -1,7 +1,4 @@
 ---
-name: 'step-06-final-assessment'
-description: 'Compile final assessment and polish the readiness report'
-
 outputFile: '{planning_artifacts}/implementation-readiness-report-{{date}}.md'
 ---