fixup CI

Author: dmcilvaney

.github/workflows/scripts/check_rendered_specs.py

@@ -264,7 +264,7 @@ def format_comment(report: dict, artifacts_url: str | None = None) -> str:
         "",
     ]
 
-    if artifacts_url and content_diffs:
+    if artifacts_url:
         lines.append(
             "Or download and apply the fix patch from the "
             f"[workflow artifacts]({artifacts_url}#artifacts):"
@@ -355,15 +355,87 @@ def format_comment(report: dict, artifacts_url: str | None = None) -> str:
     return "\n".join(lines)
 
 
-def generate_patch(content_diffs: list[dict]) -> str:
-    """Generate a git diff patch for files with real content diffs."""
-    if not content_diffs:
-        return ""
-    paths = [d["path"] for d in content_diffs]
-    try:
-        return _git("diff", "--", *paths)
-    except subprocess.CalledProcessError:
-        return ""
+def generate_patch(
+    content_diffs: list[dict],
+    extra_files: list[str],
+    missing_files: list[str],
+) -> str:
+    """Generate a git patch covering all detected drift.
+
+    - Modified files: standard git diff
+    - Extra (untracked) files: added via git diff --no-index /dev/null <file>
+    - Missing (deleted) files: removal diffs via diff header with empty content
+    """
+    parts: list[str] = []
+
+    # Modified files
+    if content_diffs:
+        paths = [d["path"] for d in content_diffs]
+        try:
+            parts.append(_git("diff", "--", *paths))
+        except subprocess.CalledProcessError:
+            pass
+
+    # Extra files — generate "new file" diffs
+    for path_str in extra_files:
+        file_path = Path(path_str)
+        try:
+            content = file_path.read_bytes()
+        except (FileNotFoundError, OSError):
+            continue
+        # Check if binary
+        try:
+            text = content.decode("utf-8")
+        except UnicodeDecodeError:
+            parts.append(
+                f"diff --git a/{path_str} b/{path_str}\n"
+                f"new file mode 100644\n"
+                f"Binary files /dev/null and b/{path_str} differ\n"
+            )
+            continue
+        lines = text.splitlines(keepends=True)
+        n = len(lines)
+        diff_body = "".join(f"+{line}" if line.endswith("\n") else f"+{line}\n\\ No newline at end of file\n" for line in lines)
+        parts.append(
+            f"diff --git a/{path_str} b/{path_str}\n"
+            f"new file mode 100644\n"
+            f"--- /dev/null\n"
+            f"+++ b/{path_str}\n"
+            f"@@ -0,0 +1,{n} @@\n"
+            f"{diff_body}"
+        )
+
+    # Missing files — generate deletion diffs
+    for path_str in missing_files:
+        try:
+            committed_bytes = subprocess.run(
+                ["git", "show", f"HEAD:{path_str}"],
+                capture_output=True, check=True,
+            ).stdout
+        except subprocess.CalledProcessError:
+            continue
+        try:
+            text = committed_bytes.decode("utf-8")
+        except UnicodeDecodeError:
+            parts.append(
+                f"diff --git a/{path_str} b/{path_str}\n"
+                f"deleted file mode 100644\n"
+                f"Binary files a/{path_str} and /dev/null differ\n"
+            )
+            continue
+        lines = text.splitlines(keepends=True)
+        n = len(lines)
+        diff_body = "".join(f"-{line}" if line.endswith("\n") else f"-{line}\n\\ No newline at end of file\n" for line in lines)
+        parts.append(
+            f"diff --git a/{path_str} b/{path_str}\n"
+            f"deleted file mode 100644\n"
+            f"--- a/{path_str}\n"
+            f"+++ /dev/null\n"
+            f"@@ -1,{n} +0,0 @@\n"
+            f"{diff_body}"
+        )
+
+    return "".join(parts)
 
 
 # ---------------------------------------------------------------------------
@@ -492,16 +564,16 @@ def main() -> int:
             json.dump(report, f, indent=2)
         print(f"Report written to {args.report}")
 
-    # 3b. Generate patch for real content diffs
-    if args.patch and content_diffs:
-        patch_content = generate_patch(content_diffs)
+    total = len(content_diffs) + len(extra) + len(missing)
+
+    # 3b. Generate patch for all drift
+    if args.patch and total > 0:
+        patch_content = generate_patch(content_diffs, extra, missing)
         if patch_content:
             args.patch.parent.mkdir(parents=True, exist_ok=True)
             args.patch.write_text(patch_content, encoding="utf-8")
             print(f"Patch written to {args.patch}")
 
-    total = len(content_diffs) + len(extra) + len(missing)
-
     # 4. Post comment or clean up (best-effort — exit code is authoritative)
     if args.repo and args.pr:
         try: