claude-mpm 5.4.85__py3-none-any.whl → 5.6.76__py3-none-any.whl

claude_mpm/cli/commands/commander.py

@@ -0,0 +1,216 @@
+"""Commander command handler for CLI."""
+
+import asyncio
+import logging
+import shutil
+import threading
+import time
+from pathlib import Path
+
+logger = logging.getLogger(__name__)
+
+# ANSI colors
+CYAN = "\033[36m"
+DIM = "\033[2m"
+BOLD = "\033[1m"
+YELLOW = "\033[33m"
+GREEN = "\033[32m"
+RED = "\033[31m"
+RESET = "\033[0m"
+
+
+def _get_terminal_width() -> int:
+    """Get terminal width with reasonable bounds."""
+    try:
+        width = shutil.get_terminal_size().columns
+        return max(80, min(width, 120))
+    except Exception:
+        return 100
+
+
+def _get_version() -> str:
+    """Get Commander version."""
+    version_file = Path(__file__).parent.parent.parent / "VERSION"
+    if version_file.exists():
+        return version_file.read_text().strip()
+    return "unknown"
+
+
+def display_commander_banner():
+    """Display Commander-specific startup banner."""
+    width = _get_terminal_width()
+    version = _get_version()
+
+    # Commander ASCII art banner
+    banner = f"""
+{CYAN}╭{"─" * (width - 2)}╮{RESET}
+{CYAN}│{RESET}{BOLD}  ⚡ MPM Commander {RESET}{DIM}v{version}{RESET}{" " * (width - 24 - len(version))}│
+{CYAN}│{RESET}{DIM}  Multi-Project AI Orchestration{RESET}{" " * (width - 36)}│
+{CYAN}├{"─" * (width - 2)}┤{RESET}
+{CYAN}│{RESET}  {YELLOW}ALPHA{RESET} - APIs may change                                {" " * (width - 55)}│
+{CYAN}╰{"─" * (width - 2)}╯{RESET}
+"""
+    print(banner)
+
+
+def _count_cached_agents() -> int:
+    """Count cached agents from ~/.claude-mpm/cache/agents/."""
+    try:
+        cache_agents_dir = Path.home() / ".claude-mpm" / "cache" / "agents"
+        if not cache_agents_dir.exists():
+            return 0
+        # Recursively find all .md files excluding base/README files
+        agent_files = [
+            f
+            for f in cache_agents_dir.rglob("*.md")
+            if f.is_file()
+            and not f.name.startswith(".")
+            and f.name not in ("README.md", "BASE-AGENT.md", "INSTRUCTIONS.md")
+        ]
+        return len(agent_files)
+    except Exception:
+        return 0
+
+
+def _count_cached_skills() -> int:
+    """Count cached skills from ~/.claude-mpm/cache/skills/."""
+    try:
+        cache_skills_dir = Path.home() / ".claude-mpm" / "cache" / "skills"
+        if not cache_skills_dir.exists():
+            return 0
+        # Recursively find all directories containing SKILL.md
+        skill_files = list(cache_skills_dir.rglob("SKILL.md"))
+        return len(skill_files)
+    except Exception:
+        return 0
+
+
+def load_agents_and_skills():
+    """Load agents and skills for Commander sessions."""
+    try:
+        print(f"{DIM}Loading agents...{RESET}", end=" ", flush=True)
+        agent_count = _count_cached_agents()
+        print(f"{GREEN}✓{RESET} {agent_count} agents")
+
+        print(f"{DIM}Loading skills...{RESET}", end=" ", flush=True)
+        skill_count = _count_cached_skills()
+        print(f"{GREEN}✓{RESET} {skill_count} skills")
+
+        return agent_count, skill_count
+    except Exception as e:
+        logger.warning(f"Could not load agents/skills: {e}")
+        print(f"{YELLOW}⚠{RESET} Could not load agents/skills")
+        return 0, 0
+
+
+def handle_commander_command(args) -> int:
+    """Handle the commander command with auto-starting daemon.
+
+    Args:
+        args: Parsed command line arguments with:
+            - port: Port for daemon (default: 8765)
+            - host: Host for daemon (default: 127.0.0.1)
+            - state_dir: Optional state directory path
+            - debug: Enable debug logging
+            - no_chat: Start daemon only without interactive chat
+            - daemon_only: Alias for no_chat
+
+    Returns:
+        Exit code (0 for success, 1 for error)
+    """
+    try:
+        # Import here to avoid circular dependencies
+        import requests
+
+        from claude_mpm.commander.chat.cli import run_commander
+        from claude_mpm.commander.config import DaemonConfig
+        from claude_mpm.commander.daemon import main as daemon_main
+
+        # Setup debug logging if requested
+        if getattr(args, "debug", False):
+            logging.basicConfig(
+                level=logging.DEBUG,
+                format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+            )
+
+        # Display Commander banner
+        display_commander_banner()
+
+        # Load agents and skills
+        load_agents_and_skills()
+
+        print()  # Blank line after loading
+
+        # Get arguments
+        port = getattr(args, "port", 8766)  # NetworkPorts.COMMANDER_DEFAULT
+        host = getattr(args, "host", "127.0.0.1")
+        state_dir = getattr(args, "state_dir", None)
+        no_chat = getattr(args, "no_chat", False) or getattr(args, "daemon_only", False)
+
+        # Check if daemon already running
+        daemon_running = False
+        try:
+            resp = requests.get(f"http://{host}:{port}/api/health", timeout=1)
+            if resp.status_code == 200:
+                print(f"{GREEN}✓{RESET} Daemon already running on {host}:{port}")
+                daemon_running = True
+        except (requests.RequestException, requests.ConnectionError):
+            pass
+
+        # Start daemon if not running
+        if not daemon_running:
+            print(
+                f"{DIM}Starting daemon on {host}:{port}...{RESET}", end=" ", flush=True
+            )
+
+            # Create daemon config
+            config_kwargs = {"host": host, "port": port}
+            if state_dir:
+                config_kwargs["state_dir"] = state_dir
+            config = DaemonConfig(**config_kwargs)
+
+            # Start daemon in background thread
+            daemon_thread = threading.Thread(
+                target=lambda: asyncio.run(daemon_main(config)), daemon=True
+            )
+            daemon_thread.start()
+
+            # Wait for daemon to be ready (max 3 seconds)
+            for _ in range(30):
+                time.sleep(0.1)
+                try:
+                    resp = requests.get(f"http://{host}:{port}/api/health", timeout=1)
+                    if resp.status_code == 200:
+                        print(f"{GREEN}✓{RESET}")
+                        daemon_running = True
+                        break
+                except (requests.RequestException, requests.ConnectionError):
+                    pass
+            else:
+                print(f"{RED}✗{RESET} Failed (timeout)")
+                return 1
+
+        # If daemon-only mode, keep running until interrupted
+        if no_chat:
+            print(f"\n{CYAN}Daemon running.{RESET} API at http://{host}:{port}")
+            print(f"{DIM}Press Ctrl+C to stop{RESET}\n")
+            try:
+                while True:
+                    time.sleep(1)
+            except KeyboardInterrupt:
+                print(f"\n{DIM}Shutting down...{RESET}")
+                return 0
+
+        # Launch interactive chat
+        print(f"\n{CYAN}Entering Commander chat...{RESET}\n")
+        asyncio.run(run_commander(port=port, state_dir=state_dir))
+
+        return 0
+
+    except KeyboardInterrupt:
+        logger.info("Commander interrupted by user")
+        return 0
+    except Exception as e:
+        logger.error(f"Commander error: {e}", exc_info=True)
+        print(f"{RED}Error:{RESET} {e}")
+        return 1

