invar-tools 1.7.0__py3-none-any.whl → 1.8.0__py3-none-any.whl

invar/shell/commands/uninstall.py

@@ -15,6 +15,8 @@ from pathlib import Path
 import typer
 from rich.console import Console
 
+from invar.shell.claude_hooks import is_invar_hook
+
 console = Console()
 
 
@@ -52,9 +54,42 @@ def has_invar_hook_marker(path: Path) -> bool:
         return False
 
 
+# @shell_orchestration: Regex patterns tightly coupled to file removal logic
+def _is_empty_user_region(content: str) -> bool:
+    """Check if user region only contains template comments (no real user content)."""
+    # Extract user region content
+    match = re.search(r"<!--invar:user-->(.*?)<!--/invar:user-->", content, flags=re.DOTALL)
+    if not match:
+        return True  # No user region = empty
+
+    user_content = match.group(1)
+
+    # Remove all HTML/markdown comments
+    cleaned = re.sub(r"<!--.*?-->", "", user_content, flags=re.DOTALL)
+
+    # Remove invar-generated merge markers and headers
+    invar_patterns = [
+        r"## Claude Analysis \(Preserved\)\s*",
+        r"## My Custom Rules\s*",
+        r"- Rule \d+:.*\n?",  # Template rules
+    ]
+    for pattern in invar_patterns:
+        cleaned = re.sub(pattern, "", cleaned)
+
+    # Remove whitespace
+    cleaned = re.sub(r"\s+", " ", cleaned).strip()
+
+    # If only whitespace or empty after removing comments and invar content, it's "empty"
+    return len(cleaned) == 0
+
+
 # @shell_orchestration: Regex patterns tightly coupled to file removal logic
 def remove_invar_regions(content: str) -> str:
-    """Remove <!--invar:xxx-->...<!--/invar:xxx--> regions except user region."""
+    """Remove <!--invar:xxx-->...<!--/invar:xxx--> regions.
+
+    User region is also removed if it only contains template comments.
+    Merge markers are always cleaned from user region.
+    """
     patterns = [
         # HTML-style regions (CLAUDE.md)
         (r"<!--invar:critical-->.*?<!--/invar:critical-->\n?", ""),
@@ -63,8 +98,34 @@ def remove_invar_regions(content: str) -> str:
         # Comment-style regions (.pre-commit-config.yaml)
         (r"# invar:begin\n.*?# invar:end\n?", ""),
     ]
+
+    # Also remove empty user region (only has template comments)
+    if _is_empty_user_region(content):
+        patterns.append((r"<!--invar:user-->.*?<!--/invar:user-->\n?", ""))
+    else:
+        # User region has real content - just remove the markers but keep content
+        patterns.append((r"<!--invar:user-->\n?", ""))
+        patterns.append((r"<!--/invar:user-->\n?", ""))
+        # Also clean invar-generated merge markers from user content
+        patterns.extend([
+            (r"<!-- =+ -->\n?", ""),
+            (r"<!-- MERGED CONTENT.*?-->\n?", ""),
+            (r"<!-- Original source:.*?-->\n?", ""),
+            (r"<!-- Merge date:.*?-->\n?", ""),
+            (r"<!-- END MERGED CONTENT -->\n?", ""),
+            (r"<!-- =+ -->\n?", ""),
+            (r"## Claude Analysis \(Preserved\)\n*", ""),
+        ])
+
     for pattern, replacement in patterns:
         content = re.sub(pattern, replacement, content, flags=re.DOTALL)
+
+    # Clean up trailing footer if nothing else left
+    content = re.sub(r"\n*---\n+\*Generated by.*?\*\s*$", "", content, flags=re.DOTALL)
+
+    # Clean up multiple blank lines
+    content = re.sub(r"\n{3,}", "\n\n", content)
+
     return content.strip()
 
 
@@ -84,6 +145,59 @@ def remove_mcp_invar_entry(path: Path) -> tuple[bool, str]:
         return False, ""
 
 
