@gitkraken/core-gitlens 0.5.113 → 0.5.114

package/src/git/gitHealth.ts

@@ -0,0 +1,522 @@
+import type {
+	GitHealthSnapshot,
+	GitMaintenanceTask,
+	GitOptimizationCapability,
+	GitOptimizationId,
+} from './providers/maintenance.js';
+
+/**
+ * Pure recommendation engine for the Git Health feature — no vscode imports, trivially unit-testable.
+ * Thresholds are initial, tunable, telemetry-informed values (see `.work/dev/git-health/spec.md`).
+ */
+
+/** Working-tree size (via the index-bytes proxy) at/above which untracked-cache/fsmonitor/manyFiles help. */
+export const trackedFilesThreshold = 10_000;
+/** Loose-object estimate at/above which the `loose-objects` maintenance task is worth running. */
+export const looseObjectsThreshold = 5_000;
+/** Git's default uncovered-pack threshold for the `incremental-repack` auto condition. */
+export const packsOutsideMultiPackIndexThreshold = 10;
+/** Loose refs at/above which packing the files ref backend avoids repeated filesystem traversal. */
+export const looseRefsThreshold = 256;
+/** Total pack bytes at/above which a repo counts as "clearly large" for the banner gate (~1 GiB). */
+export const largePackBytesThreshold = 1024 ** 3;
+/** Rough bytes-per-entry of a git v2 index — turns `.git/index` size into a tracked-file-count proxy. */
+export const approxBytesPerIndexEntry = 80;
+/** Duration (ms) above which a git command is "slow" — mirrors the exec-layer slow-call threshold. */
+export const slowCommandThresholdMs = 2000;
+
+/** Git operation families whose runtime maps to a distinct repository optimization surface. */
+export type GitHealthSlownessCategory = 'worktree' | 'history' | 'refs' | 'objects';
+
+/** Persisted passive-slowness sample for one operation family. */
+export interface GitHealthSlownessSample {
+	/** Number of slow git commands observed for this repo. */
+	readonly count: number;
+	/** Epoch ms of the most recent slow command. */
+	readonly lastAt: number;
+	/** Longest single slow-command duration observed (ms). */
+	readonly maxDurationMs: number;
+}
+
+/** Per-repo passive-slowness summary, split so recommendations only target the affected operation family. */
+export type GitHealthSlowness = Partial<Record<GitHealthSlownessCategory, GitHealthSlownessSample>>;
+
+export type GitOptimizationTier = 'auto' | 'ask';
+
+/** Coarse duration buckets for maintenance telemetry. */
+export type GitHealthDurationBucket = '<1s' | '1-5s' | '5-15s' | '15-60s' | '>60s';
+
+/** Which measured signal tripped a finding (drives view copy + telemetry buckets). */
+export type GitHealthFindingReason =
+	| 'looseObjects'
+	| 'looseRefs'
+	| 'packsOutsideMultiPackIndex'
+	| 'trackedFiles'
+	| 'largePacks'
+	| 'worktreeSlowness';
+
+/** A single recommendation: a lever to apply, its tier, and the evidence that triggered it. */
+export interface GitHealthFinding {
+	readonly tier: GitOptimizationTier;
+	readonly reason: GitHealthFindingReason;
+	/** The measured value that crossed the threshold. */
+	readonly value: number;
+	/** The threshold it crossed. */
+	readonly threshold: number;
+	/** The concrete action this finding recommends. */
+	readonly action:
+		| { readonly kind: 'maintenance'; readonly task: GitMaintenanceTask }
+		| { readonly kind: 'optimization'; readonly id: GitOptimizationId };
+}
+
+export interface GitHealthReport {
+	readonly findings: readonly GitHealthFinding[];
+	/** Repository shape that scopes local history, object, and working-tree measurements. */
+	readonly repository: GitHealthSnapshot['repository'];
+	/** Whether the repo is "clearly large" (any working-tree threshold met, or pack bytes ≥ ~1 GiB). */
+	readonly clearlyLarge: boolean;
+	/** Extrapolated loose-object count (from the probe sample). */
+	readonly estimatedLooseObjects: number;
+	/** Loose refs found by the bounded files-backend probe. */
+	readonly looseRefs: { readonly count: number; readonly exact: boolean };
+	/** Repository-size signal from the index; see {@link trackedFilesScope} for how to interpret it. */
+	readonly estimatedTrackedFiles: number;
+	/** `true` when {@link estimatedTrackedFiles} is the exact repository-wide count from a normal index. */
+	readonly trackedFilesExact: boolean;
+	/** Whether the displayed count covers the repository, a sparse working set, or is only a byte-size estimate. */
+	readonly trackedFilesScope: 'repository' | 'sparseWorkingTree' | 'estimate';
+	readonly packCount: number;
+	readonly packsOutsideMultiPackIndex: number | undefined;
+	readonly packBytes: number;
+	readonly commitGraph: {
+		readonly present: boolean;
+		readonly mtime: number | undefined;
+		readonly changedPaths: boolean;
+		readonly changedPathsSupported: boolean;
+		readonly disabled: boolean;
+		/** `core.commitGraph` explicitly false in git config — git won't read the cache, GitLens won't write it. */
+		readonly readDisabled: boolean;
+	};
+}
+
+/**
+ * Extrapolates total loose-object count from a uniform sample of the 256 object fanout dirs. Loose
+ * objects distribute uniformly by sha prefix, so `(objectsInSampled / dirsSampled) * 256` is sound.
+ */
+export function estimateLooseObjects(objectsInSampled: number, dirsSampled: number): number {
+	if (dirsSampled <= 0) return 0;
+
+	return Math.round((objectsInSampled / dirsSampled) * 256);
+}
+
+/** Turns `.git/index` byte size into an approximate tracked-file count. */
+export function estimateTrackedFiles(indexBytes: number): number {
+	if (indexBytes <= 0) return 0;
+
+	return Math.round(indexBytes / approxBytesPerIndexEntry);
+}
+
+/**
+ * Computes the {@link GitHealthReport} from a cheap probe, passive slowness, and capabilities. Findings
+ * are only emitted for levers that are supported, not already applied, and past their threshold.
+ */
+export function computeHealthReport(
+	snapshot: GitHealthSnapshot,
+	slowness: GitHealthSlowness | undefined,
+	capabilities: readonly GitOptimizationCapability[],
+): GitHealthReport {
+	const estimatedLooseObjects = estimateLooseObjects(
+		snapshot.looseObjects.objectsInSampledDirs,
+		snapshot.looseObjects.dirsSampled,
+	);
+	// A normal index header is the exact tracked-file count. A sparse index header is still a useful exact
+	// count of its populated working set, but not of the whole repository. A split index header covers only
+	// the mutable layer and conflict stages duplicate paths, so neither raw count is used.
+	const useIndexEntryCount =
+		snapshot.indexEntryCount != null &&
+		(snapshot.indexEntryCountType === 'full' || snapshot.indexEntryCountType === 'sparse');
+	const estimatedTrackedFiles = useIndexEntryCount
+		? snapshot.indexEntryCount
+		: estimateTrackedFiles(snapshot.indexBytes);
+	const trackedFilesExact = useIndexEntryCount && snapshot.indexEntryCountType === 'full';
+	const trackedFilesScope = trackedFilesExact
+		? 'repository'
+		: useIndexEntryCount && snapshot.indexEntryCountType === 'sparse'
+			? 'sparseWorkingTree'
+			: 'estimate';
+	const largeWorkingTree = estimatedTrackedFiles >= trackedFilesThreshold;
+	const clearlyLarge = largeWorkingTree || snapshot.packBytes >= largePackBytesThreshold;
+
+	const supported = (id: GitOptimizationId): boolean => capabilities.find(c => c.id === id)?.supported === true;
+
+	const findings: GitHealthFinding[] = [];
+
+	// Auto tier — safe `git maintenance run` one-shots (gated on `git maintenance` support).
+	if (snapshot.supportsMaintenanceRun) {
+		if (estimatedLooseObjects >= looseObjectsThreshold) {
+			findings.push({
+				tier: 'auto',
+				reason: 'looseObjects',
+				value: estimatedLooseObjects,
+				threshold: looseObjectsThreshold,
+				action: { kind: 'maintenance', task: 'loose-objects' },
+			});
+		}
+		const incrementalRepackThreshold = snapshot.incrementalRepackAutoThreshold;
+		const incrementalRepackDue =
+			snapshot.multiPackIndexEnabled === true &&
+			snapshot.packsOutsideMultiPackIndex != null &&
+			incrementalRepackThreshold != null &&
+			incrementalRepackThreshold !== 0 &&
+			(incrementalRepackThreshold < 0
+				? snapshot.packCount > 0
+				: snapshot.packsOutsideMultiPackIndex >= incrementalRepackThreshold);
+		if (incrementalRepackDue) {
+			findings.push({
+				tier: 'auto',
+				reason: 'packsOutsideMultiPackIndex',
+				value: snapshot.packsOutsideMultiPackIndex,
+				threshold: incrementalRepackThreshold,
+				action: { kind: 'maintenance', task: 'incremental-repack' },
+			});
+		}
+	}
+	if (
+		snapshot.supportsPackRefsMaintenance &&
+		snapshot.repository.refFormat === 'files' &&
+		snapshot.looseRefs.count >= looseRefsThreshold
+	) {
+		findings.push({
+			tier: 'auto',
+			reason: 'looseRefs',
+			value: snapshot.looseRefs.count,
+			threshold: looseRefsThreshold,
+			action: { kind: 'maintenance', task: 'pack-refs' },
+		});
+	}
+
+	// Large-working-tree levers share the same evidence; they differ only in tier and eligibility.
+	const trackedFilesEvidence = {
+		reason: 'trackedFiles',
+		value: estimatedTrackedFiles,
+		threshold: trackedFilesThreshold,
+	} as const;
+	const workingTreeLevers: { id: GitOptimizationId; tier: GitOptimizationTier; eligible: boolean }[] = [
+		{
+			id: 'untrackedCache',
+			tier: 'ask',
+			// Skip if already on, if it previously failed git's filesystem probe for this repo, or if the
+			// user set the key themselves — an explicit `false`/`keep` is a decision (often made after bad
+			// `git status` results), and this lever respects it rather than overriding it.
+			eligible:
+				!snapshot.config.untrackedCache &&
+				!snapshot.config.untrackedCacheConfigured &&
+				!snapshot.untrackedCacheNotApplicable,
+		},
+		{
+			id: 'fsmonitor',
+			tier: 'ask',
+			// Skip if already on or it previously failed to start for this repo.
+			eligible: !snapshot.config.fsmonitor && !snapshot.fsmonitorNotApplicable,
+		},
+		{
+			id: 'manyFiles',
+			tier: 'ask',
+			// `manyFiles` defaults the untracked cache on, so a repo whose filesystem already failed that
+			// probe must not be offered it either — unless the user's own explicit `core.untrackedCache`
+			// setting overrides the default, in which case the probe result is moot.
+			eligible:
+				!snapshot.config.manyFiles &&
+				!(snapshot.untrackedCacheNotApplicable && !snapshot.config.untrackedCacheConfigured),
+		},
+		{
+			id: 'sparseIndex',
+			tier: 'ask',
+			// Sparse-directory entries are safe only in cone mode. Require a normal full index so this
+			// recommendation is based on the repository-wide path count, not a split/conflicted approximation.
+			eligible:
+				snapshot.repository.sparseCheckout === true &&
+				snapshot.repository.sparseCheckoutCone === true &&
+				snapshot.repository.sparseIndex === false &&
+				snapshot.repository.splitIndex === false &&
+				snapshot.indexEntryCountType === 'full',
+		},
+	];
+	const worktreeSlowness = slowness?.worktree;
+	const worktreeSlownessObserved = (worktreeSlowness?.count ?? 0) > 0;
+	if (largeWorkingTree || worktreeSlownessObserved) {
+		const evidence: Pick<GitHealthFinding, 'reason' | 'value' | 'threshold'> = largeWorkingTree
+			? trackedFilesEvidence
+			: {
+					reason: 'worktreeSlowness',
+					value: worktreeSlowness?.maxDurationMs ?? 0,
+					threshold: slowCommandThresholdMs,
+				};
+		for (const lever of workingTreeLevers) {
+			if (!lever.eligible || !supported(lever.id)) continue;
+
+			findings.push({
+				tier: lever.tier,
+				...evidence,
+				action: { kind: 'optimization', id: lever.id },
+			});
+		}
+	}
+
+	// Ask tier — system-scheduled background maintenance. Suggested for a not-yet-registered repo that's
+	// clearly large. Passive slowness is deliberately NOT enough: worktree slowness maps to the worktree
+	// levers above, history is already covered by demand commit-graph writes, and ref/object maintenance has
+	// its own measured auto-tier conditions. A generic scheduler recommendation would promise the wrong fix.
+	// `=== false`, not falsy: `undefined` means the registration list couldn't be read, and an unknown state
+	// must never be suggested away — that's how a user's own registration gets silently reclaimed by Undo.
+	if (clearlyLarge && snapshot.maintenanceRegistered === false && supported('backgroundMaintenance')) {
+		// Resolve the evidence once so reason/value/threshold can never drift apart. Ordered so each
+		// suggestion argues from its most DISTINCTIVE signal rather than whichever crossed first: a repo
+		// large by both file count and pack bytes would otherwise attach the same tracked-files evidence to
+		// this finding as to the fsmonitor/manyFiles findings, and the view would show two identical meters.
+		let evidence: Pick<GitHealthFinding, 'reason' | 'value' | 'threshold'>;
+		if (snapshot.packBytes >= largePackBytesThreshold) {
+			evidence = { reason: 'largePacks', value: snapshot.packBytes, threshold: largePackBytesThreshold };
+		} else {
+			evidence = trackedFilesEvidence;
+		}
+		findings.push({
+			tier: 'ask',
+			...evidence,
+			action: { kind: 'optimization', id: 'backgroundMaintenance' },
+		});
+	}
+
+	return {
+		findings: findings,
+		repository: snapshot.repository,
+		clearlyLarge: clearlyLarge,
+		estimatedLooseObjects: estimatedLooseObjects,
+		looseRefs: snapshot.looseRefs,
+		estimatedTrackedFiles: estimatedTrackedFiles,
+		trackedFilesExact: trackedFilesExact,
+		trackedFilesScope: trackedFilesScope,
+		packCount: snapshot.packCount,
+		packsOutsideMultiPackIndex: snapshot.packsOutsideMultiPackIndex,
+		packBytes: snapshot.packBytes,
+		commitGraph: snapshot.commitGraph,
+	};
+}
+
+/**
+ * What the view shows for one lever. Ownership is the load-bearing distinction: `applied` offers Undo
+ * because GitLens recorded the exact prior; `userEnabled` offers nothing at all — there is nothing for
+ * GitLens to undo, and a disabled control would imply otherwise.
+ */
+export type GitHealthLeverStatus =
+	| 'suggested'
+	| 'applied'
+	| 'userEnabled'
+	/** Supported and usable here, just not worth recommending for this repo — NOT a failure. */
+	| 'available'
+	| 'unavailable'
+	| 'notApplicable';
+
+export interface GitHealthLever {
+	readonly id: GitOptimizationId;
+	readonly status: GitHealthLeverStatus;
+	readonly tier: GitOptimizationTier;
+	/** Why it can't be used here — rendered verbatim, never flattened to "unsupported". */
+	readonly reason?: string;
+	/** A consequence the person must see BEFORE choosing, not after. */
+	readonly note?: string;
+	/**
+	 * `true` when this lever's state could not be DETERMINED (e.g. the registration list was unreadable), as
+	 * opposed to a lever this git/platform doesn't support.
+	 */
+	readonly checkFailed?: boolean;
+}
+
+/** Consequences that reach beyond GitLens, surfaced on the apply action itself. */
+const leverNotes: Partial<Record<GitOptimizationId, string>> = {
+	backgroundMaintenance:
+		'Adds a task to your operating system’s scheduler. Undo unregisters this repository, but leaves the scheduler itself in place.',
+};
+
+/**
+ * Collapses a snapshot + capabilities + report into the per-lever rows the Git Health view renders.
+ * Pure, so the webview never re-derives ownership or eligibility rules that already live here.
+ */
+export function computeLevers(
+	snapshot: GitHealthSnapshot,
+	capabilities: readonly GitOptimizationCapability[],
+	report: GitHealthReport,
+): GitHealthLever[] {
+	const suggested = new Set<GitOptimizationId>(
+		report.findings.flatMap(f => (f.action.kind === 'optimization' ? [f.action.id] : [])),
+	);
+
+	const enabled: Record<GitOptimizationId, boolean> = {
+		untrackedCache: snapshot.config.untrackedCache,
+		fsmonitor: snapshot.config.fsmonitor,
+		manyFiles: snapshot.config.manyFiles,
+		// `=== true`, not the raw (possibly `undefined`) value — an unreadable registration is handled as its
+		// own status below, and must never fall through to "enabled".
+		backgroundMaintenance: snapshot.maintenanceRegistered === true,
+		sparseIndex: snapshot.repository.sparseIndex === true,
+	};
+	const blocked: Partial<Record<GitOptimizationId, boolean>> = {
+		untrackedCache: snapshot.untrackedCacheNotApplicable,
+		fsmonitor: snapshot.fsmonitorNotApplicable,
+		manyFiles: snapshot.untrackedCacheNotApplicable && !snapshot.config.untrackedCacheConfigured,
+	};
+
+	return capabilities.map<GitHealthLever>(capability => {
+		const id = capability.id;
+		const note = capability.note ?? leverNotes[id];
+		// Every optimization lever is ask-tier now — the auto tier only ever runs maintenance tasks.
+		const tier: GitOptimizationTier = 'ask';
+
+		// Unavailable outranks everything: a lever the installed git or platform cannot do is never
+		// "suggested", whatever the thresholds say.
+		if (!capability.supported) {
+			return { id: id, status: 'unavailable', tier: tier, reason: capability.reason, note: note };
+		}
+		// An unreadable maintenance registration can't answer the ownership/suggestion questions below, so
+		// it gets its own status rather than falling through and being guessed as "not registered".
+		if (id === 'backgroundMaintenance' && snapshot.maintenanceRegistered === undefined) {
+			return {
+				id: id,
+				status: 'unavailable',
+				tier: tier,
+				reason: "Couldn't read Git's maintenance registration — try reopening the repository",
+				note: note,
+				checkFailed: true,
+			};
+		}
+		// Then ownership, which is what decides whether Undo is offered at all.
+		if (enabled[id]) {
+			return { id: id, status: snapshot.applied[id] ? 'applied' : 'userEnabled', tier: tier, note: note };
+		}
+		if (id === 'sparseIndex') {
+			if (
+				snapshot.repository.sparseCheckout == null ||
+				snapshot.repository.sparseCheckoutCone == null ||
+				snapshot.repository.sparseIndex == null ||
+				snapshot.repository.splitIndex == null
+			) {
+				return {
+					id: id,
+					status: 'unavailable',
+					tier: tier,
+					reason: "Couldn't determine this worktree’s sparse-checkout and index configuration",
+					note: note,
+					checkFailed: true,
+				};
+			}
+			if (!snapshot.repository.sparseCheckout) {
+				return {
+					id: id,
+					status: 'notApplicable',
+					tier: tier,
+					reason: 'This worktree is not using sparse checkout.',
+					note: note,
+				};
+			}
+			if (!snapshot.repository.sparseCheckoutCone) {
+				return {
+					id: id,
+					status: 'notApplicable',
+					tier: tier,
+					reason: 'Sparse indexes require cone-mode sparse checkout.',
+					note: note,
+				};
+			}
+			if (snapshot.repository.splitIndex || snapshot.indexEntryCountType === 'split') {
+				return {
+					id: id,
+					status: 'notApplicable',
+					tier: tier,
+					reason: 'This worktree uses a split index; disable it before enabling a sparse index.',
+					note: note,
+				};
+			}
+			if (snapshot.indexEntryCountType === 'conflicted') {
+				return {
+					id: id,
+					status: 'notApplicable',
+					tier: tier,
+					reason: 'Finish the current merge or rebase before enabling a sparse index.',
+					note: note,
+				};
+			}
+		}
+		// `notApplicable` means GitLens TRIED here and this repo can't use it — the gk marker records that.
+		// `capability.note` is the supported-with-caveat field, not an unavailability reason, so the
+		// explanation has to come from the marker's meaning instead.
+		if (blocked[id]) {
+			return {
+				id: id,
+				status: 'notApplicable',
+				tier: tier,
+				reason:
+					id === 'fsmonitor'
+						? 'The file system monitor could not start for this repository.'
+						: id === 'manyFiles'
+							? 'This would enable the untracked cache, but this file system does not report directory changes reliably, so Git would return incorrect status results.'
+							: 'This file system does not report directory changes reliably, so Git would return incorrect status results.',
+				note: note,
+			};
+		}
+
+		// Supported and usable, just below the thresholds — `available`, never `notApplicable`. Reporting
+		// a healthy repo's levers as unavailable tells the user something false.
+		return { id: id, status: suggested.has(id) ? 'suggested' : 'available', tier: tier, note: note };
+	});
+}
+
+/** Auto-tier maintenance tasks the daily pass should run right now (deduped, order-stable). */
+export function getAutoMaintenanceTasks(report: GitHealthReport): GitMaintenanceTask[] {
+	const tasks: GitMaintenanceTask[] = [];
+	for (const finding of report.findings) {
+		if (finding.tier === 'auto' && finding.action.kind === 'maintenance' && !tasks.includes(finding.action.task)) {
+			tasks.push(finding.action.task);
+		}
+	}
+	return tasks;
+}
+
+/** Auto-tier optimization levers the daily pass should silently apply — none today; the auto tier currently
+ * applies only maintenance tasks, but this stays in place for future levers. */
+export function getAutoOptimizations(report: GitHealthReport): GitOptimizationId[] {
+	const ids: GitOptimizationId[] = [];
+	for (const finding of report.findings) {
+		if (finding.tier === 'auto' && finding.action.kind === 'optimization' && !ids.includes(finding.action.id)) {
+			ids.push(finding.action.id);
+		}
+	}
+	return ids;
+}
+
+/**
+ * Banner rule: fire only when the report contains an ask-tier fix and the repo is clearly large or slow in
+ * the working-tree family. History/ref/object slowness must not advertise unrelated worktree levers.
+ */
+export function isBannerEligible(report: GitHealthReport, slowness: GitHealthSlowness | undefined): boolean {
+	const hasAskTierFix = report.findings.some(f => f.tier === 'ask');
+	const worktreeSlownessObserved = (slowness?.worktree?.count ?? 0) > 0;
+	return hasAskTierFix && (report.clearlyLarge || worktreeSlownessObserved);
+}
+
+/** Evidence-gated banner state for one repository — undefined when the banner has nothing to say. */
+export interface GitHealthBannerState {
+	/** Show the in-graph banner strip (eligible and not explicitly dismissed). */
+	readonly banner: boolean;
+	/** Show the evidence dot on the Visualizations & Health toggle (eligible, view not visited recently). */
+	readonly indicator: boolean;
+	/** Which evidence family armed it — measured worktree slowness, or repo scale alone. */
+	readonly reason: 'slowness' | 'large';
+	/** Worst observed slow-command duration (ms); present when reason is 'slowness'. */
+	readonly maxDurationMs?: number;
+	/** Tracked-file count evidence; present when reason is 'large'. */
+	readonly trackedFiles?: number;
+	/** Whether trackedFiles is exact (report.trackedFilesScope !== 'estimate'). */
+	readonly trackedFilesExact?: boolean;
+	/** Count of levers the health view will show as "suggested" — keep in sync with its verdict. */
+	readonly suggestedCount: number;
+}

