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

claude_mpm/services/diagnostics/checks/installation_check.py

@@ -5,11 +5,14 @@ WHY: Verify that claude-mpm is properly installed with correct Python version,
 dependencies, and installation method.
 """
 
+import os
 import subprocess
 import sys
 from pathlib import Path
+from typing import Optional
 
-from ..models import DiagnosticResult, DiagnosticStatus
+from ....core.enums import OperationResult, ValidationSeverity
+from ..models import DiagnosticResult
 from .base_check import BaseDiagnosticCheck
 
 
@@ -52,14 +55,14 @@ class InstallationCheck(BaseDiagnosticCheck):
             details["dependencies"] = deps_result.details.get("status")
 
             # Determine overall status
-            if any(r.status == DiagnosticStatus.ERROR for r in sub_results):
-                status = DiagnosticStatus.ERROR
+            if any(r.status == ValidationSeverity.ERROR for r in sub_results):
+                status = ValidationSeverity.ERROR
                 message = "Installation has critical issues"
-            elif any(r.status == DiagnosticStatus.WARNING for r in sub_results):
-                status = DiagnosticStatus.WARNING
+            elif any(r.status == ValidationSeverity.WARNING for r in sub_results):
+                status = ValidationSeverity.WARNING
                 message = "Installation has minor issues"
             else:
-                status = DiagnosticStatus.OK
+                status = OperationResult.SUCCESS
                 message = "Installation is healthy"
 
             return DiagnosticResult(
@@ -73,7 +76,7 @@ class InstallationCheck(BaseDiagnosticCheck):
         except Exception as e:
             return DiagnosticResult(
                 category=self.category,
-                status=DiagnosticStatus.ERROR,
+                status=ValidationSeverity.ERROR,
                 message=f"Installation check failed: {e!s}",
                 details={"error": str(e)},
             )
@@ -89,7 +92,7 @@ class InstallationCheck(BaseDiagnosticCheck):
         if version_info < min_version:
             return DiagnosticResult(
                 category="Python Version",
-                status=DiagnosticStatus.ERROR,
+                status=ValidationSeverity.ERROR,
                 message=f"Python {version_info.major}.{version_info.minor} is below minimum required {min_version[0]}.{min_version[1]}",
                 details={"version": version},
                 fix_description="Upgrade Python to 3.9 or higher",
@@ -97,13 +100,13 @@ class InstallationCheck(BaseDiagnosticCheck):
         if version_info < recommended_version:
             return DiagnosticResult(
                 category="Python Version",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message=f"Python {version_info.major}.{version_info.minor} works but {recommended_version[0]}.{recommended_version[1]}+ is recommended",
                 details={"version": version},
             )
         return DiagnosticResult(
             category="Python Version",
-            status=DiagnosticStatus.OK,
+            status=OperationResult.SUCCESS,
             message=f"Python {version_info.major}.{version_info.minor}.{version_info.micro}",
             details={"version": version},
         )
@@ -120,7 +123,7 @@ class InstallationCheck(BaseDiagnosticCheck):
 
             return DiagnosticResult(
                 category="Claude MPM Version",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message=f"Version: {version}",
                 details={
                     "version": semantic_version,
@@ -131,7 +134,7 @@ class InstallationCheck(BaseDiagnosticCheck):
         except Exception as e:
             return DiagnosticResult(
                 category="Claude MPM Version",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message="Could not determine version",
                 details={"error": str(e)},
             )
@@ -145,31 +148,42 @@ class InstallationCheck(BaseDiagnosticCheck):
         exe_path = sys.executable
         details["python_executable"] = exe_path
 
-        # 2. Check if we're in a virtual environment
+        # 2. Check for container environment
+        container_type = self._detect_container_environment()
+        if container_type:
+            details["container_type"] = container_type
+            methods_found.append("container")
+
+        # 3. Check if we're in a virtual environment
         in_venv = hasattr(sys, "real_prefix") or (
             hasattr(sys, "base_prefix") and sys.base_prefix != sys.prefix
         )
 
-        # 3. Check if running from pipx environment
+        # 4. Check if running from pipx environment
         # Pipx creates venvs in specific locations
         is_pipx_venv = False
         if in_venv and (".local/pipx/venvs" in exe_path or "pipx/venvs" in exe_path):
             is_pipx_venv = True
             methods_found.append("pipx")
             details["pipx_venv"] = sys.prefix
+            # Get pipx metadata if available
+            pipx_metadata = self._get_pipx_metadata()
+            if pipx_metadata:
+                details["pipx_metadata"] = pipx_metadata
         elif in_venv:
             # Regular virtual environment (not pipx)
             methods_found.append("venv")
             details["venv_path"] = sys.prefix
 
-        # 4. Check if running from source (development mode)
+        # 5. Check if running from source (development mode)
         claude_mpm_path = Path(__file__).parent.parent.parent.parent.parent
-        if (claude_mpm_path / "pyproject.toml").exists():
-            if (claude_mpm_path / ".git").exists():
-                methods_found.append("development")
-                details["source_path"] = str(claude_mpm_path)
+        if (claude_mpm_path / "pyproject.toml").exists() and (
+            claude_mpm_path / ".git"
+        ).exists():
+            methods_found.append("development")
+            details["source_path"] = str(claude_mpm_path)
 
-        # 5. Check Homebrew Python
+        # 6. Check Homebrew Python
         if not in_venv and "/opt/homebrew" in exe_path:
             methods_found.append("homebrew")
             details["homebrew_python"] = exe_path
@@ -178,33 +192,26 @@ class InstallationCheck(BaseDiagnosticCheck):
             methods_found.append("homebrew")
             details["homebrew_python"] = exe_path
 
-        # 6. Check for system Python
-        if not in_venv and not methods_found:
-            if "/usr/bin/python" in exe_path or "/usr/local/bin/python" in exe_path:
-                methods_found.append("system")
-                details["system_python"] = exe_path
+        # 7. Check for system Python
+        if (
+            not in_venv
+            and not methods_found
+            and ("/usr/bin/python" in exe_path or "/usr/local/bin/python" in exe_path)
+        ):
+            methods_found.append("system")
+            details["system_python"] = exe_path
 
-        # 7. Additional check for pipx if not detected via venv
+        # 8. Additional check for pipx if not detected via venv
         if "pipx" not in methods_found:
-            try:
-                result = subprocess.run(
-                    ["pipx", "list"],
-                    capture_output=True,
-                    text=True,
-                    timeout=5,
-                    check=False,
+            pipx_check = self._check_pipx_installation_status()
+            if pipx_check and not is_pipx_venv:
+                # Pipx is installed but we're not running from it
+                details["pipx_installed"] = True
+                details["pipx_not_active"] = (
+                    "claude-mpm is installed via pipx but not currently running from pipx environment"
                 )
-                if "claude-mpm" in result.stdout:
-                    if not is_pipx_venv:
-                        # Pipx is installed but we're not running from it
-                        details["pipx_installed"] = True
-                        details["pipx_not_active"] = (
-                            "claude-mpm is installed via pipx but not currently running from pipx environment"
-                        )
-            except (subprocess.SubprocessError, FileNotFoundError):
-                pass
-
-        # 8. Check pip installation status
+
+        # 9. Check pip installation status
         try:
             result = subprocess.run(
                 [sys.executable, "-m", "pip", "show", "claude-mpm"],
@@ -237,16 +244,32 @@ class InstallationCheck(BaseDiagnosticCheck):
         if not methods_found:
             return DiagnosticResult(
                 category="Installation Method",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message="Installation method unknown",
                 details=details,
             )
 
+        # Container environments are special
+        if "container" in methods_found:
+            container_msg = (
+                f"Running in {details.get('container_type', 'container')} environment"
+            )
+            if "pipx" in methods_found:
+                container_msg += " with pipx"
+            elif "venv" in methods_found:
+                container_msg += " with virtual environment"
+            return DiagnosticResult(
+                category="Installation Method",
+                status=OperationResult.SUCCESS,
+                message=container_msg,
+                details=details,
+            )
+
         # Pipx is the recommended method
         if "pipx" in methods_found:
             return DiagnosticResult(
                 category="Installation Method",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message="Running from pipx environment (recommended)",
                 details=details,
             )
@@ -256,7 +279,7 @@ class InstallationCheck(BaseDiagnosticCheck):
             venv_name = Path(sys.prefix).name
             return DiagnosticResult(
                 category="Installation Method",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message=f"Development mode in virtual environment '{venv_name}'",
                 details=details,
             )
@@ -266,7 +289,7 @@ class InstallationCheck(BaseDiagnosticCheck):
             venv_name = Path(sys.prefix).name
             return DiagnosticResult(
                 category="Installation Method",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message=f"Virtual environment '{venv_name}'",
                 details=details,
             )
@@ -275,7 +298,7 @@ class InstallationCheck(BaseDiagnosticCheck):
         if "development" in methods_found and "homebrew" in methods_found:
             return DiagnosticResult(
                 category="Installation Method",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message="Development mode with Homebrew Python",
                 details=details,
             )
@@ -283,7 +306,7 @@ class InstallationCheck(BaseDiagnosticCheck):
         if "development" in methods_found:
             return DiagnosticResult(
                 category="Installation Method",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message="Development mode",
                 details=details,
             )
@@ -293,9 +316,9 @@ class InstallationCheck(BaseDiagnosticCheck):
             msg = "Homebrew Python"
             if details.get("pipx_installed"):
                 msg += " (pipx is installed but not active - consider using 'pipx run claude-mpm')"
-                status = DiagnosticStatus.WARNING
+                status = ValidationSeverity.WARNING
             else:
-                status = DiagnosticStatus.OK
+                status = OperationResult.SUCCESS
             return DiagnosticResult(
                 category="Installation Method",
                 status=status,
@@ -307,7 +330,7 @@ class InstallationCheck(BaseDiagnosticCheck):
         if "pip" in methods_found:
             return DiagnosticResult(
                 category="Installation Method",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message="System pip installation (consider using pipx or venv instead)",
                 details=details,
                 fix_description="Consider reinstalling with pipx for isolated environment",
@@ -317,7 +340,7 @@ class InstallationCheck(BaseDiagnosticCheck):
         if "system" in methods_found:
             return DiagnosticResult(
                 category="Installation Method",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message="System Python (consider using pipx or venv)",
                 details=details,
             )
@@ -325,7 +348,7 @@ class InstallationCheck(BaseDiagnosticCheck):
         # Fallback for any other combination
         return DiagnosticResult(
             category="Installation Method",
-            status=DiagnosticStatus.OK,
+            status=OperationResult.SUCCESS,
             message=f"Installed via {', '.join(methods_found)}",
             details=details,
         )
@@ -377,7 +400,7 @@ class InstallationCheck(BaseDiagnosticCheck):
 
             return DiagnosticResult(
                 category="Dependencies",
-                status=DiagnosticStatus.ERROR,
+                status=ValidationSeverity.ERROR,
                 message=f"Missing critical dependencies: {', '.join(missing)}",
                 details={
                     "missing": missing,
@@ -392,11 +415,11 @@ class InstallationCheck(BaseDiagnosticCheck):
         if warnings:
             return DiagnosticResult(
                 category="Dependencies",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message=f"Missing optional dependencies: {', '.join(warnings)}",
                 details={
                     "optional_missing": warnings,
-                    "status": "partial",
+                    "status": OperationResult.PARTIAL,
                     "installed": installed,
                     "python_executable": sys.executable,
                     "in_venv": in_venv,
@@ -404,12 +427,94 @@ class InstallationCheck(BaseDiagnosticCheck):
             )
         return DiagnosticResult(
             category="Dependencies",
-            status=DiagnosticStatus.OK,
+            status=OperationResult.SUCCESS,
             message="All dependencies installed",
             details={
-                "status": "complete",
+                "status": OperationResult.COMPLETED,
                 "installed": installed,
                 "python_executable": sys.executable,
                 "in_venv": in_venv,
             },
         )
+
+    def _detect_container_environment(self) -> Optional[str]:
+        """Detect if running in a container environment."""
+        # Check for Docker
+        if Path("/.dockerenv").exists():
+            return "Docker"
+
+        # Check for Kubernetes
+        if Path("/var/run/secrets/kubernetes.io").exists():
+            return "Kubernetes"
+
+        # Check cgroup for container indicators
+        try:
+            with Path("/proc/1/cgroup").open() as f:
+                cgroup = f.read()
+                if "docker" in cgroup:
+                    return "Docker"
+                if "kubepods" in cgroup:
+                    return "Kubernetes"
+                if "containerd" in cgroup:
+                    return "containerd"
+                if "lxc" in cgroup:
+                    return "LXC"
+        except (FileNotFoundError, PermissionError):
+            pass
+
+        # Check environment variables
+        if os.environ.get("CONTAINER"):
+            return os.environ.get("CONTAINER_ENGINE", "Container")
+
+        # Check for Podman
+        if Path("/run/.containerenv").exists():
+            return "Podman"
+
+        # Check for WSL
+        if Path("/proc/sys/fs/binfmt_misc/WSLInterop").exists():
+            return "WSL"
+
+        return None
+
+    def _get_pipx_metadata(self) -> Optional[dict]:
+        """Get pipx metadata for the current installation."""
+        try:
+            import json
+
+            result = subprocess.run(
+                ["pipx", "list", "--json"],
+                capture_output=True,
+                text=True,
+                timeout=5,
+                check=False,
+            )
+            if result.returncode == 0:
+                data = json.loads(result.stdout)
+                venvs = data.get("venvs", {})
+                if "claude-mpm" in venvs:
+                    return {
+                        "version": venvs["claude-mpm"]
+                        .get("metadata", {})
+                        .get("main_package", {})
+                        .get("package_version"),
+                        "python": venvs["claude-mpm"]
+                        .get("metadata", {})
+                        .get("python_version"),
+                    }
+        except Exception:
+            pass
+        return None
+
+    def _check_pipx_installation_status(self) -> bool:
+        """Check if claude-mpm is installed via pipx."""
+        try:
+            result = subprocess.run(
+                ["pipx", "list"],
+                capture_output=True,
+                text=True,
+                timeout=5,
+                check=False,
+            )
+            return "claude-mpm" in result.stdout
+        except (subprocess.SubprocessError, FileNotFoundError):
+            return False

claude_mpm/services/diagnostics/checks/instructions_check.py

@@ -11,7 +11,8 @@ from collections import defaultdict
 from pathlib import Path
 from typing import Dict
 
-from ..models import DiagnosticResult, DiagnosticStatus
+from ....core.enums import OperationResult, ValidationSeverity
+from ..models import DiagnosticResult
 from .base_check import BaseDiagnosticCheck
 
 
@@ -77,14 +78,14 @@ class InstructionsCheck(BaseDiagnosticCheck):
             sub_results.append(separation_result)
 
             # Determine overall status
-            if any(r.status == DiagnosticStatus.ERROR for r in sub_results):
-                status = DiagnosticStatus.ERROR
+            if any(r.status == ValidationSeverity.ERROR for r in sub_results):
+                status = ValidationSeverity.ERROR
                 message = "Found critical issues with instruction files"
-            elif any(r.status == DiagnosticStatus.WARNING for r in sub_results):
-                status = DiagnosticStatus.WARNING
+            elif any(r.status == ValidationSeverity.WARNING for r in sub_results):
+                status = ValidationSeverity.WARNING
                 message = "Found minor issues with instruction files"
             else:
-                status = DiagnosticStatus.OK
+                status = OperationResult.SUCCESS
                 message = "Instruction files are properly configured"
 
             return DiagnosticResult(
@@ -98,7 +99,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
         except Exception as e:
             return DiagnosticResult(
                 category=self.category,
-                status=DiagnosticStatus.ERROR,
+                status=ValidationSeverity.ERROR,
                 message=f"Instructions check failed: {e!s}",
                 details={"error": str(e)},
             )
@@ -146,7 +147,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
         if not claude_files:
             return DiagnosticResult(
                 category="CLAUDE.md Placement",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message="No CLAUDE.md files found",
                 details={},
             )
@@ -170,7 +171,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
         if issues:
             return DiagnosticResult(
                 category="CLAUDE.md Placement",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message=f"Found {len(issues)} misplaced CLAUDE.md file(s)",
                 details={"issues": issues},
                 fix_description=(
@@ -181,7 +182,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
 
         return DiagnosticResult(
             category="CLAUDE.md Placement",
-            status=DiagnosticStatus.OK,
+            status=OperationResult.SUCCESS,
             message="CLAUDE.md properly placed in project root",
             details={"count": len(claude_files)},
         )
@@ -191,7 +192,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
         if len(files) < 2:
             return DiagnosticResult(
                 category="Duplicate Content",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message="No duplicate content detected",
                 details={},
             )
@@ -226,7 +227,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
         if duplicates:
             return DiagnosticResult(
                 category="Duplicate Content",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message=f"Found {len(duplicates)} duplicate content block(s)",
                 details={"duplicates": duplicates[:5]},  # Limit to first 5
                 fix_description=(
@@ -238,7 +239,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
 
         return DiagnosticResult(
             category="Duplicate Content",
-            status=DiagnosticStatus.OK,
+            status=OperationResult.SUCCESS,
             message="No significant duplicate content found",
             details={},
         )
@@ -280,7 +281,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
         if conflicts:
             return DiagnosticResult(
                 category="Conflicting Directives",
-                status=DiagnosticStatus.ERROR,
+                status=ValidationSeverity.ERROR,
                 message=f"Found {len(conflicts)} potential conflict(s)",
                 details={"conflicts": conflicts},
                 fix_description=(
@@ -292,7 +293,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
 
         return DiagnosticResult(
             category="Conflicting Directives",
-            status=DiagnosticStatus.OK,
+            status=OperationResult.SUCCESS,
             message="No conflicting directives detected",
             details={},
         )
@@ -330,7 +331,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
         if duplicates:
             return DiagnosticResult(
                 category="Agent Definitions",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message=f"Found {len(duplicates)} duplicate agent definition(s)",
                 details={"duplicates": duplicates},
                 fix_description=(
@@ -341,7 +342,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
 
         return DiagnosticResult(
             category="Agent Definitions",
-            status=DiagnosticStatus.OK,
+            status=OperationResult.SUCCESS,
             message="Agent definitions are unique",
             details={"total_agents": len(agent_definitions)},
         )
@@ -396,7 +397,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
         if issues:
             return DiagnosticResult(
                 category="Separation of Concerns",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message=f"Found {len(issues)} separation of concerns issue(s)",
                 details={"issues": issues},
                 fix_description=(
@@ -409,7 +410,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
 
         return DiagnosticResult(
             category="Separation of Concerns",
-            status=DiagnosticStatus.OK,
+            status=OperationResult.SUCCESS,
             message="Instruction files properly separated",
             details={},
         )