lean-lsp-mcp 0.15.0__py3-none-any.whl → 0.16.0__py3-none-any.whl

lean_lsp_mcp/server.py

@@ -2,7 +2,7 @@ import asyncio
 import os
 import re
 import time
-from typing import List, Optional, Dict
+from typing import Annotated, List, Optional, Dict
 from contextlib import asynccontextmanager
 from collections.abc import AsyncIterator
 from dataclasses import dataclass
@@ -13,9 +13,11 @@ import subprocess
 import uuid
 from pathlib import Path
 
+from pydantic import BaseModel, 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
+from mcp.types import ToolAnnotations
 from leanclient import LeanLSPClient, DocumentContentChange
 
 from lean_lsp_mcp.client_utils import (
@@ -27,20 +29,51 @@ 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.loogle import LoogleManager, loogle_remote
-from lean_lsp_mcp.outline_utils import generate_outline
+from lean_lsp_mcp.outline_utils import generate_outline_data
+from lean_lsp_mcp.models import (
+    LocalSearchResult,
+    LeanSearchResult,
+    LoogleResult,
+    LeanFinderResult,
+    StateSearchResult,
+    PremiseResult,
+    DiagnosticMessage,
+    GoalState,
+    CompletionItem,
+    HoverInfo,
+    TermGoalState,
+    FileOutline,
+    AttemptResult,
+    BuildResult,
+    RunResult,
+    DeclarationInfo,
+)
 from lean_lsp_mcp.utils import (
+    COMPLETION_KIND,
     OutputCapture,
     deprecated,
     extract_range,
     filter_diagnostics_by_position,
     find_start_position,
-    format_diagnostics,
     format_goal,
-    format_line,
     get_declaration_range,
     OptionalTokenVerifier,
 )
 
+# LSP Diagnostic severity: 1=error, 2=warning, 3=info, 4=hint
+DIAGNOSTIC_SEVERITY: Dict[int, str] = {1: "error", 2: "warning", 3: "info", 4: "hint"}
+
+
+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)
@@ -50,7 +83,6 @@ logger = get_logger(__name__)
 _RG_AVAILABLE, _RG_MESSAGE = check_ripgrep_status()
 
 
-# Server and context
 @dataclass
 class AppContext:
     lean_project_path: Path | None
@@ -130,7 +162,6 @@ if auth_token:
 mcp = FastMCP(**mcp_kwargs)
 
 
-# Rate limiting: n requests per m seconds
 def rate_limited(category: str, max_requests: int, per_seconds: int):
     def decorator(func):
         @functools.wraps(func)
@@ -160,22 +191,24 @@ def rate_limited(category: str, max_requests: int, per_seconds: int):
     return decorator
 
 
-# Project level tools
-@mcp.tool("lean_build")
+@mcp.tool(
+    "lean_build",
+    annotations=ToolAnnotations(
+        title="Build Project",
+        readOnlyHint=False,
+        destructiveHint=False,
+        idempotentHint=True,
+        openWorldHint=False,
+    ),
+)
 async def lsp_build(
-    ctx: Context, lean_project_path: str = None, clean: bool = False
-) -> str:
-    """Build the Lean project and restart the LSP Server.
-
-    Use only if needed (e.g. new imports).
-
-    Args:
-        lean_project_path (str, optional): Path to the Lean project. If not provided, it will be inferred from previous tool calls.
-        clean (bool, optional): Run `lake clean` before building. Attention: Only use if it is really necessary! It can take a long time! Defaults to False.
-
-    Returns:
-        str: Build output or error msg
-    """
+    ctx: Context,
+    lean_project_path: Annotated[
+        Optional[str], Field(description="Path to Lean project")
+    ] = None,
+    clean: Annotated[bool, Field(description="Run lake clean first (slow)")] = False,
+) -> BuildResult:
+    """Build the Lean project and restart LSP. Use only if needed (e.g. new imports)."""
     if not lean_project_path:
         lean_project_path_obj = ctx.request_context.lifespan_context.lean_project_path
     else:
