@f5-sales-demo/pi-tui 21.24.4 → 21.25.0

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/pi-tui",
-	"version": "21.24.4",
+	"version": "21.25.0",
 	"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.24.4",
-		"@f5-sales-demo/pi-utils": "21.24.4",
+		"@f5-sales-demo/pi-natives": "21.25.0",
+		"@f5-sales-demo/pi-utils": "21.25.0",
 		"marked": "18.0.11"
 	},
 	"devDependencies": {

package/src/components/cancellable-loader.ts

@@ -1,22 +1,23 @@
-import { getKeybindings } from "../keybindings";
+import { getKeybindings, type Keybinding } from "../keybindings";
+import { matchesKey } from "../keys";
 import { Loader } from "./loader";
 
 /**
- * Loader that can be cancelled with Escape.
+ * Loader that requests interruption with the application's interrupt binding (Ctrl+C by default).
  * Extends Loader with an AbortSignal for cancelling async operations.
  *
  * @example
  * const loader = new CancellableLoader(tui, cyan, dim, "Working...");
- * loader.onAbort = () => done(null);
+ * // Keep tracking work until it acknowledges loader.signal; onAbort is only a request.
  * doWork(loader.signal).then(done);
  */
 export class CancellableLoader extends Loader {
 	#abortController = new AbortController();
 
-	/** Called when user presses Escape */
+	/** Called once when interruption is requested, not when work has necessarily stopped. */
 	onAbort?: () => void;
 
-	/** AbortSignal that is aborted when user presses Escape */
+	/** AbortSignal that is aborted when interruption is requested. */
 	get signal(): AbortSignal {
 		return this.#abortController.signal;
 	}
@@ -28,7 +29,10 @@ export class CancellableLoader extends Loader {
 
 	handleInput(data: string): void {
 		const kb = getKeybindings();
-		if (kb.matches(data, "tui.select.cancel")) {
+		// The optional application binding is supplied by downstream registry augmentation.
+		const interrupt = "app.interrupt" as Keybinding;
+		const requested = kb.getDefinition(interrupt) ? kb.matches(data, interrupt) : matchesKey(data, "ctrl+c");
+		if (requested && !this.aborted) {
 			this.#abortController.abort();
 			this.onAbort?.();
 		}

package/src/keybindings.ts

@@ -139,7 +139,7 @@ export const TUI_KEYBINDINGS = {
 	},
 	"tui.select.confirm": { defaultKeys: "enter", description: "Confirm selection" },
 	"tui.select.cancel": {
-		defaultKeys: ["escape", "ctrl+c"],
+		defaultKeys: "escape",
 		description: "Cancel selection",
 	},
 } as const satisfies KeybindingDefinitions;

package/src/stdin-buffer.ts

@@ -211,6 +211,17 @@ function extractCompleteSequences(buffer: string): { sequences: string[]; remain
 
 		// Try to extract a sequence starting at this position
 		if (remaining.startsWith(ESC)) {
+			// Two adjacent ESC introducers are two independent sequences. This occurs
+			// when a user's Escape key races a terminal capability response such as
+			// DA1 (`ESC ESC[?1;2c`). Treating the pair as one Meta-Escape event strips
+			// the response introducer and leaks `[?1;2c` into the focused editor.
+			// Emitting the first Escape independently lets the next pass retain the
+			// complete response for the terminal-level filter.
+			if (remaining.startsWith(`${ESC}${ESC}`)) {
+				sequences.push(ESC);
+				pos++;
+				continue;
+			}
 			// Find the end of this escape sequence
 			let seqEnd = 1;
 			while (seqEnd <= remaining.length) {