claude-mpm 4.4.5__py3-none-any.whl → 4.4.7__py3-none-any.whl

claude_mpm/services/diagnostics/checks/{claude_desktop_check.py → claude_code_check.py}

@@ -1,7 +1,7 @@
 """
-Check Claude Desktop integration.
+Check Claude Code (CLI) integration.
 
-WHY: Verify that Claude Desktop is installed, properly configured,
+WHY: Verify that Claude Code CLI is installed, properly configured,
 and integrated with claude-mpm.
 """
 
@@ -13,24 +13,24 @@ from ..models import DiagnosticResult, DiagnosticStatus
 from .base_check import BaseDiagnosticCheck
 
 
-class ClaudeDesktopCheck(BaseDiagnosticCheck):
-    """Check Claude Desktop installation and integration."""
+class ClaudeCodeCheck(BaseDiagnosticCheck):
+    """Check Claude Code CLI installation and integration."""
 
     @property
     def name(self) -> str:
-        return "claude_desktop_check"
+        return "claude_code_check"
 
     @property
     def category(self) -> str:
-        return "Claude Desktop"
+        return "Claude Code"
 
     def run(self) -> DiagnosticResult:
-        """Run Claude Desktop diagnostics."""
+        """Run Claude Code CLI diagnostics."""
         try:
             sub_results = []
             details = {}
 
-            # Check if Claude Desktop is installed
+            # Check if Claude Code CLI is installed
             install_result = self._check_installation()
             sub_results.append(install_result)
             details["installed"] = install_result.status == DiagnosticStatus.OK
@@ -54,13 +54,13 @@ class ClaudeDesktopCheck(BaseDiagnosticCheck):
             # Determine overall status
             if any(r.status == DiagnosticStatus.ERROR for r in sub_results):
                 status = DiagnosticStatus.ERROR
-                message = "Claude Desktop has critical issues"
+                message = "Claude Code CLI has critical issues"
             elif any(r.status == DiagnosticStatus.WARNING for r in sub_results):
                 status = DiagnosticStatus.WARNING
-                message = "Claude Desktop needs configuration"
+                message = "Claude Code CLI needs configuration"
             else:
                 status = DiagnosticStatus.OK