@@ -183,9 +216,13 @@ 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_file_contents`) before running `lean_build`."
+        raise LeanToolError(
+            "Lean project path not known yet. Provide `lean_project_path` explicitly or call another tool first."
+        )
+
+    output_lines: List[str] = []
+    errors: List[str] = []
 
-    build_output = ""
     try:
         client: LeanLSPClient = ctx.request_context.lifespan_context.client
         if client:
@@ -211,8 +248,6 @@ async def lsp_build(
             stderr=asyncio.subprocess.STDOUT,
         )
 
-        output_lines = []
-
         while True:
             line = await process.stdout.readline()
             if not line:
@@ -221,6 +256,10 @@ async def lsp_build(
             line_str = line.decode("utf-8", errors="replace").rstrip()
             output_lines.append(line_str)
 
+            # Collect error lines
+            if "error" in line_str.lower():
+                errors.append(line_str)
+
             # Parse progress: look for pattern like "[2/8]" or "[10/100]"
             match = re.search(r"\[(\d+)/(\d+)\]", line_str)
             if match:
@@ -228,13 +267,11 @@ async def lsp_build(
                 total_jobs = int(match.group(2))
 
                 # Extract what's being built
-                # Line format: "ℹ [2/8] Built TestLeanBuild.Basic (1.6s)"
                 desc_match = re.search(
                     r"\[\d+/\d+\]\s+(.+?)(?:\s+\(\d+\.?\d*[ms]+\))?$", line_str
                 )
                 description = desc_match.group(1) if desc_match else "Building"
 
-                # Report progress using dynamic totals from Lake
                 await ctx.report_progress(
                     progress=current_job, total=total_jobs, message=description
                 )
@@ -242,8 +279,12 @@ async def lsp_build(
         await process.wait()
 
         if process.returncode != 0:
-            build_output = "\n".join(output_lines)
-            raise Exception(f"Build failed with return code {process.returncode}")
+            return BuildResult(
+                success=False,
+                output="\n".join(output_lines),
+                errors=errors
+                or [f"Build failed with return code {process.returncode}"],
+            )
 
         # Start LSP client (without initial build since we just did it)
         with OutputCapture():
@@ -252,29 +293,34 @@ async def lsp_build(
             )
 
         logger.info("Built project and re-started LSP client")
-
         ctx.request_context.lifespan_context.client = client
-        build_output = "\n".join(output_lines)
-        return build_output
-    except Exception as e:
-        return f"Error during build:\n{str(e)}\n{build_output}"
 
+        return BuildResult(success=True, output="\n".join(output_lines), errors=[])
 
-# File level tools
-@mcp.tool("lean_file_contents")
-@deprecated
-def file_contents(ctx: Context, file_path: str, annotate_lines: bool = True) -> str:
-    """Get the text contents of a Lean file, optionally with line numbers.
-
-    Use sparingly (bloats context). Mainly when unsure about line numbers.
+    except Exception as e:
+        return BuildResult(
+            success=False,
+            output="\n".join(output_lines),
+            errors=[str(e)],
+        )
 
-    Args:
-        file_path (str): Abs path to Lean file
-        annotate_lines (bool, optional): Annotate lines with line numbers. Defaults to True.
 
-    Returns:
-        str: File content or error msg
-    """
+@mcp.tool(
+    "lean_file_contents",
+    annotations=ToolAnnotations(
+        title="File Contents (Deprecated)",
+        readOnlyHint=True,
+        idempotentHint=True,
+        openWorldHint=False,
+    ),
+)
+@deprecated
+def file_contents(
+    ctx: Context,
+    file_path: Annotated[str, Field(description="Absolute path to Lean file")],
+    annotate_lines: Annotated[bool, Field(description="Add line numbers")] = True,
+) -> str:
+    """DEPRECATED. Get file contents with optional line numbers."""
     # 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
@@ -297,53 +343,78 @@ def file_contents(ctx: Context, file_path: str, annotate_lines: bool = True) ->
         return data
 
 
-@mcp.tool("lean_file_outline")
-def file_outline(ctx: Context, file_path: str) -> str:
-    """Get a concise outline showing imports and declarations with type signatures (theorems, defs, classes, structures).
-
-    Highly useful and token-efficient. Slow-ish.
-
-    Args:
-        file_path (str): Abs path to Lean file
-
-    Returns:
-        str: Markdown formatted outline or error msg
-    """
+@mcp.tool(
+    "lean_file_outline",
+    annotations=ToolAnnotations(
+        title="File Outline",
+        readOnlyHint=True,
+        idempotentHint=True,
+        openWorldHint=False,
+    ),
+)
+def file_outline(
+    ctx: Context,
+    file_path: Annotated[str, Field(description="Absolute path to Lean file")],
+) -> FileOutline:
+    """Get imports and declarations with type signatures. Token-efficient."""
     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"
+        raise LeanToolError(
+            "Invalid Lean file path: Unable to start LSP server or load file"
+        )
 
     client: LeanLSPClient = ctx.request_context.lifespan_context.client
-    return generate_outline(client, rel_path)
+    return generate_outline_data(client, rel_path)
+
+
+def _to_diagnostic_messages(diagnostics: List[Dict]) -> List[DiagnosticMessage]:
+    result = []
+    for diag in diagnostics:
+        r = diag.get("fullRange", diag.get("range"))
+        if r is None:
+            continue
+        severity_int = diag.get("severity", 1)
+        result.append(
+            DiagnosticMessage(
+                severity=DIAGNOSTIC_SEVERITY.get(
+                    severity_int, f"unknown({severity_int})"
+                ),
+                message=diag.get("message", ""),
+                line=r["start"]["line"] + 1,
+                column=r["start"]["character"] + 1,
+            )
+        )
+    return result
 
 
-@mcp.tool("lean_diagnostic_messages")
+@mcp.tool(
+    "lean_diagnostic_messages",
+    annotations=ToolAnnotations(
+        title="Diagnostics",
+        readOnlyHint=True,
+        idempotentHint=True,
+        openWorldHint=False,
+    ),
+)
 def diagnostic_messages(
     ctx: Context,
-    file_path: str,
-    start_line: Optional[int] = None,
-    end_line: Optional[int] = None,
-    declaration_name: Optional[str] = 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). Filters from this line.
-        end_line (int, optional): End line (1-indexed). Filters to this line.
-        declaration_name (str, optional): Name of a specific theorem/lemma/definition.
-            If provided, only returns diagnostics within that declaration.
-            Takes precedence over start_line/end_line.
-            Slow, requires waiting for full file analysis.
-
-    Returns:
-        List[str] | str: Diagnostic msgs or error msg
-    """
+    file_path: Annotated[str, Field(description="Absolute path to Lean file")],
+    start_line: Annotated[
+        Optional[int], Field(description="Filter from line", ge=1)
+    ] = None,
+    end_line: Annotated[
+        Optional[int], Field(description="Filter to line", ge=1)
+    ] = None,
+    declaration_name: Annotated[
+        Optional[str], Field(description="Filter to declaration (slow)")
+    ] = None,
+) -> str:
+    """Get compiler diagnostics (errors, warnings, infos) for a Lean file."""
     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"
+        raise LeanToolError(
+            "Invalid Lean file path: Unable to start LSP server or load file"
+        )
 
     client: LeanLSPClient = ctx.request_context.lifespan_context.client
     client.open_file(rel_path)
@@ -352,7 +423,7 @@ def diagnostic_messages(
     if declaration_name:
         decl_range = get_declaration_range(client, rel_path, declaration_name)
         if decl_range is None:
-            return f"Declaration '{declaration_name}' not found in file. Check the name (case-sensitive) and try again."
+            raise LeanToolError(f"Declaration '{declaration_name}' not found in file.")
         start_line, end_line = decl_range
 
     # Convert 1-indexed to 0-indexed for leanclient
@@ -366,123 +437,144 @@ def diagnostic_messages(
         inactivity_timeout=15.0,
     )
 
-    return format_diagnostics(diagnostics)
-
-
-@mcp.tool("lean_goal")
-def goal(ctx: Context, file_path: str, line: int, column: Optional[int] = None) -> str:
-    """Get the proof goals (proof state) at a specific location in a Lean file.
+    return _to_json_array(_to_diagnostic_messages(diagnostics))
 
-    VERY USEFUL! Main tool to understand the proof state and its evolution!
-    Returns "no goals" if solved.
-    To see the goal at sorry, use the cursor before the "s".
-    Avoid giving a column if unsure-default behavior works well.
 
-    Args:
-        file_path (str): Abs path to Lean file
-        line (int): Line number (1-indexed)
-        column (int, optional): Column number (1-indexed). Defaults to None => Both before and after the line.
-
-    Returns:
-        str: Goal(s) or error msg
+@mcp.tool(
+    "lean_goal",
+    annotations=ToolAnnotations(
+        title="Proof Goals",
+        readOnlyHint=True,
+        idempotentHint=True,
+        openWorldHint=False,
+    ),
+)
+def goal(
+    ctx: Context,
+    file_path: Annotated[str, Field(description="Absolute path to Lean file")],
+    line: Annotated[int, Field(description="Line number (1-indexed)", ge=1)],
+    column: Annotated[
+        Optional[int],
+        Field(description="Column (1-indexed). Omit for before/after", ge=1),
+    ] = None,
+) -> GoalState:
+    """Get proof goals at a position. MOST IMPORTANT tool - use often!
+
+    Omit column to see goals_before (line start) and goals_after (line end),
+    showing how the tactic transforms the state. "no goals" = proof complete.
     """
     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"
+        raise LeanToolError(
+            "Invalid Lean file path: Unable to start LSP server or load file"
+        )
 
     client: LeanLSPClient = ctx.request_context.lifespan_context.client
     client.open_file(rel_path)
     content = client.get_file_content(rel_path)
+    lines = content.splitlines()
+
+    if line < 1 or line > len(lines):
+        raise LeanToolError(f"Line {line} out of range (file has {len(lines)} lines)")
+
+    line_context = lines[line - 1]
 
     if column is None:
-        lines = content.splitlines()
-        if line < 1 or line > len(lines):
-            return "Line number out of range. Try elsewhere?"
-        column_end = len(lines[line - 1])
+        column_end = len(line_context)
         column_start = next(
-            (i for i, c in enumerate(lines[line - 1]) if not c.isspace()), 0
+            (i for i, c in enumerate(line_context) if not c.isspace()), 0
         )
         goal_start = client.get_goal(rel_path, line - 1, column_start)
         goal_end = client.get_goal(rel_path, line - 1, column_end)
-
-        if goal_start is None and goal_end is None:
-            return f"No goals on line:\n{lines[line - 1]}\nTry another line?"
-
-        start_text = format_goal(goal_start, "No goals at line start.")
-        end_text = format_goal(goal_end, "No goals at line end.")
-        return f"Goals on line:\n{lines[line - 1]}\nBefore:\n{start_text}\nAfter:\n{end_text}"
-
+        before = format_goal(goal_start, None)
+        after = format_goal(goal_end, None)
+        goals = f"{before} → {after}" if before != after else after
+        return GoalState(line_context=line_context, goals=goals)
     else:
-        goal = client.get_goal(rel_path, line - 1, column - 1)
-        f_goal = format_goal(goal, "Not a valid goal position. Try elsewhere?")
-        f_line = format_line(content, line, column)
-        return f"Goals at:\n{f_line}\n{f_goal}"
+        goal_result = client.get_goal(rel_path, line - 1, column - 1)
+        return GoalState(
+            line_context=line_context, goals=format_goal(goal_result, None)
+        )
 
 
-@mcp.tool("lean_term_goal")
+@mcp.tool(
+    "lean_term_goal",
+    annotations=ToolAnnotations(
+        title="Term Goal",
+        readOnlyHint=True,
+        idempotentHint=True,
+        openWorldHint=False,
+    ),
+)
 def term_goal(
-    ctx: Context, file_path: str, line: int, column: Optional[int] = None
-) -> str:
-    """Get the expected type (term goal) at a specific location in a Lean file.
-
-    Args:
-        file_path (str): Abs path to Lean file
-        line (int): Line number (1-indexed)
-        column (int, optional): Column number (1-indexed). Defaults to None => end of line.
-
-    Returns:
-        str: Expected type or error msg
-    """
+    ctx: Context,
+    file_path: Annotated[str, Field(description="Absolute path to Lean file")],
+    line: Annotated[int, Field(description="Line number (1-indexed)", ge=1)],
+    column: Annotated[
+        Optional[int], Field(description="Column (defaults to end of line)", ge=1)
+    ] = None,
+) -> TermGoalState:
+    """Get the expected type at a position."""
     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"
+        raise LeanToolError(
+            "Invalid Lean file path: Unable to start LSP server or load file"
+        )
 
     client: LeanLSPClient = ctx.request_context.lifespan_context.client
     client.open_file(rel_path)
     content = client.get_file_content(rel_path)
+    lines = content.splitlines()
+
+    if line < 1 or line > len(lines):
+        raise LeanToolError(f"Line {line} out of range (file has {len(lines)} lines)")
+
+    line_context = lines[line - 1]
     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])
-
-    term_goal = client.get_term_goal(rel_path, line - 1, column - 1)
-    f_line = format_line(content, line, column)
-    if term_goal is None:
-        return f"Not a valid term goal position:\n{f_line}\nTry elsewhere?"
-    rendered = term_goal.get("goal", None)
-    if rendered is not None:
-        rendered = rendered.replace("```lean\n", "").replace("\n```", "")
-    return f"Term goal at:\n{f_line}\n{rendered or 'No term goal found.'}"
-
-
-@mcp.tool("lean_hover_info")
-def hover(ctx: Context, file_path: str, line: int, column: int) -> str:
-    """Get hover info (docs for syntax, variables, functions, etc.) at a specific location in a Lean file.
-
-    Args:
-        file_path (str): Abs path to Lean file
-        line (int): Line number (1-indexed)
-        column (int): Column number (1-indexed). Make sure to use the start or within the term, not the end.
-
-    Returns:
-        str: Hover info or error msg
-    """
+        column = len(line_context)
+
+    term_goal_result = client.get_term_goal(rel_path, line - 1, column - 1)
+    expected_type = None
+    if term_goal_result is not None:
+        rendered = term_goal_result.get("goal")
+        if rendered:
+            expected_type = rendered.replace("```lean\n", "").replace("\n```", "")
+
+    return TermGoalState(line_context=line_context, expected_type=expected_type)
+
+
+@mcp.tool(
+    "lean_hover_info",
+    annotations=ToolAnnotations(
+        title="Hover Info",
+        readOnlyHint=True,
+        idempotentHint=True,
+        openWorldHint=False,
+    ),
+)
+def hover(
+    ctx: Context,
+    file_path: Annotated[str, Field(description="Absolute path to Lean file")],
+    line: Annotated[int, Field(description="Line number (1-indexed)", ge=1)],
+    column: Annotated[int, Field(description="Column at START of identifier", ge=1)],
+) -> HoverInfo:
+    """Get type signature and docs for a symbol. Essential for understanding APIs."""
     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"
+        raise LeanToolError(
+            "Invalid Lean file path: Unable to start LSP server or load file"
+        )
 
     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)
-        return f"No hover information at position:\n{f_line}\nTry elsewhere?"
+        raise LeanToolError(f"No hover information at line {line}, column {column}")
 
     # Get the symbol and the hover information
     h_range = hover_info.get("range")
-    symbol = extract_range(file_content, h_range)
+    symbol = extract_range(file_content, h_range) or ""
     info = hover_info["contents"].get("value", "No hover information available.")
     info = info.replace("```lean\n", "").replace("\n```", "").strip()
 
@@ -490,45 +582,58 @@ def hover(ctx: Context, file_path: str, line: int, column: int) -> str:
     diagnostics = client.get_diagnostics(rel_path)
     filtered = filter_diagnostics_by_position(diagnostics, line - 1, column - 1)
 
-    msg = f"Hover info `{symbol}`:\n{info}"
-    if filtered:
-        msg += "\n\nDiagnostics\n" + "\n".join(format_diagnostics(filtered))
-    return msg
+    return HoverInfo(
+        symbol=symbol,
+        info=info,
+        diagnostics=_to_diagnostic_messages(filtered),
+    )
 
 
-@mcp.tool("lean_completions")
+@mcp.tool(
+    "lean_completions",
+    annotations=ToolAnnotations(
+        title="Completions",
+        readOnlyHint=True,
+        idempotentHint=True,
+        openWorldHint=False,
+    ),
+)
 def completions(
-    ctx: Context, file_path: str, line: int, column: int, max_completions: int = 32
+    ctx: Context,
+    file_path: Annotated[str, Field(description="Absolute path to Lean file")],
+    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:
-    """Get code completions at a location in a Lean file.
-
-    Only use this on INCOMPLETE lines/statements to check available identifiers and imports:
-    - Dot Completion: Displays relevant identifiers after a dot (e.g., `Nat.`, `x.`, or `Nat.ad`).
-    - Identifier Completion: Suggests matching identifiers after part of a name.
-    - Import Completion: Lists importable files after `import` at the beginning of a file.
-
-    Args:
-        file_path (str): Abs path to Lean file
-        line (int): Line number (1-indexed)
-        column (int): Column number (1-indexed)
-        max_completions (int, optional): Maximum number of completions to return. Defaults to 32
-
-    Returns:
-        str: List of possible completions or error msg
-    """
+    """Get IDE autocompletions. Use on INCOMPLETE code (after `.` or partial name)."""
     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"
+        raise LeanToolError(
+            "Invalid Lean file path: Unable to start LSP server or load file"
+        )
 
     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)
+    raw_completions = client.get_completions(rel_path, line - 1, column - 1)
+
+    # Convert to CompletionItem models
+    items: List[CompletionItem] = []
+    for c in raw_completions:
+        if "label" not in c:
+            continue
+        kind_int = c.get("kind")
+        kind_str = COMPLETION_KIND.get(kind_int) if kind_int else None
+        items.append(
+            CompletionItem(
+                label=c["label"],
+                kind=kind_str,
+                detail=c.get("detail"),
+            )
+        )
 
-    if not formatted:
-        return f"No completions at position:\n{f_line}\nTry elsewhere?"
+    if not items:
+        return "[]"
 
     # Find the sort term: The last word/identifier before the cursor
     lines = content.splitlines()
@@ -541,104 +646,102 @@ def completions(
     # Sort completions: prefix matches first, then contains, then alphabetical
     if prefix:
 
-        def sort_key(item):
-            item_lower = item.lower()
-            if item_lower.startswith(prefix):
-                return (0, item_lower)
-            elif prefix in item_lower:
-                return (1, item_lower)
+        def sort_key(item: CompletionItem):
+            label_lower = item.label.lower()
+            if label_lower.startswith(prefix):
+                return (0, label_lower)
+            elif prefix in label_lower:
+                return (1, label_lower)
             else:
-                return (2, item_lower)
+                return (2, label_lower)
 
-        formatted.sort(key=sort_key)
+        items.sort(key=sort_key)
     else:
-        formatted.sort(key=str.lower)
+        items.sort(key=lambda x: x.label.lower())
 
     # Truncate if too many results
-    if len(formatted) > max_completions:
-        remaining = len(formatted) - max_completions
-        formatted = formatted[:max_completions] + [
-            f"{remaining} more, keep typing to filter further"
-        ]
-    completions_text = "\n".join(formatted)
-    return f"Completions at:\n{f_line}\n{completions_text}"
-
-
-@mcp.tool("lean_declaration_file")
-def declaration_file(ctx: Context, file_path: str, symbol: str) -> str:
-    """Get the file contents where a symbol/lemma/class/structure is declared.
-
-    Note:
-        Symbol must be present in the file! Add if necessary!
-        Lean files can be large, use `lean_hover_info` before this tool.
+    return _to_json_array(items[:max_completions])
 
-    Args:
-        file_path (str): Abs path to Lean file
-        symbol (str): Symbol to look up the declaration for. Case sensitive!
 
-    Returns:
-        str: File contents or error msg
-    """
+@mcp.tool(
+    "lean_declaration_file",
+    annotations=ToolAnnotations(
+        title="Declaration Source",
+        readOnlyHint=True,
+        idempotentHint=True,
+        openWorldHint=False,
+    ),
+)
+def declaration_file(
+    ctx: Context,
+    file_path: Annotated[str, Field(description="Absolute path to Lean file")],
+    symbol: Annotated[
+        str, Field(description="Symbol (case sensitive, must be in file)")
+    ],
+) -> DeclarationInfo:
+    """Get file where a symbol is declared. Symbol must be present in file first."""
     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"
+        raise LeanToolError(
+            "Invalid Lean file path: Unable to start LSP server or load file"
+        )
 
     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,
+    # 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."
+        raise LeanToolError(
+            f"Symbol `{symbol}` (case sensitive) not found in file. Add it first."
+        )
 
     declaration = client.get_declarations(
         rel_path, position["line"], position["column"]
     )
 
     if len(declaration) == 0:
-        return f"No declaration available for `{symbol}`."
+        raise LeanToolError(f"No declaration available for `{symbol}`.")
 
     # Load the declaration file
-    declaration = declaration[0]
-    uri = declaration.get("targetUri")
-    if not uri:
-        uri = declaration.get("uri")
+    decl = declaration[0]
+    uri = decl.get("targetUri") or decl.get("uri")
 
     abs_path = client._uri_to_abs(uri)
     if not os.path.exists(abs_path):
-        return f"Could not open declaration file `{abs_path}` for `{symbol}`."
+        raise LeanToolError(
+            f"Could not open declaration file `{abs_path}` for `{symbol}`."
+        )
 
     file_content = get_file_contents(abs_path)
 
-    return f"Declaration of `{symbol}`:\n{file_content}"
+    return DeclarationInfo(file_path=str(abs_path), content=file_content)
 
 
-@mcp.tool("lean_multi_attempt")
+@mcp.tool(
+    "lean_multi_attempt",
+    annotations=ToolAnnotations(
+        title="Multi-Attempt",
+        readOnlyHint=True,
+        idempotentHint=True,
+        openWorldHint=False,
+    ),
+)
 def multi_attempt(
-    ctx: Context, file_path: str, line: int, snippets: List[str]
-) -> List[str] | str:
-    """Try multiple Lean code snippets at a line and get the goal state and diagnostics for each.
-
-    Use to compare tactics or approaches.
-    Use rarely-prefer direct file edits to keep users involved.
-    For a single snippet, edit the file and run `lean_diagnostic_messages` instead.
-
-    Note:
-        Only single-line, fully-indented snippets are supported.
-        Avoid comments for best results.
-
-    Args:
-        file_path (str): Abs path to Lean file
-        line (int): Line number (1-indexed)
-        snippets (List[str]): List of snippets (3+ are recommended)
-
-    Returns:
-        List[str] | str: Diagnostics and goal states or error msg
-    """
+    ctx: Context,
+    file_path: Annotated[str, Field(description="Absolute path to Lean file")],
+    line: Annotated[int, Field(description="Line number (1-indexed)", ge=1)],
+    snippets: Annotated[
+        List[str], Field(description="Tactics to try (3+ recommended)")
+    ],
+) -> str:
+    """Try multiple tactics without modifying file. Returns goal state for each."""
     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"
+        raise LeanToolError(
+            "Invalid Lean file path: Unable to start LSP server or load file"
+        )
 
     client: LeanLSPClient = ctx.request_context.lifespan_context.client
     client.open_file(rel_path)
@@ -646,7 +749,7 @@ def multi_attempt(
     try:
         client.open_file(rel_path)
 
-        results = []
+        results: List[AttemptResult] = []
         # Avoid mutating caller-provided snippets; normalize locally per attempt
         for snippet in snippets:
             snippet_str = snippet.rstrip("\n")
@@ -660,13 +763,19 @@ def multi_attempt(
             # 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))
+            filtered_diag = filter_diagnostics_by_position(diag, line - 1, None)
             # 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}")
+            goal_result = client.get_goal(rel_path, line - 1, len(snippet_str))
+            goal_state = format_goal(goal_result, None)
+            results.append(
+                AttemptResult(
+                    snippet=snippet_str,
+                    goal_state=goal_state,
+                    diagnostics=_to_diagnostic_messages(filtered_diag),
+                )
+            )
 
-        return results
+        return _to_json_array(results)
     finally:
         try:
             client.close_files([rel_path])
@@ -676,23 +785,26 @@ def multi_attempt(
             )
 
 
-@mcp.tool("lean_run_code")
-def run_code(ctx: Context, code: str) -> List[str] | str:
-    """Run a complete, self-contained code snippet and return diagnostics.
-
-    Has to include all imports and definitions!
-    Only use for testing outside open files! Keep the user in the loop by editing files instead.
-
-    Args:
-        code (str): Code snippet
-
-    Returns:
-        List[str] | str: Diagnostics msgs or error msg
-    """
+@mcp.tool(
+    "lean_run_code",
+    annotations=ToolAnnotations(
+        title="Run Code",
+        readOnlyHint=True,
+        idempotentHint=True,
+        openWorldHint=False,
+    ),
+)
+def run_code(
+    ctx: Context,
+    code: Annotated[str, Field(description="Self-contained Lean code with imports")],
+) -> RunResult:
+    """Run a code snippet and return diagnostics. Must include all imports."""
     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_file_contents`) first to set it up."
