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

lean_lsp_mcp/client_utils.py

@@ -64,59 +64,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/server.py

@@ -18,7 +18,11 @@ 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.client_utils import (
+    setup_client_for_file,
+    startup_client,
+    infer_project_path,
+)
 from lean_lsp_mcp.file_utils import get_file_contents, update_file
 from lean_lsp_mcp.instructions import INSTRUCTIONS
 from lean_lsp_mcp.search_utils import check_ripgrep_status, lean_local_search
@@ -154,10 +158,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:
@@ -247,6 +248,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:
@@ -604,7 +609,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 +689,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)
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lean-lsp-mcp
-Version: 0.11.2
+Version: 0.11.3
 Summary: Lean Theorem Prover MCP
 Author-email: Oliver Dressler <hey@oli.show>
 License-Expression: MIT

{lean_lsp_mcp-0.11.2.dist-info → lean_lsp_mcp-0.11.3.dist-info}/RECORD

@@ -1,14 +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/client_utils.py,sha256=FNfiEWQagRj9tmo2xUDxbSZYVz5_RfaNH6OApgNQ9ZM,5065
 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/server.py,sha256=zwiHeMlgRpERNIF-E_6OKzI8a-YmAx09EVX3QO2gJAk,34792
 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,,
+lean_lsp_mcp-0.11.3.dist-info/licenses/LICENSE,sha256=CQlxnf0tQyoVrBE93JYvAUYxv6Z5Yg6sX0pwogOkFvo,1071
+lean_lsp_mcp-0.11.3.dist-info/METADATA,sha256=1mf98hyaVVN1lZLWMZEdtSV6-nDZ7KAFyVLPRc7gbx8,19626
+lean_lsp_mcp-0.11.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lean_lsp_mcp-0.11.3.dist-info/entry_points.txt,sha256=nQbvwctWkWD7I-2f4VrdVQBZYGUw8CnUnFC6QjXxOSE,51
+lean_lsp_mcp-0.11.3.dist-info/top_level.txt,sha256=LGEK0lgMSNPIQ6mG8EO-adaZEGPi_0daDs004epOTF0,13
+lean_lsp_mcp-0.11.3.dist-info/RECORD,,