@narumitw/pi-btw 0.56.1 → 0.57.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-btw",
-	"version": "0.56.1",
+	"version": "0.57.0",
 	"description": "Pi extension that adds a /btw side-question command.",
 	"type": "module",
 	"license": "MIT",
@@ -32,9 +32,9 @@
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.5.11",
-		"@earendil-works/pi-ai": "0.84.4",
-		"@earendil-works/pi-coding-agent": "0.84.4",
-		"@earendil-works/pi-tui": "0.84.4",
+		"@earendil-works/pi-ai": "0.85.0",
+		"@earendil-works/pi-coding-agent": "0.85.0",
+		"@earendil-works/pi-tui": "0.85.0",
 		"esbuild": "0.28.2",
 		"typescript": "7.0.2"
 	},

package/src/fullscreen-ui.ts

@@ -8,16 +8,18 @@ import {
 import {
 	type Component,
 	isKeyRelease,
+	isKittyProtocolActive,
 	Key,
 	matchesKey,
 	type OverlayHandle,
+	parseKey,
 	type TUI,
 	TuiAltScreen,
 	type TuiInputListener,
 	type TuiInputListenerResult,
 	truncateToWidth,
 } from "@earendil-works/pi-tui";
-import { sanitizeSingleLine } from "./text.js";
+import { formatKeyLabel, sanitizeSingleLine } from "./text.js";
 
 type BtwCustomOptions = Parameters<ExtensionCommandContext["ui"]["custom"]>[1];
 type BtwCustomFactory<T> = (
@@ -205,6 +207,103 @@ class BtwTuiAltScreen extends TuiAltScreen {
 const BRACKETED_PASTE_START = "\u001b[200~";
 const BRACKETED_PASTE_END = "\u001b[201~";
 
+// TuiAltScreen evaluates these actions before bottom, so shared keys cannot jump to latest.
+const ALT_SCREEN_ACTIONS_BEFORE_BOTTOM = [
+	"tui.altScreen.search",
+	"tui.altScreen.searchNext",
+	"tui.altScreen.searchPrevious",
+	"tui.altScreen.searchClose",
+	"tui.altScreen.pageUp",
+	"tui.altScreen.pageDown",
+	"tui.altScreen.halfPageUp",
+	"tui.altScreen.halfPageDown",
+	"tui.altScreen.lineUp",
+	"tui.altScreen.lineDown",
+	"tui.altScreen.previousPrompt",
+	"tui.altScreen.nextPrompt",
+	"tui.altScreen.top",
+] as const;
+const KEY_MODIFIER_ORDER = ["shift", "ctrl", "alt", "super"] as const;
+const MATCHABLE_SPECIAL_KEYS = new Set([
+	"space",
+	"tab",
+	"enter",
+	"backspace",
+	"delete",
+	"insert",
+	"home",
+	"end",
+	"pageup",
+	"pagedown",
+	"up",
+	"down",
+	"left",
+	"right",
+]);
+const MATCHABLE_SYMBOL_KEYS = new Set("`-=[]\\;',./!@#$%^&*()_+|~{}:<>?");
+
+function normalizedKeyId(key: string): string {
+	const parts = key.toLowerCase().split("+");
+	const base = parts.at(-1);
+	if (!base) return "";
+	const normalizedBase = base === "esc" ? "escape" : base === "return" ? "enter" : base;
+	const modifiers = KEY_MODIFIER_ORDER.filter((modifier) => parts.includes(modifier));
+	return [...modifiers, normalizedBase].join("+");
+}
+
+function formatEffectiveKeyLabel(key: string): string {
+	const parts = key.split("+");
+	const base = parts.at(-1);
+	if (base === "pageup") parts[parts.length - 1] = "pageUp";
+	if (base === "pagedown") parts[parts.length - 1] = "pageDown";
+	return formatKeyLabel(parts.join("+"));
+}
+
+function canMatchKeyInput(key: string): boolean {
+	const parts = key.split("+");
+	const base = parts.at(-1) ?? "";
+	const modifiers = parts.slice(0, -1);
+	if (base === "escape") return modifiers.length === 0;
+	if (base === "clear") {
+		return (
+			modifiers.length === 0 ||
+			(modifiers.length === 1 && (modifiers[0] === "shift" || modifiers[0] === "ctrl"))
+		);
+	}
+	if (/^f(?:[1-9]|1[0-2])$/u.test(base)) return modifiers.length === 0;
+	return (
+		MATCHABLE_SPECIAL_KEYS.has(base) ||
+		(base.length === 1 && (/^[a-z0-9]$/u.test(base) || MATCHABLE_SYMBOL_KEYS.has(base)))
+	);
+}
+
+function rawCtrlInput(base: string): string | undefined {
+	if (base.length !== 1) return undefined;
+	const rawBase = base === "-" ? "_" : base;
+	if (!"abcdefghijklmnopqrstuvwxyz[\\]_".includes(rawBase)) return undefined;
+	return String.fromCharCode(rawBase.charCodeAt(0) & 0x1f);
+}
+
+function legacyRawInput(key: string): string | undefined {
+	const parts = key.split("+");
+	const base = parts.at(-1) ?? "";
+	if (parts.length === 2 && parts[0] === "ctrl") return rawCtrlInput(base);
+	if (isKittyProtocolActive()) return undefined;
+	if (parts.length === 2 && parts[0] === "alt" && base.length === 1) return `\u001b${base}`;
+	if (parts.length === 3 && parts[0] === "ctrl" && parts[1] === "alt") {
+		const input = rawCtrlInput(base);
+		return input ? `\u001b${input}` : undefined;
+	}
+	return undefined;
+}
+
+// Mirror matchesKey(), using parseKey() to canonicalize IDs that share legacy raw input.
+function keyInputIdentity(key: string): string {
+	const identity = normalizedKeyId(key);
+	const input = legacyRawInput(identity);
+	return input ? normalizedKeyId(parseKey(input) ?? identity) : identity;
+}
+
 function hasManualSelectionCopyApi(): boolean {
 	return (
 		typeof TuiAltScreen.prototype.hasActiveSelection === "function" &&
@@ -236,6 +335,32 @@ function createBtwFullscreenTui(
 			mouse: true,
 			copyOnSelect,
 			searchMatchStyle: (text) => theme.underline(styleSearchMatch(text)),
+			scrollToEndIndicator: () => {
+				const unavailableKeyIdentities = new Set<string>([keyInputIdentity(Key.ctrl("c"))]);
+				for (const action of ALT_SCREEN_ACTIONS_BEFORE_BOTTOM) {
+					for (const actionKey of keybindings.getKeys(action)) {
+						unavailableKeyIdentities.add(keyInputIdentity(String(actionKey)));
+					}
+				}
+				if (!copyOnSelect) {
+					for (const copyKey of keybindings.getKeys("app.message.copy")) {
+						unavailableKeyIdentities.add(keyInputIdentity(String(copyKey)));
+					}
+				}
+				const key = keybindings
+					.getKeys("tui.altScreen.bottom")
+					.map((candidate) => keyInputIdentity(String(candidate)))
+					.find(
+						(identity) =>
+							identity &&
+							canMatchKeyInput(identity) &&
+							!unavailableKeyIdentities.has(identity) &&
+							formatEffectiveKeyLabel(identity),
+					);
+				const label = theme.fg("text", " ↓ Jump to latest message");
+				const shortcut = key ? theme.fg("muted", ` · ${formatEffectiveKeyLabel(key)}`) : "";
+				return theme.bg("selectedBg", `${label}${shortcut} `);
+			},
 			searchCurrentMatchStyle: (text) => theme.bold(theme.inverse(styleSearchMatch(text))),
 			openUrl,
 			copySelection: async (text) => {
@@ -304,6 +429,7 @@ class BtwFullscreenHost<T> implements Component {
 	private fullscreenCreated = false;
 	private fullscreenStopped = false;
 	private parentRestoreQueued = false;
+	private parentRestorePromise: Promise<void> | undefined;
 	private cleanupError: unknown;
 
 	constructor(
@@ -357,8 +483,8 @@ class BtwFullscreenHost<T> implements Component {
 				try {
 					this.hardCancelActiveCustom?.();
 				} finally {
-					// ProcessTerminal.stop() destroys its active input buffer. Defer only the
-					// physical handoff so Windows can finish dispatching this Ctrl+C first.
+					// 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();
@@ -375,7 +501,8 @@ 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);
@@ -384,7 +511,12 @@ class BtwFullscreenHost<T> implements Component {
 	private queueParentRestore(): void {
 		if (this.parentRestoreQueued || this.parentRestoreAttempted) return;
 		this.parentRestoreQueued = true;
-		queueMicrotask(() => {
+		this.parentRestorePromise = Promise.resolve().then(async () => {
+			try {
+				await this.fullscreen?.terminal.drainInput?.();
+			} catch (error) {
+				this.cleanupError ??= error;
+			}
 			this.parentRestoreQueued = false;
 			this.restoreParent();
 		});

package/src/text.ts

@@ -8,3 +8,21 @@ export function sanitizeSingleLine(text: string): string {
 		.replace(/ +/gu, " ")
 		.trim();
 }
+
+export function formatKeyLabel(key: string): string {
+	const sanitized = sanitizeSingleLine(key);
+	if (!sanitized) return "";
+	return sanitized
+		.split("+")
+		.map((part) => {
+			const lower = part.toLowerCase();
+			if (lower === "shift") return "Shift";
+			if (lower === "ctrl") return "Ctrl";
+			if (lower === "alt") return "Alt";
+			if (lower === "super") return "Super";
+			return part.length === 1
+				? part.toUpperCase()
+				: `${part[0]?.toUpperCase() ?? ""}${part.slice(1)}`;
+		})
+		.join("+");
+}

package/src/transcript-pager.ts

@@ -24,7 +24,7 @@ import {
 } from "@earendil-works/pi-tui";
 import type { BtwFullscreenLayoutComponent } from "./fullscreen-ui.js";
 import type { BtwThinkingLevel, SideThreadTurn } from "./side-thread.js";
-import { sanitizeSingleLine } from "./text.js";
+import { formatKeyLabel, sanitizeSingleLine } from "./text.js";
 
 const TRANSCRIPT_CHROME_LINES = 2;
 const MAX_STEERING_DISPLAY_LINES = 3;
@@ -613,21 +613,10 @@ function renderSideThreadHeader(
 }
 
 function thinkingKeyLabel(keybindings: KeybindingsManager): string {
-	const key =
-		sanitizeSingleLine(String(keybindings.getKeys("app.thinking.cycle")[0] ?? "shift+tab")) ||
-		"Shift+Tab";
-	return key
-		.split("+")
-		.map((part) => {
-			const lower = part.toLowerCase();
-			if (lower === "shift") return "Shift";
-			if (lower === "ctrl") return "Ctrl";
-			if (lower === "alt") return "Alt";
-			return part.length === 1
-				? part.toUpperCase()
-				: `${part[0]?.toUpperCase() ?? ""}${part.slice(1)}`;
-		})
-		.join("+");
+	return (
+		formatKeyLabel(String(keybindings.getKeys("app.thinking.cycle")[0] ?? "shift+tab")) ||
+		"Shift+Tab"
+	);
 }
 
 function fitComposerLayout(