@gitkraken/core-gitlens 0.2.0 → 0.3.1

package/CHANGELOG.md

@@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+## [0.3.1] - 2026-06-19
+
+### Fixed
+
+- Fixes `push`, `fetch`, `pull`, `reset`, `checkout`, and `restore` resolving as success when the git command actually failed with output matching a `GitWarnings` pattern (e.g. a non-fast-forward `tipBehind` push rejection, an unreachable remote, or an invalid ref/revision) — the rejection was swallowed by the default handler and the typed-error mapping was unreachable; these now reject with the correct error (`PushError`/`FetchError`/`PullError`/`ResetError`/`CheckoutError`) (git-cli)
+
+## [0.3.0] - 2026-05-27
+
 ## [0.2.0] - 2026-05-01
 
 ### Added
@@ -32,6 +40,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Initial release. Bundles `@gitlens/utils`, `@gitlens/git`, `@gitlens/git-cli`, `@gitlens/ai`, and `@gitlens/git-github` into a single core npm package with subpath exports.
 
-[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/releases/core/v0.2.0...HEAD
+[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/releases/core/v0.3.1...HEAD
+[0.3.1]: https://github.com/gitkraken/vscode-gitlens/compare/releases/core/v0.3.0...gitkraken:releases/core/v0.3.1
+[0.3.0]: https://github.com/gitkraken/vscode-gitlens/compare/releases/core/v0.2.0...gitkraken:releases/core/v0.3.0
 [0.2.0]: https://github.com/gitkraken/vscode-gitlens/compare/releases/core/v0.1.0...gitkraken:releases/core/v0.2.0
 [0.1.0]: https://github.com/gitkraken/vscode-gitlens/releases/tag/releases/core/v0.1.0

package/dist/git/cache.d.ts

@@ -3,15 +3,15 @@ import type { PromiseOrValue } from '../utils/promise.js';
 import type { CacheController } from '../utils/promiseCache.js';
 import { PromiseCache, PromiseMap, RepoPromiseCacheMap } from '../utils/promiseCache.js';
 import type { Uri } from '../utils/uri.js';
-import type { GitResult } from './exec.types.js';
 import type { ProgressiveGitBlame } from './models/blame.js';
 import type { BranchMetadata, GitBranch } from './models/branch.js';
+import type { GitCommit } from './models/commit.js';
 import type { GitContributor, GitContributorsStats } from './models/contributor.js';
 import type { ParsedGitDiffHunks } from './models/diff.js';
 import type { GitLog } from './models/log.js';
 import type { ConflictDetectionResult } from './models/mergeConflicts.js';
 import type { GitPausedOperationStatus } from './models/pausedOperationStatus.js';
-import type { GitBranchReference } from './models/reference.js';
+import type { GitBranchReference, GitRefTip, RefRecord } from './models/reference.js';
 import type { GitRemote } from './models/remote.js';
 import type { RemoteProvider } from './models/remoteProvider.js';
 import type { GitDir, RepositoryChange } from './models/repository.js';
@@ -23,6 +23,7 @@ import type { BranchContributionsOverview, GitBranchMergedStatus } from './provi
 import type { GitCommitReachability, LeftRightCommitCountResult } from './providers/commits.js';
 import type { GitContributorsResult } from './providers/contributors.js';
 import type { ResolvedRevision } from './providers/revision.js';
+import type { GitResult } from './run.types.js';
 import type { GitIgnoreFilter } from './watching/gitIgnoreFilter.js';
 type RepoPath = string;
 /** Cache types that are keyed by file path within a repo — support per-file clearing */
@@ -30,6 +31,13 @@ export type UriScopedCachedGitTypes = 'blame' | 'diff' | 'fileLog';
 export declare function areUriScopedCachedGitTypes(types: string[]): types is UriScopedCachedGitTypes[];
 export type CachedGitTypes = UriScopedCachedGitTypes | 'branch' | 'branches' | 'config' | 'contributors' | 'gitignore' | 'gkConfig' | 'lastFetched' | 'providers' | 'remotes' | 'stashes' | 'status' | 'tags' | 'tracking' | 'worktrees';
 export type ConflictDetectionCacheKey = `apply:${string}:${string}:${string}` | `merge:${string}:${string}`;
+/**
+ * Downstream caches that `deleteGkConfig` may invalidate when a `branch.<ref>.gk-...` key changes.
+ * Callers performing a "self-write" (where the value being written matches what they just resolved,
+ * so the about-to-be-evicted entry is exactly the entry they want to preserve) can opt out by
+ * naming the targets to skip via `skipInvalidation`.
+ */
+export type GkConfigInvalidationTarget = 'branchOverviews' | 'baseBranchName';
 export declare class Cache implements Disposable {
     private _caches;
     private _commonPathRegistry;
@@ -54,8 +62,7 @@ export declare class Cache implements Disposable {
     private get sharedBranches();
     private get configKeys();
     private get configPatterns();
-    private get gkConfigKeys();
-    private get gkConfigPatterns();
+    private get gkConfigMap();
     get currentBranchReference(): PromiseCache<RepoPath, GitBranchReference | undefined>;
     setCurrentBranchReferenceIfAbsent(worktreePath: string, reference: GitBranchReference | undefined): void;
     get conflictDetection(): RepoPromiseCacheMap<ConflictDetectionCacheKey, ConflictDetectionResult>;
@@ -70,10 +77,14 @@ export declare class Cache implements Disposable {
     get initialCommitSha(): PromiseMap<RepoPath, string | undefined>;
     get lastFetched(): PromiseCache<RepoPath, number | undefined>;
     get leftRightCommitCount(): RepoPromiseCacheMap<string, LeftRightCommitCountResult | undefined>;
-    getLeftRightCommitCount(repoPath: string, key: string, factory: () => PromiseOrValue<LeftRightCommitCountResult | undefined>): Promise<LeftRightCommitCountResult | undefined>;
+    get commit(): RepoPromiseCacheMap<string, GitCommit | undefined>;
+    get commitCount(): RepoPromiseCacheMap<string, number | undefined>;
+    get mergeBase(): RepoPromiseCacheMap<string, string | undefined>;
     get logShas(): RepoPromiseCacheMap<string, string[]>;
     get pausedOperationStatus(): PromiseMap<RepoPath, GitPausedOperationStatus | undefined>;
     get resolvedRevisions(): RepoPromiseCacheMap<string, ResolvedRevision>;
+    get refs(): PromiseMap<RepoPath, RefRecord[]>;
+    get refTips(): PromiseMap<RepoPath, GitRefTip[]>;
     get reachability(): RepoPromiseCacheMap<string, GitCommitReachability | undefined>;
     get remotes(): PromiseMap<RepoPath, GitRemote[]>;
     get stashes(): RepoPromiseCacheMap<string, GitStash>;
@@ -115,9 +126,26 @@ export declare class Cache implements Disposable {
     getConfig(repoPath: string | undefined, key: string, factory: () => PromiseOrValue<string | undefined>): Promise<string | undefined>;
     getConfigRegex(repoPath: string | undefined, pattern: string, factory: () => PromiseOrValue<Map<string, string>>): Promise<Map<string, string>>;
     deleteConfig(repoPath: string | undefined, key: string): void;
-    getGkConfig(repoPath: string, key: string, factory: () => PromiseOrValue<string | undefined>): Promise<string | undefined>;
-    getGkConfigRegex(repoPath: string, pattern: string, factory: () => PromiseOrValue<Map<string, string>>): Promise<Map<string, string>>;
-    deleteGkConfig(repoPath: string, key: string): void;
+    /**
+     * The whole `.git/gk/config` is read once and cached as a single map per commonPath; per-key and
+     * per-namespace gk lookups are served from it in-memory (see `getGkConfigMap` in the CLI config
+     * sub-provider). Invalidated by `deleteGkConfig` (write) and the coarse `'gkConfig'` clear (watcher).
+     */
+    getGkConfigMap(repoPath: string, factory: () => PromiseOrValue<Map<string, string>>): Promise<Map<string, string>>;
+    /**
+     * Clears the cached `.git/gk/config` map and invalidates the derived caches
+     * (`baseBranchName`/`branchOverviews`) for the written key's ref.
+     *
+     * @param options.skipInvalidation Downstream caches the caller wants preserved despite this
+     * write. Use when the value being written is exactly what was just resolved — e.g. the Tier 2
+     * `storeMergeTargetBranchName` self-write inside `getBranchContributionsOverview` (skip
+     * `'branchOverviews'`) or the Tier 3 `storeBaseBranchName` self-write inside `getBaseBranchName`
+     * (skip both `'baseBranchName'` and `'branchOverviews'`). The bulk `gkConfigMap` map always
+     * invalidates so subsequent reads see the new value.
+     */
+    deleteGkConfig(repoPath: string, key: string, options?: {
+        skipInvalidation?: readonly GkConfigInvalidationTarget[];
+    }): void;
     getBranchOverview(repoPath: string, cacheKey: string, factory: (commonPath: string, cacheable: CacheController, cancellation?: AbortSignal) => PromiseOrValue<BranchContributionsOverview | undefined>, options?: {
         accessTTL?: number;
         cancellation?: AbortSignal;
@@ -140,6 +168,8 @@ export declare class Cache implements Disposable {
     getDefaultBranchName(repoPath: string, remote: string, factory: (commonPath: string) => PromiseOrValue<string | undefined>): Promise<string | undefined>;
     getInitialCommitSha(repoPath: string, factory: (commonPath: string) => PromiseOrValue<string | undefined>): Promise<string | undefined>;
     getLastFetchedTimestamp(repoPath: string, factory: (commonPath: string) => PromiseOrValue<number | undefined>): Promise<number | undefined>;
+    getRefs(repoPath: string, factory: (commonPath: string, cacheable: CacheController, cancellation?: AbortSignal) => PromiseOrValue<RefRecord[]>, cancellation?: AbortSignal): Promise<RefRecord[]>;
+    getRefTips(repoPath: string, factory: (commonPath: string, cacheable: CacheController, cancellation?: AbortSignal) => PromiseOrValue<GitRefTip[]>, cancellation?: AbortSignal): Promise<GitRefTip[]>;
     getRemotes(repoPath: string, factory: (commonPath: string, cacheable: CacheController, cancellation?: AbortSignal) => PromiseOrValue<GitRemote[]>, cancellation?: AbortSignal): Promise<GitRemote[]>;
     getStash(repoPath: string, cacheKey: string, factory: (commonPath: string, cacheable: CacheController, cancellation?: AbortSignal) => PromiseOrValue<GitStash>, options?: {
         accessTTL?: number;

package/dist/git/cache.d.ts.map

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

package/dist/git/cache.js

@@ -21,7 +21,7 @@ export function areUriScopedCachedGitTypes(types) {
  * gkConfig keys that participate in the `branchOverviews` cache's mergeTarget/mergeBase lineage.
  * Capture group 1 is the ref name (which may itself contain `.`/`/`).
  */
-const branchOverviewGkConfigKeyPattern = /^branch\.(.+)\.(?:gk-merge-(?:base|target(?:-user)?)|gk-target-base)$/;
+const branchOverviewGkConfigKeysRegex = /^branch\.(.+)\.(?:gk-merge-(?:base|target(?:-user)?)|gk-target-base)$/;
 /** Compile-time enforced: adding a key to SharedCaches without listing it here is a type error */
 const sharedCacheKeys = new Set(exhaustiveArray()([
     'baseBranchName',
@@ -36,10 +36,12 @@ const sharedCacheKeys = new Set(exhaustiveArray()([
     'contributorsStats',
     'defaultBranchName',
     'gitResults',
-    'gkConfigKeys',
-    'gkConfigPatterns',
+    'gkConfigMap',
     'initialCommitSha',
+    'lastFetched',
     'logShas',
+    'refs',
+    'refTips',
     'remotes',
     'sharedBranches',
     'stashes',
@@ -56,9 +58,12 @@ function createEmptyCaches() {
         branchMetadataMap: undefined,
         branchOverviews: undefined,
         branches: undefined,
+        commit: undefined,
+        commitCount: undefined,
         fileExistence: undefined,
         ignoreRevsFile: undefined,
         leftRightCommitCount: undefined,
+        mergeBase: undefined,
         configKeys: undefined,
         configPatterns: undefined,
         conflictDetection: undefined,
@@ -73,14 +78,15 @@ function createEmptyCaches() {
         gitDir: undefined,
         gitIgnore: undefined,
         gitResults: undefined,
-        gkConfigKeys: undefined,
-        gkConfigPatterns: undefined,
+        gkConfigMap: undefined,
         initialCommitSha: undefined,
         lastFetched: undefined,
         logShas: undefined,
         pausedOperationStatus: undefined,
         resolvedRevisions: undefined,
         reachability: undefined,
+        refs: undefined,
+        refTips: undefined,
         remotes: undefined,
         sharedBranches: undefined,
         stashes: undefined,
@@ -158,11 +164,8 @@ export class Cache {
             createTTL: 1000 * 30, // 30 seconds - ensures global config changes are picked up
         }));
     }
-    get gkConfigKeys() {
-        return (this._caches.gkConfigKeys ??= new RepoPromiseCacheMap());
-    }
-    get gkConfigPatterns() {
-        return (this._caches.gkConfigPatterns ??= new RepoPromiseCacheMap());
+    get gkConfigMap() {
+        return (this._caches.gkConfigMap ??= new PromiseMap());
     }
     get currentBranchReference() {
         return (this._caches.currentBranchReference ??= new PromiseCache());
@@ -221,13 +224,23 @@ export class Cache {
             capacity: 50, // Limit to 50 ref-pairs per repo
         }));
     }
-    getLeftRightCommitCount(repoPath, key, factory) {
-        const cached = this.leftRightCommitCount.get(repoPath, key);
-        if (cached != null)
-            return cached;
-        const factoryPromise = Promise.resolve(factory());
-        this.leftRightCommitCount.set(repoPath, key, factoryPromise);
-        return factoryPromise;
+    get commit() {
+        return (this._caches.commit ??= new RepoPromiseCacheMap({
+            accessTTL: 1000 * 60 * 60, // 60 minutes
+            capacity: 100, // Limit to 100 commits per repo
+        }));
+    }
+    get commitCount() {
+        return (this._caches.commitCount ??= new RepoPromiseCacheMap({
+            accessTTL: 1000 * 60 * 60, // 60 minutes
+            capacity: 50,
+        }));
+    }
+    get mergeBase() {
+        return (this._caches.mergeBase ??= new RepoPromiseCacheMap({
+            accessTTL: 1000 * 60 * 60, // 60 minutes
+            capacity: 50,
+        }));
     }
     get logShas() {
         return (this._caches.logShas ??= new RepoPromiseCacheMap({
@@ -244,6 +257,12 @@ export class Cache {
             capacity: 100,
         }));
     }
+    get refs() {
+        return (this._caches.refs ??= new PromiseMap());
+    }
+    get refTips() {
+        return (this._caches.refTips ??= new PromiseMap());
+    }
     get reachability() {
         return (this._caches.reachability ??= new RepoPromiseCacheMap({
             accessTTL: 1000 * 60 * 60, // 60 minutes
@@ -314,9 +333,15 @@ export class Cache {
                 keysToClear.add('branch');
                 keysToClear.add('branchMergedStatus');
                 keysToClear.add('branchOverviews');
+                // `commit`/`commitCount` are keyed by symbolic ref or SHA — symbolic-ref entries
+                // can drift when branches move; cascade-clear conservatively.
+                keysToClear.add('commit');
+                keysToClear.add('commitCount');
                 keysToClear.add('conflictDetection');
                 keysToClear.add('currentBranchReference');
                 keysToClear.add('leftRightCommitCount');
+                // `mergeBase` keyed by ref-pairs — symbolic refs can move; cascade-clear.
+                keysToClear.add('mergeBase');
                 keysToClear.add('reachability');
                 keysToClear.add('resolvedRevisions');
             }
@@ -329,13 +354,18 @@ export class Cache {
                 keysToClear.add('defaultBranchName');
                 keysToClear.add('initialCommitSha');
                 keysToClear.add('logShas');
+                keysToClear.add('refs');
+                keysToClear.add('refTips');
             }
             if (types.includes('config')) {
                 keysToClear.add('configKeys');
                 keysToClear.add('configPatterns');
                 keysToClear.add('currentBranchReference');
                 keysToClear.add('currentUser');
-                keysToClear.add('gitDir');
+                // `gitDir` is immutable repo topology (toplevel/git-dir/common-dir/superproject) — a
+                // `.git/config` content change never relocates it, and it's owned by the repo lifecycle
+                // (registerRepoPath/unregisterRepoPath). Clearing it here forced a redundant `git rev-parse`
+                // re-spawn (gitDir is read by getGkConfigPath→getGitDir on every gk op), so leave it warm.
             }
             if (types.includes('contributors')) {
                 keysToClear.add('branchOverviews');
@@ -347,13 +377,12 @@ export class Cache {
                 keysToClear.add('gitIgnore');
             }
             if (types.includes('gkConfig')) {
-                keysToClear.add('gkConfigKeys');
-                keysToClear.add('gkConfigPatterns');
+                keysToClear.add('gkConfigMap');
                 // Derived from `branch.<ref>.gk-merge-base`/`vscode-merge-base`; clear so external
                 // gkConfig mutations don't leave stale base-branch resolutions cached.
                 keysToClear.add('baseBranchName');
-                // Cached overviews use Tier 1's stored merge target as their key-stability anchor;
-                // stored-target changes must invalidate or readers see stale `mergeTarget`/stats.
+                // Cached overviews are keyed by `${ref}|${mergeTarget}`; bulk gkConfig changes can
+                // affect any of the merge-target sources (stored, base, default), so clear all.
                 keysToClear.add('branchOverviews');
             }
             if (types.includes('lastFetched')) {
@@ -377,6 +406,8 @@ export class Cache {
             }
             if (types.includes('tags')) {
                 keysToClear.add('tags');
+                keysToClear.add('refs');
+                keysToClear.add('refTips');
             }
             if (types.includes('tracking')) {
                 keysToClear.add('fileExistence');
@@ -600,14 +631,18 @@ export class Cache {
             // On factory invalidation, propagate to the derived per-worktree mapper entries
             // via soft-invalidate — existing waiters on the mapper complete, and the entry
             // self-evicts on mapper settle so the next callers build fresh derived entries.
-            void p.finally(() => {
+            void p
+                .finally(() => {
                 if (cacheable.invalidated) {
                     this.branches.invalidate(commonPath);
                     for (const worktreePath of this.getWorktreePaths(commonPath)) {
                         this.branches.invalidate(worktreePath);
                     }
                 }
-            });
+            })
+                // Swallow the cleanup chain's rejection so a rejected factory (e.g. cancellation)
+                // doesn't surface as an unhandled rejection; the caller-facing promise handles it.
+                .catch(() => { });
             return p;
         }, cancellation);
         void registration.catch(() => { });
@@ -647,36 +682,48 @@ export class Cache {
         this._caches.configKeys?.delete(cacheKey, key);
         this._caches.configPatterns?.delete(cacheKey);
     }
-    getGkConfig(repoPath, key, factory) {
-        const cacheKey = this.getCommonPath(repoPath);
-        const result = this.gkConfigKeys.get(cacheKey, key);
-        if (result != null)
-            return result;
-        const factoryPromise = Promise.resolve(factory());
-        this.gkConfigKeys.set(cacheKey, key, factoryPromise);
-        return factoryPromise;
-    }
-    getGkConfigRegex(repoPath, pattern, factory) {
-        const cacheKey = this.getCommonPath(repoPath);
-        const result = this.gkConfigPatterns.get(cacheKey, pattern);
-        if (result != null)
-            return result;
-        const factoryPromise = Promise.resolve(factory());
-        this.gkConfigPatterns.set(cacheKey, pattern, factoryPromise);
-        return factoryPromise;
+    /**
+     * The whole `.git/gk/config` is read once and cached as a single map per commonPath; per-key and
+     * per-namespace gk lookups are served from it in-memory (see `getGkConfigMap` in the CLI config
+     * sub-provider). Invalidated by `deleteGkConfig` (write) and the coarse `'gkConfig'` clear (watcher).
+     */
+    getGkConfigMap(repoPath, factory) {
+        return this.getSharedSimple(this.gkConfigMap, repoPath, factory);
     }
-    deleteGkConfig(repoPath, key) {
+    /**
+     * Clears the cached `.git/gk/config` map and invalidates the derived caches
+     * (`baseBranchName`/`branchOverviews`) for the written key's ref.
+     *
+     * @param options.skipInvalidation Downstream caches the caller wants preserved despite this
+     * write. Use when the value being written is exactly what was just resolved — e.g. the Tier 2
+     * `storeMergeTargetBranchName` self-write inside `getBranchContributionsOverview` (skip
+     * `'branchOverviews'`) or the Tier 3 `storeBaseBranchName` self-write inside `getBaseBranchName`
+     * (skip both `'baseBranchName'` and `'branchOverviews'`). The bulk `gkConfigMap` map always
+     * invalidates so subsequent reads see the new value.
+     */
+    deleteGkConfig(repoPath, key, options) {
         const cacheKey = this.getCommonPath(repoPath);
-        this._caches.gkConfigKeys?.delete(cacheKey, key);
-        this._caches.gkConfigPatterns?.delete(cacheKey);
-        // When the change affects a branch's merge-target/base lineage, invalidate that branch's
-        // cached overview so subsequent reads pick up the new stored value rather than stale data.
-        // `getBranchContributionsOverview` keys `branchOverviews` by ref, with Tier 1's stored
-        // target as the key-stability anchor — so any write to those keys must invalidate.
-        const refMatch = key.match(branchOverviewGkConfigKeyPattern);
-        if (refMatch != null) {
-            this._caches.branchOverviews?.delete(cacheKey, refMatch[1]);
+        this._caches.gkConfigMap?.delete(cacheKey);
+        const refMatch = key.match(branchOverviewGkConfigKeysRegex);
+        if (refMatch == null)
+            return;
+        const ref = refMatch[1];
+        const skip = options?.skipInvalidation;
+        // `getBaseBranchName` reads `branch.<ref>.gk-merge-base` and caches the resolved value
+        // per-ref. A write to that key must invalidate the cached base or Tier 3 of
+        // `getBranchContributionsOverview` will resolve `mergeTarget` against the pre-write value.
+        if (key.endsWith('.gk-merge-base') && !skip?.includes('baseBranchName')) {
+            this._caches.baseBranchName?.delete(cacheKey, ref);
         }
+        if (skip?.includes('branchOverviews'))
+            return;
+        // When the change affects a branch's merge-target/base lineage, invalidate that branch's
+        // cached overviews so subsequent reads pick up the new stored value rather than stale data.
+        // `getBranchContributionsOverview` keys `branchOverviews` by `${ref}|${mergeTarget}`, so
+        // invalidate every entry for the affected ref regardless of which target it resolved to.
+        // Uses `invalidateByKeyPrefix` (not `deleteByKeyPrefix`) so an in-flight factory is still
+        // shared with new callers instead of triggering a duplicate fetch.
+        this._caches.branchOverviews?.invalidateByKeyPrefix(cacheKey, `${ref}|`);
     }
     async getBranchOverview(repoPath, cacheKey, factory, options) {
         return this.getSharedOrCreateWithKey(this.branchOverviews, repoPath, cacheKey, factory, (data, newRepoPath) => data == null
@@ -736,6 +783,16 @@ export class Cache {
     getLastFetchedTimestamp(repoPath, factory) {
         return this.getSharedSimple(this.lastFetched, repoPath, factory);
     }
+    getRefs(repoPath, factory, cancellation) {
+        // Raw ref records are repoPath-agnostic (no per-worktree binding to remap), so we key only
+        // by commonPath and skip the per-worktree mapper that `getBranches`/`getTags` need.
+        const commonPath = this.getCommonPath(repoPath);
+        return this.refs.getOrCreate(commonPath, (cacheable, signal) => Promise.resolve(factory(commonPath, cacheable, signal)), cancellation);
+    }
+    getRefTips(repoPath, factory, cancellation) {
+        const commonPath = this.getCommonPath(repoPath);
+        return this.refTips.getOrCreate(commonPath, (cacheable, signal) => Promise.resolve(factory(commonPath, cacheable, signal)), cancellation);
+    }
     async getRemotes(repoPath, factory, cancellation) {
         return this.getSharedOrCreate(this.remotes, repoPath, factory, (data, newRepoPath) => data.map(r => r.withRepoPath(newRepoPath)), cancellation);
     }
@@ -765,7 +822,8 @@ export class Cache {
             // On factory invalidation (without rejection), propagate to the derived per-worktree
             // mapper entries so they don't persist past the shared factory's settle. Mapper
             // entries cached via `cache.set()` have no controller, so `invalidate` hard-deletes.
-            void p.finally(() => {
+            void p
+                .finally(() => {
                 if (cacheable.invalidated) {
                     for (const worktreePath of this.getWorktreePaths(commonPath)) {
                         if (worktreePath === commonPath)
@@ -773,7 +831,10 @@ export class Cache {
                         cache.invalidate(worktreePath);
                     }
                 }
-            });
+            })
+                // Swallow the cleanup chain's rejection so a rejected factory (e.g. cancellation)
+                // doesn't surface as an unhandled rejection; the caller-facing promise handles it.
+                .catch(() => { });
             return p;
         }, cancellation);
         // Swallow any rejection on the registration wrapper so it isn't surfaced as an unhandled
@@ -805,7 +866,8 @@ export class Cache {
             // mapper entries for this `cacheKey` so they don't persist past the shared factory's
             // settle. Mapper entries cached via `cache.set()` have no controller, so `invalidate`
             // hard-deletes.
-            void p.finally(() => {
+            void p
+                .finally(() => {
                 if (cacheable.invalidated) {
                     for (const worktreePath of this.getWorktreePaths(commonPath)) {
                         if (worktreePath === commonPath)
@@ -813,7 +875,10 @@ export class Cache {
                         cache.invalidate(worktreePath, cacheKey);
                     }
                 }
-            });
+            })
+                // Swallow the cleanup chain's rejection so a rejected factory (e.g. cancellation)
+                // doesn't surface as an unhandled rejection; the caller-facing promise handles it.
+                .catch(() => { });
             return p;
         }, options);
         // Swallow any rejection on the registration wrapper so it isn't surfaced as an unhandled