lean-lsp-mcp 0.11.0__py3-none-any.whl → 0.11.1__py3-none-any.whl

lean_lsp_mcp/client_utils.py

@@ -1,3 +1,4 @@
+import os
 from pathlib import Path
 from threading import Lock
 
@@ -64,35 +65,58 @@ def valid_lean_project_path(path: Path | str) -> bool:
 
 
 def setup_client_for_file(ctx: Context, file_path: str) -> str | None:
-    """Check if the current LSP client is already set up and correct for this file. Otherwise, set it up.
+    """Ensure the LSP client matches the file's Lean project and return its relative path."""
 
-    Args:
-        ctx (Context): Context object.
-        file_path (str): Absolute path to the Lean file.
+    lifespan = ctx.request_context.lifespan_context
+    project_cache = getattr(lifespan, "project_cache", {})
+    if not hasattr(lifespan, "project_cache"):
+        lifespan.project_cache = project_cache
 
-    Returns:
-        str: Relative file path if the client is set up correctly, otherwise None.
-    """
-    # Check if the file_path works for the current lean_project_path.
-    lean_project_path = ctx.request_context.lifespan_context.lean_project_path
-    if lean_project_path is not None:
-        rel_path = get_relative_file_path(lean_project_path, file_path)
+    abs_file_path = os.path.abspath(file_path)
+    file_dir = os.path.dirname(abs_file_path)
+
+    def activate_project(project_path: Path, cache_dirs: list[str]) -> str | None:
+        project_path_obj = project_path
+        rel = get_relative_file_path(project_path_obj, file_path)
+        if rel is None:
+            return None
+
+        project_path_obj = project_path_obj.resolve()
+        lifespan.lean_project_path = project_path_obj
+
+        cache_targets: list[str] = []
+        for directory in cache_dirs + [str(project_path_obj)]:
+            if directory and directory not in cache_targets:
+                cache_targets.append(directory)
+
+        for directory in cache_targets:
+            project_cache[directory] = project_path_obj
+
+        startup_client(ctx)
+        return rel
+
+    # Fast path: current Lean project already valid for this file
+    if lifespan.lean_project_path is not None:
+        rel_path = activate_project(lifespan.lean_project_path, [file_dir])
         if rel_path is not None:
-            startup_client(ctx)
             return rel_path
 
-    # Try to find the correct project path by checking all directories in file_path.
-    file_path_obj = Path(file_path)
-    rel_path = None
-    for parent in file_path_obj.parents:
-        if valid_lean_project_path(parent):
-            lean_project_path = parent
-            rel_path = get_relative_file_path(lean_project_path, file_path)
+    # Walk up from file directory to root, using cache hits or lean-toolchain
+    prev_dir = None
+    current_dir = file_dir
+    while current_dir and current_dir != prev_dir:
+        cached_root = project_cache.get(current_dir)
+        if cached_root:
+            rel_path = activate_project(Path(cached_root), [current_dir])
+            if rel_path is not None:
+                return rel_path
+        elif valid_lean_project_path(current_dir):
+            rel_path = activate_project(Path(current_dir), [current_dir])
             if rel_path is not None:
-                ctx.request_context.lifespan_context.lean_project_path = (
-                    lean_project_path
-                )
-                startup_client(ctx)
-                break
+                return rel_path
+        else:
+            project_cache[current_dir] = ""
+        prev_dir = current_dir
+        current_dir = os.path.dirname(current_dir)
 
-    return rel_path
+    return None

lean_lsp_mcp/server.py

@@ -7,7 +7,7 @@ from contextlib import asynccontextmanager
 from collections.abc import AsyncIterator
 from dataclasses import dataclass
 import urllib
-import json
+import orjson
 import functools
 import subprocess
 import uuid
@@ -555,28 +555,37 @@ def multi_attempt(
     update_file(ctx, rel_path)
     client: LeanLSPClient = ctx.request_context.lifespan_context.client
 
-    client.open_file(rel_path)
+    try:
+        client.open_file(rel_path)
 
-    results = []
-    snippets[0] += "\n"  # Extra newline for the first snippet
-    for snippet in snippets:
-        # Create a DocumentContentChange for the snippet
-        change = DocumentContentChange(
-            snippet + "\n",
-            [line - 1, 0],
-            [line, 0],
-        )
-        # Apply the change to the file, capture diagnostics and goal state
-        client.update_file(rel_path, [change])
-        diag = client.get_diagnostics(rel_path)
-        formatted_diag = "\n".join(format_diagnostics(diag, select_line=line - 1))
-        goal = client.get_goal(rel_path, line - 1, len(snippet))
-        formatted_goal = format_goal(goal, "Missing goal")
-        results.append(f"{snippet}:\n {formatted_goal}\n\n{formatted_diag}")
-
-    # Make sure it's clean after the attempts
-    client.close_files([rel_path])
-    return results
+        results = []
+        # Avoid mutating caller-provided snippets; normalize locally per attempt
+        for snippet in snippets:
+            snippet_str = snippet.rstrip("\n")
+            payload = f"{snippet_str}\n"
+            # Create a DocumentContentChange for the snippet
+            change = DocumentContentChange(
+                payload,
+                [line - 1, 0],
+                [line, 0],
+            )
+            # Apply the change to the file, capture diagnostics and goal state
+            client.update_file(rel_path, [change])
+            diag = client.get_diagnostics(rel_path)
+            formatted_diag = "\n".join(
+                format_diagnostics(diag, select_line=line - 1)
+            )
+            # Use the snippet text length without any trailing newline for the column
+            goal = client.get_goal(rel_path, line - 1, len(snippet_str))
+            formatted_goal = format_goal(goal, "Missing goal")
+            results.append(f"{snippet_str}:\n {formatted_goal}\n\n{formatted_diag}")
+
+        return results
+    finally:
+        try:
+            client.close_files([rel_path])
+        except Exception as exc:  # pragma: no cover - close failures only logged
+            logger.warning("Failed to close `%s` after multi_attempt: %s", rel_path, exc)
 
 
 @mcp.tool("lean_run_code")
@@ -702,9 +711,9 @@ def leansearch(ctx: Context, query: str, num_results: int = 5) -> List[Dict] | s
     """
     try:
         headers = {"User-Agent": "lean-lsp-mcp/0.1", "Content-Type": "application/json"}
