`a3cc97b`

Accept literal patch hunks

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 1 week ago

Status	File	+	-
M	`src/loader/tools/fs_safety.py`	8	4
M	`tests/test_bash_operator_surfaces.py`	11	0
M	`tests/test_expanded_tools.py`	27	0
M	`tests/test_safeguard_services.py`	24	0

src/loader/tools/fs_safety.pymodified

  from __future__ import annotations
 +import ast
  import json
  import re
  from dataclasses import asdict, dataclass
  ) -> list[dict[str, object] | StructuredPatchHunk]:
      """Normalize structured patch payloads from native tool callers.
 -    Some local models serialize the `hunks` array as a JSON string even though
 -    the tool schema asks for an array. Treat that as recoverable instead of
 -    rejecting an otherwise valid patch call.
 +    Some local models serialize the `hunks` array as a JSON or Python-literal
 +    string even though the tool schema asks for an array. Treat that as
 +    recoverable instead of rejecting an otherwise valid patch call.
      """
      if isinstance(value, str):
          try:
              value = json.loads(value)
          except json.JSONDecodeError:
 -            return []
 +            try:
 +                value = ast.literal_eval(value)
 +            except (SyntaxError, ValueError):
 +                return []
      if isinstance(value, StructuredPatchHunk):
          return [value]

tests/test_bash_operator_surfaces.pymodified

      assert preview.structured_patch[0].new_lines == 5
 +def test_build_file_mutation_preview_accepts_python_literal_hunks() -> None:
 +    tool_args = _replacement_block_patch_tool_args()
 +    tool_args["hunks"] = repr(tool_args["hunks"])
++
 +    preview = build_file_mutation_preview("patch", tool_args=tool_args)
++
 +    assert preview is not None
 +    assert preview.structured_patch[0].old_start == 42
 +    assert preview.structured_patch[0].new_lines == 5
++
++
  def test_cli_print_tool_call_renders_bash_panel_without_truncating(monkeypatch: pytest.MonkeyPatch) -> None:
      console = Console(record=True, width=120)
      monkeypatch.setattr(cli_main_module, "console", console)

tests/test_expanded_tools.pymodified

      assert target.read_text() == "alpha\nbeta from json string\ngamma\n"
 +@pytest.mark.asyncio
 +async def test_patch_tool_accepts_python_literal_structured_hunks(
 +    temp_dir: Path,
 +) -> None:
 +    target = temp_dir / "sample.txt"
 +    target.write_text("alpha\nbeta\ngamma\n")
 +    tool = PatchTool(workspace_root=temp_dir)
++
 +    result = await tool.execute(
 +        file_path=str(target),
 +        hunks=repr(
 +            [
 +                {
 +                    "old_start": 2,
 +                    "old_lines": 1,
 +                    "new_start": 2,
 +                    "new_lines": 1,
 +                    "lines": ["-beta", "+beta from literal string"],
 +                }
 +            ]
 +        ),
 +    )
++
 +    assert result.is_error is False
 +    assert target.read_text() == "alpha\nbeta from literal string\ngamma\n"
++
++
  @pytest.mark.asyncio
  async def test_patch_tool_rejects_context_mismatch(temp_dir: Path) -> None:
      target = temp_dir / "sample.txt"

tests/test_safeguard_services.pymodified

      assert result == ValidationResult(valid=True)
 +def test_pre_action_validator_allows_python_literal_patch_hunks() -> None:
 +    validator = PreActionValidator()
++
 +    result = validator.validate(
 +        "patch",
 +        {
 +            "file_path": "notes.txt",
 +            "hunks": repr(
 +                [
 +                    {
 +                        "old_start": 1,
 +                        "old_lines": 1,
 +                        "new_start": 1,
 +                        "new_lines": 1,
 +                        "lines": ["-old", "+new"],
 +                    }
 +                ]
 +            ),
 +        },
 +    )
++
 +    assert result == ValidationResult(valid=True)
++
++
  def test_pre_action_validator_blocks_placeholder_html_write(tmp_path: Path) -> None:
      validator = PreActionValidator()