lean-lsp-mcp 0.16.1__py3-none-any.whl → 0.16.2__py3-none-any.whl

lean_lsp_mcp/models.py

@@ -118,3 +118,80 @@ class RunResult(BaseModel):
 class DeclarationInfo(BaseModel):
     file_path: str = Field(description="Path to declaration file")
     content: str = Field(description="File content")
+
+
+# Wrapper models for list-returning tools
+# FastMCP flattens bare lists into separate TextContent blocks, causing serialization issues.
+# Wrapping in a model ensures proper JSON serialization.
+
+
+class DiagnosticsResult(BaseModel):
+    """Wrapper for diagnostic messages list."""
+
+    items: List[DiagnosticMessage] = Field(
+        default_factory=list, description="List of diagnostic messages"
+    )
+
+
+class CompletionsResult(BaseModel):
+    """Wrapper for completions list."""
+
+    items: List[CompletionItem] = Field(
+        default_factory=list, description="List of completion items"
+    )
+
+
+class MultiAttemptResult(BaseModel):
+    """Wrapper for multi-attempt results list."""
+
+    items: List[AttemptResult] = Field(
+        default_factory=list, description="List of attempt results"
+    )
+
+
+class LocalSearchResults(BaseModel):
+    """Wrapper for local search results list."""
+
+    items: List[LocalSearchResult] = Field(
+        default_factory=list, description="List of local search results"
+    )
+
+
+class LeanSearchResults(BaseModel):
+    """Wrapper for LeanSearch results list."""
+
+    items: List[LeanSearchResult] = Field(
+        default_factory=list, description="List of LeanSearch results"
+    )
+
+
+class LoogleResults(BaseModel):
+    """Wrapper for Loogle results list."""
+
+    items: List[LoogleResult] = Field(
+        default_factory=list, description="List of Loogle results"
+    )
+
+
+class LeanFinderResults(BaseModel):
+    """Wrapper for Lean Finder results list."""
+
+    items: List[LeanFinderResult] = Field(
+        default_factory=list, description="List of Lean Finder results"
+    )
+
+
+class StateSearchResults(BaseModel):
+    """Wrapper for state search results list."""
+
+    items: List[StateSearchResult] = Field(
+        default_factory=list, description="List of state search results"
+    )
+
+
+class PremiseResults(BaseModel):
+    """Wrapper for premise results list."""
+
+    items: List[PremiseResult] = Field(
+        default_factory=list, description="List of premise results"
+    )

lean_lsp_mcp/search_utils.py

@@ -8,6 +8,7 @@ import platform
 import re
 import shutil
 import subprocess
+import threading
 from orjson import loads as _json_loads
 from pathlib import Path
 
@@ -27,6 +28,21 @@ _PLATFORM_INSTRUCTIONS: dict[str, Iterable[str]] = {
 }
 
 
+def _create_ripgrep_process(command: list[str], *, cwd: str) -> subprocess.Popen[str]:
+    """Spawn ripgrep and return a process with line-streaming stdout.
+
+    Separated for test monkeypatching and to allow early termination once we
+    have enough matches.
+    """
+    return subprocess.Popen(
+        command,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        text=True,
+        cwd=cwd,
+    )
+
+
 def check_ripgrep_status() -> tuple[bool, str]:
     """Check whether ``rg`` is available on PATH and return status + message."""
 
