@oh-my-pi/pi-tui 18.3.2 → 18.3.3

package/src/overlays/cleanse-panel.ts

@@ -5,6 +5,7 @@ import { replaceTabs } from "../render/render-utils";
 import { theme } from "../theme/theme";
 import { OverlayPanel } from "../chrome/overlay-box";
 import { StreamingPanelContent, type StreamingPanelPresentation } from "../chrome/streaming-panel";
+import { interruptKey } from "../chrome/keybinding-hints";
 import type {
 	CleanseBoardModel,
 	CleanseCheckerDescriptor,
@@ -149,19 +150,21 @@ export class CleansePanelComponent extends OverlayPanel {
 	}
 
 	#footerLine(): string {
+		// The main editor routes `app.interrupt` (Escape by default) to the panel.
+		const esc = interruptKey();
 		switch (this.#outcome) {
 			case undefined:
-				return theme.fg("muted", "Esc cancel /cleanse");
+				return theme.fg("muted", `${esc} cancel /cleanse`);
 			case "clean":
-				return theme.fg("success", `${theme.status.success} Clean · Esc dismiss`);
+				return theme.fg("success", `${theme.status.success} Clean · ${esc} dismiss`);
 			case "unresolved":
-				return theme.fg("warning", `${theme.status.warning} Diagnostics remain · Esc dismiss`);
+				return theme.fg("warning", `${theme.status.warning} Diagnostics remain · ${esc} dismiss`);
 			case "unsupported":
-				return theme.fg("warning", `${theme.status.warning} No runnable checker · Esc dismiss`);
+				return theme.fg("warning", `${theme.status.warning} No runnable checker · ${esc} dismiss`);
 			case "cancelled":
-				return theme.fg("warning", `${theme.status.warning} Cancelled · Esc dismiss`);
+				return theme.fg("warning", `${theme.status.warning} Cancelled · ${esc} dismiss`);
 			case "error":
-				return theme.fg("error", `${theme.status.error} Error · Esc dismiss`);
+				return theme.fg("error", `${theme.status.error} Error · ${esc} dismiss`);
 		}
 	}
 }

package/src/overlays/codex-reset-fireworks.ts

@@ -8,6 +8,7 @@ import {
 	visibleWidth,
 } from "../index";
 import { type ThemeColor, theme } from "../theme/theme";
+import { formatKeyHint } from "../app-keybindings";
 
 const FRAME_INTERVAL_MS = 85;
 const FRAME_COUNT = 34;
@@ -176,12 +177,13 @@ function drawBanner(
 	const innerWidth = panelWidth - 2;
 	const titleText =
 		event.kind === "unscheduled-weekly-reset" ? " O P E N A I   R E S E T " : " S A V E D   R E S E T ";
+	const esc = formatKeyHint("escape");
 	const subtitleText =
 		event.kind === "unscheduled-weekly-reset"
-			? "Weekly usage cleared early · ESC to return"
+			? `Weekly usage cleared early · ${esc} to return`
 			: event.added === 1
-				? `New reset banked · ${event.available} available · ESC to return`
-				: `${event.added} resets banked · ${event.available} available · ESC to return`;
+				? `New reset banked · ${event.available} available · ${esc} to return`
+				: `${event.added} resets banked · ${event.available} available · ${esc} to return`;
 	const title = truncateToWidth(titleText, innerWidth, "");
 	const subtitle = truncateToWidth(subtitleText, innerWidth, "");
 	const titleOffset = Math.floor((innerWidth - visibleWidth(title)) / 2);

package/src/overlays/copy-selector.ts

@@ -24,7 +24,9 @@ import {
 	userTurnDraft,
 } from "../chat/transcript-entry";
 import type { SessionMessageEntryLike as SessionMessageEntry } from "../chat/transcript-entry";
-import { replaceTabs } from "../render/render-utils";
+import { expandKeyHint, replaceTabs } from "../render/render-utils";
+import { formatKeyHint } from "../app-keybindings";
+import { editorKey, editorKeys } from "../chrome/keybinding-hints";
 import { highlightCode, type ThemeColor, theme } from "../theme/theme";
 import { commandFromToolCall, extractBlocks, extractLinks } from "./copy-targets";
 import { matchesAppToolsExpand, matchesSelectCancel, matchesSelectDown, matchesSelectUp } from "../keybinding-matchers";
@@ -374,17 +376,23 @@ export class CopySelectorComponent implements Component {
 				prepared,
 				style: {
 					color: OUTLINE_COLOR,
-					caption: blocks.length > 0 ? `${blocks.length} block${blocks.length === 1 ? "" : "s"} →` : undefined,
+					caption:
+						blocks.length > 0
+							? `${blocks.length} block${blocks.length === 1 ? "" : "s"} ${formatKeyHint("right")}`
+							: undefined,
 				},
 			}).column;
 		}
 
 		const selectedBlock = this.#blocks?.[this.#blockSelected];
