clank-cli 0.1.67 → 0.1.74

package/src/commands/files/Scan.ts

@@ -1,6 +1,12 @@
 import { join, relative } from "node:path";
+import { managedAgentDirs } from "../../AgentFiles.ts";
 import { expandPath, loadConfig } from "../../Config.ts";
-import { resolveSymlinkTarget, walkDirectory } from "../../FsUtil.ts";
+import {
+  getCwd,
+  resolveSymlinkTarget,
+  toSlash,
+  walkDirectory,
+} from "../../FsUtil.ts";
 import { getGitContext } from "../../Git.ts";
 import { isClankPath } from "../../Mapper.ts";
 import { isAgentFilePath } from "./Dedupe.ts";
@@ -76,7 +82,7 @@ interface NotLinkedToOverlay {
 export async function getFilesContext(
   inputPath?: string,
 ): Promise<FilesContext> {
-  const cwd = process.cwd();
+  const cwd = await getCwd();
   const gitContext = await getGitContext(cwd);
   const targetRoot = gitContext.gitRoot;
   const scanRoot = resolveScanRoot(targetRoot, cwd, inputPath);
@@ -146,7 +152,7 @@ function resolveScanRoot(
 ): string {
   if (!input) return targetRoot;
   const resolved = join(cwd, input);
-  const rel = normalizeRelPath(relative(targetRoot, resolved));
+  const rel = toSlash(relative(targetRoot, resolved));
   if (rel.startsWith("..")) {
     throw new Error(`Path is outside the git repository: ${input}`);
   }
@@ -178,7 +184,7 @@ async function maybeCreateEntry(
   opts: NormalizedFilesOptions,
   filePath: string,
 ): Promise<FileEntry | null> {
-  const targetRel = normalizeRelPath(relative(ctx.targetRoot, filePath));
+  const targetRel = toSlash(relative(ctx.targetRoot, filePath));
   if (!isManagedTargetPath(targetRel, opts.hidden)) return null;
   if (!passesDepthFilter(targetRel, opts.depth)) return null;
 
@@ -187,16 +193,12 @@ async function maybeCreateEntry(
 
   return {
     absolutePath: filePath,
-    cwdRelativePath: normalizeRelPath(relative(ctx.cwd, filePath) || "."),
+    cwdRelativePath: toSlash(relative(ctx.cwd, filePath) || "."),
     targetRelativePath: targetRel,
     link,
   };
 }
 
-function normalizeRelPath(p: string): string {
-  return p.replaceAll("\\", "/");
-}
-
 /** Decide whether a target-relative path is managed by clank for listing. */
 function isManagedTargetPath(relPath: string, includeHidden: boolean): boolean {
   if (isAgentFilePath(relPath)) return true;
@@ -220,7 +222,8 @@ async function classifyLink(
 ): Promise<LinkState> {
   try {
     const overlayPath = await resolveSymlinkTarget(filePath);
-    if (!overlayPath.startsWith(overlayRoot)) return { kind: "unlinked" };
+    if (!toSlash(overlayPath).startsWith(toSlash(overlayRoot)))
+      return { kind: "unlinked" };
     const scope = inferScopeFromOverlay(overlayPath, overlayRoot, gitContext);
     if (!scope) return { kind: "unlinked" };
     return { kind: "linked", overlayPath, scope };
@@ -242,7 +245,7 @@ function passesLinkFilter(
 }
 
 function isInDotAgentDir(relPath: string): boolean {
-  return isInDirectory(relPath, ".claude") || isInDirectory(relPath, ".gemini");
+  return managedAgentDirs.some((dir) => isInDirectory(relPath, dir));
 }
 
 /** Enforce a max segment count beneath the nearest `clank/` path component. */
@@ -263,16 +266,16 @@ function inferScopeFromOverlay(
   overlayRoot: string,
   gitContext: Awaited<ReturnType<typeof getGitContext>>,
 ): "global" | "project" | "worktree" | null {
-  const globalPrefix = `${join(overlayRoot, "global")}/`;
-  if (overlayPath.startsWith(globalPrefix)) return "global";
+  const op = toSlash(overlayPath);
+  const globalPrefix = `${toSlash(join(overlayRoot, "global"))}/`;
+  if (op.startsWith(globalPrefix)) return "global";
 
   const { projectName, worktreeName } = gitContext;
-  const projectPath = join(overlayRoot, "targets", projectName);
-  const worktreePath = join(projectPath, "worktrees", worktreeName);
-  if (overlayPath.startsWith(`${worktreePath}/`)) return "worktree";
+  const projectBase = toSlash(join(overlayRoot, "targets", projectName));
+  const worktreePrefix = `${projectBase}/worktrees/${worktreeName}/`;
+  if (op.startsWith(worktreePrefix)) return "worktree";
 
-  const projectPrefix = `${projectPath}/`;
-  if (overlayPath.startsWith(projectPrefix)) return "project";
+  if (op.startsWith(`${projectBase}/`)) return "project";
 
   return null;
 }