refactor: extract resolveOrEnsureForkRemote to deduplicate remote resolution logic

cursoragent · juliusmarminge · cursoragent · commit 47aedcac2365 · 2026-03-09T19:32:00.000Z
Co-authored-by: Julius Marminge &lt;juliusmarminge@users.noreply.github.com&gt;
diff --git a/apps/server/src/git/Layers/GitManager.ts b/apps/server/src/git/Layers/GitManager.ts
@@ -250,31 +250,44 @@ export const makeGitManager = Effect.gen(function* () {
   const gitHubCli = yield* GitHubCli;
   const textGeneration = yield* TextGeneration;
 
-  const configurePullRequestHeadUpstream = (
+  const resolveOrEnsureForkRemote = (
     cwd: string,
-    pullRequest: ResolvedPullRequest & PullRequestHeadRemoteInfo,
+    repositoryNameWithOwner: string,
+    headRepositoryOwnerLogin: string | null | undefined,
   ) =>
     Effect.gen(function* () {
-      const repositoryNameWithOwner = pullRequest.headRepositoryNameWithOwner?.trim() ?? "";
-      if (repositoryNameWithOwner.length === 0) {
-        return;
-      }
-
       const cloneUrls = yield* gitHubCli.getRepositoryCloneUrls({
         cwd,
         repository: repositoryNameWithOwner,
       });
       const originRemoteUrl = yield* gitCore.readConfigValue(cwd, "remote.origin.url");
       const remoteUrl = shouldPreferSshRemote(originRemoteUrl) ? cloneUrls.sshUrl : cloneUrls.url;
       const preferredRemoteName =
-        pullRequest.headRepositoryOwnerLogin?.trim() ||
+        headRepositoryOwnerLogin?.trim() ||
         repositoryNameWithOwner.split("/")[0]?.trim() ||
         "fork";
-      const remoteName = yield* gitCore.ensureRemote({
+      return yield* gitCore.ensureRemote({
         cwd,
         preferredName: preferredRemoteName,
         url: remoteUrl,
       });
+    });
+
+  const configurePullRequestHeadUpstream = (
+    cwd: string,
+    pullRequest: ResolvedPullRequest & PullRequestHeadRemoteInfo,
+  ) =>
+    Effect.gen(function* () {
+      const repositoryNameWithOwner = pullRequest.headRepositoryNameWithOwner?.trim() ?? "";
+      if (repositoryNameWithOwner.length === 0) {
+        return;
+      }
+
+      const remoteName = yield* resolveOrEnsureForkRemote(
+        cwd,
+        repositoryNameWithOwner,
+        pullRequest.headRepositoryOwnerLogin,
+      );
 
       yield* gitCore.setBranchUpstream({
         cwd,
@@ -306,21 +319,11 @@ export const makeGitManager = Effect.gen(function* () {
         return;
       }
 
-      const cloneUrls = yield* gitHubCli.getRepositoryCloneUrls({
+      const remoteName = yield* resolveOrEnsureForkRemote(
         cwd,
-        repository: repositoryNameWithOwner,
-      });
-      const originRemoteUrl = yield* gitCore.readConfigValue(cwd, "remote.origin.url");
-      const remoteUrl = shouldPreferSshRemote(originRemoteUrl) ? cloneUrls.sshUrl : cloneUrls.url;
-      const preferredRemoteName =
-        pullRequest.headRepositoryOwnerLogin?.trim() ||
-        repositoryNameWithOwner.split("/")[0]?.trim() ||
-        "fork";
-      const remoteName = yield* gitCore.ensureRemote({
-        cwd,
-        preferredName: preferredRemoteName,
-        url: remoteUrl,
-      });
+        repositoryNameWithOwner,
+        pullRequest.headRepositoryOwnerLogin,
+      );
 
       yield* gitCore.fetchRemoteBranch({
         cwd,
