`9eed110`

Accept whole file edit content

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

SHA: 9eed110fbbed74910c4a9a67c375104d56cf92a2
Parents: 5769ad8
Tree: 753e097

4 changed files

Status	File	+	-
M	`src/loader/runtime/dod.py`	6	2
M	`src/loader/tools/file_tools.py`	64	3
M	`tests/test_dod.py`	20	0
M	`tests/test_tools.py`	11	0

src/loader/runtime/dod.pymodified

              _append_unique(dod.touched_files, file_path)
          dod.line_changes += _count_lines(content)
      elif tool_call.name == "edit":
 -        file_path = _resolve_touched_path(tool_call.arguments.get("file_path", ""))
 +        file_path = _resolve_touched_path(
 +            tool_call.arguments.get("file_path") or tool_call.arguments.get("path", "")
 +        )
          old_string = str(tool_call.arguments.get("old_string", ""))
 -        new_string = str(tool_call.arguments.get("new_string", ""))
 +        new_string = str(
 +            tool_call.arguments.get("new_string", tool_call.arguments.get("content", ""))
 +        )
          if file_path:
              _append_unique(dod.touched_files, file_path)
          dod.line_changes += max(_count_lines(old_string), _count_lines(new_string))

src/loader/tools/file_tools.pymodified

      async def execute(
          self,
 -        file_path: str,
 -        old_string: str,
 -        new_string: str,
 +        file_path: str | None = None,
 +        old_string: str | None = None,
 +        new_string: str | None = None,
          **kwargs: Any,
      ) -> ToolResult:
          kwargs.pop("_skip_confirmation", None)
 +        if file_path is None:
 +            file_path = str(kwargs.pop("path", "") or "")
 +        replacement_content = kwargs.pop("content", None)
 +        if replacement_content is not None and (
 +            old_string is None or new_string is None
 +        ):
 +            return await self._replace_file_content(
 +                file_path,
 +                str(replacement_content),
 +            )
 +        if old_string is None or new_string is None:
 +            return ToolResult(
 +                "edit requires file_path, old_string, and new_string. "
 +                "For whole-file replacement, provide path/file_path with content.",
 +                is_error=True,
 +            )
          try:
              path = resolve_workspace_path(
                  file_path,
          except Exception as e:
              return ToolResult(f"Error editing file: {e}", is_error=True)
 +    async def _replace_file_content(
 +        self,
 +        file_path: str,
 +        new_content: str,
 +    ) -> ToolResult:
 +        try:
 +            path = resolve_workspace_path(
 +                file_path,
 +                workspace_root=self.workspace_root,
 +            )
 +        except FileNotFoundError:
 +            return ToolResult(f"File not found: {file_path}", is_error=True)
 +        except PermissionError:
 +            return ToolResult(
 +                "Whole-file edit target is outside the workspace root.",
 +                is_error=True,
 +            )
 +        except Exception as exc:
 +            return ToolResult(f"Error resolving file path: {exc}", is_error=True)
++
 +        if not path.exists():
 +            return ToolResult(f"File not found: {file_path}", is_error=True)
++
 +        try:
 +            ensure_safe_to_read(path)
 +            original_content = await asyncio.to_thread(path.read_text)
 +            ensure_safe_to_write(new_content)
 +            await asyncio.to_thread(path.write_text, new_content)
 +            structured_patch = [
 +                hunk.to_dict()
 +                for hunk in make_structured_patch(original_content, new_content)
 +            ]
 +            return ToolResult(
 +                f"Successfully edited {path}",
 +                metadata={
 +                    "file_path": str(path),
 +                    "old_string": original_content,
 +                    "new_string": new_content,
 +                    "original_file": original_content,
 +                    "structured_patch": structured_patch,
 +                },
 +            )
 +        except Exception as exc:
 +            return ToolResult(f"Error editing file: {exc}", is_error=True)
++
  class PatchTool(Tool):
      """Edit a file by applying structured patch hunks."""

tests/test_dod.pymodified

      assert dod.line_changes == 8
 +def test_record_successful_tool_call_counts_path_content_edit(tmp_path: Path) -> None:
 +    dod = create_definition_of_done("Replace generated HTML content.")
 +    target = tmp_path / "index.html"
++
 +    record_successful_tool_call(
 +        dod,
 +        ToolCall(
 +            id="edit-1",
 +            name="edit",
 +            arguments={
 +                "path": str(target),
 +                "content": "<h1>Guide</h1>\n<p>Expanded.</p>\n",
 +            },
 +        ),
 +    )
++
 +    assert dod.touched_files == [str(target)]
 +    assert dod.line_changes == 3
++
++
  def test_derive_verification_commands_adds_semantic_html_toc_check(tmp_path: Path) -> None:
      chapters = tmp_path / "chapters"
      chapters.mkdir()

tests/test_tools.pymodified

          assert not result.is_error
          assert "Modified Line 2" in sample_file.read_text()
 +    @pytest.mark.asyncio
 +    async def test_edit_accepts_path_content_replacement(self, tool, sample_file):
 +        result = await tool.execute(
 +            path=str(sample_file),
 +            content="Replacement file\nwith details\n",
 +        )
++
 +        assert not result.is_error
 +        assert sample_file.read_text() == "Replacement file\nwith details\n"
 +        assert result.metadata["structured_patch"]
++
      @pytest.mark.asyncio
      async def test_edit_nonexistent(self, tool, temp_dir):
          result = await tool.execute(