invar-tools 1.17.12__tar.gz → 1.17.14__tar.gz

{invar_tools-1.17.12 → invar_tools-1.17.14}/.invar/context.md

@@ -51,10 +51,10 @@
 
 ## Current State
 
- - **PyPI:** `invar-tools` v1.17.11 + `invar-runtime` v1.3.0
-- **Protocol:** v5.0 (USBV workflow, DX-58 critical section)
-- **Status:** Feature complete, TypeScript tooling production-ready
-- **Recent:** DX-22 (Fix-or-Explain complexity), LX-06 (Unbundled eslint-plugin), DX-81 (Multi-agent init)
+ - **PyPI:** `invar-tools` v1.17.12 + `invar-runtime` v1.3.0
+ - **Protocol:** v5.0 (USBV workflow, DX-58 critical section)
+ - **Status:** Feature complete, TypeScript tooling production-ready
+ - **Recent:** DX-22 (Fix-or-Explain complexity), LX-06 (Unbundled eslint-plugin), DX-81 (Multi-agent init), v1.17.11 (Agent First output)
 - **Blockers:** None
 
 ## Active Work

{invar_tools-1.17.12 → invar_tools-1.17.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invar-tools
-Version: 1.17.12
+Version: 1.17.14
 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.12 → invar_tools-1.17.14}/pyproject.toml

@@ -15,7 +15,7 @@ ignore-vcs = true
 
 [project]
 name = "invar-tools"
-version = "1.17.12"
+version = "1.17.14"
 description = "AI-native software engineering tools with design-by-contract verification"
 readme = "README.md"
 license = "GPL-3.0-or-later"

{invar_tools-1.17.12 → invar_tools-1.17.14}/src/invar/mcp/handlers.py

@@ -427,11 +427,24 @@ async def _execute_command(
             timeout=timeout,
         )
 
+        stdout = result.stdout.strip()
+
+        # Try to parse as JSON
         try:
-            parsed = json.loads(result.stdout)
+            parsed = json.loads(stdout)
             return ([TextContent(type="text", text=json.dumps(parsed, indent=2))], parsed)
         except json.JSONDecodeError:
-            output = result.stdout
+            # Try to fix unescaped newlines in JSON strings
+            # Guard/map commands may output multiline JSON with literal newlines
+            fixed = _fix_json_newlines(stdout)
+            try:
+                parsed = json.loads(fixed)
+                return ([TextContent(type="text", text=json.dumps(parsed, indent=2))], parsed)
+            except json.JSONDecodeError:
+                pass
+
+            # Fall back to text output
+            output = stdout
             if result.stderr:
                 output += f"\n\nStderr:\n{result.stderr}"
             return [TextContent(type="text", text=output)]
@@ -440,3 +453,46 @@ async def _execute_command(
         return [TextContent(type="text", text=f"Error: Command timed out ({timeout}s)")]
     except Exception as e:
         return [TextContent(type="text", text=f"Error: {e}")]
+
+
+# @invar:allow shell_too_complex: Simple state machine, 6 branches is minimal
+# @invar:allow shell_pure_logic: No I/O, but called from shell context
+# @invar:allow shell_result: Pure transformation, returns str not Result
+def _fix_json_newlines(text: str) -> str:
+    """Fix unescaped newlines in JSON strings.
+
+    When subprocess outputs multiline JSON, newlines inside string values
+    are not escaped, causing json.loads() to fail. This function escapes them.
+
+    DX-33: Escape hatch for complex pure logic helper.
+    """
+    result = []
+    i = 0
+    while i < len(text):
+        if text[i] == '"':
+            # Inside a string - collect until closing quote
+            result.append('"')
+            i += 1
+            while i < len(text):
+                c = text[i]
+                if c == "\\" and i + 1 < len(text):
+                    # Escaped character - keep as is
+                    result.append("\\")
+                    result.append(text[i + 1])
+                    i += 2
+                elif c == '"':
+                    # End of string
+                    result.append('"')
+                    i += 1
+                    break
+                elif c == "\n" or c == "\r":
+                    # Unescaped newline - escape it
+                    result.append("\\n")
+                    i += 1
+                else:
+                    result.append(c)
+                    i += 1
+        else:
+            result.append(text[i])
+            i += 1
+    return "".join(result)

{invar_tools-1.17.12 → invar_tools-1.17.14}/src/invar/shell/commands/guard.py

@@ -190,12 +190,28 @@ def guard(
         ts_result = run_typescript_guard(path if path.is_dir() else find_project_root(path))
         match ts_result:
             case Success(result):
-                import json as json_mod
+                if human:
+                    # Human-readable Rich output
+                    from invar.shell.prove.guard_ts import format_typescript_guard_v2
+
+                    output = format_typescript_guard_v2(result)
+                    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}")
+                else:
+                    # JSON output for agents
+                    import json as json_mod
 
-                from invar.shell.prove.guard_ts import format_typescript_guard_v2
+                    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))
+                    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}")