vde-worktree 0.0.6 → 0.0.8

package/README.ja.md

@@ -267,6 +267,7 @@ vw extract --current --stash
 
 ```bash
 vw use feature/foo
+vw use feature/foo --allow-shared
 vw use feature/foo --allow-agent --allow-unsafe
 ```
 
@@ -278,6 +279,7 @@ vw use feature/foo --allow-agent --allow-unsafe
 安全条件:
 
 - primary が dirty なら拒否
+- 対象 branch が他 worktree で使用中なら `--allow-shared` が必要（指定時は警告を表示）
 - 非TTYでは `--allow-agent` と `--allow-unsafe` の両方が必要
 
 ### `exec`

package/README.md

@@ -267,6 +267,7 @@ Current limitation:
 
 ```bash
 vw use feature/foo
+vw use feature/foo --allow-shared
 vw use feature/foo --allow-agent --allow-unsafe
 ```
 
@@ -278,6 +279,7 @@ What it does:
 Safety:
 
 - Rejects dirty primary worktree
+- If target branch is attached by another worktree, requires `--allow-shared` and prints a warning
 - In non-TTY mode, requires `--allow-agent` and `--allow-unsafe`
 
 ### `exec`

package/completions/fish/vw.fish

@@ -6,6 +6,28 @@ function __vw_worktree_branches
     | sort -u
 end
 
+function __vw_default_branch
+  command git rev-parse --is-inside-work-tree >/dev/null 2>/dev/null; or return 0
+
+  set -l configured (command git config --get vde-worktree.baseBranch 2>/dev/null)
+  if test -n "$configured"
+    echo $configured
+    return
+  end
+
+  command git show-ref --verify --quiet refs/heads/main >/dev/null 2>/dev/null
+  and begin
+    echo main
+    return
+  end
+
+  command git show-ref --verify --quiet refs/heads/master >/dev/null 2>/dev/null
+  and begin
+    echo master
+    return
+  end
+end
+
 function __vw_current_bin
   set -l tokens (commandline -opc)
   if test (count $tokens) -ge 1
