invar-tools 1.14.0__py3-none-any.whl → 1.15.1__py3-none-any.whl

invar/shell/commands/init.py

@@ -23,6 +23,7 @@ from invar.shell.mcp_config import (
     get_recommended_method,
 )
 from invar.shell.pi_hooks import install_pi_hooks
+from invar.shell.pi_tools import install_pi_tools
 from invar.shell.templates import (
     add_config,
     create_directories,
@@ -60,6 +61,7 @@ FILE_CATEGORIES: dict[str, list[tuple[str, str]]] = {
         ("CLAUDE.md", "Agent instructions (Pi compatible)"),
         (".claude/skills/", "Workflow automation (Pi compatible)"),
         (".pi/hooks/", "Pi-specific hooks"),
+        (".pi/tools/", "Pi custom tools (invar_guard, invar_sig, invar_map)"),
     ],
 }
 
@@ -153,29 +155,43 @@ def _get_prompt_style():
 
 # @shell_complexity: Interactive prompt with cursor selection
 def _prompt_agent_selection() -> list[str]:
-    """Prompt user to select code agent using cursor navigation."""
+    """Prompt user to select agent(s) using checkbox (DX-81: multi-agent support)."""
     import questionary
 
-    console.print("\n[bold]Select code agent:[/bold]")
-    console.print("[dim]Use arrow keys to move, enter to select[/dim]\n")
+    console.print("\n[bold]Select agent(s) to configure:[/bold]")
+    console.print("[dim]Space to toggle, Enter to confirm (can select multiple)[/dim]\n")
 
     choices = [
-        questionary.Choice("Claude Code (recommended)", value="claude"),
-        questionary.Choice("Pi Coding Agent", value="pi"),
-        questionary.Choice("Other (AGENT.md)", value="generic"),
+        questionary.Choice(
+            "Claude Code (recommended)",
+            value="claude",
+            checked=True  # Default selection
+        ),
+        questionary.Choice(
+            "Pi Coding Agent",
+            value="pi",
+            checked=False
+        ),
+        questionary.Choice(
+            "Other (AGENT.md)",
+            value="generic",
+            checked=False
+        ),
     ]
 
