claude-mpm 4.24.0__py3-none-any.whl → 5.4.41__py3-none-any.whl

claude_mpm/services/runner_configuration_service.py

@@ -10,10 +10,14 @@ This service handles:
 5. Hook service registration
 
 Extracted from ClaudeRunner to follow Single Responsibility Principle.
+
+DEPENDENCY INJECTION:
+This service uses protocol-based dependency injection to avoid circular imports
+when registering the SessionManagementService.
 """
 
 import os
-from typing import Any, Dict, List, Optional, Tuple
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple
 
 from claude_mpm.core.base_service import BaseService
 from claude_mpm.core.config import Config
@@ -22,6 +26,13 @@ from claude_mpm.core.logger import get_project_logger
 from claude_mpm.core.shared.config_loader import ConfigLoader
 from claude_mpm.services.core.interfaces import RunnerConfigurationInterface
 
+# Protocol imports for type checking without circular dependencies
+if TYPE_CHECKING:
+    from claude_mpm.core.protocols import ClaudeRunnerProtocol
+else:
+    # At runtime, accept any object with matching interface
+    ClaudeRunnerProtocol = Any
+
 
 class RunnerConfigurationService(BaseService, RunnerConfigurationInterface):
     """Service for configuring and initializing ClaudeRunner components."""
@@ -495,12 +506,14 @@ class RunnerConfigurationService(BaseService, RunnerConfigurationInterface):
             )
             return None
 
-    def register_session_management_service(self, container, runner):
+    def register_session_management_service(
+        self, container, runner: "ClaudeRunnerProtocol"
+    ):
         """Register session management service in the DI container.
 
         Args:
             container: DI container instance
-            runner: ClaudeRunner instance dependency
+            runner: ClaudeRunner instance (or any object matching ClaudeRunnerProtocol)
 
         Returns:
             Initialized session management service or None if failed

claude_mpm/services/self_upgrade_service.py

@@ -3,7 +3,7 @@ Self-Upgrade Service
 ====================
 
 Handles version checking and self-upgrade functionality for claude-mpm.
-Supports pip, pipx, and npm installations with automatic detection.
+Supports pip, pipx, npm, uv tool, and Homebrew installations with automatic detection.
 Also checks Claude Code version compatibility.
 
 WHY: Users should be notified of updates and have an easy way to upgrade
@@ -11,7 +11,7 @@ without manually running installation commands. Claude Code version checking
 ensures compatibility with required features.
 
 DESIGN DECISIONS:
-- Detects installation method (pip/pipx/npm/editable)
+- Detects installation method (pip/pipx/npm/uv_tool/homebrew/editable)
 - Non-blocking version checks with caching
 - Interactive upgrade prompts with confirmation
 - Automatic restart after upgrade
@@ -40,6 +40,8 @@ class InstallationMethod:
     PIP = "pip"
     PIPX = "pipx"
     NPM = "npm"
+    UV_TOOL = "uv_tool"
+    HOMEBREW = "homebrew"
     EDITABLE = "editable"
     UNKNOWN = "unknown"
 
@@ -95,6 +97,14 @@ class SelfUpgradeService:
         """
         Detect how claude-mpm was installed.
 
+        Detection priority:
+        1. Editable (skip auto-upgrade)
+        2. UV Tool
+        3. Homebrew
+        4. Pipx
+        5. NPM
+        6. Pip (default)
+
         Returns:
             Installation method constant
         """
@@ -105,6 +115,14 @@ class SelfUpgradeService:
         ]:
             return InstallationMethod.EDITABLE
 
+        # Check for UV tool installation
+        if self._check_uv_tool_installation():
+            return InstallationMethod.UV_TOOL
+
+        # Check for Homebrew installation
+        if self._check_homebrew_installation():
+            return InstallationMethod.HOMEBREW
+
         # Check for pipx by looking at executable path
         executable = sys.executable
         if "pipx" in executable:
