Skip to content

Commit 34bc73a

Browse files
ScottN-PVclaude
andcommitted
fix(server): PR watch reports a required check that first appears already passed
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
1 parent 4ee6bfd commit 34bc73a

7 files changed

Lines changed: 105 additions & 1 deletion

File tree

‎apps/server/src/mcp/toolkits/pullRequests/handlers.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ describe("pull request toolkit handlers", () => {
248248
headSha: null,
249249
failedChecks: [],
250250
passed: false,
251+
passedChecks: [],
251252
remarksThrough: "2026-08-20T00:00:00.000Z",
252253
remarkIds: [],
253254
conflicting: false,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2998,6 +2998,7 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
29982998
headSha: null,
29992999
failedChecks: [],
30003000
passed: false,
3001+
passedChecks: [],
30013002
remarksThrough: startedAt,
30023003
remarkIds: [],
30033004
conflicting: false,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ function watchesEqual(left: ThreadPullRequestWatch, right: ThreadPullRequestWatc
5454
left.headSha === right.headSha &&
5555
left.failedChecks.join("\n") === right.failedChecks.join("\n") &&
5656
left.passed === right.passed &&
57+
left.passedChecks.join("\n") === right.passedChecks.join("\n") &&
5758
left.remarksThrough === right.remarksThrough &&
5859
left.remarkIds.join("\n") === right.remarkIds.join("\n") &&
5960
left.conflicting === right.conflicting &&

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const watch = (overrides: Partial<ThreadPullRequestWatch> = {}): ThreadPullReque
1919
headSha: null,
2020
failedChecks: [],
2121
passed: false,
22+
passedChecks: [],
2223
remarksThrough: STARTED,
2324
remarkIds: [],
2425
conflicting: false,
@@ -100,6 +101,61 @@ describe("evaluatePullRequestWatch", () => {
100101
assert.deepEqual(evaluatePullRequestWatch(watch(), plain, noRemarks).changes, []);
101102
});
102103

104+
it("reports passed again when a required check shows up already passed", () => {
105+
const required = (name: string, status: PullRequestCheck["status"]) => ({
106+
...check(name, status),
107+
required: true,
108+
});
109+
const tests = detail({
110+
checks: [required("Tests", "success"), check("Smoke Tests", "pending")],
111+
});
112+
const first = evaluatePullRequestWatch(watch(), tests, noRemarks);
113+
assert.deepEqual(first.changes, [{ kind: "checks-passed", count: 1, required: true }]);
114+
115+
// The gate job was created and finished between two passes, so it was never seen pending.
116+
const gated = detail({
117+
checks: [
118+
required("Tests", "success"),
119+
check("Smoke Tests", "success"),
120+
required("Smoke Tests Gate", "success"),
121+
],
122+
});
123+
const second = evaluatePullRequestWatch(first.next, gated, noRemarks);
124+
assert.deepEqual(second.changes, [{ kind: "checks-passed", count: 2, required: true }]);
125+
assert.deepEqual(evaluatePullRequestWatch(second.next, gated, noRemarks).changes, []);
126+
127+
// Seen pending first, the gate is reported once it passes, as before.
128+
const pending = detail({
129+
checks: [required("Tests", "success"), required("Smoke Tests Gate", "pending")],
130+
});
131+
const waiting = evaluatePullRequestWatch(first.next, pending, noRemarks);
132+
assert.deepEqual(waiting.changes, []);
133+
assert.deepEqual(evaluatePullRequestWatch(waiting.next, gated, noRemarks).changes, [
134+
{ kind: "checks-passed", count: 2, required: true },
135+
]);
136+
});
137+
138+
it("reports passed again when a check shows up already passed where none is required", () => {
139+
const first = evaluatePullRequestWatch(
140+
watch(),
141+
detail({ checks: [check("test", "success")] }),
142+
noRemarks,
143+
);
144+
assert.deepEqual(first.changes, [{ kind: "checks-passed", count: 1, required: false }]);
145+
const both = detail({ checks: [check("test", "success"), check("lint", "success")] });
146+
assert.deepEqual(evaluatePullRequestWatch(first.next, both, noRemarks).changes, [
147+
{ kind: "checks-passed", count: 2, required: false },
148+
]);
149+
});
150+
151+
it("does not wake a watch saved before passed checks were recorded", () => {
152+
const green = detail({ checks: [{ ...check("test", "success"), required: true }] });
153+
const told = watch({ headSha: "aaaaaaaaaa", passed: true });
154+
const saved = evaluatePullRequestWatch(told, green, noRemarks);
155+
assert.deepEqual(saved.changes, []);
156+
assert.deepEqual(saved.next.passedChecks, ["test"]);
157+
});
158+
103159
it("keeps remarks for a later pass when the conversation was not read whole", () => {
104160
const comments = [remark("reviewer", "2026-10-02T12:06:00Z")];
105161
const partial = evaluatePullRequestWatch(watch(), detail(), null);

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ export function evaluatePullRequestWatch(
5353
// An empty list keeps the last state: a host can answer with one when its check read fails.
5454
let failedChecks = headMoved ? [] : watch.failedChecks;
5555
let passed = headMoved ? false : watch.passed;
56+
let passedChecks = headMoved ? [] : watch.passedChecks;
5657
if (detail.checks.length > 0) {
5758
const failed = detail.checks.filter(isFailedCheck);
5859
const newlyFailed = failed.filter((check) => !failedChecks.includes(check.name));
@@ -63,10 +64,16 @@ export function evaluatePullRequestWatch(
6364
const required = detail.checks.filter((check) => check.required === true);
6465
const gate = required.length > 0 ? required : detail.checks;
6566
const passedNow = gate.every((check) => check.status !== "pending" && !isFailedCheck(check));
66-
if (passedNow && !passed) {
67+
const gateNames = gate.map((check) => check.name);
68+
// A watch saved before passedChecks existed takes the current names, so it does not wake.
69+
const told = passed && passedChecks.length === 0 ? gateNames : passedChecks;
70+
// A required job created and finished between two passes is never seen pending.
71+
const gateGrew = gateNames.some((name) => !told.includes(name));
72+
if (passedNow && (!passed || gateGrew)) {
6773
changes.push({ kind: "checks-passed", count: gate.length, required: required.length > 0 });
6874
}
6975
passed = passedNow;
76+
passedChecks = passedNow ? gateNames : [];
7077
}
7178

7279
const own = (detail.viewer ?? detail.author?.login)?.toLowerCase();
@@ -105,6 +112,7 @@ export function evaluatePullRequestWatch(
105112
headSha,
106113
failedChecks,
107114
passed,
115+
passedChecks,
108116
remarksThrough,
109117
remarkIds,
110118
conflicting,

‎packages/contracts/src/threadPullRequest.test.ts‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,32 @@ it.effect("decodes thread pull request links with snapshot and stack", () =>
5454
assert.strictEqual(links[1]?.snapshot?.state, "open");
5555
}),
5656
);
57+
58+
it.effect("decodes a watch saved before passed checks were recorded", () =>
59+
Effect.gen(function* () {
60+
const [link] = yield* decodeLinks([
61+
{
62+
host: "github.com",
63+
repository: "pingdotgg/t3code",
64+
number: 42,
65+
url: "https://github.com/pingdotgg/t3code/pull/42",
66+
source: "agent",
67+
linkedAt: "2026-01-01T00:00:00.000Z",
68+
snapshot: null,
69+
stack: null,
70+
watch: {
71+
startedAt: "2026-01-01T00:00:00.000Z",
72+
headSha: "abc123",
73+
failedChecks: [],
74+
passed: true,
75+
remarksThrough: "2026-01-01T00:00:00.000Z",
76+
remarkIds: [],
77+
conflicting: false,
78+
wakes: 0,
79+
},
80+
},
81+
]);
82+
83+
assert.deepStrictEqual(link?.watch?.passedChecks, []);
84+
}),
85+
);

‎packages/contracts/src/threadPullRequest.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import * as Effect from "effect/Effect";
12
import * as Schema from "effect/Schema";
23

34
import {
@@ -106,6 +107,13 @@ export const ThreadPullRequestWatch = Schema.Struct({
106107
failedChecks: Schema.Array(TrimmedNonEmptyString),
107108
/** The agent was told the required checks on that commit passed. */
108109
passed: Schema.Boolean,
110+
/**
111+
* Names in the passing gate on that commit, so a required check that first shows up already
112+
* passed is news. Empty on watches saved before this field existed.
113+
*/
114+
passedChecks: Schema.Array(TrimmedNonEmptyString).pipe(
115+
Schema.withDecodingDefault(Effect.succeed([])),
116+
),
109117
/** Remarks from others created up to this host time were reported. */
110118
remarksThrough: IsoDateTime,
111119
/** Remarks created exactly at `remarksThrough` that were reported, so a late one still counts. */

0 commit comments

Comments
 (0)