lean-lsp-mcp 0.11.2__py3-none-any.whl → 0.12.0__py3-none-any.whl

lean_lsp_mcp/client_utils.py

@@ -34,7 +34,6 @@ def startup_client(ctx: Context):
                 return  # Client already set up correctly - reuse it!
             # Different project path - close old client
             client.close()
-            ctx.request_context.lifespan_context.file_content_hashes.clear()
 
         # Need to create a new client
         with OutputCapture() as output:
@@ -64,59 +63,75 @@ def valid_lean_project_path(path: Path | str) -> bool:
     return (path_obj / "lean-toolchain").is_file()
 
 
-def setup_client_for_file(ctx: Context, file_path: str) -> str | None:
-    """Ensure the LSP client matches the file's Lean project and return its relative path."""
+def infer_project_path(ctx: Context, file_path: str) -> Path | None:
+    """Infer and cache the Lean project path for a file WITHOUT starting the client.
+
+    Walks up the directory tree to find a lean-toolchain file, caches the result.
+    Sets ctx.request_context.lifespan_context.lean_project_path if found.
+
+    Side effects when path changes:
+    - Next LSP tool will restart the client for the new project
+    - File content hashes will be cleared
 
+    Args:
+        ctx (Context): Context object
+        file_path (str): Absolute or relative path to a Lean file
+
+    Returns:
+        Path | None: The resolved project path if found, None otherwise
+    """
     lifespan = ctx.request_context.lifespan_context
-    project_cache = getattr(lifespan, "project_cache", {})
     if not hasattr(lifespan, "project_cache"):
-        lifespan.project_cache = project_cache
+        lifespan.project_cache = {}
 
     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:
+    def set_project_path(project_path: Path, cache_dirs: list[str]) -> Path | None:
+        """Validate file is in project, set path, update cache."""
+        if get_relative_file_path(project_path, file_path) is None:
             return None
 
-        project_path_obj = project_path_obj.resolve()
-        lifespan.lean_project_path = project_path_obj
+        project_path = project_path.resolve()
+        lifespan.lean_project_path = project_path
 
-        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)
+        # Update all relevant directories in cache
+        for directory in set(cache_dirs + [str(project_path)]):
+            if directory:
+                lifespan.project_cache[directory] = project_path
 
-        for directory in cache_targets:
-            project_cache[directory] = project_path_obj
+        return project_path
 
-        startup_client(ctx)
-        return rel
+    # Fast path: current project already valid for this file
+    if lifespan.lean_project_path and set_project_path(
+        lifespan.lean_project_path, [file_dir]
+    ):
+        return lifespan.lean_project_path
 
-    # 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:
-            return rel_path
-
-    # Walk up from file directory to root, using cache hits or lean-toolchain
-    prev_dir = None
+    # Walk up directory tree using cache and lean-toolchain detection
     current_dir = file_dir
-    while current_dir and current_dir != prev_dir:
-        cached_root = project_cache.get(current_dir)
+    while current_dir and current_dir != os.path.dirname(current_dir):
+        cached_root = lifespan.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
+            if result := set_project_path(Path(cached_root), [current_dir]):
+                return result
         elif valid_lean_project_path(current_dir):
-            rel_path = activate_project(Path(current_dir), [current_dir])
-            if rel_path is not None:
-                return rel_path
+            if result := set_project_path(Path(current_dir), [current_dir]):
+                return result
         else:
-            project_cache[current_dir] = ""
-        prev_dir = current_dir
+            lifespan.project_cache[current_dir] = ""  # Mark as checked
+
         current_dir = os.path.dirname(current_dir)
 
     return None
+
+
+def setup_client_for_file(ctx: Context, file_path: str) -> str | None:
+    """Ensure the LSP client matches the file's Lean project and return its relative path."""
+    project_path = infer_project_path(ctx, file_path)
+    if project_path is None:
+        return None
+
+    startup_client(ctx)
+    return get_relative_file_path(project_path, file_path)

lean_lsp_mcp/file_utils.py

@@ -1,13 +1,6 @@
-from typing import Optional, Dict
+from typing import Optional
 from pathlib import Path
 
