Skip to content

Commit 89359f3

Browse files
fix(pull-requests): keep settled summary over a cached detail
A still-valid detail cache entry can be older than auto-settle. Do not copy that title and state back into last-known summary. Co-authored-by: Cursor <[email protected]>
1 parent ef4fe09 commit 89359f3

2 files changed

Lines changed: 55 additions & 5 deletions

File tree

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3122,6 +3122,44 @@ it.effect("does not let a stale detail reopen overwrite a fresher linked summary
31223122
}),
31233123
);
31243124

3125+
it.effect("does not let a still-cached detail overwrite a fresher linked summary", () =>
3126+
Effect.gen(function* () {
3127+
let summaryTitle = "old title";
3128+
let summaryState: "open" | "merged" = "open";
3129+
const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
3130+
const service = yield* makeService({
3131+
projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
3132+
providers: [
3133+
fakeProvider("github", {
3134+
getChangeRequest: () => Effect.succeed(hostedChangeRequest("old body", 4)),
3135+
getChangeRequestSummary: () =>
3136+
Effect.succeed({
3137+
...changeRequest(1, "2026-07-02T00:00:00Z"),
3138+
title: summaryTitle,
3139+
state: summaryState,
3140+
}),
3141+
}),
3142+
],
3143+
});
3144+
3145+
const first = yield* service.detail(reference);
3146+
assert.strictEqual(first.title, "Change request 1");
3147+
3148+
summaryTitle = "merged title";
3149+
summaryState = "merged";
3150+
const settled = yield* service.summary(reference, { recoverTransientFailure: false });
3151+
assert.strictEqual(settled.state, "merged");
3152+
3153+
const cached = yield* service.detail(reference);
3154+
assert.strictEqual(cached.title, "Change request 1");
3155+
yield* Effect.yieldNow;
3156+
3157+
const display = yield* service.summary(reference);
3158+
assert.strictEqual(display.title, "merged title");
3159+
assert.strictEqual(display.state, "merged");
3160+
}),
3161+
);
3162+
31253163
it.effect("keeps recent detail on a transient refresh failure but not after invalidation", () =>
31263164
Effect.gen(function* () {
31273165
let failing = false;

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

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2019,7 +2019,7 @@ export const make = Effect.gen(function* () {
20192019
Effect.as(snapshot.value),
20202020
);
20212021
};
2022-
return { read, record, serveHeld };
2022+
return { peek: (key: string) => held.get(key)?.value, read, record, serveHeld };
20232023
};
20242024
const lastGoodSummary = makeLastGoodRead<PullRequestSummary>(DETAIL_CACHE_CAPACITY);
20252025
const lastGoodDetail = makeLastGoodRead<PullRequestDetail>(DETAIL_CACHE_CAPACITY);
@@ -2179,15 +2179,27 @@ export const make = Effect.gen(function* () {
21792179
baseBranch: detail.baseBranch,
21802180
updatedAt: detail.updatedAt,
21812181
});
2182+
const shouldReplaceHeldSummary = (key: string, next: PullRequestSummary) => {
2183+
const current = lastGoodSummary.peek(key);
2184+
if (current === undefined) return true;
2185+
if (current.state === "merged" && next.state !== "merged") return false;
2186+
return next.updatedAt >= current.updatedAt;
2187+
};
21822188
const detail: PullRequestService["Service"]["detail"] = (input) => {
21832189
const key = refCacheKey(input);
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.
2190+
// Record the summary from a host or cache read, not the stale value
2191+
// `serveHeld` returns immediately. Skip the write when that read is older
2192+
// than a later strict summary — display reuse would otherwise keep the
2193+
// regression and never ask the host again.
21872194
return lastGoodDetail.serveHeld(
21882195
key,
21892196
Cache.get(detailCache, key).pipe(
2190-
Effect.tap((value) => lastGoodSummary.record(key, summaryFromDetail(value))),
2197+
Effect.tap((value) => {
2198+
const summary = summaryFromDetail(value);
2199+
return shouldReplaceHeldSummary(key, summary)
2200+
? lastGoodSummary.record(key, summary)
2201+
: Effect.void;
2202+
}),
21912203
),
21922204
"revalidate",
21932205
);

0 commit comments

Comments
 (0)