Track upstream branch when deciding PR availability

- Propagate normalized upstream branch metadata through git status
- Block PR actions when the branch tracks the default branch
- Add coverage for upstream parsing, caching, and UI logic

Author: Emanuele-web04

apps/server/src/git/Layers/GitCore.test.ts

@@ -1493,6 +1493,25 @@ it.layer(TestLayer)("git integration", (it) => {
       }),
     );
 
+    it.effect("reports the tracked branch name without the remote prefix", () =>
+      Effect.gen(function* () {
+        const remote = yield* makeTmpDir();
+        const tmp = yield* makeTmpDir();
+        const remoteName = "my-org/upstream";
+        const branchName = "feature/status-upstream";
+
+        yield* git(remote, ["init", "--bare"]);
+        yield* initRepoWithCommit(tmp);
+        yield* git(tmp, ["remote", "add", remoteName, remote]);
+        yield* git(tmp, ["checkout", "-b", branchName]);
+        yield* git(tmp, ["push", "-u", remoteName, branchName]);
+
+        const details = yield* (yield* GitCore).statusDetails(tmp);
+        expect(details.upstreamRef).toBe(`${remoteName}/${branchName}`);
+        expect(details.upstreamBranch).toBe(branchName);
+      }),
+    );
+
     it.effect("counts untracked text files in working tree totals", () =>
       Effect.gen(function* () {
         const tmp = yield* makeTmpDir();

apps/server/src/git/Layers/GitCore.ts

@@ -54,6 +54,7 @@ const NON_REPOSITORY_STATUS_DETAILS = Object.freeze({
   isDefaultBranch: false,
   branch: null,
   upstreamRef: null,
+  upstreamBranch: null,
   hasWorkingTreeChanges: false,
   workingTree: { files: [], insertions: 0, deletions: 0 },
   hasUpstream: false,
@@ -98,6 +99,13 @@ function parseBranchAb(value: string): { ahead: number; behind: number } {
   };
 }
 
+function normalizeConfiguredMergeBranch(value: string): string | null {
+  const trimmed = value.trim();
+  if (trimmed.length === 0) return null;
+  const normalized = trimmed.replace(/^refs\/heads\//, "");
+  return normalized.length > 0 ? normalized : null;
+}
+
 function normalizeNumstatPath(rawPath: string): string {
   const renameArrowIndex = rawPath.indexOf(" => ");
   if (renameArrowIndex < 0) return rawPath;
@@ -1308,6 +1316,7 @@ export const makeGitCore = (options?: { executeOverride?: GitCoreShape["execute"
 
         let branch: string | null = null;
         let upstreamRef: string | null = null;
+        let upstreamBranch: string | null = null;
         let aheadCount = 0;
         let behindCount = 0;
         let hasWorkingTreeChanges = false;
@@ -1354,6 +1363,18 @@ export const makeGitCore = (options?: { executeOverride?: GitCoreShape["execute"
           }
         }
 
+        if (branch && upstreamRef) {
+          upstreamBranch = yield* runGitStdout(
+            "GitCore.statusDetails.upstreamMergeBranch",
+            cwd,
+            ["config", "--get", `branch.${branch}.merge`],
+            true,
+          ).pipe(
+            Effect.map(normalizeConfiguredMergeBranch),
+            Effect.catch(() => Effect.succeed(null)),
+          );
+        }
+
         if (!upstreamRef && branch) {
           aheadCount = yield* computeAheadCountAgainstBase(cwd, branch).pipe(
             Effect.catch(() => Effect.succeed(0)),
@@ -1371,6 +1392,7 @@ export const makeGitCore = (options?: { executeOverride?: GitCoreShape["execute"
           return {
             branch,
             upstreamRef,
+            upstreamBranch,
             hasWorkingTreeChanges,
             workingTree: moveAwareWorkingTree,
             hasUpstream: upstreamRef !== null,
@@ -1428,6 +1450,7 @@ export const makeGitCore = (options?: { executeOverride?: GitCoreShape["execute"
         return {
           branch,
           upstreamRef,
+          upstreamBranch,
           hasWorkingTreeChanges,
           workingTree: {
             files,
@@ -1447,6 +1470,7 @@ export const makeGitCore = (options?: { executeOverride?: GitCoreShape["execute"
           hasWorkingTreeChanges: details.hasWorkingTreeChanges,
           workingTree: details.workingTree,
           hasUpstream: details.hasUpstream,
+          upstreamBranch: details.upstreamBranch,
           aheadCount: details.aheadCount,
           behindCount: details.behindCount,
           pr: null,

apps/server/src/git/Layers/GitManager.ts

@@ -1475,6 +1475,7 @@ export const makeGitManager = Effect.gen(function* () {
       hasWorkingTreeChanges: details.hasWorkingTreeChanges,
       workingTree: details.workingTree,
       hasUpstream: details.hasUpstream,
+      upstreamBranch: details.upstreamBranch,
       aheadCount: details.aheadCount,
       behindCount: details.behindCount,
       pr,

apps/server/src/git/Layers/GitStatusBroadcaster.test.ts

@@ -13,6 +13,7 @@ const baseStatus: GitStatusResult = {
   hasWorkingTreeChanges: false,
   workingTree: { files: [], insertions: 0, deletions: 0 },
   hasUpstream: true,
+  upstreamBranch: "feature/status-broadcast",
   aheadCount: 0,
   behindCount: 0,
   pr: null,
@@ -21,6 +22,7 @@ const baseStatus: GitStatusResult = {
 const baseDetails: GitStatusDetails = {
   branch: baseStatus.branch,
   upstreamRef: "origin/feature/status-broadcast",
+  upstreamBranch: baseStatus.upstreamBranch,
   hasWorkingTreeChanges: baseStatus.hasWorkingTreeChanges,
   workingTree: baseStatus.workingTree,
   hasUpstream: baseStatus.hasUpstream,
@@ -267,6 +269,7 @@ describe("GitStatusBroadcasterLive", () => {
           },
           remote: {
             hasUpstream: baseStatus.hasUpstream,
+            upstreamBranch: baseStatus.upstreamBranch,
             aheadCount: baseStatus.aheadCount,
             behindCount: baseStatus.behindCount,
             pr: baseStatus.pr,

apps/server/src/git/gitStatusCache.ts

@@ -46,6 +46,7 @@ export function splitLocalStatusDetails(status: GitStatusDetails): GitStatusLoca
 export function splitRemoteStatus(status: GitStatusResult): GitStatusRemoteResult {
   return {
     hasUpstream: status.hasUpstream,
+    upstreamBranch: status.upstreamBranch,
     aheadCount: status.aheadCount,
     behindCount: status.behindCount,
     pr: status.pr,
@@ -58,6 +59,7 @@ export function splitRemoteStatusDetails(
 ): GitStatusRemoteResult {
   return {
     hasUpstream: status.hasUpstream,
+    upstreamBranch: status.upstreamBranch,
     aheadCount: status.aheadCount,
     behindCount: status.behindCount,
     pr: cachedRemote?.pr ?? null,
@@ -71,7 +73,9 @@ export function canReuseCachedRemoteStatus(input: {
   readonly ttlMs?: number;
 }): boolean {
   if (!input.cached.local || !input.cached.remote) return false;
+  if (!input.cached.remote.value) return false;
   if (input.details.branch !== input.cached.local.value.branch) return false;
+  if (input.details.upstreamBranch !== input.cached.remote.value.upstreamBranch) return false;
   return (
     (input.now ?? Date.now()) - input.cached.remote.updatedAt <
     (input.ttlMs ?? REMOTE_STATUS_CACHE_TTL_MS)

apps/web/src/components/GitActionsControl.logic.test.ts

@@ -24,6 +24,7 @@ function status(overrides: Partial<GitStatusResult> = {}): GitStatusResult {
       deletions: 0,
     },
     hasUpstream: true,
+    upstreamBranch: "feature/test",
     aheadCount: 0,
     behindCount: 0,
     pr: null,
@@ -296,6 +297,92 @@ describe("when: branch is clean, up to date, and has no open PR", () => {
       },
     ]);
   });
+
+  it("resolveQuickAction blocks PR when the branch tracks the default branch", () => {
+    const quick = resolveQuickAction(
+      status({
+        branch: "dpcode/pi-cleanup",
+        upstreamBranch: "main",
+        aheadCount: 0,
+        behindCount: 0,
+        pr: null,
+      }),
+      false,
+      false,
+      true,
+      false,
+      "main",
+    );
+
+    assert.deepEqual(quick, {
+      kind: "show_hint",
+      label: "Create PR",
+      hint: "No branch changes to include in a PR.",
+      disabled: true,
+    });
+  });
+
+  it("buildMenuItems disables create PR when the branch tracks the default branch", () => {
+    const items = buildMenuItems(
+      status({
+        branch: "dpcode/pi-cleanup",
+        upstreamBranch: "main",
+        aheadCount: 0,
+        behindCount: 0,
+        pr: null,
+      }),
+      false,
+      true,
+      false,
+      "main",
+    );
+
+    assert.deepEqual(items, [
+      {
+        id: "commit",
+        label: "Commit",
+        disabled: true,
+        icon: "commit",
+        kind: "open_dialog",
+        dialogAction: "commit",
+      },
+      {
+        id: "push",
+        label: "Push",
+        disabled: true,
+        icon: "push",
+        kind: "open_dialog",
+        dialogAction: "push",
+      },
+      {
+        id: "pr",
+        label: "Create PR",
+        disabled: true,
+        icon: "pr",
+        kind: "open_dialog",
+        dialogAction: "create_pr",
+      },
+    ]);
+  });
+
+  it("resolveQuickAction blocks PR when the upstream branch name is unknown", () => {
+    const quick = resolveQuickAction(
+      status({
+        upstreamBranch: null,
+        aheadCount: 0,
+        behindCount: 0,
+        pr: null,
+      }),
+      false,
+    );
+
+    assert.deepEqual(quick, {
+      kind: "show_hint",
+      label: "Create PR",
+      hint: "No branch changes to include in a PR.",
+      disabled: true,
+    });
+  });
 });
 
 describe("when: branch is behind upstream", () => {

apps/web/src/components/GitActionsControl.logic.ts

@@ -26,6 +26,8 @@ export interface GitQuickAction {
   hint?: string;
 }
 
+const FALLBACK_DEFAULT_BRANCH_NAMES = new Set(["main", "master"]);
+
 export interface DefaultBranchActionDialogCopy {
   title: string;
   description: string;
@@ -105,6 +107,22 @@ export function buildGitActionProgressStages(input: {
 const withDescription = (title: string, description: string | undefined) =>
   description ? { title, description } : { title };
 
+function extractTrackedBranchName(upstreamBranch: string | null | undefined): string | null {
+  if (!upstreamBranch) return null;
+  const branchName = upstreamBranch.trim();
+  return branchName.length > 0 ? branchName : null;
+}
+
+function tracksDefaultUpstream(
+  gitStatus: GitStatusResult,
+  defaultBranchName?: string | null,
+): boolean {
+  const trackedBranchName = extractTrackedBranchName(gitStatus.upstreamBranch);
+  if (!trackedBranchName) return false;
+  if (defaultBranchName) return trackedBranchName === defaultBranchName;
+  return FALLBACK_DEFAULT_BRANCH_NAMES.has(trackedBranchName);
+}
+
 export function summarizeGitResult(result: GitRunStackedActionResult): {
   title: string;
   description?: string;
@@ -140,13 +158,19 @@ export function buildMenuItems(
   isBusy: boolean,
   hasOriginRemote = true,
   isDefaultBranch = false,
+  defaultBranchName?: string | null,
 ): GitActionMenuItem[] {
   if (!gitStatus) return [];
 
   const hasBranch = gitStatus.branch !== null;
   const hasChanges = gitStatus.hasWorkingTreeChanges;
   const hasOpenPr = gitStatus.pr?.state === "open";
   const isBehind = gitStatus.behindCount > 0;
+  const canCreateCleanPublishedPr =
+    !isDefaultBranch &&
+    gitStatus.hasUpstream &&
+    gitStatus.upstreamBranch !== null &&
+    !tracksDefaultUpstream(gitStatus, defaultBranchName);
   const canPushWithoutUpstream = hasOriginRemote && !gitStatus.hasUpstream;
   const canCommit = !isBusy && hasChanges;
   const canPush =
@@ -168,7 +192,7 @@ export function buildMenuItems(
     !hasChanges &&
     !hasOpenPr &&
     !isBehind &&
-    ((!isDefaultBranch && gitStatus.hasUpstream) ||
+    (canCreateCleanPublishedPr ||
       (gitStatus.aheadCount > 0 && (gitStatus.hasUpstream || canPushWithoutUpstream)));
   const canOpenPr = !isBusy && hasOpenPr;
 
@@ -226,6 +250,7 @@ export function resolveQuickAction(
   isDefaultBranch = false,
   hasOriginRemote = true,
   shouldOfferCreateBranch = false,
+  defaultBranchName?: string | null,
 ): GitQuickAction {
   if (isBusy) {
     return { label: "Commit", disabled: true, kind: "show_hint", hint: "Git action in progress." };
@@ -246,6 +271,8 @@ export function resolveQuickAction(
   const isAhead = gitStatus.aheadCount > 0;
   const isBehind = gitStatus.behindCount > 0;
   const isDiverged = isAhead && isBehind;
+  const isTrackingDefaultUpstream = tracksDefaultUpstream(gitStatus, defaultBranchName);
+  const hasKnownUpstreamBranch = gitStatus.upstreamBranch !== null;
 
   if (!hasBranch) {
     return {
@@ -288,7 +315,12 @@ export function resolveQuickAction(
       return { label: "Commit", disabled: false, kind: "run_action", action: "commit" };
     }
     if (hasOpenPr || isDefaultBranch) {
-      return { label: "Commit & push", disabled: false, kind: "run_action", action: "commit_push" };
+      return {
+        label: "Commit & push",
+        disabled: false,
+        kind: "run_action",
+        action: "commit_push",
+      };
     }
     return {
       label: "Commit, push & PR",
@@ -358,6 +390,24 @@ export function resolveQuickAction(
     return { label: "View PR", disabled: false, kind: "open_pr" };
   }
 
+  if (gitStatus.hasUpstream && !hasKnownUpstreamBranch) {
+    return {
+      label: "Create PR",
+      disabled: true,
+      kind: "show_hint",
+      hint: "No branch changes to include in a PR.",
+    };
+  }
+
+  if (isTrackingDefaultUpstream) {
+    return {
+      label: "Create PR",
+      disabled: true,
+      kind: "show_hint",
+      hint: "No branch changes to include in a PR.",
+    };
+  }
+
   if (!isDefaultBranch) {
     return {
       label: "Create PR",