From 3db2e1b5ddd84cbd64b496442fb00d411a4ecd07 Mon Sep 17 00:00:00 2001
From: Research Assistant <research@example.com>
Date: Sun, 10 May 2026 00:13:21 +0800
Subject: [PATCH] fix(bump): git-add+commit before tag, verify version in HEAD,
 handle push failures

---
 scripts/bump.py | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/scripts/bump.py b/scripts/bump.py
index e5b12e5d..d0973be2 100644
--- a/scripts/bump.py
+++ b/scripts/bump.py
@@ -95,18 +95,38 @@ def main():
         print("\nSkipping git — files updated on disk only.")
         return
 
-    # Git commit + tag
-    run(["git", "tag", new_ver])
+    # Git add + commit + tag
+    staged = [str(FILES_TO_UPDATE[k]) for k in FILES_TO_UPDATE]
+    run(["git", "add"] + staged)
+    run(["git", "commit", "-m", f"bump: {old_ver} -> {new_ver}"])
+
+    # Verify the commit actually has the new version
+    try:
+        result = subprocess.run(
+            ["git", "show", f"HEAD:paperforge/__init__.py"],
+            cwd=ROOT, capture_output=True, text=True, check=True,
+        )
+        if new_ver not in result.stdout:
+            sys.exit(f"VERIFY FAILED: __init__.py in HEAD does not contain version {new_ver}")
+    except subprocess.CalledProcessError:
+        sys.exit("VERIFY FAILED: cannot read __init__.py from HEAD")
+
+    run(["git", "tag", "-f", new_ver])
     print(f"Committed and tagged {new_ver}")
 
     if not args.release:
         print("Run: git push && git push --tags")
         return
 
-    # Push
-    run(["git", "push"])
-    run(["git", "push", "--tags"])
-    print("Pushed to remote")
+    # Push (may fail on protected branches — push to a release branch instead)
+    try:
+        run(["git", "push"])
+    except subprocess.CalledProcessError:
+        print("WARNING: git push failed (branch may be protected). Push manually or use a release branch.")
+    try:
+        run(["git", "push", "--tags"])
+    except subprocess.CalledProcessError:
+        print("WARNING: git push --tags failed")
 
     # Create GitHub release
     notes = args.message or f"v{new_ver}"