refactor(pi-add-dir): use fs glob for file search

Author: HenryQW

package-lock.json

@@ -1,5 +1,5 @@
 import { readdirSync, readFileSync, realpathSync, statSync } from "node:fs";
-import { readdir } from "node:fs/promises";
+import { glob } from "node:fs/promises";
 import { homedir } from "node:os";
 import * as path from "node:path";
 
@@ -146,33 +146,21 @@ export async function findFiles(
 
 	const matchPath = normalizedPattern.includes(path.sep);
 	const results: string[] = [];
-	const pending = [root];
 
 	signal?.throwIfAborted();
-	while (pending.length > 0) {
+	for await (const entry of glob("**/@(*|.*)", {
+		cwd: root,
+		withFileTypes: true,
+		exclude: (entry) => entry.isDirectory() && SKIPPED_SEARCH_DIRS.has(entry.name),
+	})) {
 		signal?.throwIfAborted();
-		const current = pending.pop()!;
-		let entries;
-		try {
-			entries = await readdir(current, { withFileTypes: true });
-		} catch {
-			continue;
-		}
+		if (!entry.isFile()) continue;
 
-		for (const entry of entries) {
-			signal?.throwIfAborted();
-			const fullPath = path.join(current, entry.name);
-			if (entry.isDirectory()) {
-				if (!SKIPPED_SEARCH_DIRS.has(entry.name)) pending.push(fullPath);
-				continue;
-			}
-			if (!entry.isFile()) continue;
-
-			const candidate = matchPath ? path.relative(root, fullPath) : entry.name;
-			if (!path.matchesGlob(candidate, normalizedPattern)) continue;
-			results.push(fullPath);
-			if (results.length >= maxResults) return results;
-		}
+		const fullPath = path.join(entry.parentPath, entry.name);
+		const candidate = matchPath ? path.relative(root, fullPath) : entry.name;
+		if (!path.matchesGlob(candidate, normalizedPattern)) continue;
+		results.push(fullPath);
+		if (results.length >= maxResults) return results;
 	}
 
 	return results;

packages/pi-add-dir/extensions/add-dir-helpers.ts

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-add-dir",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "Add external directories to a Pi session with context, skills, and file search.",
   "keywords": [
     "pi-package",

packages/pi-add-dir/package.json

@@ -24,6 +24,21 @@ test("registers external skills without duplicating Pi's skill prompt", async ()
 	}
 });
 
+test("finds files recursively while skipping dependency and Git trees", async () => {
+	const dir = await mkdtemp(join(tmpdir(), "pi-add-dir-"));
+	try {
+		const matches = [join(dir, "src", "main.ts"), join(dir, ".hidden", "config.ts")];
+		for (const file of [...matches, join(dir, "node_modules", "ignored.ts"), join(dir, ".git", "ignored.ts")]) {
+			await mkdir(join(file, ".."), { recursive: true });
+			await writeFile(file, "");
+		}
+
+		assert.deepEqual((await findFiles(dir, "*.ts", 10)).sort(), matches.sort());
+	} finally {
+		await rm(dir, { recursive: true, force: true });
+	}
+});
+
 test("returns no results when an external directory disappears", async () => {
 	const dir = await mkdtemp(join(tmpdir(), "pi-add-dir-"));
 	await rm(dir, { recursive: true, force: true });