-                message = "Claude Desktop properly configured"
+                message = "Claude Code CLI properly configured"
 
             return DiagnosticResult(
                 category=self.category,
@@ -74,109 +74,102 @@ class ClaudeDesktopCheck(BaseDiagnosticCheck):
             return DiagnosticResult(
                 category=self.category,
                 status=DiagnosticStatus.ERROR,
-                message=f"Claude Desktop check failed: {e!s}",
+                message=f"Claude Code CLI check failed: {e!s}",
                 details={"error": str(e)},
             )
 
     def _check_installation(self) -> DiagnosticResult:
-        """Check if Claude Desktop is installed."""
-        # Check common installation paths
-        mac_path = Path("/Applications/Claude.app")
-        linux_paths = [
-            Path.home() / ".local/share/applications/claude.desktop",
-            Path("/usr/share/applications/claude.desktop"),
-            Path("/opt/Claude"),
-        ]
-        windows_paths = [
-            Path("C:/Program Files/Claude/Claude.exe"),
-            Path.home() / "AppData/Local/Claude/Claude.exe",
-        ]
-
-        # Check for Claude process
+        """Check if Claude Code CLI is installed."""
+        # Check if claude command is available
         try:
             result = subprocess.run(
-                ["pgrep", "-f", "Claude"], capture_output=True, timeout=2, check=False
+                ["claude", "--version"],
+                capture_output=True,
+                timeout=5,
+                check=False,
+                text=True
             )
             if result.returncode == 0:
                 return DiagnosticResult(
-                    category="Claude Desktop Installation",
+                    category="Claude Code CLI Installation",
                     status=DiagnosticStatus.OK,
-                    message="Claude Desktop is running",
-                    details={"running": True},
+                    message="Claude Code CLI is installed and accessible",
+                    details={
+                        "installed": True,
+                        "path": "claude",
+                        "version_output": result.stdout.strip()
+                    },
                 )
         except (subprocess.SubprocessError, FileNotFoundError):
             pass
 
-        # Check installation paths
-        if mac_path.exists():
-            return DiagnosticResult(
-                category="Claude Desktop Installation",
-                status=DiagnosticStatus.OK,
-                message="Claude Desktop installed (macOS)",
-                details={"path": str(mac_path), "platform": "macos"},
-            )
-
-        for path in linux_paths:
-            if path.exists():
-                return DiagnosticResult(
-                    category="Claude Desktop Installation",
-                    status=DiagnosticStatus.OK,
-                    message="Claude Desktop installed (Linux)",
-                    details={"path": str(path), "platform": "linux"},
-                )
+        # Check common installation paths
+        possible_paths = [
+            Path("/usr/local/bin/claude"),
+            Path.home() / ".local/bin/claude",
+            Path("/opt/homebrew/bin/claude"),
+            Path("/usr/bin/claude"),
+        ]
 
-        for path in windows_paths:
-            if path.exists():
+        for path in possible_paths:
+            if path.exists() and path.is_file():
                 return DiagnosticResult(
-                    category="Claude Desktop Installation",
+                    category="Claude Code CLI Installation",
                     status=DiagnosticStatus.OK,
-                    message="Claude Desktop installed (Windows)",
-                    details={"path": str(path), "platform": "windows"},
+                    message=f"Claude Code CLI found at {path}",
+                    details={"installed": True, "path": str(path)},
                 )
 
         return DiagnosticResult(
-            category="Claude Desktop Installation",
-            status=DiagnosticStatus.WARNING,
-            message="Claude Desktop not found",
+            category="Claude Code CLI Installation",
+            status=DiagnosticStatus.ERROR,
+            message="Claude Code CLI not found",
             details={"installed": False},
-            fix_description="Install Claude Desktop from https://claude.ai/download",
+            fix_description="Install Claude Code CLI from https://claude.ai/code",
         )
 
     def _check_version(self) -> DiagnosticResult:
-        """Check Claude Desktop version compatibility."""
-        # Try to get version from config file
-        config_paths = [
-            Path.home() / "Library/Application Support/Claude/config.json",  # macOS
-            Path.home() / ".config/Claude/config.json",  # Linux
-            Path.home() / "AppData/Roaming/Claude/config.json",  # Windows
-        ]
+        """Check Claude Code CLI version compatibility."""
+        try:
+            result = subprocess.run(
+                ["claude", "--version"],
+                capture_output=True,
+                timeout=5,
+                check=True,
+                text=True
+            )
+            version_output = result.stdout.strip()
 
-        for config_path in config_paths:
-            if config_path.exists():
-                try:
-                    with open(config_path) as f:
-                        config = json.load(f)
-                        version = config.get("version", "unknown")
-
-                        # Simple version check (would need real version comparison logic)
-                        return DiagnosticResult(
-                            category="Claude Desktop Version",
-                            status=DiagnosticStatus.OK,
-                            message=f"Version: {version}",
-                            details={
-                                "version": version,
-                                "config_path": str(config_path),
-                            },
-                        )
-                except Exception:
-                    pass
+            # Extract version number (basic parsing)
+            version = "unknown"
+            if "version" in version_output.lower():
+                parts = version_output.split()
+                for i, part in enumerate(parts):
+                    if "version" in part.lower() and i + 1 < len(parts):
+                        version = parts[i + 1]
+                        break
 
-        return DiagnosticResult(
-            category="Claude Desktop Version",
-            status=DiagnosticStatus.WARNING,
-            message="Could not determine version",
-            details={"version": "unknown"},
-        )
+            # Check minimum version requirement (1.0.60+)
+            status = DiagnosticStatus.OK
+            message = f"Version: {version}"
+
+            return DiagnosticResult(
+                category="Claude Code CLI Version",
+                status=status,
+                message=message,
+                details={
+                    "version": version,
+                    "version_output": version_output,
+                },
+            )
+
+        except subprocess.SubprocessError as e:
+            return DiagnosticResult(
+                category="Claude Code CLI Version",
+                status=DiagnosticStatus.WARNING,
+                message=f"Could not determine version: {e}",
+                details={"version": "unknown", "error": str(e)},
+            )
 
     def _check_output_style(self) -> DiagnosticResult:
         """Check if output style is deployed."""
@@ -224,36 +217,26 @@ class ClaudeDesktopCheck(BaseDiagnosticCheck):
             )
 
     def _check_mcp_integration(self) -> DiagnosticResult:
