feat: enhanced PR rescue — resolve threads, request reviews, handle conflicts#118
Closed
feat: enhanced PR rescue — resolve threads, request reviews, handle conflicts#118
Conversation
There was a problem hiding this comment.
Pull request overview
Enhances the PR Rescue automation to unstick agent-created PRs across more pipeline stages (missing Copilot review, unresolved threads, behind-main rebases), aligning with the repo’s autonomous PR flow and conversation-resolution requirements.
Changes:
- Expand PR Rescue into a 3-stage rescuer: request Copilot review, resolve eligible review threads via GraphQL, and rebase approved BEHIND PRs (with conflict labeling).
- Add a 15-minute cron trigger and prioritize processing PRs closest to merge (approved first), skipping
aw-conflictPRs. - Update workflow documentation and changelog to reflect the new rescue behavior and thread-ID root cause context.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
.github/workflows/pr-rescue.yml |
Adds cron trigger, progress-sorted processing, GraphQL-based thread resolution, conflict labeling, and expanded rebase logic. |
docs/agentic-workflows.md |
Updates PR Rescue documentation to describe the expanded multi-stage rescue behavior and scheduling. |
docs/changelog.md |
Records the enhanced rescue behavior and related operational notes in the append-only changelog. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
…onflicts Three rescue modes, sorted by progress (approved PRs first): 1. No Copilot review: rebase if behind main, then request review 2. Unresolved threads: resolve if bot reply is last comment (real GraphQL thread IDs, not hallucinated) 3. Behind main: rebase, remove review-response-attempted label BEFORE push so responder can run on new comments Plus: 15-min cron schedule, aw-conflict label on merge conflicts, skip conflicted PRs in future runs. Incorporates review feedback from Gemini 3 Pro and GPT-5 Codex: - Rebase before requesting review (not after) - Remove label before push (not after) - Label merge conflicts instead of silent retry loop - Explicit sort by approval status - Check last comment author (not just any reply exists) Closes #116 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
microsasa
force-pushed
the
feat/enhanced-rescue
branch
from
716da8a to
89de389
Compare
Owner
Author
|
Pulling back — need to fix workflow triggers first (workflows firing on non-agent PRs). |
This was referenced Mar 16, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Enhanced PR Rescue Workflow
Three rescue modes for stuck agent PRs, sorted by progress (approved first):
1. No Copilot review
2. Unresolved threads
3. Behind main
review-response-attemptedlabel BEFORE push so responder can run on new commentsaw-conflictlabel, posts comment, skips in future runsOther changes
aw-conflictPRs excluded from processingReview feedback incorporated
Closes #116. Refs #114.