+        raise LeanToolError(
+            "No valid Lean project path found. Run another tool first to set it up."
+        )
 
     # Use a unique snippet filename to avoid collisions under concurrency
     rel_path = f"_mcp_snippet_{uuid.uuid4().hex}.lean"
@@ -702,12 +814,10 @@ def run_code(ctx: Context, code: str) -> List[str] | str:
         with open(abs_path, "w", encoding="utf-8") as f:
             f.write(code)
     except Exception as e:
-        return f"Error writing code snippet to file `{abs_path}`:\n{str(e)}"
+        raise LeanToolError(f"Error writing code snippet: {e}")
 
     client: LeanLSPClient | None = lifespan_context.client
-    diagnostics: List[str] | str = []
-    close_error: str | None = None
-    remove_error: str | None = None
+    raw_diagnostics: List[Dict] = []
     opened_file = False
 
     try:
@@ -715,62 +825,57 @@ def run_code(ctx: Context, code: str) -> List[str] | str:
             startup_client(ctx)
             client = lifespan_context.client
             if client is None:
-                return "Failed to initialize Lean client for run_code."
+                raise LeanToolError("Failed to initialize Lean client for run_code.")
 
-        assert client is not None  # startup_client guarantees an initialized client
+        assert client is not None
         client.open_file(rel_path)
         opened_file = True
