@gajae-code/tui 0.13.2 → 0.14.0

package/src/components/select-list.ts

@@ -39,6 +39,8 @@ export interface SelectListTheme {
 	symbols: SymbolTheme;
 }
 
+export type SelectListThemeSource = SelectListTheme | (() => SelectListTheme);
+
 export interface SelectListTruncatePrimaryContext {
 	text: string;
 	maxWidth: number;
@@ -67,7 +69,7 @@ export class SelectList implements Component {
 	constructor(
 		private readonly items: ReadonlyArray<SelectItem>,
 		private readonly maxVisible: number,
-		private readonly theme: SelectListTheme,
+		private readonly themeSource: SelectListThemeSource,
 		private readonly layout: SelectListLayoutOptions = {},
 	) {
 		this.#filteredItems = items;
@@ -114,11 +116,12 @@ export class SelectList implements Component {
 	}
 
 	render(width: number): string[] {
+		const theme = this.#theme();
 		const lines: string[] = [];
 
 		// If no items match filter, show message
 		if (this.#filteredItems.length === 0) {
-			lines.push(truncateToWidth(this.theme.noMatch("  No matching commands"), Math.max(0, width), Ellipsis.Omit));
+			lines.push(truncateToWidth(theme.noMatch("  No matching commands"), Math.max(0, width), Ellipsis.Omit));
 			return lines;
 		}
 
@@ -146,12 +149,16 @@ export class SelectList implements Component {
 			const position = this.#selectedIndex >= 0 ? `${this.#selectedIndex + 1}` : "-";
 			const scrollText = `  (${position}/${this.#filteredItems.length})`;
 			// Truncate if too long for terminal
-			lines.push(this.theme.scrollInfo(truncateToWidth(scrollText, width - 2, Ellipsis.Omit)));
+			lines.push(theme.scrollInfo(truncateToWidth(scrollText, width - 2, Ellipsis.Omit)));
 		}
 
 		return lines;
 	}
 
+	#theme(): SelectListTheme {
+		return typeof this.themeSource === "function" ? this.themeSource() : this.themeSource;
+	}
+
 	handleInput(keyData: string): void {
 		const kb = getKeybindings();
 		if (this.#filteredItems.length === 0) {
@@ -193,9 +200,8 @@ export class SelectList implements Component {
 		descriptionSingleLine: string | undefined,
 		primaryColumnWidth: number,
 	): string {
-		const prefix = isSelected
-			? `${this.theme.symbols.cursor} `
-			: padding(visibleWidth(this.theme.symbols.cursor) + 1);
+		const theme = this.#theme();
+		const prefix = isSelected ? `${theme.symbols.cursor} ` : padding(visibleWidth(theme.symbols.cursor) + 1);
 		const prefixWidth = visibleWidth(prefix);
 
 		if (descriptionSingleLine && width > 40) {
@@ -210,13 +216,13 @@ export class SelectList implements Component {
 			if (remainingWidth > MIN_DESCRIPTION_WIDTH) {
 				const truncatedDesc = truncateToWidth(descriptionSingleLine, remainingWidth, Ellipsis.Omit);
 				if (item.disabled) {
-					return this.theme.description(`${prefix}${truncatedValue}${spacing}${truncatedDesc}`);
+					return theme.description(`${prefix}${truncatedValue}${spacing}${truncatedDesc}`);
 				}
 				if (isSelected) {
-					return this.theme.selectedText(`${prefix}${truncatedValue}${spacing}${truncatedDesc}`);
+					return theme.selectedText(`${prefix}${truncatedValue}${spacing}${truncatedDesc}`);
 				}
 
-				const descText = this.theme.description(spacing + truncatedDesc);
+				const descText = theme.description(spacing + truncatedDesc);
 				return prefix + truncatedValue + descText;
 			}
 		}
@@ -224,10 +230,10 @@ export class SelectList implements Component {
 		const maxWidth = width - prefixWidth - 2;
 		const truncatedValue = this.#truncatePrimary(item, isSelected, maxWidth, maxWidth);
 		if (item.disabled) {
-			return this.theme.description(`${prefix}${truncatedValue}`);
+			return theme.description(`${prefix}${truncatedValue}`);
 		}
 		if (isSelected) {
-			return this.theme.selectedText(`${prefix}${truncatedValue}`);
+			return theme.selectedText(`${prefix}${truncatedValue}`);
 		}
 
 		return prefix + truncatedValue;

package/src/terminal-capabilities.ts

@@ -15,6 +15,8 @@ export enum ImageProtocol {
 	Sixel = "\x1bPq",
 }
 
+const ITERM2_MULTIPART_IMAGE_PREFIX = "\x1b]1337;MultipartFile=";
+
 export enum NotifyProtocol {
 	Bell = "\x07",
 	Osc99 = "\x1b]99;;",
@@ -39,6 +41,10 @@ export class TerminalInfo {
 		if (this.imageProtocol === ImageProtocol.Sixel) {
 			return SIXEL_DCS_START_REGEX.test(line.slice(0, 128));
 		}
+		if (this.imageProtocol === ImageProtocol.Iterm2) {
+			const prefix = line.slice(0, 64);
+			return prefix.includes(ImageProtocol.Iterm2) || prefix.includes(ITERM2_MULTIPART_IMAGE_PREFIX);
+		}
 		return line.slice(0, 64).includes(this.imageProtocol);
 	}
 
@@ -867,3 +873,134 @@ export function imageFallback(mimeType: string, dimensions?: ImageDimensions, fi
 	if (dimensions) parts.push(`${dimensions.widthPx}x${dimensions.heightPx}`);
 	return `[Image: ${parts.join(" ")}]`;
 }
+export type Iterm2Capability = { readonly key: string; readonly value: string };
+export type Iterm2CapabilityReply = "complete-f" | "missing-f" | "invalid-f" | undefined;
+
+const ITERM2_CAPABILITY_REPLY_REGEX = /\x1b\]1337;Capabilities(?:=|:)([^\x07\x1b]*)(?:\x07|\x1b\\)/gu;
+const ITERM2_FEATURE_TOKEN_REGEX = /^[A-Z][a-z]*[0-9]*$/u;
+
+/**
+ * Classifies complete iTerm2 capability replies. An absent result means the
+ * input does not yet contain a complete capability frame.
+ */
+export function parseITerm2CapabilityReply(input: Uint8Array | string): Iterm2CapabilityReply {
+	const value = typeof input === "string" ? input : new TextDecoder().decode(input);
+	let complete = false;
+	for (const match of value.matchAll(ITERM2_CAPABILITY_REPLY_REGEX)) {
+		complete = true;
+		const featureString = match[1] ?? "";
+		const tokens: string[] = featureString.match(/[A-Z][a-z]*[0-9]*/gu) ?? [];
+		if (tokens.join("") !== featureString || !tokens.every(token => ITERM2_FEATURE_TOKEN_REGEX.test(token))) {
+			return "invalid-f";
+		}
+		if (tokens.includes("F")) return "complete-f";
+	}
+	return complete ? "missing-f" : undefined;
+}
+
+const ITERM2_BASE64 = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/u;
+const ITERM2_MAX_CAPABILITY_BYTES = 4096;
+
+function assertIterm2Base64(value: string): void {
+	if (value.length % 4 !== 0 || !ITERM2_BASE64.test(value)) throw new Error("Invalid RFC 4648 base64");
+}
+
+export function encodeITerm2Multipart(
+	base64Data: string,
+	options: { width?: number | string; height?: number | string } = {},
+): string[] {
+	assertIterm2Base64(base64Data);
+	const validate = (value: number | string, label: string): number | string => {
+		if (
+			typeof value === "number" &&
+			(!Number.isFinite(value) || !Number.isInteger(value) || value <= 0 || value > 0xffff)
+		)
+			throw new Error(`Invalid iTerm2 ${label}`);
+		if (typeof value === "string" && !/^[A-Za-z0-9]+$/u.test(value)) throw new Error(`Invalid iTerm2 ${label}`);
+		return value;
+	};
+	const width = validate(options.width ?? "auto", "width");
+	const height = validate(options.height ?? "auto", "height");
+	const size = Buffer.from(base64Data, "base64").byteLength;
+	const name = Buffer.from("gajae-pet.gif").toString("base64");
+	const records = [
+		`\x1b]1337;MultipartFile=;name=${name};size=${size};width=${width};height=${height};inline=1;preserveAspectRatio=0:\x07`,
+	];
+	for (let i = 0; i < base64Data.length; i += 200) {
+		records.push(`\x1b]1337;FilePart=${base64Data.slice(i, i + 200)}\x07`);
+	}
+	records.push("\x1b]1337;FileEnd\x07");
+	for (const record of records) {
+		if (Buffer.byteLength(`\x1bPtmux;${record.replaceAll("\x1b", "\x1b\x1b")}\x1b\\`, "utf8") > 256)
+			throw new Error("iTerm2 record exceeds tmux limit");
+	}
+	return records;
+}
+
+export function wrapITerm2RecordForTmux(record: string): string {
+	const wrapped = `\x1bPtmux;${record.replaceAll("\x1b", "\x1b\x1b")}\x1b\\`;
+	if (Buffer.byteLength(wrapped, "utf8") > 256) throw new Error("iTerm2 record exceeds tmux limit");
+	return wrapped;
+}
+
+export function wrapITerm2RecordsForTmux(records: readonly string[]): string[] {
+	return records.map(wrapITerm2RecordForTmux);
+}
+
+function parseIterm2CapabilityString(value: string): Iterm2Capability[] {
+	const out: Iterm2Capability[] = [];
+	for (const pair of value.split(";")) {
+		const i = pair.indexOf("=");
+		if (i > 0) out.push({ key: pair.slice(0, i), value: pair.slice(i + 1) });
+		else if (i < 0 && pair.length > 0) out.push({ key: pair, value: "" });
+	}
+	return out;
+}
+
+export function parseITerm2Capabilities(input: string): Iterm2Capability[] {
+	const parser = new Iterm2CapabilitiesParser();
+	return parser.push(input);
+}
+
+export class Iterm2CapabilitiesParser {
+	#buffer = "";
+	push(input: Uint8Array | string): Iterm2Capability[] {
+		this.#buffer += typeof input === "string" ? input : new TextDecoder().decode(input);
+		const out: Iterm2Capability[] = [];
+		while (true) {
+			const marker = this.#buffer.indexOf("\x1b]1337;Capabilities=");
+			if (marker < 0) {
+				this.#buffer = this.#buffer.slice(-32);
+				break;
+			}
+			const valueStart = marker + "\x1b]1337;Capabilities=".length;
+			let end = -1;
+			for (let i = valueStart; i < this.#buffer.length; i++) {
+				if (this.#buffer[i] === "\x07") {
+					end = i + 1;
+					break;
+				}
+				if (this.#buffer[i] === "\x1b" && this.#buffer[i + 1] === "\\") {
+					end = i + 2;
+					break;
+				}
+				if (i - valueStart > ITERM2_MAX_CAPABILITY_BYTES) {
+					end = -2;
+					break;
+				}
+			}
+			if (end === -1) break;
+			if (end === -2) {
+				this.#buffer = this.#buffer.slice(valueStart + 1);
+				continue;
+			}
+			const terminatorLength = this.#buffer[end - 2] === "\x1b" ? 2 : 1;
+			out.push(...parseIterm2CapabilityString(this.#buffer.slice(valueStart, end - terminatorLength)));
+			this.#buffer = this.#buffer.slice(end);
+		}
+		return out;
+	}
+	reset(): void {
+		this.#buffer = "";
+	}
+}

package/src/terminal.ts

@@ -118,6 +118,15 @@ export interface Terminal {
 	 */
 	drainInput(maxMs?: number, idleMs?: number): Promise<void>;
 
+	/**
+	 * Wait for pending stdin to go quiet without changing terminal protocols or
+	 * the active input handler. Capability probes use this non-destructive drain;
+	 * shutdown paths must continue using drainInput().
+	 * @param maxMs - Maximum time to wait (default: 1000ms)
+	 * @param idleMs - Exit early if no input arrives within this time (default: 50ms)
+	 */
+	drainPendingInput?(maxMs?: number, idleMs?: number): Promise<void>;
+
 	// Write output to terminal
 	write(data: string): void;
 
@@ -822,6 +831,30 @@ export class ProcessTerminal implements Terminal {
 		}, 150);
 	}
 
+	async drainPendingInput(maxMs = 1000, idleMs = 50): Promise<void> {
+		let lastDataTime = Date.now();
+		const onData = () => {
+			lastDataTime = Date.now();
+		};
+
+		process.stdin.on("data", onData);
+		const endTime = Date.now() + maxMs;
+
+		try {
+			while (true) {
+				const now = Date.now();
+				const timeLeft = endTime - now;
+				if (timeLeft <= 0) break;
+				if (now - lastDataTime >= idleMs) break;
+				const { promise, resolve } = Promise.withResolvers<void>();
+				setTimeout(resolve, Math.min(idleMs, timeLeft));
+				await promise;
+			}
+		} finally {
+			process.stdin.removeListener("data", onData);
+		}
+	}
+
 	async drainInput(maxMs = 1000, idleMs = 50): Promise<void> {
 		if (this.#kittyProtocolActive) {
 			// Disable Kitty keyboard protocol first so any late key releases