Skip to content

Commit cea121e

Browse files
ScottN-PVclaude
andcommitted
fix(server): PR watch no longer reports passed while a second run of a check is still going
A workflow on both push and pull_request runs the same check twice on one commit. The GitHub check deduper kept the run with the newest timestamp, so a run that finished hid one still going, and PR watch reported all checks passed. A run that has not finished now outranks finished runs of the same check in GitHub's rollup reader. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 48b71f0 commit cea121e

2 files changed

Lines changed: 52 additions & 4 deletions

File tree

‎apps/server/src/pullRequest/gitHubPullRequestJson.test.ts‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,46 @@ describe("pull request detail decoding", () => {
435435
expect(detail.checksState).toBe("pending");
436436
});
437437

438+
it("keeps a check pending while another run of it on the same commit is still going", () => {
439+
// A workflow on both `push` and `pull_request` runs the same check twice on one commit. The
440+
// `pull_request` run finished after the `push` run started, and the `push` run is still going.
441+
const finished = {
442+
__typename: "CheckRun",
443+
name: "check",
444+
workflowName: "Checks",
445+
status: "COMPLETED",
446+
conclusion: "SUCCESS",
447+
startedAt: "2026-10-08T04:06:10Z",
448+
completedAt: "2026-10-08T04:18:58Z",
449+
};
450+
const running = {
451+
...finished,
452+
status: "IN_PROGRESS",
453+
conclusion: "",
454+
startedAt: "2026-10-08T04:06:13Z",
455+
completedAt: "0001-01-01T00:00:00Z",
456+
};
457+
// A run still queued has not started either, so it carries no time at all.
458+
const queued = { ...running, status: "QUEUED", startedAt: "0001-01-01T00:00:00Z" };
459+
const raw = JSON.parse(detailJson) as Record<string, unknown>;
460+
const checksOf = (statusCheckRollup: ReadonlyArray<object>) => {
461+
const detail = expectSuccess(
462+
decodePullRequestDetailJson(JSON.stringify({ ...raw, statusCheckRollup })),
463+
);
464+
return [detail.checks.map((check) => [check.name, check.status]), detail.checksState];
465+
};
466+
467+
// Both listing orders, so the run still going wins on its own rather than by coming last.
468+
for (const rollup of [
469+
[finished, running],
470+
[running, finished],
471+
[finished, queued],
472+
[queued, finished],
473+
]) {
474+
expect(checksOf(rollup)).toEqual([[["check", "pending"]], "pending"]);
475+
}
476+
});
477+
438478
it("merges reviews with comments in time order and keeps a bodyless approval", () => {
439479
const detail = expectSuccess(activity(JSON.parse(detailJson) as Record<string, unknown>));
440480
// r2 approved without writing anything, which is still the event worth seeing.

‎apps/server/src/pullRequest/gitHubPullRequestJson.ts‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,6 +1576,9 @@ function toCheckStatus(raw: Schema.Schema.Type<typeof RawCheckSchema>): PullRequ
15761576
/** What GitHub writes where a run has not reached that moment yet, which is not a time. */
15771577
const UNSET_TIMESTAMP = "0001-01-01T00:00:00Z";
15781578

1579+
/** Sorts after every real timestamp, so the deduper keeps a run that has not finished. */
1580+
const STILL_RUNNING = "9999-12-31T23:59:59Z";
1581+
15791582
function realTimestamp(value: string | null | undefined): string | null {
15801583
const at = trimmed(value);
15811584
return at === null || at === UNSET_TIMESTAMP ? null : at;
@@ -1588,8 +1591,9 @@ function isNamelessCheck(raw: Schema.Schema.Type<typeof RawCheckSchema>): boolea
15881591

15891592
/**
15901593
* The rollup as the deduper reads it: a check, the workflow that owns it, and when the run last
1591-
* had something to say. A queued run reports a completion time it has not reached, so the start
1592-
* stands in for it rather than sorting the newest run to the bottom.
1594+
* had something to say. A run that has not finished outranks any finished run of the same check:
1595+
* a workflow triggered by both `push` and `pull_request` runs the check twice on one commit, and
1596+
* the run that finished first must not hide the one still going.
15931597
*/
15941598
function toCheckEntries(
15951599
raw: ReadonlyArray<Schema.Schema.Type<typeof RawCheckSchema>> | null | undefined,
@@ -1601,17 +1605,21 @@ function toCheckEntries(
16011605
return (raw ?? []).flatMap((check) => {
16021606
const name = trimmed(check.name) ?? trimmed(check.context);
16031607
if (name === null) return [];
1608+
const status = toCheckStatus(check);
16041609
return [
16051610
{
16061611
check: {
16071612
name,
1608-
status: toCheckStatus(check),
1613+
status,
16091614
description: trimmed(check.description),
16101615
url: trimmed(check.detailsUrl) ?? trimmed(check.targetUrl),
16111616
...(typeof check.isRequired === "boolean" ? { required: check.isRequired } : {}),
16121617
},
16131618
workflowName: trimmed(check.workflowName),
1614-
at: realTimestamp(check.completedAt) ?? realTimestamp(check.startedAt),
1619+
at:
1620+
status === "pending"
1621+
? STILL_RUNNING
1622+
: (realTimestamp(check.completedAt) ?? realTimestamp(check.startedAt)),
16151623
},
16161624
];
16171625
});

0 commit comments

Comments
 (0)