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

claude_mpm/services/core/path_resolver.py

@@ -13,14 +13,18 @@ that was previously embedded in FrameworkLoader. It manages:
 The service consolidates path management logic while maintaining backward compatibility.
 """
 
-import logging
+import os
 import subprocess
 from enum import Enum
 from pathlib import Path
 from typing import Dict, Optional, Tuple
 
+from claude_mpm.core.logging_utils import get_logger
+
 from .service_interfaces import ICacheManager, IPathResolver
 
+logger = get_logger(__name__)
+
 
 class DeploymentContext(Enum):
     """Deployment context enumeration."""
@@ -48,7 +52,7 @@ class PathResolver(IPathResolver):
         Args:
             cache_manager: Optional cache manager for caching resolved paths
         """
-        self.logger = logging.getLogger(__name__)
+        self.logger = get_logger("path_resolver")
         self.cache_manager = cache_manager
         self._framework_path: Optional[Path] = None
         self._deployment_context: Optional[DeploymentContext] = None
@@ -71,10 +75,25 @@ class PathResolver(IPathResolver):
             return path_obj
 
         if base_dir is None:
-            base_dir = Path.cwd()
+            base_dir = self._get_working_dir()
 
         return (base_dir / path_obj).resolve()
 
+    def _get_working_dir(self) -> Path:
+        """Get working directory respecting CLAUDE_MPM_USER_PWD.
+
+        When Claude MPM runs from a global installation, CLAUDE_MPM_USER_PWD
+        contains the user's actual working directory. This ensures project-local
+        paths are resolved correctly.
+
+        Returns:
+            Path: The user's working directory
+        """
+        user_pwd = os.environ.get("CLAUDE_MPM_USER_PWD")
+        if user_pwd:
+            return Path(user_pwd)
+        return Path.cwd()
+
     def validate_path(self, path: Path, must_exist: bool = False) -> bool:
         """
         Validate a path for security and existence.
@@ -91,10 +110,7 @@ class PathResolver(IPathResolver):
             resolved = path.resolve()
 
             # Check if path exists if required
-            if must_exist and not resolved.exists():
-                return False
-
-            return True
+            return not (must_exist and not resolved.exists())
         except (OSError, ValueError):
             return False
 
@@ -129,7 +145,7 @@ class PathResolver(IPathResolver):
             Project root path or None if not found
         """
         if start_path is None:
-            start_path = Path.cwd()
+            start_path = self._get_working_dir()
 
         start_path = start_path.resolve()
 
@@ -265,7 +281,7 @@ class PathResolver(IPathResolver):
 
         if agents_dir and agents_dir.exists():
             discovered_agents_dir = agents_dir
