@norman-else/dsh-claude 0.1.39 → 0.1.40

package/lib/index.mjs

@@ -4164,6 +4164,22 @@ function parseWorktreeBranches(value) {
 function slug(value, fallback) {
 	return value.toLocaleLowerCase("en-US").replace(/[^a-z0-9._-]+/gu, "-").replace(/^-+|-+$/gu, "").slice(0, 48) || fallback;
 }
+/** A branch name as one path segment: `/` and anything else unsafe folds to
+*  `-`, case is kept so a ticket key stays scannable (`PSOS-5683`, not
+*  `psos-5683`). Flattened rather than nested on purpose -- see
+*  {@link worktreeDirectoryName}. */
+function branchSegment(branch) {
+	return branch.replace(/[^A-Za-z0-9._-]+/gu, "-").replace(/^[-.]+/u, "").replace(/-+$/u, "").slice(0, 48).replace(/-+$/u, "") || "branch";
+}
+/** Name a worktree directory after the repository and the branch it holds, so
+*  the workspace list reads without opening a session.
+*
+*  One flat segment, never a `feature/x` subdirectory: the orphan sweep lists
+*  this root one level deep, and a prefix directory holds no lease of its own,
+*  so it would be removed along with every live worktree inside it. */
+function worktreeDirectoryName(root, branch) {
+	return `${slug(basename(root), "repository")}-${branchSegment(branch)}`;
+}
 /** Comparable form for path identity: resolved, forward slashes, case-folded
 *  so Windows drive-letter or case spelling differences cannot hide a match. */
 function comparablePath(value) {
@@ -4463,6 +4479,18 @@ var RepositorySetupService = class {
 		], root, GIT_FETCH_TIMEOUT_MS);
 		if (fetched.exitCode !== 0 || fetched.lossy) throw new RepositorySetupError("fetch-failed", "Git could not refresh remote references.");
 	}
+	/** The remote-tracking ref a local base branch follows, when that ref still
+	*  exists. Falls back to the local branch for a branch with no upstream. */
+	async #upstreamRef(git, info, branch) {
+		const upstream = await this.#run(git, [
+			"for-each-ref",
+			"--format=%(upstream:short)",
+			`refs/heads/${branch}`
+		], info.root);
+		if (upstream.exitCode !== 0 || upstream.lossy) return void 0;
+		const name = upstream.stdout.trim();
+		return name.length > 0 && info.remoteBranches.includes(name) ? `refs/remotes/${name}` : void 0;
+	}
 	async #checkout(info, branch) {
 		if (info.current !== branch) {
 			if (info.dirty) throw new RepositorySetupError("dirty-workspace", "Commit or stash workspace changes before switching branches.");
@@ -4493,10 +4521,11 @@ var RepositorySetupService = class {
 		const git = await this.#git();
 		progress("fetching");
 		await this.#fetchRemotes(git, root);
+		const startRef = reuseExistingBranch ? baseRef : await this.#upstreamRef(git, info, baseBranch) ?? baseRef;
 		const suffix = randomUUID().slice(0, 8);
 		const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[-:]/gu, "").replace(/\.\d{3}Z$/u, "Z");
 		const branch = explicitBranchName ?? await this.#generatedBranch(info, baseBranch, intent, stamp, suffix, progress);
-		const path = join(this.#worktreeRoot, `${slug(basename(root), "repository")}-${stamp}-${suffix}`);
+		const path = join(this.#worktreeRoot, await this.#freeDirectoryName(root, branch));
 		progress("creating-worktree");
 		await mkdir(this.#worktreeRoot, { recursive: true });
 		if (reuseExistingBranch) await this.#run(git, ["worktree", "prune"], root).catch(() => void 0);
@@ -4512,7 +4541,7 @@ var RepositorySetupService = class {
 			"-b",
 			branch,
 			path,
-			baseRef
+			startRef
 		], root);
 		if (created.exitCode !== 0) {
 			const detail = created.stderr.split(/\r?\n/u).map((line) => line.trim()).filter((line) => line.length > 0).at(-1);
@@ -4559,6 +4588,21 @@ var RepositorySetupService = class {
 	/** `<prefix>/<what the draft is about>`, falling back to
 	*  `<prefix>/<base branch>-<stamp>-<random>` whenever the summary is missing
 	*  or unusable. The prefix and the fallback shape are unchanged. */
+	/** The branch-named directory, or the first `-2`, `-3`, ... spelling free of
+	*  anything already on disk. Names no longer carry a timestamp, so a stale
+	*  directory a crash left behind -- or two branches that fold to the same
+	*  segment -- would otherwise fail `worktree add` outright. Compared
+	*  case-folded, since a case-insensitive filesystem would collide anyway. */
+	async #freeDirectoryName(root, branch) {
+		const base = worktreeDirectoryName(root, branch);
+		const taken = await readdir(this.#worktreeRoot).then((entries) => new Set(entries.map((entry) => entry.toLocaleLowerCase("en-US"))), () => /* @__PURE__ */ new Set());
+		if (!taken.has(base.toLocaleLowerCase("en-US"))) return base;
+		for (let index = 2; index < 100; index += 1) {
+			const candidate = `${base}-${index}`;
+			if (!taken.has(candidate.toLocaleLowerCase("en-US"))) return candidate;
+		}
+		return base;
+	}
 	async #generatedBranch(info, baseBranch, intent, stamp, suffix, progress) {
 		const prefix = safeBranch(await this.#branchPrefix());
 		if (intent !== void 0 && intent.trim().length > 0) {