-        """Check MCP server integration with Claude Desktop."""
-        config_path = Path.home() / ".config/claude/claude_desktop_config.json"
+        """Check MCP server integration with Claude Code CLI."""
+        # Claude Code CLI uses ~/.claude.json for configuration
+        config_path = Path.home() / ".claude.json"
 
         if not config_path.exists():
-            # Try alternate paths
-            alt_paths = [
-                Path.home()
-                / "Library/Application Support/Claude/claude_desktop_config.json",
-                Path.home() / "AppData/Roaming/Claude/claude_desktop_config.json",
-            ]
-            for alt_path in alt_paths:
-                if alt_path.exists():
-                    config_path = alt_path
-                    break
-            else:
-                return DiagnosticResult(
-                    category="MCP Integration",
-                    status=DiagnosticStatus.WARNING,
-                    message="Claude Desktop config not found",
-                    details={"configured": False},
-                    fix_command="claude-mpm mcp install",
-                    fix_description="Install MCP server integration",
-                )
+            return DiagnosticResult(
+                category="MCP Integration",
+                status=DiagnosticStatus.WARNING,
+                message="Claude Code CLI config not found",
+                details={"configured": False, "config_path": str(config_path)},
+                fix_command="claude-mpm mcp install",
+                fix_description="Install MCP server integration for Claude Code CLI",
+            )
 
         try:
             with open(config_path) as f:
                 config = json.load(f)
 
                 mcp_servers = config.get("mcpServers", {})
-                if "claude-mpm-gateway" in mcp_servers:
+                if "claude-mpm-gateway" in mcp_servers or "claude-mpm" in mcp_servers:
                     return DiagnosticResult(
                         category="MCP Integration",
                         status=DiagnosticStatus.OK,
@@ -274,7 +257,7 @@ class ClaudeDesktopCheck(BaseDiagnosticCheck):
                         "config_path": str(config_path),
                     },
                     fix_command="claude-mpm mcp install",
-                    fix_description="Configure MCP server for Claude Desktop",
+                    fix_description="Configure MCP server for Claude Code CLI",
                 )
 
         except Exception as e:
@@ -283,4 +266,4 @@ class ClaudeDesktopCheck(BaseDiagnosticCheck):
                 status=DiagnosticStatus.WARNING,
                 message=f"Could not check MCP configuration: {e!s}",
                 details={"error": str(e)},
-            )
+            )

claude_mpm/services/diagnostics/checks/mcp_check.py

@@ -2,7 +2,7 @@
 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
