invar-tools 1.17.12__py3-none-any.whl → 1.17.14__py3-none-any.whl

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/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}")

{invar_tools-1.17.12.dist-info → invar_tools-1.17.14.dist-info}/METADATA

@@ -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.dist-info → invar_tools-1.17.14.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=3khWBATWxV4TwHPm6Gnr9pWfGaPyxf5p8yR-pnJhDtg,16756
+invar/mcp/handlers.py,sha256=VQGpFG6voBOXML2TtBFyU_lkCTn83yF4GwmMvl2gxvI,18762
 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=jlAExTLnOVUI_FCIViLHlqo1B_hVVC91h-Ac6xfv6HA,24433
+invar/shell/commands/guard.py,sha256=I1BDqthsAVmz8FnUgwkbhvy2cozmOfjs3rxQwwqFemo,25391
 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.12.dist-info/METADATA,sha256=yPbRFLkoRTEBUOo-aLsAq9rf0UC3OzdMYWjdxXR-RFM,28596
-invar_tools-1.17.12.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-invar_tools-1.17.12.dist-info/entry_points.txt,sha256=RwH_EhqgtFPsnO6RcrwrAb70Zyfb8Mh6uUtztWnUxGk,102
-invar_tools-1.17.12.dist-info/licenses/LICENSE,sha256=qeFksp4H4kfTgQxPCIu3OdagXyiZcgBlVfsQ6M5oFyk,10767
-invar_tools-1.17.12.dist-info/licenses/LICENSE-GPL,sha256=IvZfC6ZbP7CLjytoHVzvpDZpD-Z3R_qa1GdMdWlWQ6Q,35157
-invar_tools-1.17.12.dist-info/licenses/NOTICE,sha256=joEyMyFhFY8Vd8tTJ-a3SirI0m2Sd0WjzqYt3sdcglc,2561
-invar_tools-1.17.12.dist-info/RECORD,,
+invar_tools-1.17.14.dist-info/METADATA,sha256=TC_Puck2FidWoZbAcQOGw7HmWg5F9fjAqY0mY-yRX-g,28596
+invar_tools-1.17.14.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+invar_tools-1.17.14.dist-info/entry_points.txt,sha256=RwH_EhqgtFPsnO6RcrwrAb70Zyfb8Mh6uUtztWnUxGk,102
+invar_tools-1.17.14.dist-info/licenses/LICENSE,sha256=qeFksp4H4kfTgQxPCIu3OdagXyiZcgBlVfsQ6M5oFyk,10767
+invar_tools-1.17.14.dist-info/licenses/LICENSE-GPL,sha256=IvZfC6ZbP7CLjytoHVzvpDZpD-Z3R_qa1GdMdWlWQ6Q,35157
+invar_tools-1.17.14.dist-info/licenses/NOTICE,sha256=joEyMyFhFY8Vd8tTJ-a3SirI0m2Sd0WjzqYt3sdcglc,2561
+invar_tools-1.17.14.dist-info/RECORD,,