@gitkraken/core-gitlens 0.5.116 → 0.7.0

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

@@ -1,36 +1,38 @@
-import type { Cache } from '../../git/cache.js';
-import type { GitServiceContext } from '../../git/context.js';
-import type { GitWorktree } from '../../git/models/worktree.js';
-import type { GitWorktreesSubProvider } from '../../git/providers/worktrees.js';
-import type { Uri } from '../../utils/uri.js';
-import type { CliGitProviderInternal } from '../cliGitProvider.js';
-import type { Git } from '../exec/git.js';
+import { Uri } from "../../utils/uri.js";
+import { GitServiceContext } from "../../git/context.js";
+import { GitWorktree } from "../../git/models/worktree.js";
+import { Cache } from "../../git/cache.js";
+import { GitWorktreesSubProvider } from "../../git/providers/worktrees.js";
+import { Git } from "../exec/git.js";
+import { CliGitProviderInternal } from "../cliGitProvider.js";
+//#region ../git-cli/src/providers/worktrees.d.ts
 export declare class WorktreesGitSubProvider implements GitWorktreesSubProvider {
-    private readonly context;
-    private readonly git;
-    private readonly cache;
-    private readonly provider;
-    constructor(context: GitServiceContext, git: Git, cache: Cache, provider: CliGitProviderInternal);
-    createWorktree(repoPath: string, path: string, options?: {
-        commitish?: string;
-        createBranch?: string;
-        detach?: boolean;
-        force?: boolean;
-        noTracking?: boolean;
-    }): Promise<void>;
-    createWorktreeWithResult(repoPath: string, path: string, options?: {
-        commitish?: string;
-        createBranch?: string;
-        detach?: boolean;
-        force?: boolean;
-        noTracking?: boolean;
-    }): Promise<GitWorktree | undefined>;
-    getWorktree(repoPath: string, predicate: (w: GitWorktree) => boolean, cancellation?: AbortSignal): Promise<GitWorktree | undefined>;
-    getWorktrees(repoPath: string, cancellation?: AbortSignal): Promise<GitWorktree[]>;
-    getWorktreesDefaultUri(repoPath: string): Uri | undefined;
-    deleteWorktree(repoPath: string, path: string | Uri, options?: {
-        force?: boolean | 'locked';
-    }): Promise<void>;
-    unlockWorktree(repoPath: string, path: string | Uri): Promise<void>;
+  private readonly context;
+  private readonly git;
+  private readonly cache;
+  private readonly provider;
+  constructor(context: GitServiceContext, git: Git, cache: Cache, provider: CliGitProviderInternal);
+  createWorktree(repoPath: string, path: string, options?: {
+    commitish?: string;
+    createBranch?: string;
+    detach?: boolean;
+    force?: boolean;
+    noTracking?: boolean;
+  }): Promise<void>;
+  createWorktreeWithResult(repoPath: string, path: string, options?: {
+    commitish?: string;
+    createBranch?: string;
+    detach?: boolean;
+    force?: boolean;
+    noTracking?: boolean;
+  }): Promise<GitWorktree | undefined>;
+  getWorktree(repoPath: string, predicate: (w: GitWorktree) => boolean, cancellation?: AbortSignal): Promise<GitWorktree | undefined>;
+  getWorktrees(repoPath: string, cancellation?: AbortSignal): Promise<GitWorktree[]>;
+  getWorktreesDefaultUri(repoPath: string): Uri | undefined;
+  deleteWorktree(repoPath: string, path: string | Uri, options?: {
+    force?: boolean | 'locked';
+  }): Promise<void>;
+  unlockWorktree(repoPath: string, path: string | Uri): Promise<void>;
 }
+//#endregion
 //# sourceMappingURL=worktrees.d.ts.map

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