@@ -127,6 +145,85 @@ class SelfUpgradeService:
         # Default to pip
         return InstallationMethod.PIP
 
+    def _check_uv_tool_installation(self) -> bool:
+        """
+        Check if claude-mpm is installed via uv tool.
+
+        Detection methods:
+        1. Check UV_TOOL_DIR environment variable
+        2. Check if executable path contains .local/share/uv/tools/
+        3. Fallback: Run `uv tool list` and check for claude-mpm
+
+        Returns:
+            True if UV tool installation detected
+        """
+        # Method 1: Check UV_TOOL_DIR environment variable
+        uv_tool_dir = os.environ.get("UV_TOOL_DIR")
+        if uv_tool_dir and "claude-mpm" in uv_tool_dir:
+            return True
+
+        # Method 2: Check executable path
+        executable = sys.executable
+        if ".local/share/uv/tools/" in executable or "uv/tools/" in executable:
+            return True
+
+        # Method 3: Fallback to `uv tool list` command
+        try:
+            result = subprocess.run(
+                ["uv", "tool", "list"],
+                check=False,
+                capture_output=True,
+                text=True,
+                timeout=5,
+            )
+            if result.returncode == 0 and "claude-mpm" in result.stdout:
+                return True
+        except (FileNotFoundError, subprocess.TimeoutExpired):
+            # uv not installed or command failed
+            pass
+        except Exception as e:
+            self.logger.debug(f"UV tool check failed: {e}")
+
+        return False
+
+    def _check_homebrew_installation(self) -> bool:
+        """
+        Check if claude-mpm is installed via Homebrew.
+
+        Detection methods:
+        1. Check if executable path starts with /opt/homebrew/ or /usr/local/Cellar/
+        2. Fallback: Run `brew list claude-mpm` to verify
+
+        Returns:
+            True if Homebrew installation detected
+        """
+        # Method 1: Check executable path
+        executable = sys.executable
+        if executable.startswith("/opt/homebrew/") or executable.startswith(
+            "/usr/local/Cellar/"
+        ):
+            return True
+
+        # Method 2: Fallback to `brew list` command
+        try:
+            result = subprocess.run(
+                ["brew", "list", "claude-mpm"],
+                check=False,
+                capture_output=True,
+                text=True,
+                timeout=5,
+            )
+            # brew list returns 0 if package is installed
+            if result.returncode == 0:
+                return True
+        except (FileNotFoundError, subprocess.TimeoutExpired):
+            # brew not installed or command failed
+            pass
+        except Exception as e:
+            self.logger.debug(f"Homebrew check failed: {e}")
+
+        return False
+
     def _get_claude_code_version(self) -> Optional[str]:
         """
         Get the installed Claude Code version.
@@ -257,6 +354,8 @@ class SelfUpgradeService:
         if self.installation_method in [
             InstallationMethod.PIP,
             InstallationMethod.PIPX,
+            InstallationMethod.UV_TOOL,
+            InstallationMethod.HOMEBREW,
         ]:
             result = await self.version_checker.check_for_update(
                 "claude-mpm", self.current_version, cache_ttl
@@ -313,15 +412,18 @@ class SelfUpgradeService:
         Returns:
             Shell command string to upgrade claude-mpm
         """