+# @shell_complexity: JSON parsing with conditional cleanup logic
+def remove_hooks_from_settings(path: Path) -> tuple[bool, str]:
+    """Remove Invar hooks from .claude/settings.local.json.
+
+    Uses merge strategy:
+    - Only removes Invar hooks (identified by .claude/hooks/ path)
+    - Preserves user's existing hooks
+    - Cleans up empty hook types and hooks section
+    """
+    settings_path = path / ".claude" / "settings.local.json"
+
+    try:
+        if not settings_path.exists():
+            return False, ""
+        content = settings_path.read_text()
+        data = json.loads(content)
+
+        if "hooks" not in data:
+            return False, content
+
+        existing_hooks = data["hooks"]
+        modified = False
+
+        # Filter out Invar hooks from each hook type
+        for hook_type in list(existing_hooks.keys()):
+            hook_list = existing_hooks[hook_type]
+            if isinstance(hook_list, list):
+                # Keep only non-Invar hooks
+                filtered = [h for h in hook_list if not is_invar_hook(h)]
+                if len(filtered) != len(hook_list):
+                    modified = True
+                if filtered:
+                    existing_hooks[hook_type] = filtered
+                else:
+                    # No hooks left for this type, remove the key
+                    del existing_hooks[hook_type]
+
+        # If no hooks left, remove the hooks section entirely
+        if not existing_hooks:
+            del data["hooks"]
+
+        if not modified:
+            return False, content
+
+        # If nothing left in data, indicate file can be deleted
+        if not data:
+            return True, ""
+
+        return True, json.dumps(data, indent=2)
+    except (OSError, json.JSONDecodeError):
+        return False, ""
+
+
 # @shell_complexity: Multi-file type detection requires comprehensive branching
 def collect_removal_targets(path: Path) -> dict:
     """Collect files and directories to remove/modify."""
@@ -146,16 +260,37 @@ def collect_removal_targets(path: Path) -> dict:
                     (f".claude/hooks/{hook_file.name}", "hook, has invar marker")
                 )
 
-    # CLAUDE.md - modify, not delete
+    # Pi hooks (LX-04)
+    pi_hooks_dir = path / ".pi" / "hooks"
+    if pi_hooks_dir.exists():
+        invar_ts = pi_hooks_dir / "invar.ts"
+        if invar_ts.exists():
+            targets["delete_files"].append((".pi/hooks/invar.ts", "Pi hook"))
+        # Check if .pi/hooks is empty after removal
+        if not any(f for f in pi_hooks_dir.iterdir() if f.name != "invar.ts"):
+            targets["delete_dirs"].append((".pi/hooks/", "empty after removal"))
+        # Check if .pi is empty
+        pi_dir = path / ".pi"
+        hooks_only = all(
+            child.name == "hooks" for child in pi_dir.iterdir() if child.is_dir()
+        )
+        if hooks_only:
+            targets["delete_dirs"].append((".pi/", "only had hooks"))
+
+    # CLAUDE.md - delete if empty user region, otherwise modify
     claude_md = path / "CLAUDE.md"
     if claude_md.exists():
         content = claude_md.read_text()
         if "<!--invar:" in content:
-            # Check if there's user content
-            has_user_region = "<!--invar:user-->" in content
-            targets["modify_files"].append(
-                ("CLAUDE.md", f"remove invar regions{', keep user region' if has_user_region else ''}")
-            )
+            # Check if user region has real content
+            if _is_empty_user_region(content):
+                # Will be empty after cleanup - delete
+                targets["delete_files"].append(("CLAUDE.md", "no user content"))
+            else:
+                # Has user content - modify
+                targets["modify_files"].append(
+                    ("CLAUDE.md", "remove invar regions, keep user content")
+                )
 
     # .mcp.json - modify or delete
     mcp_json = path / ".mcp.json"
@@ -167,6 +302,20 @@ def collect_removal_targets(path: Path) -> dict:
             else:
                 targets["delete_files"].append((".mcp.json", "only had invar config"))
 
+    # settings.local.json - remove hooks section or delete if empty
+    settings_local = path / ".claude" / "settings.local.json"
+    if settings_local.exists():
+        modified, new_content = remove_hooks_from_settings(path)
+        if modified:
+            if new_content:
+                targets["modify_files"].append(
+                    (".claude/settings.local.json", "remove hooks section")
+                )
+            else:
+                targets["delete_files"].append(
+                    (".claude/settings.local.json", "only had hooks config")
+                )
+
     # Config files with region markers (DX-69: cursor/aider removed)
     for file_name in [".pre-commit-config.yaml"]:
         file_path = path / file_name
@@ -245,6 +394,11 @@ def execute_removal(path: Path, targets: dict) -> None:
             if modified and new_content:
                 file_path.write_text(new_content)
                 console.print(f"[yellow]Modified[/yellow] {file_name}")
