claude-mpm 5.1.9__py3-none-any.whl → 5.4.48__py3-none-any.whl

claude_mpm/services/agents/git_source_manager.py

@@ -50,10 +50,10 @@ class GitSourceManager:
 
         Args:
             cache_root: Root directory for repository caches.
-                       Defaults to ~/.claude-mpm/cache/remote-agents/
+                       Defaults to ~/.claude-mpm/cache/agents/
         """
         if cache_root is None:
-            cache_root = Path.home() / ".claude-mpm" / "cache" / "remote-agents"
+            cache_root = Path.home() / ".claude-mpm" / "cache" / "agents"
 
         self.cache_root = cache_root
         self.cache_root.mkdir(parents=True, exist_ok=True)
@@ -339,14 +339,48 @@ class GitSourceManager:
 
             # Walk cache directory structure
             logger.debug(f"[DEBUG] Walking cache root: {self.cache_root}")
+
+            # Known legacy category directories to skip (flat cache structure)
+            LEGACY_CATEGORIES = {
+                "universal",
+                "engineer",
+                "ops",
+                "qa",
+                "security",
+                "documentation",
+                "claude-mpm",
+            }
+
+            # Repositories that are NOT agent repositories (should be excluded from agent discovery)
+            # These contain skills, documentation, or other non-agent content
+            EXCLUDED_REPOSITORIES = {
+                "claude-mpm-skills",  # Skills repository, not agents
+            }
+
             for owner_dir in self.cache_root.iterdir():
                 if not owner_dir.is_dir():
                     continue
+
+                # Skip legacy category directories (they're not GitHub owners)
+                if owner_dir.name.lower() in LEGACY_CATEGORIES:
+                    logger.debug(
+                        f"[DEBUG] Skipping legacy category directory: {owner_dir.name}"
+                    )
+                    continue
+
                 logger.debug(f"[DEBUG] Processing owner_dir: {owner_dir.name}")
 
                 for repo_dir in owner_dir.iterdir():
                     if not repo_dir.is_dir():
                         continue
+
+                    # Skip excluded repositories (e.g., skills repos are not agent repos)
+                    if repo_dir.name in EXCLUDED_REPOSITORIES:
+                        logger.debug(
+                            f"[DEBUG] Skipping excluded repository: {repo_dir.name}"
+                        )
+                        continue
+
                     logger.debug(f"[DEBUG] Processing repo_dir: {repo_dir.name}")
 
                     # Bug #5 fix: Don't iterate subdirectories - RemoteAgentDiscoveryService
@@ -361,8 +395,23 @@ class GitSourceManager:
                     )
                     logger.debug(f"[DEBUG] Found {len(agents)} agents so far")
 
-        logger.debug(f"[DEBUG] list_cached_agents COMPLETE: {len(agents)} total agents")
-        return agents
+        logger.debug(f"[DEBUG] list_cached_agents COMPLETE: {len(agents)} total agents (before deduplication)")
+
+        # Deduplicate agents by agent_id (Bug #2 fix)
+        # When same agent exists in multiple locations, keep only first occurrence
+        seen_ids = set()
+        deduplicated_agents = []
+
+        for agent in agents:
+            agent_id = agent.get("agent_id") or agent.get("metadata", {}).get("name")
+            if agent_id and agent_id not in seen_ids:
+                seen_ids.add(agent_id)
+                deduplicated_agents.append(agent)
+            elif agent_id:
+                logger.debug(f"[DEBUG] Skipping duplicate agent: {agent_id}")
+
+        logger.debug(f"[DEBUG] After deduplication: {len(deduplicated_agents)} unique agents")
+        return deduplicated_agents
 
     def _discover_agents_in_directory(
         self,

claude_mpm/services/agents/loading/base_agent_manager.py

@@ -13,9 +13,6 @@ from enum import Enum
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
-# Lazy import for base_agent_loader to reduce initialization overhead
-# base_agent_loader adds ~500ms to import time
-# from claude_mpm.agents.base_agent_loader import clear_base_agent_cache
 from claude_mpm.core.logging_utils import get_logger
 from claude_mpm.services.memory.cache.shared_prompt_cache import SharedPromptCache
 from claude_mpm.services.shared import ConfigServiceBase
@@ -23,13 +20,6 @@ from claude_mpm.services.shared import ConfigServiceBase
 logger = get_logger(__name__)
 
 
-def _get_clear_base_agent_cache():
-    """Lazy loader for clear_base_agent_cache function."""
-    from claude_mpm.agents.base_agent_loader import clear_base_agent_cache
-
-    return clear_base_agent_cache
-
-
 class BaseAgentSection(str, Enum):
     """Base agent markdown sections."""
 
@@ -143,9 +133,7 @@ class BaseAgentManager(ConfigServiceBase):
         content = self._structure_to_markdown(current)
         self.base_agent_path.write_text(content, encoding="utf-8")
 
-        # Clear caches (lazy load to avoid import overhead)
-        clear_base_agent_cache = _get_clear_base_agent_cache()
-        clear_base_agent_cache()
+        # Clear cache
         self.cache.invalidate("base_agent:instructions")
 
         logger.info("Base agent updated successfully")

claude_mpm/services/agents/recommender.py

@@ -226,9 +226,11 @@ class AgentRecommenderService(BaseService, IAgentRecommender):
         if max_agents is not None:
             recommendations = recommendations[:max_agents]
 
-        # Check if toolchain is unknown and we have no recommendations
-        if not recommendations and toolchain.primary_language.lower() == "unknown":
-            self.logger.info("Toolchain unknown - applying default configuration")
+        # Check if we have no recommendations (any reason: unknown language, low scores, etc.)
+        if not recommendations:
+            self.logger.info(
+                f"No agents scored above threshold for {toolchain.primary_language}; using defaults"
+            )
 
             # Get default configuration
             default_config = self._capabilities_config.get("default_configuration", {})

claude_mpm/services/agents/single_tier_deployment_service.py

@@ -78,14 +78,14 @@ class SingleTierDeploymentService:
             config: Agent source configuration with repositories
             deployment_dir: Target deployment directory (.claude/agents/)
             cache_root: Cache root for repositories
-                       (defaults to ~/.claude-mpm/cache/remote-agents/)
+                       (defaults to ~/.claude-mpm/cache/agents/)
         """
         self.config = config
         self.deployment_dir = deployment_dir
         self.deployment_dir.mkdir(parents=True, exist_ok=True)
 
         if cache_root is None:
