claude-mpm 4.1.1__py3-none-any.whl → 4.1.2__py3-none-any.whl

claude_mpm/services/agents/deployment/multi_source_deployment_service.py

@@ -12,7 +12,6 @@ Key Features:
 """
 
 import json
-import logging
 import os
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
@@ -26,112 +25,114 @@ from .agent_version_manager import AgentVersionManager
 
 class MultiSourceAgentDeploymentService:
     """Service for deploying agents from multiple sources with version comparison.
-    
+
     This service ensures that the highest version of each agent is deployed,
     regardless of whether it comes from system templates, project agents, or
     user agents.
-    
+
     WHY: The current system processes agents from a single source at a time,
     which can result in lower version agents being deployed if they exist in
     a higher priority source. This service fixes that by comparing versions
     across all sources.
     """
-    
+
     def __init__(self):
         """Initialize the multi-source deployment service."""
         self.logger = get_logger(__name__)
         self.version_manager = AgentVersionManager()
-        
+
     def discover_agents_from_all_sources(
-        self, 
+        self,
         system_templates_dir: Optional[Path] = None,
         project_agents_dir: Optional[Path] = None,
         user_agents_dir: Optional[Path] = None,
-        working_directory: Optional[Path] = None
+        working_directory: Optional[Path] = None,
     ) -> Dict[str, List[Dict[str, Any]]]:
         """Discover agents from all available sources.
-        
+
         Args:
             system_templates_dir: Directory containing system agent templates
             project_agents_dir: Directory containing project-specific agents
             user_agents_dir: Directory containing user custom agents
             working_directory: Current working directory for finding project agents
-            
+
         Returns:
             Dictionary mapping agent names to list of agent info from different sources
         """
         agents_by_name = {}
-        
+
         # Determine directories if not provided
         if not system_templates_dir:
             # Use default system templates location
             from claude_mpm.config.paths import paths
+
             system_templates_dir = paths.agents_dir / "templates"
-            
+
         if not project_agents_dir and working_directory:
             # Check for project agents in working directory
             project_agents_dir = working_directory / ".claude-mpm" / "agents"
             if not project_agents_dir.exists():
                 project_agents_dir = None
-                
+
         if not user_agents_dir:
             # Check for user agents in home directory
             user_agents_dir = Path.home() / ".claude-mpm" / "agents"
             if not user_agents_dir.exists():
                 user_agents_dir = None
-        
+
         # Discover agents from each source
         sources = [
             ("system", system_templates_dir),
             ("project", project_agents_dir),
-            ("user", user_agents_dir)
+            ("user", user_agents_dir),
         ]
-        
+
         for source_name, source_dir in sources:
             if source_dir and source_dir.exists():
-                self.logger.debug(f"Discovering agents from {source_name} source: {source_dir}")
+                self.logger.debug(
+                    f"Discovering agents from {source_name} source: {source_dir}"
+                )
                 discovery_service = AgentDiscoveryService(source_dir)
                 agents = discovery_service.list_available_agents()
-                
+
                 for agent_info in agents:
                     agent_name = agent_info.get("name")
                     if not agent_name:
                         continue
-                        
+
                     # Add source information
                     agent_info["source"] = source_name
                     agent_info["source_dir"] = str(source_dir)
-                    
+
                     # Initialize list if this is the first occurrence of this agent
                     if agent_name not in agents_by_name:
                         agents_by_name[agent_name] = []
-                        
+
                     agents_by_name[agent_name].append(agent_info)
-                    
+
                 self.logger.info(
                     f"Discovered {len(agents)} agents from {source_name} source"
                 )
-        
+
         return agents_by_name
-    
+
     def select_highest_version_agents(
-        self, 
-        agents_by_name: Dict[str, List[Dict[str, Any]]]
+        self, agents_by_name: Dict[str, List[Dict[str, Any]]]
     ) -> Dict[str, Dict[str, Any]]:
         """Select the highest version agent from multiple sources.
-        
+
         Args:
             agents_by_name: Dictionary mapping agent names to list of agent info
