claude-mpm 5.0.2__py3-none-any.whl → 5.4.3__py3-none-any.whl

claude_mpm/services/agents/git_source_manager.py

@@ -339,9 +339,29 @@ 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",
+            }
+
             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():

claude_mpm/services/agents/sources/git_source_sync_service.py

@@ -188,10 +188,10 @@ class GitSourceSyncService:
 
         Args:
             source_url: Base URL for raw files (without trailing slash)
-            cache_dir: Local cache directory (defaults to ~/.claude-mpm/cache/agents/)
+            cache_dir: Local cache directory (defaults to ~/.claude-mpm/cache/remote-agents/)
             source_id: Unique identifier for this source (for multi-source support)
 
-        Design Decision: Cache to ~/.claude-mpm/cache/agents/ (Phase 1 of refactoring)
+        Design Decision: Cache to ~/.claude-mpm/cache/remote-agents/ (canonical location)
 
         Rationale: Separates cached repository structure from deployed agents.
         This allows preserving nested directory structure in cache while
@@ -207,13 +207,13 @@ class GitSourceSyncService:
         self.source_url = source_url.rstrip("/")
         self.source_id = source_id
 
-        # Setup cache directory (Phase 1: Changed to ~/.claude-mpm/cache/agents/)
+        # Setup cache directory (canonical: ~/.claude-mpm/cache/remote-agents/)
         if cache_dir:
             self.cache_dir = Path(cache_dir)
         else:
-            # Default to ~/.claude-mpm/cache/agents/ (shared cache for nested structure)
+            # Default to ~/.claude-mpm/cache/remote-agents/ (canonical cache location)
             home = Path.home()
-            self.cache_dir = home / ".claude-mpm" / "cache" / "agents"
+            self.cache_dir = home / ".claude-mpm" / "cache" / "remote-agents"
 
         self.cache_dir.mkdir(parents=True, exist_ok=True)
 
@@ -237,6 +237,11 @@ class GitSourceSyncService:
         if etag_cache_file.exists():
             self._migrate_etag_cache(etag_cache_file)
 
+        # NEW: Initialize git manager for cache (Phase 1 integration)
+        from claude_mpm.services.agents.cache_git_manager import CacheGitManager
+
+        self.git_manager = CacheGitManager(self.cache_dir)
+
     def sync_agents(
         self,
         force_refresh: bool = False,
@@ -273,6 +278,33 @@ class GitSourceSyncService:
 
         start_time = time.time()
 
+        # NEW: Pre-sync git operations (Phase 1 integration)
+        if self.git_manager.is_git_repo():
+            logger.debug("Cache is a git repository, checking for updates...")
+
+            # Warn about uncommitted changes
+            if self.git_manager.has_uncommitted_changes():
+                uncommitted_count = len(
+                    self.git_manager.get_status().get("uncommitted", [])
+                )
+                logger.warning(
+                    f"Cache has {uncommitted_count} uncommitted change(s). "
+                    "These will be preserved, but consider committing them."
+                )
+
+            # Pull latest if online (non-blocking)
+            try:
+                success, msg = self.git_manager.pull_latest()
+                if success:
+                    logger.info(f"✅ Git pull: {msg}")
+                else:
+                    logger.warning(f"⚠️  Git pull failed: {msg}")
+                    logger.info("Continuing with HTTP sync as fallback")
+            except Exception as e:
+                logger.warning(f"Git pull error (continuing with HTTP sync): {e}")
+        else:
+            logger.debug("Cache is not a git repository, skipping git operations")
+
         results = {
             "synced": [],
             "cached": [],
@@ -819,6 +851,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 :]
@@ -939,7 +977,8 @@ class GitSourceSyncService:
         """
         import shutil
 
-        deployment_dir = project_dir / ".claude-mpm" / "agents"
+        # Deploy to .claude/agents/ where Claude Code expects them
+        deployment_dir = project_dir / ".claude" / "agents"
         deployment_dir.mkdir(parents=True, exist_ok=True)
 
         results = {

claude_mpm/services/agents/toolchain_detector.py

@@ -158,12 +158,13 @@ class ToolchainDetector:
         "make": ["ops"],
     }
 
-    # Core agents always included
+    # Core agents always included (use exact agent IDs from repository)
     CORE_AGENTS = [
-        "qa",
-        "research",
-        "documentation",
+        "qa-agent",
+        "research-agent",
+        "documentation-agent",
         "ticketing",
+        "local-ops-agent",
     ]
 
     # Directories to exclude from scanning
@@ -365,7 +366,7 @@ 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 (qa-agent, research-agent, documentation-agent, ticketing, local-ops-agent).
 
         Args:
             toolchain: Detected toolchain dictionary with languages, frameworks, tools

claude_mpm/services/analysis/__init__.py

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