-    selected = questionary.select(
+    selected = questionary.checkbox(
         "",
         choices=choices,
         instruction="",
         style=_get_prompt_style(),
     ).ask()
 
-    # Handle Ctrl+C
+    # Handle Ctrl+C or empty selection
     if not selected:
-        return ["claude"]  # Default to Claude Code
-    return [selected]
+        console.print("[yellow]No agents selected, using Claude Code as default.[/yellow]")
+        return ["claude"]
+
+    return selected
 
 
 # @shell_complexity: Interactive file selection with cursor navigation
@@ -205,9 +221,10 @@ def _prompt_file_selection(agents: list[str]) -> dict[str, bool]:
     console.print()
     console.print("[dim]Use arrow keys to move, space to toggle, enter to confirm[/dim]\n")
 
-    # Build choices with categories as separators
+    # Build choices with categories as separators (DX-81: deduplicate shared files)
     choices: list[questionary.Choice | questionary.Separator] = []
     file_list: list[str] = []
+    seen_files: set[str] = set()
 
     for category, files in available.items():
         if category == "required":
@@ -217,12 +234,19 @@ def _prompt_file_selection(agents: list[str]) -> dict[str, bool]:
             category_name = "Claude Code"
         elif category == "pi":
             category_name = "Pi Coding Agent"
-        choices.append(questionary.Separator(f"── {category_name} ──"))
-        for file, desc in files:
-            choices.append(
-                questionary.Choice(f"{file:28} {desc}", value=file, checked=True)
-            )
-            file_list.append(file)
+
+        # Filter out files already seen (shared between categories)
+        unique_files = [(f, d) for f, d in files if f not in seen_files]
+
+        # Only add separator if there are unique files to show
+        if unique_files:
+            choices.append(questionary.Separator(f"── {category_name} ──"))
+            for file, desc in unique_files:
+                choices.append(
+                    questionary.Choice(f"{file:28} {desc}", value=file, checked=True)
+                )
+                file_list.append(file)
+                seen_files.add(file)
 
     selected = questionary.checkbox(
         "Select files to install:",
@@ -390,10 +414,7 @@ def init(
     """
     from invar import __version__
 
-    # Mutual exclusivity check
-    if claude and pi:
-        console.print("[red]Error:[/red] Cannot use --claude and --pi together.")
-        raise typer.Exit(1)
+    # DX-81: Multi-agent support - removed mutual exclusivity check
 
     if mcp_only and (claude or pi):
         console.print("[red]Error:[/red] --mcp-only cannot be combined with --claude or --pi.")
@@ -458,8 +479,10 @@ def init(
             console.print(f"[red]Error:[/red] Invalid language '{language}'. Must be one of: {valid}")
             raise typer.Exit(1)
 
-    # Header
-    if claude:
+    # Header (DX-81: Support multi-agent display)
+    if claude and pi:
+        console.print(f"\n[bold]Invar v{__version__} - Quick Setup (Claude Code + Pi)[/bold]")
+    elif claude:
         console.print(f"\n[bold]Invar v{__version__} - Quick Setup (Claude Code)[/bold]")
     elif pi:
         console.print(f"\n[bold]Invar v{__version__} - Quick Setup (Pi)[/bold]")
@@ -468,27 +491,30 @@ def init(
     console.print("=" * 45)
     console.print(f"[dim]Language: {language} | Existing files will be MERGED.[/dim]")
 
-    # Determine agents and files
-    if claude:
-        # Quick mode: Claude Code defaults
-        agents = ["claude"]
+    # DX-81: Determine agents and files (multi-agent support)
+    if claude or pi:
+        # Quick mode: Build agent list from flags
+        agents = []
+        if claude:
+            agents.append("claude")
+        if pi:
+            agents.append("pi")
+
+        # Build selected_files from all agents' categories
         selected_files: dict[str, bool] = {}
-        for category in ["optional", "claude"]:
-            for file, _ in FILE_CATEGORIES.get(category, []):
-                selected_files[file] = True
-        # DX-79: Default feedback enabled for quick mode
-        feedback_enabled = True
-        console.print("\n[dim]📊 Feedback collection enabled by default (stored locally in .invar/feedback/)[/dim]")
-        console.print("[dim]   To disable: Set feedback.enabled=false in .claude/settings.local.json[/dim]")
-    elif pi:
-        # Quick mode: Pi defaults
-        agents = ["pi"]
-        selected_files = {}
-        for category in ["optional", "pi"]:
+        for agent in agents:
+            category = AGENT_CONFIGS[agent]["category"]
             for file, _ in FILE_CATEGORIES.get(category, []):
                 selected_files[file] = True
+
+        # Add optional files
+        for file, _ in FILE_CATEGORIES["optional"]:
+            selected_files[file] = True
+
         # DX-79: Default feedback enabled for quick mode
         feedback_enabled = True
+        if len(agents) > 1:
+            console.print(f"\n[dim]📊 Configuring for {len(agents)} agents: {', '.join(agents)}[/dim]")
         console.print("\n[dim]📊 Feedback collection enabled by default (stored locally in .invar/feedback/)[/dim]")
         console.print("[dim]   To disable: Set feedback.enabled=false in .claude/settings.local.json[/dim]")
     else:
@@ -598,6 +624,10 @@ def init(
     if "pi" in agents and selected_files.get(".pi/hooks/", True):
         install_pi_hooks(path, console)
 
+    # Install Pi custom tools if selected
+    if "pi" in agents and selected_files.get(".pi/tools/", True):
+        install_pi_tools(path, console)
+
     # Add feedback configuration (DX-79 Phase C)
     if "claude" in agents or "pi" in agents:
         feedback_result = add_feedback_config(path, feedback_enabled, console)
@@ -622,7 +652,7 @@ def init(
     # Completion message
     console.print(f"\n[bold green]✓ Initialized Invar v{__version__}[/bold green]")
 
-    # Show agent-specific tips
+    # Show agent-specific tips (DX-81: show all relevant tips)
     if "claude" in agents:
         console.print()
         console.print(
@@ -633,7 +663,7 @@ def init(
                 border_style="dim",
             )
         )
-    elif "pi" in agents:
+    if "pi" in agents:
         console.print()
         console.print(
             Panel(

invar/shell/pi_tools.py

@@ -0,0 +1,127 @@
+"""
+Pi Coding Agent custom tools for Invar.
+
+Provides Invar CLI commands as Pi custom tools for better LLM integration.
+"""
+
+from __future__ import annotations
+
+import shutil
+from pathlib import Path
+from typing import TYPE_CHECKING
+
+from returns.result import Failure, Result, Success
+
+if TYPE_CHECKING:
+    from rich.console import Console
+
+# Pi tools directory
+PI_TOOLS_DIR = ".pi/tools/invar"
+
+
+def get_pi_tools_template_path() -> Path:
+    """Get the path to Pi tools template."""
+    return Path(__file__).parent.parent / "templates" / "pi-tools" / "invar"
+
+
+def install_pi_tools(
+    project_path: Path,
+    console: Console,
+) -> Result[list[str], str]:
+    """
+    Install Pi custom tools for Invar.
+
+    Creates .pi/tools/invar/index.ts with:
+    - invar_guard: Wrapper for invar guard command
+    - invar_sig: Wrapper for invar sig command
+    - invar_map: Wrapper for invar map command
+    - invar_doc_toc: Extract document structure
+    - invar_doc_read: Read specific section
+    - invar_doc_find: Find sections by pattern
+    - invar_doc_replace: Replace section content
+    - invar_doc_insert: Insert content relative to section
+    - invar_doc_delete: Delete section
+    """
+    tools_dir = project_path / PI_TOOLS_DIR
+    tools_dir.mkdir(parents=True, exist_ok=True)
+
+    console.print("\n[bold]Installing Pi custom tools...[/bold]")
+    console.print("  Tools provide:")
+    console.print("    ✓ invar_guard - Smart verification (static + doctests + symbolic)")
+    console.print("    ✓ invar_sig - Show function signatures and contracts")
+    console.print("    ✓ invar_map - Symbol map with reference counts")
+    console.print("    ✓ 6 doc tools - Structured markdown editing (toc, read, find, replace, insert, delete)")
+    console.print("")
+
+    template_path = get_pi_tools_template_path()
+    tool_file = template_path / "index.ts"
+
+    if not tool_file.exists():
+        return Failure(f"Template not found: {tool_file}")
+
+    try:
+        # Copy the template file
+        dest_file = tools_dir / "index.ts"
+        shutil.copy2(tool_file, dest_file)
+
+        console.print(f"  [green]Created[/green] {PI_TOOLS_DIR}/index.ts")
+        console.print("\n  [bold green]✓ Pi custom tools installed[/bold green]")
+        console.print("  [dim]Pi will auto-discover tools in .pi/tools/[/dim]")
+        console.print("  [yellow]⚠ Restart Pi session for tools to take effect[/yellow]")
+
+        return Success(["index.ts"])
+    except Exception as e:
+        return Failure(f"Failed to install Pi tools: {e}")
+
+
+def remove_pi_tools(
+    project_path: Path,
+    console: Console,
+) -> Result[None, str]:
+    """Remove Pi custom tools."""
+    tools_dir = project_path / PI_TOOLS_DIR
+    tool_file = tools_dir / "index.ts"
+
+    if tool_file.exists():
+        tool_file.unlink()
+        console.print(f"  [red]Removed[/red] {PI_TOOLS_DIR}/index.ts")
+
+        # Remove directory if empty
+        try:
+            tools_dir.rmdir()
+            console.print(f"  [red]Removed[/red] {PI_TOOLS_DIR}/")
+        except OSError:
+            pass  # Directory not empty, keep it
+
+        console.print("[bold green]✓ Pi custom tools removed[/bold green]")
+    else:
+        console.print("[dim]No Pi custom tools installed[/dim]")
+
+    return Success(None)
+
+
+def pi_tools_status(
+    project_path: Path,
+    console: Console,
+) -> Result[dict[str, str], str]:
+    """Check status of Pi custom tools."""
+    tools_dir = project_path / PI_TOOLS_DIR
+    tool_file = tools_dir / "index.ts"
+
+    status: dict[str, str] = {}
+
+    if not tool_file.exists():
+        console.print("[dim]No Pi custom tools installed[/dim]")
+        return Success({"status": "not_installed"})
+
+    status["status"] = "installed"
+
+    # Try to check file size (basic validation)
+    try:
+        size = tool_file.stat().st_size
+        status["size"] = f"{size} bytes"
+        console.print(f"[green]✓ Pi custom tools installed[/green] ({size} bytes)")
+    except OSError:
+        console.print("[green]✓ Pi custom tools installed[/green]")
+
+    return Success(status)

invar/templates/hooks/UserPromptSubmit.sh.jinja

@@ -2,6 +2,7 @@
 # Invar UserPromptSubmit Hook
 # Protocol: v{{ protocol_version }} | Generated: {{ generated_date }}
 # DX-57: Protocol refresh with full INVAR.md injection
+# DX-79: Automatic feedback trigger via message count
 
 USER_MESSAGE="$1"
 
@@ -82,3 +83,33 @@ if [[ $COUNT -ge 25 && $((COUNT % 10)) -eq 0 ]]; then
 INVAR_EOF
   echo "</system-reminder>"
 fi
+
+# ============================================
+# DX-79: Feedback trigger at threshold
+# ============================================
+
+# Read feedback configuration
+FEEDBACK_ENABLED=true
+MIN_MESSAGES=30
+
+if [[ -f ".claude/settings.local.json" ]]; then
+  # Try to parse with jq if available, otherwise use defaults
+  if command -v jq &> /dev/null; then
+    FEEDBACK_ENABLED=$(jq -r '.feedback.enabled // true' .claude/settings.local.json 2>/dev/null)
+    MIN_MESSAGES=$(jq -r '.feedback.min_messages // 30' .claude/settings.local.json 2>/dev/null)
+  fi
+fi
+
+# Trigger feedback prompt at threshold
+if [[ "$FEEDBACK_ENABLED" == "true" && $COUNT -eq $MIN_MESSAGES ]]; then
+  echo "<system-reminder>"
+  echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+  echo "📊 Invar: Auto-triggering usage feedback ($COUNT messages)"
+  echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+  echo ""
+  echo "Session has reached $COUNT messages. Consider running /invar-reflect"
+  echo "to generate usage feedback."
+  echo ""
+  echo "To disable: Set feedback.enabled=false in .claude/settings.local.json"
+  echo "</system-reminder>"
+fi

invar/templates/hooks/pi/invar.ts.jinja

@@ -2,13 +2,16 @@
  * Invar Pi Hook
  * Protocol: v{{ protocol_version }} | Generated: {{ generated_date }}
  * LX-04: Full feature parity with Claude Code hooks
+ * DX-79: Automatic feedback trigger via message count
  *
  * Features:
  * - pytest/crosshair blocking via tool_call
  * - Protocol injection via pi.send() for long conversations
+ * - Automatic /invar-reflect trigger at message threshold
  */
 
 import type { HookAPI } from "@mariozechner/pi-coding-agent/hooks";
+import * as fs from "fs";
 
 // Blocked commands (same as Claude Code)
 {% if language == "python" -%}
@@ -22,6 +25,21 @@ const ALLOWED_FLAGS = [/--inspect/, /--coverage/, /--debug/];
 // Protocol content for injection (escaped for JS)
 const INVAR_PROTOCOL = `{{ invar_protocol_escaped }}`;
 
+// DX-79: Helper to read feedback configuration
+function readFeedbackConfig() {
+  try {
+    const settingsPath = ".claude/settings.local.json";
+    const settings = JSON.parse(fs.readFileSync(settingsPath, "utf-8"));
+    return {
+      enabled: settings.feedback?.enabled ?? true,
+      min_messages: settings.feedback?.min_messages ?? 30,
+    };
+  } catch {
+    // File doesn't exist or other error, use defaults
+  }
+  return { enabled: true, min_messages: 30 };
+}
+
 export default function (pi: HookAPI) {
   let msgCount = 0;
 
@@ -53,6 +71,21 @@ export default function (pi: HookAPI) {
       pi.send(`<system-reminder>
 === Protocol Refresh (message ${msgCount}) ===
 ${INVAR_PROTOCOL}
+</system-reminder>`);
+    }
+
+    // DX-79: Feedback trigger at threshold
+    const feedbackConfig = readFeedbackConfig();
+    if (msgCount === feedbackConfig.min_messages && feedbackConfig.enabled) {
+      pi.send(`<system-reminder>
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+📊 Invar: Auto-triggering usage feedback (${msgCount} messages)
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+Session has reached ${msgCount} messages. Consider running /invar-reflect
+to generate usage feedback.
+
+To disable: Set feedback.enabled=false in .claude/settings.local.json
 </system-reminder>`);
     }
   });
@@ -62,7 +95,8 @@ ${INVAR_PROTOCOL}
   // ============================================
   pi.on("tool_call", async (event) => {
     if (event.toolName !== "bash") return;
-    const cmd = ((event.input as Record<string, unknown>).command as string || "").trim();
+    const input = event.input as Record<string, unknown>;
+    const cmd = (typeof input?.command === "string" ? input.command : "").trim();
 
     // Skip if not a blocked command
     if (!BLOCKED_CMDS.some((p) => p.test(cmd))) return;