invar-tools 1.17.7__py3-none-any.whl → 1.17.9__py3-none-any.whl

invar/mcp/handlers.py

@@ -11,11 +11,14 @@ import json
 import subprocess
 import sys
 from pathlib import Path
-from typing import Any, Literal
+from typing import TYPE_CHECKING, Any, Literal
 
 from mcp.types import TextContent
 from returns.result import Success
 
+if TYPE_CHECKING:
+    from mcp.server.lowlevel.server import CombinationContent
+
 
 # @invar:allow shell_result: Pure validation helper, no I/O, returns tuple not Result
 # @shell_complexity: Security validation requires multiple checks
@@ -59,7 +62,7 @@ def _validate_path(path: str) -> tuple[bool, str]:
 # @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]:
+async def _run_guard(args: dict[str, Any]) -> list[TextContent] | CombinationContent:
     """Run invar guard command."""
     path = args.get("path", ".")
     is_valid, error = _validate_path(path)
@@ -88,7 +91,7 @@ async def _run_guard(args: dict[str, Any]) -> list[TextContent]:
 
 # @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]:
+async def _run_sig(args: dict[str, Any]) -> list[TextContent] | CombinationContent:
     """Run invar sig command."""
     target = args.get("target", "")
     if not target:
@@ -106,7 +109,7 @@ async def _run_sig(args: dict[str, Any]) -> list[TextContent]:
 
 # @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]:
+async def _run_map(args: dict[str, Any]) -> list[TextContent] | CombinationContent:
     """Run invar map command."""
     path = args.get("path", ".")
     is_valid, error = _validate_path(path)
@@ -125,7 +128,7 @@ async def _run_map(args: dict[str, Any]) -> list[TextContent]:
 
 # @shell_orchestration: MCP handler - orchestrates refs command execution
 # @invar:allow shell_result: MCP handler for refs tool
