Skip to content

fix(queue): reconcile all overlapping duplicate siblings by claim-time election #4071

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 8, 2026
Merged

fix(queue): reconcile all overlapping duplicate siblings by claim-time election #4071

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
7 changes: 3 additions & 4 deletions src/queue/processors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7922,13 +7922,12 @@ export async function reconcileLiveDuplicateSiblings(
if (env.GITTENSORY_DUPLICATE_WINNER !== "true") return otherOpenPullRequests;
const linkedIssues = new Set(pr.linkedIssues);
if (linkedIssues.size === 0) return otherOpenPullRequests;
const lowerOverlapping = otherOpenPullRequests.filter(
const overlapping = otherOpenPullRequests.filter(
(other) =>
other.number < pr.number &&
other.state === "open" &&
other.linkedIssues.some((issue) => linkedIssues.has(issue)),
);
if (lowerOverlapping.length === 0) return otherOpenPullRequests;
if (overlapping.length === 0) return otherOpenPullRequests;
const installationToken =
installationId === null
? undefined
Expand All @@ -7939,7 +7938,7 @@ export async function reconcileLiveDuplicateSiblings(
const admissionKey = githubAdmissionKeyForToken(env, installationId, token);
const staleClosed = new Set<number>();
await Promise.all(
lowerOverlapping.map(async (sibling) => {
overlapping.map(async (sibling) => {
// #2537: deliberately NOT durable-cached (flagged by the gate's own review) -- despite recomputing every
// delivery, this reconcile feeds duplicate-winner selection, which can auto-CLOSE the CURRENT PR when
// duplicateWinnerEnabled. A cached "open" read up to PR_STATE_CACHE_MAX_AGE_MS stale after a missed
Expand Down
37 changes: 23 additions & 14 deletions test/unit/reconcile-live-duplicate-siblings.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { createInstallationToken } from "../../src/github/app";
import type { PullRequestRecord } from "../../src/types";
import { createTestEnv } from "../helpers/d1";

// reconcileLiveDuplicateSiblings re-fetches a lower duplicate sibling's LIVE state via createInstallationToken +
// reconcileLiveDuplicateSiblings re-fetches a duplicate sibling's LIVE state via createInstallationToken +
// the REST /pulls/{n} call, so mock the token mint (the test env holds no App key) and stub fetch per case.
vi.mock("../../src/github/app", async (importOriginal) => ({
...(await importOriginal<typeof import("../../src/github/app")>()),
Expand Down Expand Up @@ -55,34 +55,43 @@ describe("reconcileLiveDuplicateSiblings (#dup-winner / audit #15)", () => {
expect(await reconcileLiveDuplicateSiblings(env, null, "owner/repo", pr, siblings)).toBe(siblings);
});

it("flag ON but every overlapping sibling is HIGHER-numbered ⇒ this PR already wins, unchanged (no fetch)", async () => {
it("flag ON, a higher overlapping sibling LIVE-closed ⇒ dropped because claim-time election lets higher numbers demote", async () => {
const env = createTestEnv();
env.GITTENSORY_DUPLICATE_WINNER = "true";
vi.stubGlobal("fetch", async () => {
throw new Error("higher-numbered siblings cannot demote the winner; no live fetch expected");
});
stubLiveStates({ 12: "closed" });
const siblings = [makePr(12, "open", [1])];
const pr = makePr(9, "open", [1]);
expect(await reconcileLiveDuplicateSiblings(env, null, "owner/repo", pr, siblings)).toBe(siblings);
const result = await reconcileLiveDuplicateSiblings(env, null, "owner/repo", pr, siblings);
expect(result.map((p) => p.number)).toEqual([]);
});

it("flag ON, a lower sibling that does NOT overlap the issue set ⇒ unchanged (not a cluster member)", async () => {
it("flag ON, a higher overlapping sibling LIVE-open ⇒ kept (claim-time winner selection decides later)", async () => {
const env = createTestEnv();
env.GITTENSORY_DUPLICATE_WINNER = "true";
const siblings = [makePr(5, "open", [2])];
stubLiveStates({ 12: "open" });
const siblings = [makePr(12, "open", [1])];
const pr = makePr(9, "open", [1]);
const result = await reconcileLiveDuplicateSiblings(env, null, "owner/repo", pr, siblings);
expect(result.map((p) => p.number)).toEqual([12]);
});

it("flag ON, a sibling that does NOT overlap the issue set ⇒ unchanged (not a cluster member)", async () => {
const env = createTestEnv();
env.GITTENSORY_DUPLICATE_WINNER = "true";
const siblings = [makePr(12, "open", [2])];
const pr = makePr(9, "open", [1]);
expect(await reconcileLiveDuplicateSiblings(env, null, "owner/repo", pr, siblings)).toBe(siblings);
});

it("flag ON, a lower sibling already cached non-open ⇒ unchanged (the cache already excludes it)", async () => {
it("flag ON, a sibling already cached non-open ⇒ unchanged (the cache already excludes it)", async () => {
const env = createTestEnv();
env.GITTENSORY_DUPLICATE_WINNER = "true";
const siblings = [makePr(5, "closed", [1])];
const pr = makePr(9, "open", [1]);
expect(await reconcileLiveDuplicateSiblings(env, null, "owner/repo", pr, siblings)).toBe(siblings);
});

it("flag ON, a lower overlapping sibling LIVE-closed ⇒ dropped so the real lowest-OPEN PR is the winner", async () => {
it("flag ON, a lower overlapping sibling LIVE-closed ⇒ dropped so the remaining open cluster is adjudicated from live members", async () => {
const env = createTestEnv();
env.GITTENSORY_DUPLICATE_WINNER = "true";
stubLiveStates({ 5: "closed" });
Expand Down Expand Up @@ -112,14 +121,14 @@ describe("reconcileLiveDuplicateSiblings (#dup-winner / audit #15)", () => {
expect(result.map((p) => p.number)).toEqual([5]);
});

it("flag ON, two lower overlapping siblings (one live-closed, one live-open) ⇒ only the closed one is dropped", async () => {
it("flag ON, two overlapping siblings (one live-closed, one live-open) ⇒ only the closed one is dropped", async () => {
const env = createTestEnv();
env.GITTENSORY_DUPLICATE_WINNER = "true";
stubLiveStates({ 4: "closed", 5: "open" });
const siblings = [makePr(4, "open", [1]), makePr(5, "open", [1])];
stubLiveStates({ 4: "closed", 12: "open" });
const siblings = [makePr(4, "open", [1]), makePr(12, "open", [1])];
const pr = makePr(9, "open", [1]);
const result = await reconcileLiveDuplicateSiblings(env, null, "owner/repo", pr, siblings);
expect(result.map((p) => p.number)).toEqual([5]);
expect(result.map((p) => p.number)).toEqual([12]);
});

it("flag ON, a numeric installation whose token mint THROWS ⇒ falls back to the public token and still reconciles", async () => {
Expand Down