@treedy/lsp-mcp 0.1.8 → 0.1.9

package/dist/bundled/python/src/rope_mcp/server.py

@@ -24,7 +24,7 @@ from .config import (
     get_python_path_status,
     set_active_workspace,
     get_active_workspace,
-    validate_file_workspace,
+    resolve_file_path,
 )
 from .rope_client import get_client as get_rope_client
 from .lsp import get_lsp_client, close_all_clients, close_all_clients as close_lsp_clients
@@ -38,7 +38,6 @@ from .tools import (
     get_hover as rope_hover,
     get_references as rope_references,
     get_symbols as rope_symbols,
-    get_diagnostics,
     get_search,
 )
 
@@ -120,7 +119,7 @@ def hover(
     """Get documentation for the symbol at the given position.
 
     Args:
-        file: Absolute path to the Python file
+        file: Path to the Python file (absolute or relative to active workspace)
         line: 1-based line number
         column: 1-based column number
         backend: Backend to use (rope/pyright). Default: from config or 'rope'
@@ -128,8 +127,8 @@ def hover(
     Returns:
         JSON string with documentation or error message
     """
-    # Guard: check workspace
-    error = validate_file_workspace(file)
+    # Resolve and validate path
+    abs_file, error = resolve_file_path(file)
     if error:
         return json.dumps(error, indent=2)
 
@@ -137,9 +136,9 @@ def hover(
 
     if effective_backend == Backend.PYRIGHT:
         try:
-            workspace = _find_workspace(file)
+            workspace = _find_workspace(abs_file)
             client = get_lsp_client(workspace)
-            result = client.hover(file, line, column)
+            result = client.hover(abs_file, line, column)
             if result:
                 return json.dumps(
                     {"contents": result.get("contents", ""), "backend": "pyright"},
@@ -152,7 +151,7 @@ def hover(
         except Exception as e:
             return json.dumps({"error": str(e), "backend": "pyright"}, indent=2)
     else:
-        result = rope_hover(file, line, column)
+        result = rope_hover(abs_file, line, column)
         result["backend"] = "rope"
         return json.dumps(result, indent=2)
 
@@ -167,7 +166,7 @@ def definition(
     """Get the definition location for the symbol at the given position.
 
     Args:
-        file: Absolute path to the Python file
+        file: Path to the Python file (absolute or relative to active workspace)
         line: 1-based line number
         column: 1-based column number
         backend: Backend to use (rope/pyright). Default: from config or 'rope'
@@ -175,8 +174,8 @@ def definition(
     Returns:
         JSON string with definition location or error message
     """
-    # Guard: check workspace
-    error = validate_file_workspace(file)
+    # Resolve and validate path
+    abs_file, error = resolve_file_path(file)
     if error:
         return json.dumps(error, indent=2)
 
@@ -184,9 +183,9 @@ def definition(
 
     if effective_backend == Backend.PYRIGHT:
         try:
-            workspace = _find_workspace(file)
+            workspace = _find_workspace(abs_file)
             client = get_lsp_client(workspace)
-            locations = client.definition(file, line, column)
+            locations = client.definition(abs_file, line, column)
             if locations:
                 result = locations[0]
                 result["backend"] = "pyright"
@@ -198,7 +197,7 @@ def definition(
         except Exception as e:
             return json.dumps({"error": str(e), "backend": "pyright"}, indent=2)
     else:
-        result = rope_definition(file, line, column)
+        result = rope_definition(abs_file, line, column)
         result["backend"] = "rope"
         return json.dumps(result, indent=2)
 
@@ -213,7 +212,7 @@ def references(
     """Find all references to the symbol at the given position.
 
     Args:
-        file: Absolute path to the Python file
+        file: Path to the Python file (absolute or relative to active workspace)
         line: 1-based line number
         column: 1-based column number
         backend: Backend to use (rope/pyright). Default: from config or 'rope'
@@ -221,8 +220,8 @@ def references(
     Returns:
         JSON string with list of references or error message
     """
-    # Guard: check workspace
-    error = validate_file_workspace(file)
+    # Resolve and validate path
+    abs_file, error = resolve_file_path(file)
     if error:
         return json.dumps(error, indent=2)
 
@@ -230,16 +229,16 @@ def references(
 
     if effective_backend == Backend.PYRIGHT:
         try:
-            workspace = _find_workspace(file)
+            workspace = _find_workspace(abs_file)
             client = get_lsp_client(workspace)
-            refs = client.references(file, line, column)
+            refs = client.references(abs_file, line, column)
             return json.dumps(
                 {"references": refs, "count": len(refs), "backend": "pyright"}, indent=2
             )
         except Exception as e:
             return json.dumps({"error": str(e), "backend": "pyright"}, indent=2)
     else:
-        result = rope_references(file, line, column)
+        result = rope_references(abs_file, line, column)
         result["backend"] = "rope"
         return json.dumps(result, indent=2)
 
@@ -254,7 +253,7 @@ def completions(
     """Get code completion suggestions at the given position.
 
     Args:
-        file: Absolute path to the Python file
+        file: Path to the Python file (absolute or relative to active workspace)
         line: 1-based line number
         column: 1-based column number
         backend: Backend to use (rope/pyright). Default: from config or 'rope'
@@ -262,8 +261,8 @@ def completions(
     Returns:
         JSON string with completion items or error message
     """
-    # Guard: check workspace
-    error = validate_file_workspace(file)
+    # Resolve and validate path
+    abs_file, error = resolve_file_path(file)
     if error:
         return json.dumps(error, indent=2)
 
@@ -271,9 +270,9 @@ def completions(
 
     if effective_backend == Backend.PYRIGHT:
         try:
-            workspace = _find_workspace(file)
+            workspace = _find_workspace(abs_file)
             client = get_lsp_client(workspace)
-            items = client.completions(file, line, column)
+            items = client.completions(abs_file, line, column)
             return json.dumps(
                 {"completions": items, "count": len(items), "backend": "pyright"},
                 indent=2,
@@ -281,7 +280,7 @@ def completions(
         except Exception as e:
             return json.dumps({"error": str(e), "backend": "pyright"}, indent=2)
     else:
-        result = rope_completions(file, line, column)
+        result = rope_completions(abs_file, line, column)
         result["backend"] = "rope"
         return json.dumps(result, indent=2)
 
@@ -295,15 +294,15 @@ def symbols(
     """Get symbols from a Python file.
 
     Args:
-        file: Absolute path to the Python file
+        file: Path to the Python file (absolute or relative to active workspace)
         query: Optional filter query for symbol names
         backend: Backend to use (rope/pyright). Default: from config or 'rope'
 
     Returns:
         JSON string with list of symbols or error message
     """
-    # Guard: check workspace
-    error = validate_file_workspace(file)
+    # Resolve and validate path
+    abs_file, error = resolve_file_path(file)
     if error:
         return json.dumps(error, indent=2)
 
@@ -311,9 +310,9 @@ def symbols(
 
     if effective_backend == Backend.PYRIGHT:
         try:
-            workspace = _find_workspace(file)
+            workspace = _find_workspace(abs_file)
             client = get_lsp_client(workspace)
-            syms = client.document_symbols(file)
+            syms = client.document_symbols(abs_file)
             # Filter by query if provided
             if query:
                 query_lower = query.lower()
@@ -322,7 +321,7 @@ def symbols(
                 {
                     "symbols": syms,
                     "count": len(syms),
-                    "file": file,
+                    "file": abs_file,
                     "backend": "pyright",
                 },
                 indent=2,
@@ -330,7 +329,7 @@ def symbols(
         except Exception as e:
             return json.dumps({"error": str(e), "backend": "pyright"}, indent=2)
     else:
-        result = rope_symbols(file, query)
+        result = rope_symbols(abs_file, query)
         result["backend"] = "rope"
         return json.dumps(result, indent=2)
 
@@ -340,10 +339,9 @@ def rename(file: str, line: int, column: int, new_name: str) -> str:
     """Rename the symbol at the given position.
 
     This will modify files on disk to rename all occurrences of the symbol.
-    Uses Rope backend for best refactoring support.
-
+    
     Args:
-        file: Absolute path to the Python file
+        file: Path to the Python file (absolute or relative to active workspace)
         line: 1-based line number
         column: 1-based column number
         new_name: The new name for the symbol
@@ -351,14 +349,44 @@ def rename(file: str, line: int, column: int, new_name: str) -> str:
     Returns:
         JSON string with changes made or error message
     """
-    # Guard: check workspace
-    error = validate_file_workspace(file)
+    # Resolve and validate path
+    abs_file, error = resolve_file_path(file)
     if error:
         return json.dumps(error, indent=2)
 
-    result = do_rename(file, line, column, new_name)
-    result["backend"] = "rope"
-    return json.dumps(result, indent=2)
+    # Determine backend (Pyright is now supported for rename)
+    # Since we moved rename to SHARED_TOOLS, we can use config logic
+    effective_backend = get_config().get_backend_for("rename")
+
+    if effective_backend == Backend.PYRIGHT:
+        try:
+            workspace = _find_workspace(abs_file)
+            client = get_lsp_client(workspace)
+            edit = client.rename(abs_file, line, column, new_name)
+            
+            if not edit:
+                return json.dumps({
+                    "error": "Rename returned no changes. Symbol might not be renamable or Pyright failed.",
+                    "backend": "pyright"
+                }, indent=2)
+                
+            # Reuse the helper from run_code_action
+            _apply_workspace_edit(edit)
+            
+            return json.dumps({
+                "success": True, 
+                "message": f"Renamed symbol to '{new_name}'", 
+                "backend": "pyright",
+                "changes": edit.get("changes") or edit.get("documentChanges")
+            }, indent=2)
+            
+        except Exception as e:
+            return json.dumps({"error": str(e), "backend": "pyright"}, indent=2)
+    else:
+        # Rope fallback
+        result = do_rename(abs_file, line, column, new_name)
+        result["backend"] = "rope"
+        return json.dumps(result, indent=2)
 
 
 @mcp.tool()
@@ -375,7 +403,7 @@ def move(
     Uses Rope backend for refactoring.
 
     Args:
-        file: Absolute path to the Python file containing the symbol
+        file: Path to the Python file containing the symbol
         line: 1-based line number of the symbol to move
         column: 1-based column number of the symbol
         destination: Destination module path (e.g., "mypackage.utils" or "utils.py")
@@ -384,12 +412,12 @@ def move(
     Returns:
         JSON string with changes made or error message
     """
-    # Guard: check workspace
-    error = validate_file_workspace(file)
+    # Resolve and validate path
+    abs_file, error = resolve_file_path(file)
     if error:
         return json.dumps(error, indent=2)
 
-    result = do_move(file, line, column, destination, resources_only=preview)
+    result = do_move(abs_file, line, column, destination, resources_only=preview)
     result["backend"] = "rope"
     return json.dumps(result, indent=2)
 
@@ -412,7 +440,7 @@ def change_signature(
     Uses Rope backend for refactoring.
 
     Args:
-        file: Absolute path to the Python file
+        file: Path to the Python file (absolute or relative to active workspace)
         line: 1-based line number of the function
         column: 1-based column number of the function
         new_params: New parameter order, e.g. ["self", "b", "a"] to reorder
@@ -435,8 +463,8 @@ def change_signature(
         # Remove param: def foo(a, b) -> def foo(a)
         change_signature(file, line, col, remove_param="b")
     """
-    # Guard: check workspace
-    error = validate_file_workspace(file)
+    # Resolve and validate path
+    abs_file, error = resolve_file_path(file)
     if error:
         return json.dumps(error, indent=2)
 
@@ -450,7 +478,7 @@ def change_signature(
         }
 
     result = do_change_signature(
-        file,
+        abs_file,
         line,
         column,
         new_params=new_params,
@@ -469,43 +497,63 @@ def function_signature(file: str, line: int, column: int) -> str:
     Useful for inspecting function parameters before changing the signature.
 
     Args:
-        file: Absolute path to the Python file
+        file: Path to the Python file (absolute or relative to active workspace)
         line: 1-based line number of the function
         column: 1-based column number of the function
 
     Returns:
         JSON string with function signature info
     """
-    # Guard: check workspace
-    error = validate_file_workspace(file)
+    # Resolve and validate path
+    abs_file, error = resolve_file_path(file)
     if error:
         return json.dumps(error, indent=2)
 
-    result = get_function_signature(file, line, column)
+    result = get_function_signature(abs_file, line, column)
     result["backend"] = "rope"
     return json.dumps(result, indent=2)
 
 
 @mcp.tool()
 def diagnostics(path: str) -> str:
-    """Get type errors and warnings for a Python file or directory.
+    """Get type errors and warnings for a Python file.
 
-    Uses Pyright for type checking. Requires Pyright to be installed.
+    Uses Pyright LSP for type checking.
 
     Args:
-        path: Absolute path to a Python file or directory
+        path: Path to a Python file (absolute or relative to active workspace)
 
     Returns:
         JSON string with diagnostics or error message
     """
-    # Guard: check workspace
-    error = validate_file_workspace(path)
+    # Resolve and validate path
+    abs_path, error = resolve_file_path(path)
     if error:
         return json.dumps(error, indent=2)
 
-    result = get_diagnostics(path)
-    result["backend"] = "pyright"
-    return json.dumps(result, indent=2)
+    try:
+        workspace = _find_workspace(abs_path)
+        client = get_lsp_client(workspace)
+        result = client.get_diagnostics(abs_path)
+        
+        # Check for config file to warn about permissive defaults
+        has_config = False
+        for cfg in ["pyrightconfig.json", "pyproject.toml"]:
+            if os.path.exists(os.path.join(workspace, cfg)):
+                has_config = True
+                break
+                
+        if not has_config:
+            if "summary" not in result:
+                result["summary"] = {}
+            result["summary"]["note"] = (
+                "No 'pyrightconfig.json' or 'pyproject.toml' found. "
+                "Using permissive defaults. Create a config file to enable stricter checks (e.g. unused imports)."
+            )
+            
+        return json.dumps(result, indent=2)
+    except Exception as e:
+        return json.dumps({"error": str(e), "backend": "pyright-lsp"}, indent=2)
 
 
 @mcp.tool()
@@ -515,22 +563,22 @@ def signature_help(file: str, line: int, column: int) -> str:
     Uses Pyright backend for accurate signature information.
 
     Args:
-        file: Absolute path to the Python file
+        file: Path to the Python file (absolute or relative to active workspace)
         line: 1-based line number
         column: 1-based column number
 
     Returns:
         JSON string with signature help or error message
     """
-    # Guard: check workspace
-    error = validate_file_workspace(file)
+    # Resolve and validate path
+    abs_file, error = resolve_file_path(file)
     if error:
         return json.dumps(error, indent=2)
 
     try:
-        workspace = _find_workspace(file)
+        workspace = _find_workspace(abs_file)
         client = get_lsp_client(workspace)
-        result = client.signature_help(file, line, column)
+        result = client.signature_help(abs_file, line, column)
         if result:
             result["backend"] = "pyright"
             return json.dumps(result, indent=2)
@@ -549,29 +597,227 @@ def update_document(file: str, content: str) -> str:
     Uses Pyright backend for incremental updates.
 
     Args:
-        file: Absolute path to the Python file
+        file: Path to the Python file (absolute or relative to active workspace)
         content: New file content
 
     Returns:
         JSON string with confirmation
     """
-    # Guard: check workspace
-    error = validate_file_workspace(file)
+    # Resolve and validate path
+    abs_file, error = resolve_file_path(file)
     if error:
         return json.dumps(error, indent=2)
 
     try:
-        workspace = _find_workspace(file)
+        workspace = _find_workspace(abs_file)
         client = get_lsp_client(workspace)
-        client.update_document(file, content)
+        client.update_document(abs_file, content)
         return json.dumps(
-            {"success": True, "file": file, "backend": "pyright"}, indent=2
+            {"success": True, "file": abs_file, "backend": "pyright"}, indent=2
         )
     except Exception as e:
         return json.dumps({"error": str(e), "backend": "pyright"}, indent=2)
 
 
 
+@mcp.tool()
+def inlay_hints(file: str) -> str:
+    """Get inlay hints (type annotations, parameter names) for a file.
+
+    Args:
+        file: Path to the Python file
+
+    Returns:
+        JSON string with list of hints
+    """
+    # Resolve and validate path
+    abs_file, error = resolve_file_path(file)
+    if error:
+        return json.dumps(error, indent=2)
+
+    try:
+        workspace = _find_workspace(abs_file)
+        client = get_lsp_client(workspace)
+        
+        # Read file to get line count
+        with open(abs_file, "r", encoding="utf-8") as f:
+            lines = f.readlines()
+            line_count = len(lines)
+            last_col = len(lines[-1]) if lines else 0
+            
+        hints = client.inlay_hint(abs_file, 1, 1, line_count + 1, last_col + 1)
+        
+        return json.dumps({"hints": hints, "count": len(hints)}, indent=2)
+        
+    except Exception as e:
+        return json.dumps({"error": str(e), "backend": "pyright"}, indent=2)
+
+
+@mcp.tool()
+def code_action(file: str, line: int, column: int) -> str:
+    """Get available code actions (Quick Fixes and Refactorings).
+
+    Args:
+        file: Path to the Python file
+        line: 1-based line number
+        column: 1-based column number
+
+    Returns:
+        JSON string with list of actions
+    """
+    # Resolve and validate path
+    abs_file, error = resolve_file_path(file)
+    if error:
+        return json.dumps(error, indent=2)
+
+    try:
+        workspace = _find_workspace(abs_file)
+        client = get_lsp_client(workspace)
+        
+        # 1. Get diagnostics to provide context
+        # In a real IDE, we'd pass active diagnostics. Here we fetch them.
+        # Note: This might be slow if we do full check. 
+        # For Pyright, we can pass empty diagnostics context and it might still return some actions,
+        # but usually it needs context.
+        # Let's try to get diagnostics for this file first.
+        # We can't easily get diagnostics without running the full check which is slow.
+        # For now, let's pass empty list and see what Pyright gives (e.g. Organize Imports usually works).
+        
+        # Actually, let's try to fetch diagnostics if possible, or just pass context.
+        diagnostics = [] # Placeholder
+        
+        actions = client.code_action(abs_file, line, column, line, column, diagnostics)
+        
+        # Format for MCP
+        formatted = []
+        for action in actions:
+            formatted.append({
+                "title": action.get("title", "Unknown Action"),
+                "kind": action.get("kind", "quickfix"),
+                "command": action.get("command"),
+                "edit": action.get("edit"),
+                # We need to store enough info to run it
+                "data": action 
+            })
+            
+        return json.dumps({"actions": formatted, "count": len(formatted)}, indent=2)
+        
+    except Exception as e:
+        return json.dumps({"error": str(e), "backend": "pyright"}, indent=2)
+
+
+@mcp.tool()
+def run_code_action(
+    file: str, 
+    line: int, 
+    column: int, 
+    title: str
+) -> str:
+    """Run a specific code action.
+
+    Args:
+        file: Path to the Python file
+        line: 1-based line number
+        column: 1-based column number
+        title: The title of the action to run (must match one from code_action)
+
+    Returns:
+        JSON string with result
+    """
+    # Resolve and validate path
+    abs_file, error = resolve_file_path(file)
+    if error:
+        return json.dumps(error, indent=2)
+
+    try:
+        workspace = _find_workspace(abs_file)
+        client = get_lsp_client(workspace)
+        
+        # We need to fetch actions again to find the matching one and its edit/command
+        actions = client.code_action(abs_file, line, column, line, column, [])
+        
+        target_action = next((a for a in actions if a.get("title") == title), None)
+        if not target_action:
+            return json.dumps({"error": f"Action '{title}' not found. It may have expired."}, indent=2)
+            
+        # Handle WorkspaceEdit
+        if "edit" in target_action:
+            _apply_workspace_edit(target_action["edit"])
+            return json.dumps({"success": True, "message": "Applied workspace edit"}, indent=2)
+            
+        # Handle Command
+        if "command" in target_action:
+            # If command has arguments, we might need to execute it via LSP workspace/executeCommand
+            cmd = target_action["command"]
+            if isinstance(cmd, dict): # Command object
+                command_name = cmd["command"]
+                arguments = cmd.get("arguments", [])
+                
+                # Execute command via LSP
+                # We need to add execute_command to LspClient if not exists
+                # client.execute_command(command_name, arguments)
+                # For now, let's just say we don't support custom commands yet unless we add that method.
+                # Pyright's organize imports is a command.
+                return json.dumps({"error": "Command execution not yet supported", "command": command_name}, indent=2)
+        
+        return json.dumps({"success": True, "message": "Action executed (no-op?)"}, indent=2)
+
+    except Exception as e:
+        return json.dumps({"error": str(e), "backend": "pyright"}, indent=2)
+
+
+def _apply_workspace_edit(edit: dict) -> None:
+    """Apply a WorkspaceEdit to files on disk."""
+    changes = edit.get("changes")
+    document_changes = edit.get("documentChanges")
+    
+    # Normalize to dict of uri -> edits
+    all_edits = {}
+    
+    if changes:
+        all_edits.update(changes)
+        
+    if document_changes:
+        for change in document_changes:
+            # Check if it's TextDocumentEdit (has textDocument and edits)
+            if "textDocument" in change and "edits" in change:
+                uri = change["textDocument"]["uri"]
+                if uri not in all_edits:
+                    all_edits[uri] = []
+                all_edits[uri].extend(change["edits"])
+            # TODO: Handle CreateFile, RenameFile, DeleteFile if needed
+    
+    for uri, text_edits in all_edits.items():
+        file_path = uri.replace("file://", "")
+        if sys.platform == "win32" and file_path.startswith("/"):
+            file_path = file_path[1:]
+            
+        if not os.path.exists(file_path):
+            continue
+            
+        with open(file_path, "r", encoding="utf-8") as f:
+            content = f.read()
+            
+        # Apply edits in reverse order
+        # Sort edits by start position descending
+        text_edits.sort(key=lambda e: (e["range"]["start"]["line"], e["range"]["start"]["character"]), reverse=True)
+        
+        client = get_rope_client() # Use rope client for offset conversion helper
+        
+        for text_edit in text_edits:
+            start = text_edit["range"]["start"]
+            end = text_edit["range"]["end"]
+            new_text = text_edit["newText"]
+            
+            start_offset = client.position_to_offset(content, start["line"] + 1, start["character"] + 1)
+            end_offset = client.position_to_offset(content, end["line"] + 1, end["character"] + 1)
+            
+            content = content[:start_offset] + new_text + content[end_offset:]
+            
+        with open(file_path, "w", encoding="utf-8") as f:
+            f.write(content)
+
+
 @mcp.tool()
 def search(
     pattern: str,
@@ -584,7 +830,7 @@ def search(
 
     Args:
         pattern: The regex pattern to search for
-        path: Directory or file to search in (defaults to current working directory)
+        path: Directory or file to search in (defaults to current working directory). Can be relative to active workspace.
         glob: Glob pattern to filter files (e.g., "*.py", "**/*.ts")
         case_sensitive: Whether the search is case sensitive
         max_results: Maximum number of results to return
@@ -592,15 +838,23 @@ def search(
     Returns:
         JSON string with search results or error message
     """
-    # Guard: check workspace if path is provided
-    if path:
-        error = validate_file_workspace(path)
+    # Resolve and validate path if provided
+    search_path = path
+    if search_path:
+        abs_path, error = resolve_file_path(search_path)
         if error:
             return json.dumps(error, indent=2)
+        search_path = abs_path
+    
+    # If no path provided, use active workspace if available
+    if not search_path:
+        active = get_active_workspace()
+        if active:
+            search_path = active
 
     result = get_search(
         pattern=pattern,
-        path=path,
+        path=search_path,
         glob=glob,
         case_sensitive=case_sensitive,
         max_results=max_results,