claude-mpm 1.0.0__py3-none-any.whl → 1.1.0__py3-none-any.whl

claude_mpm/hooks/claude_hooks/hook_handler.py

@@ -0,0 +1,399 @@
+#!/usr/bin/env python3
+"""Unified hook handler for Claude Code integration.
+
+This script is called by hook_wrapper.sh, which is the shell script
+that gets installed in ~/.claude/settings.json. The wrapper handles
+environment setup and then executes this Python handler.
+"""
+
+import json
+import sys
+import os
+import re
+import logging
+from datetime import datetime
+from pathlib import Path
+
+# Add src to path for imports
+project_root = Path(__file__).parent.parent.parent.parent
+sys.path.insert(0, str(project_root / 'src'))
+
+from claude_mpm.core.logger import get_logger, setup_logging, LogLevel
+
+# Don't initialize global logging here - we'll do it per-project
+logger = None
+
+
+class ClaudeHookHandler:
+    """Handler for all Claude Code hook events."""
+    
+    def __init__(self):
+        self.event = None
+        self.hook_type = None
+        
+        # Available MPM arguments
+        self.mpm_args = {
+            'status': 'Show claude-mpm system status',
+            # Add more arguments here as they're implemented
+            # 'config': 'Configure claude-mpm settings',
+            # 'debug': 'Toggle debug mode',
+        }
+        
+    def handle(self):
+        """Main entry point for hook handling."""
+        global logger
+        try:
+            # Quick debug log to file
+            with open('/tmp/claude-mpm-hook.log', 'a') as f:
+                f.write(f"[{datetime.now().isoformat()}] Hook called\n")
+            
+            # Read event from stdin
+            event_data = sys.stdin.read()
+            self.event = json.loads(event_data)
+            self.hook_type = self.event.get('hook_event_name', 'unknown')
+            
+            # Get the working directory from the event
+            cwd = self.event.get('cwd', os.getcwd())
+            project_dir = Path(cwd)
+            
+            # Initialize project-specific logging
+            log_dir = project_dir / '.claude-mpm' / 'logs'
+            log_dir.mkdir(parents=True, exist_ok=True)
+            
+            # Set up logging for this specific project
+            # Use a single log file per day per project
+            log_level = os.environ.get('CLAUDE_MPM_LOG_LEVEL', 'INFO')
+            log_file = log_dir / f"hooks_{datetime.now().strftime('%Y%m%d')}.log"
+            
+            # Only set up logging if we haven't already for this project
+            logger_name = f"claude_mpm_hooks_{project_dir.name}"
+            if not logging.getLogger(logger_name).handlers:
+                logger = setup_logging(
+                    name=logger_name,
+                    level=log_level,
+                    log_dir=log_dir,
+                    log_file=log_file
+                )
+            else:
+                logger = logging.getLogger(logger_name)
+            
+            # Log more details about the hook type
+            with open('/tmp/claude-mpm-hook.log', 'a') as f:
+                f.write(f"[{datetime.now().isoformat()}] Hook type: {self.hook_type}\n")
+                f.write(f"[{datetime.now().isoformat()}] Project: {project_dir}\n")
+            
+            # Log the prompt if it's UserPromptSubmit
+            if self.hook_type == 'UserPromptSubmit':
+                prompt = self.event.get('prompt', '')
+                with open('/tmp/claude-mpm-hook.log', 'a') as f:
+                    f.write(f"[{datetime.now().isoformat()}] Prompt: {prompt}\n")
+            
+            # Log the event if DEBUG logging is enabled
+            self._log_event()
+            
+            # Route to appropriate handler
+            if self.hook_type == 'UserPromptSubmit':
+                with open('/tmp/claude-mpm-hook.log', 'a') as f:
+                    f.write(f"[{datetime.now().isoformat()}] About to call _handle_user_prompt_submit\n")
+                return self._handle_user_prompt_submit()
+            elif self.hook_type == 'PreToolUse':
+                return self._handle_pre_tool_use()
+            elif self.hook_type == 'PostToolUse':
+                return self._handle_post_tool_use()
+            elif self.hook_type == 'Stop':
+                return self._handle_stop()
+            elif self.hook_type == 'SubagentStop':
+                return self._handle_subagent_stop()
+            else:
+                logger.debug(f"Unknown hook type: {self.hook_type}")
+                return self._continue()
+                
+        except Exception as e:
+            with open('/tmp/claude-mpm-hook.log', 'a') as f:
+                f.write(f"[{datetime.now().isoformat()}] Hook handler error: {e}\n")
+                import traceback
+                f.write(traceback.format_exc())
+            if logger:
+                logger.error(f"Hook handler error: {e}")
+            return self._continue()
+    
+    def _log_event(self):
+        """Log the event details if DEBUG logging is enabled."""
+        global logger
+        if not logger:
+            return
+            
+        # Check if DEBUG logging is enabled
+        # logger.level might be an int or LogLevel enum
+        try:
+            if hasattr(logger.level, 'value'):
+                debug_enabled = logger.level.value <= LogLevel.DEBUG.value
+            else:
+                # It's an int, compare with the DEBUG level value (10)
+                debug_enabled = logger.level <= 10
+        except:
+            # If comparison fails, assume debug is disabled
+            debug_enabled = False
+            
+        # Always log hook events at INFO level so they appear in the logs
+        session_id = self.event.get('session_id', 'unknown')
+        cwd = self.event.get('cwd', 'unknown')
+        
+        logger.info(f"Claude Code hook event: {self.hook_type} (session: {session_id[:8] if session_id != 'unknown' else 'unknown'})")
+        
+        if debug_enabled:
+            logger.debug(f"Event in directory: {cwd}")
+            logger.debug(f"Event data: {json.dumps(self.event, indent=2)}")
+            
+        # Log specific details based on hook type
+        if self.hook_type == 'UserPromptSubmit':
+            prompt = self.event.get('prompt', '')
+            # Don't log full agent system prompts
+            if prompt.startswith('You are Claude Code running in Claude MPM'):
+                logger.info("UserPromptSubmit: System prompt for agent delegation")
+            else:
+                logger.info(f"UserPromptSubmit: {prompt[:100]}..." if len(prompt) > 100 else f"UserPromptSubmit: {prompt}")
+        elif self.hook_type == 'PreToolUse':
+            tool_name = self.event.get('tool_name', '')
+            logger.info(f"PreToolUse: {tool_name}")
+            if debug_enabled:
+                tool_input = self.event.get('tool_input', {})
+                logger.debug(f"Tool input: {json.dumps(tool_input, indent=2)}")
+        elif self.hook_type == 'PostToolUse':
+            tool_name = self.event.get('tool_name', '')
+            exit_code = self.event.get('exit_code', 'N/A')
+            logger.info(f"PostToolUse: {tool_name} (exit code: {exit_code})")
+            if debug_enabled:
+                tool_output = self.event.get('tool_output', '')
+                logger.debug(f"Tool output: {tool_output[:200]}..." if len(str(tool_output)) > 200 else f"Tool output: {tool_output}")
+        elif self.hook_type == 'Stop':
+            reason = self.event.get('reason', 'unknown')
+            timestamp = datetime.now().isoformat()
+            logger.info(f"Stop event: reason={reason} at {timestamp}")
+        elif self.hook_type == 'SubagentStop':
+            agent_type = self.event.get('agent_type', 'unknown')
+            agent_id = self.event.get('agent_id', 'unknown')
+            reason = self.event.get('reason', 'unknown')
+            timestamp = datetime.now().isoformat()
+            logger.info(f"SubagentStop: agent_type={agent_type}, agent_id={agent_id}, reason={reason} at {timestamp}")
+    
+    def _handle_user_prompt_submit(self):
+        """Handle UserPromptSubmit events."""
+        try:
+            prompt = self.event.get('prompt', '').strip()
+            
+            # Debug log
+            with open('/tmp/claude-mpm-hook.log', 'a') as f:
+                f.write(f"[{datetime.now().isoformat()}] UserPromptSubmit - Checking prompt: '{prompt}'\n")
+            
+            # Check if this is the /mpm command
+            if prompt == '/mpm' or prompt.startswith('/mpm '):
+                # Parse arguments
+                parts = prompt.split(maxsplit=1)
+                arg = parts[1] if len(parts) > 1 else ''
+                
+                with open('/tmp/claude-mpm-hook.log', 'a') as f:
+                    f.write(f"[{datetime.now().isoformat()}] MPM command detected, arg: '{arg}'\n")
+                
+                # Route based on argument
+                if arg == 'status' or arg.startswith('status '):
+                    # Extract status args if any
+                    status_args = arg[6:].strip() if arg.startswith('status ') else ''
+                    return self._handle_mpm_status(status_args)
+                else:
+                    # Show help for empty or unknown argument
+                    return self._handle_mpm_help(arg)
+                    
+        except Exception as e:
+            with open('/tmp/claude-mpm-hook.log', 'a') as f:
+                f.write(f"[{datetime.now().isoformat()}] Error in _handle_user_prompt_submit: {e}\n")
+                import traceback
+                f.write(traceback.format_exc())
+        
+        # For now, let everything else pass through
+        return self._continue()
+    
+    def _handle_pre_tool_use(self):
+        """Handle PreToolUse events."""
+        # For now, just log and continue
+        return self._continue()
+    
+    def _handle_post_tool_use(self):
+        """Handle PostToolUse events."""
+        # For now, just log and continue
+        return self._continue()
+    
+    def _handle_stop(self):
+        """Handle Stop events."""
+        # Log the stop event and continue
+        return self._continue()
+    
+    def _handle_subagent_stop(self):
+        """Handle SubagentStop events."""
+        # Log the subagent stop event and continue
+        return self._continue()
+    
+    def _handle_mpm_status(self, args=None):
+        """Handle the /mpm:status command."""
+        # Parse arguments if provided
+        verbose = False
+        if args:
+            verbose = '--verbose' in args or '-v' in args
+        
+        # Gather system information
+        # Handle logger.level which might be int or LogLevel enum
+        if hasattr(logger.level, 'name'):
+            log_level_name = logger.level.name
+        else:
+            # It's an int, map it to name
+            level_map = {
+                0: 'NOTSET',
+                10: 'DEBUG',
+                20: 'INFO',
+                30: 'WARNING',
+                40: 'ERROR',
+                50: 'CRITICAL'
+            }
+            log_level_name = level_map.get(logger.level, f"CUSTOM({logger.level})")
+        
+        status_info = {
+            'claude_mpm_version': self._get_version(),
+            'python_version': sys.version.split()[0],
+            'project_root': str(project_root) if project_root.name != 'src' else str(project_root.parent),
+            'logging_level': log_level_name,
+            'hook_handler': 'claude_mpm.hooks.claude_hooks.hook_handler',
+            'environment': {
+                'CLAUDE_PROJECT_DIR': os.environ.get('CLAUDE_PROJECT_DIR', 'not set'),
+                'PYTHONPATH': os.environ.get('PYTHONPATH', 'not set'),
+            }
+        }
+        
+        # Add verbose information if requested
+        if verbose:
+            status_info['hooks_configured'] = {
+                'UserPromptSubmit': 'Active',
+                'PreToolUse': 'Active',
+                'PostToolUse': 'Active'
+            }
+            status_info['available_arguments'] = list(self.mpm_args.keys())
+        
+        # Format output
+        output = self._format_status_output(status_info, verbose)
+        
+        # Block LLM processing and return our output
+        print(output, file=sys.stderr)
+        sys.exit(2)
+    
+    def _get_version(self):
+        """Get claude-mpm version."""
+        try:
+            # First try to read from VERSION file in project root
+            version_file = project_root.parent / 'VERSION'
+            if not version_file.exists():
+                # Try one more level up
+                version_file = project_root.parent.parent / 'VERSION'
+            
+            if version_file.exists():
+                with open(version_file, 'r') as f:
+                    version = f.read().strip()
+                    # Return just the base version for cleaner display
+                    # e.g., "1.0.2.dev1+g4ecadd4.d20250726" -> "1.0.2.dev1"
+                    if '+' in version:
+                        version = version.split('+')[0]
+                    return version
+        except Exception:
+            pass
+        
+        try:
+            # Fallback to trying import
+            from claude_mpm import __version__
+            return __version__
+        except:
+            pass
+        
+        return 'unknown'
+    
+    def _format_status_output(self, info, verbose=False):
+        """Format status information for display."""
+        # Use same colors as help screen
+        CYAN = '\033[96m'  # Bright cyan
+        GREEN = '\033[92m'  # Green (works in help)
+        BOLD = '\033[1m'
+        RESET = '\033[0m'
+        DIM = '\033[2m'
+        
+        output = f"\n{DIM}{'─' * 60}{RESET}\n"
+        output += f"{CYAN}{BOLD}🔧 Claude MPM Status{RESET}\n"
+        output += f"{DIM}{'─' * 60}{RESET}\n\n"
+        
+        output += f"{GREEN}Version:{RESET} {info['claude_mpm_version']}\n"
+        output += f"{GREEN}Python:{RESET} {info['python_version']}\n"
+        output += f"{GREEN}Project Root:{RESET} {info['project_root']}\n"  
+        output += f"{GREEN}Logging Level:{RESET} {info['logging_level']}\n"
+        output += f"{GREEN}Hook Handler:{RESET} {info['hook_handler']}\n"
+        
+        output += f"\n{CYAN}{BOLD}Environment:{RESET}\n"
+        for key, value in info['environment'].items():
+            output += f"{GREEN}  {key}: {value}{RESET}\n"
+        
+        if verbose:
+            output += f"\n{CYAN}{BOLD}Hooks Configured:{RESET}\n"
+            for hook, status in info.get('hooks_configured', {}).items():
+                output += f"{GREEN}  {hook}: {status}{RESET}\n"
+            
+            output += f"\n{CYAN}{BOLD}Available Arguments:{RESET}\n"
+            for arg in info.get('available_arguments', []):
+                output += f"{GREEN}  /mpm {arg}{RESET}\n"
+        
+        output += f"\n{DIM}{'─' * 60}{RESET}"
+        
+        return output
+    
+    def _handle_mpm_help(self, unknown_arg=None):
+        """Show help for MPM commands."""
+        # ANSI colors
+        CYAN = '\033[96m'
+        RED = '\033[91m'
+        GREEN = '\033[92m'
+        DIM = '\033[2m'
+        RESET = '\033[0m'
+        BOLD = '\033[1m'
+        
+        output = f"\n{DIM}{'─' * 60}{RESET}\n"
+        output += f"{CYAN}{BOLD}🔧 Claude MPM Management{RESET}\n"
+        output += f"{DIM}{'─' * 60}{RESET}\n\n"
+        
+        if unknown_arg:
+            output += f"{RED}Unknown argument: {unknown_arg}{RESET}\n\n"
+        
+        output += f"{GREEN}Usage:{RESET} /mpm [argument]\n\n"
+        output += f"{GREEN}Available arguments:{RESET}\n"
+        for arg, desc in self.mpm_args.items():
+            output += f"  {arg:<12} - {desc}\n"
+        
+        output += f"\n{GREEN}Examples:{RESET}\n"
+        output += f"  /mpm         - Show this help\n"
+        output += f"  /mpm status  - Show system status\n"
+        output += f"  /mpm status --verbose - Show detailed status\n"
+        
+        output += f"\n{DIM}{'─' * 60}{RESET}"
+        
+        # Block LLM processing and return our output
+        print(output, file=sys.stderr)
+        sys.exit(2)
+    
+    def _continue(self):
+        """Return continue response to let prompt pass through."""
+        response = {"action": "continue"}
+        print(json.dumps(response))
+        sys.exit(0)
+
+
+def main():
+    """Main entry point."""
+    handler = ClaudeHookHandler()
+    handler.handle()
+
+
+if __name__ == "__main__":
+    main()

claude_mpm/hooks/claude_hooks/hook_wrapper.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+# Claude Code hook wrapper for claude-mpm
+
+# Debug log (optional - comment out in production)
+# echo "[$(date -u +%Y-%m-%dT%H:%M:%S.%3NZ)] Wrapper called with args: $@" >> /tmp/hook-wrapper.log
+
+# Get the directory where this script is located
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# Detect if we're in a development environment or installed package
+if [ -d "$SCRIPT_DIR/../../../../venv" ]; then
+    # Development environment - script is in src/claude_mpm/hooks/claude_hooks/
+    PROJECT_ROOT="$( cd "$SCRIPT_DIR/../../../.." && pwd )"
+    PYTHON_CMD="python"
+    
+    # Activate the virtual environment if it exists
+    if [ -f "$PROJECT_ROOT/venv/bin/activate" ]; then
+        source "$PROJECT_ROOT/venv/bin/activate"
+    fi
+    
+    # Set PYTHONPATH for development
+    export PYTHONPATH="$PROJECT_ROOT/src:$PYTHONPATH"
+else
+    # Installed package - use system Python and installed claude_mpm
+    PYTHON_CMD="python3"
+    
+    # Try to detect if we're in a virtual environment
+    if [ -n "$VIRTUAL_ENV" ]; then
+        PYTHON_CMD="$VIRTUAL_ENV/bin/python"
+    elif command -v python3 &> /dev/null; then
+        PYTHON_CMD="python3"
+    elif command -v python &> /dev/null; then
+        PYTHON_CMD="python"
+    fi
+fi
+
+# Check if we should use DEBUG logging
+if [[ " $* " =~ " --logging DEBUG " ]] || [[ " $* " =~ " --debug " ]]; then
+    export CLAUDE_MPM_LOG_LEVEL="DEBUG"
+fi
+
+# Debug log (optional)
+# echo "[$(date -u +%Y-%m-%dT%H:%M:%S.%3NZ)] PYTHONPATH: $PYTHONPATH" >> /tmp/hook-wrapper.log
+# echo "[$(date -u +%Y-%m-%dT%H:%M:%S.%3NZ)] Running: $PYTHON_CMD $SCRIPT_DIR/hook_handler.py" >> /tmp/hook-wrapper.log
+
+# Run the Python hook handler
+exec "$PYTHON_CMD" "$SCRIPT_DIR/hook_handler.py" "$@"

claude_mpm/hooks/validation_hooks.py

@@ -0,0 +1,181 @@
+"""
+Validation hooks for claude-mpm operations.
+
+Inspired by awesome-claude-code's pre-push validation approach.
+"""
+
+import logging
+from typing import Dict, Any, List, Optional, Callable
+from pathlib import Path
+import yaml
+
+from claude_mpm.validation import AgentValidator, ValidationResult
+
+logger = logging.getLogger(__name__)
+
+
+class ValidationHooks:
+    """Manages validation hooks for various operations."""
+    
+    def __init__(self):
+        """Initialize validation hooks."""
+        self.pre_load_hooks: List[Callable] = []
+        self.post_load_hooks: List[Callable] = []
+        self.pre_execute_hooks: List[Callable] = []
+        self.validator = AgentValidator()
+    
+    def register_pre_load_hook(self, hook: Callable) -> None:
+        """Register a hook to run before loading an agent."""
+        self.pre_load_hooks.append(hook)
+    
+    def register_post_load_hook(self, hook: Callable) -> None:
+        """Register a hook to run after loading an agent."""
+        self.post_load_hooks.append(hook)
+    
+    def register_pre_execute_hook(self, hook: Callable) -> None:
+        """Register a hook to run before executing an agent."""
+        self.pre_execute_hooks.append(hook)
+    
+    async def run_pre_load_validation(self, profile_path: Path) -> ValidationResult:
+        """Run validation before loading an agent profile."""
+        logger.info(f"Running pre-load validation for {profile_path}")
+        
+        # Run basic file validation
+        if not profile_path.exists():
+            result = ValidationResult(is_valid=False)
+            result.errors.append(f"Profile file not found: {profile_path}")
+            return result
+        
+        # Validate profile structure
+        result = self.validator.validate_profile(profile_path)
+        
+        # Run custom pre-load hooks
+        for hook in self.pre_load_hooks:
+            try:
+                hook_result = await hook(profile_path)
+                if hasattr(hook_result, 'errors'):
+                    result.errors.extend(hook_result.errors)
+                    if hook_result.errors:
+                        result.is_valid = False
+            except Exception as e:
+                logger.error(f"Pre-load hook failed: {e}")
+                result.warnings.append(f"Pre-load hook failed: {str(e)}")
+        
+        return result
+    
+    async def run_post_load_validation(self, agent_config: Dict[str, Any]) -> ValidationResult:
+        """Run validation after loading an agent."""
+        result = ValidationResult(is_valid=True)
+        
+        # Run custom post-load hooks
+        for hook in self.post_load_hooks:
+            try:
+                hook_result = await hook(agent_config)
+                if hasattr(hook_result, 'warnings'):
+                    result.warnings.extend(hook_result.warnings)
+            except Exception as e:
+                logger.error(f"Post-load hook failed: {e}")
+                result.warnings.append(f"Post-load hook failed: {str(e)}")
+        
+        return result
+    
+    async def run_pre_execute_validation(self, agent_name: str, task: str) -> ValidationResult:
+        """Run validation before executing an agent task."""
+        result = ValidationResult(is_valid=True)
+        
+        # Validate task format
+        if not task or not task.strip():
+            result.errors.append("Task cannot be empty")
+            result.is_valid = False
+        
+        # Check task length
+        if len(task) > 10000:
+            result.warnings.append("Task is very long, consider breaking it down")
+        
+        # Run custom pre-execute hooks
+        for hook in self.pre_execute_hooks:
+            try:
+                hook_result = await hook(agent_name, task)
+                if hasattr(hook_result, 'errors') and hook_result.errors:
+                    result.errors.extend(hook_result.errors)
+                    result.is_valid = False
+            except Exception as e:
+                logger.error(f"Pre-execute hook failed: {e}")
+                result.warnings.append(f"Pre-execute hook failed: {str(e)}")
+        
+        return result
+
+
+# Built-in validation hooks
+async def validate_agent_dependencies(profile_path: Path) -> ValidationResult:
+    """Validate that agent dependencies are available."""
+    result = ValidationResult(is_valid=True)
+    
+    try:
+        with open(profile_path, 'r') as f:
+            profile_data = yaml.safe_load(f)
+        
+        # Check for circular dependencies
+        agents = profile_data.get('agents', [])
+        for agent in agents:
+            dependencies = agent.get('dependencies', [])
+            # Simple check - in real implementation would need graph analysis
+            if agent['name'] in dependencies:
+                result.errors.append(f"Agent '{agent['name']}' has circular dependency")
+                result.is_valid = False
+    
+    except Exception as e:
+        result.warnings.append(f"Could not check dependencies: {e}")
+    
+    return result
+
+
+async def validate_security_constraints(agent_name: str, task: str) -> ValidationResult:
+    """Validate security constraints before execution."""
+    result = ValidationResult(is_valid=True)
+    
+    # Check for potential security issues in task
+    dangerous_patterns = [
+        'rm -rf /',
+        'sudo rm',
+        'format c:',
+        '__import__',
+        'eval(',
+        'exec(',
+    ]
+    
+    task_lower = task.lower()
+    for pattern in dangerous_patterns:
+        if pattern in task_lower:
+            result.errors.append(f"Potentially dangerous pattern detected: {pattern}")
+            result.is_valid = False
+    
+    return result
+
+
+class ValidationError(Exception):
+    """Raised when validation fails."""
+    
+    def __init__(self, message: str, validation_result: Optional[ValidationResult] = None):
+        """Initialize validation error."""
+        super().__init__(message)
+        self.validation_result = validation_result
+    
+    def get_detailed_message(self) -> str:
+        """Get detailed error message including validation results."""
+        if not self.validation_result:
+            return str(self)
+        
+        lines = [str(self)]
+        
+        if self.validation_result.errors:
+            lines.append("\nErrors:")
+            for error in self.validation_result.errors:
+                lines.append(f"  - {error}")
+        
+        if self.validation_result.warnings:
+            lines.append("\nWarnings:")
+            for warning in self.validation_result.warnings:
+                lines.append(f"  - {warning}")
+        
+        return '\n'.join(lines)

claude_mpm/services/agent_management_service.py

@@ -40,15 +40,15 @@ class AgentManager:
         Initialize AgentManager.
         
         Args:
-            framework_dir: Path to framework agent-roles directory
+            framework_dir: Path to agents templates directory
             project_dir: Path to project-specific agents directory
         """
         # Use PathResolver for consistent path discovery
         if framework_dir is None:
             try:
-                framework_root = PathResolver.get_framework_root()
-                self.framework_dir = framework_root / "framework" / "agent-roles"
-            except FileNotFoundError:
+                # Use agents templates directory
+                self.framework_dir = Path(__file__).parent.parent / "agents" / "templates"
+            except Exception:
                 # Fallback to agents directory
                 self.framework_dir = PathResolver.get_agents_dir()
         else:

claude_mpm/services/agent_profile_loader.py

@@ -118,7 +118,7 @@ class AgentProfileLoader(BaseService):
         self.tier_paths = {
             ProfileTier.PROJECT: self.working_directory / 'agents',
             ProfileTier.USER: self.user_home / '.claude-pm' / 'agents',
-            ProfileTier.SYSTEM: self.framework_path / 'agent-roles' if self.framework_path else None
+            ProfileTier.SYSTEM: Path(__file__).parent.parent / 'agents' / 'templates'
         }
         
         # Remove None values

claude_mpm/services/agent_registry.py

@@ -155,7 +155,6 @@ class AgentRegistry:
         # System-level agents - multiple possible locations
         system_paths = [
             Path(__file__).parent.parent / 'agents' / 'templates',
-            Path(__file__).parent.parent / 'framework' / 'agent-roles',
             Path('/opt/claude-pm/agents'),
             Path('/usr/local/claude-pm/agents')
         ]

claude_mpm/services/base_agent_manager.py

@@ -64,10 +64,10 @@ class BaseAgentStructure:
 class BaseAgentManager:
     """Manages base_agent.md with structured updates and validation."""
     
-    def __init__(self, framework_dir: Optional[Path] = None):
+    def __init__(self, agents_dir: Optional[Path] = None):
         """Initialize BaseAgentManager."""
-        self.framework_dir = framework_dir or Path(__file__).parent.parent.parent / "framework" / "agent-roles"
-        self.base_agent_path = self.framework_dir / "base_agent.md"
+        self.agents_dir = agents_dir or Path(__file__).parent.parent / "agents"
+        self.base_agent_path = self.agents_dir / "BASE_AGENT_TEMPLATE.md"
         self.cache = SharedPromptCache.get_instance()
         
     def read_base_agent(self) -> Optional[BaseAgentStructure]: