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

claude_mpm/cli/parsers/agents_parser.py

@@ -444,4 +444,141 @@ Available commands:
         help="Show what would be deployed without actually deploying",
     )
 
+    # ============================================================================
+    # Collection-Based Agent Management Commands
+    # ============================================================================
+    # Purpose: Enable collection-based agent selection and deployment
+    # Commands: list-collections, deploy-collection, list-by-collection
+    # NEW: Enhanced agent matching with collection_id support
+    # ============================================================================
+
+    # list-collections: List all available agent collections
+    agents_subparsers.add_parser(
+        "list-collections",
+        help="List all available agent collections",
+        description="Display all agent collections with agent counts and collection metadata",
+    )
+
+    # deploy-collection: Deploy all agents from a specific collection
+    deploy_collection_parser = agents_subparsers.add_parser(
+        "deploy-collection",
+        help="Deploy all agents from a specific collection",
+        description="Deploy all agents from a named collection (e.g., 'bobmatnyc/claude-mpm-agents')",
+    )
+    deploy_collection_parser.add_argument(
+        "collection_id",
+        help="Collection ID in format 'owner/repo-name' (e.g., 'bobmatnyc/claude-mpm-agents')",
+    )
+    deploy_collection_parser.add_argument(
+        "--force",
+        "-f",
+        action="store_true",
+        help="Force redeployment even if agents are already deployed",
+    )
+    deploy_collection_parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="Show what would be deployed without actually deploying",
+    )
+
+    # list-by-collection: List agents filtered by collection
+    list_by_collection_parser = agents_subparsers.add_parser(
+        "list-by-collection",
+        help="List agents from a specific collection",
+        description="Display agents from a specific collection with metadata",
+    )
+    list_by_collection_parser.add_argument(
+        "collection_id",
+        help="Collection ID to filter by (e.g., 'bobmatnyc/claude-mpm-agents')",
+    )
+    list_by_collection_parser.add_argument(
+        "--format",
+        choices=["table", "json", "yaml"],
+        default="table",
+        help="Output format (default: table)",
+    )
+
+    # ============================================================================
+    # Cache Git Management Commands (claude-mpm Issue 1M-442 Phase 2)
+    # ============================================================================
+    # Purpose: Enable git workflow for agent cache management
+    # Commands: cache-status, cache-pull, cache-commit, cache-push, cache-sync
+    # Documentation: See docs/research/cache-update-workflow-analysis-2025-12-03.md
+    # ============================================================================
+
+    # cache-status: Show git status of agent cache
+    agents_subparsers.add_parser(
+        "cache-status",
+        help="Show git status of agent cache directory",
+        description="Display git status including branch, uncommitted changes, and unpushed commits",
+    )
+
+    # cache-pull: Pull latest agents from remote
+    cache_pull_parser = agents_subparsers.add_parser(
+        "cache-pull",
+        help="Pull latest agents from remote repository",
+        description="Fetch and merge latest agent changes from GitHub remote repository",
+    )
+    cache_pull_parser.add_argument(
+        "--branch",
+        default="main",
+        help="Branch to pull from (default: main)",
+    )
+
+    # cache-commit: Commit changes to agent cache
+    cache_commit_parser = agents_subparsers.add_parser(
+        "cache-commit",
+        help="Commit changes to agent cache",
+        description="Stage and commit changes to local agent cache git repository",
+    )
+    cache_commit_parser.add_argument(
+        "--message",
+        "-m",
+        help="Commit message (default: 'feat: update agents from local development')",
+    )
+    cache_commit_parser.add_argument(
+        "--files",
+        nargs="+",
+        help="Specific files to commit (default: all modified files)",
+    )
+
+    # cache-push: Push agent changes to remote
+    cache_push_parser = agents_subparsers.add_parser(
+        "cache-push",
+        help="Push agent changes to remote repository",
+        description="Push committed changes from local cache to GitHub remote repository",
+    )
+    cache_push_parser.add_argument(
+        "--branch",
+        default="main",
+        help="Branch to push to (default: main)",
+    )
+    cache_push_parser.add_argument(
+        "--auto-commit",
+        action="store_true",
+        help="Automatically commit uncommitted changes before pushing",
+    )
+
+    # cache-sync: Full cache sync workflow
+    cache_sync_parser = agents_subparsers.add_parser(
+        "cache-sync",
+        help="Full agent cache sync with remote",
+        description="Complete sync workflow: pull latest, commit local changes, push to remote",
+    )
+    cache_sync_parser.add_argument(
+        "--message",
+        "-m",
+        help="Commit message for any uncommitted changes",
+    )
+    cache_sync_parser.add_argument(
+        "--skip-pull",
+        action="store_true",
+        help="Skip pulling from remote before sync",
+    )
+    cache_sync_parser.add_argument(
+        "--skip-push",
+        action="store_true",
+        help="Skip pushing to remote after sync",
+    )
+
     return agents_parser

claude_mpm/cli/parsers/auto_configure_parser.py

