bmad-method 4.37.0 → 4.39.1

package/dist/agents/analyst.txt

@@ -76,171 +76,152 @@ persona:
     - Numbered Options Protocol - Always use numbered lists for selections
 commands:
   - help: Show numbered list of the following commands to allow selection
-  - create-project-brief: use task create-doc with project-brief-tmpl.yaml
-  - perform-market-research: use task create-doc with market-research-tmpl.yaml
+  - brainstorm {topic}: Facilitate structured brainstorming session (run task facilitate-brainstorming-session.md with template brainstorming-output-tmpl.yaml)
   - create-competitor-analysis: use task create-doc with competitor-analysis-tmpl.yaml
-  - yolo: Toggle Yolo Mode
+  - create-project-brief: use task create-doc with project-brief-tmpl.yaml
   - doc-out: Output full document in progress to current destination file
-  - research-prompt {topic}: execute task create-deep-research-prompt.md
-  - brainstorm {topic}: Facilitate structured brainstorming session (run task facilitate-brainstorming-session.md with template brainstorming-output-tmpl.yaml)
   - elicit: run the task advanced-elicitation
+  - perform-market-research: use task create-doc with market-research-tmpl.yaml
+  - research-prompt {topic}: execute task create-deep-research-prompt.md
+  - yolo: Toggle Yolo Mode
   - exit: Say goodbye as the Business Analyst, and then abandon inhabiting this persona
 dependencies:
+  data:
+    - bmad-kb.md
+    - brainstorming-techniques.md
   tasks:
-    - facilitate-brainstorming-session.md
+    - advanced-elicitation.md
     - create-deep-research-prompt.md
     - create-doc.md
-    - advanced-elicitation.md
     - document-project.md
+    - facilitate-brainstorming-session.md
   templates:
-    - project-brief-tmpl.yaml
-    - market-research-tmpl.yaml
-    - competitor-analysis-tmpl.yaml
     - brainstorming-output-tmpl.yaml
-  data:
-    - bmad-kb.md
-    - brainstorming-techniques.md
+    - competitor-analysis-tmpl.yaml
+    - market-research-tmpl.yaml
+    - project-brief-tmpl.yaml
 ```
 ==================== END: .bmad-core/agents/analyst.md ====================
 
-==================== START: .bmad-core/tasks/facilitate-brainstorming-session.md ====================
----
-docOutputLocation: docs/brainstorming-session-results.md
-template: ".bmad-core/templates/brainstorming-output-tmpl.yaml"
----
-
-# 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):
+==================== START: .bmad-core/tasks/advanced-elicitation.md ====================
+# Advanced Elicitation Task
 
-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? (Default Yes)
+## Purpose
 
-### Step 2: Present Approach Options
+- Provide optional reflective and brainstorming actions to enhance content quality
+- Enable deeper exploration of ideas through structured elicitation techniques
+- Support iterative refinement through multiple analytical perspectives
+- Usable during template-driven document creation or any chat conversation
 
-After getting answers to Step 1, present 4 approach options (numbered):
+## Usage Scenarios
 
-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)
+### Scenario 1: Template Document Creation
 
-### Step 3: Execute Techniques Interactively
+After outputting a section during document creation:
 
-**KEY PRINCIPLES:**
+1. **Section Review**: Ask user to review the drafted section
+2. **Offer Elicitation**: Present 9 carefully selected elicitation methods
+3. **Simple Selection**: User types a number (0-8) to engage method, or 9 to proceed
+4. **Execute & Loop**: Apply selected method, then re-offer choices until user proceeds
 
-- **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 (default) document output requested, capture all ideas generated in each technique section to the document from the beginning.
+### Scenario 2: General Chat Elicitation
 
-**Technique Selection:**
-If user selects Option 1, present numbered list of techniques from the brainstorming-techniques data file. User can select by number..
+User can request advanced elicitation on any agent output:
 
-**Technique Execution:**
+- User says "do advanced elicitation" or similar
+- Agent selects 9 relevant methods for the context
+- Same simple 0-9 selection process
 
-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
+## Task Instructions
 
-**Output Capture (if requested):**
-For each technique used, capture:
+### 1. Intelligent Method Selection
 
-- Technique name and duration
-- Key ideas generated by user
-- Insights and patterns identified
-- User's reflections on the process
+**Context Analysis**: Before presenting options, analyze:
 
-### Step 4: Session Flow
+- **Content Type**: Technical specs, user stories, architecture, requirements, etc.
+- **Complexity Level**: Simple, moderate, or complex content
+- **Stakeholder Needs**: Who will use this information
+- **Risk Level**: High-impact decisions vs routine items
+- **Creative Potential**: Opportunities for innovation or alternatives
 
-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
+**Method Selection Strategy**:
 
-### Step 5: Document Output (if requested)
+1. **Always Include Core Methods** (choose 3-4):
+   - Expand or Contract for Audience
+   - Critique and Refine
+   - Identify Potential Risks
+   - Assess Alignment with Goals
 
-Generate structured document with these sections:
+2. **Context-Specific Methods** (choose 4-5):
+   - **Technical Content**: Tree of Thoughts, ReWOO, Meta-Prompting
+   - **User-Facing Content**: Agile Team Perspective, Stakeholder Roundtable
+   - **Creative Content**: Innovation Tournament, Escape Room Challenge
+   - **Strategic Content**: Red Team vs Blue Team, Hindsight Reflection
 
-**Executive Summary**
+3. **Always Include**: "Proceed / No Further Actions" as option 9
 
-- Session topic and goals
-- Techniques used and duration
-- Total ideas generated
-- Key themes and patterns identified
+### 2. Section Context and Review
 
-**Technique Sections** (for each technique used)
+When invoked after outputting a section:
 
-- Technique name and description
-- Ideas generated (user's own words)
-- Insights discovered
-- Notable connections or patterns
+1. **Provide Context Summary**: Give a brief 1-2 sentence summary of what the user should look for in the section just presented
 
-**Idea Categorization**
+2. **Explain Visual Elements**: If the section contains diagrams, explain them briefly before offering elicitation options
 
-- **Immediate Opportunities** - Ready to implement now
-- **Future Innovations** - Requires development/research
-- **Moonshots** - Ambitious, transformative concepts
-- **Insights & Learnings** - Key realizations from session
+3. **Clarify Scope Options**: If the section contains multiple distinct items, inform the user they can apply elicitation actions to:
+   - The entire section as a whole
+   - Individual items within the section (specify which item when selecting an action)
 
-**Action Planning**
+### 3. Present Elicitation Options
 
-- Top 3 priority ideas with rationale
-- Next steps for each priority
-- Resources/research needed
-- Timeline considerations
+**Review Request Process:**
 
-**Reflection & Follow-up**
+- Ask the user to review the drafted section
+- In the SAME message, inform them they can suggest direct changes OR select an elicitation method
+- Present 9 intelligently selected methods (0-8) plus "Proceed" (9)
+- Keep descriptions short - just the method name
+- Await simple numeric selection
 
-- What worked well in this session
-- Areas for further exploration
-- Recommended follow-up techniques
-- Questions that emerged for future sessions
+**Action List Presentation Format:**
 
-## Key Principles
+```text
+**Advanced Elicitation Options**
+Choose a number (0-8) or 9 to proceed:
 
-- **YOU ARE A FACILITATOR**: Guide the user to brainstorm, don't brainstorm for them (unless they request it persistently)
-- **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 in output document
+0. [Method Name]
+1. [Method Name]
+2. [Method Name]
+3. [Method Name]
+4. [Method Name]
+5. [Method Name]
+6. [Method Name]
+7. [Method Name]
+8. [Method Name]
+9. Proceed / No Further Actions
+```
 
-## Advanced Engagement Strategies
+**Response Handling:**
 
-**Energy Management**
+- **Numbers 0-8**: Execute the selected method, then re-offer the choice
+- **Number 9**: Proceed to next section or continue conversation
+- **Direct Feedback**: Apply user's suggested changes and continue
 
-- 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
+### 4. Method Execution Framework
 
-**Depth vs. Breadth**
+**Execution Process:**
 
-- 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...?"
+1. **Retrieve Method**: Access the specific elicitation method from the elicitation-methods data file
+2. **Apply Context**: Execute the method from your current role's perspective
+3. **Provide Results**: Deliver insights, critiques, or alternatives relevant to the content
+4. **Re-offer Choice**: Present the same 9 options again until user selects 9 or gives direct feedback
 
-**Transition Management**
+**Execution Guidelines:**
 
-- 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
-==================== END: .bmad-core/tasks/facilitate-brainstorming-session.md ====================
+- **Be Concise**: Focus on actionable insights, not lengthy explanations
+- **Stay Relevant**: Tie all elicitation back to the specific content being analyzed
+- **Identify Personas**: For multi-persona methods, clearly identify which viewpoint is speaking
+- **Maintain Flow**: Keep the process moving efficiently
+==================== END: .bmad-core/tasks/advanced-elicitation.md ====================
 
 ==================== START: .bmad-core/tasks/create-deep-research-prompt.md ====================
 # Create Deep Research Prompt Task
@@ -266,63 +247,54 @@ CRITICAL: First, help the user select the most appropriate research focus based
 Present these numbered options to the user:
 
 1. **Product Validation Research**
-
    - Validate product hypotheses and market fit
    - Test assumptions about user needs and solutions
    - Assess technical and business feasibility
    - Identify risks and mitigation strategies
 
 2. **Market Opportunity Research**
-
    - Analyze market size and growth potential
    - Identify market segments and dynamics
    - Assess market entry strategies
    - Evaluate timing and market readiness
 
 3. **User & Customer Research**
-
    - Deep dive into user personas and behaviors
    - Understand jobs-to-be-done and pain points
    - Map customer journeys and touchpoints
    - Analyze willingness to pay and value perception
 
 4. **Competitive Intelligence Research**
-
    - Detailed competitor analysis and positioning
    - Feature and capability comparisons
    - Business model and strategy analysis
    - Identify competitive advantages and gaps
 
 5. **Technology & Innovation Research**
-
    - Assess technology trends and possibilities
    - Evaluate technical approaches and architectures
    - Identify emerging technologies and disruptions
    - Analyze build vs. buy vs. partner options
 
 6. **Industry & Ecosystem Research**
-
    - Map industry value chains and dynamics
    - Identify key players and relationships
    - Analyze regulatory and compliance factors
    - Understand partnership opportunities
 
 7. **Strategic Options Research**
-
    - Evaluate different strategic directions
    - Assess business model alternatives
    - Analyze go-to-market strategies
    - Consider expansion and scaling paths
 
 8. **Risk & Feasibility Research**
-
    - Identify and assess various risk factors
    - Evaluate implementation challenges
    - Analyze resource requirements
    - Consider regulatory and legal implications
 
 9. **Custom Research Focus**
-
    - User-defined research objectives
    - Specialized domain investigation
    - Cross-functional research needs
@@ -491,13 +463,11 @@ CRITICAL: collaborate with the user to develop specific, actionable research que
 ### 5. Review and Refinement
 
 1. **Present Complete Prompt**
-
    - Show the full research prompt
    - Explain key elements and rationale
    - Highlight any assumptions made
 
 2. **Gather Feedback**
-
    - Are the objectives clear and correct?
    - Do the questions address all concerns?
    - Is the scope appropriate?
@@ -638,152 +608,32 @@ User can type `#yolo` to toggle to YOLO mode (process all sections at once).
 - End with "Select 1-9 or just type your question/feedback:"
 ==================== END: .bmad-core/tasks/create-doc.md ====================
 
