@henryqw/pi-add-dir 0.1.10 → 0.1.12

package/README.md

@@ -19,6 +19,7 @@ pi install npm:@henryqw/pi-add-dir
 | --- | --- | --- |
 | `/dir-add` | command | Add directory; no path opens input. Supports `~`. |
 | `/dir-ls` | command | List directories; select one to remove. |
+| `/dir-reload` | command | Reload external directory resources. |
 | `add_directory` | tool | Add a directory. |
 | `search_external_files` | tool | Glob-search added directories. |
 
@@ -28,4 +29,4 @@ Search uses Node filesystem traversal, skips `.git` and `node_modules`, supports
 
 ## State
 
-Pi session entry `add-dir:state` stores added directories; package-managed, do not edit.
+Pi session entry `add-dir:state` stores added directories; package-managed, do not edit. Tree navigation restores the active branch's directories and reloads resources when that set changes.

package/extensions/add-dir-helpers.ts

@@ -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";
 
@@ -18,6 +18,11 @@ const CONTEXT_FILES = ["AGENTS.md", "CLAUDE.md"] as const;
 const SKILL_DIRS = [".pi/skills", ".agents/skills", ".claude/skills"] as const;
 const SKIPPED_SEARCH_DIRS = new Set([".git", "node_modules"]);
 
+function isMissingPathError(error: unknown): boolean {
+	if (!error || typeof error !== "object" || !("code" in error)) return false;
+	return error.code === "ENOENT" || error.code === "ENOTDIR";
+}
+
 export function expandUserPath(input: string): string {
 	if (input === "~") return homedir();
 	if (input.startsWith("~/") || input.startsWith(`~${path.sep}`)) return path.join(homedir(), input.slice(2));
@@ -29,16 +34,18 @@ export function resolveDir(input: string, cwd: string): string {
 	const resolved = path.isAbsolute(expanded) ? expanded : path.resolve(cwd, expanded);
 	try {
 		return realpathSync(resolved);
-	} catch {
-		return path.resolve(resolved);
+	} catch (error) {
+		if (isMissingPathError(error)) return path.resolve(resolved);
+		throw error;
 	}
 }
 
 export function dirExists(dir: string): boolean {
 	try {
 		return statSync(dir).isDirectory();
-	} catch {
-		return false;
+	} catch (error) {
+		if (isMissingPathError(error)) return false;
+		throw error;
 	}
 }
 
@@ -63,7 +70,6 @@ function skillFiles(dir: string): Array<{ name: string; path: string }> {
 
 	for (const skillDir of SKILL_DIRS) {
 		const fullSkillDir = path.join(dir, skillDir);
-		if (!dirExists(fullSkillDir)) continue;
 		try {
 			for (const entry of readdirSync(fullSkillDir, { withFileTypes: true })) {
 				if (!entry.isDirectory() && !entry.isSymbolicLink()) continue;
@@ -97,7 +103,6 @@ export function collectSkillPaths(dirs: AddedDir[]): string[] {
 	const paths: string[] = [];
 	const names = new Set<string>();
 	for (const dir of dirs) {
-		if (!dirExists(dir.absolutePath)) continue;
 		for (const skill of skillFiles(dir.absolutePath)) {
 			if (names.has(skill.name)) continue;
 			names.add(skill.name);
@@ -146,33 +151,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.isSymbolicLink() || (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;

package/extensions/add-dir.ts

@@ -117,13 +117,21 @@ export default function addDirExtension(pi: ExtensionAPI): void {
 		}));
 	}
 
-	function reconstructState(ctx: ExtensionContext): void {
+	function reconstructState(ctx: ExtensionContext): boolean {
 		currentCwd = ctx.cwd;
 		const stateEntry = [...ctx.sessionManager.getBranch()]
 			.reverse()
 			.find((entry) => entry.type === "custom" && entry.customType === STATE_TYPE);
-		addedDirs = stateEntry?.type === "custom" ? readState(stateEntry.data) : [];
+		const nextDirs = stateEntry?.type === "custom" ? readState(stateEntry.data) : [];
+		const changed =
+			addedDirs.length !== nextDirs.length ||
+			addedDirs.some(
+				(dir, index) =>
+					dir.absolutePath !== nextDirs[index]?.absolutePath || dir.label !== nextDirs[index]?.label,
+			);
+		addedDirs = nextDirs;
 		updateWidget(ctx);
+		return changed;
 	}
 
 	function persistState(): void {
@@ -138,17 +146,24 @@ export default function addDirExtension(pi: ExtensionAPI): void {
 		const input = dirPath.trim();
 		if (!input) return { ok: false, message: "Directory path must not be blank.", hasNewSkills: false };
 
-		const absolutePath = resolveDir(input, cwd);
-		if (!dirExists(absolutePath)) {
-			return { ok: false, message: `Directory does not exist: ${absolutePath}`, hasNewSkills: false };
+		let absolutePath: string;
+		try {
+			absolutePath = resolveDir(input, cwd);
+			if (!dirExists(absolutePath)) {
+				return { ok: false, message: `Directory does not exist: ${absolutePath}`, hasNewSkills: false };
+			}
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			return { ok: false, message: `Cannot access directory: ${message}`, hasNewSkills: false };
 		}
 		if (addedDirs.some((dir) => dir.absolutePath === absolutePath)) {
 			return { ok: false, message: `Already added: ${absolutePath}`, hasNewSkills: false };
 		}
-		if (isWithinDir(resolveDir(cwd, cwd), absolutePath)) {
+		const cwdPath = resolveDir(cwd, cwd);
+		if (isWithinDir(cwdPath, absolutePath) || isWithinDir(absolutePath, cwdPath)) {
 			return {
 				ok: false,
-				message: "Directory is already in current working directory scope.",
+				message: "Directory overlaps current working directory scope.",
 				hasNewSkills: false,
 			};
 		}
@@ -195,14 +210,26 @@ export default function addDirExtension(pi: ExtensionAPI): void {
 		return skillPaths.length > 0 ? { skillPaths } : undefined;
 	});
 
-	pi.on("session_start", async (_event, ctx) => reconstructState(ctx));
-	pi.on("session_tree", async (_event, ctx) => reconstructState(ctx));
+	pi.on("session_start", async (_event, ctx) => {
+		reconstructState(ctx);
+	});
+	pi.on("session_tree", async (_event, ctx) => {
+		if (reconstructState(ctx)) pi.sendUserMessage("/dir-reload", { expandPromptTemplates: true });
+	});
 
 	pi.on("before_agent_start", async (event) => {
 		if (addedDirs.length === 0) return;
 		return { systemPrompt: event.systemPrompt + buildContextInjection(addedDirs) };
 	});
 
+	pi.registerCommand("dir-reload", {
+		description: "Reload external directory resources",
+		handler: async (_args, ctx) => {
+			await ctx.reload();
+			return;
+		},
+	});
+
 	pi.registerCommand("dir-add", {
 		description: "Add an external directory to this session",
 		handler: async (args, ctx) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-add-dir",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "Add external directories to a Pi session with context, skills, and file search.",
   "keywords": [
     "pi-package",
@@ -25,8 +25,8 @@
     "pack:check": "npm pack --dry-run"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": ">=0.84.1",
-    "@earendil-works/pi-tui": ">=0.84.1",
+    "@earendil-works/pi-coding-agent": "^0.84.4",
+    "@earendil-works/pi-tui": "^0.84.4",
     "typebox": "^1.3.15"
   },
   "repository": {