-        diagnostics = format_diagnostics(
-            client.get_diagnostics(rel_path, inactivity_timeout=15.0)
-        )
+        raw_diagnostics = client.get_diagnostics(rel_path, inactivity_timeout=15.0)
     finally:
         if opened_file:
             try:
                 client.close_files([rel_path])
-            except Exception as exc:  # pragma: no cover - close failures only logged
-                close_error = str(exc)
+            except Exception as exc:
                 logger.warning("Failed to close `%s` after run_code: %s", rel_path, exc)
         try:
             os.remove(abs_path)
         except FileNotFoundError:
             pass
         except Exception as e:
-            remove_error = str(e)
             logger.warning(
                 "Failed to remove temporary Lean snippet `%s`: %s", abs_path, e
             )
 
-    if remove_error:
-        return f"Error removing temporary file `{abs_path}`:\n{remove_error}"
-    if close_error:
-        return f"Error closing temporary Lean document `{rel_path}`:\n{close_error}"
-
-    return (
-        diagnostics
-        if diagnostics
-        else "No diagnostics found for the code snippet (compiled successfully)."
-    )
+    diagnostics = _to_diagnostic_messages(raw_diagnostics)
+    has_errors = any(d.severity == "error" for d in diagnostics)
 
+    return RunResult(success=not has_errors, diagnostics=diagnostics)
 
