claude-mpm 4.13.2__py3-none-any.whl → 4.18.2__py3-none-any.whl

claude_mpm/services/diagnostics/checks/installation_check.py

@@ -11,7 +11,8 @@ 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
 
 
@@ -54,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(
@@ -75,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)},
             )
@@ -91,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",
@@ -99,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},
         )
@@ -122,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,
@@ -133,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)},
             )
@@ -243,7 +244,7 @@ class InstallationCheck(BaseDiagnosticCheck):
         if not methods_found:
             return DiagnosticResult(
                 category="Installation Method",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message="Installation method unknown",
                 details=details,
             )
@@ -259,7 +260,7 @@ class InstallationCheck(BaseDiagnosticCheck):
                 container_msg += " with virtual environment"
             return DiagnosticResult(
                 category="Installation Method",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message=container_msg,
                 details=details,
             )
@@ -268,7 +269,7 @@ class InstallationCheck(BaseDiagnosticCheck):
         if "pipx" in methods_found:
             return DiagnosticResult(
                 category="Installation Method",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message="Running from pipx environment (recommended)",
                 details=details,
             )
@@ -278,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,
             )
@@ -288,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,
             )
@@ -297,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,
             )
@@ -305,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,
             )
@@ -315,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,
@@ -329,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",
@@ -339,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,
             )
@@ -347,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,
         )
@@ -399,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,
@@ -414,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,
@@ -426,10 +427,10 @@ 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,

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={},
         )

claude_mpm/services/diagnostics/checks/mcp_check.py

@@ -9,7 +9,9 @@ import json
 import subprocess
 from pathlib import Path
 
-from ..models import DiagnosticResult, DiagnosticStatus
+from claude_mpm.core.enums import OperationResult, ServiceState, ValidationSeverity
+
+from ..models import DiagnosticResult
 from .base_check import BaseDiagnosticCheck
 
 
@@ -34,13 +36,13 @@ class MCPCheck(BaseDiagnosticCheck):
             # Check if MCP is installed
             install_result = self._check_installation()
             sub_results.append(install_result)
-            details["installed"] = install_result.status == DiagnosticStatus.OK
+            details["installed"] = install_result.status == OperationResult.SUCCESS
 
-            if install_result.status == DiagnosticStatus.OK:
+            if install_result.status == OperationResult.SUCCESS:
                 # Check MCP configuration
                 config_result = self._check_configuration()
                 sub_results.append(config_result)
-                details["configured"] = config_result.status == DiagnosticStatus.OK
+                details["configured"] = config_result.status == OperationResult.SUCCESS
 
                 # Check MCP server status
                 status_result = self._check_server_status()
