@gajae-code/tui 0.15.3 → 0.15.4

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [0.15.4] - 2026-08-29
+
+### Fixed
+
+- Path autocomplete matches decomposed (NFD) file names against composed (NFC) input. Composer keystrokes are NFC-normalized while macOS volumes commonly return Hangul and other composed scripts in NFD, so `@한` found nothing even though `한글.txt` existed; both the directory-listing prefix match and the fuzzy filter now compare NFC forms while completion values keep the on-disk name. The native fuzzy finder applies the same normalization to queries and candidates.
+
 ## [0.15.3] - 2026-08-27
 
 ### Fixed

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@gajae-code/tui",
-	"version": "0.15.3",
+	"version": "0.15.4",
 	"description": "Terminal User Interface library with differential rendering for efficient text-based applications",
 	"homepage": "https://gajae-code.com",
 	"author": "Yeachan-Heo and Gajae Code Contributors",
@@ -36,8 +36,8 @@
 		"fmt": "biome format --write ."
 	},
 	"dependencies": {
-		"@gajae-code/natives": "0.15.3",
-		"@gajae-code/utils": "0.15.3",
+		"@gajae-code/natives": "0.15.4",
+		"@gajae-code/utils": "0.15.4",
 		"lru-cache": "11.3.6",
 		"marked": "18.0.6"
 	},

package/src/autocomplete.ts

