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

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,13 +192,12 @@ class InstructionsCheck(BaseDiagnosticCheck):
         if len(files) < 2:
             return DiagnosticResult(
                 category="Duplicate Content",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message="No duplicate content detected",
                 details={},
             )
 
         # Calculate content hashes
-        content_hashes = {}
         content_snippets = defaultdict(list)
 
         for path in files:
@@ -227,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=(
@@ -239,7 +239,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
 
         return DiagnosticResult(
             category="Duplicate Content",
-            status=DiagnosticStatus.OK,
+            status=OperationResult.SUCCESS,
             message="No significant duplicate content found",
             details={},
         )
@@ -265,7 +265,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
         for description, occurrences in pattern_occurrences.items():
             if len(occurrences) > 1:
                 files_info = []
-                for path, count, snippet in occurrences:
+                for path, count, _snippet in occurrences:
                     rel_path = (
                         path.relative_to(Path.cwd())
                         if Path.cwd() in path.parents or path.parent == Path.cwd()
@@ -281,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=(
@@ -293,7 +293,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
 
         return DiagnosticResult(
             category="Conflicting Directives",
-            status=DiagnosticStatus.OK,
+            status=OperationResult.SUCCESS,
             message="No conflicting directives detected",
             details={},
         )
@@ -331,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=(
@@ -342,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)},
         )
@@ -374,9 +374,7 @@ class InstructionsCheck(BaseDiagnosticCheck):
                 continue
 
         # Check for Claude Code specific content in INSTRUCTIONS.md
-        instructions_files = [
-            path for path in files if path.name == "INSTRUCTIONS.md"
-        ]
+        instructions_files = [path for path in files if path.name == "INSTRUCTIONS.md"]
         for path in instructions_files:
             try:
                 content = path.read_text(encoding="utf-8")
@@ -399,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=(
@@ -412,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

@@ -2,14 +2,16 @@
 Check MCP (Model Context Protocol) server status.
 
 WHY: Verify that the MCP gateway is properly installed, configured,
-and functioning for enhanced Claude Desktop capabilities.
+and functioning for enhanced Claude Code capabilities.
 """
 
 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",
@@ -129,7 +131,7 @@ class MCPCheck(BaseDiagnosticCheck):
         )
 
     def _check_configuration(self) -> DiagnosticResult:
-        """Check MCP configuration in Claude Desktop."""
+        """Check MCP configuration in Claude Code."""
         config_paths = [
             Path.home() / ".config/claude/claude_desktop_config.json",
             Path.home()
@@ -146,15 +148,15 @@ class MCPCheck(BaseDiagnosticCheck):
         if not config_path:
             return DiagnosticResult(
                 category="MCP Configuration",
-                status=DiagnosticStatus.WARNING,
-                message="Claude Desktop config not found",
+                status=ValidationSeverity.WARNING,
+                message="Claude Code config not found",
                 details={"configured": False},
                 fix_command="claude-mpm mcp config",
-                fix_description="Configure MCP server in Claude Desktop",
+                fix_description="Configure MCP server in Claude Code",
             )
 
         try:
-            with open(config_path) as f:
+            with config_path.open() as f:
                 config = json.load(f)
 
                 mcp_servers = config.get("mcpServers", {})
@@ -163,11 +165,11 @@ 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",
-                        fix_description="Add MCP gateway to Claude Desktop configuration",
+                        fix_description="Add MCP gateway to Claude Code configuration",
                     )
 
                 # Check configuration validity
@@ -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,15 +202,15 @@ 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 Desktop config",
+                fix_description="Fix JSON syntax in Claude Code config",
             )
         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)},
             )