package/src/git/models/search.ts

@@ -1,7 +1,9 @@
 type SearchOperatorsShortForm = '' | '=:' | '@:' | '#:' | '?:' | '~:' | 'is:' | '>:' | '<:' | '^:';
 export type SearchOperatorsLongForm =
 	| 'message:'
+	| '-message:'
 	| 'author:'
+	| 'committer:'
 	| 'commit:'
 	| 'file:'
 	| 'change:'
@@ -17,8 +19,10 @@ export const searchOperators = new Set<string>([
 	'',
 	'=:',
 	'message:',
+	'-message:',
 	'@:',
 	'author:',
+	'committer:',
 	'#:',
 	'commit:',
 	'?:',
@@ -41,8 +45,10 @@ export const searchOperatorsToLongFormMap = new Map<SearchOperators, SearchOpera
 	['', 'message:'],
 	['=:', 'message:'],
 	['message:', 'message:'],
+	['-message:', '-message:'],
 	['@:', 'author:'],
 	['author:', 'author:'],
+	['committer:', 'committer:'],
 	['#:', 'commit:'],
 	['commit:', 'commit:'],
 	['?:', 'file:'],
@@ -62,11 +68,20 @@ export const searchOperatorsToLongFormMap = new Map<SearchOperators, SearchOpera
 ]);
 
 export const searchOperationHelpRegex =