@@ -66,6 +88,13 @@ for (const worktree of worktrees) {
 ' 2>/dev/null
 end
 
+function __vw_use_candidates_with_meta
+  begin
+    __vw_worktree_branches
+    __vw_default_branch
+  end | sort -u
+end
+
 function __vw_local_branches
   command git rev-parse --is-inside-work-tree >/dev/null 2>/dev/null; or return 0
   command git for-each-ref --format='%(refname:short)' refs/heads 2>/dev/null | sort -u
@@ -132,7 +161,7 @@ for __vw_bin in vw vde-worktree
   complete -c $__vw_bin -n "__fish_seen_subcommand_from mv" -a "(__vw_local_branches)"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from del" -a "(__vw_worktree_candidates_with_meta)"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from get" -a "(__vw_remote_branches)"
-  complete -c $__vw_bin -n "__fish_seen_subcommand_from use" -a "(__vw_switch_branches)"
+  complete -c $__vw_bin -n "__fish_seen_subcommand_from use" -a "(__vw_use_candidates_with_meta)"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from exec" -a "(__vw_worktree_candidates_with_meta)"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from invoke" -a "(__vw_hook_names)"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from lock" -a "(__vw_worktree_candidates_with_meta)"
@@ -153,6 +182,7 @@ for __vw_bin in vw vde-worktree
   complete -c $__vw_bin -n "__fish_seen_subcommand_from extract" -l stash -d "Allow stash when dirty"
 
   complete -c $__vw_bin -n "__fish_seen_subcommand_from use" -l allow-agent -d "Allow non-TTY execution for use"
+  complete -c $__vw_bin -n "__fish_seen_subcommand_from use" -l allow-shared -d "Allow checkout when branch is attached by another worktree"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from use" -l allow-unsafe -d "Allow unsafe behavior in non-TTY mode"
 
   complete -c $__vw_bin -n "__fish_seen_subcommand_from link" -l no-fallback -d "Disable copy fallback when symlink fails"

package/completions/zsh/_vw

@@ -7,6 +7,24 @@ _vw_worktree_branches_raw() {
     | command sort -u
 }
 
+_vw_default_branch_raw() {
+  command git rev-parse --is-inside-work-tree >/dev/null 2>&1 || return 0
+  local configured
+  configured="$(command git config --get vde-worktree.baseBranch 2>/dev/null)"
+  if [[ -n "${configured}" ]]; then
+    print -r -- "${configured}"
+    return 0
+  fi
+  if command git show-ref --verify --quiet refs/heads/main 2>/dev/null; then
+    print -r -- "main"
+    return 0
+  fi
+  if command git show-ref --verify --quiet refs/heads/master 2>/dev/null; then
+    print -r -- "master"
+    return 0
+  fi
+}
+
 _vw_worktree_candidate_rows_raw() {
   command git rev-parse --is-inside-work-tree >/dev/null 2>&1 || return 0
   local vw_bin="${words[1]:-vw}"
@@ -110,6 +128,25 @@ _vw_complete_worktree_branches_with_meta() {
   _vw_complete_worktree_branches
 }
 
+_vw_complete_use_branches() {
+  local -a branches
+  local default_branch
+  branches=("${(@f)$(_vw_worktree_branches_raw)}")
+  default_branch="$(_vw_default_branch_raw | command head -n 1)"
+  if [[ -n "${default_branch}" ]]; then
+    branches+=("${default_branch}")
+  fi
+
+  branches=("${(@u)branches}")
+
+  if (( ${#branches} > 0 )); then
+    _vw_describe_values "branch" "${branches[@]}"
+    return 0
+  fi
+
+  _vw_complete_worktree_branches
+}
+
 _vw_complete_local_branches() {
   local -a values
   values=("${(@f)$(_vw_local_branches_raw)}")
@@ -118,7 +155,11 @@ _vw_complete_local_branches() {
 
 _vw_complete_switch_branches() {
   local -a values
-  values=("${(@u)${(@f)$(_vw_worktree_branches_raw)} ${(@f)$(_vw_local_branches_raw)}}")
+  values=(
+    "${(@f)$(_vw_worktree_branches_raw)}"
+    "${(@f)$(_vw_local_branches_raw)}"
+  )
+  values=("${(@u)values}")
   _vw_describe_values "branch" "${values[@]}"
 }
 
@@ -231,7 +272,8 @@ _vw() {
           ;;
         use)
           _arguments \
-            "1:branch:_vw_complete_switch_branches" \
+            "1:branch:_vw_complete_use_branches" \
+            "--allow-shared[Allow checkout when branch is attached by another worktree]" \
             "--allow-agent[Allow non-TTY execution for use]" \
             "--allow-unsafe[Allow unsafe behavior in non-TTY mode]"
           ;;

package/dist/index.mjs

@@ -10,6 +10,7 @@ import { parseArgs } from "citty";
 import { execa } from "execa";
 import stringWidth from "string-width";
 import { getBorderCharacters, table } from "table";
+import { createHash } from "node:crypto";
 
 //#region src/core/constants.ts
 const SCHEMA_VERSION = 1;
@@ -170,6 +171,8 @@ const doesGitRefExist = async (cwd, ref) => {
 //#endregion
 //#region src/core/paths.ts
 const GIT_DIR_NAME = ".git";
+const WORKTREE_ID_HASH_LENGTH = 12;
+const WORKTREE_ID_SLUG_MAX_LENGTH = 48;
 const resolveRepoRootFromCommonDir = ({ currentWorktreeRoot, gitCommonDir }) => {
 	if (gitCommonDir.endsWith(`/${GIT_DIR_NAME}`)) return dirname(gitCommonDir);
 	if (gitCommonDir.endsWith(`\\${GIT_DIR_NAME}`)) return dirname(gitCommonDir);
@@ -224,10 +227,14 @@ const getStateDirectoryPath = (repoRoot) => {
 	return join(getWorktreeMetaRootPath(repoRoot), "state");
 };
 const branchToWorktreeId = (branch) => {
-	return encodeURIComponent(branch);
+	return `${branch.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, WORKTREE_ID_SLUG_MAX_LENGTH) || "branch"}--${createHash("sha256").update(branch).digest("hex").slice(0, WORKTREE_ID_HASH_LENGTH)}`;
 };
 const branchToWorktreePath = (repoRoot, branch) => {
-	return join(getWorktreeRootPath(repoRoot), branchToWorktreeId(branch));
+	const worktreeRoot = getWorktreeRootPath(repoRoot);
+	return ensurePathInsideRepo({
+		repoRoot: worktreeRoot,
+		path: join(worktreeRoot, ...branch.split("/"))
+	});
 };
 const ensurePathInsideRepo = ({ repoRoot, path }) => {
 	const rel = relative(repoRoot, path);
@@ -1378,9 +1385,14 @@ const commandHelpEntries = [
 	},
 	{
 		name: "use",
-		usage: "vw use <branch> [--allow-agent --allow-unsafe]",
+		usage: "vw use <branch> [--allow-shared] [--allow-agent --allow-unsafe]",
 		summary: "Checkout target branch in primary worktree.",
-		details: ["Non-TTY execution requires --allow-agent and --allow-unsafe."]
+		details: ["If target branch is attached by another worktree, --allow-shared is required.", "Non-TTY execution requires --allow-agent and --allow-unsafe."],
+		options: [
+			"--allow-shared",
+			"--allow-agent",
+			"--allow-unsafe"
+		]
 	},
 	{
 		name: "exec",
@@ -1654,6 +1666,7 @@ const ensureTargetPathWritable = async (targetPath) => {
 	try {
 		await access(targetPath, constants.F_OK);
 	} catch {
+		await mkdir(dirname(targetPath), { recursive: true });
 		return;
 	}
 	if ((await readdir(targetPath)).length > 0) throw createCliError("TARGET_PATH_NOT_EMPTY", {
@@ -2140,6 +2153,10 @@ const createCli = (options = {}) => {
 			type: "boolean",
 			description: "Allow non-TTY execution for use command"
 		},
+		allowShared: {
+			type: "boolean",
+			description: "Allow use checkout when target branch is attached by another worktree"
+		},
 		reason: {
 			type: "string",
 			valueHint: "text",
@@ -3175,6 +3192,7 @@ const createCli = (options = {}) => {
 					max: 1
 				});
 				const branch = commandArgs[0];
+				const allowShared = parsedArgs.allowShared === true;
 				if (runtime.isInteractive !== true) {
 					if (parsedArgs.allowAgent !== true) throw createCliError("UNSAFE_FLAG_REQUIRED", { message: "UNSAFE_FLAG_REQUIRED: use in non-TTY requires --allow-agent" });
 					ensureUnsafeForNonTty({
@@ -3191,6 +3209,38 @@ const createCli = (options = {}) => {
 						message: "use requires clean primary worktree",
 						details: { repoRoot }
 					});
+					const branchCheckedOutInOtherWorktree = (await collectWorktreeSnapshot(repoRoot)).worktrees.find((worktree) => {
+						return worktree.branch === branch && worktree.path !== repoRoot;
+					});
+					if (branchCheckedOutInOtherWorktree !== void 0 && allowShared !== true) throw createCliError("BRANCH_IN_USE", {
+						message: [
+							`branch '${branch}' is already checked out in another worktree.`,
+							`  path: ${branchCheckedOutInOtherWorktree.path}`,
+							"",
+							"To continue (unsafe), re-run with:",
+							`  vw use ${branch} --allow-shared`,
+							"",
+							"Risk:",
+							"  multiple worktrees will share the same branch."
+						].join("\n"),
+						details: {
+							branch,
+							path: branchCheckedOutInOtherWorktree.path,
+							hint: "re-run with --allow-shared to continue",
+							risk: "unsafe: multiple worktrees will share the same branch"
+						}
+					});
+					if (branchCheckedOutInOtherWorktree !== void 0 && allowShared === true) stderr([
+						"warning: --allow-shared enabled.",
+						`  branch: ${branch}`,
+						`  path: ${branchCheckedOutInOtherWorktree.path}`,
+						"  risk (unsafe): multiple worktrees will share the same branch."
+					].join("\n"));
+					const checkoutArgs = branchCheckedOutInOtherWorktree ? [
+						"checkout",
+						"--ignore-other-worktrees",
+						branch
+					] : ["checkout", branch];
 					const hookContext = createHookContext({
 						runtime,
 						repoRoot,
@@ -3205,7 +3255,7 @@ const createCli = (options = {}) => {
 					});
 					await runGitCommand({
 						cwd: repoRoot,
-						args: ["checkout", branch]
+						args: checkoutArgs
 					});
 					await runPostHook({
 						name: "use",