hillclimb 0.8.13 → 0.9.0

package/dist/{chunk-IFGDO3FI.js → chunk-JZC2F6VA.js}

@@ -160,7 +160,7 @@ async function repoIdentity(repoRoot) {
 }
 async function logHeal(level, message) {
   try {
-    const { appendLog: appendLog2 } = await import("./log-6MUC7Q3F.js");
+    const { appendLog: appendLog2 } = await import("./log-6OIO3F7C.js");
     appendLog2(level, message);
   } catch {
   }
@@ -169,11 +169,11 @@ function matchByPath(projects, resolved) {
   let best = null;
   let bestLen = -1;
   for (const [key, config] of Object.entries(projects)) {
-    const canonical = path.resolve(key);
-    if (resolved === canonical || resolved.startsWith(canonical + path.sep)) {
-      if (canonical.length > bestLen) {
-        bestLen = canonical.length;
-        best = { key, repoRoot: canonical, config };
+    const canonical2 = path.resolve(key);
+    if (resolved === canonical2 || resolved.startsWith(canonical2 + path.sep)) {
+      if (canonical2.length > bestLen) {
+        bestLen = canonical2.length;
+        best = { key, repoRoot: canonical2, config };
       }
     }
   }
@@ -192,6 +192,10 @@ async function healRenamedProject(file, resolved) {
     healMisses.add(missKey);
     return null;
   }
+  if (await linkedWorktreeParent(toplevel)) {
+    healMisses.add(missKey);
+    return null;
+  }
   const repoRoot = path.resolve(toplevel);
   const identity = await repoIdentity(repoRoot);
   const strong = dead.filter(([, config2]) => {
@@ -246,6 +250,44 @@ async function backfillIdentity(file, match) {
   if (identity.remoteUrl) stored.remoteUrl = identity.remoteUrl;
   await saveProjects(file);
 }
+async function canonical(target) {
+  try {
+    return await fs.promises.realpath(target);
+  } catch {
+    return path.resolve(target);
+  }
+}
+async function linkedWorktreeParent(toplevel) {
+  const [gitDir, commonDir] = await Promise.all([
+    gitOut(["rev-parse", "--git-dir"], toplevel),
+    gitOut(["rev-parse", "--git-common-dir"], toplevel)
+  ]);
+  if (!gitDir || !commonDir) return null;
+  const absolute = (value) => path.isAbsolute(value) ? value : path.join(toplevel, value);
+  const [ownDir, sharedDir] = await Promise.all([
+    canonical(absolute(gitDir)),
+    canonical(absolute(commonDir))
+  ]);
+  if (ownDir === sharedDir || path.basename(sharedDir) !== ".git") return null;
+  return {
+    worktreeRoot: path.resolve(toplevel),
+    parentRoot: path.dirname(sharedDir)
+  };
+}
+async function matchLinkedWorktree(projects, resolved) {
+  const toplevel = await gitOut(["rev-parse", "--show-toplevel"], resolved);
+  if (!toplevel) return null;
+  const linked = await linkedWorktreeParent(toplevel);
+  if (!linked) return null;
+  const direct = matchByPath(projects, linked.parentRoot);
+  if (direct) return { repoRoot: linked.worktreeRoot, config: direct.config };
+  const parentRoot = await canonical(linked.parentRoot);
+  for (const [key, config] of Object.entries(projects)) {
+    if (await canonical(key) === parentRoot)
+      return { repoRoot: linked.worktreeRoot, config };
+  }
+  return null;
+}
 async function findProjectForCwd(cwd) {
   const file = await loadProjects();
   const resolved = path.resolve(cwd);
@@ -254,6 +296,8 @@ async function findProjectForCwd(cwd) {
     await backfillIdentity(file, match);
     return { repoRoot: match.repoRoot, config: match.config };
   }
+  const worktree = await matchLinkedWorktree(file.projects, resolved);
+  if (worktree) return worktree;
   return healRenamedProject(file, resolved);
 }
 

package/dist/{log-6MUC7Q3F.js → log-6OIO3F7C.js}

@@ -3,7 +3,7 @@ import {
   appendLog,
   setLogPrefix,
   todayLogPath
-} from "./chunk-IFGDO3FI.js";
+} from "./chunk-JZC2F6VA.js";
 export {
   appendLog,
   setLogPrefix,