-		const openHint = selectedBlock?.href && this.deps.onOpen ? "  o open" : "";
+		const openHint = selectedBlock?.href && this.deps.onOpen ? `  ${formatKeyHint("o")} open` : "";
 		const action = this.deps.actionLabel ?? "copy";
+		const upDown = editorKeys("tui.select.up", "tui.select.down");
+		const enter = formatKeyHint("enter");
+		const cancel = editorKey("tui.select.cancel");
 		const hint = this.#blocks
-			? `${this.#blockSelected + 1}/${this.#blocks.length}  ↑/↓ block  ←/esc back  enter ${action}${openHint}  click ${theme.cmd.copy}/${theme.cmd.share}`
-			: `${this.#targets.length > 0 ? `${this.#selected + 1}/${this.#targets.length}  ` : ""}↑/↓ step  ${blocks.length > 0 ? "→ blocks  " : ""}enter ${action}  ${this.#truncated ? "a earlier turns  " : ""}ctrl+o expand  esc close`;
+			? `${this.#blockSelected + 1}/${this.#blocks.length}  ${upDown} block  ${formatKeyHint("left")}/${cancel} back  ${enter} ${action}${openHint}  click ${theme.cmd.copy}/${theme.cmd.share}`
+			: `${this.#targets.length > 0 ? `${this.#selected + 1}/${this.#targets.length}  ` : ""}${upDown} step  ${blocks.length > 0 ? `${formatKeyHint("right")} blocks  ` : ""}${enter} ${action}  ${this.#truncated ? `${formatKeyHint("a")} earlier turns  ` : ""}${expandKeyHint()} expand  ${cancel} close`;
 		const anchorId = target
 			? this.#blocks
 				? `copy:${target.turnId}:block:${this.#blockSelected}`

package/src/overlays/extensions/extension-dashboard.ts

@@ -30,6 +30,8 @@ import {
 	matchesSelectPageUp,
 } from "../../keybinding-matchers";
 import { expandKeyHint } from "../../render/render-utils";
+import { formatKeyHint, formatKeyHints } from "../../app-keybindings";
+import { editorKeys, interruptKey } from "../../chrome/keybinding-hints";
 import { bottomBorder, divider, PanelRows, row, topBorder } from "../../chrome/overlay-box";
 import { ExtensionList } from "./extension-list";
 import { InspectorPanel, type ToolRuntimeSource } from "./inspector-panel";
@@ -73,7 +75,10 @@ export interface ExtensionDashboardOptions {
 }
 
 function extFooter(): string {
-	return ` ↑/↓: navigate · Space: toggle · ←/→: provider · PgUp/PgDn: inspector · ${expandKeyHint()}: expand · Esc: close`;
+	const upDown = editorKeys("tui.select.up", "tui.select.down");
+	const pages = editorKeys("tui.select.pageUp", "tui.select.pageDown");
+	const close = interruptKey();
+	return ` ${upDown}: navigate · ${formatKeyHint("space")}: toggle · ${formatKeyHints(["left", "right"])}: provider · ${pages}: inspector · ${expandKeyHint()}: expand · ${close}: close`;
 }
 
 /**

package/src/overlays/history-search.ts

@@ -28,7 +28,7 @@ export interface HistorySource {
 	search(query: string, limit: number): HistorySearchEntry[];
 	getRecent(limit: number): HistorySearchEntry[];
 }
-import { rawKeyHint } from "../chrome/keybinding-hints";
+import { editorKeys, keyHint, rawKeyHint } from "../chrome/keybinding-hints";
 import { OverlayPanel } from "../chrome/overlay-box";
 import { contentRowWidth, renderScrollableList } from "../chrome/selector-helpers";
 import { MenuSelection } from "../components/menu-selection";
@@ -195,7 +195,8 @@ export class HistorySearchComponent extends OverlayPanel {
 		this.#resultsList = new HistoryResultsList(this.#menu);
 
 		const dot = theme.fg("dim", theme.sep.dot);
-		const hint = [rawKeyHint("↑↓", "navigate"), rawKeyHint("enter", "select"), rawKeyHint("esc", "cancel")].join(dot);
+		const navigate = theme.fg("dim", editorKeys("tui.select.up", "tui.select.down")) + theme.fg("muted", " navigate");
+		const hint = [navigate, rawKeyHint("enter", "select"), keyHint("tui.select.cancel", "cancel")].join(dot);
 
 		this.addChild(new Spacer(1));
 		this.addChild(this.#searchInput);

package/src/overlays/hook-editor.ts

@@ -14,6 +14,8 @@ import { matchesAppExternalEditor, matchesAppFollowUp, matchesAppInterrupt } fro
 import { formTheme } from "../chrome/form-theme";
 import { OverlayPanel } from "../chrome/overlay-box";
 import { FormField } from "../components/form";
+import { formatKeyHint, formatKeyHints } from "../app-keybindings";
+import { boundKeys, editorKey, interruptKey } from "../chrome/keybinding-hints";
 
 export interface HookEditorOptions {
 	/** Edit text with the host's configured external editor. */
@@ -81,9 +83,12 @@ export class HookEditorComponent extends OverlayPanel implements Focusable {
 			this.#editor.setText(prefill);
 		}
 		// Hint
+		const followUpKeys = boundKeys("app.message.followUp", ["ctrl+q", "ctrl+enter"]);
+		const [primaryFollowUpKey = "ctrl+q"] = followUpKeys;
+		const externalEditorKey = editorKey("app.editor.external") || formatKeyHint("ctrl+g");
 		const hint = this.#promptStyle
-			? "enter or ctrl+q submit  esc cancel  ctrl+g external editor"
-			: "ctrl+q/ctrl+enter submit  esc cancel  ctrl+g external editor";
+			? `${formatKeyHint("enter")} or ${formatKeyHint(primaryFollowUpKey)} submit  ${formatKeyHint("escape")} cancel  ${externalEditorKey} external editor`
+			: `${formatKeyHints(followUpKeys)} submit  ${interruptKey()} cancel  ${externalEditorKey} external editor`;
 		this.#field = new FormField(this.#editor, {
 			theme: formTheme,
 			details:

package/src/overlays/hook-input.ts

@@ -7,6 +7,7 @@ import { CountdownTimer } from "../chrome/countdown-timer";
 import { formTheme } from "../chrome/form-theme";
 import { OverlayPanel } from "../chrome/overlay-box";
 import { Form, TextFormField } from "../components/form";
+import { editorKey, interruptKey } from "../chrome/keybinding-hints";
 
 export interface HookInputOptions {
 	tui?: TUI;
@@ -49,7 +50,7 @@ export class HookInputComponent extends OverlayPanel {
 
 		this.#field = new TextFormField({
 			theme: formTheme,
-			hint: "enter submit  esc cancel",
+			hint: `${editorKey("tui.input.submit")} submit  ${interruptKey()} cancel`,
 			empty: "submit",
 			onSubmit: value => this.#onSubmitCallback(value),
 			onCancel: () => this.#onCancelCallback(),

package/src/overlays/hook-selector.ts

@@ -26,6 +26,8 @@ import {
 	matchesSelectUp,
 } from "../keybinding-matchers";
 import { CountdownTimer } from "../chrome/countdown-timer";
+import { editorKey, editorKeys } from "../chrome/keybinding-hints";
+import { formatKeyHint } from "../app-keybindings";
 import { OverlayPanel } from "../chrome/overlay-box";
 import { renderSegmentTrack } from "../chrome/segment-track";
 import { MenuSelection, getMenuWindow } from "../components/menu-selection";
@@ -264,7 +266,9 @@ export class HookSelectorComponent extends OverlayPanel {
 			this.addChild(this.#listContainer);
 		}
 		this.addChild(new Spacer(1));
-		const controlsHint = opts?.helpText ?? "up/down navigate  enter select  esc cancel";
+		const controlsHint =
+			opts?.helpText ??
+			`${editorKeys("tui.select.up", "tui.select.down")} navigate  ${formatKeyHint("enter")} select  ${editorKey("tui.select.cancel")} cancel`;
 		this.addChild(new Text(theme.fg("dim", controlsHint), 0, 0));
 		this.addChild(new Spacer(1));
 

package/src/overlays/login-dialog.ts

@@ -6,6 +6,8 @@ import { urlHyperlinkAlways, WidthAwareText } from "../render/index";
 import { formTheme } from "../chrome/form-theme";
 import { OverlayPanel } from "../chrome/overlay-box";
 import { TextFormField } from "../components/form";
+import { formatKeyHint, keyHintPlatform } from "../app-keybindings";
+import { editorKey } from "../chrome/keybinding-hints";
 
 /**
  * Login dialog component - replaces editor during OAuth login flow
@@ -98,7 +100,7 @@ export class LoginDialogComponent extends OverlayPanel {
 			),
 		);
 
-		const clickHint = process.platform === "darwin" ? "Cmd+click to open" : "Ctrl+click to open";
+		const clickHint = `${formatKeyHint(keyHintPlatform() === "darwin" ? "super" : "ctrl")}+click to open`;
 		const hyperlink = `\x1b]8;;${url}\x07${clickHint}\x1b]8;;\x07`;
 		this.#contentContainer.addChild(new Text(theme.fg("dim", hyperlink), 0, 0));
 
@@ -132,7 +134,9 @@ export class LoginDialogComponent extends OverlayPanel {
 			this.#contentContainer.addChild(new Spacer(1));
 			this.#contentContainer.addChild(new Text(theme.fg("dim", prompt), 0, 0));
 			this.#contentContainer.addChild(this.#input);
-			this.#contentContainer.addChild(new Text(theme.fg("dim", "(Escape to cancel)"), 0, 0));
+			this.#contentContainer.addChild(
+				new Text(theme.fg("dim", `(${editorKey("tui.select.cancel")} to cancel)`), 0, 0),
+			);
 		}
 		this.#tui.requestRender();
 
@@ -175,7 +179,16 @@ export class LoginDialogComponent extends OverlayPanel {
 			this.#contentContainer.addChild(new Text(theme.fg("dim", `e.g., ${prompt.placeholder}`), 0, 0));
 		}
 		this.#contentContainer.addChild(this.#input);
-		this.#contentContainer.addChild(new Text(theme.fg("dim", "(Escape to cancel, Enter to submit)"), 0, 0));
+		this.#contentContainer.addChild(
+			new Text(
+				theme.fg(
+					"dim",
+					`(${editorKey("tui.select.cancel")} to cancel, ${editorKey("tui.input.submit")} to submit)`,
+				),
+				0,
+				0,
+			),
+		);
 
 		this.#tui.requestRender();
 
@@ -200,7 +213,7 @@ export class LoginDialogComponent extends OverlayPanel {
 	showWaiting(message: string): void {
 		this.#contentContainer.addChild(new Spacer(1));
 		this.#contentContainer.addChild(new Text(theme.fg("dim", message), 0, 0));
-		this.#contentContainer.addChild(new Text(theme.fg("dim", "(Escape to cancel)"), 0, 0));
+		this.#contentContainer.addChild(new Text(theme.fg("dim", `(${editorKey("tui.select.cancel")} to cancel)`), 0, 0));
 		this.#tui.requestRender();
 	}
 

package/src/overlays/logout-account-selector.ts

@@ -4,6 +4,8 @@ import { matchesSelectCancel, matchesSelectDown, matchesSelectUp } from "../keyb
 import { OverlayPanel } from "../chrome/overlay-box";
 import { MenuSelection } from "../components/menu-selection";
 import { centeredViewportRange } from "../components/scroll-viewport";
+import { formatKeyHint } from "../app-keybindings";
+import { editorKey, editorKeys } from "../chrome/keybinding-hints";
 
 const LOGOUT_SELECTOR_MAX_VISIBLE = 10;
 
@@ -84,7 +86,14 @@ export class LogoutAccountSelectorComponent extends OverlayPanel {
 		}
 
 		this.#listContainer.addChild(
-			new TruncatedText(theme.fg("muted", "↑/↓ select · ↵ log out account · Esc cancel"), 0, 0),
+			new TruncatedText(
+				theme.fg(
+					"muted",
+					`${editorKeys("tui.select.up", "tui.select.down")} select · ${formatKeyHint("enter")} log out account · ${editorKey("tui.select.cancel")} cancel`,
+				),
+				0,
+				0,
+			),
 		);
 	}
 

package/src/overlays/mcp-add-wizard.ts

@@ -9,6 +9,8 @@ import { getMCPConfigPath, getProjectDir } from "@oh-my-pi/pi-utils";
 import { shortenPath } from "../render/render-utils";
 import { getSelectListTheme, theme } from "../theme/theme";
 import { matchesAppInterrupt, matchesSelectDown, matchesSelectUp } from "../keybinding-matchers";
+import { formatKeyHint } from "../app-keybindings";
+import { editorKey, editorKeys, interruptKey } from "../chrome/keybinding-hints";
 import { OverlayPanel } from "../chrome/overlay-box";
 import { TextFormField, type FormFieldTheme } from "../components/form";
 import { SelectList } from "../components/select-list";
@@ -163,6 +165,16 @@ function sanitize(text: string): string {
 	return truncateToWidth(replaceTabs(text), MAX_DISPLAY_WIDTH);
 }
 
+/** Footer for text steps; the field submits on `tui.input.submit` and cancels on `tui.select.cancel`. */
+function inputHint(escapeAction: string): string {
+	return `[${editorKey("tui.input.submit")} to continue, ${editorKey("tui.select.cancel")} to ${escapeAction}]`;
+}
+
+/** Footer for choice steps; the wizard routes navigation, Enter, and Escape itself. */
+function choiceHint(escapeAction: string): string {
+	return `[${editorKeys("tui.select.up", "tui.select.down")} to navigate, ${formatKeyHint("enter")} to select, ${interruptKey()} to ${escapeAction}]`;
+}
+
 const mcpFormTheme: FormFieldTheme = {
 	label: text => text,
 	description: text => theme.fg("muted", text),
@@ -451,7 +463,7 @@ export class MCPAddWizard extends OverlayPanel {
 			heading: "Step 1: Server Name",
 			prompt: "Enter a unique name for this server:",
 			initial: this.#state.name,
-			hint: "[Only letters, numbers, dash, underscore, dot, colon]\n[Enter to continue, Esc to cancel]",
+			hint: `[Only letters, numbers, dash, underscore, dot, colon]\n${inputHint("cancel")}`,
 			optional: false,
 			error: this.#validationError,
 		});
@@ -466,7 +478,7 @@ export class MCPAddWizard extends OverlayPanel {
 				{ label: "http (HTTP server)" },
 				{ label: "sse (Server-Sent Events)" },
 			],
-			hint: "[↑↓ to navigate, Enter to select, Esc to cancel]",
+			hint: choiceHint("cancel"),
 		});
 	}
 
@@ -475,7 +487,7 @@ export class MCPAddWizard extends OverlayPanel {
 			heading: "Step 3: Command",
 			prompt: "Enter the command to run:",
 			initial: this.#state.command,
-			hint: "[Enter to continue, Esc to go back]",
+			hint: inputHint("go back"),
 			optional: false,
 		});
 	}
