@gitkraken/core-gitlens 0.2.0 → 0.3.1

package/dist/git-cli/providers/branches.d.ts

@@ -1,10 +1,11 @@
-import type { Cache } from '../../git/cache.js';
+import type { Cache, GkConfigInvalidationTarget } from '../../git/cache.js';
 import type { GitServiceContext } from '../../git/context.js';
 import type { BranchDisposition } from '../../git/models/branch.js';
 import { GitBranch } from '../../git/models/branch.js';
 import type { ConflictDetectionResult } from '../../git/models/mergeConflicts.js';
 import type { GitBranchReference } from '../../git/models/reference.js';
 import type { BranchContributionsOverview, GitBranchesSubProvider, GitBranchMergedStatus } from '../../git/providers/branches.js';
+import type { GitCommandPriority } from '../../git/run.types.js';
 import type { BranchSortOptions } from '../../git/utils/sorting.js';
 import type { PagedResult, PagingOptions } from '../../utils/paging.js';
 import type { CliGitProviderInternal } from '../cliGitProvider.js';
@@ -31,6 +32,7 @@ export declare class BranchesGitSubProvider implements GitBranchesSubProvider {
                 };
             };
         } | undefined>;
+        priority?: GitCommandPriority;
     }, cancellation?: AbortSignal): Promise<BranchContributionsOverview | undefined>;
     getBranchesWithCommits(repoPath: string, commits: string[], branch?: string, options?: {
         all?: boolean;
@@ -44,7 +46,9 @@ export declare class BranchesGitSubProvider implements GitBranchesSubProvider {
     private branchesContainingCore;
     getCurrentBranchReference(repoPath: string, cancellation?: AbortSignal): Promise<GitBranchReference | undefined>;
     private getCurrentBranchReferenceCore;
-    getDefaultBranchName(repoPath: string | undefined, remote?: string, cancellation?: AbortSignal): Promise<string | undefined>;
+    getDefaultBranchName(repoPath: string | undefined, remote?: string, options?: {
+        priority?: GitCommandPriority;
+    }, cancellation?: AbortSignal): Promise<string | undefined>;
     createBranch(repoPath: string, name: string, ref: string, options?: {
         noTracking?: boolean;
     }): Promise<void>;
@@ -62,7 +66,9 @@ export declare class BranchesGitSubProvider implements GitBranchesSubProvider {
     /** Detects potential conflict when merge a branch into a target branch (git merge) */
     getPotentialMergeConflicts(repoPath: string, branch: string, targetBranch: string, cancellation?: AbortSignal): Promise<ConflictDetectionResult>;
     private checkForPotentialConflicts;
-    getBaseBranchName(repoPath: string, ref: string, cancellation?: AbortSignal): Promise<string | undefined>;
+    getBaseBranchName(repoPath: string, ref: string, options?: {
+        priority?: GitCommandPriority;
+    }, cancellation?: AbortSignal): Promise<string | undefined>;
     private getBaseBranchFromReflog;
     getStoredMergeTargetBranchName(repoPath: string, ref: string): Promise<string | undefined>;
     getStoredDetectedMergeTargetBranchName(repoPath: string, ref: string): Promise<string | undefined>;
@@ -75,8 +81,12 @@ export declare class BranchesGitSubProvider implements GitBranchesSubProvider {
     onCurrentBranchAgentActivity(repoPath: string): Promise<void>;
     renameBranch(repoPath: string, oldName: string, newName: string): Promise<void>;
     setUpstreamBranch(repoPath: string, name: string, upstream: string | undefined): Promise<void>;
-    storeBaseBranchName(repoPath: string, ref: string, base: string): Promise<void>;
-    storeMergeTargetBranchName(repoPath: string, ref: string, target: string): Promise<void>;
+    storeBaseBranchName(repoPath: string, ref: string, base: string, options?: {
+        skipInvalidation?: readonly GkConfigInvalidationTarget[];
+    }): Promise<void>;
+    storeMergeTargetBranchName(repoPath: string, ref: string, target: string, options?: {
+        skipInvalidation?: readonly GkConfigInvalidationTarget[];
+    }): Promise<void>;
     storeUserMergeTargetBranchName(repoPath: string, ref: string, target: string | undefined): Promise<void>;
     /**
      * Gets all branch metadata (dates and disposition) from git config in a single batch operation.

package/dist/git-cli/providers/branches.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branches.d.ts","sourceRoot":"","sources":["../../src/providers/branches.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"branches.d.ts","sourceRoot":"","sources":["../../src/providers/branches.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAA6B,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAC1G,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,KAAK,EAAE,iBAAiB,EAAkB,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,KAAK,EACX,2BAA2B,EAC3B,sBAAsB,EACtB,qBAAqB,EACrB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAapE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAQvE,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAM3E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAEnE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAO1C,qBAAa,sBAAuB,YAAW,sBAAsB;IAEnE,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAHR,OAAO,EAAE,iBAAiB,EAC1B,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,sBAAsB;IAI5C,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;YA6B9F,gBAAgB;IA6DxB,WAAW,CAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;QACT,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,KAAK,OAAO,CAAC;QACnC,QAAQ,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,MAAM,GAAG,IAAI,CAAC;QAClD,MAAM,CAAC,EAAE,aAAa,CAAC;QACvB,IAAI,CAAC,EAAE,OAAO,GAAG,iBAAiB,CAAC;KACnC,EACD,YAAY,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IA0M5B,8BAA8B,CACnC,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE;QACT,qBAAqB,CAAC,EAAE,OAAO,CAAC;YAAE,IAAI,CAAC,EAAE;gBAAE,IAAI,CAAC,EAAE;oBAAE,MAAM,EAAE,MAAM,CAAA;iBAAE,CAAA;aAAE,CAAA;SAAE,GAAG,SAAS,CAAC,CAAC;QACtF,QAAQ,CAAC,EAAE,kBAAkB,CAAC;KAC9B,EACD,YAAY,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAmJ7C,sBAAsB,CAC3B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EACL;QAAE,GAAG,CAAC,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,IAAI,CAAC;QAAC,IAAI,CAAC,EAAE,UAAU,GAAG,UAAU,CAAA;KAAE,GACpE;QAAE,UAAU,CAAC,EAAE,IAAI,CAAC;QAAC,IAAI,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,EAC3E,YAAY,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,EAAE,CAAC;YAkBN,sBAAsB;IAwC9B,yBAAyB,CAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAe1C,OAAO,CAAC,6BAA6B;IAiI/B,oBAAoB,CACzB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,kBAAkB,CAAA;KAAE,EAC3C,YAAY,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA2DxB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA4B5G,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA4B3G,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBnG,qBAAqB,CACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,kBAAkB,EAC1B,IAAI,EAAE,kBAAkB,EACxB,YAAY,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,qBAAqB,CAAC;YA0DnB,yBAAyB;IA6FjC,wBAAwB,CAC7B,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,YAAY,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAOjC,0GAA0G;IAEpG,0BAA0B,CAC/B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,CAAC,EAAE;QAAE,mBAAmB,CAAC,EAAE,OAAO,CAAA;KAAE,EAC3C,YAAY,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,uBAAuB,CAAC;IAmCnC,sFAAsF;IAEhF,0BAA0B,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,uBAAuB,CAAC;YAuErB,0BAA0B;IAqIxC,iBAAiB,CAChB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,kBAAkB,CAAA;KAAE,EAC3C,YAAY,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YA2DhB,uBAAuB;IAyE/B,8BAA8B,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAQ1F,sCAAsC,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAQlG,kCAAkC,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKpG,iEAAiE;IAG3D,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9D,8EAA8E;IAGxE,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9D,uEAAuE;IAGjE,4BAA4B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ7D,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB/E,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B9F,mBAAmB,CACxB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QAAE,gBAAgB,CAAC,EAAE,SAAS,0BAA0B,EAAE,CAAA;KAAE,GACpE,OAAO,CAAC,IAAI,CAAC;IAKV,0BAA0B,CAC/B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;QAAE,gBAAgB,CAAC,EAAE,SAAS,0BAA0B,EAAE,CAAA;KAAE,GACpE,OAAO,CAAC,IAAI,CAAC;IAKV,8BAA8B,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9G;;;OAGG;IACH,OAAO,CAAC,oBAAoB;YAmDd,mBAAmB;IAe3B,oBAAoB,CACzB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,iBAAiB,GAAG,SAAS,GACxC,OAAO,CAAC,IAAI,CAAC;CAKhB"}

package/dist/git-cli/providers/branches.js

@@ -75,7 +75,6 @@ import { getSettledValue } from '../../utils/promise.js';
 import { maybeStopWatch } from '../../utils/stopwatch.js';
 import { getGitCommandError, gitConfigsBranch, gitConfigsLog, GitError, GitErrors, GitWarnings } from '../exec/git.js';
 import { parseMergeTreeConflict } from '../parsers/mergeTreeParser.js';
-import { getBranchParser } from '../parsers/refParser.js';
 /** Minimum time between writes to the config for last accessed/modified dates */
 const dateMetadataStaleThresholdMs = 5 * 60 * 1000; // 5 minutes
 export class BranchesGitSubProvider {
@@ -110,7 +109,7 @@ export class BranchesGitSubProvider {
             return undefined;
         const [pausedOpStatusResult, committerDateResult, defaultWorktreePathResult, metadataMapResult] = await Promise.allSettled([
             isDetachedHead(ref.name)
-                ? this.provider.pausedOps?.getPausedOperationStatus(repoPath, cancellation)
+                ? this.provider.pausedOps?.getPausedOperationStatus(repoPath, undefined, cancellation)
                 : undefined,
             this.git
                 .run({
@@ -147,32 +146,37 @@ export class BranchesGitSubProvider {
             try {
                 const env_1 = { stack: [], error: void 0, hasError: false };
                 try {
-                    const supported = await this.git.supported('git:for-each-ref');
-                    const parser = getBranchParser(supported);
-                    const [gitResult, defaultWorktreePathResult, metadataMapResult] = await Promise.allSettled([
-                        this.git.run({ cwd: commonPath, cancellation: signal }, 'for-each-ref', ...parser.arguments, 'refs/heads/', 'refs/remotes/'),
+                    const [recordsResult, supportedResult, defaultWorktreePathResult, metadataMapResult] = await Promise.allSettled([
+                        this.provider.refs.getRefs(commonPath, signal),
+                        this.git.supported('git:for-each-ref'),
                         this.provider.config.getDefaultWorktreePath?.(commonPath),
                         this.getBranchMetadataMap(commonPath),
                     ]);
-                    const result = getSettledValue(gitResult);
+                    const records = getSettledValue(recordsResult) ?? [];
+                    const supported = getSettledValue(supportedResult) ?? [];
                     const metadataMap = getSettledValue(metadataMapResult) ?? new Map();
                     const defaultWorktreePath = getSettledValue(defaultWorktreePathResult);
+                    const worktreePathSupported = supported.includes('git:for-each-ref:worktreePath');
                     // If we don't get any data, assume the repo doesn't have any commits yet so check if we have a current branch
-                    if (!result?.stdout) {
+                    if (!records.length) {
                         const current = await this.getCurrentBranch(commonPath, metadataMap, options?.ordering ?? this.context.config?.commits.ordering ?? undefined, signal);
                         return current != null ? { values: [current] } : emptyPagedResult;
                     }
                     const sw = __addDisposableResource(env_1, maybeStopWatch(scope, { log: { onlyExit: true, level: 'debug' } }), false);
                     const branches = [];
-                    for (const entry of parser.parse(result.stdout)) {
+                    for (const record of records) {
+                        const fullName = record.name;
+                        // Filter to branches and remote-tracking branches; skip tags from the unified records.
+                        if (!fullName.startsWith('refs/heads/') && !fullName.startsWith('refs/remotes/'))
+                            continue;
                         // Skip HEAD refs in remote branches
-                        if (isRemoteHEAD(entry.name))
+                        if (isRemoteHEAD(fullName))
                             continue;
-                        const upstream = parseUpstream(entry.upstream, entry.upstreamTracking);
-                        const metadata = metadataMap.get(parseRefName(entry.name).name);
-                        const worktreePath = entry.worktreePath ? normalizePath(entry.worktreePath) : undefined;
-                        branches.push(new GitBranch(commonPath, entry.name, false, // Don't trust %(HEAD) for current as it's per-worktree -- we will set it later
-                        entry.date ? new Date(entry.date) : undefined, metadata, entry.sha, upstream, supported.includes('git:for-each-ref:worktreePath')
+                        const upstream = parseUpstream(record.upstream, record.upstreamTracking);
+                        const metadata = metadataMap.get(parseRefName(fullName).name);
+                        const worktreePath = record.worktreePath ? normalizePath(record.worktreePath) : undefined;
+                        branches.push(new GitBranch(commonPath, fullName, false, // Don't trust %(HEAD) for current as it's per-worktree -- we will set it later
+                        record.committerDate ? new Date(record.committerDate) : undefined, metadata, record.objectname, upstream, worktreePathSupported
                             ? worktreePath
                                 ? { path: worktreePath, isDefault: worktreePath === defaultWorktreePath }
                                 : false
@@ -182,6 +186,7 @@ export class BranchesGitSubProvider {
                     // Pre-populate current branch cache for worktrees based on worktreePath info
                     // This eliminates the need for rev-parse calls during branch reconstruction
                     for (const branch of branches) {
+                        // oxlint-disable-next-line typescript/prefer-optional-chain
                         if (branch.worktree && branch.worktree.path) {
                             const { name } = parseRefName(branch.refName);
                             const reference = createReference(name, branch.worktree.path, {
@@ -286,33 +291,12 @@ export class BranchesGitSubProvider {
     }
     async getBranchContributionsOverview(repoPath, ref, options, cancellation) {
         const scope = getScopedLogger();
-        const getCore = async (_commonPath, _cacheable, signal, storedTarget) => {
-            let mergeTarget;
-            // Tier 1: Stored merge target (user-set or previously detected from PR). Caller has
-            // already read this once for the cache decision; reuse rather than re-fetching.
-            if (storedTarget) {
-                const validated = await this.provider.refs.getSymbolicReferenceName(repoPath, storedTarget);
-                mergeTarget = validated || storedTarget;
-            }
-            // Tier 2: PR-based lookup. The branch object is only needed here (for `remoteName`),
-            // so lazy-load it on the cold path instead of paying for it on every call.
-            if (mergeTarget == null && options?.associatedPullRequest != null) {
-                const pr = await options.associatedPullRequest;
-                if (pr?.refs?.base != null) {
-                    const branch = await this.getBranch(repoPath, ref, signal);
-                    if (branch == null)
-                        return undefined;
-                    mergeTarget = `${branch.remoteName}/${pr.refs.base.branch}`;
-                    // Store for future reuse — turns the next call into a Tier 1 cache-eligible path.
-                    void this.storeMergeTargetBranchName(repoPath, ref, mergeTarget);
-                }
-            }
-            // Tier 3: Base branch, then default branch
-            mergeTarget ??= await this.getBaseBranchName(repoPath, ref, signal);
-            mergeTarget ??= await this.getDefaultBranchName(repoPath, undefined, signal);
-            if (mergeTarget == null)
-                return undefined;
-            const mergeBase = await this.provider.refs.getMergeBase(repoPath, ref, mergeTarget, undefined, signal);
+        const priority = options?.priority;
+        const priorityOpts = priority != null ? { priority: priority } : undefined;
+        // Expensive body — runs only on cache miss. Closes over `mergeTarget` so the cache key
+        // (`${ref}|${mergeTarget}`) fully captures every input that affects the result.
+        const fetchBody = async (mergeTarget, signal) => {
+            const mergeBase = await this.provider.refs.getMergeBase(repoPath, ref, mergeTarget, priorityOpts, signal);
             if (mergeBase == null)
                 return undefined;
             // Fetch the merge-base commit's dates in parallel with contributors so consumers
@@ -367,14 +351,47 @@ export class BranchesGitSubProvider {
             };
         };
         try {
-            // Pre-check Tier 1: when a stored merge target exists the result is deterministic for
-            // `ref` (Tier 2's PR resolution is short-circuited), so it's safe to cache. Otherwise
-            // the result depends on PR resolution which the cache key can't capture — bypass.
+            // Resolve `mergeTarget` through Tier 1 → Tier 2 → Tier 3. The pieces of each tier are
+            // already individually cached (`getStoredMergeTargetBranchName`, `getBaseBranchName`,
+            // `getDefaultBranchName`), so this resolution path is cheap on warm caches. Only the
+            // expensive body below (`getMergeBase` + `getContributors` w/ stats + `getCommitDates`)
+            // is wrapped by `cache.getBranchOverview`, keyed on the resolved `mergeTarget` so any
+            // caller that resolves to the same target shares; differing targets get independent
+            // slots, which is the correctness constraint that previously forced the Tier 2/3 paths
+            // to bypass the cache entirely.
+            let mergeTarget;
+            // Tier 1: Stored merge target (user-set or previously detected from PR).
             const storedTarget = await this.getStoredMergeTargetBranchName(repoPath, ref);
-            if (storedTarget != null) {
-                return await this.cache.getBranchOverview(repoPath, ref, (commonPath, cacheable, signal) => getCore(commonPath, cacheable, signal ?? cancellation, storedTarget), { cancellation: cancellation });
+            if (storedTarget) {
+                const validated = await this.provider.refs.getSymbolicReferenceName(repoPath, storedTarget, priorityOpts, cancellation);
+                mergeTarget = validated || storedTarget;
             }
-            return await getCore(repoPath, undefined, cancellation, undefined);
+            // Tier 2: PR-based lookup. The branch object is only needed here (for `remoteName`),
+            // so lazy-load it on the cold path instead of paying for it on every call.
+            if (mergeTarget == null && options?.associatedPullRequest != null) {
+                const pr = await options.associatedPullRequest;
+                if (pr?.refs?.base != null) {
+                    const branch = await this.getBranch(repoPath, ref, cancellation);
+                    if (branch == null)
+                        return undefined;
+                    mergeTarget = `${branch.remoteName}/${pr.refs.base.branch}`;
+                    // Store for future reuse — turns the next call into a Tier 1 path. Skip the
+                    // `branchOverviews` invalidation that the write would otherwise trigger: we're
+                    // about to populate `${ref}|${mergeTarget}` with this exact target, so evicting
+                    // it would just force the next caller to redo the body. (gk-merge-target writes
+                    // do not affect `baseBranchName`, so no need to skip that target.)
+                    void this.storeMergeTargetBranchName(repoPath, ref, mergeTarget, {
+                        skipInvalidation: ['branchOverviews'],
+                    });
+                }
+            }
+            // Tier 3: Base branch, then default branch.
+            mergeTarget ??= await this.getBaseBranchName(repoPath, ref, priorityOpts, cancellation);
+            mergeTarget ??= await this.getDefaultBranchName(repoPath, undefined, priorityOpts, cancellation);
+            if (mergeTarget == null)
+                return undefined;
+            const resolvedTarget = mergeTarget;
+            return await this.cache.getBranchOverview(repoPath, `${ref}|${resolvedTarget}`, (_commonPath, _cacheable, signal) => fetchBody(resolvedTarget, signal ?? cancellation), { cancellation: cancellation });
         }
         catch (ex) {
             scope?.error(ex);
@@ -459,7 +476,7 @@ export class BranchesGitSubProvider {
                                 throw ex;
                         }
                         if (data == null) {
-                            const symbolicRef = await this.getDefaultBranchName(repoPath, 'origin', signal);
+                            const symbolicRef = await this.getDefaultBranchName(repoPath, 'origin', undefined, signal);
                             if (symbolicRef != null) {
                                 data = [
                                     symbolicRef.startsWith('origin/')
@@ -516,15 +533,17 @@ export class BranchesGitSubProvider {
             });
         }, { cancellation: cancellation });
     }
-    async getDefaultBranchName(repoPath, remote, cancellation) {
+    async getDefaultBranchName(repoPath, remote, options, cancellation) {
         if (repoPath == null)
             return undefined;
         remote ??= 'origin';
+        const priority = options?.priority;
+        const priorityOpts = priority != null ? { priority: priority } : undefined;
         return this.cache.getDefaultBranchName(repoPath, remote, async (commonPath) => {
             let retried = false;
             while (true) {
                 try {
-                    const result = await this.git.run({ cwd: commonPath, cancellation: cancellation }, 'symbolic-ref', '--short', `refs/remotes/${remote}/HEAD`);
+                    const result = await this.git.run({ cwd: commonPath, cancellation: cancellation, ...priorityOpts }, 'symbolic-ref', '--short', `refs/remotes/${remote}/HEAD`);
                     return result.stdout.trim() || undefined;
                 }
                 catch (ex) {
@@ -532,10 +551,10 @@ export class BranchesGitSubProvider {
                         try {
                             if (!retried) {
                                 retried = true;
-                                await this.git.run({ cwd: commonPath, cancellation: cancellation }, 'remote', 'set-head', '-a', remote);
+                                await this.git.run({ cwd: commonPath, cancellation: cancellation, ...priorityOpts }, 'remote', 'set-head', '-a', remote);
                                 continue;
                             }
-                            const result = await this.git.run({ cwd: commonPath, cancellation: cancellation }, 'ls-remote', '--symref', remote, 'HEAD');
+                            const result = await this.git.run({ cwd: commonPath, cancellation: cancellation, ...priorityOpts }, 'ls-remote', '--symref', remote, 'HEAD');
                             if (result.stdout) {
                                 const match = /ref:\s(\S+)\s+HEAD/m.exec(result.stdout);
                                 if (match != null) {
@@ -907,7 +926,9 @@ export class BranchesGitSubProvider {
         }
         return { status: 'clean' };
     }
-    getBaseBranchName(repoPath, ref, cancellation) {
+    getBaseBranchName(repoPath, ref, options, cancellation) {
+        const priority = options?.priority;
+        const priorityOpts = priority != null ? { priority: priority } : undefined;
         return this.cache.getBaseBranchName(repoPath, ref, async (commonPath, signal) => {
             try {
                 // getGkConfig has built-in fallback to regular config for backward compatibility
@@ -919,27 +940,37 @@ export class BranchesGitSubProvider {
                     update = mergeBase != null;
                 }
                 if (mergeBase != null) {
-                    const branch = await this.provider.refs.getSymbolicReferenceName(commonPath, mergeBase);
+                    const branch = await this.provider.refs.getSymbolicReferenceName(commonPath, mergeBase, priorityOpts);
                     if (branch != null) {
                         if (update) {
-                            void this.storeBaseBranchName(commonPath, ref, branch);
+                            // Self-write: the value we're storing is exactly what this factory is
+                            // returning, so any in-flight `branchOverviews` or `baseBranchName` entry
+                            // being populated against this resolution should NOT be evicted.
+                            void this.storeBaseBranchName(commonPath, ref, branch, {
+                                skipInvalidation: ['branchOverviews', 'baseBranchName'],
+                            });
                         }
                         return branch;
                     }
                 }
             }
             catch { }
-            const branch = await this.getBaseBranchFromReflog(commonPath, ref, { upstream: true }, signal);
+            const branch = await this.getBaseBranchFromReflog(commonPath, ref, { upstream: true, priority: priority }, signal);
             if (branch != null) {
-                void this.storeBaseBranchName(commonPath, ref, branch);
+                // Self-write: see comment on the migration path above.
+                void this.storeBaseBranchName(commonPath, ref, branch, {
+                    skipInvalidation: ['branchOverviews', 'baseBranchName'],
+                });
                 return branch;
             }
             return undefined;
         }, cancellation);
     }
     async getBaseBranchFromReflog(repoPath, ref, options, cancellation) {
+        const priority = options?.priority;
+        const priorityOpts = priority != null ? { priority: priority } : undefined;
         try {
-            let result = await this.git.run({ cwd: repoPath, cancellation: cancellation }, 'reflog', ref, '--grep-reflog=branch: Created from *.');
+            let result = await this.git.run({ cwd: repoPath, cancellation: cancellation, ...priorityOpts }, 'reflog', ref, '--grep-reflog=branch: Created from *.');
             let entries = result.stdout.split('\n').filter(entry => Boolean(entry));
             if (entries.length !== 1)
                 return undefined;
@@ -949,17 +980,17 @@ export class BranchesGitSubProvider {
                 let name = match[1];
                 if (name !== 'HEAD') {
                     if (options?.upstream) {
-                        const upstream = await this.provider.refs.getSymbolicReferenceName(repoPath, `${name}@{u}`);
+                        const upstream = await this.provider.refs.getSymbolicReferenceName(repoPath, `${name}@{u}`, priorityOpts);
                         if (upstream)
                             return upstream;
                     }
-                    name = await this.provider.refs.getSymbolicReferenceName(repoPath, name);
+                    name = await this.provider.refs.getSymbolicReferenceName(repoPath, name, priorityOpts);
                     if (name)
                         return name;
                 }
             }
             // Check if branch was created from HEAD
-            result = await this.git.run({ cwd: repoPath, cancellation: cancellation }, 'reflog', 'HEAD', `--grep-reflog=checkout: moving from .* to ${ref.replace('refs/heads/', '')}`);
+            result = await this.git.run({ cwd: repoPath, cancellation: cancellation, ...priorityOpts }, 'reflog', 'HEAD', `--grep-reflog=checkout: moving from .* to ${ref.replace('refs/heads/', '')}`);
             entries = result.stdout.split('\n').filter(entry => Boolean(entry));
             if (!entries.length)
                 return undefined;
@@ -967,11 +998,11 @@ export class BranchesGitSubProvider {
             if (match?.length === 2) {
                 let name = match[1];
                 if (options?.upstream) {
-                    const upstream = await this.provider.refs.getSymbolicReferenceName(repoPath, `${name}@{u}`);
+                    const upstream = await this.provider.refs.getSymbolicReferenceName(repoPath, `${name}@{u}`, priorityOpts);
                     if (upstream)
                         return upstream;
                 }
-                name = await this.provider.refs.getSymbolicReferenceName(repoPath, name);
+                name = await this.provider.refs.getSymbolicReferenceName(repoPath, name, priorityOpts);
                 if (name)
                     return name;
             }
@@ -1051,11 +1082,11 @@ export class BranchesGitSubProvider {
             }, ex));
         }
     }
-    async storeBaseBranchName(repoPath, ref, base) {
-        await this.provider.config.setGkConfig(repoPath, `branch.${ref}.gk-merge-base`, base);
+    async storeBaseBranchName(repoPath, ref, base, options) {
+        await this.provider.config.setGkConfig(repoPath, `branch.${ref}.gk-merge-base`, base, options);
     }
-    async storeMergeTargetBranchName(repoPath, ref, target) {
-        await this.provider.config.setGkConfig(repoPath, `branch.${ref}.gk-merge-target`, target);
+    async storeMergeTargetBranchName(repoPath, ref, target, options) {
+        await this.provider.config.setGkConfig(repoPath, `branch.${ref}.gk-merge-target`, target, options);
     }
     async storeUserMergeTargetBranchName(repoPath, ref, target) {
         await this.provider.config.setGkConfig(repoPath, `branch.${ref}.gk-merge-target-user`, target);