@@ -1,207 +1,182 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { exec } from 'child_process';
-import { promises as fs } from 'fs';
-import { WorktreeCreateError, WorktreeDeleteError } from '../../git/errors.js';
-import { debug } from '../../utils/decorators/log.js';
-import { isWindows } from '../../utils/env/node/platform.js';
-import { getScopedLogger } from '../../utils/logger.scoped.js';
-import { basename, normalizePath } from '../../utils/path.js';
-import { getSettledValue } from '../../utils/promise.js';
-import { fileUri, toFsPath } from '../../utils/uri.js';
-import { getGitCommandError, GitErrors } from '../exec/git.js';
-import { parseGitWorktrees } from '../parsers/worktreeParser.js';
+import { getScopedLogger } from "../../utils/logger.scoped.js";
+import { getSettledValue } from "../../utils/promise.js";
+import { debug } from "../../utils/decorators/log.js";
+import { fileUri, toFsPath } from "../../utils/uri.js";
+import { basename, normalizePath } from "../../utils/path.js";
+import __decorate from "../../_virtual/@oxc-project+runtime/helpers/esm/decorate.js";
+import { WorktreeCreateError, WorktreeDeleteError } from "../../git/errors.js";
+import { isWindows } from "../../utils/env/node/platform.js";
+import { GitErrors, getGitCommandError } from "../exec/git.js";
+import { parseGitWorktrees } from "../parsers/worktreeParser.js";
+import * as l10n from "@vscode/l10n";
+import { exec } from "child_process";
+import { promises } from "fs";
+//#region ../git-cli/src/providers/worktrees.ts
 /** Extracts the lock reason from Git's `cannot remove a locked working tree` output, when it provides one */
 function getLockReason(ex) {
-    return GitErrors.worktreeLockedReason.exec(ex.stderr || ex.stdout || ex.message || '')?.[1].trim() || undefined;
-}
-export class WorktreesGitSubProvider {
-    context;
-    git;
-    cache;
-    provider;
-    constructor(context, git, cache, provider) {
-        this.context = context;
-        this.git = git;
-        this.cache = cache;
-        this.provider = provider;
-    }
-    async createWorktree(repoPath, path, options) {
-        const scope = getScopedLogger();
-        const args = ['worktree', 'add'];
-        if (options?.force) {
-            args.push('--force');
-        }
-        if (options?.createBranch) {
-            args.push('-b', options.createBranch);
-        }
-        if (options?.createBranch && options.noTracking) {
-            args.push('--no-track');
-        }
-        if (options?.detach) {
-            args.push('--detach');
-        }
-        args.push(path);
-        if (options?.commitish) {
-            args.push(options.commitish);
-        }
-        try {
-            await this.git.run({ cwd: repoPath }, ...args);
-            if (options?.createBranch) {
-                // Evict the cached base only — see `checkout -b` for why the persisted keys are left alone.
-                this.cache.deleteBaseBranchName(repoPath, options.createBranch);
-            }
-            this.context.hooks?.cache?.onReset?.(repoPath, ...(options?.createBranch ? ['branches', 'worktrees'] : ['worktrees']));
-            this.context.hooks?.repository?.onChanged?.(repoPath, options?.createBranch ? ['worktrees', 'heads'] : ['worktrees']);
-        }
-        catch (ex) {
-            scope?.error(ex);
-            throw getGitCommandError('worktree-create', ex, reason => new WorktreeCreateError({ reason: reason, gitCommand: { repoPath: repoPath, args: args } }, ex));
-        }
-    }
-    async createWorktreeWithResult(repoPath, path, options) {
-        await this.createWorktree(repoPath, path, options);
-        const normalized = normalizePath(path);
-        return this.getWorktree(repoPath, w => normalizePath(w.path) === normalized);
-    }
-    async getWorktree(repoPath, predicate, cancellation) {
-        return (await this.getWorktrees(repoPath, cancellation)).find(predicate);
-    }
-    async getWorktrees(repoPath, cancellation) {
-        await this.git.ensureSupports('git:worktrees', 'Displaying worktrees', ' Please install a more recent version of Git and try again.');
-        return this.cache.getWorktrees(repoPath, async (commonPath, cacheable, signal) => {
-            // Prefer the aggregate signal from the cache; fall back to the caller's cancellation.
-            signal ??= cancellation;
-            const [dataResult, branchesResult] = await Promise.allSettled([
-                this.git.run({ cwd: commonPath, cancellation: signal }, 'worktree', 'list', '--porcelain'),
-                this.provider.branches.getBranches(commonPath, undefined, signal),
-            ]);
-            if (dataResult.status === 'rejected') {
-                // Don't cache a bogus empty result for a transient command failure — retry on next access.
-                cacheable.invalidate();
-            }
-            const getWorkspaceFolder = this.context.workspace
-                ? uri => {
-                    const folder = this.context.workspace.getFolder(uri.fsPath);
-                    if (folder == null)
-                        return undefined;
-                    return { uri: fileUri(folder.path), name: basename(folder.path) };
-                }
-                : undefined;
-            return parseGitWorktrees(getSettledValue(dataResult)?.stdout, commonPath, getSettledValue(branchesResult)?.values ?? [], getWorkspaceFolder);
-        }, cancellation);
-    }
-    getWorktreesDefaultUri(repoPath) {
-        return this.context.workspace?.getWorktreeDefaultUri?.(repoPath);
-    }
-    async deleteWorktree(repoPath, path, options) {
-        const scope = getScopedLogger();
-        await this.git.ensureSupports('git:worktrees', 'Deleting worktrees', ' Please install a more recent version of Git and try again.');
-        const args = ['worktree', 'remove'];
-        if (options?.force) {
-            args.push('--force');
-            // Git requires a second `--force` to remove a locked worktree
-            if (options.force === 'locked') {
-                args.push('--force');
-            }
-        }
-        const pathStr = normalizePath(toFsPath(path));
-        args.push(pathStr);
-        let deleted = false;
-        try {
-            await this.git.run({ cwd: repoPath, errors: 'throw' }, ...args);
-            deleted = true;
-        }
-        catch (ex) {
-            scope?.error(ex);
-            const gitError = getGitCommandError('worktree-delete', ex, reason => new WorktreeDeleteError({
-                reason: reason,
-                lockReason: reason === 'locked' ? getLockReason(ex) : undefined,
-                gitCommand: { repoPath: repoPath, args: args },
-            }, ex));
-            if (gitError.details.reason === 'directoryNotEmpty') {
-                scope?.warn(`Failed to fully delete worktree '${pathStr}' because it is not empty. Attempting to delete it manually.`);
-                try {
-                    await fs.rm(pathStr, { force: true, recursive: true });
-                    deleted = true;
-                    return;
-                }
-                catch (ex) {
-                    if (isWindows) {
-                        const match = /EPERM: operation not permitted, unlink '(.*?)'/i.exec(ex.message);
-                        if (match != null) {
-                            scope?.warn(`Failed to manually delete '${pathStr}' because it is in use. Attempting to forcefully delete it.`);
-                            // Windows-specific: `del` via cmd.exe to force-remove a locked symlink.
-                            // Node's fs.rm/unlink fails with EPERM when the symlink target is in use.
-                            function deleteInUseSymlink(symlink) {
-                                return new Promise((resolve, reject) => {
-                                    exec(`del "${symlink}"`, (ex, stdout, stderr) => {
-                                        if (ex) {
-                                            reject(ex instanceof Error ? ex : new Error(String(ex)));
-                                        }
-                                        else if (stderr) {
-                                            reject(new Error(stderr));
-                                        }
-                                        else {
-                                            resolve(stdout);
-                                        }
-                                    });
-                                });
-                            }
-                            const [, file] = match;
-                            try {
-                                await deleteInUseSymlink(file);
-                                await fs.rm(pathStr, { force: true, recursive: true, maxRetries: 1, retryDelay: 1 });
-                                deleted = true;
-                                return;
-                            }
-                            catch (ex) {
-                                scope?.error(ex, `Failed to forcefully delete '${pathStr}' because it is in use.`);
-                            }
-                        }
-                    }
-                }
-            }
-            throw gitError;
-        }
-        finally {
-            if (deleted) {
-                // Clean up Cache registry + per-worktree cache entries for the deleted worktree.
-                // Order matters: unregister before emitting the repo-level change so any listener
-                // that re-queries worktree-aware state sees the registry already updated.
-                this.cache.unregisterRepoPath(pathStr);
-                this.context.hooks?.cache?.onReset?.(repoPath, 'worktrees');
-                this.context.hooks?.repository?.onChanged?.(repoPath, ['worktrees']);
-            }
-        }
-    }
-    async unlockWorktree(repoPath, path) {
-        await this.git.ensureSupports('git:worktrees', 'Unlocking worktrees', ' Please install a more recent version of Git and try again.');
-        await this.git.run({ cwd: repoPath, errors: 'throw' }, 'worktree', 'unlock', normalizePath(toFsPath(path)));
-        this.context.hooks?.cache?.onReset?.(repoPath, 'worktrees');
-        this.context.hooks?.repository?.onChanged?.(repoPath, ['worktrees']);
-    }
+	return GitErrors.worktreeLockedReason.exec(ex.stderr || ex.stdout || ex.message || "")?.[1].trim() || void 0;
 }
-__decorate([
-    debug()
-], WorktreesGitSubProvider.prototype, "createWorktree", null);
-__decorate([
-    debug()
-], WorktreesGitSubProvider.prototype, "getWorktree", null);
-__decorate([
-    debug()
-], WorktreesGitSubProvider.prototype, "getWorktrees", null);
-__decorate([
-    debug()
-], WorktreesGitSubProvider.prototype, "getWorktreesDefaultUri", null);
-__decorate([
-    debug()
-], WorktreesGitSubProvider.prototype, "deleteWorktree", null);
-__decorate([
-    debug()
-], WorktreesGitSubProvider.prototype, "unlockWorktree", null);
+var WorktreesGitSubProvider = class {
+	context;
+	git;
+	cache;
+	provider;
+	constructor(context, git, cache, provider) {
+		this.context = context;
+		this.git = git;
+		this.cache = cache;
+		this.provider = provider;
+	}
+	async createWorktree(repoPath, path, options) {
+		const scope = getScopedLogger();
+		const args = ["worktree", "add"];
+		if (options?.force) args.push("--force");
+		if (options?.createBranch) args.push("-b", options.createBranch);
+		if (options?.createBranch && options.noTracking) args.push("--no-track");
+		if (options?.detach) args.push("--detach");
+		args.push(path);
+		if (options?.commitish) args.push(options.commitish);
+		try {
+			await this.git.run({ cwd: repoPath }, ...args);
+			if (options?.createBranch) this.cache.deleteBaseBranchName(repoPath, options.createBranch);
+			this.context.hooks?.cache?.onReset?.(repoPath, ...options?.createBranch ? ["branches", "worktrees"] : ["worktrees"]);
+			this.context.hooks?.repository?.onChanged?.(repoPath, options?.createBranch ? ["worktrees", "heads"] : ["worktrees"]);
+		} catch (ex) {
+			scope?.error(ex);
+			throw getGitCommandError("worktree-create", ex, (reason) => new WorktreeCreateError({
+				reason,
+				gitCommand: {
+					repoPath,
+					args
+				}
+			}, ex));
+		}
+	}
+	async createWorktreeWithResult(repoPath, path, options) {
+		await this.createWorktree(repoPath, path, options);
+		const normalized = normalizePath(path);
+		return this.getWorktree(repoPath, (w) => normalizePath(w.path) === normalized);
+	}
+	async getWorktree(repoPath, predicate, cancellation) {
+		return (await this.getWorktrees(repoPath, cancellation)).find(predicate);
+	}
+	async getWorktrees(repoPath, cancellation) {
+		await this.git.ensureSupports("git:worktrees", (requiredVersion, installedVersion) => l10n.t("Displaying worktrees requires a newer version of Git (>= {0}) than is currently installed ({1}). Please install a more recent version of Git and try again.", requiredVersion, installedVersion));
+		return this.cache.getWorktrees(repoPath, async (commonPath, cacheable, signal) => {
+			signal ??= cancellation;
+			const [dataResult, branchesResult] = await Promise.allSettled([this.git.run({
+				cwd: commonPath,
+				cancellation: signal
+			}, "worktree", "list", "--porcelain"), this.provider.branches.getBranches(commonPath, void 0, signal)]);
+			if (dataResult.status === "rejected") cacheable.invalidate();
+			const getWorkspaceFolder = this.context.workspace ? (uri) => {
+				const folder = this.context.workspace.getFolder(uri.fsPath);
+				if (folder == null) return void 0;
+				return {
+					uri: fileUri(folder.path),
+					name: basename(folder.path)
+				};
+			} : void 0;
+			return parseGitWorktrees(getSettledValue(dataResult)?.stdout, commonPath, getSettledValue(branchesResult)?.values ?? [], getWorkspaceFolder);
+		}, cancellation);
+	}
+	getWorktreesDefaultUri(repoPath) {
+		return this.context.workspace?.getWorktreeDefaultUri?.(repoPath);
+	}
+	async deleteWorktree(repoPath, path, options) {
+		const scope = getScopedLogger();
+		await this.git.ensureSupports("git:worktrees", (requiredVersion, installedVersion) => l10n.t("Deleting worktrees requires a newer version of Git (>= {0}) than is currently installed ({1}). Please install a more recent version of Git and try again.", requiredVersion, installedVersion));
+		const args = ["worktree", "remove"];
+		if (options?.force) {
+			args.push("--force");
+			if (options.force === "locked") args.push("--force");
+		}
+		const pathStr = normalizePath(toFsPath(path));
+		args.push(pathStr);
+		let deleted = false;
+		try {
+			await this.git.run({
+				cwd: repoPath,
+				errors: "throw"
+			}, ...args);
+			deleted = true;
+		} catch (ex) {
+			scope?.error(ex);
+			const gitError = getGitCommandError("worktree-delete", ex, (reason) => new WorktreeDeleteError({
+				reason,
+				lockReason: reason === "locked" ? getLockReason(ex) : void 0,
+				gitCommand: {
+					repoPath,
+					args
+				}
+			}, ex));
+			if (gitError.details.reason === "directoryNotEmpty") {
+				scope?.warn(`Failed to fully delete worktree '${pathStr}' because it is not empty. Attempting to delete it manually.`);
+				try {
+					await promises.rm(pathStr, {
+						force: true,
+						recursive: true
+					});
+					deleted = true;
+					return;
+				} catch (ex) {
+					if (isWindows) {
+						const match = /EPERM: operation not permitted, unlink '(.*?)'/i.exec(ex.message);
+						if (match != null) {
+							scope?.warn(`Failed to manually delete '${pathStr}' because it is in use. Attempting to forcefully delete it.`);
+							function deleteInUseSymlink(symlink) {
+								return new Promise((resolve, reject) => {
+									exec(`del "${symlink}"`, (ex, stdout, stderr) => {
+										if (ex) reject(ex instanceof Error ? ex : new Error(String(ex)));
+										else if (stderr) reject(new Error(stderr));
+										else resolve(stdout);
+									});
+								});
+							}
+							const [, file] = match;
+							try {
+								await deleteInUseSymlink(file);
+								await promises.rm(pathStr, {
+									force: true,
+									recursive: true,
+									maxRetries: 1,
+									retryDelay: 1
+								});
+								deleted = true;
+								return;
+							} catch (ex) {
+								scope?.error(ex, `Failed to forcefully delete '${pathStr}' because it is in use.`);
+							}
+						}
+					}
+				}
+			}
+			throw gitError;
+		} finally {
+			if (deleted) {
+				this.cache.unregisterRepoPath(pathStr);
+				this.context.hooks?.cache?.onReset?.(repoPath, "worktrees");
+				this.context.hooks?.repository?.onChanged?.(repoPath, ["worktrees"]);
+			}
+		}
+	}
+	async unlockWorktree(repoPath, path) {
+		await this.git.ensureSupports("git:worktrees", (requiredVersion, installedVersion) => l10n.t("Unlocking worktrees requires a newer version of Git (>= {0}) than is currently installed ({1}). Please install a more recent version of Git and try again.", requiredVersion, installedVersion));
+		await this.git.run({
+			cwd: repoPath,
+			errors: "throw"
+		}, "worktree", "unlock", normalizePath(toFsPath(path)));
+		this.context.hooks?.cache?.onReset?.(repoPath, "worktrees");
+		this.context.hooks?.repository?.onChanged?.(repoPath, ["worktrees"]);
+	}
+};
+__decorate([debug()], WorktreesGitSubProvider.prototype, "createWorktree", null);
+__decorate([debug()], WorktreesGitSubProvider.prototype, "getWorktree", null);
+__decorate([debug()], WorktreesGitSubProvider.prototype, "getWorktrees", null);
+__decorate([debug()], WorktreesGitSubProvider.prototype, "getWorktreesDefaultUri", null);
+__decorate([debug()], WorktreesGitSubProvider.prototype, "deleteWorktree", null);
+__decorate([debug()], WorktreesGitSubProvider.prototype, "unlockWorktree", null);
+//#endregion
+export { WorktreesGitSubProvider };
+
 //# sourceMappingURL=worktrees.js.map

