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

claude_mpm/cli/startup.py

@@ -14,6 +14,52 @@ import warnings
 from pathlib import Path
 
 
+def sync_hooks_on_startup(quiet: bool = False) -> bool:
+    """Ensure hooks are up-to-date on startup.
+
+    WHY: Users can have stale hook configurations in settings.json that cause errors.
+    Reinstalling hooks ensures the hook format matches the current code.
+
+    DESIGN DECISION: Shows brief status message on success for user awareness.
+    Failures are logged but don't prevent startup to ensure claude-mpm remains functional.
+
+    Args:
+        quiet: If True, suppress all output (used internally)
+
+    Returns:
+        bool: True if hooks were synced successfully, False otherwise
+    """
+    try:
+        from ..hooks.claude_hooks.installer import HookInstaller
+
+        installer = HookInstaller()
+
+        # Show brief status (hooks sync is fast)
+        if not quiet:
+            print("Syncing Claude Code hooks...", end=" ", flush=True)
+
+        # Reinstall hooks (force=True ensures update)
+        success = installer.install_hooks(force=True)
+
+        if not quiet:
+            if success:
+                print("✓")
+            else:
+                print("(skipped)")
+
+        return success
+
+    except Exception as e:
+        if not quiet:
+            print("(error)")
+        # Log but don't fail startup
+        from ..core.logger import get_logger
+
+        logger = get_logger("startup")
+        logger.warning(f"Hook sync failed (non-fatal): {e}")
+        return False
+
+
 def check_legacy_cache() -> None:
     """Check for legacy cache/agents/ directory and warn user.
 
@@ -221,78 +267,157 @@ def discover_and_link_runtime_skills():
 
 def deploy_output_style_on_startup():
     """
-    Deploy claude-mpm output style to Claude Code on CLI startup.
+    Deploy claude-mpm output styles to PROJECT-LEVEL directory on CLI startup.
 
-    WHY: Automatically deploy and activate the output style to ensure consistent,
-    professional communication without emojis and exclamation points. This ensures
-    the style is available even when using Claude Code directly (not via chat command).
+    WHY: Automatically deploy output styles to ensure consistent, professional
+    communication without emojis and exclamation points. Styles are project-specific
+    to allow different projects to have different communication styles.
 
