From a459d6bda2f517337548c46da71b03d7cb05207d Mon Sep 17 00:00:00 2001 From: Victor Vogel Date: Sun, 8 Nov 2026 01:53:00 +0000 Subject: [PATCH 1/3] fix(server): a branch's own pull request shows past a hundred same-named fork pull requests Branch status looks a branch's pull request up by its bare head name, one page of 100 across all states, and keeps rows whose head repository matches. When more than 100 newer pull requests from other forks reuse that head name (common for `main` or `patch-1` on busy repositories), the page holds only their rows and the branch's own open pull request never shows. When an all-states page comes back full and holds no open match, look the branch up once more among open pull requests only and use that result. Pages that are not full make no extra request. --- apps/server/src/git/GitManager.test.ts | 65 ++++++++++++++++++++++++++ apps/server/src/git/GitManager.ts | 7 +++ 2 files changed, 72 insertions(+) diff --git a/apps/server/src/git/GitManager.test.ts b/apps/server/src/git/GitManager.test.ts index 634898612b077..3607fc155fd2b 100644 --- a/apps/server/src/git/GitManager.test.ts +++ b/apps/server/src/git/GitManager.test.ts @@ -2185,6 +2185,71 @@ it.layer(layerGitManagerTest)("GitManager", (it) => { }), ); + it.effect("finds a fork branch's open PR past a full page of other forks' PRs", () => + Effect.gen(function* () { + const repoDir = yield* makeTempDir("t3code-git-manager-"); + yield* initRepo(repoDir); + const originDir = yield* createBareRemote(); + const forkDir = yield* createBareRemote(); + yield* runGit(repoDir, ["remote", "add", "origin", originDir]); + yield* runGit(repoDir, ["push", "-u", "origin", "main"]); + yield* runGit(repoDir, ["remote", "add", "fork", forkDir]); + yield* runGit(repoDir, ["checkout", "-b", "feature"]); + yield* runGit(repoDir, ["push", "-u", "fork", "feature"]); + yield* configureVisibleRemoteUrlWithLocalRewrite( + repoDir, + "origin", + "git@github.com:team/repository.git", + originDir, + ); + yield* configureVisibleRemoteUrlWithLocalRewrite( + repoDir, + "fork", + "git@github.com:alice/repository.git", + forkDir, + ); + const otherForks: FakeChangeRequest[] = Array.from({ length: 100 }, (_, index) => ({ + number: 200 - index, + title: "Update docs", + url: `https://github.com/team/repository/pull/${200 - index}`, + baseRefName: "main", + headRefName: "feature", + state: "closed", + isCrossRepository: true, + headRepositoryNameWithOwner: `fork-${index + 1}/repository`, + headRepositoryOwnerLogin: `fork-${index + 1}`, + })); + const { manager, providerCalls } = yield* makeManager({ + providerScenario: { + prListSequenceByHeadSelector: { + feature: [ + otherForks, + [ + { + number: 1, + title: "This fork", + url: "https://github.com/team/repository/pull/1", + baseRefName: "main", + headRefName: "feature", + state: "open", + isCrossRepository: true, + headRepositoryNameWithOwner: "alice/repository", + headRepositoryOwnerLogin: "alice", + }, + ], + ], + }, + }, + }); + + expect(yield* manager.branchPullRequest({ cwd: repoDir, branch: "feature" })).toMatchObject({ + number: 1, + state: "open", + }); + expect(listed(providerCalls).map((call) => call.state)).toEqual(["all", "open"]); + }), + ); + it.effect.each([ { remoteUrl: "git@gitlab.com:Group/Subgroup/Fork.git", setUpstream: true }, { remoteUrl: "git@gitlab.com:Group/Subgroup/Fork.git", setUpstream: false }, diff --git a/apps/server/src/git/GitManager.ts b/apps/server/src/git/GitManager.ts index a944922d530b5..ddaeb0b345d51 100644 --- a/apps/server/src/git/GitManager.ts +++ b/apps/server/src/git/GitManager.ts @@ -1907,6 +1907,7 @@ export const make = Effect.gen(function* () { const provider = yield* sourceControlProvider(cwd); const probe = headBranchProbe(provider, headContext.headSelectors, "all"); + let pageWasFull = false; for (const headSelector of probe.headSelectors) { const pullRequests = yield* provider.listChangeRequests({ cwd, @@ -1914,6 +1915,7 @@ export const make = Effect.gen(function* () { state: "all", limit: probe.limit, }); + pageWasFull ||= pullRequests.length >= probe.limit; for (const pr of pullRequests.map(toPullRequestInfo)) { if (!matchesBranchHeadContext(pr, headContext)) { @@ -1929,6 +1931,11 @@ export const make = Effect.gen(function* () { if (latestOpenPr) { return latestOpenPr; } + // Forks reusing the head name can fill the page before the branch's own open PR. + if (pageWasFull) { + const openPr = yield* findOpenPr(cwd, headContext); + if (openPr) return openPr; + } return parsed[0] ?? null; }); const buildCompletionToast = Effect.fn("buildCompletionToast")(function* ( From 2a74869575b4c6fee9cc46e0eae0215901b6cc95 Mon Sep 17 00:00:00 2001 From: Victor Vogel Date: Thu, 12 Nov 2026 22:40:19 +0000 Subject: [PATCH 2/3] fix(server): a branch's own open PR shows past a hundred newer open same-named fork PRs The open-only fallback read the 100 newest open PRs by bare head name, so more than 100 newer open PRs from other forks still hid the branch's own one. When the head's owner is known, the fallback now asks for owner:branch, which GitHub filters by owner. The probe parameter defaultBranchHeadSelector from #33954 becomes ownerHeadSelector, since it now also carries a head that is not the default branch. --- apps/server/src/git/GitManager.test.ts | 109 +++++++++--------- apps/server/src/git/GitManager.ts | 15 ++- .../src/server/SourceControlProvider.ts | 4 +- .../GitHubSourceControlProvider.test.ts | 4 +- .../src/server/GitHubSourceControlProvider.ts | 6 +- 5 files changed, 75 insertions(+), 63 deletions(-) diff --git a/apps/server/src/git/GitManager.test.ts b/apps/server/src/git/GitManager.test.ts index 0c3a09a470a66..adbfe729e2e1e 100644 --- a/apps/server/src/git/GitManager.test.ts +++ b/apps/server/src/git/GitManager.test.ts @@ -439,9 +439,9 @@ function createFakeSourceControlProvider(scenario: FakeProviderScenario = {}): { : { headBranchProbe: scenario.headBranchProbe ?? - (({ headSelectors, defaultBranchHeadSelector }) => ({ - headSelectors: defaultBranchHeadSelector - ? [defaultBranchHeadSelector] + (({ headSelectors, ownerHeadSelector }) => ({ + headSelectors: ownerHeadSelector + ? [ownerHeadSelector] : headSelectors.filter((selector) => !selector.includes(":")), limit: 100, })), @@ -2188,46 +2188,47 @@ it.layer(layerGitManagerTest)("GitManager", (it) => { }), ); - it.effect("finds a fork branch's open PR past a full page of other forks' PRs", () => - Effect.gen(function* () { - const repoDir = yield* makeTempDir("t3code-git-manager-"); - yield* initRepo(repoDir); - const originDir = yield* createBareRemote(); - const forkDir = yield* createBareRemote(); - yield* runGit(repoDir, ["remote", "add", "origin", originDir]); - yield* runGit(repoDir, ["push", "-u", "origin", "main"]); - yield* runGit(repoDir, ["remote", "add", "fork", forkDir]); - yield* runGit(repoDir, ["checkout", "-b", "feature"]); - yield* runGit(repoDir, ["push", "-u", "fork", "feature"]); - yield* configureVisibleRemoteUrlWithLocalRewrite( - repoDir, - "origin", - "git@github.com:team/repository.git", - originDir, - ); - yield* configureVisibleRemoteUrlWithLocalRewrite( - repoDir, - "fork", - "git@github.com:alice/repository.git", - forkDir, - ); - const otherForks: FakeChangeRequest[] = Array.from({ length: 100 }, (_, index) => ({ - number: 200 - index, - title: "Update docs", - url: `https://github.com/team/repository/pull/${200 - index}`, - baseRefName: "main", - headRefName: "feature", - state: "closed", - isCrossRepository: true, - headRepositoryNameWithOwner: `fork-${index + 1}/repository`, - headRepositoryOwnerLogin: `fork-${index + 1}`, - })); - const { manager, providerCalls } = yield* makeManager({ - providerScenario: { - prListSequenceByHeadSelector: { - feature: [ - otherForks, - [ + it.effect.each(["closed", "open"] as const)( + "finds a fork branch's open PR past a full page of other forks' %s PRs", + (otherForksState) => + Effect.gen(function* () { + const repoDir = yield* makeTempDir("t3code-git-manager-"); + yield* initRepo(repoDir); + const originDir = yield* createBareRemote(); + const forkDir = yield* createBareRemote(); + yield* runGit(repoDir, ["remote", "add", "origin", originDir]); + yield* runGit(repoDir, ["push", "-u", "origin", "main"]); + yield* runGit(repoDir, ["remote", "add", "fork", forkDir]); + yield* runGit(repoDir, ["checkout", "-b", "feature"]); + yield* runGit(repoDir, ["push", "-u", "fork", "feature"]); + yield* configureVisibleRemoteUrlWithLocalRewrite( + repoDir, + "origin", + "git@github.com:team/repository.git", + originDir, + ); + yield* configureVisibleRemoteUrlWithLocalRewrite( + repoDir, + "fork", + "git@github.com:alice/repository.git", + forkDir, + ); + const otherForks: FakeChangeRequest[] = Array.from({ length: 100 }, (_, index) => ({ + number: 200 - index, + title: "Update docs", + url: `https://github.com/team/repository/pull/${200 - index}`, + baseRefName: "main", + headRefName: "feature", + state: otherForksState, + isCrossRepository: true, + headRepositoryNameWithOwner: `fork-${index + 1}/repository`, + headRepositoryOwnerLogin: `fork-${index + 1}`, + })); + const { manager, providerCalls } = yield* makeManager({ + providerScenario: { + prListSequenceByHeadSelector: { feature: [otherForks, otherForks] }, + prListByHeadSelector: { + "alice:feature": [ { number: 1, title: "This fork", @@ -2240,17 +2241,21 @@ it.layer(layerGitManagerTest)("GitManager", (it) => { headRepositoryOwnerLogin: "alice", }, ], - ], + }, }, - }, - }); + }); - expect(yield* manager.branchPullRequest({ cwd: repoDir, branch: "feature" })).toMatchObject({ - number: 1, - state: "open", - }); - expect(listed(providerCalls).map((call) => call.state)).toEqual(["all", "open"]); - }), + expect(yield* manager.branchPullRequest({ cwd: repoDir, branch: "feature" })).toMatchObject( + { + number: 1, + state: "open", + }, + ); + expect(listed(providerCalls).map((call) => [call.headSelector, call.state])).toEqual([ + ["feature", "all"], + ["alice:feature", "open"], + ]); + }), ); it.effect.each([ diff --git a/apps/server/src/git/GitManager.ts b/apps/server/src/git/GitManager.ts index f045b1f6af220..937f8729814d7 100644 --- a/apps/server/src/git/GitManager.ts +++ b/apps/server/src/git/GitManager.ts @@ -575,10 +575,10 @@ function headBranchProbe( provider: SourceControlProvider.SourceControlProvider["Service"], headSelectors: ReadonlyArray, state: "open" | "all", - defaultBranchHeadSelector?: string, + ownerHeadSelector?: string, ) { return ( - provider.headBranchProbe?.({ headSelectors, state, defaultBranchHeadSelector }) ?? { + provider.headBranchProbe?.({ headSelectors, state, ownerHeadSelector }) ?? { headSelectors, limit: state === "open" ? 1 : 20, } @@ -1897,9 +1897,10 @@ export const make = Effect.gen(function* () { | "headRepositoryOwnerLogin" | "isCrossRepository" >, + ownerHeadSelector?: string, ) { const provider = yield* sourceControlProvider(cwd); - const probe = headBranchProbe(provider, headContext.headSelectors, "open"); + const probe = headBranchProbe(provider, headContext.headSelectors, "open", ownerHeadSelector); for (const headSelector of probe.headSelectors) { const pullRequests = yield* provider.listChangeRequests({ cwd, @@ -1966,7 +1967,13 @@ export const make = Effect.gen(function* () { } // Forks reusing the head name can fill the page before the branch's own open PR. if (pageWasFull) { - const openPr = yield* findOpenPr(cwd, headContext); + const openPr = yield* findOpenPr( + cwd, + headContext, + headContext.headRepositoryOwnerLogin + ? `${headContext.headRepositoryOwnerLogin}:${headContext.headBranch}` + : undefined, + ); if (openPr) return openPr; } return parsed[0] ?? null; diff --git a/packages/source-control-core/src/server/SourceControlProvider.ts b/packages/source-control-core/src/server/SourceControlProvider.ts index ddc4a8198c606..d24fc6f9d82d0 100644 --- a/packages/source-control-core/src/server/SourceControlProvider.ts +++ b/packages/source-control-core/src/server/SourceControlProvider.ts @@ -122,8 +122,8 @@ export class SourceControlProvider extends Context.Service< readonly headBranchProbe?: (input: { readonly headSelectors: ReadonlyArray; readonly state: "open" | "all"; - /** `owner:branch` when the head is the default branch, a name most forks share. */ - readonly defaultBranchHeadSelector?: string | undefined; + /** `owner:branch` to read instead of bare names, when the caller knows the head's owner. */ + readonly ownerHeadSelector?: string | undefined; }) => { readonly headSelectors: ReadonlyArray; readonly limit: number }; readonly readChangeRequestTemplate?: (input: { readonly cwd: string; diff --git a/packages/source-control-github/src/server/GitHubSourceControlProvider.test.ts b/packages/source-control-github/src/server/GitHubSourceControlProvider.test.ts index 712ef2f8d784f..85eac9a608be7 100644 --- a/packages/source-control-github/src/server/GitHubSourceControlProvider.test.ts +++ b/packages/source-control-github/src/server/GitHubSourceControlProvider.test.ts @@ -450,11 +450,11 @@ describe("GitHubSourceControlProvider change request lookups by head", () => { }); return Effect.gen(function* () { const gh = yield* GitHubSourceControlProvider.make; - const probe = (defaultBranchHeadSelector?: string) => + const probe = (ownerHeadSelector?: string) => gh.headBranchProbe?.({ headSelectors: ["me:main", "main"], state: "all", - defaultBranchHeadSelector, + ownerHeadSelector, }).headSelectors; assert.deepStrictEqual([probe(), probe("me:main")], [["main"], ["me:main"]]); const read = (state: "open" | "merged") => diff --git a/packages/source-control-github/src/server/GitHubSourceControlProvider.ts b/packages/source-control-github/src/server/GitHubSourceControlProvider.ts index e510473aa756d..1fb4c92bef922 100644 --- a/packages/source-control-github/src/server/GitHubSourceControlProvider.ts +++ b/packages/source-control-github/src/server/GitHubSourceControlProvider.ts @@ -963,9 +963,9 @@ export const make = Effect.gen(function* () { ), // GitHub matches bare heads; read a full page to disambiguate forks by owner. A default branch // collides with most forks, so its owner-qualified lookup has GitHub filter by owner instead. - headBranchProbe: ({ headSelectors, defaultBranchHeadSelector }) => ({ - headSelectors: defaultBranchHeadSelector - ? [defaultBranchHeadSelector] + headBranchProbe: ({ headSelectors, ownerHeadSelector }) => ({ + headSelectors: ownerHeadSelector + ? [ownerHeadSelector] : headSelectors.filter((selector) => !selector.includes(":")), limit: 100, }), From be910ce683e02da8c564ba3b563ebcf8eeccd289 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Sun, 15 Nov 2026 06:24:28 +0000 Subject: [PATCH 3/3] test(server): cover the open-only fallback with one case Co-Authored-By: Claude Opus 5.5 --- apps/server/src/git/GitManager.test.ts | 128 ++++++++++++------------- 1 file changed, 62 insertions(+), 66 deletions(-) diff --git a/apps/server/src/git/GitManager.test.ts b/apps/server/src/git/GitManager.test.ts index 6f6088f0e05c2..8712ef796cbd1 100644 --- a/apps/server/src/git/GitManager.test.ts +++ b/apps/server/src/git/GitManager.test.ts @@ -2270,74 +2270,70 @@ it.layer(layerGitManagerTest)("GitManager", (it) => { }), ); - it.effect.each(["closed", "open"] as const)( - "finds a fork branch's open PR past a full page of other forks' %s PRs", - (otherForksState) => - Effect.gen(function* () { - const repoDir = yield* makeTempDir("t3code-git-manager-"); - yield* initRepo(repoDir); - const originDir = yield* createBareRemote(); - const forkDir = yield* createBareRemote(); - yield* runGit(repoDir, ["remote", "add", "origin", originDir]); - yield* runGit(repoDir, ["push", "-u", "origin", "main"]); - yield* runGit(repoDir, ["remote", "add", "fork", forkDir]); - yield* runGit(repoDir, ["checkout", "-b", "feature"]); - yield* runGit(repoDir, ["push", "-u", "fork", "feature"]); - yield* configureVisibleRemoteUrlWithLocalRewrite( - repoDir, - "origin", - "git@github.com:team/repository.git", - originDir, - ); - yield* configureVisibleRemoteUrlWithLocalRewrite( - repoDir, - "fork", - "git@github.com:alice/repository.git", - forkDir, - ); - const otherForks: FakeChangeRequest[] = Array.from({ length: 100 }, (_, index) => ({ - number: 200 - index, - title: "Update docs", - url: `https://github.com/team/repository/pull/${200 - index}`, - baseRefName: "main", - headRefName: "feature", - state: otherForksState, - isCrossRepository: true, - headRepositoryNameWithOwner: `fork-${index + 1}/repository`, - headRepositoryOwnerLogin: `fork-${index + 1}`, - })); - const { manager, providerCalls } = yield* makeManager({ - providerScenario: { - prListSequenceByHeadSelector: { feature: [otherForks, otherForks] }, - prListByHeadSelector: { - "alice:feature": [ - { - number: 1, - title: "This fork", - url: "https://github.com/team/repository/pull/1", - baseRefName: "main", - headRefName: "feature", - state: "open", - isCrossRepository: true, - headRepositoryNameWithOwner: "alice/repository", - headRepositoryOwnerLogin: "alice", - }, - ], - }, + it.effect("finds a fork branch's open PR past a full page of other forks' PRs", () => + Effect.gen(function* () { + const repoDir = yield* makeTempDir("t3code-git-manager-"); + yield* initRepo(repoDir); + const originDir = yield* createBareRemote(); + const forkDir = yield* createBareRemote(); + yield* runGit(repoDir, ["remote", "add", "origin", originDir]); + yield* runGit(repoDir, ["push", "-u", "origin", "main"]); + yield* runGit(repoDir, ["remote", "add", "fork", forkDir]); + yield* runGit(repoDir, ["checkout", "-b", "feature"]); + yield* runGit(repoDir, ["push", "-u", "fork", "feature"]); + yield* configureVisibleRemoteUrlWithLocalRewrite( + repoDir, + "origin", + "git@github.com:team/repository.git", + originDir, + ); + yield* configureVisibleRemoteUrlWithLocalRewrite( + repoDir, + "fork", + "git@github.com:alice/repository.git", + forkDir, + ); + const otherForks: FakeChangeRequest[] = Array.from({ length: 100 }, (_, index) => ({ + number: 200 - index, + title: "Update docs", + url: `https://github.com/team/repository/pull/${200 - index}`, + baseRefName: "main", + headRefName: "feature", + state: "open", + isCrossRepository: true, + headRepositoryNameWithOwner: `fork-${index + 1}/repository`, + headRepositoryOwnerLogin: `fork-${index + 1}`, + })); + const { manager, providerCalls } = yield* makeManager({ + providerScenario: { + prListSequenceByHeadSelector: { feature: [otherForks, otherForks] }, + prListByHeadSelector: { + "alice:feature": [ + { + number: 1, + title: "This fork", + url: "https://github.com/team/repository/pull/1", + baseRefName: "main", + headRefName: "feature", + state: "open", + isCrossRepository: true, + headRepositoryNameWithOwner: "alice/repository", + headRepositoryOwnerLogin: "alice", + }, + ], }, - }); + }, + }); - expect(yield* manager.branchPullRequest({ cwd: repoDir, branch: "feature" })).toMatchObject( - { - number: 1, - state: "open", - }, - ); - expect(listed(providerCalls).map((call) => [call.headSelector, call.state])).toEqual([ - ["feature", "all"], - ["alice:feature", "open"], - ]); - }), + expect(yield* manager.branchPullRequest({ cwd: repoDir, branch: "feature" })).toMatchObject({ + number: 1, + state: "open", + }); + expect(listed(providerCalls).map((call) => [call.headSelector, call.state])).toEqual([ + ["feature", "all"], + ["alice:feature", "open"], + ]); + }), ); it.effect.each([