@gitkraken/core-gitlens 0.3.1 → 0.4.100

package/package.json

@@ -1,173 +1,239 @@
 {
-	"name": "@gitkraken/core-gitlens",
-	"description": "GitLens core — shared Git / AI / GitHub primitives for internal GitKraken consumption",
-	"version": "0.3.1",
-	"license": "SEE LICENSE IN LICENSE",
-	"author": {
-		"name": "GitKraken",
-		"url": "https://gitkraken.com"
-	},
-	"homepage": "https://github.com/gitkraken/vscode-gitlens/tree/main/packages/core",
-	"bugs": {
-		"url": "https://github.com/gitkraken/vscode-gitlens/issues"
-	},
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/gitkraken/vscode-gitlens.git",
-		"directory": "packages/core"
-	},
-	"engines": {
-		"node": ">= 22.12.0"
-	},
-	"type": "module",
-	"sideEffects": false,
-	"publishConfig": {
-		"provenance": false
-	},
-	"files": [
-		"dist",
-		"src",
-		"LICENSE",
-		"LICENSE.plus",
-		"README.md",
-		"CHANGELOG.md"
-	],
-	"imports": {
-		"#env/*.js": {
-			"node": {
-				"types": "./dist/utils/env/node/*.d.ts",
-				"default": "./dist/utils/env/node/*.js"
-			},
-			"default": {
-				"types": "./dist/utils/env/browser/*.d.ts",
-				"default": "./dist/utils/env/browser/*.js"
-			}
-		}
-	},
-	"exports": {
-		"./package.json": "./package.json",
-		"./git-cli/*.js": {
-			"types": "./dist/git-cli/*.d.ts",
-			"default": "./dist/git-cli/*.js"
-		},
-		"./git-cli/exec/*.js": {
-			"types": "./dist/git-cli/exec/*.d.ts",
-			"default": "./dist/git-cli/exec/*.js"
-		},
-		"./git-cli/parsers/*.js": {
-			"types": "./dist/git-cli/parsers/*.d.ts",
-			"default": "./dist/git-cli/parsers/*.js"
-		},
-		"./git-cli/providers/*.js": {
-			"types": "./dist/git-cli/providers/*.d.ts",
-			"default": "./dist/git-cli/providers/*.js"
-		},
-		"./git/*.js": {
-			"types": "./dist/git/*.d.ts",
-			"default": "./dist/git/*.js"
-		},
-		"./git/models/*.js": {
-			"types": "./dist/git/models/*.d.ts",
-			"default": "./dist/git/models/*.js"
-		},
-		"./git/parsers/*.js": {
-			"types": "./dist/git/parsers/*.d.ts",
-			"default": "./dist/git/parsers/*.js"
-		},
-		"./git/providers/*.js": {
-			"types": "./dist/git/providers/*.d.ts",
-			"default": "./dist/git/providers/*.js"
-		},
-		"./git/providers/shared/*.js": {
-			"types": "./dist/git/providers/shared/*.d.ts",
-			"default": "./dist/git/providers/shared/*.js"
-		},
-		"./git/remotes/*.js": {
-			"types": "./dist/git/remotes/*.d.ts",
-			"default": "./dist/git/remotes/*.js"
-		},
-		"./git/utils/*.js": {
-			"types": "./dist/git/utils/*.d.ts",
-			"default": "./dist/git/utils/*.js"
-		},
-		"./git/watching/*.js": {
-			"types": "./dist/git/watching/*.d.ts",
-			"default": "./dist/git/watching/*.js"
-		},
-		"./ipc/*.js": {
-			"types": "./dist/ipc/*.d.ts",
-			"default": "./dist/ipc/*.js"
-		},
-		"./plus/agents/*.js": {
-			"types": "./dist/plus/agents/*.d.ts",
-			"default": "./dist/plus/agents/*.js"
-		},
-		"./plus/agents/providers/*.js": {
-			"types": "./dist/plus/agents/providers/*.d.ts",
-			"default": "./dist/plus/agents/providers/*.js"
-		},
-		"./plus/ai/*.js": {
-			"types": "./dist/plus/ai/*.d.ts",
-			"default": "./dist/plus/ai/*.js"
-		},
-		"./plus/ai/models/*.js": {
-			"types": "./dist/plus/ai/models/*.d.ts",
-			"default": "./dist/plus/ai/models/*.js"
-		},
-		"./plus/ai/providers/*.js": {
-			"types": "./dist/plus/ai/providers/*.d.ts",
-			"default": "./dist/plus/ai/providers/*.js"
-		},
-		"./plus/ai/utils/*.js": {
-			"types": "./dist/plus/ai/utils/*.d.ts",
-			"default": "./dist/plus/ai/utils/*.js"
-		},
-		"./plus/git-github/*.js": {
-			"types": "./dist/plus/git-github/*.d.ts",
-			"default": "./dist/plus/git-github/*.js"
-		},
-		"./plus/git-github/api/*.js": {
-			"types": "./dist/plus/git-github/api/*.d.ts",
-			"default": "./dist/plus/git-github/api/*.js"
-		},
-		"./plus/git-github/providers/*.js": {
-			"types": "./dist/plus/git-github/providers/*.d.ts",
-			"default": "./dist/plus/git-github/providers/*.js"
-		},
-		"./plus/git-github/providers/github/*.js": {
-			"types": "./dist/plus/git-github/providers/github/*.d.ts",
-			"default": "./dist/plus/git-github/providers/github/*.js"
-		},
-		"./utils/*.js": {
-			"types": "./dist/utils/*.d.ts",
-			"default": "./dist/utils/*.js"
-		},
-		"./utils/decorators/*.js": {
-			"types": "./dist/utils/decorators/*.d.ts",
-			"default": "./dist/utils/decorators/*.js"
-		},
-		"./utils/env/node/exec.js": {
-			"types": "./dist/utils/env/node/exec.d.ts",
-			"default": "./dist/utils/env/node/exec.js"
-		},
-		"./utils/function/*.js": {
-			"types": "./dist/utils/function/*.d.ts",
-			"default": "./dist/utils/function/*.js"
-		}
-	},
-	"dependencies": {
-		"@octokit/graphql": "9.0.3",
-		"@octokit/request": "10.0.8",
-		"@octokit/request-error": "7.1.0",
-		"@octokit/types": "16.0.0",
-		"fast-string-truncated-width": "3.0.3",
-		"ignore": "7.0.5",
-		"vscode-uri": "3.1.0"
-	},
-	"scripts": {
-		"build": "node scripts/bundle.mjs",
-		"bundle": "node scripts/bundle.mjs",
-		"clean": "pnpx rimraf --glob dist src LICENSE LICENSE.plus *.tgz",
-		"prepack": "node scripts/bundle.mjs"
-	}
-}
+  "name": "@gitkraken/core-gitlens",
+  "description": "GitLens core — shared Git / AI / GitHub primitives for internal GitKraken consumption",
+  "version": "0.4.100",
+  "license": "SEE LICENSE IN LICENSE",
+  "author": {
+    "name": "GitKraken",
+    "url": "https://gitkraken.com"
+  },
+  "homepage": "https://github.com/gitkraken/vscode-gitlens/tree/main/packages/core",
+  "bugs": {
+    "url": "https://github.com/gitkraken/vscode-gitlens/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/gitkraken/vscode-gitlens.git",
+    "directory": "packages/core"
+  },
+  "engines": {
+    "node": ">= 22.12.0"
+  },
+  "type": "module",
+  "sideEffects": false,
+  "publishConfig": {
+    "provenance": false
+  },
+  "files": [
+    "dist",
+    "src",
+    "LICENSE",
+    "LICENSE.plus",
+    "README.md",
+    "CHANGELOG.md",
+    "docs"
+  ],
+  "imports": {
+    "#env/*.js": {
+      "node": {
+        "types": "./dist/utils/env/node/*.d.ts",
+        "default": "./dist/utils/env/node/*.js"
+      },
+      "default": {
+        "types": "./dist/utils/env/browser/*.d.ts",
+        "default": "./dist/utils/env/browser/*.js"
+      }
+    }
+  },
+  "exports": {
+    "./package.json": "./package.json",
+    "./git-cli/cliGitProvider.js": {
+      "types": "./dist/git-cli/cliGitProvider.d.ts",
+      "default": "./dist/git-cli/cliGitProvider.js"
+    },
+    "./git-cli/exec/*.js": {
+      "types": "./dist/git-cli/exec/*.d.ts",
+      "default": "./dist/git-cli/exec/*.js"
+    },
+    "./git-cli/parsers/*.js": {
+      "types": "./dist/git-cli/parsers/*.d.ts",
+      "default": "./dist/git-cli/parsers/*.js"
+    },
+    "./git-cli/providers/*.js": {
+      "types": "./dist/git-cli/providers/*.d.ts",
+      "default": "./dist/git-cli/providers/*.js"
+    },
+    "./git-cli/service.js": {
+      "types": "./dist/git-cli/service.d.ts",
+      "default": "./dist/git-cli/service.js"
+    },
+    "./git/cache.js": {
+      "types": "./dist/git/cache.d.ts",
+      "default": "./dist/git/cache.js"
+    },
+    "./git/context.js": {
+      "types": "./dist/git/context.d.ts",
+      "default": "./dist/git/context.js"
+    },
+    "./git/errors.js": {
+      "types": "./dist/git/errors.d.ts",
+      "default": "./dist/git/errors.js"
+    },
+    "./git/features.js": {
+      "types": "./dist/git/features.d.ts",
+      "default": "./dist/git/features.js"
+    },
+    "./git/models/*.js": {
+      "types": "./dist/git/models/*.d.ts",
+      "default": "./dist/git/models/*.js"
+    },
+    "./git/parsers/*.js": {
+      "types": "./dist/git/parsers/*.d.ts",
+      "default": "./dist/git/parsers/*.js"
+    },
+    "./git/providers/*.js": {
+      "types": "./dist/git/providers/*.d.ts",
+      "default": "./dist/git/providers/*.js"
+    },
+    "./git/providers/shared/*.js": {
+      "types": "./dist/git/providers/shared/*.d.ts",
+      "default": "./dist/git/providers/shared/*.js"
+    },
+    "./git/remotes/*.js": {
+      "types": "./dist/git/remotes/*.d.ts",
+      "default": "./dist/git/remotes/*.js"
+    },
+    "./git/repositoryService.js": {
+      "types": "./dist/git/repositoryService.d.ts",
+      "default": "./dist/git/repositoryService.js"
+    },
+    "./git/run.types.js": {
+      "types": "./dist/git/run.types.d.ts",
+      "default": "./dist/git/run.types.js"
+    },
+    "./git/service.js": {
+      "types": "./dist/git/service.d.ts",
+      "default": "./dist/git/service.js"
+    },
+    "./git/utils/*.js": {
+      "types": "./dist/git/utils/*.d.ts",
+      "default": "./dist/git/utils/*.js"
+    },
+    "./git/watching/*.js": {
+      "types": "./dist/git/watching/*.d.ts",
+      "default": "./dist/git/watching/*.js"
+    },
+    "./ipc/discovery.js": {
+      "types": "./dist/ipc/discovery.d.ts",
+      "default": "./dist/ipc/discovery.js"
+    },
+    "./ipc/ipcServer.js": {
+      "types": "./dist/ipc/ipcServer.d.ts",
+      "default": "./dist/ipc/ipcServer.js"
+    },
+    "./plus/agents/providers/*.js": {
+      "types": "./dist/plus/agents/providers/*.d.ts",
+      "default": "./dist/plus/agents/providers/*.js"
+    },
+    "./plus/agents/sanitizePrompt.js": {
+      "types": "./dist/plus/agents/sanitizePrompt.d.ts",
+      "default": "./dist/plus/agents/sanitizePrompt.js"
+    },
+    "./plus/agents/stateMachine.js": {
+      "types": "./dist/plus/agents/stateMachine.d.ts",
+      "default": "./dist/plus/agents/stateMachine.js"
+    },
+    "./plus/agents/types.js": {
+      "types": "./dist/plus/agents/types.d.ts",
+      "default": "./dist/plus/agents/types.js"
+    },
+    "./plus/ai/constants.js": {
+      "types": "./dist/plus/ai/constants.d.ts",
+      "default": "./dist/plus/ai/constants.js"
+    },
+    "./plus/ai/errors.js": {
+      "types": "./dist/plus/ai/errors.d.ts",
+      "default": "./dist/plus/ai/errors.js"
+    },
+    "./plus/ai/models/*.js": {
+      "types": "./dist/plus/ai/models/*.d.ts",
+      "default": "./dist/plus/ai/models/*.js"
+    },
+    "./plus/ai/prompts.js": {
+      "types": "./dist/plus/ai/prompts.d.ts",
+      "default": "./dist/plus/ai/prompts.js"
+    },
+    "./plus/ai/providers/*.js": {
+      "types": "./dist/plus/ai/providers/*.d.ts",
+      "default": "./dist/plus/ai/providers/*.js"
+    },
+    "./plus/ai/utils/*.js": {
+      "types": "./dist/plus/ai/utils/*.d.ts",
+      "default": "./dist/plus/ai/utils/*.js"
+    },
+    "./plus/git-github/api/*.js": {
+      "types": "./dist/plus/git-github/api/*.d.ts",
+      "default": "./dist/plus/git-github/api/*.js"
+    },
+    "./plus/git-github/context.js": {
+      "types": "./dist/plus/git-github/context.d.ts",
+      "default": "./dist/plus/git-github/context.js"
+    },
+    "./plus/git-github/models.js": {
+      "types": "./dist/plus/git-github/models.d.ts",
+      "default": "./dist/plus/git-github/models.js"
+    },
+    "./plus/git-github/providers/*.js": {
+      "types": "./dist/plus/git-github/providers/*.d.ts",
+      "default": "./dist/plus/git-github/providers/*.js"
+    },
+    "./plus/git-github/providers/github/*.js": {
+      "types": "./dist/plus/git-github/providers/github/*.d.ts",
+      "default": "./dist/plus/git-github/providers/github/*.js"
+    },
+    "./plus/integrations/index.js": {
+      "types": "./dist/plus/integrations/index.d.ts",
+      "default": "./dist/plus/integrations/index.js"
+    },
+    "./plus/integrations/lite.js": {
+      "types": "./dist/plus/integrations/lite.d.ts",
+      "default": "./dist/plus/integrations/lite.js"
+    },
+    "./utils/__tests__/*.js": null,
+    "./utils/*.js": {
+      "types": "./dist/utils/*.d.ts",
+      "default": "./dist/utils/*.js"
+    },
+    "./utils/decorators/*.js": {
+      "types": "./dist/utils/decorators/*.d.ts",
+      "default": "./dist/utils/decorators/*.js"
+    },
+    "./utils/env/browser/*.js": null,
+    "./utils/env/node/*.js": null,
+    "./utils/env/node/exec.js": {
+      "types": "./dist/utils/env/node/exec.d.ts",
+      "default": "./dist/utils/env/node/exec.js"
+    },
+    "./utils/env/node/platform.js": {
+      "types": "./dist/utils/env/node/platform.d.ts",
+      "default": "./dist/utils/env/node/platform.js"
+    }
+  },
+  "dependencies": {
+    "@gitkraken/provider-apis": "0.54.0",
+    "@octokit/graphql": "9.0.3",
+    "@octokit/request": "10.0.11",
+    "@octokit/request-error": "7.1.0",
+    "@octokit/types": "16.0.0",
+    "fast-string-truncated-width": "3.0.3",
+    "ignore": "7.0.6",
+    "vscode-uri": "3.1.0"
+  },
+  "scripts": {
+    "build": "node scripts/bundle.mjs",
+    "bundle": "node scripts/bundle.mjs",
+    "clean": "pnpx rimraf --glob dist src LICENSE LICENSE.plus *.tgz",
+    "verify:esm": "node scripts/verify-esm.mjs",
+    "verify:package": "node scripts/verify-package.mjs"
+  }
+}

