You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: .claude/skills/aw-daily/SKILL.md
+97-2Lines changed: 97 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -334,12 +334,103 @@ When running as a gh-aw workflow, `post-steps` handles marking the draft PR read
334
334
gh pr ready {PR_NUMBER}
335
335
```
336
336
337
-
The pipeline does NOT auto-merge. Merging is a separate review decision.
337
+
Phase 8 handles review monitoring, remediation, and merge. Do NOT merge here.
338
338
339
339
**Error mode:** If PR creation fails, report error. Leave branch for manual inspection. Switch back to `ORIGINAL_BRANCH`.
340
340
341
341
---
342
342
343
+
## Phase 8: PR Review Monitoring & Remediation
344
+
345
+
After the PR is created and marked ready, request Copilot review and monitor for feedback. This phase runs a review-fix loop until the PR is approved or the loop limit is reached.
**Loop limit:** Maximum 2 review-fix cycles. If Copilot requests changes a third time, log "Review loop limit reached — PR left for manual review" and proceed to Phase 9.
407
+
408
+
### Step 8.5: Merge the PR
409
+
410
+
After review is complete (approved, or fixes pushed and all threads resolved), merge the PR:
If direct merge fails (e.g., branch protection requires approvals), fall back to auto-merge:
417
+
```bash
418
+
gh pr merge {PR_NUMBER} --repo zircote/github-agentic-workflows --squash --auto --delete-branch ||echo"Auto-merge enabled — will merge when requirements are met"
419
+
```
420
+
421
+
Verify the merge succeeded:
422
+
```bash
423
+
gh pr view {PR_NUMBER} --repo zircote/github-agentic-workflows --json state -q '.state'
424
+
```
425
+
426
+
If state is `MERGED`, the pipeline is complete. If state is still `OPEN` with auto-merge enabled, report that and proceed to Phase 9.
427
+
428
+
If `--no-merge` flag was passed, skip this step entirely and report "PR left open per --no-merge flag."
429
+
430
+
**Error mode:** If remediation fails for any comment, skip that comment with a reply explaining the issue. Do not block the entire phase on a single comment failure. If merge fails after 2 attempts, leave the PR open and report the error.
431
+
432
+
---
433
+
343
434
## Phase 9: Final Summary
344
435
345
436
```
@@ -354,7 +445,11 @@ The pipeline does NOT auto-merge. Merging is a separate review decision.
0 commit comments