package/dist/git-cli/providers/worktrees.js.map

@@ -1 +1 @@
-{"version":3,"file":"worktrees.js","sourceRoot":"","sources":["../../../src/git-cli/providers/worktrees.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worktrees.js","names":["fs"],"sources":["../../../../git-cli/src/providers/worktrees.ts"],"sourcesContent":["import { exec } from 'child_process';\nimport { promises as fs } from 'fs';\nimport * as l10n from '@vscode/l10n';\nimport type { Cache } from '@gitlens/git/cache.js';\nimport type { GitServiceContext } from '@gitlens/git/context.js';\nimport { WorktreeCreateError, WorktreeDeleteError } from '@gitlens/git/errors.js';\nimport type { GitWorktree, WorkspaceFolderResolver } from '@gitlens/git/models/worktree.js';\nimport type { GitWorktreesSubProvider } from '@gitlens/git/providers/worktrees.js';\nimport { debug } from '@gitlens/utils/decorators/log.js';\nimport { isWindows } from '@gitlens/utils/env/node/platform.js';\nimport { getScopedLogger } from '@gitlens/utils/logger.scoped.js';\nimport { basename, normalizePath } from '@gitlens/utils/path.js';\nimport { getSettledValue } from '@gitlens/utils/promise.js';\nimport type { Uri } from '@gitlens/utils/uri.js';\nimport { fileUri, toFsPath } from '@gitlens/utils/uri.js';\nimport type { CliGitProviderInternal } from '../cliGitProvider.js';\nimport type { Git, GitError } from '../exec/git.js';\nimport { getGitCommandError, GitErrors } from '../exec/git.js';\nimport { parseGitWorktrees } from '../parsers/worktreeParser.js';\n\n/** Extracts the lock reason from Git's `cannot remove a locked working tree` output, when it provides one */\nfunction getLockReason(ex: GitError): string | undefined {\n\treturn GitErrors.worktreeLockedReason.exec(ex.stderr || ex.stdout || ex.message || '')?.[1].trim() || undefined;\n}\n\nexport class WorktreesGitSubProvider implements GitWorktreesSubProvider {\n\tconstructor(\n\t\tprivate readonly context: GitServiceContext,\n\t\tprivate readonly git: Git,\n\t\tprivate readonly cache: Cache,\n\t\tprivate readonly provider: CliGitProviderInternal,\n\t) {}\n\n\t@debug()\n\tasync createWorktree(\n\t\trepoPath: string,\n\t\tpath: string,\n\t\toptions?: {\n\t\t\tcommitish?: string;\n\t\t\tcreateBranch?: string;\n\t\t\tdetach?: boolean;\n\t\t\tforce?: boolean;\n\t\t\tnoTracking?: boolean;\n\t\t},\n\t): Promise<void> {\n\t\tconst scope = getScopedLogger();\n\n\t\tconst args = ['worktree', 'add'];\n\t\tif (options?.force) {\n\t\t\targs.push('--force');\n\t\t}\n\t\tif (options?.createBranch) {\n\t\t\targs.push('-b', options.createBranch);\n\t\t}\n\t\tif (options?.createBranch && options.noTracking) {\n\t\t\targs.push('--no-track');\n\t\t}\n\t\tif (options?.detach) {\n\t\t\targs.push('--detach');\n\t\t}\n\t\targs.push(path);\n\t\tif (options?.commitish) {\n\t\t\targs.push(options.commitish);\n\t\t}\n\n\t\ttry {\n\t\t\tawait this.git.run({ cwd: repoPath }, ...args);\n\n\t\t\tif (options?.createBranch) {\n\t\t\t\t// Evict the cached base only — see `checkout -b` for why the persisted keys are left alone.\n\t\t\t\tthis.cache.deleteBaseBranchName(repoPath, options.createBranch);\n\t\t\t}\n\n\t\t\tthis.context.hooks?.cache?.onReset?.(\n\t\t\t\trepoPath,\n\t\t\t\t...(options?.createBranch ? (['branches', 'worktrees'] as const) : (['worktrees'] as const)),\n\t\t\t);\n\t\t\tthis.context.hooks?.repository?.onChanged?.(\n\t\t\t\trepoPath,\n\t\t\t\toptions?.createBranch ? ['worktrees', 'heads'] : ['worktrees'],\n\t\t\t);\n\t\t} catch (ex) {\n\t\t\tscope?.error(ex);\n\t\t\tthrow getGitCommandError(\n\t\t\t\t'worktree-create',\n\t\t\t\tex as GitError,\n\t\t\t\treason =>\n\t\t\t\t\tnew WorktreeCreateError(\n\t\t\t\t\t\t{ reason: reason, gitCommand: { repoPath: repoPath, args: args } },\n\t\t\t\t\t\tex as GitError,\n\t\t\t\t\t),\n\t\t\t);\n\t\t}\n\t}\n\n\tasync createWorktreeWithResult(\n\t\trepoPath: string,\n\t\tpath: string,\n\t\toptions?: {\n\t\t\tcommitish?: string;\n\t\t\tcreateBranch?: string;\n\t\t\tdetach?: boolean;\n\t\t\tforce?: boolean;\n\t\t\tnoTracking?: boolean;\n\t\t},\n\t): Promise<GitWorktree | undefined> {\n\t\tawait this.createWorktree(repoPath, path, options);\n\t\tconst normalized = normalizePath(path);\n\t\treturn this.getWorktree(repoPath, w => normalizePath(w.path) === normalized);\n\t}\n\n\t@debug()\n\tasync getWorktree(\n\t\trepoPath: string,\n\t\tpredicate: (w: GitWorktree) => boolean,\n\t\tcancellation?: AbortSignal,\n\t): Promise<GitWorktree | undefined> {\n\t\treturn (await this.getWorktrees(repoPath, cancellation)).find(predicate);\n\t}\n\n\t@debug()\n\tasync getWorktrees(repoPath: string, cancellation?: AbortSignal): Promise<GitWorktree[]> {\n\t\tawait this.git.ensureSupports('git:worktrees', (requiredVersion, installedVersion) =>\n\t\t\tl10n.t(\n\t\t\t\t'Displaying worktrees requires a newer version of Git (>= {0}) than is currently installed ({1}). Please install a more recent version of Git and try again.',\n\t\t\t\trequiredVersion,\n\t\t\t\tinstalledVersion,\n\t\t\t),\n\t\t);\n\n\t\treturn this.cache.getWorktrees(\n\t\t\trepoPath,\n\t\t\tasync (commonPath, cacheable, signal) => {\n\t\t\t\t// Prefer the aggregate signal from the cache; fall back to the caller's cancellation.\n\t\t\t\tsignal ??= cancellation;\n\t\t\t\tconst [dataResult, branchesResult] = await Promise.allSettled([\n\t\t\t\t\tthis.git.run({ cwd: commonPath, cancellation: signal }, 'worktree', 'list', '--porcelain'),\n\t\t\t\t\tthis.provider.branches.getBranches(commonPath, undefined, signal),\n\t\t\t\t]);\n\n\t\t\t\tif (dataResult.status === 'rejected') {\n\t\t\t\t\t// Don't cache a bogus empty result for a transient command failure — retry on next access.\n\t\t\t\t\tcacheable.invalidate();\n\t\t\t\t}\n\n\t\t\t\tconst getWorkspaceFolder: WorkspaceFolderResolver | undefined = this.context.workspace\n\t\t\t\t\t? uri => {\n\t\t\t\t\t\t\tconst folder = this.context.workspace!.getFolder(uri.fsPath);\n\t\t\t\t\t\t\tif (folder == null) return undefined;\n\t\t\t\t\t\t\treturn { uri: fileUri(folder.path), name: basename(folder.path) };\n\t\t\t\t\t\t}\n\t\t\t\t\t: undefined;\n\n\t\t\t\treturn parseGitWorktrees(\n\t\t\t\t\tgetSettledValue(dataResult)?.stdout,\n\t\t\t\t\tcommonPath,\n\t\t\t\t\tgetSettledValue(branchesResult)?.values ?? [],\n\t\t\t\t\tgetWorkspaceFolder,\n\t\t\t\t);\n\t\t\t},\n\t\t\tcancellation,\n\t\t);\n\t}\n\n\t@debug()\n\tgetWorktreesDefaultUri(repoPath: string): Uri | undefined {\n\t\treturn this.context.workspace?.getWorktreeDefaultUri?.(repoPath);\n\t}\n\n\t@debug()\n\tasync deleteWorktree(\n\t\trepoPath: string,\n\t\tpath: string | Uri,\n\t\toptions?: { force?: boolean | 'locked' },\n\t): Promise<void> {\n\t\tconst scope = getScopedLogger();\n\n\t\tawait this.git.ensureSupports('git:worktrees', (requiredVersion, installedVersion) =>\n\t\t\tl10n.t(\n\t\t\t\t'Deleting worktrees requires a newer version of Git (>= {0}) than is currently installed ({1}). Please install a more recent version of Git and try again.',\n\t\t\t\trequiredVersion,\n\t\t\t\tinstalledVersion,\n\t\t\t),\n\t\t);\n\n\t\tconst args = ['worktree', 'remove'];\n\t\tif (options?.force) {\n\t\t\targs.push('--force');\n\t\t\t// Git requires a second `--force` to remove a locked worktree\n\t\t\tif (options.force === 'locked') {\n\t\t\t\targs.push('--force');\n\t\t\t}\n\t\t}\n\n\t\tconst pathStr = normalizePath(toFsPath(path));\n\t\targs.push(pathStr);\n\n\t\tlet deleted = false;\n\t\ttry {\n\t\t\tawait this.git.run({ cwd: repoPath, errors: 'throw' }, ...args);\n\t\t\tdeleted = true;\n\t\t} catch (ex) {\n\t\t\tscope?.error(ex);\n\t\t\tconst gitError = getGitCommandError(\n\t\t\t\t'worktree-delete',\n\t\t\t\tex as GitError,\n\t\t\t\treason =>\n\t\t\t\t\tnew WorktreeDeleteError(\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\treason: reason,\n\t\t\t\t\t\t\tlockReason: reason === 'locked' ? getLockReason(ex as GitError) : undefined,\n\t\t\t\t\t\t\tgitCommand: { repoPath: repoPath, args: args },\n\t\t\t\t\t\t},\n\t\t\t\t\t\tex as GitError,\n\t\t\t\t\t),\n\t\t\t);\n\n\t\t\tif (gitError.details.reason === 'directoryNotEmpty') {\n\t\t\t\tscope?.warn(\n\t\t\t\t\t`Failed to fully delete worktree '${pathStr}' because it is not empty. Attempting to delete it manually.`,\n\t\t\t\t);\n\t\t\t\ttry {\n\t\t\t\t\tawait fs.rm(pathStr, { force: true, recursive: true });\n\t\t\t\t\tdeleted = true;\n\t\t\t\t\treturn;\n\t\t\t\t} catch (ex) {\n\t\t\t\t\tif (isWindows) {\n\t\t\t\t\t\tconst match = /EPERM: operation not permitted, unlink '(.*?)'/i.exec((ex as GitError).message);\n\t\t\t\t\t\tif (match != null) {\n\t\t\t\t\t\t\tscope?.warn(\n\t\t\t\t\t\t\t\t`Failed to manually delete '${pathStr}' because it is in use. Attempting to forcefully delete it.`,\n\t\t\t\t\t\t\t);\n\n\t\t\t\t\t\t\t// Windows-specific: `del` via cmd.exe to force-remove a locked symlink.\n\t\t\t\t\t\t\t// Node's fs.rm/unlink fails with EPERM when the symlink target is in use.\n\t\t\t\t\t\t\tfunction deleteInUseSymlink(symlink: string) {\n\t\t\t\t\t\t\t\treturn new Promise((resolve, reject) => {\n\t\t\t\t\t\t\t\t\texec(`del \"${symlink}\"`, (ex, stdout, stderr) => {\n\t\t\t\t\t\t\t\t\t\tif (ex) {\n\t\t\t\t\t\t\t\t\t\t\treject(ex instanceof Error ? ex : new Error(String(ex)));\n\t\t\t\t\t\t\t\t\t\t} else if (stderr) {\n\t\t\t\t\t\t\t\t\t\t\treject(new Error(stderr));\n\t\t\t\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\t\t\t\tresolve(stdout);\n\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t});\n\t\t\t\t\t\t\t\t});\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\tconst [, file] = match;\n\t\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\t\tawait deleteInUseSymlink(file);\n\t\t\t\t\t\t\t\tawait fs.rm(pathStr, { force: true, recursive: true, maxRetries: 1, retryDelay: 1 });\n\t\t\t\t\t\t\t\tdeleted = true;\n\t\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t\t} catch (ex) {\n\t\t\t\t\t\t\t\tscope?.error(ex, `Failed to forcefully delete '${pathStr}' because it is in use.`);\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tthrow gitError;\n\t\t} finally {\n\t\t\tif (deleted) {\n\t\t\t\t// Clean up Cache registry + per-worktree cache entries for the deleted worktree.\n\t\t\t\t// Order matters: unregister before emitting the repo-level change so any listener\n\t\t\t\t// that re-queries worktree-aware state sees the registry already updated.\n\t\t\t\tthis.cache.unregisterRepoPath(pathStr);\n\t\t\t\tthis.context.hooks?.cache?.onReset?.(repoPath, 'worktrees');\n\t\t\t\tthis.context.hooks?.repository?.onChanged?.(repoPath, ['worktrees']);\n\t\t\t}\n\t\t}\n\t}\n\n\t@debug()\n\tasync unlockWorktree(repoPath: string, path: string | Uri): Promise<void> {\n\t\tawait this.git.ensureSupports('git:worktrees', (requiredVersion, installedVersion) =>\n\t\t\tl10n.t(\n\t\t\t\t'Unlocking worktrees requires a newer version of Git (>= {0}) than is currently installed ({1}). Please install a more recent version of Git and try again.',\n\t\t\t\trequiredVersion,\n\t\t\t\tinstalledVersion,\n\t\t\t),\n\t\t);\n\n\t\tawait this.git.run({ cwd: repoPath, errors: 'throw' }, 'worktree', 'unlock', normalizePath(toFsPath(path)));\n\n\t\tthis.context.hooks?.cache?.onReset?.(repoPath, 'worktrees');\n\t\tthis.context.hooks?.repository?.onChanged?.(repoPath, ['worktrees']);\n\t}\n}\n"],"mappings":"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"}

package/dist/git-cli/service.d.ts

@@ -1,33 +1,34 @@
-import { GitService } from '../git/service.js';
-import type { FileWatchingProvider } from '../git/watching/provider.js';
-import type { CliGitProviderOptions } from './cliGitProvider.js';
-import type { GitLocation } from './exec/locator.js';
+import { FileWatchingProvider } from "../git/watching/provider.js";
+import { GitLocation } from "./exec/locator.js";
+import { CliGitProviderOptions } from "./cliGitProvider.js";
+import { GitService } from "../git/service.js";
+//#region ../git-cli/src/service.d.ts
 /**
  * Options for {@link createCliGitService}.
  */
 export interface CliGitServiceOptions {
-    /**
-     * Path(s) to the git binary.
-     * Auto-detected if omitted (searches PATH, platform-specific locations).
-     * Ignored when {@link locator} is provided.
-     */
-    gitPath?: string | string[];
-    /**
-     * Custom git binary resolver. When provided, used instead of the
-     * default `findGitPath(gitPath)` lookup.
-     */
-    locator?: () => Promise<GitLocation>;
-    /** Host-provided context hooks (cache events, workspace, integrations, telemetry, fs) */
-    context: CliGitProviderOptions['context'];
-    /** Git execution options passed through to the underlying Git executor */
-    gitOptions?: CliGitProviderOptions['gitOptions'];
-    /** Use an existing Cache instance, or one will be created */
-    cache?: CliGitProviderOptions['cache'];
-    /**
-     * Filesystem watching provider. When provided, the {@link GitService}
-     * will watch repositories for changes (file creates, edits, deletes).
-     */
-    watchingProvider?: FileWatchingProvider;
+  /**
+   * Path(s) to the git binary.
+   * Auto-detected if omitted (searches PATH, platform-specific locations).
+   * Ignored when {@link locator} is provided.
+   */
+  gitPath?: string | string[];
+  /**
+   * Custom git binary resolver. When provided, used instead of the
+   * default `findGitPath(gitPath)` lookup.
+   */
+  locator?: () => Promise<GitLocation>;
+  /** Host-provided context hooks (cache events, workspace, integrations, telemetry, fs) */
+  context: CliGitProviderOptions['context'];
+  /** Git execution options passed through to the underlying Git executor */
+  gitOptions?: CliGitProviderOptions['gitOptions'];
+  /** Use an existing Cache instance, or one will be created */
+  cache?: CliGitProviderOptions['cache'];
+  /**
+   * Filesystem watching provider. When provided, the {@link GitService}
+   * will watch repositories for changes (file creates, edits, deletes).
+   */
+  watchingProvider?: FileWatchingProvider;
 }
 /**
  * Creates a ready-to-use {@link GitService} backed by the CLI git provider.
@@ -49,4 +50,5 @@ export interface CliGitServiceOptions {
  * ```
  */
 export declare function createCliGitService(options: CliGitServiceOptions): GitService;
+//#endregion
 //# sourceMappingURL=service.d.ts.map