clank-cli 0.1.66 → 0.1.67

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "clank-cli",
   "description": "Keep AI files in a separate overlay repository",
-  "version": "0.1.66",
+  "version": "0.1.67",
   "author": "",
   "type": "module",
   "bin": {

package/src/OverlayLinks.ts

@@ -1,14 +1,16 @@
-import { lstat } from "node:fs/promises";
-import { dirname, join } from "node:path";
+import { lstat, unlink } from "node:fs/promises";
+import { dirname, join, relative } from "node:path";
 import picomatch from "picomatch";
-import { managedAgentDirs } from "./AgentFiles.ts";
+import { managedAgentDirs, targetManagedDirs } from "./AgentFiles.ts";
 import {
   createSymlink,
   ensureDir,
   getLinkTarget,
+  isSymlink,
   resolveSymlinkTarget,
   walkDirectory,
 } from "./FsUtil.ts";
+import type { GitContext } from "./Git.ts";
 import {
   getPromptRelPath,
   type MapperContext,
@@ -139,3 +141,44 @@ function isMatchingPromptPath(
   const canonical = getPromptRelPath(canonicalPath);
   return canonical !== null && canonical === getPromptRelPath(actualPath);
 }
+
+/** Find and remove symlinks pointing to wrong worktree in the overlay.
+ *  Returns paths that were removed. */
+export async function cleanStaleWorktreeSymlinks(
+  targetRoot: string,
+  overlayRoot: string,
+  gitContext: GitContext,
+): Promise<string[]> {
+  const removed: string[] = [];
+  const currentWorktree = gitContext.worktreeName;
+  const projectName = gitContext.projectName;
+  const worktreesPrefix = `${overlayRoot}/targets/${projectName}/worktrees/`;
+
+  for await (const { path, isDirectory } of walkDirectory(targetRoot)) {
+    if (isDirectory) continue;
+
+    const relPath = relative(targetRoot, path);
+    if (!isInManagedDir(relPath)) continue;
+    if (!(await isSymlink(path))) continue;
+
+    const target = await resolveSymlinkTarget(path);
+    if (!target.startsWith(worktreesPrefix)) continue;
+
+    // Extract worktree name from path like .../worktrees/main/clank/notes.md
+    const afterPrefix = target.slice(worktreesPrefix.length);
+    const worktreeName = afterPrefix.split("/")[0];
+
+    if (worktreeName && worktreeName !== currentWorktree) {
+      await unlink(path);
+      removed.push(relPath);
+    }
+  }
+
+  return removed;
+}
+
+/** Check if a path is inside a clank-managed directory */
+function isInManagedDir(relPath: string): boolean {
+  const parts = relPath.split("/");
+  return parts.some((part) => targetManagedDirs.includes(part));
+}

package/src/commands/Check.ts

@@ -250,7 +250,7 @@ function showUnaddedFiles(
       `Found ${outsideOverlay.length} stale symlink(s) in ${targetName}:\n`,
     );
     console.log("These symlinks point outside the clank overlay.");
-    console.log("Remove them, then run `clank link` to recreate:\n");
+    console.log("Remove them manually, then run `clank link` to recreate:\n");
     for (const file of outsideOverlay) {
       console.log(`  rm ${relativePath(cwd, file.targetPath)}`);
     }
@@ -262,12 +262,11 @@ function showUnaddedFiles(
       `Found ${wrongMapping.length} mislinked symlink(s) in ${targetName}:\n`,
     );
     console.log("These symlinks point to the wrong overlay location.");
-    console.log("Remove them, then run `clank link` to recreate:\n");
+    console.log("Run `clank link` to fix them.\n");
     for (const file of wrongMapping) {
-      console.log(`  rm ${relativePath(cwd, file.targetPath)}`);
-      if (file.currentTarget && file.expectedTarget) {
+      console.log(`  ${relativePath(cwd, file.targetPath)}`);
+      if (file.currentTarget) {
         console.log(`    points to: ${file.currentTarget}`);
-        console.log(`    expected:  ${file.expectedTarget}`);
       }
     }
     console.log();

package/src/commands/Link.ts

@@ -32,6 +32,7 @@ import {
   type TargetMapping,
 } from "../Mapper.ts";
 import {
+  cleanStaleWorktreeSymlinks,
   createPromptLinks as createPromptLinksShared,
   walkOverlayFiles,
 } from "../OverlayLinks.ts";
@@ -72,6 +73,19 @@ export async function linkCommand(targetDir?: string): Promise<void> {
   const overlayRoot = expandPath(config.overlayRepo);
   await validateOverlayExists(overlayRoot);
 
+  // Clean up symlinks pointing to wrong worktree before linking
+  const staleRemoved = await cleanStaleWorktreeSymlinks(
+    targetRoot,
+    overlayRoot,
+    gitContext,
+  );
+  if (staleRemoved.length > 0) {
+    console.log(`\nCleaned ${staleRemoved.length} stale worktree symlink(s):`);
+    for (const path of staleRemoved) {
+      console.log(`  ${path}`);
+    }
+  }
+
   // Check for problematic agent files before proceeding
   await checkAgentFiles(targetRoot, overlayRoot);