approve-merge

Approve Merge

Merge a PR and perform post-merge cleanup. This command is the final step in the shipping pipeline -- it runs after the PR has been rebased, CI has passed, and the user has approved the merge from the dashboard.

# Benchmark logging (entry)
bash .claude/benchmark/log.sh "approve_merge_start" "" "" 2>/dev/null || true

PR: $ARGUMENTS

Instructions

You are an autonomous agent handling the merge and cleanup of an approved PR.

1. Read Handoff Context

Check if a handoff file exists from a previous agent:

cat .claude/agent-control/handoff.json 2>/dev/null

If present, extract pr_number, issue, and branch from it. If not present, parse the arguments directly.

2. Pre-Merge Verification

# Verify PR is still approved and mergeable
gh pr view <PR_NUMBER> --json state,reviewDecision,mergeable,statusCheckRollup,headRefName,baseRefName

# Check CI status
gh pr checks <PR_NUMBER>

Verify:

• PR state is OPEN
• PR is mergeable (no conflicts)

Note: formal GitHub review approval is NOT required. The user triggering this command from the dashboard is the approval. Log the review status for the record, but proceed regardless.

If CI checks are still pending, poll in a loop. Replace <PR_NUMBER> with the actual PR number from context before executing the loop as a single Bash tool call. Requires gh CLI v2.32+ (for the bucket field).

# Set the PR number once at the top -- substitute from context
PR_NUM=<PR_NUMBER>
# Poll CI checks in a loop (30 iterations x 30s = 15 minutes max)
# Uses `bucket` (not `state`) -- bucket normalizes raw states into: pass, fail, pending, skipping, cancel
# Grace period: first 5 iterations (2.5 min) tolerate TOTAL=0 for checks to register after push
for i in $(seq 1 30); do
  echo "--- CI poll attempt $i/30 ---"
  CHECKS_JSON=$(gh pr checks "$PR_NUM" --json name,bucket 2>/dev/null || echo "[]")
  echo "$CHECKS_JSON" | jq -r '.[] | "\(.bucket)\t\(.name)"'
  STATS=$(echo "$CHECKS_JSON" | jq -r '
    (length | tostring) + "\t" +
    ([.[] | select(.bucket == "pending")] | length | tostring) + "\t" +
    ([.[] | select(.bucket == "fail" or .bucket == "cancel")] | length | tostring)
  ' 2>/dev/null) || { echo "Failed to parse CI check status"; break; }
  IFS=$'\t' read -r TOTAL PENDING FAILED <<< "$STATS"
  if [ "$TOTAL" -eq 0 ]; then
    if [ "$i" -lt 5 ]; then
      echo "No checks registered yet (grace period $i/5)"
      sleep 30
      continue
    else
      echo "NO_CHECKS: no CI checks configured (grace period expired)"
      break
    fi
  fi
  if [ "$PENDING" -eq 0 ]; then
    if [ "$FAILED" -gt 0 ]; then
      echo "CI FAILED: $FAILED check(s) failed"
      break
    else
      echo "CI PASSED: all $TOTAL checks passed"
      break
    fi
  fi
  if [ "$i" -eq 30 ]; then
    echo "CI TIMEOUT: checks still pending after 15 minutes"
    break
  fi
  sleep 30
done