claude_mpm/cli/commands/hook_errors.py

@@ -57,33 +57,33 @@ def list_errors(format, hook_type):
 
     if not errors:
         if hook_type:
-            click.echo(f"No errors recorded for hook type: {hook_type}")
+            click.echo(f"No errors recorded for hook type: {hook_type}", err=True)
         else:
-            click.echo("No errors recorded. Hook system is healthy! ✅")
+            click.echo("No errors recorded. Hook system is healthy! ✅", err=True)
         return
 
     if format == "json":
         # JSON output
-        click.echo(json.dumps(errors, indent=2))
+        click.echo(json.dumps(errors, indent=2), err=True)
     else:
         # Table output
-        click.echo("\n" + "=" * 80)
-        click.echo("Hook Error Memory Report")
-        click.echo("=" * 80)
+        click.echo("\n" + "=" * 80, err=True)
+        click.echo("Hook Error Memory Report", err=True)
+        click.echo("=" * 80, err=True)
 
         for key, data in errors.items():
-            click.echo(f"\n🔴 Error: {data['type']}")
-            click.echo(f"   Hook Type: {data['hook_type']}")
-            click.echo(f"   Details: {data['details']}")
-            click.echo(f"   Match: {data['match']}")
-            click.echo(f"   Count: {data['count']} occurrences")
-            click.echo(f"   First Seen: {data['first_seen']}")
-            click.echo(f"   Last Seen: {data['last_seen']}")
+            click.echo(f"\n🔴 Error: {data['type']}", err=True)
+            click.echo(f"   Hook Type: {data['hook_type']}", err=True)
+            click.echo(f"   Details: {data['details']}", err=True)
+            click.echo(f"   Match: {data['match']}", err=True)
+            click.echo(f"   Count: {data['count']} occurrences", err=True)
+            click.echo(f"   First Seen: {data['first_seen']}", err=True)
+            click.echo(f"   Last Seen: {data['last_seen']}", err=True)
 
