redeploy 0.2.67__tar.gz → 0.2.68__tar.gz

{redeploy-0.2.67 → redeploy-0.2.68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.67
+Version: 0.2.68
 Summary: Infrastructure migration toolkit: detect → plan → apply
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -32,17 +32,17 @@ Requires-Dist: mcp>=1.0; extra == "mcp"
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.67-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-34.2h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.68-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-35.1h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (88 commits)
-- 👤 **Human dev:** ~$3416 (34.2h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (89 commits)
+- 👤 **Human dev:** ~$3512 (35.1h @ $100/h, 30min dedup)
 
 Generated on 2026-04-23 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 
 ---
 
-![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.67-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.68-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
 
 Infrastructure migration and device deploy toolkit — VPS, Raspberry Pi kiosk, Podman Quadlet, k3s.
 

{redeploy-0.2.67 → redeploy-0.2.68}/README.md

@@ -3,17 +3,17 @@
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.67-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-34.2h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.68-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-35.1h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (88 commits)
-- 👤 **Human dev:** ~$3416 (34.2h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (89 commits)
+- 👤 **Human dev:** ~$3512 (35.1h @ $100/h, 30min dedup)
 
 Generated on 2026-04-23 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 
 ---
 
-![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.67-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.68-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
 
 Infrastructure migration and device deploy toolkit — VPS, Raspberry Pi kiosk, Podman Quadlet, k3s.
 

{redeploy-0.2.67 → redeploy-0.2.68}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "redeploy"
-version = "0.2.67"
+version = "0.2.68"
 description = "Infrastructure migration toolkit: detect → plan → apply"
 readme = "README.md"
 requires-python = ">=3.11"

{redeploy-0.2.67 → redeploy-0.2.68}/redeploy/__init__.py

@@ -7,7 +7,7 @@ Public API (stable from 0.2.0, semver guaranteed)::
 
 Everything not listed in ``__all__`` is internal and may change without notice.
 """
-__version__ = "0.2.67"
+__version__ = "0.2.68"
 
 # ── Core models ───────────────────────────────────────────────────────────────
 from .models import (  # noqa: F401

{redeploy-0.2.67 → redeploy-0.2.68}/redeploy/cli/commands/prompt_cmd.py

@@ -121,6 +121,8 @@ def _call_llm(schema: dict, user_prompt: str) -> str:
 
 def _parse_llm_response(raw: str) -> dict:
     """Parse JSON from LLM response, strip accidental fences and escape control characters."""
+    import re
+
     # Strip ```json ... ``` if present
     clean = raw.strip()
     if clean.startswith("```"):
@@ -129,18 +131,92 @@ def _parse_llm_response(raw: str) -> dict:
             line for line in lines
             if not line.strip().startswith("```")
         )
+
+    # Extract innermost balanced {...} if extra text surrounds it
+    def _extract_json(text: str) -> str:
+        start = text.find("{")
+        if start == -1:
+            return text
+        depth = 0
+        for i, ch in enumerate(text[start:], start):
+            if ch == "{":
+                depth += 1
+            elif ch == "}":
+                depth -= 1
+                if depth == 0:
+                    return text[start : i + 1]
+        return text
+
+    clean = _extract_json(clean)
+
     # Escape control characters (except \n, \r, \t) for JSON safety
     def escape_control_char(match):
         char = match.group(0)
-        # Keep allowed whitespace, escape others as \uXXXX
         if char in "\n\r\t":
             return char
         return f"\\u{ord(char):04x}"
-    
-    # Match any control character (ord < 32) except \n, \r, \t
-    import re
+
     clean = re.sub(r"[\x00-\x08\x0b\x0c\x0e-\x1f]", escape_control_char, clean)
-    return json.loads(clean)
+
+    # Try strict parse first
+    try:
+        return json.loads(clean)
+    except json.JSONDecodeError:
+        pass
+
+    # Fallback: try ujson (more lenient with some LLM quirks) if available
+    try:
+        import ujson
+        return ujson.loads(clean)
+    except Exception:
+        pass
+
+    # Repair trailing commas before ] or }
+    repaired = re.sub(r",(\s*[}\]])", r"\1", clean)
+    try:
+        return json.loads(repaired)
+    except json.JSONDecodeError:
+        pass
+
+    # Repair raw newlines inside string values by escaping them
+    def _escape_newlines_in_strings(text: str) -> str:
+        result = []
+        in_string = False
+        escape = False
+        for ch in text:
+            if escape:
+                result.append(ch)
+                escape = False
+                continue
+            if ch == "\\":
+                result.append(ch)
+                escape = True
+                continue
+            if ch == '"' and not in_string:
+                in_string = True
+                result.append(ch)
+                continue
+            if ch == '"' and in_string:
+                in_string = False
+                result.append(ch)
+                continue
+            if ch == "\n" and in_string:
+                result.append("\\n")
+                continue
+            if ch == "\r" and in_string:
+                result.append("\\r")
+                continue
+            result.append(ch)
+        return "".join(result)
+
+    repaired = _escape_newlines_in_strings(clean)
+    try:
+        return json.loads(repaired)
+    except json.JSONDecodeError:
+        pass
+
+    # Last resort: raise original error with cleaned text for debugging
+    raise json.JSONDecodeError("Failed to parse LLM JSON after all repairs", clean, 0)
 
 
 # ---------------------------------------------------------------------------

{redeploy-0.2.67 → redeploy-0.2.68}/redeploy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.67
+Version: 0.2.68
 Summary: Infrastructure migration toolkit: detect → plan → apply
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -32,17 +32,17 @@ Requires-Dist: mcp>=1.0; extra == "mcp"
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.67-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-34.2h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.68-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-35.1h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (88 commits)
-- 👤 **Human dev:** ~$3416 (34.2h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (89 commits)
+- 👤 **Human dev:** ~$3512 (35.1h @ $100/h, 30min dedup)
 
 Generated on 2026-04-23 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 
 ---
 
-![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.67-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.68-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
 
 Infrastructure migration and device deploy toolkit — VPS, Raspberry Pi kiosk, Podman Quadlet, k3s.
 

{redeploy-0.2.67 → redeploy-0.2.68}/tests/test_prompt_llm.py

@@ -369,3 +369,53 @@ def test_parse_llm_response_preserves_newlines():
     
     result = _parse_llm_response(response_with_whitespace)
     assert "Line 1\nLine 2\rLine 3\tTabbed" in result["thought"]
+
+
+def test_parse_llm_response_handles_trailing_commas():
+    """_parse_llm_response must repair trailing commas before } or ]."""
+    from redeploy.cli.commands.prompt_cmd import _parse_llm_response
+    
+    response_with_trailing_comma = '''{
+  "thought": "test",
+  "argv": ["redeploy", "status",],
+  "confirm": false,
+  "human_summary": "Status check",
+}'''
+    
+    result = _parse_llm_response(response_with_trailing_comma)
+    assert result["argv"] == ["redeploy", "status"]
+    assert result["confirm"] is False
+
+
+def test_parse_llm_response_handles_raw_newlines_in_strings():
+    """_parse_llm_response must escape raw newlines that appear inside JSON strings."""
+    from redeploy.cli.commands.prompt_cmd import _parse_llm_response
+    
+    response_with_raw_newlines = '''{
+  "thought": "Line one
+Line two",
+  "argv": ["redeploy", "status"],
+  "confirm": false,
+  "human_summary": "Status check"
+}'''
+    
+    result = _parse_llm_response(response_with_raw_newlines)
+    assert "Line one\nLine two" in result["thought"]
+
+
+def test_parse_llm_response_extracts_json_from_surrounding_text():
+    """_parse_llm_response must find the JSON object if the LLM adds extra text."""
+    from redeploy.cli.commands.prompt_cmd import _parse_llm_response
+    
+    response_with_extra_text = '''Here is the JSON you requested:
+{
+  "thought": "test",
+  "argv": ["redeploy", "status"],
+  "confirm": false,
+  "human_summary": "Status check"
+}
+Hope that helps!'''
+    
+    result = _parse_llm_response(response_with_extra_text)
+    assert result["argv"] == ["redeploy", "status"]
+    assert result["confirm"] is False