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

package/src/hotkeys-markdown.ts

@@ -135,6 +135,7 @@ function hotkeyGroups(bindings: HotkeysMarkdownBindings): HotkeyGroup[] {
 				{ keys: [act("app.history.search")], action: "Search prompt history" },
 				{ keys: [act("app.tools.expand")], action: "Toggle tool output expansion" },
 				{ keys: [act("app.tools.toggleVisibility")], action: "Toggle tool activity visibility" },
+				{ keys: [act("app.links.hint")], action: "Pick an extension link on screen by its tag" },
 				{ keys: [act("app.ask.hide")], action: "Hide/show a pending ask question" },
 				{ keys: [act("app.approval.approve")], action: "Approve a pending tool call" },
 				{ keys: [act("app.thinking.toggle")], action: "Toggle thinking block visibility" },

package/src/native/backend.ts

@@ -39,15 +39,7 @@ import {
 	type TspOp,
 } from "@oh-my-pi/pi-wire";
 import type { Terminal } from "../terminal";
-import {
-	bindTheme,
-	getCurrentThemeName,
-	getNativeThemePalette,
-	getNativeThemePaletteKey,
-	isLightTheme,
-	type NativeThemePalette,
-	setNativeSymbolPreset,
-} from "../theme/theme";
+import { getCurrentThemeName, isLightTheme, setNativeSymbolPreset } from "../theme/theme";
 import type { Component, OverlayOptions, RenderScheduler, RenderTimer } from "../tui";
 import { TspDocument } from "./apply";
 import { getNativeBlob, type NativeBlob } from "./blobs";
@@ -206,9 +198,10 @@ function sameSet(a: ReadonlySet<string>, b: ReadonlySet<string>): boolean {
 /**
  * Kinds newer than some Tern builds that answer `TERM_PROGRAM=tern`: used only
  * once the real `hello` lists them, so the optimistic start never emits a node
- * an older terminal cannot draw (`media`: files Tern loads by path).
+ * an older terminal cannot draw (`media`: files Tern loads by path; `json`:
+ * raw JSON values Tern draws as its own tree).
  */
-const UNASSUMED_KINDS: Partial<Record<TspKind, true>> = { media: true };
+const UNASSUMED_KINDS: Partial<Record<TspKind, true>> = { media: true, json: true };
 
 /**
  * The reply a v1 terminal is assumed to give before its real `hello` arrives
@@ -313,11 +306,6 @@ export class NativeBackend {
 	#sawResize = false;
 	#live = false;
 	#overlayNodes = new Map<Component, { key: string; node: NativeNode }>();
-	#unbindTheme: (() => void) | undefined;
-	#palette: NativeThemePalette | undefined;
-	#paletteKey: string | undefined;
-	/** Serialized palette last sent, to skip resends of an unchanged theme. */
-	#paletteSent: string | undefined;
 	/** Pending delivery owns bytes until sent or confirmed held; settled descriptions may already be released. */
 	#blobs = new Map<string, NativeBlob | "sent">();
 	/** `blobs` queries sent, oldest first: the terminal answers each once, in order. */
@@ -366,54 +354,11 @@ export class NativeBackend {
 		if (this.#live) return;
 		this.#live = true;
 		this.#useNerdSymbols(true);
-		this.#watchTheme();
 		this.#open(this.#inline);
 		setNativeRendering(true);
 		this.render();
 	}
 
-	/**
-	 * Any theme swap (switch, selector preview, auto light/dark, file reload)
-	 * schedules a render; `render()` resends the palette when it changed, so
-	 * bursts coalesce into one `t` and no frame is needed for it.
-	 */
-	#watchTheme(): void {
-		this.#unbindTheme?.();
-		let initial = true;
-		this.#unbindTheme = bindTheme(() => {
-			if (initial) return;
-			this.#host.requestRender();
-		});
-		initial = false;
-	}
-
-	/** The current palette, recomputed only when its inputs changed. */
-	#currentPalette(): NativeThemePalette {
-		const key = getNativeThemePaletteKey();
-		if (this.#palette === undefined || key !== this.#paletteKey) {
-			this.#paletteKey = key;
-			this.#palette = getNativeThemePalette();
-		}
-		return this.#palette;
-	}
-
-	/** Send the palette to `surface` (right after its `o`, before any `f`). */
-	#sendPalette(surface: Surface): void {
-		const palette = this.#currentPalette();
-		if (!palette.dark && !palette.light) return;
-		this.#paletteSent = JSON.stringify(palette);
-		this.#write("t", { sf: surface.id, ...palette });
-	}
-
-	/** Resend the palette to every open surface when the theme changed since it was sent. */
-	#refreshPalette(): void {
-		const key = this.#paletteKey;
-		const palette = this.#currentPalette();
-		if (key === this.#paletteKey || JSON.stringify(palette) === this.#paletteSent) return;
-		this.#sendPalette(this.#inline);
-		if (this.#screen) this.#sendPalette(this.#screen);
-	}
-
 	/**
 	 * Tern's font carries every Nerd Font glyph, and it never answers the Glyph
 	 * Protocol, so icons come from the nerd preset (process-local, not the
@@ -435,8 +380,6 @@ export class NativeBackend {
 		this.#close(this.#inline, keep);
 		this.#inline.doc?.close();
 		setNativeRendering(false);
-		this.#unbindTheme?.();
-		this.#unbindTheme = undefined;
 		this.#useNerdSymbols(false);
 		this.#clearStallTimer();
 		// Replies no longer reach the backend: forget the queries outright.
@@ -455,7 +398,6 @@ export class NativeBackend {
 		this.#applyHello(hello);
 		this.#live = true;
 		this.#useNerdSymbols(true);
-		this.#watchTheme();
 		this.#resetBlobs();
 		const surface = this.#inline;
 		surface.reconciler.detachLive();
@@ -466,7 +408,6 @@ export class NativeBackend {
 		surface.focus = null;
 		surface.dirty = false;
 		this.#write("o", { id: surface.id, mode: "inline", title: "omp", role: SESSION_ROLE, adopt: true });
-		this.#sendPalette(surface);
 		// After the `o`, as in `start()`.
 		setNativeRendering(true);
 		this.render();
@@ -508,7 +449,6 @@ export class NativeBackend {
 	/** Reconcile and send a frame, unless the target surface is out of credits. */
 	render(): void {
 		if (!this.#live) return;
-		this.#refreshPalette();
 		const overlays = this.#host.overlays();
 		let fullscreen = -1;
 		for (let i = overlays.length - 1; i >= 0; i--) {
@@ -608,7 +548,6 @@ export class NativeBackend {
 
 	#open(surface: Surface): void {
 		this.#write("o", { id: surface.id, mode: surface.mode, title: "omp", role: surface.role });
-		this.#sendPalette(surface);
 	}
 
 	#close(surface: Surface, keep: boolean): void {
@@ -776,7 +715,7 @@ export class NativeBackend {
 		}
 	}
 
-	#write(verb: "o" | "f" | "t" | "x" | "q", body: unknown): void {
+	#write(verb: "o" | "f" | "x" | "q", body: unknown): void {
 		this.#record("out", verb, undefined, body);
 		this.#host.terminal.write(encodeTspJson(verb, body, undefined, this.#limit));
 	}

package/src/native/blobs.ts

@@ -97,10 +97,11 @@ export function base64ImageNode(
 /**
  * Props that make an `image` node open the file at `filePath` (as a `file://` URL, the TSP
  * open-target form): a click zooms the image in the terminal, and the file opens from its
- * context menu. Empty without a file.
+ * context menu. Always uses a local file URL because the open action runs locally,
+ * even when remote file handlers are configured. Empty without a file.
  */
 export function openableImageProps(filePath: string | undefined): Pick<TspProps<"image">, "href" | "actions"> {
-	const href = filePath ? tryFileUri(filePath) : undefined;
+	const href = filePath ? tryFileUri(filePath, { local: true }) : undefined;
 	return href ? { href, actions: { menu: ["open"] } } : {};
 }
 

package/src/native/picker.ts

@@ -16,7 +16,7 @@
  * the item id and `action` with an action id (plus `value` for
  * `scope`/`tab`/`strip`). {@link pickerEvent} folds them into one shape.
  */
-import type { TspPickerAction, TspPickerItem, TspPickerProps } from "@oh-my-pi/pi-wire";
+import type { TspPickerAction, TspPickerItem, TspPickerProps, TspProps } from "@oh-my-pi/pi-wire";
 import type { KeyName } from "../key-hint-format";
 import { getKeybindings, type Keybinding } from "../keybindings";
 import type { Input } from "../components/input";
@@ -25,7 +25,7 @@ import { col, node } from "./describe";
 import type { NativeChild, NativeNode, NativeUiEvent } from "./node";
 
 /** The picker sheet; `preview` children fill its preview pane. */
-export function picker(p: TspPickerProps, preview?: readonly NativeChild[]): NativeNode {
+export function picker(p: TspProps<"picker">, preview?: readonly NativeChild[]): NativeNode {
 	return node("picker", p, preview);
 }
 
@@ -46,7 +46,7 @@ export const PICKER_KEY = "picker";
  * the picker as child {@link PICKER_KEY}, which the reconciler hoists into
  * `layer`. Route its events with `pickerEvent(event, PICKER_KEY)`.
  */
-export function dockedPicker(p: TspPickerProps, preview?: readonly NativeChild[]): NativeNode {
+export function dockedPicker(p: TspProps<"picker">, preview?: readonly NativeChild[]): NativeNode {
 	return col([node("picker", p, preview, PICKER_KEY)]);
 }
 

package/src/overlays/advisor-config.ts

@@ -36,7 +36,6 @@ import { editorKey, editorKeys } from "../chrome/keybinding-hints";
 import { HookEditorComponent } from "./hook-editor";
 import {
 	buildBrowserItems,
-	MODEL_PICKER_COLUMNS,
 	ModelBrowser,
 	type ModelBrowserItem,
 	type ModelBrowserSource,
@@ -749,16 +748,8 @@ export class AdvisorConfigOverlayComponent implements Component {
 				size: "md",
 				layout: "rows",
 				preview: "below",
-				query: browser.query,
-				cursor: browser.cursor,
 				placeholder: "Search models…",
-				columns: MODEL_PICKER_COLUMNS,
-				...catalogue,
-				order: order.order,
-				...(order.hits ? { hits: order.hits } : {}),
-				selected: browser.pickerSelected,
-				...(this.#modelCurrent ? { current: [this.#modelCurrent] } : {}),
-				total: browser.baseCount,
+				...browser.pickerRows(catalogue, order, this.#modelCurrent),
 				empty: "No models available",
 				actions: [
 					pickerAction("use", "Use for advisor", "enter", { primary: true }),

package/src/overlays/annotation-overlay.ts

@@ -19,6 +19,7 @@ import type { Keybinding } from "../keybindings";
 import { sanitizeText } from "@oh-my-pi/pi-utils";
 import { type Theme } from "../theme/theme";
 import type {
+	AnnotationOverlayDraft,
 	CodeReviewAnnotation,
 	CodeReviewOverlayResult,
 	ReviewDiffFile,
@@ -125,8 +126,14 @@ const MIN_BODY_ROWS = 3;
 const SIDEBAR_MIN_TOTAL_WIDTH = 64;
 const SIDEBAR_MIN_BODY_WIDTH = 40;
 const MAX_ANNOTATION_EDITOR_ROWS = 6;
-const CODE_REVIEW_ACTIONS = [CONTINUE_CODE_REVIEW_ACTION, PASTE_CODE_REVIEW_ACTION] as const;
-const TEXT_REVIEW_ACTIONS = [PASTE_CODE_REVIEW_ACTION] as const;
+/** Clears every note and closes; the host then has nothing to keep. Needs a second confirm. */
+export const DISCARD_ANNOTATIONS_ACTION = "Discard notes and close";
+const CODE_REVIEW_ACTIONS = [
+	CONTINUE_CODE_REVIEW_ACTION,
+	PASTE_CODE_REVIEW_ACTION,
+	DISCARD_ANNOTATIONS_ACTION,
+] as const;
+const TEXT_REVIEW_ACTIONS = [PASTE_CODE_REVIEW_ACTION, DISCARD_ANNOTATIONS_ACTION] as const;
 
 function isSourceRow(row: ReviewDiffRow): row is ReviewSourceRow {
 	return row.kind === "context" || row.kind === "added" || row.kind === "removed";
@@ -229,6 +236,8 @@ export class AnnotationOverlay implements Focusable {
 	/** Set once {@link replaceTextSource} runs; the paste result then carries the edited text. */
 	#textSourceEdited = false;
 	#finished = false;
+	/** Discard was chosen once; choosing it again discards, any other input disarms it. */
+	#discardArmed = false;
 	#annotations: CommittedAnnotation[] = [];
 	#textAnnotations: CommittedTextAnnotation[] = [];
 	/** Annotation lists before each create/edit/delete, restored by `u`. */
@@ -295,6 +304,8 @@ export class AnnotationOverlay implements Focusable {
 			this.#files = filesOrSource;
 			this.#mode = modeOrCallbacks as string;
 			this.#callbacks = maybeCallbacks!;
+			// Start on Paste, not the LLM review: a stray Enter must not submit (it does nothing until a note exists).
+			this.#actionIndex = 1;
 		}
 		const symbols = {
 			cursor: theme.nav.cursor,
@@ -357,6 +368,60 @@ export class AnnotationOverlay implements Focusable {
 		this.#finished = true;
 	}
 
+	/** Notes, the unfinished note, and any source edit, in the form {@link restoreDraft} replays. */
+	getDraft(): AnnotationOverlayDraft {
+		const editing =
+			this.#editingAnnotationIndex === undefined ? {} : { editingAnnotationIndex: this.#editingAnnotationIndex };
+		const text = this.#editor.getExpandedText();
+		if (this.#textSource) {
+			const scope = this.#annotationScope === "text" ? "text" : "line";
+			const sourceIndex = scope === "text" ? -1 : this.#sourceIndex;
+			return {
+				kind: "text",
+				annotations: this.#textAnnotations.map(entry => ({ ...entry, annotation: { ...entry.annotation } })),
+				...(this.#textSourceEdited ? { editedText: this.#textSource.text } : {}),
+				...(this.#annotating ? { editor: { sourceIndex, scope, ...editing, text } } : {}),
+			};
+		}
+		const scope = this.#annotationScope === "file" ? "file" : "line";
+		const editor = { fileIndex: this.#fileIndex, sourceIndex: this.#sourceIndex, scope, ...editing, text } as const;
+		return {
+			kind: "diff",
+			annotations: this.#annotations.map(entry => ({ ...entry, annotation: { ...entry.annotation } })),
+			...(this.#annotating ? { editor } : {}),
+		};
+	}
+
+	/** Replay a draft taken from this same source; anything anchored outside it is dropped. */
+	restoreDraft(draft: AnnotationOverlayDraft): void {
+		const rows = (fileIndex: number) =>
+			this.#textSource ? this.#textLines.length : (this.#files[fileIndex]?.rows.filter(isSourceRow).length ?? -1);
+		const fits = (fileIndex: number, sourceIndex: number, whole: boolean) =>
+			rows(fileIndex) >= 0 && (whole ? sourceIndex === -1 : sourceIndex >= 0 && sourceIndex < rows(fileIndex));
+		if (draft.kind === "text" && this.#textSource) {
+			if (draft.editedText !== undefined) this.replaceTextSource(draft.editedText);
+			this.#textAnnotations = draft.annotations.filter(e => fits(0, e.sourceIndex, e.annotation.scope === "text"));
+		} else if (draft.kind === "diff" && !this.#textSource) {
+			this.#annotations = draft.annotations.filter(e =>
+				fits(e.fileIndex, e.sourceIndex, e.annotation.scope === "file"),
+			);
+		} else return;
+		const editor = draft.editor;
+		const fileIndex = editor && "fileIndex" in editor ? editor.fileIndex : 0;
+		if (editor && fits(fileIndex, editor.sourceIndex, editor.scope === "text" || editor.scope === "file")) {
+			this.#fileIndex = fileIndex;
+			if (editor.sourceIndex >= 0) this.#sourceIndex = editor.sourceIndex;
+			this.#annotationScope = editor.scope;
+			const count = this.#textSource ? this.#textAnnotations.length : this.#annotations.length;
+			this.#editingAnnotationIndex =
+				(editor.editingAnnotationIndex ?? count) < count ? editor.editingAnnotationIndex : undefined;
+			this.#annotating = true;
+			this.#editor.setText(editor.text);
+		}
+		this.#annotationRev++;
+		this.#nativeBody = undefined;
+	}
+
 	getAnnotations(): CodeReviewAnnotation[] {
 		return this.#annotations.map(entry => ({ ...entry.annotation }));
 	}
@@ -422,6 +487,8 @@ export class AnnotationOverlay implements Focusable {
 
 	handleInput(data: string): void {
 		if (this.#finished || this.#externalOperation) return;
+		const discardArmed = this.#discardArmed;
+		this.#discardArmed = false;
 		if (this.#annotationChooser) {
 			this.#handleAnnotationChooser(data);
 			return;
@@ -431,8 +498,9 @@ export class AnnotationOverlay implements Focusable {
 				void this.#openAnnotationEditor();
 				return;
 			}
+			// Close, keeping the unfinished note in the draft so it reopens in the editor.
 			if (this.#keybindings.matches(data, "tui.select.cancel")) {
-				this.#cancelAnnotation();
+				this.#finish(undefined);
 				return;
 			}
 			this.#editor.handleInput(data);
@@ -476,7 +544,7 @@ export class AnnotationOverlay implements Focusable {
 		}
 		if (this.#focus === "files") this.#handleFiles(data);
 		else if (this.#focus === "diff") this.#handleDiff(data);
-		else this.#handleActions(data);
+		else this.#handleActions(data, discardArmed);
 	}
 
 	/** Primary key bound to `action` in this overlay's keybindings, formatted for footer hints. */
@@ -495,10 +563,9 @@ export class AnnotationOverlay implements Focusable {
 		}
 	}
 
-	/** Esc, by state: leave the note chooser, drop the note draft, else close the review. */
+	/** Esc, by state: leave the note chooser, else close the review; the host keeps the draft. */
 	#escape(): void {
 		if (this.#annotationChooser) this.#annotationChooser = undefined;
-		else if (this.#annotating) this.#cancelAnnotation();
 		else this.#finish(undefined);
 	}
 
@@ -602,33 +669,41 @@ export class AnnotationOverlay implements Focusable {
 		}
 	}
 
-	#handleActions(data: string): void {
-		const actionCount = this.#actions.length;
-		if (actionCount === 0) return;
-		const hasAnnotations = this.#textSource ? this.#textAnnotations.length > 0 : this.#annotations.length > 0;
-		if (this.#keybindings.matches(data, "tui.select.up") || matchesKey(data, "k")) {
-			this.#actionIndex = this.#textSource ? (this.#actionIndex - 1 + actionCount) % actionCount : 0;
-			return;
-		}
-		if (this.#keybindings.matches(data, "tui.select.down") || matchesKey(data, "j")) {
-			if (this.#textSource) {
-				this.#actionIndex = (this.#actionIndex + 1) % actionCount;
-			} else if (hasAnnotations) {
-				this.#actionIndex = Math.min(actionCount - 1, this.#actionIndex + 1);
+	#handleActions(data: string, discardArmed: boolean): void {
+		const up = this.#keybindings.matches(data, "tui.select.up") || matchesKey(data, "k");
+		if (up || this.#keybindings.matches(data, "tui.select.down") || matchesKey(data, "j")) {
+			const step = up ? -1 : 1;
+			for (let index = this.#actionIndex + step; index >= 0 && index < this.#actions.length; index += step) {
+				if (this.#actionDisabled(index)) continue;
+				this.#actionIndex = index;
+				break;
 			}
 			return;
 		}
-		if (this.#keybindings.matches(data, "tui.select.confirm")) this.#confirmAction();
+		if (this.#keybindings.matches(data, "tui.select.confirm")) this.#confirmAction(discardArmed);
 	}
 
 	#actionDisabled(index: number): boolean {
+		if (this.#actions[index] === DISCARD_ANNOTATIONS_ACTION) return false;
 		const hasAnnotations = this.#textSource ? this.#textAnnotations.length > 0 : this.#annotations.length > 0;
 		return this.#textSource ? !hasAnnotations : index === 1 && !hasAnnotations;
 	}
 
-	#confirmAction(): void {
+	#confirmAction(discardArmed = false): void {
 		if (this.#actionDisabled(this.#actionIndex)) return;
-		if (this.#textSource) {
+		if (this.#actions[this.#actionIndex] === DISCARD_ANNOTATIONS_ACTION) {
+			if (!discardArmed) {
+				this.#discardArmed = true;
+				return;
+			}
+			this.#annotations = [];
+			this.#textAnnotations = [];
+			this.#textSourceEdited = false;
+			this.#annotating = false;
+			this.#editingAnnotationIndex = undefined;
+			this.#editor.setText("");
+			this.#finish(undefined);
+		} else if (this.#textSource) {
 			this.#finish({
 				action: "paste",
 				annotations: this.getTextAnnotations(),
@@ -721,12 +796,6 @@ export class AnnotationOverlay implements Focusable {
 		this.#editor.setText(existing?.annotation.note ?? "");
 	}
 
-	#cancelAnnotation(): void {
-		this.#annotating = false;
-		this.#editingAnnotationIndex = undefined;
-		this.#editor.setText("");
-	}
-
 	#commitAnnotation(value: string): void {
 		if (this.#textSource) {
 			this.#commitTextAnnotation(value);
@@ -925,7 +994,6 @@ export class AnnotationOverlay implements Focusable {
 		this.#annotationRev++;
 		this.#annotations = snapshot.annotations;
 		this.#textAnnotations = snapshot.textAnnotations;
-		if (this.#annotations.length === 0 && this.#actionIndex === 1) this.#actionIndex = 0;
 	}
 
 	async #openAnnotationEditor(): Promise<void> {
@@ -1146,9 +1214,10 @@ export class AnnotationOverlay implements Focusable {
 	}
 
 	#renderActions(): string[] {
-		const hasAnnotations = this.#textSource ? this.#textAnnotations.length > 0 : this.#annotations.length > 0;
-		return this.#actions.map((label, index) => {
-			const disabled = this.#textSource ? !hasAnnotations : index === 1 && !hasAnnotations;
+		return this.#actions.map((action, index) => {
+			const label =
+				action === DISCARD_ANNOTATIONS_ACTION && this.#discardArmed ? "Confirm: discard all notes" : action;
+			const disabled = this.#actionDisabled(index);
 			const selected = index === this.#actionIndex;
 			const cursor = selected ? `${this.#theme.nav.cursor} ` : "  ";
 			const text = disabled
@@ -1224,7 +1293,7 @@ export class AnnotationOverlay implements Focusable {
 			const hints = [
 				`${editorKey("tui.input.submit")} save`,
 				`${editorKey("tui.input.newLine")} newline`,
-				`${this.#key("tui.select.cancel")} cancel`,
+				`${this.#key("tui.select.cancel")} close, keep note`,
 			];
 			hints.push(`${formatKeyHint(appExternalEditorKey())} editor`);
 			return [caption, ...this.#editor.render(width), this.#theme.fg("dim", hints.join(" · "))];
@@ -1428,6 +1497,7 @@ export class AnnotationOverlay implements Focusable {
 			this.#bodyHeight,
 			this.#annotating ? `annotating:${this.#annotationScope}:${this.#editingAnnotationIndex}` : "",
 			chooser ? `chooser:${chooser.selected}:${chooser.entries.join()}` : "",
+			this.#discardArmed ? "discard-armed" : "",
 		].join("|");
 		if (this.#nativeRoot && sig === this.#nativeSig && body === this.#nativeRootBody) return this.#nativeRoot;
 
@@ -1462,6 +1532,8 @@ export class AnnotationOverlay implements Focusable {
 
 	handleNativeEvent(event: NativeUiEvent): void {
 		if (this.#finished || this.#externalOperation) return;
+		const discardArmed = this.#discardArmed;
+		this.#discardArmed = false;
 		if (event.type === "action") {
 			if (event.act === "close") {
 				this.#escape();
@@ -1470,10 +1542,18 @@ export class AnnotationOverlay implements Focusable {
 			// A draft or the note chooser is open: finish or leave it first.
 			if (this.#annotating || this.#annotationChooser) return;
 			const index =
-				event.act === "review" && !this.#textSource ? 0 : event.act === "paste" ? (this.#textSource ? 0 : 1) : -1;
+				event.act === "discard"
+					? this.#actions.indexOf(DISCARD_ANNOTATIONS_ACTION)
+					: event.act === "review" && !this.#textSource
+						? 0
+						: event.act === "paste"
+							? this.#textSource
+								? 0
+								: 1
+							: -1;
 			if (index < 0 || this.#actionDisabled(index)) return;
 			this.#actionIndex = index;
-			this.#confirmAction();
+			this.#confirmAction(discardArmed);
 			return;
 		}
 		if (event.type !== "select" && event.type !== "activate") return;
@@ -1824,7 +1904,15 @@ export class AnnotationOverlay implements Focusable {
 			mark ? ({ ...button, p: { ...button.p, mark } } as NativeNode) : button;
 		const hasNotes = this.#textSource ? this.#textAnnotations.length > 0 : this.#annotations.length > 0;
 		const pasteTitle = hasNotes ? PASTE_CODE_REVIEW_ACTION : "Add a note to paste it into the prompt";
-		const buttons: NativeNode[] = [actionButton("Cancel", "close", { keys: "escape" })];
+		const buttons: NativeNode[] = [
+			actionButton("Cancel", "close", { keys: "escape" }),
+			marked(
+				actionButton(this.#discardArmed ? "Confirm discard" : "Discard", "discard", {
+					title: DISCARD_ANNOTATIONS_ACTION,
+				}),
+				pick(this.#actions.indexOf(DISCARD_ANNOTATIONS_ACTION)),
+			),
+		];
 		if (this.#textSource) {
 			buttons.push(
 				marked(actionButton("Paste into prompt", "paste", { tone: "accent", title: pasteTitle }), pick(0)),
@@ -1860,7 +1948,7 @@ export class AnnotationOverlay implements Focusable {
 			return [
 				this.#hint("tui.input.submit", "save"),
 				this.#hint("tui.input.newLine", "new line"),
-				this.#hint("tui.select.cancel", "discard"),
+				this.#hint("tui.select.cancel", "close, keep note"),
 				this.#callbacks.onAnnotationExternalEditor ? key(appExternalEditorKey(), "editor") : undefined,
 			];
 		}

package/src/overlays/annotation-types.ts

@@ -78,3 +78,27 @@ export interface TextReviewOverlayResult {
 	/** Source text after an external-editor edit; absent when the source was not edited. */
 	editedText?: string;
 }
+
+export type AnnotationOverlayDraft =
+	| {
+			kind: "diff";
+			annotations: { fileIndex: number; sourceIndex: number; annotation: CodeReviewAnnotation }[];
+			editor?: {
+				fileIndex: number;
+				sourceIndex: number;
+				scope: "file" | "line";
+				editingAnnotationIndex?: number;
+				text: string;
+			};
+	  }
+	| {
+			kind: "text";
+			annotations: { sourceIndex: number; annotation: TextReviewAnnotation }[];
+			editedText?: string;
+			editor?: {
+				sourceIndex: number;
+				scope: "text" | "line";
+				editingAnnotationIndex?: number;
+				text: string;
+			};
+	  };

package/src/overlays/hook-selector.ts

@@ -647,9 +647,9 @@ export class HookSelectorComponent extends OverlayPanel {
 			return;
 		}
 
-		if (matchesSelectUp(keyData) || (!this.#isSearchEnabled() && matchesKey(keyData, "k"))) {
+		if (matchesSelectUp(keyData)) {
 			this.#moveSelection(-1);
-		} else if (matchesSelectDown(keyData) || (!this.#isSearchEnabled() && matchesKey(keyData, "j"))) {
+		} else if (matchesSelectDown(keyData)) {
 			this.#moveSelection(1);
 		} else if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			const selected = this.#menu.selectedItem;

package/src/overlays/login-dialog.ts

@@ -64,7 +64,9 @@ function urlPlace(url: string): string {
 export class LoginDialogComponent extends OverlayPanel {
 	#contentContainer: Container;
 	#input: TextFormField;
-	#tui: TUI;
+	#tui: Pick<TUI, "requestRender">;
+	#focused = false;
+	#useTerminalCursor = false;
 	#onComplete: (success: boolean, message?: string) => void;
 	#openUrl: (url: string) => void;
 	#abortController = new AbortController();
@@ -78,7 +80,7 @@ export class LoginDialogComponent extends OverlayPanel {
 	#nativeRoot: NativeNode | undefined;
 
 	constructor(
-		tui: TUI,
+		tui: Pick<TUI, "requestRender">,
 		providerId: string,
 		onComplete: (success: boolean, message?: string) => void,
 		openUrl: (url: string) => void,
@@ -98,8 +100,29 @@ export class LoginDialogComponent extends OverlayPanel {
 		this.#input = this.#createInput();
 	}
 
+	/** Focus reaches the live field: it draws the caret (the hardware cursor when the terminal's is on). */
+	get focused(): boolean {
+		return this.#focused;
+	}
+
+	set focused(value: boolean) {
+		this.#focused = value;
+		this.#input.focused = value;
+	}
+
+	setUseTerminalCursor(useTerminalCursor: boolean): void {
+		this.#useTerminalCursor = useTerminalCursor;
+		this.#input.input.setUseTerminalCursor(useTerminalCursor);
+	}
+
+	/** A fresh field for the next answer; the previous one stops drawing a caret. */
+	#replaceInput(secret = false): void {
+		this.#input.focused = false;
+		this.#input = this.#createInput(secret);
+	}
+
 	#createInput(secret = false): TextFormField {
-		return new TextFormField({
+		const field = new TextFormField({
 			theme: formTheme,
 			secret,
 			empty: "submit",
@@ -116,6 +139,9 @@ export class LoginDialogComponent extends OverlayPanel {
 			},
 			requestRender: () => this.#tui.requestRender(),
 		});
+		field.focused = this.#focused;
+		field.input.setUseTerminalCursor(this.#useTerminalCursor);
+		return field;
 	}
 
 	get signal(): AbortSignal {
@@ -194,7 +220,7 @@ export class LoginDialogComponent extends OverlayPanel {
 		// Keep retry chrome in place, but discard prior prompt undo/kill history.
 		const mounted = this.#contentContainer.children.indexOf(this.#input);
 		const previousInput = this.#input;
-		this.#input = this.#createInput();
+		this.#replaceInput();
 		const nativeMounted = this.#nativeSteps.find(step => step.kind === "input" && step.field === previousInput);
 		if (mounted !== -1) {
 			// The flow asks again only when the last paste carried no usable code.
@@ -247,7 +273,7 @@ export class LoginDialogComponent extends OverlayPanel {
 			if (answered?.kind === "input") answered.answer = value;
 		}
 		// A new prompt must not recover a previous secret through undo or yank.
-		this.#input = this.#createInput(prompt.secret === true);
+		this.#replaceInput(prompt.secret === true);
 		if (prompt.placeholder) this.#input.input.placeholder = plainText(prompt.placeholder);
 		this.#contentContainer.addChild(new Spacer(1));
 		this.#contentContainer.addChild(new Text(theme.fg("text", prompt.message), 0, 0));