uni-diff-patch 0.0.1__py3-none-any.whl → 0.0.3__py3-none-any.whl

uni_diff_patch/cli.py

@@ -46,11 +46,17 @@ def main() -> None:
     is_flag=True,
     help="Overwrite existing output file.",
 )
+@click.option(
+    "--no-append",
+    is_flag=True,
+    help="Disable append mode (default appends to existing file).",
+)
 def generate(
     spec_source: str,
     output_override: str | None,
     work_dir: str | None,
     overwrite: bool,
+    no_append: bool,
 ) -> None:
     """Generate a unified diff patch from a JSON spec.
 
@@ -91,6 +97,7 @@ def generate(
             output_path=final_output,
             work_dir=work_dir,
             overwrite=overwrite,
+            append=not no_append,
         )
     except (DiffGenerationError, SearchReplaceError) as e:
         raise click.ClickException(str(e))

uni_diff_patch/core/diff_engine.py

@@ -263,12 +263,18 @@ def _generate_single_diff(
                     f"{change.file_path}"
                 )
             patch_path = _make_patch_path(change.file_path, work_dir)
-            return _create_unified_diff(patch_path, "", change.new_content, 3)
+            diff = _create_unified_diff(patch_path, "", change.new_content, 3)
+            # 替换 --- 行为 /dev/null，标准的新建文件格式
+            diff = diff.replace(f"--- a/{patch_path}", "--- /dev/null", 1)
+            return diff
 
         case DeleteFileChange():
             old = _read_file(change.file_path, change.encoding)
             patch_path = _make_patch_path(change.file_path, work_dir)
-            return _create_unified_diff(patch_path, old, "", 3)
+            diff = _create_unified_diff(patch_path, old, "", 3)
+            # 替换 +++ 行为 /dev/null，让 git apply 真正删除文件
+            diff = diff.replace(f"+++ b/{patch_path}", "+++ /dev/null", 1)
+            return diff
 
         case TextPairChange():
             if change.old_text == change.new_text:
@@ -315,6 +321,7 @@ def generate_patch(
     work_dir: str | None = None,
     self_validate: bool = True,
     overwrite: bool = False,
+    append: bool = True,
 ) -> GenerateResult:
     """Generate a unified diff patch from one or more file changes.
 
@@ -325,6 +332,8 @@ def generate_patch(
             Defaults to current working directory.
         self_validate: If True, validate the generated patch with mpatch.parse_auto.
         overwrite: If True, overwrite existing output files. Default False.
+        append: If True, append to existing output file instead of overwriting.
+            Useful for incremental patch generation (e.g. Codex workflow).
 
     Returns:
         GenerateResult with the patch string and metadata.
@@ -391,12 +400,18 @@ def generate_patch(
 
     if output_path is not None:
         out = Path(output_path)
-        if out.exists() and not overwrite:
+        out.parent.mkdir(parents=True, exist_ok=True)
+        if append and out.exists():
+            # 追加模式：在已有 diff 后追加新内容
+            existing = out.read_text(encoding="utf-8")
+            separator = "\n" if existing and not existing.endswith("\n") else ""
+            out.write_text(existing + separator + combined, encoding="utf-8")
+        elif out.exists() and not overwrite:
             raise DiffGenerationError(
                 f"Output file already exists: {output_path}. "
-                f"Use overwrite=True to replace."
+                f"Use overwrite=True to replace, or append=True to append."
             )
-        out.parent.mkdir(parents=True, exist_ok=True)
-        out.write_text(combined, encoding="utf-8")
+        else:
+            out.write_text(combined, encoding="utf-8")
 
     return result

uni_diff_patch/core/validator.py

@@ -44,39 +44,57 @@ def _parse_header_only_diffs(content: str) -> list[FileInfo]:
     """Parse git extended header-only diffs (rename, chmod without content changes).
 
     mpatch.parse_auto cannot parse these since they have no hunk body.
-    We detect them by looking for 'diff --git' lines followed by
-    rename/mode headers without any @@ hunk markers.
+    We detect them by scanning for 'diff --git' lines and checking the
+    header section (between 'diff --git' and the first '---' or next
+    'diff --git') for rename/mode patterns.
 
     Returns:
         List of FileInfo for recognized header-only diffs, empty if none found.
     """
     files: list[FileInfo] = []
-    # 匹配 "diff --git a/X b/Y" 块
-    diff_blocks = re.split(r"(?=^diff --git )", content, flags=re.MULTILINE)
-    for block in diff_blocks:
-        block = block.strip()
-        if not block.startswith("diff --git "):
-            continue
-        # 如果有 @@ hunk，mpatch 应该已经处理了，这里只处理无 hunk 的
-        if "@@" in block:
+    lines = content.split("\n")
+    i = 0
+    while i < len(lines):
+        line = lines[i]
+        if not line.startswith("diff --git "):
+            i += 1
             continue
 
         # 提取文件路径
-        first_line = block.split("\n")[0]
-        m = re.match(r"diff --git a/(.+?) b/(.+)", first_line)
+        m = re.match(r"diff --git a/(.+?) b/(.+)", line)
         if not m:
+            i += 1
             continue
 
         file_path = m.group(2)
-        is_rename = "rename from" in block
-        is_chmod = "old mode" in block or "new mode" in block
 
-        if is_rename or is_chmod:
-            files.append(FileInfo(
-                file_path=file_path,
-                hunk_count=0,
-                is_creation=False,
-            ))
+        # 收集 header 行（diff --git 之后到下一个 diff --git / --- / 空内容）
+        header_lines: list[str] = []
+        has_hunk = False
+        j = i + 1
+        while j < len(lines):
+            l = lines[j]
+            if l.startswith("diff --git ") or l.startswith("--- "):
+                break
+            if l.startswith("@@ "):
+                has_hunk = True
+                break
+            header_lines.append(l)
+            j += 1
+
+        # 只处理无 hunk body 的 header-only diff
+        if not has_hunk:
+            header_text = "\n".join(header_lines)
+            is_rename = "rename from" in header_text
+            is_chmod = "old mode" in header_text or "new mode" in header_text
+            if is_rename or is_chmod:
+                files.append(FileInfo(
+                    file_path=file_path,
+                    hunk_count=0,
+                    is_creation=False,
+                ))
+
+        i = j if j > i + 1 else i + 1
 
     return files
 
@@ -142,19 +160,21 @@ def validate_patch(
         return ValidationResult(valid=False, parse_error=str(e))
 
     # mpatch.parse_auto 无法解析 header-only diff（纯 rename/chmod）
-    # 如果 parse 结果为空，检查是否包含 git 扩展 header
-    if not patches:
-        header_files = _parse_header_only_diffs(patch_content)
-        if header_files:
-            return ValidationResult(
-                valid=True, files=header_files, total_hunks=0,
-            )
+    # 始终检查 header-only diff，与 parse_auto 结果合并
+    header_files = _parse_header_only_diffs(patch_content)
+
+    if not patches and not header_files:
         return ValidationResult(
             valid=False, parse_error="No patches found in content"
         )
 
     files: list[FileInfo] = []
     total_hunks = 0
+
+    # header-only diff（rename/chmod 无 hunk body）
+    files.extend(header_files)
+
+    # hunked diff（mpatch 解析结果）
     for p in patches:
         hunk_count = len(p)
         total_hunks += hunk_count

uni_diff_patch/server.py

@@ -62,6 +62,7 @@ def generate_patch_tool(
     output_path: str | None = None,
     work_dir: str | None = None,
     overwrite: bool = False,
+    append: bool = True,
 ) -> dict:
     """Generate a valid unified diff patch from structured file changes.
 
@@ -73,6 +74,8 @@ def generate_patch_tool(
         output_path: Optional file path to write the patch to.
         work_dir: Base directory for relativizing absolute paths in diff headers.
         overwrite: If true, overwrite existing output file. Default false.
+        append: If true (default), append to existing output file.
+            Set to false to require a fresh file.
 
     Returns:
         Dict with patch, files_changed, self_valid, skipped_files, or error.
@@ -83,6 +86,7 @@ def generate_patch_tool(
             output_path=output_path,
             work_dir=work_dir,
             overwrite=overwrite,
+            append=append,
         )
         return {
             "patch": result.patch,

{uni_diff_patch-0.0.1.dist-info → uni_diff_patch-0.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: uni-diff-patch
-Version: 0.0.1
+Version: 0.0.3
 Summary: MCP server and CLI tool for generating valid unified diff patches deterministically
 Author: LimLLL
 Author-email: LimLLL <github@awebapp.useforall.com>

uni_diff_patch-0.0.3.dist-info/RECORD

@@ -0,0 +1,13 @@
+uni_diff_patch/__init__.py,sha256=QZHH9fShZy0Uae-0TF-6HN35C_3nCbGHcYE56eNy83E,1066
+uni_diff_patch/cli.py,sha256=IgqlrUySgehRRNbY1h-vgkXt0jiKU8zKJRyJWVWRREI,5286
+uni_diff_patch/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+uni_diff_patch/core/diff_engine.py,sha256=E2-ZPkgyXv3QrQUFAMGh4t97Tvj-_gxbPZ6W6ItL_bY,14244
+uni_diff_patch/core/search_replace.py,sha256=kwUfr-SqB9oZJwXK0A3LOEmccXi_fx5SGQD_MPN83Rk,4592
+uni_diff_patch/core/validator.py,sha256=ZXO5xNCGNu1MjWr2r3xgWQA7mmMwAiWl03Rn-vBqnBk,7160
+uni_diff_patch/models.py,sha256=M7PcWRcUWUz0CO8MK7z5CDwYxpoN-MCmihvAq7zH9x0,6154
+uni_diff_patch/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+uni_diff_patch/server.py,sha256=9mswkL4i0zfMczEtHJFd3MQKkK-SPQln2H2KyUgJ1Hw,5014
+uni_diff_patch-0.0.3.dist-info/WHEEL,sha256=YR4QUxGCbsyoOnWBVTv-p1I4yc3seKGPev46mvmc8Cg,81
+uni_diff_patch-0.0.3.dist-info/entry_points.txt,sha256=SMaBpCbADshKmWiXYPpy_PSVvKWf0KQcwNJXi_FIsoM,60
+uni_diff_patch-0.0.3.dist-info/METADATA,sha256=UtsHSKzmdqwqkqeLn-qzjlnbkF-DlhaV9NG2hxgDTEE,4870
+uni_diff_patch-0.0.3.dist-info/RECORD,,

uni_diff_patch-0.0.1.dist-info/RECORD

@@ -1,13 +0,0 @@
-uni_diff_patch/__init__.py,sha256=QZHH9fShZy0Uae-0TF-6HN35C_3nCbGHcYE56eNy83E,1066
-uni_diff_patch/cli.py,sha256=XyqjzIUHsli_SGBkbFxxOL7Y02NY_Wz7x54fGgZDE9I,5109
-uni_diff_patch/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-uni_diff_patch/core/diff_engine.py,sha256=lARXSa8iacdLRRZlxI_H21hgwf2q9HC1PR1Ob0oddjI,13358
-uni_diff_patch/core/search_replace.py,sha256=kwUfr-SqB9oZJwXK0A3LOEmccXi_fx5SGQD_MPN83Rk,4592
-uni_diff_patch/core/validator.py,sha256=qf66MXYT3zvHsqQ3l6PlvyK5Go6_DXu89QcIIxlE5cg,6639
-uni_diff_patch/models.py,sha256=M7PcWRcUWUz0CO8MK7z5CDwYxpoN-MCmihvAq7zH9x0,6154
-uni_diff_patch/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-uni_diff_patch/server.py,sha256=NAjVofdUUqL3VI3AgtCT7ky7Csf9atSenF6d3-734cM,4845
-uni_diff_patch-0.0.1.dist-info/WHEEL,sha256=YR4QUxGCbsyoOnWBVTv-p1I4yc3seKGPev46mvmc8Cg,81
-uni_diff_patch-0.0.1.dist-info/entry_points.txt,sha256=SMaBpCbADshKmWiXYPpy_PSVvKWf0KQcwNJXi_FIsoM,60
-uni_diff_patch-0.0.1.dist-info/METADATA,sha256=mK4hc0wOlTpdUdyfNvtxTvZJf4cRY3uQ73_7vYX-sM4,4870
-uni_diff_patch-0.0.1.dist-info/RECORD,,