Skip to content

fix(review): pin expectedHeadSha on the contributor_cap close action #6466

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

Merged
JSONbored merged 1 commit into from
Jul 16, 2026
Merged

fix(review): pin expectedHeadSha on the contributor_cap close action #6466

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
4 changes: 4 additions & 0 deletions src/settings/agent-actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,10 @@ export function planAgentMaintenanceActions(input: AgentActionPlanInput): Planne
closeReasons: ["over the per-contributor open-item cap"],
closeComment: sanitizePublicComment(contributorCapCloseMessage(authorLogin, openCount, cap, itemKind, scope)),
closeKind: "contributor_cap",
// Pin like blacklist/review_nag/copycat/screenshot_table above (#2452): without this an auto_with_approval
// stage persists params.expectedHeadSha as undefined, so decidePendingAgentAction's isUnpinnedRatifyingAction
// guard unconditionally rejects the maintainer's accept before the close ever executes.
...(input.pr.headSha ? { expectedHeadSha: input.pr.headSha } : {}),
});
}
if (acting("close") && label !== null) actions.push({ actionClass: "label", autonomyClass: "close", closeKind: "contributor_cap", requiresApproval: approval("close"), reason: "over the per-contributor open-item cap", label, labelOp: "add" });
Expand Down
10 changes: 10 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 @@ -2052,6 +2052,16 @@ describe("per-contributor open-item cap short-circuit (#2270)", () => {
expect(plan[1]).toMatchObject({ actionClass: "label", label: DEFAULT_CONTRIBUTOR_CAP_LABEL, labelOp: "add", closeKind: "contributor_cap" });
});

it("pins the contributor_cap close to the reviewed head, mirroring blacklist/review_nag/copycat/screenshot_table (regression: was previously unpinned, which made decidePendingAgentAction reject every auto_with_approval accept via isUnpinnedRatifyingAction)", () => {
const plan = planAgentMaintenanceActions(overCap({ pr: { labels: [], headSha: "h-reviewed" } }));
expect(plan.find((a) => a.actionClass === "close")).toMatchObject({ closeKind: "contributor_cap", expectedHeadSha: "h-reviewed" });
});

it("omits expectedHeadSha on the contributor_cap close when the PR record has no headSha (defensive fallback)", () => {
const plan = planAgentMaintenanceActions(overCap());
expect(plan.find((a) => a.actionClass === "close")?.expectedHeadSha).toBeUndefined();
});

it("interpolates the (public) login/count/cap into the close comment — unlike blacklist's static-only comment", () => {
const plan = planAgentMaintenanceActions(overCap());
expect(plan[0]?.closeComment).toContain("@farmer99");
Expand Down