fix: enable diverged branch sync and target origin repo for PR creation

42tg · 42tg · commit 97e3ada525b5 · 2026-04-02T12:19:13.000+02:00
- Branch sync: when local branch diverges from remote, allow force-pull
  (reset to upstream) if working tree is clean
- PR creation: pass --repo flag to gh pr create so PRs target the
  correct fork repository
- Update GitActionsControl tests for new pull menu item
diff --git a/apps/server/src/git/Layers/GitCore.ts b/apps/server/src/git/Layers/GitCore.ts
@@ -1424,6 +1424,20 @@ export const makeGitCore = Effect.fn("makeGitCore")(function* (options?: {
     },
   );
 
+  const resetToUpstream: GitCoreShape["resetToUpstream"] = (cwd) =>
+    Effect.gen(function* () {
+      const upstream = yield* runGitStdout(
+        "GitCore.resetToUpstream.upstream",
+        cwd,
+        ["rev-parse", "--abbrev-ref", "@{upstream}"],
+      );
+      yield* runGit("GitCore.resetToUpstream.reset", cwd, [
+        "reset",
+        "--hard",
+        upstream.trim(),
+      ]);
+    });
+
   const readRangeContext: GitCoreShape["readRangeContext"] = Effect.fn("readRangeContext")(
     function* (cwd, baseBranch) {
       const range = `${baseBranch}..HEAD`;
@@ -1966,6 +1980,7 @@ export const makeGitCore = Effect.fn("makeGitCore")(function* (options?: {
     commit,
     pushCurrentBranch,
     pullCurrentBranch,
+    resetToUpstream,
     readRangeContext,
     readConfigValue,
     isInsideWorkTree,
diff --git a/apps/server/src/git/Layers/GitHubCli.ts b/apps/server/src/git/Layers/GitHubCli.ts
@@ -247,6 +247,7 @@ const makeGitHubCli = Effect.sync(() => {
         args: [
           "pr",
           "create",
+          ...(input.repo ? ["--repo", input.repo] : []),
           "--base",
           input.baseBranch,
           "--head",
diff --git a/apps/server/src/git/Layers/GitManager.ts b/apps/server/src/git/Layers/GitManager.ts
@@ -74,6 +74,8 @@ interface BranchHeadContext {
   remoteName: string | null;
   headRepositoryNameWithOwner: string | null;
   headRepositoryOwnerLogin: string | null;
+  /** The origin remote's owner/repo — used to target the correct repo for PR creation in forks. */
+  originRepositoryNameWithOwner: string | null;
   isCrossRepository: boolean;
 }
 
@@ -808,6 +810,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
       remoteName,
       headRepositoryNameWithOwner: remoteRepository.repositoryNameWithOwner,
       headRepositoryOwnerLogin: remoteRepository.ownerLogin,
+      originRepositoryNameWithOwner: originRepository.repositoryNameWithOwner,
       isCrossRepository,
     } satisfies BranchHeadContext;
   });
@@ -1261,6 +1264,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
         headSelector: headContext.preferredHeadSelector,
         title: generated.title,
         bodyFile,
+        repo: headContext.originRepositoryNameWithOwner,
       })
       .pipe(Effect.ensuring(fileSystem.remove(bodyFile).pipe(Effect.catch(() => Effect.void))));
 
diff --git a/apps/server/src/git/Services/GitCore.ts b/apps/server/src/git/Services/GitCore.ts
@@ -230,6 +230,11 @@ export interface GitCoreShape {
    */
   readonly pullCurrentBranch: (cwd: string) => Effect.Effect<GitPullResult, GitCommandError>;
 
+  /**
+   * Hard-reset the current branch to its upstream tracking ref.
+   */
+  readonly resetToUpstream: (cwd: string) => Effect.Effect<void, GitCommandError>;
+
   /**
    * Create a worktree and branch from a base branch.
    */
diff --git a/apps/server/src/git/Services/GitHubCli.ts b/apps/server/src/git/Services/GitHubCli.ts
@@ -76,6 +76,8 @@ export interface GitHubCliShape {
     readonly headSelector: string;
     readonly title: string;
     readonly bodyFile: string;
+    /** Optional owner/repo to target. Without this, `gh` defaults to the upstream parent for forks. */
+    readonly repo?: string | null;
   }) => Effect.Effect<void, GitHubCliError>;
 
   /**
diff --git a/apps/server/src/ws.ts b/apps/server/src/ws.ts
@@ -222,7 +222,29 @@ const WsRpcLayer = WsRpcGroup.toLayer(
         ),
       [WS_METHODS.shellOpenInEditor]: (input) => open.openInEditor(input),
       [WS_METHODS.gitStatus]: (input) => gitManager.status(input),
-      [WS_METHODS.gitPull]: (input) => git.pullCurrentBranch(input.cwd),
+      [WS_METHODS.gitPull]: (input) =>
+        git.pullCurrentBranch(input.cwd).pipe(
+          Effect.catch(() =>
+            Effect.gen(function* () {
+              const details = yield* git.statusDetails(input.cwd);
+              if (details.hasWorkingTreeChanges) {
+                return yield* Effect.fail(
+                  new GitManagerServiceError({
+                    message:
+                      "Branch has diverged and has local changes. Stash or commit changes before syncing.",
+                  }),
+                );
+              }
+              yield* git.resetToUpstream(input.cwd);
+              const refreshed = yield* git.statusDetails(input.cwd);
+              return {
+                status: "pulled" as const,
+                branch: refreshed.branch ?? "unknown",
+                upstreamBranch: refreshed.upstreamRef,
+              };
+            }),
+          ),
+        ),
       [WS_METHODS.gitRunStackedAction]: (input) =>
         Stream.callback<GitActionProgressEvent, GitManagerServiceError>((queue) =>
           gitManager
diff --git a/apps/web/src/components/GitActionsControl.logic.test.ts b/apps/web/src/components/GitActionsControl.logic.test.ts
@@ -69,6 +69,13 @@ describe("when: branch is clean and has an open PR", () => {
         kind: "open_dialog",
         dialogAction: "commit",
       },
+      {
+        id: "pull",
+        label: "Pull",
+        disabled: true,
+        icon: "pull",
+        kind: "run_pull",
+      },
       {
         id: "push",
         label: "Push",
@@ -110,6 +117,13 @@ describe("when: actions are busy", () => {
         kind: "open_dialog",
         dialogAction: "commit",
       },
+      {
+        id: "pull",
+        label: "Pull",
+        disabled: true,
+        icon: "pull",
+        kind: "run_pull",
+      },
       {
         id: "push",
         label: "Push",
@@ -190,6 +204,13 @@ describe("when: branch is clean, ahead, and has an open PR", () => {
         kind: "open_dialog",
         dialogAction: "commit",
       },
+      {
+        id: "pull",
+        label: "Pull",
+        disabled: true,
+        icon: "pull",
+        kind: "run_pull",
+      },
       {
         id: "push",
         label: "Push",
@@ -230,6 +251,13 @@ describe("when: branch is clean, ahead, and has no open PR", () => {
         kind: "open_dialog",
         dialogAction: "commit",
       },
+      {
+        id: "pull",
+        label: "Pull",
+        disabled: true,
+        icon: "pull",
+        kind: "run_pull",
+      },
       {
         id: "push",
         label: "Push",
@@ -270,6 +298,13 @@ describe("when: branch is clean, up to date, and has no open PR", () => {
         kind: "open_dialog",
         dialogAction: "commit",
       },
+      {
+        id: "pull",
+        label: "Pull",
+        disabled: true,
+        icon: "pull",
+        kind: "run_pull",
+      },
       {
         id: "push",
         label: "Push",
@@ -296,7 +331,7 @@ describe("when: branch is behind upstream", () => {
     assert.deepInclude(quick, { kind: "run_pull", label: "Pull", disabled: false });
   });
 
-  it("buildMenuItems disables push and create PR", () => {
+  it("buildMenuItems enables pull and disables push and create PR", () => {
     const items = buildMenuItems(status({ behindCount: 1, pr: null }), false);
     assert.deepEqual(items, [
       {
@@ -307,6 +342,13 @@ describe("when: branch is behind upstream", () => {
         kind: "open_dialog",
         dialogAction: "commit",
       },
+      {
+        id: "pull",
+        label: "Pull",
+        disabled: false,
+        icon: "pull",
+        kind: "run_pull",
+      },
       {
         id: "push",
         label: "Push",
@@ -328,13 +370,12 @@ describe("when: branch is behind upstream", () => {
 });
 
 describe("when: branch has diverged from upstream", () => {
-  it("resolveQuickAction returns a disabled sync hint", () => {
+  it("resolveQuickAction enables sync when working tree is clean", () => {
     const quick = resolveQuickAction(status({ aheadCount: 2, behindCount: 1 }), false);
     assert.deepEqual(quick, {
       label: "Sync branch",
-      disabled: true,
-      kind: "show_hint",
-      hint: "Branch has diverged from upstream. Rebase/merge first.",
+      disabled: false,
+      kind: "run_pull",
     });
   });
 });
@@ -397,6 +438,13 @@ describe("when: working tree has local changes", () => {
         kind: "open_dialog",
         dialogAction: "commit",
       },
+      {
+        id: "pull",
+        label: "Pull",
+        disabled: true,
+        icon: "pull",
+        kind: "run_pull",
+      },
       {
         id: "push",
         label: "Push",
@@ -471,6 +519,13 @@ describe("when: working tree has local changes and branch is behind upstream", (
         kind: "open_dialog",
         dialogAction: "commit",
       },
+      {
+        id: "pull",
+        label: "Pull",
+        disabled: false,
+        icon: "pull",
+        kind: "run_pull",
+      },
       {
         id: "push",
         label: "Push",
@@ -500,7 +555,7 @@ describe("when: HEAD is detached and there are no local changes", () => {
     assert.deepInclude(quick, { kind: "show_hint", label: "Commit", disabled: true });
   });
 
-  it("buildMenuItems keeps commit, push, and PR disabled", () => {
+  it("buildMenuItems keeps commit, pull, push, and PR disabled", () => {
     const items = buildMenuItems(status({ branch: null, hasWorkingTreeChanges: false }), false);
     assert.deepEqual(items, [
       {
@@ -511,6 +566,13 @@ describe("when: HEAD is detached and there are no local changes", () => {
         kind: "open_dialog",
         dialogAction: "commit",
       },
+      {
+        id: "pull",
+        label: "Pull",
+        disabled: true,
+        icon: "pull",
+        kind: "run_pull",
+      },
       {
         id: "push",
         label: "Push",
@@ -603,6 +665,13 @@ describe("when: branch has no upstream configured", () => {
         kind: "open_dialog",
         dialogAction: "commit",
       },
+      {
+        id: "pull",
+        label: "Pull",
+        disabled: true,
+        icon: "pull",
+        kind: "run_pull",
+      },
       {
         id: "push",
         label: "Push",
@@ -669,6 +738,13 @@ describe("when: branch has no upstream configured", () => {
         kind: "open_dialog",
         dialogAction: "commit",
       },
+      {
+        id: "pull",
+        label: "Pull",
+        disabled: true,
+        icon: "pull",
+        kind: "run_pull",
+      },
       {
         id: "push",
         label: "Push",
@@ -703,6 +779,13 @@ describe("when: branch has no upstream configured", () => {
         kind: "open_dialog",
         dialogAction: "commit",
       },
+      {
+        id: "pull",
+        label: "Pull",
+        disabled: true,
+        icon: "pull",
+        kind: "run_pull",
+      },
       {
         id: "push",
         label: "Push",
@@ -779,6 +862,13 @@ describe("when: branch has no upstream configured", () => {
         kind: "open_dialog",
         dialogAction: "commit",
       },
+      {
+        id: "pull",
+        label: "Pull",
+        disabled: true,
+        icon: "pull",
+        kind: "run_pull",
+      },
       {
         id: "push",
         label: "Push",
diff --git a/apps/web/src/components/GitActionsControl.logic.ts b/apps/web/src/components/GitActionsControl.logic.ts
diff --git a/apps/web/src/components/GitActionsControl.tsx b/apps/web/src/components/GitActionsControl.tsx
