@f5xc-salesdemos/pi-tui 19.27.1 → 19.28.1

package/package.json

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

package/src/terminal.ts

@@ -134,7 +134,6 @@ export class ProcessTerminal implements Terminal {
 	}
 
 	start(onInput: (data: string) => void, onResize: () => void): void {
-		this.#inputHandler = onInput;
 		this.#resizeHandler = onResize;
 
 		// Register for emergency cleanup
@@ -186,6 +185,13 @@ export class ProcessTerminal implements Terminal {
 		// Start periodic OSC 11 re-query for terminals without Mode 2031
 		// (Warp, Alacritty, WezTerm, iTerm2). Self-disables once Mode 2031 fires.
 		this.#startOsc11Poll();
+
+		// Defer activating the user input handler until terminal capability
+		// queries have settled. Without this, query responses (Kitty, DA1,
+		// OSC 11) race into the editor as typed text.
+		setTimeout(() => {
+			this.#inputHandler = onInput;
+		}, 50);
 	}
 
 	/**
@@ -264,41 +270,33 @@ export class ProcessTerminal implements Terminal {
 
 		// Forward individual sequences to the input handler
 		this.#stdinBuffer.on("data", (sequence: string) => {
-			// Check for Kitty protocol response (only if not already enabled)
-			if (!this.#kittyProtocolActive) {
-				const match = sequence.match(kittyResponsePattern);
-				if (match) {
+			// Kitty protocol response — always swallow, enable protocol on first match
+			const kittyMatch = sequence.match(kittyResponsePattern);
+			if (kittyMatch) {
+				if (!this.#kittyProtocolActive) {
 					if (this.#modifyOtherKeysTimeout) {
 						clearTimeout(this.#modifyOtherKeysTimeout);
 						this.#modifyOtherKeysTimeout = undefined;
 					}
 					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 = "";
-				}
-				// Now that this DA1 cycle is complete, start any queued query.
-				if (this.#osc11QueryQueued && !this.#dead) {
-					this.#osc11QueryQueued = false;
-					this.#startOsc11Query();
+			// DA1 response — always swallow; manage sentinel count if pending
+			if (da1ResponsePattern.test(sequence)) {
+				if (this.#pendingDa1Sentinels > 0) {
+					this.#pendingDa1Sentinels--;
+					if (this.#osc11Pending) {
+						this.#osc11Pending = false;
+						this.#osc11ResponseBuffer = "";
+					}
+					if (this.#osc11QueryQueued && !this.#dead) {
+						this.#osc11QueryQueued = false;
+						this.#startOsc11Query();
+					}
 				}
 				return;
 			}
@@ -339,6 +337,18 @@ export class ProcessTerminal implements Terminal {
 				}, 100);
 				return;
 			}
+			// Drop stale terminal responses that leaked through the stdin buffer
+			// timeout flush. These are incomplete DA1/DA2 replies, OSC 11
+			// fragments, or Kitty protocol responses that arrived split across
+			// data events and were flushed before their terminator arrived.
+			if (
+				/^\x1b\[\?[\d;]*[a-z]?$/i.test(sequence) || // DA1/Kitty responses: ESC[?...
+				/^\x1b\](?:11|10|4);/.test(sequence) || // OSC color responses without terminator
+				/^\x1b\[>[\d;]*[a-z]?$/i.test(sequence) // DA2 responses: ESC[>...
+			) {
+				return;
+			}
+
 			if (this.#inputHandler) {
 				this.#inputHandler(sequence);
 			}