-@mcp.tool("lean_local_search")
-def local_search(
-    ctx: Context, query: str, limit: int = 10, project_root: str | None = None
-) -> List[Dict[str, str]] | str:
-    """Confirm declarations exist in the current workspace to prevent hallucinating APIs.
 
-    VERY USEFUL AND FAST!
-    Pass a short prefix (e.g. ``map_mul``); the metadata shows the declaration kind and file.
-    The index spans theorems, lemmas, defs, classes, instances, structures, inductives, abbrevs, and opaque decls.
+class LocalSearchError(Exception):
+    pass
 
-    Args:
-        query (str): Declaration name or prefix.
-        limit (int): Max matches to return (default 10).
 
-    Returns:
-        List[Dict[str, str]] | str: Matches as ``{"name", "kind", "file"}`` or error message.
-    """
+@mcp.tool(
+    "lean_local_search",
+    annotations=ToolAnnotations(
+        title="Local Search",
+        readOnlyHint=True,
+        idempotentHint=True,
+        openWorldHint=False,
+    ),
+)
+def local_search(
+    ctx: Context,
+    query: Annotated[str, Field(description="Declaration name or prefix")],
+    limit: Annotated[int, Field(description="Max matches", ge=1)] = 10,
+    project_root: Annotated[
+        Optional[str], Field(description="Project root (inferred if omitted)")
+    ] = None,
+) -> str:
+    """Fast local search to verify declarations exist. Use BEFORE trying a lemma name."""
     if not _RG_AVAILABLE:
