From 37494c9bcb12a81cf13593ae238164b8c98732c6 Mon Sep 17 00:00:00 2001 From: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com> Date: Fri, 20 Nov 2026 13:36:41 -0800 Subject: [PATCH] fix(server): pull_request_merge accepts an abbreviated head SHA Co-Authored-By: Claude Opus 5.5 --- .../toolkits/pullRequests/handlers.test.ts | 12 +++++-- .../src/mcp/toolkits/pullRequests/handlers.ts | 8 ++++- .../pullRequest/PullRequestService.test.ts | 17 ++++++---- .../src/pullRequest/PullRequestService.ts | 32 ++++++++++++------- 4 files changed, 49 insertions(+), 20 deletions(-) diff --git a/apps/server/src/mcp/toolkits/pullRequests/handlers.test.ts b/apps/server/src/mcp/toolkits/pullRequests/handlers.test.ts index b036392730fa9..3c97d6b9d5d00 100644 --- a/apps/server/src/mcp/toolkits/pullRequests/handlers.test.ts +++ b/apps/server/src/mcp/toolkits/pullRequests/handlers.test.ts @@ -1024,6 +1024,7 @@ describe("source control tools", () => { Effect.gen(function* () { const actions: Array = []; let lowerHead: string | undefined = "bbb"; + let targetHead = "stale"; const layer = (number: number, state: "open" | "merged", headSha: string | undefined) => ({ number, state, @@ -1044,7 +1045,7 @@ describe("source control tools", () => { layers: [ layer(40, "merged", "aaa"), layer(41, "open", lowerHead), - layer(42, "open", "stale"), + layer(42, "open", targetHead), layer(43, "open", "ddd"), ], }), @@ -1064,12 +1065,19 @@ describe("source control tools", () => { ], }, ]); + const fullHead = "c0ffee1234567890abcdef1234567890abcdef12"; + targetHead = fullHead; + yield* harness.call("pull_request_merge", { expectedHeadSha: "c0ffee1", stack: true }); + expect(actions[1]?.expectedStackHeads).toEqual([ + { number: 41, headSha: "bbb" }, + { number: 42, headSha: fullHead }, + ]); lowerHead = undefined; const unpinned = yield* harness .call("pull_request_merge", { expectedHeadSha: "ccc", stack: true }) .pipe(Effect.flip); expect(unpinned._tag).toBe("PullRequestForgeError"); - expect(actions).toHaveLength(1); + expect(actions).toHaveLength(2); }), ); diff --git a/apps/server/src/mcp/toolkits/pullRequests/handlers.ts b/apps/server/src/mcp/toolkits/pullRequests/handlers.ts index 65eaf22975c68..dd37b813e6bbe 100644 --- a/apps/server/src/mcp/toolkits/pullRequests/handlers.ts +++ b/apps/server/src/mcp/toolkits/pullRequests/handlers.ts @@ -418,7 +418,13 @@ const make = Effect.gen(function* () { const expectedStackHeads: Array<{ readonly number: number; readonly headSha: string }> = []; for (const layer of stack.layers.slice(0, end + 1)) { if (layer.state === "merged") continue; - const headSha = layer.number === ref.number ? input.expectedHeadSha : layer.headSha; + const headSha = + layer.number !== ref.number + ? layer.headSha + : layer.headSha !== undefined && + PullRequestService.isHeadSha(layer.headSha, input.expectedHeadSha) + ? layer.headSha + : input.expectedHeadSha; if (headSha === undefined) return yield* new PullRequestForgeError({ detail: `The host did not report PR #${layer.number}'s head, so the stack cannot be pinned. Try again.`, diff --git a/apps/server/src/pullRequest/PullRequestService.test.ts b/apps/server/src/pullRequest/PullRequestService.test.ts index 73a7222cf9a01..a1e04a9114b50 100644 --- a/apps/server/src/pullRequest/PullRequestService.test.ts +++ b/apps/server/src/pullRequest/PullRequestService.test.ts @@ -1550,13 +1550,13 @@ it.effect.each([false, true])( it.effect("refuses a merge whose head moved past expectedHeadSha and pins the host merge", () => Effect.gen(function* () { + const head = "0a1b2c3d4e5f60718293a4b5c6d7e8f901234567"; const pinned: Array = []; const service = yield* makeService({ projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })], providers: [ fakePullRequestProvider(SourceControlProviderKind.make("github"), { - getChangeRequest: () => - Effect.succeed({ ...hostedChangeRequest("Body"), headSha: "new-head" }), + getChangeRequest: () => Effect.succeed({ ...hostedChangeRequest("Body"), headSha: head }), getChangeRequestSummary: () => Effect.succeed(changeRequest(1, "2026-09-03T00:00:00Z")), runAction: (input) => Effect.sync(() => void pinned.push(input.expectedHeadSha)), }), @@ -1564,11 +1564,16 @@ it.effect("refuses a merge whose head moved past expectedHeadSha and pins the ho }); const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 }; const refused = yield* Effect.flip( - service.runAction({ ...reference, action: "merge", expectedHeadSha: "reviewed-head" }), + service.runAction({ ...reference, action: "merge", expectedHeadSha: "0a1b2c4" }), + ); + assert.include(refused.message, head); + const tooShort = yield* Effect.flip( + service.runAction({ ...reference, action: "merge", expectedHeadSha: "0a1b2c" }), ); - assert.include(refused.message, "new-head"); - yield* service.runAction({ ...reference, action: "merge", expectedHeadSha: "new-head" }); - assert.deepStrictEqual(pinned, ["new-head"]); + assert.include(tooShort.message, head); + yield* service.runAction({ ...reference, action: "merge", expectedHeadSha: head }); + yield* service.runAction({ ...reference, action: "merge", expectedHeadSha: "0A1B2C3D4" }); + assert.deepStrictEqual(pinned, [head, head]); }), ); diff --git a/apps/server/src/pullRequest/PullRequestService.ts b/apps/server/src/pullRequest/PullRequestService.ts index eab5d89888d8f..e30938735c765 100644 --- a/apps/server/src/pullRequest/PullRequestService.ts +++ b/apps/server/src/pullRequest/PullRequestService.ts @@ -753,6 +753,12 @@ function httpRemoteHost(remoteUrl: string): string | null { } } +/** Whether `expected` names `head`: the full SHA, or a hex prefix of at least 7 characters. */ +export const isHeadSha = (head: string, expected: string) => { + const wanted = expected.toLowerCase(); + return /^[0-9a-f]{7,}$/.test(wanted) ? head.toLowerCase().startsWith(wanted) : head === expected; +}; + // Capture before the provider read so a slow response keeps its original freshness through caches. const observeRead = Effect.fnUntraced(function* (read: Effect.Effect) { const observedAt = yield* Clock.currentTimeMillis; @@ -2285,9 +2291,10 @@ export const make = Effect.gen(function* () { ) : Effect.succeed(false); // Hosts that cannot pin a merge to a commit still refuse a head that already moved. - const headPinned = - input.expectedHeadSha === undefined - ? Effect.void + const expected = input.expectedHeadSha; + const headPinned: Effect.Effect = + expected === undefined + ? Effect.undefined : project.api .getChangeRequest({ cwd: project.project.workspaceRoot, @@ -2298,19 +2305,24 @@ export const make = Effect.gen(function* () { .pipe( Effect.mapError(toPullRequestError("runAction")), Effect.flatMap((current) => - current.headSha === input.expectedHeadSha - ? Effect.void + typeof current.headSha === "string" && isHeadSha(current.headSha, expected) + ? Effect.succeed(current.headSha) : Effect.fail( new PullRequestOperationError({ operation: "runAction", - detail: `The head is now ${current.headSha ?? "unknown"}, not ${input.expectedHeadSha}. Review the new commits first.`, + detail: `The head is now ${current.headSha ?? "unknown"}, not ${expected}. Review the new commits first.`, }), ), ), ); return headPinned.pipe( - Effect.andThen(mergeSettings), - Effect.flatMap((removeAgentCreditsOnMerge) => + Effect.flatMap((expectedHeadSha) => + Effect.map(mergeSettings, (removeAgentCreditsOnMerge) => ({ + expectedHeadSha, + removeAgentCreditsOnMerge, + })), + ), + Effect.flatMap(({ expectedHeadSha, removeAgentCreditsOnMerge }) => project.api .runAction({ cwd: project.project.workspaceRoot, @@ -2323,9 +2335,7 @@ export const make = Effect.gen(function* () { ...(input.expectedStackHeads === undefined ? {} : { expectedStackHeads: input.expectedStackHeads }), - ...(input.expectedHeadSha === undefined - ? {} - : { expectedHeadSha: input.expectedHeadSha }), + ...(expectedHeadSha === undefined ? {} : { expectedHeadSha }), ...(input.mergeMethod === undefined ? {} : { mergeMethod: input.mergeMethod }), ...(input.updateMethod === undefined ? {}