fix(github): Include owner in head parameter for PRs from forks

Author: matthewevans

apps/desktop/src/components/ReviewCreation.svelte

@@ -30,6 +30,7 @@
 	import { StackService } from '$lib/stacks/stackService.svelte';
 	import { UserService } from '$lib/user/userService';
 	import { getBranchNameFromRef } from '$lib/utils/branch';
+	import { parseRemoteUrl } from '$lib/url/gitUrl';
 	import { sleep } from '$lib/utils/sleep';
 	import { getContext } from '@gitbutler/shared/context';
 	import { persisted } from '@gitbutler/shared/persisted';
@@ -41,6 +42,7 @@
 	import { error } from '@gitbutler/ui/toasts';
 	import { isDefined } from '@gitbutler/ui/utils/typeguards';
 	import { tick } from 'svelte';
+	import { RemotesService } from '$lib/remotes/remotesService';
 
 	type Props = {
 		projectId: string;
@@ -63,6 +65,7 @@
 	const userService = getContext(UserService);
 	const templateService = getContext(TemplateService);
 	const aiService = getContext(AIService);
+	const remotesService = getContext(RemotesService);
 
 	const user = userService.user;
 	const project = projectsService.getProjectStore(projectId);
@@ -276,12 +279,21 @@
 				base = branchParent.name;
 			}
 
+			const pushRemoteName = baseBranch.actualPushRemoteName();
+			const allRemotes = await remotesService.remotes(projectId);
+			const pushRemote = allRemotes.find((r) => r.name === pushRemoteName);
+			const pushRemoteUrl = pushRemote?.url;
+
+			const repoInfo = parseRemoteUrl(pushRemoteUrl);
+			const headOwner = repoInfo?.owner;
+
 			const pr = await prService.createPr({
 				title: params.title,
 				body: params.body,
 				draft: params.draft,
 				baseBranchName: base,
-				upstreamName: params.upstreamBranchName
+				upstreamName: params.upstreamBranchName,
+				headOwner
 			});
 
 			// Store the new pull request number with the branch data.

apps/desktop/src/lib/forge/github/githubPrService.svelte.ts

@@ -36,13 +36,15 @@ export class GitHubPrService implements ForgePrService {
 		body,
 		draft,
 		baseBranchName,
-		upstreamName
+		upstreamName,
+		headOwner
 	}: CreatePullRequestArgs): Promise<PullRequest> {
 		this.loading.set(true);
 		const request = async () => {
+			const head = headOwner ? `${headOwner}:${upstreamName}` : upstreamName;
 			return ghResponseToInstance(
 				await this.api.endpoints.createPr.mutate({
-					head: upstreamName,
+					head,
 					base: baseBranchName,
 					title,
 					body,

apps/desktop/src/lib/forge/interface/types.ts

@@ -88,4 +88,5 @@ export type CreatePullRequestArgs = {
 	draft: boolean;
 	baseBranchName: string;
 	upstreamName: string;
+	headOwner?: string;
 };