fix: ensure npm installation for Claude Code and handle already-installed plugins

Author: maxritter

installer/steps/dependencies.py

@@ -99,9 +99,22 @@ def install_python_tools() -> bool:
         return False
 
 
+def _is_claude_installed_via_npm() -> bool:
+    """Check if Claude Code is installed via npm (required for LSP fix)."""
+    try:
+        result = subprocess.run(
+            ["npm", "list", "-g", "@anthropic-ai/claude-code", "--depth=0"],
+            capture_output=True,
+            text=True,
+        )
+        return "@anthropic-ai/claude-code" in result.stdout
+    except Exception:
+        return False
+
+
 def install_claude_code() -> bool:
-    """Install Claude Code CLI via npm."""
-    if command_exists("claude"):
+    """Install Claude Code CLI via npm (required for LSP fix to work)."""
+    if _is_claude_installed_via_npm():
         return True
 
     return _run_bash_with_retry("npm install -g @anthropic-ai/claude-code")
@@ -202,7 +215,15 @@ def install_pyright_lsp() -> bool:
 
 def install_claude_mem() -> bool:
     """Install claude-mem plugin via claude plugin marketplace."""
-    if not _run_bash_with_retry("claude plugin marketplace add thedotmack/claude-mem"):
+    try:
+        result = subprocess.run(
+            ["bash", "-c", "claude plugin marketplace add thedotmack/claude-mem"],
+            capture_output=True,
+            text=True,
+        )
+        if result.returncode != 0 and "already installed" not in result.stderr.lower():
+            return False
+    except Exception:
         return False
 
     return _run_bash_with_retry("claude plugin install claude-mem")

tests/unit/installer/steps/test_dependencies.py

@@ -342,15 +342,32 @@ def test_install_claude_mem_uses_plugin_system(self, mock_run):
         """install_claude_mem uses claude plugin marketplace and install."""
         from installer.steps.dependencies import install_claude_mem
 
-        mock_run.return_value = MagicMock(returncode=0)
+        mock_run.return_value = MagicMock(returncode=0, stdout="", stderr="")
 
         result = install_claude_mem()
 
         assert mock_run.call_count >= 2
-        # Check marketplace add call
+        # First call adds marketplace
         first_call = mock_run.call_args_list[0][0][0]
         assert "claude plugin marketplace add" in first_call[2]
         assert "thedotmack/claude-mem" in first_call[2]
-        # Check plugin install call
+        # Second call installs plugin
         second_call = mock_run.call_args_list[1][0][0]
         assert "claude plugin install claude-mem" in second_call[2]
+
+    @patch("subprocess.run")
+    def test_install_claude_mem_succeeds_if_marketplace_already_added(self, mock_run):
+        """install_claude_mem succeeds when marketplace already exists."""
+        from installer.steps.dependencies import install_claude_mem
+
+        def side_effect(*args, **kwargs):
+            cmd = args[0] if args else kwargs.get("args", [])
+            if isinstance(cmd, list) and "marketplace add" in cmd[2]:
+                return MagicMock(returncode=1, stderr="already installed", stdout="")
+            return MagicMock(returncode=0, stdout="", stderr="")
+
+        mock_run.side_effect = side_effect
+
+        result = install_claude_mem()
+
+        assert result is True