-            
+
         Returns:
             Dictionary mapping agent names to the highest version agent info
         """
         selected_agents = {}
-        
+
         for agent_name, agent_versions in agents_by_name.items():
             if not agent_versions:
                 continue
-                
+
             # If only one version exists, use it
             if len(agent_versions) == 1:
                 selected_agents[agent_name] = agent_versions[0]
@@ -139,51 +140,61 @@ class MultiSourceAgentDeploymentService:
                     f"Agent '{agent_name}' has single source: {agent_versions[0]['source']}"
                 )
                 continue
-            
+
             # Compare versions to find the highest
             highest_version_agent = None
             highest_version_tuple = (0, 0, 0)
-            
+
             for agent_info in agent_versions:
                 version_str = agent_info.get("version", "0.0.0")
                 version_tuple = self.version_manager.parse_version(version_str)
-                
+
                 self.logger.debug(
                     f"Agent '{agent_name}' from {agent_info['source']}: "
                     f"version {version_str} -> {version_tuple}"
                 )
-                
+
                 # Compare with current highest
-                if self.version_manager.compare_versions(version_tuple, highest_version_tuple) > 0:
+                if (
+                    self.version_manager.compare_versions(
+                        version_tuple, highest_version_tuple
+                    )
+                    > 0
+                ):
                     highest_version_agent = agent_info
                     highest_version_tuple = version_tuple
-            
+
             if highest_version_agent:
                 selected_agents[agent_name] = highest_version_agent
                 self.logger.info(
                     f"Selected agent '{agent_name}' version {highest_version_agent['version']} "
                     f"from {highest_version_agent['source']} source"
                 )
-                
+
                 # Log if a higher priority source was overridden by version
                 for other_agent in agent_versions:
                     if other_agent != highest_version_agent:
-                        other_version = self.version_manager.parse_version(
+                        self.version_manager.parse_version(
                             other_agent.get("version", "0.0.0")
                         )
-                        if other_agent["source"] == "project" and highest_version_agent["source"] == "system":
+                        if (
+                            other_agent["source"] == "project"
+                            and highest_version_agent["source"] == "system"
+                        ):
                             self.logger.warning(
                                 f"Project agent '{agent_name}' v{other_agent['version']} "
                                 f"overridden by higher system version v{highest_version_agent['version']}"
                             )
-                        elif other_agent["source"] == "user" and highest_version_agent["source"] in ["system", "project"]:
+                        elif other_agent["source"] == "user" and highest_version_agent[
+                            "source"
+                        ] in ["system", "project"]:
                             self.logger.warning(
                                 f"User agent '{agent_name}' v{other_agent['version']} "
                                 f"overridden by higher {highest_version_agent['source']} version v{highest_version_agent['version']}"
                             )
-        
+
         return selected_agents
-    
+
     def get_agents_for_deployment(
         self,
         system_templates_dir: Optional[Path] = None,
@@ -192,10 +203,10 @@ class MultiSourceAgentDeploymentService:
         working_directory: Optional[Path] = None,
         excluded_agents: Optional[List[str]] = None,
         config: Optional[Config] = None,
-        cleanup_outdated: bool = True
+        cleanup_outdated: bool = True,
     ) -> Tuple[Dict[str, Path], Dict[str, str], Dict[str, Any]]:
         """Get the highest version agents from all sources for deployment.
-        
+
         Args:
             system_templates_dir: Directory containing system agent templates
             project_agents_dir: Directory containing project-specific agents
@@ -204,7 +215,7 @@ class MultiSourceAgentDeploymentService:
             excluded_agents: List of agent names to exclude from deployment
             config: Configuration object for additional filtering
             cleanup_outdated: Whether to cleanup outdated user agents (default: True)
-            
+
         Returns:
             Tuple of:
             - Dictionary mapping agent names to template file paths
@@ -216,48 +227,52 @@ class MultiSourceAgentDeploymentService:
             system_templates_dir=system_templates_dir,
             project_agents_dir=project_agents_dir,
             user_agents_dir=user_agents_dir,
-            working_directory=working_directory
+            working_directory=working_directory,
         )
-        
+
         # Select highest version for each agent
         selected_agents = self.select_highest_version_agents(agents_by_name)
-        
+
         # Clean up outdated user agents if enabled
         cleanup_results = {"removed": [], "preserved": [], "errors": []}
         if cleanup_outdated:
             # Check if cleanup is enabled in config or environment
             cleanup_enabled = True
-            
+
             # Check environment variable first (for CI/CD and testing)
             env_cleanup = os.environ.get("CLAUDE_MPM_CLEANUP_USER_AGENTS", "").lower()
             if env_cleanup in ["false", "0", "no", "disabled"]:
                 cleanup_enabled = False
-                self.logger.debug("User agent cleanup disabled via environment variable")
-            
+                self.logger.debug(
+                    "User agent cleanup disabled via environment variable"
+                )
+
             # Check config if environment doesn't disable it
             if cleanup_enabled and config:
-                cleanup_enabled = config.get("agent_deployment.cleanup_outdated_user_agents", True)
-            
+                cleanup_enabled = config.get(
+                    "agent_deployment.cleanup_outdated_user_agents", True
+                )
+
             if cleanup_enabled:
                 cleanup_results = self.cleanup_outdated_user_agents(
                     agents_by_name, selected_agents
                 )
