@devries-cameron20 / t3code Mirror · read-only / commits / 9f815c94af
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 11:00 UTC

fix(server): a branch's own pull request shows past a hundred same-named fork pull requests (#32796)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

Victor committed Nov 15, 2026 at 00:55 UTC 9f815c94af72e17e288969b5647da6a34ccace38
5 files changed +93 -13
apps/server/src/git/GitManager.test.ts
+69 -3
@@ -465,9 +465,9 @@ function createFakeSourceControlProvider(scenario: FakeProviderScenario = {}): {
465 : {
466 headBranchProbe:
467 scenario.headBranchProbe ??
468 - (({ headSelectors, defaultBranchHeadSelector }) => ({
469 - headSelectors: defaultBranchHeadSelector
470 - ? [defaultBranchHeadSelector]
468 + (({ headSelectors, ownerHeadSelector }) => ({
469 + headSelectors: ownerHeadSelector
470 + ? [ownerHeadSelector]
471 : headSelectors.filter((selector) => !selector.includes(":")),
472 limit: 100,
473 })),
@@ -2270,6 +2270,72 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
2270 }),
2271 );
2272
2273 + it.effect("finds a fork branch's open PR past a full page of other forks' PRs", () =>
2274 + Effect.gen(function* () {
2275 + const repoDir = yield* makeTempDir("t3code-git-manager-");
2276 + yield* initRepo(repoDir);
2277 + const originDir = yield* createBareRemote();
2278 + const forkDir = yield* createBareRemote();
2279 + yield* runGit(repoDir, ["remote", "add", "origin", originDir]);
2280 + yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
2281 + yield* runGit(repoDir, ["remote", "add", "fork", forkDir]);
2282 + yield* runGit(repoDir, ["checkout", "-b", "feature"]);
2283 + yield* runGit(repoDir, ["push", "-u", "fork", "feature"]);
2284 + yield* configureVisibleRemoteUrlWithLocalRewrite(
2285 + repoDir,
2286 + "origin",
2287 + "git@github.com:team/repository.git",
2288 + originDir,
2289 + );
2290 + yield* configureVisibleRemoteUrlWithLocalRewrite(
2291 + repoDir,
2292 + "fork",
2293 + "git@github.com:alice/repository.git",
2294 + forkDir,
2295 + );
2296 + const otherForks: FakeChangeRequest[] = Array.from({ length: 100 }, (_, index) => ({
2297 + number: 200 - index,
2298 + title: "Update docs",
2299 + url: `https://github.com/team/repository/pull/${200 - index}`,
2300 + baseRefName: "main",
2301 + headRefName: "feature",
2302 + state: "open",
2303 + isCrossRepository: true,
2304 + headRepositoryNameWithOwner: `fork-${index + 1}/repository`,
2305 + headRepositoryOwnerLogin: `fork-${index + 1}`,
2306 + }));
2307 + const { manager, providerCalls } = yield* makeManager({
2308 + providerScenario: {
2309 + prListSequenceByHeadSelector: { feature: [otherForks, otherForks] },
2310 + prListByHeadSelector: {
2311 + "alice:feature": [
2312 + {
2313 + number: 1,
2314 + title: "This fork",
2315 + url: "https://github.com/team/repository/pull/1",
2316 + baseRefName: "main",
2317 + headRefName: "feature",
2318 + state: "open",
2319 + isCrossRepository: true,
2320 + headRepositoryNameWithOwner: "alice/repository",
2321 + headRepositoryOwnerLogin: "alice",
2322 + },
2323 + ],
2324 + },
2325 + },
2326 + });
2327 +
2328 + expect(yield* manager.branchPullRequest({ cwd: repoDir, branch: "feature" })).toMatchObject({
2329 + number: 1,
2330 + state: "open",
2331 + });
2332 + expect(listed(providerCalls).map((call) => [call.headSelector, call.state])).toEqual([
2333 + ["feature", "all"],
2334 + ["alice:feature", "open"],
2335 + ]);
2336 + }),
2337 + );
2338 +
2339 it.effect.each([
2340 { remoteUrl: "git@gitlab.com:Group/Subgroup/Fork.git", setUpstream: true },
2341 { remoteUrl: "git@gitlab.com:Group/Subgroup/Fork.git", setUpstream: false },
apps/server/src/git/GitManager.ts
+17 -3
@@ -629,10 +629,10 @@ function headBranchProbe(
629 provider: SourceControlProvider.SourceControlProvider["Service"],
630 headSelectors: ReadonlyArray<string>,
631 state: "open" | "all",
632 - defaultBranchHeadSelector?: string,
632 + ownerHeadSelector?: string,
633 ) {
634 return (
635 - provider.headBranchProbe?.({ headSelectors, state, defaultBranchHeadSelector }) ?? {
635 + provider.headBranchProbe?.({ headSelectors, state, ownerHeadSelector }) ?? {
636 headSelectors,
637 limit: state === "open" ? 1 : 20,
638 }
@@ -1980,9 +1980,10 @@ export const make = Effect.gen(function* () {
1980 | "headRepositoryOwnerLogin"
1981 | "isCrossRepository"
1982 >,
1983 + ownerHeadSelector?: string,
1984 ) {
1985 const provider = yield* sourceControlProvider(cwd);
1985 - const probe = headBranchProbe(provider, headContext.headSelectors, "open");
1986 + const probe = headBranchProbe(provider, headContext.headSelectors, "open", ownerHeadSelector);
1987 for (const headSelector of probe.headSelectors) {
1988 const pullRequests = yield* provider.listChangeRequests({
1989 cwd,
@@ -2023,6 +2024,7 @@ export const make = Effect.gen(function* () {
2024 ? `${headContext.headRepositoryOwnerLogin}:${defaultBranch}`
2025 : undefined,
2026 );
2027 + let pageWasFull = false;
2028 for (const headSelector of probe.headSelectors) {
2029 const pullRequests = yield* provider.listChangeRequests({
2030 cwd,
@@ -2030,6 +2032,7 @@ export const make = Effect.gen(function* () {
2032 state: "all",
2033 limit: probe.limit,
2034 });
2035 + pageWasFull ||= pullRequests.length >= probe.limit;
2036
2037 for (const pr of pullRequests.map(toPullRequestInfo)) {
2038 if (!matchesBranchHeadContext(pr, headContext)) {
@@ -2045,6 +2048,17 @@ export const make = Effect.gen(function* () {
2048 if (latestOpenPr) {
2049 return latestOpenPr;
2050 }
2051 + // Forks reusing the head name can fill the page before the branch's own open PR.
2052 + if (pageWasFull) {
2053 + const openPr = yield* findOpenPr(
2054 + cwd,
2055 + headContext,
2056 + headContext.headRepositoryOwnerLogin
2057 + ? `${headContext.headRepositoryOwnerLogin}:${headContext.headBranch}`
2058 + : undefined,
2059 + );
2060 + if (openPr) return openPr;
2061 + }
2062 return parsed[0] ?? null;
2063 });
2064 const buildCompletionToast = Effect.fn("buildCompletionToast")(function* (
packages/source-control-core/src/server/SourceControlProvider.ts
+2 -2
@@ -122,8 +122,8 @@ export class SourceControlProvider extends Context.Service<
122 readonly headBranchProbe?: (input: {
123 readonly headSelectors: ReadonlyArray<string>;
124 readonly state: "open" | "all";
125 - /** `owner:branch` when the head is the default branch, a name most forks share. */
126 - readonly defaultBranchHeadSelector?: string | undefined;
125 + /** `owner:branch` to read instead of bare names, when the caller knows the head's owner. */
126 + readonly ownerHeadSelector?: string | undefined;
127 }) => { readonly headSelectors: ReadonlyArray<string>; readonly limit: number };
128 readonly readChangeRequestTemplate?: (input: {
129 readonly cwd: string;
packages/source-control-github/src/server/GitHubSourceControlProvider.test.ts
+2 -2
@@ -453,11 +453,11 @@ describe("GitHubSourceControlProvider change request lookups by head", () => {
453 });
454 return Effect.gen(function* () {
455 const gh = yield* GitHubSourceControlProvider.make;
456 - const probe = (defaultBranchHeadSelector?: string) =>
456 + const probe = (ownerHeadSelector?: string) =>
457 gh.headBranchProbe?.({
458 headSelectors: ["me:main", "main"],
459 state: "all",
460 - defaultBranchHeadSelector,
460 + ownerHeadSelector,
461 }).headSelectors;
462 assert.deepStrictEqual([probe(), probe("me:main")], [["main"], ["me:main"]]);
463 const read = (state: "open" | "merged") =>
packages/source-control-github/src/server/GitHubSourceControlProvider.ts
+3 -3
@@ -972,9 +972,9 @@ export const make = Effect.gen(function* () {
972 ),
973 // GitHub matches bare heads; read a full page to disambiguate forks by owner. A default branch
974 // collides with most forks, so its owner-qualified lookup has GitHub filter by owner instead.
975 - headBranchProbe: ({ headSelectors, defaultBranchHeadSelector }) => ({
976 - headSelectors: defaultBranchHeadSelector
977 - ? [defaultBranchHeadSelector]
975 + headBranchProbe: ({ headSelectors, ownerHeadSelector }) => ({
976 + headSelectors: ownerHeadSelector
977 + ? [ownerHeadSelector]
978 : headSelectors.filter((selector) => !selector.includes(":")),
979 limit: 100,
980 }),