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

claude_mpm/services/diagnostics/checks/monitor_check.py

@@ -7,7 +7,8 @@ properly configured and accessible for real-time updates.
 
 import socket
 
-from ..models import DiagnosticResult, DiagnosticStatus
+from ....core.enums import OperationResult, ValidationSeverity
+from ..models import DiagnosticResult
 from .base_check import BaseDiagnosticCheck
 
 
@@ -33,7 +34,7 @@ class MonitorCheck(BaseDiagnosticCheck):
             socketio_result = self._check_socketio()
             sub_results.append(socketio_result)
             details["socketio_available"] = (
-                socketio_result.status == DiagnosticStatus.OK
+                socketio_result.status == OperationResult.SUCCESS
             )
 
             # Check port availability
@@ -49,17 +50,17 @@ class MonitorCheck(BaseDiagnosticCheck):
             # Check hook service
             hook_result = self._check_hook_service()
             sub_results.append(hook_result)
-            details["hooks_enabled"] = hook_result.status == DiagnosticStatus.OK
+            details["hooks_enabled"] = hook_result.status == OperationResult.SUCCESS
 
             # 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 = "Monitoring 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 = "Monitoring has minor issues"
             else:
-                status = DiagnosticStatus.OK
+                status = OperationResult.SUCCESS
                 message = "Monitoring properly configured"
 
             return DiagnosticResult(
@@ -73,7 +74,7 @@ class MonitorCheck(BaseDiagnosticCheck):
         except Exception as e:
             return DiagnosticResult(
                 category=self.category,
-                status=DiagnosticStatus.ERROR,
+                status=ValidationSeverity.ERROR,
                 message=f"Monitor check failed: {e!s}",
                 details={"error": str(e)},
             )
@@ -85,7 +86,7 @@ class MonitorCheck(BaseDiagnosticCheck):
 
             return DiagnosticResult(
                 category="SocketIO",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message="SocketIO library available",
                 details={
                     "available": True,
@@ -95,7 +96,7 @@ class MonitorCheck(BaseDiagnosticCheck):
         except ImportError:
             return DiagnosticResult(
                 category="SocketIO",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message="SocketIO not installed",
                 details={"available": False},
                 fix_command="pip install python-socketio[asyncio]",
@@ -122,7 +123,7 @@ class MonitorCheck(BaseDiagnosticCheck):
             if not available_ports:
                 return DiagnosticResult(
                     category="Port Availability",
-                    status=DiagnosticStatus.ERROR,
+                    status=ValidationSeverity.ERROR,
                     message="No monitoring ports available (8765-8785)",
                     details={
                         "available": [],
@@ -137,7 +138,7 @@ class MonitorCheck(BaseDiagnosticCheck):
             if default_port not in available_ports:
                 return DiagnosticResult(
                     category="Port Availability",
-                    status=DiagnosticStatus.WARNING,
+                    status=ValidationSeverity.WARNING,
                     message=f"Default port {default_port} in use, but alternatives available",
                     details={
                         "available": available_ports,
@@ -148,7 +149,7 @@ class MonitorCheck(BaseDiagnosticCheck):
 
             return DiagnosticResult(
                 category="Port Availability",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message=f"{len(available_ports)} monitoring port(s) available",
                 details={
                     "available": available_ports,
@@ -160,7 +161,7 @@ class MonitorCheck(BaseDiagnosticCheck):
         except Exception as e:
             return DiagnosticResult(
                 category="Port Availability",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message=f"Could not check ports: {e!s}",
                 details={"error": str(e)},
             )
@@ -193,7 +194,7 @@ class MonitorCheck(BaseDiagnosticCheck):
         for config_path in config_paths:
             if config_path.exists():
                 try:
-                    with open(config_path) as f:
+                    with config_path.open() as f:
                         config = yaml.safe_load(f)
                         if config and isinstance(config, dict):
                             response_config = config.get("response_logging", {})
@@ -209,7 +210,7 @@ class MonitorCheck(BaseDiagnosticCheck):
         if not response_logging_enabled:
             return DiagnosticResult(
                 category="Response Logging",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message="Response logging disabled (default)",
                 details={"enabled": False},
             )
@@ -219,7 +220,7 @@ class MonitorCheck(BaseDiagnosticCheck):
         if not log_dir.exists():
             return DiagnosticResult(
                 category="Response Logging",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message="Response logging enabled but directory missing",
                 details={"enabled": True, "path": str(log_dir), "exists": False},
                 fix_command=f"mkdir -p {log_dir}",
@@ -231,7 +232,7 @@ class MonitorCheck(BaseDiagnosticCheck):
         if not os.access(log_dir, os.W_OK):
             return DiagnosticResult(
                 category="Response Logging",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message="Response logging directory not writable",
                 details={"enabled": True, "path": str(log_dir), "writable": False},
                 fix_command=f"chmod 755 {log_dir}",
@@ -240,7 +241,7 @@ class MonitorCheck(BaseDiagnosticCheck):
 
         return DiagnosticResult(
             category="Response Logging",
-            status=DiagnosticStatus.OK,
+            status=OperationResult.SUCCESS,
             message="Response logging enabled and configured",
             details={
                 "enabled": True,
@@ -260,7 +261,7 @@ class MonitorCheck(BaseDiagnosticCheck):
 
             return DiagnosticResult(
                 category="Hook Service",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message="Hook service available",
                 details={"available": True},
             )
@@ -268,14 +269,14 @@ class MonitorCheck(BaseDiagnosticCheck):
         except ImportError:
             return DiagnosticResult(
                 category="Hook Service",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message="Hook service not available",
                 details={"available": False},
             )
         except Exception as e:
             return DiagnosticResult(
                 category="Hook Service",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message=f"Hook service error: {e!s}",
                 details={"available": False, "error": str(e)},
             )

claude_mpm/services/diagnostics/checks/startup_log_check.py

@@ -15,9 +15,10 @@ DESIGN DECISIONS:
 import re
 from datetime import datetime
 from pathlib import Path
-from typing import Any, Dict, Optional
+from typing import Any, ClassVar, Dict, Optional
 
-from ..models import DiagnosticResult, DiagnosticStatus
+from ....core.enums import OperationResult, ValidationSeverity
+from ..models import DiagnosticResult
 from .base_check import BaseDiagnosticCheck
 
 
@@ -25,7 +26,7 @@ class StartupLogCheck(BaseDiagnosticCheck):
     """Analyze startup logs for errors and issues."""
 
     # Common error patterns and their fixes
-    ERROR_PATTERNS = {
+    ERROR_PATTERNS: ClassVar[dict[str, dict[str, Any]]] = {
         r"Agent deployment.*failed": (
             "Agent deployment failure",
             "Check agent configuration in .claude/agents/ and run 'claude-mpm deploy'",
@@ -94,7 +95,7 @@ class StartupLogCheck(BaseDiagnosticCheck):
             if not log_file:
                 return DiagnosticResult(
                     category=self.category,
-                    status=DiagnosticStatus.WARNING,
+                    status=ValidationSeverity.WARNING,
                     message="No startup logs found",
                     details={
                         "recommendation": "Startup logging will be created on next run"
@@ -135,7 +136,7 @@ class StartupLogCheck(BaseDiagnosticCheck):
                     sub_results.append(
                         DiagnosticResult(
                             category="Error",
-                            status=DiagnosticStatus.ERROR,
+                            status=ValidationSeverity.ERROR,
                             message=error_type,
                             details={"fix": fix},
                         )
@@ -153,7 +154,7 @@ class StartupLogCheck(BaseDiagnosticCheck):
         except Exception as e:
             return DiagnosticResult(
                 category=self.category,
-                status=DiagnosticStatus.ERROR,
+                status=ValidationSeverity.ERROR,
                 message=f"Startup log check failed: {e!s}",
                 details={"error": str(e)},
             )
@@ -186,7 +187,9 @@ class StartupLogCheck(BaseDiagnosticCheck):
         }
 
         try:
-            with open(log_file, encoding="utf-8") as f:
+            with Path(log_file).open(
+                encoding="utf-8",
+            ) as f:
                 lines = f.readlines()
 
             # Extract timestamp from filename or first line
@@ -278,13 +281,13 @@ class StartupLogCheck(BaseDiagnosticCheck):
 
         analysis["recommendations"] = recommendations
 
-    def _determine_status(self, analysis: Dict[str, Any]) -> DiagnosticStatus:
+    def _determine_status(self, analysis: Dict[str, Any]):
         """Determine overall status based on analysis."""
         if analysis["error_count"] > 0:
-            return DiagnosticStatus.ERROR
+            return ValidationSeverity.ERROR
         if analysis["warning_count"] > 3 or analysis["warning_count"] > 0:
-            return DiagnosticStatus.WARNING
-        return DiagnosticStatus.OK
+            return ValidationSeverity.WARNING
+        return OperationResult.SUCCESS
 
     def _create_message(self, analysis: Dict[str, Any]) -> str:
         """Create summary message based on analysis."""

claude_mpm/services/diagnostics/diagnostic_runner.py

@@ -6,24 +6,29 @@ and aggregate results for reporting.
 """
 
 import asyncio
-import logging
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from typing import List, Type
 
+from claude_mpm.core.enums import ValidationSeverity
+from claude_mpm.core.logging_utils import get_logger
+
 from .checks import (
     AgentCheck,
     BaseDiagnosticCheck,
-    ClaudeDesktopCheck,
+    ClaudeCodeCheck,
     CommonIssuesCheck,
     ConfigurationCheck,
     FilesystemCheck,
     InstallationCheck,
     InstructionsCheck,
     MCPCheck,
+    MCPServicesCheck,
     MonitorCheck,
     StartupLogCheck,
 )
-from .models import DiagnosticResult, DiagnosticStatus, DiagnosticSummary
+from .models import DiagnosticResult, DiagnosticSummary
+
+logger = get_logger(__name__)
 
 
 class DiagnosticRunner:
@@ -42,17 +47,17 @@ class DiagnosticRunner:
         """
         self.verbose = verbose
         self.fix = fix
-        self.logger = logging.getLogger(__name__)
-
+        self.logger = logger  # Add logger initialization
         # Define check order (dependencies first)
         self.check_classes: List[Type[BaseDiagnosticCheck]] = [
             InstallationCheck,
             ConfigurationCheck,
             FilesystemCheck,
             InstructionsCheck,  # Check instruction files early
-            ClaudeDesktopCheck,
+            ClaudeCodeCheck,
             AgentCheck,
             MCPCheck,
+            MCPServicesCheck,  # Check external MCP services
             MonitorCheck,
             StartupLogCheck,  # Check startup logs for recent issues
             CommonIssuesCheck,
@@ -88,7 +93,7 @@ class DiagnosticRunner:
                 self.logger.error(f"Check {check_class.__name__} failed: {e}")
                 error_result = DiagnosticResult(
                     category=check_class.__name__.replace("Check", ""),
-                    status=DiagnosticStatus.ERROR,
+                    status=ValidationSeverity.ERROR,
                     message=f"Check failed: {e!s}",
                     details={"error": str(e)},
                 )
@@ -117,9 +122,10 @@ class DiagnosticRunner:
         ]
         # Level 2: May depend on level 1
         level2 = [
-            ClaudeDesktopCheck,
+            ClaudeCodeCheck,
             AgentCheck,
             MCPCheck,
+            MCPServicesCheck,
             MonitorCheck,
             StartupLogCheck,
         ]
@@ -162,7 +168,7 @@ class DiagnosticRunner:
                     results.append(
                         DiagnosticResult(
                             category=check_class.__name__.replace("Check", ""),
-                            status=DiagnosticStatus.ERROR,
+                            status=ValidationSeverity.ERROR,
                             message=f"Check initialization failed: {e!s}",
                             details={"error": str(e)},
                         )
@@ -178,7 +184,7 @@ class DiagnosticRunner:
                     results.append(
                         DiagnosticResult(
                             category=check_name.replace("Check", ""),
-                            status=DiagnosticStatus.ERROR,
+                            status=ValidationSeverity.ERROR,
                             message=f"Check execution failed: {e!s}",
                             details={"error": str(e)},
                         )
@@ -204,11 +210,14 @@ class DiagnosticRunner:
             "config": ConfigurationCheck,
             "filesystem": FilesystemCheck,
             "fs": FilesystemCheck,
-            "claude": ClaudeDesktopCheck,
-            "claude_desktop": ClaudeDesktopCheck,
+            "claude": ClaudeCodeCheck,
+            "claude_code": ClaudeCodeCheck,
             "agents": AgentCheck,
             "agent": AgentCheck,
             "mcp": MCPCheck,
+            "mcp_services": MCPServicesCheck,
+            "mcp-services": MCPServicesCheck,
+            "external": MCPServicesCheck,
             "monitor": MonitorCheck,
             "monitoring": MonitorCheck,
             "common": CommonIssuesCheck,
@@ -230,7 +239,7 @@ class DiagnosticRunner:
                 self.logger.error(f"Check {name} failed: {e}")
                 error_result = DiagnosticResult(
                     category=check_class.__name__.replace("Check", ""),
-                    status=DiagnosticStatus.ERROR,
+                    status=ValidationSeverity.ERROR,
                     message=f"Check failed: {e!s}",
                     details={"error": str(e)},
                 )