-async def _run_refs(args: dict[str, Any]) -> list[TextContent]:
+async def _run_refs(args: dict[str, Any]) -> list[TextContent] | CombinationContent:
     """Run invar refs command.
 
     DX-78: Find all references to a symbol.
@@ -155,7 +158,7 @@ async def _run_refs(args: dict[str, Any]) -> list[TextContent]:
 # @shell_orchestration: MCP handler - calls shell layer directly
 # @shell_complexity: MCP input validation + result handling
 # @invar:allow shell_result: MCP handler for doc_toc tool
-async def _run_doc_toc(args: dict[str, Any]) -> list[TextContent]:
+async def _run_doc_toc(args: dict[str, Any]) -> list[TextContent] | CombinationContent:
     """Run invar_doc_toc - extract document structure."""
     from dataclasses import asdict
 
@@ -203,7 +206,7 @@ def _section_to_dict(section: Any) -> dict[str, Any]:
 # @shell_orchestration: MCP handler - calls shell layer directly
 # @shell_complexity: MCP input validation + result handling
 # @invar:allow shell_result: MCP handler for doc_read tool
-async def _run_doc_read(args: dict[str, Any]) -> list[TextContent]:
+async def _run_doc_read(args: dict[str, Any]) -> list[TextContent] | CombinationContent:
     """Run invar_doc_read - read a specific section."""
     from invar.shell.doc_tools import read_section
 
@@ -232,7 +235,7 @@ async def _run_doc_read(args: dict[str, Any]) -> list[TextContent]:
 
 # @shell_complexity: Multiple arg validation branches + error handling
 # @invar:allow shell_result: MCP handler for doc_read_many tool
-async def _run_doc_read_many(args: dict[str, Any]) -> list[TextContent]:
+async def _run_doc_read_many(args: dict[str, Any]) -> list[TextContent] | CombinationContent:
     """Run invar_doc_read_many - read multiple sections."""
     from invar.shell.doc_tools import read_sections_batch
 
@@ -264,7 +267,7 @@ async def _run_doc_read_many(args: dict[str, Any]) -> list[TextContent]:
 # @shell_orchestration: MCP handler - calls shell layer directly
 # @shell_complexity: MCP input validation + result handling
 # @invar:allow shell_result: MCP handler for doc_find tool
-async def _run_doc_find(args: dict[str, Any]) -> list[TextContent]:
+async def _run_doc_find(args: dict[str, Any]) -> list[TextContent] | CombinationContent:
     """Run invar_doc_find - find sections matching pattern."""
     from invar.shell.doc_tools import find_sections
 
@@ -308,7 +311,7 @@ async def _run_doc_find(args: dict[str, Any]) -> list[TextContent]:
 # @shell_orchestration: MCP handler - calls shell layer directly
 # @shell_complexity: MCP input validation + result handling
 # @invar:allow shell_result: MCP handler for doc_replace tool
-async def _run_doc_replace(args: dict[str, Any]) -> list[TextContent]:
+async def _run_doc_replace(args: dict[str, Any]) -> list[TextContent] | CombinationContent:
     """Run invar_doc_replace - replace section content."""
     from invar.shell.doc_tools import replace_section_content
 
@@ -342,7 +345,7 @@ async def _run_doc_replace(args: dict[str, Any]) -> list[TextContent]:
 # @shell_orchestration: MCP handler - calls shell layer directly
 # @shell_complexity: MCP input validation + result handling
 # @invar:allow shell_result: MCP handler for doc_insert tool
-async def _run_doc_insert(args: dict[str, Any]) -> list[TextContent]:
+async def _run_doc_insert(args: dict[str, Any]) -> list[TextContent] | CombinationContent:
     """Run invar_doc_insert - insert content relative to section."""
     from invar.shell.doc_tools import insert_section_content
 
@@ -382,7 +385,7 @@ async def _run_doc_insert(args: dict[str, Any]) -> list[TextContent]:
 # @shell_orchestration: MCP handler - calls shell layer directly
 # @shell_complexity: MCP input validation + result handling
 # @invar:allow shell_result: MCP handler for doc_delete tool
-async def _run_doc_delete(args: dict[str, Any]) -> list[TextContent]:
+async def _run_doc_delete(args: dict[str, Any]) -> list[TextContent] | CombinationContent:
     """Run invar_doc_delete - delete a section."""
     from invar.shell.doc_tools import delete_section_content
 
@@ -411,13 +414,11 @@ async def _run_doc_delete(args: dict[str, Any]) -> list[TextContent]:
 
 # @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)
-    """
+async def _execute_command(
+    cmd: list[str],
+    timeout: int = 600,
+) -> list[TextContent] | CombinationContent:
+    """Execute a command and return result."""
     try:
         result = subprocess.run(
             cmd,
@@ -426,18 +427,14 @@ async def _execute_command(cmd: list[str], timeout: int = 600) -> list[TextConte
             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)
+            return ([TextContent(type="text", text=json.dumps(parsed, indent=2))], parsed)
         except json.JSONDecodeError:
-            pass
-
-        return [TextContent(type="text", text=output)]
+            output = result.stdout
+            if result.stderr:
+                output += f"\n\nStderr:\n{result.stderr}"
+            return [TextContent(type="text", text=output)]
 
     except subprocess.TimeoutExpired:
         return [TextContent(type="text", text=f"Error: Command timed out ({timeout}s)")]

invar/shell/commands/guard.py

@@ -6,7 +6,6 @@ Shell module: handles user interaction and file I/O.
 
 from __future__ import annotations
 
-import os
 from pathlib import Path
 
 import typer
@@ -14,13 +13,6 @@ from returns.result import Failure, Result, Success
 from rich.console import Console
 from rich.table import Table
 
-
-def _detect_agent_mode() -> bool:
-    """Detect agent context: INVAR_MODE=agent OR non-TTY (pipe/redirect)."""
-    import sys
-    return os.getenv("INVAR_MODE") == "agent" or not sys.stdout.isatty()
-
-
 from invar import __version__
 from invar.core.models import GuardReport, RuleConfig
 from invar.core.rules import check_all_rules
@@ -95,12 +87,14 @@ def _scan_and_check(
             for rule, reason, line in extract_escape_hatches(file_info.source):
                 all_escapes.append((file_info.path, rule, reason))
                 # DX-66: Add to escape hatch summary
-                report.escape_hatches.add(EscapeHatchDetail(
-                    file=file_info.path,
-                    line=line,
-                    rule=rule,
-                    reason=reason,
-                ))
+                report.escape_hatches.add(
+                    EscapeHatchDetail(
+                        file=file_info.path,
+                        line=line,
+                        rule=rule,
+                        reason=reason,
+                    )
+                )
 
     # DX-22: Check project-level complexity debt (Fix-or-Explain enforcement)
     for debt_violation in check_complexity_debt(
@@ -115,6 +109,10 @@ def _scan_and_check(
     return Success(report)
 
 
+def _determine_output_mode(human: bool, agent: bool = False, json_output: bool = False) -> bool:
+    return not human
+
+
 # @invar:allow entry_point_too_thick: Main CLI entry point, orchestrates all verification phases
 @app.command()
 def guard(
@@ -133,7 +131,7 @@ def guard(
         False, "--static", help="Static analysis only, skip all runtime tests"
     ),
     human: bool = typer.Option(
-        False, "--human", help="Force human-readable output (for testing/debugging)"
+        False, "--human", help="Force Rich human-readable output (opt-in, default is JSON)"
     ),
     # DX-26: Deprecated flags kept for backward compatibility
     no_strict_pure: bool = typer.Option(
@@ -192,23 +190,12 @@ def guard(
         ts_result = run_typescript_guard(path if path.is_dir() else find_project_root(path))
         match ts_result:
             case Success(result):
-                if json_output or agent:
-                    import json as json_mod
-
-                    from invar.shell.prove.guard_ts import format_typescript_guard_v2
-
-                    output = format_typescript_guard_v2(result)
-                    console.print(json_mod.dumps(output, indent=2))
-                else:
-                    console.print(f"[bold]TypeScript Guard[/bold] ({project_language})")
-                    if result.status == "passed":
-                        console.print("[green]✓ PASSED[/green]")
-                    elif result.status == "skipped":
-                        console.print("[yellow]⚠ SKIPPED[/yellow] (no TypeScript tools available)")
-                    else:
-                        console.print(f"[red]✗ FAILED[/red] ({result.error_count} errors)")
-                        for v in result.violations[:10]:  # Show first 10
-                            console.print(f"  {v.file}:{v.line}: [{v.severity}] {v.message}")
+                import json as json_mod
+
+                from invar.shell.prove.guard_ts import format_typescript_guard_v2
+
+                output = format_typescript_guard_v2(result)
+                console.print(json_mod.dumps(output, indent=2))
                 raise typer.Exit(0 if result.status == "passed" else 1)
             case Failure(err):
                 console.print(f"[red]Error:[/red] {err}")
@@ -295,6 +282,7 @@ def guard(
             run_pattern_detection,
             suggestions_to_violations,
         )
+
         # Run pattern detection on checked files
         files_to_check = list(only_files) if only_files else None
         pattern_result = run_pattern_detection(path, files_to_check)
@@ -331,6 +319,7 @@ def guard(
     # DX-37: Check coverage availability if requested
     if coverage:
         from invar.shell.coverage import check_coverage_available
+
         cov_check = check_coverage_available()
         if isinstance(cov_check, Failure):
             console.print(f"[yellow]Warning:[/yellow] {cov_check.failure()}")
@@ -342,14 +331,19 @@ def guard(
 
         # Phase 1: Doctests (DX-37: with optional coverage)
         doctest_passed, doctest_output, doctest_coverage = run_doctests_phase(
-            checked_files, explain, timeout=config.timeout_doctest,
+            checked_files,
+            explain,
+            timeout=config.timeout_doctest,
             collect_coverage=coverage,
         )
 
         # Phase 2: CrossHair symbolic verification
         # Note: CrossHair uses subprocess + symbolic execution, coverage not applicable
         crosshair_passed, crosshair_output = run_crosshair_phase(
-            path, checked_files, doctest_passed, static_exit_code,
+            path,
+            checked_files,
+            doctest_passed,
+            static_exit_code,
             changed_mode=changed,
             timeout=config.timeout_crosshair,
             per_condition_timeout=config.timeout_crosshair_per_condition,
@@ -357,7 +351,9 @@ def guard(
 
         # Phase 3: Hypothesis property tests (DX-37: with optional coverage)
         property_passed, property_output, property_coverage = run_property_tests_phase(
-            checked_files, doctest_passed, static_exit_code,
+            checked_files,
+            doctest_passed,
+            static_exit_code,
             collect_coverage=coverage,
         )
     elif verification_level == VerificationLevel.STATIC:
@@ -382,20 +378,31 @@ def guard(
         if property_coverage and property_coverage.get("collected"):
             coverage_output["phases_tracked"].append("hypothesis")
             if "overall_branch_coverage" in property_coverage:
-                coverage_output["overall_branch_coverage"] = property_coverage["overall_branch_coverage"]
+                coverage_output["overall_branch_coverage"] = property_coverage[
+                    "overall_branch_coverage"
+                ]
 
     # DX-26: Unified output (agent JSON or human Rich)
     if use_agent_output:
         output_agent(
-            report, strict, doctest_passed, doctest_output, crosshair_output, level_name,
+            report,
+            strict,
+            doctest_passed,
+            doctest_output,
+            crosshair_output,
+            level_name,
             property_output=property_output,
             coverage_data=coverage_output,  # DX-37
         )
     else:
         output_rich(report, config.strict_pure, changed, pedantic, explain, static)
         output_verification_status(
-            verification_level, static_exit_code, doctest_passed,
-            doctest_output, crosshair_output, explain,
+            verification_level,
+            static_exit_code,
+            doctest_passed,
+            doctest_output,
+            crosshair_output,
+            explain,
             property_output=property_output,
             strict=strict,
         )
@@ -405,7 +412,9 @@ def guard(
             overall = coverage_output.get("overall_branch_coverage", 0.0)
             console.print(f"\n[bold]Coverage Analysis[/bold] ({' + '.join(phases)})")
             console.print(f"  Overall branch coverage: {overall}%")
-            console.print("  [dim]Note: CrossHair uses symbolic execution; coverage not applicable.[/dim]")
+            console.print(
+                "  [dim]Note: CrossHair uses symbolic execution; coverage not applicable.[/dim]"
+            )
 
     # Exit with combined status
     all_passed = doctest_passed and crosshair_passed and property_passed
@@ -413,28 +422,6 @@ def guard(
     raise typer.Exit(final_exit)
 
 
-# @shell_orchestration: Output mode decision helper for CLI
-def _determine_output_mode(human: bool, agent: bool = False, json_output: bool = False) -> bool:
-    """Determine if agent JSON output should be used (DX-26).
-
-    DX-26: TTY auto-detection with --human override.
-    - --human flag → human output (for testing/debugging)
-    - TTY (terminal) → human output
-    - Non-TTY (pipe/redirect) → agent JSON output
-    - Deprecated --agent/--json flags → still work for backward compat
-    """
-    # --human flag always forces human output
-    if human:
-        return False  # use_agent = False
-
-    # Deprecated flags (backward compat)
-    if json_output or agent:
-        return True  # use_agent = True
-
-    # TTY auto-detection
-    return _detect_agent_mode()  # Returns True if non-TTY
-
-
 def _show_verification_level(verification_level) -> None:
     """Show verification level in human-readable format.
 
@@ -464,8 +451,7 @@ def map_command(
     """Generate symbol map with reference counts."""
     from invar.shell.commands.perception import run_map
 
-    # Phase 9 P11: Auto-detect agent mode
-    use_json = json_output or _detect_agent_mode()
+    use_json = True
     result = run_map(path, top, use_json)
     if isinstance(result, Failure):
         console.print(f"[red]Error:[/red] {result.failure()}")
@@ -480,8 +466,7 @@ def sig_command(
     """Extract signatures from a file or symbol."""
     from invar.shell.commands.perception import run_sig
 
-    # Phase 9 P11: Auto-detect agent mode
-    use_json = json_output or _detect_agent_mode()
+    use_json = True
     result = run_sig(target, use_json)
     if isinstance(result, Failure):
         console.print(f"[red]Error:[/red] {result.failure()}")
@@ -504,8 +489,7 @@ def refs_command(
     """
     from invar.shell.commands.perception import run_refs
 
-    # Auto-detect agent mode
-    use_json = json_output or _detect_agent_mode()
+    use_json = True
     result = run_refs(target, use_json)
     if isinstance(result, Failure):
         console.print(f"[red]Error:[/red] {result.failure()}")
@@ -529,8 +513,7 @@ def rules(
 
     from invar.core.rule_meta import RULE_META, RuleCategory, get_rules_by_category
 
-    # Phase 9 P11: Auto-detect agent mode
-    use_json = json_output or _detect_agent_mode()
+    use_json = True
 
     # Filter by category if specified
     if category:

{invar_tools-1.17.7.dist-info → invar_tools-1.17.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invar-tools
-Version: 1.17.7
+Version: 1.17.9
 Summary: AI-native software engineering tools with design-by-contract verification
 Project-URL: Homepage, https://github.com/tefx/invar
 Project-URL: Documentation, https://github.com/tefx/invar#readme

{invar_tools-1.17.7.dist-info → invar_tools-1.17.9.dist-info}/RECORD

@@ -50,7 +50,7 @@ invar/core/patterns/registry.py,sha256=2rz0wWDRarMkuHN-qM_ZrT3qeGFDSKMABvRvPNZxQ
 invar/core/patterns/types.py,sha256=ULAlWuAdmO6CFcEDjTrWBfzNTBsnomAl2d25tR11ihU,5506
 invar/mcp/__init__.py,sha256=n3S7QwMjSMqOMT8cI2jf9E0yZPjKmBOJyIYhq4WZ8TQ,226
 invar/mcp/__main__.py,sha256=ZcIT2U6xUyGOWucl4jq422BDE3lRLjqyxb9pFylRBdk,219
-invar/mcp/handlers.py,sha256=Kls1aXnYmGcMvib_Mesfz5FjBaL7lmrhKaw_P2JDnyw,16551
+invar/mcp/handlers.py,sha256=3khWBATWxV4TwHPm6Gnr9pWfGaPyxf5p8yR-pnJhDtg,16756
 invar/mcp/server.py,sha256=zSpY9bCFuq4mWe7XfolTnwHffhdmoyN40aFL4L7dFrE,20407
 invar/node_tools/.gitignore,sha256=M2kz8Iw7Kzmi44mKo1r7_HOZMh79a7dFDdRrqXyaEhI,530
 invar/node_tools/MANIFEST,sha256=2Z2at-27MK8K7DSjOjjtR4faTbt6eCiKQuEfvP_lwH8,145
@@ -2681,7 +2681,7 @@ invar/shell/ts_compiler.py,sha256=nA8brnOhThj9J_J3vAEGjDsM4NjbWQ_eX8Yf4pHPOgk,66
 invar/shell/commands/__init__.py,sha256=MEkKwVyjI9DmkvBpJcuumXo2Pg_FFkfEr-Rr3nrAt7A,284
 invar/shell/commands/doc.py,sha256=SOLDoCXXGxx_JU0PKXlAIGEF36PzconHmmAtL-rM6D4,13819
 invar/shell/commands/feedback.py,sha256=lLxEeWW_71US_vlmorFrGXS8IARB9nbV6D0zruLs660,7640
-invar/shell/commands/guard.py,sha256=ZuqxYkCZHoomUPuk4-HNf0bTk86il0_uRkhOTvD6T3k,24840
+invar/shell/commands/guard.py,sha256=6Ik3DJ8x6f8ZE-Y9UnzZXf2Lo2e3ZgiWUmN08cRldyE,23264
 invar/shell/commands/hooks.py,sha256=W-SOnT4VQyUvXwipozkJwgEYfiOJGz7wksrbcdWegUg,2356
 invar/shell/commands/init.py,sha256=rtoPFsfq7xRZ6lfTipWT1OejNK5wfzqu1ncXi1kizU0,23634
 invar/shell/commands/merge.py,sha256=nuvKo8m32-OL-SCQlS4SLKmOZxQ3qj-1nGCx1Pgzifw,8183
@@ -2778,10 +2778,10 @@ invar/templates/skills/invar-reflect/template.md,sha256=Rr5hvbllvmd8jSLf_0ZjyKt6
 invar/templates/skills/investigate/SKILL.md.jinja,sha256=cp6TBEixBYh1rLeeHOR1yqEnFqv1NZYePORMnavLkQI,3231
 invar/templates/skills/propose/SKILL.md.jinja,sha256=6BuKiCqO1AEu3VtzMHy1QWGqr_xqG9eJlhbsKT4jev4,3463
 invar/templates/skills/review/SKILL.md.jinja,sha256=ET5mbdSe_eKgJbi2LbgFC-z1aviKcHOBw7J5Q28fr4U,14105
-invar_tools-1.17.7.dist-info/METADATA,sha256=v4uFpW9-ouRRiRqmkIR-GRWDTDsLa5304LnjooU67sA,28595
-invar_tools-1.17.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-invar_tools-1.17.7.dist-info/entry_points.txt,sha256=RwH_EhqgtFPsnO6RcrwrAb70Zyfb8Mh6uUtztWnUxGk,102
-invar_tools-1.17.7.dist-info/licenses/LICENSE,sha256=qeFksp4H4kfTgQxPCIu3OdagXyiZcgBlVfsQ6M5oFyk,10767
-invar_tools-1.17.7.dist-info/licenses/LICENSE-GPL,sha256=IvZfC6ZbP7CLjytoHVzvpDZpD-Z3R_qa1GdMdWlWQ6Q,35157
-invar_tools-1.17.7.dist-info/licenses/NOTICE,sha256=joEyMyFhFY8Vd8tTJ-a3SirI0m2Sd0WjzqYt3sdcglc,2561
-invar_tools-1.17.7.dist-info/RECORD,,
+invar_tools-1.17.9.dist-info/METADATA,sha256=OvB2f3yrJg-G-p5y5DRWqtFxuqI2g2gKHnuh2rJWnH4,28595
+invar_tools-1.17.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+invar_tools-1.17.9.dist-info/entry_points.txt,sha256=RwH_EhqgtFPsnO6RcrwrAb70Zyfb8Mh6uUtztWnUxGk,102
+invar_tools-1.17.9.dist-info/licenses/LICENSE,sha256=qeFksp4H4kfTgQxPCIu3OdagXyiZcgBlVfsQ6M5oFyk,10767
+invar_tools-1.17.9.dist-info/licenses/LICENSE-GPL,sha256=IvZfC6ZbP7CLjytoHVzvpDZpD-Z3R_qa1GdMdWlWQ6Q,35157
+invar_tools-1.17.9.dist-info/licenses/NOTICE,sha256=joEyMyFhFY8Vd8tTJ-a3SirI0m2Sd0WjzqYt3sdcglc,2561
+invar_tools-1.17.9.dist-info/RECORD,,