-    DESIGN DECISION: This is non-blocking and idempotent. It uses OutputStyleManager
-    which handles version detection, file deployment, and settings activation.
-    Only works for Claude Code >= 1.0.83.
+    DESIGN DECISION: This is non-blocking and idempotent. Deploys to project-level
+    directory (.claude/settings/output-styles/) instead of user-level to maintain
+    project isolation.
+
+    Deploys two styles:
+    - claude-mpm-style.md (professional mode)
+    - claude-mpm-teacher.md (teaching mode)
     """
     try:
+        import shutil
         from pathlib import Path
 
-        from ..core.output_style_manager import OutputStyleManager
-
-        # Create OutputStyleManager instance
-        output_style_manager = OutputStyleManager()
-
-        # Check if Claude Code supports output styles
-        if not output_style_manager.supports_output_styles():
-            # Silently skip - version too old or Claude not installed
-            return
-
-        # Check if already deployed and active
-        settings_file = Path.home() / ".claude" / "settings.json"
-        output_style_file = Path.home() / ".claude" / "output-styles" / "claude-mpm.md"
-
-        already_configured = False
-        if settings_file.exists() and output_style_file.exists():
-            try:
-                import json
-
-                # Check if file has content (bug fix: was skipping empty files)
-                if output_style_file.stat().st_size == 0:
-                    # File is empty, need to redeploy with content
-                    pass  # Fall through to deployment below
-                else:
-                    # File has content, check if already active
-                    settings = json.loads(settings_file.read_text())
-                    if settings.get("activeOutputStyle") == "claude-mpm":
-                        # Already deployed and active with content
-                        already_configured = True
-            except Exception:
-                pass  # Continue with deployment if we can't read settings
+        # Source files (in framework package)
+        package_dir = Path(__file__).parent.parent / "agents"
+        professional_source = package_dir / "CLAUDE_MPM_OUTPUT_STYLE.md"
+        teacher_source = package_dir / "CLAUDE_MPM_TEACHER_OUTPUT_STYLE.md"
+
+        # Target directory (PROJECT-LEVEL, not user-level)
+        project_dir = Path.cwd()
+        output_styles_dir = project_dir / ".claude" / "settings" / "output-styles"
+        professional_target = output_styles_dir / "claude-mpm-style.md"
+        teacher_target = output_styles_dir / "claude-mpm-teacher.md"
+
+        # Create directory if it doesn't exist
+        output_styles_dir.mkdir(parents=True, exist_ok=True)
+
+        # Check if already deployed (both files exist and have content)
+        already_deployed = (
+            professional_target.exists()
+            and teacher_target.exists()
+            and professional_target.stat().st_size > 0
+            and teacher_target.stat().st_size > 0
+        )
 
-        if already_configured:
-            # Show feedback that output style is ready
-            print("✓ Output style configured", flush=True)
+        if already_deployed:
+            # Show feedback that output styles are ready
+            print("✓ Output styles ready", flush=True)
             return
 
-        # Read OUTPUT_STYLE.md content
-        output_style_path = Path(__file__).parent.parent / "agents" / "OUTPUT_STYLE.md"
+        # Deploy both styles
+        deployed_count = 0
+        if professional_source.exists():
+            shutil.copy2(professional_source, professional_target)
+            deployed_count += 1
 
-        if not output_style_path.exists():
-            # No output style file to deploy
-            return
+        if teacher_source.exists():
+            shutil.copy2(teacher_source, teacher_target)
+            deployed_count += 1
 
-        output_style_content = output_style_path.read_text()
+        if deployed_count > 0:
+            print(f"✓ Output styles deployed ({deployed_count} styles)", flush=True)
+        else:
+            # Source files missing - log but don't fail
+            from ..core.logger import get_logger
 
-        # Deploy the output style (deploys file and activates it)
-        output_style_manager.deploy_output_style(output_style_content)
-        print("✓ Output style configured", flush=True)
+            logger = get_logger("cli")
+            logger.debug("Output style source files not found")
 
     except Exception as e:
         # Non-critical - log but don't fail startup
         from ..core.logger import get_logger
 
         logger = get_logger("cli")
-        logger.debug(f"Failed to deploy output style: {e}")
+        logger.debug(f"Failed to deploy output styles: {e}")
         # Continue execution - output style deployment shouldn't block startup
 
 
+def _cleanup_orphaned_agents(deploy_target: Path, deployed_agents: list[str]) -> int:
+    """Remove agents that are managed by claude-mpm but no longer deployed.
+
+    WHY: When agent configurations change, old agents should be removed to avoid
+    confusion and stale agent references. Only removes claude-mpm managed agents,
+    leaving user-created agents untouched.
+
+    SAFETY: Only removes files with claude-mpm ownership markers in frontmatter.
+    Files without frontmatter or without ownership indicators are preserved.
+
+    Args:
+        deploy_target: Path to .claude/agents/ directory
+        deployed_agents: List of agent filenames that should remain
+
+    Returns:
+        Number of agents removed
+    """
+    import re
+
+    import yaml
+
+    from ..core.logger import get_logger
+
+    logger = get_logger("cli")
+    removed_count = 0
+    deployed_set = set(deployed_agents)
+
+    if not deploy_target.exists():
+        return 0
+
+    # Scan all .md files in agents directory
+    for agent_file in deploy_target.glob("*.md"):
+        # Skip hidden files
+        if agent_file.name.startswith("."):
+            continue
+
+        # Skip if this agent should remain deployed
+        if agent_file.name in deployed_set:
+            continue
+
+        # Check if this is a claude-mpm managed agent
+        try:
+            content = agent_file.read_text(encoding="utf-8")
+
+            # Parse YAML frontmatter
+            if content.startswith("---"):
+                match = re.match(r"^---\n(.*?)\n---", content, re.DOTALL)
+                if match:
+                    frontmatter = yaml.safe_load(match.group(1))
+
+                    # Check ownership indicators
+                    is_ours = False
+                    if frontmatter:
+                        author = frontmatter.get("author", "")
+                        source = frontmatter.get("source", "")
+                        agent_id = frontmatter.get("agent_id", "")
+
+                        # It's ours if it has any of these markers
+                        if (
+                            "Claude MPM" in str(author)
+                            or source == "remote"
+                            or agent_id
+                        ):
+                            is_ours = True
+
+                    if is_ours:
+                        # Safe to remove - it's our agent but not deployed
+                        agent_file.unlink()
+                        removed_count += 1
+                        logger.info(f"Removed orphaned agent: {agent_file.name}")
+
+        except Exception as e:
+            logger.debug(f"Could not check agent {agent_file.name}: {e}")
+            # Don't remove if we can't verify ownership
+
+    return removed_count
+
+
 def sync_remote_agents_on_startup():
     """
     Synchronize agent templates from remote sources on startup.
