@f5-sales-demo/pi-tui 21.14.1 → 21.15.1

package/CHANGELOG.md

@@ -6,6 +6,15 @@
 
 ### Fixed
 
+- Bounded oversized ANSI-heavy render rows before width measurement while preserving visible text,
+  complete OSC 66 payloads, and reset semantics. Semantically ported from
+  [can1357/oh-my-pi#2047](https://github.com/can1357/oh-my-pi/pull/2047)
+  ([#3743](https://github.com/f5-sales-demo/xcsh/issues/3743)).
+- Stopped rendering and initiated best-effort SIGHUP teardown when terminal input or output is
+  disconnected, including revoked-PTY and throwing-handler paths. Semantically ported from
+  [can1357/oh-my-pi#5837](https://github.com/can1357/oh-my-pi/pull/5837) and
+  [#6788](https://github.com/can1357/oh-my-pi/pull/6788)
+  ([#3743](https://github.com/f5-sales-demo/xcsh/issues/3743)).
 - Kept `@` directory completion open after Tab or Enter without inserting a trailing space ([#3724](https://github.com/f5-sales-demo/xcsh/issues/3724)).
 
 ## [20.3.0] - 2026-08-04

package/README.md

@@ -521,7 +521,7 @@ The TUI works with any object implementing the `Terminal` interface:
 
 ```typescript
 interface Terminal {
- start(onInput: (data: string) => void, onResize: () => void): void;
+ start(onInput: (data: string) => void, onResize: () => void, onDisconnect?: () => void): void;
  stop(): void;
  write(data: string): void;
  get columns(): number;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/pi-tui",
-	"version": "21.14.1",
+	"version": "21.15.1",
 	"description": "Terminal User Interface library with differential rendering for efficient text-based applications",
 	"homepage": "https://github.com/f5-sales-demo/xcsh",
 	"author": "Can Boluk",
@@ -37,8 +37,8 @@
 		"fmt": "biome format --write ."
 	},
 	"dependencies": {
-		"@f5-sales-demo/pi-natives": "21.14.1",
-		"@f5-sales-demo/pi-utils": "21.14.1",
+		"@f5-sales-demo/pi-natives": "21.15.1",
+		"@f5-sales-demo/pi-utils": "21.15.1",
 		"marked": "^18.0"
 	},
 	"devDependencies": {

package/src/terminal.ts

@@ -46,8 +46,8 @@ export function emergencyTerminalRestore(): void {
 /** Terminal-reported appearance (dark/light mode). */
 export type TerminalAppearance = "dark" | "light";
 export interface Terminal {
-	// Start the terminal with input and resize handlers
-	start(onInput: (data: string) => void, onResize: () => void): void;
+	// Start the terminal with input, resize, and host-disconnect handlers.
+	start(onInput: (data: string) => void, onResize: () => void, onDisconnect?: () => void): void;
 
 	// Stop the terminal and restore state
 	stop(): void;
@@ -108,6 +108,11 @@ export class ProcessTerminal implements Terminal {
 	#modifyOtherKeysTimeout?: ReturnType<typeof setTimeout>;
 	#stdinBuffer?: StdinBuffer;
 	#stdinDataHandler?: (data: string) => void;
+	#disconnectHandler?: () => void;
+	#stdinEndHandler = () => this.#markTerminalDisconnected("stdin ended");
+	#stdinCloseHandler = () => this.#markTerminalDisconnected("stdin closed");
+	#stdinErrorHandler = (error: Error) => this.#markTerminalDisconnected("stdin failed", error);
+	#stdoutErrorHandler = (error: Error) => this.#markTerminalDisconnected("stdout failed", error);
 	#dead = false;
 	#writeLogPath = $env.PI_TUI_WRITE_LOG || "";
 	#windowsVTInputRestore?: () => void;
@@ -142,8 +147,9 @@ export class ProcessTerminal implements Terminal {
 		this.#appearanceCallbacks.push(callback);
 	}
 
-	start(onInput: (data: string) => void, onResize: () => void): void {
+	start(onInput: (data: string) => void, onResize: () => void, onDisconnect?: () => void): void {
 		this.#resizeHandler = onResize;
+		this.#disconnectHandler = onDisconnect;
 
 		// Register for emergency cleanup
 		activeTerminal = this;
@@ -155,6 +161,10 @@ export class ProcessTerminal implements Terminal {
 			process.stdin.setRawMode(true);
 		}
 		process.stdin.setEncoding("utf8");
+		process.stdin.on("end", this.#stdinEndHandler);
+		process.stdin.on("close", this.#stdinCloseHandler);
+		process.stdin.on("error", this.#stdinErrorHandler);
+		process.stdout.on("error", this.#stdoutErrorHandler);
 		process.stdin.resume();
 
 		// Enable bracketed paste mode - terminal will wrap pastes in \x1b[200~ ... \x1b[201~
@@ -610,6 +620,11 @@ export class ProcessTerminal implements Terminal {
 			process.stdin.removeListener("data", this.#stdinDataHandler);
 			this.#stdinDataHandler = undefined;
 		}
+		process.stdin.removeListener("end", this.#stdinEndHandler);
+		process.stdin.removeListener("close", this.#stdinCloseHandler);
+		process.stdin.removeListener("error", this.#stdinErrorHandler);
+		process.stdout.removeListener("error", this.#stdoutErrorHandler);
+		this.#disconnectHandler = undefined;
 		this.#inputHandler = undefined;
 		this.#appearance = undefined;
 		if (this.#resizeHandler) {
@@ -622,9 +637,37 @@ export class ProcessTerminal implements Terminal {
 		// where Ctrl+D could close the parent shell over SSH.
 		process.stdin.pause();
 
-		// Restore raw mode state
-		if (process.stdin.setRawMode) {
-			process.stdin.setRawMode(this.#wasRaw);
+		// A revoked PTY cannot be restored. Suppress that failure only after a
+		// disconnect; normal live-terminal restoration failures must still surface.
+		try {
+			process.stdin.setRawMode?.(this.#wasRaw);
+		} catch (error) {
+			if (!this.#dead) throw error;
+		}
+	}
+
+	#markTerminalDisconnected(reason: string, error?: unknown): void {
+		if (this.#dead) return;
+		this.#dead = true;
+		logger.warn("terminal disconnected; stopping interactive rendering", { reason, error });
+
+		const disconnectHandler = this.#disconnectHandler;
+		this.#disconnectHandler = undefined;
+		if (!disconnectHandler) return;
+		try {
+			disconnectHandler();
+		} catch (handlerError) {
+			logger.error("terminal disconnect handler failed; exiting anyway", { error: handlerError });
+		}
+
+		if (process.platform === "win32") {
+			process.exit(129);
+		}
+		try {
+			process.kill(process.pid, "SIGHUP");
+		} catch (signalError) {
+			logger.error("terminal disconnect signal failed; exiting directly", { error: signalError });
+			process.exit(129);
 		}
 	}
 
@@ -644,9 +687,7 @@ export class ProcessTerminal implements Terminal {
 		try {
 			process.stdout.write(data);
 		} catch (err) {
-			// Any write failure means terminal is dead - no recovery possible
-			this.#dead = true;
-			logger.warn("terminal is dead - no recovery possible", { error: err, data });
+			this.#markTerminalDisconnected("stdout failed", err);
 		}
 	}
 

package/src/tui.ts

@@ -10,6 +10,75 @@ import { ImageProtocol, setCellDimensions, setTerminalImageProtocol, TERMINAL }
 import { extractSegments, sliceByColumn, sliceWithWidth, visibleWidth } from "./utils";
 
 const SEGMENT_RESET = "\x1b[0m";
+const LINE_FIT_MIN_SOURCE_CODE_UNITS = 4096;
+const LINE_FIT_MAX_SOURCE_CODE_UNITS = 65_536;
+const LINE_FIT_SOURCE_WIDTH_MULTIPLIER = 64;
+
+function ansiSequenceEnd(line: string, start: number): number {
+	const next = line.charCodeAt(start + 1);
+	if (next === 0x5b) {
+		let index = start + 2;
+		while (index < line.length) {
+			const final = line.charCodeAt(index);
+			if (final >= 0x40 && final <= 0x7e) return index + 1;
+			index++;
+		}
+		return -1;
+	}
+	if (next === 0x5d) {
+		let index = start + 2;
+		while (index < line.length) {
+			const code = line.charCodeAt(index);
+			if (code === 0x07) return index + 1;
+			if (code === 0x1b && line.charCodeAt(index + 1) === 0x5c) return index + 2;
+			index++;
+		}
+		return -1;
+	}
+	return start + 2 <= line.length ? start + 2 : -1;
+}
+
+function ansiSequenceHasVisiblePayload(line: string, start: number): boolean {
+	return line.startsWith("\x1b]66;", start);
+}
+
+/** Bound work before width measurement while retaining later visible text. */
+function lineFitSource(raw: string, width: number): string {
+	const safeWidth = Number.isFinite(width) ? Math.max(1, Math.trunc(width)) : 1;
+	const maxSourceLength = Math.min(
+		LINE_FIT_MAX_SOURCE_CODE_UNITS,
+		Math.max(LINE_FIT_MIN_SOURCE_CODE_UNITS, safeWidth * LINE_FIT_SOURCE_WIDTH_MULTIPLIER),
+	);
+	if (raw.length <= maxSourceLength) return raw;
+
+	const chunks: string[] = [];
+	let emitted = 0;
+	for (let index = 0; index < raw.length && emitted < maxSourceLength; ) {
+		if (raw.charCodeAt(index) === 0x1b) {
+			const end = ansiSequenceEnd(raw, index);
+			if (end === -1) break;
+			const sequenceLength = end - index;
+			if (ansiSequenceHasVisiblePayload(raw, index)) {
+				chunks.push(raw.slice(index, end));
+				emitted += sequenceLength;
+			} else if (emitted > 0 && sequenceLength <= maxSourceLength - emitted) {
+				chunks.push(raw.slice(index, end));
+				emitted += sequenceLength;
+			}
+			index = end;
+			continue;
+		}
+
+		const start = index;
+		const end = Math.min(raw.length, start + maxSourceLength - emitted);
+		while (index < end && raw.charCodeAt(index) !== 0x1b) index++;
+		if (index === start) break;
+		chunks.push(raw.slice(start, index));
+		emitted += index - start;
+	}
+
+	return chunks.join("") + SEGMENT_RESET;
+}
 
 type InputListenerResult = { consume?: boolean; data?: string } | undefined;
 type InputListener = (data: string) => InputListenerResult;
@@ -451,7 +520,9 @@ export class TUI extends Container {
 				this.#handleInput(data);
 			},
 			() => this.requestRender(),
+			() => this.stop(),
 		);
+		if (this.#stopped) return;
 		this.terminal.hideCursor();
 		this.#querySixelSupport();
 		this.#queryCellSize();
@@ -1074,11 +1145,10 @@ export class TUI extends Container {
 		// as visible chars; the marker is extracted later in #extractCursorPosition.
 		for (let i = 0; i < newLines.length; i++) {
 			if (TERMINAL.isImageLine(newLines[i])) continue;
-			const stripped = newLines[i].replaceAll(CURSOR_MARKER, "");
-			if (visibleWidth(stripped) > width) {
-				const hadMarker = newLines[i] !== stripped;
-				newLines[i] = sliceByColumn(stripped, 0, width, true) + (hadMarker ? CURSOR_MARKER : "");
-			}
+			const hadMarker = newLines[i].includes(CURSOR_MARKER);
+			let fitted = lineFitSource(newLines[i].replaceAll(CURSOR_MARKER, ""), width);
+			if (visibleWidth(fitted) > width) fitted = sliceByColumn(fitted, 0, width, true);
+			newLines[i] = fitted + (hadMarker ? CURSOR_MARKER : "");
 		}
 
 		// Composite overlays into the rendered lines (before differential compare)