@gitkraken/core-gitlens 0.2.0 → 0.3.0

package/dist/git-cli/parsers/refParser.js

@@ -52,41 +52,41 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
 });
 import { maybeStopWatch } from '../../utils/stopwatch.js';
 import { iterateByDelimiter } from '../../utils/string.js';
-const branchMapping = {
-    current: `%(HEAD)`, // HEAD indicator (current branch)
-    name: `%(refname)`, // Full reference name
-    upstream: `%(upstream)`, // Upstream branch, if any
-    upstreamTracking: `%(upstream:track)`, // Tracking status
-    sha: `%(objectname)`, // SHA
-    date: `%(committerdate:iso8601)`, // Date
+/**
+ * Unified `for-each-ref` mapping covering branches, remotes, and tags in a single pass.
+ * Fields inapplicable to a given ref-type come back as empty strings from git.
+ *
+ * NOTE: When adding a new field that is gated on a git feature flag, mirror the entry in
+ * `refMappingSupportsWorktreePath` (and any future variants) — both maps MUST stay aligned
+ * so callers can switch parsers based on `git.supported('git:for-each-ref')` without losing
+ * field positions.
+ */
+const refMapping = {
+    current: `%(HEAD)`,
+    name: `%(refname)`,
+    objectname: `%(objectname)`,
+    peeledObjectname: `%(*objectname)`,
+    upstream: `%(upstream)`,
+    upstreamTracking: `%(upstream:track)`,
+    committerDate: `%(committerdate:iso8601)`,
+    creatorDate: `%(creatordate:iso8601)`,
+    authorDate: `%(authordate:iso8601)`,
+    subject: `%(subject)`,
     worktreePath: undefined,
 };
-const branchMappingSupportsWorktreePath = {
-    ...branchMapping,
-    worktreePath: '%(worktreepath)', // Worktree path
+const refMappingSupportsWorktreePath = {
+    ...refMapping,
+    worktreePath: '%(worktreepath)',
 };
-let _branchParser;
-let _branchParserWithWorktree;
-export function getBranchParser(supportedFeatures) {
+let _refParser;
+let _refParserWithWorktree;
+export function getRefParser(supportedFeatures) {
     if (supportedFeatures.includes('git:for-each-ref:worktreePath')) {
-        _branchParserWithWorktree ??= createRefParser(branchMappingSupportsWorktreePath);
-        return _branchParserWithWorktree;
+        _refParserWithWorktree ??= createRefParser(refMappingSupportsWorktreePath);
+        return _refParserWithWorktree;
     }
-    _branchParser ??= createRefParser(branchMapping);
-    return _branchParser;
-}
-const tagMapping = {
-    name: `%(refname)`, // Full reference name
-    tagSha: `%(objectname)`, // sha of the tag
-    sha: `%(*objectname)`, // sha of the commit the tag points to, if any
-    date: `%(creatordate:iso8601)`, // date the tag was created
-    commitDate: `%(authordate:iso8601)`, // author date of the commit the tag points to
-    message: `%(subject)`, // message
-};
-let _tagParser;
-export function getTagParser() {
-    _tagParser ??= createRefParser(tagMapping);
-    return _tagParser;
+    _refParser ??= createRefParser(refMapping);
+    return _refParser;
 }
 const recordSep = '\x1E'; // ASCII Record Separator character
 const recordFormatSep = '%1E';

package/dist/git-cli/parsers/refParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"refParser.js","sourceRoot":"","sources":["../../src/parsers/refParser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"refParser.js","sourceRoot":"","sources":["../../src/parsers/refParser.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"blame.d.ts","sourceRoot":"","sources":["../../src/providers/blame.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EACX,QAAQ,EAER,YAAY,EAEZ,mBAAmB,EAEnB,MAAM,8BAA8B,CAAC;AAOtC,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC5F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAWjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAEnE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAiB1C,qBAAa,mBAAoB,YAAW,mBAAmB;IAE7D,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAFR,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,sBAAsB;IAG5C,QAAQ,CACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,GAAG,CAAC,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,eAAe,GACvB,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IAK1B,mBAAmB,CACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,GAAG,CAAC,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,eAAe,GACvB,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;YAmB7B,uBAAuB;YAgCvB,WAAW;IAkGnB,eAAe,CACpB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,GAAG,CAAC,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,eAAe,GACvD,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IA4C9B,gBAAgB,CACrB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,SAAS,EAChB,GAAG,CAAC,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,eAAe,GACvB,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;YAOlB,YAAY;IAS1B,2FAA2F;YAC7E,cAAc;IA0F5B,gGAAgG;YAClF,aAAa;CAyB3B"}
+{"version":3,"file":"blame.d.ts","sourceRoot":"","sources":["../../src/providers/blame.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EACX,QAAQ,EAER,YAAY,EAEZ,mBAAmB,EAEnB,MAAM,8BAA8B,CAAC;AAOtC,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC5F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAWjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAEnE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAiB1C,qBAAa,mBAAoB,YAAW,mBAAmB;IAE7D,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAFR,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,sBAAsB;IAG5C,QAAQ,CACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,GAAG,CAAC,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,eAAe,GACvB,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IAK1B,mBAAmB,CACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,GAAG,CAAC,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,eAAe,GACvB,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;YAmB7B,uBAAuB;YAgCvB,WAAW;IAkGnB,eAAe,CACpB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,GAAG,CAAC,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,eAAe,GACvD,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IA6C9B,gBAAgB,CACrB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,SAAS,EAChB,GAAG,CAAC,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,eAAe,GACvB,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;YAOlB,YAAY;IAS1B,2FAA2F;YAC7E,cAAc;IA0F5B,gGAAgG;YAClF,aAAa;CAyB3B"}

package/dist/git-cli/providers/blame.js.map

@@ -1 +1 @@
-{"version":3,"file":"blame.js","sourceRoot":"","sources":["../../src/providers/blame.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"blame.js","sourceRoot":"","sources":["../../src/providers/blame.ts"],"names":[],"mappings":"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"}

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":"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"}

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
@@ -286,33 +290,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 +350,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 +475,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 +532,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 +550,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 +925,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 +939,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 +979,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 +997,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 +1081,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);