-==================== START: .bmad-core/tasks/advanced-elicitation.md ====================
-# Advanced Elicitation Task
+==================== START: .bmad-core/tasks/document-project.md ====================
+# Document an Existing Project
 
 ## Purpose
 
-- Provide optional reflective and brainstorming actions to enhance content quality
-- Enable deeper exploration of ideas through structured elicitation techniques
-- Support iterative refinement through multiple analytical perspectives
-- Usable during template-driven document creation or any chat conversation
+Generate comprehensive documentation for existing projects optimized for AI development agents. This task creates structured reference materials that enable AI agents to understand project context, conventions, and patterns for effective contribution to any codebase.
 
-## Usage Scenarios
+## Task Instructions
 
-### Scenario 1: Template Document Creation
+### 1. Initial Project Analysis
 
-After outputting a section during document creation:
+**CRITICAL:** First, check if a PRD or requirements document exists in context. If yes, use it to focus your documentation efforts on relevant areas only.
 
-1. **Section Review**: Ask user to review the drafted section
-2. **Offer Elicitation**: Present 9 carefully selected elicitation methods
-3. **Simple Selection**: User types a number (0-8) to engage method, or 9 to proceed
-4. **Execute & Loop**: Apply selected method, then re-offer choices until user proceeds
+**IF PRD EXISTS**:
 
-### Scenario 2: General Chat Elicitation
+- Review the PRD to understand what enhancement/feature is planned
+- Identify which modules, services, or areas will be affected
+- Focus documentation ONLY on these relevant areas
+- Skip unrelated parts of the codebase to keep docs lean
 
-User can request advanced elicitation on any agent output:
+**IF NO PRD EXISTS**:
+Ask the user:
 
-- User says "do advanced elicitation" or similar
-- Agent selects 9 relevant methods for the context
-- Same simple 0-9 selection process
+"I notice you haven't provided a PRD or requirements document. To create more focused and useful documentation, I recommend one of these options:
 
-## Task Instructions
-
-### 1. Intelligent Method Selection
-
-**Context Analysis**: Before presenting options, analyze:
-
-- **Content Type**: Technical specs, user stories, architecture, requirements, etc.
-- **Complexity Level**: Simple, moderate, or complex content
-- **Stakeholder Needs**: Who will use this information
-- **Risk Level**: High-impact decisions vs routine items
-- **Creative Potential**: Opportunities for innovation or alternatives
-
-**Method Selection Strategy**:
-
-1. **Always Include Core Methods** (choose 3-4):
-   - Expand or Contract for Audience
-   - Critique and Refine
-   - Identify Potential Risks
-   - Assess Alignment with Goals
-
-2. **Context-Specific Methods** (choose 4-5):
-   - **Technical Content**: Tree of Thoughts, ReWOO, Meta-Prompting
-   - **User-Facing Content**: Agile Team Perspective, Stakeholder Roundtable
-   - **Creative Content**: Innovation Tournament, Escape Room Challenge
-   - **Strategic Content**: Red Team vs Blue Team, Hindsight Reflection
-
-3. **Always Include**: "Proceed / No Further Actions" as option 9
-
-### 2. Section Context and Review
-
-When invoked after outputting a section:
-
-1. **Provide Context Summary**: Give a brief 1-2 sentence summary of what the user should look for in the section just presented
-
-2. **Explain Visual Elements**: If the section contains diagrams, explain them briefly before offering elicitation options
-
-3. **Clarify Scope Options**: If the section contains multiple distinct items, inform the user they can apply elicitation actions to:
-   - The entire section as a whole
-   - Individual items within the section (specify which item when selecting an action)
-
-### 3. Present Elicitation Options
-
-**Review Request Process:**
-
-- Ask the user to review the drafted section
-- In the SAME message, inform them they can suggest direct changes OR select an elicitation method
-- Present 9 intelligently selected methods (0-8) plus "Proceed" (9)
-- Keep descriptions short - just the method name
-- Await simple numeric selection
-
-**Action List Presentation Format:**
-
-```text
-**Advanced Elicitation Options**
-Choose a number (0-8) or 9 to proceed:
-
-0. [Method Name]
-1. [Method Name]
-2. [Method Name]
-3. [Method Name]
-4. [Method Name]
-5. [Method Name]
-6. [Method Name]
-7. [Method Name]
-8. [Method Name]
-9. Proceed / No Further Actions
-```
-
-**Response Handling:**
-
-- **Numbers 0-8**: Execute the selected method, then re-offer the choice
-- **Number 9**: Proceed to next section or continue conversation
-- **Direct Feedback**: Apply user's suggested changes and continue
-
-### 4. Method Execution Framework
-
-**Execution Process:**
-
-1. **Retrieve Method**: Access the specific elicitation method from the elicitation-methods data file
-2. **Apply Context**: Execute the method from your current role's perspective
-3. **Provide Results**: Deliver insights, critiques, or alternatives relevant to the content
-4. **Re-offer Choice**: Present the same 9 options again until user selects 9 or gives direct feedback
-
-**Execution Guidelines:**
-
-- **Be Concise**: Focus on actionable insights, not lengthy explanations
-- **Stay Relevant**: Tie all elicitation back to the specific content being analyzed
-- **Identify Personas**: For multi-persona methods, clearly identify which viewpoint is speaking
-- **Maintain Flow**: Keep the process moving efficiently
-==================== END: .bmad-core/tasks/advanced-elicitation.md ====================
-
-==================== START: .bmad-core/tasks/document-project.md ====================
-# Document an Existing Project
-
-## Purpose
-
-Generate comprehensive documentation for existing projects optimized for AI development agents. This task creates structured reference materials that enable AI agents to understand project context, conventions, and patterns for effective contribution to any codebase.
-
-## Task Instructions
-
-### 1. Initial Project Analysis
-
-**CRITICAL:** First, check if a PRD or requirements document exists in context. If yes, use it to focus your documentation efforts on relevant areas only.
-
-**IF PRD EXISTS**:
-
-- Review the PRD to understand what enhancement/feature is planned
-- Identify which modules, services, or areas will be affected
-- Focus documentation ONLY on these relevant areas
-- Skip unrelated parts of the codebase to keep docs lean
-
-**IF NO PRD EXISTS**:
-Ask the user:
-
-"I notice you haven't provided a PRD or requirements document. To create more focused and useful documentation, I recommend one of these options:
-
-1. **Create a PRD first** - Would you like me to help create a brownfield PRD before documenting? This helps focus documentation on relevant areas.
+1. **Create a PRD first** - Would you like me to help create a brownfield PRD before documenting? This helps focus documentation on relevant areas.
 
 2. **Provide existing requirements** - Do you have a requirements document, epic, or feature description you can share?
 
@@ -872,9 +722,9 @@ This document captures the CURRENT STATE of the [Project Name] codebase, includi
 
 ### Change Log
 
-| Date | Version | Description | Author |
-|------|---------|-------------|--------|
-| [Date] | 1.0 | Initial brownfield analysis | [Analyst] |
+| Date   | Version | Description                 | Author    |
+| ------ | ------- | --------------------------- | --------- |
+| [Date] | 1.0     | Initial brownfield analysis | [Analyst] |
 
 ## Quick Reference - Key Files and Entry Points
 
@@ -897,11 +747,11 @@ This document captures the CURRENT STATE of the [Project Name] codebase, includi
 
 ### Actual Tech Stack (from package.json/requirements.txt)
 
-| Category | Technology | Version | Notes |
-|----------|------------|---------|--------|
-| Runtime | Node.js | 16.x | [Any constraints] |
-| Framework | Express | 4.18.2 | [Custom middleware?] |
-| Database | PostgreSQL | 13 | [Connection pooling setup] |
+| Category  | Technology | Version | Notes                      |
+| --------- | ---------- | ------- | -------------------------- |
+| Runtime   | Node.js    | 16.x    | [Any constraints]          |
+| Framework | Express    | 4.18.2  | [Custom middleware?]       |
+| Database  | PostgreSQL | 13      | [Connection pooling setup] |
 
 etc...
 
@@ -940,6 +790,7 @@ project-root/
 ### Data Models
 
 Instead of duplicating, reference actual model files:
+
 - **User Model**: See `src/models/User.js`
 - **Order Model**: See `src/models/Order.js`
 - **Related Types**: TypeScript definitions in `src/types/`
@@ -969,10 +820,10 @@ Instead of duplicating, reference actual model files:
 
 ### External Services
 
-| Service | Purpose | Integration Type | Key Files |
-|---------|---------|------------------|-----------|
-| Stripe | Payments | REST API | `src/integrations/stripe/` |
-| SendGrid | Emails | SDK | `src/services/emailService.js` |
+| Service  | Purpose  | Integration Type | Key Files                      |
+| -------- | -------- | ---------------- | ------------------------------ |
+| Stripe   | Payments | REST API         | `src/integrations/stripe/`     |
+| SendGrid | Emails   | SDK              | `src/services/emailService.js` |
 
 etc...
 
@@ -1017,6 +868,7 @@ npm run test:integration  # Runs integration tests (requires local DB)
 ### Files That Will Need Modification
 
 Based on the enhancement requirements, these files will be affected:
+
 - `src/services/userService.js` - Add new user fields
 - `src/models/User.js` - Update schema
 - `src/routes/userRoutes.js` - New endpoints
@@ -1102,939 +954,1091 @@ Apply the advanced elicitation task after major sections to refine based on user
 - The goal is PRACTICAL documentation for AI agents doing real work
 ==================== END: .bmad-core/tasks/document-project.md ====================
 
