diff --git a/src/bmm/agents/analyst.agent.yaml b/src/bmm/agents/analyst.agent.yaml
index 4767dadfa..332e778a8 100644
--- a/src/bmm/agents/analyst.agent.yaml
+++ b/src/bmm/agents/analyst.agent.yaml
@@ -18,7 +18,7 @@ agent:
menu:
- trigger: BP or fuzzy match on brainstorm-project
- exec: "{project-root}/_bmad/core/workflows/brainstorming/workflow.md"
+ exec: "skill:bmad-brainstorming"
data: "{project-root}/_bmad/bmm/data/project-context-template.md"
description: "[BP] Brainstorm Project: Expert Guided Facilitation through a single or multiple techniques with a final report"
diff --git a/src/bmm/module-help.csv b/src/bmm/module-help.csv
index 73482ae56..85f7bf6f8 100644
--- a/src/bmm/module-help.csv
+++ b/src/bmm/module-help.csv
@@ -10,7 +10,7 @@ bmm,anytime,Update Standards,US,,_bmad/bmm/agents/tech-writer/tech-writer.agent.
bmm,anytime,Mermaid Generate,MG,,_bmad/bmm/agents/tech-writer/tech-writer.agent.yaml,,false,tech-writer,,"Create a Mermaid diagram based on user description. Will suggest diagram types if not specified.",planning_artifacts,"mermaid diagram",
bmm,anytime,Validate Document,VD,,_bmad/bmm/agents/tech-writer/tech-writer.agent.yaml,,false,tech-writer,,"Review the specified document against documentation standards and best practices. Returns specific actionable improvement suggestions organized by priority.",planning_artifacts,"validation report",
bmm,anytime,Explain Concept,EC,,_bmad/bmm/agents/tech-writer/tech-writer.agent.yaml,,false,tech-writer,,"Create clear technical explanations with examples and diagrams for complex concepts. Breaks down into digestible sections using task-oriented approach.",project_knowledge,"explanation",
-bmm,1-analysis,Brainstorm Project,BP,10,_bmad/core/workflows/brainstorming/workflow.md,bmad-brainstorming,false,analyst,data=_bmad/bmm/data/project-context-template.md,"Expert Guided Facilitation through a single or multiple techniques",planning_artifacts,"brainstorming session",
+bmm,1-analysis,Brainstorm Project,BP,10,skill:bmad-brainstorming,bmad-brainstorming,false,analyst,data=_bmad/bmm/data/project-context-template.md,"Expert Guided Facilitation through a single or multiple techniques",planning_artifacts,"brainstorming session",
bmm,1-analysis,Market Research,MR,20,_bmad/bmm/workflows/1-analysis/research/workflow-market-research.md,bmad-bmm-market-research,false,analyst,Create Mode,"Market analysis competitive landscape customer needs and trends","planning_artifacts|project-knowledge","research documents",
bmm,1-analysis,Domain Research,DR,21,_bmad/bmm/workflows/1-analysis/research/workflow-domain-research.md,bmad-bmm-domain-research,false,analyst,Create Mode,"Industry domain deep dive subject matter expertise and terminology","planning_artifacts|project_knowledge","research documents",
bmm,1-analysis,Technical Research,TR,22,_bmad/bmm/workflows/1-analysis/research/workflow-technical-research.md,bmad-bmm-technical-research,false,analyst,Create Mode,"Technical feasibility architecture options and implementation approaches","planning_artifacts|project_knowledge","research documents",
diff --git a/src/core/module-help.csv b/src/core/module-help.csv
index 456238761..e987b9353 100644
--- a/src/core/module-help.csv
+++ b/src/core/module-help.csv
@@ -1,5 +1,5 @@
module,phase,name,code,sequence,workflow-file,command,required,agent,options,description,output-location,outputs
-core,anytime,Brainstorming,BSP,,_bmad/core/workflows/brainstorming/workflow.md,bmad-brainstorming,false,analyst,,"Generate diverse ideas through interactive techniques. Use early in ideation phase or when stuck generating ideas.",{output_folder}/brainstorming/brainstorming-session-{{date}}.md,,
+core,anytime,Brainstorming,BSP,,skill:bmad-brainstorming,bmad-brainstorming,false,analyst,,"Generate diverse ideas through interactive techniques. Use early in ideation phase or when stuck generating ideas.",{output_folder}/brainstorming/brainstorming-session-{{date}}.md,,
core,anytime,Party Mode,PM,,skill:bmad-party-mode,bmad-party-mode,false,party-mode facilitator,,"Orchestrate multi-agent discussions. Use when you need multiple agent perspectives or want agents to collaborate.",,
core,anytime,bmad-help,BH,,skill:bmad-help,bmad-help,false,,,"Get unstuck by showing what workflow steps come next or answering BMad Method questions.",,
core,anytime,Index Docs,ID,,skill:bmad-index-docs,bmad-index-docs,false,,,"Create lightweight index for quick LLM scanning. Use when LLM needs to understand available docs without loading everything.",,
diff --git a/src/core/workflows/bmad-brainstorming/SKILL.md b/src/core/workflows/bmad-brainstorming/SKILL.md
new file mode 100644
index 000000000..0d0d55663
--- /dev/null
+++ b/src/core/workflows/bmad-brainstorming/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: bmad-brainstorming
+description: 'Facilitate interactive brainstorming sessions using diverse creative techniques and ideation methods. Use when the user says help me brainstorm or help me ideate.'
+---
+
+Follow the instructions in [workflow.md](workflow.md).
diff --git a/src/core/workflows/bmad-brainstorming/bmad-skill-manifest.yaml b/src/core/workflows/bmad-brainstorming/bmad-skill-manifest.yaml
new file mode 100644
index 000000000..d0f08abdb
--- /dev/null
+++ b/src/core/workflows/bmad-brainstorming/bmad-skill-manifest.yaml
@@ -0,0 +1 @@
+type: skill
diff --git a/src/core/workflows/brainstorming/brain-methods.csv b/src/core/workflows/bmad-brainstorming/brain-methods.csv
similarity index 100%
rename from src/core/workflows/brainstorming/brain-methods.csv
rename to src/core/workflows/bmad-brainstorming/brain-methods.csv
diff --git a/src/core/workflows/brainstorming/steps/step-01-session-setup.md b/src/core/workflows/bmad-brainstorming/steps/step-01-session-setup.md
similarity index 100%
rename from src/core/workflows/brainstorming/steps/step-01-session-setup.md
rename to src/core/workflows/bmad-brainstorming/steps/step-01-session-setup.md
diff --git a/src/core/workflows/brainstorming/steps/step-01b-continue.md b/src/core/workflows/bmad-brainstorming/steps/step-01b-continue.md
similarity index 100%
rename from src/core/workflows/brainstorming/steps/step-01b-continue.md
rename to src/core/workflows/bmad-brainstorming/steps/step-01b-continue.md
diff --git a/src/core/workflows/brainstorming/steps/step-02a-user-selected.md b/src/core/workflows/bmad-brainstorming/steps/step-02a-user-selected.md
similarity index 100%
rename from src/core/workflows/brainstorming/steps/step-02a-user-selected.md
rename to src/core/workflows/bmad-brainstorming/steps/step-02a-user-selected.md
diff --git a/src/core/workflows/brainstorming/steps/step-02b-ai-recommended.md b/src/core/workflows/bmad-brainstorming/steps/step-02b-ai-recommended.md
similarity index 100%
rename from src/core/workflows/brainstorming/steps/step-02b-ai-recommended.md
rename to src/core/workflows/bmad-brainstorming/steps/step-02b-ai-recommended.md
diff --git a/src/core/workflows/brainstorming/steps/step-02c-random-selection.md b/src/core/workflows/bmad-brainstorming/steps/step-02c-random-selection.md
similarity index 100%
rename from src/core/workflows/brainstorming/steps/step-02c-random-selection.md
rename to src/core/workflows/bmad-brainstorming/steps/step-02c-random-selection.md
diff --git a/src/core/workflows/brainstorming/steps/step-02d-progressive-flow.md b/src/core/workflows/bmad-brainstorming/steps/step-02d-progressive-flow.md
similarity index 100%
rename from src/core/workflows/brainstorming/steps/step-02d-progressive-flow.md
rename to src/core/workflows/bmad-brainstorming/steps/step-02d-progressive-flow.md
diff --git a/src/core/workflows/brainstorming/steps/step-03-technique-execution.md b/src/core/workflows/bmad-brainstorming/steps/step-03-technique-execution.md
similarity index 100%
rename from src/core/workflows/brainstorming/steps/step-03-technique-execution.md
rename to src/core/workflows/bmad-brainstorming/steps/step-03-technique-execution.md
diff --git a/src/core/workflows/brainstorming/steps/step-04-idea-organization.md b/src/core/workflows/bmad-brainstorming/steps/step-04-idea-organization.md
similarity index 100%
rename from src/core/workflows/brainstorming/steps/step-04-idea-organization.md
rename to src/core/workflows/bmad-brainstorming/steps/step-04-idea-organization.md
diff --git a/src/core/workflows/brainstorming/template.md b/src/core/workflows/bmad-brainstorming/template.md
similarity index 100%
rename from src/core/workflows/brainstorming/template.md
rename to src/core/workflows/bmad-brainstorming/template.md
diff --git a/src/core/workflows/brainstorming/workflow.md b/src/core/workflows/bmad-brainstorming/workflow.md
similarity index 93%
rename from src/core/workflows/brainstorming/workflow.md
rename to src/core/workflows/bmad-brainstorming/workflow.md
index 3a05e93f9..e8b11e4e1 100644
--- a/src/core/workflows/brainstorming/workflow.md
+++ b/src/core/workflows/bmad-brainstorming/workflow.md
@@ -1,5 +1,5 @@
---
-name: brainstorming
+name: bmad-brainstorming
description: 'Facilitate interactive brainstorming sessions using diverse creative techniques and ideation methods. Use when the user says help me brainstorm or help me ideate.'
context_file: '' # Optional context file path for project-specific guidance
---
@@ -42,9 +42,8 @@ Load config from `{project-root}/_bmad/core/config.yaml` and resolve:
### Paths
-- `installed_path` = `{project-root}/_bmad/core/workflows/brainstorming`
-- `template_path` = `{installed_path}/template.md`
-- `brain_techniques_path` = `{installed_path}/brain-methods.csv`
+- `template_path` = `./template.md`
+- `brain_techniques_path` = `./brain-methods.csv`
- `brainstorming_session_output_file` = `{output_folder}/brainstorming/brainstorming-session-{{date}}-{{time}}.md` (evaluated once at workflow start)
All steps MUST reference `{brainstorming_session_output_file}` instead of the full path pattern.
diff --git a/src/core/workflows/bmad-party-mode/workflow.md b/src/core/workflows/bmad-party-mode/workflow.md
index 5b439f55d..e8e13b2a1 100644
--- a/src/core/workflows/bmad-party-mode/workflow.md
+++ b/src/core/workflows/bmad-party-mode/workflow.md
@@ -1,6 +1,4 @@
---
-name: bmad-party-mode
-description: 'Orchestrates group discussions between all installed BMAD agents, enabling natural multi-agent conversations. Use when user requests party mode.'
---
# Party Mode Workflow
diff --git a/src/core/workflows/brainstorming/bmad-skill-manifest.yaml b/src/core/workflows/brainstorming/bmad-skill-manifest.yaml
deleted file mode 100644
index 39a8f0ca9..000000000
--- a/src/core/workflows/brainstorming/bmad-skill-manifest.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-canonicalId: bmad-brainstorming
-type: workflow
-description: "Facilitate interactive brainstorming sessions using diverse creative techniques and ideation methods"
diff --git a/tools/cli/installers/lib/ide/_base-ide.js b/tools/cli/installers/lib/ide/_base-ide.js
index a09222868..ce1b0ceae 100644
--- a/tools/cli/installers/lib/ide/_base-ide.js
+++ b/tools/cli/installers/lib/ide/_base-ide.js
@@ -349,7 +349,6 @@ class BaseIdeSetup {
} else if (entry.isFile() && entry.name === 'workflow.md') {
// Read workflow.md frontmatter to get name and standalone property
try {
- const yaml = require('yaml');
const content = await fs.readFile(fullPath, 'utf8');
const frontmatterMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
if (!frontmatterMatch) continue;
diff --git a/tools/cli/lib/agent/compiler.js b/tools/cli/lib/agent/compiler.js
index ca03b79c7..a557a69af 100644
--- a/tools/cli/lib/agent/compiler.js
+++ b/tools/cli/lib/agent/compiler.js
@@ -157,7 +157,7 @@ function buildMenuXml(menuItems) {
}
}
- xml += ` - [PM] Start Party Mode
\n`;
+ xml += ` - [PM] Start Party Mode
\n`;
xml += ` - [DA] Dismiss Agent
\n`;
xml += ' \n';