package/src/git/cache.ts

@@ -213,6 +213,8 @@ export class Cache implements Disposable {
 	private _commonPathRegistry = new Map<RepoPath, string>();
 	/** Reverse index: commonPath → set of worktree repoPaths that share it */
 	private _worktreesByCommonPath = new Map<string, Set<RepoPath>>();
+	/** Monotonic per-worktree "status clock" — see {@link getStatusGeneration}. */
+	private _statusGenerations = new Map<RepoPath, number>();
 
 	[Symbol.dispose](): void {
 		this.dispose();
@@ -257,7 +259,9 @@ export class Cache implements Disposable {
 
 	get branchMergedStatus(): RepoPromiseCacheMap<string, GitBranchMergedStatus> {
 		return (this._caches.branchMergedStatus ??= new RepoPromiseCacheMap<string, GitBranchMergedStatus>({
-			createTTL: 1000 * 60 * 5, // 5 minutes
+			createTTL: 1000 * 60 * 30, // 30 minutes — content-keyed on tip shas, so this is just a backstop
+			accessTTL: 1000 * 60 * 60, // 60 minutes
+			capacity: 100, // Limit to 100 branch-pairs per repo
 		}));
 	}
 
@@ -490,6 +494,7 @@ export class Cache implements Disposable {
 			}
 
 			invalidateMemoized('providers');
+			this.incrementStatusGenerations(repoPath);
 		} else {
 			// Clear specific cache types
 			if (types.includes('blame')) {
@@ -502,13 +507,11 @@ export class Cache implements Disposable {
 				keysToClear.add('fileLog');
 			}
 
-			// Branch caches affected by HEAD/heads changes — `branchMergedStatus` is shared
-			// (the answer is invariant across worktrees of the same common repo) but is invalidated
-			// here because branch-tip movement in any worktree can change the merge status; the
-			// shared-clear logic below routes shared keys via commonPath.
+			// Branch caches affected by HEAD/heads changes. `branchMergedStatus` is deliberately NOT
+			// cleared here — it's content-keyed on the involved tip shas, so tip movement already
+			// self-invalidates (a new key); evicting it here would only discard still-valid answers.
 			if (types.includes('branch') || types.includes('branches')) {
 				keysToClear.add('branch');
-				keysToClear.add('branchMergedStatus');
 				keysToClear.add('branchOverviews');
 				// `commit`/`commitCount` are keyed by symbolic ref or SHA — symbolic-ref entries
 				// can drift when branches move; cascade-clear conservatively.
@@ -589,6 +592,10 @@ export class Cache implements Disposable {
 			}
 			if (types.includes('status')) {
 				keysToClear.add('pausedOperationStatus');
+				// A caller asserting "status changed" (the post-op hooks in `operations.ts`, a user-initiated
+				// refresh) has to advance the clock too — otherwise a `git status` still in flight from before
+				// the operation can satisfy the read that follows it.
+				this.incrementStatusGenerations(repoPath);
 			}
 			if (types.includes('tags')) {
 				keysToClear.add('tags');
@@ -647,6 +654,52 @@ export class Cache implements Disposable {
 		}
 	}
 
+	/**
+	 * Monotonic per-worktree counter, advanced whenever anything that can change `git status` output is
+	 * observed. `git status` and its siblings are point-in-time reads of mutable state, so deduplicating them
+	 * on repoPath alone is unsound — a run that started before a commit would satisfy a caller that arrived
+	 * after it. Callers stamp their in-flight run with the generation it started in and refuse older joins.
+	 * Kept per exact worktree path (never spread to the common path) and advanced on `unregisterRepoPath` so a
+	 * read in flight from a prior registration can't be joined after a reopen.
+	 *
+	 * Note: a run that never settles wedges only its own generation's callers (a newer generation gets a fresh
+	 * key). `git.run` recovers via its per-command timeout (default 60s); a hung `git.stream` is caught by the
+	 * status provider's `raceWithTimeout` backstop (scaled to `advanced.git.timeout`; see
+	 * `dedupeByStatusGeneration`), which rejects a wedged read so waiters unblock and a later caller retries.
+	 */
+	getStatusGeneration(repoPath: string): number {
+		return this._statusGenerations.get(repoPath) ?? 0;
+	}
+
+	/** Advances the status clock — see {@link getStatusGeneration}. */
+	incrementStatusGeneration(repoPath: string): void {
+		this._statusGenerations.set(repoPath, this.getStatusGeneration(repoPath) + 1);
+	}
+
+	/**
+	 * Working-tree changes ride their own channel (`Repository.onDidChangeWorkingTree`), not
+	 * `onRepositoryChanged` — an external `git restore <file>` may touch no `.git` path we classify — so
+	 * they have to advance the status clock separately or a discard would never invalidate an in-flight read.
+	 */
+	onWorkingTreeChanged(repoPath: string): void {
+		this.incrementStatusGeneration(repoPath);
+	}
+
+	/** Advances the status clock for one worktree, or for every known worktree when `repoPath` is undefined. */
+	private incrementStatusGenerations(repoPath: string | undefined): void {
+		if (repoPath != null) {
+			this.incrementStatusGeneration(repoPath);
+			return;
+		}
+
+		// Union of registered repos and any path that already carries a generation — a secondary-worktree
+		// path incremented via its own watcher may never have been registered, but still has in-flight reads to fence.
+		const paths = new Set([...this._commonPathRegistry.keys(), ...this._statusGenerations.keys()]);
+		for (const path of paths) {
+			this.incrementStatusGeneration(path);
+		}
+	}
+
 	getCommonPath(repoPath: string): string {
 		return this._commonPathRegistry.get(repoPath) ?? repoPath;
 	}
@@ -704,10 +757,15 @@ export class Cache implements Disposable {
 	 * cancellation into the underlying work rather than leaving it orphaned. Controller-backed
 	 * entries self-evict on settle; plain `.set()`-based entries hard-delete immediately.
 	 *
-	 * No-op if `repoPath` is not registered.
+	 * Cache eviction is a no-op if `repoPath` is not registered, but the status clock is advanced
+	 * unconditionally (a fresh registration must not let a post-reopen read join a pre-close one).
 	 */
 	@debug({ onlyExit: true })
 	unregisterRepoPath(repoPath: string): void {
+		// Advance the status clock on close so a status read still in flight from this registration can't be
+		// joined by a read issued after the path is reopened (which would otherwise reuse the same generation).
+		this.incrementStatusGeneration(repoPath);
+
 		const commonPath = this._commonPathRegistry.get(repoPath) ?? repoPath;
 		const worktrees = this._worktreesByCommonPath.get(commonPath);
 		// After removing repoPath, would the commonPath have any worktrees left?
@@ -755,11 +813,12 @@ export class Cache implements Disposable {
 	reset(): void {
 		this._commonPathRegistry.clear();
 		this._worktreesByCommonPath.clear();
+		this._statusGenerations.clear();
 		this._caches = createEmptyCaches();
 	}
 
 	@debug({ onlyExit: true })
-	onRepositoryChanged(repoPath: string, changes: RepositoryChange[]): void {
+	onRepositoryChanged(repoPath: string, changes: Iterable<RepositoryChange>): void {
 		const changesSet = new Set(changes);
 
 		const hasAny = (...c: RepositoryChange[]) => c.some(ch => changesSet.has(ch));
@@ -769,6 +828,14 @@ export class Cache implements Disposable {
 			return;
 		}
 
+		// Advance the status clock (see {@link getStatusGeneration}) for changes that alter `git status` output but
+		// aren't mapped to the `'status'` cache type below: files (index/head/heads), untracked set (ignores/config),
+		// ahead/behind (remotes). Paused-op changes advance it too, but via `clearCaches('status')` (see below) —
+		// listing them here as well would double-increment the clock for a single change.
+		if (hasAny('index', 'head', 'heads', 'remotes', 'ignores', 'config')) {
+			this.incrementStatusGeneration(repoPath);
+		}
+
 		const types = new Set<CachedGitTypes>();
 
 		if (hasAny('head')) {

package/src/git/context.ts

@@ -137,9 +137,10 @@ export interface GitServiceHooks {
 		/**
 		 * Called when a commit is signed successfully.
 		 *
-		 * Note: currently fired only from explicit-sign paths in the patch provider
-		 * (where signing is requested via `-S` and confirmed up front). Operations
-		 * that sign implicitly via `commit.gpgsign=true` (`commit`, `merge`, `pull`,
+		 * Note: currently fired only from explicit-sign paths — the patch provider's
+		 * `commit-tree -S` and the commit operation when the host signing override
+		 * (`config.signing.enabled`) adds `-S`. Operations that sign implicitly via
+		 * `commit.gpgsign=true` (`commit` without the override, `merge`, `pull`,
 		 * `rebase`, `revert`, `cherryPick`) do not fire this hook because the
 		 * library cannot cheaply confirm that signing actually occurred without an
 		 * extra `git config`/`log --show-signature` call.