@@ -88,6 +88,19 @@ Examples:
         help="Skip confirmation prompts and deploy automatically",
     )
 
+    # Scope selection
+    scope_group = auto_configure_parser.add_mutually_exclusive_group()
+    scope_group.add_argument(
+        "--agents-only",
+        action="store_true",
+        help="Configure agents only (skip skills)",
+    )
+    scope_group.add_argument(
+        "--skills-only",
+        action="store_true",
+        help="Configure skills only (skip agents)",
+    )
+
     # Configuration options
     auto_configure_parser.add_argument(
         "--min-confidence",

claude_mpm/cli/parsers/base_parser.py

@@ -553,6 +553,10 @@ def create_parser(
 
         add_doctor_parser(subparsers)
 
+        from ..commands.postmortem import add_postmortem_parser
+
+        add_postmortem_parser(subparsers)
+
         # Add upgrade command
         from ..commands.upgrade import add_upgrade_parser
 
@@ -590,6 +594,11 @@ def create_parser(
             action="store_true",
             help="Skip confirmation prompts",
         )
+
+        # Add summarize command
+        from ..commands.summarize import add_summarize_parser
+
+        add_summarize_parser(subparsers)
     except ImportError:
         # Commands module may not be available during testing or refactoring
         pass

claude_mpm/cli/parsers/skills_parser.py

@@ -134,6 +134,13 @@ def add_skills_subparser(subparsers) -> argparse.ArgumentParser:
         help="Show configuration file path",
     )
 
+    # Configure command (interactive skills selection)
+    skills_subparsers.add_parser(
+        SkillsCommands.CONFIGURE.value,
+        help="Interactive skills configuration with checkbox selection (like agents configure)",
+    )
+    # No additional arguments needed - purely interactive
+
     # GitHub deployment commands
     # Deploy from GitHub command
     deploy_github_parser = skills_subparsers.add_parser(

claude_mpm/cli/startup.py

@@ -10,6 +10,47 @@ Part of cli/__init__.py refactoring to reduce file size and improve modularity.
 
 import os
 import sys
+import warnings
+from pathlib import Path
+
+
+def check_legacy_cache() -> None:
+    """Check for legacy cache/agents/ directory and warn user.
+
+    WHY: cache/agents/ is deprecated in favor of cache/remote-agents/.
+    Research confirmed that cache/remote-agents/ is the canonical location
+    with 26 active code references, while cache/agents/ has only 7 legacy references.
+
+    DESIGN DECISIONS:
+    - Non-blocking warning: Doesn't stop execution, just informs user
+    - Migration guidance: Provides clear path to migrate
+    - One-time check: Only warns if legacy cache contains files
+    """
+    home = Path.home()
+    legacy_cache = home / ".claude-mpm" / "cache" / "agents"
+    canonical_cache = home / ".claude-mpm" / "cache" / "remote-agents"
+    migration_marker = home / ".claude-mpm" / "cache" / ".migrated_to_remote_agents"
+
+    # Skip if already migrated or no legacy cache
+    if migration_marker.exists() or not legacy_cache.exists():
+        return
+
+    # Check if legacy cache has actual agent files
+    legacy_files = list(legacy_cache.glob("*.md")) + list(legacy_cache.glob("*.json"))
+    if not legacy_files:
+        return
+
+    # Only warn if canonical cache doesn't exist (indicating unmigrated system)
+    if not canonical_cache.exists():
+        warnings.warn(
+            f"\n⚠️  DEPRECATION: Legacy cache directory detected\n"
+            f"   Location: {legacy_cache}\n"
+            f"   Files found: {len(legacy_files)}\n\n"
+            f"The 'cache/agents/' directory is deprecated. Please migrate to 'cache/remote-agents/'.\n"
+            f"Run: python scripts/migrate_cache_to_remote_agents.py\n",
+            DeprecationWarning,
+            stacklevel=2,
+        )
 
 
 def setup_early_environment(argv):
@@ -180,75 +221,76 @@ 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
 
 
@@ -269,6 +311,9 @@ def sync_remote_agents_on_startup():
     2. Deploy agents to ~/.claude/agents/ - Phase 2 progress bar
     3. Log deployment results
     """
+    # Check for legacy cache and warn user if found
+    check_legacy_cache()
+
     try:
         from ..services.agents.deployment.agent_deployment import AgentDeploymentService
         from ..services.agents.startup_sync import sync_agents_on_startup
@@ -311,8 +356,9 @@ def sync_remote_agents_on_startup():
 
                 if cache_dir.exists():
                     # Count MD files in cache (agent markdown files from Git)
-                    # Only check root directory (avoid counting subdirectory duplicates)
-                    # Exclude PM templates and BASE-AGENT - only count deployable agents
+                    # BUGFIX: Only count files in agent directories, not docs/templates/READMEs
+                    # Valid agent paths must contain "/agents/" or be in root-level category dirs
+                    # Exclude PM templates, BASE-AGENT, and documentation files
                     pm_templates = {
                         "base-agent.md",
                         "circuit_breakers.md",
@@ -324,10 +370,40 @@ def sync_remote_agents_on_startup():
                         "validation_templates.md",
                         "git_file_tracking.md",
                     }
+                    # Documentation files to exclude (by filename)
+                    doc_files = {
+                        "readme.md",
+                        "changelog.md",
+                        "contributing.md",
+                        "implementation-summary.md",
+                        "reorganization-plan.md",
+                        "auto-deploy-index.md",
+                    }
+
+                    # Find all markdown files
+                    all_md_files = list(cache_dir.rglob("*.md"))
+
+                    # Filter to only agent files:
+                    # 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 cache_dir.glob("*.md")
-                        if f.name.lower() not in pm_templates
+                        for f in all_md_files
+                        if (
+                            # Must be in an agent directory (from git repos like bobmatnyc/claude-mpm-agents/agents/)
+                            "/agents/" in str(f)
+                            # Exclude PM templates, doc files, and BASE-AGENT
+                            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)
 
@@ -340,8 +416,8 @@ def sync_remote_agents_on_startup():
                         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
@@ -719,34 +795,6 @@ def check_mcp_auto_configuration():
         logger = get_logger("cli")
         logger.debug(f"MCP auto-configuration check failed: {e}")
 
-    # Also ensure MCP services are properly configured in ~/.claude.json
-    # This fixes incorrect paths and adds missing services
-    try:
-        from ..core.logger import get_logger
-        from ..services.mcp_config_manager import MCPConfigManager
-
-        logger = get_logger("cli")
-        mcp_manager = MCPConfigManager()
-
-        # Fix any corrupted installations first
-        _fix_success, fix_message = mcp_manager.fix_mcp_service_issues()
-        if fix_message and "Fixed:" in fix_message:
-            logger.info(f"MCP service fixes applied: {fix_message}")
-            print("✓ MCP services fixed", flush=True)
-
-        # Ensure all services are configured correctly
-        _config_success, config_message = mcp_manager.ensure_mcp_services_configured()
-        if config_message and "Added MCP services" in config_message:
-            logger.info(f"MCP services configured: {config_message}")
-            print("✓ MCP services configured", flush=True)
-
-    except Exception as e:
-        # Non-critical - log but don't fail
-        from ..core.logger import get_logger
-
-        logger = get_logger("cli")
-        logger.debug(f"MCP services configuration update failed: {e}")
-
 
 def verify_mcp_gateway_startup():
     """

claude_mpm/commands/mpm-agents-auto-configure.md

@@ -1,10 +1,10 @@
 ---
 namespace: mpm/agents
 command: auto-configure
-aliases: [mpm-agents-auto-configure, mpm-auto-configure]
+aliases: [mpm-agents-auto-configure]
 migration_target: /mpm/agents:auto-configure
 category: agents
-deprecated_aliases: []
+deprecated_aliases: [mpm-auto-configure]
 description: Automatically detect project toolchain and configure appropriate agents
 ---
 # Automatically configure agents based on project detection

claude_mpm/commands/mpm-agents-list.md

@@ -1,10 +1,10 @@
 ---
 namespace: mpm/agents
 command: list
-aliases: [mpm-agents, mpm-agents-list]
+aliases: [mpm-agents-list]
 migration_target: /mpm/agents:list
 category: agents
-deprecated_aliases: []
+deprecated_aliases: [mpm-agents]
 description: List all available Claude MPM agents with versions and deployment status
 ---
 # Show available agents and their versions

claude_mpm/commands/mpm-config-view.md

@@ -1,10 +1,10 @@
 ---
 namespace: mpm/config
 command: view
-aliases: [mpm-config-view, mpm-config]
+aliases: [mpm-config-view]
 migration_target: /mpm/config:view
 category: config
-deprecated_aliases: []
+deprecated_aliases: [mpm-config]
 description: View and validate Claude MPM configuration settings
 ---
 # View and validate claude-mpm configuration

claude_mpm/commands/mpm-help.md

@@ -72,6 +72,9 @@ Available Commands:
 /mpm-doctor [--fix] [--verbose]
   Diagnose and fix common issues
 
+/mpm-postmortem [--auto-fix] [--create-prs]
+  Analyze session errors and suggest improvements
+
 /mpm-agents [list|deploy|remove] [name]
   Manage agent deployment
 

claude_mpm/commands/{mpm-ticket-organize.md → mpm-organize.md}

@@ -1,10 +1,9 @@
 ---
-namespace: mpm/ticket
+namespace: mpm/system
 command: organize
-aliases: [mpm-ticket-organize, mpm-organize]
-migration_target: /mpm/ticket:organize
-category: tickets
-deprecated_aliases: []
+aliases: [mpm-organize]
+migration_target: /mpm/system:organize
+category: system
 description: Organize project files into proper directories with intelligent pattern detection
 ---
 # /mpm-organize