@oh-my-pi/pi-tui 12.11.1 → 12.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-tui",
-	"version": "12.11.1",
+	"version": "12.11.2",
 	"description": "Terminal User Interface library with differential rendering for efficient text-based applications",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -52,8 +52,8 @@
 	"bun": ">=1.3.7"
 },
 "dependencies": {
-	"@oh-my-pi/pi-natives": "12.11.1",
-	"@oh-my-pi/pi-utils": "12.11.1",
+	"@oh-my-pi/pi-natives": "12.11.2",
+	"@oh-my-pi/pi-utils": "12.11.2",
 	"@types/mime-types": "^3.0.1",
 	"chalk": "^5.6.2",
 	"marked": "^17.0.2",

package/src/tui.ts

@@ -886,11 +886,12 @@ export class TUI extends Container {
 				buffer += newLines[i];
 			}
 			const renderCursorRow = Math.max(0, newLines.length - 1);
+			const cursorUpdate = this.#buildHardwareCursorSequence(cursorPos, newLines.length, renderCursorRow);
+			buffer += cursorUpdate.sequence;
 			buffer += "\x1b[?2026l"; // End synchronized output
 			this.terminal.write(buffer);
 			this.#cursorRow = renderCursorRow;
-			this.#hardwareCursorRow = renderCursorRow;
-			this.#positionHardwareCursor(cursorPos, newLines.length);
+			this.#hardwareCursorRow = cursorUpdate.row;
 			// Reset max lines when clearing, otherwise track growth
 			if (clear) {
 				this.#maxLinesRendered = newLines.length;
@@ -967,37 +968,36 @@ export class TUI extends Container {
 		// All changes are in deleted lines (nothing to render, just clear)
 		if (firstChanged >= newLines.length) {
 			const targetRow = Math.max(0, newLines.length - 1);
-			if (this.#previousLines.length > newLines.length) {
-				let buffer = "\x1b[?2026h\x1b7";
-				const lineDiff = computeLineDiff(targetRow);
-				if (lineDiff > 0) buffer += `\x1b[${lineDiff}B`;
-				else if (lineDiff < 0) buffer += `\x1b[${-lineDiff}A`;
-				buffer += "\r";
-				// Clear extra lines without scrolling
-				const extraLines = this.#previousLines.length - newLines.length;
-				if (extraLines > height) {
-					logRedraw(`extraLines > height (${extraLines} > ${height})`);
-					fullRender(true);
-					return;
-				}
-				if (extraLines > 0) {
-					buffer += "\x1b[1B";
-				}
-				for (let i = 0; i < extraLines; i++) {
-					buffer += "\r\x1b[2K";
-					if (i < extraLines - 1) buffer += "\x1b[1B";
-				}
-				if (extraLines > 0) {
-					buffer += `\x1b[${extraLines}A`;
-				}
-				buffer += "\x1b8\x1b[?2026l";
-				this.terminal.write(buffer);
-				// Cursor restored to pre-render position by \x1b8; keep tracked row unchanged here.
+			let buffer = "\x1b[?2026h";
+			const lineDiff = computeLineDiff(targetRow);
+			if (lineDiff > 0) buffer += `\x1b[${lineDiff}B`;
+			else if (lineDiff < 0) buffer += `\x1b[${-lineDiff}A`;
+			buffer += "\r";
+			// Clear extra lines without scrolling
+			const extraLines = this.#previousLines.length - newLines.length;
+			if (extraLines > height) {
+				logRedraw(`extraLines > height (${extraLines} > ${height})`);
+				fullRender(true);
+				return;
+			}
+			if (extraLines > 0) {
+				buffer += "\x1b[1B";
+			}
+			for (let i = 0; i < extraLines; i++) {
+				buffer += "\r\x1b[2K";
+				if (i < extraLines - 1) buffer += "\x1b[1B";
 			}
+			if (extraLines > 0) {
+				buffer += `\x1b[${extraLines}A`;
+			}
+			const cursorUpdate = this.#buildHardwareCursorSequence(cursorPos, newLines.length, targetRow);
+			buffer += cursorUpdate.sequence;
+			buffer += "\x1b[?2026l";
+			this.terminal.write(buffer);
+			this.#hardwareCursorRow = cursorUpdate.row;
 			this.#cursorRow = targetRow;
 			this.#previousLines = newLines;
 			this.#previousWidth = width;
-			this.#positionHardwareCursor(cursorPos, newLines.length);
 			this.#previousViewportTop = Math.max(0, this.#maxLinesRendered - height);
 			return;
 		}
@@ -1014,7 +1014,7 @@ export class TUI extends Container {
 
 		// Render from first changed line to end
 		// Build buffer with all updates wrapped in synchronized output
-		let buffer = "\x1b[?2026h\x1b7"; // Begin synchronized output + save cursor
+		let buffer = "\x1b[?2026h"; // Begin synchronized output
 		const prevViewportBottom = prevViewportTop + height - 1;
 		const moveTargetRow = appendStart ? firstChanged - 1 : firstChanged;
 		if (moveTargetRow > prevViewportBottom) {
@@ -1098,7 +1098,9 @@ export class TUI extends Container {
 			buffer += `\x1b[${extraLines}A`;
 		}
 
-		buffer += "\x1b8\x1b[?2026l"; // Restore cursor, then end synchronized output
+		const cursorUpdate = this.#buildHardwareCursorSequence(cursorPos, newLines.length, finalCursorRow);
+		buffer += cursorUpdate.sequence;
+		buffer += "\x1b[?2026l"; // End synchronized output
 		if (process.env.PI_TUI_DEBUG === "1") {
 			const debugDir = "/tmp/tui";
 			fs.mkdirSync(debugDir, { recursive: true });
@@ -1132,7 +1134,7 @@ export class TUI extends Container {
 		// cursorRow tracks end of content (for viewport calculation)
 		// hardwareCursorRow tracks actual terminal cursor position (for movement)
 		this.#cursorRow = Math.max(0, newLines.length - 1);
-		this.#positionHardwareCursor(cursorPos, newLines.length);
+		this.#hardwareCursorRow = cursorUpdate.row;
 		// Track terminal's working area (grows but doesn't shrink unless cleared)
 		this.#maxLinesRendered = Math.max(this.#maxLinesRendered, newLines.length);
 		this.#previousViewportTop = Math.max(0, this.#maxLinesRendered - height);