-from mcp.server.fastmcp import Context
-from mcp.server.fastmcp.utilities.logging import get_logger
-from leanclient import LeanLSPClient
-
-
-logger = get_logger(__name__)
-
 
 def get_relative_file_path(lean_project_path: Path, file_path: str) -> Optional[str]:
     """Convert path relative to project path.
@@ -21,25 +14,24 @@ def get_relative_file_path(lean_project_path: Path, file_path: str) -> Optional[
     """
     file_path_obj = Path(file_path)
 
-    # Check if absolute path
+    # Absolute path under project
     if file_path_obj.is_absolute() and file_path_obj.exists():
         try:
             return str(file_path_obj.relative_to(lean_project_path))
         except ValueError:
-            # File is not in this project
             return None
 
-    # Check if relative to project path
+    # Relative to project path
     path = lean_project_path / file_path
     if path.exists():
         return str(path.relative_to(lean_project_path))
 
-    # Check if relative to CWD
+    # Relative to CWD, but only if inside project root
     cwd = Path.cwd()
     path = cwd / file_path
     if path.exists():
         try:
-            return str(path.relative_to(lean_project_path))
+            return str(path.resolve().relative_to(lean_project_path))
         except ValueError:
             return None
 
@@ -55,46 +47,3 @@ def get_file_contents(abs_path: str) -> str:
             continue
     with open(abs_path, "r", encoding=None) as f:
         return f.read()
-
-
-def update_file(ctx: Context, rel_path: str) -> str:
-    """Update the file contents in the context.
-    Args:
-        ctx (Context): Context object.
-        rel_path (str): Relative file path.
-
-    Returns:
-        str: Updated file contents.
-    """
-    # Get file contents and hash
-    abs_path = ctx.request_context.lifespan_context.lean_project_path / rel_path
-    file_content = get_file_contents(str(abs_path))
-    hashed_file = hash(file_content)
-
-    # Check if file_contents have changed
-    file_content_hashes: Dict[str, str] = (
-        ctx.request_context.lifespan_context.file_content_hashes
-    )
-    if rel_path not in file_content_hashes:
-        file_content_hashes[rel_path] = hashed_file
-        return file_content
-
-    elif hashed_file == file_content_hashes[rel_path]:
-        return file_content
-
-    # Update file_contents
-    file_content_hashes[rel_path] = hashed_file
-
-    # Reload file in LSP
-    client: LeanLSPClient = ctx.request_context.lifespan_context.client
-    try:
-        client.close_files([rel_path])
-    except FileNotFoundError as e:
-        logger.warning(
-            f"Attempted to close file {rel_path} that wasn't open in LSP client: {e}"
-        )
-    except Exception as e:
-        logger.error(
-            f"Unexpected error closing file {rel_path}: {type(e).__name__}: {e}"
-        )
-    return file_content

lean_lsp_mcp/server.py

@@ -18,8 +18,12 @@ from mcp.server.fastmcp.utilities.logging import get_logger, configure_logging
 from mcp.server.auth.settings import AuthSettings
 from leanclient import LeanLSPClient, DocumentContentChange
 
