Skip to content

Commit 97dca56

Browse files
vkpdeveloperclaude
andcommitted
fix(server): only treat a change between two known head SHAs as a push
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 41d7c50 commit 97dca56

2 files changed

Lines changed: 26 additions & 2 deletions

File tree

‎apps/server/src/orchestration-v2/pullRequestWatch.test.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,29 @@ describe("evaluatePullRequestWatch", () => {
172172
]);
173173
});
174174

175+
it("keeps a baseline taken without a head SHA once the SHA appears", () => {
176+
const green = detail({ checks: [check("test", "success")] });
177+
const baseline = evaluatePullRequestWatch(
178+
watch({ awaitingBaseline: true }),
179+
{ ...green, headSha: undefined },
180+
noRemarks,
181+
);
182+
const known = evaluatePullRequestWatch(baseline.next, green, noRemarks);
183+
assert.deepEqual(known.changes, []);
184+
assert.equal(known.next.headSha, green.headSha);
185+
const unknown = evaluatePullRequestWatch(
186+
known.next,
187+
{ ...green, headSha: undefined },
188+
noRemarks,
189+
);
190+
assert.equal(unknown.next.headSha, green.headSha);
191+
assert.deepEqual(
192+
evaluatePullRequestWatch(unknown.next, { ...green, headSha: "bbbbbbbbbb" }, noRemarks)
193+
.changes,
194+
[{ kind: "checks-passed", count: 1, required: false }],
195+
);
196+
});
197+
175198
it("reports each failure at once, even while another check never finishes", () => {
176199
const bot = check("CodeRabbit", "pending");
177200
const first = detail({ checks: [check("lint", "failure"), check("test", "pending"), bot] });

‎apps/server/src/orchestration-v2/pullRequestWatch.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@ export function evaluatePullRequestWatch(
3636
remarks: ReadonlyArray<PullRequestComment> | null,
3737
): PullRequestWatchReport {
3838
const changes: Array<PullRequestWatchChange> = [];
39-
const headSha = detail.headSha ?? null;
39+
// A read without a head says nothing about pushes, so it keeps the last known one.
40+
const headSha = detail.headSha ?? watch.headSha;
4041
// Remarks already have their baseline in startedAt.
4142
const baseline = watch.awaitingBaseline === true;
42-
const headMoved = headSha !== watch.headSha;
43+
const headMoved = watch.headSha !== null && headSha !== watch.headSha;
4344

4445
// An empty list keeps the last state: a host can answer with one when its check read fails.
4546
let failedChecks = headMoved ? [] : watch.failedChecks;

0 commit comments

Comments
 (0)