@oh-my-pi/pi-tui 13.9.6 → 13.9.12

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-tui",
-	"version": "13.9.6",
+	"version": "13.9.12",
 	"description": "Terminal User Interface library with differential rendering for efficient text-based applications",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -33,8 +33,8 @@
 		"test": "bun test test/*.test.ts"
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-natives": "13.9.6",
-		"@oh-my-pi/pi-utils": "13.9.6",
+		"@oh-my-pi/pi-natives": "13.9.12",
+		"@oh-my-pi/pi-utils": "13.9.12",
 		"marked": "^17.0"
 	},
 	"devDependencies": {

package/src/autocomplete.ts

@@ -188,6 +188,7 @@ export interface AutocompleteProvider {
 		lines: string[];
 		cursorLine: number;
 		cursorCol: number;
+		onApplied?: () => void;
 	};
 
 	/** Get inline hint text to show as dim ghost text after the cursor */

package/src/components/editor.ts

@@ -2,7 +2,7 @@ import { getProjectDir } from "@oh-my-pi/pi-utils";
 import type { AutocompleteProvider, CombinedAutocompleteProvider } from "../autocomplete";
 import { BracketedPasteHandler } from "../bracketed-paste";
 import { type EditorKeybindingsManager, getEditorKeybindings } from "../keybindings";
-import { matchesKey } from "../keys";
+import { extractPrintableText, matchesKey } from "../keys";
 import { KillRing } from "../kill-ring";
 import type { SymbolTheme } from "../symbols";
 import { type Component, CURSOR_MARKER, type Focusable } from "../tui";
@@ -255,62 +255,6 @@ function wordWrapLine(line: string, maxWidth: number): TextChunk[] {
 	return chunks.length > 0 ? chunks : [{ text: "", startIndex: 0, endIndex: 0 }];
 }
 
-// Kitty CSI-u sequences for printable keys, including optional shifted/base codepoints and text field.
-const KITTY_CSI_U_REGEX = /^\x1b\[(\d+)(?::(\d*))?(?::(\d+))?(?:;(\d+))?(?::(\d+))?(?:;([\d:]*))?u$/;
-const KITTY_MOD_SHIFT = 1;
-const KITTY_MOD_ALT = 2;
-const KITTY_MOD_CTRL = 4;
-
-// Decode a printable CSI-u sequence, preferring the shifted key when present.
-function decodeKittyPrintable(data: string): string | undefined {
-	const match = data.match(KITTY_CSI_U_REGEX);
-	if (!match) return undefined;
-
-	// CSI-u groups: <codepoint>[:<shifted>[:<base>]];<mod>u
-	const codepoint = Number.parseInt(match[1] ?? "", 10);
-	if (!Number.isFinite(codepoint)) return undefined;
-
-	const shiftedKey = match[2] && match[2].length > 0 ? Number.parseInt(match[2], 10) : undefined;
-	const modValue = match[4] ? Number.parseInt(match[4], 10) : 1;
-	// Modifiers are 1-indexed in CSI-u; normalize to our bitmask.
-	const modifier = Number.isFinite(modValue) ? modValue - 1 : 0;
-
-	// Ignore CSI-u sequences used for Alt/Ctrl shortcuts.
-	if (modifier & (KITTY_MOD_ALT | KITTY_MOD_CTRL)) return undefined;
-
-	const textField = match[6];
-	if (textField && textField.length > 0) {
-		const codepoints = textField
-			.split(":")
-			.filter(Boolean)
-			.map(value => Number.parseInt(value, 10))
-			.filter(value => Number.isFinite(value) && value >= 32);
-		if (codepoints.length > 0) {
-			try {
-				return String.fromCodePoint(...codepoints);
-			} catch {
-				return undefined;
-			}
-		}
-	}
-
-	// Prefer the shifted keycode when Shift is held.
-	let effectiveCodepoint = codepoint;
-	if (modifier & KITTY_MOD_SHIFT && typeof shiftedKey === "number") {
-		effectiveCodepoint = shiftedKey;
-	}
-	if (effectiveCodepoint >= 0xe000 && effectiveCodepoint <= 0xf8ff) {
-		return undefined;
-	}
-	// Drop control characters or invalid codepoints.
-	if (!Number.isFinite(effectiveCodepoint) || effectiveCodepoint < 32) return undefined;
-
-	try {
-		return String.fromCodePoint(effectiveCodepoint);
-	} catch {
-		return undefined;
-	}
-}
 const DEFAULT_PAGE_SCROLL_LINES = 10;
 
 interface EditorState {
@@ -757,11 +701,11 @@ export class Editor implements Component, Focusable {
 				return;
 			}
 
-			if (data.charCodeAt(0) >= 32) {
-				// Printable character - perform the jump
+			const printableText = extractPrintableText(data);
+			if (printableText) {
 				const direction = this.#jumpMode;
 				this.#jumpMode = null;
-				this.#jumpToChar(data, direction);
+				this.#jumpToChar(printableText, direction);
 				return;
 			}
 
@@ -845,6 +789,8 @@ export class Editor implements Component, Focusable {
 						if (this.onChange) {
 							this.onChange(this.getText());
 						}
+
+						result.onApplied?.();
 					}
 					return;
 				}
@@ -874,6 +820,7 @@ export class Editor implements Component, Focusable {
 							this.#state.lines = result.lines;
 							this.#state.cursorLine = result.cursorLine;
 							this.#setCursorCol(result.cursorCol);
+							result.onApplied?.();
 						}
 						this.#cancelAutocomplete();
 					}
@@ -900,6 +847,8 @@ export class Editor implements Component, Focusable {
 						if (this.onChange) {
 							this.onChange(this.getText());
 						}
+
+						result.onApplied?.();
 					}
 					return;
 				}
@@ -1066,16 +1015,11 @@ export class Editor implements Component, Focusable {
 		} else if (kb.matches(data, "jumpBackward")) {
 			this.#jumpMode = "backward";
 		}
-		// Kitty CSI-u printable characters (shifted symbols like @, ?, {, })
+		// Printable keystrokes, including Kitty CSI-u text-producing sequences.
 		else {
-			const kittyChar = decodeKittyPrintable(data);
-			if (kittyChar) {
-				this.insertText(kittyChar);
-				return;
-			}
-			// Regular characters (printable characters and unicode, but not control characters)
-			if (data.charCodeAt(0) >= 32) {
-				this.#insertCharacter(data);
+			const printableText = extractPrintableText(data);
+			if (printableText) {
+				this.#insertCharacter(printableText);
 			}
 		}
 	}
@@ -1193,6 +1137,14 @@ export class Editor implements Component, Focusable {
 		return { line: this.#state.cursorLine, col: this.#state.cursorCol };
 	}
 
+	moveToLineStart(): void {
+		this.#moveToLineStart();
+	}
+
+	moveToLineEnd(): void {
+		this.#moveToLineEnd();
+	}
+
 	setText(text: string): void {
 		this.#historyIndex = -1; // Exit history browsing mode
 		this.#resetKillSequence();
@@ -1261,7 +1213,11 @@ export class Editor implements Component, Focusable {
 					this.#tryTriggerAutocomplete();
 				}
 			}
-			// Also auto-trigger when typing letters/path chars in a slash command context
+			// Auto-trigger for "#" prompt actions anywhere in the current token
+			else if (char === "#") {
+				this.#tryTriggerAutocomplete();
+			}
+			// Also auto-trigger when typing letters/path chars in a completable context
 			else if (/[a-zA-Z0-9.\-_/]/.test(char)) {
 				const currentLine = this.#state.lines[this.#state.cursorLine] || "";
 				const textBeforeCursor = currentLine.slice(0, this.#state.cursorCol);
@@ -1273,6 +1229,10 @@ export class Editor implements Component, Focusable {
 				else if (textBeforeCursor.match(/(?:^|[\s])@[^\s]*$/)) {
 					this.#tryTriggerAutocomplete();
 				}
+				// Check if we're in a # prompt action context
+				else if (textBeforeCursor.match(/#[^\s#]*$/)) {
+					this.#tryTriggerAutocomplete();
+				}
 			}
 		} else {
 			this.#debouncedUpdateAutocomplete();
@@ -1446,6 +1406,10 @@ export class Editor implements Component, Focusable {
 			else if (textBeforeCursor.match(/(?:^|[\s])@[^\s]*$/)) {
 				this.#tryTriggerAutocomplete();
 			}
+			// # prompt action context
+			else if (textBeforeCursor.match(/#[^\s#]*$/)) {
+				this.#tryTriggerAutocomplete();
+			}
 		}
 	}
 
@@ -1582,6 +1546,8 @@ export class Editor implements Component, Focusable {
 				this.#tryTriggerAutocomplete();
 			} else if (textBeforeCursor.match(/(?:^|[\s])@[^\s]*$/)) {
 				this.#tryTriggerAutocomplete();
+			} else if (textBeforeCursor.match(/#[^\s#]*$/)) {
+				this.#tryTriggerAutocomplete();
 			}
 		}
 	}
@@ -1873,6 +1839,10 @@ export class Editor implements Component, Focusable {
 			else if (textBeforeCursor.match(/(?:^|[\s])@[^\s]*$/)) {
 				this.#tryTriggerAutocomplete();
 			}
+			// # prompt action context
+			else if (textBeforeCursor.match(/#[^\s#]*$/)) {
+				this.#tryTriggerAutocomplete();
+			}
 		}
 	}
 

package/src/components/input.ts

@@ -1,5 +1,6 @@
 import { BracketedPasteHandler } from "../bracketed-paste";
 import { getEditorKeybindings } from "../keybindings";
+import { extractPrintableText } from "../keys";
 import { KillRing } from "../kill-ring";
 import { type Component, CURSOR_MARKER, type Focusable } from "../tui";
 import {
@@ -169,14 +170,10 @@ export class Input implements Component, Focusable {
 			return;
 		}
 
-		// Regular character input - accept printable characters including Unicode,
-		// but reject control characters (C0: 0x00-0x1F, DEL: 0x7F, C1: 0x80-0x9F)
-		const hasControlChars = [...data].some(ch => {
-			const code = ch.charCodeAt(0);
-			return code < 32 || code === 0x7f || (code >= 0x80 && code <= 0x9f);
-		});
-		if (!hasControlChars) {
-			this.#insertCharacter(data);
+		// Regular character input, including Kitty CSI-u text-producing sequences.
+		const printableText = extractPrintableText(data);
+		if (printableText) {
+			this.#insertCharacter(printableText);
 		}
 	}
 

package/src/keys.ts

@@ -78,6 +78,8 @@ type Letter =
 	| "y"
 	| "z";
 
+type Digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9";
+
 type SymbolKey =
 	| "`"
 	| "-"
@@ -143,7 +145,7 @@ type SpecialKey =
 	| "f11"
 	| "f12";
 
-type BaseKey = Letter | SymbolKey | SpecialKey;
+type BaseKey = Letter | Digit | SymbolKey | SpecialKey;
 
 /**
  * Union type of all valid key identifiers.
@@ -184,6 +186,24 @@ interface ParsedKittySequence {
 // Format: \x1b[...;modifier:event_type<terminator> where terminator is u, ~, or A-F/H
 const KITTY_RELEASE_PATTERN = /^\x1b\[[\d:;]*:3[u~ABCDHF]$/;
 const KITTY_REPEAT_PATTERN = /^\x1b\[[\d:;]*:2[u~ABCDHF]$/;
+const KITTY_CSI_U_PATTERN = /^\x1b\[(\d+)(?::(\d*))?(?::(\d+))?(?:;(\d+))?(?::(\d+))?(?:;([\d:]*))?u$/;
+const KITTY_MOD_SHIFT = 1;
+const KITTY_MOD_ALT = 2;
+const KITTY_MOD_CTRL = 4;
+const KITTY_MOD_NUM_LOCK = 128;
+const KITTY_NUMPAD_TEXT: Record<number, string> = {
+	57399: "0",
+	57400: "1",
+	57401: "2",
+	57402: "3",
+	57403: "4",
+	57404: "5",
+	57405: "6",
+	57406: "7",
+	57407: "8",
+	57408: "9",
+	57409: ".",
+};
 
 /**
  * Check if the input is a key release event.
@@ -237,6 +257,81 @@ export function parseKittySequence(data: string): ParsedKittySequence | null {
 	};
 }
 
+function hasControlChars(data: string): boolean {
+	return [...data].some(ch => {
+		const code = ch.charCodeAt(0);
+		return code < 32 || code === 0x7f || (code >= 0x80 && code <= 0x9f);
+	});
+}
+
+function decodeKittyPrintable(data: string): string | undefined {
+	const match = data.match(KITTY_CSI_U_PATTERN);
+	if (!match) return undefined;
+
+	const codepoint = Number.parseInt(match[1] ?? "", 10);
+	if (!Number.isFinite(codepoint)) return undefined;
+
+	if (match[5] === "3") return undefined;
+
+	const shiftedKey = match[2] && match[2].length > 0 ? Number.parseInt(match[2], 10) : undefined;
+	const modValue = match[4] ? Number.parseInt(match[4], 10) : 1;
+	const modifier = Number.isFinite(modValue) ? modValue - 1 : 0;
+	const effectiveMod = modifier & ~(64 + 128);
+
+	if (effectiveMod & (KITTY_MOD_ALT | KITTY_MOD_CTRL)) return undefined;
+
+	const textField = match[6];
+	if (textField && textField.length > 0) {
+		const codepoints = textField
+			.split(":")
+			.filter(Boolean)
+			.map(value => Number.parseInt(value, 10))
+			.filter(value => Number.isFinite(value) && value >= 32);
+		if (codepoints.length > 0) {
+			try {
+				return String.fromCodePoint(...codepoints);
+			} catch {
+				return undefined;
+			}
+		}
+	}
+
+	if (effectiveMod === 0 && modifier & KITTY_MOD_NUM_LOCK) {
+		const numpadText = KITTY_NUMPAD_TEXT[codepoint];
+		if (numpadText) return numpadText;
+	}
+
+	let effectiveCodepoint = codepoint;
+	if (effectiveMod & KITTY_MOD_SHIFT && typeof shiftedKey === "number") {
+		effectiveCodepoint = shiftedKey;
+	}
+
+	if (effectiveCodepoint >= 0xe000 && effectiveCodepoint <= 0xf8ff) {
+		return undefined;
+	}
+
+	if (!Number.isFinite(effectiveCodepoint) || effectiveCodepoint < 32) return undefined;
+
+	try {
+		return String.fromCodePoint(effectiveCodepoint);
+	} catch {
+		return undefined;
+	}
+}
+
+/**
+ * Extract printable text from raw terminal input.
+ *
+ * Handles Kitty CSI-u text-producing keys so text-entry components can treat
+ * keypad digits and shifted symbols the same as direct character input.
+ */
+export function extractPrintableText(data: string): string | undefined {
+	const kittyText = decodeKittyPrintable(data);
+	if (kittyText) return kittyText;
+	if (data.length === 0 || hasControlChars(data)) return undefined;
+	return data;
+}
+
 /**
  * Match input data against a key identifier string.
  *