-            self.logger.info(f"Using custom agents directory: {discovered_agents_dir}")
+            self.logger.debug(f"Using custom agents directory: {discovered_agents_dir}")
         elif framework_path and framework_path != Path("__PACKAGED__"):
             # Prioritize templates directory over main agents directory
             templates_dir = (
@@ -299,7 +315,7 @@ class PathResolver(IPathResolver):
         paths = {"project": None, "user": None, "system": None}
 
         # Project-specific instructions
-        project_path = Path.cwd() / ".claude-mpm" / "INSTRUCTIONS.md"
+        project_path = self._get_working_dir() / ".claude-mpm" / "INSTRUCTIONS.md"
         if project_path.exists():
             paths["project"] = project_path
 
@@ -423,19 +439,22 @@ class PathResolver(IPathResolver):
         """Check common locations for claude-mpm."""
         candidates = [
             # Current directory (if we're already in claude-mpm)
-            Path.cwd(),
+            self._get_working_dir(),
             # Development location
             Path.home() / "Projects" / "claude-mpm",
             # Current directory subdirectory
-            Path.cwd() / "claude-mpm",
+            self._get_working_dir() / "claude-mpm",
         ]
 
         for candidate in candidates:
-            if candidate and candidate.exists():
-                # Check for claude-mpm agents directory
-                if (candidate / "src" / "claude_mpm" / "agents").exists():
-                    self.logger.info(f"Found claude-mpm at: {candidate}")
-                    return candidate
+            if (
+                candidate
+                and candidate.exists()
+                and (candidate / "src" / "claude_mpm" / "agents").exists()
+            ):
+                # Found claude-mpm agents directory
+                self.logger.info(f"Found claude-mpm at: {candidate}")
+                return candidate
 
         return None
 
@@ -484,7 +503,7 @@ class PathResolver(IPathResolver):
             pass
 
         # Check if we're in development
-        if (Path.cwd() / "pyproject.toml").exists():
+        if (self._get_working_dir() / "pyproject.toml").exists():
             return DeploymentContext.DEVELOPMENT
 
         return DeploymentContext.UNKNOWN

claude_mpm/services/core/service_container.py

@@ -244,7 +244,7 @@ class ServiceContainer:
 
         # Check for circular dependencies
         if service_type in self._resolution_stack.stack:
-            raise CircularDependencyError(self._resolution_stack.stack + [service_type])
+            raise CircularDependencyError([*self._resolution_stack.stack, service_type])
 
         try:
             # Add to resolution stack
@@ -287,7 +287,7 @@ class ServiceContainer:
         results = []
 
         with self._lock:
-            for registered_type, descriptor in self._services.items():
+            for registered_type, _descriptor in self._services.items():
                 # Check if registered type is subclass of requested type
                 if self._is_assignable(registered_type, service_type):
                     try:

claude_mpm/services/diagnostics/__init__.py

@@ -13,6 +13,6 @@ DESIGN DECISIONS:
 
 from .diagnostic_runner import DiagnosticRunner
 from .doctor_reporter import DoctorReporter
-from .models import DiagnosticResult, DiagnosticStatus
+from .models import DiagnosticResult
 
-__all__ = ["DiagnosticResult", "DiagnosticRunner", "DiagnosticStatus", "DoctorReporter"]
+__all__ = ["DiagnosticResult", "DiagnosticRunner", "DoctorReporter"]

claude_mpm/services/diagnostics/checks/__init__.py

@@ -7,26 +7,28 @@ diagnostic components.
 
 from .agent_check import AgentCheck
 from .base_check import BaseDiagnosticCheck
-from .claude_desktop_check import ClaudeDesktopCheck
+from .claude_code_check import ClaudeCodeCheck
 from .common_issues_check import CommonIssuesCheck
 from .configuration_check import ConfigurationCheck
 from .filesystem_check import FilesystemCheck
 from .installation_check import InstallationCheck
 from .instructions_check import InstructionsCheck
 from .mcp_check import MCPCheck
+from .mcp_services_check import MCPServicesCheck
 from .monitor_check import MonitorCheck
 from .startup_log_check import StartupLogCheck
 
 __all__ = [
     "AgentCheck",
     "BaseDiagnosticCheck",
-    "ClaudeDesktopCheck",
+    "ClaudeCodeCheck",
     "CommonIssuesCheck",
     "ConfigurationCheck",
     "FilesystemCheck",
     "InstallationCheck",
     "InstructionsCheck",
     "MCPCheck",
+    "MCPServicesCheck",
     "MonitorCheck",
     "StartupLogCheck",
 ]

claude_mpm/services/diagnostics/checks/agent_check.py

@@ -6,7 +6,8 @@ WHY: Verify that agents are properly deployed, up-to-date, and functioning corre
 
 from pathlib import Path
 
-from ..models import DiagnosticResult, DiagnosticStatus
+from ....core.enums import OperationResult, ValidationSeverity
+from ..models import DiagnosticResult
 from .base_check import BaseDiagnosticCheck
 
 
@@ -64,29 +65,29 @@ class AgentCheck(BaseDiagnosticCheck):
             available_count = details["available_count"]
 
             if deployed_count == 0:
-                status = DiagnosticStatus.ERROR
+                status = ValidationSeverity.ERROR
                 message = f"No agents deployed (0/{available_count} available)"
                 fix_command = "claude-mpm agents deploy"
                 fix_description = "Deploy all available agents"
             elif deployed_count < available_count:
-                status = DiagnosticStatus.WARNING
+                status = ValidationSeverity.WARNING
                 message = f"{deployed_count}/{available_count} agents deployed"
                 fix_command = "claude-mpm agents deploy"
                 fix_description = (
                     f"Deploy remaining {available_count - deployed_count} agents"
                 )
-            elif any(r.status == DiagnosticStatus.ERROR for r in sub_results):
-                status = DiagnosticStatus.ERROR
+            elif any(r.status == ValidationSeverity.ERROR for r in sub_results):
+                status = ValidationSeverity.ERROR
                 message = "Agents have critical issues"
                 fix_command = None
                 fix_description = None
-            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 = "Agents have minor issues"
                 fix_command = None
                 fix_description = None
             else:
-                status = DiagnosticStatus.OK
+                status = OperationResult.SUCCESS
                 message = f"All {deployed_count} agents properly deployed"
                 fix_command = None
                 fix_description = None
@@ -104,17 +105,16 @@ class AgentCheck(BaseDiagnosticCheck):
         except Exception as e:
             return DiagnosticResult(
                 category=self.category,
-                status=DiagnosticStatus.ERROR,
+                status=ValidationSeverity.ERROR,
                 message=f"Agent check failed: {e!s}",
                 details={"error": str(e)},
             )
 
     def _check_deployed_agents(self) -> DiagnosticResult:
         """Check deployed agents in both project and user directories."""
-        import os
 
         # Check project-level agents first (preferred in development)
-        project_agents_dir = Path(os.getcwd()) / ".claude" / "agents"
+        project_agents_dir = Path(Path.cwd()) / ".claude" / "agents"
         user_agents_dir = Path.home() / ".claude" / "agents"
 
         # Determine which directory to check
@@ -128,7 +128,7 @@ class AgentCheck(BaseDiagnosticCheck):
             # Neither exists, default to user directory for error message
             return DiagnosticResult(
                 category="Deployed Agents",
-                status=DiagnosticStatus.ERROR,
+                status=ValidationSeverity.ERROR,
                 message="No agents directory found (checked project and user)",
                 details={
                     "project_path": str(project_agents_dir),
@@ -145,7 +145,7 @@ class AgentCheck(BaseDiagnosticCheck):
         if not agent_files:
             return DiagnosticResult(
                 category="Deployed Agents",
-                status=DiagnosticStatus.ERROR,
+                status=ValidationSeverity.ERROR,
                 message=f"No agents deployed in {location} directory",
                 details={"path": str(agents_dir), "location": location, "count": 0},
                 fix_command="claude-mpm agents deploy",
@@ -160,7 +160,7 @@ class AgentCheck(BaseDiagnosticCheck):
         if missing_core:
             return DiagnosticResult(
                 category="Deployed Agents",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message=f"Missing core agents in {location}: {', '.join(missing_core)}",
                 details={
                     "path": str(agents_dir),
@@ -175,7 +175,7 @@ class AgentCheck(BaseDiagnosticCheck):
 
         return DiagnosticResult(
             category="Deployed Agents",
-            status=DiagnosticStatus.OK,
+            status=OperationResult.SUCCESS,
             message=f"{len(agent_files)} agents deployed ({location} level)",
             details={
                 "path": str(agents_dir),
@@ -188,7 +188,6 @@ class AgentCheck(BaseDiagnosticCheck):
     def _check_agent_versions(self) -> DiagnosticResult:
         """Check if deployed agents are up-to-date."""
         try:
-            import os
 
             from ....services.agents.deployment.agent_version_manager import (
                 AgentVersionManager,
@@ -197,7 +196,7 @@ class AgentCheck(BaseDiagnosticCheck):
             version_manager = AgentVersionManager()
 
             # Check both project and user directories
-            project_agents_dir = Path(os.getcwd()) / ".claude" / "agents"
+            project_agents_dir = Path(Path.cwd()) / ".claude" / "agents"
             user_agents_dir = Path.home() / ".claude" / "agents"
 
             if project_agents_dir.exists():
@@ -207,7 +206,7 @@ class AgentCheck(BaseDiagnosticCheck):
             else:
                 return DiagnosticResult(
                     category="Agent Versions",
-                    status=DiagnosticStatus.SKIPPED,
+                    status=OperationResult.SKIPPED,
                     message="No agents to check",
                     details={},
                 )
@@ -226,7 +225,7 @@ class AgentCheck(BaseDiagnosticCheck):
             if outdated:
                 return DiagnosticResult(
                     category="Agent Versions",
-                    status=DiagnosticStatus.WARNING,
+                    status=ValidationSeverity.WARNING,
                     message=f"{len(outdated)} agent(s) outdated",
                     details={"outdated": outdated, "checked": checked},
                     fix_command="claude-mpm agents update",
@@ -236,14 +235,14 @@ class AgentCheck(BaseDiagnosticCheck):
             if checked == 0:
                 return DiagnosticResult(
                     category="Agent Versions",
-                    status=DiagnosticStatus.WARNING,
+                    status=ValidationSeverity.WARNING,
                     message="No agents to check",
                     details={"checked": 0},
                 )
 
             return DiagnosticResult(
                 category="Agent Versions",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message=f"All {checked} agents up-to-date",
                 details={"checked": checked},
             )
@@ -251,7 +250,7 @@ class AgentCheck(BaseDiagnosticCheck):
         except Exception as e:
             return DiagnosticResult(
                 category="Agent Versions",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message=f"Could not check versions: {e!s}",
                 details={"error": str(e)},
             )
@@ -259,14 +258,13 @@ class AgentCheck(BaseDiagnosticCheck):
     def _validate_agents(self) -> DiagnosticResult:
         """Validate agent configurations."""
         try:
-            import os
 
             from ....services.agents.deployment.agent_validator import AgentValidator
 
             AgentValidator()
 
             # Check both project and user directories
-            project_agents_dir = Path(os.getcwd()) / ".claude" / "agents"
+            project_agents_dir = Path(Path.cwd()) / ".claude" / "agents"
             user_agents_dir = Path.home() / ".claude" / "agents"
 
             if project_agents_dir.exists():
@@ -276,7 +274,7 @@ class AgentCheck(BaseDiagnosticCheck):
             else:
                 return DiagnosticResult(
                     category="Agent Validation",
-                    status=DiagnosticStatus.SKIPPED,
+                    status=OperationResult.SKIPPED,
                     message="No agents to validate",
                     details={},
                 )
@@ -289,7 +287,7 @@ class AgentCheck(BaseDiagnosticCheck):
 
                 # Basic validation
                 try:
-                    with open(agent_file) as f:
+                    with agent_file.open() as f:
                         content = f.read()
 
                         # Check for required sections
@@ -304,14 +302,14 @@ class AgentCheck(BaseDiagnosticCheck):
             if invalid:
                 return DiagnosticResult(
                     category="Agent Validation",
-                    status=DiagnosticStatus.WARNING,
+                    status=ValidationSeverity.WARNING,
                     message=f"{len(invalid)} validation issue(s)",
                     details={"issues": invalid, "validated": validated},
                 )
 
             return DiagnosticResult(
                 category="Agent Validation",
-                status=DiagnosticStatus.OK,
+                status=OperationResult.SUCCESS,
                 message=f"All {validated} agents valid",
                 details={"validated": validated},
             )
@@ -319,7 +317,7 @@ class AgentCheck(BaseDiagnosticCheck):
         except Exception as e:
             return DiagnosticResult(
                 category="Agent Validation",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message=f"Validation failed: {e!s}",
                 details={"error": str(e)},
             )
@@ -331,7 +329,7 @@ class AgentCheck(BaseDiagnosticCheck):
         issues = []
 
         # Check both project and user directories
-        project_agents_dir = Path(os.getcwd()) / ".claude" / "agents"
+        project_agents_dir = Path(Path.cwd()) / ".claude" / "agents"
         user_agents_dir = Path.home() / ".claude" / "agents"
 
         if project_agents_dir.exists():
@@ -361,14 +359,14 @@ class AgentCheck(BaseDiagnosticCheck):
         if issues:
             return DiagnosticResult(
                 category="Common Issues",
-                status=DiagnosticStatus.WARNING,
+                status=ValidationSeverity.WARNING,
                 message=f"{len(issues)} issue(s) found",
                 details={"issues": issues},
             )
 
         return DiagnosticResult(
             category="Common Issues",
-            status=DiagnosticStatus.OK,
+            status=OperationResult.SUCCESS,
             message="No common issues detected",
             details={},
         )