-            cache_root = Path.home() / ".claude-mpm" / "cache" / "remote-agents"
+            cache_root = Path.home() / ".claude-mpm" / "cache" / "agents"
 
         self.cache_root = cache_root
         self.git_source_manager = GitSourceManager(cache_root)

claude_mpm/services/agents/sources/git_source_sync_service.py

@@ -13,11 +13,16 @@ import logging
 import time
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Set, Tuple
 
 import requests
 
 from claude_mpm.core.file_utils import get_file_hash
+
+# Import normalize function for exclusion filtering
+from claude_mpm.services.agents.deployment.multi_source_deployment_service import (
+    _normalize_agent_name,
+)
 from claude_mpm.services.agents.sources.agent_sync_state import AgentSyncState
 from claude_mpm.utils.progress import create_progress_bar
 
@@ -188,10 +193,10 @@ class GitSourceSyncService:
 
         Args:
             source_url: Base URL for raw files (without trailing slash)
-            cache_dir: Local cache directory (defaults to ~/.claude-mpm/cache/remote-agents/)
+            cache_dir: Local cache directory (defaults to ~/.claude-mpm/cache/agents/)
             source_id: Unique identifier for this source (for multi-source support)
 
-        Design Decision: Cache to ~/.claude-mpm/cache/remote-agents/ (canonical location)
+        Design Decision: Cache to ~/.claude-mpm/cache/agents/ (canonical location)
 
         Rationale: Separates cached repository structure from deployed agents.
         This allows preserving nested directory structure in cache while
@@ -207,13 +212,13 @@ class GitSourceSyncService:
         self.source_url = source_url.rstrip("/")
         self.source_id = source_id
 
-        # Setup cache directory (canonical: ~/.claude-mpm/cache/remote-agents/)
+        # Setup cache directory (canonical: ~/.claude-mpm/cache/agents/)
         if cache_dir:
             self.cache_dir = Path(cache_dir)
         else:
-            # Default to ~/.claude-mpm/cache/remote-agents/ (canonical cache location)
+            # Default to ~/.claude-mpm/cache/agents/ (canonical cache location)
             home = Path.home()
-            self.cache_dir = home / ".claude-mpm" / "cache" / "remote-agents"
+            self.cache_dir = home / ".claude-mpm" / "cache" / "agents"
 
         self.cache_dir.mkdir(parents=True, exist_ok=True)
 
