Merge remote-tracking branch 'origin/main' into new-issue-1872

Signed-off-by: Chen-Rong-Zi <1398881912@qq.com>

Author: Chen-Rong-Zi

.github/workflows/claude-review.yml

@@ -63,74 +63,44 @@ jobs:
           )
 
     steps:
+      # Checkout PR Branch (for comments)
+      - name: Resolve PR Ref
+        id: resolve-pr-ref
+        if: github.event_name == 'issue_comment' && github.event.issue.pull_request
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PR_NUMBER=${{ github.event.issue.number }}
+          echo "Resolving HEAD SHA for PR #$PR_NUMBER..."
+          PR_SHA=$(gh pr view $PR_NUMBER --repo ${{ github.repository }} --json headRefOid -q .headRefOid)
+          echo "Resolved SHA: $PR_SHA"
+          echo "pr_sha=$PR_SHA" >> $GITHUB_OUTPUT
+
       # Checkout the repository at the appropriate commit for review
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
-          # Use PR head SHA for pull_request_target, fallback to current SHA otherwise
-          fetch-depth: 0
-          ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.sha || github.sha }}
-
-      # Handle fork branches for pull_request_target events
-      - name: Setup Fork Remote (for pull_request_target)
-        if: ${{ github.event_name == 'pull_request_target' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-          PR_HEAD_REF: ${{ github.event.pull_request.head.ref }}
-          PR_HEAD_OWNER: ${{ github.event.pull_request.head.repo.owner.login }}
-          PR_HEAD_REPO: ${{ github.event.pull_request.head.repo.name }}
-          REPO_OWNER: ${{ github.repository_owner }}
-        run: |
-          PR_NUMBER="$PR_NUMBER"
-          HEAD_REF="$PR_HEAD_REF"
-          HEAD_OWNER="$PR_HEAD_OWNER"
-          HEAD_REPO="$PR_HEAD_REPO"
-          CURRENT_OWNER="$REPO_OWNER"
-
-          # For forked PRs, temporarily change origin URL to fork repository
-          # This allows claude-code-action to fetch the PR branch correctly
-          if [ "$HEAD_OWNER" != "$CURRENT_OWNER" ]; then
-            echo "PR is from fork: $HEAD_OWNER/$HEAD_REPO"
-            FORK_URL="https://github.com/$HEAD_OWNER/$HEAD_REPO.git"
-            echo "Temporarily changing origin URL to fork: $FORK_URL"
-            git remote set-url origin "$FORK_URL"
-            git fetch origin "$HEAD_REF"
-            git branch "$HEAD_REF" "origin/$HEAD_REF" 2>/dev/null || git branch -f "$HEAD_REF" "origin/$HEAD_REF"
-          fi
-
-      # For comment-driven triggers, ensure we have the correct PR branch checked out
-      - name: Checkout PR Branch (for comments)
-        if: ${{ github.event_name == 'issue_comment' || github.event_name == 'pull_request_review_comment' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # Use PR head SHA for pull_request_target to review the actual PR code
+          # For comment events, this will default to the base branch (PR context is inferred by Claude action)
+          ref: ${{ steps.resolve-pr-ref.outputs.pr_sha || github.event.pull_request.head.sha || github.sha }}
+          fetch-depth: 20
+
+      # Fix git ref access for claude-code-action PR branch checkout
+      # The action internally runs: git fetch origin pull/N/head:pr-N
+      # This can fail for two reasons:
+      # 1. Under git protocol v2, refs/pull/* may not be discoverable if not in
+      #    the configured fetch refspec (causes "couldn't find remote ref")
+      # 2. If a local branch pr-N already exists and is checked out, git refuses
+      #    to fetch into it (causes "refusing to fetch into branch")
+      # Adding refs/pull/*/head to the fetch refspec solves issue 1, and we avoid
+      # creating local branches to prevent issue 2.
+      - name: Configure git for PR ref access
         run: |
-          PR_NUMBER=${{ github.event.issue.number || github.event.pull_request.number }}
-
-          # Fetch PR metadata: head branch name and source repository
-          PR_DATA=$(gh pr view $PR_NUMBER --json headRefName,headRepositoryOwner,headRepository,baseRefName)
-          HEAD_REF=$(echo "$PR_DATA" | jq -r '.headRefName')
-          HEAD_OWNER=$(echo "$PR_DATA" | jq -r '.headRepositoryOwner.login')
-          HEAD_REPO=$(echo "$PR_DATA" | jq -r '.headRepository.name')
-          BASE_BRANCH=$(echo "$PR_DATA" | jq -r '.baseRefName')
-          CURRENT_OWNER="${{ github.repository_owner }}"
-
-          # For forked PRs, temporarily change origin URL to fork repository
-          # This allows claude-code-action to fetch the PR branch correctly
-          if [ "$HEAD_OWNER" != "$CURRENT_OWNER" ]; then
-            echo "PR is from fork: $HEAD_OWNER/$HEAD_REPO"
-            FORK_URL="https://github.com/$HEAD_OWNER/$HEAD_REPO.git"
-            echo "Temporarily changing origin URL to fork: $FORK_URL"
-            git remote set-url origin "$FORK_URL"
-          fi
-
-          # Fetch and checkout the PR branch
-          git fetch origin "$HEAD_REF"
-          git branch "$HEAD_REF" "origin/$HEAD_REF" 2>/dev/null || git branch -f "$HEAD_REF" "origin/$HEAD_REF"
-          git checkout "$HEAD_REF"
+          git config --add remote.origin.fetch '+refs/pull/*/head:refs/remotes/origin/pull/*/head'
 
       # Invoke Claude to perform an automated PR review with progress tracking
-      - name: PR Review with Progress Tracking
+      - name: Run Claude Code Review
+        id: claude-review
         uses: anthropics/claude-code-action@v1
         with:
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
@@ -176,4 +146,3 @@ jobs:
           # Restrict tools that Claude can use during the review
           claude_args: |
             --allowedTools "mcp__github_inline_comment__create_inline_comment,Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*)"
-

Cargo.toml

@@ -81,6 +81,7 @@ smallvec = "1.15.1"
 bytes = "1.11.1"
 chrono = { version = "0.4.43", features = ["serde"] }
 hex = "0.4.3"
+sha1 = "0.10"
 sha2 = "0.10.9"
 
 idgenerator = "2.0.0"

ceres/Cargo.toml

@@ -44,6 +44,8 @@ tokio-util = { workspace = true }
 uuid = { workspace = true, features = ["v4"] }
 redis = { workspace = true }
 bincode = { workspace = true }
+sha1 = { workspace = true }
+hex = { workspace = true }
 
 [dev-dependencies]
 tempfile = { workspace = true }