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

claude_mpm/agents/agent_loader.py

@@ -45,7 +45,6 @@ from claude_mpm.core.logging_utils import get_logger
 
 # Import modular components
 from claude_mpm.core.unified_agent_registry import AgentTier, get_agent_registry
-from claude_mpm.core.unified_paths import get_path_manager
 from claude_mpm.services.memory.cache.shared_prompt_cache import SharedPromptCache
 
 from ..core.agent_name_normalizer import AgentNameNormalizer
@@ -102,33 +101,27 @@ def _get_agent_templates_dirs() -> Dict[AgentTier, Optional[Path]]:
     """
     Get directories containing agent JSON files across all tiers.
 
-    Returns a dictionary mapping tiers to their agent directories:
-    - PROJECT: .claude-mpm/agents in the current working directory
-    - USER: ~/.claude-mpm/agents
-    - SYSTEM: Built-in agents relative to this module
+    SIMPLIFIED ARCHITECTURE:
+    - SOURCE: ~/.claude-mpm/cache/remote-agents/ (git cache from GitHub)
+    - DEPLOYMENT: .claude/agents/ (project-level Claude Code discovery)
 
-    WHY: We support multiple tiers to allow project-specific customization
-    while maintaining backward compatibility with system agents.
+    This function is kept for backward compatibility but the tier-based
+    system is being phased out in favor of the simplified architecture.
 
     Returns:
         Dict mapping AgentTier to Path (or None if not available)
     """
     dirs = {}
 
-    # PROJECT tier - ALWAYS check current working directory dynamically
-    # This ensures we pick up project agents even if CWD changes
-    project_dir = Path.cwd() / get_path_manager().CONFIG_DIR / "agents"
+    # PROJECT tier - Deprecated in simplified architecture
+    # Agents are now deployed to .claude/agents/ directly
+    project_dir = Path.cwd() / ".claude" / "agents"
     if project_dir.exists():
         dirs[AgentTier.PROJECT] = project_dir
         logger.debug(f"Found PROJECT agents at: {project_dir}")
 
-    # USER tier - check user home directory
-    user_config_dir = get_path_manager().get_user_config_dir()
-    if user_config_dir:
-        user_agents_dir = user_config_dir / "agents"
-        if user_agents_dir.exists():
-            dirs[AgentTier.USER] = user_agents_dir
-            logger.debug(f"Found USER agents at: {user_agents_dir}")
+    # USER tier - Deprecated in simplified architecture
+    # (Kept for backward compatibility but not actively used)
 
     # SYSTEM tier - built-in agents
     system_dir = Path(__file__).parent / "templates"

claude_mpm/agents/base_agent_loader.py

@@ -311,42 +311,17 @@ def _remove_test_mode_instructions(content: str) -> str:
     Returns:
         str: Content with test-mode instructions removed
     """
-    lines = content.split("\n")
-    filtered_lines = []
-    skip_section = False
-
-    i = 0
-    while i < len(lines):
-        line = lines[i]
-
-        # Check if we're entering the test response protocol section
-        if line.strip() == "## Standard Test Response Protocol":
-            skip_section = True
-            i += 1
-            continue
-
-        # Check if we're in the test section and need to continue skipping
-        if skip_section:
-            # Check if we've reached a new top-level section (## but not ###)
-            # Only stop skipping when we hit another ## section (same level as test section)
-            if line.startswith("##") and not line.startswith("###"):
-                skip_section = False
-                # Don't skip this line - it's the start of a new section
-                filtered_lines.append(line)
-                i += 1
-                continue
-            # Skip this line as we're still in test section (includes ### subsections)
-            i += 1
-            continue
-
-        # Not in test section, keep the line
-        filtered_lines.append(line)
-        i += 1
-
-    # Join back and clean up extra blank lines
-    result = "\n".join(filtered_lines)
+    import re
+
+    # Pattern matches from "## Standard Test Response Protocol"
+    # until the next "##" (but not "###") or end of string
+    # Uses negative lookahead to stop at ## but not ###
+    pattern = r"## Standard Test Response Protocol\n.*?(?=\n##(?!#)|\Z)"
+
+    # Remove the test section (DOTALL allows . to match newlines)
+    result = re.sub(pattern, "", content, flags=re.DOTALL)
 
-    # Replace multiple consecutive newlines with double newlines
+    # Clean up multiple consecutive newlines
     while "\n\n\n" in result:
         result = result.replace("\n\n\n", "\n\n")
 

claude_mpm/agents/frontmatter_validator.py

@@ -143,6 +143,10 @@ class FrontmatterValidator:
             "dependencies",
             "capabilities",
             "color",
+            # NEW: Collection-based identification fields
+            "collection_id",
+            "source_path",
+            "canonical_id",
         }
 
     def validate_and_correct(self, frontmatter: Dict[str, Any]) -> ValidationResult:
@@ -176,6 +180,8 @@ class FrontmatterValidator:
         self._validate_author_field(corrected, errors, warnings)
         self._validate_tags_field(corrected, errors, warnings)
         self._validate_numeric_fields(corrected, errors, warnings)
+        # NEW: Validate collection-based identification fields
+        self._validate_collection_fields(corrected, field_corrections, errors, warnings)
 
         # Determine if valid
         is_valid = len(errors) == 0
@@ -464,6 +470,68 @@ class FrontmatterValidator:
                     f"Field '{field_name}' value {value} outside recommended range [{min_val}, {max_val}]"
                 )
 
+    def _validate_collection_fields(
+        self,
+        corrected: Dict[str, Any],
+        field_corrections: Dict[str, Any],
+        errors: List[str],
+        warnings: List[str],
+    ) -> None:
+        """Validate collection-based identification fields.
+
+        NEW: Validates collection_id, source_path, and canonical_id fields.
+
+        These fields are auto-populated by RemoteAgentDiscoveryService for remote agents
+        and should follow specific formats:
+        - collection_id: "owner/repo-name" (e.g., "bobmatnyc/claude-mpm-agents")
+        - source_path: Relative path in repo (e.g., "agents/pm.md")
+        - canonical_id: "collection_id:agent_id" or "legacy:filename"
+        """
+        # Validate collection_id format (optional field)
+        if "collection_id" in corrected:
+            collection_id = corrected["collection_id"]
+            if not isinstance(collection_id, str):
+                errors.append(
+                    f"Field 'collection_id' must be a string, got {type(collection_id).__name__}"
+                )
+            elif "/" not in collection_id:
+                warnings.append(
+                    f"Field 'collection_id' should be in format 'owner/repo-name', got '{collection_id}'"
+                )
+
+        # Validate source_path format (optional field)
+        if "source_path" in corrected:
+            source_path = corrected["source_path"]
+            if not isinstance(source_path, str):
+                errors.append(
+                    f"Field 'source_path' must be a string, got {type(source_path).__name__}"
+                )
+
+        # Validate canonical_id format (optional field)
+        if "canonical_id" in corrected:
+            canonical_id = corrected["canonical_id"]
+            if not isinstance(canonical_id, str):
+                errors.append(
+                    f"Field 'canonical_id' must be a string, got {type(canonical_id).__name__}"
+                )
+            elif ":" not in canonical_id:
+                warnings.append(
+                    f"Field 'canonical_id' should be in format 'collection:agent_id' or 'legacy:filename', got '{canonical_id}'"
+                )
+
+        # Auto-generate canonical_id if collection_id is present but canonical_id is missing
+        if "collection_id" in corrected and "canonical_id" not in corrected:
+            collection_id = corrected["collection_id"]
+            agent_id = corrected.get("name", "unknown")
+
+            # Generate canonical_id
+            canonical_id = f"{collection_id}:{agent_id}"
+            corrected["canonical_id"] = canonical_id
+            field_corrections["canonical_id"] = canonical_id
+            warnings.append(
+                f"Auto-generated canonical_id: '{canonical_id}' from collection_id and name"
+            )
+
     def _normalize_model(self, model: str) -> str:
         """
         Normalize model name to standard tier using ModelTier enum.