-==================== START: .bmad-core/templates/project-brief-tmpl.yaml ====================
-template:
-  id: project-brief-template-v2
-  name: Project Brief
-  version: 2.0
-  output:
-    format: markdown
-    filename: docs/brief.md
-    title: "Project Brief: {{project_name}}"
-
-workflow:
-  mode: interactive
-  elicitation: advanced-elicitation
-  custom_elicitation:
-    title: "Project Brief Elicitation Actions"
-    options:
-      - "Expand section with more specific details"
-      - "Validate against similar successful products"
-      - "Stress test assumptions with edge cases"
-      - "Explore alternative solution approaches"
-      - "Analyze resource/constraint trade-offs"
-      - "Generate risk mitigation strategies"
-      - "Challenge scope from MVP minimalist view"
-      - "Brainstorm creative feature possibilities"
-      - "If only we had [resource/capability/time]..."
-      - "Proceed to next section"
+==================== START: .bmad-core/tasks/facilitate-brainstorming-session.md ====================
+---
+docOutputLocation: docs/brainstorming-session-results.md
+template: '.bmad-core/templates/brainstorming-output-tmpl.yaml'
+---
 
-sections:
-  - id: introduction
-    instruction: |
-      This template guides creation of a comprehensive Project Brief that serves as the foundational input for product development.
-      
-      Start by asking the user which mode they prefer:
-      
-      1. **Interactive Mode** - Work through each section collaboratively
-      2. **YOLO Mode** - Generate complete draft for review and refinement
-      
-      Before beginning, understand what inputs are available (brainstorming results, market research, competitive analysis, initial ideas) and gather project context.
+# Facilitate Brainstorming Session Task
 
-  - id: executive-summary
-    title: Executive Summary
-    instruction: |
-      Create a concise overview that captures the essence of the project. Include:
-      - Product concept in 1-2 sentences
-      - Primary problem being solved
-      - Target market identification
-      - Key value proposition
-    template: "{{executive_summary_content}}"
+Facilitate interactive brainstorming sessions with users. Be creative and adaptive in applying techniques.
 
-  - id: problem-statement
-    title: Problem Statement
-    instruction: |
-      Articulate the problem with clarity and evidence. Address:
-      - Current state and pain points
-      - Impact of the problem (quantify if possible)
-      - Why existing solutions fall short
-      - Urgency and importance of solving this now
-    template: "{{detailed_problem_description}}"
+## Process
 
-  - id: proposed-solution
-    title: Proposed Solution
-    instruction: |
-      Describe the solution approach at a high level. Include:
-      - Core concept and approach
-      - Key differentiators from existing solutions
-      - Why this solution will succeed where others haven't
-      - High-level vision for the product
-    template: "{{solution_description}}"
+### Step 1: Session Setup
 
