@gitkraken/core-gitlens 0.1.0 → 0.3.0

package/src/git/models/commit.ts

@@ -177,10 +177,7 @@ export class GitCommit implements GitRevisionReference {
 
 			const stashFiles = getSettledValue(stashFilesResult);
 			if (stashFiles?.length) {
-				commit.applyFileset({
-					files: stashFiles as readonly GitFileChange[],
-					filtered: commit.fileset?.filtered,
-				});
+				commit.applyFileset({ files: stashFiles, filtered: commit.fileset?.filtered });
 			}
 			enrichCommit(commit, { stashUntrackedFilesLoaded: true });
 		} else {
@@ -218,7 +215,6 @@ export class GitCommit implements GitRevisionReference {
 	readonly stashNumber: string | undefined;
 	readonly stashOnRef: string | undefined;
 	readonly tips: string[] | undefined;
-	readonly parentTimestamps?: GitStashParentInfo[] | undefined;
 
 	constructor(
 		public readonly repoPath: string,
@@ -234,13 +230,11 @@ export class GitCommit implements GitRevisionReference {
 		tips?: string[],
 		stashName?: string | undefined,
 		stashOnRef?: string | undefined,
-		parentTimestamps?: GitStashParentInfo[] | undefined,
 		shaLength: number = getAbbreviatedShaLength(),
 	) {
 		this.ref = sha;
 		this.shortSha = sha.substring(0, shaLength);
 		this.tips = tips;
-		this.parentTimestamps = parentTimestamps;
 
 		if (stashName) {
 			this.refType = 'stash';
@@ -457,7 +451,6 @@ export class GitCommit implements GitRevisionReference {
 		stats?: GitCommitStats | null;
 		stashUntrackedFilesLoaded?: boolean;
 		resolvedPreviousSha?: string;
-		parentTimestamps?: GitStashParentInfo[] | null;
 	}): T {
 		const commit = new GitCommit(
 			this.repoPath,
@@ -473,7 +466,6 @@ export class GitCommit implements GitRevisionReference {
 			this.tips,
 			this.stashName,
 			this.stashOnRef,
-			this.getChangedValue(changes.parentTimestamps, this.parentTimestamps),
 			this.shortSha.length,
 		);
 		commit._etagWorkingTree = this._etagWorkingTree;
@@ -522,7 +514,6 @@ export class GitCommit implements GitRevisionReference {
 			this.tips,
 			this.stashName,
 			this.stashOnRef,
-			this.parentTimestamps,
 		);
 		commit._etagWorkingTree = this._etagWorkingTree;
 		return commit as T;
@@ -530,6 +521,7 @@ export class GitCommit implements GitRevisionReference {
 
 	protected computeFileStats(): void {
 		if (!this._recomputeStats || this._fileset == null) return;
+
 		this._recomputeStats = false;
 
 		const changedFiles = { added: 0, deleted: 0, changed: 0 };
@@ -672,17 +664,10 @@ export interface GitCommitStats<Files extends number | GitDiffFileStats = number
 	readonly deletions: number;
 }
 
-export interface GitStashParentInfo {
-	readonly sha: string;
-	readonly authorDate?: number;
-	readonly committerDate?: number;
-}
-
 export interface GitStashCommit extends GitCommit {
 	readonly refType: GitStashReference['refType'];
 	readonly stashName: string;
 	readonly stashNumber: string;
-	readonly parentTimestamps?: GitStashParentInfo[];
 }
 
 export type GitCommitWithFullDetails = GitCommit & { message: string; fileset: GitCommitFileset };

package/src/git/models/graph.ts

@@ -1,3 +1,4 @@
+import type { GitCommitReachability } from '../providers/commits.js';
 import type { GitBranch } from './branch.js';
 import type { GitStashCommit } from './commit.js';
 import type { GitRemote } from './remote.js';
@@ -77,7 +78,7 @@ export interface GitGraphRow {
 	tags?: GitGraphRowTag[];
 	contexts?: GitGraphRowContexts;
 	stats?: GitGraphRowStats;
-	reachableFromBranches?: string[];
+	reachability?: GitCommitReachability;
 	isCurrentUser?: boolean;
 }
 
@@ -97,8 +98,6 @@ export interface GitGraph {
 
 	/** SHAs reachable from HEAD (for enrichment: marking commits on the current branch) */
 	readonly reachableFromHEAD?: ReadonlySet<string>;
-	/** Map of SHA → set of branch names reachable from that SHA (for enrichment: branch context) */
-	readonly reachableFromBranches?: ReadonlyMap<string, ReadonlySet<string>>;
 
 	/** The rows for the set of commits requested */
 	readonly rows: GitGraphRow[];
@@ -179,6 +178,5 @@ export interface GraphContext {
 	readonly branchIdOfMainWorktree: string | undefined;
 	readonly stashes: ReadonlyMap<string, GitStashCommit> | undefined;
 	readonly reachableFromHEAD: ReadonlySet<string>;
-	readonly reachableFromBranches: ReadonlyMap<string, ReadonlySet<string>>;
 	readonly avatars: Map<string, string>;
 }

package/src/git/models/reference.ts

@@ -45,3 +45,36 @@ export interface GitTagReference {
 }
 
 export type GitReference = GitBranchReference | GitRevisionReference | GitStashReference | GitTagReference;
+
+/**
+ * Lightweight ref-tip tuple — the minimum needed to map a SHA back to the refs that point at it.
+ * No upstream tracking, ahead/behind, annotation, etc. — use `GitBranch`/`GitTag` for those.
+ */
+export interface GitRefTip {
+	readonly type: 'branch' | 'remote' | 'tag';
+	/** Short name: `main`, `origin/main`, `v1.2.0` */
+	readonly name: string;
+	/** Full refname: `refs/heads/main`, `refs/remotes/origin/main`, `refs/tags/v1.2.0` */
+	readonly fullName: string;
+	/** Tip object SHA. For annotated tags, the peeled commit SHA */
+	readonly sha: string;
+}
+
+/**
+ * Raw parsed `git for-each-ref` record covering every field the unified format emits.
+ * Inapplicable fields come back as empty strings from git (e.g. `upstream` on a tag,
+ * `peeledObjectname` on a branch).
+ */
+export interface RefRecord {
+	current: string;
+	name: string;
+	objectname: string;
+	peeledObjectname: string;
+	upstream: string;
+	upstreamTracking: string;
+	committerDate: string;
+	creatorDate: string;
+	authorDate: string;
+	subject: string;
+	worktreePath?: string;
+}

package/src/git/models/remote.ts

@@ -71,6 +71,7 @@ export class GitRemote<TProvider extends RemoteProvider | undefined = RemoteProv
 	matches(urlOrDomain: string, path?: string): boolean {
 		if (path == null) {
 			if (equalsIgnoreCase(urlOrDomain, this.url)) return true;
+
 			[, urlOrDomain, path] = parseGitRemoteUrl(urlOrDomain);
 		}
 

package/src/git/models/repository.ts

@@ -48,7 +48,8 @@ export type RepositoryChange =
 	| 'remoteProviders'
 	| 'starred'
 	| 'opened'
-	| 'gkConfig';
+	| 'gkConfig'
+	| 'lastFetched';
 
 export const repositoryChanges = exhaustiveArray<RepositoryChange>()([
 	'unknown',
@@ -71,6 +72,7 @@ export const repositoryChanges = exhaustiveArray<RepositoryChange>()([
 	'starred',
 	'opened',
 	'gkConfig',
+	'lastFetched',
 ]);
 
 export interface RepositoryInit {
@@ -123,6 +125,7 @@ export class Repository {
 	protected readonly _watchService: RepositoryWatchService;
 
 	private _pendingWorkingTreeChange?: RepositoryWorkingTreeChangeEvent;
+	private _pendingWorkingTreeFlush = false;
 	private _repoChangeListener: UnifiedDisposable | undefined;
 
 	constructor(init: RepositoryInit) {
@@ -355,7 +358,27 @@ export class Repository {
 
 	/** Called when the watch service notifies of FETCH_HEAD changes. */
 	protected onFetchHeadChanged(): void {
-		this._lastFetched = undefined;
+		// Don't reset `_lastFetched` here: the FS watcher can fire even when the on-disk mtime
+		// hasn't advanced (atomic-rename / lock-file activity emits `change` events without an
+		// mtime bump), and wiping would clobber a fresher value set by `markFetched()`.
+		// `getLastFetched()` reconciles in-memory vs FS via `Math.max`. Force-fire so consumers
+		// invalidate their caches and re-read.
+		this.fireChange('lastFetched', true);
+	}
+
+	/**
+	 * Marks the repository as having just been fetched. Use after a GitLens-initiated fetch/pull
+	 * completes so the "last fetched" UI tracks the attempt even when git skipped rewriting
+	 * `.git/FETCH_HEAD` (modern git omits the rewrite when all refs are up-to-date). The
+	 * in-memory timestamp is reconciled with the on-disk mtime by {@link getLastFetched} via
+	 * `Math.max`, so this is monotonic.
+	 */
+	markFetched(timestamp: number = Date.now()): void {
+		const next = Math.max(this._lastFetched ?? 0, timestamp);
+		if (next === this._lastFetched) return;
+
+		this._lastFetched = next;
+		this.fireChange('lastFetched', true);
 	}
 
 	/** Called when .gitignore changes in the working tree. */
@@ -374,7 +397,15 @@ export class Repository {
 		this._onDidChange.fire(extEvent);
 	}
 
-	/** Called by the session when debounced working tree changes arrive */
+	/**
+	 * Called by every {@link watchWorkingTree} subscription when its debounced batch arrives. Each
+	 * call to {@link watchWorkingTree} adds a separate bridge listener on the underlying watch
+	 * session, so a single fs change can invoke this method multiple times in the same microtask —
+	 * once per active subscription. We accumulate paths into a single pending event and defer the
+	 * actual fire to a microtask so back-to-back synchronous bridge calls collapse into ONE
+	 * `_onDidChangeWorkingTree` emission. Without this coalescing, every WIP-dependent listener
+	 * (graph, file history, compare branch, etc.) would fire N times for N active subscriptions.
+	 */
 	protected onWorkingTreeChanged(paths: ReadonlySet<string>): void {
 		this._updatedAt = Date.now();
 
@@ -384,10 +415,17 @@ export class Repository {
 		}
 
 		if (this._suspended) return;
+		if (this._pendingWorkingTreeFlush) return;
 
-		const e = this._pendingWorkingTreeChange;
-		this._pendingWorkingTreeChange = undefined;
-		this._onDidChangeWorkingTree.fire(e);
+		this._pendingWorkingTreeFlush = true;
+		queueMicrotask(() => {
+			this._pendingWorkingTreeFlush = false;
+			const e = this._pendingWorkingTreeChange;
+			if (e == null || this._suspended) return;
+
+			this._pendingWorkingTreeChange = undefined;
+			this._onDidChangeWorkingTree.fire(e);
+		});
 	}
 
 	@trace({ onlyExit: true })

package/src/git/models/search.ts

@@ -96,8 +96,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` and `tip` are supported */
-	type?: 'stash' | 'tip';
+	/** 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 ref or ref range */
 	refs: boolean;
 }

package/src/git/models/worktree.ts

@@ -6,6 +6,7 @@ import { basename, normalizePath, relative } from '../../utils/path.js';
 import type { Shape } from '../../utils/types.js';
 import type { Uri } from '../../utils/uri.js';
 import { getRepositoryService } from '../repositoryService.js';
+import type { GitCommandPriority } from '../run.types.js';
 import { getRepositoryOrWorktreePath } from '../utils/repository.utils.js';
 import { shortenRevision } from '../utils/revision.utils.js';
 import type { GitBranch } from './branch.js';
@@ -73,6 +74,7 @@ export class GitWorktree {
 			const relativePath = normalizePath(relative(this.workspaceFolder.uri.fsPath, this.uri.fsPath));
 			return relativePath || this.workspaceFolder.name;
 		}
+
 		const relativePath = normalizePath(relative(this.repoPath, this.uri.fsPath));
 		return relativePath || normalizePath(this.uri.fsPath);
 	}
@@ -135,10 +137,15 @@ export class GitWorktree {
 			: GitWorktree.formatDateFromNow(worktree);
 	}
 
-	static async getStatus(worktree: GitWorktree): Promise<GitStatus | undefined> {
+	static async getStatus(
+		worktree: GitWorktree,
+		options?: { priority?: GitCommandPriority },
+		cancellation?: AbortSignal,
+	): Promise<GitStatus | undefined> {
 		if (worktree.type === 'bare') return undefined;
+
 		const repo = getRepositoryService(worktree.path);
-		return repo?.status.getStatus();
+		return repo?.status.getStatus(options, cancellation);
 	}
 
 	static async hasWorkingChanges(
@@ -146,6 +153,7 @@ export class GitWorktree {
 		options?: { staged?: boolean; unstaged?: boolean; untracked?: boolean },
 	): Promise<boolean | undefined> {
 		if (worktree.type === 'bare') return undefined;
+
 		const repo = getRepositoryService(worktree.path);
 		return repo?.status.hasWorkingChanges(options);
 	}

package/src/git/parsers/diffParser.ts

@@ -364,43 +364,6 @@ export function parseGitFileDiff(data: string, includeRawContent = false): Parse
 	};
 }
 
-export function parseGitDiffNameStatusFiles(data: string, repoPath: string): GitFile[] | undefined {
-	using sw = maybeStopWatch('Git.parseDiffNameStatusFiles', { log: { onlyExit: true, level: 'debug' } });
-	if (!data) {
-		sw?.stop({ suffix: ` no data` });
-		return undefined;
-	}
-
-	const files: GitFile[] = [];
-
-	let status;
-
-	const fields = data.split('\0');
-	for (let i = 0; i < fields.length - 1; i++) {
-		status = fields[i][0];
-		if (status === '.') {
-			status = '?';
-		}
-
-		let originalPath;
-		// Renamed files are old followed by the new path
-		if (status === 'R' || status === 'C') {
-			if (i + 1 >= fields.length - 1) break;
-
-			originalPath = fields[++i];
-		}
-		if (i + 1 >= fields.length) break;
-
-		const path = fields[++i];
-
-		files.push({ status: status as GitFileStatus, path: path, originalPath: originalPath, repoPath: repoPath });
-	}
-
-	sw?.stop({ suffix: ` parsed ${files.length} files` });
-
-	return files;
-}
-
 /**
  * Parses the output of `git diff --numstat --summary -z`.
  *
@@ -450,6 +413,7 @@ export function parseGitDiffNumStatFiles(data: string, repoPath: string): GitFil
 			i++;
 			continue;
 		}
+
 		const tabIndex2 = field.indexOf('\t', tabIndex1 + 1);
 		if (tabIndex2 === -1) {
 			i++;
@@ -464,6 +428,7 @@ export function parseGitDiffNumStatFiles(data: string, repoPath: string): GitFil
 		if (path === '') {
 			// Rename or copy: next two fields are oldPath and newPath (summary pass distinguishes R vs C)
 			if (i + 2 >= fields.length) break;
+
 			originalPath = fields[++i];
 			path = fields[++i];
 		}
@@ -477,7 +442,7 @@ export function parseGitDiffNumStatFiles(data: string, repoPath: string): GitFil
 			repoPath: repoPath,
 			path: path,
 			originalPath: originalPath,
-			status: (originalPath ? 'R' : 'M') as GitFileStatus,
+			status: originalPath ? 'R' : 'M',
 			stats: { additions: additions, deletions: deletions, changes: additions + deletions },
 		});
 
@@ -514,14 +479,14 @@ export function parseGitDiffNumStatFiles(data: string, repoPath: string): GitFil
 			if (createOrDelete != null) {
 				const file = files.get(normalizePath(createOrDeletePath));
 				if (file != null) {
-					file.status = (createOrDelete === 'create' ? 'A' : 'D') as GitFileStatus;
+					file.status = createOrDelete === 'create' ? 'A' : 'D';
 				}
 			} else if (renameOrCopy === 'copy') {
 				// Numstat defaulted to R; promote to C. Reconstruct the full new-side path by
 				// concatenating prefix + new-leaf + suffix, covering all compact and non-compact forms.
 				const file = files.get(normalizePath(renameRoot + renameNewLeaf + renameSuffix));
 				if (file != null) {
-					file.status = 'C' as GitFileStatus;
+					file.status = 'C';
 				}
 			} else if (modeChangePath != null) {
 				// File-type boundary: 100xxx = regular file, 120000 = symlink, 160000 = gitlink.
@@ -529,7 +494,7 @@ export function parseGitDiffNumStatFiles(data: string, repoPath: string): GitFil
 				if (oldMode.substring(0, 2) !== newMode.substring(0, 2)) {
 					const file = files.get(normalizePath(modeChangePath));
 					if (file != null) {
-						file.status = 'T' as GitFileStatus;
+						file.status = 'T';
 					}
 				}
 			}
@@ -564,7 +529,7 @@ export function parseGitApplyFiles(data: string, repoPath: string): GitFileChang
 		const [insertions, deletions, path] = line.split('\t');
 		files.set(
 			normalizePath(path),
-			new GitFileChange(repoPath, path, 'M' as GitFileStatus, getUri(path), undefined, undefined, undefined, {
+			new GitFileChange(repoPath, path, 'M', getUri(path), undefined, undefined, undefined, {
 				changes: 0,
 				additions: parseInt(insertions, 10),
 				deletions: parseInt(deletions, 10),
@@ -603,7 +568,7 @@ export function parseGitApplyFiles(data: string, repoPath: string): GitFileChang
 				new GitFileChange(
 					repoPath,
 					newPath,
-					(renameOrCopy === 'copy' ? 'C' : 'R') as GitFileStatus,
+					renameOrCopy === 'copy' ? 'C' : 'R',
 					getUri(newPath),
 					originalPath,
 					getUri(originalPath),
@@ -618,7 +583,7 @@ export function parseGitApplyFiles(data: string, repoPath: string): GitFileChang
 				new GitFileChange(
 					repoPath,
 					file.path,
-					(createOrDelete === 'create' ? 'A' : 'D') as GitFileStatus,
+					createOrDelete === 'create' ? 'A' : 'D',
 					getUri(file.path),
 					undefined,
 					undefined,

package/src/git/providers/branches.ts

@@ -1,10 +1,12 @@
 import type { PagedResult, PagingOptions } from '../../utils/paging.js';
+import type { GkConfigInvalidationTarget } from '../cache.js';
 import type { BranchDisposition, GitBranch } from '../models/branch.js';
 import type { GitCommitStats } from '../models/commit.js';
 import type { GitContributor } from '../models/contributor.js';
 import type { ConflictDetectionResult } from '../models/mergeConflicts.js';
 import type { PullRequest } from '../models/pullRequest.js';
 import type { GitBranchReference } from '../models/reference.js';
+import type { GitCommandPriority } from '../run.types.js';
 import type { BranchSortOptions } from '../utils/sorting.js';
 
 export interface BranchContributionsOverview extends GitCommitStats<number> {
@@ -12,6 +14,8 @@ export interface BranchContributionsOverview extends GitCommitStats<number> {
 	readonly branch: string;
 	readonly mergeTarget: string;
 	readonly mergeBase: string;
+	/** Committer date of the merge-base commit. Lets consumers (e.g. the graph minimap scope window) anchor on the same date semantics as the minimap aggregation without a separate commit fetch. */
+	readonly mergeBaseDate: Date | undefined;
 
 	readonly commits: number;
 	readonly latestCommitDate: Date | undefined;
@@ -41,7 +45,7 @@ export interface GitBranchesSubProvider {
 	getBranchContributionsOverview(
 		repoPath: string,
 		ref: string,
-		options?: { associatedPullRequest?: Promise<PullRequest | undefined> },
+		options?: { associatedPullRequest?: Promise<PullRequest | undefined>; priority?: GitCommandPriority },
 		cancellation?: AbortSignal,
 	): Promise<BranchContributionsOverview | undefined>;
 	getBranchesWithCommits(
@@ -56,6 +60,7 @@ export interface GitBranchesSubProvider {
 	getDefaultBranchName(
 		repoPath: string | undefined,
 		remote?: string,
+		options?: { priority?: GitCommandPriority },
 		cancellation?: AbortSignal,
 	): Promise<string | undefined>;
 
@@ -92,12 +97,18 @@ export interface GitBranchesSubProvider {
 		targetBranch: string,
 		cancellation?: AbortSignal,
 	): Promise<ConflictDetectionResult>;
-	getBaseBranchName?(repoPath: string, ref: string, cancellation?: AbortSignal): Promise<string | undefined>;
+	getBaseBranchName?(
+		repoPath: string,
+		ref: string,
+		options?: { priority?: GitCommandPriority },
+		cancellation?: AbortSignal,
+	): Promise<string | undefined>;
 	getStoredMergeTargetBranchName?(repoPath: string, ref: string): Promise<string | undefined>;
 	getStoredDetectedMergeTargetBranchName?(repoPath: string, ref: string): Promise<string | undefined>;
 	getStoredUserMergeTargetBranchName?(repoPath: string, ref: string): Promise<string | undefined>;
 	onCurrentBranchAccessed?(repoPath: string): Promise<void>;
 	onCurrentBranchModified?(repoPath: string): Promise<void>;
+	onCurrentBranchAgentActivity?(repoPath: string): Promise<void>;
 	renameBranch?(repoPath: string, oldName: string, newName: string): Promise<void>;
 	setUpstreamBranch?(repoPath: string, name: string, upstream: string | undefined): Promise<void>;
 	setBranchDisposition?(
@@ -105,7 +116,17 @@ export interface GitBranchesSubProvider {
 		branchName: string,
 		disposition: BranchDisposition | 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>;
 }

package/src/git/providers/commits.ts

@@ -68,6 +68,7 @@ export interface IncomingActivityOptions extends GitLogOptionsBase {
 }
 
 export interface GitCommitReachability {
+	readonly partial?: boolean;
 	readonly refs: (
 		| { readonly refType: 'branch'; readonly name: string; readonly remote: boolean; readonly current?: boolean }
 		| { readonly refType: 'tag'; readonly name: string; readonly current?: never }
@@ -77,6 +78,12 @@ export interface GitCommitReachability {
 export interface GitCommitsSubProvider {
 	getCommit(repoPath: string, rev: string, cancellation?: AbortSignal): Promise<GitCommit | undefined>;
 	getCommitCount(repoPath: string, rev: string, cancellation?: AbortSignal): Promise<number | undefined>;
+	/** Cheap author/committer date lookup for a single revision. Skips the full commit parse (no files, parents, or message) — use when only the dates are needed. Pass a full SHA so caching stays correct (commits are immutable; refs are not). */
+	getCommitDates?(
+		repoPath: string,
+		rev: string,
+		cancellation?: AbortSignal,
+	): Promise<{ authorDate: Date; committerDate: Date } | undefined>;
 	getCommitFiles(repoPath: string, rev: string, cancellation?: AbortSignal): Promise<GitFileChange[]>;
 	getCommitForFile(
 		repoPath: string,

package/src/git/providers/config.ts

@@ -1,3 +1,4 @@
+import type { GkConfigInvalidationTarget } from '../cache.js';
 import type { GitDir } from '../models/repository.js';
 import type { SigningConfig, ValidationResult } from '../models/signature.js';
 import type { GitUser } from '../models/user.js';
@@ -36,6 +37,8 @@ export type GkConfigKeys =
 	| `branch.${string}.gk-last-accessed`
 	/** `gk-last-modified` — ISO 8601 timestamp of when the branch last received a commit */
 	| `branch.${string}.gk-last-modified`
+	/** `gk-agent-last-activity` — ISO 8601 timestamp of when an AI agent was last active on this branch */
+	| `branch.${string}.gk-agent-last-activity`
 	/** `gk-disposition` — user-assigned branch disposition: 'starred' or 'archived' */
 	| `branch.${string}.gk-disposition`
 	/** `gk.defaultRemote` — the user-designated default remote for the repository */
@@ -95,6 +98,7 @@ export interface GitConfigSubProvider {
 		repoPath: string,
 		key: GkConfigKeys | DeprecatedGkConfigKeys,
 		value: string | undefined,
+		options?: { skipInvalidation?: readonly GkConfigInvalidationTarget[] },
 	): Promise<void>;
 
 	getSigningConfig?(repoPath: string): Promise<SigningConfig>;

package/src/git/providers/diff.ts

@@ -32,7 +32,7 @@ export interface GitDiffSubProvider {
 		repoPath: string,
 		to?: string,
 		from?: string,
-		options?: { uris?: (string | Uri)[] },
+		options?: { uris?: (string | Uri)[]; includeUntracked?: boolean },
 		cancellation?: AbortSignal,
 	): Promise<GitDiffShortStat | undefined>;
 	getDiff?(
@@ -70,7 +70,13 @@ export interface GitDiffSubProvider {
 		repoPath: string,
 		ref1OrRange: string | GitRevisionRange,
 		ref2?: string,
-		options?: { filters?: GitDiffFilter[]; path?: string; renameLimit?: number; similarityThreshold?: number },
+		options?: {
+			filters?: GitDiffFilter[];
+			includeUntracked?: boolean;
+			path?: string;
+			renameLimit?: number;
+			similarityThreshold?: number;
+		},
 	): Promise<GitFile[] | undefined>;
 	getDiffTool?(repoPath?: string): Promise<string | undefined>;
 	getNextComparisonUris(