diff --git a/bmad-core/agents/analyst.md b/bmad-core/agents/analyst.md
index c4afe28d..d059e03f 100644
--- a/bmad-core/agents/analyst.md
+++ b/bmad-core/agents/analyst.md
@@ -51,7 +51,7 @@ commands:
   - exit: Say goodbye as the Business Analyst, and then abandon inhabiting this persona
 dependencies:
   tasks:
-    - brainstorming-techniques
+    - facilitate-brainstorming-session
     - create-deep-research-prompt
     - create-doc
     - advanced-elicitation
@@ -60,8 +60,10 @@ dependencies:
     - project-brief-tmpl
     - market-research-tmpl
     - competitor-analysis-tmpl
+    - brainstorming-output-tmpl
   data:
     - bmad-kb
+    - brainstorming-techniques
   utils:
     - template-format
 ```
diff --git a/bmad-core/agents/bmad-master.md b/bmad-core/agents/bmad-master.md
index 85a95bac..c4d86f65 100644
--- a/bmad-core/agents/bmad-master.md
+++ b/bmad-core/agents/bmad-master.md
@@ -59,7 +59,7 @@ execution:
 dependencies:
   tasks:
     - advanced-elicitation
-    - brainstorming-techniques
+    - facilitate-brainstorming-session
     - brownfield-create-epic
     - brownfield-create-story
     - correct-course
@@ -87,6 +87,7 @@ dependencies:
     - story-tmpl
   data:
     - bmad-kb
+    - brainstorming-techniques
     - technical-preferences
   utils:
     - plan-management
diff --git a/bmad-core/data/brainstorming-techniques.md b/bmad-core/data/brainstorming-techniques.md
new file mode 100644
index 00000000..32dc6204
--- /dev/null
+++ b/bmad-core/data/brainstorming-techniques.md
@@ -0,0 +1,31 @@
+# Brainstorming Techniques Data
+
+## Creative Expansion
+1. **What If Scenarios**: Ask one provocative question, get their response, then ask another
+2. **Analogical Thinking**: Give one example analogy, ask them to find 2-3 more
+3. **Reversal/Inversion**: Pose the reverse question, let them work through it
+4. **First Principles Thinking**: Ask "What are the fundamentals?" and guide them to break it down
+
+## Structured Frameworks
+5. **SCAMPER Method**: Go through one letter at a time, wait for their ideas before moving to next
+6. **Six Thinking Hats**: Present one hat, ask for their thoughts, then move to next hat
+7. **Mind Mapping**: Start with central concept, ask them to suggest branches
+
+## Collaborative Techniques
+8. **"Yes, And..." Building**: They give idea, you "yes and" it, they "yes and" back - alternate
+9. **Brainwriting/Round Robin**: They suggest idea, you build on it, ask them to build on yours
+10. **Random Stimulation**: Give one random prompt/word, ask them to make connections
+
+## Deep Exploration
+11. **Five Whys**: Ask "why" and wait for their answer before asking next "why"
+12. **Morphological Analysis**: Ask them to list parameters first, then explore combinations together
+13. **Provocation Technique (PO)**: Give one provocative statement, ask them to extract useful ideas
+
+## Advanced Techniques
+14. **Forced Relationships**: Connect two unrelated concepts and ask them to find the bridge
+15. **Assumption Reversal**: Challenge their core assumptions and ask them to build from there
+16. **Role Playing**: Ask them to brainstorm from different stakeholder perspectives
+17. **Time Shifting**: "How would you solve this in 1995? 2030?"
+18. **Resource Constraints**: "What if you had only $10 and 1 hour?"
+19. **Metaphor Mapping**: Use extended metaphors to explore solutions
+20. **Question Storming**: Generate questions instead of answers first
\ No newline at end of file
diff --git a/bmad-core/tasks/brainstorming-techniques.md b/bmad-core/tasks/brainstorming-techniques.md
deleted file mode 100644
index 631a16c6..00000000
--- a/bmad-core/tasks/brainstorming-techniques.md
+++ /dev/null
@@ -1,238 +0,0 @@
-# Brainstorming Techniques Task
-
-This task provides a comprehensive toolkit of creative brainstorming techniques for ideation and innovative thinking. The analyst can use these techniques to facilitate productive brainstorming sessions with users.
-
-## Process
-
-### 1. Session Setup
-
-[[LLM: Begin by understanding the brainstorming context and goals. Ask clarifying questions if needed to determine the best approach.]]
-
-1. **Establish Context**
-
-   - Understand the problem space or opportunity area
-   - Identify any constraints or parameters
-   - Determine session goals (divergent exploration vs. focused ideation)
-
-2. **Select Technique Approach**
-   - Option A: User selects specific techniques
-   - Option B: Analyst recommends techniques based on context
-   - Option C: Random technique selection for creative variety
-   - Option D: Progressive technique flow (start broad, narrow down)
-
-### 2. Core Brainstorming Techniques
-
-#### Creative Expansion Techniques
-
-1. **"What If" Scenarios**
-   [[LLM: Generate provocative what-if questions that challenge assumptions and expand thinking beyond current limitations.]]
-
-   - What if we had unlimited resources?
-   - What if this problem didn't exist?
-   - What if we approached this from a child's perspective?
-   - What if we had to solve this in 24 hours?
-
-2. **Analogical Thinking**
-   [[LLM: Help user draw parallels between their challenge and other domains, industries, or natural systems.]]
-
-   - "How might this work like [X] but for [Y]?"
-   - Nature-inspired solutions (biomimicry)
-   - Cross-industry pattern matching
-   - Historical precedent analysis
-
-3. **Reversal/Inversion**
-   [[LLM: Flip the problem or approach it from the opposite angle to reveal new insights.]]
-
-   - What if we did the exact opposite?
-   - How could we make this problem worse? (then reverse)
-   - Start from the end goal and work backward
-   - Reverse roles or perspectives
-
-4. **First Principles Thinking**
-   [[LLM: Break down to fundamental truths and rebuild from scratch.]]
-   - What are the absolute fundamentals here?
-   - What assumptions can we challenge?
-   - If we started from zero, what would we build?
-   - What laws of physics/economics/human nature apply?
-
-#### Structured Ideation Frameworks
-
-1. **SCAMPER Method**
-   [[LLM: Guide through each SCAMPER prompt systematically.]]
-
-   - **S** = Substitute: What can be substituted?
-   - **C** = Combine: What can be combined or integrated?
-   - **A** = Adapt: What can be adapted from elsewhere?
-   - **M** = Modify/Magnify: What can be emphasized or reduced?
-   - **P** = Put to other uses: What else could this be used for?
-   - **E** = Eliminate: What can be removed or simplified?
-   - **R**= Reverse/Rearrange: What can be reversed or reordered?
-
-2. **Six Thinking Hats**
-   [[LLM: Cycle through different thinking modes, spending focused time in each.]]
-
-   - White Hat: Facts and information
-   - Red Hat: Emotions and intuition
-   - Black Hat: Caution and critical thinking
-   - Yellow Hat: Optimism and benefits
-   - Green Hat: Creativity and alternatives
-   - Blue Hat: Process and control
-
-3. **Mind Mapping**
-   [[LLM: Create text-based mind maps with clear hierarchical structure.]]
-
-   ```plaintext
-   Central Concept
-   ├── Branch 1
-   │   ├── Sub-idea 1.1
-   │   └── Sub-idea 1.2
-   ├── Branch 2
-   │   ├── Sub-idea 2.1
-   │   └── Sub-idea 2.2
-   └── Branch 3
-       └── Sub-idea 3.1
-   ```
-
-#### Collaborative Techniques
-
-1. **"Yes, And..." Building**
-   [[LLM: Accept every idea and build upon it without judgment. Encourage wild ideas and defer criticism.]]
-
-   - Accept the premise of each idea
-   - Add to it with "Yes, and..."
-   - Build chains of connected ideas
-   - Explore tangents freely
-
-2. **Brainwriting/Round Robin**
-   [[LLM: Simulate multiple perspectives by generating ideas from different viewpoints.]]
-
-   - Generate ideas from stakeholder perspectives
-   - Build on previous ideas in rounds
-   - Combine unrelated ideas
-   - Cross-pollinate concepts
-
-3. **Random Stimulation**
-   [[LLM: Use random words, images, or concepts as creative triggers.]]
-   - Random word association
-   - Picture/metaphor inspiration
-   - Forced connections between unrelated items
-   - Constraint-based creativity
-
-#### Deep Exploration Techniques
-
-1. **Five Whys**
-   [[LLM: Dig deeper into root causes and underlying motivations.]]
-
-   - Why does this problem exist? → Answer → Why? (repeat 5 times)
-   - Uncover hidden assumptions
-   - Find root causes, not symptoms
-   - Identify intervention points
-
-2. **Morphological Analysis**
-   [[LLM: Break down into parameters and systematically explore combinations.]]
-
-   - List key parameters/dimensions
-   - Identify possible values for each
-   - Create combination matrix
-   - Explore unusual combinations
-
-3. **Provocation Technique (PO)**
-   [[LLM: Make deliberately provocative statements to jar thinking.]]
-   - PO: Cars have square wheels
-   - PO: Customers pay us to take products
-   - PO: The problem solves itself
-   - Extract useful ideas from provocations
-
-### 3. Technique Selection Guide
-
-[[LLM: Help user select appropriate techniques based on their needs.]]
-
-**For Initial Exploration:**
-
-- What If Scenarios
-- First Principles
-- Mind Mapping
-
-**For Stuck/Blocked Thinking:**
-
-- Random Stimulation
-- Reversal/Inversion
-- Provocation Technique
-
-**For Systematic Coverage:**
-
-- SCAMPER
-- Morphological Analysis
-- Six Thinking Hats
-
-**For Deep Understanding:**
-
-- Five Whys
-- Analogical Thinking
-- First Principles
-
-**For Team/Collaborative Settings:**
-
-- Brainwriting
-- "Yes, And..."
-- Six Thinking Hats
-
-### 4. Session Flow Management
-
-[[LLM: Guide the brainstorming session with appropriate pacing and technique transitions.]]
-
-1. **Warm-up Phase** (5-10 min)
-
-   - Start with accessible techniques
-   - Build creative confidence
-   - Establish "no judgment" atmosphere
-
-2. **Divergent Phase** (20-30 min)
-
-   - Use expansion techniques
-   - Generate quantity over quality
-   - Encourage wild ideas
-
-3. **Convergent Phase** (15-20 min)
-
-   - Group and categorize ideas
-   - Identify patterns and themes
-   - Select promising directions
-
-4. **Synthesis Phase** (10-15 min)
-   - Combine complementary ideas
-   - Refine and develop concepts
-   - Prepare summary of insights
-
-### 5. Output Format
-
-[[LLM: Present brainstorming results in an organized, actionable format.]]
-
-**Session Summary:**
-
-- Techniques used
-- Number of ideas generated
-- Key themes identified
-
-**Idea Categories:**
-
-1. **Immediate Opportunities** - Ideas that could be implemented now
-2. **Future Innovations** - Ideas requiring more development
-3. **Moonshots** - Ambitious, transformative ideas
-4. **Insights & Learnings** - Key realizations from the session
-
-**Next Steps:**
-
-- Which ideas to explore further
-- Recommended follow-up techniques
-- Suggested research areas
-
-## Important Notes
-
-- Maintain energy and momentum throughout the session
-- Defer judgment - all ideas are valid during generation
-- Quantity leads to quality - aim for many ideas
-- Build on ideas collaboratively
-- Document everything - even "silly" ideas can spark breakthroughs
-- Take breaks if energy flags
-- End with clear next actions
diff --git a/bmad-core/tasks/facilitate-brainstorming-session.md b/bmad-core/tasks/facilitate-brainstorming-session.md
new file mode 100644
index 00000000..efafab14
--- /dev/null
+++ b/bmad-core/tasks/facilitate-brainstorming-session.md
@@ -0,0 +1,136 @@
+---
+docOutputLocation: docs/brainstorming-session-results.md
+template: brainstorming-output-tmpl
+---
+
+# Facilitate Brainstorming Session Task
+
+Facilitate interactive brainstorming sessions with users. Be creative and adaptive in applying techniques.
+
+## Process
+
+### Step 1: Session Setup
+
+Ask 4 context questions (don't preview what happens next):
+
+1. What are we brainstorming about?
+2. Any constraints or parameters?
+3. Goal: broad exploration or focused ideation?
+4. Do you want a structured document output to reference later? (Y/N)
+
+### Step 2: Present Approach Options
+
+After getting answers to Step 1, present 4 approach options (numbered):
+
+1. User selects specific techniques
+2. Analyst recommends techniques based on context
+3. Random technique selection for creative variety
+4. Progressive technique flow (start broad, narrow down)
+
+### Step 3: Execute Techniques Interactively
+
+**KEY PRINCIPLES:**
+
+- **FACILITATOR ROLE**: Guide user to generate their own ideas through questions, prompts, and examples
+- **CONTINUOUS ENGAGEMENT**: Keep user engaged with chosen technique until they want to switch or are satisfied
+- **CAPTURE OUTPUT**: If document output requested, capture all ideas generated in each technique section
+
+**Technique Selection:**
+If user selects Option 1, present numbered list of techniques from the brainstorming-techniques data file. User can select by number (e.g., "7" for Mind Mapping).
+
+**Technique Execution:**
+
+1. Apply selected technique according to data file description
+2. Keep engaging with technique until user indicates they want to:
+   - Choose a different technique
+   - Apply current ideas to a new technique  
+   - Move to convergent phase
+   - End session
+
+**Output Capture (if requested):**
+For each technique used, capture:
+
+- Technique name and duration
+- Key ideas generated by user
+- Insights and patterns identified
+- User's reflections on the process
+
+### Step 4: Session Flow
+
+1. **Warm-up** (5-10 min) - Build creative confidence
+2. **Divergent** (20-30 min) - Generate quantity over quality
+3. **Convergent** (15-20 min) - Group and categorize ideas
+4. **Synthesis** (10-15 min) - Refine and develop concepts
+
+### Step 5: Document Output (if requested)
+
+Generate structured document with these sections:
+
+**Executive Summary**
+
+- Session topic and goals
+- Techniques used and duration
+- Total ideas generated
+- Key themes and patterns identified
+
+**Technique Sections** (for each technique used)
+
+- Technique name and description
+- Ideas generated (user's own words)
+- Insights discovered
+- Notable connections or patterns
+
+**Idea Categorization**
+
+- **Immediate Opportunities** - Ready to implement now
+- **Future Innovations** - Requires development/research
+- **Moonshots** - Ambitious, transformative concepts
+- **Insights & Learnings** - Key realizations from session
+
+**Action Planning**
+
+- Top 3 priority ideas with rationale
+- Next steps for each priority
+- Resources/research needed
+- Timeline considerations
+
+**Reflection & Follow-up**
+
+- What worked well in this session
+- Areas for further exploration
+- Recommended follow-up techniques
+- Questions that emerged for future sessions
+
+## Key Principles
+
+- **YOU ARE A FACILITATOR**: Guide the user to brainstorm, don't brainstorm for them
+- **INTERACTIVE DIALOGUE**: Ask questions, wait for responses, build on their ideas
+- **ONE TECHNIQUE AT A TIME**: Don't mix multiple techniques in one response
+- **CONTINUOUS ENGAGEMENT**: Stay with one technique until user wants to switch
+- **DRAW IDEAS OUT**: Use prompts and examples to help them generate their own ideas
+- **REAL-TIME ADAPTATION**: Monitor engagement and adjust approach as needed
+- Maintain energy and momentum
+- Defer judgment during generation
+- Quantity leads to quality (aim for 100 ideas in 60 minutes)
+- Build on ideas collaboratively
+- Document everything if output requested
+
+## Advanced Engagement Strategies
+
+**Energy Management**
+
+- Check engagement levels: "How are you feeling about this direction?"
+- Offer breaks or technique switches if energy flags
+- Use encouraging language and celebrate idea generation
+
+**Depth vs. Breadth**
+
+- Ask follow-up questions to deepen ideas: "Tell me more about that..."
+- Use "Yes, and..." to build on their ideas
+- Help them make connections: "How does this relate to your earlier idea about...?"
+
+**Transition Management**
+
+- Always ask before switching techniques: "Ready to try a different approach?"
+- Offer options: "Should we explore this idea deeper or generate more alternatives?"
+- Respect their process and timing
diff --git a/bmad-core/templates/brainstorming-output-tmpl.md b/bmad-core/templates/brainstorming-output-tmpl.md
new file mode 100644
index 00000000..e3ad6418
--- /dev/null
+++ b/bmad-core/templates/brainstorming-output-tmpl.md
@@ -0,0 +1,149 @@
+---
+defaultOutput: docs/brainstorming-session-results.md
+---
+
+# Brainstorming Session Results
+
+**Session Date:** [DATE]
+**Facilitator:** [Agent Role] [Agent Name]
+**Participant:** [USER NAME]
+
+## Executive Summary
+
+**Topic:** [SESSION TOPIC]
+
+**Session Goals:** [STATED GOALS]
+
+**Techniques Used:** [LIST OF TECHNIQUES AND DURATION]
+
+**Total Ideas Generated:** [NUMBER]
+
+**Key Themes Identified:**
+
+- [THEME 1]
+- [THEME 2]
+- [THEME 3]
+
+---
+
+## Technique Sessions
+
+### [TECHNIQUE NAME 1] - [DURATION]
+
+**Description:** [BRIEF DESCRIPTION OF TECHNIQUE]
+
+**Ideas Generated:**
+
+1. [USER IDEA 1]
+2. [USER IDEA 2]
+3. [USER IDEA 3]
+[etc.]
+
+**Insights Discovered:**
+
+- [INSIGHT 1]
+- [INSIGHT 2]
+
+**Notable Connections:**
+
+- [CONNECTION OR PATTERN IDENTIFIED]
+
+---
+
+### [TECHNIQUE NAME 2] - [DURATION]
+
+[Repeat format for each technique used]
+
+---
+
+## Idea Categorization
+
+### Immediate Opportunities
+
+*Ideas ready to implement now*
+
+1. **[IDEA NAME]**
+   - Description: [BRIEF DESCRIPTION]
+   - Why immediate: [RATIONALE]
+   - Resources needed: [BASIC REQUIREMENTS]
+
+### Future Innovations
+
+*Ideas requiring development/research*
+
+1. **[IDEA NAME]**
+   - Description: [BRIEF DESCRIPTION]
+   - Development needed: [WHAT'S REQUIRED]
+   - Timeline estimate: [ROUGH TIMEFRAME]
+
+### Moonshots
+
+*Ambitious, transformative concepts*
+
+1. **[IDEA NAME]**
+   - Description: [BRIEF DESCRIPTION]
+   - Transformative potential: [WHY IT'S A MOONSHOT]
+   - Challenges to overcome: [MAJOR OBSTACLES]
+
+### Insights & Learnings
+
+*Key realizations from the session*
+
+- [INSIGHT 1]: [DESCRIPTION AND IMPLICATIONS]
+- [INSIGHT 2]: [DESCRIPTION AND IMPLICATIONS]
+
+---
+
+## Action Planning
+
+### Top 3 Priority Ideas
+
+**#1 Priority: [IDEA NAME]**
+
+- Rationale: [WHY THIS IS TOP PRIORITY]
+- Next steps: [SPECIFIC ACTIONS TO TAKE]
+- Resources needed: [WHAT'S REQUIRED]
+- Timeline: [WHEN TO START/COMPLETE]
+
+**#2 Priority: [IDEA NAME]**
+
+- [Same format]
+
+**#3 Priority: [IDEA NAME]**
+
+- [Same format]
+
+---
+
+## Reflection & Follow-up
+
+### What Worked Well
+
+- [SUCCESSFUL ASPECT 1]
+- [SUCCESSFUL ASPECT 2]
+
+### Areas for Further Exploration
+
+- [AREA 1]: [WHY IT NEEDS MORE EXPLORATION]
+- [AREA 2]: [WHY IT NEEDS MORE EXPLORATION]
+
+### Recommended Follow-up Techniques
+
+- [TECHNIQUE 1]: [WHY IT WOULD BE HELPFUL]
+- [TECHNIQUE 2]: [WHY IT WOULD BE HELPFUL]
+
+### Questions That Emerged
+
+- [QUESTION 1]
+- [QUESTION 2]
+- [QUESTION 3]
+
+### Next Session Planning
+
+- **Suggested topics:** [FOLLOW-UP TOPICS]
+- **Recommended timeframe:** [WHEN TO RECONVENE]
+- **Preparation needed:** [WHAT TO RESEARCH/PREPARE]
+
+---
+
+*Session facilitated using the BMAD-METHOD brainstorming framework*