-  - id: target-users
-    title: Target Users
-    instruction: |
-      Define and characterize the intended users with specificity. For each user segment include:
-      - Demographic/firmographic profile
-      - Current behaviors and workflows
-      - Specific needs and pain points
-      - Goals they're trying to achieve
-    sections:
-      - id: primary-segment
-        title: "Primary User Segment: {{segment_name}}"
-        template: "{{primary_user_description}}"
-      - id: secondary-segment
-        title: "Secondary User Segment: {{segment_name}}"
-        condition: Has secondary user segment
-        template: "{{secondary_user_description}}"
+Ask 4 context questions (don't preview what happens next):
 
-  - id: goals-metrics
-    title: Goals & Success Metrics
-    instruction: Establish clear objectives and how to measure success. Make goals SMART (Specific, Measurable, Achievable, Relevant, Time-bound)
-    sections:
-      - id: business-objectives
-        title: Business Objectives
-        type: bullet-list
-        template: "- {{objective_with_metric}}"
-      - id: user-success-metrics
-        title: User Success Metrics
-        type: bullet-list
-        template: "- {{user_metric}}"
-      - id: kpis
-        title: Key Performance Indicators (KPIs)
-        type: bullet-list
-        template: "- {{kpi}}: {{definition_and_target}}"
+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? (Default Yes)
 
-  - id: mvp-scope
-    title: MVP Scope
-    instruction: Define the minimum viable product clearly. Be specific about what's in and what's out. Help user distinguish must-haves from nice-to-haves.
-    sections:
-      - id: core-features
-        title: Core Features (Must Have)
-        type: bullet-list
-        template: "- **{{feature}}:** {{description_and_rationale}}"
-      - id: out-of-scope
-        title: Out of Scope for MVP
-        type: bullet-list
-        template: "- {{feature_or_capability}}"
-      - id: mvp-success-criteria
-        title: MVP Success Criteria
-        template: "{{mvp_success_definition}}"
+### Step 2: Present Approach Options
 
-  - id: post-mvp-vision
-    title: Post-MVP Vision
-    instruction: Outline the longer-term product direction without overcommitting to specifics
-    sections:
-      - id: phase-2-features
-        title: Phase 2 Features
-        template: "{{next_priority_features}}"
-      - id: long-term-vision
-        title: Long-term Vision
-        template: "{{one_two_year_vision}}"
-      - id: expansion-opportunities
-        title: Expansion Opportunities
-        template: "{{potential_expansions}}"
+After getting answers to Step 1, present 4 approach options (numbered):
 
-  - id: technical-considerations
-    title: Technical Considerations
-    instruction: Document known technical constraints and preferences. Note these are initial thoughts, not final decisions.
+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 (default) document output requested, capture all ideas generated in each technique section to the document from the beginning.
+
+**Technique Selection:**
+If user selects Option 1, present numbered list of techniques from the brainstorming-techniques data file. User can select by number..
+
+**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 (unless they request it persistently)
+- **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 in output document
+
+## 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
+==================== END: .bmad-core/tasks/facilitate-brainstorming-session.md ====================
+
+==================== START: .bmad-core/templates/brainstorming-output-tmpl.yaml ====================
+template:
+  id: brainstorming-output-template-v2
+  name: Brainstorming Session Results
+  version: 2.0
+  output:
+    format: markdown
+    filename: docs/brainstorming-session-results.md
+    title: "Brainstorming Session Results"
+
+workflow:
+  mode: non-interactive
+
+sections:
+  - id: header
+    content: |
+      **Session Date:** {{date}}
+      **Facilitator:** {{agent_role}} {{agent_name}}
+      **Participant:** {{user_name}}
+
+  - id: executive-summary
+    title: Executive Summary
     sections:
-      - id: platform-requirements
-        title: Platform Requirements
-        template: |
-          - **Target Platforms:** {{platforms}}
-          - **Browser/OS Support:** {{specific_requirements}}
-          - **Performance Requirements:** {{performance_specs}}
-      - id: technology-preferences
-        title: Technology Preferences
-        template: |
-          - **Frontend:** {{frontend_preferences}}
-          - **Backend:** {{backend_preferences}}
-          - **Database:** {{database_preferences}}
-          - **Hosting/Infrastructure:** {{infrastructure_preferences}}
-      - id: architecture-considerations
-        title: Architecture Considerations
+      - id: summary-details
         template: |
-          - **Repository Structure:** {{repo_thoughts}}
-          - **Service Architecture:** {{service_thoughts}}
-          - **Integration Requirements:** {{integration_needs}}
-          - **Security/Compliance:** {{security_requirements}}
+          **Topic:** {{session_topic}}
 
-  - id: constraints-assumptions
-    title: Constraints & Assumptions
-    instruction: Clearly state limitations and assumptions to set realistic expectations
+          **Session Goals:** {{stated_goals}}
+
+          **Techniques Used:** {{techniques_list}}
+
+          **Total Ideas Generated:** {{total_ideas}}
+      - id: key-themes
+        title: "Key Themes Identified:"
+        type: bullet-list
+        template: "- {{theme}}"
+
+  - id: technique-sessions
+    title: Technique Sessions
+    repeatable: true
     sections:
-      - id: constraints
-        title: Constraints
+      - id: technique
+        title: "{{technique_name}} - {{duration}}"
+        sections:
+          - id: description
+            template: "**Description:** {{technique_description}}"
+          - id: ideas-generated
+            title: "Ideas Generated:"
+            type: numbered-list
+            template: "{{idea}}"
+          - id: insights
+            title: "Insights Discovered:"
+            type: bullet-list
+            template: "- {{insight}}"
+          - id: connections
+            title: "Notable Connections:"
+            type: bullet-list
+            template: "- {{connection}}"
+
+  - id: idea-categorization
+    title: Idea Categorization
+    sections:
+      - id: immediate-opportunities
+        title: Immediate Opportunities
+        content: "*Ideas ready to implement now*"
+        repeatable: true
+        type: numbered-list
         template: |
-          - **Budget:** {{budget_info}}
-          - **Timeline:** {{timeline_info}}
-          - **Resources:** {{resource_info}}
-          - **Technical:** {{technical_constraints}}
-      - id: key-assumptions
-        title: Key Assumptions
+          **{{idea_name}}**
+          - Description: {{description}}
+          - Why immediate: {{rationale}}
+          - Resources needed: {{requirements}}
+      - id: future-innovations
+        title: Future Innovations
+        content: "*Ideas requiring development/research*"
+        repeatable: true
+        type: numbered-list
+        template: |
+          **{{idea_name}}**
+          - Description: {{description}}
+          - Development needed: {{development_needed}}
+          - Timeline estimate: {{timeline}}
+      - id: moonshots
+        title: Moonshots
+        content: "*Ambitious, transformative concepts*"
+        repeatable: true
+        type: numbered-list
+        template: |
+          **{{idea_name}}**
+          - Description: {{description}}
+          - Transformative potential: {{potential}}
+          - Challenges to overcome: {{challenges}}
+      - id: insights-learnings
+        title: Insights & Learnings
+        content: "*Key realizations from the session*"
         type: bullet-list
-        template: "- {{assumption}}"
+        template: "- {{insight}}: {{description_and_implications}}"
 
-  - id: risks-questions
-    title: Risks & Open Questions
-    instruction: Identify unknowns and potential challenges proactively
+  - id: action-planning
+    title: Action Planning
     sections:
-      - id: key-risks
-        title: Key Risks
+      - id: top-priorities
+        title: Top 3 Priority Ideas
+        sections:
+          - id: priority-1
+            title: "#1 Priority: {{idea_name}}"
+            template: |
+              - Rationale: {{rationale}}
+              - Next steps: {{next_steps}}
+              - Resources needed: {{resources}}
+              - Timeline: {{timeline}}
+          - id: priority-2
+            title: "#2 Priority: {{idea_name}}"
+            template: |
+              - Rationale: {{rationale}}
+              - Next steps: {{next_steps}}
+              - Resources needed: {{resources}}
+              - Timeline: {{timeline}}
+          - id: priority-3
+            title: "#3 Priority: {{idea_name}}"
+            template: |
+              - Rationale: {{rationale}}
+              - Next steps: {{next_steps}}
+              - Resources needed: {{resources}}
+              - Timeline: {{timeline}}
+
+  - id: reflection-followup
+    title: Reflection & Follow-up
+    sections:
+      - id: what-worked
+        title: What Worked Well
         type: bullet-list
-        template: "- **{{risk}}:** {{description_and_impact}}"
-      - id: open-questions
-        title: Open Questions
+        template: "- {{aspect}}"
+      - id: areas-exploration
+        title: Areas for Further Exploration
         type: bullet-list
-        template: "- {{question}}"
-      - id: research-areas
-        title: Areas Needing Further Research
+        template: "- {{area}}: {{reason}}"
+      - id: recommended-techniques
+        title: Recommended Follow-up Techniques
         type: bullet-list
-        template: "- {{research_topic}}"
-
-  - id: appendices
-    title: Appendices
-    sections:
-      - id: research-summary
-        title: A. Research Summary
-        condition: Has research findings
-        instruction: |
-          If applicable, summarize key findings from:
-          - Market research
-          - Competitive analysis
-          - User interviews
-          - Technical feasibility studies
-      - id: stakeholder-input
-        title: B. Stakeholder Input
-        condition: Has stakeholder feedback
-        template: "{{stakeholder_feedback}}"
-      - id: references
-        title: C. References
-        template: "{{relevant_links_and_docs}}"
+        template: "- {{technique}}: {{reason}}"
+      - id: questions-emerged
+        title: Questions That Emerged
+        type: bullet-list
+        template: "- {{question}}"
+      - id: next-session
+        title: Next Session Planning
+        template: |
+          - **Suggested topics:** {{followup_topics}}
+          - **Recommended timeframe:** {{timeframe}}
+          - **Preparation needed:** {{preparation}}
 
-  - id: next-steps
-    title: Next Steps
-    sections:
-      - id: immediate-actions
-        title: Immediate Actions
-        type: numbered-list
-        template: "{{action_item}}"
-      - id: pm-handoff
-        title: PM Handoff
-        content: |
-          This Project Brief provides the full context for {{project_name}}. Please start in 'PRD Generation Mode', review the brief thoroughly to work with the user to create the PRD section by section as the template indicates, asking for any necessary clarification or suggesting improvements.
-==================== END: .bmad-core/templates/project-brief-tmpl.yaml ====================
+  - id: footer
+    content: |
+      ---
 
-==================== START: .bmad-core/templates/market-research-tmpl.yaml ====================
+      *Session facilitated using the BMAD-METHOD brainstorming framework*
+==================== END: .bmad-core/templates/brainstorming-output-tmpl.yaml ====================
+
+==================== START: .bmad-core/templates/competitor-analysis-tmpl.yaml ====================
 template:
-  id: market-research-template-v2
-  name: Market Research Report
+  id: competitor-analysis-template-v2
+  name: Competitive Analysis Report
   version: 2.0
   output:
     format: markdown
-    filename: docs/market-research.md
-    title: "Market Research Report: {{project_product_name}}"
+    filename: docs/competitor-analysis.md
+    title: "Competitive Analysis Report: {{project_product_name}}"
 
 workflow:
   mode: interactive
   elicitation: advanced-elicitation
   custom_elicitation:
-    title: "Market Research Elicitation Actions"
+    title: "Competitive Analysis Elicitation Actions"
     options:
-      - "Expand market sizing calculations with sensitivity analysis"
-      - "Deep dive into a specific customer segment"
-      - "Analyze an emerging market trend in detail"
-      - "Compare this market to an analogous market"
-      - "Stress test market assumptions"
-      - "Explore adjacent market opportunities"
-      - "Challenge market definition and boundaries"
-      - "Generate strategic scenarios (best/base/worst case)"
-      - "If only we had considered [X market factor]..."
+      - "Deep dive on a specific competitor's strategy"
+      - "Analyze competitive dynamics in a specific segment"
+      - "War game competitive responses to your moves"
+      - "Explore partnership vs. competition scenarios"
+      - "Stress test differentiation claims"
+      - "Analyze disruption potential (yours or theirs)"
+      - "Compare to competition in adjacent markets"
+      - "Generate win/loss analysis insights"
+      - "If only we had known about [competitor X's plan]..."
       - "Proceed to next section"
 
 sections:
   - id: executive-summary
     title: Executive Summary
-    instruction: Provide a high-level overview of key findings, market opportunity assessment, and strategic recommendations. Write this section LAST after completing all other sections.
+    instruction: Provide high-level competitive insights, main threats and opportunities, and recommended strategic actions. Write this section LAST after completing all analysis.
 
-  - id: research-objectives
-    title: Research Objectives & Methodology
-    instruction: This template guides the creation of a comprehensive market research report. Begin by understanding what market insights the user needs and why. Work through each section systematically, using the appropriate analytical frameworks based on the research objectives.
+  - id: analysis-scope
+    title: Analysis Scope & Methodology
+    instruction: This template guides comprehensive competitor analysis. Start by understanding the user's competitive intelligence needs and strategic objectives. Help them identify and prioritize competitors before diving into detailed analysis.
     sections:
-      - id: objectives
-        title: Research Objectives
+      - id: analysis-purpose
+        title: Analysis Purpose
         instruction: |
-          List the primary objectives of this market research:
-          - What decisions will this research inform?
-          - What specific questions need to be answered?
-          - What are the success criteria for this research?
-      - id: methodology
+          Define the primary purpose:
+          - New market entry assessment
+          - Product positioning strategy
+          - Feature gap analysis
+          - Pricing strategy development
+          - Partnership/acquisition targets
+          - Competitive threat assessment
+      - id: competitor-categories
+        title: Competitor Categories Analyzed
+        instruction: |
+          List categories included:
+          - Direct Competitors: Same product/service, same target market
+          - Indirect Competitors: Different product, same need/problem
+          - Potential Competitors: Could enter market easily
+          - Substitute Products: Alternative solutions
+          - Aspirational Competitors: Best-in-class examples
+      - id: research-methodology
         title: Research Methodology
         instruction: |
-          Describe the research approach:
-          - Data sources used (primary/secondary)
-          - Analysis frameworks applied
-          - Data collection timeframe
-          - Limitations and assumptions
+          Describe approach:
+          - Information sources used
+          - Analysis timeframe
+          - Confidence levels
+          - Limitations
 
-  - id: market-overview
-    title: Market Overview
+  - id: competitive-landscape
+    title: Competitive Landscape Overview
     sections:
-      - id: market-definition
-        title: Market Definition
+      - id: market-structure
+        title: Market Structure
         instruction: |
-          Define the market being analyzed:
-          - Product/service category
-          - Geographic scope
-          - Customer segments included
-          - Value chain position
-      - id: market-size-growth
-        title: Market Size & Growth
+          Describe the competitive environment:
+          - Number of active competitors
+          - Market concentration (fragmented/consolidated)
+          - Competitive dynamics
+          - Recent market entries/exits
+      - id: prioritization-matrix
+        title: Competitor Prioritization Matrix
         instruction: |
-          Guide through TAM, SAM, SOM calculations with clear assumptions. Use one or more approaches:
-          - Top-down: Start with industry data, narrow down
-          - Bottom-up: Build from customer/unit economics
-          - Value theory: Based on value provided vs. alternatives
-        sections:
-          - id: tam
-            title: Total Addressable Market (TAM)
-            instruction: Calculate and explain the total market opportunity
-          - id: sam
-            title: Serviceable Addressable Market (SAM)
-            instruction: Define the portion of TAM you can realistically reach
-          - id: som
-            title: Serviceable Obtainable Market (SOM)
-            instruction: Estimate the portion you can realistically capture
-      - id: market-trends
-        title: Market Trends & Drivers
-        instruction: Analyze key trends shaping the market using appropriate frameworks like PESTEL
-        sections:
-          - id: key-trends
-            title: Key Market Trends
-            instruction: |
-              List and explain 3-5 major trends:
-              - Trend 1: Description and impact
-              - Trend 2: Description and impact
-              - etc.
-          - id: growth-drivers
-            title: Growth Drivers
-            instruction: Identify primary factors driving market growth
-          - id: market-inhibitors
-            title: Market Inhibitors
-            instruction: Identify factors constraining market growth
+          Help categorize competitors by market share and strategic threat level
 
-  - id: customer-analysis
-    title: Customer Analysis
+          Create a 2x2 matrix:
+          - Priority 1 (Core Competitors): High Market Share + High Threat
+          - Priority 2 (Emerging Threats): Low Market Share + High Threat
+          - Priority 3 (Established Players): High Market Share + Low Threat
+          - Priority 4 (Monitor Only): Low Market Share + Low Threat
+
+  - id: competitor-profiles
+    title: Individual Competitor Profiles
+    instruction: Create detailed profiles for each Priority 1 and Priority 2 competitor. For Priority 3 and 4, create condensed profiles.
+    repeatable: true
     sections:
-      - id: segment-profiles
-        title: Target Segment Profiles
-        instruction: For each segment, create detailed profiles including demographics/firmographics, psychographics, behaviors, needs, and willingness to pay
-        repeatable: true
+      - id: competitor
+        title: "{{competitor_name}} - Priority {{priority_level}}"
         sections:
-          - id: segment
-            title: "Segment {{segment_number}}: {{segment_name}}"
+          - id: company-overview
+            title: Company Overview
             template: |
-              - **Description:** {{brief_overview}}
-              - **Size:** {{number_of_customers_market_value}}
-              - **Characteristics:** {{key_demographics_firmographics}}
-              - **Needs & Pain Points:** {{primary_problems}}
-              - **Buying Process:** {{purchasing_decisions}}
-              - **Willingness to Pay:** {{price_sensitivity}}
-      - id: jobs-to-be-done
-        title: Jobs-to-be-Done Analysis
-        instruction: Uncover what customers are really trying to accomplish
-        sections:
-          - id: functional-jobs
-            title: Functional Jobs
-            instruction: List practical tasks and objectives customers need to complete
-          - id: emotional-jobs
-            title: Emotional Jobs
-            instruction: Describe feelings and perceptions customers seek
-          - id: social-jobs
-            title: Social Jobs
-            instruction: Explain how customers want to be perceived by others
-      - id: customer-journey
-        title: Customer Journey Mapping
-        instruction: Map the end-to-end customer experience for primary segments
-        template: |
-          For primary customer segment:
-          
-          1. **Awareness:** {{discovery_process}}
-          2. **Consideration:** {{evaluation_criteria}}
-          3. **Purchase:** {{decision_triggers}}
-          4. **Onboarding:** {{initial_expectations}}
-          5. **Usage:** {{interaction_patterns}}
-          6. **Advocacy:** {{referral_behaviors}}
-
-  - id: competitive-landscape
-    title: Competitive Landscape
-    sections:
-      - id: market-structure
-        title: Market Structure
-        instruction: |
-          Describe the overall competitive environment:
-          - Number of competitors
-          - Market concentration
-          - Competitive intensity
-      - id: major-players
-        title: Major Players Analysis
-        instruction: |
-          For top 3-5 competitors:
-          - Company name and brief description
-          - Market share estimate
-          - Key strengths and weaknesses
-          - Target customer focus
-          - Pricing strategy
-      - id: competitive-positioning
-        title: Competitive Positioning
-        instruction: |
-          Analyze how competitors are positioned:
-          - Value propositions
-          - Differentiation strategies
-          - Market gaps and opportunities
+              - **Founded:** {{year_founders}}
+              - **Headquarters:** {{location}}
+              - **Company Size:** {{employees_revenue}}
+              - **Funding:** {{total_raised_investors}}
+              - **Leadership:** {{key_executives}}
+          - id: business-model
+            title: Business Model & Strategy
+            template: |
+              - **Revenue Model:** {{revenue_model}}
+              - **Target Market:** {{customer_segments}}
+              - **Value Proposition:** {{value_promise}}
+              - **Go-to-Market Strategy:** {{gtm_approach}}
+              - **Strategic Focus:** {{current_priorities}}
+          - id: product-analysis
+            title: Product/Service Analysis
+            template: |
+              - **Core Offerings:** {{main_products}}
+              - **Key Features:** {{standout_capabilities}}
+              - **User Experience:** {{ux_assessment}}
+              - **Technology Stack:** {{tech_stack}}
+              - **Pricing:** {{pricing_model}}
+          - id: strengths-weaknesses
+            title: Strengths & Weaknesses
+            sections:
+              - id: strengths
+                title: Strengths
+                type: bullet-list
+                template: "- {{strength}}"
+              - id: weaknesses
+                title: Weaknesses
+                type: bullet-list
+                template: "- {{weakness}}"
+          - id: market-position
+            title: Market Position & Performance
+            template: |
+              - **Market Share:** {{market_share_estimate}}
+              - **Customer Base:** {{customer_size_notables}}
+              - **Growth Trajectory:** {{growth_trend}}
+              - **Recent Developments:** {{key_news}}
 
-  - id: industry-analysis
-    title: Industry Analysis
+  - id: comparative-analysis
+    title: Comparative Analysis
     sections:
-      - id: porters-five-forces
-        title: Porter's Five Forces Assessment
-        instruction: Analyze each force with specific evidence and implications
+      - id: feature-comparison
+        title: Feature Comparison Matrix
+        instruction: Create a detailed comparison table of key features across competitors
+        type: table
+        columns:
+          [
+            "Feature Category",
+            "{{your_company}}",
+            "{{competitor_1}}",
+            "{{competitor_2}}",
+            "{{competitor_3}}",
+          ]
+        rows:
+          - category: "Core Functionality"
+            items:
+              - ["Feature A", "{{status}}", "{{status}}", "{{status}}", "{{status}}"]
+              - ["Feature B", "{{status}}", "{{status}}", "{{status}}", "{{status}}"]
+          - category: "User Experience"
+            items:
+              - ["Mobile App", "{{rating}}", "{{rating}}", "{{rating}}", "{{rating}}"]
+              - ["Onboarding Time", "{{time}}", "{{time}}", "{{time}}", "{{time}}"]
+          - category: "Integration & Ecosystem"
+            items:
+              - [
+                  "API Availability",
+                  "{{availability}}",
+                  "{{availability}}",
+                  "{{availability}}",
+                  "{{availability}}",
+                ]
+              - ["Third-party Integrations", "{{number}}", "{{number}}", "{{number}}", "{{number}}"]
+          - category: "Pricing & Plans"
+            items:
+              - ["Starting Price", "{{price}}", "{{price}}", "{{price}}", "{{price}}"]
+              - ["Free Tier", "{{yes_no}}", "{{yes_no}}", "{{yes_no}}", "{{yes_no}}"]
+      - id: swot-comparison
+        title: SWOT Comparison
+        instruction: Create SWOT analysis for your solution vs. top competitors
         sections:
-          - id: supplier-power
-            title: "Supplier Power: {{power_level}}"
-            template: "{{analysis_and_implications}}"
-          - id: buyer-power
-            title: "Buyer Power: {{power_level}}"
-            template: "{{analysis_and_implications}}"
-          - id: competitive-rivalry
-            title: "Competitive Rivalry: {{intensity_level}}"
-            template: "{{analysis_and_implications}}"
-          - id: threat-new-entry
-            title: "Threat of New Entry: {{threat_level}}"
-            template: "{{analysis_and_implications}}"
-          - id: threat-substitutes
-            title: "Threat of Substitutes: {{threat_level}}"
-            template: "{{analysis_and_implications}}"
-      - id: adoption-lifecycle
-        title: Technology Adoption Lifecycle Stage
+          - id: your-solution
+            title: Your Solution
+            template: |
+              - **Strengths:** {{strengths}}
+              - **Weaknesses:** {{weaknesses}}
+              - **Opportunities:** {{opportunities}}
+              - **Threats:** {{threats}}
+          - id: vs-competitor
+            title: "vs. {{main_competitor}}"
+            template: |
+              - **Competitive Advantages:** {{your_advantages}}
+              - **Competitive Disadvantages:** {{their_advantages}}
+              - **Differentiation Opportunities:** {{differentiation}}
+      - id: positioning-map
+        title: Positioning Map
         instruction: |
-          Identify where the market is in the adoption curve:
-          - Current stage and evidence
-          - Implications for strategy
-          - Expected progression timeline
+          Describe competitor positions on key dimensions
 
-  - id: opportunity-assessment
-    title: Opportunity Assessment
+          Create a positioning description using 2 key dimensions relevant to the market, such as:
+          - Price vs. Features
+          - Ease of Use vs. Power
+          - Specialization vs. Breadth
+          - Self-Serve vs. High-Touch
+
+  - id: strategic-analysis
+    title: Strategic Analysis
     sections:
-      - id: market-opportunities
-        title: Market Opportunities
-        instruction: Identify specific opportunities based on the analysis
-        repeatable: true
-        sections:
-          - id: opportunity
-            title: "Opportunity {{opportunity_number}}: {{name}}"
-            template: |
-              - **Description:** {{what_is_the_opportunity}}
-              - **Size/Potential:** {{quantified_potential}}
-              - **Requirements:** {{needed_to_capture}}
-              - **Risks:** {{key_challenges}}
-      - id: strategic-recommendations
-        title: Strategic Recommendations
+      - id: competitive-advantages
+        title: Competitive Advantages Assessment
         sections:
-          - id: go-to-market
-            title: Go-to-Market Strategy
+          - id: sustainable-advantages
+            title: Sustainable Advantages
             instruction: |
-              Recommend approach for market entry/expansion:
-              - Target segment prioritization
-              - Positioning strategy
-              - Channel strategy
-              - Partnership opportunities
-          - id: pricing-strategy
-            title: Pricing Strategy
+              Identify moats and defensible positions:
+              - Network effects
+              - Switching costs
+              - Brand strength
+              - Technology barriers
+              - Regulatory advantages
+          - id: vulnerable-points
+            title: Vulnerable Points
             instruction: |
-              Based on willingness to pay analysis and competitive landscape:
-              - Recommended pricing model
-              - Price points/ranges
-              - Value metric
-              - Competitive positioning
-          - id: risk-mitigation
-            title: Risk Mitigation
+              Where competitors could be challenged:
+              - Weak customer segments
+              - Missing features
+              - Poor user experience
+              - High prices
+              - Limited geographic presence
+      - id: blue-ocean
+        title: Blue Ocean Opportunities
+        instruction: |
+          Identify uncontested market spaces
+
+          List opportunities to create new market space:
+          - Underserved segments
+          - Unaddressed use cases
+          - New business models
+          - Geographic expansion
+          - Different value propositions
+
+  - id: strategic-recommendations
+    title: Strategic Recommendations
+    sections:
+      - id: differentiation-strategy
+        title: Differentiation Strategy
+        instruction: |
+          How to position against competitors:
+          - Unique value propositions to emphasize
+          - Features to prioritize
+          - Segments to target
+          - Messaging and positioning
+      - id: competitive-response
+        title: Competitive Response Planning
+        sections:
+          - id: offensive-strategies
+            title: Offensive Strategies
             instruction: |
-              Key risks and mitigation strategies:
-              - Market risks
-              - Competitive risks
-              - Execution risks
-              - Regulatory/compliance risks
+              How to gain market share:
+              - Target competitor weaknesses
+              - Win competitive deals
+              - Capture their customers
+          - id: defensive-strategies
+            title: Defensive Strategies
+            instruction: |
+              How to protect your position:
+              - Strengthen vulnerable areas
+              - Build switching costs
+              - Deepen customer relationships
+      - id: partnership-ecosystem
+        title: Partnership & Ecosystem Strategy
+        instruction: |
+          Potential collaboration opportunities:
+          - Complementary players
+          - Channel partners
+          - Technology integrations
+          - Strategic alliances
 
-  - id: appendices
-    title: Appendices
+  - id: monitoring-plan
+    title: Monitoring & Intelligence Plan
     sections:
-      - id: data-sources
-        title: A. Data Sources
-        instruction: List all sources used in the research
-      - id: calculations
-        title: B. Detailed Calculations
-        instruction: Include any complex calculations or models
-      - id: additional-analysis
-        title: C. Additional Analysis
-        instruction: Any supplementary analysis not included in main body
-==================== END: .bmad-core/templates/market-research-tmpl.yaml ====================
+      - id: key-competitors
+        title: Key Competitors to Track
+        instruction: Priority list with rationale
+      - id: monitoring-metrics
+        title: Monitoring Metrics
+        instruction: |
+          What to track:
+          - Product updates
+          - Pricing changes
+          - Customer wins/losses
+          - Funding/M&A activity
+          - Market messaging
+      - id: intelligence-sources
+        title: Intelligence Sources
+        instruction: |
+          Where to gather ongoing intelligence:
+          - Company websites/blogs
+          - Customer reviews
+          - Industry reports
+          - Social media
+          - Patent filings
+      - id: update-cadence
+        title: Update Cadence
+        instruction: |
+          Recommended review schedule:
+          - Weekly: {{weekly_items}}
+          - Monthly: {{monthly_items}}
+          - Quarterly: {{quarterly_analysis}}
+==================== END: .bmad-core/templates/competitor-analysis-tmpl.yaml ====================
 
-==================== START: .bmad-core/templates/competitor-analysis-tmpl.yaml ====================
+==================== START: .bmad-core/templates/market-research-tmpl.yaml ====================
 template:
-  id: competitor-analysis-template-v2
-  name: Competitive Analysis Report
+  id: market-research-template-v2
+  name: Market Research Report
   version: 2.0
   output:
     format: markdown
-    filename: docs/competitor-analysis.md
-    title: "Competitive Analysis Report: {{project_product_name}}"
+    filename: docs/market-research.md
+    title: "Market Research Report: {{project_product_name}}"
 
 workflow:
   mode: interactive
   elicitation: advanced-elicitation
   custom_elicitation:
-    title: "Competitive Analysis Elicitation Actions"
+    title: "Market Research Elicitation Actions"
     options:
-      - "Deep dive on a specific competitor's strategy"
-      - "Analyze competitive dynamics in a specific segment"
-      - "War game competitive responses to your moves"
-      - "Explore partnership vs. competition scenarios"
-      - "Stress test differentiation claims"
-      - "Analyze disruption potential (yours or theirs)"
-      - "Compare to competition in adjacent markets"
-      - "Generate win/loss analysis insights"
-      - "If only we had known about [competitor X's plan]..."
+      - "Expand market sizing calculations with sensitivity analysis"
+      - "Deep dive into a specific customer segment"
+      - "Analyze an emerging market trend in detail"
+      - "Compare this market to an analogous market"
+      - "Stress test market assumptions"
+      - "Explore adjacent market opportunities"
+      - "Challenge market definition and boundaries"
+      - "Generate strategic scenarios (best/base/worst case)"
+      - "If only we had considered [X market factor]..."
       - "Proceed to next section"
 
 sections:
   - id: executive-summary
     title: Executive Summary
-    instruction: Provide high-level competitive insights, main threats and opportunities, and recommended strategic actions. Write this section LAST after completing all analysis.
+    instruction: Provide a high-level overview of key findings, market opportunity assessment, and strategic recommendations. Write this section LAST after completing all other sections.
 
-  - id: analysis-scope
-    title: Analysis Scope & Methodology
-    instruction: This template guides comprehensive competitor analysis. Start by understanding the user's competitive intelligence needs and strategic objectives. Help them identify and prioritize competitors before diving into detailed analysis.
+  - id: research-objectives
+    title: Research Objectives & Methodology
+    instruction: This template guides the creation of a comprehensive market research report. Begin by understanding what market insights the user needs and why. Work through each section systematically, using the appropriate analytical frameworks based on the research objectives.
     sections:
-      - id: analysis-purpose
-        title: Analysis Purpose
-        instruction: |
-          Define the primary purpose:
-          - New market entry assessment
-          - Product positioning strategy
-          - Feature gap analysis
-          - Pricing strategy development
-          - Partnership/acquisition targets
-          - Competitive threat assessment
-      - id: competitor-categories
-        title: Competitor Categories Analyzed
+      - id: objectives
+        title: Research Objectives
         instruction: |
-          List categories included:
-          - Direct Competitors: Same product/service, same target market
-          - Indirect Competitors: Different product, same need/problem
-          - Potential Competitors: Could enter market easily
-          - Substitute Products: Alternative solutions
-          - Aspirational Competitors: Best-in-class examples
-      - id: research-methodology
+          List the primary objectives of this market research:
+          - What decisions will this research inform?
+          - What specific questions need to be answered?
+          - What are the success criteria for this research?
+      - id: methodology
         title: Research Methodology
         instruction: |
-          Describe approach:
-          - Information sources used
-          - Analysis timeframe
-          - Confidence levels
-          - Limitations
+          Describe the research approach:
+          - Data sources used (primary/secondary)
+          - Analysis frameworks applied
+          - Data collection timeframe
+          - Limitations and assumptions
 
-  - id: competitive-landscape
-    title: Competitive Landscape Overview
+  - id: market-overview
+    title: Market Overview
     sections:
-      - id: market-structure
-        title: Market Structure
+      - id: market-definition
+        title: Market Definition
         instruction: |
-          Describe the competitive environment:
-          - Number of active competitors
-          - Market concentration (fragmented/consolidated)
-          - Competitive dynamics
-          - Recent market entries/exits
-      - id: prioritization-matrix
-        title: Competitor Prioritization Matrix
+          Define the market being analyzed:
+          - Product/service category
+          - Geographic scope
+          - Customer segments included
+          - Value chain position
+      - id: market-size-growth
+        title: Market Size & Growth
         instruction: |
-          Help categorize competitors by market share and strategic threat level
-          
-          Create a 2x2 matrix:
-          - Priority 1 (Core Competitors): High Market Share + High Threat
-          - Priority 2 (Emerging Threats): Low Market Share + High Threat
-          - Priority 3 (Established Players): High Market Share + Low Threat
-          - Priority 4 (Monitor Only): Low Market Share + Low Threat
+          Guide through TAM, SAM, SOM calculations with clear assumptions. Use one or more approaches:
+          - Top-down: Start with industry data, narrow down
+          - Bottom-up: Build from customer/unit economics
+          - Value theory: Based on value provided vs. alternatives
+        sections:
+          - id: tam
+            title: Total Addressable Market (TAM)
+            instruction: Calculate and explain the total market opportunity
+          - id: sam
+            title: Serviceable Addressable Market (SAM)
+            instruction: Define the portion of TAM you can realistically reach
+          - id: som
+            title: Serviceable Obtainable Market (SOM)
+            instruction: Estimate the portion you can realistically capture
+      - id: market-trends
+        title: Market Trends & Drivers
+        instruction: Analyze key trends shaping the market using appropriate frameworks like PESTEL
+        sections:
+          - id: key-trends
+            title: Key Market Trends
+            instruction: |
+              List and explain 3-5 major trends:
+              - Trend 1: Description and impact
+              - Trend 2: Description and impact
+              - etc.
+          - id: growth-drivers
+            title: Growth Drivers
+            instruction: Identify primary factors driving market growth
+          - id: market-inhibitors
+            title: Market Inhibitors
+            instruction: Identify factors constraining market growth
 
-  - id: competitor-profiles
-    title: Individual Competitor Profiles
-    instruction: Create detailed profiles for each Priority 1 and Priority 2 competitor. For Priority 3 and 4, create condensed profiles.
-    repeatable: true
+  - id: customer-analysis
+    title: Customer Analysis
     sections:
-      - id: competitor
-        title: "{{competitor_name}} - Priority {{priority_level}}"
+      - id: segment-profiles
+        title: Target Segment Profiles
+        instruction: For each segment, create detailed profiles including demographics/firmographics, psychographics, behaviors, needs, and willingness to pay
+        repeatable: true
         sections:
-          - id: company-overview
-            title: Company Overview
-            template: |
-              - **Founded:** {{year_founders}}
-              - **Headquarters:** {{location}}
-              - **Company Size:** {{employees_revenue}}
-              - **Funding:** {{total_raised_investors}}
-              - **Leadership:** {{key_executives}}
-          - id: business-model
-            title: Business Model & Strategy
-            template: |
-              - **Revenue Model:** {{revenue_model}}
-              - **Target Market:** {{customer_segments}}
-              - **Value Proposition:** {{value_promise}}
-              - **Go-to-Market Strategy:** {{gtm_approach}}
-              - **Strategic Focus:** {{current_priorities}}
-          - id: product-analysis
-            title: Product/Service Analysis
-            template: |
-              - **Core Offerings:** {{main_products}}
-              - **Key Features:** {{standout_capabilities}}
-              - **User Experience:** {{ux_assessment}}
-              - **Technology Stack:** {{tech_stack}}
-              - **Pricing:** {{pricing_model}}
-          - id: strengths-weaknesses
-            title: Strengths & Weaknesses
-            sections:
-              - id: strengths
-                title: Strengths
-                type: bullet-list
-                template: "- {{strength}}"
-              - id: weaknesses
-                title: Weaknesses
-                type: bullet-list
-                template: "- {{weakness}}"
-          - id: market-position
-            title: Market Position & Performance
+          - id: segment
+            title: "Segment {{segment_number}}: {{segment_name}}"
             template: |
-              - **Market Share:** {{market_share_estimate}}
-              - **Customer Base:** {{customer_size_notables}}
-              - **Growth Trajectory:** {{growth_trend}}
-              - **Recent Developments:** {{key_news}}
+              - **Description:** {{brief_overview}}
+              - **Size:** {{number_of_customers_market_value}}
+              - **Characteristics:** {{key_demographics_firmographics}}
+              - **Needs & Pain Points:** {{primary_problems}}
+              - **Buying Process:** {{purchasing_decisions}}
+              - **Willingness to Pay:** {{price_sensitivity}}
+      - id: jobs-to-be-done
+        title: Jobs-to-be-Done Analysis
+        instruction: Uncover what customers are really trying to accomplish
+        sections:
+          - id: functional-jobs
+            title: Functional Jobs
+            instruction: List practical tasks and objectives customers need to complete
+          - id: emotional-jobs
+            title: Emotional Jobs
+            instruction: Describe feelings and perceptions customers seek
+          - id: social-jobs
+            title: Social Jobs
+            instruction: Explain how customers want to be perceived by others
+      - id: customer-journey
+        title: Customer Journey Mapping
+        instruction: Map the end-to-end customer experience for primary segments
+        template: |
+          For primary customer segment:
 
-  - id: comparative-analysis
-    title: Comparative Analysis
+          1. **Awareness:** {{discovery_process}}
+          2. **Consideration:** {{evaluation_criteria}}
+          3. **Purchase:** {{decision_triggers}}
+          4. **Onboarding:** {{initial_expectations}}
+          5. **Usage:** {{interaction_patterns}}
+          6. **Advocacy:** {{referral_behaviors}}
+
+  - id: competitive-landscape
+    title: Competitive Landscape
     sections:
-      - id: feature-comparison
-        title: Feature Comparison Matrix
-        instruction: Create a detailed comparison table of key features across competitors
-        type: table
-        columns: ["Feature Category", "{{your_company}}", "{{competitor_1}}", "{{competitor_2}}", "{{competitor_3}}"]
-        rows:
-          - category: "Core Functionality"
-            items:
-              - ["Feature A", "{{status}}", "{{status}}", "{{status}}", "{{status}}"]
-              - ["Feature B", "{{status}}", "{{status}}", "{{status}}", "{{status}}"]
-          - category: "User Experience"
-            items:
-              - ["Mobile App", "{{rating}}", "{{rating}}", "{{rating}}", "{{rating}}"]
-              - ["Onboarding Time", "{{time}}", "{{time}}", "{{time}}", "{{time}}"]
-          - category: "Integration & Ecosystem"
-            items:
-              - ["API Availability", "{{availability}}", "{{availability}}", "{{availability}}", "{{availability}}"]
-              - ["Third-party Integrations", "{{number}}", "{{number}}", "{{number}}", "{{number}}"]
-          - category: "Pricing & Plans"
-            items:
-              - ["Starting Price", "{{price}}", "{{price}}", "{{price}}", "{{price}}"]
-              - ["Free Tier", "{{yes_no}}", "{{yes_no}}", "{{yes_no}}", "{{yes_no}}"]
-      - id: swot-comparison
-        title: SWOT Comparison
-        instruction: Create SWOT analysis for your solution vs. top competitors
-        sections:
-          - id: your-solution
-            title: Your Solution
-            template: |
-              - **Strengths:** {{strengths}}
-              - **Weaknesses:** {{weaknesses}}
-              - **Opportunities:** {{opportunities}}
-              - **Threats:** {{threats}}
-          - id: vs-competitor
-            title: "vs. {{main_competitor}}"
-            template: |
-              - **Competitive Advantages:** {{your_advantages}}
-              - **Competitive Disadvantages:** {{their_advantages}}
-              - **Differentiation Opportunities:** {{differentiation}}
-      - id: positioning-map
-        title: Positioning Map
+      - id: market-structure
+        title: Market Structure
+        instruction: |
+          Describe the overall competitive environment:
+          - Number of competitors
+          - Market concentration
+          - Competitive intensity
+      - id: major-players
+        title: Major Players Analysis
+        instruction: |
+          For top 3-5 competitors:
+          - Company name and brief description
+          - Market share estimate
+          - Key strengths and weaknesses
+          - Target customer focus
+          - Pricing strategy
+      - id: competitive-positioning
+        title: Competitive Positioning
         instruction: |
-          Describe competitor positions on key dimensions
-          
-          Create a positioning description using 2 key dimensions relevant to the market, such as:
-          - Price vs. Features
-          - Ease of Use vs. Power
-          - Specialization vs. Breadth
-          - Self-Serve vs. High-Touch
+          Analyze how competitors are positioned:
+          - Value propositions
+          - Differentiation strategies
+          - Market gaps and opportunities
 
-  - id: strategic-analysis
-    title: Strategic Analysis
+  - id: industry-analysis
+    title: Industry Analysis
     sections:
-      - id: competitive-advantages
-        title: Competitive Advantages Assessment
+      - id: porters-five-forces
+        title: Porter's Five Forces Assessment
+        instruction: Analyze each force with specific evidence and implications
         sections:
-          - id: sustainable-advantages
-            title: Sustainable Advantages
-            instruction: |
-              Identify moats and defensible positions:
-              - Network effects
-              - Switching costs
-              - Brand strength
-              - Technology barriers
-              - Regulatory advantages
-          - id: vulnerable-points
-            title: Vulnerable Points
-            instruction: |
-              Where competitors could be challenged:
-              - Weak customer segments
-              - Missing features
-              - Poor user experience
-              - High prices
-              - Limited geographic presence
-      - id: blue-ocean
-        title: Blue Ocean Opportunities
+          - id: supplier-power
+            title: "Supplier Power: {{power_level}}"
+            template: "{{analysis_and_implications}}"
+          - id: buyer-power
+            title: "Buyer Power: {{power_level}}"
+            template: "{{analysis_and_implications}}"
+          - id: competitive-rivalry
+            title: "Competitive Rivalry: {{intensity_level}}"
+            template: "{{analysis_and_implications}}"
+          - id: threat-new-entry
+            title: "Threat of New Entry: {{threat_level}}"
+            template: "{{analysis_and_implications}}"
+          - id: threat-substitutes
+            title: "Threat of Substitutes: {{threat_level}}"
+            template: "{{analysis_and_implications}}"
+      - id: adoption-lifecycle
+        title: Technology Adoption Lifecycle Stage
         instruction: |
-          Identify uncontested market spaces
-          
-          List opportunities to create new market space:
-          - Underserved segments
-          - Unaddressed use cases
-          - New business models
-          - Geographic expansion
-          - Different value propositions
+          Identify where the market is in the adoption curve:
+          - Current stage and evidence
+          - Implications for strategy
+          - Expected progression timeline
 
-  - id: strategic-recommendations
-    title: Strategic Recommendations
+  - id: opportunity-assessment
+    title: Opportunity Assessment
     sections:
-      - id: differentiation-strategy
-        title: Differentiation Strategy
-        instruction: |
-          How to position against competitors:
-          - Unique value propositions to emphasize
-          - Features to prioritize
-          - Segments to target
-          - Messaging and positioning
-      - id: competitive-response
-        title: Competitive Response Planning
+      - id: market-opportunities
+        title: Market Opportunities
+        instruction: Identify specific opportunities based on the analysis
+        repeatable: true
         sections:
-          - id: offensive-strategies
-            title: Offensive Strategies
+          - id: opportunity
+            title: "Opportunity {{opportunity_number}}: {{name}}"
+            template: |
+              - **Description:** {{what_is_the_opportunity}}
+              - **Size/Potential:** {{quantified_potential}}
+              - **Requirements:** {{needed_to_capture}}
+              - **Risks:** {{key_challenges}}
+      - id: strategic-recommendations
+        title: Strategic Recommendations
+        sections:
+          - id: go-to-market
+            title: Go-to-Market Strategy
             instruction: |
-              How to gain market share:
-              - Target competitor weaknesses
-              - Win competitive deals
-              - Capture their customers
-          - id: defensive-strategies
-            title: Defensive Strategies
+              Recommend approach for market entry/expansion:
+              - Target segment prioritization
+              - Positioning strategy
+              - Channel strategy
+              - Partnership opportunities
+          - id: pricing-strategy
+            title: Pricing Strategy
             instruction: |
-              How to protect your position:
-              - Strengthen vulnerable areas
-              - Build switching costs
-              - Deepen customer relationships
-      - id: partnership-ecosystem
-        title: Partnership & Ecosystem Strategy
-        instruction: |
-          Potential collaboration opportunities:
-          - Complementary players
-          - Channel partners
-          - Technology integrations
-          - Strategic alliances
+              Based on willingness to pay analysis and competitive landscape:
+              - Recommended pricing model
+              - Price points/ranges
+              - Value metric
+              - Competitive positioning
+          - id: risk-mitigation
+            title: Risk Mitigation
+            instruction: |
+              Key risks and mitigation strategies:
+              - Market risks
+              - Competitive risks
+              - Execution risks
+              - Regulatory/compliance risks
 
-  - id: monitoring-plan
-    title: Monitoring & Intelligence Plan
+  - id: appendices
+    title: Appendices
     sections:
-      - id: key-competitors
-        title: Key Competitors to Track
-        instruction: Priority list with rationale
-      - id: monitoring-metrics
-        title: Monitoring Metrics
-        instruction: |
-          What to track:
-          - Product updates
-          - Pricing changes
-          - Customer wins/losses
-          - Funding/M&A activity
-          - Market messaging
-      - id: intelligence-sources
-        title: Intelligence Sources
-        instruction: |
-          Where to gather ongoing intelligence:
-          - Company websites/blogs
-          - Customer reviews
-          - Industry reports
-          - Social media
-          - Patent filings
-      - id: update-cadence
-        title: Update Cadence
-        instruction: |
-          Recommended review schedule:
-          - Weekly: {{weekly_items}}
-          - Monthly: {{monthly_items}}
-          - Quarterly: {{quarterly_analysis}}
-==================== END: .bmad-core/templates/competitor-analysis-tmpl.yaml ====================
+      - id: data-sources
+        title: A. Data Sources
+        instruction: List all sources used in the research
+      - id: calculations
+        title: B. Detailed Calculations
+        instruction: Include any complex calculations or models
+      - id: additional-analysis
+        title: C. Additional Analysis
+        instruction: Any supplementary analysis not included in main body
+==================== END: .bmad-core/templates/market-research-tmpl.yaml ====================
 
-==================== START: .bmad-core/templates/brainstorming-output-tmpl.yaml ====================
+==================== START: .bmad-core/templates/project-brief-tmpl.yaml ====================
 template:
-  id: brainstorming-output-template-v2
-  name: Brainstorming Session Results
+  id: project-brief-template-v2
+  name: Project Brief
   version: 2.0
   output:
     format: markdown
-    filename: docs/brainstorming-session-results.md
-    title: "Brainstorming Session Results"
+    filename: docs/brief.md
+    title: "Project Brief: {{project_name}}"
 
 workflow:
-  mode: non-interactive
+  mode: interactive
+  elicitation: advanced-elicitation
+  custom_elicitation:
+    title: "Project Brief Elicitation Actions"
+    options:
+      - "Expand section with more specific details"
+      - "Validate against similar successful products"
+      - "Stress test assumptions with edge cases"
+      - "Explore alternative solution approaches"
+      - "Analyze resource/constraint trade-offs"
+      - "Generate risk mitigation strategies"
+      - "Challenge scope from MVP minimalist view"
+      - "Brainstorm creative feature possibilities"
+      - "If only we had [resource/capability/time]..."
+      - "Proceed to next section"
+
+sections:
+  - id: introduction
+    instruction: |
+      This template guides creation of a comprehensive Project Brief that serves as the foundational input for product development.
+
+      Start by asking the user which mode they prefer:
+
+      1. **Interactive Mode** - Work through each section collaboratively
+      2. **YOLO Mode** - Generate complete draft for review and refinement
+
+      Before beginning, understand what inputs are available (brainstorming results, market research, competitive analysis, initial ideas) and gather project context.
+
+  - id: executive-summary
+    title: Executive Summary
+    instruction: |
+      Create a concise overview that captures the essence of the project. Include:
+      - Product concept in 1-2 sentences
+      - Primary problem being solved
+      - Target market identification
+      - Key value proposition
+    template: "{{executive_summary_content}}"
+
+  - id: problem-statement
+    title: Problem Statement
+    instruction: |
+      Articulate the problem with clarity and evidence. Address:
+      - Current state and pain points
+      - Impact of the problem (quantify if possible)
+      - Why existing solutions fall short
+      - Urgency and importance of solving this now
+    template: "{{detailed_problem_description}}"
+
+  - id: proposed-solution
+    title: Proposed Solution
+    instruction: |
+      Describe the solution approach at a high level. Include:
+      - Core concept and approach
+      - Key differentiators from existing solutions
+      - Why this solution will succeed where others haven't
+      - High-level vision for the product
+    template: "{{solution_description}}"
+
+  - id: target-users
+    title: Target Users
+    instruction: |
+      Define and characterize the intended users with specificity. For each user segment include:
+      - Demographic/firmographic profile
+      - Current behaviors and workflows
+      - Specific needs and pain points
+      - Goals they're trying to achieve
+    sections:
+      - id: primary-segment
+        title: "Primary User Segment: {{segment_name}}"
+        template: "{{primary_user_description}}"
+      - id: secondary-segment
+        title: "Secondary User Segment: {{segment_name}}"
+        condition: Has secondary user segment
+        template: "{{secondary_user_description}}"
 
-sections:
-  - id: header
-    content: |
-      **Session Date:** {{date}}
-      **Facilitator:** {{agent_role}} {{agent_name}}
-      **Participant:** {{user_name}}
+  - id: goals-metrics
+    title: Goals & Success Metrics
+    instruction: Establish clear objectives and how to measure success. Make goals SMART (Specific, Measurable, Achievable, Relevant, Time-bound)
+    sections:
+      - id: business-objectives
+        title: Business Objectives
+        type: bullet-list
+        template: "- {{objective_with_metric}}"
+      - id: user-success-metrics
+        title: User Success Metrics
+        type: bullet-list
+        template: "- {{user_metric}}"
+      - id: kpis
+        title: Key Performance Indicators (KPIs)
+        type: bullet-list
+        template: "- {{kpi}}: {{definition_and_target}}"
 
-  - id: executive-summary
-    title: Executive Summary
+  - id: mvp-scope
+    title: MVP Scope
+    instruction: Define the minimum viable product clearly. Be specific about what's in and what's out. Help user distinguish must-haves from nice-to-haves.
     sections:
-      - id: summary-details
-        template: |
-          **Topic:** {{session_topic}}
-          
-          **Session Goals:** {{stated_goals}}
-          
-          **Techniques Used:** {{techniques_list}}
-          
-          **Total Ideas Generated:** {{total_ideas}}
-      - id: key-themes
-        title: "Key Themes Identified:"
+      - id: core-features
+        title: Core Features (Must Have)
         type: bullet-list
-        template: "- {{theme}}"
+        template: "- **{{feature}}:** {{description_and_rationale}}"
+      - id: out-of-scope
+        title: Out of Scope for MVP
+        type: bullet-list
+        template: "- {{feature_or_capability}}"
+      - id: mvp-success-criteria
+        title: MVP Success Criteria
+        template: "{{mvp_success_definition}}"
 
-  - id: technique-sessions
-    title: Technique Sessions
-    repeatable: true
+  - id: post-mvp-vision
+    title: Post-MVP Vision
+    instruction: Outline the longer-term product direction without overcommitting to specifics
     sections:
-      - id: technique
-        title: "{{technique_name}} - {{duration}}"
-        sections:
-          - id: description
-            template: "**Description:** {{technique_description}}"
-          - id: ideas-generated
-            title: "Ideas Generated:"
-            type: numbered-list
-            template: "{{idea}}"
-          - id: insights
-            title: "Insights Discovered:"
-            type: bullet-list
-            template: "- {{insight}}"
-          - id: connections
-            title: "Notable Connections:"
-            type: bullet-list
-            template: "- {{connection}}"
+      - id: phase-2-features
+        title: Phase 2 Features
+        template: "{{next_priority_features}}"
+      - id: long-term-vision
+        title: Long-term Vision
+        template: "{{one_two_year_vision}}"
+      - id: expansion-opportunities
+        title: Expansion Opportunities
+        template: "{{potential_expansions}}"
 
-  - id: idea-categorization
-    title: Idea Categorization
+  - id: technical-considerations
+    title: Technical Considerations
+    instruction: Document known technical constraints and preferences. Note these are initial thoughts, not final decisions.
     sections:
-      - id: immediate-opportunities
-        title: Immediate Opportunities
-        content: "*Ideas ready to implement now*"
-        repeatable: true
-        type: numbered-list
+      - id: platform-requirements
+        title: Platform Requirements
         template: |
-          **{{idea_name}}**
-          - Description: {{description}}
-          - Why immediate: {{rationale}}
-          - Resources needed: {{requirements}}
-      - id: future-innovations
-        title: Future Innovations
-        content: "*Ideas requiring development/research*"
-        repeatable: true
-        type: numbered-list
+          - **Target Platforms:** {{platforms}}
+          - **Browser/OS Support:** {{specific_requirements}}
+          - **Performance Requirements:** {{performance_specs}}
+      - id: technology-preferences
+        title: Technology Preferences
         template: |
-          **{{idea_name}}**
-          - Description: {{description}}
-          - Development needed: {{development_needed}}
-          - Timeline estimate: {{timeline}}
-      - id: moonshots
-        title: Moonshots
-        content: "*Ambitious, transformative concepts*"
-        repeatable: true
-        type: numbered-list
+          - **Frontend:** {{frontend_preferences}}
+          - **Backend:** {{backend_preferences}}
+          - **Database:** {{database_preferences}}
+          - **Hosting/Infrastructure:** {{infrastructure_preferences}}
+      - id: architecture-considerations
+        title: Architecture Considerations
         template: |
-          **{{idea_name}}**
-          - Description: {{description}}
-          - Transformative potential: {{potential}}
-          - Challenges to overcome: {{challenges}}
-      - id: insights-learnings
-        title: Insights & Learnings
-        content: "*Key realizations from the session*"
-        type: bullet-list
-        template: "- {{insight}}: {{description_and_implications}}"
+          - **Repository Structure:** {{repo_thoughts}}
+          - **Service Architecture:** {{service_thoughts}}
+          - **Integration Requirements:** {{integration_needs}}
+          - **Security/Compliance:** {{security_requirements}}
 
-  - id: action-planning
-    title: Action Planning
+  - id: constraints-assumptions
+    title: Constraints & Assumptions
+    instruction: Clearly state limitations and assumptions to set realistic expectations
     sections:
-      - id: top-priorities
-        title: Top 3 Priority Ideas
-        sections:
-          - id: priority-1
-            title: "#1 Priority: {{idea_name}}"
-            template: |
-              - Rationale: {{rationale}}
-              - Next steps: {{next_steps}}
-              - Resources needed: {{resources}}
-              - Timeline: {{timeline}}
-          - id: priority-2
-            title: "#2 Priority: {{idea_name}}"
-            template: |
-              - Rationale: {{rationale}}
-              - Next steps: {{next_steps}}
-              - Resources needed: {{resources}}
-              - Timeline: {{timeline}}
-          - id: priority-3
-            title: "#3 Priority: {{idea_name}}"
-            template: |
-              - Rationale: {{rationale}}
-              - Next steps: {{next_steps}}
-              - Resources needed: {{resources}}
-              - Timeline: {{timeline}}
+      - id: constraints
+        title: Constraints
+        template: |
+          - **Budget:** {{budget_info}}
+          - **Timeline:** {{timeline_info}}
+          - **Resources:** {{resource_info}}
+          - **Technical:** {{technical_constraints}}
+      - id: key-assumptions
+        title: Key Assumptions
+        type: bullet-list
+        template: "- {{assumption}}"
 
-  - id: reflection-followup
-    title: Reflection & Follow-up
+  - id: risks-questions
+    title: Risks & Open Questions
+    instruction: Identify unknowns and potential challenges proactively
     sections:
-      - id: what-worked
-        title: What Worked Well
-        type: bullet-list
-        template: "- {{aspect}}"
-      - id: areas-exploration
-        title: Areas for Further Exploration
-        type: bullet-list
-        template: "- {{area}}: {{reason}}"
-      - id: recommended-techniques
-        title: Recommended Follow-up Techniques
+      - id: key-risks
+        title: Key Risks
         type: bullet-list
-        template: "- {{technique}}: {{reason}}"
-      - id: questions-emerged
-        title: Questions That Emerged
+        template: "- **{{risk}}:** {{description_and_impact}}"
+      - id: open-questions
+        title: Open Questions
         type: bullet-list
         template: "- {{question}}"
-      - id: next-session
-        title: Next Session Planning
-        template: |
-          - **Suggested topics:** {{followup_topics}}
-          - **Recommended timeframe:** {{timeframe}}
-          - **Preparation needed:** {{preparation}}
+      - id: research-areas
+        title: Areas Needing Further Research
+        type: bullet-list
+        template: "- {{research_topic}}"
 
-  - id: footer
-    content: |
-      ---
-      
-      *Session facilitated using the BMAD-METHOD brainstorming framework*
-==================== END: .bmad-core/templates/brainstorming-output-tmpl.yaml ====================
+  - id: appendices
+    title: Appendices
+    sections:
+      - id: research-summary
+        title: A. Research Summary
+        condition: Has research findings
+        instruction: |
+          If applicable, summarize key findings from:
+          - Market research
+          - Competitive analysis
+          - User interviews
+          - Technical feasibility studies
+      - id: stakeholder-input
+        title: B. Stakeholder Input
+        condition: Has stakeholder feedback
+        template: "{{stakeholder_feedback}}"
+      - id: references
+        title: C. References
+        template: "{{relevant_links_and_docs}}"
+
+  - id: next-steps
+    title: Next Steps
+    sections:
+      - id: immediate-actions
+        title: Immediate Actions
+        type: numbered-list
+        template: "{{action_item}}"
+      - id: pm-handoff
+        title: PM Handoff
+        content: |
+          This Project Brief provides the full context for {{project_name}}. Please start in 'PRD Generation Mode', review the brief thoroughly to work with the user to create the PRD section by section as the template indicates, asking for any necessary clarification or suggesting improvements.
+==================== END: .bmad-core/templates/project-brief-tmpl.yaml ====================
 
 ==================== START: .bmad-core/data/bmad-kb.md ====================
 # BMad Knowledge Base
@@ -2337,7 +2341,7 @@ You are the "Vibe CEO" - thinking like a CEO with unlimited resources and a sing
 
 - **Claude Code**: `/agent-name` (e.g., `/bmad-master`)
 - **Cursor**: `@agent-name` (e.g., `@bmad-master`)
-- **Windsurf**: `@agent-name` (e.g., `@bmad-master`)
+- **Windsurf**: `/agent-name` (e.g., `/bmad-master`)
 - **Trae**: `@agent-name` (e.g., `@bmad-master`)
 - **Roo Code**: Select mode from mode selector (e.g., `bmad-master`)
 - **GitHub Copilot**: Open the Chat view (`⌃⌘I` on Mac, `Ctrl+Alt+I` on Windows/Linux) and select **Agent** from the chat mode selector.
@@ -2581,7 +2585,7 @@ Each status change requires user verification and approval before proceeding.
 #### Greenfield Development
 
 - Business analysis and market research
-- Product requirements and feature definition  
+- Product requirements and feature definition
 - System architecture and design
 - Development execution
 - Testing and deployment
@@ -2690,8 +2694,11 @@ Templates with Level 2 headings (`##`) can be automatically sharded:
 
 ```markdown
 ## Goals and Background Context
-## Requirements  
+
+## Requirements
+
 ## User Interface Design Goals
+
 ## Success Metrics
 ```