invar-tools 1.10.0__py3-none-any.whl → 1.11.0__py3-none-any.whl

invar/mcp/server.py

@@ -4,54 +4,33 @@ Invar MCP Server implementation.
 Exposes invar guard, sig, and map as first-class MCP tools.
 Part of DX-16: Agent Tool Enforcement.
 DX-52: Added Phase 2 smart re-spawn for project Python compatibility.
+DX-76: Added doc_toc, doc_read, doc_find for structured document queries.
 """
 
 from __future__ import annotations
 
-import json
 import os
-import subprocess
-import sys
 from pathlib import Path
 from typing import Any
 
 from mcp.server import Server
 from mcp.types import TextContent, Tool
 
+from invar.mcp.handlers import (
+    _run_doc_delete,
+    _run_doc_find,
+    _run_doc_insert,
+    _run_doc_read,
+    _run_doc_read_many,
+    _run_doc_replace,
+    _run_doc_toc,
+    _run_guard,
+    _run_map,
+    _run_sig,
+)
 from invar.shell.subprocess_env import should_respawn
 
-
-# @invar:allow shell_result: Pure validation helper, no I/O, returns tuple not Result
-# @shell_complexity: Security validation requires multiple checks
-def _validate_path(path: str) -> tuple[bool, str]:
-    """Validate path argument for safety.
-
-    Returns (is_valid, error_message).
-    Rejects paths that could be interpreted as shell commands or flags.
-    """
-    if not path:
-        return True, ""  # Empty path defaults to "." in handlers
-
-    # Reject if looks like a flag (starts with -)
-    if path.startswith("-"):
-        return False, f"Invalid path: cannot start with '-': {path}"
-
-    # Reject shell metacharacters that could cause issues
-    dangerous_chars = [";", "&", "|", "$", "`", "\n", "\r"]
-    for char in dangerous_chars:
-        if char in path:
-            return False, f"Invalid path: contains forbidden character: {char!r}"
-
-    # Try to resolve path - this catches malformed paths
-    try:
-        Path(path).resolve()
-    except (OSError, ValueError) as e:
-        return False, f"Invalid path: {e}"
-
-    return True, ""
-
-
-# Strong instructions for agent behavior (DX-16 + DX-17 + DX-26)
+# Strong instructions for agent behavior (DX-16 + DX-17 + DX-26 + DX-76)
 INVAR_INSTRUCTIONS = """
 ## Invar Tool Usage (MANDATORY)
 
@@ -77,6 +56,26 @@ Then read `.invar/examples/` and `.invar/context.md` for project context.
 | Symbolic verification | `Bash("crosshair ...")` | `invar_guard` (included by default) |
 | Understand file structure | `Read` entire .py file | `invar_sig` |
 | Find entry points | `Grep` for "def " | `invar_map` |
+| View document structure | `Read` entire .md file | `invar_doc_toc` |
+| Read document section | `Read` with manual line counting | `invar_doc_read` |
+| Read multiple sections | Multiple `invar_doc_read` calls | `invar_doc_read_many` |
+| Find sections by pattern | `Grep` in markdown files | `invar_doc_find` |
+
+### Document Tools (DX-76)
+
+| I want to... | Use |
+|--------------|-----|
+| View document structure | `invar_doc_toc(file="path.md")` |
+| Read specific section | `invar_doc_read(file="path.md", section="slug")` |
+| Read multiple sections | `invar_doc_read_many(file="path.md", sections=["slug1", "slug2"])` |
+| Search sections by title | `invar_doc_find(file="path.md", pattern="*auth*")` |
+| Replace section content | `invar_doc_replace(file="path.md", section="slug", content="...")` |
+| Insert new section | `invar_doc_insert(file="path.md", anchor="slug", content="...")` |
+| Delete section | `invar_doc_delete(file="path.md", section="slug")` |
+
+**Section addressing:** slug path (`requirements/auth`), fuzzy (`auth`), index (`#0/#1`), line (`@48`)
+
+**Workflow:** ALWAYS call `invar_doc_toc` first to understand document structure before editing.
 
 ### Common Mistakes to AVOID
 
@@ -86,6 +85,8 @@ Then read `.invar/examples/` and `.invar/context.md` for project context.
 ❌ `Read("src/foo.py")` just to see signatures - Use invar_sig instead
 ❌ `Grep` for function definitions - Use invar_map instead
 ❌ `Bash("invar guard ...")` - Use invar_guard MCP tool instead
+❌ `Read("docs/file.md")` to understand structure - Use invar_doc_toc instead
+❌ `Grep` in markdown files - Use invar_doc_find instead
 
 ### Task Completion
 
@@ -99,6 +100,7 @@ A task is complete ONLY when:
 1. **invar_guard** = Smart Guard (static + doctests + CrossHair + Hypothesis)
 2. **invar_sig** shows @pre/@post contracts that Read misses
 3. **invar_map** includes reference counts for importance ranking
+4. **invar_doc_toc** shows document structure that Read doesn't parse
 
 ### Correct Usage Examples
 
@@ -112,6 +114,12 @@ invar_guard(changed=true)
 
 # Understand a file's structure
 invar_sig(target="src/invar/core/parser.py")
+
+# Understand a document's structure
+invar_doc_toc(file="docs/proposals/DX-76.md")
+
+# Read specific section
+invar_doc_read(file="docs/proposals/DX-76.md", section="phase-a")
 ```
 
 IMPORTANT: Using Bash commands for Invar operations bypasses
@@ -125,6 +133,7 @@ def _get_guard_tool() -> Tool:
     """Define the invar_guard tool."""
     return Tool(
         name="invar_guard",
+        title="Smart Guard",
         description=(
             "Smart Guard: Verify code quality with static analysis + doctests. "
             "Use this INSTEAD of Bash('pytest ...') or Bash('crosshair ...'). "
@@ -149,6 +158,7 @@ def _get_sig_tool() -> Tool:
     """Define the invar_sig tool."""
     return Tool(
         name="invar_sig",
+        title="Show Signatures",
         description=(
             "Show function signatures and contracts (@pre/@post). "
             "Use this INSTEAD of Read('file.py') when you want to understand structure."
@@ -169,6 +179,7 @@ def _get_map_tool() -> Tool:
     """Define the invar_map tool."""
     return Tool(
         name="invar_map",
+        title="Symbol Map",
         description=(
             "Symbol map with reference counts. "
             "Use this INSTEAD of Grep for 'def ' to find functions."
@@ -183,6 +194,217 @@ def _get_map_tool() -> Tool:
     )
 
 
+# DX-76: Document query tools
+# @shell_orchestration: MCP tool factory - creates Tool objects
+# @invar:allow shell_result: MCP tool factory for doc_toc command
+def _get_doc_toc_tool() -> Tool:
+    """Define the invar_doc_toc tool."""
+    return Tool(
+        name="invar_doc_toc",
+        title="Markdown TOC",
+        description=(
+            "Extract document structure (Table of Contents) from markdown files. "
+            "Shows headings hierarchy with line numbers and character counts. "
+            "Use this INSTEAD of Read() to understand markdown structure."
+        ),
+        inputSchema={
+            "type": "object",
+            "properties": {
+                "file": {"type": "string", "description": "Path to markdown file"},
+                "depth": {
+                    "type": "integer",
+                    "description": "Maximum heading depth to include (1-6)",
+                    "default": 6,
+                },
+            },
+            "required": ["file"],
+        },
+    )
+
+
+# @shell_orchestration: MCP tool factory - creates Tool objects
+# @invar:allow shell_result: MCP tool factory for doc_read command
+def _get_doc_read_tool() -> Tool:
+    """Define the invar_doc_read tool."""
+    return Tool(
+        name="invar_doc_read",
+        title="Read Markdown Section",
+        description=(
+            "Read a specific section from a markdown document. "
+            "Supports multiple addressing formats: slug path, fuzzy match, "
+            "index (#0/#1), or line anchor (@48). "
+            "Use this INSTEAD of Read() with manual line counting."
+        ),
+        inputSchema={
+            "type": "object",
+            "properties": {
+                "file": {"type": "string", "description": "Path to markdown file"},
+                "section": {
+                    "type": "string",
+                    "description": (
+                        "Section path: slug ('requirements/auth'), "
+                        "fuzzy ('auth'), index ('#0/#1'), or line ('@48')"
+                    ),
+                },
+            },
+            "required": ["file", "section"],
+        },
+    )
+
+
+# @shell_orchestration: MCP tool factory - creates Tool objects
+# @invar:allow shell_result: MCP tool factory for doc_read_many command
+def _get_doc_read_many_tool() -> Tool:
+    """Define the invar_doc_read_many tool."""
+    return Tool(
+        name="invar_doc_read_many",
+        title="Read Multiple Markdown Sections",
+        description=(
+            "Read multiple sections from a markdown document in one call. "
+            "Reduces tool calls by batching section reads. "
+            "Use this INSTEAD of multiple invar_doc_read() calls."
+        ),
+        inputSchema={
+            "type": "object",
+            "properties": {
+                "file": {"type": "string", "description": "Path to markdown file"},
+                "sections": {
+                    "type": "array",
+                    "items": {"type": "string"},
+                    "description": (
+                        "List of section paths (slug, fuzzy, index, or line anchor)"
+                    ),
+                },
+                "include_children": {
+                    "type": "boolean",
+                    "description": "Include child sections in output",
+                    "default": True,
+                },
+            },
+            "required": ["file", "sections"],
+        },
+    )
+
+
+# @shell_orchestration: MCP tool factory - creates Tool objects
+# @invar:allow shell_result: MCP tool factory for doc_find command
+def _get_doc_find_tool() -> Tool:
+    """Define the invar_doc_find tool."""
+    return Tool(
+        name="invar_doc_find",
+        title="Find Markdown Sections",
+        description=(
+            "Find sections in markdown documents matching a pattern. "
+            "Supports glob patterns for titles and optional content search. "
+            "Use this INSTEAD of Grep in markdown files."
+        ),
+        inputSchema={
+            "type": "object",
+            "properties": {
+                "file": {"type": "string", "description": "Path to markdown file"},
+                "pattern": {
+                    "type": "string",
+                    "description": "Title pattern (glob-style, e.g., '*auth*')",
+                },
+                "content": {
+                    "type": "string",
+                    "description": "Optional content search pattern",
+                },
+            },
+            "required": ["file", "pattern"],
+        },
+    )
+
+
+# DX-76 Phase A-2: Extended editing tools
+# @shell_orchestration: MCP tool factory - creates Tool objects
+# @invar:allow shell_result: MCP tool factory for doc_replace command
+def _get_doc_replace_tool() -> Tool:
+    """Define the invar_doc_replace tool."""
+    return Tool(
+        name="invar_doc_replace",
+        title="Replace Markdown Section",
+        description=(
+            "Replace a section's content in a markdown document. "
+            "Use this INSTEAD of Edit()/Write() for section replacement."
+        ),
+        inputSchema={
+            "type": "object",
+            "properties": {
+                "file": {"type": "string", "description": "Path to markdown file"},
+                "section": {
+                    "type": "string",
+                    "description": "Section path to replace (slug, fuzzy, index, or line anchor)",
+                },
+                "content": {"type": "string", "description": "New content to replace the section with"},
+                "keep_heading": {
+                    "type": "boolean",
+                    "description": "If true, preserve the original heading line",
+                    "default": True,
+                },
+            },
+            "required": ["file", "section", "content"],
+        },
+    )
+
+
+# @shell_orchestration: MCP tool factory - creates Tool objects
+# @invar:allow shell_result: MCP tool factory for doc_insert command
+def _get_doc_insert_tool() -> Tool:
+    """Define the invar_doc_insert tool."""
+    return Tool(
+        name="invar_doc_insert",
+        title="Insert Markdown Section",
+        description=(
+            "Insert new content relative to a section in a markdown document. "
+            "Use this INSTEAD of Edit()/Write() for section insertion."
+        ),
+        inputSchema={
+            "type": "object",
+            "properties": {
+                "file": {"type": "string", "description": "Path to markdown file"},
+                "anchor": {
+                    "type": "string",
+                    "description": "Section path for the anchor (slug, fuzzy, index, or line anchor)",
+                },
+                "content": {"type": "string", "description": "Content to insert (include heading if new section)"},
+                "position": {
+                    "type": "string",
+                    "description": "Where to insert: 'before', 'after', 'first_child', 'last_child'",
+                    "default": "after",
+                    "enum": ["before", "after", "first_child", "last_child"],
+                },
+            },
+            "required": ["file", "anchor", "content"],
+        },
+    )
+
+
+# @shell_orchestration: MCP tool factory - creates Tool objects
+# @invar:allow shell_result: MCP tool factory for doc_delete command
+def _get_doc_delete_tool() -> Tool:
+    """Define the invar_doc_delete tool."""
+    return Tool(
+        name="invar_doc_delete",
+        title="Delete Markdown Section",
+        description=(
+            "Delete a section from a markdown document. "
+            "Use this INSTEAD of Edit()/Write() for section deletion."
+        ),
+        inputSchema={
+            "type": "object",
+            "properties": {
+                "file": {"type": "string", "description": "Path to markdown file"},
+                "section": {
+                    "type": "string",
+                    "description": "Section path to delete (slug, fuzzy, index, or line anchor)",
+                },
+            },
+            "required": ["file", "section"],
+        },
+    )
+
+
 # @shell_orchestration: MCP server setup - registers handlers with framework
 # @invar:allow shell_result: MCP framework API returns Server
 def create_server() -> Server:
@@ -191,11 +413,37 @@ def create_server() -> Server:
 
     @server.list_tools()
     async def list_tools() -> list[Tool]:
-        return [_get_guard_tool(), _get_sig_tool(), _get_map_tool()]
+        return [
+            _get_guard_tool(),
+            _get_sig_tool(),
+            _get_map_tool(),
+            # DX-76: Document query tools
+            _get_doc_toc_tool(),
+            _get_doc_read_tool(),
+            _get_doc_read_many_tool(),  # DX-77: Batch section reading
+            _get_doc_find_tool(),
+            # DX-76 Phase A-2: Document editing tools
+            _get_doc_replace_tool(),
+            _get_doc_insert_tool(),
+            _get_doc_delete_tool(),
+        ]
 
     @server.call_tool()
     async def call_tool(name: str, arguments: dict[str, Any]) -> list[TextContent]:
-        handlers = {"invar_guard": _run_guard, "invar_sig": _run_sig, "invar_map": _run_map}
+        handlers = {
+            "invar_guard": _run_guard,
+            "invar_sig": _run_sig,
+            "invar_map": _run_map,
+            # DX-76: Document query handlers
+            "invar_doc_toc": _run_doc_toc,
+            "invar_doc_read": _run_doc_read,
+            "invar_doc_read_many": _run_doc_read_many,  # DX-77: Batch reading
+            "invar_doc_find": _run_doc_find,
+            # DX-76 Phase A-2: Document editing handlers
+            "invar_doc_replace": _run_doc_replace,
+            "invar_doc_insert": _run_doc_insert,
+            "invar_doc_delete": _run_doc_delete,
+        }
         handler = handlers.get(name)
         if handler:
             return await handler(arguments)
@@ -204,109 +452,6 @@ def create_server() -> Server:
     return server
 
 
-# @shell_orchestration: MCP handler - subprocess is called inside
-# @shell_complexity: Guard command with multiple optional flags
-# @invar:allow shell_result: MCP handler for guard tool
-async def _run_guard(args: dict[str, Any]) -> list[TextContent]:
-    """Run invar guard command."""
-    path = args.get("path", ".")
-    is_valid, error = _validate_path(path)
-    if not is_valid:
-        return [TextContent(type="text", text=f"Error: {error}")]
-
-    cmd = [sys.executable, "-m", "invar.shell.commands.guard", "guard"]
-    cmd.append(path)
-
-    if args.get("changed", True):
-        cmd.append("--changed")
-    if args.get("strict", False):
-        cmd.append("--strict")
-    # DX-37: Optional coverage collection
-    if args.get("coverage", False):
-        cmd.append("--coverage")
-    # DX-63: Contract coverage check only
-    if args.get("contracts_only", False):
-        cmd.append("--contracts-only")
-
-    # DX-26: TTY auto-detection - MCP runs in non-TTY, so agent JSON output is automatic
-    # No explicit flag needed
-
-    return await _execute_command(cmd)
-
-
-# @shell_orchestration: MCP handler - subprocess is called inside
-# @invar:allow shell_result: MCP handler for sig tool
-async def _run_sig(args: dict[str, Any]) -> list[TextContent]:
-    """Run invar sig command."""
-    target = args.get("target", "")
-    if not target:
-        return [TextContent(type="text", text="Error: target is required")]
-
-    # Validate target (can be file path or file::symbol)
-    target_path = target.split("::")[0] if "::" in target else target
-    is_valid, error = _validate_path(target_path)
-    if not is_valid:
-        return [TextContent(type="text", text=f"Error: {error}")]
-
-    cmd = [sys.executable, "-m", "invar.shell.commands.guard", "sig", target, "--json"]
-    return await _execute_command(cmd)
-
-
-# @shell_orchestration: MCP handler - subprocess is called inside
-# @invar:allow shell_result: MCP handler for map tool
-async def _run_map(args: dict[str, Any]) -> list[TextContent]:
-    """Run invar map command."""
-    path = args.get("path", ".")
-    is_valid, error = _validate_path(path)
-    if not is_valid:
-        return [TextContent(type="text", text=f"Error: {error}")]
-
-    cmd = [sys.executable, "-m", "invar.shell.commands.guard", "map"]
-    cmd.append(path)
-
-    top = args.get("top", 10)
-    cmd.extend(["--top", str(top)])
-
-    cmd.append("--json")
-    return await _execute_command(cmd)
-
-
-# @shell_complexity: Command execution with error handling branches
-# @invar:allow shell_result: MCP subprocess wrapper utility
-async def _execute_command(cmd: list[str], timeout: int = 600) -> list[TextContent]:
-    """Execute a command and return the result.
-
-    Args:
-        cmd: Command to execute
-        timeout: Maximum time in seconds (default: 600, accommodates full Guard cycle)
-    """
-    try:
-        result = subprocess.run(
-            cmd,
-            capture_output=True,
-            text=True,
-            timeout=timeout,
-        )
-
-        output = result.stdout
-        if result.stderr:
-            output += f"\n\nStderr:\n{result.stderr}"
-
-        # Try to parse as JSON for better formatting
-        try:
-            parsed = json.loads(result.stdout)
-            output = json.dumps(parsed, indent=2)
-        except json.JSONDecodeError:
-            pass
-
-        return [TextContent(type="text", text=output)]
-
-    except subprocess.TimeoutExpired:
-        return [TextContent(type="text", text=f"Error: Command timed out ({timeout}s)")]
-    except Exception as e:
-        return [TextContent(type="text", text=f"Error: {e}")]
-
-
 # @shell_orchestration: MCP server entry point - runs async server
 def run_server() -> None:
     """Run the Invar MCP server.
@@ -315,6 +460,8 @@ def run_server() -> None:
     to ensure C extensions are compatible with project's Python version.
     """
     import asyncio
+    import subprocess
+    import sys
 
     from mcp.server.stdio import stdio_server
 
@@ -324,8 +471,6 @@ def run_server() -> None:
 
     if do_respawn and project_python is not None:
         # Re-spawn with project Python (has both invar AND project deps)
-        import subprocess
-        import sys
 
         if os.name == "nt":
             # Windows: execv doesn't replace process, use subprocess + exit
@@ -339,7 +484,7 @@ def run_server() -> None:
             )
 
     # Phase 1 fallback: Continue with uvx + PYTHONPATH injection
-    async def main():
+    async def main() -> None:
         server = create_server()
         async with stdio_server() as (read_stream, write_stream):
             await server.run(