uni-diff-patch 0.0.2__py3-none-any.whl → 0.0.4__py3-none-any.whl

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:

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

@@ -66,8 +66,19 @@ def generate_patch_tool(
 ) -> dict:
     """Generate a valid unified diff patch from structured file changes.
 
-    Each change object must have a "mode" field to select the change type,
-    plus mode-specific fields. The mode determines which fields are required.
+    Each change object must include a "mode" field and its mode-specific fields.
+    Use EXACT field names listed below — no aliases accepted.
+
+    Supported modes and required fields:
+    - file_content: file_path, new_content (full new file content; reads original from disk)
+    - search_replace: file_path, replacements (list of {search, replace, line_hint?})
+    - create_file: file_path, new_content (content for the new file)
+    - delete_file: file_path
+    - text_pair: file_path, old_text, new_text (both sides provided directly)
+    - rename_file: file_path (old path), new_path, new_content? (optional content change)
+    - chmod: file_path, old_mode, new_mode, new_content? (optional content change)
+
+    Optional shared fields: encoding (default "utf-8"), context_lines (default 3).
 
     Args:
         changes: Array of change objects (discriminated by "mode" field).

{uni_diff_patch-0.0.2.dist-info → uni_diff_patch-0.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: uni-diff-patch
-Version: 0.0.2
+Version: 0.0.4
 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.4.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=F377tvVLomnCfeB_owc4VkH5v-cuJPEVWvOTErfR81g,5660
+uni_diff_patch-0.0.4.dist-info/WHEEL,sha256=r-Se0i_n47Mj8pdnVuq7W628oP9YAKMaTjp4l3lQcns,81
+uni_diff_patch-0.0.4.dist-info/entry_points.txt,sha256=SMaBpCbADshKmWiXYPpy_PSVvKWf0KQcwNJXi_FIsoM,60
+uni_diff_patch-0.0.4.dist-info/METADATA,sha256=C4OTLvkswEXWs9a_wKiUZQGCVVnQ9sIK-Jio2Q-YBho,4870
+uni_diff_patch-0.0.4.dist-info/RECORD,,

{uni_diff_patch-0.0.2.dist-info → uni_diff_patch-0.0.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.11.29
+Generator: uv 0.11.31
 Root-Is-Purelib: true
 Tag: py3-none-any

uni_diff_patch-0.0.2.dist-info/RECORD

@@ -1,13 +0,0 @@
-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=VHSk80sqiSciWaZe8BRWkokOM8Z9Gldy2sXe69Ve5C0,13897
-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=9mswkL4i0zfMczEtHJFd3MQKkK-SPQln2H2KyUgJ1Hw,5014
-uni_diff_patch-0.0.2.dist-info/WHEEL,sha256=YR4QUxGCbsyoOnWBVTv-p1I4yc3seKGPev46mvmc8Cg,81
-uni_diff_patch-0.0.2.dist-info/entry_points.txt,sha256=SMaBpCbADshKmWiXYPpy_PSVvKWf0KQcwNJXi_FIsoM,60
-uni_diff_patch-0.0.2.dist-info/METADATA,sha256=j_t4J2YYyIO0xlq-efZcbH3nqZoSiPAnCoftxJR1Uzc,4870
-uni_diff_patch-0.0.2.dist-info/RECORD,,