@@ -485,7 +497,7 @@ export class MCPAddWizard extends OverlayPanel {
 			heading: "Step 4: Arguments (Optional)",
 			prompt: "Enter command arguments (space-separated):",
 			initial: this.#state.args,
-			hint: "[Press Enter to skip or continue]",
+			hint: `[Press ${editorKey("tui.input.submit")} to skip or continue]`,
 			optional: true,
 		});
 	}
@@ -495,7 +507,7 @@ export class MCPAddWizard extends OverlayPanel {
 			heading: "Step 3: Server URL",
 			prompt: "Enter the server URL:",
 			initial: this.#state.url,
-			hint: "[Must start with http:// or https://]\n[Enter to continue, Esc to go back]",
+			hint: `[Must start with http:// or https://]\n${inputHint("go back")}`,
 			optional: false,
 			error: this.#validationError,
 		});
@@ -505,7 +517,7 @@ export class MCPAddWizard extends OverlayPanel {
 		this.#choiceStep({
 			heading: "Step: How to provide the key?",
 			choices: [{ label: "Environment variable" }, { label: "HTTP header" }],
-			hint: "[↑↓ to navigate, Enter to select, Esc to go back]",
+			hint: choiceHint("go back"),
 		});
 	}
 
@@ -514,7 +526,7 @@ export class MCPAddWizard extends OverlayPanel {
 			heading: "Step: Environment Variable Name",
 			prompt: "Enter the environment variable name:",
 			initial: this.#state.envVarName,
-			hint: "[Enter to continue, Esc to go back]",
+			hint: inputHint("go back"),
 			optional: false,
 		});
 	}