@@ -851,6 +856,12 @@ class GitSourceSyncService:
             if base_path and not path.startswith(base_path + "/"):
                 continue
 
+            # Exclude build/dist directories (prevents double-counting)
+            # e.g., both "agents/engineer.md" and "dist/agents/engineer.md"
+            path_parts = path.split("/")
+            if any(excluded in path_parts for excluded in ["dist", "build", ".cache"]):
+                continue
+
             # Remove base_path prefix for relative paths
             if base_path:
                 relative_path = path[len(base_path) + 1 :]
@@ -917,6 +928,62 @@ class GitSourceSyncService:
         """
         return self.cache_dir
 
+    def _cleanup_excluded_agents(
+        self,
+        deployment_dir: Path,
+        excluded_set: Set[str],
+    ) -> Dict[str, List[str]]:
+        """Remove excluded agents from deployment directory.
+
+        Removes any agents in the deployment directory whose normalized
+        names match the exclusion list. This ensures that excluded agents
+        are cleaned up from previous deployments.
+
+        Args:
+            deployment_dir: Directory containing deployed agents
+            excluded_set: Set of normalized agent names to exclude
+
+        Returns:
+            Dictionary with cleanup results:
+            - removed: List of agent names that were removed
+        """
+        cleanup_results: Dict[str, List[str]] = {"removed": []}
+
+        if not deployment_dir.exists():
+            logger.debug("Deployment directory does not exist, no cleanup needed")
+            return cleanup_results
+
+        for item in deployment_dir.iterdir():
+            # Only process .md files
+            if not item.is_file() or item.suffix != ".md":
+                continue
+
+            # Skip hidden files
+            if item.name.startswith("."):
+                continue
+
+            # Normalize agent name for comparison
+            agent_name = _normalize_agent_name(item.stem)
+
+            # Check if this agent is excluded
+            if agent_name in excluded_set:
+                try:
+                    item.unlink()
+                    cleanup_results["removed"].append(item.stem)
+                    logger.info(f"Removed excluded agent: {item.stem}")
+                except PermissionError as e:
+                    logger.error(f"Permission denied removing {item.stem}: {e}")
+                except Exception as e:
+                    logger.error(f"Failed to remove {item.stem}: {e}")
+
+        # Log summary
+        if cleanup_results["removed"]:
+            logger.info(
+                f"Cleanup complete: removed {len(cleanup_results['removed'])} excluded agents"
+            )
+
+        return cleanup_results
+
     def deploy_agents_to_project(
         self,
         project_dir: Path,
@@ -971,7 +1038,10 @@ class GitSourceSyncService:
         """
         import shutil
 
-        deployment_dir = project_dir / ".claude-mpm" / "agents"
+        from claude_mpm.core.config import Config
+
+        # Deploy to .claude/agents/ where Claude Code expects them
+        deployment_dir = project_dir / ".claude" / "agents"
         deployment_dir.mkdir(parents=True, exist_ok=True)
 
         results = {
@@ -982,10 +1052,53 @@ class GitSourceSyncService:
             "deployment_dir": str(deployment_dir),
         }
 
+        # Load project config to get exclusion list
+        config_file = project_dir / ".claude-mpm" / "configuration.yaml"
+        if config_file.exists():
+            config = Config(config_file=config_file)
+            excluded_agents = config.get("excluded_agents", [])
+        else:
+            # No project config, no exclusions
+            excluded_agents = []
+
+        # Create normalized exclusion set
+        excluded_set: Set[str] = (
+            {_normalize_agent_name(name) for name in excluded_agents}
+            if excluded_agents
+            else set()
+        )
+
+        if excluded_set:
+            logger.info(
+                f"Applying exclusions: {', '.join(sorted(excluded_agents))} "
+                f"(normalized: {', '.join(sorted(excluded_set))})"
+            )
+
         # Get agents from cache or use provided list
         if agent_list is None:
             agent_list = self._discover_cached_agents()
 