-        
+
         # Apply exclusion filters
         if excluded_agents:
             for agent_name in excluded_agents:
                 if agent_name in selected_agents:
                     self.logger.info(f"Excluding agent '{agent_name}' from deployment")
                     del selected_agents[agent_name]
-        
+
         # Apply config-based filtering if provided
         if config:
             selected_agents = self._apply_config_filters(selected_agents, config)
-        
+
         # Create deployment mappings
         agents_to_deploy = {}
         agent_sources = {}
-        
+
         for agent_name, agent_info in selected_agents.items():
             template_path = Path(agent_info["path"])
             if template_path.exists():
@@ -265,7 +280,7 @@ class MultiSourceAgentDeploymentService:
                 file_stem = template_path.stem
                 agents_to_deploy[file_stem] = template_path
                 agent_sources[file_stem] = agent_info["source"]
-                
+
                 # Also keep the display name mapping for logging
                 if file_stem != agent_name:
                     self.logger.debug(f"Mapping '{agent_name}' -> '{file_stem}'")
@@ -273,93 +288,92 @@ class MultiSourceAgentDeploymentService:
                 self.logger.warning(
                     f"Template file not found for agent '{agent_name}': {template_path}"
                 )
-        
+
         self.logger.info(
             f"Selected {len(agents_to_deploy)} agents for deployment "
             f"(system: {sum(1 for s in agent_sources.values() if s == 'system')}, "
             f"project: {sum(1 for s in agent_sources.values() if s == 'project')}, "
             f"user: {sum(1 for s in agent_sources.values() if s == 'user')})"
         )
-        
+
         return agents_to_deploy, agent_sources, cleanup_results
-    
+
     def cleanup_outdated_user_agents(
         self,
         agents_by_name: Dict[str, List[Dict[str, Any]]],
-        selected_agents: Dict[str, Dict[str, Any]]
+        selected_agents: Dict[str, Dict[str, Any]],
     ) -> Dict[str, Any]:
         """Remove outdated user agents when project or system agents have higher versions.
-        
+
         WHY: When project agents are updated to newer versions, outdated user agent
         copies should be removed to prevent confusion and ensure the latest version
         is always used. User agents with same or higher versions are preserved to
         respect user customizations.
-        
+
         Args:
             agents_by_name: Dictionary mapping agent names to list of agent info from different sources
             selected_agents: Dictionary mapping agent names to the selected highest version agent
-            
+
         Returns:
             Dictionary with cleanup results:
             - removed: List of removed agent info
             - preserved: List of preserved agent info with reasons
             - errors: List of errors during cleanup
         """
-        cleanup_results = {
-            "removed": [],
-            "preserved": [],
-            "errors": []
-        }
-        
+        cleanup_results = {"removed": [], "preserved": [], "errors": []}
+
         # Get user agents directory
         user_agents_dir = Path.home() / ".claude-mpm" / "agents"
-        
+
         # Safety check - only operate on user agents directory
         if not user_agents_dir.exists():
             self.logger.debug("User agents directory does not exist, no cleanup needed")
             return cleanup_results
-        
+
         for agent_name, agent_versions in agents_by_name.items():
             # Skip if only one version exists
             if len(agent_versions) < 2:
                 continue
-                
+
             selected = selected_agents.get(agent_name)
             if not selected:
                 continue
-            
+
             # Process each version of this agent
             for agent_info in agent_versions:
                 # Only consider user agents for cleanup
                 if agent_info["source"] != "user":
                     continue
-                
+
                 # Safety check - ensure path is within user agents directory
                 user_agent_path = Path(agent_info["path"])
                 try:
                     # Resolve paths to compare them safely
                     resolved_user_path = user_agent_path.resolve()
                     resolved_user_agents_dir = user_agents_dir.resolve()
-                    
+
                     # Verify the agent is actually in the user agents directory
-                    if not str(resolved_user_path).startswith(str(resolved_user_agents_dir)):
+                    if not str(resolved_user_path).startswith(
+                        str(resolved_user_agents_dir)
+                    ):
                         self.logger.warning(
                             f"Skipping cleanup for {agent_name}: path {user_agent_path} "
                             f"is not within user agents directory"
                         )
-                        cleanup_results["errors"].append({
-                            "agent": agent_name,
-                            "error": "Path outside user agents directory"
-                        })
+                        cleanup_results["errors"].append(
+                            {
+                                "agent": agent_name,
+                                "error": "Path outside user agents directory",
+                            }
+                        )
                         continue
                 except Exception as e:
                     self.logger.error(f"Error resolving paths for {agent_name}: {e}")
-                    cleanup_results["errors"].append({
-                        "agent": agent_name,
-                        "error": f"Path resolution error: {e}"
-                    })
+                    cleanup_results["errors"].append(
+                        {"agent": agent_name, "error": f"Path resolution error: {e}"}
+                    )
                     continue
-                
+
                 # Compare versions
                 user_version = self.version_manager.parse_version(
                     agent_info.get("version", "0.0.0")
@@ -367,13 +381,16 @@ class MultiSourceAgentDeploymentService:
                 selected_version = self.version_manager.parse_version(
                     selected.get("version", "0.0.0")
                 )
-                
+
                 version_comparison = self.version_manager.compare_versions(
                     user_version, selected_version
                 )
-                
+
                 # Determine action based on version comparison and selected source
-                if version_comparison < 0 and selected["source"] in ["project", "system"]:
+                if version_comparison < 0 and selected["source"] in [
+                    "project",
+                    "system",
+                ]:
                     # User agent has lower version than selected project/system agent - remove it
                     if user_agent_path.exists():
                         try:
@@ -384,30 +401,32 @@ class MultiSourceAgentDeploymentService:
                                 f"(superseded by {selected['source']} "
                                 f"v{self.version_manager.format_version_display(selected_version)})"
                             )
-                            
+
                             # Remove the file
                             user_agent_path.unlink()
-                            
-                            cleanup_results["removed"].append({
-                                "name": agent_name,
-                                "version": self.version_manager.format_version_display(user_version),
-                                "path": str(user_agent_path),
-                                "reason": f"Superseded by {selected['source']} v{self.version_manager.format_version_display(selected_version)}"
-                            })
+
+                            cleanup_results["removed"].append(
+                                {
+                                    "name": agent_name,
+                                    "version": self.version_manager.format_version_display(
+                                        user_version
+                                    ),
+                                    "path": str(user_agent_path),
+                                    "reason": f"Superseded by {selected['source']} v{self.version_manager.format_version_display(selected_version)}",
+                                }
+                            )
                         except PermissionError as e:
                             error_msg = f"Permission denied removing {agent_name}: {e}"
                             self.logger.error(error_msg)
-                            cleanup_results["errors"].append({
-                                "agent": agent_name,
-                                "error": error_msg
-                            })
+                            cleanup_results["errors"].append(
+                                {"agent": agent_name, "error": error_msg}
+                            )
                         except Exception as e:
                             error_msg = f"Error removing {agent_name}: {e}"
                             self.logger.error(error_msg)
-                            cleanup_results["errors"].append({
-                                "agent": agent_name,
-                                "error": error_msg
-                            })
+                            cleanup_results["errors"].append(
+                                {"agent": agent_name, "error": error_msg}
+                            )
                 else:
                     # Preserve the user agent
                     if version_comparison >= 0:
@@ -416,18 +435,22 @@ class MultiSourceAgentDeploymentService:
                         reason = "User agent is the selected version"
                     else:
                         reason = "User customization preserved"
-                        
-                    cleanup_results["preserved"].append({
-                        "name": agent_name,
-                        "version": self.version_manager.format_version_display(user_version),
-                        "reason": reason
-                    })
-                    
+
+                    cleanup_results["preserved"].append(
+                        {
+                            "name": agent_name,
+                            "version": self.version_manager.format_version_display(
+                                user_version
+                            ),
+                            "reason": reason,
+                        }
+                    )
+
                     self.logger.debug(
                         f"Preserving user agent {agent_name} "
                         f"v{self.version_manager.format_version_display(user_version)}: {reason}"
                     )
-        
+
         # Log cleanup summary
         if cleanup_results["removed"]:
             self.logger.info(
@@ -441,65 +464,67 @@ class MultiSourceAgentDeploymentService:
             self.logger.warning(
                 f"Encountered {len(cleanup_results['errors'])} errors during cleanup"
             )
-        
+
         return cleanup_results
-    
+
     def _apply_config_filters(
-        self, 
-        selected_agents: Dict[str, Dict[str, Any]], 
-        config: Config
+        self, selected_agents: Dict[str, Dict[str, Any]], config: Config
     ) -> Dict[str, Dict[str, Any]]:
         """Apply configuration-based filtering to selected agents.
-        
+
         Args:
             selected_agents: Dictionary of selected agents
             config: Configuration object
-            
+
         Returns:
             Filtered dictionary of agents
         """
         filtered_agents = {}
-        
+
         # Get exclusion patterns from config
         exclusion_patterns = config.get("agent_deployment.exclusion_patterns", [])
-        
+
         # Get environment-specific exclusions
         environment = config.get("environment", "development")
         env_exclusions = config.get(f"agent_deployment.{environment}_exclusions", [])
-        
+
         for agent_name, agent_info in selected_agents.items():
             # Check exclusion patterns
             excluded = False
-            
+
             for pattern in exclusion_patterns:
                 if pattern in agent_name:
-                    self.logger.debug(f"Excluding '{agent_name}' due to pattern '{pattern}'")
+                    self.logger.debug(
+                        f"Excluding '{agent_name}' due to pattern '{pattern}'"
+                    )
                     excluded = True
                     break
-            
+
             # Check environment exclusions
             if not excluded and agent_name in env_exclusions:
-                self.logger.debug(f"Excluding '{agent_name}' due to {environment} environment")
+                self.logger.debug(
+                    f"Excluding '{agent_name}' due to {environment} environment"
+                )
                 excluded = True
-            
+
             if not excluded:
                 filtered_agents[agent_name] = agent_info
-        
+
         return filtered_agents
-    
+
     def compare_deployed_versions(
         self,
         deployed_agents_dir: Path,
         agents_to_deploy: Dict[str, Path],
-        agent_sources: Dict[str, str]
+        agent_sources: Dict[str, str],
     ) -> Dict[str, Any]:
         """Compare deployed agent versions with candidates for deployment.
-        
+
         Args:
             deployed_agents_dir: Directory containing currently deployed agents
             agents_to_deploy: Dictionary mapping agent names to template paths
             agent_sources: Dictionary mapping agent names to their sources
-            
+
         Returns:
             Dictionary with comparison results including which agents need updates
         """
@@ -510,111 +535,142 @@ class MultiSourceAgentDeploymentService:
             "orphaned_agents": [],  # Agents without templates
             "version_upgrades": [],
             "version_downgrades": [],
-            "source_changes": []
+            "source_changes": [],
         }
-        
+
         for agent_name, template_path in agents_to_deploy.items():
             deployed_file = deployed_agents_dir / f"{agent_name}.md"
-            
+
             if not deployed_file.exists():
-                comparison_results["new_agents"].append({
-                    "name": agent_name,
-                    "source": agent_sources[agent_name],
-                    "template": str(template_path)
-                })
+                comparison_results["new_agents"].append(
+                    {
+                        "name": agent_name,
+                        "source": agent_sources[agent_name],
+                        "template": str(template_path),
+                    }
+                )
                 comparison_results["needs_update"].append(agent_name)
                 continue
-            
+
             # Read template version
             try:
                 template_data = json.loads(template_path.read_text())
                 metadata = template_data.get("metadata", {})
                 template_version = self.version_manager.parse_version(
-                    template_data.get("agent_version") or 
-                    template_data.get("version") or
-                    metadata.get("version", "0.0.0")
+                    template_data.get("agent_version")
+                    or template_data.get("version")
+                    or metadata.get("version", "0.0.0")
                 )
             except Exception as e:
                 self.logger.warning(f"Error reading template for '{agent_name}': {e}")
                 continue
-            
+
             # Read deployed version
             try:
                 deployed_content = deployed_file.read_text()
