@gajae-code/coding-agent 0.11.7 → 0.11.9

package/src/modes/controllers/selector-controller.ts

@@ -5,7 +5,7 @@ import type { OAuthProvider } from "@gajae-code/ai/utils/oauth/types";
 import type { Component, OverlayHandle, SlashCommand } from "@gajae-code/tui";
 import { Input, isPetMode, Loader, Spacer, Text } from "@gajae-code/tui";
 import { getAgentDbPath, getProjectDir, logger, VERSION } from "@gajae-code/utils";
-import { type AppKeybinding, formatKeyHints } from "../../config/keybindings";
+import type { AppKeybinding } from "../../config/keybindings";
 import {
 	activateModelProfile,
 	type MaterializeModelProfileForDeletionResult,
@@ -64,7 +64,7 @@ import {
 import type { NotificationSessionStatus } from "../../sdk/bus/session-control";
 import {
 	ensureTelegramDaemonRunningDetailed,
-	readDaemonState,
+	resolveTelegramSetupPreflight,
 	unregisterNotificationRoot,
 } from "../../sdk/bus/telegram-daemon";
 import { TelegramDaemonController } from "../../sdk/bus/telegram-daemon-control";
@@ -226,6 +226,7 @@ export interface NotificationsEditorOperationDependencies {
 	sanitizeDiagnostic: typeof sanitizeDiagnostic;
 	ensureTelegramDaemonRunningDetailed: typeof ensureTelegramDaemonRunningDetailed;
 	runTelegramSetup: typeof runTelegramSetup;
+	resolveTelegramSetupPreflight: typeof resolveTelegramSetupPreflight;
 	proposedTelegramIdentity: typeof proposedTelegramIdentity;
 	reconcileCommittedTelegramConfiguration: typeof reconcileCommittedTelegramConfiguration;
 	saveTelegramInactive: typeof saveTelegramInactive;
@@ -250,6 +251,7 @@ const notificationEditorOperationDependencies: NotificationsEditorOperationDepen
 	sanitizeDiagnostic,
 	ensureTelegramDaemonRunningDetailed,
 	runTelegramSetup,
+	resolveTelegramSetupPreflight,
 	proposedTelegramIdentity,
 	reconcileCommittedTelegramConfiguration,
 	saveTelegramInactive,
@@ -306,33 +308,8 @@ export function createNotificationsEditorOperations(
 			cwd: ctx.sessionManager.getCwd(),
 			sessionId: ctx.sessionManager.getSessionId(),
 		});
-	const telegramSetupPreflight = async (): Promise<TelegramSetupPreflight> => {
-		const storedChatId = services.getNotificationConfig(ctx.settings).chatId;
-		try {
-			const state = await readDaemonState(ctx.settings);
-			const validPid = Number.isSafeInteger(state?.pid) && (state?.pid ?? 0) > 0;
-			if (!state || !validPid) return { storedChatId };
-			let live = false;
-			try {
-				process.kill(state.pid, 0);
-				live = true;
-			} catch (error) {
-				live = (error as NodeJS.ErrnoException).code === "EPERM";
-			}
-			return live
-				? {
-						storedChatId,
-						daemon: {
-							live,
-							tokenFingerprint: typeof state.tokenFingerprint === "string" ? state.tokenFingerprint : undefined,
-							chatId: typeof state.chatId === "string" && state.chatId.trim() ? state.chatId.trim() : undefined,
-						},
-					}
-				: { storedChatId };
-		} catch {
-			return { storedChatId };
-		}
-	};
+	const telegramSetupPreflight = async (): Promise<TelegramSetupPreflight> =>
+		await services.resolveTelegramSetupPreflight(ctx.settings);
 
 	return {
 		loadState: async () => {
@@ -838,7 +815,7 @@ export class SelectorController {
 				id: `action:${action.id}`,
 				label: action.label,
 				description: action.id,
-				keybinding: formatKeyHints(this.ctx.keybindings.getKeys(action.id as AppKeybinding)) || undefined,
+				keybinding: this.ctx.keybindings.getDisplayString(action.id as AppKeybinding) || undefined,
 				searchText: action.id,
 				handler: action.handler,
 			})),
@@ -1108,12 +1085,12 @@ export class SelectorController {
 
 	async #handleImageGenerationConfig(): Promise<void> {
 		const provider = await this.ctx.showHookInput(
-			"Image Generation provider (auto, openai, gemini, openrouter, antigravity, custom)",
+			"Image Generation provider (auto, openai, gemini, openrouter, antigravity, alibaba, custom)",
 			"auto",
 		);
 		if (provider === undefined) return;
 		const normalized = provider.trim().toLowerCase();
-		const validProviders = ["auto", "openai", "gemini", "openrouter", "antigravity", "custom"];
+		const validProviders = ["auto", "openai", "gemini", "openrouter", "antigravity", "alibaba", "custom"];
 		if (!validProviders.includes(normalized)) {
 			this.ctx.showStatus(`Invalid image provider: ${normalized}. Valid: ${validProviders.join(", ")}`);
 			return;
@@ -1145,7 +1122,14 @@ export class SelectorController {
 		if (scope === undefined) return;
 		const persistDefault = scope.trim().toLowerCase() === "default";
 
-		const imageProvider = normalized as "auto" | "openai" | "gemini" | "openrouter" | "antigravity" | "custom";
+		const imageProvider = normalized as
+			| "auto"
+			| "openai"
+			| "gemini"
+			| "openrouter"
+			| "antigravity"
+			| "alibaba"
+			| "custom";
 		setPreferredImageProvider(imageProvider === "custom" ? "auto" : imageProvider);
 		setConfiguredImageModel({
 			provider: imageProvider,
@@ -1644,6 +1628,7 @@ export class SelectorController {
 					imgProvider === "gemini" ||
 					imgProvider === "openrouter" ||
 					imgProvider === "antigravity" ||
+					imgProvider === "alibaba" ||
 					imgProvider === "custom"
 				) {
 					setPreferredImageProvider(imgProvider === "custom" ? "auto" : imgProvider);
@@ -1694,6 +1679,14 @@ export class SelectorController {
 	showModelSelector(options?: { temporaryOnly?: boolean }): void {
 		this.showSelector(done => {
 			let modelSelector: ModelSelectorComponent;
+			const refreshRoleAssignments = () => {
+				modelSelector.refreshRoleAssignments({
+					currentModel: this.ctx.session.model,
+					currentThinkingLevel: this.ctx.session.thinkingLevel,
+					activeModelProfile:
+						this.ctx.session.getActiveModelProfile?.() ?? this.ctx.settings.get("modelProfile.default"),
+				});
+			};
 			modelSelector = new ModelSelectorComponent(
 				this.ctx.ui,
 				this.ctx.session.model,
@@ -1701,6 +1694,8 @@ export class SelectorController {
 				this.ctx.session.modelRegistry,
 				this.ctx.session.scopedModels,
 				async selection => {
+					const isTrackedSingleAssignment =
+						selection.kind === "assignment" && selection.role !== null && selection.roles === undefined;
 					try {
 						if (selection.kind === "createProfile") {
 							done();
@@ -1741,7 +1736,7 @@ export class SelectorController {
 							this.ctx.showStatus(`Temporary model: ${selectedSelector ?? model.id}`);
 							done();
 							this.ctx.ui.requestRender();
-						} else if (selection.roles) {
+						} else if (selection.roles !== undefined) {
 							const targetRoles: readonly GjcModelAssignmentTargetId[] = selection.roles;
 							const includesDefault = targetRoles.includes("default");
 							const includesRoleAgent = targetRoles.some(targetRole => targetRole !== "default");
@@ -1819,25 +1814,23 @@ export class SelectorController {
 								selectedSelector ?? `${model.provider}/${model.id}`,
 								thinkingLevel,
 							);
-							materializeActiveModelProfileAssignment({
-								session: this.ctx.session,
-								settings: this.ctx.settings,
-								role,
-								selector: value,
-							});
+							if (
+								!materializeActiveModelProfileAssignment({
+									session: this.ctx.session,
+									settings: this.ctx.settings,
+									role,
+									selector: value,
+								})
+							) {
+								this.ctx.settings.setModelRole(role, value);
+							}
 							if (thinkingLevel && thinkingLevel !== ThinkingLevel.Inherit) {
 								this.ctx.session.setThinkingLevel(thinkingLevel);
 							}
-							modelSelector.refreshRoleAssignments({
-								currentModel: this.ctx.session.model,
-								currentThinkingLevel: this.ctx.session.thinkingLevel,
-								activeModelProfile:
-									this.ctx.session.getActiveModelProfile?.() ?? this.ctx.settings.get("modelProfile.default"),
-							});
+							refreshRoleAssignments();
 							this.ctx.statusLine.invalidate();
 							this.ctx.updateEditorBorderColor();
 							this.ctx.showStatus(`Default model: ${selectedSelector ?? model.id}`);
-							done();
 							this.ctx.ui.requestRender();
 						} else {
 							const apiKey = await this.ctx.session.modelRegistry.getApiKey(model, this.ctx.session.sessionId);
@@ -1860,22 +1853,21 @@ export class SelectorController {
 									this.ctx.settings.setAgentModelOverride(role, value);
 								}
 							}
-							modelSelector.refreshRoleAssignments({
-								currentModel: this.ctx.session.model,
-								currentThinkingLevel: this.ctx.session.thinkingLevel,
-								activeModelProfile:
-									this.ctx.session.getActiveModelProfile?.() ?? this.ctx.settings.get("modelProfile.default"),
-							});
+							refreshRoleAssignments();
 							this.ctx.settings.getStorage()?.recordModelUsage(`${model.provider}/${model.id}`);
 							this.ctx.statusLine.invalidate();
 							this.ctx.updateEditorBorderColor();
 							await this.ctx.notifyConfigChanged?.();
 							this.ctx.showStatus(`${role} agent model: ${value}`);
-							done();
 							this.ctx.ui.requestRender();
 						}
 					} catch (error) {
 						this.ctx.showError(error instanceof Error ? error.message : String(error));
+						if (isTrackedSingleAssignment) {
+							refreshRoleAssignments();
+							this.ctx.ui.requestRender();
+							throw error;
+						}
 					}
 				},
 				() => {

package/src/modes/interactive-mode.ts

@@ -16,7 +16,13 @@ import {
 import { APP_NAME, adjustHsv, getProjectDir, logger, postmortem } from "@gajae-code/utils";
 import chalk from "chalk";
 import { AsyncJobManager } from "../async";
-import { type AppKeybinding, KeybindingsManager } from "../config/keybindings";
+import {
+	type AppKeybinding,
+	formatKeyHint,
+	formatKeyHints,
+	KeybindingsManager,
+	type KeyDisplayContext,
+} from "../config/keybindings";
 import { isSettingsInitialized, type Settings, settings } from "../config/settings";
 import { DEFAULT_GJC_DEFINITION_NAMES } from "../defaults/gjc-defaults";
 import type {
@@ -64,6 +70,7 @@ import type { ToolExecutionHandle } from "./components/tool-execution";
 import { StatusLineComponent } from "./components/tool-status-header";
 import { composeToolText } from "./components/tool-transcript-format";
 import {
+	type RecentSession,
 	WelcomeComponent,
 	type WelcomeLogoMode,
 	type LspServerInfo as WelcomeLspServerInfo,
@@ -83,6 +90,7 @@ import { TodoCommandController } from "./controllers/todo-command-controller";
 import { IrcObservationLedger } from "./irc-observation-ledger";
 import { JobsObserver } from "./jobs-observer";
 import { OAuthManualInputManager } from "./oauth-manual-input";
+import { PromptSuggestionController } from "./prompt-suggestion-controller";
 import { SessionObserverRegistry } from "./session-observer-registry";
 import { interruptHint } from "./shared";
 import { shouldShowExtensionCommand } from "./slash-command-visibility";
@@ -105,8 +113,15 @@ import {
 import type { ParsedIrcMessage } from "./utils/irc-message";
 import { addChatChild, prepareTranscriptRebuild, UiHelpers } from "./utils/ui-helpers";
 
-const COMPOSER_NEWLINE_HINT = process.platform === "win32" ? "Alt+Enter/Ctrl+J" : "Shift+Enter/Ctrl+J";
-export const DEFAULT_COMPOSER_PLACEHOLDER = `Type your message... ${COMPOSER_NEWLINE_HINT}: New line · Ctrl+C: Clear · Ctrl+R: Search history · Shift+Tab: Reasoning`;
+export function getDefaultComposerPlaceholder(context: KeyDisplayContext = { platform: process.platform }): string {
+	const newlineKeys = context.platform === "win32" ? ["alt+enter", "ctrl+j"] : ["shift+enter", "ctrl+j"];
+	return `Type your message... ${formatKeyHints(newlineKeys, context)}: New line · ${formatKeyHint(
+		"ctrl+c",
+		context,
+	)}: Clear · ${formatKeyHint("ctrl+r", context)}: Search history · ${formatKeyHint("shift+tab", context)}: Reasoning`;
+}
+
+export const DEFAULT_COMPOSER_PLACEHOLDER = getDefaultComposerPlaceholder();
 const WELCOME_RESERVED_CONTAINER_CHILD_LIMIT = 8;
 
 const IRC_SIDEBAR_TOGGLE_SHADOWING_ACTIONS: readonly AppKeybinding[] = [
@@ -128,23 +143,6 @@ export function getWelcomeTranscriptReservedRows(chatContainer: Container, width
 		? 0
 		: chatContainer.render(width).length;
 }
-const FRIENDLY_KEY_PARTS: Record<string, string> = {
-	alt: "Alt",
-	cmd: "Cmd",
-	command: "Cmd",
-	ctrl: "Ctrl",
-	enter: "Enter",
-	meta: process.platform === "darwin" ? "Command" : "Meta",
-	option: "Option",
-	shift: "Shift",
-};
-
-function formatShortcutForPlaceholder(key: string): string {
-	return key
-		.split("+")
-		.map(part => FRIENDLY_KEY_PARTS[part.toLowerCase()] ?? (part.length === 1 ? part.toUpperCase() : part))
-		.join("+");
-}
 
 const HINT_SHIMMER_PALETTE: ShimmerPalette = {
 	low: "dim",
@@ -169,7 +167,7 @@ function configureDefaultComposerChrome(editor: CustomEditor): void {
 	editor.setClosedBorderBox(true);
 	editor.setPromptGutter(undefined);
 	editor.setInputPrefix(getDefaultInputPrefix());
-	editor.setPlaceholder(DEFAULT_COMPOSER_PLACEHOLDER);
+	editor.setPlaceholder(getDefaultComposerPlaceholder());
 	editor.setPaddingX(1);
 	editor.setRightGutterWidth(1);
 	editor.setTopBorder(undefined);
@@ -340,6 +338,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	fileSlashCommands: Set<string> = new Set();
 	skillCommands: Map<string, Skill> = new Map();
 	oauthManualInput: OAuthManualInputManager = new OAuthManualInputManager();
+	promptSuggestion: PromptSuggestionController;
 
 	#baseSlashCommands: SlashCommand[] = [];
 	#resolvedSlashCommands: SlashCommand[] = [];
@@ -351,6 +350,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	#petUnavailableWarningDisposer?: () => void;
 	readonly #version: string;
 	readonly #changelogMarkdown: string | undefined;
+	readonly #keyDisplayContext: KeyDisplayContext;
 
 	readonly lspServers: LspStartupServerInfo[] | undefined = undefined;
 	mcpManager?: import("../runtime-mcp").MCPManager;
@@ -398,6 +398,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		lspServers: LspStartupServerInfo[] | undefined = undefined,
 		mcpManager?: import("../runtime-mcp").MCPManager,
 		eventBus?: EventBus,
+		keyDisplayContext: KeyDisplayContext = { platform: process.platform },
 	) {
 		this.session = session;
 		this.sessionManager = session.sessionManager;
@@ -436,6 +437,8 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.lspServers = lspServers;
 		this.mcpManager = mcpManager;
 		this.#eventBus = eventBus;
+		this.#keyDisplayContext = keyDisplayContext;
+		this.keybindings.setDisplayContext(this.#keyDisplayContext);
 		const thisMode = this;
 		this.#goalModeController = new GoalModeController({
 			session: this.session,
@@ -517,6 +520,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.btwContainer = new Container();
 		this.editor = new CustomEditor(getEditorTheme());
 		configureDefaultComposerChrome(this.editor);
+		this.editor.setPlaceholder(this.#getComposerPlaceholder());
 		this.editor.setUseTerminalCursor(this.ui.getShowHardwareCursor());
 		this.editor.setAutocompleteMaxVisible(settings.get("autocompleteMaxVisible"));
 		this.editor.onAutocompleteCancel = () => {
@@ -544,7 +548,11 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.hookWidgetContainerBelow = new Container();
 		this.editorContainer = new Container();
 		this.editorContainer.addChild(this.editor);
-		this.statusLine = new StatusLineComponent(session, { version: this.#version, focusDomain: "composer" });
+		this.statusLine = new StatusLineComponent(session, {
+			version: this.#version,
+			focusDomain: "composer",
+			keyDisplayContext: this.#keyDisplayContext,
+		});
 		this.statusLine.setAutoCompactEnabled(session.autoCompactionEnabled);
 
 		this.hideThinkingBlock = settings.get("hideThinkingBlock");
@@ -580,6 +588,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#selectorController = new SelectorController(this);
 		this.#inputController = new InputController(this);
 		this.statusLine.setActionRegistry(this.#inputController.actionRegistry, () => this.keybindings);
+		this.promptSuggestion = new PromptSuggestionController(this);
 		this.#observerRegistry = new SessionObserverRegistry();
 	}
 
@@ -600,6 +609,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		if (this.isInitialized) return;
 
 		this.keybindings = logger.time("InteractiveMode.init:keybindings", () => KeybindingsManager.create());
+		this.keybindings.setDisplayContext(this.#keyDisplayContext);
 
 		// Register session manager flush for signal handlers (SIGINT, SIGTERM, SIGHUP)
 		this.#cleanupUnsubscribe = postmortem.register("session-manager-flush", () => this.sessionManager.flush());
@@ -622,15 +632,9 @@ export class InteractiveMode implements InteractiveModeContext {
 		const modelName = this.session.model?.name ?? "Unknown";
 		const providerName = this.session.model?.provider ?? "Unknown";
 
-		// Get recent sessions
-		const recentSessions = await logger.time("InteractiveMode.init:recentSessions", () =>
-			getRecentSessions(this.sessionManager.getSessionDir()).then(sessions =>
-				sessions.map(s => ({
-					name: s.name,
-					timeAgo: s.timeAgo,
-				})),
-			),
-		);
+		// Session history is display-only. Never hold the editor and keyboard behind
+		// transcript I/O; populate the welcome trail after the interactive surface exists.
+		const recentSessions: RecentSession[] = [];
 
 		const startupQuiet = settings.get("startup.quiet");
 		const welcomeLogoMode = resolveWelcomeLogoMode(settings.get("startup.welcomeBannerMode"));
@@ -657,6 +661,7 @@ export class InteractiveMode implements InteractiveModeContext {
 					getReservedBottomRows: getWelcomeReservedBottomRows,
 					changelogMarkdown: this.#changelogMarkdown,
 					collapseChangelog: settings.get("collapseChangelog"),
+					keyDisplayContext: this.#keyDisplayContext,
 				},
 			);
 
@@ -753,6 +758,31 @@ export class InteractiveMode implements InteractiveModeContext {
 		if (this.settings.get("tasksPane.defaultVisible")) this.showTasksPane();
 		this.#syncIrcSidebarAvailabilityFromSettings();
 		this.ui.requestRender(true);
+		if (this.#welcomeComponent) {
+			const welcomeComponent = this.#welcomeComponent;
+			const recentSessionsTimer = setTimeout(() => {
+				void logger
+					.time("InteractiveMode.init:recentSessions", () =>
+						getRecentSessions(this.sessionManager.getSessionDir()),
+					)
+					.then(sessions => {
+						if (this.#welcomeComponent !== welcomeComponent) return;
+						welcomeComponent.setRecentSessions(
+							sessions.map(session => ({
+								name: session.name,
+								timeAgo: session.timeAgo,
+							})),
+						);
+						this.ui.requestRender();
+					})
+					.catch(error => {
+						logger.debug("Failed to load recent sessions for welcome screen", {
+							error: error instanceof Error ? error.message : String(error),
+						});
+					});
+			}, 0);
+			recentSessionsTimer.unref?.();
+		}
 
 		// GitHub star reminder (interactive-only). Register the decline-driven
 		// injection contributor and schedule the launch nudge after the first
@@ -807,6 +837,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		onThemeChange(() => {
 			clearRenderCache();
 			configureDefaultComposerChrome(this.editor);
+			this.editor.setPlaceholder(this.#getComposerPlaceholder());
 			this.ui.invalidate();
 			this.updateEditorChrome();
 			this.ui.requestRender();
@@ -1038,12 +1069,14 @@ export class InteractiveMode implements InteractiveModeContext {
 	}
 
 	#getComposerPlaceholder(): string {
-		if (!this.#isPromptDeliveryBusy()) return DEFAULT_COMPOSER_PLACEHOLDER;
-		const enterAction = this.settings.get("busyPromptMode") === "steer" ? "Steer" : "Queue";
-		const parts = [`Enter: ${enterAction}`];
+		const defaultPlaceholder = getDefaultComposerPlaceholder(this.#keyDisplayContext);
+		if (!this.#isPromptDeliveryBusy()) return defaultPlaceholder;
+		const submitAction = this.settings.get("busyPromptMode") === "steer" ? "Steer" : "Queue";
+		const submitKey = this.keybindings.getDisplayString("tui.input.submit", this.#keyDisplayContext);
+		const parts = submitKey ? [`${submitKey}: ${submitAction}`] : [];
 		const queueKey = this.#getMessageQueueShortcut();
-		if (queueKey) parts.push(`${formatShortcutForPlaceholder(queueKey)}: Queue`);
-		return `${DEFAULT_COMPOSER_PLACEHOLDER} · ${parts.join(" · ")}`;
+		if (queueKey) parts.push(`${formatKeyHint(queueKey, this.#keyDisplayContext)}: Queue`);
+		return parts.length > 0 ? `${defaultPlaceholder} · ${parts.join(" · ")}` : defaultPlaceholder;
 	}
 
 	#getWelcomeReservedRows(width: number): number {
@@ -1398,6 +1431,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			: new CustomEditor(getEditorTheme());
 
 		configureDefaultComposerChrome(nextEditor);
+		nextEditor.setPlaceholder(this.#getComposerPlaceholder());
 		nextEditor.setUseTerminalCursor(this.ui.getShowHardwareCursor());
 		nextEditor.setAutocompleteMaxVisible(this.settings.get("autocompleteMaxVisible"));
 		nextEditor.onAutocompleteCancel = () => {

package/src/modes/prompt-action-autocomplete.ts

@@ -3,12 +3,10 @@ import {
 	type AutocompleteProvider,
 	CombinedAutocompleteProvider,
 	extractSlashCommandTokenPrefix,
-	getKeybindings,
 	getSlashCommandMatchRank,
 	type SlashCommand,
 } from "@gajae-code/tui";
 import type { KeybindingsManager } from "../config/keybindings";
-import { formatKeyHints } from "../config/keybindings";
 import { isSettingsInitialized, settings } from "../config/settings";
 import { applyEmojiCompletion, getEmojiSuggestions, isEmojiPrefix, tryEmojiInlineReplace } from "./emoji-autocomplete";
 
@@ -44,6 +42,11 @@ interface PromptActionAutocompleteOptions {
 	moveCursorToMessageStart: () => void;
 	moveCursorToLineStart: () => void;
 	moveCursorToLineEnd: () => void;
+	/**
+	 * Ghost-text next-prompt prediction shown in the empty composer as a dim
+	 * inline hint (Tab accepts it via the editor's onTab handler).
+	 */
+	getPromptSuggestion?: () => string | null;
 }
 
 function fuzzyMatch(query: string, target: string): boolean {
@@ -186,11 +189,18 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 	#baseProvider: CombinedAutocompleteProvider;
 	#actions: PromptActionDefinition[];
 	#commands: SlashCommand[];
-
-	constructor(commands: SlashCommand[], basePath: string, actions: PromptActionDefinition[]) {
+	#getPromptSuggestion: (() => string | null) | undefined;
+
+	constructor(
+		commands: SlashCommand[],
+		basePath: string,
+		actions: PromptActionDefinition[],
+		getPromptSuggestion?: () => string | null,
+	) {
 		this.#baseProvider = new CombinedAutocompleteProvider(commands, basePath);
 		this.#actions = actions;
 		this.#commands = commands;
+		this.#getPromptSuggestion = getPromptSuggestion;
 	}
 
 	async getSuggestions(
@@ -309,6 +319,11 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 	}
 
 	getInlineHint(lines: string[], cursorLine: number, cursorCol: number): string | null {
+		// An empty composer renders the pending prompt suggestion as ghost text.
+		if (lines.every(line => line === "")) {
+			const suggestion = this.#getPromptSuggestion?.();
+			if (suggestion) return suggestion;
+		}
 		return this.#baseProvider.getInlineHint?.(lines, cursorLine, cursorCol) ?? null;
 	}
 	trySyncSlashCompletion(textBeforeCursor: string): { items: AutocompleteItem[]; prefix: string } | null {
@@ -382,12 +397,11 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 export function createPromptActionAutocompleteProvider(
 	options: PromptActionAutocompleteOptions,
 ): PromptActionAutocompleteProvider {
-	const editorKeybindings = getKeybindings();
 	const actions: PromptActionDefinition[] = [
 		{
 			id: "new-session",
 			label: "Start new session",
-			description: formatKeyHints(options.keybindings.getKeys("app.session.new")) || "/new",
+			description: options.keybindings.getDisplayString("app.session.new"),
 			keywords: ["new", "session", "fresh", "clear", "start", "conversation"],
 			execute: options.newSession,
 		},
@@ -401,21 +415,21 @@ export function createPromptActionAutocompleteProvider(
 		{
 			id: "copy-line",
 			label: "Copy current line",
-			description: formatKeyHints(options.keybindings.getKeys("app.clipboard.copyLine")),
+			description: options.keybindings.getDisplayString("app.clipboard.copyLine"),
 			keywords: ["copy", "line", "clipboard", "current"],
 			execute: options.copyCurrentLine,
 		},
 		{
 			id: "copy-prompt",
 			label: "Copy whole prompt",
-			description: formatKeyHints(options.keybindings.getKeys("app.clipboard.copyPrompt")),
+			description: options.keybindings.getDisplayString("app.clipboard.copyPrompt"),
 			keywords: ["copy", "prompt", "clipboard", "message"],
 			execute: options.copyPrompt,
 		},
 		{
 			id: "paste-image",
 			label: "Paste image from clipboard",
-			description: formatKeyHints(options.keybindings.getKeys("app.clipboard.pasteImage")),
+			description: options.keybindings.getDisplayString("app.clipboard.pasteImage"),
 			keywords: ["paste", "image", "clipboard", "screenshot", "attach", "vision"],
 			execute: options.pasteImage,
 		},
@@ -429,7 +443,7 @@ export function createPromptActionAutocompleteProvider(
 		{
 			id: "undo",
 			label: "Undo",
-			description: formatKeyHints(editorKeybindings.getKeys("tui.editor.undo")),
+			description: options.keybindings.getDisplayString("tui.editor.undo"),
 			keywords: ["undo", "revert", "edit", "history"],
 			execute: options.undo,
 		},
@@ -450,18 +464,23 @@ export function createPromptActionAutocompleteProvider(
 		{
 			id: "cursor-line-start",
 			label: "Move cursor to beginning of line",
-			description: formatKeyHints(editorKeybindings.getKeys("tui.editor.cursorLineStart")),
+			description: options.keybindings.getDisplayString("tui.editor.cursorLineStart"),
 			keywords: ["move", "cursor", "line", "start", "beginning", "home"],
 			execute: options.moveCursorToLineStart,
 		},
 		{
 			id: "cursor-line-end",
 			label: "Move cursor to end of line",
-			description: formatKeyHints(editorKeybindings.getKeys("tui.editor.cursorLineEnd")),
+			description: options.keybindings.getDisplayString("tui.editor.cursorLineEnd"),
 			keywords: ["move", "cursor", "line", "end"],
 			execute: options.moveCursorToLineEnd,
 		},
 	];
 
-	return new PromptActionAutocompleteProvider(options.commands, options.basePath, actions);
+	return new PromptActionAutocompleteProvider(
+		options.commands,
+		options.basePath,
+		actions,
+		options.getPromptSuggestion,
+	);
 }

package/src/modes/prompt-suggestion-controller.ts

@@ -0,0 +1,96 @@
+import { logger } from "@gajae-code/utils";
+import { generatePromptSuggestion } from "../utils/prompt-suggestion";
+import type { InteractiveModeContext } from "./types";
+
+/**
+ * Owns the ghost-text next-prompt prediction lifecycle for interactive mode.
+ *
+ * After each agent turn ends (and only when `promptSuggestions` is enabled
+ * and the composer is empty), a smol-model prediction of the user's next
+ * prompt is generated in the background. The result renders as dim ghost
+ * text in the empty composer via the autocomplete provider's inline hint;
+ * Tab accepts it, typing dismisses it, and a new turn clears it.
+ */
+export class PromptSuggestionController {
+	#ctx: InteractiveModeContext;
+	#current: string | null = null;
+	/** Monotonic token; bumping it invalidates any in-flight generation. */
+	#generation = 0;
+
+	constructor(ctx: InteractiveModeContext) {
+		this.#ctx = ctx;
+	}
+
+	/** Current suggestion to render as ghost text, or null. */
+	get current(): string | null {
+		return this.#current;
+	}
+
+	/** Drop the current suggestion and invalidate any in-flight generation. */
+	clear(): void {
+		this.#generation++;
+		if (this.#current === null) return;
+		this.#current = null;
+		this.#ctx.ui.requestRender();
+	}
+
+	/** A new agent turn started; any pending suggestion is stale. */
+	onAgentStart(): void {
+		this.clear();
+	}
+
+	/**
+	 * Editor content changed. A non-empty composer means the user is writing
+	 * their own prompt: dismiss the suggestion and cancel pending generation.
+	 */
+	notifyEditorChanged(text: string): void {
+		if (text.length > 0) this.clear();
+	}
+
+	/**
+	 * Agent turn ended; kick off background generation when the feature is
+	 * enabled and the composer is idle and empty.
+	 */
+	onAgentEnd(): void {
+		if (!this.#ctx.settings.get("promptSuggestions")) return;
+		if (this.#ctx.shutdownRequested) return;
+		if (this.#ctx.session.isStreaming) return;
+		if (this.#ctx.editor.getText().trim() !== "") return;
+
+		const generation = ++this.#generation;
+		void generatePromptSuggestion(
+			this.#ctx.session.messages,
+			this.#ctx.session.modelRegistry,
+			this.#ctx.settings,
+			this.#ctx.session.sessionId,
+			this.#ctx.session.model,
+			provider => this.#ctx.session.agent.metadataForProvider(provider),
+		)
+			.then(suggestion => {
+				if (generation !== this.#generation) return;
+				if (!suggestion) return;
+				// The world may have moved on while the model was thinking.
+				if (this.#ctx.session.isStreaming) return;
+				if (this.#ctx.editor.getText().trim() !== "") return;
+				this.#current = suggestion;
+				this.#ctx.ui.requestRender();
+			})
+			.catch(error => {
+				logger.debug("prompt-suggestion: generation failed", { error: String(error) });
+			});
+	}
+
+	/**
+	 * Tab handler for the composer: accept the suggestion when the composer
+	 * is empty. Returns true when Tab was consumed.
+	 */
+	tryAcceptOnTab(text: string): boolean {
+		const suggestion = this.#current;
+		if (!suggestion || text.trim() !== "") return false;
+		// setText fires onChange with non-empty text, which clears #current.
+		this.#ctx.editor.setText(suggestion);
+		this.clear();
+		this.#ctx.ui.requestRender();
+		return true;
+	}
+}