@narumitw/pi-btw 0.56.0 → 0.56.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-btw",
-	"version": "0.56.0",
+	"version": "0.56.2",
 	"description": "Pi extension that adds a /btw side-question command.",
 	"type": "module",
 	"license": "MIT",

package/src/fullscreen-ui.ts

@@ -300,9 +300,11 @@ class BtwFullscreenHost<T> implements Component {
 	private disposed = false;
 	private finished = false;
 	private parentStopped = false;
-	private parentRestarted = false;
+	private parentRestoreAttempted = false;
 	private fullscreenCreated = false;
 	private fullscreenStopped = false;
+	private parentRestoreQueued = false;
+	private parentRestorePromise: Promise<void> | undefined;
 	private cleanupError: unknown;
 
 	constructor(
@@ -356,7 +358,11 @@ class BtwFullscreenHost<T> implements Component {
 				try {
 					this.hardCancelActiveCustom?.();
 				} finally {
-					this.restoreParent();
+					// ProcessTerminal.stop() destroys its active input buffer. Keep cancellation
+					// synchronous, then drain input before the physical Windows terminal handoff.
+					// Pi has no public input injection, so do not replay bytes already coalesced
+					// behind the hard-cancel key.
+					this.queueParentRestore();
 				}
 				return { consume: true };
 			});
@@ -370,15 +376,35 @@ class BtwFullscreenHost<T> implements Component {
 		} catch (error) {
 			this.cleanupError ??= error;
 		}
-		this.restoreParent();
+		if (this.parentRestorePromise) await this.parentRestorePromise;
+		else this.restoreParent();
 		if (this.cleanupError !== undefined) outcome = { kind: "failed", error: this.cleanupError };
 		this.finished = true;
 		this.done(outcome);
 	}
 
+	private queueParentRestore(): void {
+		if (this.parentRestoreQueued || this.parentRestoreAttempted) return;
+		this.parentRestoreQueued = true;
+		this.parentRestorePromise = Promise.resolve().then(async () => {
+			try {
+				await this.fullscreen?.terminal.drainInput?.();
+			} catch (error) {
+				this.cleanupError ??= error;
+			}
+			this.parentRestoreQueued = false;
+			this.restoreParent();
+		});
+	}
+
 	private restoreParent(): void {
-		this.removeHardCancelListener?.();
+		const removeHardCancelListener = this.removeHardCancelListener;
 		this.removeHardCancelListener = undefined;
+		try {
+			removeHardCancelListener?.();
+		} catch (error) {
+			this.cleanupError ??= error;
+		}
 		if (this.fullscreenCreated && !this.fullscreenStopped) {
 			this.fullscreenStopped = true;
 			try {
@@ -387,7 +413,7 @@ class BtwFullscreenHost<T> implements Component {
 				this.cleanupError ??= error;
 			}
 		}
-		if (!this.parentStopped || this.parentRestarted) return;
+		if (!this.parentStopped || this.parentRestoreAttempted) return;
 		const parentOverlay = this.parentOverlay;
 		this.parentOverlay = undefined;
 		try {
@@ -396,8 +422,8 @@ class BtwFullscreenHost<T> implements Component {
 			this.cleanupError ??= error;
 		}
 		try {
+			this.parentRestoreAttempted = true;
 			this.parent.start();
-			this.parentRestarted = true;
 			this.parent.renderNow(false);
 		} catch (error) {
 			this.cleanupError ??= error;