@@ -84,38 +100,116 @@ def lean_local_search(
     if lean_src := _get_lean_src_search_path():
         command.append(lean_src)
 
-    result = subprocess.run(command, capture_output=True, text=True, cwd=str(root))
-
-    matches = []
-    for line in result.stdout.splitlines():
-        if not line or (event := _json_loads(line)).get("type") != "match":
-            continue
+    process = _create_ripgrep_process(command, cwd=str(root))
 
-        data = event["data"]
-        parts = data["lines"]["text"].lstrip().split(maxsplit=2)
-        if len(parts) < 2:
-            continue
-
-        decl_kind, decl_name = parts[0], parts[1].rstrip(":")
-        file_path = Path(data["path"]["text"])
-        abs_path = (
-            file_path if file_path.is_absolute() else (root / file_path).resolve()
-        )
+    matches: list[dict[str, str]] = []
+    stderr_text = ""
+    terminated_early = False
+    stderr_chunks: list[str] = []
+    stderr_chars = 0
+    stderr_truncated = False
+    max_stderr_chars = 100_000
 
+    def _drain_stderr(pipe) -> None:
+        nonlocal stderr_chars, stderr_truncated
         try:
-            display_path = str(abs_path.relative_to(root))
-        except ValueError:
-            display_path = str(file_path)
-
-        matches.append({"name": decl_name, "kind": decl_kind, "file": display_path})
+            for err_line in pipe:
+                if stderr_chars < max_stderr_chars:
+                    stderr_chunks.append(err_line)
+                    stderr_chars += len(err_line)
+                else:
+                    stderr_truncated = True
+        except Exception:
+            return
+
+    stderr_thread: threading.Thread | None = None
+    if process.stderr is not None:
+        stderr_thread = threading.Thread(
+            target=_drain_stderr,
+            args=(process.stderr,),
+            name="lean-local-search-rg-stderr",
+            daemon=True,
+        )
+        stderr_thread.start()
 
-        if len(matches) >= limit:
-            break
+    try:
+        stdout = process.stdout
+        if stdout is None:
+            raise RuntimeError("ripgrep did not provide stdout pipe")
+
+        for line in stdout:
+            if not line or (event := _json_loads(line)).get("type") != "match":
+                continue
+
+            data = event["data"]
+            parts = data["lines"]["text"].lstrip().split(maxsplit=2)
+            if len(parts) < 2:
+                continue
+
+            decl_kind, decl_name = parts[0], parts[1].rstrip(":")
+            file_path = Path(data["path"]["text"])
+            abs_path = (
+                file_path if file_path.is_absolute() else (root / file_path).resolve()
+            )
+
+            try:
+                display_path = str(abs_path.relative_to(root))
+            except ValueError:
+                display_path = str(file_path)
+
+            matches.append({"name": decl_name, "kind": decl_kind, "file": display_path})
+
+            if len(matches) >= limit:
+                terminated_early = True
+                try:
+                    process.terminate()
+                except Exception:
+                    pass
+                break
 
-    if result.returncode not in (0, 1) and not matches:
-        error_msg = f"ripgrep exited with code {result.returncode}"
-        if result.stderr:
-            error_msg += f"\n{result.stderr}"
+        try:
+            if terminated_early:
+                process.wait(timeout=5)
+            else:
+                process.wait()
+        except subprocess.TimeoutExpired:
+            process.kill()
+            process.wait()
+    finally:
+        if process.returncode is None:
+            try:
+                process.terminate()
+            except Exception:
+                pass
+            try:
+                process.wait(timeout=5)
+            except Exception:
+                try:
+                    process.kill()
+                except Exception:
+                    pass
+                try:
+                    process.wait(timeout=5)
+                except Exception:
+                    pass
+        if stderr_thread is not None:
+            stderr_thread.join(timeout=1)
+        if process.stdout is not None:
+            process.stdout.close()
+        if process.stderr is not None:
+            process.stderr.close()
+
+    if stderr_chunks:
+        stderr_text = "".join(stderr_chunks)
+        if stderr_truncated:
+            stderr_text += "\n[stderr truncated]"
+
+    returncode = process.returncode if process.returncode is not None else 0
+
+    if returncode not in (0, 1) and not matches:
+        error_msg = f"ripgrep exited with code {returncode}"
+        if stderr_text:
+            error_msg += f"\n{stderr_text}"
         raise RuntimeError(error_msg)
 
     return matches

lean_lsp_mcp/server.py

@@ -12,7 +12,7 @@ import functools
 import uuid
 from pathlib import Path
 
-from pydantic import BaseModel, Field
+from pydantic import Field
 from mcp.server.fastmcp import Context, FastMCP
 from mcp.server.fastmcp.utilities.logging import get_logger, configure_logging
 from mcp.server.auth.settings import AuthSettings
@@ -46,6 +46,16 @@ from lean_lsp_mcp.models import (
     BuildResult,
     RunResult,
     DeclarationInfo,
+    # Wrapper models for list-returning tools
+    DiagnosticsResult,
+    CompletionsResult,
+    MultiAttemptResult,
+    LocalSearchResults,
+    LeanSearchResults,
+    LoogleResults,
+    LeanFinderResults,
+    StateSearchResults,
+    PremiseResults,
 )
 from lean_lsp_mcp.utils import (
     COMPLETION_KIND,
@@ -67,13 +77,6 @@ class LeanToolError(Exception):
     pass
 
 
-def _to_json_array(items: List[BaseModel]) -> str:
-    """Serialize list of models as JSON array (avoids FastMCP list flattening)."""
-    return orjson.dumps(
-        [item.model_dump() for item in items], option=orjson.OPT_INDENT_2
-    ).decode()
-
-
 _LOG_LEVEL = os.environ.get("LEAN_LOG_LEVEL", "INFO")
 configure_logging("CRITICAL" if _LOG_LEVEL == "NONE" else _LOG_LEVEL)
 logger = get_logger(__name__)
@@ -414,7 +417,7 @@ def diagnostic_messages(
     declaration_name: Annotated[
         Optional[str], Field(description="Filter to declaration (slow)")
     ] = None,
-) -> str:
+) -> DiagnosticsResult:
     """Get compiler diagnostics (errors, warnings, infos) for a Lean file."""
     rel_path = setup_client_for_file(ctx, file_path)
     if not rel_path:
@@ -443,7 +446,7 @@ def diagnostic_messages(
         inactivity_timeout=15.0,
     )
 
-    return _to_json_array(_to_diagnostic_messages(diagnostics))
+    return DiagnosticsResult(items=_to_diagnostic_messages(diagnostics))
 
 
 @mcp.tool(
@@ -610,7 +613,7 @@ def completions(
     line: Annotated[int, Field(description="Line number (1-indexed)", ge=1)],
     column: Annotated[int, Field(description="Column number (1-indexed)", ge=1)],
     max_completions: Annotated[int, Field(description="Max completions", ge=1)] = 32,
-) -> str:
+) -> CompletionsResult:
     """Get IDE autocompletions. Use on INCOMPLETE code (after `.` or partial name)."""
     rel_path = setup_client_for_file(ctx, file_path)
     if not rel_path:
@@ -639,7 +642,7 @@ def completions(
         )
 
     if not items:
-        return "[]"
+        return CompletionsResult(items=[])
 
     # Find the sort term: The last word/identifier before the cursor
     lines = content.splitlines()
@@ -666,7 +669,7 @@ def completions(
         items.sort(key=lambda x: x.label.lower())
 
     # Truncate if too many results
-    return _to_json_array(items[:max_completions])
+    return CompletionsResult(items=items[:max_completions])
 
 
 @mcp.tool(
@@ -741,7 +744,7 @@ def multi_attempt(
     snippets: Annotated[
         List[str], Field(description="Tactics to try (3+ recommended)")
     ],
-) -> str:
+) -> MultiAttemptResult:
     """Try multiple tactics without modifying file. Returns goal state for each."""
     rel_path = setup_client_for_file(ctx, file_path)
     if not rel_path:
@@ -753,8 +756,6 @@ def multi_attempt(
     client.open_file(rel_path)
 
     try:
-        client.open_file(rel_path)
-
         results: List[AttemptResult] = []
         # Avoid mutating caller-provided snippets; normalize locally per attempt
         for snippet in snippets:
@@ -781,7 +782,7 @@ def multi_attempt(
                 )
             )
 
-        return _to_json_array(results)
+        return MultiAttemptResult(items=results)
     finally:
         try:
             client.close_files([rel_path])
@@ -878,7 +879,7 @@ def local_search(
     project_root: Annotated[
         Optional[str], Field(description="Project root (inferred if omitted)")
     ] = None,
-) -> str:
+) -> LocalSearchResults:
     """Fast local search to verify declarations exist. Use BEFORE trying a lemma name."""
     if not _RG_AVAILABLE:
         raise LocalSearchError(_RG_MESSAGE)
@@ -910,7 +911,7 @@ def local_search(
             LocalSearchResult(name=r["name"], kind=r["kind"], file=r["file"])
             for r in raw_results
         ]
-        return _to_json_array(results)
+        return LocalSearchResults(items=results)
     except RuntimeError as exc:
         raise LocalSearchError(f"Search failed: {exc}")
 
@@ -929,7 +930,7 @@ def leansearch(
     ctx: Context,
     query: Annotated[str, Field(description="Natural language or Lean term query")],
     num_results: Annotated[int, Field(description="Max results", ge=1)] = 5,
-) -> str:
+) -> LeanSearchResults:
     """Search Mathlib via leansearch.net using natural language.
 
     Examples: "sum of two even numbers is even", "Cauchy-Schwarz inequality",
@@ -949,7 +950,7 @@ def leansearch(
         results = orjson.loads(response.read())
 
     if not results or not results[0]:
-        return "[]"
+        return LeanSearchResults(items=[])
 
     raw_results = [r["result"] for r in results[0][:num_results]]
     items = [
@@ -961,7 +962,7 @@ def leansearch(
         )
         for r in raw_results
     ]
-    return _to_json_array(items)
+    return LeanSearchResults(items=items)
 
 
 @mcp.tool(
@@ -979,7 +980,7 @@ async def loogle(
         str, Field(description="Type pattern, constant, or name substring")
     ],
     num_results: Annotated[int, Field(description="Max results", ge=1)] = 8,
-) -> str:
+) -> LoogleResults:
     """Search Mathlib by type signature via loogle.lean-lang.org.
 
     Examples: `Real.sin`, `"comm"`, `(?a → ?b) → List ?a → List ?b`,
