@oh-my-pi/pi-tui 15.4.3 → 15.5.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+## [15.5.0] - 2026-05-26
+
+### Fixed
+
+- Fixed `@` file mention autocomplete stalling for seconds when the query references something outside the project root (e.g. `@../`, `@~/`, `@/abs/`). `CombinedAutocompleteProvider` now short-circuits to plain immediate-directory prefix listing in those cases instead of dispatching a recursive `fuzzyFind` walk over a sibling directory full of unrelated projects. Inside-cwd queries keep the existing fuzzy-then-prefix behavior. ([#1395](https://github.com/can1357/oh-my-pi/issues/1395))
+- Gated the Hangul Compatibility Jamo width correction (U+3131..U+318E → 1 cell, originally landed in 15.0.1 for the IME / hardware-cursor displacement bug) behind `process.platform === "darwin"` in the TS path and `cfg!(target_os = "macos")` in the `pi-natives` Rust path. macOS terminals (Ghostty / Terminal.app / iTerm2) render jamo as 1 cell despite UAX#11 classifying them as Wide, but WezTerm and most Linux terminals honor UAX#11 and render them as 2 cells. The unconditional correction therefore desynced the TUI's column bookkeeping from the terminal's actual rendering off-darwin, producing corrupted layout and broken Korean input on Linux. On non-darwin the helpers now defer entirely to `Bun.stringWidth` / `UnicodeWidthStr` (also a small perf win on the multi-char-grapheme path). ([#1410](https://github.com/can1357/oh-my-pi/issues/1410))
+
 ## [15.4.0] - 2026-05-26
 
 ### Fixed

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-tui",
-	"version": "15.4.3",
+	"version": "15.5.1",
 	"description": "Terminal User Interface library with differential rendering for efficient text-based applications",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -37,8 +37,8 @@
 		"fmt": "biome format --write ."
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-natives": "15.4.3",
-		"@oh-my-pi/pi-utils": "15.4.3",
+		"@oh-my-pi/pi-natives": "15.5.1",
+		"@oh-my-pi/pi-utils": "15.5.1",
 		"lru-cache": "11.3.6",
 		"marked": "^18.0.3"
 	},

package/src/autocomplete.ts

@@ -237,6 +237,17 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 		const atPrefix = this.#extractAtPrefix(textBeforeCursor);
 		if (atPrefix) {
 			const { rawPrefix, isQuotedPrefix } = parsePathPrefix(atPrefix);
+			// Recursive fuzzy walks rooted outside the project (e.g. `@../`,
+			// `@~/`, `@/abs`) can be huge — a parent dir full of sibling
+			// projects blows past several seconds of latency. Outside cwd,
+			// fall back to plain prefix listing of the immediate directory
+			// (matches Claude Code's behavior). Inside cwd we keep the
+			// fuzzy-then-prefix flow.
+			if (rawPrefix.length > 0 && this.#isOutsideCwd(rawPrefix)) {
+				const items = await this.#getFileSuggestions(atPrefix);
+				if (items.length === 0) return null;
+				return { items, prefix: atPrefix };
+			}
 			const suggestions =
 				rawPrefix.length > 0
 					? await this.#getFuzzyFileSuggestions(rawPrefix, { isQuotedPrefix })
@@ -479,6 +490,28 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 		return filePath;
 	}
 
+	// Resolve `rawPrefix` lexically (no I/O) and report whether it points
+	// somewhere outside `this.#basePath`. Used to skip recursive fuzzy walks
+	// rooted at parent / absolute / home paths — those routinely include
+	// thousands of unrelated files and stall the UI for seconds.
+	#isOutsideCwd(rawPrefix: string): boolean {
+		if (rawPrefix.length === 0) return false;
+		let target: string;
+		if (rawPrefix.startsWith("~")) {
+			target = this.#expandHomePath(rawPrefix);
+		} else if (path.isAbsolute(rawPrefix)) {
+			target = rawPrefix;
+		} else {
+			target = path.resolve(this.#basePath, rawPrefix);
+		}
+		const rel = path.relative(this.#basePath, target);
+		if (rel === "" || rel === ".") return false;
+		if (path.isAbsolute(rel)) return true;
+		const firstSep = rel.indexOf(path.sep);
+		const head = firstSep === -1 ? rel : rel.slice(0, firstSep);
+		return head === "..";
+	}
+
 	async #resolveScopedFuzzyQuery(
 		rawQuery: string,
 	): Promise<{ baseDir: string; query: string; displayBase: string } | null> {

package/src/stdin-buffer.ts

@@ -67,6 +67,18 @@ function isCompleteSequence(data: string): "complete" | "incomplete" | "not-esca
 		return afterEsc.length >= 2 ? "complete" : "incomplete";
 	}
 
+	// ESC-prefixed sequences (terminals with metaSendsEscape):
+	// Only when the inner ESC starts a CSI ('[') or SS3 ('O') sequence.
+	// Bare double-ESC (e.g. \x1b\x1bX) remains complete to avoid 10ms timeout lag.
+	if (afterEsc.startsWith(ESC)) {
+		const inner = data.slice(1);
+		const third = inner.charCodeAt(1);
+		if (third === 0x5b || third === 0x4f) {
+			return isCompleteSequence(inner);
+		}
+		return "complete";
+	}
+
 	// Meta key sequences: ESC followed by a single character
 	if (afterEsc.length === 1) {
 		return "complete";

package/src/terminal.ts

@@ -128,7 +128,7 @@ export class ProcessTerminal implements Terminal {
 	#osc11QueryQueued = false;
 	#osc11ResponseBuffer = "";
 	#privateCsiResponseBuffer = "";
-	#pendingDa1Sentinels = 0;
+	#da1SentinelOwners: ("keyboard" | "osc11")[] = [];
 	#osc11PollTimer?: Timer;
 	#mode2031DebounceTimer?: Timer;
 	#progressTimer?: ReturnType<typeof setInterval>;
@@ -293,7 +293,7 @@ export class ProcessTerminal implements Terminal {
 			// events that would otherwise leak into the prompt as keystrokes. See #1238.
 			if (
 				this.#privateCsiResponseBuffer ||
-				(privateCsiPartialPattern.test(sequence) && this.#pendingDa1Sentinels > 0)
+				(privateCsiPartialPattern.test(sequence) && this.#da1SentinelOwners.length > 0)
 			) {
 				if (this.#privateCsiResponseBuffer && sequence.startsWith("\x1b")) {
 					// New escape arrived mid-reassembly — abandon partial and re-process the new sequence.
@@ -324,41 +324,60 @@ export class ProcessTerminal implements Terminal {
 				}
 			}
 
-			// Check for Kitty protocol response (only if not already enabled)
-			if (!this.#kittyProtocolActive) {
-				const match = sequence.match(kittyResponsePattern);
-				if (match) {
-					if (this.#modifyOtherKeysTimeout) {
+			// DA1 response: swallow our sentinel reply regardless of whether OSC 11
+			// already succeeded. Other terminal probes should never see these replies.
+			if (da1ResponsePattern.test(sequence) && this.#da1SentinelOwners.length > 0) {
+				const owner = this.#da1SentinelOwners.shift()!;
+				if (owner === "osc11") {
+					if (this.#osc11Pending) {
+						// DA1 arrived before the OSC 11 reply: terminal does not support OSC 11.
+						this.#osc11Pending = false;
+						this.#osc11ResponseBuffer = "";
+					}
+					// Start a queued OSC 11 query once the prior cycle is fully drained.
+					if (
+						this.#osc11QueryQueued &&
+						!this.#osc11Pending &&
+						!this.#da1SentinelOwners.includes("osc11") &&
+						!this.#dead
+					) {
+						this.#osc11QueryQueued = false;
+						this.#startOsc11Query();
+					}
+				} else {
+					// Keyboard probe sentinel: kitty reply never arrived → fall back to modifyOtherKeys.
+					if (!this.#kittyProtocolActive && !this.#modifyOtherKeysActive && this.#modifyOtherKeysTimeout) {
 						clearTimeout(this.#modifyOtherKeysTimeout);
 						this.#modifyOtherKeysTimeout = undefined;
+						this.#safeWrite("\x1b[>4;2m");
+						this.#modifyOtherKeysActive = true;
 					}
-					this.#kittyProtocolActive = true;
-					setKittyProtocolActive(true);
-
-					// Enable Kitty keyboard protocol (push flags)
-					// Flag 1 = disambiguate escape codes
-					// Flag 2 = report event types (press/repeat/release)
-					// Flag 4 = report alternate keys
-					this.#safeWrite("\x1b[>7u");
-					return; // Don't forward protocol response to TUI
 				}
+				return;
 			}
 
-			// DA1 response: swallow our sentinel reply regardless of whether OSC 11
-			// already succeeded. Other terminal probes should never see these replies.
-			if (da1ResponsePattern.test(sequence) && this.#pendingDa1Sentinels > 0) {
-				this.#pendingDa1Sentinels--;
-				if (this.#osc11Pending) {
-					// DA1 arrived before OSC 11 response: terminal does not support
-					// OSC 11. Clear the pending state without starting a queued query
-					// (queued query is started below, after sentinel is consumed).
-					this.#osc11Pending = false;
-					this.#osc11ResponseBuffer = "";
+			const match = sequence.match(kittyResponsePattern);
+			if (match && !this.#modifyOtherKeysActive) {
+				if (this.#modifyOtherKeysTimeout) {
+					clearTimeout(this.#modifyOtherKeysTimeout);
+					this.#modifyOtherKeysTimeout = undefined;
 				}
-				// Now that this DA1 cycle is complete, start any queued query.
-				if (this.#osc11QueryQueued && !this.#dead) {
-					this.#osc11QueryQueued = false;
-					this.#startOsc11Query();
+				// Any reply to `\x1b[?u` means the terminal speaks the kitty keyboard
+				// protocol. The reported flag value is the *current* stack-top — fresh
+				// terminals report 0 — so support is implied by the reply itself, not by
+				// the flag value. Pick the level we want; `\x1b[>Nu` pushes one frame
+				// that shutdown's single `\x1b[<u` pop balances.
+				const reportedFlags = parseInt(match[1]!, 10);
+				this.#kittyProtocolActive = true;
+				setKittyProtocolActive(true);
+				if (reportedFlags >= 3) {
+					// Already enriched (Ghostty/foot may keep flags from a parent app).
+					// Push level-2 to lock in event reporting.
+					this.#safeWrite("\x1b[>7u");
+				} else {
+					// Level 1 (disambiguate escape codes) — enough for Shift+Enter
+					// without the modifyOtherKeys fallback that caused regression #3259.
+					this.#safeWrite("\x1b[>1u");
 				}
 				return;
 			}
@@ -425,7 +444,7 @@ export class ProcessTerminal implements Terminal {
 		// consumed yet. Starting a new query while a DA1 is outstanding would
 		// increment the sentinel counter, and the old DA1 arrival would then
 		// prematurely clear the new query's pending state.
-		if (this.#osc11Pending || this.#pendingDa1Sentinels > 0) {
+		if (this.#osc11Pending || this.#da1SentinelOwners.includes("osc11")) {
 			this.#osc11QueryQueued = true;
 			return;
 		}
@@ -435,7 +454,7 @@ export class ProcessTerminal implements Terminal {
 	#startOsc11Query(): void {
 		this.#osc11Pending = true;
 		this.#osc11ResponseBuffer = "";
-		this.#pendingDa1Sentinels++;
+		this.#da1SentinelOwners.push("osc11");
 		this.#safeWrite("\x1b]11;?\x07"); // OSC 11 query (BEL terminated)
 		this.#safeWrite("\x1b[c"); // DA1 sentinel
 	}
@@ -498,7 +517,11 @@ export class ProcessTerminal implements Terminal {
 	#queryAndEnableKittyProtocol(): void {
 		this.#setupStdinBuffer();
 		process.stdin.on("data", this.#stdinDataHandler!);
-		this.#safeWrite("\x1b[?u");
+		// Progressive enhancement query: CSI ?u asks the terminal for its current
+		// kitty keyboard flags (no side effect on the stack); the DA1 sentinel
+		// guarantees a reply even from terminals that ignore CSI ?u.
+		this.#da1SentinelOwners.push("keyboard");
+		this.#safeWrite("\x1b[?u\x1b[c");
 		this.#modifyOtherKeysTimeout = setTimeout(() => {
 			this.#modifyOtherKeysTimeout = undefined;
 			if (this.#kittyProtocolActive || this.#modifyOtherKeysActive) {
@@ -576,7 +599,7 @@ export class ProcessTerminal implements Terminal {
 		this.#osc11QueryQueued = false;
 		this.#osc11ResponseBuffer = "";
 		this.#privateCsiResponseBuffer = "";
-		this.#pendingDa1Sentinels = 0;
+		this.#da1SentinelOwners.length = 0;
 
 		// Disable Kitty keyboard protocol if not already done by drainInput()
 		if (this.#kittyProtocolActive) {

package/src/utils.ts

@@ -101,6 +101,7 @@ export function visibleWidthRaw(str: string): number {
 	const tabWidth = getDefaultTabWidth();
 	let isPureAscii = true;
 	let jamoOvercount = 0;
+	const isMacOS = process.platform === "darwin";
 	for (let i = 0; i < str.length; i++) {
 		const code = str.charCodeAt(i);
 		if (code === 9) {
@@ -108,18 +109,9 @@ export function visibleWidthRaw(str: string): number {
 		} else if (code < 0x20 || code > 0x7e) {
 			isPureAscii = false;
 			// Hangul Compatibility Jamo (U+3131..U+318E) is EAW=W per UAX#11,
-			// so `Bun.stringWidth` returns 2 for each — but every macOS
-			// terminal we ship to (Ghostty, Terminal.app, iTerm2) renders
-			// them as a single cell in monospace fonts. Without this
-			// correction every jamo a Korean IME emits during composition
-			// adds 1 cell of drift to `#extractCursorPosition`, displacing
-			// the hardware cursor (and therefore the IME candidate window)
-			// `N_jamo` cells past the visible glyph. Hangul Syllables
-			// (U+AC00..U+D7A3, e.g. `안`) are correctly 2 cells in both Bun
-			// and the terminal — leave those alone. The Halfwidth Hangul
-			// block (U+FFA0..U+FFDC) is already Narrow in Bun, so no
-			// correction needed there.
-			if (code >= 0x3131 && code <= 0x318e) {
+			// but macOS terminals render them as 1 cell. WezTerm and others
+			// follow UAX#11 at 2 cells. Only correct on macOS.
+			if (isMacOS && code >= 0x3131 && code <= 0x318e) {
 				jamoOvercount++;
 			}
 		}