@@ -18,6 +18,10 @@ async function fuzzyFindNative(): Promise<NativeFuzzyFind> {
 
 const PATH_DELIMITERS = new Set([" ", "\t", '"', "'", "="]);
 
+function isAbsolutePathLike(value: string): boolean {
+	return path.isAbsolute(value) || path.win32.isAbsolute(value);
+}
+
 function buildAutocompleteFuzzyDiscoveryProfile(
 	query: string,
 	basePath: string,
@@ -310,7 +314,7 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 	// Intentionally separate from pi-natives cache: this cache is a local,
 	// per-directory readdir fast-path for prefix completions. Global fuzzy
 	// discovery continues to use native fuzzyFind + shared scan cache.
-	#dirCache: Map<string, { entries: fs.Dirent[]; timestamp: number }> = new Map();
+	#dirCache: Map<string, { entries: fs.Dirent[]; resolvedDir: string; timestamp: number }> = new Map();
 	readonly #DIR_CACHE_TTL = 2000; // 2 seconds
 
 	constructor(commands: (SlashCommand | AutocompleteItem)[] = [], basePath: string = getProjectDir()) {
@@ -589,7 +593,7 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 	async #resolveScopedFuzzyQuery(
 		rawQuery: string,
 	): Promise<{ baseDir: string; query: string; displayBase: string } | null> {
-		const slashIndex = rawQuery.lastIndexOf("/");
+		const slashIndex = Math.max(rawQuery.lastIndexOf("/"), rawQuery.lastIndexOf("\\"));
 		if (slashIndex === -1) {
 			return null;
 		}
@@ -606,15 +610,16 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 			baseDir = path.join(this.#basePath, displayBase);
 		}
 
-		try {
-			if (!(await fs.promises.stat(baseDir)).isDirectory()) {
-				return null;
-			}
-		} catch {
+		const resolvedDir = await this.#resolveDirectoryPath(baseDir);
+		if (!resolvedDir) {
 			return null;
 		}
 
-		return { baseDir, query, displayBase };
+		return {
+			baseDir: resolvedDir,
+			query,
+			displayBase: this.#formatResolvedDirectoryPrefix(displayBase, resolvedDir),
+		};
 	}
 
 	#scopedPathForDisplay(displayBase: string, relativePath: string): string {
@@ -624,16 +629,75 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 		return `${displayBase}${relativePath}`;
 	}
 
-	async #getCachedDirEntries(searchDir: string): Promise<fs.Dirent[]> {
+	async #resolveDirectoryPath(candidate: string): Promise<string | null> {
+		const absoluteCandidate = path.resolve(candidate);
+		const root = path.parse(absoluteCandidate).root;
+		const relativePath = path.relative(root, absoluteCandidate);
+		const components = relativePath ? relativePath.split(path.sep).filter(Boolean) : [];
+		let resolvedPath = root;
+
+		for (const component of components) {
+			let entries: fs.Dirent[];
+			try {
+				entries = await fs.promises.readdir(resolvedPath, { withFileTypes: true });
+			} catch (error) {
+				if ((error as NodeJS.ErrnoException).code === "ENOENT") return null;
+				throw error;
+			}
+
+			const exactEntry = entries.find(entry => entry.name === component);
+			const matchingEntries = exactEntry
+				? [exactEntry]
+				: entries.filter(entry => entry.name.normalize("NFC") === component.normalize("NFC"));
+			// An exact spelling is unambiguous even when a Linux directory contains
+			// both NFC and NFD variants. A normalized-only match must not guess
+			// between siblings, since doing so can expose the wrong subtree.
+			if (matchingEntries.length !== 1) return null;
+
+			const entry = matchingEntries[0];
+			if (!entry) return null;
+			let isDirectory = entry.isDirectory();
+			if (!isDirectory && entry.isSymbolicLink()) {
+				isDirectory = (await fs.promises.stat(path.join(resolvedPath, entry.name))).isDirectory();
+			}
+			if (!isDirectory) return null;
+			resolvedPath = path.join(resolvedPath, entry.name);
+		}
+
+		return resolvedPath;
+	}
+
+	#formatResolvedDirectoryPrefix(rawPrefix: string, resolvedDir: string): string {
+		const normalizedResolvedDir = resolvedDir.replaceAll(path.sep, "/");
+		if (rawPrefix === "~" || rawPrefix.startsWith("~/")) {
+			const homeRelative = path.relative(path.resolve(os.homedir()), resolvedDir).replaceAll(path.sep, "/");
+			return homeRelative ? `~/${homeRelative}/` : "~/";
+		}
+		if (isAbsolutePathLike(rawPrefix)) {
+			return normalizedResolvedDir === "/" ? "/" : `${normalizedResolvedDir}/`;
+		}
+
+		const relative = path.relative(path.resolve(this.#basePath), resolvedDir).replaceAll(path.sep, "/");
+		if (rawPrefix.startsWith("./")) {
+			return relative ? `./${relative}/` : "./";
+		}
+		return relative ? `${relative}/` : "";
+	}
+
+	async #getCachedDirEntries(searchDir: string): Promise<{ entries: fs.Dirent[]; resolvedDir: string }> {
 		const now = Date.now();
 		const cached = this.#dirCache.get(searchDir);
 
 		if (cached && now - cached.timestamp < this.#DIR_CACHE_TTL) {
-			return cached.entries;
+			return { entries: cached.entries, resolvedDir: cached.resolvedDir };
 		}
 
-		const entries = await fs.promises.readdir(searchDir, { withFileTypes: true });
-		this.#dirCache.set(searchDir, { entries, timestamp: now });
+		const resolvedDir = await this.#resolveDirectoryPath(searchDir);
+		if (!resolvedDir) {
+			throw new Error(`Directory not found: ${searchDir}`);
+		}
+		const entries = await fs.promises.readdir(resolvedDir, { withFileTypes: true });
+		this.#dirCache.set(searchDir, { entries, resolvedDir, timestamp: now });
 
 		if (this.#dirCache.size > 100) {
 			const sortedKeys = [...this.#dirCache.entries()]
@@ -645,7 +709,7 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 			}
 		}
 
-		return entries;
+		return { entries, resolvedDir };
 	}
 
 	invalidateDirCache(dir?: string): void {
@@ -680,7 +744,7 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 
 			if (isRootPrefix) {
 				// Complete from specified position
-				if (rawPrefix.startsWith("~") || expandedPrefix.startsWith("/")) {
+				if (rawPrefix.startsWith("~") || isAbsolutePathLike(expandedPrefix)) {
 					searchDir = expandedPrefix;
 				} else {
 					searchDir = path.join(this.#basePath, expandedPrefix);
@@ -688,7 +752,7 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 				searchPrefix = "";
 			} else if (rawPrefix.endsWith("/")) {
 				// If prefix ends with /, show contents of that directory
-				if (rawPrefix.startsWith("~") || expandedPrefix.startsWith("/")) {
+				if (rawPrefix.startsWith("~") || isAbsolutePathLike(expandedPrefix)) {
 					searchDir = expandedPrefix;
 				} else {
 					searchDir = path.join(this.#basePath, expandedPrefix);
@@ -698,7 +762,7 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 				// Split into directory and file prefix
 				const dir = path.dirname(expandedPrefix);
 				const file = path.basename(expandedPrefix);
-				if (rawPrefix.startsWith("~") || expandedPrefix.startsWith("/")) {
+				if (rawPrefix.startsWith("~") || isAbsolutePathLike(expandedPrefix)) {
 					searchDir = dir;
 				} else {
 					searchDir = path.join(this.#basePath, dir);
@@ -706,11 +770,13 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 				searchPrefix = file;
 			}
 
-			const entries = await this.#getCachedDirEntries(searchDir);
+			const { entries, resolvedDir } = await this.#getCachedDirEntries(searchDir);
 			const suggestions: AutocompleteItem[] = [];
+			const lowerSearchPrefix = searchPrefix.normalize("NFC").toLowerCase();
+			const displayDirectoryPrefix = this.#formatResolvedDirectoryPrefix(rawPrefix, resolvedDir);
 
 			for (const entry of entries) {
-				if (!entry.name.toLowerCase().startsWith(searchPrefix.toLowerCase())) {
+				if (!entry.name.normalize("NFC").toLowerCase().startsWith(lowerSearchPrefix)) {
 					continue;
 				}
 				// Skip .git directory
@@ -722,7 +788,7 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 				let isDirectory = entry.isDirectory();
 				if (!isDirectory && entry.isSymbolicLink()) {
 					try {
-						const fullPath = path.join(searchDir, entry.name);
+						const fullPath = path.join(resolvedDir, entry.name);
 						isDirectory = (await fs.promises.stat(fullPath)).isDirectory();
 					} catch {
 						// Broken symlink, file deleted between readdir and stat, or permission error
@@ -730,41 +796,8 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 					}
 				}
 
-				let relativePath: string;
 				const name = entry.name;
-				const displayPrefix = rawPrefix;
-
-				if (displayPrefix.endsWith("/")) {
-					// If prefix ends with /, append entry to the prefix
-					relativePath = displayPrefix + name;
-				} else if (displayPrefix.includes("/")) {
-					// Preserve ~/ format for home directory paths
-					if (displayPrefix.startsWith("~/")) {
-						const homeRelativeDir = displayPrefix.slice(2); // Remove ~/
-						const dir = path.dirname(homeRelativeDir);
-						relativePath = `~/${dir === "." ? name : path.join(dir, name)}`;
-					} else if (displayPrefix.startsWith("/")) {
-						// Absolute path - construct properly
-						const dir = path.dirname(displayPrefix);
-						if (dir === "/") {
-							relativePath = `/${name}`;
-						} else {
-							relativePath = `${dir}/${name}`;
-						}
-					} else {
-						relativePath = path.join(path.dirname(displayPrefix), name);
-						if (displayPrefix.startsWith("./") && !relativePath.startsWith("./")) {
-							relativePath = `./${relativePath}`;
-						}
-					}
-				} else {
-					// For standalone entries, preserve ~/ if original prefix was ~/
-					if (displayPrefix.startsWith("~")) {
-						relativePath = `~/${name}`;
-					} else {
-						relativePath = name;
-					}
-				}
+				const relativePath = `${displayDirectoryPrefix}${name}`;
 
 				const pathValue = isDirectory ? `${relativePath}/` : relativePath;
 				const value = buildCompletionValue(pathValue, {
@@ -798,17 +831,20 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 	async #getFuzzyFileSuggestions(query: string, options: { isQuotedPrefix: boolean }): Promise<AutocompleteItem[]> {
 		try {
 			const scopedQuery = await this.#resolveScopedFuzzyQuery(query);
+			if (query.includes("/") && !scopedQuery) {
+				return [];
+			}
 			const searchPath = scopedQuery?.baseDir ?? this.#basePath;
 			const fuzzyQuery = scopedQuery?.query ?? query;
 			const result = await (await fuzzyFindNative())(buildAutocompleteFuzzyDiscoveryProfile(fuzzyQuery, searchPath));
-			const lowerQuery = fuzzyQuery.toLowerCase();
+			const lowerQuery = fuzzyQuery.normalize("NFC").toLowerCase();
 			const filteredMatches = result.matches.filter(entry => {
 				const p = entry.path.endsWith("/") ? entry.path.slice(0, -1) : entry.path;
 				const normalized = p.replaceAll("\\", "/");
 				if (/(^|\/)\.git(\/|$)/.test(normalized)) {
 					return false;
 				}
-				return lowerQuery.length === 0 || fuzzyMatch(lowerQuery, normalized.toLowerCase());
+				return lowerQuery.length === 0 || fuzzyMatch(lowerQuery, normalized.normalize("NFC").toLowerCase());
 			});
 			const topEntries = filteredMatches.slice(0, 20);
 			const suggestions: AutocompleteItem[] = [];