Skip to content

Commit beadfe5

Browse files
RealDoc06claude
andauthored
fix(server): Bitbucket threads settle after their pull request merges (pingdotgg#19937)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent c3bfef8 commit beadfe5

7 files changed

Lines changed: 129 additions & 6 deletions

File tree

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

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,11 @@ describe("PullRequestSyncReactor", () => {
630630
yield* TestClock.setTime(Date.parse(NOW));
631631
const fixture = yield* makeHarness({
632632
snapshot: makeSnapshot([
633-
makeThread("merged", { pullRequests: [makeLink(1, { state: "merged" })] }),
633+
makeThread("merged", {
634+
pullRequests: [
635+
makeLink(1, { state: "merged", mergedAt: "2026-08-27T00:00:00.000Z" }),
636+
],
637+
}),
634638
]),
635639
});
636640

@@ -658,6 +662,38 @@ describe("PullRequestSyncReactor", () => {
658662
),
659663
);
660664

665+
it.effect("re-reads a merged pull request until the host supplies its merge time", () =>
666+
Effect.scoped(
667+
Effect.gen(function* () {
668+
yield* TestClock.setTime(Date.parse(NOW));
669+
const invalidated = yield* Ref.make<ReadonlyArray<number>>([]);
670+
const fixture = yield* makeHarness({
671+
snapshot: makeSnapshot([
672+
makeThread("merged", { pullRequests: [makeLink(1, { state: "merged" })] }),
673+
]),
674+
invalidate: ({ reference }) =>
675+
Ref.update(invalidated, (numbers) => [...numbers, reference?.number ?? -1]),
676+
summary: (input) =>
677+
Effect.succeed(
678+
makeSummary(input, { state: "merged", mergedAt: "2026-08-27T00:00:00.000Z" }),
679+
),
680+
});
681+
682+
yield* Effect.gen(function* () {
683+
const reactor = yield* startAndSweep(fixture);
684+
const firstSweep = yield* Ref.get(fixture.syncCommands);
685+
// The held merged summary is dropped so the read reaches the host.
686+
assert.deepStrictEqual(yield* Ref.get(invalidated), [1]);
687+
assert.strictEqual(firstSweep.at(-1)?.snapshot.mergedAt, "2026-08-27T00:00:00.000Z");
688+
yield* Ref.update(fixture.snapshots, (snapshot) => applySync(snapshot, firstSweep));
689+
690+
for (let index = 0; index < 15; index += 1) yield* sweepAgain(fixture, reactor);
691+
assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 1);
692+
}).pipe(Effect.provide(fixture.layer));
693+
}),
694+
),
695+
);
696+
661697
it.effect("syncs a pull request a reader saw merge without waiting for the sweep", () =>
662698
Effect.scoped(
663699
Effect.gen(function* () {

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,15 @@ export const make = Effect.gen(function* () {
167167
if (requested.has(key) || retryStacks.has(key)) return true;
168168
if (entries.some((entry) => entry.link.snapshot === null)) return true;
169169
const active = entries.filter((entry) => isUnsettled(entry.thread));
170-
if (active.every((entry) => entry.link.snapshot?.state === "merged")) return false;
170+
// A merged snapshot without its merge time cannot settle the thread, so it keeps the slow
171+
// cadence until the host supplies one (Bitbucket snapshots saved before it was read).
172+
if (
173+
active.every(
174+
(entry) => entry.link.snapshot?.state === "merged" && entry.link.snapshot.mergedAt != null,
175+
)
176+
) {
177+
return false;
178+
}
171179
if (active.some((entry) => entry.link.snapshot?.state === "open")) return true;
172180
const last = lastSyncedAt.get(key);
173181
return last === undefined || nowMs - last >= SLOW_SYNC_INTERVAL_MS;
@@ -271,7 +279,14 @@ export const make = Effect.gen(function* () {
271279
number: first.link.number,
272280
};
273281
const generation = requested.get(key);
274-
if (generation !== undefined) yield* pullRequests.invalidate({ reference: ref });
282+
// A held merged summary is served without asking the host, so a snapshot still missing its
283+
// merge time has to drop it or the slow-cadence re-read would hand back the same gap.
284+
const missingMergedAt = entries.some(
285+
(entry) => entry.link.snapshot?.state === "merged" && entry.link.snapshot.mergedAt == null,
286+
);
287+
if (generation !== undefined || missingMergedAt) {
288+
yield* pullRequests.invalidate({ reference: ref });
289+
}
275290
const summary = yield* pullRequests.summary(ref, { recoverTransientFailure: false });
276291
const fields = snapshotFieldsOf(summary);
277292
const needsStack =

‎packages/source-control-bitbucket/src/server/BitbucketPullRequestApi.test.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,24 @@ layer("BitbucketPullRequestApi.layer", (it) => {
711711
}),
712712
);
713713

714+
it.effect("asks for the time a pull request closed, which Bitbucket leaves out by default", () =>
715+
Effect.gen(function* () {
716+
mockedRequest.mockReturnValueOnce(
717+
Effect.succeed(
718+
response(
719+
pullRequestJson({ state: "MERGED", closed_on: "2025-06-16T23:40:46.222238+00:00" }),
720+
),
721+
),
722+
);
723+
const api = yield* BitbucketPullRequestApi.BitbucketPullRequestApi;
724+
725+
const pullRequest = yield* api.getPullRequest({ repository: "acme/web", number: 7 });
726+
727+
expect(callAt(0).url).toBe("/repositories/acme/web/pullrequests/7?fields=%2Bclosed_on");
728+
assert.strictEqual(pullRequest.closedAt, "2025-06-16T23:40:46.222Z");
729+
}),
730+
);
731+
714732
it.effect("fails the read when Bitbucket answers with something unreadable", () =>
715733
Effect.gen(function* () {
716734
mockedRequest.mockReturnValueOnce(

‎packages/source-control-bitbucket/src/server/BitbucketPullRequestApi.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,9 @@ export const make = Effect.gen(function* () {
585585
withRepository(input.repository, (path) =>
586586
readPage({
587587
operation: "getPullRequest",
588-
url: `${path}/pullrequests/${input.number}`,
588+
// `closed_on` is left out of the default representation. It is the only merge or
589+
// decline time Bitbucket states on the pull request itself, and settlement needs it.
590+
url: `${path}/pullrequests/${input.number}?fields=%2Bclosed_on`,
589591
decode: decodePullRequestJson,
590592
}),
591593
),

‎packages/source-control-bitbucket/src/server/BitbucketPullRequestProvider.test.ts‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,53 @@ it.effect.each([
7070
}),
7171
);
7272

73+
it.effect.each([
74+
{ state: "MERGED", mergedAt: "2025-06-16T23:40:46.222Z", closedAt: null },
75+
{ state: "DECLINED", mergedAt: null, closedAt: "2025-06-16T23:40:46.222Z" },
76+
{ state: "OPEN", mergedAt: null, closedAt: null },
77+
])("reads the $state time from closed_on", ({ state, mergedAt, closedAt }) =>
78+
Effect.gen(function* () {
79+
const pullRequest = Result.getOrThrow(
80+
decodePullRequestJson(
81+
JSON.stringify({
82+
id: 52,
83+
title: "Release",
84+
state,
85+
source: { branch: { name: "release" } },
86+
destination: { branch: { name: "master" } },
87+
created_on: "2025-06-16T06:20:58.415108+00:00",
88+
// Comments after a merge move this, so it is not the merge time.
89+
updated_on: "2025-06-20T10:00:00.000000+00:00",
90+
closed_on: state === "OPEN" ? null : "2025-06-16T23:40:46.222238+00:00",
91+
links: { html: { href: "https://bitbucket.org/acme/web/pull-requests/52" } },
92+
}),
93+
),
94+
);
95+
const provider = yield* make.pipe(
96+
Effect.provide(
97+
Layer.mock(BitbucketPullRequestApi.BitbucketPullRequestApi)({
98+
getPullRequest: () => Effect.succeed(pullRequest),
99+
getDiffStat: () => Effect.succeed({ additions: 0, deletions: 0, changedFiles: 0 }),
100+
getMergeability: () => Effect.succeed("unknown"),
101+
listChecks: () => Effect.succeed([]),
102+
getRepositoryPermission: () => Effect.succeed(true),
103+
}),
104+
),
105+
);
106+
const detail = yield* provider.getChangeRequest({
107+
cwd: "/repo",
108+
repository: "acme/web",
109+
host: "bitbucket.org",
110+
number: 52,
111+
});
112+
113+
expect({ mergedAt: detail.mergedAt, closedAt: detail.closedAt }).toEqual({
114+
mergedAt,
115+
closedAt,
116+
});
117+
}),
118+
);
119+
73120
for (const operation of [
74121
"getMergeability",
75122
"listChecks",

‎packages/source-control-bitbucket/src/server/BitbucketPullRequestProvider.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ export const make = Effect.gen(function* () {
198198
deletions: diffStat.deletions,
199199
changedFiles: diffStat.changedFiles,
200200
body: pullRequest.body,
201-
mergedAt: null,
202-
closedAt: null,
201+
mergedAt: pullRequest.state === "merged" ? pullRequest.closedAt : null,
202+
closedAt: pullRequest.state === "closed" ? pullRequest.closedAt : null,
203203
reviewers: pullRequest.reviewers,
204204
checks,
205205
// Bitbucket publishes no per-repository list of allowed strategies, so the ones it

‎packages/source-control-bitbucket/src/server/bitbucketPullRequestJson.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ const RawPullRequestSchema = Schema.Struct({
6666
destination: RawBranchSchema,
6767
created_on: Schema.String,
6868
updated_on: Schema.String,
69+
/** Only sent when asked for with `fields=+closed_on`; null while the request is open. */
70+
closed_on: Schema.optional(Schema.NullOr(Schema.String)),
6971
reviewers: Schema.optional(Schema.NullOr(Schema.Array(RawUserSchema))),
7072
participants: Schema.optional(
7173
Schema.NullOr(
@@ -175,6 +177,8 @@ export interface BitbucketPullRequest {
175177
readonly mergeability: PullRequestMergeability;
176178
readonly createdAt: string;
177179
readonly updatedAt: string;
180+
/** When the request was merged or declined, unlike `updatedAt`, which later comments move. */
181+
readonly closedAt: string | null;
178182
readonly body: string;
179183
readonly reviewRequestLogins: ReadonlyArray<string>;
180184
readonly reviewers: ReadonlyArray<PullRequestActor>;
@@ -280,6 +284,7 @@ function toPullRequest(raw: Schema.Schema.Type<typeof RawPullRequestSchema>): Bi
280284
mergeability: "unknown",
281285
createdAt: toIsoUtc(raw.created_on),
282286
updatedAt: toIsoUtc(raw.updated_on),
287+
closedAt: raw.closed_on == null ? null : toIsoUtc(raw.closed_on),
283288
body: raw.description ?? "",
284289
reviewRequestLogins: reviewers.map((reviewer) => reviewer.login),
285290
reviewers,

0 commit comments

Comments
 (0)