-from lean_lsp_mcp.client_utils import setup_client_for_file, startup_client
-from lean_lsp_mcp.file_utils import get_file_contents, update_file
+from lean_lsp_mcp.client_utils import (
+    setup_client_for_file,
+    startup_client,
+    infer_project_path,
+)
+from lean_lsp_mcp.file_utils import get_file_contents
 from lean_lsp_mcp.instructions import INSTRUCTIONS
 from lean_lsp_mcp.search_utils import check_ripgrep_status, lean_local_search
 from lean_lsp_mcp.utils import (
@@ -47,7 +51,6 @@ _RG_AVAILABLE, _RG_MESSAGE = check_ripgrep_status()
 class AppContext:
     lean_project_path: Path | None
     client: LeanLSPClient | None
-    file_content_hashes: Dict[str, str]
     rate_limit: Dict[str, List[int]]
     lean_search_available: bool
 
@@ -64,7 +67,6 @@ async def app_lifespan(server: FastMCP) -> AsyncIterator[AppContext]:
         context = AppContext(
             lean_project_path=lean_project_path,
             client=None,
-            file_content_hashes={},
             rate_limit={
                 "leansearch": [],
                 "loogle": [],
@@ -154,10 +156,7 @@ async def lsp_build(
         ctx.request_context.lifespan_context.lean_project_path = lean_project_path_obj
 
     if lean_project_path_obj is None:
-        return (
-            "Lean project path not known yet. Provide `lean_project_path` explicitly or call a "
-            "tool that infers it (e.g. `lean_goal`) before running `lean_build`."
-        )
+        return "Lean project path not known yet. Provide `lean_project_path` explicitly or call a tool that infers it (e.g. `lean_file_contents`) before running `lean_build`."
 
     build_output = ""
     try:
@@ -165,7 +164,6 @@ async def lsp_build(
         if client:
             ctx.request_context.lifespan_context.client = None
             client.close()
-            ctx.request_context.lifespan_context.file_content_hashes.clear()
 
         if clean:
             subprocess.run(["lake", "clean"], cwd=lean_project_path_obj, check=False)
@@ -247,6 +245,10 @@ def file_contents(ctx: Context, file_path: str, annotate_lines: bool = True) ->
     Returns:
         str: File content or error msg
     """
+    # Infer project path but do not start a client
+    if file_path.endswith(".lean"):
+        infer_project_path(ctx, file_path)  # Silently fails for non-project files
+
     try:
         data = get_file_contents(file_path)
     except FileNotFoundError:
@@ -266,13 +268,20 @@ def file_contents(ctx: Context, file_path: str, annotate_lines: bool = True) ->
 
 
 @mcp.tool("lean_diagnostic_messages")
-def diagnostic_messages(ctx: Context, file_path: str) -> List[str] | str:
+def diagnostic_messages(
+    ctx: Context,
+    file_path: str,
+    start_line: Optional[int] = None,
+    end_line: Optional[int] = None,
+) -> List[str] | str:
     """Get all diagnostic msgs (errors, warnings, infos) for a Lean file.
 
     "no goals to be solved" means code may need removal.
 
     Args:
         file_path (str): Abs path to Lean file
+        start_line (int, optional): Start line (1-indexed) for filtering diagnostics. If provided, only diagnostics from this line onwards are returned.
+        end_line (int, optional): End line (1-indexed) for filtering diagnostics. If provided with start_line, only diagnostics in this range are returned.
 
     Returns:
         List[str] | str: Diagnostic msgs or error msg
@@ -281,10 +290,22 @@ def diagnostic_messages(ctx: Context, file_path: str) -> List[str] | str:
     if not rel_path:
         return "Invalid Lean file path: Unable to start LSP server or load file"
 
-    update_file(ctx, rel_path)
-
     client: LeanLSPClient = ctx.request_context.lifespan_context.client
-    diagnostics = client.get_diagnostics(rel_path)
+
+    # leanclient requires both start_line and end_line to filter
+    # Convert 1-indexed to 0-indexed for leanclient
+    if start_line is not None or end_line is not None:
+        start_line_0 = (start_line - 1) if start_line is not None else 0
+        end_line_0 = (end_line - 1) if end_line is not None else 999999
+        diagnostics = client.get_diagnostics(
+            rel_path,
+            start_line=start_line_0,
+            end_line=end_line_0,
+            inactivity_timeout=10.0,
+        )
+    else:
+        diagnostics = client.get_diagnostics(rel_path, inactivity_timeout=10.0)
+
     return format_diagnostics(diagnostics)
 
 
@@ -309,8 +330,9 @@ def goal(ctx: Context, file_path: str, line: int, column: Optional[int] = None)
     if not rel_path:
         return "Invalid Lean file path: Unable to start LSP server or load file"
 
-    content = update_file(ctx, rel_path)
     client: LeanLSPClient = ctx.request_context.lifespan_context.client
+    client.open_file(rel_path)
+    content = client.get_file_content(rel_path)
 
     if column is None:
         lines = content.splitlines()
@@ -355,14 +377,15 @@ def term_goal(
     if not rel_path:
         return "Invalid Lean file path: Unable to start LSP server or load file"
 
-    content = update_file(ctx, rel_path)
+    client: LeanLSPClient = ctx.request_context.lifespan_context.client
+    client.open_file(rel_path)
+    content = client.get_file_content(rel_path)
     if column is None:
         lines = content.splitlines()
         if line < 1 or line > len(lines):
             return "Line number out of range. Try elsewhere?"
         column = len(content.splitlines()[line - 1])
 
-    client: LeanLSPClient = ctx.request_context.lifespan_context.client
     term_goal = client.get_term_goal(rel_path, line - 1, column - 1)
     f_line = format_line(content, line, column)
     if term_goal is None:
@@ -389,8 +412,9 @@ def hover(ctx: Context, file_path: str, line: int, column: int) -> str:
     if not rel_path:
         return "Invalid Lean file path: Unable to start LSP server or load file"
 
-    file_content = update_file(ctx, rel_path)
     client: LeanLSPClient = ctx.request_context.lifespan_context.client
+    client.open_file(rel_path)
+    file_content = client.get_file_content(rel_path)
     hover_info = client.get_hover(rel_path, line - 1, column - 1)
     if hover_info is None:
         f_line = format_line(file_content, line, column)
@@ -435,9 +459,10 @@ def completions(
     rel_path = setup_client_for_file(ctx, file_path)
     if not rel_path:
         return "Invalid Lean file path: Unable to start LSP server or load file"
-    content = update_file(ctx, rel_path)
 
     client: LeanLSPClient = ctx.request_context.lifespan_context.client
+    client.open_file(rel_path)
+    content = client.get_file_content(rel_path)
     completions = client.get_completions(rel_path, line - 1, column - 1)
     formatted = [c["label"] for c in completions if "label" in c]
     f_line = format_line(content, line, column)
@@ -497,14 +522,16 @@ def declaration_file(ctx: Context, file_path: str, symbol: str) -> str:
     rel_path = setup_client_for_file(ctx, file_path)
     if not rel_path:
         return "Invalid Lean file path: Unable to start LSP server or load file"
-    orig_file_content = update_file(ctx, rel_path)
+
+    client: LeanLSPClient = ctx.request_context.lifespan_context.client
+    client.open_file(rel_path)
+    orig_file_content = client.get_file_content(rel_path)
 
     # Find the first occurence of the symbol (line and column) in the file,
     position = find_start_position(orig_file_content, symbol)
     if not position:
         return f"Symbol `{symbol}` (case sensitive) not found in file `{rel_path}`. Add it first, then try again."
 
-    client: LeanLSPClient = ctx.request_context.lifespan_context.client
     declaration = client.get_declarations(
         rel_path, position["line"], position["column"]
     )
@@ -552,8 +579,9 @@ def multi_attempt(
     rel_path = setup_client_for_file(ctx, file_path)
     if not rel_path:
         return "Invalid Lean file path: Unable to start LSP server or load file"
-    update_file(ctx, rel_path)
+
     client: LeanLSPClient = ctx.request_context.lifespan_context.client
+    client.open_file(rel_path)
 
     try:
         client.open_file(rel_path)
@@ -604,7 +632,7 @@ def run_code(ctx: Context, code: str) -> List[str] | str:
     lifespan_context = ctx.request_context.lifespan_context
     lean_project_path = lifespan_context.lean_project_path
     if lean_project_path is None:
-        return "No valid Lean project path found. Run another tool (e.g. `lean_diagnostic_messages`) first to set it up or set the LEAN_PROJECT_PATH environment variable."
+        return "No valid Lean project path found. Run another tool (e.g. `lean_file_contents`) first to set it up."
 
     # Use a unique snippet filename to avoid collisions under concurrency
     rel_path = f"_mcp_snippet_{uuid.uuid4().hex}.lean"
@@ -684,7 +712,7 @@ def local_search(
 
     stored_root = ctx.request_context.lifespan_context.lean_project_path
     if stored_root is None:
-        return "Lean project path not set. Call a file-based tool (like lean_goal) first to set the project path."
+        return "Lean project path not set. Call a file-based tool (like lean_file_contents) first to set the project path."
 
     return lean_local_search(query=query.strip(), limit=limit, project_root=stored_root)
 
@@ -853,8 +881,9 @@ def state_search(
     if not rel_path:
         return "Invalid Lean file path: Unable to start LSP server or load file"
 
-    file_contents = update_file(ctx, rel_path)
     client: LeanLSPClient = ctx.request_context.lifespan_context.client
+    client.open_file(rel_path)
+    file_contents = client.get_file_content(rel_path)
     goal = client.get_goal(rel_path, line - 1, column - 1)
 
     f_line = format_line(file_contents, line, column)
@@ -903,8 +932,9 @@ def hammer_premise(
     if not rel_path:
         return "Invalid Lean file path: Unable to start LSP server or load file"
 
-    file_contents = update_file(ctx, rel_path)
     client: LeanLSPClient = ctx.request_context.lifespan_context.client
+    client.open_file(rel_path)
+    file_contents = client.get_file_content(rel_path)
     goal = client.get_goal(rel_path, line - 1, column - 1)
 
     f_line = format_line(file_contents, line, column)

{lean_lsp_mcp-0.11.2.dist-info → lean_lsp_mcp-0.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lean-lsp-mcp
-Version: 0.11.2
+Version: 0.12.0
 Summary: Lean Theorem Prover MCP
 Author-email: Oliver Dressler <hey@oli.show>
 License-Expression: MIT
@@ -8,8 +8,8 @@ Project-URL: Repository, https://github.com/oOo0oOo/lean-lsp-mcp
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: leanclient==0.4.0
-Requires-Dist: mcp[cli]==1.19.0
+Requires-Dist: leanclient==0.5.0
+Requires-Dist: mcp[cli]==1.21.0
 Requires-Dist: orjson>=3.11.1
 Provides-Extra: lint
 Requires-Dist: ruff>=0.2.0; extra == "lint"

lean_lsp_mcp-0.12.0.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=hF941DEeRE3ICMgMhv9J4vv6bO4hZPJOAcFU03yIDXs,4988
+lean_lsp_mcp/file_utils.py,sha256=kCTYQSfmV-R2cm_NCi_L8W5Dcsm0_rTOPpTtpyAin78,1365
+lean_lsp_mcp/instructions.py,sha256=y_gHlbeJoKnPohmcSVrQQds6mbBO1en-lxnXAfEypZE,892
+lean_lsp_mcp/search_utils.py,sha256=X2LPynDNLi767UDxbxHpMccOkbnfKJKv_HxvRNxIXM4,3984
+lean_lsp_mcp/server.py,sha256=oxuytxr58QLS-lCVRxYgtlLGEW0uHPhw2gKC5oRChqk,35799
+lean_lsp_mcp/utils.py,sha256=zLu2VIhaX4yocY07F3Z94LB2jRGrkH1ID9SjR3poE9A,8255
+lean_lsp_mcp-0.12.0.dist-info/licenses/LICENSE,sha256=CQlxnf0tQyoVrBE93JYvAUYxv6Z5Yg6sX0pwogOkFvo,1071
+lean_lsp_mcp-0.12.0.dist-info/METADATA,sha256=wMGQwNNQxVIt_hxZZgOZDIJ1E5wQmq2h4x9hRJrBgjw,19626
+lean_lsp_mcp-0.12.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lean_lsp_mcp-0.12.0.dist-info/entry_points.txt,sha256=nQbvwctWkWD7I-2f4VrdVQBZYGUw8CnUnFC6QjXxOSE,51
+lean_lsp_mcp-0.12.0.dist-info/top_level.txt,sha256=LGEK0lgMSNPIQ6mG8EO-adaZEGPi_0daDs004epOTF0,13
+lean_lsp_mcp-0.12.0.dist-info/RECORD,,

lean_lsp_mcp-0.11.2.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=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=X2LPynDNLi767UDxbxHpMccOkbnfKJKv_HxvRNxIXM4,3984
-lean_lsp_mcp/server.py,sha256=knA8HsJZeUNnMqNdv2rnAnS__Eblr0aPnlwKH1FrLbA,34661
-lean_lsp_mcp/utils.py,sha256=zLu2VIhaX4yocY07F3Z94LB2jRGrkH1ID9SjR3poE9A,8255
-lean_lsp_mcp-0.11.2.dist-info/licenses/LICENSE,sha256=CQlxnf0tQyoVrBE93JYvAUYxv6Z5Yg6sX0pwogOkFvo,1071
-lean_lsp_mcp-0.11.2.dist-info/METADATA,sha256=2sGVG-wCFYATL2iKhQ7Twt_6jcvPumAk7P74y_2uCto,19626
-lean_lsp_mcp-0.11.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lean_lsp_mcp-0.11.2.dist-info/entry_points.txt,sha256=nQbvwctWkWD7I-2f4VrdVQBZYGUw8CnUnFC6QjXxOSE,51
-lean_lsp_mcp-0.11.2.dist-info/top_level.txt,sha256=LGEK0lgMSNPIQ6mG8EO-adaZEGPi_0daDs004epOTF0,13
-lean_lsp_mcp-0.11.2.dist-info/RECORD,,