The best way to control Claude Code, Codex and more from any computer or phone
fix(server): fork PRs into gh's upstream base use an owner-qualified head (#35055)
Julius Marminge committed
Nov 12, 2026 at 02:38 UTC
4ff329d1089436ba7083fefe91fe13dd819d7e9b
4 files changed
+103
-45
apps/server/src/git/GitManager.test.ts
+42
@@ -4514,6 +4514,48 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
4514
}),
4515
);
4516
4517
+ it.effect("creates a fork PR from origin into the upstream remote the provider targets", () =>
4518
+ Effect.gen(function* () {
4519
+ const repoDir = yield* makeTempDir("t3code-git-manager-");
4520
+ yield* initRepo(repoDir);
4521
+ const forkDir = yield* createBareRemote();
4522
+ yield* runGit(repoDir, ["remote", "add", "origin", forkDir]);
4523
+ yield* runGit(repoDir, [
4524
+ "remote",
4525
+ "add",
4526
+ "upstream",
4527
+ "git@github.com:pingdotgg/codething-mvp.git",
4528
+ ]);
4529
+ yield* runGit(repoDir, ["config", "remote.upstream.gh-resolved", "base"]);
4530
+ yield* runGit(repoDir, ["checkout", "-b", "feature/fork-only"]);
4531
+ NodeFS.writeFileSync(NodePath.join(repoDir, "fork-only.txt"), "fork only\n");
4532
+ yield* runGit(repoDir, ["add", "fork-only.txt"]);
4533
+ yield* runGit(repoDir, ["commit", "-m", "Fork-only commit"]);
4534
+ yield* runGit(repoDir, ["push", "-u", "origin", "feature/fork-only"]);
4535
+ yield* configureVisibleRemoteUrlWithLocalRewrite(
4536
+ repoDir,
4537
+ "origin",
4538
+ "git@github.com:octocat/codething-mvp.git",
4539
+ forkDir,
4540
+ );
4541
+
4542
+ const { service, calls } = createFakeSourceControlProvider({ prListSequence: [[], []] });
4543
+ const { manager } = yield* makeManager({
4544
+ sourceControlProvider: {
4545
+ ...service,
4546
+ createsChangeRequestsIn: ({ repository }) =>
4547
+ Effect.succeed(repository === "pingdotgg/codething-mvp"),
4548
+ },
4549
+ });
4550
+ const result = yield* runStackedAction(manager, { cwd: repoDir, action: "create_pr" });
4551
+
4552
+ expect(result.pr.status).toBe("created");
4553
+ expect(created(calls)).toEqual([
4554
+ { baseRefName: "main", headSelector: "octocat:feature/fork-only" },
4555
+ ]);
4556
+ }),
4557
+ );
4558
+
4559
it.effect("commit_push_pr publishes the default branch to the push remote's fork", () =>
4560
Effect.gen(function* () {
4561
const repoDir = yield* makeTempDir("t3code-git-manager-");
apps/server/src/git/GitManager.ts
+11
-6
@@ -1480,9 +1480,9 @@ export const make = Effect.gen(function* () {
1480
const readConfigValueNullable = (cwd: string, key: string) =>
1481
gitCore.readConfigValue(cwd, key).pipe(Effect.orElseSucceed(() => null));
1482
1483
- // Whether the remote's host creates change requests in the only remote. A host's tools can let
1484
- // configuration outside the remotes name another repository; the remote itself otherwise.
1485
- const targetsOnlyRemote = Effect.fn("targetsOnlyRemote")(function* (
1483
+ // Whether the remote's host creates change requests in this remote's repository. A host's tools
1484
+ // can let configuration, such as gh's default repository, name another one.
1485
+ const targetsRemote = Effect.fn("targetsRemote")(function* (
1486
cwd: string,
1487
remoteName: string,
1488
remote: { readonly remoteUrl: string | null; readonly repositoryNameWithOwner: string | null },
@@ -1617,15 +1617,20 @@ export const make = Effect.gen(function* () {
1617
),
1618
Effect.orElseSucceed(() => 0),
1619
)) === 1 &&
1620
- (yield* targetsOnlyRemote(cwd, remoteName, remoteRepository));
1620
+ (yield* targetsRemote(cwd, remoteName, remoteRepository));
1621
const isForeignRemote = remoteName !== null && remoteName !== "origin" && !isOnlyRemote;
1622
1623
const isCrossRepository =
1624
- remoteRepository.repositoryNameWithOwner !== null &&
1624
+ (remoteRepository.repositoryNameWithOwner !== null &&
1625
originRepository.repositoryNameWithOwner !== null
1626
? remoteRepository.repositoryNameWithOwner.toLowerCase() !==
1627
originRepository.repositoryNameWithOwner.toLowerCase()
1628
- : isForeignRemote && remoteRepository.repositoryNameWithOwner !== null;
1628
+ : isForeignRemote && remoteRepository.repositoryNameWithOwner !== null) ||
1629
+ // A fork as origin, with the host targeting another remote such as upstream.
1630
+ (remoteName !== null &&
1631
+ !isOnlyRemote &&
1632
+ remoteRepository.repositoryNameWithOwner !== null &&
1633
+ !(yield* targetsRemote(cwd, remoteName, remoteRepository)));
1634
1635
const ownerHeadSelector =
1636
remoteRepository.ownerLogin && headBranch.length > 0
packages/source-control-github/src/server/GitHubSourceControlProvider.test.ts
+33
-26
@@ -1190,6 +1190,10 @@ it.effect.each([
1190
`${host}/repos/${expected}`,
1191
`${host}/repos/${expected}/pulls`,
1192
]);
1193
+ assert.deepStrictEqual(
1194
+ yield* provider.createsChangeRequestsIn!({ ...input, repository: "me/web" }),
1195
+ expected === "me/web",
1196
+ );
1197
}).pipe(
1198
Effect.provide(layer),
1199
Effect.provideService(HostProcess.Environment, { GH_REPO: envRepository }),
@@ -1198,30 +1202,33 @@ it.effect.each([
1202
},
1203
);
1204
1201
-it.effect("says a GH_REPO naming an unparseable host targets no remote rather than failing", () => {
1202
- const { layer } = harness({
1203
- remotes: remotesOutput(["upstream", "git@github.com:acme/web.git"]),
1204
- resolved: "",
1205
- api: {},
1206
- });
1207
- return Effect.gen(function* () {
1208
- const provider = yield* GitHubSourceControlProvider.make;
1209
- const targets = yield* provider.createsChangeRequestsIn!({
1210
- cwd: "/repo",
1211
- context: {
1212
- provider: {
1213
- kind: SourceControlProviderKind.make("github"),
1214
- name: "GitHub",
1215
- baseUrl: "https://github.com",
1216
- },
1217
- remoteName: "upstream",
1218
- remoteUrl: "git@github.com:acme/web.git",
1219
- },
1220
- repository: "acme/web",
1205
+it.effect(
1206
+ "says a GH_REPO naming an unparseable host falls back to the remotes, as creation does",
1207
+ () => {
1208
+ const { layer } = harness({
1209
+ remotes: remotesOutput(["upstream", "git@github.com:acme/web.git"]),
1210
+ resolved: "",
1211
+ api: {},
1212
});
1222
- assert.isFalse(targets);
1223
- }).pipe(
1224
- Effect.provide(layer),
1225
- Effect.provideService(HostProcess.Environment, { GH_REPO: "bad host/acme/web" }),
1226
- );
1227
-});
1213
+ return Effect.gen(function* () {
1214
+ const provider = yield* GitHubSourceControlProvider.make;
1215
+ const targets = yield* provider.createsChangeRequestsIn!({
1216
+ cwd: "/repo",
1217
+ context: {
1218
+ provider: {
1219
+ kind: SourceControlProviderKind.make("github"),
1220
+ name: "GitHub",
1221
+ baseUrl: "https://github.com",
1222
+ },
1223
+ remoteName: "upstream",
1224
+ remoteUrl: "git@github.com:acme/web.git",
1225
+ },
1226
+ repository: "acme/web",
1227
+ });
1228
+ assert.isTrue(targets);
1229
+ }).pipe(
1230
+ Effect.provide(layer),
1231
+ Effect.provideService(HostProcess.Environment, { GH_REPO: "bad host/acme/web" }),
1232
+ );
1233
+ },
1234
+);
packages/source-control-github/src/server/GitHubSourceControlProvider.ts
+17
-13
@@ -474,6 +474,18 @@ export const make = Effect.gen(function* () {
474
timeoutMs: 5_000,
475
});
476
477
+ const readRemotes = (cwd: string) =>
478
+ Effect.all([
479
+ gitRead(cwd, ["remote", "-v"]),
480
+ gitRead(cwd, ["config", "--get-regexp", "^remote\\..*\\.gh-resolved$"]),
481
+ ]).pipe(
482
+ Effect.orElseSucceed(() => [null, null] as const),
483
+ Effect.map(([remotes, resolved]) => ({
484
+ remotes: remotes?.exitCode === 0 ? remotes.stdout : "",
485
+ resolved: resolved?.exitCode === 0 ? resolved.stdout : "",
486
+ })),
487
+ );
488
+
489
const resolveRepository = Effect.fn("GitHubSourceControlProvider.resolveRepository")(
490
function* (input: {
491
readonly cwd: string;
@@ -487,13 +499,8 @@ export const make = Effect.gen(function* () {
499
const locator = parseGitHubRepositorySelector(envRepository, defaultHost);
500
if (locator !== null) return locator;
501
}
490
- const [remotes, resolved] = yield* Effect.all([
491
- gitRead(input.cwd, ["remote", "-v"]),
492
- gitRead(input.cwd, ["config", "--get-regexp", "^remote\\..*\\.gh-resolved$"]),
493
- ]).pipe(Effect.orElseSucceed(() => [null, null] as const));
502
const { host, locator } = resolveGitHubRepository({
495
- remotes: remotes?.exitCode === 0 ? remotes.stdout : "",
496
- resolved: resolved?.exitCode === 0 ? resolved.stdout : "",
503
+ ...(yield* readRemotes(input.cwd)),
504
hostHint,
505
defaultHost,
506
});
@@ -888,8 +895,9 @@ export const make = Effect.gen(function* () {
895
},
896
),
897
// `createChangeRequest` targets what `resolveRepository` picks: GH_REPO when it parses, else
891
- // the remote `gh repo set-default` marked (`gh-resolved`). An HTTPS remote keeps a
892
- // non-default port in the context's host, and the mark is then ignored.
898
+ // gh's pick among the checkout's remotes, led by the one `gh repo set-default` marked
899
+ // (`gh-resolved`). An HTTPS remote keeps a non-default port in the context's host, and the
900
+ // mark is then ignored.
901
createsChangeRequestsIn: Effect.fn("GitHubSourceControlProvider.createsChangeRequestsIn")(
902
function* ({ cwd, context, repository }) {
903
const host = URL.canParse(context.provider.baseUrl)
@@ -909,12 +917,8 @@ export const make = Effect.gen(function* () {
917
`${owner}/${name}`.toLowerCase() === target
918
);
919
}
912
- const mark = yield* git
913
- .readConfigValue(cwd, `remote.${context.remoteName}.gh-resolved`)
914
- .pipe(Effect.orElseSucceed(() => null));
920
const { locator } = resolveGitHubRepository({
916
- remotes: `${context.remoteName}\t${context.remoteUrl} (fetch)`,
917
- resolved: mark === null ? "" : `remote.${context.remoteName}.gh-resolved ${mark}`,
921
+ ...(yield* readRemotes(cwd)),
922
hostHint: host ?? undefined,
923
defaultHost: host ?? "github.com",
924
});