-                deployed_version, _, _ = self.version_manager.extract_version_from_frontmatter(
-                    deployed_content
+                deployed_version, _, _ = (
+                    self.version_manager.extract_version_from_frontmatter(
+                        deployed_content
+                    )
                 )
-                
+
                 # Extract source from deployed agent if available
                 deployed_source = "unknown"
                 if "source:" in deployed_content:
                     import re
-                    source_match = re.search(r'^source:\s*(.+)$', deployed_content, re.MULTILINE)
+
+                    source_match = re.search(
+                        r"^source:\s*(.+)$", deployed_content, re.MULTILINE
+                    )
                     if source_match:
                         deployed_source = source_match.group(1).strip()
-                
+
                 # If source is still unknown, try to infer it from deployment context
                 if deployed_source == "unknown":
-                    deployed_source = self._infer_agent_source_from_context(agent_name, deployed_agents_dir)
+                    deployed_source = self._infer_agent_source_from_context(
+                        agent_name, deployed_agents_dir
+                    )
             except Exception as e:
                 self.logger.warning(f"Error reading deployed agent '{agent_name}': {e}")
                 comparison_results["needs_update"].append(agent_name)
                 continue
-            
+
             # Compare versions
             version_comparison = self.version_manager.compare_versions(
                 template_version, deployed_version
             )
-            
+
             if version_comparison > 0:
                 # Template version is higher
-                comparison_results["version_upgrades"].append({
-                    "name": agent_name,
-                    "deployed_version": self.version_manager.format_version_display(deployed_version),
-                    "new_version": self.version_manager.format_version_display(template_version),
-                    "source": agent_sources[agent_name],
-                    "previous_source": deployed_source
-                })
+                comparison_results["version_upgrades"].append(
+                    {
+                        "name": agent_name,
+                        "deployed_version": self.version_manager.format_version_display(
+                            deployed_version
+                        ),
+                        "new_version": self.version_manager.format_version_display(
+                            template_version
+                        ),
+                        "source": agent_sources[agent_name],
+                        "previous_source": deployed_source,
+                    }
+                )
                 comparison_results["needs_update"].append(agent_name)
-                
+
                 if deployed_source != agent_sources[agent_name]:
-                    comparison_results["source_changes"].append({
-                        "name": agent_name,
-                        "from_source": deployed_source,
-                        "to_source": agent_sources[agent_name]
-                    })
+                    comparison_results["source_changes"].append(
+                        {
+                            "name": agent_name,
+                            "from_source": deployed_source,
+                            "to_source": agent_sources[agent_name],
+                        }
+                    )
             elif version_comparison < 0:
                 # Deployed version is higher (shouldn't happen with proper version management)
-                comparison_results["version_downgrades"].append({
-                    "name": agent_name,
-                    "deployed_version": self.version_manager.format_version_display(deployed_version),
-                    "template_version": self.version_manager.format_version_display(template_version),
-                    "warning": "Deployed version is higher than template"
-                })
+                comparison_results["version_downgrades"].append(
+                    {
+                        "name": agent_name,
+                        "deployed_version": self.version_manager.format_version_display(
+                            deployed_version
+                        ),
+                        "template_version": self.version_manager.format_version_display(
+                            template_version
+                        ),
+                        "warning": "Deployed version is higher than template",
+                    }
+                )
                 # Don't add to needs_update - keep the higher version
             else:
                 # Versions are equal
-                comparison_results["up_to_date"].append({
-                    "name": agent_name,
-                    "version": self.version_manager.format_version_display(deployed_version),
-                    "source": agent_sources[agent_name]
-                })
-        
+                comparison_results["up_to_date"].append(
+                    {
+                        "name": agent_name,
+                        "version": self.version_manager.format_version_display(
+                            deployed_version
+                        ),
+                        "source": agent_sources[agent_name],
+                    }
+                )
+
         # Check for orphaned agents (deployed but no template)
-        orphaned = self._detect_orphaned_agents_simple(deployed_agents_dir, agents_to_deploy)
+        orphaned = self._detect_orphaned_agents_simple(
+            deployed_agents_dir, agents_to_deploy
+        )
         comparison_results["orphaned_agents"] = orphaned
-        
+
         # Log summary
         summary_parts = [
             f"{len(comparison_results['needs_update'])} need updates",
             f"{len(comparison_results['up_to_date'])} up to date",
-            f"{len(comparison_results['new_agents'])} new agents"
+            f"{len(comparison_results['new_agents'])} new agents",
         ]
         if comparison_results["orphaned_agents"]:
-            summary_parts.append(f"{len(comparison_results['orphaned_agents'])} orphaned")
-        
+            summary_parts.append(
+                f"{len(comparison_results['orphaned_agents'])} orphaned"
+            )
+
         self.logger.info(f"Version comparison complete: {', '.join(summary_parts)}")
-        
+
         if comparison_results["version_upgrades"]:
             for upgrade in comparison_results["version_upgrades"]:
                 self.logger.info(
@@ -622,14 +678,14 @@ class MultiSourceAgentDeploymentService:
                     f"{upgrade['deployed_version']} -> {upgrade['new_version']} "
                     f"(from {upgrade['source']})"
                 )
-        
+
         if comparison_results["source_changes"]:
             for change in comparison_results["source_changes"]:
                 self.logger.info(
                     f"  Source change: {change['name']} "
                     f"from {change['from_source']} to {change['to_source']}"
                 )
-        
+
         if comparison_results["version_downgrades"]:
             for downgrade in comparison_results["version_downgrades"]:
                 # Changed from warning to debug - deployed versions higher than templates
@@ -639,7 +695,7 @@ class MultiSourceAgentDeploymentService:
                     f"{downgrade['deployed_version']} is higher than template "
                     f"{downgrade['template_version']} (keeping deployed version)"
                 )
-        
+
         # Log orphaned agents if found
         if comparison_results["orphaned_agents"]:
             self.logger.info(
@@ -651,57 +707,72 @@ class MultiSourceAgentDeploymentService:
                     f"  - {orphan['name']} v{orphan['version']} "
                     f"(consider removing or creating a template)"
                 )
-        
+
         return comparison_results