@@ -524,7 +536,7 @@ export class MCPAddWizard extends OverlayPanel {
 			heading: "Step: HTTP Header Name",
 			prompt: "Enter the HTTP header name:",
 			initial: this.#state.headerName,
-			hint: "[Enter to continue, Esc to go back]",
+			hint: inputHint("go back"),
 			optional: false,
 		});
 	}
@@ -536,7 +548,7 @@ export class MCPAddWizard extends OverlayPanel {
 		this.#choiceStep({
 			heading: "Step: Configuration Scope",
 			choices: [{ label: `User level (${userPathLabel})` }, { label: `Project level (${projectPathLabel})` }],
-			hint: "[↑↓ to navigate, Enter to select, Esc to go back]",
+			hint: choiceHint("go back"),
 		});
 	}
 
@@ -576,7 +588,7 @@ export class MCPAddWizard extends OverlayPanel {
 			heading: "Review Configuration",
 			intro: summary,
 			choices: [{ label: "Yes" }, { label: "No" }],
-			hint: "[↑↓ to navigate, Enter to select, Esc to go back]",
+			hint: choiceHint("go back"),
 			kind: "confirm",
 		});
 	}
@@ -931,7 +943,7 @@ export class MCPAddWizard extends OverlayPanel {
 				{ label: "OAuth flow (web-based)", description: "(opens browser)" },
 				{ label: "Manual API key/token", description: "(paste or use shell command)" },
 			],
-			hint: "[↑↓ to navigate, Enter to select, Esc to go back]",
+			hint: choiceHint("go back"),
 		});
 	}
 
@@ -941,7 +953,7 @@ export class MCPAddWizard extends OverlayPanel {
 			prompt: "Enter the OAuth authorization endpoint:",
 			initial: this.#state.oauthAuthUrl,
 			details: ["e.g., https://auth.example.com/oauth/authorize"],
-			hint: "[Enter to continue, Esc to go back]",
+			hint: inputHint("go back"),
 			optional: false,
 		});
 	}
@@ -952,7 +964,7 @@ export class MCPAddWizard extends OverlayPanel {
 			prompt: "Enter the OAuth token endpoint:",
 			initial: this.#state.oauthTokenUrl,
 			details: ["e.g., https://auth.example.com/oauth/token"],
-			hint: "[Enter to continue, Esc to go back]",
+			hint: inputHint("go back"),
 			optional: false,
 		});
 	}
@@ -962,7 +974,7 @@ export class MCPAddWizard extends OverlayPanel {
 			heading: "OAuth: Client ID",
 			prompt: "Enter your OAuth client ID:",
 			initial: this.#state.oauthClientId,
-			hint: "[Enter to continue, Esc to go back]",
+			hint: inputHint("go back"),
 			optional: false,
 		});
 	}
@@ -973,7 +985,7 @@ export class MCPAddWizard extends OverlayPanel {
 			prompt: "Enter your OAuth client secret:",
 			initial: this.#state.oauthClientSecret,
 			details: ["(Leave empty for PKCE-only flows)"],
-			hint: "[Enter to continue, Esc to go back]",
+			hint: inputHint("go back"),
 			optional: true,
 		});
 	}
@@ -984,7 +996,7 @@ export class MCPAddWizard extends OverlayPanel {
 			prompt: "Enter OAuth scopes (space-separated):",
 			initial: this.#state.oauthScopes,
 			details: ["e.g., read write"],
-			hint: "[Enter to continue, Esc to go back]",
+			hint: inputHint("go back"),
 			optional: true,
 		});
 	}
@@ -1002,7 +1014,7 @@ export class MCPAddWizard extends OverlayPanel {
 			headingTone: this.#oauthErrorHeading?.tone ?? "error",
 			intro,
 			choices: [{ label: "Retry OAuth authentication" }, { label: "Edit OAuth settings" }],
-			hint: "[↑↓ to navigate, Enter to select, Esc to go back]",
+			hint: choiceHint("go back"),
 		});
 	}
 
@@ -1012,7 +1024,7 @@ export class MCPAddWizard extends OverlayPanel {
 			prompt: "Enter your API key or token:",
 			initial: this.#state.apiKey,
 			details: ["(Supports !command for password manager)"],
-			hint: "[Enter to continue, Esc to go back]",
+			hint: inputHint("go back"),
 			optional: false,
 		});
 	}
@@ -1210,7 +1222,7 @@ export class MCPAddWizard extends OverlayPanel {
 				"OAuth configuration incomplete",
 				"error",
 				incompleteBody,
-				new Text(theme.fg("muted", "[Press Esc to go back]"), 0, 0),
+				new Text(theme.fg("muted", `[Press ${interruptKey()} to go back]`), 0, 0),
 			);
 			this.#requestRender();
 			return;
@@ -1226,7 +1238,7 @@ export class MCPAddWizard extends OverlayPanel {
 			"OAuth Authentication",
 			"accent",
 			authBody,
-			new Text(theme.fg("muted", "(Press Esc to cancel)"), 0, 0),
+			new Text(theme.fg("muted", `(Press ${interruptKey()} to cancel)`), 0, 0),
 		);
 		this.#requestRender();