Skip to content

Commit 8798d1b

Browse files
committed
fix(workspace): keep merge settlement scoped and share provider discovery (#11251)
1 parent 19e6229 commit 8798d1b

4 files changed

Lines changed: 206 additions & 28 deletions

File tree

‎apps/server/src/orchestration/ThreadSettlementReactor.test.ts‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,49 @@ describe("ThreadSettlementReactor", () => {
689689
),
690690
);
691691

692+
for (const matchingFirst of [true, false]) {
693+
it.effect(
694+
`scoped root merges settle only their thread when matchingFirst=${matchingFirst}`,
695+
() =>
696+
Effect.scoped(
697+
Effect.gen(function* () {
698+
yield* TestClock.setTime(Date.parse(NOW));
699+
const ids = matchingFirst ? ["matching", "unrelated"] : ["unrelated", "matching"];
700+
const fixture = yield* makeHarness({
701+
snapshot: makeSnapshot(
702+
ids.map((id) =>
703+
makeThread(id, {
704+
branch: "shared-feature",
705+
latestUserMessageAt: "2026-08-27T00:00:00.000Z",
706+
linkedPullRequest: {
707+
projectId: PROJECT_ID,
708+
repository: "owner/repository",
709+
number: 42,
710+
url: "https://example.test/owner/repository/pull/42",
711+
},
712+
}),
713+
),
714+
),
715+
mergeWorkspace: { threadId: ThreadId.make("matching"), repositoryPath: "." },
716+
});
717+
yield* Effect.gen(function* () {
718+
const reactor = yield* ThreadSettlementReactor.ThreadSettlementReactor;
719+
yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
720+
assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 1);
721+
yield* fixture.publishMerge;
722+
yield* Queue.take(fixture.snapshotReads);
723+
yield* reactor.drain;
724+
assert.deepStrictEqual(
725+
(yield* Ref.get(fixture.commands)).map((command) => command.threadId),
726+
[ThreadId.make("matching")],
727+
);
728+
assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 2);
729+
}).pipe(Effect.provide(fixture.layer));
730+
}),
731+
),
732+
);
733+
}
734+
692735
it.effect("does not settle the wrapper from a child repository merge event", () =>
693736
Effect.scoped(
694737
Effect.gen(function* () {

‎apps/server/src/orchestration/ThreadSettlementReactor.ts‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,19 @@ export const make = Effect.gen(function* () {
179179
discard: true,
180180
});
181181
}
182+
const mergeFor = (thread: (typeof candidates)[number]) => {
183+
const reference = thread.linkedPullRequest ?? thread.branchPullRequest;
184+
return reference != null &&
185+
mergedPullRequest !== null &&
186+
(mergedPullRequest.workspace === undefined ||
187+
(mergedPullRequest.workspace.repositoryPath === "." &&
188+
mergedPullRequest.workspace.threadId === thread.id)) &&
189+
reference.projectId === mergedPullRequest.projectId &&
190+
reference.repository.toLowerCase() === mergedPullRequest.repository.toLowerCase() &&
191+
reference.number === mergedPullRequest.number
192+
? mergedPullRequest
193+
: null;
194+
};
182195
const lookupKey = (thread: (typeof candidates)[number]) => {
183196
const reference = thread.linkedPullRequest ?? thread.branchPullRequest;
184197
if (reference != null) {
@@ -189,6 +202,7 @@ export const make = Effect.gen(function* () {
189202
reference.number,
190203
lookupCwdByThreadId.get(thread.id),
191204
thread.branch,
205+
mergeFor(thread) !== null,
192206
]);
193207
}
194208
if (thread.branch === null) return JSON.stringify(["none", thread.id]);
@@ -204,31 +218,25 @@ export const make = Effect.gen(function* () {
204218
) {
205219
const reference = thread.linkedPullRequest ?? thread.branchPullRequest;
206220
if (reference != null) {
207-
const matchesMerge =
208-
mergedPullRequest !== null &&
209-
(mergedPullRequest.workspace === undefined ||
210-
(mergedPullRequest.workspace.repositoryPath === "." &&
211-
mergedPullRequest.workspace.threadId === thread.id)) &&
212-
reference.projectId === mergedPullRequest.projectId &&
213-
reference.repository.toLowerCase() === mergedPullRequest.repository.toLowerCase() &&
214-
reference.number === mergedPullRequest.number;
215-
if (!matchesMerge && !projects.has(reference.projectId)) {
221+
const matchingMerge = mergeFor(thread);
222+
if (matchingMerge === null && !projects.has(reference.projectId)) {
216223
return yield* Effect.die(new Error("linked pull request project not found"));
217224
}
218-
const summary = matchesMerge
219-
? ({
220-
state: "merged",
221-
closedAt: null,
222-
mergedAt: mergedPullRequest.mergedAt,
223-
} satisfies SettlementPullRequest)
224-
: yield* pullRequests.summary(
225-
{
226-
projectId: reference.projectId,
227-
repository: reference.repository,
228-
number: reference.number,
229-
},
230-
{ recoverTransientFailure: false },
231-
);
225+
const summary =
226+
matchingMerge !== null
227+
? ({
228+
state: "merged",
229+
closedAt: null,
230+
mergedAt: matchingMerge.mergedAt,
231+
} satisfies SettlementPullRequest)
232+
: yield* pullRequests.summary(
233+
{
234+
projectId: reference.projectId,
235+
repository: reference.repository,
236+
number: reference.number,
237+
},
238+
{ recoverTransientFailure: false },
239+
);
232240
const cwd = lookupCwdByThreadId.get(thread.id);
233241
if (summary.state !== "open" && thread.branch !== null && cwd !== undefined) {
234242
// A reused branch can already have a new open PR while discovery

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

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4808,6 +4808,120 @@ for (const validHost of [undefined, "GITHUB.COM"] as const) {
48084808
);
48094809
}
48104810

4811+
for (const variation of ["same-checkout", "different-checkout", "different-remote"] as const) {
4812+
it.effect(
4813+
`coalesces scoped provider refinement only for the same checkout and remote (${variation})`,
4814+
() =>
4815+
Effect.gen(function* () {
4816+
const refinements: Array<{ cwd: string; remoteUrl: string | undefined }> = [];
4817+
const statsReads: string[] = [];
4818+
const unknownIdentity = project({
4819+
id: "child",
4820+
title: "app",
4821+
workspaceRoot: "/task/projects/app",
4822+
repository: "org/app",
4823+
provider: "unknown",
4824+
host: "code.example.test",
4825+
}).repositoryIdentity!;
4826+
const secondIdentity =
4827+
variation === "different-remote"
4828+
? project({
4829+
id: "child",
4830+
title: "app",
4831+
workspaceRoot: "/task/projects/app",
4832+
repository: "org/app",
4833+
provider: "unknown",
4834+
host: "other.example.test",
4835+
}).repositoryIdentity!
4836+
: unknownIdentity;
4837+
const service = yield* makeService({
4838+
projects: [project({ id: "p1", title: "wrapper", workspaceRoot: "/wrapper" })],
4839+
threads: [
4840+
scopedThread,
4841+
{
4842+
...scopedThread,
4843+
id: "t2" as ThreadId,
4844+
worktreePath: variation === "different-checkout" ? "/other" : "/task",
4845+
},
4846+
{ ...scopedThread, id: "invalid" as ThreadId, projectId: "p2" as ProjectId },
4847+
],
4848+
repositories: (cwd) => [
4849+
{
4850+
path: "projects/app",
4851+
name: "app",
4852+
cwd: `${cwd}/projects/app`,
4853+
kind: "repository",
4854+
available: true,
4855+
repositoryIdentity: unknownIdentity,
4856+
},
4857+
{
4858+
path: "projects/alias",
4859+
name: "alias",
4860+
cwd: `${cwd}/projects/app`,
4861+
kind: "repository",
4862+
available: true,
4863+
repositoryIdentity: secondIdentity,
4864+
},
4865+
],
4866+
resolveHandle: ({ cwd, context }) =>
4867+
Effect.gen(function* () {
4868+
refinements.push({ cwd, remoteUrl: context?.remoteUrl });
4869+
yield* Effect.yieldNow;
4870+
return {
4871+
context: {
4872+
...context!,
4873+
provider: { ...context!.provider, kind: "gitlab" as const },
4874+
},
4875+
provider: undefined as never,
4876+
};
4877+
}),
4878+
providers: [
4879+
fakeProvider("gitlab", {
4880+
listChangeRequestStats: ({ cwd, host, changeRequests }) => {
4881+
statsReads.push(`${cwd} ${host}`);
4882+
return Effect.succeed(
4883+
[...new Set(changeRequests.map((ref) => ref.number))].map((number) => ({
4884+
repository: "org/app",
4885+
number,
4886+
additions: 10,
4887+
deletions: 0,
4888+
})),
4889+
);
4890+
},
4891+
}),
4892+
],
4893+
});
4894+
const refs = [
4895+
scopedRef,
4896+
{
4897+
...scopedRef,
4898+
workspace: { threadId: "t2" as ThreadId, repositoryPath: "projects/alias" },
4899+
},
4900+
{ ...scopedRef, workspace: { ...scopedRef.workspace, threadId: "invalid" as ThreadId } },
4901+
{ ...scopedRef, repository: "org/not-authorized" },
4902+
];
4903+
const result = yield* service.listStats({ refs });
4904+
assert.deepStrictEqual(result.stats.map((stat) => stat.workspace?.threadId).sort(), [
4905+
"t1",
4906+
"t2",
4907+
]);
4908+
assert.strictEqual(refinements.length, variation === "same-checkout" ? 1 : 2);
4909+
assert.strictEqual(statsReads.length, variation === "same-checkout" ? 1 : 2);
4910+
if (variation === "different-checkout")
4911+
assert.deepStrictEqual(refinements.map((entry) => entry.cwd).sort(), [
4912+
"/other/projects/app",
4913+
"/task/projects/app",
4914+
]);
4915+
if (variation === "different-remote")
4916+
assert.deepStrictEqual(refinements.map((entry) => entry.remoteUrl).sort(), [
4917+
"https://code.example.test/org/app.git",
4918+
"https://other.example.test/org/app.git",
4919+
]);
4920+
assert.deepStrictEqual(yield* service.listStats({ refs: refs.slice(2) }), { stats: [] });
4921+
}),
4922+
);
4923+
}
4924+
48114925
it.effect("publishes child repository merges with their workspace scope", () =>
48124926
Effect.scoped(
48134927
Effect.gen(function* () {

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

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -540,9 +540,15 @@ export const make = Effect.gen(function* () {
540540
const rateLimits = yield* SourceControlRateLimit.SourceControlRateLimit;
541541
const readCache = yield* PullRequestReadCache.PullRequestReadCache;
542542

543+
const resolveProviderKind = (input: Parameters<typeof sourceControlProviders.resolveHandle>[0]) =>
544+
sourceControlProviders
545+
.resolveHandle(input)
546+
.pipe(Effect.map((handle) => handle.context?.provider.kind));
547+
543548
const refineUnknownProjectKinds = (
544549
projects: ReadonlyArray<OrchestrationProjectShell>,
545550
filter: Pick<PullRequestListInput, "projectId" | "host">,
551+
resolveKind = resolveProviderKind,
546552
) => {
547553
type RefinementCandidate = {
548554
readonly project: OrchestrationProjectShell;
@@ -581,13 +587,12 @@ export const make = Effect.gen(function* () {
581587
Effect.firstSuccessOf(
582588
candidates.map(({ project, provider, remoteName, remoteUrl }) =>
583589
Effect.suspend(() =>
584-
sourceControlProviders.resolveHandle({
590+
resolveKind({
585591
cwd: project.workspaceRoot,
586592
context: { provider, remoteName, remoteUrl },
587593
}),
588594
).pipe(
589-
Effect.flatMap((handle) => {
590-
const kind = handle.context?.provider.kind;
595+
Effect.flatMap((kind) => {
591596
return kind === undefined || kind === "unknown"
592597
? Effect.fail(undefined)
593598
: Effect.succeed(kind);
@@ -746,6 +751,7 @@ export const make = Effect.gen(function* () {
746751

747752
const requireProject = Effect.fn("PullRequestService.requireProject")(function* (
748753
ref: PullRequestRef,
754+
resolveKind = resolveProviderKind,
749755
): Effect.fn.Return<SupportedProject, PullRequestError> {
750756
if (ref.workspace === undefined) return yield* requireUnscopedProject(ref);
751757
const invalid = (detail: string) =>
@@ -789,7 +795,7 @@ export const make = Effect.gen(function* () {
789795
const repository = sourceControlRepositorySelector(project.repositoryIdentity);
790796
if (!repository || repository.toLowerCase() !== ref.repository.trim().toLowerCase())
791797
return yield* invalid("The change request does not belong to the selected repository.");
792-
const refined = yield* refineUnknownProjectKinds([project], {});
798+
const refined = yield* refineUnknownProjectKinds([project], {}, resolveKind);
793799
const identity = project.repositoryIdentity;
794800
if (!identity) return yield* invalid("The selected repository has no remote identity.");
795801
let kind = identity.provider as SourceControlProviderKind;
@@ -2186,10 +2192,17 @@ export const make = Effect.gen(function* () {
21862192
if (group) group.push(ref);
21872193
else byScope.set(key, [ref]);
21882194
}
2195+
const providerKinds = yield* Cache.makeWith(
2196+
(key: string) =>
2197+
resolveProviderKind(JSON.parse(key) as Parameters<typeof resolveProviderKind>[0]),
2198+
{ capacity: byScope.size },
2199+
);
2200+
const resolveBatchProviderKind: typeof resolveProviderKind = (input) =>
2201+
Cache.get(providerKinds, JSON.stringify(input));
21892202
const resolved = yield* Effect.forEach(
21902203
[...byScope.values()],
21912204
Effect.fn(function* (refs) {
2192-
const project = yield* requireProject(refs[0]!).pipe(
2205+
const project = yield* requireProject(refs[0]!, resolveBatchProviderKind).pipe(
21932206
Effect.orElseSucceed(() => undefined),
21942207
);
21952208
return project?.api.listChangeRequestStats ? [{ project, refs }] : [];

0 commit comments

Comments
 (0)