Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions apps/server/src/mcp/toolkits/pullRequests/handlers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1024,6 +1024,7 @@ describe("source control tools", () => {
Effect.gen(function* () {
const actions: Array<PullRequestActionInput> = [];
let lowerHead: string | undefined = "bbb";
let targetHead = "stale";
const layer = (number: number, state: "open" | "merged", headSha: string | undefined) => ({
number,
state,
Expand All @@ -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"),
],
}),
Expand All @@ -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);
}),
);

Expand Down
8 changes: 7 additions & 1 deletion apps/server/src/mcp/toolkits/pullRequests/handlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.`,
Expand Down
17 changes: 11 additions & 6 deletions apps/server/src/pullRequest/PullRequestService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1550,25 +1550,30 @@ 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<string | undefined> = [];
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)),
}),
],
});
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]);
}),
);

Expand Down
32 changes: 21 additions & 11 deletions apps/server/src/pullRequest/PullRequestService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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* <A, E, R>(read: Effect.Effect<A, E, R>) {
const observedAt = yield* Clock.currentTimeMillis;
Expand Down Expand Up @@ -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<string | undefined, PullRequestError> =
expected === undefined
? Effect.undefined
: project.api
.getChangeRequest({
cwd: project.project.workspaceRoot,
Expand All @@ -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,
Expand All @@ -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
? {}
Expand Down
Loading