@@ -52,17 +54,17 @@ class MCPCheck(BaseDiagnosticCheck):
                 sub_results.append(startup_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 = "MCP server has critical issues"
             elif not details.get("installed", False):
-                status = DiagnosticStatus.WARNING
+                status = ValidationSeverity.WARNING
                 message = "MCP server not installed"
-            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 = "MCP server needs configuration"
             else:
-                status = DiagnosticStatus.OK
+                status = OperationResult.SUCCESS
                 message = "MCP server properly configured"
 
             return DiagnosticResult(
@@ -76,7 +78,7 @@ class MCPCheck(BaseDiagnosticCheck):
         except Exception as e:
             return DiagnosticResult(
                 category=self.category,
-                status=DiagnosticStatus.ERROR,
+                status=ValidationSeverity.ERROR,
                 message=f"MCP check failed: {e!s}",
                 details={"error": str(e)},
             )
@@ -94,7 +96,7 @@ class MCPCheck(BaseDiagnosticCheck):
             if mcp_path.exists():
                 return DiagnosticResult(
                     category="MCP Installation",
-                    status=DiagnosticStatus.OK,
+                    status=OperationResult.SUCCESS,
                     message="MCP server installed",
                     details={"path": str(mcp_path), "installed": True},
                 )
@@ -112,7 +114,7 @@ class MCPCheck(BaseDiagnosticCheck):
                 path = result.stdout.strip()
                 return DiagnosticResult(
                     category="MCP Installation",
-                    status=DiagnosticStatus.OK,
+                    status=OperationResult.SUCCESS,
                     message="MCP server installed",
                     details={"path": path, "installed": True},
                 )
@@ -121,7 +123,7 @@ class MCPCheck(BaseDiagnosticCheck):
 
         return DiagnosticResult(
             category="MCP Installation",
-            status=DiagnosticStatus.WARNING,
+            status=ValidationSeverity.WARNING,
             message="MCP server not installed",
             details={"installed": False},
             fix_command="claude-mpm mcp install",
@@ -146,7 +148,7 @@ class MCPCheck(BaseDiagnosticCheck):
         if not config_path:
             return DiagnosticResult(
                 category="MCP Configuration",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message="Claude Code config not found",
                 details={"configured": False},
                 fix_command="claude-mpm mcp config",
@@ -163,7 +165,7 @@ class MCPCheck(BaseDiagnosticCheck):
                 if not gateway:
                     return DiagnosticResult(
                         category="MCP Configuration",
-                        status=DiagnosticStatus.WARNING,
+                        status=ValidationSeverity.WARNING,
                         message="MCP gateway not configured",
                         details={"configured": False, "config_path": str(config_path)},
                         fix_command="claude-mpm mcp config",
@@ -175,7 +177,7 @@ class MCPCheck(BaseDiagnosticCheck):
                 if not command:
                     return DiagnosticResult(
                         category="MCP Configuration",
-                        status=DiagnosticStatus.ERROR,
+                        status=ValidationSeverity.ERROR,
                         message="MCP gateway misconfigured (no command)",
                         details={
                             "configured": True,
@@ -188,7 +190,7 @@ class MCPCheck(BaseDiagnosticCheck):
 
                 return DiagnosticResult(
                     category="MCP Configuration",
-                    status=DiagnosticStatus.OK,
+                    status=OperationResult.SUCCESS,
                     message="MCP gateway configured",
                     details={
                         "configured": True,
@@ -200,7 +202,7 @@ class MCPCheck(BaseDiagnosticCheck):
         except json.JSONDecodeError as e:
             return DiagnosticResult(
                 category="MCP Configuration",
-                status=DiagnosticStatus.ERROR,
+                status=ValidationSeverity.ERROR,
                 message="Invalid JSON in config file",
                 details={"error": str(e), "config_path": str(config_path)},
                 fix_description="Fix JSON syntax in Claude Code config",
@@ -208,7 +210,7 @@ class MCPCheck(BaseDiagnosticCheck):
         except Exception as e:
             return DiagnosticResult(
                 category="MCP Configuration",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message=f"Could not check configuration: {e!s}",
                 details={"error": str(e)},
             )
@@ -226,41 +228,53 @@ class MCPCheck(BaseDiagnosticCheck):
             )
 
             if result.returncode == 0:
-                if "running" in result.stdout.lower():
+                if ServiceState.RUNNING.value in result.stdout.lower():
                     return DiagnosticResult(
                         category="MCP Server Status",
-                        status=DiagnosticStatus.OK,
+                        status=OperationResult.SUCCESS,
                         message="MCP server is running",
-                        details={"running": True},
+                        details={"running": True, "state": ServiceState.RUNNING},
                     )
                 return DiagnosticResult(
                     category="MCP Server Status",
-                    status=DiagnosticStatus.WARNING,
+                    status=ValidationSeverity.WARNING,
                     message="MCP server not running",
-                    details={"running": False},
+                    details={"running": False, "state": ServiceState.STOPPED},
                     fix_command="claude-mpm mcp start",
                     fix_description="Start the MCP server",
                 )
             return DiagnosticResult(
                 category="MCP Server Status",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message="Could not determine server status",
-                details={"running": "unknown", "error": result.stderr},
+                details={
+                    "running": "unknown",
+                    "state": ServiceState.UNKNOWN,
+                    "error": result.stderr,
+                },
             )
 
         except subprocess.TimeoutExpired:
             return DiagnosticResult(
                 category="MCP Server Status",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message="Server status check timed out",
-                details={"running": "unknown", "error": "timeout"},
+                details={
+                    "running": "unknown",
+                    "state": ServiceState.UNKNOWN,
+                    "error": "timeout",
+                },
             )
         except Exception as e:
             return DiagnosticResult(
                 category="MCP Server Status",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message=f"Could not check server status: {e!s}",
-                details={"running": "unknown", "error": str(e)},
+                details={
+                    "running": "unknown",
+                    "state": ServiceState.UNKNOWN,
+                    "error": str(e),
+                },
             )
 
     def _check_startup_verification(self) -> DiagnosticResult:
@@ -276,7 +290,7 @@ class MCPCheck(BaseDiagnosticCheck):
             if not issues:
                 return DiagnosticResult(
                     category="MCP Startup Verification",
-                    status=DiagnosticStatus.OK,
+                    status=OperationResult.SUCCESS,
                     message="Startup verification passed",
                     details={"issues": []},
                 )
@@ -290,20 +304,20 @@ class MCPCheck(BaseDiagnosticCheck):
             if errors:
                 return DiagnosticResult(
                     category="MCP Startup Verification",
-                    status=DiagnosticStatus.ERROR,
+                    status=ValidationSeverity.ERROR,
                     message=f"{len(errors)} critical issue(s) found",
                     details={"errors": errors, "warnings": warnings},
                 )
             if warnings:
                 return DiagnosticResult(
                     category="MCP Startup Verification",
-                    status=DiagnosticStatus.WARNING,
+                    status=ValidationSeverity.WARNING,
                     message=f"{len(warnings)} warning(s) found",
                     details={"warnings": warnings},
                 )
             return DiagnosticResult(
                 category="MCP Startup Verification",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message="Startup verification passed",
                 details={"issues": []},
             )
@@ -311,7 +325,7 @@ class MCPCheck(BaseDiagnosticCheck):
         except Exception as e:
             return DiagnosticResult(
                 category="MCP Startup Verification",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message=f"Could not verify startup: {e!s}",
                 details={"error": str(e)},
             )