git-worktree-organize 1.0.11 → 1.0.12

package/dist/cli.js

@@ -144,6 +144,16 @@ async function moveDir(src, dest) {
 function sanitizeBranch(branch) {
   return branch.replace(/\//g, "-");
 }
+function resolveWorktreePath(worktreePath, dest, sourceParent) {
+  if (existsSync2(worktreePath))
+    return worktreePath;
+  if (worktreePath.startsWith(dest + "/")) {
+    const remapped = sourceParent + worktreePath.slice(dest.length);
+    if (existsSync2(remapped))
+      return remapped;
+  }
+  return worktreePath;
+}
 function isPartialMigration(dest) {
   const gitFile = join2(dest, ".git");
   return existsSync2(join2(dest, ".bare")) && existsSync2(gitFile) && statSync2(gitFile).isFile();
@@ -191,6 +201,8 @@ async function migrate(config, options) {
   await setGitConfig("remote.origin.fetch", "+refs/heads/*:refs/remotes/origin/*", { gitdir: destBare });
   writeFileSync(join2(dest, ".git"), `gitdir: ./.bare
 `);
+  const sourceParent = dirname(source);
+  const worktreesResolved = worktrees.map((wt, i) => i === 0 && config.type === "standard" ? wt : { ...wt, path: resolveWorktreePath(wt.path, dest, sourceParent) });
   if (config.type === "standard") {
     const mainBranch = worktrees[0].branch;
     const mainSafe = sanitizeBranch(mainBranch);
@@ -214,11 +226,11 @@ async function migrate(config, options) {
     }
     writeFileSync(join2(mainDest, ".git"), `gitdir: ${mainAdminDir}
 `);
-    for (let i = 1;i < worktrees.length; i++) {
-      await processLinkedWorktree(worktrees[i], dest, destBare);
+    for (let i = 1;i < worktreesResolved.length; i++) {
+      await processLinkedWorktree(worktreesResolved[i], dest, destBare);
     }
   } else {
-    for (const wt of worktrees) {
+    for (const wt of worktreesResolved) {
       await processLinkedWorktree(wt, dest, destBare);
     }
   }
@@ -332,7 +344,12 @@ ${green("==>")} Reading worktrees from ${source}
 `);
   const config = await detect(source);
   const allWorktrees = await listWorktrees(source);
-  const missing = allWorktrees.filter((wt) => !wt.isBare && !existsSync3(wt.path));
+  const missing = allWorktrees.filter((wt) => {
+    if (wt.isBare)
+      return false;
+    const actual = resolveWorktreePath(wt.path, dest, dirname2(source));
+    return !existsSync3(actual);
+  });
   if (missing.length > 0) {
     console.log(`${yellow("warn:")} The following worktree paths no longer exist:`);
     for (const wt of missing) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-worktree-organize",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Convert any git repo into the canonical bare-hub worktree layout",
   "type": "module",
   "bin": {