-        payload = json.dumps(
+        payload = orjson.dumps(
             {"num_results": str(num_results), "query": [query]}
-        ).encode("utf-8")
+        )
 
         req = urllib.request.Request(
             "https://leansearch.net/search",
@@ -714,7 +723,7 @@ def leansearch(ctx: Context, query: str, num_results: int = 5) -> List[Dict] | s
         )
 
         with urllib.request.urlopen(req, timeout=20) as response:
-            results = json.loads(response.read().decode("utf-8"))
+            results = orjson.loads(response.read())
 
         if not results or not results[0]:
             return "No results found."
@@ -760,14 +769,14 @@ def loogle(ctx: Context, query: str, num_results: int = 8) -> List[dict] | str:
         )
 
         with urllib.request.urlopen(req, timeout=20) as response:
-            results = json.loads(response.read().decode("utf-8"))
+            results = orjson.loads(response.read())
 
         if "hits" not in results:
             return "No results found."
 
         results = results["hits"][:num_results]
         for result in results:
-            result.pop("doc")
+            result.pop("doc", None)
         return results
     except Exception as e:
         return f"loogle error:\n{str(e)}"
@@ -797,7 +806,7 @@ def leanfinder(
     """
     try:
         headers = {"User-Agent": "lean-lsp-mcp/0.1", "Content-Type": "application/json"}
-        payload = json.dumps({"data": [query, num_results, "Normal"]}).encode("utf-8")
+        payload = orjson.dumps({"data": [query, num_results, "Normal"]})
 
         req = urllib.request.Request(
             "https://delta-lab-ai-lean-finder.hf.space/gradio_api/call/retrieve",
@@ -807,7 +816,7 @@ def leanfinder(
         )
 
         with urllib.request.urlopen(req, timeout=10) as response:
-            event_data = json.loads(response.read().decode("utf-8"))
+            event_data = orjson.loads(response.read())
             event_id = event_data.get("event_id")
 
         if not event_id:
@@ -820,7 +829,7 @@ def leanfinder(
             for line in response:
                 line = line.decode("utf-8").strip()
                 if line.startswith("data: "):
-                    data = json.loads(line[6:])
+                    data = orjson.loads(line[6:])
                     if isinstance(data, list) and len(data) > 0:
                         html = data[0] if isinstance(data[0], str) else str(data)
 
@@ -887,7 +896,7 @@ def state_search(
         )
 
         with urllib.request.urlopen(req, timeout=20) as response:
-            results = json.loads(response.read().decode("utf-8"))
+            results = orjson.loads(response.read())
 
         for result in results:
             result.pop("rev")
@@ -941,11 +950,11 @@ def hammer_premise(
                 "Content-Type": "application/json",
             },
             method="POST",
-            data=json.dumps(data).encode("utf-8"),
+            data=orjson.dumps(data),
         )
 
         with urllib.request.urlopen(req, timeout=20) as response:
-            results = json.loads(response.read().decode("utf-8"))
+            results = orjson.loads(response.read())
 
         results = [result["name"] for result in results]
         results.insert(0, f"Results for line:\n{f_line}")

lean_lsp_mcp/utils.py

@@ -1,4 +1,5 @@
 import os
+import secrets
 import sys
 import tempfile
 from typing import List, Dict, Optional
@@ -41,6 +42,19 @@ class OutputCapture:
         return self.captured_output
 
 
+class OptionalTokenVerifier(TokenVerifier):
+    """Minimal verifier that accepts a single pre-shared token."""
+
+    def __init__(self, expected_token: str):
+        self._expected_token = expected_token
+
+    async def verify_token(self, token: str | None) -> AccessToken | None:
+        if token is None or not secrets.compare_digest(token, self._expected_token):
+            return None
+        # AccessToken requires both client_id and scopes parameters to be provided.
+        return AccessToken(token=token, client_id="lean-lsp-mcp-optional", scopes=[])
+
+
 def format_diagnostics(diagnostics: List[Dict], select_line: int = -1) -> List[str]:
     """Format the diagnostics messages.
 
@@ -190,38 +204,58 @@ def format_line(
 
 
 def filter_diagnostics_by_position(
-    diagnostics: List[Dict], line: int, column: Optional[int]
+    diagnostics: List[Dict], line: Optional[int], column: Optional[int]
 ) -> List[Dict]:
-    """Find diagnostics at a specific position.
-
-    Args:
-        diagnostics (List[Dict]): List of diagnostics.
-        line (int): The line number (0-indexed).
-        column (Optional[int]): The column number (0-indexed).
-
-    Returns:
-        List[Dict]: List of diagnostics at the specified position.
-    """
-    if column is None:
-        return [
-            d
-            for d in diagnostics
-            if d["range"]["start"]["line"] <= line <= d["range"]["end"]["line"]
-        ]
-
-    return [
-        d
-        for d in diagnostics
-        if d["range"]["start"]["line"] <= line <= d["range"]["end"]["line"]
-        and d["range"]["start"]["character"] <= column < d["range"]["end"]["character"]
-    ]
-
-
-class OptionalTokenVerifier(TokenVerifier):
-    def __init__(self, expected_token: str):
-        self.expected_token = expected_token
-
-    async def verify_token(self, token: str) -> AccessToken | None:
-        if token == self.expected_token:
-            return AccessToken(token=token, client_id="lean-lsp-mcp", scopes=["user"])
-        return None
+    """Return diagnostics that intersect the requested (0-indexed) position."""
+
+    if line is None:
+        return list(diagnostics)
+
+    matches: List[Dict] = []
+    for diagnostic in diagnostics:
+        diagnostic_range = diagnostic.get("range") or diagnostic.get("fullRange")
+        if not diagnostic_range:
+            continue
+
+        start = diagnostic_range.get("start", {})
+        end = diagnostic_range.get("end", {})
+        start_line = start.get("line")
+        end_line = end.get("line")
+
+        if start_line is None or end_line is None:
+            continue
+        if line < start_line or line > end_line:
+            continue
+
+        start_char = start.get("character")
+        end_char = end.get("character")
+
+        if column is None:
+            if (
+                line == end_line
+                and line != start_line
+                and end_char is not None
+                and end_char == 0
+            ):
+                continue
+            matches.append(diagnostic)
+            continue
+
+        if start_char is None:
+            start_char = 0
+        if end_char is None:
+            end_char = column + 1
+
+        if start_line == end_line and start_char == end_char:
+            if column == start_char:
+                matches.append(diagnostic)
+            continue
+
+        if line == start_line and column < start_char:
+            continue
+        if line == end_line and column >= end_char:
+            continue
+
+        matches.append(diagnostic)
+
+    return matches

{lean_lsp_mcp-0.11.0.dist-info → lean_lsp_mcp-0.11.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lean-lsp-mcp
-Version: 0.11.0
+Version: 0.11.1
 Summary: Lean Theorem Prover MCP
 Author-email: Oliver Dressler <hey@oli.show>
 License-Expression: MIT
@@ -77,7 +77,11 @@ OR using the setup wizard:
 
 Ctrl+Shift+P > "MCP: Add Server..." > "Command (stdio)" > "uvx lean-lsp-mcp" > "lean-lsp" (or any name you like) > Global or Workspace
 
-OR manually add config to `mcp.json`:
+OR manually adding config by opening `mcp.json` with: 
+
+Ctrl+Shift+P > "MCP: Open User Configuration"
+
+and adding the following
 
 ```jsonc
 {
@@ -92,6 +96,25 @@ OR manually add config to `mcp.json`:
     }
 }
 ```
+
+If you installed VSCode on Windows and are using WSL2 as your development environment, you may need to use this config instead:
+
+```jsonc
+{
+    "servers": {
+        "lean-lsp": {
+            "type": "stdio",
+            "command": "wsl.exe",
+            "args": [
+                "uvx",
+                "lean-lsp-mcp"
+            ]
+        }
+    }
+}
+```
+If that doesn't work, you can try cloning this repository and replace `"lean-lsp-mcp"` with `"/path/to/cloned/lean-lsp-mcp"`.
+
 </details>
 
 <details>

lean_lsp_mcp-0.11.1.dist-info/RECORD

@@ -0,0 +1,14 @@
+lean_lsp_mcp/__init__.py,sha256=lxqDq0G_sI2iu2Nniy-pTW7BE9Ux7ZXeDoGf0OAWIDc,763
+lean_lsp_mcp/__main__.py,sha256=XnpTzfJc0T-j9tHtdkA8ovTr1c139ffTewcJGhxYDaM,49
+lean_lsp_mcp/client_utils.py,sha256=Z-2AoFBA36UO8oeauTNUtquE6Yz_ZRTKz_9n1iapyJ4,4519
+lean_lsp_mcp/file_utils.py,sha256=qddegF-T5-egZop8dPe_3Cma-3rRSKsAErVDQLecmbE,2916
+lean_lsp_mcp/instructions.py,sha256=y_gHlbeJoKnPohmcSVrQQds6mbBO1en-lxnXAfEypZE,892
+lean_lsp_mcp/search_utils.py,sha256=cNpWzR1TuNyvRxCeCIb0HoEHGsCIW1ypqN1R1ZpbkdI,4170
+lean_lsp_mcp/server.py,sha256=jK2bwi7iiM_agXtwRNFAMIpAo5FLDJ2FKfdDLvbaWfY,35433
+lean_lsp_mcp/utils.py,sha256=zLu2VIhaX4yocY07F3Z94LB2jRGrkH1ID9SjR3poE9A,8255
+lean_lsp_mcp-0.11.1.dist-info/licenses/LICENSE,sha256=CQlxnf0tQyoVrBE93JYvAUYxv6Z5Yg6sX0pwogOkFvo,1071
+lean_lsp_mcp-0.11.1.dist-info/METADATA,sha256=IWxzDA2qqh5yK7jxCr36R6z7HuwwLV2bzoFlGqUWEoQ,19444
+lean_lsp_mcp-0.11.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lean_lsp_mcp-0.11.1.dist-info/entry_points.txt,sha256=nQbvwctWkWD7I-2f4VrdVQBZYGUw8CnUnFC6QjXxOSE,51
+lean_lsp_mcp-0.11.1.dist-info/top_level.txt,sha256=LGEK0lgMSNPIQ6mG8EO-adaZEGPi_0daDs004epOTF0,13
+lean_lsp_mcp-0.11.1.dist-info/RECORD,,

lean_lsp_mcp-0.11.0.dist-info/RECORD

@@ -1,14 +0,0 @@
-lean_lsp_mcp/__init__.py,sha256=lxqDq0G_sI2iu2Nniy-pTW7BE9Ux7ZXeDoGf0OAWIDc,763
-lean_lsp_mcp/__main__.py,sha256=XnpTzfJc0T-j9tHtdkA8ovTr1c139ffTewcJGhxYDaM,49
-lean_lsp_mcp/client_utils.py,sha256=M7ep3-bDaGjN_tc3cvaWuyG00js0cwH9npMMdOgDDBw,3672
-lean_lsp_mcp/file_utils.py,sha256=qddegF-T5-egZop8dPe_3Cma-3rRSKsAErVDQLecmbE,2916
-lean_lsp_mcp/instructions.py,sha256=y_gHlbeJoKnPohmcSVrQQds6mbBO1en-lxnXAfEypZE,892
-lean_lsp_mcp/search_utils.py,sha256=cNpWzR1TuNyvRxCeCIb0HoEHGsCIW1ypqN1R1ZpbkdI,4170
-lean_lsp_mcp/server.py,sha256=-qrXb1ESuuoJz3-XAmox22ePPsoB1tbDMXSd84Qc8EM,35075
-lean_lsp_mcp/utils.py,sha256=HQA0bJSl5LWuIUmo7wPi7BMfP7R6ITOJbn5dOA2UfOk,7219
-lean_lsp_mcp-0.11.0.dist-info/licenses/LICENSE,sha256=CQlxnf0tQyoVrBE93JYvAUYxv6Z5Yg6sX0pwogOkFvo,1071
-lean_lsp_mcp-0.11.0.dist-info/METADATA,sha256=I3JjZPWmoawz4x_BA4PJ_AVDmg07q_YtvtnDoIHOvgc,18872
-lean_lsp_mcp-0.11.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lean_lsp_mcp-0.11.0.dist-info/entry_points.txt,sha256=nQbvwctWkWD7I-2f4VrdVQBZYGUw8CnUnFC6QjXxOSE,51
-lean_lsp_mcp-0.11.0.dist-info/top_level.txt,sha256=LGEK0lgMSNPIQ6mG8EO-adaZEGPi_0daDs004epOTF0,13
-lean_lsp_mcp-0.11.0.dist-info/RECORD,,