Skip to content

fix(agent-actions): never approve a repeat unlinked-issue offender's PR it is closing #6695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jaytbarimbao-collab wants to merge 1 commit into from
Closed

fix(agent-actions): never approve a repeat unlinked-issue offender's PR it is closing #6695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/settings/agent-actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,8 +1206,12 @@ export function planAgentMaintenanceActions(input: AgentActionPlanInput): Planne
// Never APPROVE a base-conflicting PR: it is closed below (willClose on isConflict), so a "LoopOver approves —
// safe to merge" review on a PR we're about to close is incoherent (and a stale approval strands the PR if it
// later goes green). A `behind`/`blocked` PR is fine to approve (it is rebased pre-review or the approval clears
// the block); only a hard `dirty` conflict is excluded here. (#ready-needs-mergeable, the #4220 report) */
if (reviewGood && !heldForManualReview && !linkedIssueCloseInFlight && !isConflict && acting("approve") && input.pr.reviewDecision !== "APPROVED" && !alreadyApprovedThisHead) {
// the block); only a hard `dirty` conflict is excluded here. (#ready-needs-mergeable, the #4220 report)
// The same coherence rule applies to a confirmed repeat unlinked-issue offender (`unlinkedIssueMatchViolated`),
// whose own CLOSE branch fires below — approving a PR being closed as a repeat violation is equally incoherent.
// The sibling close paths already exclude it (lines 1092, 1128-1134); this guard omitted it, so a green,
// not-yet-approved repeat offender's PR was planned as an incoherent approve+close pair. */
if (reviewGood && !heldForManualReview && !linkedIssueCloseInFlight && !unlinkedIssueMatchViolated && !isConflict && acting("approve") && input.pr.reviewDecision !== "APPROVED" && !alreadyApprovedThisHead) {
actions.push({
actionClass: "approve",
requiresApproval: approval("approve"),
Expand Down
17 changes: 17 additions & 0 deletions test/unit/agent-actions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,23 @@ describe("planAgentMaintenanceActions (#778)", () => {
expect(plan.find((a) => a.actionClass === "close")?.expectedHeadSha).toBe("abc123");
});

it("never ALSO approves the repeat offender's PR it is closing — no incoherent approve+close pair", () => {
// A green, clean, not-yet-approved PR from a confirmed repeat unlinked-issue offender, with BOTH approve
// and close autonomy acting. The dedicated close branch fires on unlinkedIssueMatchViolated; the approve
// guard must suppress here too (like every sibling close path) — approving a PR we're about to close is
// incoherent (function contract: "never both merge and close"; the approve guard's own comment).
const plan = planAgentMaintenanceActions(
input({
conclusion: "success",
autonomy: { approve: "auto", close: "auto" },
...repeated,
pr: { labels: [], mergeableState: "clean" }, // reviewDecision unset: the APPROVED short-circuit is absent
}),
);
expect(classes(plan)).toContain("close");
expect(classes(plan)).not.toContain("approve");
});

it("cites the repeat-specific reason and the standard close message template, tagged closeKind: heuristic (subject to the precision breaker)", () => {
const action = planAgentMaintenanceActions(input({ conclusion: "success", autonomy: { close: "auto" }, ...repeated, pr: { labels: [] } })).find((a) => a.actionClass === "close");
expect(action?.reason).toContain("#42");
Expand Down