-    
-    def _infer_agent_source_from_context(self, agent_name: str, deployed_agents_dir: Path) -> str:
+
+    def _infer_agent_source_from_context(
+        self, agent_name: str, deployed_agents_dir: Path
+    ) -> str:
         """Infer the source of a deployed agent when source metadata is missing.
-        
+
         This method attempts to determine the agent source based on:
         1. Deployment context (development vs pipx)
         2. Agent naming patterns
         3. Known system agents
-        
+
         Args:
             agent_name: Name of the agent
             deployed_agents_dir: Directory where agent is deployed
-            
+
         Returns:
             Inferred source string (system/project/user)
         """
         # List of known system agents that ship with claude-mpm
         system_agents = {
-            "pm", "engineer", "qa", "research", "documentation", "ops", 
-            "security", "web-ui", "api-qa", "version-control"
+            "pm",
+            "engineer",
+            "qa",
+            "research",
+            "documentation",
+            "ops",
+            "security",
+            "web-ui",
+            "api-qa",
+            "version-control",
         }
-        
+
         # If this is a known system agent, it's from system
         if agent_name in system_agents:
             return "system"
-        
+
         # Check deployment context
         from ....core.unified_paths import get_path_manager
+
         path_manager = get_path_manager()
-        
+
         # If deployed_agents_dir is under user home/.claude/agents, check context
         user_claude_dir = Path.home() / ".claude" / "agents"
         if deployed_agents_dir == user_claude_dir:
             # Check if we're in development mode
             try:
                 from ....core.unified_paths import DeploymentContext, PathContext
+
                 deployment_context = PathContext.detect_deployment_context()
-                
-                if deployment_context in (DeploymentContext.DEVELOPMENT, DeploymentContext.EDITABLE_INSTALL):
+
+                if deployment_context in (
+                    DeploymentContext.DEVELOPMENT,
+                    DeploymentContext.EDITABLE_INSTALL,
+                ):
                     # In development mode, unknown agents are likely system agents being tested
                     return "system"
-                elif deployment_context == DeploymentContext.PIPX_INSTALL:
+                if deployment_context == DeploymentContext.PIPX_INSTALL:
                     # In pipx mode, unknown agents could be system agents
                     # Check if agent follows system naming patterns
-                    if agent_name.count('-') <= 2 and len(agent_name) <= 20:
+                    if agent_name.count("-") <= 2 and len(agent_name) <= 20:
                         return "system"
             except Exception:
                 pass
-        
+
         # Check if deployed to project-specific directory
         try:
             project_root = path_manager.project_root
@@ -709,165 +780,163 @@ class MultiSourceAgentDeploymentService:
                 return "project"
         except Exception:
             pass
-        
+
         # Default inference based on naming patterns
         # System agents typically have simple names
-        if '-' not in agent_name or agent_name.count('-') <= 1:
+        if "-" not in agent_name or agent_name.count("-") <= 1:
             return "system"
-        
+
         # Complex names are more likely to be user/project agents
         return "user"
-    
+
     def detect_orphaned_agents(
-        self, 
-        deployed_agents_dir: Path,
-        available_agents: Dict[str, Any]
+        self, deployed_agents_dir: Path, available_agents: Dict[str, Any]
     ) -> List[Dict[str, Any]]:
         """Detect deployed agents that don't have corresponding templates.
-        
+
         WHY: Orphaned agents can cause confusion with version warnings.
         This method identifies them so they can be handled appropriately.
-        
+
         Args:
             deployed_agents_dir: Directory containing deployed agents
             available_agents: Dictionary of available agents from all sources
-            
+
         Returns:
             List of orphaned agent information
         """
         orphaned = []
-        
+
         if not deployed_agents_dir.exists():
             return orphaned
-        
+
         # Build a mapping of file stems to agent names for comparison
         # Since available_agents uses display names like "Code Analysis Agent"
         # but deployed files use stems like "code_analyzer"
         available_stems = set()
         stem_to_name = {}
-        
+
         for agent_name, agent_sources in available_agents.items():
             # Get the file path from the first source to extract the stem
-            if agent_sources and isinstance(agent_sources, list) and len(agent_sources) > 0:
+            if (
+                agent_sources
+                and isinstance(agent_sources, list)
+                and len(agent_sources) > 0
+            ):
                 first_source = agent_sources[0]
-                if 'file_path' in first_source:
-                    file_path = Path(first_source['file_path'])
+                if "file_path" in first_source:
+                    file_path = Path(first_source["file_path"])
                     stem = file_path.stem
                     available_stems.add(stem)
                     stem_to_name[stem] = agent_name
-        
+
         for deployed_file in deployed_agents_dir.glob("*.md"):
             agent_stem = deployed_file.stem
-            
+
             # Skip if this agent has a template (check by stem, not display name)
             if agent_stem in available_stems:
                 continue