@@ -308,7 +433,8 @@ def sync_remote_agents_on_startup():
     Workflow:
     1. Sync all enabled Git sources (download/cache files) - Phase 1 progress bar
     2. Deploy agents to ~/.claude/agents/ - Phase 2 progress bar
-    3. Log deployment results
+    3. Cleanup orphaned agents (ours but no longer deployed) - Phase 3
+    4. Log deployment results
     """
     # Check for legacy cache and warn user if found
     check_legacy_cache()
@@ -386,6 +512,7 @@ def sync_remote_agents_on_startup():
                     # 1. Must have "/agents/" in path (from git repos)
                     # 2. Must not be in PM templates or doc files
                     # 3. Exclude BASE-AGENT.md which is not a deployable agent
+                    # 4. Exclude build artifacts (dist/, build/, .cache/) to prevent double-counting
                     agent_files = [
                         f
                         for f in all_md_files
@@ -396,44 +523,98 @@ def sync_remote_agents_on_startup():
                             and f.name.lower() not in pm_templates
                             and f.name.lower() not in doc_files
                             and f.name.lower() != "base-agent.md"
+                            # Exclude build artifacts (prevents double-counting source + built files)
+                            and not any(
+                                part in str(f).split("/")
+                                for part in ["dist", "build", ".cache"]
+                            )
                         )
                     ]
                     agent_count = len(agent_files)
 
                 if agent_count > 0:
-                    # Create progress bar for deployment phase
-                    deploy_progress = ProgressBar(
-                        total=agent_count,
-                        prefix="Deploying agents",
-                        show_percentage=True,
-                        show_counter=True,
-                    )
-
-                    # Deploy agents with progress callback
-                    deploy_target = Path.home() / ".claude" / "agents"
+                    # Deploy agents to project-level directory where Claude Code expects them
+                    deploy_target = Path.cwd() / ".claude" / "agents"
                     deployment_result = deployment_service.deploy_agents(
                         target_dir=deploy_target,
                         force_rebuild=False,  # Only deploy if versions differ
                         deployment_mode="update",  # Version-aware updates
                     )
 
-                    # Update progress bar (single increment since deploy_agents is batch)
-                    deploy_progress.update(agent_count)
-
-                    # Finish deployment progress bar
+                    # Get actual counts from deployment result (reflects configured agents)
                     deployed = len(deployment_result.get("deployed", []))
                     updated = len(deployment_result.get("updated", []))
                     skipped = len(deployment_result.get("skipped", []))
-                    total_available = deployed + updated + skipped
+                    total_configured = deployed + updated + skipped
+
+                    # FALLBACK: If deployment result doesn't track skipped agents (async path),
+                    # count existing agents in target directory as "already deployed"
+                    # This ensures accurate reporting when agents are already up-to-date
+                    if total_configured == 0 and deploy_target.exists():
+                        existing_agents = list(deploy_target.glob("*.md"))
+                        # Filter out non-agent files (e.g., README.md, INSTRUCTIONS.md)
+                        agent_count_in_target = len(
+                            [
+                                f
+                                for f in existing_agents
+                                if not f.name.startswith(("README", "INSTRUCTIONS"))
+                            ]
+                        )
+                        if agent_count_in_target > 0:
+                            # All agents already deployed - count them as skipped
+                            skipped = agent_count_in_target
+                            total_configured = agent_count_in_target
+
+                    # Create progress bar with actual configured agent count (not raw file count)
+                    deploy_progress = ProgressBar(
+                        total=total_configured if total_configured > 0 else 1,
+                        prefix="Deploying agents",
+                        show_percentage=True,
+                        show_counter=True,
+                    )
+
+                    # Update progress bar to completion
+                    deploy_progress.update(
+                        total_configured if total_configured > 0 else 1
+                    )
+
+                    # Cleanup orphaned agents (ours but no longer deployed)
+                    # Get list of deployed agent filenames (what should remain)
+                    deployed_filenames = []
+                    for agent_name in deployment_result.get("deployed", []):
+                        deployed_filenames.append(f"{agent_name}.md")
+                    for agent_name in deployment_result.get("updated", []):
+                        deployed_filenames.append(f"{agent_name}.md")
+                    for agent_name in deployment_result.get("skipped", []):
+                        deployed_filenames.append(f"{agent_name}.md")
+
+                    # Run cleanup and get count of removed agents
+                    removed = _cleanup_orphaned_agents(
+                        deploy_target, deployed_filenames
+                    )
 
-                    # Show total available agents (deployed + updated + already existing)
+                    # Show total configured agents (deployed + updated + already existing)
+                    # Include repo count for context and removed count if any
                     if deployed > 0 or updated > 0:
+                        if removed > 0:
+                            deploy_progress.finish(
+                                f"Complete: {deployed} new, {updated} updated, {skipped} unchanged, "
+                                f"{removed} removed ({total_configured} configured from {agent_count} in repo)"
+                            )
+                        else:
+                            deploy_progress.finish(
+                                f"Complete: {deployed} new, {updated} updated, {skipped} unchanged "
+                                f"({total_configured} configured from {agent_count} in repo)"
+                            )
+                    elif removed > 0:
                         deploy_progress.finish(
-                            f"Complete: {deployed} deployed, {updated} updated, {skipped} already present ({total_available} total)"
+                            f"Complete: {total_configured} agents ready - all unchanged, "
+                            f"{removed} removed ({agent_count} available in repo)"
                         )
                     else:
                         deploy_progress.finish(
-                            f"Complete: {total_available} agents ready (all up-to-date)"
+                            f"Complete: {total_configured} agents ready - all unchanged "
+                            f"({agent_count} available in repo)"
                         )
 
                     # Display deployment errors to user (not just logs)
@@ -523,6 +704,8 @@ def sync_remote_skills_on_startup():
 
         # Discover total file count across all sources
         total_file_count = 0
+        total_skill_dirs = 0  # Count actual skill directories (folders with SKILL.md)
+
         for source in enabled_sources:
             try:
                 # Parse GitHub URL
@@ -546,15 +729,26 @@ def sync_remote_skills_on_startup():
                     ]
                     total_file_count += len(relevant_files)
 
+                    # Count skill directories (unique directories containing SKILL.md)
+                    skill_dirs = set()
+                    for f in all_files:
+                        if f.endswith("/SKILL.md"):
+                            # Extract directory path
+                            skill_dir = "/".join(f.split("/")[:-1])
+                            skill_dirs.add(skill_dir)
+                    total_skill_dirs += len(skill_dirs)
+
             except Exception as e:
                 logger.debug(f"Failed to discover files for {source.id}: {e}")
                 # Use estimate if discovery fails
                 total_file_count += 150
+                total_skill_dirs += 50  # Estimate ~50 skills
 
         # Create progress bar for sync phase with actual file count
+        # Note: We sync files (md, json, etc.), but will deploy skill directories
         sync_progress = ProgressBar(
             total=total_file_count if total_file_count > 0 else 1,
-            prefix="Syncing skills",
+            prefix="Syncing skill files",
             show_percentage=True,
             show_counter=True,
         )
@@ -571,51 +765,96 @@ def sync_remote_skills_on_startup():
 
         if cached > 0:
             sync_progress.finish(
-                f"Complete: {downloaded} downloaded, {cached} cached ({total_files} total)"
+                f"Complete: {downloaded} downloaded, {cached} cached ({total_files} files, {total_skill_dirs} skills)"
             )
         else:
             # All new downloads (first sync)
-            sync_progress.finish(f"Complete: {downloaded} files downloaded")
+            sync_progress.finish(
+                f"Complete: {downloaded} files downloaded ({total_skill_dirs} skills)"
+            )
 
         # Phase 2: Deploy skills to ~/.claude/skills/
         # This flattens nested Git structure (e.g., collaboration/parallel-agents/SKILL.md)
         # into flat deployment (e.g., collaboration-dispatching-parallel-agents/SKILL.md)
         if results["synced_count"] > 0:
-            # Get all skills to determine deployment count
+            # Get required skills from deployed agents (selective deployment)
+            from ..services.skills.selective_skill_deployer import (
+                get_required_skills_from_agents,
+            )
+
+            agents_dir = Path.cwd() / ".claude" / "agents"
+            required_skills = get_required_skills_from_agents(agents_dir)
+
+            # Get all skills to determine counts
             all_skills = manager.get_all_skills()
-            skill_count = len(all_skills)
+            total_skill_count = len(all_skills)
 
-            if skill_count > 0:
-                # Create progress bar for deployment phase
-                deploy_progress = ProgressBar(
-                    total=skill_count,
-                    prefix="Deploying skill directories",
-                    show_percentage=True,
-                    show_counter=True,
-                )
+            # Determine skill count based on whether we have agent requirements
+            if required_skills:
+                # Selective deployment: only skills required by deployed agents
+                skill_count = len(required_skills)
+            else:
+                # No agent requirements found - deploy all skills
+                skill_count = total_skill_count
 
-                # Deploy skills with progress callback
+            if skill_count > 0:
+                # Deploy skills with selective filter (if agent requirements exist)
                 # Deploy to project directory (like agents), not user directory
                 deployment_result = manager.deploy_skills(
                     target_dir=Path.cwd() / ".claude" / "skills",
                     force=False,
-                    progress_callback=deploy_progress.update,
+                    skill_filter=required_skills if required_skills else None,
                 )
 
-                # Finish deployment progress bar
+                # Get actual counts from deployment result
                 deployed = deployment_result.get("deployed_count", 0)
                 skipped = deployment_result.get("skipped_count", 0)
+                filtered = deployment_result.get("filtered_count", 0)
                 total_available = deployed + skipped
 
+                # Only show progress bar if there are skills to deploy
+                if total_available > 0:
+                    deploy_progress = ProgressBar(
+                        total=total_available,
+                        prefix="Deploying skill directories",
+                        show_percentage=True,
+                        show_counter=True,
+                    )
+                    # Update progress bar to completion
+                    deploy_progress.update(total_available)
+                else:
+                    # No skills to deploy - create dummy progress for message only
+                    deploy_progress = ProgressBar(
+                        total=1,
+                        prefix="Deploying skill directories",
+                        show_percentage=False,
+                        show_counter=False,
+                    )
+                    deploy_progress.update(1)
+
                 # Show total available skills (deployed + already existing)
-                # This is more user-friendly than just showing newly deployed count
+                # Include filtered count if selective deployment was used
+                # Note: total_skill_count is from the repo, total_available is what's deployed/needed
                 if deployed > 0:
+                    if filtered > 0:
+                        deploy_progress.finish(
+                            f"Complete: {deployed} new, {skipped} unchanged "
+                            f"({total_available} required by agents, {filtered} available in repo)"
+                        )
+                    else:
+                        deploy_progress.finish(
+                            f"Complete: {deployed} new, {skipped} unchanged "
+                            f"({total_available} skills deployed from {total_skill_count} in repo)"
+                        )
+                elif filtered > 0:
+                    # Skills filtered means agents require fewer skills than available
                     deploy_progress.finish(
-                        f"Complete: {deployed} deployed, {skipped} already present ({total_available} total)"
+                        f"Agents require no skills ({total_skill_count} available in repo)"
                     )
                 else:
                     deploy_progress.finish(
-                        f"Complete: {total_available} skills ready (all up-to-date)"
+                        f"Complete: {total_available} skills deployed for agents "
+                        f"({total_skill_count} available in repo)"
                     )
 
                 # Log deployment errors if any
@@ -656,6 +895,11 @@ def run_background_services():
     file creation in project .claude/ directories.
     See: SystemInstructionsDeployer and agent_deployment.py line 504-509
     """
+    # Sync hooks early to ensure up-to-date configuration
+    # RATIONALE: Hooks should be synced before other services to fix stale configs
+    # This is fast (<100ms) and non-blocking, so it doesn't delay startup
+    sync_hooks_on_startup()  # Shows "Syncing Claude Code hooks... ✓"
+
     initialize_project_registry()
     check_mcp_auto_configuration()
     verify_mcp_gateway_startup()