chore(automations): handle merge conflicts and duplicate PRs#54
Conversation
PR Shepherd now detects and acts on: - Duplicate PRs (linked issue already closed) — closes automatically - Multiple open PRs for the same issue — closes the newer one - Merge conflicts with open issues — attempts rebase, flags needs-human if conflicts are non-trivial PR Reviewer now skips conflicted PRs instead of attempting to review or merge them. The Shepherd owns conflict resolution. Co-authored-by: Ona <no-reply@ona.com>
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Codifies the workflow for creating, updating, deleting, and syncing Ona automations. Includes a registry mapping YAML files to live automation IDs, trigger design rules to prevent race conditions, and the authentication flow (ONA_PAT required). Co-authored-by: Ona <no-reply@ona.com>
|
This PR needs a linked GitHub issue ( Per AGENTS.md: "PRs with type Aside from the missing issue link, the changes look correct:
Will approve once the issue link is added. |
|
Reviewed against AGENTS.md and .agents/conventions.md. No blocking issues found. PR Reviewer — correctly adds PR Shepherd — classification ordering is sound (duplicates → conflicts → stalls). The rebase flow handles all three outcomes correctly. Removing the old "Do NOT force-push" and "Do NOT close PRs" rules is correct since the Shepherd now owns both operations. Automation Manager skill — useful reference for keeping YAML and live registrations in sync.
|
…hreads The reviewer was refusing to act on PRs it authored, incorrectly assuming self-approval is required. The ruleset has required_approving_review_count: 0 — no approvals needed. Also adds review thread resolution before merge. The ruleset requires all threads resolved (required_review_thread_resolution: true) but the prompt never handled this, leaving PRs stuck. Co-authored-by: Ona <no-reply@ona.com>
… merge rules fix(automations): PRs are infrastructure changes that don't require a linked issue, same as chore: PRs. The reviewer was blocking merge on PR #50 demanding a Closes #N reference for an automation config change. Co-authored-by: Ona <no-reply@ona.com>
zacharias-ona
changed the title
|
✅ UI verification skipped — no UI files changed ( |
1 participant
What
Teach the PR Shepherd to detect and resolve merge conflicts and duplicate PRs. Add a mergeable guard to the PR Reviewer so it doesn't attempt to review or merge conflicted PRs.
Why
After the duplicate-trigger race was fixed in PR #50, there's still no automation that handles the aftermath: orphaned PRs with merge conflicts, or PRs whose linked issue was already closed by a duplicate. PR #45 sat open with conflicts until manually closed. The PR Shepherd runs every 30 minutes and is the right place for this.
Changes
PR Shepherd — three new classifications (evaluated before the existing stall checks):
Closes #Nreferences a closed issueCloses #Nmergeable: CONFLICTING, issue still opengit rebase origin/main. If clean + checks pass → force-push. If conflicts or checks fail →needs-humanlabelPR Reviewer — skip PRs where
mergeableisCONFLICTINGin both the state-determination step and the merge step. The Shepherd owns conflict resolution.Automations already registered
Both automations were updated live via
ona ai automation update— the fix is active now.