fix(ci): make sync step visible, fetch PR merge ref, retry, file cap, fix NL

Author: watney1024

.github/workflows/ai-code-review.yml

@@ -41,10 +41,12 @@ jobs:
           # ── Inline system prompt ──
           SYSTEM_PROMPT=$(cat .github/prompts/code-review-prompt.md)
 
-          REVIEW_FILE="review_output.md"
+           REVIEW_FILE="review_output.md"
           : > "$REVIEW_FILE"
           HAS_REVIEW=false
           FILE_COUNT=0
+          MAX_REVIEW_FILES=10
+          SKIPPED_FILES=""
           CHANGED_FILES=$(cat changed_files.txt)
 
           # ── Check API key early ──
@@ -57,7 +59,13 @@ jobs:
             echo "No files changed, skipping review." >> "$REVIEW_FILE"
           else
             while IFS= read -r FILE; do
+              NL=$'\n'
               [ -z "$FILE" ] && continue
+              if [ "${FILE_COUNT}" -ge "${MAX_REVIEW_FILES}" ]; then
+                echo "  [SKIP] $FILE — max ${MAX_REVIEW_FILES} files reached"
+                SKIPPED_FILES="${SKIPPED_FILES}  - $FILE${NL}"
+                continue
+              fi
               echo "Reviewing: $FILE"
 
               # ── Get per-file diff ──
@@ -69,7 +77,6 @@ jobs:
                 continue
               fi
 
-              NL=$'\n'
               # ── If empty (new file / special chars), show full content ──
               if [ -z "$DIFF" ]; then
                 # Check file type before generating virtual diff
@@ -148,16 +155,28 @@ jobs:
           fi
 
           # ── Final summary ──
-          if [ "$HAS_REVIEW" = false ]; then
-            printf '%s\n' '## 🤖 AI Code Review' '' 'No reviewable changes found (all files binary, unchanged, or empty).' > "$REVIEW_FILE"
-          else
-            SUMMARY=$(printf '# 🤖 AI Code Review\n\n> 共审查 **%s** 个变更文件\n\n' "${FILE_COUNT}")
-            {
-              echo "$SUMMARY"
-              echo ""
+          {
+            echo "# 🤖 AI Code Review"
+            echo ""
+            echo "> 共审查 **${FILE_COUNT}** 个变更文件"
+            if [ -n "$SKIPPED_FILES" ]; then
+              SKIP_COUNT=$(echo "$SKIPPED_FILES" | grep -c '  - ' || true)
+              echo "> ⚠️ 另有 **${SKIP_COUNT}** 个文件超过上限（最多 ${MAX_REVIEW_FILES} 个）未审查"
+            fi
+            echo ""
+            if [ "$HAS_REVIEW" = true ]; then
               cat "$REVIEW_FILE"
-            } > "${REVIEW_FILE}.tmp" && mv "${REVIEW_FILE}.tmp" "$REVIEW_FILE"
-          fi
+            else
+              echo "No reviewable changes found (all files binary, unchanged, or empty)."
+            fi
+            if [ -n "$SKIPPED_FILES" ]; then
+              echo ""
+              echo "---"
+              echo "### ⚠️ 未审查的文件"
+              printf '%b' "$SKIPPED_FILES"
+            fi
+          } > "${REVIEW_FILE}.tmp"
+          mv "${REVIEW_FILE}.tmp" "$REVIEW_FILE"
 
           echo "Review written to $REVIEW_FILE"
 

.github/workflows/ci.yml

@@ -24,15 +24,41 @@ jobs:
     steps:
       - name: Sync from local mirror (skip unstable GitHub checkout)
         run: |
+          echo "=== CI Sync ==="
+          retry() {
+            local desc="$1" rc=0; shift
+            for i in 1 2 3; do
+              if "$@" --depth=1; then rc=0; break; fi
+              rc=$?
+              if [ "$i" -lt 3 ]; then
+                echo "::warning::$desc failed, retry #$i in $((i*3))s"
+                sleep $((i * 3))
+              else
+                echo "::error::$desc failed after 3 attempts"
+              fi
+            done
+            return $rc
+          }
           MIRROR=/opt/ScratchV
           WORKSPACE=/opt/actions-runner/_work/ScratchV/ScratchV
