claude-mpm 5.0.9__py3-none-any.whl → 5.6.23__py3-none-any.whl

claude_mpm/services/agents/deployment/agent_deployment.py

@@ -876,13 +876,13 @@ class AgentDeploymentService(ConfigServiceBase, AgentDeploymentInterface):
             user_agents_dir = potential_user_dir
             self.logger.info(f"Found user agents at: {user_agents_dir}")
 
-        # Check for remote agents (cached from GitHub)
-        remote_agents_dir = None
+        # Check for agents cache (from Git sources)
+        agents_cache_dir = None
         cache_dir = user_home / ".claude-mpm" / "cache"
-        potential_remote_dir = cache_dir / "remote-agents"
-        if potential_remote_dir.exists():
-            remote_agents_dir = potential_remote_dir
-            self.logger.info(f"Found remote agents cache at: {remote_agents_dir}")
+        potential_cache_dir = cache_dir / "agents"
+        if potential_cache_dir.exists():
+            agents_cache_dir = potential_cache_dir
+            self.logger.info(f"Found agents cache at: {agents_cache_dir}")
 
         # Get agents with version comparison and cleanup (4-tier discovery)
         agents_to_deploy, agent_sources, cleanup_results = (
@@ -890,7 +890,7 @@ class AgentDeploymentService(ConfigServiceBase, AgentDeploymentInterface):
                 system_templates_dir=system_templates_dir,
                 project_agents_dir=project_agents_dir,
                 user_agents_dir=user_agents_dir,
-                remote_agents_dir=remote_agents_dir,  # NEW: 4th tier
+                agents_cache_dir=agents_cache_dir,  # NEW: 4th tier
                 working_directory=self.working_directory,
                 excluded_agents=excluded_agents,
                 config=config,
@@ -898,6 +898,9 @@ class AgentDeploymentService(ConfigServiceBase, AgentDeploymentInterface):
             )
         )
 
+        # Keep track of all enabled agents before filtering (for cleanup)
+        all_enabled_agents = agents_to_deploy.copy()
+
         # Compare with deployed versions if agents directory exists
         if agents_dir.exists():
             comparison_results = self.multi_source_service.compare_deployed_versions(
@@ -954,6 +957,25 @@ class AgentDeploymentService(ConfigServiceBase, AgentDeploymentInterface):
                         f"All {len(comparison_results.get('up_to_date', []))} agents are up to date"
                     )
 
+        # Cleanup excluded agents (remove agents not in deployment list)
+        # CRITICAL: Use all_enabled_agents (before filtering for updates) to preserve up-to-date agents
+        # Bug fix (1M-XXX): Previously used filtered agents_to_deploy which could be empty,
+        # causing all agents to be removed when everything was up-to-date
+        exclusion_cleanup_results = self.multi_source_service.cleanup_excluded_agents(
+            deployed_agents_dir=agents_dir,
+            agents_to_deploy=all_enabled_agents,
+        )
+
+        # Add exclusion cleanup results to main cleanup results
+        if exclusion_cleanup_results.get("removed"):
+            cleanup_results.setdefault("excluded_removed", []).extend(
+                exclusion_cleanup_results["removed"]
+            )
+            self.logger.info(
+                f"Removed {len(exclusion_cleanup_results['removed'])} excluded agents: "
+                f"{', '.join(exclusion_cleanup_results['removed'])}"
+            )
+
         # Convert to list of Path objects
         template_files = list(agents_to_deploy.values())
 

claude_mpm/services/agents/deployment/agent_discovery_service.py

@@ -215,9 +215,8 @@ class AgentDiscoveryService:
             # Extract YAML frontmatter
             frontmatter = self._extract_yaml_frontmatter(template_content)
             if not frontmatter:
-                self.logger.warning(
-                    f"No valid YAML frontmatter in {template_file.name}"
-                )
+                # Silently return None for files without frontmatter
+                # (e.g., PM instruction templates in templates/ directory)
                 return None
 
             # Extract metadata directly from frontmatter (flat structure)