-            
+
             # This is an orphaned agent
             try:
                 deployed_content = deployed_file.read_text()
-                deployed_version, _, _ = self.version_manager.extract_version_from_frontmatter(
-                    deployed_content
+                deployed_version, _, _ = (
+                    self.version_manager.extract_version_from_frontmatter(
+                        deployed_content
+                    )
+                )
+                version_str = self.version_manager.format_version_display(
+                    deployed_version
                 )
-                version_str = self.version_manager.format_version_display(deployed_version)
             except Exception:
                 version_str = "unknown"
-            
-            orphaned.append({
-                "name": agent_stem,
-                "file": str(deployed_file),
-                "version": version_str
-            })
-        
+
+            orphaned.append(
+                {"name": agent_stem, "file": str(deployed_file), "version": version_str}
+            )
+
         return orphaned
-    
+
     def _detect_orphaned_agents_simple(
-        self, 
-        deployed_agents_dir: Path,
-        agents_to_deploy: Dict[str, Path]
+        self, deployed_agents_dir: Path, agents_to_deploy: Dict[str, Path]
     ) -> List[Dict[str, Any]]:
         """Simple orphan detection that works with agents_to_deploy structure.
-        
+
         Args:
             deployed_agents_dir: Directory containing deployed agents
             agents_to_deploy: Dictionary mapping file stems to template paths
-            
+
         Returns:
             List of orphaned agent information
         """
         orphaned = []
-        
+
         if not deployed_agents_dir.exists():
             return orphaned
-        
+
         # agents_to_deploy already contains file stems as keys
         available_stems = set(agents_to_deploy.keys())
-        
+
         for deployed_file in deployed_agents_dir.glob("*.md"):
             agent_stem = deployed_file.stem
-            
+
             # Skip if this agent has a template (check by stem)
             if agent_stem in available_stems:
                 continue
-            
+
             # This is an orphaned agent
             try:
                 deployed_content = deployed_file.read_text()
-                deployed_version, _, _ = self.version_manager.extract_version_from_frontmatter(
-                    deployed_content
+                deployed_version, _, _ = (
+                    self.version_manager.extract_version_from_frontmatter(
+                        deployed_content
+                    )
+                )
+                version_str = self.version_manager.format_version_display(
+                    deployed_version
                 )
-                version_str = self.version_manager.format_version_display(deployed_version)
             except Exception:
                 version_str = "unknown"
-            
-            orphaned.append({
-                "name": agent_stem,
-                "file": str(deployed_file),
-                "version": version_str
-            })
-        
+
+            orphaned.append(
+                {"name": agent_stem, "file": str(deployed_file), "version": version_str}
+            )
+
         return orphaned
-    
+
     def cleanup_orphaned_agents(
-        self,
-        deployed_agents_dir: Path,
-        dry_run: bool = True
+        self, deployed_agents_dir: Path, dry_run: bool = True
     ) -> Dict[str, Any]:
         """Clean up orphaned agents that don't have templates.
-        
+
         WHY: Orphaned agents can accumulate over time and cause confusion.
         This method provides a way to clean them up systematically.
-        
+
         Args:
             deployed_agents_dir: Directory containing deployed agents
             dry_run: If True, only report what would be removed
-            
+
         Returns:
             Dictionary with cleanup results
         """
-        results = {
-            "orphaned": [],
-            "removed": [],
-            "errors": []
-        }
-        
+        results = {"orphaned": [], "removed": [], "errors": []}
+
         # First, discover all available agents from all sources
         all_agents = self.discover_agents_from_all_sources()
-        available_names = set(all_agents.keys())
-        
+        set(all_agents.keys())
+
         # Detect orphaned agents
         orphaned = self.detect_orphaned_agents(deployed_agents_dir, all_agents)
         results["orphaned"] = orphaned
-        
+
         if not orphaned:
             self.logger.info("No orphaned agents found")
             return results
-        
+
         self.logger.info(f"Found {len(orphaned)} orphaned agent(s)")
-        
+
         for orphan in orphaned:
             agent_file = Path(orphan["file"])
-            
+
             if dry_run:
                 self.logger.info(
                     f"  Would remove: {orphan['name']} v{orphan['version']}"
@@ -883,10 +952,10 @@ class MultiSourceAgentDeploymentService:
                     error_msg = f"Failed to remove {orphan['name']}: {e}"
                     results["errors"].append(error_msg)
                     self.logger.error(f"  {error_msg}")
-        
+
         if dry_run and orphaned:
             self.logger.info(
                 "Run with dry_run=False to actually remove orphaned agents"
             )
-        
-        return results
+
+        return results