Agent Zero AI framework
improve: text_editor add mtime checks and prompts for patch read validation
linuztxa5a1e02bad34
diff --git a/plugins/text_editor/prompts/fw.text_editor.patch_need_read.md b/plugins/text_editor/prompts/fw.text_editor.patch_need_read.mdnew file mode 100644index 000000000..e02f7defa--- /dev/null+++ b/plugins/text_editor/prompts/fw.text_editor.patch_need_read.md@@ -0,0 +1 @@+error patching {{path}}: read file before patching - line numbers unknowndiff --git a/plugins/text_editor/prompts/fw.text_editor.patch_stale_read.md b/plugins/text_editor/prompts/fw.text_editor.patch_stale_read.mdnew file mode 100644index 000000000..c94ed0799--- /dev/null+++ b/plugins/text_editor/prompts/fw.text_editor.patch_stale_read.md@@ -0,0 +1 @@+error patching {{path}}: file changed since last read - re-read to get current line numbersdiff --git a/plugins/text_editor/tools/text_editor.py b/plugins/text_editor/tools/text_editor.pyindex 6ade8048f..3050e1c1d 100644--- a/plugins/text_editor/tools/text_editor.py+++ b/plugins/text_editor/tools/text_editor.py@@ -10,6 +10,10 @@ from plugins.text_editor.helpers.file_ops import (apply_patch,)+# Key used in agent.data to store file mtimes+_MTIME_KEY = "_text_editor_mtimes"++class TextEditor(Tool):@@ -49,6 +53,8 @@ class TextEditor(Tool):if result.error:return self._error("read", path, result.error)+ _record_mtime(self.agent, os.path.expanduser(path))+# Extension pointext_data = {"content": result.content, "warnings": result.warnings}await call_extensions(@@ -89,6 +95,8 @@ class TextEditor(Tool):)expanded = os.path.expanduser(path)+ _record_mtime(self.agent, expanded)+cfg = _get_config(self.agent)read_result = read_file(expanded,@@ -117,6 +125,11 @@ class TextEditor(Tool):if not os.path.isfile(expanded):return self._error("patch", path, "file not found")+ stale_err = _check_mtime(self.agent, expanded)+ if stale_err:+ return self._error("patch", path, stale_err)++parsed, err = validate_edits(edits)if err:return self._error("patch", path, err)@@ -138,6 +151,8 @@ class TextEditor(Tool):data={"path": expanded, "total_lines": total_lines},)+ _record_mtime(self.agent, expanded)+patch_content = _read_patch_region(expanded, ext_data["edits"], total_lines, _get_config(self.agent))@@ -168,7 +183,6 @@ class TextEditor(Tool):def _read_patch_region(path: str, edits: list[dict], total_lines: int, cfg: dict) -> str:- """Read back the affected region after a patch so the LLM sees the result."""if not edits:return ""@@ -194,6 +208,32 @@ def _read_patch_region()return result.content++def _record_mtime(agent, path: str):+ mtimes = agent.data.setdefault(_MTIME_KEY, {})+ try:+ mtimes[os.path.realpath(path)] = os.path.getmtime(path)+ except OSError:+ pass+++def _check_mtime(agent, path: str) -> str:+ mtimes = agent.data.get(_MTIME_KEY, {})+ real = os.path.realpath(path)+ if real not in mtimes:+ return agent.read_prompt(+ "fw.text_editor.patch_need_read.md", path=path+ )+ try:+ current = os.path.getmtime(path)+ except OSError:+ return ""+ if current != mtimes[real]:+ return agent.read_prompt(+ "fw.text_editor.patch_stale_read.md", path=path+ )+ return ""+# ------------------------------------------------------------------# Config# ------------------------------------------------------------------