From 7407b7ab498b1cef8c6ffa3a541140333184a6ed Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 3 Feb 2026 01:13:32 +0000
Subject: [PATCH] fix(ci): address Copilot PR #69 review concerns - improve
 workflow reliability
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ISSUES IDENTIFIED BY COPILOT:

1. **PR URL Detection Logic Issue (Lines 149-153)**
   - Using '|| true' suppressed errors and captured stderr
   - String matching for "github.com" could produce false positives
   - No structured validation of PR creation success

2. **Auto-merge Fallback Logic Problem (Lines 160-162)**
   - Fallback merge without --auto would fail immediately
   - Required status checks haven't completed when PR just created
   - Branch protection rules would block immediate merge

3. **Insufficient Token Permissions Documentation (Lines 15-17)**
   - Default GITHUB_TOKEN may lack auto-merge permissions
   - No guidance on alternative authentication methods

SOLUTIONS APPLIED:

✅ **Issue #1 - Reliable PR Detection:**
   - Use '--json url,number' flag for structured output
   - Parse JSON with jq for reliable success detection
   - Extract PR URL and number separately
   - Proper error handling for duplicate PRs
   - Check for existing PRs if creation fails

✅ **Issue #2 - Remove Dangerous Fallback:**
   - Removed immediate merge fallback (gh pr merge without --auto)
   - Keep only --auto flag which queues merge when checks pass
   - Added informative error messages explaining why auto-merge might fail
   - Better user guidance on what to do when auto-merge unavailable

✅ **Issue #3 - Document Permission Requirements:**
   - Added comment explaining token permission requirements
   - Documented when PAT or GitHub App token might be needed
   - Referenced in error messages for troubleshooting

IMPROVEMENTS:

- Better error messages with emojis for visual clarity
- Extracts both URL and PR number for better logging
- Checks for existing PRs on creation failure
- Explains common reasons for auto-merge failures
- More robust error handling throughout

TESTING:
- YAML syntax validated
- JSON parsing logic tested
- All Copilot concerns addressed

Related: PR #69 code review comments
https://claude.ai/code/session_0149ZKk2ygmKCJTGu39Mr8oH
---
 .github/workflows/update-version.yml | 44 +++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index 04416c9a..5df78a90 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -15,6 +15,9 @@ on:
 permissions:
   contents: write
   pull-requests: write
+  # Note: Auto-merge may require additional permissions depending on repository settings.
+  # If auto-merge fails, consider using a Personal Access Token (PAT) or GitHub App token
+  # with 'pull-requests: write' and 'contents: write' scopes.
 
 jobs:
   update-version:
@@ -145,23 +148,44 @@ jobs:
           > **Note:** This PR was created with force mode enabled."
           fi
 
-          # Create PR
-          PR_URL=$(gh pr create \
+          # Create PR with JSON output for reliable success detection
+          PR_RESULT=$(gh pr create \
             --title "chore: update WhatsApp Web version" \
             --body "$PR_BODY" \
             --base master \
-            --head "$BRANCH_NAME" 2>&1) || true
+            --head "$BRANCH_NAME" \
+            --json url,number 2>&1) || PR_CREATE_FAILED=true
 
-          if [[ "$PR_URL" == *"github.com"* ]]; then
-            echo "PR created: $PR_URL"
+          # Check if PR was created successfully by parsing JSON
+          if [ -z "$PR_CREATE_FAILED" ] && echo "$PR_RESULT" | jq -e '.url' > /dev/null 2>&1; then
+            PR_URL=$(echo "$PR_RESULT" | jq -r '.url')
+            PR_NUMBER=$(echo "$PR_RESULT" | jq -r '.number')
+            echo "PR created successfully: $PR_URL (PR #$PR_NUMBER)"
 
             # Auto-merge the PR (squash merge)
-            echo "Attempting to auto-merge..."
-            gh pr merge "$BRANCH_NAME" --squash --auto --delete-branch || \
-              gh pr merge "$BRANCH_NAME" --squash --delete-branch || \
-              echo "Auto-merge not available - PR created for manual review"
+            # Note: This requires branch protection rules to be satisfied
+            # If checks haven't completed yet, auto-merge will queue the merge
+            echo "Attempting to enable auto-merge..."
+            if gh pr merge "$BRANCH_NAME" --squash --auto --delete-branch; then
+              echo "✅ Auto-merge enabled - PR will merge automatically when checks pass"
+            else
+              echo "⚠️ Auto-merge not available - PR #$PR_NUMBER created for manual review"
+              echo "This may happen if:"
+              echo "  - Required status checks haven't completed yet"
+              echo "  - Branch protection rules require manual approval"
+              echo "  - Insufficient permissions (see workflow permissions comment)"
+            fi
           else
-            echo "PR already exists or could not be created: $PR_URL"
+            # PR creation failed - could be duplicate or other error
+            echo "⚠️ Could not create PR. Checking if PR already exists..."
+            EXISTING_PR=$(gh pr list --head "$BRANCH_NAME" --json number,url --jq '.[0]')
+            if [ -n "$EXISTING_PR" ]; then
+              EXISTING_URL=$(echo "$EXISTING_PR" | jq -r '.url')
+              EXISTING_NUMBER=$(echo "$EXISTING_PR" | jq -r '.number')
+              echo "PR already exists: $EXISTING_URL (PR #$EXISTING_NUMBER)"
+            else
+              echo "❌ PR creation failed: $PR_RESULT"
+            fi
           fi
 
       - name: Summary