Fix cross-repo PR selector ordering and base branch candidate normalization

cursoragent · juliusmarminge · cursoragent · commit 0478c41a4132 · 2026-03-10T08:44:32.000Z
- Reorder headSelectors so owner-qualified selectors (e.g. octocat:branch)
  come before bare branch names when isCrossRepository is true, preventing
  an unrelated same-repo PR from being matched first.

- Extend base branch candidate normalization to strip the dynamic
  primaryRemoteName prefix (not just hardcoded 'origin/'), so candidates
  stored with a non-origin remote prefix are correctly normalized.

Co-authored-by: Julius Marminge &lt;juliusmarminge@users.noreply.github.com&gt;
diff --git a/apps/server/src/git/Layers/GitCore.ts b/apps/server/src/git/Layers/GitCore.ts
@@ -565,9 +565,13 @@ const makeGitCore = Effect.gen(function* () {
           continue;
         }
 
+        const remotePrefix =
+          primaryRemoteName && primaryRemoteName !== "origin" ? `${primaryRemoteName}/` : null;
         const normalizedCandidate = candidate.startsWith("origin/")
           ? candidate.slice("origin/".length)
-          : candidate;
+          : remotePrefix && candidate.startsWith(remotePrefix)
+            ? candidate.slice(remotePrefix.length)
+            : candidate;
         if (normalizedCandidate.length === 0 || normalizedCandidate === branch) {
           continue;
         }
diff --git a/apps/server/src/git/Layers/GitManager.ts b/apps/server/src/git/Layers/GitManager.ts
@@ -489,15 +489,19 @@ export const makeGitManager = Effect.gen(function* () {
       const shouldProbeRemoteOwnedSelectors = isCrossRepository || (remoteName !== null && remoteName !== "origin");
 
       const headSelectors: string[] = [];
+      if (isCrossRepository && shouldProbeRemoteOwnedSelectors) {
+        appendUnique(headSelectors, ownerHeadSelector);
+        appendUnique(headSelectors, remoteAliasHeadSelector !== ownerHeadSelector ? remoteAliasHeadSelector : null);
+      }
       appendUnique(headSelectors, details.branch);
       appendUnique(headSelectors, headBranch !== details.branch ? headBranch : null);
-      appendUnique(headSelectors, shouldProbeRemoteOwnedSelectors ? ownerHeadSelector : null);
-      appendUnique(
-        headSelectors,
-        shouldProbeRemoteOwnedSelectors && remoteAliasHeadSelector !== ownerHeadSelector
-          ? remoteAliasHeadSelector
-          : null,
-      );
+      if (!isCrossRepository && shouldProbeRemoteOwnedSelectors) {
+        appendUnique(headSelectors, ownerHeadSelector);
+        appendUnique(
+          headSelectors,
+          remoteAliasHeadSelector !== ownerHeadSelector ? remoteAliasHeadSelector : null,
+        );
+      }
 
       return {
         localBranch: details.branch,

Original file line number	Diff line number	Diff line change
`@@ -565,9 +565,13 @@ const makeGitCore = Effect.gen(function* () {`
`565`	`565`	`continue;`
`566`	`566`	`}`
`567`	`567`
	`568`	`+ const remotePrefix =`
	`569`	+ primaryRemoteName && primaryRemoteName !== "origin" ? `${primaryRemoteName}/` : null;
`568`	`570`	`const normalizedCandidate = candidate.startsWith("origin/")`
`569`	`571`	`? candidate.slice("origin/".length)`
`570`		`- : candidate;`
	`572`	`+ : remotePrefix && candidate.startsWith(remotePrefix)`
	`573`	`+ ? candidate.slice(remotePrefix.length)`
	`574`	`+ : candidate;`
`571`	`575`	`if (normalizedCandidate.length === 0 \|\| normalizedCandidate === branch) {`
`572`	`576`	`continue;`
`573`	`577`	`}`