-        click.echo("\n" + "=" * 80)
-        click.echo(f"Total unique errors: {len(errors)}")
-        click.echo(f"Memory file: {error_memory.memory_file}")
-        click.echo("\nTo clear errors: claude-mpm hook-errors clear")
+        click.echo("\n" + "=" * 80, err=True)
+        click.echo(f"Total unique errors: {len(errors)}", err=True)
+        click.echo(f"Memory file: {error_memory.memory_file}", err=True)
+        click.echo("\nTo clear errors: claude-mpm hook-errors clear", err=True)
 
 
 @hook_errors_group.command(name="summary")
@@ -99,28 +99,28 @@ def show_summary():
     summary = error_memory.get_error_summary()
 
     if summary["total_errors"] == 0:
-        click.echo("No errors recorded. Hook system is healthy! ✅")
+        click.echo("No errors recorded. Hook system is healthy! ✅", err=True)
         return
 
-    click.echo("\n" + "=" * 80)
-    click.echo("Hook Error Summary")
-    click.echo("=" * 80)
-    click.echo("\n📊 Statistics:")
-    click.echo(f"   Total Errors: {summary['total_errors']}")
-    click.echo(f"   Unique Errors: {summary['unique_errors']}")
+    click.echo("\n" + "=" * 80, err=True)
+    click.echo("Hook Error Summary", err=True)
+    click.echo("=" * 80, err=True)
+    click.echo("\n📊 Statistics:", err=True)
+    click.echo(f"   Total Errors: {summary['total_errors']}", err=True)
+    click.echo(f"   Unique Errors: {summary['unique_errors']}", err=True)
 
     if summary["errors_by_type"]:
-        click.echo("\n🔍 Errors by Type:")
+        click.echo("\n🔍 Errors by Type:", err=True)
         for error_type, count in summary["errors_by_type"].items():
-            click.echo(f"   {error_type}: {count}")
+            click.echo(f"   {error_type}: {count}", err=True)
 
     if summary["errors_by_hook"]:
-        click.echo("\n🎣 Errors by Hook Type:")
+        click.echo("\n🎣 Errors by Hook Type:", err=True)
         for hook_type, count in summary["errors_by_hook"].items():
-            click.echo(f"   {hook_type}: {count}")
+            click.echo(f"   {hook_type}: {count}", err=True)
 
-    click.echo(f"\n📁 Memory File: {summary['memory_file']}")
-    click.echo("\nFor detailed list: claude-mpm hook-errors list")
+    click.echo(f"\n📁 Memory File: {summary['memory_file']}", err=True)
+    click.echo("\nFor detailed list: claude-mpm hook-errors list", err=True)
 
 
 @hook_errors_group.command(name="clear")
@@ -158,21 +158,21 @@ def clear_errors(hook_type, yes):
         scope = "all hook types"
 
     if count == 0:
-        click.echo(f"No errors to clear {scope}.")
+        click.echo(f"No errors to clear {scope}.", err=True)
         return
 
     # Confirm if not using -y flag
     if not yes:
         message = f"Clear {count} error(s) {scope}?"
         if not click.confirm(message):
-            click.echo("Cancelled.")
+            click.echo("Cancelled.", err=True)
             return
 
     # Clear errors
     error_memory.clear_errors(hook_type)
 
-    click.echo(f"✅ Cleared {count} error(s) {scope}.")
-    click.echo("\nHooks will be retried on next execution.")
+    click.echo(f"✅ Cleared {count} error(s) {scope}.", err=True)
+    click.echo("\nHooks will be retried on next execution.", err=True)
 
 
 @hook_errors_group.command(name="diagnose")
@@ -201,19 +201,19 @@ def diagnose_errors(hook_type):
 
     if not errors:
         if hook_type:
-            click.echo(f"No errors to diagnose for hook type: {hook_type}")
+            click.echo(f"No errors to diagnose for hook type: {hook_type}", err=True)
         else:
-            click.echo("No errors to diagnose. Hook system is healthy! ✅")
+            click.echo("No errors to diagnose. Hook system is healthy! ✅", err=True)
         return
 
-    click.echo("\n" + "=" * 80)
-    click.echo("Hook Error Diagnostics")
-    click.echo("=" * 80)
+    click.echo("\n" + "=" * 80, err=True)
+    click.echo("Hook Error Diagnostics", err=True)
+    click.echo("=" * 80, err=True)
 
     for key, data in errors.items():
-        click.echo(f"\n🔴 Error: {data['type']}")
-        click.echo(f"   Hook: {data['hook_type']}")
-        click.echo(f"   Count: {data['count']} failures")
+        click.echo(f"\n🔴 Error: {data['type']}", err=True)
+        click.echo(f"   Hook: {data['hook_type']}", err=True)
+        click.echo(f"   Count: {data['count']} failures", err=True)
 
         # Generate and show fix suggestion
         error_info = {
@@ -223,13 +223,13 @@ def diagnose_errors(hook_type):
         }
         suggestion = error_memory.suggest_fix(error_info)
 
-        click.echo("\n" + "-" * 80)
-        click.echo(suggestion)
-        click.echo("-" * 80)
+        click.echo("\n" + "-" * 80, err=True)
+        click.echo(suggestion, err=True)
+        click.echo("-" * 80, err=True)
 
-    click.echo("\n" + "=" * 80)
-    click.echo("After fixing issues, clear errors to retry:")
-    click.echo("  claude-mpm hook-errors clear")
+    click.echo("\n" + "=" * 80, err=True)
+    click.echo("After fixing issues, clear errors to retry:", err=True)
+    click.echo("  claude-mpm hook-errors clear", err=True)
 
 
 @hook_errors_group.command(name="status")
@@ -244,27 +244,27 @@ def show_status():
     error_memory = get_hook_error_memory()
     summary = error_memory.get_error_summary()
 
-    click.echo("\n📊 Hook Error Memory Status")
-    click.echo("=" * 80)
+    click.echo("\n📊 Hook Error Memory Status", err=True)
+    click.echo("=" * 80, err=True)
 
     if summary["total_errors"] == 0:
-        click.echo("✅ Status: Healthy (no errors recorded)")
+        click.echo("✅ Status: Healthy (no errors recorded)", err=True)
     else:
-        click.echo(f"⚠️  Status: {summary['total_errors']} error(s) recorded")
-        click.echo(f"   Unique errors: {summary['unique_errors']}")
+        click.echo(f"⚠️  Status: {summary['total_errors']} error(s) recorded", err=True)
+        click.echo(f"   Unique errors: {summary['unique_errors']}", err=True)
 
         # Show which hooks are affected
         if summary["errors_by_hook"]:
             affected_hooks = list(summary["errors_by_hook"].keys())
-            click.echo(f"   Affected hooks: {', '.join(affected_hooks)}")
+            click.echo(f"   Affected hooks: {', '.join(affected_hooks)}", err=True)
 
-    click.echo(f"\n📁 Memory file: {summary['memory_file']}")
-    click.echo(f"   Exists: {Path(summary['memory_file']).exists()}")
+    click.echo(f"\n📁 Memory file: {summary['memory_file']}", err=True)
+    click.echo(f"   Exists: {Path(summary['memory_file']).exists()}", err=True)
 
-    click.echo("\nCommands:")
-    click.echo("  claude-mpm hook-errors list      # View detailed errors")
-    click.echo("  claude-mpm hook-errors diagnose  # Get fix suggestions")
-    click.echo("  claude-mpm hook-errors clear     # Clear and retry")
+    click.echo("\nCommands:", err=True)
+    click.echo("  claude-mpm hook-errors list      # View detailed errors", err=True)
+    click.echo("  claude-mpm hook-errors diagnose  # Get fix suggestions", err=True)
+    click.echo("  claude-mpm hook-errors clear     # Clear and retry", err=True)
 
 
 # Register the command group

claude_mpm/cli/commands/mcp.py

