clank-cli 0.1.61 → 0.1.65

package/src/Mapper.ts

@@ -12,6 +12,19 @@ export interface ScopeOptions {
   worktree?: boolean;
 }
 
+/** Result of mapping an overlay path to a target path */
+export interface TargetMapping {
+  targetPath: string;
+  scope: Scope;
+}
+
+/** params for mapping from the overlay repo to the target project repo */
+export interface MapperContext {
+  overlayRoot: string;
+  targetRoot: string;
+  gitContext: GitContext;
+}
+
 /** Resolve scope from CLI options
  * @param options - The CLI options
  * @param defaultScope - Default scope if none specified, or "require" to throw
@@ -32,19 +45,6 @@ export function resolveScopeFromOptions(
   return defaultScope;
 }
 
-/** Result of mapping an overlay path to a target path */
-export interface TargetMapping {
-  targetPath: string;
-  scope: Scope;
-}
-
-/** params for mapping from the overlay repo to the target project repo */
-export interface MapperContext {
-  overlayRoot: string;
-  targetRoot: string;
-  gitContext: GitContext;
-}
-
 /** Get overlay path for a project: overlay/targets/{projectName} */
 export function overlayProjectDir(
   overlayRoot: string,
@@ -132,34 +132,6 @@ export function targetToOverlay(
   return encodeTargetPath(relPath, overlayBase);
 }
 
-/** Encode a target-relative path to an overlay path */
-function encodeTargetPath(relPath: string, overlayBase: string): string {
-  // agents.md stays at natural path
-  if (basename(relPath) === "agents.md") {
-    return join(overlayBase, relPath);
-  }
-  // .claude/prompts/ and .gemini/prompts/ → prompts/ in overlay (agent-agnostic)
-  for (const agentDir of managedAgentDirs) {
-    const prefix = `${agentDir}/prompts/`;
-    if (relPath.startsWith(prefix)) {
-      return join(overlayBase, "prompts", relPath.slice(prefix.length));
-    }
-  }
-  // .claude/* and .gemini/* → claude/*, gemini/* in overlay (agent-specific)
-  for (const agentDir of managedAgentDirs) {
-    if (relPath.startsWith(`${agentDir}/`)) {
-      const subPath = relPath.slice(agentDir.length + 1);
-      return join(overlayBase, agentDir.slice(1), subPath); // strip leading dot
-    }
-  }
-  // Files with clank/ in path → preserve structure
-  if (isClankPath(relPath)) {
-    return join(overlayBase, relPath);
-  }
-  // Plain files → add clank/ prefix
-  return join(overlayBase, "clank", relPath);
-}
-
 /**
  * Normalize file path argument from clank add command
  * All files go to clank/ in target (except .claude/ files and agent files)
@@ -276,6 +248,64 @@ function mapGlobalOverlay(
   return decodeOverlayPath(relPath, targetRoot, "global");
 }
 
+/** Map project overlay files to target */
+function mapProjectOverlay(
+  overlayPath: string,
+  projectPrefix: string,
+  context: MapperContext,
+): TargetMapping | null {
+  const { targetRoot, gitContext } = context;
+  const relPath = relative(projectPrefix, overlayPath);
+
+  // Worktree-specific files
+  const worktreePrefix = join("worktrees", gitContext.worktreeName);
+  if (relPath.startsWith(`${worktreePrefix}/`)) {
+    const innerPath = relative(worktreePrefix, relPath);
+    return decodeOverlayPath(innerPath, targetRoot, "worktree");
+  }
+
+  // Skip other worktrees
+  if (relPath.startsWith("worktrees/")) return null;
+
+  // Project settings.json (project-only, before shared logic)
+  if (relPath === "claude/settings.json") {
+    return {
+      targetPath: join(targetRoot, ".claude/settings.json"),
+      scope: "project",
+    };
+  }
+
+  return decodeOverlayPath(relPath, targetRoot, "project");
+}
+
+/** Encode a target-relative path to an overlay path */
+function encodeTargetPath(relPath: string, overlayBase: string): string {
+  // agents.md stays at natural path
+  if (basename(relPath) === "agents.md") {
+    return join(overlayBase, relPath);
+  }
+  // .claude/prompts/ and .gemini/prompts/ → prompts/ in overlay (agent-agnostic)
+  for (const agentDir of managedAgentDirs) {
+    const prefix = `${agentDir}/prompts/`;
+    if (relPath.startsWith(prefix)) {
+      return join(overlayBase, "prompts", relPath.slice(prefix.length));
+    }
+  }
+  // .claude/* and .gemini/* → claude/*, gemini/* in overlay (agent-specific)
+  for (const agentDir of managedAgentDirs) {
+    if (relPath.startsWith(`${agentDir}/`)) {
+      const subPath = relPath.slice(agentDir.length + 1);
+      return join(overlayBase, agentDir.slice(1), subPath); // strip leading dot
+    }
+  }
+  // Files with clank/ in path → preserve structure
+  if (isClankPath(relPath)) {
+    return join(overlayBase, relPath);
+  }
+  // Plain files → add clank/ prefix
+  return join(overlayBase, "clank", relPath);
+}
+
 /** Decode an overlay-relative path to target (shared by all scopes) */
 function decodeOverlayPath(
   relPath: string,
@@ -312,33 +342,3 @@ function decodeOverlayPath(
 
   return null;
 }
-
-/** Map project overlay files to target */
-function mapProjectOverlay(
-  overlayPath: string,
-  projectPrefix: string,
-  context: MapperContext,
-): TargetMapping | null {
-  const { targetRoot, gitContext } = context;
-  const relPath = relative(projectPrefix, overlayPath);
-
-  // Worktree-specific files
-  const worktreePrefix = join("worktrees", gitContext.worktreeName);
-  if (relPath.startsWith(`${worktreePrefix}/`)) {
-    const innerPath = relative(worktreePrefix, relPath);
-    return decodeOverlayPath(innerPath, targetRoot, "worktree");
-  }
-
-  // Skip other worktrees
-  if (relPath.startsWith("worktrees/")) return null;
-
-  // Project settings.json (project-only, before shared logic)
-  if (relPath === "claude/settings.json") {
-    return {
-      targetPath: join(targetRoot, ".claude/settings.json"),
-      scope: "project",
-    };
-  }
-
-  return decodeOverlayPath(relPath, targetRoot, "project");
-}

package/src/OverlayGit.ts

@@ -1,16 +1,18 @@
 import { execa } from "execa";
+import picomatch from "picomatch";
 import { managedDirs } from "./AgentFiles.ts";
 
 /** Get git status of the overlay repository */
 export async function getOverlayStatus(
   overlayRoot: string,
-): Promise<{ lines: string[]; raw: string }> {
+  ignorePatterns: string[] = [],
+): Promise<string[]> {
   const { stdout } = await execa({
     cwd: overlayRoot,
   })`git status --porcelain -uall`;
 
-  const lines = stdout.trimEnd() ? stdout.trimEnd().split("\n") : [];
-  return { lines, raw: stdout };
+  const allLines = stdout.trimEnd() ? stdout.trimEnd().split("\n") : [];
+  return filterIgnoredLines(allLines, ignorePatterns);
 }
 
 /** Format git status --porcelain output into readable lines */
@@ -35,6 +37,27 @@ export function formatStatusCode(code: string): string {
   return "?";
 }
 
+/** Filter out lines matching ignore patterns */
+function filterIgnoredLines(
+  lines: string[],
+  ignorePatterns: string[],
+): string[] {
+  if (ignorePatterns.length === 0) return lines;
+
+  const isIgnored = picomatch(ignorePatterns);
+  return lines.filter((line) => {
+    const filePath = line.slice(3); // Skip status code + space
+    const segments = filePath.split("/");
+    const pathBasename = segments.at(-1) ?? "";
+
+    // Check full path and basename
+    if (isIgnored(filePath) || isIgnored(pathBasename)) return false;
+
+    // Check each directory segment (for patterns like ".obsidian")
+    return !segments.some((segment) => isIgnored(segment));
+  });
+}
+
 /** Parse overlay path into scope and path parts within that scope */
 function parseScopedPath(filePath: string): {
   scope: string;
@@ -54,10 +77,8 @@ function parseScopedPath(filePath: string): {
         Math.max(0, afterWorktrees.length - 1),
       );
       const branch = afterWorktrees.slice(0, branchSegments).join("/");
-      return {
-        scope: `${project}/${branch}`,
-        pathParts: afterWorktrees.slice(branchSegments),
-      };
+      const scope = `${project}/${branch}`;
+      return { scope, pathParts: afterWorktrees.slice(branchSegments) };
     }
     return { scope: project || "unknown", pathParts: segments.slice(2) };
   }

package/src/OverlayLinks.ts

@@ -101,14 +101,10 @@ export async function* walkOverlayFiles(
     ignorePatterns.length > 0 ? picomatch(ignorePatterns) : null;
 
   const skip = (relPath: string): boolean => {
-    // Skip templates
-    if (relPath.startsWith("clank/init/")) return true;
-    // Check ignore patterns against relative path and basename
-    if (isIgnored) {
-      const basename = relPath.split("/").at(-1) ?? "";
-      if (isIgnored(relPath) || isIgnored(basename)) return true;
-    }
-    return false;
+    if (relPath.startsWith("clank/init/")) return true; // Skip templates
+    if (!isIgnored) return false;
+    const basename = relPath.split("/").at(-1) ?? "";
+    return isIgnored(relPath) || isIgnored(basename);
   };
 
   const genEntries = walkDirectory(overlayRoot, { skip });
@@ -140,7 +136,6 @@ function isMatchingPromptPath(
   canonicalPath: string,
   actualPath: string,
 ): boolean {
-  const canonicalPrompt = getPromptRelPath(canonicalPath);
-  const actualPrompt = getPromptRelPath(actualPath);
-  return canonicalPrompt !== null && canonicalPrompt === actualPrompt;
+  const canonical = getPromptRelPath(canonicalPath);
+  return canonical !== null && canonical === getPromptRelPath(actualPath);
 }