-	/(?:^|(\b|\s)*)((=:|message:|@:|author:|#:|commit:|\?:|file:|~:|change:|is:|type:|>:|after:|since:|<:|before:|until:|\^:|ref:)(?:"[^"]*"?|[^\s]*))(?:$|(\b|\s))/g;
+	/(?:^|(\b|\s)*)((=:|message:|-message:|@:|author:|committer:|#:|commit:|\?:|file:|~:|change:|is:|type:|>:|after:|since:|<:|before:|until:|\^:|ref:)(?:"[^"]*"?|[^\s]*))(?:$|(\b|\s))/g;
 
 export interface SearchQuery {
 	query: string;
-	naturalLanguage?: boolean | { query: string; processedQuery?: string; error?: string };
+	naturalLanguage?:
+		| boolean
+		| {
+				query: string;
+				processedQuery?: string;
+				error?: string;
+				explanation?: string;
+				mode?: 'highlight' | 'filter' | 'select';
+				alternates?: string[];
+		  };
 
 	filter?: boolean;
 	matchAll?: boolean;
@@ -96,8 +111,8 @@ export interface ParsedSearchQuery {
 export interface SearchQueryFilters {
 	/** Specifies whether the search results will be filtered to specific files */
 	files: boolean;
-	/** Specifies whether the search results will be filtered to a specific type, only `stash`, `tip`, and `wip` are supported */
-	type?: 'stash' | 'tip' | 'wip';
+	/** Specifies whether the search results will be filtered to a specific type, only `stash`, `tip`, `wip`, and `merge` are supported */
+	type?: 'stash' | 'tip' | 'wip' | 'merge';
 	/** Specifies whether the search results will be filtered to a specific ref or ref range */
 	refs: boolean;
 }

package/src/git/parsers/diffParser.ts

@@ -219,18 +219,41 @@ export async function filterDiffFiles(
 		.join('');
 }
 
-/** Counts insertions and deletions from a parsed diff file */
+/**
+ * Counts the added and removed lines of a parsed diff file, matching what `git diff --numstat`
+ * reports for it. Binary files and files without content changes (pure renames, mode changes)
+ * count as 0/0.
+ */
 export function countDiffInsertionsAndDeletions(file: ParsedGitDiffFile): { insertions: number; deletions: number } {
 	let insertions = 0;
 	let deletions = 0;
 	for (const hunk of file.hunks) {
-		insertions += hunk.current.count;
-		deletions += hunk.previous.count;
+		// Counted off the hunk's raw content rather than its header counts (which include unchanged
+		// context) or `hunk.lines` (which merges a removed/added pair into one `changed` entry and
+		// lets a following context line overwrite the tail of an asymmetric block). Scanned in place
+		// rather than split into lines: splitting a multi-megabyte diff allocates a string per line
+		// for a single pass that only ever looks at each line's first character.
+		const { content } = hunk;
+		for (let start = 0; start < content.length;) {
+			const marker = content[start];
+			if (marker === '+') {
+				insertions++;
+			} else if (marker === '-') {
+				deletions++;
+			}
+
+			const end = content.indexOf('\n', start);
+			if (end === -1) break;
+
+			start = end + 1;
+		}
 	}
 	return { insertions: insertions, deletions: deletions };
 }
 
-/** Counts approximate number of changed lines in a diff file */
+/** Counts the approximate number of changed lines in a diff file — the size of both sides of its
+ *  hunks, unchanged context included. Suitable for relative sizing, not for reporting a line count
+ *  to the user; use {@link countDiffInsertionsAndDeletions} for that. */
 export function countDiffLines(file: ParsedGitDiffFile): number {
 	let count = 0;
 	for (const hunk of file.hunks) {