-        return _RG_MESSAGE
+        raise LocalSearchError(_RG_MESSAGE)
 
     lifespan = ctx.request_context.lifespan_context
     stored_root = lifespan.lean_project_path
@@ -778,92 +883,101 @@ def local_search(
     if project_root:
         try:
             resolved_root = Path(project_root).expanduser().resolve()
-        except OSError as exc:  # pragma: no cover - defensive path handling
-            return f"Invalid project root '{project_root}': {exc}"
+        except OSError as exc:
+            raise LocalSearchError(f"Invalid project root '{project_root}': {exc}")
         if not resolved_root.exists():
-            return f"Project root '{project_root}' does not exist."
+            raise LocalSearchError(f"Project root '{project_root}' does not exist.")
         lifespan.lean_project_path = resolved_root
     else:
         resolved_root = stored_root
 
     if resolved_root is None:
-        return "Lean project path not set. Call a file-based tool (like lean_file_contents) first to set the project path."
+        raise LocalSearchError(
+            "Lean project path not set. Call a file-based tool first."
+        )
 
     try:
-        return lean_local_search(
+        raw_results = lean_local_search(
             query=query.strip(), limit=limit, project_root=resolved_root
         )
+        results = [
+            LocalSearchResult(name=r["name"], kind=r["kind"], file=r["file"])
+            for r in raw_results
+        ]
+        return _to_json_array(results)
     except RuntimeError as exc:
-        return f"lean_local_search error:\n{exc}"
+        raise LocalSearchError(f"Search failed: {exc}")
 
 
-@mcp.tool("lean_leansearch")
+@mcp.tool(
+    "lean_leansearch",
+    annotations=ToolAnnotations(
+        title="LeanSearch",
+        readOnlyHint=True,
+        idempotentHint=True,
+        openWorldHint=True,
+    ),
+)
 @rate_limited("leansearch", max_requests=3, per_seconds=30)
-def leansearch(ctx: Context, query: str, num_results: int = 5) -> List[Dict] | str:
-    """Search for Lean theorems, definitions, and tactics using leansearch.net.
-
-    Query patterns:
-      - Natural language: "If there exist injective maps of sets from A to B and from B to A, then there exists a bijective map between A and B."
-      - Mixed natural/Lean: "natural numbers. from: n < m, to: n + 1 < m + 1", "n + 1 <= m if n < m"
-      - Concept names: "Cauchy Schwarz"
-      - Lean identifiers: "List.sum", "Finset induction"
-      - Lean term: "{f : A → B} {g : B → A} (hf : Injective f) (hg : Injective g) : ∃ h, Bijective h"
-
-    Args:
-        query (str): Search query
-        num_results (int, optional): Max results. Defaults to 5.
-
-    Returns:
-        List[Dict] | str: Search results or error msg
-    """
-    try:
-        headers = {"User-Agent": "lean-lsp-mcp/0.1", "Content-Type": "application/json"}
-        payload = orjson.dumps({"num_results": str(num_results), "query": [query]})
-
-        req = urllib.request.Request(
-            "https://leansearch.net/search",
-            data=payload,
-            headers=headers,
-            method="POST",
-        )
-
-        with urllib.request.urlopen(req, timeout=20) as response:
-            results = orjson.loads(response.read())
-
-        if not results or not results[0]:
-            return "No results found."
-        results = results[0][:num_results]
-        results = [r["result"] for r in results]
-
-        for result in results:
-            result.pop("docstring")
-            result["module_name"] = ".".join(result["module_name"])
-            result["name"] = ".".join(result["name"])
-
-        return results
-    except Exception as e:
-        return f"leansearch error:\n{str(e)}"
+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:
+    """Search Mathlib via leansearch.net using natural language.
 
+    Examples: "sum of two even numbers is even", "Cauchy-Schwarz inequality",
+    "{f : A → B} (hf : Injective f) : ∃ g, LeftInverse g f"
+    """
+    headers = {"User-Agent": "lean-lsp-mcp/0.1", "Content-Type": "application/json"}
+    payload = orjson.dumps({"num_results": str(num_results), "query": [query]})
+
+    req = urllib.request.Request(
+        "https://leansearch.net/search",
+        data=payload,
+        headers=headers,
+        method="POST",
+    )
 
-@mcp.tool("lean_loogle")
-async def loogle(ctx: Context, query: str, num_results: int = 8) -> List[dict] | str:
-    """Search for definitions and theorems using loogle.
+    with urllib.request.urlopen(req, timeout=20) as response:
+        results = orjson.loads(response.read())
 
-    Query patterns:
-      - By constant: Real.sin  # finds lemmas mentioning Real.sin
-      - By lemma name: "differ"  # finds lemmas with "differ" in the name
-      - By subexpression: _ * (_ ^ _)  # finds lemmas with a product and power
-      - Non-linear: Real.sqrt ?a * Real.sqrt ?a
-      - By type shape: (?a -> ?b) -> List ?a -> List ?b
-      - By conclusion: |- tsum _ = _ * tsum _
-      - By conclusion w/hyps: |- _ < _ → tsum _ < tsum _
+    if not results or not results[0]:
+        return "[]"
 
-    Args:
-        query (str): Search query
-        num_results (int, optional): Max results. Defaults to 8.
+    raw_results = [r["result"] for r in results[0][:num_results]]
+    items = [
+        LeanSearchResult(
+            name=".".join(r["name"]),
+            module_name=".".join(r["module_name"]),
+            kind=r.get("kind"),
+            type=r.get("type"),
+        )
+        for r in raw_results
+    ]
+    return _to_json_array(items)
+
+
+@mcp.tool(
+    "lean_loogle",
+    annotations=ToolAnnotations(
+        title="Loogle",
+        readOnlyHint=True,
+        idempotentHint=True,
+        openWorldHint=True,
+    ),
+)
+async def loogle(
+    ctx: Context,
+    query: Annotated[
+        str, Field(description="Type pattern, constant, or name substring")
+    ],
+    num_results: Annotated[int, Field(description="Max results", ge=1)] = 8,
+) -> str:
+    """Search Mathlib by type signature via loogle.lean-lang.org.
 
-    Returns:
-        List[dict] | str: Search results or error msg
+    Examples: `Real.sin`, `"comm"`, `(?a → ?b) → List ?a → List ?b`,
+    `_ * (_ ^ _)`, `|- _ < _ → _ + 1 < _ + 1`
     """
     app_ctx: AppContext = ctx.request_context.lifespan_context
 
@@ -871,9 +985,17 @@ async def loogle(ctx: Context, query: str, num_results: int = 8) -> List[dict] |
     if app_ctx.loogle_local_available and app_ctx.loogle_manager:
         try:
             results = await app_ctx.loogle_manager.query(query, num_results)
-            for result in results:
-                result.pop("doc", None)
-            return results if results else "No results found."
+            if not results:
+                return "No results found."
+            items = [
+                LoogleResult(
+                    name=r.get("name", ""),
+                    type=r.get("type", ""),
+                    module=r.get("module", ""),
+                )
+                for r in results
+            ]
+            return _to_json_array(items)
         except Exception as e:
             logger.warning(f"Local loogle failed: {e}, falling back to remote")
 
@@ -885,142 +1007,145 @@ async def loogle(ctx: Context, query: str, num_results: int = 8) -> List[dict] |
         return "Rate limit exceeded: 3 requests per 30s. Use --loogle-local to avoid limits."
     rate_limit.append(now)
 
-    return loogle_remote(query, num_results)
+    result = loogle_remote(query, num_results)
+    if isinstance(result, str):
+        return result  # Error message
+    return _to_json_array(result)
 
 
-@mcp.tool("lean_leanfinder")
+@mcp.tool(
+    "lean_leanfinder",
+    annotations=ToolAnnotations(
+        title="Lean Finder",
+        readOnlyHint=True,
+        idempotentHint=True,
+        openWorldHint=True,
+    ),
+)
 @rate_limited("leanfinder", max_requests=10, per_seconds=30)
-def leanfinder(ctx: Context, query: str, num_results: int = 5) -> List[Dict] | str:
-    """Search Mathlib theorems/definitions semantically by mathematical concept or proof state using Lean Finder.
-
-    Effective query types:
-    - Natural language mathematical statement: "For any natural numbers n and m, the sum n+m is equal to m+n."
-    - Natural language questions: "I'm working with algebraic elements over a field extension … Does this imply that the minimal polynomials of x and y are equal?"
-    - Proof state. For better results, enter a proof state followed by how you want to transform the proof state.
-    - Statement definition: Fragment or the whole statement definition.
-
-    Tips: Multiple targeted queries beat one complex query.
-
-    Args:
-        query (str): Mathematical concept or proof state
-        num_results (int, optional): Max results. Defaults to 5.
+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:
+    """Semantic search by mathematical meaning via Lean Finder.
 
-    Returns:
-        List[Dict] | str: List of Lean statement objects (full name, formal statement, informal statement) or error msg
+    Examples: "commutativity of addition on natural numbers",
+    "I have h : n < m and need n + 1 < m + 1", proof state text.
     """
-    try:
-        headers = {"User-Agent": "lean-lsp-mcp/0.1", "Content-Type": "application/json"}
-        request_url = (
-            "https://bxrituxuhpc70w8w.us-east-1.aws.endpoints.huggingface.cloud"
-        )
-        payload = orjson.dumps({"inputs": query, "top_k": int(num_results)})
-        req = urllib.request.Request(
-            request_url, data=payload, headers=headers, method="POST"
-        )
+    headers = {"User-Agent": "lean-lsp-mcp/0.1", "Content-Type": "application/json"}
+    request_url = "https://bxrituxuhpc70w8w.us-east-1.aws.endpoints.huggingface.cloud"
+    payload = orjson.dumps({"inputs": query, "top_k": int(num_results)})
+    req = urllib.request.Request(
+        request_url, data=payload, headers=headers, method="POST"
+    )
 
-        results = []
-        with urllib.request.urlopen(req, timeout=30) as response:
-            data = orjson.loads(response.read())
-            for result in data["results"]:
-                if (
-                    "https://leanprover-community.github.io/mathlib4_docs"
-                    not in result["url"]
-                ):  # Do not include results from other sources other than mathlib4, since users might not have imported them
-                    continue
-                full_name = re.search(r"pattern=(.*?)#doc", result["url"]).group(1)
-                obj = {
-                    "full_name": full_name,
-                    "formal_statement": result["formal_statement"],
-                    "informal_statement": result["informal_statement"],
-                }
-                results.append(obj)
-
-        return results if results else "Lean Finder: No results parsed"
-    except Exception as e:
-        return f"Lean Finder Error:\n{str(e)}"
+    results: List[LeanFinderResult] = []
+    with urllib.request.urlopen(req, timeout=30) as response:
+        data = orjson.loads(response.read())
+        for result in data["results"]:
+            if (
+                "https://leanprover-community.github.io/mathlib4_docs"
+                not in result["url"]
+            ):  # Only include mathlib4 results
+                continue
+            match = re.search(r"pattern=(.*?)#doc", result["url"])
+            if match:
+                results.append(
+                    LeanFinderResult(
+                        full_name=match.group(1),
+                        formal_statement=result["formal_statement"],
+                        informal_statement=result["informal_statement"],
+                    )
+                )
+
+    return _to_json_array(results)
 
 
-@mcp.tool("lean_state_search")
+@mcp.tool(
+    "lean_state_search",
+    annotations=ToolAnnotations(
+        title="State Search",
+        readOnlyHint=True,
+        idempotentHint=True,
+        openWorldHint=True,
+    ),
+)
 @rate_limited("lean_state_search", max_requests=3, per_seconds=30)
 def state_search(
-    ctx: Context, file_path: str, line: int, column: int, num_results: int = 5
-) -> List | str:
-    """Search for theorems based on proof state using premise-search.com.
-
-    Only uses first goal if multiple.
-
-    Args:
-        file_path (str): Abs path to Lean file
-        line (int): Line number (1-indexed)
-        column (int): Column number (1-indexed)
-        num_results (int, optional): Max results. Defaults to 5.
-
-    Returns:
-        List | str: Search results or error msg
-    """
+    ctx: Context,
+    file_path: Annotated[str, Field(description="Absolute path to Lean file")],
+    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:
+    """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:
-        return "Invalid Lean file path: Unable to start LSP server or load file"
+        raise LeanToolError(
+            "Invalid Lean file path: Unable to start LSP server or load file"
+        )
 
     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)
     if not goal or not goal.get("goals"):
-        return f"No goals found:\n{f_line}\nTry elsewhere?"
+        raise LeanToolError(
+            f"No goals found at line {line}, column {column}. Try a different position or check if the proof is complete."
+        )
 
-    goal = urllib.parse.quote(goal["goals"][0])
+    goal_str = urllib.parse.quote(goal["goals"][0])
 
-    try:
-        url = os.getenv("LEAN_STATE_SEARCH_URL", "https://premise-search.com")
-        req = urllib.request.Request(
-            f"{url}/api/search?query={goal}&results={num_results}&rev=v4.22.0",
-            headers={"User-Agent": "lean-lsp-mcp/0.1"},
-            method="GET",
-        )
+    url = os.getenv("LEAN_STATE_SEARCH_URL", "https://premise-search.com")
+    req = urllib.request.Request(
+        f"{url}/api/search?query={goal_str}&results={num_results}&rev=v4.22.0",
+        headers={"User-Agent": "lean-lsp-mcp/0.1"},
+        method="GET",
+    )
 
-        with urllib.request.urlopen(req, timeout=20) as response:
-            results = orjson.loads(response.read())
+    with urllib.request.urlopen(req, timeout=20) as response:
+        results = orjson.loads(response.read())
 
-        for result in results:
-            result.pop("rev")
-        # Very dirty type mix
-        results.insert(0, f"Results for line:\n{f_line}")
-        return results
-    except Exception as e:
-        return f"lean state search error:\n{str(e)}"
+    items = [StateSearchResult(name=r["name"]) for r in results]
+    return _to_json_array(items)
 
 
-@mcp.tool("lean_hammer_premise")
+@mcp.tool(
+    "lean_hammer_premise",
+    annotations=ToolAnnotations(
+        title="Hammer Premises",
+        readOnlyHint=True,
+        idempotentHint=True,
+        openWorldHint=True,
+    ),
+)
 @rate_limited("hammer_premise", max_requests=3, per_seconds=30)
 def hammer_premise(
-    ctx: Context, file_path: str, line: int, column: int, num_results: int = 32
-) -> List[str] | str:
-    """Search for premises based on proof state using the lean hammer premise search.
-
-    Args:
-        file_path (str): Abs path to Lean file
-        line (int): Line number (1-indexed)
-        column (int): Column number (1-indexed)
-        num_results (int, optional): Max results. Defaults to 32.
-
-    Returns:
-        List[str] | str: List of relevant premises or error message
+    ctx: Context,
+    file_path: Annotated[str, Field(description="Absolute path to Lean file")],
+    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:
+    """Get premise suggestions for automation tactics at a goal position.
+
+    Returns lemma names to try with `simp only [...]`, `aesop`, or as hints.
     """
     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"
+        raise LeanToolError(
+            "Invalid Lean file path: Unable to start LSP server or load file"
+        )
 
     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)
     if not goal or not goal.get("goals"):
-        return f"No goals found:\n{f_line}\nTry elsewhere?"
+        raise LeanToolError(
+            f"No goals found at line {line}, column {column}. Try a different position or check if the proof is complete."
+        )
 
     data = {
         "state": goal["goals"][0],
@@ -1028,26 +1153,22 @@ def hammer_premise(
         "k": num_results,
     }
 
-    try:
-        url = os.getenv("LEAN_HAMMER_URL", "http://leanpremise.net")
-        req = urllib.request.Request(
-            url + "/retrieve",
-            headers={
-                "User-Agent": "lean-lsp-mcp/0.1",
-                "Content-Type": "application/json",
-            },
-            method="POST",
-            data=orjson.dumps(data),
-        )
+    url = os.getenv("LEAN_HAMMER_URL", "http://leanpremise.net")
+    req = urllib.request.Request(
+        url + "/retrieve",
+        headers={
+            "User-Agent": "lean-lsp-mcp/0.1",
+            "Content-Type": "application/json",
+        },
+        method="POST",
+        data=orjson.dumps(data),
+    )
 
-        with urllib.request.urlopen(req, timeout=20) as response:
-            results = orjson.loads(response.read())
+    with urllib.request.urlopen(req, timeout=20) as response:
+        results = orjson.loads(response.read())
 
-        results = [result["name"] for result in results]
-        results.insert(0, f"Results for line:\n{f_line}")
-        return results
-    except Exception as e:
-        return f"lean hammer premise error:\n{str(e)}"
+    items = [PremiseResult(name=r["name"]) for r in results]
+    return _to_json_array(items)
 
 
 if __name__ == "__main__":