From 4d11d06e4e0bb44b6b0433e75a3839e93c21f20b Mon Sep 17 00:00:00 2001
From: randypanding <66171646+randypanding@users.noreply.github.com>
Date: Fri, 21 Aug 2026 20:16:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E5=8A=A8=20revert=20=E6=94=B9?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=20API=20=E5=85=BC=E5=AE=B9=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=EF=BC=88revert=20REST=20=E7=AB=AF=E7=82=B9=E6=9C=AC=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=20404=EF=BC=9B=E9=80=90=E6=96=87=E4=BB=B6=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D=E7=88=B6=E6=8F=90=E4=BA=A4+PR+auto-merge+P0=20?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=EF=BC=89=E2=80=94=E2=80=94.github=20#91?=
 =?UTF-8?q?=EF=BC=8CADR-0041?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/post-merge-verify.yml | 30 ++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/post-merge-verify.yml b/.github/workflows/post-merge-verify.yml
index ce79404..b67f79b 100644
--- a/.github/workflows/post-merge-verify.yml
+++ b/.github/workflows/post-merge-verify.yml
@@ -87,7 +87,7 @@ jobs:
           repositories: ${{ github.event.repository.name }}
           permission-contents: write
           permission-pull-requests: write
-      - name: 自动 revert（REST revert 端点 + auto-merge）
+      - name: 自动 revert（内容 API 兼容路径 + auto-merge）
         if: steps.guard.outputs.nested != 'true' && steps.guard.outputs.recent == '0' && steps.guard.outputs.reverts_24h < '3' && steps.app.outcome == 'success'
         env:
           GH_TOKEN: ${{ steps.app.outputs.token }}
@@ -99,11 +99,31 @@ jobs:
             exit 3
           fi
           TITLE="[auto-revert] #$PRN：post-merge 冒烟失败（run ${{ github.run_id }}）"
-          RESP=$(gh api -X POST "repos/$REPO/pulls/$PRN/revert" -f title="$TITLE" \
-            -f body="post-merge-verify 冒烟失败，自动回滚（ADR-0041）。原 PR #$PRN，commit ${SHA:0:8}，失败 run：$RUN_URL" \
-            --jq '.number')
-          echo "revert PR #$RESP 已建，enable auto-merge"
+          PARENT=$(gh api "repos/$REPO/commits/$SHA" --jq '.parents[0].sha')
+          [ -n "$PARENT" ] || { echo "无父提交"; exit 3; }
+          BR="auto-revert-$PRN-$(date +%s)"
+          gh api "repos/$REPO/git/refs" -f ref="refs/heads/$BR" -f sha="$PARENT" --jq '.ref'
+          gh api "repos/$REPO/pulls/$PRN/files?per_page=100" --paginate --jq '.[].filename' | while read -r F; do
+            [ -n "$F" ] || continue
+            ENC=$(python3 -c "import urllib.parse,sys;print(urllib.parse.quote(sys.argv[1]))" "$F")
+            PC=$(gh api "repos/$REPO/contents/$ENC?ref=$PARENT" --jq '.content' 2>/dev/null || true)
+            CS=$(gh api "repos/$REPO/contents/$ENC?ref=$BR" --jq '.sha' 2>/dev/null || true)
+            if [ -n "$PC" ]; then
+              if [ -n "$CS" ]; then
+                gh api -X PUT "repos/$REPO/contents/$ENC" -f message="revert: $F -> 父提交状态" -f branch="$BR" -f content="$PC" -f sha="$CS" --jq '.commit.sha' >/dev/null
+              else
+                gh api -X PUT "repos/$REPO/contents/$ENC" -f message="revert: 恢复 $F" -f branch="$BR" -f content="$PC" --jq '.commit.sha' >/dev/null
+              fi
+            else
+              if [ -n "$CS" ]; then
+                gh api -X DELETE "repos/$REPO/contents/$ENC" -f message="revert: 删除 PR 新增的 $F" -f branch="$BR" -f sha="$CS" >/dev/null
+              fi
+            fi
+          done
+          RESP=$(gh api -X POST "repos/$REPO/pulls" -f title="$TITLE" -f head="$BR" -f base=main             -f body="post-merge-verify 冒烟失败，自动回滚（ADR-0041，内容 API 兼容路径——revert REST 端点本环境 404）。原 PR #$PRN，commit ${SHA:0:8}，失败 run：$RUN_URL"             --jq '.number')
+          echo "revert PR #$RESP 已建，enable auto-merge（revert 照常过 gate）"
           gh pr merge "$RESP" --repo "$REPO" --auto --squash
+          gh issue create --repo "$REPO" --title "P0 通知: auto-revert #$RESP 已启动（原 PR #$PRN，run ${{ github.run_id }}）"             --body "合并 ${SHA:0:8} 后冒烟失败。自动回滚已执行：revert PR #$RESP（过 gate 后 auto-merge）。失败 run：$RUN_URL（ADR-0041）" --label P0 || true
       - name: 降级/兜底告警（revert 不可用或被闸拦）
         if: failure() || steps.app.outcome != 'success' || steps.guard.outputs.nested == 'true' || steps.guard.outputs.recent != '0' || steps.guard.outputs.reverts_24h >= '3'
         env: