🐛 fix(branch-sync): 修复 main 回灌 dev 时 mergeable 异步计算导致漏开自动合并

- 增加 mergeable 状态轮询，避免新建同步 PR 后立即返回 UNKNOWN
- 在合并状态未稳定时输出中文告警与执行摘要
- 保持冲突分支、待计算分支与自动合并分支的处理路径清晰

.github/release.yaml

@@ -0,0 +1,26 @@
+changelog:
+  categories:
+    - title: 新功能
+      labels:
+        - feature
+        - enhancement
+        - feat
+    - title: 问题修复
+      labels:
+        - bug
+        - fix
+    - title: 文档与流程
+      labels:
+        - docs
+        - documentation
+        - ci
+        - workflow
+        - chore
+    - title: 重构与优化
+      labels:
+        - refactor
+        - perf
+        - optimization
+    - title: 其他更新
+      labels:
+        - '*'

.github/workflows/release.yml

@@ -550,5 +550,6 @@ jobs:
           files: release-assets/*
           draft: true
           make_latest: true
+          generate_release_notes: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sync-main-to-dev.yml

@@ -106,9 +106,28 @@ jobs:
         run: |
           set -euo pipefail
           pr_number="${{ steps.sync_pr.outputs.pr_number }}"
-          mergeable="$(gh pr view "${pr_number}" --json mergeable --jq '.mergeable')"
+          mergeable="UNKNOWN"
-          merge_state_status="$(gh pr view "${pr_number}" --json mergeStateStatus --jq '.mergeStateStatus')"
+          merge_state_status="UNKNOWN"
-          echo "PR #${pr_number} 合并状态：mergeable=${mergeable}, mergeStateStatus=${merge_state_status}"
+
+          for attempt in 1 2 3 4 5 6; do
+            mergeable="$(gh pr view "${pr_number}" --json mergeable --jq '.mergeable')"
+            merge_state_status="$(gh pr view "${pr_number}" --json mergeStateStatus --jq '.mergeStateStatus')"
+            echo "第 ${attempt} 次检查 PR #${pr_number} 合并状态：mergeable=${mergeable}, mergeStateStatus=${merge_state_status}"
+            if [ "${mergeable}" != "UNKNOWN" ]; then
+              break
+            fi
+            if [ "${attempt}" -lt 6 ]; then
+              echo "GitHub 仍在计算可合并状态，3 秒后重试..."
+              sleep 3
+            fi
+          done
+
+          if [ "${mergeable}" = "UNKNOWN" ]; then
+            echo "::warning::PR 合并状态仍在计算中，本次未开启自动合并，可稍后重跑 workflow 或手动开启。"
+            echo "merge_state_pending=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "merge_state_pending=false" >> "$GITHUB_OUTPUT"
+          fi
           echo "mergeable=${mergeable}" >> "$GITHUB_OUTPUT"
           echo "merge_state_status=${merge_state_status}" >> "$GITHUB_OUTPUT"
 
@@ -151,6 +170,8 @@ jobs:
             echo "- 合并状态详情：${{ steps.merge_state.outputs.merge_state_status }}"
             if [ "${{ steps.merge_state.outputs.mergeable }}" = "CONFLICTING" ]; then
               echo "- 结论：检测到冲突，需要手动处理后合并"
+            elif [ "${{ steps.merge_state.outputs.merge_state_pending }}" = "true" ]; then
+              echo "- 结论：GitHub 仍在计算合并状态，本次未开启自动合并；可稍后重跑 workflow 或手动开启 auto-merge"
             elif [ "${{ steps.auto_merge.outputs.result }}" = "enabled" ]; then
               echo "- 结论：已启用自动合并（满足保护规则后将自动入 dev）"
             else

README.md

@@ -154,6 +154,7 @@ Artifacts are generated in `build/bin`.
 
 The repository includes a release workflow.
 Push a `v*` tag to trigger automated build and release.
+Release notes are generated automatically from merged pull requests and categorized by `.github/release.yaml`.
 
 Target artifacts include:
 - macOS (AMD64 / ARM64)

README.zh-CN.md

@@ -147,6 +147,7 @@ wails build -clean
 ### 跨平台发布（GitHub Actions）
 
 仓库内置发布流水线，推送 `v*` Tag 可自动构建并发布 Release。
+Release 更新说明会基于已合并 Pull Request 自动生成，并按 `.github/release.yaml` 分类。
 
 支持目标：
 - macOS (AMD64 / ARM64)