-          # Copy pre-cloned repo to workspace (avoid GitHub network issues)
           rm -rf "$WORKSPACE"
           cp -a "$MIRROR" "$WORKSPACE"
           cd "$WORKSPACE"
-          # Try to fetch latest; fallback to local copy if network fails
-          git fetch origin main --depth=1 2>/dev/null || echo "WARNING: git fetch failed, using local mirror"
-          git checkout -f "$GITHUB_SHA" 2>/dev/null || git checkout -f origin/main 2>/dev/null || true
+          echo "Fetching origin main..."
+          retry "git fetch origin main" git fetch origin main || exit 1
+          if [ "$GITHUB_EVENT_NAME" = "pull_request" ]; then
+            PR_NUMBER="${GITHUB_REF#refs/pull/}"
+            PR_NUMBER="${PR_NUMBER%/merge}"
+            echo "Fetching PR #${PR_NUMBER} merge ref..."
+            retry "git fetch PR #${PR_NUMBER}" git fetch origin "refs/pull/${PR_NUMBER}/merge" || exit 1
+          fi
+          echo "Checking out $GITHUB_SHA..."
+          if git -c advice.detachedHead=false checkout -f "$GITHUB_SHA"; then
+            echo "::notice::Checkout successful: $(git log -1 --format='%h %ai %s')"
+          else
+            echo "::error::GITHUB_SHA ($GITHUB_SHA) not found in local repo — checkout failed"
+            exit 1
+          fi
 
       - name: Install dependencies
         run: |
@@ -72,15 +98,41 @@ jobs:
     steps:
       - name: Sync from local mirror (skip unstable GitHub checkout)
         run: |
+          echo "=== CI Sync ==="
+          retry() {
+            local desc="$1" rc=0; shift
+            for i in 1 2 3; do
+              if "$@" --depth=1; then rc=0; break; fi
+              rc=$?
+              if [ "$i" -lt 3 ]; then
+                echo "::warning::$desc failed, retry #$i in $((i*3))s"
+                sleep $((i * 3))
+              else
+                echo "::error::$desc failed after 3 attempts"
+              fi
+            done
+            return $rc
+          }
           MIRROR=/opt/ScratchV
           WORKSPACE=/opt/actions-runner/_work/ScratchV/ScratchV
-          # Copy pre-cloned repo to workspace (avoid GitHub network issues)
           rm -rf "$WORKSPACE"
           cp -a "$MIRROR" "$WORKSPACE"
           cd "$WORKSPACE"
-          # Try to fetch latest; fallback to local copy if network fails
-          git fetch origin main --depth=1 2>/dev/null || echo "WARNING: git fetch failed, using local mirror"
-          git checkout -f "$GITHUB_SHA" 2>/dev/null || git checkout -f origin/main 2>/dev/null || true
+          echo "Fetching origin main..."
+          retry "git fetch origin main" git fetch origin main || exit 1
+          if [ "$GITHUB_EVENT_NAME" = "pull_request" ]; then
+            PR_NUMBER="${GITHUB_REF#refs/pull/}"
+            PR_NUMBER="${PR_NUMBER%/merge}"
+            echo "Fetching PR #${PR_NUMBER} merge ref..."
+            retry "git fetch PR #${PR_NUMBER}" git fetch origin "refs/pull/${PR_NUMBER}/merge" || exit 1
+          fi
+          echo "Checking out $GITHUB_SHA..."
+          if git -c advice.detachedHead=false checkout -f "$GITHUB_SHA"; then
+            echo "::notice::Checkout successful: $(git log -1 --format='%h %ai %s')"
+          else
+            echo "::error::GITHUB_SHA ($GITHUB_SHA) not found in local repo — checkout failed"
+            exit 1
+          fi
 
       - name: Install dependencies
         run: |