@@ -33,7 +33,27 @@ def manage_mcp(args):
     """
     logger = get_logger("cli.mcp")
 
-    # First check if MCP package is installed for any command
+    # Commands that don't require full MCP Gateway or mcp package
+    # These only need mcp_service_registry which doesn't require the mcp package
+    service_mgmt_commands = {
+        MCPCommands.ENABLE.value,
+        MCPCommands.DISABLE.value,
+        MCPCommands.LIST.value,
+    }
+
+    # Route service management commands directly without any MCP dependencies
+    if args.mcp_command in service_mgmt_commands:
+        try:
+            from .mcp_command_router import MCPCommandRouter
+
+            router = MCPCommandRouter(logger)
+            return router.route_command(args)
+        except Exception as e:
+            logger.error(f"Error running service command: {e}", exc_info=True)
+            print(f"Error: {e}")
+            return 1
+
+    # Now check for mcp package for other commands
     import importlib.util
 
     mcp_spec = importlib.util.find_spec("mcp")
@@ -58,22 +78,14 @@ def manage_mcp(args):
         except ImportError as e:
             # Provide minimal fallbacks for basic commands
             logger.warning(f"Some MCP Gateway services not available: {e}")
-
-            # Allow install command to proceed
-            if args.mcp_command == MCPCommands.INSTALL.value:
-                MCPConfiguration = None
-                MCPServiceRegistry = None
-                ToolRegistry = None
-                MCPGateway = None
-            else:
-                print(
-                    "\nError: MCP Gateway services not fully available",
-                    file=sys.stderr,
-                )
-                print(f"Details: {e}", file=sys.stderr)
-                print("\nTry running:", file=sys.stderr)
-                print("  claude-mpm mcp install", file=sys.stderr)
-                return 1
+            print(
+                "\nError: MCP Gateway services not fully available",
+                file=sys.stderr,
+            )
+            print(f"Details: {e}", file=sys.stderr)
+            print("\nTry running:", file=sys.stderr)
+            print("  claude-mpm mcp install", file=sys.stderr)
+            return 1
 
         if not args.mcp_command:
             # No subcommand - show status by default

claude_mpm/cli/commands/mcp_command_router.py

@@ -48,6 +48,15 @@ class MCPCommandRouter:
         if args.mcp_command == MCPCommands.EXTERNAL.value:
             return self._manage_external(args)
 
+        if args.mcp_command == MCPCommands.ENABLE.value:
+            return self._enable_service(args)
+
+        if args.mcp_command == MCPCommands.DISABLE.value:
+            return self._disable_service(args)
+
+        if args.mcp_command == MCPCommands.LIST.value:
+            return self._list_services(args)
+
         if args.mcp_command == "cleanup":
             return self._cleanup_locks(args)
 
@@ -134,6 +143,27 @@ class MCPCommandRouter:
         handler = MCPExternalCommands(self.logger)
         return handler.manage_external(args)
 
+    def _enable_service(self, args) -> int:
+        """Enable MCP service command handler."""
+        from .mcp_service_commands import MCPServiceCommands
+
+        handler = MCPServiceCommands(self.logger)
+        return handler.enable_service(args)
+
+    def _disable_service(self, args) -> int:
+        """Disable MCP service command handler."""
+        from .mcp_service_commands import MCPServiceCommands
+
+        handler = MCPServiceCommands(self.logger)
+        return handler.disable_service(args)
+
+    def _list_services(self, args) -> int:
+        """List MCP services command handler."""
+        from .mcp_service_commands import MCPServiceCommands
+
+        handler = MCPServiceCommands(self.logger)
+        return handler.list_services(args)
+
     def _show_help(self):
         """Show available MCP commands."""
         print("\nAvailable MCP commands:")
@@ -148,6 +178,10 @@ class MCPCommandRouter:
         print("  config   - View and manage configuration")
         print("  external - Manage external MCP services")
         print("  cleanup  - Clean up legacy files")
+        print("\nService management:")
+        print("  enable   - Enable an MCP service in configuration")
+        print("  disable  - Disable an MCP service from configuration")
+        print("  list     - List available and enabled MCP services")
         print("\nFor help with a specific command:")
         print("  claude-mpm mcp <command> --help")
         print("\nExamples:")
@@ -159,3 +193,8 @@ class MCPCommandRouter:
         print("  claude-mpm mcp tools")
         print("  claude-mpm mcp register my-tool")
         print("  claude-mpm mcp test my-tool")
+        print("\nService management examples:")
+        print("  claude-mpm mcp list --available       # List all available services")
+        print("  claude-mpm mcp enable kuzu-memory     # Enable a service")
+        print("  claude-mpm mcp enable mcp-github --interactive  # Enable with prompts")
+        print("  claude-mpm mcp disable mcp-github     # Disable a service")