@gitkraken/core-gitlens 0.12.0 → 0.14.0

package/dist/git/features.js.map

@@ -1 +1 @@
-{"version":3,"file":"features.js","names":[],"sources":["../../../git/src/features.ts"],"sourcesContent":["// GitFeature's must start with `git:` to be recognized in all usages\nexport type GitFeatures =\n\t| 'git:checkout:pathspec-from-file'\n\t| 'git:commit-graph'\n\t| 'git:commit-graph:changed-paths'\n\t| 'git:fetch:no-write-fetch-head'\n\t| 'git:for-each-ref:worktreePath'\n\t| 'git:fsmonitor'\n\t| 'git:fsmonitor:linux'\n\t| 'git:ignoreRevsFile'\n\t| 'git:index:skipHash'\n\t| 'git:maintenance'\n\t| 'git:maintenance:pack-refs'\n\t| 'git:maintenance:start'\n\t| 'git:maintenance:start:systemd'\n\t| 'git:manyFiles'\n\t| 'git:merge-tree:merge-base'\n\t| 'git:merge-tree:write-tree'\n\t| 'git:patch-id:binary-oids'\n\t| 'git:patch-id:verbatim'\n\t| 'git:push:force-if-includes'\n\t| 'git:rebase:autosquash'\n\t| 'git:rev-parse:end-of-options'\n\t| 'git:signing:ssh'\n\t| 'git:signing:x509'\n\t| 'git:sparse-index'\n\t| 'git:stash:push:pathspecs'\n\t| 'git:stash:push:staged'\n\t| 'git:stash:push:stdin'\n\t| 'git:status:find-renames'\n\t| 'git:status:porcelain-v2'\n\t| 'git:untrackedCache'\n\t| 'git:worktrees';\n\ntype ExtractPrefix<T> = T extends `${infer Prefix}:${infer Rest}`\n\t? Rest extends `${infer SubPrefix}:${string}`\n\t\t? T | `${Prefix}:${SubPrefix}` | Prefix\n\t\t: T | Prefix\n\t: never;\n\nexport type GitFeatureOrPrefix = ExtractPrefix<GitFeatures>;\nexport type FilteredGitFeatures<T extends GitFeatureOrPrefix> = T extends GitFeatures\n\t? T\n\t: Extract<GitFeatures, T | `${T}:${string}`>;\n\nexport const gitMinimumVersion = '2.7.2';\nexport const gitFeaturesByVersion = new Map<GitFeatures, string>([\n\t['git:checkout:pathspec-from-file', '2.26'],\n\t// 2.24 is when git READS the commit-graph file by default (core.commitGraph on); writing it for\n\t// older gits would be dead weight.\n\t['git:commit-graph', '2.24'],\n\t// Changed-path Bloom filters (`--changed-paths`), the v2 filter format — pre-2.31 shipped Bloom filters\n\t// with real correctness bugs (bad results for merge commits), so 2.31 is the safe floor to write them.\n\t['git:commit-graph:changed-paths', '2.31'],\n\t['git:fetch:no-write-fetch-head', '2.29'],\n\t['git:for-each-ref:worktreePath', '2.23'],\n\t// `core.fsmonitor=true` selects the built-in FSMonitor daemon (accepting a bool rather than only a\n\t// hook path). This 2.37 floor is the Windows + macOS one.\n\t['git:fsmonitor', '2.37'],\n\t// Linux got its own FSMonitor backend (inotify) only in 2.55, hence a separate floor. Note the backend\n\t// places a watch on EVERY directory, so a large repo can exhaust `fs.inotify.max_user_watches` and the\n\t// daemon fails at runtime even on a new enough git — the apply path must still probe, not just gate.\n\t['git:fsmonitor:linux', '2.55'],\n\t['git:ignoreRevsFile', '2.23'],\n\t// `index.skipHash` (skip the trailing index checksum for faster writes); part of `feature.manyFiles`.\n\t['git:index:skipHash', '2.40'],\n\t// `git maintenance run --task=…`. The `maintenance` builtin + `commit-graph`/`gc` tasks are 2.29, but\n\t// the loose-objects + incremental-repack tasks the auto tier uses landed in 2.30 (and `core.multiPackIndex`\n\t// is default-on from 2.30, so no separate midx config write is needed) — 2.30 is the safe floor.\n\t['git:maintenance', '2.30'],\n\t// The pack-refs maintenance task landed one release after the maintenance builtin.\n\t['git:maintenance:pack-refs', '2.31'],\n\t// `git maintenance start` — the subcommands exist from 2.30 (cron only); launchctl (macOS) + schtasks\n\t// (Windows) scheduling arrived in 2.31, so 2.31 is the cross-platform-safe floor.\n\t['git:maintenance:start', '2.31'],\n\t// `git maintenance start` systemd-timer scheduling. On Linux, 2.31–2.33 is cron-only and modern distros\n\t// often ship without cron (scheduling then silently fails); the systemd fallback arrived in 2.34.\n\t['git:maintenance:start:systemd', '2.34'],\n\t// `feature.manyFiles` umbrella (index v4 + untracked cache + skipHash where available).\n\t['git:manyFiles', '2.24'],\n\t['git:merge-tree:merge-base', '2.40'],\n\t// `merge-tree --write-tree` mode with `-z`/`--name-only`/`--no-messages`; the older trivial mode can't check conflicts\n\t['git:merge-tree:write-tree', '2.38'],\n\t// `patch-id` hashes a binary change through its blob ids; older ones hash the diff's text, so need `--binary` data\n\t['git:patch-id:binary-oids', '2.39'],\n\t// `patch-id --verbatim`: hashes whitespace and file-mode header lines instead of normalizing them away\n\t['git:patch-id:verbatim', '2.39'],\n\t['git:push:force-if-includes', '2.30.0'],\n\t// `--autosquash` WITHOUT `-i` (folding `fixup!`/`squash!` commits into a plain/automatic rebase).\n\t// Interactive rebases support autosquash on every git version GitLens supports, so this floor only\n\t// gates the non-interactive path.\n\t['git:rebase:autosquash', '2.44'],\n\t['git:rev-parse:end-of-options', '2.30'],\n\t['git:signing:ssh', '2.34.0'],\n\t['git:signing:x509', '2.19.0'],\n\t// Sparse-index support debuted earlier, but 2.33 shipped a corruption fix and 2.34 broadened command\n\t// support. Use 2.34 as the conservative floor before offering a repository mutation.\n\t['git:sparse-index', '2.34'],\n\t['git:stash:push:pathspecs', '2.13.2'],\n\t['git:stash:push:staged', '2.35.0'],\n\t['git:stash:push:stdin', '2.30.0'],\n\t['git:status:find-renames', '2.18'],\n\t['git:status:porcelain-v2', '2.11'],\n\t// `core.untrackedCache=true` (repo-local cache of untracked-file scans — the auto-tier config lever).\n\t['git:untrackedCache', '2.8'],\n\t['git:worktrees', '2.17.0'],\n]);\n"],"mappings":";AA6CA,MAAa,oBAAoB;AACjC,MAAa,uCAAuB,IAAI,IAAyB;CAChE,CAAC,mCAAmC,MAAM;CAG1C,CAAC,oBAAoB,MAAM;CAG3B,CAAC,kCAAkC,MAAM;CACzC,CAAC,iCAAiC,MAAM;CACxC,CAAC,iCAAiC,MAAM;CAGxC,CAAC,iBAAiB,MAAM;CAIxB,CAAC,uBAAuB,MAAM;CAC9B,CAAC,sBAAsB,MAAM;CAE7B,CAAC,sBAAsB,MAAM;CAI7B,CAAC,mBAAmB,MAAM;CAE1B,CAAC,6BAA6B,MAAM;CAGpC,CAAC,yBAAyB,MAAM;CAGhC,CAAC,iCAAiC,MAAM;CAExC,CAAC,iBAAiB,MAAM;CACxB,CAAC,6BAA6B,MAAM;CAEpC,CAAC,6BAA6B,MAAM;CAEpC,CAAC,4BAA4B,MAAM;CAEnC,CAAC,yBAAyB,MAAM;CAChC,CAAC,8BAA8B,QAAQ;CAIvC,CAAC,yBAAyB,MAAM;CAChC,CAAC,gCAAgC,MAAM;CACvC,CAAC,mBAAmB,QAAQ;CAC5B,CAAC,oBAAoB,QAAQ;CAG7B,CAAC,oBAAoB,MAAM;CAC3B,CAAC,4BAA4B,QAAQ;CACrC,CAAC,yBAAyB,QAAQ;CAClC,CAAC,wBAAwB,QAAQ;CACjC,CAAC,2BAA2B,MAAM;CAClC,CAAC,2BAA2B,MAAM;CAElC,CAAC,sBAAsB,KAAK;CAC5B,CAAC,iBAAiB,QAAQ;AAC3B,CAAC"}
+{"version":3,"file":"features.js","names":[],"sources":["../../../git/src/features.ts"],"sourcesContent":["// GitFeature's must start with `git:` to be recognized in all usages\nexport type GitFeatures =\n\t| 'git:checkout:pathspec-from-file'\n\t| 'git:commit-graph'\n\t| 'git:commit-graph:changed-paths'\n\t| 'git:fetch:all-config'\n\t| 'git:fetch:follow-remote-head'\n\t| 'git:fetch:no-write-fetch-head'\n\t| 'git:for-each-ref:ahead-behind'\n\t| 'git:for-each-ref:worktreePath'\n\t| 'git:fsmonitor'\n\t| 'git:fsmonitor:linux'\n\t| 'git:ignoreRevsFile'\n\t| 'git:index:skipHash'\n\t| 'git:maintenance'\n\t| 'git:maintenance:pack-refs'\n\t| 'git:maintenance:start'\n\t| 'git:maintenance:start:systemd'\n\t| 'git:manyFiles'\n\t| 'git:merge-tree:merge-base'\n\t| 'git:merge-tree:write-tree'\n\t| 'git:patch-id:binary-oids'\n\t| 'git:patch-id:verbatim'\n\t| 'git:push:force-if-includes'\n\t| 'git:rebase:autosquash'\n\t| 'git:rev-parse:end-of-options'\n\t| 'git:signing:ssh'\n\t| 'git:signing:x509'\n\t| 'git:sparse-index'\n\t| 'git:stash:push:pathspecs'\n\t| 'git:stash:push:staged'\n\t| 'git:stash:push:stdin'\n\t| 'git:status:find-renames'\n\t| 'git:status:ignored-matching'\n\t| 'git:status:porcelain-v2'\n\t| 'git:untrackedCache'\n\t| 'git:worktree:list:lock-reason'\n\t| 'git:worktrees';\n\ntype ExtractPrefix<T> = T extends `${infer Prefix}:${infer Rest}`\n\t? Rest extends `${infer SubPrefix}:${string}`\n\t\t? T | `${Prefix}:${SubPrefix}` | Prefix\n\t\t: T | Prefix\n\t: never;\n\nexport type GitFeatureOrPrefix = ExtractPrefix<GitFeatures>;\nexport type FilteredGitFeatures<T extends GitFeatureOrPrefix> = T extends GitFeatures\n\t? T\n\t: Extract<GitFeatures, T | `${T}:${string}`>;\n\nexport const gitMinimumVersion = '2.7.2';\nexport const gitFeaturesByVersion = new Map<GitFeatures, string>([\n\t['git:checkout:pathspec-from-file', '2.26'],\n\t// 2.24 is when git READS the commit-graph file by default (core.commitGraph on); writing it for\n\t// older gits would be dead weight.\n\t['git:commit-graph', '2.24'],\n\t// Changed-path Bloom filters (`--changed-paths`), the v2 filter format — pre-2.31 shipped Bloom filters\n\t// with real correctness bugs (bad results for merge commits), so 2.31 is the safe floor to write them.\n\t['git:commit-graph:changed-paths', '2.31'],\n\t// A bare `fetch` reads every remote when `fetch.all` is set\n\t['git:fetch:all-config', '2.44'],\n\t// A fetch using a remote's configured refspecs creates its missing `refs/remotes/<remote>/HEAD`\n\t// (`remote.<name>.followRemoteHEAD`, default `create`)\n\t['git:fetch:follow-remote-head', '2.48'],\n\t['git:fetch:no-write-fetch-head', '2.29'],\n\t// `%(ahead-behind:<commit>)` in for-each-ref formats\n\t['git:for-each-ref:ahead-behind', '2.41'],\n\t['git:for-each-ref:worktreePath', '2.23'],\n\t// `core.fsmonitor=true` selects the built-in FSMonitor daemon (accepting a bool rather than only a\n\t// hook path). This 2.37 floor is the Windows + macOS one.\n\t['git:fsmonitor', '2.37'],\n\t// Linux got its own FSMonitor backend (inotify) only in 2.55, hence a separate floor. Note the backend\n\t// places a watch on EVERY directory, so a large repo can exhaust `fs.inotify.max_user_watches` and the\n\t// daemon fails at runtime even on a new enough git — the apply path must still probe, not just gate.\n\t['git:fsmonitor:linux', '2.55'],\n\t['git:ignoreRevsFile', '2.23'],\n\t// `index.skipHash` (skip the trailing index checksum for faster writes); part of `feature.manyFiles`.\n\t['git:index:skipHash', '2.40'],\n\t// `git maintenance run --task=…`. The `maintenance` builtin + `commit-graph`/`gc` tasks are 2.29, but\n\t// the loose-objects + incremental-repack tasks the auto tier uses landed in 2.30 (and `core.multiPackIndex`\n\t// is default-on from 2.30, so no separate midx config write is needed) — 2.30 is the safe floor.\n\t['git:maintenance', '2.30'],\n\t// The pack-refs maintenance task landed one release after the maintenance builtin.\n\t['git:maintenance:pack-refs', '2.31'],\n\t// `git maintenance start` — the subcommands exist from 2.30 (cron only); launchctl (macOS) + schtasks\n\t// (Windows) scheduling arrived in 2.31, so 2.31 is the cross-platform-safe floor.\n\t['git:maintenance:start', '2.31'],\n\t// `git maintenance start` systemd-timer scheduling. On Linux, 2.31–2.33 is cron-only and modern distros\n\t// often ship without cron (scheduling then silently fails); the systemd fallback arrived in 2.34.\n\t['git:maintenance:start:systemd', '2.34'],\n\t// `feature.manyFiles` umbrella (index v4 + untracked cache + skipHash where available).\n\t['git:manyFiles', '2.24'],\n\t['git:merge-tree:merge-base', '2.40'],\n\t// `merge-tree --write-tree` mode with `-z`/`--name-only`/`--no-messages`; the older trivial mode can't check conflicts\n\t['git:merge-tree:write-tree', '2.38'],\n\t// `patch-id` hashes a binary change through its blob ids; older ones hash the diff's text, so need `--binary` data\n\t['git:patch-id:binary-oids', '2.39'],\n\t// `patch-id --verbatim`: hashes whitespace and file-mode header lines instead of normalizing them away\n\t['git:patch-id:verbatim', '2.39'],\n\t['git:push:force-if-includes', '2.30.0'],\n\t// `--autosquash` WITHOUT `-i` (folding `fixup!`/`squash!` commits into a plain/automatic rebase).\n\t// Interactive rebases support autosquash on every git version GitLens supports, so this floor only\n\t// gates the non-interactive path.\n\t['git:rebase:autosquash', '2.44'],\n\t['git:rev-parse:end-of-options', '2.30'],\n\t['git:signing:ssh', '2.34.0'],\n\t['git:signing:x509', '2.19.0'],\n\t// Sparse-index support debuted earlier, but 2.33 shipped a corruption fix and 2.34 broadened command\n\t// support. Use 2.34 as the conservative floor before offering a repository mutation.\n\t['git:sparse-index', '2.34'],\n\t['git:stash:push:pathspecs', '2.13.2'],\n\t['git:stash:push:staged', '2.35.0'],\n\t['git:stash:push:stdin', '2.30.0'],\n\t['git:status:find-renames', '2.18'],\n\t// `status --ignored=matching`: an ignored folder is one entry, without a walk of what is inside it\n\t['git:status:ignored-matching', '2.16'],\n\t['git:status:porcelain-v2', '2.11'],\n\t// `core.untrackedCache=true` (repo-local cache of untracked-file scans — the auto-tier config lever).\n\t['git:untrackedCache', '2.8'],\n\t// `worktree list --porcelain` prints a lock's reason (`locked <reason>`); older ones print a bare `locked`\n\t['git:worktree:list:lock-reason', '2.31'],\n\t['git:worktrees', '2.17.0'],\n]);\n"],"mappings":";AAkDA,MAAa,oBAAoB;AACjC,MAAa,uCAAuB,IAAI,IAAyB;CAChE,CAAC,mCAAmC,MAAM;CAG1C,CAAC,oBAAoB,MAAM;CAG3B,CAAC,kCAAkC,MAAM;CAEzC,CAAC,wBAAwB,MAAM;CAG/B,CAAC,gCAAgC,MAAM;CACvC,CAAC,iCAAiC,MAAM;CAExC,CAAC,iCAAiC,MAAM;CACxC,CAAC,iCAAiC,MAAM;CAGxC,CAAC,iBAAiB,MAAM;CAIxB,CAAC,uBAAuB,MAAM;CAC9B,CAAC,sBAAsB,MAAM;CAE7B,CAAC,sBAAsB,MAAM;CAI7B,CAAC,mBAAmB,MAAM;CAE1B,CAAC,6BAA6B,MAAM;CAGpC,CAAC,yBAAyB,MAAM;CAGhC,CAAC,iCAAiC,MAAM;CAExC,CAAC,iBAAiB,MAAM;CACxB,CAAC,6BAA6B,MAAM;CAEpC,CAAC,6BAA6B,MAAM;CAEpC,CAAC,4BAA4B,MAAM;CAEnC,CAAC,yBAAyB,MAAM;CAChC,CAAC,8BAA8B,QAAQ;CAIvC,CAAC,yBAAyB,MAAM;CAChC,CAAC,gCAAgC,MAAM;CACvC,CAAC,mBAAmB,QAAQ;CAC5B,CAAC,oBAAoB,QAAQ;CAG7B,CAAC,oBAAoB,MAAM;CAC3B,CAAC,4BAA4B,QAAQ;CACrC,CAAC,yBAAyB,QAAQ;CAClC,CAAC,wBAAwB,QAAQ;CACjC,CAAC,2BAA2B,MAAM;CAElC,CAAC,+BAA+B,MAAM;CACtC,CAAC,2BAA2B,MAAM;CAElC,CAAC,sBAAsB,KAAK;CAE5B,CAAC,iCAAiC,MAAM;CACxC,CAAC,iBAAiB,QAAQ;AAC3B,CAAC"}

