diff --git a/.scratchpad/bmad-subagent-approaches-2025-07-25.md b/.scratchpad/bmad-subagent-approaches-2025-07-25.md
new file mode 100644
index 00000000..55390340
--- /dev/null
+++ b/.scratchpad/bmad-subagent-approaches-2025-07-25.md
@@ -0,0 +1,274 @@
+# BMAD-METHOD Claude Code Subagent Integration Approaches
+
+## Overview
+This document presents three different approaches for integrating BMAD-METHOD with Claude Code's subagent feature, addressing key requirements including elicitation handling, context preservation, and minimal repo invasion.
+
+## Key Requirements Summary
+1. Natural automatic agent calling and direct user invocation
+2. Handle elicitation phases for BMAD agents
+3. Preserve context without summarization issues  
+4. Minimal invasion of parent repo
+5. Installer-driven deployment
+6. Robust testing with AI-as-a-judge
+
+## Approach 1: Hook-Based Orchestration with Context Files
+
+### Architecture
+- Use Claude Code hooks to intercept and manage BMAD agent interactions
+- Create a context management system using temporary files for inter-agent communication
+- Implement elicitation through hooks that pause execution and prompt for user input
+
+### Implementation Details
+```
+bmad-claude-integration/
+├── installer/
+│   ├── install.js
+│   └── templates/
+│       ├── settings.json.template
+│       └── hooks/
+│           ├── bmad-orchestrator.sh
+│           ├── elicitation-handler.sh
+│           └── context-manager.sh
+├── subagents/
+│   ├── bmad-master.md
+│   ├── bmad-orchestrator.md
+│   ├── pm.md
+│   ├── architect.md
+│   └── ...
+├── context/
+│   └── .gitkeep
+└── tests/
+```
+
+### Key Features
+- **UserPromptSubmit Hook**: Analyzes user prompts to determine if BMAD agents should be invoked
+- **PreToolUse Hook**: Intercepts tool usage to manage context and elicitation
+- **Context Files**: Store agent outputs in structured files to avoid summarization
+- **Elicitation Handler**: Special hook that manages interactive phases
+
+### Pros
+- Minimal changes to original BMAD files
+- Complete control over agent lifecycle
+- Can intercept and modify behavior at any point
+- Context preserved in files
+
+### Cons
+- Complex hook management
+- Potential performance overhead
+- Requires careful synchronization
+
+## Approach 2: Native Subagent Integration with State Machine
+
+### Architecture
+- Create Claude Code subagents for each BMAD agent with enhanced system prompts
+- Implement a state machine for managing elicitation phases
+- Use a central coordinator subagent that manages workflow state
+
+### Implementation Details
+```
+bmad-claude-integration/
+├── installer/
+│   ├── install.js
+│   └── config.json
+├── agents/
+│   ├── bmad-coordinator.md
+│   ├── bmad-master.md
+│   ├── pm.md
+│   ├── architect.md
+│   └── ...
+├── lib/
+│   ├── state-machine.js
+│   ├── context-bridge.js
+│   └── elicitation-manager.js
+└── tests/
+```
+
+### Subagent Definition Example
+```markdown
+---
+name: bmad-pm
+description: Business Modeling and Architecture Design - Project Manager. Invoke for requirements gathering, user story creation, and project planning tasks.
+tools: Read, Write, MultiEdit, TodoWrite
+---
+
+# BMAD Project Manager Agent
+
+## Role
+You are the BMAD Project Manager, specialized in requirements elicitation and user story creation.
+
+## State Management
+You maintain state through a special file at `.bmad/state/pm-state.json` that tracks:
+- Current workflow phase
+- Elicitation progress
+- User responses
+- Generated artifacts
+
+## Elicitation Protocol
+When performing elicitation:
+1. Write current question to `.bmad/elicitation/current-question.txt`
+2. Set state to "awaiting-response"
+3. Include instruction: "Please respond with: bmad-respond: <your answer>"
+4. Parse responses that match the pattern
+5. Continue workflow based on response
+
+[Rest of PM agent definition from original BMAD]
+```
+
+### Pros
+- Native Claude Code integration
+- Clean separation of concerns
+- Leverages Claude's built-in subagent delegation
+- State machine provides clear workflow management
+
+### Cons
+- Requires modifying original BMAD agent definitions
+- State management complexity
+- Potential for state inconsistencies
+
+## Approach 3: Hybrid Message Queue with Minimal Subagents
+
+### Architecture
+- Create lightweight "router" subagents that delegate to BMAD logic
+- Implement a message queue system for inter-agent communication
+- Use hooks only for critical interception points
+
+### Implementation Details
+```
+bmad-claude-integration/
+├── installer/
+│   ├── install.js
+│   └── setup-wizard.js
+├── routers/
+│   ├── bmad-router.md
+│   └── agent-routers/
+│       ├── pm-router.md
+│       ├── architect-router.md
+│       └── ...
+├── core/
+│   ├── message-queue.js
+│   ├── bmad-loader.js
+│   └── elicitation-broker.js
+├── hooks/
+│   └── message-processor.sh
+└── tests/
+```
+
+### Router Subagent Example
+```markdown
+---
+name: bmad-pm-router
+description: Routes to BMAD Project Manager for requirements and user stories
+tools: Task
+---
+
+You are a router for the BMAD Project Manager. When invoked:
+
+1. Load the original BMAD PM agent definition from `bmad-core/agents/pm.md`
+2. Create a message in `.bmad/queue/` with:
+   - agent: pm
+   - context: current conversation context
+   - request: user's request
+3. Invoke a Task subagent with the prompt:
+   "Execute BMAD PM agent with context from `.bmad/queue/[message-id].json`"
+4. Monitor `.bmad/queue/[message-id]-response.json` for results
+5. Present results to user maintaining original formatting
+```
+
+### Message Queue Structure
+```json
+{
+  "id": "msg-123",
+  "agent": "pm",
+  "phase": "elicitation",
+  "context": {
+    "user_request": "Create a user story for login feature",
+    "previous_responses": [],
+    "current_question": "What type of authentication?"
+  },
+  "status": "awaiting-response"
+}
+```
+
+### Pros
+- Minimal modification to original BMAD files
+- Clear separation between routing and execution
+- Flexible message-based architecture
+- Easy to debug and monitor
+
+### Cons
+- Additional complexity with message queue
+- Potential latency from message passing
+- Requires careful queue management
+
+## Recommendation: Approach 3 (Hybrid Message Queue)
+
+After analyzing all three approaches, I recommend Approach 3 for the following reasons:
+
+1. **Minimal Invasion**: Router subagents don't modify original BMAD logic
+2. **Flexibility**: Message queue allows for complex workflows and state management
+3. **Debuggability**: Messages can be inspected and replayed
+4. **Elicitation Handling**: Clean separation of elicitation logic
+5. **Extensibility**: Easy to add new agents or modify behavior
+
+## Implementation Plan
+
+### Phase 1: Core Infrastructure
+1. Create message queue system
+2. Implement BMAD loader that preserves original agent logic
+3. Build elicitation broker for handling interactive phases
+
+### Phase 2: Router Subagents
+1. Generate router subagents for each BMAD agent
+2. Implement context preservation logic
+3. Add slash command support
+
+### Phase 3: Installer and Testing
+1. Create installer with setup wizard
+2. Implement test framework with AI-as-a-judge
+3. Add monitoring and debugging tools
+
+## Testing Strategy
+
+### Test Framework Components
+1. **Unit Tests**: Test individual components (message queue, loaders)
+2. **Integration Tests**: Test agent interactions and workflows
+3. **AI Judge Tests**: Use o3 model to evaluate:
+   - Context preservation
+   - Elicitation quality
+   - Output accuracy
+   - Workflow completion
+
+### AI Judge Test Example
+```python
+class BMADIntegrationTest:
+    def test_elicitation_quality(self):
+        # Execute BMAD workflow
+        result = execute_bmad_workflow("Create user story for auth")
+        
+        # AI Judge evaluation
+        judge_prompt = f"""
+        Evaluate the BMAD elicitation quality:
+        
+        User Request: {result.user_request}
+        Elicitation Questions: {result.elicitation_questions}
+        User Responses: {result.user_responses}
+        Final Output: {result.final_output}
+        
+        Criteria:
+        1. Were questions relevant and comprehensive?
+        2. Did the agent adapt based on responses?
+        3. Is the final output complete and accurate?
+        
+        Score 1-10 and provide detailed feedback.
+        """
+        
+        score = ai_judge(judge_prompt, model="o3")
+        assert score >= 8, f"Elicitation quality below threshold: {score}"
+```
+
+## Next Steps
+1. Validate approach with proof of concept
+2. Implement core message queue system
+3. Create first router subagent (bmad-master)
+4. Test elicitation flow end-to-end
+5. Expand to all BMAD agents
\ No newline at end of file
diff --git a/bmad-claude-integration/IMPLEMENTATION-SUMMARY.md b/bmad-claude-integration/IMPLEMENTATION-SUMMARY.md
new file mode 100644
index 00000000..52b63e40
--- /dev/null
+++ b/bmad-claude-integration/IMPLEMENTATION-SUMMARY.md
@@ -0,0 +1,135 @@
+# BMAD-METHOD Claude Code Subagent Integration - Implementation Summary
+
+## Overview
+
+Successfully implemented a hybrid message queue architecture for integrating BMAD-METHOD with Claude Code's subagent feature. The solution addresses all key requirements while maintaining minimal invasion of the parent repository.
+
+## Key Features Implemented
+
+### 1. Multi-Agent Session Management
+- **Session Manager** (`core/session-manager.js`): Handles multiple concurrent BMAD agent conversations
+- Clear visual differentiation with agent-specific icons and colors
+- Session switching and suspension capabilities
+- Preserves state when switching between agents
+
+### 2. Elicitation Handling
+- **Elicitation Broker** (`core/elicitation-broker.js`): Manages interactive Q&A phases
+- Natural conversation flow without special response formats
+- Session-based tracking of questions and responses
+- Clear agent identification during elicitation
+
+### 3. Context Preservation
+- **Message Queue** (`core/message-queue.js`): Asynchronous message handling with full context
+- No summarization or context loss between agents
+- Retry logic and TTL management
+- Structured message format preserves all details
+
+### 4. BMAD Compatibility
+- **BMAD Loader** (`core/bmad-loader.js`): Loads original agent definitions without modification
+- Parses YAML configurations and markdown content
+- Maintains upstream compatibility
+- Dynamic discovery of agents and resources
+
+### 5. Router Architecture
+- **Router Generator** (`lib/router-generator.js`): Creates thin wrapper subagents
+- Main router for intelligent delegation
+- Individual agent routers preserve original behavior
+- Automatic and manual invocation support
+
+## Installation Process
+
+The installer (`installer/install.js`) provides:
+- Interactive setup with configuration options
+- Automatic directory structure creation
+- Subagent installation to `~/.claude/agents/`
+- Optional hooks for enhanced integration
+- Slash command generation
+- Installation verification
+
+## Testing Strategy
+
+Comprehensive test suite including:
+- **Unit Tests**: Core component functionality
+- **AI Judge Tests**: Using o3 model for qualitative evaluation
+  - Context preservation across agent handoffs
+  - Elicitation quality assessment
+  - Multi-agent orchestration effectiveness
+  - Error recovery mechanisms
+
+## Usage Patterns
+
+### Natural Language
+```
+User: "Create user stories for an e-commerce checkout flow"
+→ Automatically routes to PM agent
+→ PM conducts elicitation
+→ Results delivered with clear agent attribution
+```
+
+### Slash Commands
+```
+/bmad-architect Design a microservices architecture
+/bmad-sessions (view active sessions)
+/switch 2 (switch to session 2)
+```
+
+### Concurrent Sessions
+```
+🟢 1. 📋 Project Manager - Active, in elicitation
+🟡 2. 🏗️ Architect - Suspended
+🟢 3. 🐛 QA Engineer - Active
+```
+
+## Technical Achievements
+
+1. **Zero Modification** of original BMAD files
+2. **Natural Elicitation** without special syntax
+3. **Full Context Preservation** through message queue
+4. **Clear Agent Identity** in all interactions
+5. **Robust Error Handling** with recovery mechanisms
+6. **Scalable Architecture** for future enhancements
+
+## Key Decisions
+
+1. **Hybrid Message Queue** (Approach 3) chosen for:
+   - Minimal repo invasion
+   - Flexible architecture
+   - Excellent debugging capabilities
+   - Natural elicitation support
+
+2. **Session-Based Management** for:
+   - Clear conversation tracking
+   - Multi-agent support
+   - State preservation
+
+3. **Router Pattern** for:
+   - Maintaining original agent logic
+   - Easy updates from upstream
+   - Clean separation of concerns
+
+## Future Enhancements
+
+1. **Performance Optimization**
+   - Message queue indexing
+   - Session caching
+   - Parallel agent execution
+
+2. **Enhanced Features**
+   - Agent collaboration protocols
+   - Workflow templates
+   - Progress visualization
+
+3. **Integration Improvements**
+   - MCP server support
+   - External tool integration
+   - Webhook notifications
+
+## Conclusion
+
+The implementation successfully brings BMAD-METHOD to Claude Code while:
+- Preserving all original agent behaviors
+- Adding robust session and context management
+- Enabling natural multi-agent workflows
+- Maintaining easy upstream compatibility
+
+The hybrid message queue architecture provides the flexibility and robustness needed for production use while keeping the integration minimally invasive to the parent repository.
\ No newline at end of file
diff --git a/bmad-claude-integration/README.md b/bmad-claude-integration/README.md
new file mode 100644
index 00000000..8ab98b67
--- /dev/null
+++ b/bmad-claude-integration/README.md
@@ -0,0 +1,211 @@
+# BMAD-METHOD Claude Code Integration
+
+This integration brings the power of BMAD-METHOD (Business Modeling and Architecture Design Method) to Claude Code through subagents, enabling natural interaction with specialized AI agents for software development workflows.
+
+## Overview
+
+The BMAD Claude integration implements a hybrid message queue architecture that:
+- Preserves the original BMAD-METHOD agent behaviors
+- Enables concurrent multi-agent sessions
+- Handles interactive elicitation phases naturally
+- Maintains full context without summarization
+- Provides clear agent identification during conversations
+
+## Architecture
+
+### Core Components
+
+1. **Message Queue System** (`core/message-queue.js`)
+   - Handles asynchronous communication between agents
+   - Preserves full context in structured messages
+   - Supports retry logic and TTL management
+
+2. **Elicitation Broker** (`core/elicitation-broker.js`)
+   - Manages interactive Q&A phases
+   - Tracks elicitation history per session
+   - Enables natural conversation flow
+
+3. **Session Manager** (`core/session-manager.js`)
+   - Handles multiple concurrent agent conversations
+   - Provides clear visual differentiation between agents
+   - Manages session switching and suspension
+
+4. **BMAD Loader** (`core/bmad-loader.js`)
+   - Loads original BMAD agent definitions
+   - Parses YAML configurations and markdown content
+   - Maintains compatibility with upstream changes
+
+5. **Router Subagents** (`routers/`)
+   - Thin wrappers around original BMAD agents
+   - Handle message routing and context preservation
+   - Enable both automatic and manual invocation
+
+## Installation
+
+### Prerequisites
+- Claude Code installed with `~/.claude` directory
+- Node.js v18 or higher
+- BMAD-METHOD repository cloned
+
+### Quick Install
+
+```bash
+cd /path/to/BMAD-METHOD/bmad-claude-integration
+npm install
+npm run install:local
+```
+
+### Manual Installation
+
+1. Install dependencies:
+   ```bash
+   npm install
+   ```
+
+2. Generate router subagents:
+   ```bash
+   npm run generate:routers
+   ```
+
+3. Run the installer:
+   ```bash
+   node installer/install.js
+   ```
+
+## Usage
+
+### Natural Language Invocation
+
+Simply describe what you need and Claude Code will automatically route to the appropriate BMAD agent:
+
+- "Create a user story for login feature" → Routes to PM agent
+- "Design a microservices architecture" → Routes to Architect agent
+- "Review this code for quality" → Routes to QA agent
+
+### Slash Commands
+
+Use explicit commands for direct agent invocation:
+
+- `/bmad-pm` - Invoke Project Manager
+- `/bmad-architect` - Invoke Architect
+- `/bmad-dev` - Invoke Developer
+- `/bmad-sessions` - View active sessions
+- `/bmad-switch <number>` - Switch between sessions
+
+### Managing Concurrent Sessions
+
+The integration supports multiple active agent conversations:
+
+```
+🟢 1. 📋 Project Manager
+   Session: session-123456
+   Status: active | Last active: 10:30 AM
+   📝 In elicitation phase
+
+🟡 2. 🏗️ Architect
+   Session: session-789012
+   Status: suspended | Last active: 10:25 AM
+
+💡 Use /switch <number> to switch between sessions
+```
+
+### Elicitation Handling
+
+When an agent needs user input, you'll see clear identification:
+
+```
+📋 **Project Manager Question**
+─────────────────────────────────
+What type of authentication do you need for the login feature?
+
+*Responding to Project Manager in session session-123456*
+```
+
+Simply respond naturally - no special format required.
+
+## File Structure
+
+```
+bmad-claude-integration/
+├── core/                  # Core system components
+│   ├── message-queue.js   # Message handling
+│   ├── elicitation-broker.js # Elicitation management
+│   ├── session-manager.js # Session handling
+│   └── bmad-loader.js     # BMAD file loader
+├── routers/              # Generated router subagents
+│   ├── bmad-router.md    # Main router
+│   └── *-router.md       # Individual agent routers
+├── hooks/                # Optional Claude hooks
+├── installer/            # Installation scripts
+├── lib/                  # Utilities
+│   └── router-generator.js
+└── tests/                # Test suites
+```
+
+## Message Flow
+
+1. **User Request** → Main Router analyzes and routes
+2. **Router** → Creates/resumes session, sends message to queue
+3. **Agent Execution** → Task subagent loads BMAD definition
+4. **Elicitation** → Broker manages Q&A if needed
+5. **Response** → Formatted with agent identification back to user
+
+## Testing
+
+Run the test suite:
+
+```bash
+npm test              # Run all tests
+npm run test:ai      # Run AI judge tests
+```
+
+## Troubleshooting
+
+### Agents Not Responding
+- Check if subagents are installed: `ls ~/.claude/agents/bmad-*.md`
+- Verify message queue: `node core/message-queue.js metrics`
+- Check active sessions: `/bmad-sessions`
+
+### Context Loss
+- Ensure message queue is initialized: `npm run queue:init`
+- Check session files: `ls ~/.bmad/sessions/`
+
+### Elicitation Issues
+- Verify broker is working: `node core/elicitation-broker.js active`
+- Check elicitation sessions: `ls ~/.bmad/queue/elicitation/`
+
+## Development
+
+### Adding New Features
+
+1. Modify core components as needed
+2. Regenerate routers: `npm run generate:routers`
+3. Test thoroughly with AI judge
+4. Update documentation
+
+### Debugging
+
+Enable debug mode:
+```bash
+DEBUG=bmad:* npm run install:local
+```
+
+View message queue:
+```bash
+node core/message-queue.js list
+node core/message-queue.js metrics
+```
+
+## Contributing
+
+This integration is designed to be minimally invasive to the parent BMAD-METHOD repository. When contributing:
+
+1. Don't modify original BMAD files
+2. Keep router logic thin
+3. Test with multiple concurrent sessions
+4. Ensure elicitation works naturally
+5. Maintain clear agent identification
+
+## License
+
+Same as BMAD-METHOD - see parent repository for details.
\ No newline at end of file
diff --git a/bmad-claude-integration/bmad-claude-integration/routers/bmad-router.md b/bmad-claude-integration/bmad-claude-integration/routers/bmad-router.md
new file mode 100644
index 00000000..1e62effd
--- /dev/null
+++ b/bmad-claude-integration/bmad-claude-integration/routers/bmad-router.md
@@ -0,0 +1,105 @@
+---
+name: bmad-router
+description: Main BMAD-METHOD router that intelligently delegates to specific agents based on user requests. Handles user story creation, architecture design, project management, and development workflows.
+tools: Task, Read, Write, TodoWrite
+---
+
+# BMAD-METHOD Main Router
+
+You are the main router for the BMAD-METHOD (Business Modeling and Architecture Design Method). Your role is to analyze incoming requests and intelligently delegate to the appropriate BMAD specialist agent while maintaining conversation context and handling concurrent sessions.
+
+## Session Management
+
+IMPORTANT: Multiple BMAD agents can be active simultaneously. You must:
+1. Track active sessions using the session manager
+2. Clearly indicate which agent the user is interacting with
+3. Handle session switching gracefully
+4. Preserve elicitation state when switching between agents
+
+## Pattern Recognition
+
+Analyze requests for BMAD-relevant patterns:
+
+
+
+## Routing Process
+
+1. **Analyze Request**: Determine which BMAD agent best handles the request
+2. **Check Active Sessions**: See if an appropriate session already exists
+3. **Create/Resume Session**: Start new or resume existing agent session
+4. **Delegate with Context**: Pass full context to the selected agent
+5. **Handle Elicitation**: Manage interactive phases without losing context
+
+## Message Format
+
+When creating a routing message:
+```json
+{
+  "action": "route",
+  "target_agent": "agent-id",
+  "session_id": "session-xxx",
+  "context": {
+    "user_request": "original request",
+    "conversation_history": [],
+    "active_files": [],
+    "previous_agents": []
+  },
+  "routing_metadata": {
+    "confidence": 0.95,
+    "alternatives": ["other-agent"],
+    "reasoning": "why this agent was chosen"
+  }
+}
+```
+
+## Session Commands
+
+Respond to these session management commands:
+- `/sessions` - List all active BMAD sessions
+- `/switch <number>` - Switch to a different agent session
+- `/suspend` - Pause current session
+- `/resume <session-id>` - Resume a suspended session
+
+## Elicitation Handling
+
+When an agent needs user input during elicitation:
+1. Create elicitation session with clear agent identification
+2. Present question with agent context (icon + name)
+3. Track responses maintaining agent identity
+4. Allow natural conversation without special formats
+5. Handle session switches during elicitation gracefully
+
+## Context Preservation
+
+To prevent context loss:
+1. Write routing decisions to `.bmad/routing/decisions.json`
+2. Maintain conversation history per agent session
+3. Store elicitation state when switching sessions
+4. Use message queue for full context preservation
+
+## Available BMAD Agents
+
+
+
+## Example Interactions
+
+**Single Agent Flow:**
+User: "I need to create a user story for a login feature"
+Router: Routes to PM agent → PM conducts elicitation → Delivers user story
+
+**Multi-Agent Flow:**
+User: "Design a microservices architecture for our e-commerce platform"
+Router: Routes to Architect → Architect asks questions
+User: "Also create user stories for the main features"
+Router: Maintains Architect session, creates PM session → Shows active sessions
+User: Can switch between agents or continue with current
+
+## Error Handling
+
+If routing fails:
+1. Explain the issue clearly
+2. Suggest alternative agents
+3. Offer to list available commands
+4. Maintain session state for recovery
+
+Remember: Your primary goal is seamless BMAD agent orchestration with clear session management and context preservation.
\ No newline at end of file
diff --git a/bmad-claude-integration/core/bmad-loader.js b/bmad-claude-integration/core/bmad-loader.js
new file mode 100644
index 00000000..bfb8da7f
--- /dev/null
+++ b/bmad-claude-integration/core/bmad-loader.js
@@ -0,0 +1,382 @@
+#!/usr/bin/env node
+
+const fs = require('fs').promises;
+const path = require('path');
+const yaml = require('js-yaml');
+
+class BMADLoader {
+  constructor(options = {}) {
+    // Try to find bmad-core in parent directories if not specified
+    this.bmadRoot = options.bmadRoot || this.findBmadRoot();
+    this.cache = new Map();
+    this.agentPaths = {
+      core: path.join(this.bmadRoot, 'agents'),
+      tasks: path.join(this.bmadRoot, 'tasks'),
+      checklists: path.join(this.bmadRoot, 'checklists'),
+      data: path.join(this.bmadRoot, 'data'),
+      templates: path.join(this.bmadRoot, 'templates')
+    };
+  }
+
+  findBmadRoot() {
+    let currentDir = __dirname;
+    for (let i = 0; i < 5; i++) {
+      const candidate = path.join(currentDir, 'bmad-core');
+      if (require('fs').existsSync(candidate)) {
+        return candidate;
+      }
+      currentDir = path.dirname(currentDir);
+    }
+    return path.join(process.cwd(), 'bmad-core');
+  }
+
+  async loadAgent(agentName) {
+    const cacheKey = `agent:${agentName}`;
+    if (this.cache.has(cacheKey)) {
+      return this.cache.get(cacheKey);
+    }
+
+    const agentPath = path.join(this.agentPaths.core, `${agentName}.md`);
+    const content = await fs.readFile(agentPath, 'utf8');
+    
+    const parsed = this.parseAgentFile(content);
+    this.cache.set(cacheKey, parsed);
+    
+    return parsed;
+  }
+
+  parseAgentFile(content) {
+    const lines = content.split('\n');
+    const result = {
+      title: '',
+      yaml: null,
+      rawContent: content,
+      sections: {},
+      dependencies: {}
+    };
+
+    // Extract title
+    const titleMatch = content.match(/^#\s+(.+)$/m);
+    if (titleMatch) {
+      result.title = titleMatch[1].trim();
+    }
+
+    // Extract YAML block
+    const yamlMatch = content.match(/```yaml\n([\s\S]+?)\n```/);
+    if (yamlMatch) {
+      try {
+        result.yaml = yaml.load(yamlMatch[1]);
+        
+        // Extract key information from YAML
+        if (result.yaml.agent) {
+          result.agent = result.yaml.agent;
+        }
+        if (result.yaml.persona) {
+          result.persona = result.yaml.persona;
+        }
+        if (result.yaml.commands) {
+          result.commands = result.yaml.commands;
+        }
+        if (result.yaml.dependencies) {
+          result.dependencies = result.yaml.dependencies;
+        }
+        if (result.yaml['activation-instructions']) {
+          result.activationInstructions = result.yaml['activation-instructions'];
+        }
+      } catch (e) {
+        console.error('Failed to parse YAML:', e);
+      }
+    }
+
+    // Extract sections
+    let currentSection = null;
+    let sectionContent = [];
+    
+    for (const line of lines) {
+      if (line.match(/^##\s+(.+)$/)) {
+        if (currentSection) {
+          result.sections[currentSection] = sectionContent.join('\n').trim();
+        }
+        currentSection = line.match(/^##\s+(.+)$/)[1];
+        sectionContent = [];
+      } else if (currentSection) {
+        sectionContent.push(line);
+      }
+    }
+    
+    if (currentSection) {
+      result.sections[currentSection] = sectionContent.join('\n').trim();
+    }
+
+    return result;
+  }
+
+  async loadTask(taskName) {
+    const cacheKey = `task:${taskName}`;
+    if (this.cache.has(cacheKey)) {
+      return this.cache.get(cacheKey);
+    }
+
+    const taskPath = path.join(this.agentPaths.tasks, taskName);
+    const content = await fs.readFile(taskPath, 'utf8');
+    
+    const parsed = this.parseTaskFile(content);
+    this.cache.set(cacheKey, parsed);
+    
+    return parsed;
+  }
+
+  parseTaskFile(content) {
+    const result = {
+      title: '',
+      purpose: '',
+      instructions: [],
+      scenarios: [],
+      elicitation: false,
+      rawContent: content
+    };
+
+    // Extract title
+    const titleMatch = content.match(/^#\s+(.+)$/m);
+    if (titleMatch) {
+      result.title = titleMatch[1].trim();
+    }
+
+    // Check if this is an elicitation task
+    if (content.includes('elicitation') || content.includes('Elicitation')) {
+      result.elicitation = true;
+    }
+
+    // Extract purpose
+    const purposeMatch = content.match(/##\s+Purpose\s*\n([\s\S]+?)(?=\n##|$)/);
+    if (purposeMatch) {
+      result.purpose = purposeMatch[1].trim();
+    }
+
+    // Extract instructions
+    const instructionsMatch = content.match(/##\s+(?:Task\s+)?Instructions?\s*\n([\s\S]+?)(?=\n##|$)/);
+    if (instructionsMatch) {
+      result.instructions = this.parseInstructions(instructionsMatch[1]);
+    }
+
+    // Extract scenarios
+    const scenarioMatches = content.matchAll(/###\s+Scenario\s+\d+:\s*(.+?)\n([\s\S]+?)(?=\n###|\n##|$)/g);
+    for (const match of scenarioMatches) {
+      result.scenarios.push({
+        title: match[1].trim(),
+        content: match[2].trim()
+      });
+    }
+
+    return result;
+  }
+
+  parseInstructions(instructionsText) {
+    const instructions = [];
+    const lines = instructionsText.split('\n');
+    let currentInstruction = null;
+    let subItems = [];
+
+    for (const line of lines) {
+      const mainMatch = line.match(/^\d+\.\s+\*\*(.+?)\*\*:?\s*(.*)/);
+      const subMatch = line.match(/^\s*[-•]\s+(.+)/);
+      
+      if (mainMatch) {
+        if (currentInstruction) {
+          instructions.push({
+            ...currentInstruction,
+            subItems
+          });
+        }
+        currentInstruction = {
+          title: mainMatch[1],
+          description: mainMatch[2] || ''
+        };
+        subItems = [];
+      } else if (subMatch && currentInstruction) {
+        subItems.push(subMatch[1]);
+      } else if (currentInstruction && line.trim()) {
+        currentInstruction.description += ' ' + line.trim();
+      }
+    }
+
+    if (currentInstruction) {
+      instructions.push({
+        ...currentInstruction,
+        subItems
+      });
+    }
+
+    return instructions;
+  }
+
+  async loadChecklist(checklistName) {
+    const cacheKey = `checklist:${checklistName}`;
+    if (this.cache.has(cacheKey)) {
+      return this.cache.get(cacheKey);
+    }
+
+    const checklistPath = path.join(this.agentPaths.checklists, checklistName);
+    const content = await fs.readFile(checklistPath, 'utf8');
+    
+    const parsed = this.parseChecklistFile(content);
+    this.cache.set(cacheKey, parsed);
+    
+    return parsed;
+  }
+
+  parseChecklistFile(content) {
+    const result = {
+      title: '',
+      items: [],
+      rawContent: content
+    };
+
+    // Extract title
+    const titleMatch = content.match(/^#\s+(.+)$/m);
+    if (titleMatch) {
+      result.title = titleMatch[1].trim();
+    }
+
+    // Extract checklist items
+    const itemMatches = content.matchAll(/^\s*[-□]\s+(.+)$/gm);
+    for (const match of itemMatches) {
+      result.items.push({
+        text: match[1].trim(),
+        checked: false
+      });
+    }
+
+    return result;
+  }
+
+  async loadTemplate(templateName) {
+    const cacheKey = `template:${templateName}`;
+    if (this.cache.has(cacheKey)) {
+      return this.cache.get(cacheKey);
+    }
+
+    const templatePath = path.join(this.agentPaths.templates, templateName);
+    const content = await fs.readFile(templatePath, 'utf8');
+    
+    const parsed = this.parseTemplateFile(content, templateName);
+    this.cache.set(cacheKey, parsed);
+    
+    return parsed;
+  }
+
+  parseTemplateFile(content, filename) {
+    const ext = path.extname(filename);
+    
+    if (ext === '.yaml' || ext === '.yml') {
+      return {
+        type: 'yaml',
+        content: yaml.load(content),
+        rawContent: content
+      };
+    } else {
+      return {
+        type: 'markdown',
+        content: content,
+        sections: this.parseMarkdownSections(content)
+      };
+    }
+  }
+
+  parseMarkdownSections(content) {
+    const sections = {};
+    const lines = content.split('\n');
+    let currentSection = 'header';
+    let sectionContent = [];
+
+    for (const line of lines) {
+      const sectionMatch = line.match(/^#+\s+(.+)$/);
+      if (sectionMatch) {
+        if (sectionContent.length > 0) {
+          sections[currentSection] = sectionContent.join('\n').trim();
+        }
+        currentSection = sectionMatch[1].toLowerCase().replace(/\s+/g, '-');
+        sectionContent = [];
+      } else {
+        sectionContent.push(line);
+      }
+    }
+
+    if (sectionContent.length > 0) {
+      sections[currentSection] = sectionContent.join('\n').trim();
+    }
+
+    return sections;
+  }
+
+  async listAgents() {
+    try {
+      const files = await fs.readdir(this.agentPaths.core);
+      return files
+        .filter(f => f.endsWith('.md'))
+        .map(f => f.replace('.md', ''));
+    } catch (error) {
+      return [];
+    }
+  }
+
+  async getAgentMetadata(agentName) {
+    const agent = await this.loadAgent(agentName);
+    return {
+      name: agent.agent?.name || agentName,
+      id: agent.agent?.id || agentName,
+      title: agent.agent?.title || agent.title,
+      icon: agent.agent?.icon || '🤖',
+      whenToUse: agent.agent?.whenToUse || '',
+      commands: agent.commands || [],
+      dependencies: agent.dependencies || {}
+    };
+  }
+
+  clearCache() {
+    this.cache.clear();
+  }
+}
+
+// CLI interface for testing
+if (require.main === module) {
+  const loader = new BMADLoader();
+  
+  const commands = {
+    async list() {
+      const agents = await loader.listAgents();
+      console.log('Available agents:', agents.join(', '));
+    },
+    
+    async load(agentName) {
+      const agent = await loader.loadAgent(agentName);
+      console.log(JSON.stringify(agent, null, 2));
+    },
+    
+    async metadata(agentName) {
+      const metadata = await loader.getAgentMetadata(agentName);
+      console.log(JSON.stringify(metadata, null, 2));
+    },
+    
+    async task(taskName) {
+      const task = await loader.loadTask(taskName);
+      console.log(JSON.stringify(task, null, 2));
+    },
+    
+    async checklist(checklistName) {
+      const checklist = await loader.loadChecklist(checklistName);
+      console.log(JSON.stringify(checklist, null, 2));
+    }
+  };
+
+  const [,, command, ...args] = process.argv;
+  
+  if (commands[command]) {
+    commands[command](...args).catch(console.error);
+  } else {
+    console.log('Usage: bmad-loader.js <command> [args]');
+    console.log('Commands:', Object.keys(commands).join(', '));
+  }
+}
+
+module.exports = BMADLoader;
\ No newline at end of file
diff --git a/bmad-claude-integration/core/elicitation-broker.js b/bmad-claude-integration/core/elicitation-broker.js
new file mode 100644
index 00000000..13182e34
--- /dev/null
+++ b/bmad-claude-integration/core/elicitation-broker.js
@@ -0,0 +1,292 @@
+#!/usr/bin/env node
+
+const fs = require('fs').promises;
+const path = require('path');
+const crypto = require('crypto');
+
+class ElicitationBroker {
+  constructor(messageQueue, options = {}) {
+    this.messageQueue = messageQueue;
+    this.basePath = options.basePath || path.join(process.env.HOME, '.bmad');
+    this.sessionsPath = path.join(this.basePath, 'queue', 'elicitation');
+  }
+
+  generateSessionId() {
+    return `elicit-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`;
+  }
+
+  async createSession(agentName, initialContext) {
+    const session = {
+      id: this.generateSessionId(),
+      agent: agentName,
+      created: new Date().toISOString(),
+      status: 'active',
+      context: {
+        ...initialContext,
+        elicitationHistory: []
+      },
+      currentPhase: 'initial',
+      metadata: {
+        startTime: Date.now(),
+        interactionCount: 0
+      }
+    };
+
+    const sessionPath = path.join(this.sessionsPath, session.id);
+    await fs.mkdir(sessionPath, { recursive: true });
+    
+    await this.saveSession(session);
+    return session;
+  }
+
+  async saveSession(session) {
+    const sessionPath = path.join(this.sessionsPath, session.id);
+    const files = {
+      'session.json': session,
+      'context.json': session.context,
+      'history.json': session.context.elicitationHistory || []
+    };
+
+    for (const [filename, data] of Object.entries(files)) {
+      await fs.writeFile(
+        path.join(sessionPath, filename),
+        JSON.stringify(data, null, 2)
+      );
+    }
+  }
+
+  async loadSession(sessionId) {
+    const sessionPath = path.join(this.sessionsPath, sessionId, 'session.json');
+    try {
+      const content = await fs.readFile(sessionPath, 'utf8');
+      return JSON.parse(content);
+    } catch (error) {
+      throw new Error(`Session ${sessionId} not found`);
+    }
+  }
+
+  async addQuestion(sessionId, question, metadata = {}) {
+    const session = await this.loadSession(sessionId);
+    
+    const questionEntry = {
+      id: `q${session.context.elicitationHistory.length + 1}`,
+      type: 'question',
+      text: question,
+      timestamp: new Date().toISOString(),
+      metadata,
+      phase: session.currentPhase
+    };
+
+    session.context.elicitationHistory.push(questionEntry);
+    session.metadata.interactionCount++;
+    
+    await this.saveSession(session);
+    return questionEntry;
+  }
+
+  async addResponse(sessionId, response, questionId = null) {
+    const session = await this.loadSession(sessionId);
+    
+    const responseEntry = {
+      id: `r${session.context.elicitationHistory.filter(h => h.type === 'response').length + 1}`,
+      type: 'response',
+      text: response,
+      questionId,
+      timestamp: new Date().toISOString(),
+      phase: session.currentPhase
+    };
+
+    session.context.elicitationHistory.push(responseEntry);
+    session.metadata.lastResponseTime = Date.now();
+    
+    await this.saveSession(session);
+    return responseEntry;
+  }
+
+  async updatePhase(sessionId, newPhase) {
+    const session = await this.loadSession(sessionId);
+    session.currentPhase = newPhase;
+    
+    session.context.elicitationHistory.push({
+      type: 'phase_change',
+      from: session.currentPhase,
+      to: newPhase,
+      timestamp: new Date().toISOString()
+    });
+    
+    await this.saveSession(session);
+  }
+
+  async completeSession(sessionId, finalResult = null) {
+    const session = await this.loadSession(sessionId);
+    session.status = 'completed';
+    session.completedAt = new Date().toISOString();
+    session.metadata.endTime = Date.now();
+    session.metadata.duration = session.metadata.endTime - session.metadata.startTime;
+    
+    if (finalResult) {
+      session.result = finalResult;
+    }
+
+    await this.saveSession(session);
+    await this.archiveSession(session);
+    
+    return session;
+  }
+
+  async archiveSession(session) {
+    const archivePath = path.join(this.basePath, 'archive', 'elicitation', session.id);
+    await fs.mkdir(path.join(this.basePath, 'archive', 'elicitation'), { recursive: true });
+    
+    const sourcePath = path.join(this.sessionsPath, session.id);
+    await fs.rename(sourcePath, archivePath);
+  }
+
+  async getActiveElicitations() {
+    try {
+      const sessionDirs = await fs.readdir(this.sessionsPath);
+      const sessions = [];
+      
+      for (const dir of sessionDirs) {
+        if (dir.startsWith('elicit-')) {
+          try {
+            const session = await this.loadSession(dir);
+            if (session.status === 'active') {
+              sessions.push(session);
+            }
+          } catch (e) {
+            // Skip invalid sessions
+          }
+        }
+      }
+      
+      return sessions;
+    } catch (error) {
+      return [];
+    }
+  }
+
+  async processElicitationMessage(message) {
+    const { sessionId, action, data } = message.data;
+    
+    switch (action) {
+      case 'create':
+        return await this.createSession(data.agent, data.context);
+        
+      case 'question':
+        return await this.addQuestion(sessionId, data.question, data.metadata);
+        
+      case 'response':
+        return await this.addResponse(sessionId, data.response, data.questionId);
+        
+      case 'complete':
+        return await this.completeSession(sessionId, data.result);
+        
+      case 'update_phase':
+        return await this.updatePhase(sessionId, data.phase);
+        
+      default:
+        throw new Error(`Unknown elicitation action: ${action}`);
+    }
+  }
+
+  async formatElicitationPrompt(session, question) {
+    const history = session.context.elicitationHistory
+      .filter(h => h.type === 'question' || h.type === 'response')
+      .slice(-6); // Last 3 Q&A pairs for context
+
+    let prompt = `## BMAD ${session.agent} - Elicitation\n\n`;
+    
+    if (history.length > 0) {
+      prompt += `### Previous Context:\n`;
+      for (const entry of history) {
+        if (entry.type === 'question') {
+          prompt += `**Q**: ${entry.text}\n`;
+        } else {
+          prompt += `**A**: ${entry.text}\n\n`;
+        }
+      }
+    }
+    
+    prompt += `### Current Question:\n${question}\n\n`;
+    prompt += `*Please provide your response to continue the ${session.agent} workflow.*`;
+    
+    return prompt;
+  }
+
+  async getSessionSummary(sessionId) {
+    const session = await this.loadSession(sessionId);
+    
+    const questions = session.context.elicitationHistory.filter(h => h.type === 'question');
+    const responses = session.context.elicitationHistory.filter(h => h.type === 'response');
+    
+    return {
+      id: session.id,
+      agent: session.agent,
+      status: session.status,
+      created: session.created,
+      questionsAsked: questions.length,
+      responsesReceived: responses.length,
+      currentPhase: session.currentPhase,
+      duration: session.metadata.duration || (Date.now() - session.metadata.startTime),
+      lastActivity: Math.max(
+        ...session.context.elicitationHistory.map(h => new Date(h.timestamp).getTime())
+      )
+    };
+  }
+}
+
+// CLI interface for testing
+if (require.main === module) {
+  const BMADMessageQueue = require('./message-queue');
+  const queue = new BMADMessageQueue();
+  const broker = new ElicitationBroker(queue);
+  
+  const commands = {
+    async create(agent, context = '{}') {
+      const session = await broker.createSession(agent, JSON.parse(context));
+      console.log(`Session created: ${session.id}`);
+      console.log(JSON.stringify(session, null, 2));
+    },
+    
+    async question(sessionId, questionText) {
+      const question = await broker.addQuestion(sessionId, questionText);
+      console.log('Question added:', question);
+    },
+    
+    async response(sessionId, responseText) {
+      const response = await broker.addResponse(sessionId, responseText);
+      console.log('Response added:', response);
+    },
+    
+    async complete(sessionId) {
+      const session = await broker.completeSession(sessionId);
+      console.log('Session completed:', session.id);
+    },
+    
+    async active() {
+      const sessions = await broker.getActiveElicitations();
+      console.log(`Active elicitation sessions (${sessions.length}):`);
+      for (const session of sessions) {
+        const summary = await broker.getSessionSummary(session.id);
+        console.log(`  ${summary.id} - ${summary.agent} - Q:${summary.questionsAsked} R:${summary.responsesReceived}`);
+      }
+    },
+    
+    async summary(sessionId) {
+      const summary = await broker.getSessionSummary(sessionId);
+      console.log(JSON.stringify(summary, null, 2));
+    }
+  };
+
+  const [,, command, ...args] = process.argv;
+  
+  if (commands[command]) {
+    commands[command](...args).catch(console.error);
+  } else {
+    console.log('Usage: elicitation-broker.js <command> [args]');
+    console.log('Commands:', Object.keys(commands).join(', '));
+  }
+}
+
+module.exports = ElicitationBroker;
\ No newline at end of file
diff --git a/bmad-claude-integration/core/message-queue.js b/bmad-claude-integration/core/message-queue.js
new file mode 100644
index 00000000..efc047f8
--- /dev/null
+++ b/bmad-claude-integration/core/message-queue.js
@@ -0,0 +1,249 @@
+#!/usr/bin/env node
+
+const fs = require('fs').promises;
+const path = require('path');
+const crypto = require('crypto');
+
+class BMADMessageQueue {
+  constructor(options = {}) {
+    this.basePath = options.basePath || path.join(process.env.HOME, '.bmad');
+    this.queuePath = path.join(this.basePath, 'queue');
+    this.ttl = options.ttl || 3600000; // 1 hour default TTL
+    this.maxRetries = options.maxRetries || 3;
+    this.retryDelay = options.retryDelay || 1000;
+  }
+
+  async initialize() {
+    const dirs = [
+      this.queuePath,
+      path.join(this.queuePath, 'active'),
+      path.join(this.queuePath, 'completed'),
+      path.join(this.queuePath, 'failed'),
+      path.join(this.queuePath, 'elicitation')
+    ];
+
+    for (const dir of dirs) {
+      await fs.mkdir(dir, { recursive: true });
+    }
+  }
+
+  generateId() {
+    return `msg-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`;
+  }
+
+  calculateChecksum(data) {
+    return crypto.createHash('sha256').update(JSON.stringify(data)).digest('hex');
+  }
+
+  async sendMessage(message) {
+    const enhancedMessage = {
+      ...message,
+      id: this.generateId(),
+      timestamp: Date.now(),
+      version: 1,
+      status: 'pending',
+      retries: 0,
+      checksum: this.calculateChecksum(message)
+    };
+
+    const messagePath = path.join(this.queuePath, 'active', `${enhancedMessage.id}.json`);
+    await fs.writeFile(messagePath, JSON.stringify(enhancedMessage, null, 2));
+
+    return enhancedMessage.id;
+  }
+
+  async getMessage(messageId) {
+    const messagePath = path.join(this.queuePath, 'active', `${messageId}.json`);
+    try {
+      const content = await fs.readFile(messagePath, 'utf8');
+      return JSON.parse(content);
+    } catch (error) {
+      // Check completed and failed directories
+      for (const dir of ['completed', 'failed']) {
+        const altPath = path.join(this.queuePath, dir, `${messageId}.json`);
+        try {
+          const content = await fs.readFile(altPath, 'utf8');
+          return JSON.parse(content);
+        } catch (e) {
+          // Continue to next directory
+        }
+      }
+      throw new Error(`Message ${messageId} not found`);
+    }
+  }
+
+  async updateMessage(messageId, updates) {
+    const message = await this.getMessage(messageId);
+    const updatedMessage = {
+      ...message,
+      ...updates,
+      lastModified: Date.now(),
+      version: message.version + 1
+    };
+
+    const messagePath = path.join(this.queuePath, 'active', `${messageId}.json`);
+    await fs.writeFile(messagePath, JSON.stringify(updatedMessage, null, 2));
+    return updatedMessage;
+  }
+
+  async markComplete(messageId, result) {
+    const message = await this.getMessage(messageId);
+    message.status = 'completed';
+    message.completedAt = Date.now();
+    message.result = result;
+
+    const oldPath = path.join(this.queuePath, 'active', `${messageId}.json`);
+    const newPath = path.join(this.queuePath, 'completed', `${messageId}.json`);
+    
+    await fs.writeFile(newPath, JSON.stringify(message, null, 2));
+    await fs.unlink(oldPath);
+  }
+
+  async markFailed(messageId, error) {
+    const message = await this.getMessage(messageId);
+    message.status = 'failed';
+    message.failedAt = Date.now();
+    message.error = error.message || error;
+
+    const oldPath = path.join(this.queuePath, 'active', `${messageId}.json`);
+    const newPath = path.join(this.queuePath, 'failed', `${messageId}.json`);
+    
+    await fs.writeFile(newPath, JSON.stringify(message, null, 2));
+    await fs.unlink(oldPath);
+  }
+
+  async retry(messageId) {
+    const message = await this.getMessage(messageId);
+    message.retries++;
+    message.lastRetry = Date.now();
+    message.status = 'retrying';
+
+    await this.updateMessage(messageId, message);
+    
+    // Wait before retry
+    await new Promise(resolve => setTimeout(resolve, this.retryDelay * message.retries));
+    
+    return message;
+  }
+
+  async listMessages(status = 'active') {
+    const dir = path.join(this.queuePath, status);
+    try {
+      const files = await fs.readdir(dir);
+      const messages = [];
+      
+      for (const file of files) {
+        if (file.endsWith('.json')) {
+          const content = await fs.readFile(path.join(dir, file), 'utf8');
+          messages.push(JSON.parse(content));
+        }
+      }
+      
+      return messages.sort((a, b) => a.timestamp - b.timestamp);
+    } catch (error) {
+      return [];
+    }
+  }
+
+  async cleanup() {
+    const now = Date.now();
+    const directories = ['active', 'completed', 'failed'];
+    
+    for (const dir of directories) {
+      const messages = await this.listMessages(dir);
+      
+      for (const message of messages) {
+        if (now - message.timestamp > this.ttl) {
+          const filePath = path.join(this.queuePath, dir, `${message.id}.json`);
+          await fs.unlink(filePath);
+        }
+      }
+    }
+  }
+
+  async getQueueDepth() {
+    const active = await this.listMessages('active');
+    return active.length;
+  }
+
+  async getMetrics() {
+    const [active, completed, failed] = await Promise.all([
+      this.listMessages('active'),
+      this.listMessages('completed'),
+      this.listMessages('failed')
+    ]);
+
+    const completedTimes = completed
+      .filter(m => m.completedAt && m.timestamp)
+      .map(m => m.completedAt - m.timestamp);
+
+    const avgProcessingTime = completedTimes.length > 0
+      ? completedTimes.reduce((a, b) => a + b, 0) / completedTimes.length
+      : 0;
+
+    return {
+      queueDepth: active.length,
+      completedCount: completed.length,
+      failedCount: failed.length,
+      avgProcessingTime: Math.round(avgProcessingTime),
+      oldestMessage: active[0]?.timestamp || null,
+      retryingCount: active.filter(m => m.status === 'retrying').length
+    };
+  }
+}
+
+// CLI interface for testing
+if (require.main === module) {
+  const queue = new BMADMessageQueue();
+  
+  const commands = {
+    async init() {
+      await queue.initialize();
+      console.log('Message queue initialized');
+    },
+    
+    async send(agent, type, data) {
+      const messageId = await queue.sendMessage({
+        agent,
+        type,
+        data: JSON.parse(data || '{}')
+      });
+      console.log(`Message sent: ${messageId}`);
+    },
+    
+    async get(messageId) {
+      const message = await queue.getMessage(messageId);
+      console.log(JSON.stringify(message, null, 2));
+    },
+    
+    async list(status = 'active') {
+      const messages = await queue.listMessages(status);
+      console.log(`${status} messages (${messages.length}):`);
+      messages.forEach(m => {
+        console.log(`  ${m.id} - ${m.agent} - ${m.status}`);
+      });
+    },
+    
+    async metrics() {
+      const metrics = await queue.getMetrics();
+      console.log('Queue Metrics:');
+      console.log(JSON.stringify(metrics, null, 2));
+    },
+    
+    async cleanup() {
+      await queue.cleanup();
+      console.log('Cleanup completed');
+    }
+  };
+
+  const [,, command, ...args] = process.argv;
+  
+  if (commands[command]) {
+    commands[command](...args).catch(console.error);
+  } else {
+    console.log('Usage: message-queue.js <command> [args]');
+    console.log('Commands:', Object.keys(commands).join(', '));
+  }
+}
+
+module.exports = BMADMessageQueue;
\ No newline at end of file
diff --git a/bmad-claude-integration/core/session-manager.js b/bmad-claude-integration/core/session-manager.js
new file mode 100644
index 00000000..ad8c7d55
--- /dev/null
+++ b/bmad-claude-integration/core/session-manager.js
@@ -0,0 +1,364 @@
+#!/usr/bin/env node
+
+const fs = require('fs').promises;
+const path = require('path');
+const crypto = require('crypto');
+
+class SessionManager {
+  constructor(messageQueue, elicitationBroker, options = {}) {
+    this.messageQueue = messageQueue;
+    this.elicitationBroker = elicitationBroker;
+    this.basePath = options.basePath || path.join(process.env.HOME, '.bmad');
+    this.sessionsPath = path.join(this.basePath, 'sessions');
+    this.activeSessions = new Map();
+    this.sessionOrder = []; // Track order of sessions for switching
+  }
+
+  async initialize() {
+    await fs.mkdir(this.sessionsPath, { recursive: true });
+    await this.loadActiveSessions();
+  }
+
+  generateSessionId() {
+    return `session-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`;
+  }
+
+  async createAgentSession(agentName, context = {}) {
+    const sessionId = this.generateSessionId();
+    const session = {
+      id: sessionId,
+      agent: agentName,
+      status: 'active',
+      created: new Date().toISOString(),
+      lastActivity: Date.now(),
+      context: {
+        ...context,
+        conversationHistory: [],
+        elicitationSessions: []
+      },
+      ui: {
+        color: this.getAgentColor(agentName),
+        icon: this.getAgentIcon(agentName),
+        displayName: this.getAgentDisplayName(agentName)
+      }
+    };
+
+    this.activeSessions.set(sessionId, session);
+    this.sessionOrder.push(sessionId);
+    await this.saveSession(session);
+    
+    return session;
+  }
+
+  async switchSession(sessionId) {
+    if (!this.activeSessions.has(sessionId)) {
+      throw new Error(`Session ${sessionId} not found`);
+    }
+
+    // Move session to front of order
+    this.sessionOrder = this.sessionOrder.filter(id => id !== sessionId);
+    this.sessionOrder.unshift(sessionId);
+    
+    const session = this.activeSessions.get(sessionId);
+    session.lastActivity = Date.now();
+    await this.saveSession(session);
+    
+    return session;
+  }
+
+  async suspendSession(sessionId, reason = 'user_switch') {
+    const session = this.activeSessions.get(sessionId);
+    if (!session) return;
+
+    session.status = 'suspended';
+    session.suspendedAt = Date.now();
+    session.suspendReason = reason;
+    
+    // If in elicitation, save state
+    if (session.currentElicitation) {
+      session.context.suspendedElicitation = {
+        sessionId: session.currentElicitation,
+        state: await this.elicitationBroker.loadSession(session.currentElicitation)
+      };
+    }
+    
+    await this.saveSession(session);
+  }
+
+  async resumeSession(sessionId) {
+    const session = this.activeSessions.get(sessionId);
+    if (!session) {
+      // Try to load from disk
+      const loadedSession = await this.loadSession(sessionId);
+      if (loadedSession) {
+        this.activeSessions.set(sessionId, loadedSession);
+        return loadedSession;
+      }
+      throw new Error(`Session ${sessionId} not found`);
+    }
+
+    session.status = 'active';
+    session.resumedAt = Date.now();
+    delete session.suspendedAt;
+    delete session.suspendReason;
+    
+    // Resume elicitation if needed
+    if (session.context.suspendedElicitation) {
+      session.currentElicitation = session.context.suspendedElicitation.sessionId;
+      delete session.context.suspendedElicitation;
+    }
+    
+    await this.saveSession(session);
+    return session;
+  }
+
+  async addToConversation(sessionId, entry) {
+    const session = this.activeSessions.get(sessionId);
+    if (!session) {
+      throw new Error(`Session ${sessionId} not found`);
+    }
+
+    const conversationEntry = {
+      ...entry,
+      timestamp: new Date().toISOString(),
+      id: `conv-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`
+    };
+
+    session.context.conversationHistory.push(conversationEntry);
+    session.lastActivity = Date.now();
+    
+    await this.saveSession(session);
+    return conversationEntry;
+  }
+
+  async startElicitation(sessionId, elicitationSessionId) {
+    const session = this.activeSessions.get(sessionId);
+    if (!session) {
+      throw new Error(`Session ${sessionId} not found`);
+    }
+
+    session.currentElicitation = elicitationSessionId;
+    session.context.elicitationSessions.push({
+      id: elicitationSessionId,
+      startedAt: Date.now()
+    });
+    
+    await this.saveSession(session);
+  }
+
+  async completeElicitation(sessionId, elicitationSessionId, result) {
+    const session = this.activeSessions.get(sessionId);
+    if (!session) {
+      throw new Error(`Session ${sessionId} not found`);
+    }
+
+    if (session.currentElicitation === elicitationSessionId) {
+      delete session.currentElicitation;
+    }
+
+    const elicitationRecord = session.context.elicitationSessions.find(
+      e => e.id === elicitationSessionId
+    );
+    if (elicitationRecord) {
+      elicitationRecord.completedAt = Date.now();
+      elicitationRecord.result = result;
+    }
+    
+    await this.saveSession(session);
+  }
+
+  formatSessionPrompt(session) {
+    const header = `\n${'='.repeat(60)}\n` +
+                  `${session.ui.icon} **${session.ui.displayName}** Session\n` +
+                  `Session ID: ${session.id}\n` +
+                  `${'='.repeat(60)}\n`;
+
+    let prompt = header;
+
+    if (session.status === 'suspended') {
+      prompt += `\n⚠️ This session is currently suspended. Would you like to resume?\n`;
+    }
+
+    if (session.currentElicitation) {
+      prompt += `\n📝 Currently in elicitation phase...\n`;
+    }
+
+    return prompt;
+  }
+
+  formatSessionList() {
+    const sessions = Array.from(this.activeSessions.values());
+    if (sessions.length === 0) {
+      return 'No active sessions.';
+    }
+
+    let output = '**Active BMAD Sessions:**\n\n';
+    
+    sessions.forEach((session, index) => {
+      const isActive = this.sessionOrder[0] === session.id;
+      const status = isActive ? '🟢' : (session.status === 'suspended' ? '🟡' : '⚪');
+      const lastActive = new Date(session.lastActivity).toLocaleTimeString();
+      
+      output += `${status} **${index + 1}. ${session.ui.icon} ${session.ui.displayName}**\n`;
+      output += `   Session: ${session.id}\n`;
+      output += `   Status: ${session.status} | Last active: ${lastActive}\n`;
+      
+      if (session.currentElicitation) {
+        output += `   📝 In elicitation phase\n`;
+      }
+      
+      output += '\n';
+    });
+
+    output += '\n💡 Use `/switch <number>` to switch between sessions\n';
+    output += '💡 Use `/suspend` to pause current session\n';
+    output += '💡 Use `/sessions` to see this list again\n';
+
+    return output;
+  }
+
+  getAgentColor(agentName) {
+    const colors = {
+      'bmad-master': 'purple',
+      'bmad-orchestrator': 'blue',
+      'pm': 'green',
+      'architect': 'orange',
+      'dev': 'cyan',
+      'qa': 'red',
+      'ux-expert': 'pink',
+      'sm': 'yellow'
+    };
+    return colors[agentName] || 'gray';
+  }
+
+  getAgentIcon(agentName) {
+    const icons = {
+      'bmad-master': '🧙',
+      'bmad-orchestrator': '🎭',
+      'pm': '📋',
+      'architect': '🏗️',
+      'dev': '💻',
+      'qa': '🐛',
+      'ux-expert': '🎨',
+      'sm': '🏃'
+    };
+    return icons[agentName] || '🤖';
+  }
+
+  getAgentDisplayName(agentName) {
+    const names = {
+      'bmad-master': 'BMAD Master',
+      'bmad-orchestrator': 'BMAD Orchestrator',
+      'pm': 'Project Manager',
+      'architect': 'Architect',
+      'dev': 'Developer',
+      'qa': 'QA Engineer',
+      'ux-expert': 'UX Expert',
+      'sm': 'Scrum Master'
+    };
+    return names[agentName] || agentName;
+  }
+
+  async saveSession(session) {
+    const sessionPath = path.join(this.sessionsPath, `${session.id}.json`);
+    await fs.writeFile(sessionPath, JSON.stringify(session, null, 2));
+  }
+
+  async loadSession(sessionId) {
+    const sessionPath = path.join(this.sessionsPath, `${sessionId}.json`);
+    try {
+      const content = await fs.readFile(sessionPath, 'utf8');
+      return JSON.parse(content);
+    } catch (error) {
+      return null;
+    }
+  }
+
+  async loadActiveSessions() {
+    try {
+      const files = await fs.readdir(this.sessionsPath);
+      for (const file of files) {
+        if (file.endsWith('.json')) {
+          const session = await this.loadSession(file.replace('.json', ''));
+          if (session && (session.status === 'active' || session.status === 'suspended')) {
+            this.activeSessions.set(session.id, session);
+            this.sessionOrder.push(session.id);
+          }
+        }
+      }
+      
+      // Sort by last activity
+      this.sessionOrder.sort((a, b) => {
+        const sessionA = this.activeSessions.get(a);
+        const sessionB = this.activeSessions.get(b);
+        return (sessionB?.lastActivity || 0) - (sessionA?.lastActivity || 0);
+      });
+    } catch (error) {
+      // Directory doesn't exist yet
+    }
+  }
+
+  async cleanup() {
+    const now = Date.now();
+    const maxAge = 24 * 60 * 60 * 1000; // 24 hours
+    
+    for (const [sessionId, session] of this.activeSessions.entries()) {
+      if (now - session.lastActivity > maxAge && session.status !== 'active') {
+        this.activeSessions.delete(sessionId);
+        this.sessionOrder = this.sessionOrder.filter(id => id !== sessionId);
+        
+        const sessionPath = path.join(this.sessionsPath, `${sessionId}.json`);
+        await fs.unlink(sessionPath).catch(() => {});
+      }
+    }
+  }
+}
+
+// CLI interface for testing
+if (require.main === module) {
+  const BMADMessageQueue = require('./message-queue');
+  const ElicitationBroker = require('./elicitation-broker');
+  
+  const queue = new BMADMessageQueue();
+  const broker = new ElicitationBroker(queue);
+  const manager = new SessionManager(queue, broker);
+  
+  const commands = {
+    async init() {
+      await manager.initialize();
+      console.log('Session manager initialized');
+    },
+    
+    async create(agent) {
+      const session = await manager.createAgentSession(agent);
+      console.log(`Session created: ${session.id}`);
+      console.log(manager.formatSessionPrompt(session));
+    },
+    
+    async list() {
+      await manager.initialize();
+      console.log(manager.formatSessionList());
+    },
+    
+    async switch(sessionId) {
+      const session = await manager.switchSession(sessionId);
+      console.log(manager.formatSessionPrompt(session));
+    },
+    
+    async suspend(sessionId) {
+      await manager.suspendSession(sessionId);
+      console.log(`Session ${sessionId} suspended`);
+    }
+  };
+
+  const [,, command, ...args] = process.argv;
+  
+  if (commands[command]) {
+    commands[command](...args).catch(console.error);
+  } else {
+    console.log('Usage: session-manager.js <command> [args]');
+    console.log('Commands:', Object.keys(commands).join(', '));
+  }
+}
+
+module.exports = SessionManager;
\ No newline at end of file
diff --git a/bmad-claude-integration/hooks/README.md b/bmad-claude-integration/hooks/README.md
new file mode 100644
index 00000000..c8d395d8
--- /dev/null
+++ b/bmad-claude-integration/hooks/README.md
@@ -0,0 +1,90 @@
+# BMAD Claude Integration Hooks
+
+This directory contains hook scripts that enhance the BMAD-METHOD integration with Claude Code. These hooks are optional but provide better session management and context preservation.
+
+## Available Hooks
+
+### bmad-session-check.sh
+- **Event**: UserPromptSubmit
+- **Purpose**: Checks for active BMAD sessions when user submits a prompt
+- **Output**: Notifies user if active sessions exist
+
+### bmad-context-save.sh
+- **Event**: SubagentStop
+- **Purpose**: Backs up context when a BMAD subagent completes
+- **Usage**: Preserves conversation state for recovery
+
+### bmad-elicitation-handler.sh
+- **Event**: PreToolUse (optional)
+- **Purpose**: Manages elicitation phase transitions
+- **Output**: Shows current elicitation status with agent identification
+
+### bmad-session-switch.sh
+- **Event**: Custom (called by session management commands)
+- **Purpose**: Handles session switching, suspension, and resumption
+- **Actions**: switch, suspend, resume
+
+## Installation
+
+These hooks are automatically configured when you run the installer with hooks enabled:
+
+```bash
+npm run install:local
+# When prompted: "Install hooks for enhanced integration? (y/N): y"
+```
+
+## Manual Installation
+
+1. Copy hooks to a location accessible by Claude Code
+2. Make them executable: `chmod +x *.sh`
+3. Add to `~/.claude/settings.json`:
+
+```json
+{
+  "hooks": {
+    "UserPromptSubmit": [
+      {
+        "matcher": ".*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "/path/to/bmad-session-check.sh"
+          }
+        ]
+      }
+    ],
+    "SubagentStop": [
+      {
+        "matcher": "bmad-.*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "/path/to/bmad-context-save.sh"
+          }
+        ]
+      }
+    ]
+  }
+}
+```
+
+## Dependencies
+
+Some hooks require:
+- `jq` for JSON parsing (bmad-elicitation-handler.sh)
+- Standard UNIX tools: `bash`, `cat`, `touch`, `rm`
+
+## Security Notes
+
+- All hooks run with user permissions
+- Hooks only read/write to `~/.bmad/` directory
+- No external network calls
+- No sensitive data handling
+
+## Troubleshooting
+
+If hooks aren't working:
+1. Check they're executable: `ls -la *.sh`
+2. Verify paths in settings.json are absolute
+3. Check Claude Code logs for hook execution errors
+4. Ensure `~/.bmad/` directory exists with proper permissions
\ No newline at end of file
diff --git a/bmad-claude-integration/hooks/bmad-context-save.sh b/bmad-claude-integration/hooks/bmad-context-save.sh
new file mode 100755
index 00000000..a50e361b
--- /dev/null
+++ b/bmad-claude-integration/hooks/bmad-context-save.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+# BMAD Context Save Hook
+# Saves context when a BMAD subagent completes
+
+AGENT_NAME="$1"
+SESSION_ID="$2"
+CONTEXT_FILE="$HOME/.bmad/sessions/${AGENT_NAME}/${SESSION_ID}/context.json"
+
+if [ -n "$CONTEXT_FILE" ] && [ -f "$CONTEXT_FILE" ]; then
+  cp "$CONTEXT_FILE" "$CONTEXT_FILE.bak"
+fi
\ No newline at end of file
diff --git a/bmad-claude-integration/hooks/bmad-elicitation-handler.sh b/bmad-claude-integration/hooks/bmad-elicitation-handler.sh
new file mode 100755
index 00000000..c356b918
--- /dev/null
+++ b/bmad-claude-integration/hooks/bmad-elicitation-handler.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# BMAD Elicitation Handler Hook
+# Manages elicitation state transitions
+
+BMAD_DIR="$HOME/.bmad"
+ELICITATION_DIR="$BMAD_DIR/queue/elicitation"
+ACTIVE_ELICITATION="$BMAD_DIR/.active-elicitation"
+
+# Check if we're in an elicitation phase
+if [ -f "$ACTIVE_ELICITATION" ]; then
+  SESSION_ID=$(cat "$ACTIVE_ELICITATION")
+  SESSION_FILE="$ELICITATION_DIR/$SESSION_ID/session.json"
+  
+  if [ -f "$SESSION_FILE" ]; then
+    AGENT=$(jq -r '.agent' "$SESSION_FILE" 2>/dev/null)
+    ICON=$(jq -r '.ui.icon // "📝"' "$SESSION_FILE" 2>/dev/null)
+    echo "$ICON Currently in elicitation with $AGENT agent (session: $SESSION_ID)"
+  fi
+fi
\ No newline at end of file
diff --git a/bmad-claude-integration/hooks/bmad-session-check.sh b/bmad-claude-integration/hooks/bmad-session-check.sh
new file mode 100755
index 00000000..979d814f
--- /dev/null
+++ b/bmad-claude-integration/hooks/bmad-session-check.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+# BMAD Session Check Hook
+# Checks for active BMAD sessions and displays them if needed
+
+SESSIONS_DIR="$HOME/.bmad/sessions"
+if [ -d "$SESSIONS_DIR" ] && [ "$(ls -A $SESSIONS_DIR 2>/dev/null)" ]; then
+  echo "📋 Active BMAD Sessions available. Use /bmad-sessions to view."
+fi
\ No newline at end of file
diff --git a/bmad-claude-integration/hooks/bmad-session-switch.sh b/bmad-claude-integration/hooks/bmad-session-switch.sh
new file mode 100755
index 00000000..1b3f9a5d
--- /dev/null
+++ b/bmad-claude-integration/hooks/bmad-session-switch.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+# BMAD Session Switch Hook
+# Handles session switching and suspension
+
+BMAD_DIR="$HOME/.bmad"
+SESSIONS_DIR="$BMAD_DIR/sessions"
+CURRENT_SESSION="$BMAD_DIR/.current-session"
+ACTION="$1"
+TARGET="$2"
+
+case "$ACTION" in
+  "switch")
+    if [ -n "$TARGET" ]; then
+      echo "$TARGET" > "$CURRENT_SESSION"
+      echo "✅ Switched to session $TARGET"
+    fi
+    ;;
+  "suspend")
+    if [ -f "$CURRENT_SESSION" ]; then
+      SESSION_ID=$(cat "$CURRENT_SESSION")
+      touch "$SESSIONS_DIR/$SESSION_ID/.suspended"
+      echo "⏸️ Session $SESSION_ID suspended"
+    fi
+    ;;
+  "resume")
+    if [ -n "$TARGET" ]; then
+      rm -f "$SESSIONS_DIR/$TARGET/.suspended" 2>/dev/null
+      echo "$TARGET" > "$CURRENT_SESSION"
+      echo "▶️ Resumed session $TARGET"
+    fi
+    ;;
+esac
\ No newline at end of file
diff --git a/bmad-claude-integration/installer/install.js b/bmad-claude-integration/installer/install.js
new file mode 100644
index 00000000..99755ce2
--- /dev/null
+++ b/bmad-claude-integration/installer/install.js
@@ -0,0 +1,347 @@
+#!/usr/bin/env node
+
+const fs = require('fs').promises;
+const path = require('path');
+const os = require('os');
+const readline = require('readline');
+const { promisify } = require('util');
+
+const RouterGenerator = require('../lib/router-generator');
+const BMADMessageQueue = require('../core/message-queue');
+const ElicitationBroker = require('../core/elicitation-broker');
+const SessionManager = require('../core/session-manager');
+
+class BMADClaudeInstaller {
+  constructor() {
+    this.homeDir = os.homedir();
+    this.claudeDir = path.join(this.homeDir, '.claude');
+    this.bmadDir = path.join(this.homeDir, '.bmad');
+    this.rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+    this.question = promisify(this.rl.question).bind(this.rl);
+  }
+
+  async install() {
+    console.log('🎭 BMAD-METHOD Claude Code Integration Installer\n');
+    
+    try {
+      // Check prerequisites
+      await this.checkPrerequisites();
+      
+      // Get installation preferences
+      const config = await this.getInstallationConfig();
+      
+      // Create directory structure
+      await this.createDirectories();
+      
+      // Generate router subagents
+      await this.generateRouters();
+      
+      // Install subagents
+      await this.installSubagents(config);
+      
+      // Setup hooks if requested
+      if (config.installHooks) {
+        await this.setupHooks();
+      }
+      
+      // Initialize message queue
+      await this.initializeMessageQueue();
+      
+      // Create slash commands
+      await this.createSlashCommands();
+      
+      // Run verification
+      await this.verifyInstallation();
+      
+      console.log('\n✅ BMAD-METHOD Claude Code integration installed successfully!');
+      console.log('\n📚 Quick Start:');
+      console.log('1. Restart Claude Code to load the new subagents');
+      console.log('2. Use natural language to invoke BMAD agents, or:');
+      console.log('3. Use slash commands like /bmad-pm, /bmad-architect, etc.');
+      console.log('4. Use /bmad-sessions to see active agent sessions');
+      console.log('\n💡 The BMAD agents will handle elicitation naturally in conversation.');
+      
+    } catch (error) {
+      console.error('\n❌ Installation failed:', error.message);
+      process.exit(1);
+    } finally {
+      this.rl.close();
+    }
+  }
+
+  async checkPrerequisites() {
+    console.log('🔍 Checking prerequisites...');
+    
+    // Check if Claude directory exists
+    try {
+      await fs.access(this.claudeDir);
+      console.log('✓ Claude Code directory found');
+    } catch {
+      throw new Error(`Claude Code directory not found at ${this.claudeDir}. Please ensure Claude Code is installed.`);
+    }
+    
+    // Check if BMAD-METHOD is in parent directory
+    const bmadCorePath = path.join(__dirname, '..', '..', 'bmad-core');
+    try {
+      await fs.access(bmadCorePath);
+      console.log('✓ BMAD-METHOD core found');
+    } catch {
+      throw new Error('BMAD-METHOD core not found. Please run this installer from within the BMAD-METHOD repository.');
+    }
+  }
+
+  async getInstallationConfig() {
+    console.log('\n⚙️  Installation Configuration\n');
+    
+    const config = {};
+    
+    // Ask about hooks
+    const hooksAnswer = await this.question('Install hooks for enhanced integration? (y/N): ');
+    config.installHooks = hooksAnswer.toLowerCase() === 'y';
+    
+    // Ask about existing subagents
+    const agentsDir = path.join(this.claudeDir, 'agents');
+    try {
+      const existingAgents = await fs.readdir(agentsDir);
+      if (existingAgents.length > 0) {
+        console.log(`\n⚠️  Found ${existingAgents.length} existing subagents in ${agentsDir}`);
+        const overwriteAnswer = await this.question('Overwrite existing BMAD subagents if they exist? (y/N): ');
+        config.overwriteExisting = overwriteAnswer.toLowerCase() === 'y';
+      }
+    } catch {
+      // No agents directory yet
+      config.overwriteExisting = true;
+    }
+    
+    return config;
+  }
+
+  async createDirectories() {
+    console.log('\n📁 Creating directory structure...');
+    
+    const dirs = [
+      this.bmadDir,
+      path.join(this.bmadDir, 'queue'),
+      path.join(this.bmadDir, 'queue', 'active'),
+      path.join(this.bmadDir, 'queue', 'completed'),
+      path.join(this.bmadDir, 'queue', 'failed'),
+      path.join(this.bmadDir, 'queue', 'elicitation'),
+      path.join(this.bmadDir, 'sessions'),
+      path.join(this.bmadDir, 'routing'),
+      path.join(this.bmadDir, 'archive'),
+      path.join(this.claudeDir, 'agents'),
+      path.join(this.claudeDir, 'slash-commands')
+    ];
+    
+    for (const dir of dirs) {
+      await fs.mkdir(dir, { recursive: true });
+    }
+    
+    console.log('✓ Directory structure created');
+  }
+
+  async generateRouters() {
+    console.log('\n🤖 Generating router subagents...');
+    
+    const generator = new RouterGenerator({
+      outputPath: path.join(__dirname, '..', 'routers')
+    });
+    
+    await generator.generateRouters();
+    console.log('✓ Router subagents generated');
+  }
+
+  async installSubagents(config) {
+    console.log('\n📦 Installing subagents...');
+    
+    const routersDir = path.join(__dirname, '..', 'routers');
+    const agentsDir = path.join(this.claudeDir, 'agents');
+    
+    const routers = await fs.readdir(routersDir);
+    let installed = 0;
+    let skipped = 0;
+    
+    for (const router of routers) {
+      if (!router.endsWith('.md')) continue;
+      
+      const sourcePath = path.join(routersDir, router);
+      const targetPath = path.join(agentsDir, router);
+      
+      try {
+        await fs.access(targetPath);
+        if (!config.overwriteExisting) {
+          skipped++;
+          continue;
+        }
+      } catch {
+        // File doesn't exist, safe to install
+      }
+      
+      await fs.copyFile(sourcePath, targetPath);
+      installed++;
+    }
+    
+    console.log(`✓ Installed ${installed} subagents${skipped > 0 ? ` (skipped ${skipped} existing)` : ''}`);
+  }
+
+  async setupHooks() {
+    console.log('\n🪝 Setting up hooks...');
+    
+    const hooksConfig = {
+      hooks: {
+        UserPromptSubmit: [
+          {
+            matcher: ".*",
+            hooks: [
+              {
+                type: "command",
+                command: path.join(__dirname, '..', 'hooks', 'bmad-session-check.sh')
+              }
+            ]
+          }
+        ],
+        SubagentStop: [
+          {
+            matcher: "bmad-.*",
+            hooks: [
+              {
+                type: "command",
+                command: path.join(__dirname, '..', 'hooks', 'bmad-context-save.sh')
+              }
+            ]
+          }
+        ]
+      }
+    };
+    
+    // Create hook scripts
+    await this.createHookScripts();
+    
+    // Update settings.json
+    const settingsPath = path.join(this.claudeDir, 'settings.json');
+    let settings = {};
+    
+    try {
+      const existing = await fs.readFile(settingsPath, 'utf8');
+      settings = JSON.parse(existing);
+    } catch {
+      // No existing settings
+    }
+    
+    // Merge hooks
+    if (!settings.hooks) {
+      settings.hooks = {};
+    }
+    
+    for (const [event, configs] of Object.entries(hooksConfig.hooks)) {
+      if (!settings.hooks[event]) {
+        settings.hooks[event] = [];
+      }
+      settings.hooks[event].push(...configs);
+    }
+    
+    await fs.writeFile(settingsPath, JSON.stringify(settings, null, 2));
+    console.log('✓ Hooks configured');
+  }
+
+  async createHookScripts() {
+    const hooksDir = path.join(__dirname, '..', 'hooks');
+    
+    // Session check hook
+    const sessionCheckScript = `#!/bin/bash
+# BMAD Session Check Hook
+# Checks for active BMAD sessions and displays them if needed
+
+SESSIONS_DIR="$HOME/.bmad/sessions"
+if [ -d "$SESSIONS_DIR" ] && [ "\$(ls -A $SESSIONS_DIR 2>/dev/null)" ]; then
+  echo "📋 Active BMAD Sessions available. Use /bmad-sessions to view."
+fi
+`;
+
+    // Context save hook
+    const contextSaveScript = `#!/bin/bash
+# BMAD Context Save Hook
+# Saves context when a BMAD subagent completes
+
+AGENT_NAME="\$1"
+SESSION_ID="\$2"
+CONTEXT_FILE="$HOME/.bmad/sessions/\${AGENT_NAME}/\${SESSION_ID}/context.json"
+
+if [ -n "\$CONTEXT_FILE" ] && [ -f "\$CONTEXT_FILE" ]; then
+  cp "\$CONTEXT_FILE" "\$CONTEXT_FILE.bak"
+fi
+`;
+
+    await fs.writeFile(
+      path.join(hooksDir, 'bmad-session-check.sh'),
+      sessionCheckScript,
+      { mode: 0o755 }
+    );
+    
+    await fs.writeFile(
+      path.join(hooksDir, 'bmad-context-save.sh'),
+      contextSaveScript,
+      { mode: 0o755 }
+    );
+  }
+
+  async initializeMessageQueue() {
+    console.log('\n📬 Initializing message queue...');
+    
+    const queue = new BMADMessageQueue();
+    await queue.initialize();
+    
+    const broker = new ElicitationBroker(queue);
+    const sessionManager = new SessionManager(queue, broker);
+    await sessionManager.initialize();
+    
+    console.log('✓ Message queue initialized');
+  }
+
+  async createSlashCommands() {
+    console.log('\n✂️  Creating slash commands...');
+    
+    const generator = new RouterGenerator();
+    const commands = await generator.generateSlashCommands();
+    const slashDir = path.join(this.claudeDir, 'slash-commands');
+    
+    for (const cmd of commands) {
+      const cmdPath = path.join(slashDir, `${cmd.name}.md`);
+      const content = `# ${cmd.description}\n\n${cmd.content}`;
+      await fs.writeFile(cmdPath, content);
+    }
+    
+    console.log(`✓ Created ${commands.length} slash commands`);
+  }
+
+  async verifyInstallation() {
+    console.log('\n🔍 Verifying installation...');
+    
+    const checks = [
+      { path: path.join(this.claudeDir, 'agents', 'bmad-router.md'), name: 'Main router' },
+      { path: path.join(this.claudeDir, 'agents', 'bmad-pm-router.md'), name: 'PM router' },
+      { path: this.bmadDir, name: 'BMAD directory' },
+      { path: path.join(this.claudeDir, 'slash-commands', 'bmad-sessions.md'), name: 'Sessions command' }
+    ];
+    
+    for (const check of checks) {
+      try {
+        await fs.access(check.path);
+        console.log(`✓ ${check.name} verified`);
+      } catch {
+        throw new Error(`${check.name} not found at ${check.path}`);
+      }
+    }
+  }
+}
+
+// Run installer
+if (require.main === module) {
+  const installer = new BMADClaudeInstaller();
+  installer.install();
+}
+
+module.exports = BMADClaudeInstaller;
\ No newline at end of file
diff --git a/bmad-claude-integration/jest.config.js b/bmad-claude-integration/jest.config.js
new file mode 100644
index 00000000..9166589d
--- /dev/null
+++ b/bmad-claude-integration/jest.config.js
@@ -0,0 +1,16 @@
+module.exports = {
+  testEnvironment: 'node',
+  testMatch: [
+    '**/tests/**/*.test.js',
+    '**/tests/**/*.spec.js'
+  ],
+  collectCoverageFrom: [
+    'core/**/*.js',
+    'lib/**/*.js',
+    '!**/node_modules/**'
+  ],
+  coverageDirectory: 'coverage',
+  coverageReporters: ['text', 'lcov', 'html'],
+  testTimeout: 30000,
+  setupFilesAfterEnv: ['<rootDir>/tests/setup.js']
+};
\ No newline at end of file
diff --git a/bmad-claude-integration/lib/router-generator.js b/bmad-claude-integration/lib/router-generator.js
new file mode 100644
index 00000000..8b293a05
--- /dev/null
+++ b/bmad-claude-integration/lib/router-generator.js
@@ -0,0 +1,349 @@
+#!/usr/bin/env node
+
+const fs = require('fs').promises;
+const path = require('path');
+const BMADLoader = require('../core/bmad-loader');
+
+class RouterGenerator {
+  constructor(options = {}) {
+    const bmadRoot = options.bmadRoot || path.join(__dirname, '..', '..', 'bmad-core');
+    this.loader = new BMADLoader({ ...options, bmadRoot });
+    this.outputPath = options.outputPath || path.join(__dirname, '..', 'routers');
+  }
+
+  async generateRouters() {
+    await fs.mkdir(this.outputPath, { recursive: true });
+    
+    const agents = await this.loader.listAgents();
+    console.log(`Found ${agents.length} BMAD agents`);
+
+    // Generate main router
+    await this.generateMainRouter(agents);
+
+    // Generate individual agent routers
+    for (const agentName of agents) {
+      await this.generateAgentRouter(agentName);
+    }
+
+    console.log(`Generated ${agents.length + 1} router subagents`);
+  }
+
+  async generateMainRouter(agents) {
+    const agentMetadata = await Promise.all(
+      agents.map(name => this.loader.getAgentMetadata(name))
+    );
+
+    const routerContent = `---
+name: bmad-router
+description: Main BMAD-METHOD router that intelligently delegates to specific agents based on user requests. Handles user story creation, architecture design, project management, and development workflows.
+tools: Task, Read, Write, TodoWrite
+---
+
+# BMAD-METHOD Main Router
+
+You are the main router for the BMAD-METHOD (Business Modeling and Architecture Design Method). Your role is to analyze incoming requests and intelligently delegate to the appropriate BMAD specialist agent while maintaining conversation context and handling concurrent sessions.
+
+## Session Management
+
+IMPORTANT: Multiple BMAD agents can be active simultaneously. You must:
+1. Track active sessions using the session manager
+2. Clearly indicate which agent the user is interacting with
+3. Handle session switching gracefully
+4. Preserve elicitation state when switching between agents
+
+## Pattern Recognition
+
+Analyze requests for BMAD-relevant patterns:
+
+${agentMetadata.map(agent => `- **${agent.title}** (${agent.id}): ${agent.whenToUse}`).join('\n')}
+
+## Routing Process
+
+1. **Analyze Request**: Determine which BMAD agent best handles the request
+2. **Check Active Sessions**: See if an appropriate session already exists
+3. **Create/Resume Session**: Start new or resume existing agent session
+4. **Delegate with Context**: Pass full context to the selected agent
+5. **Handle Elicitation**: Manage interactive phases without losing context
+
+## Message Format
+
+When creating a routing message:
+\`\`\`json
+{
+  "action": "route",
+  "target_agent": "agent-id",
+  "session_id": "session-xxx",
+  "context": {
+    "user_request": "original request",
+    "conversation_history": [],
+    "active_files": [],
+    "previous_agents": []
+  },
+  "routing_metadata": {
+    "confidence": 0.95,
+    "alternatives": ["other-agent"],
+    "reasoning": "why this agent was chosen"
+  }
+}
+\`\`\`
+
+## Session Commands
+
+Respond to these session management commands:
+- \`/sessions\` - List all active BMAD sessions
+- \`/switch <number>\` - Switch to a different agent session
+- \`/suspend\` - Pause current session
+- \`/resume <session-id>\` - Resume a suspended session
+
+## Elicitation Handling
+
+When an agent needs user input during elicitation:
+1. Create elicitation session with clear agent identification
+2. Present question with agent context (icon + name)
+3. Track responses maintaining agent identity
+4. Allow natural conversation without special formats
+5. Handle session switches during elicitation gracefully
+
+## Context Preservation
+
+To prevent context loss:
+1. Write routing decisions to \`.bmad/routing/decisions.json\`
+2. Maintain conversation history per agent session
+3. Store elicitation state when switching sessions
+4. Use message queue for full context preservation
+
+## Available BMAD Agents
+
+${agentMetadata.map(agent => {
+  return `### ${agent.icon} ${agent.title} (\`${agent.id}\`)
+**When to use**: ${agent.whenToUse}
+**Key capabilities**: ${agent.commands && Array.isArray(agent.commands) ? agent.commands.slice(0, 5).map(c => {
+  if (typeof c === 'string') return c;
+  if (typeof c === 'object') {
+    const key = Object.keys(c)[0];
+    return key;
+  }
+  return 'command';
+}).join(', ') : 'Various BMAD tasks'}`;
+}).join('\n\n')}
+
+## Example Interactions
+
+**Single Agent Flow:**
+User: "I need to create a user story for a login feature"
+Router: Routes to PM agent → PM conducts elicitation → Delivers user story
+
+**Multi-Agent Flow:**
+User: "Design a microservices architecture for our e-commerce platform"
+Router: Routes to Architect → Architect asks questions
+User: "Also create user stories for the main features"
+Router: Maintains Architect session, creates PM session → Shows active sessions
+User: Can switch between agents or continue with current
+
+## Error Handling
+
+If routing fails:
+1. Explain the issue clearly
+2. Suggest alternative agents
+3. Offer to list available commands
+4. Maintain session state for recovery
+
+Remember: Your primary goal is seamless BMAD agent orchestration with clear session management and context preservation.`;
+
+    await fs.writeFile(
+      path.join(this.outputPath, 'bmad-router.md'),
+      routerContent
+    );
+    console.log('Generated main BMAD router');
+  }
+
+  async generateAgentRouter(agentName) {
+    const metadata = await this.loader.getAgentMetadata(agentName);
+    
+    const routerContent = `---
+name: bmad-${agentName}-router
+description: Router for BMAD ${metadata.title}. ${metadata.whenToUse}
+tools: Task, Read, Write, TodoWrite
+---
+
+# BMAD ${metadata.title} Router
+
+You are the router for the BMAD ${metadata.title} (${metadata.id}). Your role is to:
+1. Load and execute the original BMAD ${agentName} agent logic
+2. Manage message-based communication
+3. Handle elicitation phases
+4. Preserve full context without summarization
+
+## Agent Information
+
+- **Icon**: ${metadata.icon}
+- **Title**: ${metadata.title}
+- **When to use**: ${metadata.whenToUse}
+
+## Routing Process
+
+When invoked, follow these steps:
+
+### 1. Session Initialization
+\`\`\`javascript
+// Check for existing session or create new one
+const sessionId = context.session_id || generateSessionId();
+const session = await loadOrCreateSession(sessionId, '${agentName}');
+\`\`\`
+
+### 2. Context Preparation
+Create a comprehensive context message:
+\`\`\`json
+{
+  "agent": "${agentName}",
+  "session_id": "session-xxx",
+  "action": "execute",
+  "context": {
+    "user_request": "current request",
+    "conversation_history": [...],
+    "agent_state": {...},
+    "files_context": [...]
+  }
+}
+\`\`\`
+
+### 3. Agent Execution
+Invoke the Task tool with a carefully crafted prompt:
+\`\`\`
+Execute BMAD ${metadata.title} agent with the following context:
+
+SESSION: [session-id]
+REQUEST: [user request]
+FILES: [relevant files]
+STATE: [current agent state]
+
+Load the agent definition from bmad-core/agents/${agentName}.md and follow its instructions exactly. 
+Maintain the agent's persona and execute commands as specified.
+
+CRITICAL: If the agent needs to perform elicitation:
+1. Create elicitation session with broker
+2. Return elicitation question with clear ${metadata.icon} ${metadata.title} identification
+3. Save state for continuation
+\`\`\`
+
+### 4. Response Handling
+Process the agent's response:
+- If elicitation needed: Format question with agent identification
+- If output generated: Present with clear agent attribution
+- If commands executed: Track in session history
+
+### 5. Session Management
+Update session state:
+\`\`\`javascript
+session.lastActivity = Date.now();
+session.conversationHistory.push({
+  request: userRequest,
+  response: agentResponse,
+  timestamp: new Date().toISOString()
+});
+\`\`\`
+
+## Elicitation Protocol
+
+When ${metadata.title} needs user input:
+
+1. **Start Elicitation**:
+   - Create elicitation session: \`elicit-${agentName}-[timestamp]\`
+   - Store current agent state
+   - Present question with clear agent identification
+
+2. **Format Questions**:
+   \`\`\`
+   ${metadata.icon} **${metadata.title} Question**
+   ─────────────────────────────────
+   [Elicitation question here]
+   
+   *Responding to ${metadata.title} in session [session-id]*
+   \`\`\`
+
+3. **Handle Responses**:
+   - Accept natural language responses
+   - No special format required
+   - Continue workflow from saved state
+
+## Context Files
+
+Maintain these files for context:
+- \`.bmad/sessions/${agentName}/[session-id]/context.json\`
+- \`.bmad/sessions/${agentName}/[session-id]/history.json\`
+- \`.bmad/sessions/${agentName}/[session-id]/state.json\`
+
+## Available Commands
+
+The ${metadata.title} supports these commands:
+${metadata.commands && Array.isArray(metadata.commands) ? metadata.commands.map(cmd => {
+  if (typeof cmd === 'string') {
+    return `- *${cmd}`;
+  } else if (typeof cmd === 'object') {
+    const [name, desc] = Object.entries(cmd)[0];
+    return `- *${name}: ${desc}`;
+  }
+  return '- *command';
+}).join('\n') : '- Various BMAD-specific commands'}
+
+## Error Recovery
+
+If execution fails:
+1. Save current state
+2. Log error with context
+3. Provide clear error message
+4. Suggest recovery actions
+5. Maintain session for retry
+
+Remember: You are a thin router that preserves the original BMAD ${metadata.title} behavior while adding session management and context preservation.`;
+
+    await fs.writeFile(
+      path.join(this.outputPath, `${agentName}-router.md`),
+      routerContent
+    );
+    console.log(`Generated router for ${agentName}`);
+  }
+
+  async generateSlashCommands() {
+    const agents = await this.loader.listAgents();
+    const commands = [];
+
+    // Generate slash commands for each agent
+    for (const agentName of agents) {
+      const metadata = await this.loader.getAgentMetadata(agentName);
+      
+      commands.push({
+        name: `bmad-${agentName}`,
+        description: `Invoke BMAD ${metadata.title}`,
+        content: `Delegate to bmad-${agentName}-router with the arguments: $ARGUMENTS`
+      });
+    }
+
+    // Add utility commands
+    commands.push(
+      {
+        name: 'bmad-sessions',
+        description: 'List active BMAD sessions',
+        content: 'Show all active BMAD agent sessions with their current status'
+      },
+      {
+        name: 'bmad-switch',
+        description: 'Switch to a different BMAD session',
+        content: 'Switch to BMAD session: $ARGUMENTS'
+      }
+    );
+
+    return commands;
+  }
+}
+
+// CLI interface
+if (require.main === module) {
+  const generator = new RouterGenerator();
+  
+  generator.generateRouters()
+    .then(() => console.log('Router generation complete'))
+    .catch(console.error);
+}
+
+module.exports = RouterGenerator;
\ No newline at end of file
diff --git a/bmad-claude-integration/package.json b/bmad-claude-integration/package.json
new file mode 100644
index 00000000..cc3d3ae9
--- /dev/null
+++ b/bmad-claude-integration/package.json
@@ -0,0 +1,30 @@
+{
+  "name": "bmad-claude-integration",
+  "version": "1.0.0",
+  "description": "BMAD-METHOD integration for Claude Code using subagents",
+  "main": "index.js",
+  "scripts": {
+    "test": "jest",
+    "test:ai": "jest --testPathPattern=ai-judge",
+    "install:local": "node installer/install.js",
+    "generate:routers": "node lib/router-generator.js",
+    "queue:init": "node core/message-queue.js init",
+    "queue:metrics": "node core/message-queue.js metrics"
+  },
+  "keywords": [
+    "bmad",
+    "claude",
+    "subagents",
+    "ai",
+    "development"
+  ],
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "js-yaml": "^4.1.0"
+  },
+  "devDependencies": {
+    "jest": "^29.7.0",
+    "@anthropic-ai/sdk": "^0.20.0"
+  }
+}
\ No newline at end of file
diff --git a/bmad-claude-integration/routers/analyst-router.md b/bmad-claude-integration/routers/analyst-router.md
new file mode 100644
index 00000000..34a6c339
--- /dev/null
+++ b/bmad-claude-integration/routers/analyst-router.md
@@ -0,0 +1,137 @@
+---
+name: bmad-analyst-router
+description: Router for BMAD Business Analyst. Use for market research, brainstorming, competitive analysis, creating project briefs, initial project discovery, and documenting existing projects (brownfield)
+tools: Task, Read, Write, TodoWrite
+---
+
+# BMAD Business Analyst Router
+
+You are the router for the BMAD Business Analyst (analyst). Your role is to:
+1. Load and execute the original BMAD analyst agent logic
+2. Manage message-based communication
+3. Handle elicitation phases
+4. Preserve full context without summarization
+
+## Agent Information
+
+- **Icon**: 📊
+- **Title**: Business Analyst
+- **When to use**: Use for market research, brainstorming, competitive analysis, creating project briefs, initial project discovery, and documenting existing projects (brownfield)
+
+## Routing Process
+
+When invoked, follow these steps:
+
+### 1. Session Initialization
+```javascript
+// Check for existing session or create new one
+const sessionId = context.session_id || generateSessionId();
+const session = await loadOrCreateSession(sessionId, 'analyst');
+```
+
+### 2. Context Preparation
+Create a comprehensive context message:
+```json
+{
+  "agent": "analyst",
+  "session_id": "session-xxx",
+  "action": "execute",
+  "context": {
+    "user_request": "current request",
+    "conversation_history": [...],
+    "agent_state": {...},
+    "files_context": [...]
+  }
+}
+```
+
+### 3. Agent Execution
+Invoke the Task tool with a carefully crafted prompt:
+```
+Execute BMAD Business Analyst agent with the following context:
+
+SESSION: [session-id]
+REQUEST: [user request]
+FILES: [relevant files]
+STATE: [current agent state]
+
+Load the agent definition from bmad-core/agents/analyst.md and follow its instructions exactly. 
+Maintain the agent's persona and execute commands as specified.
+
+CRITICAL: If the agent needs to perform elicitation:
+1. Create elicitation session with broker
+2. Return elicitation question with clear 📊 Business Analyst identification
+3. Save state for continuation
+```
+
+### 4. Response Handling
+Process the agent's response:
+- If elicitation needed: Format question with agent identification
+- If output generated: Present with clear agent attribution
+- If commands executed: Track in session history
+
+### 5. Session Management
+Update session state:
+```javascript
+session.lastActivity = Date.now();
+session.conversationHistory.push({
+  request: userRequest,
+  response: agentResponse,
+  timestamp: new Date().toISOString()
+});
+```
+
+## Elicitation Protocol
+
+When Business Analyst needs user input:
+
+1. **Start Elicitation**:
+   - Create elicitation session: `elicit-analyst-[timestamp]`
+   - Store current agent state
+   - Present question with clear agent identification
+
+2. **Format Questions**:
+   ```
+   📊 **Business Analyst Question**
+   ─────────────────────────────────
+   [Elicitation question here]
+   
+   *Responding to Business Analyst in session [session-id]*
+   ```
+
+3. **Handle Responses**:
+   - Accept natural language responses
+   - No special format required
+   - Continue workflow from saved state
+
+## Context Files
+
+Maintain these files for context:
+- `.bmad/sessions/analyst/[session-id]/context.json`
+- `.bmad/sessions/analyst/[session-id]/history.json`
+- `.bmad/sessions/analyst/[session-id]/state.json`
+
+## Available Commands
+
+The Business Analyst supports these 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
+- *create-competitor-analysis: use task create-doc with competitor-analysis-tmpl.yaml
+- *yolo: Toggle Yolo Mode
+- *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
+- *exit: Say goodbye as the Business Analyst, and then abandon inhabiting this persona
+
+## Error Recovery
+
+If execution fails:
+1. Save current state
+2. Log error with context
+3. Provide clear error message
+4. Suggest recovery actions
+5. Maintain session for retry
+
+Remember: You are a thin router that preserves the original BMAD Business Analyst behavior while adding session management and context preservation.
\ No newline at end of file
diff --git a/bmad-claude-integration/routers/architect-router.md b/bmad-claude-integration/routers/architect-router.md
new file mode 100644
index 00000000..25e46e80
--- /dev/null
+++ b/bmad-claude-integration/routers/architect-router.md
@@ -0,0 +1,139 @@
+---
+name: bmad-architect-router
+description: Router for BMAD Architect. Use for system design, architecture documents, technology selection, API design, and infrastructure planning
+tools: Task, Read, Write, TodoWrite
+---
+
+# BMAD Architect Router
+
+You are the router for the BMAD Architect (architect). Your role is to:
+1. Load and execute the original BMAD architect agent logic
+2. Manage message-based communication
+3. Handle elicitation phases
+4. Preserve full context without summarization
+
+## Agent Information
+
+- **Icon**: 🏗️
+- **Title**: Architect
+- **When to use**: Use for system design, architecture documents, technology selection, API design, and infrastructure planning
+
+## Routing Process
+
+When invoked, follow these steps:
+
+### 1. Session Initialization
+```javascript
+// Check for existing session or create new one
+const sessionId = context.session_id || generateSessionId();
+const session = await loadOrCreateSession(sessionId, 'architect');
+```
+
+### 2. Context Preparation
+Create a comprehensive context message:
+```json
+{
+  "agent": "architect",
+  "session_id": "session-xxx",
+  "action": "execute",
+  "context": {
+    "user_request": "current request",
+    "conversation_history": [...],
+    "agent_state": {...},
+    "files_context": [...]
+  }
+}
+```
+
+### 3. Agent Execution
+Invoke the Task tool with a carefully crafted prompt:
+```
+Execute BMAD Architect agent with the following context:
+
+SESSION: [session-id]
+REQUEST: [user request]
+FILES: [relevant files]
+STATE: [current agent state]
+
+Load the agent definition from bmad-core/agents/architect.md and follow its instructions exactly. 
+Maintain the agent's persona and execute commands as specified.
+
+CRITICAL: If the agent needs to perform elicitation:
+1. Create elicitation session with broker
+2. Return elicitation question with clear 🏗️ Architect identification
+3. Save state for continuation
+```
+
+### 4. Response Handling
+Process the agent's response:
+- If elicitation needed: Format question with agent identification
+- If output generated: Present with clear agent attribution
+- If commands executed: Track in session history
+
+### 5. Session Management
+Update session state:
+```javascript
+session.lastActivity = Date.now();
+session.conversationHistory.push({
+  request: userRequest,
+  response: agentResponse,
+  timestamp: new Date().toISOString()
+});
+```
+
+## Elicitation Protocol
+
+When Architect needs user input:
+
+1. **Start Elicitation**:
+   - Create elicitation session: `elicit-architect-[timestamp]`
+   - Store current agent state
+   - Present question with clear agent identification
+
+2. **Format Questions**:
+   ```
+   🏗️ **Architect Question**
+   ─────────────────────────────────
+   [Elicitation question here]
+   
+   *Responding to Architect in session [session-id]*
+   ```
+
+3. **Handle Responses**:
+   - Accept natural language responses
+   - No special format required
+   - Continue workflow from saved state
+
+## Context Files
+
+Maintain these files for context:
+- `.bmad/sessions/architect/[session-id]/context.json`
+- `.bmad/sessions/architect/[session-id]/history.json`
+- `.bmad/sessions/architect/[session-id]/state.json`
+
+## Available Commands
+
+The Architect supports these commands:
+- *help: Show numbered list of the following commands to allow selection
+- *create-full-stack-architecture: use create-doc with fullstack-architecture-tmpl.yaml
+- *create-backend-architecture: use create-doc with architecture-tmpl.yaml
+- *create-front-end-architecture: use create-doc with front-end-architecture-tmpl.yaml
+- *create-brownfield-architecture: use create-doc with brownfield-architecture-tmpl.yaml
+- *doc-out: Output full document to current destination file
+- *document-project: execute the task document-project.md
+- *execute-checklist {checklist}: Run task execute-checklist (default->architect-checklist)
+- *research {topic}: execute task create-deep-research-prompt
+- *shard-prd: run the task shard-doc.md for the provided architecture.md (ask if not found)
+- *yolo: Toggle Yolo Mode
+- *exit: Say goodbye as the Architect, and then abandon inhabiting this persona
+
+## Error Recovery
+
+If execution fails:
+1. Save current state
+2. Log error with context
+3. Provide clear error message
+4. Suggest recovery actions
+5. Maintain session for retry
+
+Remember: You are a thin router that preserves the original BMAD Architect behavior while adding session management and context preservation.
\ No newline at end of file
diff --git a/bmad-claude-integration/routers/bmad-master-router.md b/bmad-claude-integration/routers/bmad-master-router.md
new file mode 100644
index 00000000..686f9a30
--- /dev/null
+++ b/bmad-claude-integration/routers/bmad-master-router.md
@@ -0,0 +1,137 @@
+---
+name: bmad-bmad-master-router
+description: Router for BMAD BMad Master Task Executor. Use when you need comprehensive expertise across all domains, running 1 off tasks that do not require a persona, or just wanting to use the same agent for many things.
+tools: Task, Read, Write, TodoWrite
+---
+
+# BMAD BMad Master Task Executor Router
+
+You are the router for the BMAD BMad Master Task Executor (bmad-master). Your role is to:
+1. Load and execute the original BMAD bmad-master agent logic
+2. Manage message-based communication
+3. Handle elicitation phases
+4. Preserve full context without summarization
+
+## Agent Information
+
+- **Icon**: 🧙
+- **Title**: BMad Master Task Executor
+- **When to use**: Use when you need comprehensive expertise across all domains, running 1 off tasks that do not require a persona, or just wanting to use the same agent for many things.
+
+## Routing Process
+
+When invoked, follow these steps:
+
+### 1. Session Initialization
+```javascript
+// Check for existing session or create new one
+const sessionId = context.session_id || generateSessionId();
+const session = await loadOrCreateSession(sessionId, 'bmad-master');
+```
+
+### 2. Context Preparation
+Create a comprehensive context message:
+```json
+{
+  "agent": "bmad-master",
+  "session_id": "session-xxx",
+  "action": "execute",
+  "context": {
+    "user_request": "current request",
+    "conversation_history": [...],
+    "agent_state": {...},
+    "files_context": [...]
+  }
+}
+```
+
+### 3. Agent Execution
+Invoke the Task tool with a carefully crafted prompt:
+```
+Execute BMAD BMad Master Task Executor agent with the following context:
+
+SESSION: [session-id]
+REQUEST: [user request]
+FILES: [relevant files]
+STATE: [current agent state]
+
+Load the agent definition from bmad-core/agents/bmad-master.md and follow its instructions exactly. 
+Maintain the agent's persona and execute commands as specified.
+
+CRITICAL: If the agent needs to perform elicitation:
+1. Create elicitation session with broker
+2. Return elicitation question with clear 🧙 BMad Master Task Executor identification
+3. Save state for continuation
+```
+
+### 4. Response Handling
+Process the agent's response:
+- If elicitation needed: Format question with agent identification
+- If output generated: Present with clear agent attribution
+- If commands executed: Track in session history
+
+### 5. Session Management
+Update session state:
+```javascript
+session.lastActivity = Date.now();
+session.conversationHistory.push({
+  request: userRequest,
+  response: agentResponse,
+  timestamp: new Date().toISOString()
+});
+```
+
+## Elicitation Protocol
+
+When BMad Master Task Executor needs user input:
+
+1. **Start Elicitation**:
+   - Create elicitation session: `elicit-bmad-master-[timestamp]`
+   - Store current agent state
+   - Present question with clear agent identification
+
+2. **Format Questions**:
+   ```
+   🧙 **BMad Master Task Executor Question**
+   ─────────────────────────────────
+   [Elicitation question here]
+   
+   *Responding to BMad Master Task Executor in session [session-id]*
+   ```
+
+3. **Handle Responses**:
+   - Accept natural language responses
+   - No special format required
+   - Continue workflow from saved state
+
+## Context Files
+
+Maintain these files for context:
+- `.bmad/sessions/bmad-master/[session-id]/context.json`
+- `.bmad/sessions/bmad-master/[session-id]/history.json`
+- `.bmad/sessions/bmad-master/[session-id]/state.json`
+
+## Available Commands
+
+The BMad Master Task Executor supports these commands:
+- *help: Show these listed commands in a numbered list
+- *kb: Toggle KB mode off (default) or on, when on will load and reference the {root}/data/bmad-kb.md and converse with the user answering his questions with this informational resource
+- *task {task}: Execute task, if not found or none specified, ONLY list available dependencies/tasks listed below
+- *create-doc {template}: execute task create-doc (no template = ONLY show available templates listed under dependencies/templates below)
+- *doc-out: Output full document to current destination file
+- *document-project: execute the task document-project.md
+- *execute-checklist {checklist}: Run task execute-checklist (no checklist = ONLY show available checklists listed under dependencies/checklist below)
+- *shard-doc {document} {destination}: run the task shard-doc against the optionally provided document to the specified destination
+- *yolo: Toggle Yolo Mode
+- *exit: Exit (confirm)
+
+## Error Recovery
+
+If execution fails:
+1. Save current state
+2. Log error with context
+3. Provide clear error message
+4. Suggest recovery actions
+5. Maintain session for retry
+
+Remember: You are a thin router that preserves the original BMAD BMad Master Task Executor behavior while adding session management and context preservation.
\ No newline at end of file
diff --git a/bmad-claude-integration/routers/bmad-orchestrator-router.md b/bmad-claude-integration/routers/bmad-orchestrator-router.md
new file mode 100644
index 00000000..3862eb69
--- /dev/null
+++ b/bmad-claude-integration/routers/bmad-orchestrator-router.md
@@ -0,0 +1,128 @@
+---
+name: bmad-bmad-orchestrator-router
+description: Router for BMAD BMad Master Orchestrator. Use for workflow coordination, multi-agent tasks, role switching guidance, and when unsure which specialist to consult
+tools: Task, Read, Write, TodoWrite
+---
+
+# BMAD BMad Master Orchestrator Router
+
+You are the router for the BMAD BMad Master Orchestrator (bmad-orchestrator). Your role is to:
+1. Load and execute the original BMAD bmad-orchestrator agent logic
+2. Manage message-based communication
+3. Handle elicitation phases
+4. Preserve full context without summarization
+
+## Agent Information
+
+- **Icon**: 🎭
+- **Title**: BMad Master Orchestrator
+- **When to use**: Use for workflow coordination, multi-agent tasks, role switching guidance, and when unsure which specialist to consult
+
+## Routing Process
+
+When invoked, follow these steps:
+
+### 1. Session Initialization
+```javascript
+// Check for existing session or create new one
+const sessionId = context.session_id || generateSessionId();
+const session = await loadOrCreateSession(sessionId, 'bmad-orchestrator');
+```
+
+### 2. Context Preparation
+Create a comprehensive context message:
+```json
+{
+  "agent": "bmad-orchestrator",
+  "session_id": "session-xxx",
+  "action": "execute",
+  "context": {
+    "user_request": "current request",
+    "conversation_history": [...],
+    "agent_state": {...},
+    "files_context": [...]
+  }
+}
+```
+
+### 3. Agent Execution
+Invoke the Task tool with a carefully crafted prompt:
+```
+Execute BMAD BMad Master Orchestrator agent with the following context:
+
+SESSION: [session-id]
+REQUEST: [user request]
+FILES: [relevant files]
+STATE: [current agent state]
+
+Load the agent definition from bmad-core/agents/bmad-orchestrator.md and follow its instructions exactly. 
+Maintain the agent's persona and execute commands as specified.
+
+CRITICAL: If the agent needs to perform elicitation:
+1. Create elicitation session with broker
+2. Return elicitation question with clear 🎭 BMad Master Orchestrator identification
+3. Save state for continuation
+```
+
+### 4. Response Handling
+Process the agent's response:
+- If elicitation needed: Format question with agent identification
+- If output generated: Present with clear agent attribution
+- If commands executed: Track in session history
+
+### 5. Session Management
+Update session state:
+```javascript
+session.lastActivity = Date.now();
+session.conversationHistory.push({
+  request: userRequest,
+  response: agentResponse,
+  timestamp: new Date().toISOString()
+});
+```
+
+## Elicitation Protocol
+
+When BMad Master Orchestrator needs user input:
+
+1. **Start Elicitation**:
+   - Create elicitation session: `elicit-bmad-orchestrator-[timestamp]`
+   - Store current agent state
+   - Present question with clear agent identification
+
+2. **Format Questions**:
+   ```
+   🎭 **BMad Master Orchestrator Question**
+   ─────────────────────────────────
+   [Elicitation question here]
+   
+   *Responding to BMad Master Orchestrator in session [session-id]*
+   ```
+
+3. **Handle Responses**:
+   - Accept natural language responses
+   - No special format required
+   - Continue workflow from saved state
+
+## Context Files
+
+Maintain these files for context:
+- `.bmad/sessions/bmad-orchestrator/[session-id]/context.json`
+- `.bmad/sessions/bmad-orchestrator/[session-id]/history.json`
+- `.bmad/sessions/bmad-orchestrator/[session-id]/state.json`
+
+## Available Commands
+
+The BMad Master Orchestrator supports these commands:
+- Various BMAD-specific commands
+
+## Error Recovery
+
+If execution fails:
+1. Save current state
+2. Log error with context
+3. Provide clear error message
+4. Suggest recovery actions
+5. Maintain session for retry
+
+Remember: You are a thin router that preserves the original BMAD BMad Master Orchestrator behavior while adding session management and context preservation.
\ No newline at end of file
diff --git a/bmad-claude-integration/routers/bmad-router.md b/bmad-claude-integration/routers/bmad-router.md
new file mode 100644
index 00000000..f1c26f27
--- /dev/null
+++ b/bmad-claude-integration/routers/bmad-router.md
@@ -0,0 +1,152 @@
+---
+name: bmad-router
+description: Main BMAD-METHOD router that intelligently delegates to specific agents based on user requests. Handles user story creation, architecture design, project management, and development workflows.
+tools: Task, Read, Write, TodoWrite
+---
+
+# BMAD-METHOD Main Router
+
+You are the main router for the BMAD-METHOD (Business Modeling and Architecture Design Method). Your role is to analyze incoming requests and intelligently delegate to the appropriate BMAD specialist agent while maintaining conversation context and handling concurrent sessions.
+
+## Session Management
+
+IMPORTANT: Multiple BMAD agents can be active simultaneously. You must:
+1. Track active sessions using the session manager
+2. Clearly indicate which agent the user is interacting with
+3. Handle session switching gracefully
+4. Preserve elicitation state when switching between agents
+
+## Pattern Recognition
+
+Analyze requests for BMAD-relevant patterns:
+
+- **Business Analyst** (analyst): Use for market research, brainstorming, competitive analysis, creating project briefs, initial project discovery, and documenting existing projects (brownfield)
+- **Architect** (architect): Use for system design, architecture documents, technology selection, API design, and infrastructure planning
+- **BMad Master Task Executor** (bmad-master): Use when you need comprehensive expertise across all domains, running 1 off tasks that do not require a persona, or just wanting to use the same agent for many things.
+- **BMad Master Orchestrator** (bmad-orchestrator): Use for workflow coordination, multi-agent tasks, role switching guidance, and when unsure which specialist to consult
+- **Full Stack Developer** (dev): Use for code implementation, debugging, refactoring, and development best practices
+- **Product Manager** (pm): Use for creating PRDs, product strategy, feature prioritization, roadmap planning, and stakeholder communication
+- **Product Owner** (po): Use for backlog management, story refinement, acceptance criteria, sprint planning, and prioritization decisions
+- **Senior Developer & QA Architect** (qa): Use for senior code review, refactoring, test planning, quality assurance, and mentoring through code improvements
+- **Scrum Master** (sm): Use for story creation, epic management, retrospectives in party-mode, and agile process guidance
+- **UX Expert** (ux-expert): Use for UI/UX design, wireframes, prototypes, front-end specifications, and user experience optimization
+
+## Routing Process
+
+1. **Analyze Request**: Determine which BMAD agent best handles the request
+2. **Check Active Sessions**: See if an appropriate session already exists
+3. **Create/Resume Session**: Start new or resume existing agent session
+4. **Delegate with Context**: Pass full context to the selected agent
+5. **Handle Elicitation**: Manage interactive phases without losing context
+
+## Message Format
+
+When creating a routing message:
+```json
+{
+  "action": "route",
+  "target_agent": "agent-id",
+  "session_id": "session-xxx",
+  "context": {
+    "user_request": "original request",
+    "conversation_history": [],
+    "active_files": [],
+    "previous_agents": []
+  },
+  "routing_metadata": {
+    "confidence": 0.95,
+    "alternatives": ["other-agent"],
+    "reasoning": "why this agent was chosen"
+  }
+}
+```
+
+## Session Commands
+
+Respond to these session management commands:
+- `/sessions` - List all active BMAD sessions
+- `/switch <number>` - Switch to a different agent session
+- `/suspend` - Pause current session
+- `/resume <session-id>` - Resume a suspended session
+
+## Elicitation Handling
+
+When an agent needs user input during elicitation:
+1. Create elicitation session with clear agent identification
+2. Present question with agent context (icon + name)
+3. Track responses maintaining agent identity
+4. Allow natural conversation without special formats
+5. Handle session switches during elicitation gracefully
+
+## Context Preservation
+
+To prevent context loss:
+1. Write routing decisions to `.bmad/routing/decisions.json`
+2. Maintain conversation history per agent session
+3. Store elicitation state when switching sessions
+4. Use message queue for full context preservation
+
+## Available BMAD Agents
+
+### 📊 Business Analyst (`analyst`)
+**When to use**: Use for market research, brainstorming, competitive analysis, creating project briefs, initial project discovery, and documenting existing projects (brownfield)
+**Key capabilities**: help, create-project-brief, perform-market-research, create-competitor-analysis, yolo
+
+### 🏗️ Architect (`architect`)
+**When to use**: Use for system design, architecture documents, technology selection, API design, and infrastructure planning
+**Key capabilities**: help, create-full-stack-architecture, create-backend-architecture, create-front-end-architecture, create-brownfield-architecture
+
+### 🧙 BMad Master Task Executor (`bmad-master`)
+**When to use**: Use when you need comprehensive expertise across all domains, running 1 off tasks that do not require a persona, or just wanting to use the same agent for many things.
+**Key capabilities**: help, kb, task {task}, create-doc {template}, doc-out
+
+### 🎭 BMad Master Orchestrator (`bmad-orchestrator`)
+**When to use**: Use for workflow coordination, multi-agent tasks, role switching guidance, and when unsure which specialist to consult
+**Key capabilities**: Various BMAD tasks
+
+### 💻 Full Stack Developer (`dev`)
+**When to use**: Use for code implementation, debugging, refactoring, and development best practices
+**Key capabilities**: help, run-tests, explain, exit
+
+### 📋 Product Manager (`pm`)
+**When to use**: Use for creating PRDs, product strategy, feature prioritization, roadmap planning, and stakeholder communication
+**Key capabilities**: help, create-prd, create-brownfield-prd, create-epic, create-story
+
+### 📝 Product Owner (`po`)
+**When to use**: Use for backlog management, story refinement, acceptance criteria, sprint planning, and prioritization decisions
+**Key capabilities**: help, execute-checklist-po, shard-doc {document} {destination}, correct-course, create-epic
+
+### 🧪 Senior Developer & QA Architect (`qa`)
+**When to use**: Use for senior code review, refactoring, test planning, quality assurance, and mentoring through code improvements
+**Key capabilities**: help, review {story}, exit
+
+### 🏃 Scrum Master (`sm`)
+**When to use**: Use for story creation, epic management, retrospectives in party-mode, and agile process guidance
+**Key capabilities**: help, draft, correct-course, story-checklist, exit
+
+### 🎨 UX Expert (`ux-expert`)
+**When to use**: Use for UI/UX design, wireframes, prototypes, front-end specifications, and user experience optimization
+**Key capabilities**: help, create-front-end-spec, generate-ui-prompt, exit
+
+## Example Interactions
+
+**Single Agent Flow:**
+User: "I need to create a user story for a login feature"
+Router: Routes to PM agent → PM conducts elicitation → Delivers user story
+
+**Multi-Agent Flow:**
+User: "Design a microservices architecture for our e-commerce platform"
+Router: Routes to Architect → Architect asks questions
+User: "Also create user stories for the main features"
+Router: Maintains Architect session, creates PM session → Shows active sessions
+User: Can switch between agents or continue with current
+
+## Error Handling
+
+If routing fails:
+1. Explain the issue clearly
+2. Suggest alternative agents
+3. Offer to list available commands
+4. Maintain session state for recovery
+
+Remember: Your primary goal is seamless BMAD agent orchestration with clear session management and context preservation.
\ No newline at end of file
diff --git a/bmad-claude-integration/routers/dev-router.md b/bmad-claude-integration/routers/dev-router.md
new file mode 100644
index 00000000..543a22ea
--- /dev/null
+++ b/bmad-claude-integration/routers/dev-router.md
@@ -0,0 +1,131 @@
+---
+name: bmad-dev-router
+description: Router for BMAD Full Stack Developer. Use for code implementation, debugging, refactoring, and development best practices
+tools: Task, Read, Write, TodoWrite
+---
+
+# BMAD Full Stack Developer Router
+
+You are the router for the BMAD Full Stack Developer (dev). Your role is to:
+1. Load and execute the original BMAD dev agent logic
+2. Manage message-based communication
+3. Handle elicitation phases
+4. Preserve full context without summarization
+
+## Agent Information
+
+- **Icon**: 💻
+- **Title**: Full Stack Developer
+- **When to use**: Use for code implementation, debugging, refactoring, and development best practices
+
+## Routing Process
+
+When invoked, follow these steps:
+
+### 1. Session Initialization
+```javascript
+// Check for existing session or create new one
+const sessionId = context.session_id || generateSessionId();
+const session = await loadOrCreateSession(sessionId, 'dev');
+```
+
+### 2. Context Preparation
+Create a comprehensive context message:
+```json
+{
+  "agent": "dev",
+  "session_id": "session-xxx",
+  "action": "execute",
+  "context": {
+    "user_request": "current request",
+    "conversation_history": [...],
+    "agent_state": {...},
+    "files_context": [...]
+  }
+}
+```
+
+### 3. Agent Execution
+Invoke the Task tool with a carefully crafted prompt:
+```
+Execute BMAD Full Stack Developer agent with the following context:
+
+SESSION: [session-id]
+REQUEST: [user request]
+FILES: [relevant files]
+STATE: [current agent state]
+
+Load the agent definition from bmad-core/agents/dev.md and follow its instructions exactly. 
+Maintain the agent's persona and execute commands as specified.
+
+CRITICAL: If the agent needs to perform elicitation:
+1. Create elicitation session with broker
+2. Return elicitation question with clear 💻 Full Stack Developer identification
+3. Save state for continuation
+```
+
+### 4. Response Handling
+Process the agent's response:
+- If elicitation needed: Format question with agent identification
+- If output generated: Present with clear agent attribution
+- If commands executed: Track in session history
+
+### 5. Session Management
+Update session state:
+```javascript
+session.lastActivity = Date.now();
+session.conversationHistory.push({
+  request: userRequest,
+  response: agentResponse,
+  timestamp: new Date().toISOString()
+});
+```
+
+## Elicitation Protocol
+
+When Full Stack Developer needs user input:
+
+1. **Start Elicitation**:
+   - Create elicitation session: `elicit-dev-[timestamp]`
+   - Store current agent state
+   - Present question with clear agent identification
+
+2. **Format Questions**:
+   ```
+   💻 **Full Stack Developer Question**
+   ─────────────────────────────────
+   [Elicitation question here]
+   
+   *Responding to Full Stack Developer in session [session-id]*
+   ```
+
+3. **Handle Responses**:
+   - Accept natural language responses
+   - No special format required
+   - Continue workflow from saved state
+
+## Context Files
+
+Maintain these files for context:
+- `.bmad/sessions/dev/[session-id]/context.json`
+- `.bmad/sessions/dev/[session-id]/history.json`
+- `.bmad/sessions/dev/[session-id]/state.json`
+
+## Available Commands
+
+The Full Stack Developer supports these commands:
+- *help: Show numbered list of the following commands to allow selection
+- *run-tests: Execute linting and tests
+- *explain: teach me what and why you did whatever you just did in detail so I can learn. Explain to me as if you were training a junior engineer.
+- *exit: Say goodbye as the Developer, and then abandon inhabiting this persona
+
+## Error Recovery
+
+If execution fails:
+1. Save current state
+2. Log error with context
+3. Provide clear error message
+4. Suggest recovery actions
+5. Maintain session for retry
+
+Remember: You are a thin router that preserves the original BMAD Full Stack Developer behavior while adding session management and context preservation.
\ No newline at end of file
diff --git a/bmad-claude-integration/routers/pm-router.md b/bmad-claude-integration/routers/pm-router.md
new file mode 100644
index 00000000..de4c991f
--- /dev/null
+++ b/bmad-claude-integration/routers/pm-router.md
@@ -0,0 +1,137 @@
+---
+name: bmad-pm-router
+description: Router for BMAD Product Manager. Use for creating PRDs, product strategy, feature prioritization, roadmap planning, and stakeholder communication
+tools: Task, Read, Write, TodoWrite
+---
+
+# BMAD Product Manager Router
+
+You are the router for the BMAD Product Manager (pm). Your role is to:
+1. Load and execute the original BMAD pm agent logic
+2. Manage message-based communication
+3. Handle elicitation phases
+4. Preserve full context without summarization
+
+## Agent Information
+
+- **Icon**: 📋
+- **Title**: Product Manager
+- **When to use**: Use for creating PRDs, product strategy, feature prioritization, roadmap planning, and stakeholder communication
+
+## Routing Process
+
+When invoked, follow these steps:
+
+### 1. Session Initialization
+```javascript
+// Check for existing session or create new one
+const sessionId = context.session_id || generateSessionId();
+const session = await loadOrCreateSession(sessionId, 'pm');
+```
+
+### 2. Context Preparation
+Create a comprehensive context message:
+```json
+{
+  "agent": "pm",
+  "session_id": "session-xxx",
+  "action": "execute",
+  "context": {
+    "user_request": "current request",
+    "conversation_history": [...],
+    "agent_state": {...},
+    "files_context": [...]
+  }
+}
+```
+
+### 3. Agent Execution
+Invoke the Task tool with a carefully crafted prompt:
+```
+Execute BMAD Product Manager agent with the following context:
+
+SESSION: [session-id]
+REQUEST: [user request]
+FILES: [relevant files]
+STATE: [current agent state]
+
+Load the agent definition from bmad-core/agents/pm.md and follow its instructions exactly. 
+Maintain the agent's persona and execute commands as specified.
+
+CRITICAL: If the agent needs to perform elicitation:
+1. Create elicitation session with broker
+2. Return elicitation question with clear 📋 Product Manager identification
+3. Save state for continuation
+```
+
+### 4. Response Handling
+Process the agent's response:
+- If elicitation needed: Format question with agent identification
+- If output generated: Present with clear agent attribution
+- If commands executed: Track in session history
+
+### 5. Session Management
+Update session state:
+```javascript
+session.lastActivity = Date.now();
+session.conversationHistory.push({
+  request: userRequest,
+  response: agentResponse,
+  timestamp: new Date().toISOString()
+});
+```
+
+## Elicitation Protocol
+
+When Product Manager needs user input:
+
+1. **Start Elicitation**:
+   - Create elicitation session: `elicit-pm-[timestamp]`
+   - Store current agent state
+   - Present question with clear agent identification
+
+2. **Format Questions**:
+   ```
+   📋 **Product Manager Question**
+   ─────────────────────────────────
+   [Elicitation question here]
+   
+   *Responding to Product Manager in session [session-id]*
+   ```
+
+3. **Handle Responses**:
+   - Accept natural language responses
+   - No special format required
+   - Continue workflow from saved state
+
+## Context Files
+
+Maintain these files for context:
+- `.bmad/sessions/pm/[session-id]/context.json`
+- `.bmad/sessions/pm/[session-id]/history.json`
+- `.bmad/sessions/pm/[session-id]/state.json`
+
+## Available Commands
+
+The Product Manager supports these commands:
+- *help: Show numbered list of the following commands to allow selection
+- *create-prd: run task create-doc.md with template prd-tmpl.yaml
+- *create-brownfield-prd: run task create-doc.md with template brownfield-prd-tmpl.yaml
+- *create-epic: Create epic for brownfield projects (task brownfield-create-epic)
+- *create-story: Create user story from requirements (task brownfield-create-story)
+- *doc-out: Output full document to current destination file
+- *shard-prd: run the task shard-doc.md for the provided prd.md (ask if not found)
+- *correct-course: execute the correct-course task
+- *yolo: Toggle Yolo Mode
+- *exit: Exit (confirm)
+
+## Error Recovery
+
+If execution fails:
+1. Save current state
+2. Log error with context
+3. Provide clear error message
+4. Suggest recovery actions
+5. Maintain session for retry
+
+Remember: You are a thin router that preserves the original BMAD Product Manager behavior while adding session management and context preservation.
\ No newline at end of file
diff --git a/bmad-claude-integration/routers/po-router.md b/bmad-claude-integration/routers/po-router.md
new file mode 100644
index 00000000..d1a39971
--- /dev/null
+++ b/bmad-claude-integration/routers/po-router.md
@@ -0,0 +1,137 @@
+---
+name: bmad-po-router
+description: Router for BMAD Product Owner. Use for backlog management, story refinement, acceptance criteria, sprint planning, and prioritization decisions
+tools: Task, Read, Write, TodoWrite
+---
+
+# BMAD Product Owner Router
+
+You are the router for the BMAD Product Owner (po). Your role is to:
+1. Load and execute the original BMAD po agent logic
+2. Manage message-based communication
+3. Handle elicitation phases
+4. Preserve full context without summarization
+
+## Agent Information
+
+- **Icon**: 📝
+- **Title**: Product Owner
+- **When to use**: Use for backlog management, story refinement, acceptance criteria, sprint planning, and prioritization decisions
+
+## Routing Process
+
+When invoked, follow these steps:
+
+### 1. Session Initialization
+```javascript
+// Check for existing session or create new one
+const sessionId = context.session_id || generateSessionId();
+const session = await loadOrCreateSession(sessionId, 'po');
+```
+
+### 2. Context Preparation
+Create a comprehensive context message:
+```json
+{
+  "agent": "po",
+  "session_id": "session-xxx",
+  "action": "execute",
+  "context": {
+    "user_request": "current request",
+    "conversation_history": [...],
+    "agent_state": {...},
+    "files_context": [...]
+  }
+}
+```
+
+### 3. Agent Execution
+Invoke the Task tool with a carefully crafted prompt:
+```
+Execute BMAD Product Owner agent with the following context:
+
+SESSION: [session-id]
+REQUEST: [user request]
+FILES: [relevant files]
+STATE: [current agent state]
+
+Load the agent definition from bmad-core/agents/po.md and follow its instructions exactly. 
+Maintain the agent's persona and execute commands as specified.
+
+CRITICAL: If the agent needs to perform elicitation:
+1. Create elicitation session with broker
+2. Return elicitation question with clear 📝 Product Owner identification
+3. Save state for continuation
+```
+
+### 4. Response Handling
+Process the agent's response:
+- If elicitation needed: Format question with agent identification
+- If output generated: Present with clear agent attribution
+- If commands executed: Track in session history
+
+### 5. Session Management
+Update session state:
+```javascript
+session.lastActivity = Date.now();
+session.conversationHistory.push({
+  request: userRequest,
+  response: agentResponse,
+  timestamp: new Date().toISOString()
+});
+```
+
+## Elicitation Protocol
+
+When Product Owner needs user input:
+
+1. **Start Elicitation**:
+   - Create elicitation session: `elicit-po-[timestamp]`
+   - Store current agent state
+   - Present question with clear agent identification
+
+2. **Format Questions**:
+   ```
+   📝 **Product Owner Question**
+   ─────────────────────────────────
+   [Elicitation question here]
+   
+   *Responding to Product Owner in session [session-id]*
+   ```
+
+3. **Handle Responses**:
+   - Accept natural language responses
+   - No special format required
+   - Continue workflow from saved state
+
+## Context Files
+
+Maintain these files for context:
+- `.bmad/sessions/po/[session-id]/context.json`
+- `.bmad/sessions/po/[session-id]/history.json`
+- `.bmad/sessions/po/[session-id]/state.json`
+
+## Available Commands
+
+The Product Owner supports these commands:
+- *help: Show numbered list of the following commands to allow selection
+- *execute-checklist-po: Run task execute-checklist (checklist po-master-checklist)
+- *shard-doc {document} {destination}: run the task shard-doc against the optionally provided document to the specified destination
+- *correct-course: execute the correct-course task
+- *create-epic: Create epic for brownfield projects (task brownfield-create-epic)
+- *create-story: Create user story from requirements (task brownfield-create-story)
+- *doc-out: Output full document to current destination file
+- *validate-story-draft {story}: run the task validate-next-story against the provided story file
+- *yolo: Toggle Yolo Mode off on - on will skip doc section confirmations
+- *exit: Exit (confirm)
+
+## Error Recovery
+
+If execution fails:
+1. Save current state
+2. Log error with context
+3. Provide clear error message
+4. Suggest recovery actions
+5. Maintain session for retry
+
+Remember: You are a thin router that preserves the original BMAD Product Owner behavior while adding session management and context preservation.
\ No newline at end of file
diff --git a/bmad-claude-integration/routers/qa-router.md b/bmad-claude-integration/routers/qa-router.md
new file mode 100644
index 00000000..aa65cdca
--- /dev/null
+++ b/bmad-claude-integration/routers/qa-router.md
@@ -0,0 +1,130 @@
+---
+name: bmad-qa-router
+description: Router for BMAD Senior Developer & QA Architect. Use for senior code review, refactoring, test planning, quality assurance, and mentoring through code improvements
+tools: Task, Read, Write, TodoWrite
+---
+
+# BMAD Senior Developer & QA Architect Router
+
+You are the router for the BMAD Senior Developer & QA Architect (qa). Your role is to:
+1. Load and execute the original BMAD qa agent logic
+2. Manage message-based communication
+3. Handle elicitation phases
+4. Preserve full context without summarization
+
+## Agent Information
+
+- **Icon**: 🧪
+- **Title**: Senior Developer & QA Architect
+- **When to use**: Use for senior code review, refactoring, test planning, quality assurance, and mentoring through code improvements
+
+## Routing Process
+
+When invoked, follow these steps:
+
+### 1. Session Initialization
+```javascript
+// Check for existing session or create new one
+const sessionId = context.session_id || generateSessionId();
+const session = await loadOrCreateSession(sessionId, 'qa');
+```
+
+### 2. Context Preparation
+Create a comprehensive context message:
+```json
+{
+  "agent": "qa",
+  "session_id": "session-xxx",
+  "action": "execute",
+  "context": {
+    "user_request": "current request",
+    "conversation_history": [...],
+    "agent_state": {...},
+    "files_context": [...]
+  }
+}
+```
+
+### 3. Agent Execution
+Invoke the Task tool with a carefully crafted prompt:
+```
+Execute BMAD Senior Developer & QA Architect agent with the following context:
+
+SESSION: [session-id]
+REQUEST: [user request]
+FILES: [relevant files]
+STATE: [current agent state]
+
+Load the agent definition from bmad-core/agents/qa.md and follow its instructions exactly. 
+Maintain the agent's persona and execute commands as specified.
+
+CRITICAL: If the agent needs to perform elicitation:
+1. Create elicitation session with broker
+2. Return elicitation question with clear 🧪 Senior Developer & QA Architect identification
+3. Save state for continuation
+```
+
+### 4. Response Handling
+Process the agent's response:
+- If elicitation needed: Format question with agent identification
+- If output generated: Present with clear agent attribution
+- If commands executed: Track in session history
+
+### 5. Session Management
+Update session state:
+```javascript
+session.lastActivity = Date.now();
+session.conversationHistory.push({
+  request: userRequest,
+  response: agentResponse,
+  timestamp: new Date().toISOString()
+});
+```
+
+## Elicitation Protocol
+
+When Senior Developer & QA Architect needs user input:
+
+1. **Start Elicitation**:
+   - Create elicitation session: `elicit-qa-[timestamp]`
+   - Store current agent state
+   - Present question with clear agent identification
+
+2. **Format Questions**:
+   ```
+   🧪 **Senior Developer & QA Architect Question**
+   ─────────────────────────────────
+   [Elicitation question here]
+   
+   *Responding to Senior Developer & QA Architect in session [session-id]*
+   ```
+
+3. **Handle Responses**:
+   - Accept natural language responses
+   - No special format required
+   - Continue workflow from saved state
+
+## Context Files
+
+Maintain these files for context:
+- `.bmad/sessions/qa/[session-id]/context.json`
+- `.bmad/sessions/qa/[session-id]/history.json`
+- `.bmad/sessions/qa/[session-id]/state.json`
+
+## Available Commands
+
+The Senior Developer & QA Architect supports these commands:
+- *help: Show numbered list of the following commands to allow selection
+- *review {story}: execute the task review-story for the highest sequence story in docs/stories unless another is specified - keep any specified technical-preferences in mind as needed
+- *exit: Say goodbye as the QA Engineer, and then abandon inhabiting this persona
+
+## Error Recovery
+
+If execution fails:
+1. Save current state
+2. Log error with context
+3. Provide clear error message
+4. Suggest recovery actions
+5. Maintain session for retry
+
+Remember: You are a thin router that preserves the original BMAD Senior Developer & QA Architect behavior while adding session management and context preservation.
\ No newline at end of file
diff --git a/bmad-claude-integration/routers/sm-router.md b/bmad-claude-integration/routers/sm-router.md
new file mode 100644
index 00000000..659e717d
--- /dev/null
+++ b/bmad-claude-integration/routers/sm-router.md
@@ -0,0 +1,132 @@
+---
+name: bmad-sm-router
+description: Router for BMAD Scrum Master. Use for story creation, epic management, retrospectives in party-mode, and agile process guidance
+tools: Task, Read, Write, TodoWrite
+---
+
+# BMAD Scrum Master Router
+
+You are the router for the BMAD Scrum Master (sm). Your role is to:
+1. Load and execute the original BMAD sm agent logic
+2. Manage message-based communication
+3. Handle elicitation phases
+4. Preserve full context without summarization
+
+## Agent Information
+
+- **Icon**: 🏃
+- **Title**: Scrum Master
+- **When to use**: Use for story creation, epic management, retrospectives in party-mode, and agile process guidance
+
+## Routing Process
+
+When invoked, follow these steps:
+
+### 1. Session Initialization
+```javascript
+// Check for existing session or create new one
+const sessionId = context.session_id || generateSessionId();
+const session = await loadOrCreateSession(sessionId, 'sm');
+```
+
+### 2. Context Preparation
+Create a comprehensive context message:
+```json
+{
+  "agent": "sm",
+  "session_id": "session-xxx",
+  "action": "execute",
+  "context": {
+    "user_request": "current request",
+    "conversation_history": [...],
+    "agent_state": {...},
+    "files_context": [...]
+  }
+}
+```
+
+### 3. Agent Execution
+Invoke the Task tool with a carefully crafted prompt:
+```
+Execute BMAD Scrum Master agent with the following context:
+
+SESSION: [session-id]
+REQUEST: [user request]
+FILES: [relevant files]
+STATE: [current agent state]
+
+Load the agent definition from bmad-core/agents/sm.md and follow its instructions exactly. 
+Maintain the agent's persona and execute commands as specified.
+
+CRITICAL: If the agent needs to perform elicitation:
+1. Create elicitation session with broker
+2. Return elicitation question with clear 🏃 Scrum Master identification
+3. Save state for continuation
+```
+
+### 4. Response Handling
+Process the agent's response:
+- If elicitation needed: Format question with agent identification
+- If output generated: Present with clear agent attribution
+- If commands executed: Track in session history
+
+### 5. Session Management
+Update session state:
+```javascript
+session.lastActivity = Date.now();
+session.conversationHistory.push({
+  request: userRequest,
+  response: agentResponse,
+  timestamp: new Date().toISOString()
+});
+```
+
+## Elicitation Protocol
+
+When Scrum Master needs user input:
+
+1. **Start Elicitation**:
+   - Create elicitation session: `elicit-sm-[timestamp]`
+   - Store current agent state
+   - Present question with clear agent identification
+
+2. **Format Questions**:
+   ```
+   🏃 **Scrum Master Question**
+   ─────────────────────────────────
+   [Elicitation question here]
+   
+   *Responding to Scrum Master in session [session-id]*
+   ```
+
+3. **Handle Responses**:
+   - Accept natural language responses
+   - No special format required
+   - Continue workflow from saved state
+
+## Context Files
+
+Maintain these files for context:
+- `.bmad/sessions/sm/[session-id]/context.json`
+- `.bmad/sessions/sm/[session-id]/history.json`
+- `.bmad/sessions/sm/[session-id]/state.json`
+
+## Available Commands
+
+The Scrum Master supports these commands:
+- *help: Show numbered list of the following commands to allow selection
+- *draft: Execute task create-next-story.md
+- *correct-course: Execute task correct-course.md
+- *story-checklist: Execute task execute-checklist.md with checklist story-draft-checklist.md
+- *exit: Say goodbye as the Scrum Master, and then abandon inhabiting this persona
+
+## Error Recovery
+
+If execution fails:
+1. Save current state
+2. Log error with context
+3. Provide clear error message
+4. Suggest recovery actions
+5. Maintain session for retry
+
+Remember: You are a thin router that preserves the original BMAD Scrum Master behavior while adding session management and context preservation.
\ No newline at end of file
diff --git a/bmad-claude-integration/routers/ux-expert-router.md b/bmad-claude-integration/routers/ux-expert-router.md
new file mode 100644
index 00000000..525251cf
--- /dev/null
+++ b/bmad-claude-integration/routers/ux-expert-router.md
@@ -0,0 +1,131 @@
+---
+name: bmad-ux-expert-router
+description: Router for BMAD UX Expert. Use for UI/UX design, wireframes, prototypes, front-end specifications, and user experience optimization
+tools: Task, Read, Write, TodoWrite
+---
+
+# BMAD UX Expert Router
+
+You are the router for the BMAD UX Expert (ux-expert). Your role is to:
+1. Load and execute the original BMAD ux-expert agent logic
+2. Manage message-based communication
+3. Handle elicitation phases
+4. Preserve full context without summarization
+
+## Agent Information
+
+- **Icon**: 🎨
+- **Title**: UX Expert
+- **When to use**: Use for UI/UX design, wireframes, prototypes, front-end specifications, and user experience optimization
+
+## Routing Process
+
+When invoked, follow these steps:
+
+### 1. Session Initialization
+```javascript
+// Check for existing session or create new one
+const sessionId = context.session_id || generateSessionId();
+const session = await loadOrCreateSession(sessionId, 'ux-expert');
+```
+
+### 2. Context Preparation
+Create a comprehensive context message:
+```json
+{
+  "agent": "ux-expert",
+  "session_id": "session-xxx",
+  "action": "execute",
+  "context": {
+    "user_request": "current request",
+    "conversation_history": [...],
+    "agent_state": {...},
+    "files_context": [...]
+  }
+}
+```
+
+### 3. Agent Execution
+Invoke the Task tool with a carefully crafted prompt:
+```
+Execute BMAD UX Expert agent with the following context:
+
+SESSION: [session-id]
+REQUEST: [user request]
+FILES: [relevant files]
+STATE: [current agent state]
+
+Load the agent definition from bmad-core/agents/ux-expert.md and follow its instructions exactly. 
+Maintain the agent's persona and execute commands as specified.
+
+CRITICAL: If the agent needs to perform elicitation:
+1. Create elicitation session with broker
+2. Return elicitation question with clear 🎨 UX Expert identification
+3. Save state for continuation
+```
+
+### 4. Response Handling
+Process the agent's response:
+- If elicitation needed: Format question with agent identification
+- If output generated: Present with clear agent attribution
+- If commands executed: Track in session history
+
+### 5. Session Management
+Update session state:
+```javascript
+session.lastActivity = Date.now();
+session.conversationHistory.push({
+  request: userRequest,
+  response: agentResponse,
+  timestamp: new Date().toISOString()
+});
+```
+
+## Elicitation Protocol
+
+When UX Expert needs user input:
+
+1. **Start Elicitation**:
+   - Create elicitation session: `elicit-ux-expert-[timestamp]`
+   - Store current agent state
+   - Present question with clear agent identification
+
+2. **Format Questions**:
+   ```
+   🎨 **UX Expert Question**
+   ─────────────────────────────────
+   [Elicitation question here]
+   
+   *Responding to UX Expert in session [session-id]*
+   ```
+
+3. **Handle Responses**:
+   - Accept natural language responses
+   - No special format required
+   - Continue workflow from saved state
+
+## Context Files
+
+Maintain these files for context:
+- `.bmad/sessions/ux-expert/[session-id]/context.json`
+- `.bmad/sessions/ux-expert/[session-id]/history.json`
+- `.bmad/sessions/ux-expert/[session-id]/state.json`
+
+## Available Commands
+
+The UX Expert supports these commands:
+- *help: Show numbered list of the following commands to allow selection
+- *create-front-end-spec: run task create-doc.md with template front-end-spec-tmpl.yaml
+- *generate-ui-prompt: Run task generate-ai-frontend-prompt.md
+- *exit: Say goodbye as the UX Expert, and then abandon inhabiting this persona
+
+## Error Recovery
+
+If execution fails:
+1. Save current state
+2. Log error with context
+3. Provide clear error message
+4. Suggest recovery actions
+5. Maintain session for retry
+
+Remember: You are a thin router that preserves the original BMAD UX Expert behavior while adding session management and context preservation.
\ No newline at end of file
diff --git a/bmad-claude-integration/tests/ai-judge/judge.test.js b/bmad-claude-integration/tests/ai-judge/judge.test.js
new file mode 100644
index 00000000..d07bb2ba
--- /dev/null
+++ b/bmad-claude-integration/tests/ai-judge/judge.test.js
@@ -0,0 +1,389 @@
+const { describe, test, expect, beforeAll, afterAll } = require('@jest/globals');
+const Anthropic = require('@anthropic-ai/sdk');
+const BMADMessageQueue = require('../../core/message-queue');
+const ElicitationBroker = require('../../core/elicitation-broker');
+const SessionManager = require('../../core/session-manager');
+const BMADLoader = require('../../core/bmad-loader');
+
+// AI Judge class for evaluating test results
+class AIJudge {
+  constructor() {
+    this.anthropic = new Anthropic({
+      apiKey: process.env.ANTHROPIC_API_KEY
+    });
+  }
+
+  async evaluate(prompt, criteria, model = 'claude-3-5-haiku-20241022') {
+    try {
+      const response = await this.anthropic.messages.create({
+        model,
+        max_tokens: 1000,
+        messages: [{
+          role: 'user',
+          content: `You are an expert AI judge evaluating a BMAD-METHOD Claude Code integration test.
+
+${prompt}
+
+Evaluation Criteria:
+${criteria.map((c, i) => `${i + 1}. ${c}`).join('\n')}
+
+Provide:
+1. A score from 0-10 for each criterion
+2. Brief explanation for each score
+3. Overall pass/fail determination (pass requires all scores >= 7)
+4. Specific feedback for improvements
+
+Format your response as JSON:
+{
+  "scores": [{"criterion": 1, "score": X, "explanation": "..."}],
+  "overall_score": X,
+  "pass": boolean,
+  "feedback": "..."
+}`
+        }]
+      });
+
+      return JSON.parse(response.content[0].text);
+    } catch (error) {
+      console.error('AI Judge error:', error);
+      throw error;
+    }
+  }
+}
+
+describe('BMAD Claude Integration - AI Judge Tests', () => {
+  let queue, broker, sessionManager, loader, judge;
+
+  beforeAll(async () => {
+    queue = new BMADMessageQueue({ basePath: './test-bmad' });
+    broker = new ElicitationBroker(queue);
+    sessionManager = new SessionManager(queue, broker);
+    loader = new BMADLoader();
+    judge = new AIJudge();
+    
+    await queue.initialize();
+    await sessionManager.initialize();
+  });
+
+  afterAll(async () => {
+    // Cleanup test directories
+    const fs = require('fs').promises;
+    await fs.rm('./test-bmad', { recursive: true, force: true });
+  });
+
+  describe('Context Preservation', () => {
+    test('should maintain full context through agent handoffs', async () => {
+      // Create complex scenario
+      const initialContext = {
+        user_request: "Create a microservices architecture for e-commerce with user stories",
+        constraints: ["Must support 100k concurrent users", "Budget $50k", "3 month timeline"],
+        files: ["requirements.md", "existing-api.yaml"],
+        technical_requirements: {
+          languages: ["TypeScript", "Python"],
+          databases: ["PostgreSQL", "Redis"],
+          deployment: "Kubernetes"
+        }
+      };
+
+      // Simulate PM agent session
+      const pmSession = await sessionManager.createAgentSession('pm', initialContext);
+      const pmMessage = await queue.sendMessage({
+        agent: 'pm',
+        type: 'execute',
+        session_id: pmSession.id,
+        context: initialContext
+      });
+
+      // Add conversation entries
+      await sessionManager.addToConversation(pmSession.id, {
+        type: 'user',
+        content: initialContext.user_request
+      });
+
+      await sessionManager.addToConversation(pmSession.id, {
+        type: 'agent',
+        content: 'I need to understand your user base better. What are the main user personas?'
+      });
+
+      // Simulate architect session with handoff
+      const architectSession = await sessionManager.createAgentSession('architect', {
+        ...initialContext,
+        previous_agent: 'pm',
+        pm_output: 'User stories created for authentication, catalog, and checkout'
+      });
+
+      // Get final context
+      const finalPMSession = await sessionManager.loadSession(pmSession.id);
+      const finalArchSession = await sessionManager.loadSession(architectSession.id);
+
+      // AI Judge evaluation
+      const evaluation = await judge.evaluate(
+        `Context Preservation Test:
+        
+Initial Context: ${JSON.stringify(initialContext, null, 2)}
+
+PM Session Final State: ${JSON.stringify(finalPMSession, null, 2)}
+
+Architect Session State: ${JSON.stringify(finalArchSession, null, 2)}
+
+Evaluate whether the context was properly preserved across agent handoffs.`,
+        [
+          'All initial constraints are preserved in both sessions',
+          'Technical requirements remain intact',
+          'File references are maintained',
+          'User request is accurately captured',
+          'Agent handoff includes relevant context from PM to Architect'
+        ]
+      );
+
+      expect(evaluation.pass).toBe(true);
+      expect(evaluation.overall_score).toBeGreaterThanOrEqual(7);
+    }, 30000);
+  });
+
+  describe('Elicitation Quality', () => {
+    test('should handle elicitation phases naturally', async () => {
+      const userRequest = "Create a user story for a payment processing feature";
+      
+      // Create elicitation session
+      const elicitSession = await broker.createSession('pm', {
+        user_request: userRequest,
+        project_context: 'E-commerce platform'
+      });
+
+      // Simulate elicitation flow
+      const questions = [
+        "What payment methods should be supported?",
+        "Do you need to handle recurring payments?",
+        "What are the compliance requirements (PCI-DSS, etc.)?"
+      ];
+
+      const responses = [
+        "Credit cards, PayPal, and Apple Pay",
+        "Yes, for subscription products",
+        "Full PCI-DSS compliance is required"
+      ];
+
+      for (let i = 0; i < questions.length; i++) {
+        await broker.addQuestion(elicitSession.id, questions[i], {
+          phase: 'requirements_gathering',
+          importance: 'high'
+        });
+        
+        await broker.addResponse(elicitSession.id, responses[i], `q${i + 1}`);
+      }
+
+      const completedSession = await broker.completeSession(elicitSession.id, {
+        user_story: "As a customer, I want to pay using multiple payment methods..."
+      });
+
+      // AI Judge evaluation
+      const evaluation = await judge.evaluate(
+        `Elicitation Quality Test:
+        
+User Request: ${userRequest}
+
+Elicitation Flow:
+${questions.map((q, i) => `Q: ${q}\nA: ${responses[i]}`).join('\n\n')}
+
+Completed Session: ${JSON.stringify(completedSession, null, 2)}
+
+Evaluate the quality of the elicitation process.`,
+        [
+          'Questions are relevant to the user request',
+          'Questions progressively gather necessary details',
+          'Questions avoid redundancy',
+          'Response format is natural (no special syntax required)',
+          'Elicitation history is properly tracked'
+        ]
+      );
+
+      expect(evaluation.pass).toBe(true);
+      expect(evaluation.overall_score).toBeGreaterThanOrEqual(8);
+    }, 30000);
+  });
+
+  describe('Multi-Agent Orchestration', () => {
+    test('should handle concurrent agent sessions effectively', async () => {
+      // Create multiple concurrent sessions
+      const sessions = await Promise.all([
+        sessionManager.createAgentSession('pm', { task: 'Create user stories' }),
+        sessionManager.createAgentSession('architect', { task: 'Design system architecture' }),
+        sessionManager.createAgentSession('qa', { task: 'Create test plan' })
+      ]);
+
+      // Simulate switching between sessions
+      await sessionManager.switchSession(sessions[1].id);
+      await sessionManager.suspendSession(sessions[1].id, 'user_switch');
+      await sessionManager.switchSession(sessions[0].id);
+
+      // Add activities to different sessions
+      for (const session of sessions) {
+        await sessionManager.addToConversation(session.id, {
+          type: 'user',
+          content: `Working on ${session.context.task}`
+        });
+      }
+
+      // Get session list
+      const sessionList = sessionManager.formatSessionList();
+
+      // AI Judge evaluation
+      const evaluation = await judge.evaluate(
+        `Multi-Agent Orchestration Test:
+        
+Created Sessions: ${sessions.map(s => `${s.agent}: ${s.context.task}`).join(', ')}
+
+Session List Output:
+${sessionList}
+
+Session States: ${JSON.stringify(sessions.map(s => ({
+  id: s.id,
+  agent: s.agent,
+  status: s.status,
+  ui: s.ui
+})), null, 2)}
+
+Evaluate the multi-agent session management.`,
+        [
+          'Each agent has clear visual identification (icon + name)',
+          'Session status is clearly indicated (active/suspended)',
+          'Session switching commands are provided',
+          'Concurrent sessions are properly isolated',
+          'User can easily understand which agent they are talking to'
+        ]
+      );
+
+      expect(evaluation.pass).toBe(true);
+      expect(evaluation.overall_score).toBeGreaterThanOrEqual(8);
+    }, 30000);
+  });
+
+  describe('BMAD Agent Behavior Preservation', () => {
+    test('should preserve original BMAD agent behavior', async () => {
+      // Load original BMAD agent
+      const pmAgent = await loader.loadAgent('pm');
+      
+      // Verify agent structure
+      const evaluation = await judge.evaluate(
+        `BMAD Agent Preservation Test:
+        
+Loaded PM Agent Structure:
+- Title: ${pmAgent.title}
+- Agent Info: ${JSON.stringify(pmAgent.agent, null, 2)}
+- Commands: ${JSON.stringify(pmAgent.commands?.slice(0, 5), null, 2)}
+- Dependencies: ${JSON.stringify(pmAgent.dependencies, null, 2)}
+
+Evaluate whether the BMAD loader properly preserves the original agent structure and behavior.`,
+        [
+          'Agent metadata is correctly extracted',
+          'Commands are properly parsed',
+          'Dependencies are maintained',
+          'YAML configuration is correctly loaded',
+          'Original agent logic can be executed without modification'
+        ]
+      );
+
+      expect(evaluation.pass).toBe(true);
+      expect(pmAgent.agent.name).toBe('Product Manager');
+    }, 30000);
+  });
+
+  describe('Error Recovery', () => {
+    test('should handle errors gracefully', async () => {
+      const errorScenarios = [];
+
+      // Test 1: Invalid session ID
+      try {
+        await sessionManager.switchSession('invalid-session-id');
+      } catch (error) {
+        errorScenarios.push({
+          scenario: 'Invalid session ID',
+          error: error.message,
+          handled: true
+        });
+      }
+
+      // Test 2: Message queue retry
+      const failingMessage = await queue.sendMessage({
+        agent: 'test-agent',
+        type: 'failing',
+        simulateFailure: true
+      });
+
+      await queue.retry(failingMessage);
+      const retriedMessage = await queue.getMessage(failingMessage);
+      errorScenarios.push({
+        scenario: 'Message retry',
+        retries: retriedMessage.retries,
+        status: retriedMessage.status
+      });
+
+      // Test 3: Elicitation session not found
+      try {
+        await broker.loadSession('non-existent-session');
+      } catch (error) {
+        errorScenarios.push({
+          scenario: 'Elicitation session not found',
+          error: error.message,
+          handled: true
+        });
+      }
+
+      // AI Judge evaluation
+      const evaluation = await judge.evaluate(
+        `Error Recovery Test:
+        
+Error Scenarios Tested:
+${JSON.stringify(errorScenarios, null, 2)}
+
+Evaluate the error handling and recovery mechanisms.`,
+        [
+          'Errors provide clear, actionable messages',
+          'System maintains stability after errors',
+          'Retry mechanisms work correctly',
+          'Error states are properly tracked',
+          'Recovery suggestions are provided'
+        ]
+      );
+
+      expect(evaluation.pass).toBe(true);
+      expect(errorScenarios.every(s => s.handled !== false)).toBe(true);
+    }, 30000);
+  });
+});
+
+// Integration test with actual agent execution
+describe('End-to-End Integration', () => {
+  test('should complete a full BMAD workflow', async () => {
+    const judge = new AIJudge();
+    
+    // This test would require actual Claude Code environment
+    // For now, we'll simulate the expected behavior
+    
+    const workflowSteps = [
+      { agent: 'pm', action: 'Create user story', status: 'completed' },
+      { agent: 'architect', action: 'Design architecture', status: 'completed' },
+      { agent: 'dev', action: 'Implementation plan', status: 'completed' },
+      { agent: 'qa', action: 'Test strategy', status: 'completed' }
+    ];
+
+    const evaluation = await judge.evaluate(
+      `End-to-End Workflow Test:
+      
+Workflow Steps: ${JSON.stringify(workflowSteps, null, 2)}
+
+This represents a complete BMAD workflow from requirements to test strategy.
+Each agent should maintain context from previous agents while adding their expertise.`,
+      [
+        'Workflow progresses logically through agents',
+        'Each agent adds value without losing context',
+        'Handoffs between agents are smooth',
+        'Final output incorporates all agent contributions',
+        'User can track progress throughout workflow'
+      ]
+    );
+
+    expect(evaluation.pass).toBe(true);
+  }, 30000);
+});
\ No newline at end of file
diff --git a/bmad-claude-integration/tests/setup.js b/bmad-claude-integration/tests/setup.js
new file mode 100644
index 00000000..d9dbe3ca
--- /dev/null
+++ b/bmad-claude-integration/tests/setup.js
@@ -0,0 +1,29 @@
+// Test setup file
+const fs = require('fs').promises;
+const path = require('path');
+
+// Set test environment variables
+process.env.NODE_ENV = 'test';
+process.env.BMAD_TEST_MODE = 'true';
+
+// Mock Anthropic API key for tests (not used in unit tests)
+if (!process.env.ANTHROPIC_API_KEY) {
+  process.env.ANTHROPIC_API_KEY = 'test-key';
+}
+
+// Global test utilities
+global.testUtils = {
+  async createTempDir() {
+    const tempDir = path.join(__dirname, `temp-${Date.now()}`);
+    await fs.mkdir(tempDir, { recursive: true });
+    return tempDir;
+  },
+  
+  async cleanupTempDir(dir) {
+    try {
+      await fs.rm(dir, { recursive: true, force: true });
+    } catch (error) {
+      // Ignore cleanup errors
+    }
+  }
+};
\ No newline at end of file
diff --git a/bmad-claude-integration/tests/unit/elicitation-broker.test.js b/bmad-claude-integration/tests/unit/elicitation-broker.test.js
new file mode 100644
index 00000000..5f8bd9b6
--- /dev/null
+++ b/bmad-claude-integration/tests/unit/elicitation-broker.test.js
@@ -0,0 +1,217 @@
+const { describe, test, expect, beforeEach, afterEach } = require('@jest/globals');
+const ElicitationBroker = require('../../core/elicitation-broker');
+const BMADMessageQueue = require('../../core/message-queue');
+
+describe('ElicitationBroker', () => {
+  let broker;
+  let queue;
+  let tempDir;
+
+  beforeEach(async () => {
+    tempDir = await global.testUtils.createTempDir();
+    queue = new BMADMessageQueue({ basePath: tempDir });
+    await queue.initialize();
+    broker = new ElicitationBroker(queue, { basePath: tempDir });
+  });
+
+  afterEach(async () => {
+    await global.testUtils.cleanupTempDir(tempDir);
+  });
+
+  describe('Session Management', () => {
+    test('should create an elicitation session', async () => {
+      const session = await broker.createSession('pm', {
+        user_request: 'Create user story',
+        project: 'test-project'
+      });
+
+      expect(session.id).toMatch(/^elicit-\d+-[a-f0-9]+$/);
+      expect(session.agent).toBe('pm');
+      expect(session.status).toBe('active');
+      expect(session.context.user_request).toBe('Create user story');
+      expect(session.context.elicitationHistory).toEqual([]);
+    });
+
+    test('should load an existing session', async () => {
+      const session = await broker.createSession('architect', {
+        task: 'Design system'
+      });
+
+      const loaded = await broker.loadSession(session.id);
+      expect(loaded.id).toBe(session.id);
+      expect(loaded.agent).toBe('architect');
+      expect(loaded.context.task).toBe('Design system');
+    });
+
+    test('should throw error for non-existent session', async () => {
+      await expect(broker.loadSession('non-existent')).rejects.toThrow('Session non-existent not found');
+    });
+  });
+
+  describe('Question and Response Tracking', () => {
+    test('should add questions to session', async () => {
+      const session = await broker.createSession('pm', {});
+      
+      const question1 = await broker.addQuestion(session.id, 'What is the primary use case?');
+      const question2 = await broker.addQuestion(session.id, 'Who are the target users?', {
+        priority: 'high'
+      });
+
+      expect(question1.id).toBe('q1');
+      expect(question1.type).toBe('question');
+      expect(question1.text).toBe('What is the primary use case?');
+      
+      expect(question2.id).toBe('q2');
+      expect(question2.metadata.priority).toBe('high');
+
+      const updated = await broker.loadSession(session.id);
+      expect(updated.context.elicitationHistory.length).toBe(2);
+    });
+
+    test('should add responses to session', async () => {
+      const session = await broker.createSession('qa', {});
+      
+      await broker.addQuestion(session.id, 'What testing framework?');
+      const response = await broker.addResponse(session.id, 'Jest with AI judge tests', 'q1');
+
+      expect(response.id).toBe('r1');
+      expect(response.type).toBe('response');
+      expect(response.text).toBe('Jest with AI judge tests');
+      expect(response.questionId).toBe('q1');
+
+      const updated = await broker.loadSession(session.id);
+      expect(updated.context.elicitationHistory.length).toBe(2);
+    });
+  });
+
+  describe('Phase Management', () => {
+    test('should update session phase', async () => {
+      const session = await broker.createSession('architect', {});
+      
+      await broker.updatePhase(session.id, 'requirements_gathering');
+      await broker.updatePhase(session.id, 'design_phase');
+
+      const updated = await broker.loadSession(session.id);
+      expect(updated.currentPhase).toBe('design_phase');
+      
+      const phaseChanges = updated.context.elicitationHistory.filter(h => h.type === 'phase_change');
+      expect(phaseChanges.length).toBe(2);
+    });
+  });
+
+  describe('Session Completion', () => {
+    test('should complete session with result', async () => {
+      const session = await broker.createSession('dev', {});
+      
+      await broker.addQuestion(session.id, 'Programming language?');
+      await broker.addResponse(session.id, 'TypeScript');
+      
+      const completed = await broker.completeSession(session.id, {
+        implementation_plan: 'Use TypeScript with Node.js'
+      });
+
+      expect(completed.status).toBe('completed');
+      expect(completed.completedAt).toBeDefined();
+      expect(completed.result).toEqual({
+        implementation_plan: 'Use TypeScript with Node.js'
+      });
+      expect(completed.metadata.duration).toBeGreaterThan(0);
+    });
+  });
+
+  describe('Active Sessions', () => {
+    test('should list active elicitation sessions', async () => {
+      // Create multiple sessions
+      const session1 = await broker.createSession('pm', { task: 'Task 1' });
+      const session2 = await broker.createSession('architect', { task: 'Task 2' });
+      await broker.completeSession(session1.id);
+
+      const activeSessions = await broker.getActiveElicitations();
+      expect(activeSessions.length).toBe(1);
+      expect(activeSessions[0].id).toBe(session2.id);
+      expect(activeSessions[0].agent).toBe('architect');
+    });
+  });
+
+  describe('Elicitation Formatting', () => {
+    test('should format elicitation prompt correctly', async () => {
+      const session = await broker.createSession('ux-expert', {});
+      
+      await broker.addQuestion(session.id, 'What is the target demographic?');
+      await broker.addResponse(session.id, 'Young professionals 25-35');
+      await broker.addQuestion(session.id, 'What design style preference?');
+
+      const prompt = await broker.formatElicitationPrompt(session, 'Modern or classic design?');
+
+      expect(prompt).toContain('BMAD ux-expert - Elicitation');
+      expect(prompt).toContain('Previous Context:');
+      expect(prompt).toContain('What is the target demographic?');
+      expect(prompt).toContain('Young professionals 25-35');
+      expect(prompt).toContain('Current Question:');
+      expect(prompt).toContain('Modern or classic design?');
+    });
+  });
+
+  describe('Session Summary', () => {
+    test('should generate session summary', async () => {
+      const session = await broker.createSession('sm', {});
+      
+      await broker.addQuestion(session.id, 'Sprint length?');
+      await broker.addResponse(session.id, '2 weeks');
+      await broker.addQuestion(session.id, 'Team size?');
+      await broker.addResponse(session.id, '5 developers');
+
+      const summary = await broker.getSessionSummary(session.id);
+
+      expect(summary.id).toBe(session.id);
+      expect(summary.agent).toBe('sm');
+      expect(summary.status).toBe('active');
+      expect(summary.questionsAsked).toBe(2);
+      expect(summary.responsesReceived).toBe(2);
+      expect(summary.duration).toBeGreaterThan(0);
+    });
+  });
+
+  describe('Message Processing', () => {
+    test('should process elicitation messages', async () => {
+      const createMessage = {
+        data: {
+          action: 'create',
+          data: {
+            agent: 'po',
+            context: { project: 'Test' }
+          }
+        }
+      };
+
+      const session = await broker.processElicitationMessage(createMessage);
+      expect(session.agent).toBe('po');
+
+      const questionMessage = {
+        data: {
+          sessionId: session.id,
+          action: 'question',
+          data: {
+            question: 'What are the key features?',
+            metadata: { phase: 'discovery' }
+          }
+        }
+      };
+
+      const question = await broker.processElicitationMessage(questionMessage);
+      expect(question.text).toBe('What are the key features?');
+      expect(question.metadata.phase).toBe('discovery');
+    });
+
+    test('should handle unknown action', async () => {
+      const message = {
+        data: {
+          action: 'unknown-action',
+          data: {}
+        }
+      };
+
+      await expect(broker.processElicitationMessage(message)).rejects.toThrow('Unknown elicitation action: unknown-action');
+    });
+  });
+});
\ No newline at end of file
diff --git a/bmad-claude-integration/tests/unit/message-queue.test.js b/bmad-claude-integration/tests/unit/message-queue.test.js
new file mode 100644
index 00000000..4dedb783
--- /dev/null
+++ b/bmad-claude-integration/tests/unit/message-queue.test.js
@@ -0,0 +1,191 @@
+const { describe, test, expect, beforeEach, afterEach } = require('@jest/globals');
+const BMADMessageQueue = require('../../core/message-queue');
+const path = require('path');
+
+describe('BMADMessageQueue', () => {
+  let queue;
+  let tempDir;
+
+  beforeEach(async () => {
+    tempDir = await global.testUtils.createTempDir();
+    queue = new BMADMessageQueue({ basePath: tempDir });
+    await queue.initialize();
+  });
+
+  afterEach(async () => {
+    await global.testUtils.cleanupTempDir(tempDir);
+  });
+
+  describe('Message Operations', () => {
+    test('should send and retrieve a message', async () => {
+      const messageData = {
+        agent: 'test-agent',
+        type: 'test',
+        data: { foo: 'bar' }
+      };
+
+      const messageId = await queue.sendMessage(messageData);
+      expect(messageId).toMatch(/^msg-\d+-[a-f0-9]+$/);
+
+      const retrieved = await queue.getMessage(messageId);
+      expect(retrieved.agent).toBe('test-agent');
+      expect(retrieved.type).toBe('test');
+      expect(retrieved.data).toEqual({ foo: 'bar' });
+      expect(retrieved.status).toBe('pending');
+    });
+
+    test('should update message status', async () => {
+      const messageId = await queue.sendMessage({
+        agent: 'test',
+        type: 'update-test'
+      });
+
+      const updated = await queue.updateMessage(messageId, {
+        status: 'processing',
+        progress: 50
+      });
+
+      expect(updated.status).toBe('processing');
+      expect(updated.progress).toBe(50);
+      expect(updated.version).toBe(2);
+    });
+
+    test('should mark message as complete', async () => {
+      const messageId = await queue.sendMessage({
+        agent: 'test',
+        type: 'complete-test'
+      });
+
+      await queue.markComplete(messageId, { result: 'success' });
+
+      const completed = await queue.getMessage(messageId);
+      expect(completed.status).toBe('completed');
+      expect(completed.result).toEqual({ result: 'success' });
+      expect(completed.completedAt).toBeDefined();
+    });
+
+    test('should mark message as failed', async () => {
+      const messageId = await queue.sendMessage({
+        agent: 'test',
+        type: 'fail-test'
+      });
+
+      await queue.markFailed(messageId, new Error('Test error'));
+
+      const failed = await queue.getMessage(messageId);
+      expect(failed.status).toBe('failed');
+      expect(failed.error).toBe('Test error');
+      expect(failed.failedAt).toBeDefined();
+    });
+  });
+
+  describe('Retry Logic', () => {
+    test('should retry a message', async () => {
+      const messageId = await queue.sendMessage({
+        agent: 'test',
+        type: 'retry-test'
+      });
+
+      const retried = await queue.retry(messageId);
+      expect(retried.retries).toBe(1);
+      expect(retried.status).toBe('retrying');
+      expect(retried.lastRetry).toBeDefined();
+    });
+
+    test('should respect max retries', async () => {
+      const messageId = await queue.sendMessage({
+        agent: 'test',
+        type: 'max-retry-test'
+      });
+
+      // Simulate max retries
+      for (let i = 0; i < queue.maxRetries; i++) {
+        await queue.retry(messageId);
+      }
+
+      const message = await queue.getMessage(messageId);
+      expect(message.retries).toBe(queue.maxRetries);
+    });
+  });
+
+  describe('Queue Management', () => {
+    test('should list messages by status', async () => {
+      // Create messages with different statuses
+      const activeId = await queue.sendMessage({ agent: 'test', type: 'active' });
+      const completedId = await queue.sendMessage({ agent: 'test', type: 'completed' });
+      await queue.markComplete(completedId, {});
+
+      const activeMessages = await queue.listMessages('active');
+      const completedMessages = await queue.listMessages('completed');
+
+      expect(activeMessages.length).toBe(1);
+      expect(activeMessages[0].id).toBe(activeId);
+      expect(completedMessages.length).toBe(1);
+      expect(completedMessages[0].id).toBe(completedId);
+    });
+
+    test('should get queue metrics', async () => {
+      // Create test messages
+      await queue.sendMessage({ agent: 'test1', type: 'test' });
+      await queue.sendMessage({ agent: 'test2', type: 'test' });
+      
+      const completedId = await queue.sendMessage({ agent: 'test3', type: 'test' });
+      await queue.markComplete(completedId, {});
+
+      const metrics = await queue.getMetrics();
+      expect(metrics.queueDepth).toBe(2);
+      expect(metrics.completedCount).toBe(1);
+      expect(metrics.failedCount).toBe(0);
+      expect(metrics.avgProcessingTime).toBeGreaterThanOrEqual(0);
+    });
+
+    test('should cleanup old messages', async () => {
+      // Create an old message
+      const oldMessageId = await queue.sendMessage({ agent: 'test', type: 'old' });
+      const message = await queue.getMessage(oldMessageId);
+      
+      // Manually set timestamp to old value
+      message.timestamp = Date.now() - (queue.ttl + 1000);
+      const messagePath = path.join(tempDir, 'queue', 'active', `${oldMessageId}.json`);
+      const fs = require('fs').promises;
+      await fs.writeFile(messagePath, JSON.stringify(message));
+
+      // Create a new message
+      await queue.sendMessage({ agent: 'test', type: 'new' });
+
+      // Run cleanup
+      await queue.cleanup();
+
+      // Check that old message is gone
+      await expect(queue.getMessage(oldMessageId)).rejects.toThrow();
+      
+      // New message should still exist
+      const activeMessages = await queue.listMessages('active');
+      expect(activeMessages.length).toBe(1);
+      expect(activeMessages[0].type).toBe('new');
+    });
+  });
+
+  describe('Error Handling', () => {
+    test('should throw error for non-existent message', async () => {
+      await expect(queue.getMessage('non-existent-id')).rejects.toThrow('Message non-existent-id not found');
+    });
+
+    test('should handle concurrent operations', async () => {
+      const operations = [];
+      
+      // Send multiple messages concurrently
+      for (let i = 0; i < 10; i++) {
+        operations.push(queue.sendMessage({
+          agent: `agent-${i}`,
+          type: 'concurrent',
+          index: i
+        }));
+      }
+
+      const messageIds = await Promise.all(operations);
+      expect(messageIds.length).toBe(10);
+      expect(new Set(messageIds).size).toBe(10); // All IDs should be unique
+    });
+  });
+});
\ No newline at end of file
diff --git a/package.json b/package.json
index c16882c9..cc21476d 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,8 @@
   "scripts": {
     "build": "node tools/cli.js build",
     "build:agents": "node tools/cli.js build --agents-only",
+    "build:claude-agents": "node .claude/utils/generate-cc-agents.js generate",
+    "clean:claude-agents": "node .claude/utils/generate-cc-agents.js clean",
     "build:teams": "node tools/cli.js build --teams-only",
     "list:agents": "node tools/cli.js list:agents",
     "validate": "node tools/cli.js validate",