From fa254bfcb97c61a125517b0c8d702d4b879b232c Mon Sep 17 00:00:00 2001 From: Alex Southwell <4596216+saphid@users.noreply.github.com> Date: Tue, 3 Nov 2026 08:14:27 +1100 Subject: [PATCH] fix(gitcafe): PR link previews show a GitHub-merged pull request as merged Co-Authored-By: Claude Opus 5.5 --- .../src/server/GitCafePullRequestProvider.test.ts | 2 ++ .../src/server/GitCafePullRequestProvider.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.test.ts b/packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.test.ts index 113a388e853b..cb2bf219c0b5 100644 --- a/packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.test.ts +++ b/packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.test.ts @@ -1103,6 +1103,8 @@ describe("GitCafePullRequestProvider", () => { const detail = yield* provider.getChangeRequest(target); assert.strictEqual(detail.state, "merged"); assert.strictEqual(detail.mergedAt, mergedAt); + const preview = yield* provider.getChangeRequestPreview!(target); + assert.strictEqual(preview.state, "merged"); }).pipe(Effect.provide(server.layer)); }); diff --git a/packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.ts b/packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.ts index e87a4e154d69..7f8b4bab29da 100644 --- a/packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.ts +++ b/packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.ts @@ -897,7 +897,7 @@ export const make = Effect.gen(function* () { ), getChangeRequestPreview: (input) => readPull("getChangeRequestPreview", input).pipe( - Effect.map((pull) => Json.toChangeRequest(pull, input)), + Effect.map((pull) => ({ ...Json.toChangeRequest(pull, input), ...settledMerge(pull) })), ), getChangeRequestSummary: Effect.fn("GitCafePullRequestProvider.getChangeRequestSummary")( function* (input) {