Skip to content

fix(github): evaluate CI-status coalescing for the merge/close actuation path — found unsafe, documented #2600

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 3 commits into from
Jul 2, 2026
Merged

fix(github): evaluate CI-status coalescing for the merge/close actuation path — found unsafe, documented #2600

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fed1787
fix(github): close the remaining CI-status re-fetch gap outside the s…
JSONbored Jul 2, 2026
3dbcde6
Merge branch 'main' into fix/selfhost-ci-status-refetch-coalesce
JSONbored Jul 2, 2026
722c7e2
fix(github): revert the accept-time/pre-mutation CI coalescing — conf…
JSONbored Jul 2, 2026
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
14 changes: 14 additions & 0 deletions test/unit/agent-approval-queue.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,20 @@ describe("agent approval queue (#779)", () => {
expect(mergePullRequest).toHaveBeenCalledWith(env, 5, "owner/repo", 7, { mergeMethod: "merge", sha: "h7" });
});

it("REGRESSION (#2539 evaluated, reverted): a successful staged-merge accept still fetches live CI TWICE — once for the #2126 accept-time re-check, once for the executor's own #2128 pre-mutation re-check. These must NOT be coalesced: real async work (isHoldOnly/isCloseHoldOnly DB reads, the linked-issue hard-rule resolution, and the executor's own fetchPullRequestFreshness call) runs between the two reads, so reusing the earlier one would let CI flip from passed to failed/pending in that window without the pre-mutation guard ever seeing it — exactly the staleness #2128 exists to catch.", async () => {
const env = createTestEnv({ GITHUB_APP_PRIVATE_KEY: "x" });
await upsertRepositorySettings(env, { repoFullName: "owner/repo", autonomy: { merge: "auto_with_approval" } });
await seedInstallation(env);
await upsertPullRequestFromGitHub(env, "owner/repo", { number: 7, title: "PR", state: "open", user: { login: "contributor" }, head: { sha: "h7" }, labels: [], body: "x" });
const { action } = await createPendingAgentActionIfAbsent(env, { repoFullName: "owner/repo", pullNumber: 7, installationId: 5, actionClass: "merge", autonomyLevel: "auto_with_approval", params: { mergeMethod: "squash", expectedHeadSha: "h7" }, reason: "clean" });

const result = await decidePendingAgentAction(env, { id: action.id, decision: "accept", decidedBy: "owner" });

expect(result.status).toBe("accepted");
expect(mergePullRequest).toHaveBeenCalledWith(env, 5, "owner/repo", 7, { mergeMethod: "squash", sha: "h7" });
expect(fetchLiveCiAggregate).toHaveBeenCalledTimes(2);
});

it("accept downgrades a staged merge to a needs-human-review label when the precision breaker engaged after staging (#2127)", async () => {
const env = createTestEnv({ GITHUB_APP_PRIVATE_KEY: "x" });
await upsertRepositorySettings(env, { repoFullName: "owner/repo", autonomy: { merge: "auto_with_approval", label: "auto" } });
Expand Down
Loading