@oh-my-pi/pi-tui 18.13.2 → 18.13.3

package/src/overlays/session-selector.ts

@@ -51,8 +51,10 @@ export interface SessionSelectorEntry {
 	parentSessionPath?: string;
 }
 import { shortenPath } from "../render/render-utils";
+import { formTheme } from "../chrome/form-theme";
 import { HookSelectorComponent } from "./hook-selector";
 import { bottomBorder, OverlayPanel, row, topBorder } from "../chrome/overlay-box";
+import { TextFormField } from "../components/form";
 import { MenuSelection, getMenuWindow } from "../components/menu-selection";
 import { formatKeyHint, formatKeyHints } from "../app-keybindings";
 import { boundKeys, interruptKey } from "../chrome/keybinding-hints";
@@ -518,6 +520,7 @@ class SessionList<T extends SessionSelectorEntry> implements Component {
 	readonly #getTerminalRows: () => number;
 
 	onDeleteRequest?: (session: T) => void;
+	onRenameRequest?: (session: T) => void;
 
 	#allSessions: T[];
 	#showCwd: boolean;
@@ -810,6 +813,22 @@ class SessionList<T extends SessionSelectorEntry> implements Component {
 		}
 	}
 
+	/** Update a session's title in place and refresh the visible list, keeping the selection. */
+	renameSessionTitle(sessionPath: string, title: string): void {
+		const entry = this.#allSessions.find(s => s.path === sessionPath);
+		if (!entry) return;
+		this.#datasetVersion++;
+		entry.title = title;
+		// The cached native item embeds the old title, and the search haystack
+		// caches it too: drop both so the next describe rebuilds the row and
+		// the literal/fuzzy search paths match the new title. Selection is
+		// path-keyed, so the same-query refilter keeps the cursor on the
+		// renamed session.
+		delete (entry as NativeSessionInfo)[kNativeItem];
+		delete (entry as SearchableSessionInfo)[kSearchTextLower];
+		this.#filterSessions(this.#searchInput.getValue());
+	}
+
 	/** Resolve a list-local rendered-line index to a filtered-session index. */
 	hitTestSession(line: number): number | undefined {
 		return this.#hitRows[line];
@@ -853,6 +872,12 @@ class SessionList<T extends SessionSelectorEntry> implements Component {
 		if (selected) this.onDeleteRequest?.(selected);
 	}
 
+	/** F2: ask the parent to rename the selected session. */
+	requestRename(): void {
+		const selected = this.#menu.selectedItem;
+		if (selected) this.onRenameRequest?.(selected);
+	}
+
 	/** Empty the search query (the empty state's "Clear search"). */
 	clearSearch(): void {
 		this.#searchInput.setValue("");
@@ -1277,6 +1302,12 @@ class SessionList<T extends SessionSelectorEntry> implements Component {
 			this.requestDelete();
 			return;
 		}
+		// F2 renames the selected session; as a non-printable key it never
+		// collides with the search input.
+		if (matchesKey(keyData, "f2")) {
+			this.requestRename();
+			return;
+		}
 		// Up arrow
 		if (matchesSelectUp(keyData)) {
 			this.#selectionMoved = true;
@@ -1331,6 +1362,12 @@ class SessionList<T extends SessionSelectorEntry> implements Component {
 
 export interface SessionSelectorOptions<T extends SessionSelectorEntry = SessionSelectorEntry> {
 	onDelete?: (session: T) => Promise<boolean>;
+	/**
+	 * Rename the selected session to a user-supplied title; resolve with the
+	 * title as stored (the session canonicalizes it) or null when the rename
+	 * did not happen.
+	 */
+	onRename?: (session: T, title: string) => Promise<string | null>;
 	historyMatcher?: SessionHistoryMatcher;
 	/** Loads sessions across all projects for the all-projects scope toggle (Tab). */
 	loadAllSessions?: () => Promise<T[]>;
@@ -1378,15 +1415,20 @@ export interface SessionSelectorOptions<T extends SessionSelectorEntry = Session
 export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSelectorEntry> extends OverlayPanel {
 	#sessionList: SessionList<T>;
 	#confirmationDialog: HookSelectorComponent | null = null;
-	// Hosts whichever of `#sessionList` / `#confirmationDialog` is live this
-	// frame. The delete dialog REPLACES the list in this slot rather than being
-	// appended below the picker chrome, so the picker is always
+	/** Open rename dialog: an OverlayPanel hosting the rename TextFormField. */
+	#renameDialog: OverlayPanel | null = null;
+	/** The rename dialog's input; keystrokes route here while the dialog is open. */
+	#renameField: TextFormField | null = null;
+	// Hosts whichever of `#sessionList` / `#confirmationDialog` / `#renameDialog`
+	// is live this frame. The delete dialog REPLACES the list in this slot rather
+	// than being appended below the picker chrome, so the picker is always
 	// `chrome + max(list, dialog) + chrome` and never overflows the viewport
 	// (issue #3283: an overflowing dialog frame committed the header into
 	// scrollback, stranding it above the viewport once the dialog closed).
 	#contentSlot: Container;
 	#messageContainer: Container;
 	#onDelete?: (session: T) => Promise<boolean>;
+	#onRename?: (session: T, title: string) => Promise<string | null>;
 	#onRequestRender?: () => void;
 	readonly #loadAllSessions?: () => Promise<T[]>;
 	#folderSessions: T[];
@@ -1431,6 +1473,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 				message: SessionPickerMessage | undefined;
 				errorOpen: boolean;
 				choice: DeleteChoice<T> | null;
+				rename: OverlayPanel | null;
 				node: NativeNode;
 		  }
 		| undefined;
@@ -1439,7 +1482,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 				title: string;
 				scope: "folder" | "all";
 				message: SessionPickerMessage | undefined;
-				dialog: HookSelectorComponent | null;
+				dialog: HookSelectorComponent | OverlayPanel | null;
 				list: NativeNode;
 				node: NativeNode;
 		  }
@@ -1456,6 +1499,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 
 		this.#messageContainer = new Container();
 		this.#onDelete = options.onDelete;
+		this.#onRename = options.onRename;
 		this.#loadAllSessions = options.loadAllSessions;
 		this.#folderSessions = sessions;
 		// Storage directory, not recorded cwd: one folder's sessions may record
@@ -1505,6 +1549,11 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 				this.#showDeleteConfirmation(session);
 			};
 		}
+		if (this.#onRename) {
+			this.#sessionList.onRenameRequest = (session: T) => {
+				this.#showRenameDialog(session);
+			};
+		}
 		if (this.#loadAllSessions || this.#globalSessions) {
 			this.#sessionList.onToggleScope = () => {
 				void this.#toggleScope();
@@ -1527,7 +1576,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 	 * never pays for the cross-project scan.
 	 */
 	async #toggleScope(): Promise<void> {
-		if (this.#toggling || this.#confirmationDialog) return;
+		if (this.#toggling || this.#confirmationDialog || this.#renameDialog) return;
 		if (this.#scope === "folder") {
 			let global = this.#globalSessions;
 			if (!global) {
@@ -1651,6 +1700,107 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 		this.#onRequestRender?.();
 	}
 
+	/**
+	 * Mirror a renamed title into the scope caches. The visible list holds
+	 * one entry per session, but the folder and all-projects caches can hold
+	 * their own copies of the same session, so a rename has to reach all of
+	 * them or a scope switch shows the old title again.
+	 */
+	#syncScopeTitles(sessionPath: string, title: string): void {
+		for (const cache of [this.#folderSessions, this.#globalSessions]) {
+			if (!cache) continue;
+			const entry = cache.find(s => s.path === sessionPath);
+			if (!entry) continue;
+			entry.title = title;
+			delete (entry as NativeSessionInfo)[kNativeItem];
+			delete (entry as SearchableSessionInfo)[kSearchTextLower];
+		}
+	}
+
+	/** Close the rename dialog without changes, restoring the session list. */
+	#closeRenameDialog(): void {
+		if (!this.#renameDialog) return;
+		this.#renameDialog = null;
+		this.#renameField = null;
+		// Restore the SessionList into the content slot so the picker is back
+		// to its normal layout on the very next render — the same frame the
+		// dialog disappears.
+		this.#contentSlot.clear();
+		this.#contentSlot.addChild(this.#sessionList);
+		this.#onRequestRender?.();
+	}
+
+	#showRenameDialog(session: T): void {
+		if (!this.#onRename || this.#confirmationDialog || this.#renameDialog || this.#toggling) return;
+		// One submit at a time: a second Enter while the rename is still
+		// awaiting disk I/O would queue a second write for the same session.
+		let pending = false;
+		// This editor's own identity: a submit that settles after the user
+		// opened another editor must not close it.
+		const owner = new OverlayPanel("Rename Session");
+		const submit = async (value: string) => {
+			if (pending) return;
+			const title = value.trim();
+			// Empty treated as cancel: Esc and a blank submit both leave the title.
+			if (title.length === 0) {
+				this.#closeRenameDialog();
+				return;
+			}
+			const rename = this.#onRename;
+			if (!rename) {
+				this.#closeRenameDialog();
+				return;
+			}
+			this.#clearError();
+			pending = true;
+			try {
+				const stored = await rename(session, title);
+				if (stored) {
+					// The stored title is the canonical one (the session may
+					// collapse whitespace), so the row and the search index
+					// match what is on disk.
+					this.#sessionList.renameSessionTitle(session.path, stored);
+					this.#syncScopeTitles(session.path, stored);
+					if (this.#preview?.session === session) this.#preview = undefined;
+				} else {
+					this.#showError("Failed to rename session.");
+				}
+			} catch (err) {
+				this.#showError(err instanceof Error ? err.message : String(err));
+			} finally {
+				pending = false;
+			}
+			if (this.#renameDialog === owner) this.#closeRenameDialog();
+		};
+		const field = new TextFormField({
+			theme: formTheme,
+			label: "Rename session",
+			initialValue: session.title ?? "",
+			empty: "cancel",
+			onSubmit: value => {
+				void submit(value);
+			},
+			onCancel: () => {
+				// A cancel while the rename is still in flight must not tear
+				// the editor down underneath it; the submit closes it.
+				if (pending) return;
+				this.#closeRenameDialog();
+			},
+		});
+		field.focused = true;
+		owner.addChild(field);
+		this.#renameDialog = owner;
+		this.#renameField = field;
+		// Swap the SessionList out of the content slot and mount the dialog in its
+		// place: the dialog competes only with the SessionList's rendered budget,
+		// never the SessionList AND the picker chrome, so the picker frame stays
+		// inside the terminal viewport and the TUI never commits the header into
+		// scrollback (issue #3283).
+		this.#contentSlot.clear();
+		this.#contentSlot.addChild(owner);
+		this.#onRequestRender?.();
+	}
+
 	/**
 	 * Render the panel directly so fill-height mode can keep its footer pinned
 	 * while sharing OverlayPanel's exact rounded-box chrome. Children receive
@@ -1682,7 +1832,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 		const cancel = interruptKey();
 		const hint = theme.fg(
 			"muted",
-			`[${this.#onDelete ? `${formatKeyHints(["delete", "backspace"])} delete · ` : ""}${formatKeyHint("enter")} select · ${formatKeyHint("tab")} ${scopeHint} · ${cancel} cancel]`,
+			`[${this.#onDelete ? `${formatKeyHints(["delete", "backspace"])} delete · ` : ""}${this.#onRename ? `${formatKeyHint("f2")} rename · ` : ""}${formatKeyHint("enter")} select · ${formatKeyHint("tab")} ${scopeHint} · ${cancel} cancel]`,
 		);
 		return [row("", width), row(hint, width), row("", width), bottomBorder(width)];
 	}
@@ -1694,24 +1844,32 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 
 	/** Over the transcript the picker is its own sheet (`layer`); the standalone app fills the screen surface. */
 	nativeSheet(cx: DescribeContext): boolean {
+		// A rename editor is a card with a text field, not a picker sheet: it
+		// renders in place, like the generic composition does.
+		if (this.#renameDialog) return false;
 		return cx.supports("picker") && !this.#standalone;
 	}
 
 	/**
 	 * With the `picker` kind: the data-first session picker (§4.7). Otherwise
 	 * scope `tabs`, loading/error message, then the search `input` and session
-	 * `list` — or the delete-confirmation dialog in their place, as on the ANSI
-	 * path — and the key-hint footer.
+	 * `list` — or the delete-confirmation / rename dialog in their place, as on
+	 * the ANSI path — and the key-hint footer.
 	 */
 	override describe(cx: DescribeContext): NativeNode {
-		if (cx.supports("picker")) return this.#describePicker();
+		// The picker kind has no text-input affordance, so a rename would
+		// capture every keystroke into an invisible field. While the rename
+		// editor is open, describe the card path instead (the same fallback
+		// the hook selector uses for its slider and countdown).
+		if (cx.supports("picker") && !this.#renameDialog) return this.#describePicker();
 		const list = this.#sessionList.describeList();
+		const dialog = this.#confirmationDialog ?? this.#renameDialog;
 		const memo = this.#nativeMemo;
 		if (
 			memo?.title === this.title &&
 			memo.scope === this.#scope &&
 			memo.message === this.#message &&
-			memo.dialog === this.#confirmationDialog &&
+			memo.dialog === dialog &&
 			memo.list === list
 		) {
 			return memo.node;
@@ -1725,13 +1883,14 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 		} else if (message) {
 			children.push(node("text", { spans: [span(message.text, "error")] }, undefined, "message"));
 		}
-		if (this.#confirmationDialog) {
-			children.push(this.#confirmationDialog);
+		if (dialog) {
+			children.push(dialog);
 		} else {
 			children.push(this.#sessionList.searchInput, list);
 		}
 		const hints: (NativeHint | undefined)[] = [];
 		if (this.#onDelete) hints.push({ keys: ["delete", "backspace"], label: "delete" });
+		if (this.#onRename) hints.push({ keys: ["f2"], label: "rename" });
 		hints.push({ keys: ["enter"], label: "select" });
 		if (this.#sessionList.onToggleScope) {
 			hints.push({ keys: ["tab"], label: this.#scope === "all" ? "current folder" : "all projects" });
@@ -1745,7 +1904,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 			title: this.title,
 			scope: this.#scope,
 			message,
-			dialog: this.#confirmationDialog,
+			dialog,
 			list,
 			node: result,
 		};
@@ -1756,8 +1915,8 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 	 * `lg` cards sheet (`screen` for the standalone app): sessions grouped by
 	 * day (ranked flat while searching), the selected session's preview, the
 	 * delete confirm strip, and the actions of the keys Enter, Delete/Backspace,
-	 * Tab (the scope toggle, labelled with the scope it switches to) and Esc.
-	 * Untitled unless the caller named it; the placeholder says the scope.
+	 * F2 (rename), Tab (the scope toggle, labelled with the scope it switches
+	 * to) and Esc. Untitled unless the caller named it; the placeholder says the scope.
 	 */
 	#describePicker(): NativeNode {
 		const list = this.#sessionList;
@@ -1766,6 +1925,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 		const message = this.#message;
 		const errorOpen = this.#pickerErrorOpen && message?.kind === "error";
 		const choice = this.#deleteChoice;
+		const rename = this.#renameDialog;
 		const memo = this.#pickerMemo;
 		if (
 			memo?.view === view &&
@@ -1773,7 +1933,8 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 			memo.scope === this.#scope &&
 			memo.message === message &&
 			memo.errorOpen === errorOpen &&
-			memo.choice === choice
+			memo.choice === choice &&
+			memo.rename === rename
 		) {
 			return memo.node;
 		}
@@ -1781,6 +1942,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 		const toggle = list.onToggleScope !== undefined;
 		const actions = [pickerAction("resume", this.#actionLabel, "enter", { primary: true })];
 		if (this.#onDelete) actions.push(pickerAction("delete", "Delete", "backspace"));
+		if (this.#onRename) actions.push(pickerAction("rename", "Rename", "f2"));
 		if (toggle) {
 			actions.push(pickerAction("scope", this.#scope === "all" ? "This folder" : "All projects", "tab"));
 		}
@@ -1831,7 +1993,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 			},
 			preview,
 		);
-		this.#pickerMemo = { view, preview, scope: this.#scope, message, errorOpen, choice, node: result };
+		this.#pickerMemo = { view, preview, scope: this.#scope, message, errorOpen, choice, rename, node: result };
 		return result;
 	}
 
@@ -1867,27 +2029,31 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 
 	/**
 	 * Picker pointer events run the keys' paths: a row click selects (arrows),
-	 * a second click or `Resume` resumes (Enter), `Delete` asks (Delete), the
-	 * tab or `All projects` toggles scope (Tab), `Close` cancels (Esc), and
-	 * the confirm strip answers the delete dialog (Yes / Esc).
+	 * a second click or `Resume` resumes (Enter), `Delete` asks (Delete),
+	 * `Rename` renames (F2), the tab or `All projects` toggles scope (Tab),
+	 * `Close` cancels (Esc), and the confirm strip answers the delete dialog (Yes / Esc).
 	 */
 	#handlePickerEvent(ev: PickerEvent): void {
 		const list = this.#sessionList;
 		const choice = this.#deleteChoice;
 		if (ev.kind !== "action") {
-			if (choice) return;
+			if (choice || this.#renameDialog) return;
 			if (ev.kind === "select") list.selectSession(ev.item);
 			else list.confirmSession(ev.item);
 			return;
 		}
 		if (ev.act === "delete-confirm") choice?.confirm();
-		else if (ev.act === "cancel") choice?.cancel();
-		else if (ev.act === "close") {
+		else if (ev.act === "cancel") {
+			if (choice) choice.cancel();
+			else this.#closeRenameDialog();
+		} else if (ev.act === "close") {
 			if (choice) choice.cancel();
+			else if (this.#renameDialog) this.#closeRenameDialog();
 			else list.onCancel?.();
-		} else if (choice) return;
+		} else if (choice || this.#renameDialog) return;
 		else if (ev.act === "resume") list.resumeSelected();
 		else if (ev.act === "delete") list.requestDelete();
+		else if (ev.act === "rename") list.requestRename();
 		else if (ev.act === "scope") {
 			list.onToggleScope?.();
 		} else if (ev.act === "clear") list.clearSearch();
@@ -1907,7 +2073,8 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 			if (event.type === "select" && event.item !== this.#scope) void this.#toggleScope();
 			return;
 		}
-		if (event.key === "list" && !this.#confirmationDialog) this.#sessionList.confirmSession(event.item);
+		if (event.key === "list" && !this.#confirmationDialog && !this.#renameDialog)
+			this.#sessionList.confirmSession(event.item);
 	}
 
 	handleInput(keyData: string): void {
@@ -1919,6 +2086,8 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 		}
 		if (this.#confirmationDialog) {
 			this.#confirmationDialog.handleInput(keyData);
+		} else if (this.#renameDialog) {
+			this.#renameField?.handleInput(keyData);
 		} else {
 			this.#sessionList.handleInput(keyData);
 		}
@@ -1931,7 +2100,7 @@ export class SessionSelectorComponent<T extends SessionSelectorEntry = SessionSe
 	 * pointer. Mouse is inert while the delete-confirmation dialog is open.
 	 */
 	#handleMouse(data: string): void {
-		if (this.#confirmationDialog) return;
+		if (this.#confirmationDialog || this.#renameDialog) return;
 		routeSgrMouseInput(data, event => {
 			if (event.wheel !== null) {
 				this.#sessionList.handleWheel(event.wheel);

package/src/overlays/usage-dashboard.ts

@@ -435,22 +435,15 @@ function clockTime(date: Date): string {
 }
 
 /**
- * When a window resets, relative to `nowMs`: `resets 18:00` today, `resets
- * Tue 18:00` within the week, `resets 3 Oct` beyond; the title carries the
- * absolute date and the countdown.
+ * When a window resets, `resetMs` from `nowMs`: the countdown (`resets in
+ * 2h30m`), which reads the same in every time zone; the title carries the
+ * local date and time.
  */
 function resetLabel(nowMs: number, resetMs: number): { text: string; title: string } {
 	const at = new Date(nowMs + resetMs);
-	const now = new Date(nowMs);
-	const sameDay = at.toDateString() === now.toDateString();
-	const text = sameDay
-		? `resets ${clockTime(at)}`
-		: resetMs < 6 * 86_400_000
-			? `resets ${WEEKDAY_NAMES[at.getDay()]} ${clockTime(at)}`
-			: `resets ${at.getDate()} ${MONTH_NAMES[at.getMonth()]}`;
 	return {
-		text,
-		title: `Resets ${shortDate(at)} ${at.getFullYear()}, ${clockTime(at)} (in ${formatDuration(resetMs)})`,
+		text: `resets in ${formatDuration(resetMs)}`,
+		title: `Resets ${shortDate(at)} ${at.getFullYear()}, ${clockTime(at)}`,
 	};
 }
 

package/src/prompt/custom-editor.ts

@@ -1063,7 +1063,12 @@ export class CustomEditor extends Editor {
 	/** Editing is available during bootstrap; atomic sends wait until submission is wired and enabled
 	 *  and no dictation is still writing into the draft. */
 	protected override get nativeSendable(): boolean {
-		return this.onSubmit !== undefined && !this.disableSubmit && !dictationHoldsDraft(this.composerState().dictation);
+		return (
+			!this.nativeKeyPassthrough &&
+			this.onSubmit !== undefined &&
+			!this.disableSubmit &&
+			!dictationHoldsDraft(this.composerState().dictation)
+		);
 	}
 	/** The quoted-title placeholder, kept while the title stands so the editor node stays reused. */
 	#titlePlaceholder: { title: string; text: TspText } | undefined;

package/src/terminal.ts

@@ -774,7 +774,8 @@ type Da1SentinelOwner =
 	| { kind: "privateMode"; mode: number }
 	| { kind: "osc99Probe"; id: string }
 	| { kind: "glyphProtocol"; phase: "support" | "confirm" }
-	| { kind: "tsp" };
+	| { kind: "tsp" }
+	| { kind: "drain"; answered: () => void };
 
 let nextOsc99ProbeId = 1;
 
@@ -1607,6 +1608,10 @@ export class ProcessTerminal implements Terminal {
 						if (owner.phase === this.#glyphProtocolPhase) this.#resolveGlyphProtocolSupport(false);
 						break;
 					}
+					case "drain": {
+						owner.answered();
+						break;
+					}
 					case "tsp": {
 						// DA1 before any `tsp;r` reply: the terminal doesn't speak TSP.
 						this.#resolveTspSupport(
@@ -2314,12 +2319,29 @@ export class ProcessTerminal implements Terminal {
 		process.stdin.on("data", onData);
 		const endTime = Date.now() + maxMs;
 
+		// A terminal that answers DA1 (`#sixelSupport` is set from its first
+		// reply) answers this one after everything it sent before reading it:
+		// replies to output already written (TSP acks for the last frames, which
+		// a terminal may send well after the idle window) are read here instead
+		// of reaching the shell as typed text.
+		let sentinelAnswered = true;
+		if (this.#sixelSupport !== undefined && !this.#dead) {
+			sentinelAnswered = false;
+			this.#da1SentinelOwners.push({
+				kind: "drain",
+				answered: () => {
+					sentinelAnswered = true;
+				},
+			});
+			this.#safeWrite("\x1b[c");
+		}
+
 		try {
 			while (true) {
 				const now = Date.now();
 				const timeLeft = endTime - now;
 				if (timeLeft <= 0) break;
-				if (now - lastDataTime >= idleMs) break;
+				if (sentinelAnswered && now - lastDataTime >= idleMs) break;
 				await new Promise(resolve => setTimeout(resolve, Math.min(idleMs, timeLeft)));
 			}
 		} finally {

package/src/theme/theme.ts

@@ -843,71 +843,6 @@ export async function getResolvedThemeColors(themeName?: string): Promise<Record
 	return cssColors;
 }
 
-/** One appearance variant of {@link NativeThemePalette}: token name → `#rrggbb`. */
-export type NativeThemeVariant = Record<string, string>;
-
-/** omp's resolved theme for a Tern Surface Protocol terminal (the `t` verb body minus `sf`). */
-export interface NativeThemePalette {
-	dark?: NativeThemeVariant;
-	light?: NativeThemeVariant;
-	name: { dark?: string; light?: string };
-}
-
-/**
- * Cheap identity of everything {@link getNativeThemePalette} depends on;
- * recompute the palette only when it changes.
- */
-export function getNativeThemePaletteKey(): string {
-	return `${themeEpoch}|${autoDetectedTheme}|${autoDarkTheme}|${autoLightTheme}|${currentThemeName}|${previewThemeName}|${currentColorBlindMode}`;
-}
-
-/** Every token of theme `name` as hex (terminal-default tokens omitted), plus its export colours. */
-function nativeThemeVariant(name: string): { light: boolean; colors: NativeThemeVariant } {
-	const themeJson = loadThemeJsonSync(name);
-	const built = createTheme(themeJson, getCurrentThemeOptions());
-	const raw = resolveThemeColors(themeJson.colors, themeJson.vars);
-	const colors: NativeThemeVariant = {};
-	for (const key in raw) {
-		// Terminal-default tokens stay unset; keys outside the schema are ignored like the theme does.
-		if (raw[key as keyof typeof raw] === "") continue;
-		if (isValidThemeColor(key)) colors[key] = built.getColorHex(key);
-		else if (isValidThemeBg(key)) colors[key] = built.getBgHex(key);
-	}
-	const exported = resolveThemeExportColors(themeJson);
-	for (const key of ["pageBg", "cardBg", "infoBg"] as const) {
-		const value = exported[key];
-		if (value) colors[key] = value;
-	}
-	return { light: isLightThemeJson(themeJson), colors };
-}
-
-/**
- * omp's theme for a native surface: with auto theme, the configured dark and
- * light themes; otherwise (or while the theme selector previews one) the
- * active theme under its own appearance only. Themes without a loadable
- * definition (in-memory instances) contribute nothing.
- */
-export function getNativeThemePalette(): NativeThemePalette {
-	const palette: NativeThemePalette = { name: {} };
-	const add = (name: string, as?: "dark" | "light"): void => {
-		try {
-			const variant = nativeThemeVariant(name);
-			const slot = as ?? (variant.light ? "light" : "dark");
-			palette[slot] = variant.colors;
-			palette.name[slot] = name;
-		} catch (error) {
-			logger.debug("Native theme palette: theme not loadable", { name, error: String(error) });
-		}
-	};
-	const single = previewThemeName ?? (autoDetectedTheme ? undefined : currentThemeName);
-	if (single !== undefined) add(single);
-	else {
-		add(autoDarkTheme, "dark");
-		add(autoLightTheme, "light");
-	}
-	return palette;
-}
-
 /**
  * Check if a theme is a "light" theme by analyzing its status-line background
  * luminance. Loads theme JSON synchronously (built-in or custom file on disk)

package/src/tools/bash-interactive.ts

@@ -25,7 +25,12 @@ const NATIVE_SHEET_INSET_COLS = 8;
 // Action id of the native Force kill button (mirrors Esc).
 const KILL_ACTION = "kill";
 
-function normalizeInputForPty(data: string, applicationCursorKeysMode: boolean): string {
+/**
+ * Translates a TUI key event into the bytes a terminal would send to a PTY
+ * child; key releases encode to "". Shared by the agent `pty` console and
+ * `!` commands (`BashExecutionComponent.encodePtyInput`).
+ */
+export function normalizeInputForPty(data: string, applicationCursorKeysMode: boolean): string {
 	const kitty = parseKittySequence(data);
 	if (kitty?.eventType === 3) {
 		return "";

package/src/tools/job-widget.ts

@@ -190,10 +190,22 @@ function headlineGlance(view: JobWidgetView): JobWidgetGlance | undefined {
 	};
 }
 
+/** The meter's `140/190` when the headline only restates its numerator (`140`). */
+function meterWhole(headline: JobWidgetGlance, view: JobWidgetView): string | undefined {
+	const meter = view.blocks.find((block): block is JobWidgetMeterBlock => block.kind === "meter");
+	const whole = meter ? plainLine(meter.text) : "";
+	return /^\s*\/\s*\S/.test(whole.slice(headline.text.trim().length)) && whole.startsWith(headline.text.trim())
+		? whole
+		: undefined;
+}
+
 /** What one glance at the widget reads: the headline, else the latest figure of its first spark or meter. */
 export function jobWidgetGlance(view: JobWidgetView): JobWidgetGlance | undefined {
 	const headline = headlineGlance(view);
-	if (headline) return headline;
+	if (headline) {
+		const whole = meterWhole(headline, view);
+		return whole ? { ...headline, text: whole } : headline;
+	}
 	for (const block of view.blocks) {
 		if (block.kind === "spark" && block.values.length > 0 && plainLine(block.last)) {
 			return { text: plainLine(block.last), label: plainLine(block.label) };

package/src/tools/json-tree.ts

@@ -83,7 +83,7 @@ export function formatArgsInline(
 		const pairs: string[] = [];
 		let length = 0;
 		for (const key in args) {
-			if (!Object.hasOwn(args, key)) continue;
+			if (!Object.hasOwn(args, key) || key in HIDDEN_ARG_KEYS) continue;
 			const pair = `${options.sanitizeText?.(key) ?? key}=${formatScalar(args[key], 24, options)}`;
 			const added = pair.length + (pairs.length > 0 ? 2 : 0);
 			if (length + added > maxWidth && pairs.length > 0) {

package/src/tui.ts

@@ -2450,8 +2450,13 @@ export class TUI extends Container {
 		}
 	}
 
-	addInputListener(listener: InputListener): () => void {
-		this.#inputListeners.add(listener);
+	/** Registers a key listener; `prepend` gives a foreground input owner first refusal over global shortcuts. */
+	addInputListener(listener: InputListener, options?: { prepend?: boolean }): () => void {
+		if (options?.prepend) {
+			this.#inputListeners = new Set([listener, ...this.#inputListeners]);
+		} else {
+			this.#inputListeners.add(listener);
+		}
 		return () => {
 			this.#inputListeners.delete(listener);
 		};