Merge branch 'main' into worktree-resolve-stale-threads

Author: derekmisler

.github/workflows/review-pr.yml

@@ -195,7 +195,7 @@ jobs:
     if: |
       github.event.issue.pull_request &&
       contains(github.event.comment.body, '/review') &&
-      github.event.comment.user.type != 'Bot'
+      (github.event.comment.user.type != 'Bot' || github.event.comment.user.login == 'docker-agent[bot]')
     runs-on: ubuntu-latest
     env:
       HAS_APP_SECRETS: ${{ secrets.CAGENT_REVIEWER_APP_ID != '' }}

action.yml

@@ -475,6 +475,7 @@ runs:
           exit 1
         fi
         echo "verbose-log-file=$VERBOSE_LOG_FILE" >> $GITHUB_OUTPUT
+        echo "verbose-log-timestamp=$(date +%s%N)" >> $GITHUB_OUTPUT
         echo "Verbose log file: $VERBOSE_LOG_FILE"
 
         # Build command arguments array (SECURE: no eval!)
@@ -701,7 +702,7 @@ runs:
       if: always() && steps.run-agent.outputs.verbose-log-file != ''
       uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
-        name: cagent-verbose-log-${{ github.run_id }}-${{ github.run_attempt }}
+        name: cagent-verbose-log-${{ github.run_id }}-${{ github.run_attempt }}-${{ steps.run-agent.outputs.verbose-log-timestamp }}
         path: ${{ steps.run-agent.outputs.verbose-log-file }}
         retention-days: 14
         if-no-files-found: ignore

review-pr/action.yml

@@ -157,11 +157,25 @@ runs:
         # Uses github.token (has contents:read) instead of the App token (used for posting reviews).
         # Uses the full PR URL instead of just the number — gh can't resolve a bare number
         # from a detached HEAD (refs/pull/N/head).
-        if GH_TOKEN="$READ_TOKEN" gh pr diff "$PR_URL" > pr.diff 2>/dev/null; then
-          echo "✅ Pre-fetched PR diff ($(wc -l < pr.diff | tr -d ' ') lines)"
+        if GH_TOKEN="$READ_TOKEN" gh pr diff "$PR_URL" > pr.diff 2>pr_diff_stderr.txt; then
+          echo "✅ Pre-fetched PR diff via gh pr diff ($(wc -l < pr.diff | tr -d ' ') lines)"
+          rm -f pr_diff_stderr.txt
         else
-          echo "::warning::Failed to pre-fetch PR diff — agent will use git diff as fallback"
-          rm -f pr.diff
+          echo "::warning::gh pr diff failed: $(cat pr_diff_stderr.txt 2>/dev/null)"
+          rm -f pr.diff pr_diff_stderr.txt
+
+          # Fallback: git diff with merge-base (repo is checked out with full history)
+          MERGE_BASE=$(git merge-base origin/main HEAD 2>/dev/null || git merge-base origin/master HEAD 2>/dev/null || echo "")
+          if [ -n "$MERGE_BASE" ]; then
+            if git diff "$MERGE_BASE"...HEAD > pr.diff; then
+              echo "✅ Pre-fetched PR diff via git diff ($(wc -l < pr.diff | tr -d ' ') lines)"
+            else
+              echo "::warning::git diff failed — agent will fetch diff itself"
+              rm -f pr.diff
+            fi
+          else
+            echo "::warning::Could not determine merge base — agent will fetch diff itself"
+          fi
         fi
 
     - name: Resolve stale review threads
@@ -358,8 +372,9 @@ runs:
       uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
       with:
         path: ${{ github.workspace }}/.cache/pr-review-memory.db
-        key: pr-review-memory-${{ github.repository }}-${{ github.run_id }}
+        key: pr-review-memory-${{ github.repository }}-${{ github.job }}-${{ github.run_id }}
         restore-keys: |
+          pr-review-memory-${{ github.repository }}-${{ github.job }}-
           pr-review-memory-${{ github.repository }}-
 
     # ========================================
@@ -541,7 +556,7 @@ runs:
       uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
       with:
         path: ${{ github.workspace }}/.cache/pr-review-memory.db
-        key: pr-review-memory-${{ github.repository }}-${{ github.run_id }}
+        key: pr-review-memory-${{ github.repository }}-${{ github.job }}-${{ github.run_id }}
 
     # ========================================
     # POST-REVIEW: Clean summary & reactions