+        elif file_name == ".claude/settings.local.json":
+            modified, new_content = remove_hooks_from_settings(path)
+            if modified and new_content:
+                file_path.write_text(new_content)
+                console.print(f"[yellow]Modified[/yellow] {file_name}")
         else:
             content = file_path.read_text()
             cleaned = remove_invar_regions(content)
@@ -270,6 +424,7 @@ def execute_removal(path: Path, targets: dict) -> None:
             console.print("[dim]Removed empty[/dim] .claude/")
 
 
+# @shell_complexity: CLI entry point with confirmation prompts and multi-target removal
 def uninstall(
     path: Path = typer.Argument(
         Path(),

invar/shell/contract_coverage.py

@@ -121,6 +121,7 @@ def count_contracts_in_file(
     return Success(result)
 
 
+# @shell_complexity: Git status parsing requires multiple branch conditions
 def get_changed_python_files(path: Path) -> Result[list[Path], str]:
     """Get Python files changed in git."""
     try:
@@ -153,6 +154,7 @@ def get_changed_python_files(path: Path) -> Result[list[Path], str]:
         return Failure("Git not found")
 
 
+# @shell_complexity: Coverage calculation with multiple file/directory handling paths
 def calculate_contract_coverage(
     path: Path, changed_only: bool = False
 ) -> Result[ContractCoverageReport, str]:
@@ -207,6 +209,7 @@ def calculate_contract_coverage(
     return Success(report)
 
 
+# @shell_complexity: Batch detection with git status parsing and threshold logic
 def detect_batch_creation(
     path: Path, threshold: int = 3
 ) -> Result[BatchWarning | None, str]:
@@ -263,7 +266,7 @@ def detect_batch_creation(
         return Success(None)
 
 
-# @shell_orchestration: Report formatting tightly coupled with CLI output
+# @shell_complexity: Report formatting with multiple conditional sections
 def format_contract_coverage_report(report: ContractCoverageReport) -> str:
     """Format coverage report for human-readable output."""
     lines = [

invar/shell/pi_hooks.py

@@ -0,0 +1,207 @@
+"""
+Pi Coding Agent hooks for Invar.
+
+LX-04: Full feature parity with Claude Code hooks.
+- pytest/crosshair blocking via tool_call
+- Protocol injection via pi.send() for long conversations
+"""
+
+from __future__ import annotations
+
+import re
+from datetime import datetime
+from pathlib import Path
+from typing import TYPE_CHECKING
+
+from jinja2 import Environment, FileSystemLoader
+from returns.result import Failure, Result, Success
+
+from invar.core.template_helpers import escape_for_js_template
+from invar.shell.claude_hooks import detect_syntax, get_invar_md_content
+
+if TYPE_CHECKING:
+    from rich.console import Console
+
+# Pi hooks directory
+PI_HOOKS_DIR = ".pi/hooks"
+PROTOCOL_VERSION = "5.0"
+
+
+def get_pi_templates_path() -> Path:
+    """Get the path to Pi hook templates."""
+    return Path(__file__).parent.parent / "templates" / "hooks" / "pi"
+
+
+# @shell_complexity: Template rendering with protocol escaping
+def generate_pi_hook_content(project_path: Path) -> Result[str, str]:
+    """Generate Pi hook content from template."""
+    templates_path = get_pi_templates_path()
+    template_file = "invar.ts.jinja"
+
+    if not (templates_path / template_file).exists():
+        return Failure(f"Template not found: {template_file}")
+
+    try:
+        env = Environment(
+            loader=FileSystemLoader(str(templates_path)),
+            keep_trailing_newline=True,
+        )
+        template = env.get_template(template_file)
+
+        # Determine guard command based on syntax
+        syntax = detect_syntax(project_path)
+        guard_cmd = "invar_guard" if syntax == "mcp" else "invar guard"
+
+        # Get and escape protocol content for JS template literal
+        protocol_content = get_invar_md_content(project_path)
+        protocol_escaped = escape_for_js_template(protocol_content)
+
+        # Build context for template
+        context = {
+            "protocol_version": PROTOCOL_VERSION,
+            "generated_date": datetime.now().strftime("%Y-%m-%d"),
+            "guard_cmd": guard_cmd,
+            "invar_protocol_escaped": protocol_escaped,
+        }
+
+        content = template.render(**context)
+        return Success(content)
+    except Exception as e:
+        return Failure(f"Failed to generate Pi hook: {e}")
+
+
+def install_pi_hooks(
+    project_path: Path,
+    console: Console,
+) -> Result[list[str], str]:
+    """
+    Install Pi hooks for Invar.
+
+    Creates .pi/hooks/invar.ts with:
+    - pytest/crosshair blocking
+    - Protocol injection for long conversations
+    """
+    hooks_dir = project_path / PI_HOOKS_DIR
+    hooks_dir.mkdir(parents=True, exist_ok=True)
+
+    console.print("\n[bold]Installing Pi hooks (LX-04)...[/bold]")
+    console.print("  Hooks will:")
+    console.print("    ✓ Block pytest/crosshair → redirect to invar guard")
+    console.print("    ✓ Refresh protocol in long conversations")
+    console.print("")
+
+    result = generate_pi_hook_content(project_path)
+    if isinstance(result, Failure):
+        console.print(f"  [red]Failed:[/red] {result.failure()}")
+        return Failure(result.failure())
+
+    content = result.unwrap()
+    hook_file = hooks_dir / "invar.ts"
+    hook_file.write_text(content)
+
+    console.print(f"  [green]Created[/green] {PI_HOOKS_DIR}/invar.ts")
+    console.print("\n  [bold green]✓ Pi hooks installed[/bold green]")
+    console.print("  [dim]Requires: Pi coding agent with hooks support[/dim]")
+    console.print("  [yellow]⚠ Restart Pi session for hooks to take effect[/yellow]")
+
+    return Success(["invar.ts"])
+
+
+# @shell_complexity: Version detection and conditional update logic
+def sync_pi_hooks(
+    project_path: Path,
+    console: Console,
+) -> Result[list[str], str]:
+    """
+    Update Pi hooks with current INVAR.md content.
+
+    Called during `invar init` to ensure hooks stay in sync with protocol.
+    Only updates if Pi hooks are already installed.
+    """
+    hooks_dir = project_path / PI_HOOKS_DIR
+    hook_file = hooks_dir / "invar.ts"
+
+    if not hook_file.exists():
+        return Success([])  # No hooks installed, nothing to sync
+
+    # Check version in existing hook
+    try:
+        existing_content = hook_file.read_text()
+        version_match = re.search(r"Protocol: v([\d.]+)", existing_content)
+        old_version = version_match.group(1) if version_match else "unknown"
+
+        if old_version != PROTOCOL_VERSION:
+            console.print(f"[cyan]Updating Pi hooks: v{old_version} → v{PROTOCOL_VERSION}[/cyan]")
+        else:
+            console.print("[dim]Refreshing Pi hooks...[/dim]")
+    except OSError:
+        pass
+
+    result = generate_pi_hook_content(project_path)
+    if isinstance(result, Failure):
+        console.print(f"  [yellow]Warning:[/yellow] Failed to generate Pi hook: {result.failure()}")
+        return Failure(result.failure())
+
+    content = result.unwrap()
+    hook_file.write_text(content)
+    console.print("[green]✓[/green] Pi hooks synced")
+
+    return Success(["invar.ts"])
+
+
+def remove_pi_hooks(
+    project_path: Path,
+    console: Console,
+) -> Result[None, str]:
+    """Remove Pi hooks."""
+    hooks_dir = project_path / PI_HOOKS_DIR
+    hook_file = hooks_dir / "invar.ts"
+
+    if hook_file.exists():
+        hook_file.unlink()
+        console.print(f"  [red]Removed[/red] {PI_HOOKS_DIR}/invar.ts")
+
+        # Remove directory if empty
+        try:
+            hooks_dir.rmdir()
+            console.print(f"  [red]Removed[/red] {PI_HOOKS_DIR}/")
+        except OSError:
+            pass  # Directory not empty, keep it
+
+        console.print("[bold green]✓ Pi hooks removed[/bold green]")
+    else:
+        console.print("[dim]No Pi hooks installed[/dim]")
+
+    return Success(None)
+
+
+def pi_hooks_status(
+    project_path: Path,
+    console: Console,
+) -> Result[dict[str, str], str]:
+    """Check status of Pi hooks."""
+    hooks_dir = project_path / PI_HOOKS_DIR
+    hook_file = hooks_dir / "invar.ts"
+
+    status: dict[str, str] = {}
+
+    if not hook_file.exists():
+        console.print("[dim]No Pi hooks installed[/dim]")
+        return Success({"status": "not_installed"})
+
+    status["status"] = "installed"
+
+    # Try to get version
+    try:
+        content = hook_file.read_text()
+        match = re.search(r"Protocol: v([\d.]+)", content)
+        if match:
+            version = match.group(1)
+            status["version"] = version
+            console.print(f"[green]✓ Pi hooks installed (v{version})[/green]")
+        else:
+            console.print("[green]✓ Pi hooks installed[/green]")
+    except OSError:
+        console.print("[green]✓ Pi hooks installed[/green]")
+
+    return Success(status)

invar/shell/templates.py

@@ -76,11 +76,18 @@ def copy_template(
 
 # @shell_complexity: Config addition with existing file detection
 def add_config(path: Path, console) -> Result[bool, str]:
-    """Add configuration to project. Returns Success(True) if added, Success(False) if skipped."""
+    """Add configuration to project. Returns Success(True) if added, Success(False) if skipped.
+
+    DX-70: Creates .invar/config.toml instead of invar.toml for cleaner organization.
+    Backward compatible: still reads from invar.toml if it exists.
+    """
     pyproject = path / "pyproject.toml"
-    invar_toml = path / "invar.toml"
+    invar_dir = path / ".invar"
+    invar_config = invar_dir / "config.toml"
+    legacy_invar_toml = path / "invar.toml"
 
     try:
+        # Priority 1: Add to pyproject.toml if it exists
         if pyproject.exists():
             content = pyproject.read_text()
             if "[tool.invar]" not in content:
@@ -90,9 +97,15 @@ def add_config(path: Path, console) -> Result[bool, str]:
                 return Success(True)
             return Success(False)
 
-        if not invar_toml.exists():
-            invar_toml.write_text(_DEFAULT_INVAR_TOML)
-            console.print("[green]Created[/green] invar.toml")
+        # Skip if legacy invar.toml exists (backward compatibility)
+        if legacy_invar_toml.exists():
+            return Success(False)
+
+        # Create .invar/config.toml (DX-70: new default location)
+        if not invar_config.exists():
+            invar_dir.mkdir(exist_ok=True)
+            invar_config.write_text(_DEFAULT_INVAR_TOML)
+            console.print("[green]Created[/green] .invar/config.toml")
             return Success(True)
 
         return Success(False)
@@ -197,6 +210,7 @@ AGENT_CONFIGS = {
 }
 
 
+# @shell_complexity: Multi-agent config detection with file existence checks
 def detect_agent_configs(path: Path) -> Result[dict[str, str], str]:
     """
     Detect existing agent configuration files.
@@ -392,36 +406,28 @@ The server communicates via stdio and should be managed by your AI agent.
 
 # @shell_complexity: Git hooks installation with backup
 def install_hooks(path: Path, console) -> Result[bool, str]:
-    """Install pre-commit hooks configuration and activate them."""
+    """Run 'pre-commit install' if config exists (file created by sync_templates)."""
     import subprocess
 
     pre_commit_config = path / ".pre-commit-config.yaml"
 
-    if pre_commit_config.exists():
-        console.print("[yellow]Skipped[/yellow] .pre-commit-config.yaml (already exists)")
+    if not pre_commit_config.exists():
+        # File should be created by sync_templates; skip if missing
         return Success(False)
 
-    result = copy_template("pre-commit-config.yaml.template", path, ".pre-commit-config.yaml")
-    if isinstance(result, Failure):
-        return result
-
-    if result.unwrap():
-        console.print("[green]Created[/green] .pre-commit-config.yaml")
-
-        # Auto-install hooks (Automatic > Opt-in)
-        try:
-            subprocess.run(
-                ["pre-commit", "install"],
-                cwd=path,
-                check=True,
-                capture_output=True,
-            )
-            console.print("[green]Installed[/green] pre-commit hooks")
-        except FileNotFoundError:
-            console.print("[dim]Run: pre-commit install (pre-commit not in PATH)[/dim]")
-        except subprocess.CalledProcessError:
-            console.print("[dim]Run: pre-commit install (not a git repo?)[/dim]")
-
+    # Auto-install hooks (Automatic > Opt-in)
+    try:
+        subprocess.run(
+            ["pre-commit", "install"],
+            cwd=path,
+            check=True,
+            capture_output=True,
+        )
+        console.print("[green]Installed[/green] pre-commit hooks")
         return Success(True)
+    except FileNotFoundError:
+        console.print("[dim]Run: pre-commit install (pre-commit not in PATH)[/dim]")
+    except subprocess.CalledProcessError:
+        console.print("[dim]Run: pre-commit install (not a git repo?)[/dim]")
 
     return Success(False)