@gitkraken/core-gitlens 0.10.5 → 0.10.6

package/CHANGELOG.md

@@ -6,6 +6,20 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+## [0.10.6] - 2026-10-13
+
+### Added
+
+- Adds optional `getSymbolicReferenceNameOrMissing` to the refs sub-provider: `getSymbolicReferenceName`'s answer plus `missing`, which is true only when git confirmed the ref doesn't exist (`rev-parse --verify` exit 1), never for a read that didn't complete (git, git-cli)
+
+### Changed
+
+- Changes `getStoredMergeTargetBranchName` to skip a stored merge target whose branch git confirms is gone: it checks the user's pick, then the detected target, returns the first that exists (resolved to its symbolic name), and keeps one it couldn't check. It takes optional `options` (`detectedOnly`, `priority`) and `cancellation`. `getStoredUserMergeTargetBranchName` and `getStoredDetectedMergeTargetBranchName` still return the raw stored values (git, git-cli)
+
+### Fixed
+
+- Fixes `getBranchContributionsOverview` measuring against a merge target whose branch no longer exists: a confirmed-gone stored target or pull request base now falls through to the base and default branch, and a gone base is never stored. `storeMergeTargetBranchName` also no longer rewrites an unchanged value (git-cli)
+
 ## [0.10.5] - 2026-10-08
 
 ### Added