-        if self.installation_method == InstallationMethod.PIPX:
-            return "pipx upgrade claude-mpm"
-        if self.installation_method == InstallationMethod.NPM:
-            return "npm update -g claude-mpm"
-        if self.installation_method == InstallationMethod.PIP:
-            return f"{sys.executable} -m pip install --upgrade claude-mpm"
-        if self.installation_method == InstallationMethod.EDITABLE:
-            return "git pull && pip install -e ."
-        return "pip install --upgrade claude-mpm"
+        upgrade_commands = {
+            InstallationMethod.UV_TOOL: "uv tool upgrade claude-mpm",
+            InstallationMethod.HOMEBREW: "brew upgrade claude-mpm",
+            InstallationMethod.PIPX: "pipx upgrade claude-mpm",
+            InstallationMethod.NPM: "npm update -g claude-mpm",
+            InstallationMethod.PIP: f"{sys.executable} -m pip install --upgrade claude-mpm",
+            InstallationMethod.EDITABLE: "git pull && pip install -e .",
+        }
+
+        return upgrade_commands.get(
+            self.installation_method, "pip install --upgrade claude-mpm"
+        )
 
     def prompt_for_upgrade(self, update_info: Dict[str, any]) -> bool:
         """
@@ -432,7 +534,13 @@ class SelfUpgradeService:
             args = sys.argv[:]
 
             # Replace current process with new one
-            if self.installation_method == InstallationMethod.PIPX:
+            if self.installation_method == InstallationMethod.UV_TOOL:
+                # Use uv run
+                os.execvp("uv", ["uv", "tool", "run", "claude-mpm", *args[1:]])
+            elif self.installation_method == InstallationMethod.HOMEBREW:
+                # Use direct executable (installed to PATH by Homebrew)
+                os.execvp("claude-mpm", args)
+            elif self.installation_method == InstallationMethod.PIPX:
                 # Use pipx run
                 os.execvp("pipx", ["pipx", "run", "claude-mpm", *args[1:]])
             elif self.installation_method == InstallationMethod.NPM:

claude_mpm/services/session_management_service.py

@@ -9,29 +9,41 @@ This service handles:
 4. Session logging and cleanup
 
 Extracted from ClaudeRunner to follow Single Responsibility Principle.
+
+DEPENDENCY INJECTION:
+This service uses protocol-based dependency injection to avoid circular imports.
+It accepts a ClaudeRunnerProtocol instead of importing ClaudeRunner directly.
 """
 
 import time
 import uuid
 from datetime import timezone
-from typing import Any, Dict, List, Optional
+from typing import TYPE_CHECKING, Any, Dict, List, Optional
 
 from claude_mpm.core.base_service import BaseService
 from claude_mpm.core.enums import OperationResult, ServiceState
 from claude_mpm.services.core.interfaces import SessionManagementInterface
 
+# Protocol imports for type checking without circular dependencies
+if TYPE_CHECKING:
+    from claude_mpm.core.protocols import ClaudeRunnerProtocol
+else:
+    # At runtime, accept any object with matching interface
+    ClaudeRunnerProtocol = Any
+
 
 class SessionManagementService(BaseService, SessionManagementInterface):
     """Service for managing Claude session orchestration."""
 
-    def __init__(self, runner=None):
+    def __init__(self, runner: Optional["ClaudeRunnerProtocol"] = None):
         """Initialize the session management service.
 
         Args:
-            runner: ClaudeRunner instance for delegation
+            runner: ClaudeRunner instance (or any object matching ClaudeRunnerProtocol)
+                    for delegation
         """
         super().__init__(name="session_management_service")
-        self.runner = runner
+        self.runner: Optional[ClaudeRunnerProtocol] = runner
         self.active_sessions = {}  # Track active sessions
 
     async def _initialize(self) -> None:

claude_mpm/services/skills/__init__.py

@@ -0,0 +1,21 @@
+"""Skills management services.
+
+This package provides services for Git-based skills management:
+- GitSkillSourceManager: Multi-repository orchestration with priority resolution
+- SkillDiscoveryService: Parse skills from Git repositories (Markdown with YAML frontmatter)
+- SkillToAgentMapper: Map skills to agents using YAML configuration
+"""
+
+from claude_mpm.services.skills.git_skill_source_manager import GitSkillSourceManager
+from claude_mpm.services.skills.skill_discovery_service import (
+    SkillDiscoveryService,
+    SkillMetadata,
+)
+from claude_mpm.services.skills.skill_to_agent_mapper import SkillToAgentMapper
+
+__all__ = [
+    "GitSkillSourceManager",
+    "SkillDiscoveryService",
+    "SkillMetadata",
+    "SkillToAgentMapper",
+]