@@ -992,7 +993,7 @@ async def loogle(
         try:
             results = await app_ctx.loogle_manager.query(query, num_results)
             if not results:
-                return "No results found."
+                return LoogleResults(items=[])
             items = [
                 LoogleResult(
                     name=r.get("name", ""),
@@ -1001,7 +1002,7 @@ async def loogle(
                 )
                 for r in results
             ]
-            return _to_json_array(items)
+            return LoogleResults(items=items)
         except Exception as e:
             logger.warning(f"Local loogle failed: {e}, falling back to remote")
 
@@ -1010,13 +1011,15 @@ async def loogle(
     now = int(time.time())
     rate_limit[:] = [t for t in rate_limit if now - t < 30]
     if len(rate_limit) >= 3:
-        return "Rate limit exceeded: 3 requests per 30s. Use --loogle-local to avoid limits."
+        raise LeanToolError(
+            "Rate limit exceeded: 3 requests per 30s. Use --loogle-local to avoid limits."
+        )
     rate_limit.append(now)
 
     result = loogle_remote(query, num_results)
     if isinstance(result, str):
-        return result  # Error message
-    return _to_json_array(result)
+        raise LeanToolError(result)  # Error message from remote
+    return LoogleResults(items=result)
 
 
 @mcp.tool(
@@ -1033,7 +1036,7 @@ def leanfinder(
     ctx: Context,
     query: Annotated[str, Field(description="Mathematical concept or proof state")],
     num_results: Annotated[int, Field(description="Max results", ge=1)] = 5,
-) -> str:
+) -> LeanFinderResults:
     """Semantic search by mathematical meaning via Lean Finder.
 
     Examples: "commutativity of addition on natural numbers",
@@ -1065,7 +1068,7 @@ def leanfinder(
                     )
                 )
 
-    return _to_json_array(results)
+    return LeanFinderResults(items=results)
 
 
 @mcp.tool(
@@ -1084,7 +1087,7 @@ def state_search(
     line: Annotated[int, Field(description="Line number (1-indexed)", ge=1)],
     column: Annotated[int, Field(description="Column number (1-indexed)", ge=1)],
     num_results: Annotated[int, Field(description="Max results", ge=1)] = 5,
-) -> str:
+) -> StateSearchResults:
     """Find lemmas to close the goal at a position. Searches premise-search.com."""
     rel_path = setup_client_for_file(ctx, file_path)
     if not rel_path:
@@ -1114,7 +1117,7 @@ def state_search(
         results = orjson.loads(response.read())
 
     items = [StateSearchResult(name=r["name"]) for r in results]
-    return _to_json_array(items)
+    return StateSearchResults(items=items)
 
 
 @mcp.tool(
@@ -1133,7 +1136,7 @@ def hammer_premise(
     line: Annotated[int, Field(description="Line number (1-indexed)", ge=1)],
     column: Annotated[int, Field(description="Column number (1-indexed)", ge=1)],
     num_results: Annotated[int, Field(description="Max results", ge=1)] = 32,
-) -> str:
+) -> PremiseResults:
     """Get premise suggestions for automation tactics at a goal position.
 
     Returns lemma names to try with `simp only [...]`, `aesop`, or as hints.
@@ -1174,7 +1177,7 @@ def hammer_premise(
         results = orjson.loads(response.read())
 
     items = [PremiseResult(name=r["name"]) for r in results]
-    return _to_json_array(items)
+    return PremiseResults(items=items)
 
 
 if __name__ == "__main__":

{lean_lsp_mcp-0.16.1.dist-info → lean_lsp_mcp-0.16.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lean-lsp-mcp
-Version: 0.16.1
+Version: 0.16.2
 Summary: Lean Theorem Prover MCP
 Author-email: Oliver Dressler <hey@oli.show>
 License-Expression: MIT
@@ -8,9 +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.6.1
-Requires-Dist: mcp[cli]==1.23.1
-Requires-Dist: mcp[cli]>=1.22.0
+Requires-Dist: leanclient==0.6.2
+Requires-Dist: mcp[cli]==1.24.0
 Requires-Dist: orjson>=3.11.1
 Provides-Extra: lint
 Requires-Dist: ruff>=0.2.0; extra == "lint"

{lean_lsp_mcp-0.16.1.dist-info → lean_lsp_mcp-0.16.2.dist-info}/RECORD

@@ -4,14 +4,14 @@ lean_lsp_mcp/client_utils.py,sha256=HgPuB35rMitn2Xm8SCAErsFLq15trB6VMz3FDFgmPd8,
 lean_lsp_mcp/file_utils.py,sha256=kCTYQSfmV-R2cm_NCi_L8W5Dcsm0_rTOPpTtpyAin78,1365
 lean_lsp_mcp/instructions.py,sha256=S1y834V8v-SFSYJlxxy6Dj-Z0szMyEBT5SkEyM6Npr8,1756
 lean_lsp_mcp/loogle.py,sha256=ChybtPM8jOxP8s28358yNqcLiYvGlQqkAEFFLzR87Zw,11971
-lean_lsp_mcp/models.py,sha256=M8CmTg0_NL7KwcQ7UX_Zk7ZG1zXoWLINr41NPs_no2Y,4301
+lean_lsp_mcp/models.py,sha256=gDfyAX09YzKtjpKzuo6JtA2mNDc9pRWJ7iT44nHwi94,6326
 lean_lsp_mcp/outline_utils.py,sha256=-eoZNbx2eaKaYmuyFJnwUMWP8I9YXNWusue_2OYpDBM,10981
-lean_lsp_mcp/search_utils.py,sha256=X2LPynDNLi767UDxbxHpMccOkbnfKJKv_HxvRNxIXM4,3984
-lean_lsp_mcp/server.py,sha256=8QEkRlbLEKif4NfagD2l1min1w1IFF7Jw1TUUOK-xFg,39481
+lean_lsp_mcp/search_utils.py,sha256=MLqKGe4bhEvyfFLIBCmiDxkbcH4O5J3vl9mWnRSb_v0,6801
+lean_lsp_mcp/server.py,sha256=AvjzoS8lwomUtIP2wrBln4z28-cXzCf1hNgXd9O1w4E,39749
 lean_lsp_mcp/utils.py,sha256=355kzyB3dkwU7_4Mfcg--JXEorFaE2gtqs6-HbH5rRE,11722
-lean_lsp_mcp-0.16.1.dist-info/licenses/LICENSE,sha256=CQlxnf0tQyoVrBE93JYvAUYxv6Z5Yg6sX0pwogOkFvo,1071
-lean_lsp_mcp-0.16.1.dist-info/METADATA,sha256=nwfjUYlagiUb49IkT3AWoOmJwH4fnwJ5ElyvD9V8zGw,20819
-lean_lsp_mcp-0.16.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lean_lsp_mcp-0.16.1.dist-info/entry_points.txt,sha256=nQbvwctWkWD7I-2f4VrdVQBZYGUw8CnUnFC6QjXxOSE,51
-lean_lsp_mcp-0.16.1.dist-info/top_level.txt,sha256=LGEK0lgMSNPIQ6mG8EO-adaZEGPi_0daDs004epOTF0,13
-lean_lsp_mcp-0.16.1.dist-info/RECORD,,
+lean_lsp_mcp-0.16.2.dist-info/licenses/LICENSE,sha256=CQlxnf0tQyoVrBE93JYvAUYxv6Z5Yg6sX0pwogOkFvo,1071
+lean_lsp_mcp-0.16.2.dist-info/METADATA,sha256=Wrhb1l5m-Up77bQyegUdesd0k1ryWhe0C6dIHIWJ5mM,20787
+lean_lsp_mcp-0.16.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lean_lsp_mcp-0.16.2.dist-info/entry_points.txt,sha256=nQbvwctWkWD7I-2f4VrdVQBZYGUw8CnUnFC6QjXxOSE,51
+lean_lsp_mcp-0.16.2.dist-info/top_level.txt,sha256=LGEK0lgMSNPIQ6mG8EO-adaZEGPi_0daDs004epOTF0,13
+lean_lsp_mcp-0.16.2.dist-info/RECORD,,