@@ -593,7 +607,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.10.5...HEAD
+[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/releases/core/v0.10.6...HEAD
+[0.10.6]: https://github.com/gitkraken/vscode-gitlens/compare/releases/core/v0.10.5...gitkraken:releases/core/v0.10.6
 [0.10.5]: https://github.com/gitkraken/vscode-gitlens/compare/releases/core/v0.10.4...gitkraken:releases/core/v0.10.5
 [0.10.4]: https://github.com/gitkraken/vscode-gitlens/compare/releases/core/v0.10.3...gitkraken:releases/core/v0.10.4
 [0.10.3]: https://github.com/gitkraken/vscode-gitlens/compare/releases/core/v0.10.2...gitkraken:releases/core/v0.10.3

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

@@ -88,7 +88,10 @@ export interface GitBranchesSubProvider {
   getBaseBranchName?(repoPath: string, ref: string, options?: {
     priority?: GitCommandPriority;
   }, cancellation?: AbortSignal): Promise<string | undefined>;
-  getStoredMergeTargetBranchName?(repoPath: string, ref: string): Promise<string | undefined>;
+  getStoredMergeTargetBranchName?(repoPath: string, ref: string, options?: {
+    detectedOnly?: boolean;
+    priority?: GitCommandPriority;
+  }, cancellation?: AbortSignal): Promise<string | undefined>;
   getStoredDetectedMergeTargetBranchName?(repoPath: string, ref: string): Promise<string | undefined>;
   getStoredUserMergeTargetBranchName?(repoPath: string, ref: string): Promise<string | undefined>;
   onCurrentBranchAccessed?(repoPath: string): Promise<void>;

package/dist/git/providers/refs.d.ts

@@ -45,6 +45,13 @@ export interface GitRefsSubProvider {
   getSymbolicReferenceName?(repoPath: string, ref: string, options?: {
     priority?: GitCommandPriority;
   }, cancellation?: AbortSignal): Promise<string | undefined>;
+  /** Like `getSymbolicReferenceName`, but `missing` is true only when git confirmed the ref doesn't exist; a read that didn't complete never reports missing. */
+  getSymbolicReferenceNameOrMissing?(repoPath: string, ref: string, options?: {
+    priority?: GitCommandPriority;
+  }, cancellation?: AbortSignal): Promise<{
+    name: string | undefined;
+    missing: boolean;
+  }>;
   hasBranchOrTag(repoPath: string | undefined, options?: {
     filter?: {
       branches?: ((b: GitBranch) => boolean) | undefined;

package/dist/git-cli/exec/git.js

@@ -13,8 +13,8 @@ import { getChangesForCommand, leadingCommand } from "./commandClassifier.js";
 import { EventLoopMonitor } from "./eventLoopMonitor.js";
 import { GitQueue, getPrimaryGitCommand, inferGitCommandPriority } from "./gitQueue.js";
 import { resolve } from "path";
-import { spawn } from "child_process";
 import * as process from "process";
+import { spawn } from "child_process";
 //#region ../git-cli/src/exec/git.ts
 const slowCallWarningThreshold = 2e3;
 /** Below this, a queue-wait annotation isn't worth adding to the log line. */

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

@@ -99,7 +99,16 @@ export declare class BranchesGitSubProvider implements GitBranchesSubProvider {
    * caches the former forever and must not cache the latter.
    */
   private getBaseBranchFromReflog;
-  getStoredMergeTargetBranchName(repoPath: string, ref: string): Promise<string | undefined>;
+  /**
+   * The stored merge target — the user's pick, else the one detected from its PR — skipping any whose branch git
+   * confirms is gone so resolution falls through to the next source. A target that couldn't be checked is kept.
+   * The stored keys are never rewritten here: the user pick is the user's, and Kepler shares the file.
+   */
+  getStoredMergeTargetBranchName(repoPath: string, ref: string, options?: {
+    detectedOnly?: boolean;
+    priority?: GitCommandPriority;
+  }, cancellation?: AbortSignal): Promise<string | undefined>;
+  private resolveStoredMergeTarget;
   getStoredDetectedMergeTargetBranchName(repoPath: string, ref: string): Promise<string | undefined>;
   getStoredUserMergeTargetBranchName(repoPath: string, ref: string): Promise<string | undefined>;
   /** Updates the last accessed timestamp for the current branch */

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

@@ -240,15 +240,18 @@ var BranchesGitSubProvider = class {
 		};
 		try {
 			let mergeTarget;
-			const storedTarget = await this.getStoredMergeTargetBranchName(repoPath, ref);
-			if (storedTarget) mergeTarget = await this.provider.refs.getSymbolicReferenceName(repoPath, storedTarget, priorityOpts, cancellation) || storedTarget;
+			mergeTarget = await this.getStoredMergeTargetBranchName(repoPath, ref, priorityOpts, cancellation);
 			if (mergeTarget == null && options?.associatedPullRequest != null) {
 				const pr = await options.associatedPullRequest;
 				if (pr?.refs?.base != null) {
 					const branch = await this.getBranch(repoPath, ref, void 0, cancellation);
 					if (branch == null) return void 0;
-					mergeTarget = `${branch.remoteName}/${pr.refs.base.branch}`;
-					if (pr.stack == null) this.storeMergeTargetBranchName(repoPath, ref, mergeTarget, { skipInvalidation: ["branchOverviews"] });
+					const prTarget = `${branch.remoteName}/${pr.refs.base.branch}`;
+					const { missing } = await this.provider.refs.getSymbolicReferenceNameOrMissing(repoPath, prTarget, priorityOpts, cancellation);
+					if (!missing) {
+						mergeTarget = prTarget;
+						if (pr.stack == null) this.storeMergeTargetBranchName(repoPath, ref, prTarget, { skipInvalidation: ["branchOverviews"] });
+					}
 				}
 			}
 			mergeTarget ??= await this.getBaseBranchName(repoPath, ref, priorityOpts, cancellation);
@@ -973,8 +976,29 @@ var BranchesGitSubProvider = class {
 			failed: false
 		};
 	}
-	async getStoredMergeTargetBranchName(repoPath, ref) {
-		return (await this.getStoredUserMergeTargetBranchName?.(repoPath, ref) ?? await this.getStoredDetectedMergeTargetBranchName?.(repoPath, ref))?.trim() || void 0;
+	/**
+	* The stored merge target — the user's pick, else the one detected from its PR — skipping any whose branch git
+	* confirms is gone so resolution falls through to the next source. A target that couldn't be checked is kept.
+	* The stored keys are never rewritten here: the user pick is the user's, and Kepler shares the file.
+	*/
+	async getStoredMergeTargetBranchName(repoPath, ref, options, cancellation) {
+		const priority = options?.priority;
+		let goneUserTarget;
+		if (!options?.detectedOnly) {
+			const userTarget = await this.getStoredUserMergeTargetBranchName(repoPath, ref);
+			if (userTarget) {
+				const resolved = await this.resolveStoredMergeTarget(repoPath, userTarget, priority, cancellation);
+				if (resolved) return resolved;
+				goneUserTarget = userTarget;
+			}
+		}
+		const detectedTarget = await this.getStoredDetectedMergeTargetBranchName(repoPath, ref);
+		if (!detectedTarget || detectedTarget === goneUserTarget) return void 0;
+		return this.resolveStoredMergeTarget(repoPath, detectedTarget, priority, cancellation);
+	}
+	async resolveStoredMergeTarget(repoPath, target, priority, cancellation) {
+		const { name, missing } = await this.provider.refs.getSymbolicReferenceNameOrMissing(repoPath, target, priority != null ? { priority } : void 0, cancellation);
+		return missing ? void 0 : name || target;
 	}
 	async getStoredDetectedMergeTargetBranchName(repoPath, ref) {
 		return (await this.provider.config.getGkConfig(repoPath, `branch.${ref}.gk-merge-target`) ?? await this.provider.config.getGkConfig(repoPath, `branch.${ref}.gk-target-base`))?.trim() || void 0;
@@ -1059,6 +1083,7 @@ var BranchesGitSubProvider = class {
 		await this.provider.config.setGkConfig(repoPath, `branch.${ref}.gk-merge-base`, base, options);
 	}
 	async storeMergeTargetBranchName(repoPath, ref, target, options) {
+		if (await this.provider.config.getGkConfig(repoPath, `branch.${ref}.gk-merge-target`) === target) return;
 		await this.provider.config.setGkConfig(repoPath, `branch.${ref}.gk-merge-target`, target, options);
 	}
 	async storeUserMergeTargetBranchName(repoPath, ref, target) {