Skip to content

Commit ef4fe09

Browse files
fix(pull-requests): do not clobber settled summary on PR reopen
Record last-known summary from the host read, not the stale snapshot served immediately, and key snapshot IO on the pull request identity instead of the inline reference object. Co-authored-by: Cursor <[email protected]>
1 parent 9498978 commit ef4fe09

3 files changed

Lines changed: 68 additions & 5 deletions

File tree

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3073,6 +3073,55 @@ it.effect("does not ask the host again for a linked summary it already holds", (
30733073
}),
30743074
);
30753075

3076+
it.effect("does not let a stale detail reopen overwrite a fresher linked summary", () =>
3077+
Effect.gen(function* () {
3078+
const gate = yield* Deferred.make<void>();
3079+
let detailCalls = 0;
3080+
let summaryTitle = "old title";
3081+
let summaryState: "open" | "merged" = "open";
3082+
const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
3083+
const service = yield* makeService({
3084+
projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
3085+
providers: [
3086+
fakeProvider("github", {
3087+
getChangeRequest: () =>
3088+
Effect.gen(function* () {
3089+
detailCalls += 1;
3090+
if (detailCalls > 1) yield* Deferred.await(gate);
3091+
return hostedChangeRequest("old body", 4);
3092+
}),
3093+
getChangeRequestSummary: () =>
3094+
Effect.succeed({
3095+
...changeRequest(1, "2026-07-02T00:00:00Z"),
3096+
title: summaryTitle,
3097+
state: summaryState,
3098+
}),
3099+
}),
3100+
],
3101+
});
3102+
3103+
const first = yield* service.detail(reference);
3104+
assert.strictEqual(first.title, "Change request 1");
3105+
3106+
summaryTitle = "merged title";
3107+
summaryState = "merged";
3108+
yield* TestClock.adjust("61 seconds");
3109+
const settled = yield* service.summary(reference, { recoverTransientFailure: false });
3110+
assert.strictEqual(settled.title, "merged title");
3111+
assert.strictEqual(settled.state, "merged");
3112+
3113+
yield* TestClock.adjust("16 seconds");
3114+
const stale = yield* service.detail(reference);
3115+
assert.strictEqual(stale.title, "Change request 1");
3116+
yield* Effect.yieldNow;
3117+
3118+
const display = yield* service.summary(reference);
3119+
assert.strictEqual(display.title, "merged title");
3120+
assert.strictEqual(display.state, "merged");
3121+
assert.strictEqual(detailCalls, 2);
3122+
}),
3123+
);
3124+
30763125
it.effect("keeps recent detail on a transient refresh failure but not after invalidation", () =>
30773126
Effect.gen(function* () {
30783127
let failing = false;

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2181,9 +2181,16 @@ export const make = Effect.gen(function* () {
21812181
});
21822182
const detail: PullRequestService["Service"]["detail"] = (input) => {
21832183
const key = refCacheKey(input);
2184-
return lastGoodDetail
2185-
.serveHeld(key, Cache.get(detailCache, key), "revalidate")
2186-
.pipe(Effect.tap((value) => lastGoodSummary.record(key, summaryFromDetail(value))));
2184+
// Record the summary from a host (or cache) read, not from the stale value
2185+
// `serveHeld` returns immediately — that snapshot can be older than a later
2186+
// strict summary, and display reuse would then never ask the host again.
2187+
return lastGoodDetail.serveHeld(
2188+
key,
2189+
Cache.get(detailCache, key).pipe(
2190+
Effect.tap((value) => lastGoodSummary.record(key, summaryFromDetail(value))),
2191+
),
2192+
"revalidate",
2193+
);
21872194
};
21882195

21892196
const activityCache = yield* Cache.makeWith(

‎apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ export function PullRequestDetailPanel({
576576
reference,
577577
),
578578
);
579-
}, [environmentId, pullRequestKey, reference]);
579+
}, [environmentId, pullRequestKey, reference.projectId, reference.repository, reference.number]);
580580
useEffect(() => {
581581
if (detailQuery.data === null) return;
582582
writePullRequestDetailSnapshot(
@@ -586,7 +586,14 @@ export function PullRequestDetailPanel({
586586
detailQuery.data,
587587
);
588588
setCachedDetail(detailQuery.data);
589-
}, [detailQuery.data, environmentId, pullRequestKey, reference]);
589+
}, [
590+
detailQuery.data,
591+
environmentId,
592+
pullRequestKey,
593+
reference.projectId,
594+
reference.repository,
595+
reference.number,
596+
]);
590597
const coreDetail = resolveDisplayedPullRequestDetail({
591598
live: detailQuery.data,
592599
cached: cachedDetail,

0 commit comments

Comments
 (0)