package/dist/git/models/branch.d.ts

@@ -3,6 +3,12 @@ import { Shape } from "../../utils/types.js";
 import { GitBranchReference } from "./reference.js";
 //#region ../git/src/models/branch.d.ts
 export type BranchDisposition = 'starred' | 'archived';
+/** The `.git/gk/config` keys (`branch.<name>.<key>`) a branch's {@link BranchMetadata} is read from */
+export type BranchMetadataGkConfigKey = 'gk-last-accessed' | 'gk-last-modified' | 'gk-agent-last-activity' | 'gk-disposition';
+/**
+ * A branch's `.git/gk/config` metadata. Unlike other cached values, the cache updates these objects in place when a
+ * key changes (see `Cache.patchBranchMetadata`), so every `GitBranch` holding one, old or new, reads the new value
+ */
 export interface BranchMetadata {
   lastAccessedAt?: string;
   lastModifiedAt?: string;
@@ -15,7 +21,10 @@ export declare class GitBranch implements GitBranchReference {
   readonly refName: string;
   readonly current: boolean;
   readonly date: Date | undefined;
-  /** GK config metadata (dates, disposition) */
+  /**
+   * GK config metadata (dates, disposition), shared with the cache and updated in place: comparing an old and a
+   * new branch can't detect a changed stamp (no change event fires for one either)
+   */
   readonly metadata: BranchMetadata | undefined;
   readonly sha?: string | undefined;
   readonly upstream?: GitTrackingUpstream | undefined;
@@ -32,7 +41,10 @@ export declare class GitBranch implements GitBranchReference {
   private readonly _remote;
   get remote(): boolean;
   constructor(repoPath: string, refName: string, current: boolean, date: Date | undefined,
-  /** GK config metadata (dates, disposition) */
+  /**
+   * GK config metadata (dates, disposition), shared with the cache and updated in place: comparing an old and a
+   * new branch can't detect a changed stamp (no change event fires for one either)
+   */
   metadata: BranchMetadata | undefined, sha?: string | undefined, upstream?: GitTrackingUpstream | undefined, worktree?: {
     path: string;
     isDefault: boolean;
@@ -43,6 +55,7 @@ export declare class GitBranch implements GitBranchReference {
   /** @returns The most recent date among lastModifiedDate, lastAccessedDate, and branch.date */
   get effectiveDate(): Date | undefined;
   get lastAccessedDate(): Date | undefined;
+  /** When a checkout's working tree or index last changed while on this branch (`gk-last-modified`), not only commits */
   get lastModifiedDate(): Date | undefined;
   get nameWithoutRemote(): string;
   get ref(): string;
@@ -75,6 +88,11 @@ export interface GitTrackingState {
 }
 export interface GitTrackingUpstream {
   readonly name: string;
+  /**
+   * The remote the upstream is on (`branch.<name>.remote`) as git reports it, so a remote whose own name contains a
+   * `/` stays whole. `undefined` when git is too old to report it (before 2.23 here) or the upstream is a local branch
+   */
+  readonly remote?: string;
   readonly missing: boolean;
   readonly state: GitTrackingState;
 }

package/dist/git/models/branch.js

@@ -1,13 +1,36 @@
 import { loggable } from "../../utils/decorators/log.js";
 import { memoize } from "../../utils/decorators/memoize.js";
 import { getBranchId, getRemoteNameFromBranchName, getRemoteNameSlashIndex } from "../../utils/gitRefs.js";
+import { formatDetachedHeadName, getBranchTrackingWithoutRemote, isDetachedHead, parseRefName } from "../utils/branch.utils.js";
 import __decorate from "../../_virtual/@oxc-project+runtime/helpers/esm/decorate.js";
 import { formatDate, fromNow } from "../../utils/date.js";
 import { serializable } from "../../utils/decorators/serializable.js";
-import { formatDetachedHeadName, getBranchTrackingWithoutRemote, isDetachedHead, parseRefName } from "../utils/branch.utils.js";
 import { getUpstreamStatus } from "../utils/status.utils.js";
 //#region ../git/src/models/branch.ts
 var _GitBranch;
+/**
+* Each metadata object's last parsed stamps. Not `@memoize`d on the branch: the cache updates `BranchMetadata` in
+* place, so a parse is reused only while its stamp is unchanged — and shared by every branch holding the object.
+*/
+const stampDates = /* @__PURE__ */ new WeakMap();
+function getStampDate(metadata, field) {
+	const stamp = metadata[field];
+	if (!stamp) return void 0;
+	let parsed = stampDates.get(metadata);
+	if (parsed == null) {
+		parsed = {};
+		stampDates.set(metadata, parsed);
+	}
+	let entry = parsed[field];
+	if (entry?.stamp !== stamp) {
+		entry = {
+			stamp,
+			date: new Date(stamp)
+		};
+		parsed[field] = entry;
+	}
+	return entry.date;
+}
 let GitBranch = _GitBranch = class GitBranch {
 	repoPath;
 	refName;
@@ -70,10 +93,11 @@ let GitBranch = _GitBranch = class GitBranch {
 		return maxTime != null ? new Date(maxTime) : void 0;
 	}
 	get lastAccessedDate() {
-		return this.metadata?.lastAccessedAt ? new Date(this.metadata.lastAccessedAt) : void 0;
+		return this.metadata != null ? getStampDate(this.metadata, "lastAccessedAt") : void 0;
 	}
+	/** When a checkout's working tree or index last changed while on this branch (`gk-last-modified`), not only commits */
 	get lastModifiedDate() {
-		return this.metadata?.lastModifiedAt ? new Date(this.metadata.lastModifiedAt) : void 0;
+		return this.metadata != null ? getStampDate(this.metadata, "lastModifiedAt") : void 0;
 	}
 	get nameWithoutRemote() {
 		return this.remote ? this.name.substring(getRemoteNameSlashIndex(this.name) + 1) : this.name;
@@ -83,7 +107,7 @@ let GitBranch = _GitBranch = class GitBranch {
 	}
 	get remoteName() {
 		if (this.remote) return getRemoteNameFromBranchName(this.name);
-		if (this.upstream != null) return getRemoteNameFromBranchName(this.upstream.name);
+		if (this.upstream != null) return this.upstream.remote ?? getRemoteNameFromBranchName(this.upstream.name);
 	}
 	get starred() {
 		return this.metadata?.disposition === "starred";
@@ -123,8 +147,6 @@ let GitBranch = _GitBranch = class GitBranch {
 	}
 };
 __decorate([memoize()], GitBranch.prototype, "basename", null);
-__decorate([memoize()], GitBranch.prototype, "lastAccessedDate", null);
-__decorate([memoize()], GitBranch.prototype, "lastModifiedDate", null);
 __decorate([memoize()], GitBranch.prototype, "nameWithoutRemote", null);
 __decorate([memoize()], GitBranch.prototype, "remoteName", null);
 __decorate([memoize()], GitBranch.prototype, "trackingWithoutRemote", null);

package/dist/git/models/branch.js.map

@@ -1 +1 @@
-{"version":3,"file":"branch.js","names":[],"sources":["../../../../git/src/models/branch.ts"],"sourcesContent":["import { formatDate, fromNow } from '@gitlens/utils/date.js';\nimport { loggable } from '@gitlens/utils/decorators/log.js';\nimport { memoize } from '@gitlens/utils/decorators/memoize.js';\nimport { serializable } from '@gitlens/utils/decorators/serializable.js';\nimport { getBranchId, getRemoteNameFromBranchName, getRemoteNameSlashIndex } from '@gitlens/utils/gitRefs.js';\nimport type { MaybePausedResult } from '@gitlens/utils/promise.js';\nimport type { Shape } from '@gitlens/utils/types.js';\nimport {\n\tformatDetachedHeadName,\n\tgetBranchTrackingWithoutRemote,\n\tisDetachedHead,\n\tparseRefName,\n} from '../utils/branch.utils.js';\nimport { getUpstreamStatus } from '../utils/status.utils.js';\nimport type { GitBranchReference } from './reference.js';\n\nexport type BranchDisposition = 'starred' | 'archived';\n\nexport interface BranchMetadata {\n\tlastAccessedAt?: string;\n\tlastModifiedAt?: string;\n\tagentLastActivityAt?: string;\n\tdisposition?: BranchDisposition;\n}\n\nexport type GitBranchShape = Shape<GitBranch>;\n\n@loggable(i => i.id)\n@serializable\nexport class GitBranch implements GitBranchReference {\n\treadonly refType = 'branch';\n\treadonly detached: boolean;\n\treadonly id: string;\n\n\tprivate readonly _name: string;\n\tget name(): string {\n\t\treturn this._name;\n\t}\n\n\tprivate readonly _remote: boolean;\n\tget remote(): boolean {\n\t\treturn this._remote;\n\t}\n\n\tconstructor(\n\t\tpublic readonly repoPath: string,\n\t\tpublic readonly refName: string,\n\t\tpublic readonly current: boolean,\n\t\tpublic readonly date: Date | undefined,\n\t\t/** GK config metadata (dates, disposition) */\n\t\tpublic readonly metadata: BranchMetadata | undefined,\n\t\tpublic readonly sha?: string,\n\t\tpublic readonly upstream?: GitTrackingUpstream,\n\t\tpublic readonly worktree?: { path: string; isDefault: boolean } | false,\n\t\tdetached: boolean = false,\n\t\tpublic readonly rebasing: boolean = false,\n\t) {\n\t\t({ name: this._name, remote: this._remote } = parseRefName(refName));\n\n\t\tthis.detached = detached || (this.current ? isDetachedHead(this._name) : false);\n\t\tif (this.detached) {\n\t\t\tthis.id = getBranchId(repoPath, this._remote, this.sha!);\n\t\t\tthis._name = formatDetachedHeadName(this.sha!);\n\t\t} else {\n\t\t\tthis.id = getBranchId(repoPath, this._remote, this._name);\n\t\t}\n\n\t\tthis.upstream = upstream?.name ? upstream : undefined;\n\t}\n\n\tget archived(): boolean {\n\t\treturn this.metadata?.disposition === 'archived';\n\t}\n\n\t@memoize()\n\tget basename(): string {\n\t\tconst name = this.nameWithoutRemote;\n\t\tconst index = name.lastIndexOf('/');\n\t\treturn index !== -1 ? name.substring(index + 1) : name;\n\t}\n\n\tget disposition(): BranchDisposition | undefined {\n\t\treturn this.metadata?.disposition;\n\t}\n\n\t/** @returns The most recent date among lastModifiedDate, lastAccessedDate, and branch.date */\n\tget effectiveDate(): Date | undefined {\n\t\tlet maxTime: number | undefined;\n\n\t\tconst accessed = this.lastAccessedDate?.getTime();\n\t\tif (accessed != null && (maxTime == null || accessed > maxTime)) {\n\t\t\tmaxTime = accessed;\n\t\t}\n\n\t\tconst modified = this.lastModifiedDate?.getTime();\n\t\tif (modified != null && (maxTime == null || modified > maxTime)) {\n\t\t\tmaxTime = modified;\n\t\t}\n\n\t\tconst date = this.date?.getTime();\n\t\tif (date != null && (maxTime == null || date > maxTime)) {\n\t\t\tmaxTime = date;\n\t\t}\n\n\t\treturn maxTime != null ? new Date(maxTime) : undefined;\n\t}\n\n\t@memoize()\n\tget lastAccessedDate(): Date | undefined {\n\t\treturn this.metadata?.lastAccessedAt ? new Date(this.metadata.lastAccessedAt) : undefined;\n\t}\n\n\t@memoize()\n\tget lastModifiedDate(): Date | undefined {\n\t\treturn this.metadata?.lastModifiedAt ? new Date(this.metadata.lastModifiedAt) : undefined;\n\t}\n\n\t@memoize()\n\tget nameWithoutRemote(): string {\n\t\treturn this.remote ? this.name.substring(getRemoteNameSlashIndex(this.name) + 1) : this.name;\n\t}\n\n\tget ref(): string {\n\t\treturn this.detached ? this.sha! : this._name;\n\t}\n\n\t@memoize()\n\tget remoteName(): string | undefined {\n\t\tif (this.remote) return getRemoteNameFromBranchName(this.name);\n\t\tif (this.upstream != null) return getRemoteNameFromBranchName(this.upstream.name);\n\n\t\treturn undefined;\n\t}\n\n\tget starred(): boolean {\n\t\treturn this.metadata?.disposition === 'starred';\n\t}\n\n\tget status(): GitBranchStatus {\n\t\tif (this.remote) return 'remote';\n\t\tif (this.upstream == null) return this.detached ? 'detached' : 'local';\n\n\t\tif (this.upstream.missing) return 'missingUpstream';\n\t\tif (this.upstream.state.ahead && this.upstream.state.behind) return 'diverged';\n\t\tif (this.upstream.state.ahead) return 'ahead';\n\t\tif (this.upstream.state.behind) return 'behind';\n\t\treturn 'upToDate';\n\t}\n\n\t@memoize()\n\tget trackingWithoutRemote(): string | undefined {\n\t\treturn getBranchTrackingWithoutRemote(this);\n\t}\n\n\t/** Creates a copy of this branch with a different repoPath and optionally a different current flag — ONLY used for worktree-aware caching */\n\twithRepoPath(repoPath: string, current?: boolean): GitBranch {\n\t\tconst newCurrent = current ?? this.current;\n\t\tif (repoPath === this.repoPath && newCurrent === this.current) return this;\n\t\treturn new GitBranch(\n\t\t\trepoPath,\n\t\t\tthis.refName,\n\t\t\tnewCurrent,\n\t\t\tthis.date,\n\t\t\tthis.metadata,\n\t\t\tthis.sha,\n\t\t\tthis.upstream,\n\t\t\tthis.worktree,\n\t\t\tthis.detached,\n\t\t\tthis.rebasing,\n\t\t);\n\t}\n\n\tstatic is(branch: unknown): branch is GitBranch {\n\t\treturn branch instanceof GitBranch;\n\t}\n\n\tstatic formatDate(branch: GitBranchShape, format?: string | null): string {\n\t\treturn branch.date != null ? formatDate(branch.date, format ?? 'MMMM Do, YYYY h:mma') : '';\n\t}\n\n\tstatic formatDateFromNow(branch: GitBranchShape): string {\n\t\treturn branch.date != null ? fromNow(branch.date) : '';\n\t}\n\n\tstatic formatDateWithStyle(\n\t\tbranch: GitBranchShape,\n\t\tformatting: { dateStyle: string; dateFormat: string | null },\n\t): string {\n\t\treturn formatting.dateStyle === 'absolute'\n\t\t\t? GitBranch.formatDate(branch, formatting.dateFormat)\n\t\t\t: GitBranch.formatDateFromNow(branch);\n\t}\n\n\tstatic getTrackingStatus(\n\t\tbranch: GitBranchShape,\n\t\toptions?: {\n\t\t\tcount?: boolean;\n\t\t\tempty?: string;\n\t\t\texpand?: boolean;\n\t\t\ticons?: boolean;\n\t\t\tprefix?: string;\n\t\t\tseparator?: string;\n\t\t\tsuffix?: string;\n\t\t},\n\t): string {\n\t\treturn getUpstreamStatus(branch.upstream, options);\n\t}\n}\n\nexport interface GitTrackingState {\n\treadonly ahead: number;\n\treadonly behind: number;\n}\n\nexport interface GitTrackingUpstream {\n\treadonly name: string;\n\treadonly missing: boolean;\n\treadonly state: GitTrackingState;\n}\n\nexport type GitBranchStatus =\n\t| 'local'\n\t| 'detached'\n\t| 'ahead'\n\t| 'behind'\n\t| 'diverged'\n\t| 'upToDate'\n\t| 'missingUpstream'\n\t| 'remote';\n\nexport interface BranchTargetInfo {\n\tmergeTargetBranch: MaybePausedResult<string | undefined>;\n\tbaseBranch: string | undefined;\n\tdefaultBranch: string | undefined;\n}\n"],"mappings":"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"}
+{"version":3,"file":"branch.js","names":[],"sources":["../../../../git/src/models/branch.ts"],"sourcesContent":["import { formatDate, fromNow } from '@gitlens/utils/date.js';\nimport { loggable } from '@gitlens/utils/decorators/log.js';\nimport { memoize } from '@gitlens/utils/decorators/memoize.js';\nimport { serializable } from '@gitlens/utils/decorators/serializable.js';\nimport { getBranchId, getRemoteNameFromBranchName, getRemoteNameSlashIndex } from '@gitlens/utils/gitRefs.js';\nimport type { MaybePausedResult } from '@gitlens/utils/promise.js';\nimport type { Shape } from '@gitlens/utils/types.js';\nimport {\n\tformatDetachedHeadName,\n\tgetBranchTrackingWithoutRemote,\n\tisDetachedHead,\n\tparseRefName,\n} from '../utils/branch.utils.js';\nimport { getUpstreamStatus } from '../utils/status.utils.js';\nimport type { GitBranchReference } from './reference.js';\n\nexport type BranchDisposition = 'starred' | 'archived';\n\n/** The `.git/gk/config` keys (`branch.<name>.<key>`) a branch's {@link BranchMetadata} is read from */\nexport type BranchMetadataGkConfigKey =\n\t| 'gk-last-accessed'\n\t| 'gk-last-modified'\n\t| 'gk-agent-last-activity'\n\t| 'gk-disposition';\n\n/**\n * A branch's `.git/gk/config` metadata. Unlike other cached values, the cache updates these objects in place when a\n * key changes (see `Cache.patchBranchMetadata`), so every `GitBranch` holding one, old or new, reads the new value\n */\nexport interface BranchMetadata {\n\tlastAccessedAt?: string;\n\tlastModifiedAt?: string;\n\tagentLastActivityAt?: string;\n\tdisposition?: BranchDisposition;\n}\n\nexport type GitBranchShape = Shape<GitBranch>;\n\n/**\n * Each metadata object's last parsed stamps. Not `@memoize`d on the branch: the cache updates `BranchMetadata` in\n * place, so a parse is reused only while its stamp is unchanged — and shared by every branch holding the object.\n */\nconst stampDates = new WeakMap<BranchMetadata, Partial<Record<StampField, { stamp: string; date: Date }>>>();\ntype StampField = 'lastAccessedAt' | 'lastModifiedAt';\n\nfunction getStampDate(metadata: BranchMetadata, field: StampField): Date | undefined {\n\tconst stamp = metadata[field];\n\tif (!stamp) return undefined;\n\n\tlet parsed = stampDates.get(metadata);\n\tif (parsed == null) {\n\t\tparsed = {};\n\t\tstampDates.set(metadata, parsed);\n\t}\n\n\tlet entry = parsed[field];\n\tif (entry?.stamp !== stamp) {\n\t\tentry = { stamp: stamp, date: new Date(stamp) };\n\t\tparsed[field] = entry;\n\t}\n\treturn entry.date;\n}\n\n@loggable(i => i.id)\n@serializable\nexport class GitBranch implements GitBranchReference {\n\treadonly refType = 'branch';\n\treadonly detached: boolean;\n\treadonly id: string;\n\n\tprivate readonly _name: string;\n\tget name(): string {\n\t\treturn this._name;\n\t}\n\n\tprivate readonly _remote: boolean;\n\tget remote(): boolean {\n\t\treturn this._remote;\n\t}\n\n\tconstructor(\n\t\tpublic readonly repoPath: string,\n\t\tpublic readonly refName: string,\n\t\tpublic readonly current: boolean,\n\t\tpublic readonly date: Date | undefined,\n\t\t/**\n\t\t * GK config metadata (dates, disposition), shared with the cache and updated in place: comparing an old and a\n\t\t * new branch can't detect a changed stamp (no change event fires for one either)\n\t\t */\n\t\tpublic readonly metadata: BranchMetadata | undefined,\n\t\tpublic readonly sha?: string,\n\t\tpublic readonly upstream?: GitTrackingUpstream,\n\t\tpublic readonly worktree?: { path: string; isDefault: boolean } | false,\n\t\tdetached: boolean = false,\n\t\tpublic readonly rebasing: boolean = false,\n\t) {\n\t\t({ name: this._name, remote: this._remote } = parseRefName(refName));\n\n\t\tthis.detached = detached || (this.current ? isDetachedHead(this._name) : false);\n\t\tif (this.detached) {\n\t\t\tthis.id = getBranchId(repoPath, this._remote, this.sha!);\n\t\t\tthis._name = formatDetachedHeadName(this.sha!);\n\t\t} else {\n\t\t\tthis.id = getBranchId(repoPath, this._remote, this._name);\n\t\t}\n\n\t\tthis.upstream = upstream?.name ? upstream : undefined;\n\t}\n\n\tget archived(): boolean {\n\t\treturn this.metadata?.disposition === 'archived';\n\t}\n\n\t@memoize()\n\tget basename(): string {\n\t\tconst name = this.nameWithoutRemote;\n\t\tconst index = name.lastIndexOf('/');\n\t\treturn index !== -1 ? name.substring(index + 1) : name;\n\t}\n\n\tget disposition(): BranchDisposition | undefined {\n\t\treturn this.metadata?.disposition;\n\t}\n\n\t/** @returns The most recent date among lastModifiedDate, lastAccessedDate, and branch.date */\n\tget effectiveDate(): Date | undefined {\n\t\tlet maxTime: number | undefined;\n\n\t\tconst accessed = this.lastAccessedDate?.getTime();\n\t\tif (accessed != null && (maxTime == null || accessed > maxTime)) {\n\t\t\tmaxTime = accessed;\n\t\t}\n\n\t\tconst modified = this.lastModifiedDate?.getTime();\n\t\tif (modified != null && (maxTime == null || modified > maxTime)) {\n\t\t\tmaxTime = modified;\n\t\t}\n\n\t\tconst date = this.date?.getTime();\n\t\tif (date != null && (maxTime == null || date > maxTime)) {\n\t\t\tmaxTime = date;\n\t\t}\n\n\t\treturn maxTime != null ? new Date(maxTime) : undefined;\n\t}\n\n\tget lastAccessedDate(): Date | undefined {\n\t\treturn this.metadata != null ? getStampDate(this.metadata, 'lastAccessedAt') : undefined;\n\t}\n\n\t/** When a checkout's working tree or index last changed while on this branch (`gk-last-modified`), not only commits */\n\tget lastModifiedDate(): Date | undefined {\n\t\treturn this.metadata != null ? getStampDate(this.metadata, 'lastModifiedAt') : undefined;\n\t}\n\n\t@memoize()\n\tget nameWithoutRemote(): string {\n\t\treturn this.remote ? this.name.substring(getRemoteNameSlashIndex(this.name) + 1) : this.name;\n\t}\n\n\tget ref(): string {\n\t\treturn this.detached ? this.sha! : this._name;\n\t}\n\n\t@memoize()\n\tget remoteName(): string | undefined {\n\t\tif (this.remote) return getRemoteNameFromBranchName(this.name);\n\t\tif (this.upstream != null) return this.upstream.remote ?? getRemoteNameFromBranchName(this.upstream.name);\n\n\t\treturn undefined;\n\t}\n\n\tget starred(): boolean {\n\t\treturn this.metadata?.disposition === 'starred';\n\t}\n\n\tget status(): GitBranchStatus {\n\t\tif (this.remote) return 'remote';\n\t\tif (this.upstream == null) return this.detached ? 'detached' : 'local';\n\n\t\tif (this.upstream.missing) return 'missingUpstream';\n\t\tif (this.upstream.state.ahead && this.upstream.state.behind) return 'diverged';\n\t\tif (this.upstream.state.ahead) return 'ahead';\n\t\tif (this.upstream.state.behind) return 'behind';\n\t\treturn 'upToDate';\n\t}\n\n\t@memoize()\n\tget trackingWithoutRemote(): string | undefined {\n\t\treturn getBranchTrackingWithoutRemote(this);\n\t}\n\n\t/** Creates a copy of this branch with a different repoPath and optionally a different current flag — ONLY used for worktree-aware caching */\n\twithRepoPath(repoPath: string, current?: boolean): GitBranch {\n\t\tconst newCurrent = current ?? this.current;\n\t\tif (repoPath === this.repoPath && newCurrent === this.current) return this;\n\t\treturn new GitBranch(\n\t\t\trepoPath,\n\t\t\tthis.refName,\n\t\t\tnewCurrent,\n\t\t\tthis.date,\n\t\t\tthis.metadata,\n\t\t\tthis.sha,\n\t\t\tthis.upstream,\n\t\t\tthis.worktree,\n\t\t\tthis.detached,\n\t\t\tthis.rebasing,\n\t\t);\n\t}\n\n\tstatic is(branch: unknown): branch is GitBranch {\n\t\treturn branch instanceof GitBranch;\n\t}\n\n\tstatic formatDate(branch: GitBranchShape, format?: string | null): string {\n\t\treturn branch.date != null ? formatDate(branch.date, format ?? 'MMMM Do, YYYY h:mma') : '';\n\t}\n\n\tstatic formatDateFromNow(branch: GitBranchShape): string {\n\t\treturn branch.date != null ? fromNow(branch.date) : '';\n\t}\n\n\tstatic formatDateWithStyle(\n\t\tbranch: GitBranchShape,\n\t\tformatting: { dateStyle: string; dateFormat: string | null },\n\t): string {\n\t\treturn formatting.dateStyle === 'absolute'\n\t\t\t? GitBranch.formatDate(branch, formatting.dateFormat)\n\t\t\t: GitBranch.formatDateFromNow(branch);\n\t}\n\n\tstatic getTrackingStatus(\n\t\tbranch: GitBranchShape,\n\t\toptions?: {\n\t\t\tcount?: boolean;\n\t\t\tempty?: string;\n\t\t\texpand?: boolean;\n\t\t\ticons?: boolean;\n\t\t\tprefix?: string;\n\t\t\tseparator?: string;\n\t\t\tsuffix?: string;\n\t\t},\n\t): string {\n\t\treturn getUpstreamStatus(branch.upstream, options);\n\t}\n}\n\nexport interface GitTrackingState {\n\treadonly ahead: number;\n\treadonly behind: number;\n}\n\nexport interface GitTrackingUpstream {\n\treadonly name: string;\n\t/**\n\t * The remote the upstream is on (`branch.<name>.remote`) as git reports it, so a remote whose own name contains a\n\t * `/` stays whole. `undefined` when git is too old to report it (before 2.23 here) or the upstream is a local branch\n\t */\n\treadonly remote?: string;\n\treadonly missing: boolean;\n\treadonly state: GitTrackingState;\n}\n\nexport type GitBranchStatus =\n\t| 'local'\n\t| 'detached'\n\t| 'ahead'\n\t| 'behind'\n\t| 'diverged'\n\t| 'upToDate'\n\t| 'missingUpstream'\n\t| 'remote';\n\nexport interface BranchTargetInfo {\n\tmergeTargetBranch: MaybePausedResult<string | undefined>;\n\tbaseBranch: string | undefined;\n\tdefaultBranch: string | undefined;\n}\n"],"mappings":"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"}

package/dist/git/models/reference.d.ts

@@ -9,6 +9,7 @@ export interface GitBranchReference {
   readonly upstream?: {
     name: string;
     missing: boolean;
+    remote?: string;
   };
   readonly worktree?: {
     path: string;
@@ -76,6 +77,8 @@ export interface RefRecord {
   authorDate: string;
   subject: string;
   worktreePath?: string;
+  /** `%(upstream:remotename)` — the remote a local branch tracks on (`.` for a local upstream); only read where git supports it */
+  upstreamRemote?: string;
 }
 //#endregion
 //# sourceMappingURL=reference.d.ts.map

package/dist/git/models/status.js

@@ -1,10 +1,10 @@
 import { loggable } from "../../utils/decorators/log.js";
 import { memoize } from "../../utils/decorators/memoize.js";
+import { formatDetachedHeadName, isDetachedHead } from "../utils/branch.utils.js";
 import __decorate from "../../_virtual/@oxc-project+runtime/helpers/esm/decorate.js";
 import { serializable } from "../../utils/decorators/serializable.js";
-import { GitFileConflictStatus, GitFileIndexStatus, GitFileWorkingTreeStatus } from "./fileStatus.js";
-import { formatDetachedHeadName, isDetachedHead } from "../utils/branch.utils.js";
 import { getFormattedDiffStatus, getUpstreamStatus } from "../utils/status.utils.js";
+import { GitFileConflictStatus, GitFileIndexStatus, GitFileWorkingTreeStatus } from "./fileStatus.js";
 //#region ../git/src/models/status.ts
 var _GitStatus;
 let GitStatus = _GitStatus = class GitStatus {

package/dist/git/models/worktree.d.ts

@@ -24,7 +24,10 @@ export declare class GitWorktree {
     readonly name: string;
   } | undefined);
   get date(): Date | undefined;
-  /** @returns The most recent date among lastModifiedDate, lastAccessedDate, and branch.date */
+  /**
+   * @returns The most recent date among lastModifiedDate, lastAccessedDate, and branch.date. Not memoized: the stamps
+   * change in place (see `BranchMetadata`)
+   */
   get effectiveDate(): Date | undefined;
   /** Timestamp when the worktree branch was last accessed or modified */
   get lastAccessedDate(): Date | undefined;

package/dist/git/models/worktree.js

@@ -33,7 +33,10 @@ let GitWorktree = _GitWorktree = class GitWorktree {
 	get date() {
 		return this.branch?.date;
 	}
-	/** @returns The most recent date among lastModifiedDate, lastAccessedDate, and branch.date */
+	/**
+	* @returns The most recent date among lastModifiedDate, lastAccessedDate, and branch.date. Not memoized: the stamps
+	* change in place (see `BranchMetadata`)
+	*/
 	get effectiveDate() {
 		let maxTime;
 		const accessed = this.lastAccessedDate?.getTime();
@@ -95,7 +98,6 @@ let GitWorktree = _GitWorktree = class GitWorktree {
 		return getRepositoryService(worktree.path)?.status.hasWorkingChanges(options);
 	}
 };
-__decorate([memoize()], GitWorktree.prototype, "effectiveDate", null);
 __decorate([memoize()], GitWorktree.prototype, "friendlyPath", null);
 __decorate([memoize()], GitWorktree.prototype, "name", null);
 GitWorktree = _GitWorktree = __decorate([loggable((i) => i.uri.toString()), serializable], GitWorktree);

package/dist/git/models/worktree.js.map

@@ -1 +1 @@
-{"version":3,"file":"worktree.js","names":[],"sources":["../../../../git/src/models/worktree.ts"],"sourcesContent":["import { formatDate, fromNow } from '@gitlens/utils/date.js';\nimport { loggable } from '@gitlens/utils/decorators/log.js';\nimport { memoize } from '@gitlens/utils/decorators/memoize.js';\nimport { serializable } from '@gitlens/utils/decorators/serializable.js';\nimport { basename, normalizePath, relative } from '@gitlens/utils/path.js';\nimport type { Shape } from '@gitlens/utils/types.js';\nimport type { Uri } from '@gitlens/utils/uri.js';\nimport { getRepositoryService } from '../repositoryService.js';\nimport type { GitCommandPriority } from '../run.types.js';\nimport { getRepositoryOrWorktreePath } from '../utils/repository.utils.js';\nimport { shortenRevision } from '../utils/revision.utils.js';\nimport type { GitBranch } from './branch.js';\nimport type { GitStatus } from './status.js';\n\nexport type GitWorktreeShape = Shape<GitWorktree>;\n\nexport type WorkspaceFolderResolver = (uri: Uri) => GitWorktree['workspaceFolder'] | undefined;\n\n@loggable(i => i.uri.toString())\n@serializable\nexport class GitWorktree {\n\tconstructor(\n\t\tpublic readonly isDefault: boolean,\n\t\tpublic readonly type: 'bare' | 'branch' | 'detached',\n\t\tpublic readonly repoPath: string,\n\t\tpublic readonly uri: Uri,\n\t\tpublic readonly locked: boolean | string,\n\t\tpublic readonly prunable: boolean | string,\n\t\tpublic readonly sha?: string,\n\t\tpublic readonly branch?: GitBranch,\n\t\tpublic readonly workspaceFolder?: { readonly uri: Uri; readonly name: string },\n\t) {}\n\n\tget date(): Date | undefined {\n\t\treturn this.branch?.date;\n\t}\n\n\t/** @returns The most recent date among lastModifiedDate, lastAccessedDate, and branch.date */\n\t@memoize()\n\tget effectiveDate(): Date | undefined {\n\t\tlet maxTime: number | undefined;\n\n\t\tconst accessed = this.lastAccessedDate?.getTime();\n\t\tif (accessed != null && (maxTime == null || accessed > maxTime)) {\n\t\t\tmaxTime = accessed;\n\t\t}\n\n\t\tconst modified = this.lastModifiedDate?.getTime();\n\t\tif (modified != null && (maxTime == null || modified > maxTime)) {\n\t\t\tmaxTime = modified;\n\t\t}\n\n\t\tconst date = this.branch?.date?.getTime();\n\t\tif (date != null && (maxTime == null || date > maxTime)) {\n\t\t\tmaxTime = date;\n\t\t}\n\n\t\treturn maxTime != null ? new Date(maxTime) : undefined;\n\t}\n\n\t/** Timestamp when the worktree branch was last accessed or modified */\n\tget lastAccessedDate(): Date | undefined {\n\t\treturn this.branch?.lastAccessedDate;\n\t}\n\n\t/** Timestamp when the worktree branch was last modified (working changes / index) */\n\tget lastModifiedDate(): Date | undefined {\n\t\treturn this.branch?.lastModifiedDate;\n\t}\n\n\t@memoize()\n\tget friendlyPath(): string {\n\t\tif (this.workspaceFolder != null) {\n\t\t\tconst relativePath = normalizePath(relative(this.workspaceFolder.uri.fsPath, this.uri.fsPath));\n\t\t\treturn relativePath || this.workspaceFolder.name;\n\t\t}\n\n\t\tconst relativePath = normalizePath(relative(this.repoPath, this.uri.fsPath));\n\t\treturn relativePath || normalizePath(this.uri.fsPath);\n\t}\n\n\t@memoize()\n\tget name(): string {\n\t\tswitch (this.type) {\n\t\t\tcase 'bare':\n\t\t\t\treturn '(bare)';\n\t\t\tcase 'detached':\n\t\t\t\treturn `${basename(this.path)} (${shortenRevision(this.sha)})`;\n\t\t\tdefault:\n\t\t\t\treturn this.branch?.name || this.friendlyPath;\n\t\t}\n\t}\n\n\tget opened(): boolean {\n\t\treturn this.workspaceFolder?.uri.toString() === this.uri.toString();\n\t}\n\n\tget path(): string {\n\t\treturn getRepositoryOrWorktreePath(this.uri);\n\t}\n\n\t/** Creates a copy of this worktree with a different repoPath and updated branch — ONLY used for worktree-aware caching */\n\twithRepoPath(repoPath: string): GitWorktree {\n\t\tif (repoPath === this.repoPath) return this;\n\n\t\treturn new GitWorktree(\n\t\t\tthis.isDefault,\n\t\t\tthis.type,\n\t\t\trepoPath,\n\t\t\tthis.uri,\n\t\t\tthis.locked,\n\t\t\tthis.prunable,\n\t\t\tthis.sha,\n\t\t\tthis.branch?.withRepoPath(repoPath, true),\n\t\t\tthis.workspaceFolder,\n\t\t);\n\t}\n\n\tstatic is(worktree: unknown): worktree is GitWorktree {\n\t\treturn worktree instanceof GitWorktree;\n\t}\n\n\tstatic formatDate(worktree: GitWorktreeShape, format?: string | null): string {\n\t\treturn worktree.date != null ? formatDate(worktree.date, format ?? 'MMMM Do, YYYY h:mma') : '';\n\t}\n\n\tstatic formatDateFromNow(worktree: GitWorktreeShape): string {\n\t\treturn worktree.date != null ? fromNow(worktree.date) : '';\n\t}\n\n\tstatic formatDateWithStyle(\n\t\tworktree: GitWorktreeShape,\n\t\tformatting: { dateStyle: string; dateFormat: string | null },\n\t): string {\n\t\treturn formatting.dateStyle === 'absolute'\n\t\t\t? GitWorktree.formatDate(worktree, formatting.dateFormat)\n\t\t\t: GitWorktree.formatDateFromNow(worktree);\n\t}\n\n\tstatic async getStatus(\n\t\tworktree: GitWorktree,\n\t\toptions?: { priority?: GitCommandPriority },\n\t\tcancellation?: AbortSignal,\n\t): Promise<GitStatus | undefined> {\n\t\tif (worktree.type === 'bare') return undefined;\n\n\t\tconst repo = getRepositoryService(worktree.path);\n\t\treturn repo?.status.getStatus(options, cancellation);\n\t}\n\n\tstatic async hasWorkingChanges(\n\t\tworktree: GitWorktree,\n\t\toptions?: { staged?: boolean; unstaged?: boolean; untracked?: boolean },\n\t): Promise<boolean | undefined> {\n\t\tif (worktree.type === 'bare') return undefined;\n\n\t\tconst repo = getRepositoryService(worktree.path);\n\t\treturn repo?.status.hasWorkingChanges(options);\n\t}\n}\n"],"mappings":"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"}
+{"version":3,"file":"worktree.js","names":[],"sources":["../../../../git/src/models/worktree.ts"],"sourcesContent":["import { formatDate, fromNow } from '@gitlens/utils/date.js';\nimport { loggable } from '@gitlens/utils/decorators/log.js';\nimport { memoize } from '@gitlens/utils/decorators/memoize.js';\nimport { serializable } from '@gitlens/utils/decorators/serializable.js';\nimport { basename, normalizePath, relative } from '@gitlens/utils/path.js';\nimport type { Shape } from '@gitlens/utils/types.js';\nimport type { Uri } from '@gitlens/utils/uri.js';\nimport { getRepositoryService } from '../repositoryService.js';\nimport type { GitCommandPriority } from '../run.types.js';\nimport { getRepositoryOrWorktreePath } from '../utils/repository.utils.js';\nimport { shortenRevision } from '../utils/revision.utils.js';\nimport type { GitBranch } from './branch.js';\nimport type { GitStatus } from './status.js';\n\nexport type GitWorktreeShape = Shape<GitWorktree>;\n\nexport type WorkspaceFolderResolver = (uri: Uri) => GitWorktree['workspaceFolder'] | undefined;\n\n@loggable(i => i.uri.toString())\n@serializable\nexport class GitWorktree {\n\tconstructor(\n\t\tpublic readonly isDefault: boolean,\n\t\tpublic readonly type: 'bare' | 'branch' | 'detached',\n\t\tpublic readonly repoPath: string,\n\t\tpublic readonly uri: Uri,\n\t\tpublic readonly locked: boolean | string,\n\t\tpublic readonly prunable: boolean | string,\n\t\tpublic readonly sha?: string,\n\t\tpublic readonly branch?: GitBranch,\n\t\tpublic readonly workspaceFolder?: { readonly uri: Uri; readonly name: string },\n\t) {}\n\n\tget date(): Date | undefined {\n\t\treturn this.branch?.date;\n\t}\n\n\t/**\n\t * @returns The most recent date among lastModifiedDate, lastAccessedDate, and branch.date. Not memoized: the stamps\n\t * change in place (see `BranchMetadata`)\n\t */\n\tget effectiveDate(): Date | undefined {\n\t\tlet maxTime: number | undefined;\n\n\t\tconst accessed = this.lastAccessedDate?.getTime();\n\t\tif (accessed != null && (maxTime == null || accessed > maxTime)) {\n\t\t\tmaxTime = accessed;\n\t\t}\n\n\t\tconst modified = this.lastModifiedDate?.getTime();\n\t\tif (modified != null && (maxTime == null || modified > maxTime)) {\n\t\t\tmaxTime = modified;\n\t\t}\n\n\t\tconst date = this.branch?.date?.getTime();\n\t\tif (date != null && (maxTime == null || date > maxTime)) {\n\t\t\tmaxTime = date;\n\t\t}\n\n\t\treturn maxTime != null ? new Date(maxTime) : undefined;\n\t}\n\n\t/** Timestamp when the worktree branch was last accessed or modified */\n\tget lastAccessedDate(): Date | undefined {\n\t\treturn this.branch?.lastAccessedDate;\n\t}\n\n\t/** Timestamp when the worktree branch was last modified (working changes / index) */\n\tget lastModifiedDate(): Date | undefined {\n\t\treturn this.branch?.lastModifiedDate;\n\t}\n\n\t@memoize()\n\tget friendlyPath(): string {\n\t\tif (this.workspaceFolder != null) {\n\t\t\tconst relativePath = normalizePath(relative(this.workspaceFolder.uri.fsPath, this.uri.fsPath));\n\t\t\treturn relativePath || this.workspaceFolder.name;\n\t\t}\n\n\t\tconst relativePath = normalizePath(relative(this.repoPath, this.uri.fsPath));\n\t\treturn relativePath || normalizePath(this.uri.fsPath);\n\t}\n\n\t@memoize()\n\tget name(): string {\n\t\tswitch (this.type) {\n\t\t\tcase 'bare':\n\t\t\t\treturn '(bare)';\n\t\t\tcase 'detached':\n\t\t\t\treturn `${basename(this.path)} (${shortenRevision(this.sha)})`;\n\t\t\tdefault:\n\t\t\t\treturn this.branch?.name || this.friendlyPath;\n\t\t}\n\t}\n\n\tget opened(): boolean {\n\t\treturn this.workspaceFolder?.uri.toString() === this.uri.toString();\n\t}\n\n\tget path(): string {\n\t\treturn getRepositoryOrWorktreePath(this.uri);\n\t}\n\n\t/** Creates a copy of this worktree with a different repoPath and updated branch — ONLY used for worktree-aware caching */\n\twithRepoPath(repoPath: string): GitWorktree {\n\t\tif (repoPath === this.repoPath) return this;\n\n\t\treturn new GitWorktree(\n\t\t\tthis.isDefault,\n\t\t\tthis.type,\n\t\t\trepoPath,\n\t\t\tthis.uri,\n\t\t\tthis.locked,\n\t\t\tthis.prunable,\n\t\t\tthis.sha,\n\t\t\tthis.branch?.withRepoPath(repoPath, true),\n\t\t\tthis.workspaceFolder,\n\t\t);\n\t}\n\n\tstatic is(worktree: unknown): worktree is GitWorktree {\n\t\treturn worktree instanceof GitWorktree;\n\t}\n\n\tstatic formatDate(worktree: GitWorktreeShape, format?: string | null): string {\n\t\treturn worktree.date != null ? formatDate(worktree.date, format ?? 'MMMM Do, YYYY h:mma') : '';\n\t}\n\n\tstatic formatDateFromNow(worktree: GitWorktreeShape): string {\n\t\treturn worktree.date != null ? fromNow(worktree.date) : '';\n\t}\n\n\tstatic formatDateWithStyle(\n\t\tworktree: GitWorktreeShape,\n\t\tformatting: { dateStyle: string; dateFormat: string | null },\n\t): string {\n\t\treturn formatting.dateStyle === 'absolute'\n\t\t\t? GitWorktree.formatDate(worktree, formatting.dateFormat)\n\t\t\t: GitWorktree.formatDateFromNow(worktree);\n\t}\n\n\tstatic async getStatus(\n\t\tworktree: GitWorktree,\n\t\toptions?: { priority?: GitCommandPriority },\n\t\tcancellation?: AbortSignal,\n\t): Promise<GitStatus | undefined> {\n\t\tif (worktree.type === 'bare') return undefined;\n\n\t\tconst repo = getRepositoryService(worktree.path);\n\t\treturn repo?.status.getStatus(options, cancellation);\n\t}\n\n\tstatic async hasWorkingChanges(\n\t\tworktree: GitWorktree,\n\t\toptions?: { staged?: boolean; unstaged?: boolean; untracked?: boolean },\n\t): Promise<boolean | undefined> {\n\t\tif (worktree.type === 'bare') return undefined;\n\n\t\tconst repo = getRepositoryService(worktree.path);\n\t\treturn repo?.status.hasWorkingChanges(options);\n\t}\n}\n"],"mappings":"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"}

package/dist/git/parsers/diffParser.js

@@ -1,9 +1,9 @@
 import { fileUri, joinUriPath } from "../../utils/uri.js";
 import { normalizePath } from "../../utils/path.js";
 import { GitFileIndexStatus } from "../models/fileStatus.js";
-import { GitFileChange } from "../models/fileChange.js";
 import { maybeStopWatch } from "../../utils/stopwatch.js";
 import _usingCtx from "../../_virtual/@oxc-project+runtime/helpers/esm/usingCtx.js";
+import { GitFileChange } from "../models/fileChange.js";
 //#region ../git/src/parsers/diffParser.ts
 const diffRegex = /^diff --git a\/(.*) b\/(.*)$/;
 const diffHunkRegex = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;

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

@@ -21,6 +21,8 @@ export interface BranchContributionsOverview extends GitCommitStats<number> {
   readonly firstCommitDate: Date | undefined;
   readonly contributors: GitContributor[];
 }
+/** Which source decided a base (see `getAheadOfBase`) */
+export type AheadOfBaseTier = 'preferred' | 'user' | 'detected' | 'recorded' | 'created' | 'default' | 'upstream';
 export interface AheadOfBase {
   /** The base HEAD was measured against; `undefined` when there is none (see `getAheadOfBase`) */
   readonly base: {
@@ -30,8 +32,14 @@ export interface AheadOfBase {
     readonly ahead: number;
     /** The commit `ref` pointed at, from the cached ref list; `undefined` when no listed ref matches it */
     readonly sha: string | undefined;
+    /** Where HEAD forked from `ref`: git's `--fork-point` reading of `ref`'s reflog, else the merge base; `undefined` when they share no history */
+    readonly forkPoint: string | undefined;
+    /** The source the base came from: the `preferredTarget` option, the user's merge target, the detected one, the base recorded against the branch, the branch git's reflog says this branch was created from (unless the default branch forked strictly nearer HEAD), the default branch, or — when the branch is the default branch — the branch's own upstream */
+    readonly tier: AheadOfBaseTier;
   } | undefined;
-  /** Full ref names (`refs/heads/main`, `refs/remotes/origin/main`, `refs/remotes/origin/HEAD`) whose movement can change this answer, given with or without a base so a watcher also learns when one appears: the branch, every candidate compared up to the chosen one, their tracking refs, and the default-branch symref when the default was consulted. Lets a watcher recompute only when one of them moves. */
+  /** Why there is no base; set exactly when `base` is `undefined`: `'none'` when nothing resolved, `'self'` when the base is the branch itself at HEAD's commit (or the default branch has no upstream to measure against), `'unborn'` when HEAD has no commit yet */
+  readonly reason?: 'none' | 'self' | 'unborn';
+  /** Full ref names (`refs/heads/main`, `refs/remotes/origin/main`, `refs/remotes/origin/HEAD`) whose movement can change this answer, given with or without a base so a watcher also learns when one appears: the branch, every candidate compared up to the chosen one, their tracking refs, the default-branch symrefs and the `<remote>/main`/`<remote>/master` refs when the default was consulted, the `upstream` remote's copy of the created-from or default branch when it was compared, and the branch's upstream when it is the default branch. Lets a watcher recompute only when one of them moves. */
   readonly dependsOn: readonly string[];
 }
 export type MergeDetectionConfidence = 'highest' | 'high' | 'medium';
@@ -99,16 +107,61 @@ export interface GitBranchesSubProvider {
   /** Detects conflicts when an autostash is reapplied onto the tree an integration produced */
   getPotentialStashReapplyConflicts?(repoPath: string, ontoTreeOid: string, cancellation?: AbortSignal): Promise<ConflictDetectionResult>;
   /**
-   * How far HEAD has moved past the base `branch` (the branch checked out at HEAD) was cut from. Candidates in trust
+   * How far HEAD has moved past the base `branch` (the branch checked out at HEAD, or `undefined` when HEAD is
+   * detached) was cut from. Candidates in trust
    * order: the user's merge target, the detected one, then the base recorded against the branch — only recorded bases
    * count, never a reflog guess. Each is measured as itself or its tracking ref, whichever forked nearer HEAD; a stale
-   * target (one naming no ref, a flag-like one, or the branch itself) falls through to the next, and the local default
-   * branch is used when none survives. The count is the right side of `<base>...HEAD`. `base` is `undefined` when no
-   * base resolves, when the base is the branch itself (by name, or as its copy on one of the repo's remotes) at HEAD's
-   * own commit, or when HEAD is detached or has no commit yet; `dependsOn` is given either way. `base.sha` is the tip of
-   * `ref`, read from the cached ref list. Rejects when the count can't be read.
+   * target (one naming no ref, a flag-like one, or the branch itself) falls through to the next, and the default branch
+   * is used when none survives: the `HEAD` symref of the `upstream` remote, else `origin`, else the first remote, as its
+   * local branch or else the remote ref; then, in the same remote order, `<remote>/main` or `<remote>/master`, again as
+   * the local branch or else the remote ref; then `init.defaultBranch`, `main`, `master` — from local refs only, never
+   * the network. On the default branch itself the base is its upstream (`upstream/<branch>` when an `upstream` remote has
+   * it, else `<branch>@{u}`), tier `'upstream'`. The count is the right side of `<base>...HEAD`. `base` is `undefined`
+   * when no base resolves, when the base is the branch itself (by name, or as its copy on one of the repo's remotes) at
+   * HEAD's own commit — or the default branch has no upstream — or when HEAD has no commit yet; `reason`
+   * then says which (`'none'`, `'self'` or `'unborn'`) and `dependsOn` is given either way. `base.sha` is the tip of
+   * `ref`, read from the cached ref list; `base.forkPoint` is where HEAD forked from `ref` and `base.tier` the source
+   * that decided the base. On a detached HEAD (`undefined`, or a name `isDetachedHead` recognizes) only the default branch
+   * is tried, as tier `'default'` and with no self check. Rejects when the count can't be read.
+   *
+   * `options.skipUserTarget` leaves the user's merge target out, giving the order a merge-target picker shows as
+   * "automatic". `options.preferredTarget` is tried before every other source, also on a detached HEAD, and measured
+   * like a recorded candidate (tier `'preferred'`); one that is unusable — naming no ref, flag-like, the branch itself,
+   * or the branch's copy on one of the repo's remotes at HEAD's own commit — falls through to the usual order.
+   * Tier `'preferred'` means the preferred target is the base; any other tier, or no base, means it fell through.
    */
-  getAheadOfBase?(repoPath: string, branch: string, cancellation?: AbortSignal): Promise<AheadOfBase>;
+  getAheadOfBase?(repoPath: string, branch: string | undefined, options?: {
+    /** Leaves the user's merge target out: the order a merge-target picker shows as "automatic" */
+    skipUserTarget?: boolean;
+    /** A target to try before every other source */
+    preferredTarget?: string;
+  }, cancellation?: AbortSignal): Promise<AheadOfBase>;
+  /**
+   * How far each branch has diverged from `base`, keyed by full ref name (`refs/heads/x`, plus `refs/remotes/<remote>/x`
+   * when `options.remotes` is set) so a local and a remote name can't collide. Symbolic refs such as
+   * `refs/remotes/origin/HEAD` are left out. `ahead` is the commits on the branch that `base` lacks and `behind` the
+   * commits on `base` that the branch lacks, i.e. the right and left sides of `base...branch`. `options.refs` limits it to
+   * those full ref names (in place of `remotes`), so a host counts only the branches it shows; an empty list answers
+   * empty without running git. One git run on git 2.41+, a bounded count per distinct tip before that. Rejects when
+   * `base` can't be resolved or the counts can't be read.
+   */
+  getAheadBehindCounts?(repoPath: string, base: string, options?: {
+    remotes?: boolean;
+    refs?: readonly string[];
+  }, cancellation?: AbortSignal): Promise<Map<string, {
+    ahead: number;
+    behind: number;
+  }>>;
+  /**
+   * The branches whose tips are reachable from `into`, as full ref names (`refs/heads/x`, plus `refs/remotes/<remote>/x`
+   * when `options.remotes` is set). Ancestry only: a branch squash-merged or cherry-picked into `into` is not included,
+   * so use `getBranchMergedStatus` for that heuristic per-branch answer. A branch whose tip equals `into`'s tip (never
+   * diverged) is included, as git reports it. Symbolic refs such as `refs/remotes/origin/HEAD` are left out. One git
+   * run. Not cached. Rejects when `into` can't be resolved or the branches can't be read.
+   */
+  getMergedBranches?(repoPath: string, into: string, options?: {
+    remotes?: boolean;
+  }, cancellation?: AbortSignal): Promise<Set<string>>;
   getBaseBranchName?(repoPath: string, ref: string, options?: {
     priority?: GitCommandPriority;
   }, cancellation?: AbortSignal): Promise<string | undefined>;
@@ -118,8 +171,20 @@ export interface GitBranchesSubProvider {
   }, cancellation?: AbortSignal): Promise<string | undefined>;
   getStoredDetectedMergeTargetBranchName?(repoPath: string, ref: string): Promise<string | undefined>;
   getStoredUserMergeTargetBranchName?(repoPath: string, ref: string): Promise<string | undefined>;
+  /**
+   * Stamps `branch.<name>.gk-last-accessed` in `.git/gk/config` for the branch checked out at `repoPath`, when the
+   * host checks it out or opens it. A no-op for a detached HEAD or no branch. Each key's write is attempted at most
+   * once per 5 minutes per branch, failed or not, and not when its stored value, from any process, is under 5 minutes
+   * old. Calls for different repositories never drop each other, and the promise settles once the write is done and
+   * never rejects.
+   */
   onCurrentBranchAccessed?(repoPath: string): Promise<void>;
+  /**
+   * Stamps `gk-last-modified` and `gk-last-accessed`: the checkout's working tree or index changed while on the
+   * branch — file edits and staging, not only commits. Otherwise as {@link onCurrentBranchAccessed}.
+   */
   onCurrentBranchModified?(repoPath: string): Promise<void>;
+  /** Stamps `gk-agent-last-activity`: an AI agent worked in the checkout. Otherwise as {@link onCurrentBranchAccessed} */
   onCurrentBranchAgentActivity?(repoPath: string): Promise<void>;
   renameBranch?(repoPath: string, oldName: string, newName: string): Promise<void>;
   setUpstreamBranch?(repoPath: string, name: string, upstream: string | undefined): Promise<void>;

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

@@ -9,7 +9,8 @@ export interface GitOperationResult {
 }
 /**
  * Spawn-layer overrides callers can pass to user-initiated git operations to inject per-call
- * environment variables, an `AbortSignal` for cancellation, or a custom `timeout`. Forwarded
+ * environment variables, an `AbortSignal` for cancellation, a custom `timeout`, or a `beforeIndexLockRetry`
+ * hook to re-verify state before an index write is retried. Forwarded
  * verbatim to the underlying `git.run(...)` invocation; cannot override op-owned fields like
  * `cwd`, `configs`, `errors`, or `stdin`.
  *
@@ -17,7 +18,7 @@ export interface GitOperationResult {
  * intentionally disable the timeout (set it to 0) because those operations can take a long
  * time; a caller-supplied `timeout` will replace that "no timeout" setting, so use with care.
  */
-export type GitOperationRunOptions = Pick<GitRunOptions, 'env' | 'cancellation' | 'timeout'>;
+export type GitOperationRunOptions = Pick<GitRunOptions, 'env' | 'cancellation' | 'timeout' | 'beforeIndexLockRetry'>;
 export interface GitOperationsSubProvider {
   /**
    * Switches the repository to a branch or ref. Pure branch/ref switching — does not accept

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

@@ -4,6 +4,12 @@ export interface GitPausedOperationsSubProvider {
   getPausedOperationStatus(repoPath: string, options?: {
     force?: boolean;
   }, cancellation?: AbortSignal): Promise<GitPausedOperationStatus | undefined>;
+  /**
+   * Whether git's dir holds a sentinel of any in-progress operation (merge, cherry-pick, revert, rebase,
+   * `git am`, or a sequencer run with a todo) — presence only, so it is `true` even for states
+   * `getPausedOperationStatus` can't describe. Rejects when git's dir can't be read, rather than answering `false`
+   */
+  hasPausedOperation?(repoPath: string, cancellation?: AbortSignal): Promise<boolean>;
   abortPausedOperation(repoPath: string, options?: {
     quit?: boolean;
   }): Promise<void>;

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

@@ -4,6 +4,7 @@ import { GitProviderDescriptor } from "./types.js";
 import { GitIgnoreFilter } from "../watching/gitIgnoreFilter.js";
 import { RepositoryChange } from "../models/repository.js";
 import { GitMaintenanceSubProvider } from "./maintenance.js";
+import { GitCommandPriority } from "../run.types.js";
 import { GitCommitsSubProvider } from "./commits.js";
 import { GitBranchesSubProvider } from "./branches.js";
 import { GitContributorsSubProvider } from "./contributors.js";
@@ -24,6 +25,11 @@ import { GitStatusSubProvider } from "./status.js";
 import { GitTagsSubProvider } from "./tags.js";
 import { GitWorktreesSubProvider } from "./worktrees.js";
 //#region ../git/src/providers/provider.d.ts
+/** One path a provider announced its own write for, with the changes it announced there */
+export interface AnnouncedRepositoryChanges {
+  readonly repoPath: string;
+  readonly changes: readonly RepositoryChange[];
+}
 /**
  * Common interface for all git providers (CLI, GitHub, etc.).
  * Consumers can register multiple providers and route operations transparently.
@@ -48,13 +54,50 @@ export interface GitProvider {
    * ancestor, and literal paths containing glob metacharacters are dropped (a watcher can't express them safely).
    */
   getIgnoredDirectories?(repoPath: string, cancellation?: AbortSignal): Promise<string[]>;
+  /**
+   * The working tree's ignored entries as repo-relative `/`-separated paths, the way `git status --ignored` lists
+   * them: an ignored file is one entry, and a directory whose entire contents are ignored is one entry with a
+   * trailing `/` (its contents aren't listed). Empty directories and `.git/` aren't listed. Sorted, and not capped —
+   * the caller limits what it shows. Unlike `getIgnoredDirectories` this is a listing, not a watcher-pruning set, so
+   * nothing is dropped or re-confirmed against the rules. `options.paths` limits the listing to those repo-relative
+   * folders (or files), matched literally rather than as globs, so only they are walked — an empty array answers
+   * empty without running git, and omitting it lists the whole working tree. `options.priority` (e.g.
+   * `'interactive'`) is for a caller waiting on the answer.
+   */
+  getIgnoredEntries?(repoPath: string, options?: {
+    paths?: readonly string[];
+    priority?: GitCommandPriority;
+  }, cancellation?: AbortSignal): Promise<string[]>;
+  /**
+   * An exact check of which of `paths` (repo-relative) git's ignore rules match — the subset that is ignored, as
+   * given. A tracked file isn't reported as ignored, even when a rule matches it. This is git's answer, where the
+   * in-memory `GitIgnoreFilter` errs toward not-ignored. Each path is checked as that exact file, never as pathspec
+   * magic (a file named `:secret` is not `secret`), and comes back in the caller's spelling. Pass
+   * `options.priority` (e.g. `'interactive'` when opening a file) for a caller waiting on the answer.
+   */
+  getIgnoredPaths?(repoPath: string, paths: readonly string[], options?: {
+    priority?: GitCommandPriority;
+  }, cancellation?: AbortSignal): Promise<Set<string>>;
   getIgnoredUrisFilter?(repoPath: string): Promise<(uri: Uri) => boolean>;
   getLastFetchedTimestamp?(repoPath: string): Promise<number | undefined>;
   /**
-   * Fires when an external write changed a branch's merge-relevant `.git/gk/config` keys — not for activity
-   * timestamps, and not for the provider's own writes. See `Cache.onDidChangeMergeTargets`.
+   * Fires when a write changed a branch's merge-relevant `.git/gk/config` keys — not for activity timestamps. The
+   * provider's own key store fires it once, naming the branch, as the write completes; its section remove and
+   * rename don't, nor do its internal saves while answering a read (only another process's watcher reports those).
+   * See `Cache.onDidChangeMergeTargets`.
    */
   readonly onDidChangeMergeTargets?: Event<MergeTargetsChangeEvent>;
+  /**
+   * The repository's common path, as it appears in {@link onDidChangeMergeTargets} events; `undefined` when the
+   * provider can't tell, because `repoPath` was never registered with it
+   */
+  getCommonPath?(repoPath: string): string | undefined;
+  /**
+   * Fires as the provider announces one of its own writes to the host (`hooks.repository.onChanged`), once for each
+   * path it announces it for, sibling worktrees included — after the write finished and its caches were evicted.
+   * `GitService` forwards it to its watch service, so the write's own file events aren't announced a second time.
+   */
+  readonly onDidAnnounceChanges?: Event<AnnouncedRepositoryChanges>;
   /** Creates a new repository at `path` (`git init`), creating `path` itself if it doesn't yet exist. */
   init?(path: string, options?: {
     defaultBranch?: string;

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

@@ -22,10 +22,24 @@ export interface GitRevisionSubProvider {
   getEmptyTreeSha(repoPath: string): Promise<string>;
   getRevisionContent(repoPath: string, path: string, rev: string): Promise<Uint8Array | undefined>;
   getSubmoduleHead?(repoPath: string, submodulePath: string): Promise<string | undefined>;
-  /** Gets tracked file paths from the index (reflects working tree state, even during rebase) */
-  getTrackedFiles(repoPath: string): Promise<string[]>;
+  /**
+   * Gets tracked file paths from the index (reflects working tree state, even during rebase).
+   * `paths` limits the read to those repo-relative folders (or files), matched literally rather than as globs;
+   * an empty array answers empty without running git, and omitting it reads the whole index.
+   */
+  getTrackedFiles(repoPath: string, options?: {
+    paths?: readonly string[];
+  }, cancellation?: AbortSignal): Promise<string[]>;
   getTreeEntryForRevision(repoPath: string, path: string, rev: string): Promise<GitTreeEntry | undefined>;
-  getTreeForRevision(repoPath: string, rev: string): Promise<GitTreeEntry[]>;
+  /**
+   * Lists every entry (files and folders) of the tree at `rev`, recursively.
+   * `paths` limits the listing to those repo-relative folders (or files), matched literally rather than as globs;
+   * each scope's ancestor folders are listed too, an empty array answers empty without running git, and omitting
+   * it lists the whole tree.
+   */
+  getTreeForRevision(repoPath: string, rev: string, options?: {
+    paths?: readonly string[];
+  }): Promise<GitTreeEntry[]>;
   resolveRevision(repoPath: string, ref: string, pathOrUri?: string | Uri,
   /** `force`: skips the cached answer and any in-flight read that started before this call, and stores the fresh answer. */
   options?: {

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

@@ -39,8 +39,14 @@ export interface GitStatusSubProvider {
   hasConflictingFiles(repoPath: string, cancellation?: AbortSignal): Promise<boolean>;
   /** Rejects when git fails, rather than answering empty */
   getConflictingFiles(repoPath: string, cancellation?: AbortSignal): Promise<GitConflictFile[]>;
-  /** Rejects when git fails, rather than answering empty */
-  getUntrackedFiles(repoPath: string, cancellation?: AbortSignal): Promise<GitFile[]>;
+  /**
+   * Rejects when git fails, rather than answering empty.
+   * `paths` limits the read to repo-relative files or folders (matched literally, never as globs); an empty
+   * array answers empty without running git, and omitting it reads the whole working tree.
+   */
+  getUntrackedFiles(repoPath: string, options?: {
+    paths?: readonly string[];
+  }, cancellation?: AbortSignal): Promise<GitFile[]>;
 }
 //#endregion
 //# sourceMappingURL=status.d.ts.map