@@ -249,7 +248,9 @@ class AgentDiscoveryService:
             return agent_info
 
         except yaml.YAMLError as e:
-            self.logger.error(f"Invalid YAML frontmatter in {template_file.name}: {e}")
+            self.logger.warning(
+                f"Invalid YAML frontmatter in {template_file.name}: {e}"
+            )
             return None
         except Exception as e:
             self.logger.error(
@@ -432,7 +433,7 @@ class AgentDiscoveryService:
             return True
 
         except yaml.YAMLError:
-            self.logger.error(
+            self.logger.warning(
                 f"Invalid YAML frontmatter in template: {template_file.name}"
             )
             return False

claude_mpm/services/agents/deployment/agent_format_converter.py

@@ -137,8 +137,8 @@ class AgentFormatConverter:
         else:
             pass
 
-        # Extract additional fields
-        model = self.extract_yaml_field(yaml_content, "model") or "sonnet"
+        # Extract additional fields - model is optional (Claude Code uses conversation model if not set)
+        model = self.extract_yaml_field(yaml_content, "model")  # None if not specified
         author = (
             self.extract_yaml_field(yaml_content, "author")
             or "claude-mpm@anthropic.com"
@@ -147,7 +147,7 @@ class AgentFormatConverter:
         # Extract instructions from YAML content
         instructions = self._extract_instructions_from_yaml(yaml_content, agent_name)
 
-        # Map model names to Claude Code format
+        # Map model names to Claude Code format (only if model is specified)
         model_map = {
             "claude-3-5-sonnet-20241022": "sonnet",
             "claude-3-5-sonnet": "sonnet",
@@ -159,7 +159,8 @@ class AgentFormatConverter:
             "opus": "opus",
         }
 
-        mapped_model = model_map.get(model, "sonnet")
+        # Only map model if it's not None (preserve None for agents without model field)
+        mapped_model = model_map.get(model, model) if model is not None else None
 
         # Create multiline description with example (Claude Code format)
         multiline_description = f"""{description}
@@ -172,16 +173,27 @@ assistant: "I'll use the {name} agent to provide specialized assistance."
 
         # Build new YAML frontmatter - Claude Code compatible format
         # NOTE: Removed tags field and other non-essential fields for Claude Code compatibility
-        new_frontmatter = f"""---
-name: {name}
-description: |
-  {self._indent_text(multiline_description, 2)}
-model: {mapped_model}
-version: "{version}"
-author: "{author}"
----
+        frontmatter_lines = [
+            "---",
+            f"name: {name}",
+            "description: |",
+            f"  {self._indent_text(multiline_description, 2)}",
+        ]
 
-"""
+        # Only include model field if explicitly set in source
+        if mapped_model is not None:
+            frontmatter_lines.append(f"model: {mapped_model}")
+
+        frontmatter_lines.extend(
+            [
+                f'version: "{version}"',
+                f'author: "{author}"',
+                "---",
+                "",
+            ]
+        )
+
+        new_frontmatter = "\n".join(frontmatter_lines)
 
         return new_frontmatter + instructions
 

claude_mpm/services/agents/deployment/agent_template_builder.py

@@ -129,13 +129,14 @@ class AgentTemplateBuilder:
                 base_templates.append(base_agent_file)
                 self.logger.debug(f"Found BASE-AGENT.md at: {base_agent_file}")
 
-            # Stop at git repository root if detected
+            # Stop at git repository root if detected (check AFTER finding BASE-AGENT.md)
             if (current_dir / ".git").exists():
                 self.logger.debug(f"Reached git repository root at: {current_dir}")
                 break
 
-            # Stop at common repository root indicators
-            if current_dir.name in [".claude-mpm", "remote-agents", "cache"]:
+            # Stop at common repository root indicators (check AFTER finding BASE-AGENT.md)
+            # Stop at cache root or .claude-mpm directory
+            if current_dir.name in [".claude-mpm", "cache"]:
                 self.logger.debug(
                     f"Reached repository root indicator at: {current_dir}"
                 )
@@ -418,7 +419,7 @@ class AgentTemplateBuilder:
         if non_standard:
             self.logger.info(f"Using non-standard tools: {non_standard}")
 
-        # Extract model from template with fallback
+        # Extract model from template (no fallback - preserve None if not specified)
         capabilities_model = (
             capabilities.get("model") if isinstance(capabilities, dict) else None
         )
@@ -427,7 +428,7 @@ class AgentTemplateBuilder:
             template_data.get("model")
             or capabilities_model
             or template_data.get("configuration_fields", {}).get("model")
-            or "sonnet"  # Default fallback
+            # No default fallback - preserve None if not set
         )
 
         # Convert tools list to comma-separated string (without spaces for compatibility)
@@ -447,11 +448,11 @@ class AgentTemplateBuilder:
             "opus": "opus",
         }
 
-        if model in model_map:
-            model = model_map[model]
-        else:
-            # Default to sonnet if model not found in map
-            model = "sonnet"
+        # Only map model if it's not None
+        if model is not None:
+            if model in model_map:
+                model = model_map[model]
+            # If model is specified but not in map, keep as-is (no default)
 
         # Get response format from template or use base agent default
         template_data.get("response", {}).get("format", "structured")
@@ -558,8 +559,9 @@ class AgentTemplateBuilder:
             f"description: {self._format_description_for_yaml(description)}"
         )
 
-        # Add model field (required for Claude Code)
-        frontmatter_lines.append(f"model: {model}")
+        # Add model field only if explicitly set (not required for Claude Code)
+        if model is not None:
+            frontmatter_lines.append(f"model: {model}")
 
         # Add type field (important for agent categorization)
         if agent_type and agent_type != "general":
@@ -584,6 +586,14 @@ class AgentTemplateBuilder:
             tags_str = ",".join(metadata["tags"])
             frontmatter_lines.append(f"tags: {tags_str}")
 
+        # CRITICAL: Preserve skills field from template for selective skill deployment
+        # Skills are used by startup.py to determine which skills to deploy
+        skills = template_data.get("skills", [])
+        if skills and isinstance(skills, list):
+            frontmatter_lines.append("skills:")
+            for skill in skills:
+                frontmatter_lines.append(f"- {skill}")
+
         frontmatter_lines.extend(
             [
                 "---",
@@ -675,6 +685,7 @@ Only include memories that are:
 """
             content = content + memory_instructions
 
+        # Combine frontmatter and content
         return frontmatter + content
 
     def build_agent_yaml(
@@ -716,21 +727,32 @@ Only include memories that are:
             "description", f"{name} agent for specialized tasks"
         )
 
-        # Get tools and model with fallbacks
+        # Get tools and model (no fallback for model)
         raw_tools = merged_config.get("tools")
         tools = self.normalize_tools_input(raw_tools)
-        model = merged_config.get("model", "sonnet")
+        model = merged_config.get("model")  # No default - preserve None
 
         # Format tools as YAML list
         tools_yaml = self.format_yaml_list(tools, 2)
 
         # Build YAML content with only essential fields
-        return f"""name: {name}
-description: {description}
-model: {model}
-tools:
-{tools_yaml}
-"""
+        yaml_lines = [
+            f"name: {name}",
+            f"description: {description}",
+        ]
+
+        # Only include model if explicitly set
+        if model is not None:
+            yaml_lines.append(f"model: {model}")
+
+        yaml_lines.extend(
+            [
+                "tools:",
+                tools_yaml,
+            ]
+        )
+
+        return "\n".join(yaml_lines) + "\n"
 
     def merge_narrative_fields(self, base_data: dict, template_data: dict) -> dict:
         """

claude_mpm/services/agents/deployment/agents_directory_resolver.py

@@ -8,7 +8,7 @@ DEPLOYMENT ARCHITECTURE:
 
 Agent Source Locations (Discovery):
 -----------------------------------
-1. System Agents:  ~/.claude-mpm/cache/remote-agents/bobmatnyc/claude-mpm-agents/
+1. System Agents:  ~/.claude-mpm/cache/agents/bobmatnyc/claude-mpm-agents/
    - Synced from GitHub repository
    - Read-only (managed by git pull)
    - 44+ agents organized by category
@@ -39,7 +39,7 @@ Why Project-Level Deployment?
 Example Flow:
 -------------
 1. User runs: claude-mpm agents deploy
-2. Agents synced from GitHub → ~/.claude-mpm/cache/remote-agents/
+2. Agents synced from GitHub → ~/.claude-mpm/cache/agents/
 3. Agents deployed FROM cache → .claude/agents/
 4. Claude Code discovers agents FROM .claude/agents/
 

claude_mpm/services/agents/deployment/async_agent_deployment.py

@@ -551,38 +551,39 @@ class AsyncAgentDeploymentService:
             or ["Read", "Write", "Edit", "Grep", "Glob", "LS"]  # Default fallback
         )
 
-        # Get model from capabilities.model in new format
+        # Get model from capabilities.model in new format (no default fallback)
         model = (
             agent_data.get("capabilities", {}).get("model")
             or agent_data.get("configuration_fields", {}).get("model")
-            or "sonnet"  # Default fallback
+            # No default fallback - preserve None if not set
         )
 
-        # Simplify model name for Claude Code
-        model_map = {
-            "claude-4-sonnet-20250514": "sonnet",
-            "claude-sonnet-4-20250514": "sonnet",
-            "claude-opus-4-20250514": "opus",
-            "claude-3-opus-20240229": "opus",
-            "claude-3-haiku-20240307": "haiku",
-            "claude-3.5-sonnet": "sonnet",
-            "claude-3-sonnet": "sonnet",
-        }
-        # Better fallback: extract the model type (opus/sonnet/haiku) from the string
-        if model not in model_map:
-            if "opus" in model.lower():
-                model = "opus"
-            elif "sonnet" in model.lower():
-                model = "sonnet"
-            elif "haiku" in model.lower():
-                model = "haiku"
+        # Simplify model name for Claude Code (only if model is specified)
+        if model is not None:
+            model_map = {
+                "claude-4-sonnet-20250514": "sonnet",
+                "claude-sonnet-4-20250514": "sonnet",
+                "claude-opus-4-20250514": "opus",
+                "claude-3-opus-20240229": "opus",
+                "claude-3-haiku-20240307": "haiku",
+                "claude-3.5-sonnet": "sonnet",
+                "claude-3-sonnet": "sonnet",
+            }
+            # Better fallback: extract the model type (opus/sonnet/haiku) from the string
+            if model not in model_map:
+                if "opus" in model.lower():
+                    model = "opus"
+                elif "sonnet" in model.lower():
+                    model = "sonnet"
+                elif "haiku" in model.lower():
+                    model = "haiku"
+                else:
+                    # Last resort: try to extract from hyphenated format
+                    model = model_map.get(
+                        model, model.split("-")[-1] if "-" in model else model
+                    )
             else:
-                # Last resort: try to extract from hyphenated format
-                model = model_map.get(
-                    model, model.split("-")[-1] if "-" in model else model
-                )
-        else:
-            model = model_map[model]
+                model = model_map[model]
 
         # Convert tools list to comma-separated string for Claude Code compatibility
         # IMPORTANT: No spaces after commas - Claude Code requires exact format
@@ -601,9 +602,12 @@ class AsyncAgentDeploymentService:
             f"base_version: {self._format_version_display(base_version)}",
             "author: claude-mpm",  # Identify as system agent for deployment
             f"tools: {tools_str}",
-            f"model: {model}",
         ]
 
+        # Only include model field if explicitly set
+        if model is not None:
+            frontmatter_lines.append(f"model: {model}")
+
         # Add optional fields if present
         # Check for color in metadata section (new format) or root (old format)
         color = agent_data.get("metadata", {}).get("color") or agent_data.get("color")