+        # Filter out excluded agents
+        if excluded_set:
+            original_count = len(agent_list)
+            agent_list = [
+                agent_path
+                for agent_path in agent_list
+                if _normalize_agent_name(Path(agent_path).stem) not in excluded_set
+            ]
+            filtered_count = original_count - len(agent_list)
+            if filtered_count > 0:
+                logger.info(f"Filtered out {filtered_count} excluded agents")
+
+        # Clean up any previously deployed excluded agents
+        if excluded_set:
+            cleanup_results = self._cleanup_excluded_agents(deployment_dir, excluded_set)
+            if cleanup_results["removed"]:
+                logger.info(
+                    f"Cleaned up {len(cleanup_results['removed'])} excluded agents: "
+                    f"{', '.join(cleanup_results['removed'])}"
+                )
+
         logger.info(
             f"Deploying {len(agent_list)} agents from cache to {deployment_dir}"
         )

claude_mpm/services/agents/startup_sync.py

@@ -110,6 +110,26 @@ def sync_agents_on_startup(config: Optional[Dict[str, Any]] = None) -> Dict[str,
         else:
             cache_dir = None  # Will use default
 
+        # Check for old cache directory names and provide migration guidance
+        # This handles users upgrading from older versions
+        old_cache_paths = [
+            Path.home() / ".claude-mpm" / "cache" / "remote-agents",
+        ]
+        new_cache_dir = Path.home() / ".claude-mpm" / "cache" / "agents"
+
+        for old_cache in old_cache_paths:
+            if old_cache.exists() and not new_cache_dir.exists():
+                logger.warning(f"Found old cache directory: {old_cache}")
+                logger.warning(
+                    "The cache directory location has changed to: ~/.claude-mpm/cache/agents"
+                )
+                logger.warning("To migrate your existing cache, run:")
+                logger.warning(f"  mv {old_cache} {new_cache_dir}")
+                logger.info(
+                    "Agents will be re-synced to the new cache location automatically."
+                )
+                break  # Only show warning once
+
         # Sync each enabled source
         for source_config in sources:
             try:
@@ -217,7 +237,7 @@ def get_sync_status() -> Dict[str, Any]:
             "enabled": agent_sync_config.get("enabled", True),
             "sources_configured": len(enabled_sources),
             "cache_dir": agent_sync_config.get(
-                "cache_dir", "~/.claude-mpm/cache/remote-agents"
+                "cache_dir", "~/.claude-mpm/cache/agents"
             ),
         }
 
@@ -233,7 +253,7 @@ def get_sync_status() -> Dict[str, Any]:
         return {
             "enabled": False,
             "sources_configured": 0,
-            "cache_dir": "~/.claude-mpm/cache/remote-agents",
+            "cache_dir": "~/.claude-mpm/cache/agents",
             "last_sync": None,
             "error": str(e),
         }

claude_mpm/services/agents/toolchain_detector.py

@@ -158,12 +158,15 @@ class ToolchainDetector:
         "make": ["ops"],
     }
 
-    # Core agents always included
+    # Core agents always included (use exact agent IDs from repository)
     CORE_AGENTS = [
-        "qa",
-        "research",
-        "documentation",
-        "ticketing",
+        "engineer",
+        "qa-agent",
+        "memory-manager-agent",
+        "local-ops-agent",
+        "research-agent",
+        "documentation-agent",
+        "security-agent",
     ]
 
     # Directories to exclude from scanning
@@ -365,7 +368,8 @@ class ToolchainDetector:
         """Map detected toolchain to recommended agents.
 
         Combines language-specific, framework-specific, and ops agents with
-        core agents (qa, research, documentation, ticketing).
+        core agents (engineer, qa-agent, memory-manager-agent, local-ops-agent, research-agent,
+        documentation-agent, security-agent).
 
         Args:
             toolchain: Detected toolchain dictionary with languages, frameworks, tools

claude_mpm/services/analysis/__init__.py

@@ -1,9 +1,15 @@
 """
 Analysis services for Claude MPM.
 
-Provides postmortem analysis and error improvement suggestions.
+Provides postmortem analysis, error improvement suggestions, and code clone detection.
 """
 
+from .clone_detector import (
+    CloneDetector,
+    CloneReport,
+    RefactoringSuggestion,
+    SimilarityReport,
+)
 from .postmortem_service import (
     ActionType,
     ErrorAnalysis,
@@ -16,10 +22,14 @@ from .postmortem_service import (
 
 __all__ = [
     "ActionType",
+    "CloneDetector",
+    "CloneReport",
     "ErrorAnalysis",
     "ErrorCategory",
     "ImprovementAction",
     "PostmortemReport",
     "PostmortemService",
+    "RefactoringSuggestion",
+    "SimilarityReport",
     "get_postmortem_service",
 ]