@@ -129,7 +129,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()
@@ -147,10 +147,10 @@ class MCPCheck(BaseDiagnosticCheck):
             return DiagnosticResult(
                 category="MCP Configuration",
                 status=DiagnosticStatus.WARNING,
-                message="Claude Desktop config not found",
+                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:
@@ -167,7 +167,7 @@ class MCPCheck(BaseDiagnosticCheck):
                         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
@@ -203,7 +203,7 @@ class MCPCheck(BaseDiagnosticCheck):
                 status=DiagnosticStatus.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(

claude_mpm/services/diagnostics/checks/mcp_services_check.py

@@ -2,7 +2,7 @@
 Check MCP external services installation and health.
 
 WHY: Verify that MCP services (mcp-vector-search, mcp-browser, mcp-ticketer, kuzu-memory)
-are properly installed and accessible for enhanced Claude Desktop capabilities.
+are properly installed and accessible for enhanced Claude Code capabilities.
 """
 
 import json
@@ -21,7 +21,10 @@ class MCPServicesCheck(BaseDiagnosticCheck):
     MCP_SERVICES = {
         "mcp-vector-search": {
             "package": "mcp-vector-search",
-            "command": ["mcp-vector-search", "--version"],  # Use --version for proper check
+            "command": [
+                "mcp-vector-search",
+                "--version",
+            ],  # Use --version for proper check
             "description": "Vector search for semantic code navigation",
             "check_health": True,
             "health_command": ["mcp-vector-search", "--version"],
@@ -305,17 +308,37 @@ class MCPServicesCheck(BaseDiagnosticCheck):
                 # Look for actual version information
                 output = (result.stdout + result.stderr).lower()
                 # Check for version indicators
-                if any(keyword in output for keyword in ["version", "v1.", "v0.", "1.", "0."]):
+                if any(
+                    keyword in output
+                    for keyword in ["version", "v1.", "v0.", "1.", "0."]
+                ):
                     # But reject if it's an error message
-                    if not any(error in output for error in ["error", "not found", "no such", "command not found"]):
+                    if not any(
+                        error in output
+                        for error in [
+                            "error",
+                            "not found",
+                            "no such",
+                            "command not found",
+                        ]
+                    ):
                         return True
 
             # For some tools, non-zero return code is OK if version is shown
             elif "--version" in command or "--help" in command:
                 output = (result.stdout + result.stderr).lower()
                 # Must have version info and no error indicators
-                if ("version" in output or "v1." in output or "v0." in output):
-                    if not any(error in output for error in ["error", "not found", "no such", "command not found", "traceback"]):
+                if "version" in output or "v1." in output or "v0." in output:
+                    if not any(
+                        error in output
+                        for error in [
+                            "error",
+                            "not found",
+                            "no such",
+                            "command not found",
+                            "traceback",
+                        ]
+                    ):
                         return True
 
         except (subprocess.SubprocessError, FileNotFoundError, OSError):

claude_mpm/services/diagnostics/diagnostic_runner.py

@@ -14,7 +14,7 @@ from claude_mpm.core.logging_utils import get_logger
 from .checks import (
     AgentCheck,
     BaseDiagnosticCheck,
-    ClaudeDesktopCheck,
+    ClaudeCodeCheck,
     CommonIssuesCheck,
     ConfigurationCheck,
     FilesystemCheck,
@@ -53,7 +53,7 @@ class DiagnosticRunner:
             ConfigurationCheck,
             FilesystemCheck,
             InstructionsCheck,  # Check instruction files early
-            ClaudeDesktopCheck,
+            ClaudeCodeCheck,
             AgentCheck,
             MCPCheck,
             MCPServicesCheck,  # Check external MCP services
@@ -121,7 +121,7 @@ class DiagnosticRunner:
         ]
         # Level 2: May depend on level 1
         level2 = [
-            ClaudeDesktopCheck,
+            ClaudeCodeCheck,
             AgentCheck,
             MCPCheck,
             MCPServicesCheck,
@@ -209,8 +209,8 @@ class DiagnosticRunner:
             "config": ConfigurationCheck,
             "filesystem": FilesystemCheck,
             "fs": FilesystemCheck,
-            "claude": ClaudeDesktopCheck,
-            "claude_desktop": ClaudeDesktopCheck,
+            "claude": ClaudeCodeCheck,
+            "claude_code": ClaudeCodeCheck,
             "agents": AgentCheck,
             "agent": AgentCheck,
             "mcp": MCPCheck,

claude_mpm/services/diagnostics/doctor_reporter.py

@@ -385,9 +385,9 @@ class DoctorReporter:
                     print(
                         f"| Installation Method | {result.details['installation_method']} |"
                     )
-            elif result.category == "Claude Desktop":
+            elif result.category == "Claude Code":
                 if result.details.get("version"):
-                    print(f"| Claude Desktop | {result.details['version']} |")
+                    print(f"| Claude Code (CLI) | {result.details['version']} |")
 
     def _print_mcp_services_markdown(self, summary: DiagnosticSummary):
         """Print MCP services status table in markdown."""
@@ -533,11 +533,11 @@ class DoctorReporter:
                     )
 
             if (
-                result.category == "Claude Desktop"
+                result.category == "Claude Code"
                 and result.status == DiagnosticStatus.WARNING
             ):
                 recommendations.append(
-                    "Update Claude Desktop to the latest version for best compatibility"
+                    "Update Claude Code (CLI) to the latest version for best compatibility"
                 )
 
         if recommendations:

claude_mpm/services/mcp_config_manager.py

@@ -86,7 +86,11 @@ class MCPConfigManager:
             for path in candidates:
                 try:
                     result = subprocess.run(
-                        [path, "--help"], capture_output=True, text=True, timeout=5, check=False
+                        [path, "--help"],
+                        capture_output=True,
+                        text=True,
+                        timeout=5,
+                        check=False,
                     )
                     # Check if this version has MCP support
                     if "claude" in result.stdout or "mcp" in result.stdout:
@@ -304,7 +308,7 @@ class MCPConfigManager:
 
         elif service_name == "kuzu-memory":
             # Determine kuzu-memory command version
-            kuzu_args = []
+            kuzu_args = ["mcp", "serve"]  # Default to the correct modern format
             test_cmd = None
 
             if use_pipx_run:
@@ -317,17 +321,30 @@ class MCPConfigManager:
             if test_cmd:
                 try:
                     result = subprocess.run(
-                        test_cmd, capture_output=True, text=True, timeout=10, check=False
+                        test_cmd,
+                        capture_output=True,
+                        text=True,
+                        timeout=10,
+                        check=False,
                     )
-                    if "claude" in result.stdout:
-                        # v1.1.0+ with claude command
-                        kuzu_args = ["claude", "mcp-server"]
-                    else:
-                        # v1.0.0 with serve command
+                    # Check for MCP support in help output
+                    help_output = result.stdout.lower() + result.stderr.lower()
+
+                    # Modern version detection - look for "mcp serve" command
+                    if "mcp serve" in help_output or ("mcp" in help_output and "serve" in help_output):
+                        # Modern version with mcp serve command
+                        kuzu_args = ["mcp", "serve"]
+                    # Legacy version detection - only "serve" without "mcp"
+                    elif "serve" in help_output and "mcp" not in help_output:
+                        # Very old version that only has serve command
                         kuzu_args = ["serve"]
-                except:
-                    # Default to newer version command
-                    kuzu_args = ["claude", "mcp-server"]
+                    # Note: "claude mcp-server" format is deprecated and not used
+                    else:
+                        # Default to the correct modern format
+                        kuzu_args = ["mcp", "serve"]
+                except Exception:
+                    # Default to the correct mcp serve command on any error
+                    kuzu_args = ["mcp", "serve"]
 
             if use_pipx_run:
                 config["command"] = "pipx"
@@ -339,17 +356,16 @@ class MCPConfigManager:
                 config["command"] = service_path
                 config["args"] = kuzu_args
 
+        # Generic config for unknown services
+        elif use_pipx_run:
+            config["command"] = "pipx"
+            config["args"] = ["run", service_name]
+        elif use_uvx:
+            config["command"] = "uvx"
+            config["args"] = [service_name]
         else:
-            # Generic config for unknown services
-            if use_pipx_run:
-                config["command"] = "pipx"
-                config["args"] = ["run", service_name]
-            elif use_uvx:
-                config["command"] = "uvx"
-                config["args"] = [service_name]
-            else:
-                config["command"] = service_path
-                config["args"] = []
+            config["command"] = service_path
+            config["args"] = []
 
         return config
 
@@ -632,9 +648,7 @@ class MCPConfigManager:
                         f"pipx install succeeded but verification failed for {service_name}"
                     )
                 else:
-                    self.logger.debug(
-                        f"pipx install failed: {result.stderr}"
-                    )
+                    self.logger.debug(f"pipx install failed: {result.stderr}")
             except subprocess.TimeoutExpired:
                 self.logger.warning(f"pipx install timed out for {service_name}")
             except Exception as e:
@@ -739,9 +753,15 @@ class MCPConfigManager:
                 if result.returncode == 0:
                     return True
                 # Some tools return non-zero but still work
-                elif any(indicator in output for indicator in ["version", "usage", "help", service_name.lower()]):
+                if any(
+                    indicator in output
+                    for indicator in ["version", "usage", "help", service_name.lower()]
+                ):
                     # Make sure it's not an error message
-                    if not any(error in output for error in ["error", "not found", "traceback", "no such"]):
+                    if not any(
+                        error in output
+                        for error in ["error", "not found", "traceback", "no such"]
+                    ):
                         return True
         except Exception as e:
             self.logger.debug(f"Verification error for {service_name}: {e}")

claude_mpm/services/mcp_gateway/core/process_pool.py

@@ -423,7 +423,8 @@ async def auto_initialize_vector_search():
                     ["pipx", "install", "mcp-vector-search"],
                     capture_output=True,
                     text=True,
-                    timeout=60, check=False,  # 1 minute timeout for installation
+                    timeout=60,
+                    check=False,  # 1 minute timeout for installation
                 )
 
                 if result.returncode == 0:
@@ -492,9 +493,7 @@ async def auto_initialize_vector_search():
                     if chroma_db.exists() and chroma_db.stat().st_size > 0:
                         logger.info("✓ Vector search index is healthy and ready")
                         return
-                    logger.info(
-                        "⚠️ Vector search index may be corrupted, rebuilding..."
-                    )
+                    logger.info("⚠️ Vector search index may be corrupted, rebuilding...")
                 except Exception as e:
                     logger.debug(
                         f"Vector search health check failed: {e}, will attempt to rebuild"
@@ -512,7 +511,8 @@ async def auto_initialize_vector_search():
             capture_output=True,
             text=True,
             timeout=30,
-            cwd=str(current_dir), check=False,  # Run in the project directory
+            cwd=str(current_dir),
+            check=False,  # Run in the project directory
         )
 
         if proc.returncode == 0:
@@ -527,7 +527,8 @@ async def auto_initialize_vector_search():
                         capture_output=True,
                         text=True,
                         timeout=300,  # 5 minute timeout for indexing
-                        cwd=str(current_dir), check=False,  # Run in the project directory
+                        cwd=str(current_dir),
+                        check=False,  # Run in the project directory
                     )
                     if index_proc.returncode == 0:
                         logger.info("✅ Project indexing completed successfully")
@@ -610,7 +611,8 @@ async def auto_initialize_kuzu_memory():
                     ["pipx", "install", "kuzu-memory"],
                     capture_output=True,
                     text=True,
-                    timeout=60, check=False,  # 1 minute timeout for installation
+                    timeout=60,
+                    check=False,  # 1 minute timeout for installation
                 )
 
                 if result.returncode == 0:
@@ -679,7 +681,8 @@ async def auto_initialize_kuzu_memory():
                 capture_output=True,
                 text=True,
                 timeout=30,
-                cwd=str(current_dir), check=False,
+                cwd=str(current_dir),
+                check=False,
             )
 
             if proc.returncode == 0: