@sayknow-cli/coding-agent 0.3.5 → 0.3.7

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

@@ -1,7 +1,7 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { type AgentMessage, ThinkingLevel } from "@sayknow-cli/agent-core";
-import type { AutocompleteProvider, SlashCommand } from "@sayknow-cli/tui";
+import { type AutocompleteProvider, matchesKey, type SlashCommand } from "@sayknow-cli/tui";
 import { $env, sanitizeText } from "@sayknow-cli/utils";
 import { isSettingsInitialized, settings } from "../../config/settings";
 import { resolveSubskillActivationForSkillInvocation } from "../../extensibility/skc-plugins";
@@ -9,6 +9,7 @@ import { buildSkillPromptMessage, parseSkillInvocations } from "../../extensibil
 import { expandEmoticons } from "../../modes/emoji-autocomplete";
 import { createPromptActionAutocompleteProvider } from "../../modes/prompt-action-autocomplete";
 import { theme } from "../../modes/theme/theme";
+import { scrollTmuxToPreviousUserInput as scrollTmuxPaneToPreviousUserInput } from "../../modes/tmux-scroll";
 import type { InteractiveModeContext } from "../../modes/types";
 import type { AgentSessionEvent } from "../../session/agent-session";
 import { SKILL_PROMPT_MESSAGE_TYPE, type SkillPromptDetails } from "../../session/messages";
@@ -41,6 +42,127 @@ export class InputController {
 	 *  so abort cleanup going idle cannot turn the second Esc into an idle action. */
 	#steerConsumePending = false;
 
+	#globalInterruptUnsubscribe: (() => void) | undefined;
+
+	#matchesInterruptKey(data: string): boolean {
+		return this.ctx.keybindings.getKeys("app.interrupt").some(key => matchesKey(data, key));
+	}
+
+	#hasHookDialog(): boolean {
+		return Boolean(this.ctx.hookSelector || this.ctx.hookInput || this.ctx.hookEditor);
+	}
+
+	#isRetryBackoffActive(): boolean {
+		return Boolean(
+			this.ctx.retryLoader ||
+				this.ctx.retryEscapeHandler ||
+				(this.ctx.session.isRetrying && !this.ctx.session.isStreaming),
+		);
+	}
+
+	#handleCancellableWorkEscape(options: {
+		loading?: boolean;
+		processes?: boolean;
+		modes?: boolean;
+		maintenance?: boolean;
+		retry?: boolean;
+		streaming?: boolean;
+	}): boolean {
+		if (options.loading && this.ctx.loadingAnimation) {
+			if (this.ctx.cancelPendingSubmission()) {
+				return true;
+			}
+			this.restoreQueuedMessagesToEditor({ abort: true });
+			return true;
+		}
+		if (options.processes && this.ctx.session.isBashRunning) {
+			this.ctx.session.abortBash();
+			return true;
+		}
+		if (options.modes && this.ctx.isBashMode) {
+			this.ctx.editor.setText("");
+			this.ctx.isBashMode = false;
+			this.ctx.isBashNoContext = false;
+			this.ctx.updateEditorBorderColor();
+			return true;
+		}
+		if (options.processes && this.ctx.session.isEvalRunning) {
+			this.ctx.session.abortEval();
+			return true;
+		}
+		if (options.modes && this.ctx.isPythonMode) {
+			this.ctx.editor.setText("");
+			this.ctx.isPythonMode = false;
+			this.ctx.updateEditorBorderColor();
+			return true;
+		}
+		if (
+			options.maintenance &&
+			(this.ctx.session.isCompacting || this.ctx.autoCompactionLoader || this.ctx.autoCompactionEscapeHandler)
+		) {
+			this.ctx.session.abortCompaction();
+			return true;
+		}
+		if (options.maintenance && this.ctx.session.isGeneratingHandoff) {
+			this.ctx.session.abortHandoff();
+			return true;
+		}
+		if (options.retry) {
+			if (this.#isRetryBackoffActive()) {
+				if (this.ctx.retryEscapePrimed) {
+					this.ctx.session.abortRetry();
+				} else {
+					this.ctx.retryEscapePrimed = true;
+					this.ctx.session.retryNow();
+				}
+				return true;
+			}
+			this.ctx.retryEscapePrimed = false;
+		}
+		if (options.streaming && this.ctx.session.isStreaming) {
+			if (this.ctx.session.hasQueuedSteering && !this.#steerConsumePending) {
+				// First Esc with a queued steer: silently consume it and
+				// auto-continue via steer-on-interrupt instead of stalling on
+				// "Operation aborted".
+				this.#steerConsumePending = true;
+				void this.#abortInteractive({ silent: true });
+			} else {
+				void this.#abortInteractive();
+			}
+			return true;
+		}
+		return false;
+	}
+
+	#installGlobalInterruptListener(): void {
+		if (typeof this.ctx.ui.addInputListener !== "function") {
+			return;
+		}
+		this.#globalInterruptUnsubscribe?.();
+		this.#globalInterruptUnsubscribe = this.ctx.ui.addInputListener(data => {
+			if (!this.#matchesInterruptKey(data)) {
+				return undefined;
+			}
+			if (this.ctx.hasActiveBtw() && this.ctx.handleBtwEscape()) {
+				return { consume: true };
+			}
+			const hookDialogActive = this.#hasHookDialog();
+			if (
+				this.#handleCancellableWorkEscape({
+					loading: hookDialogActive,
+					processes: hookDialogActive,
+					modes: false,
+					maintenance: true,
+					retry: true,
+					streaming: hookDialogActive,
+				})
+			) {
+				return { consume: true };
+			}
+			return undefined;
+		});
+	}
+
 	#abortInteractive(options?: { silent?: boolean }): Promise<void> {
 		return this.ctx.session.abort({
 			timeoutMs: INTERACTIVE_ABORT_CLEANUP_TIMEOUT_MS,
@@ -59,6 +181,7 @@ export class InputController {
 					this.ctx.session.isStreaming ||
 					this.ctx.session.isCompacting ||
 					this.ctx.session.isGeneratingHandoff ||
+					this.ctx.session.isRetrying ||
 					this.ctx.session.isBashRunning ||
 					this.ctx.session.isEvalRunning ||
 					this.ctx.autoCompactionLoader ||
@@ -66,6 +189,8 @@ export class InputController {
 					this.ctx.autoCompactionEscapeHandler ||
 					this.ctx.retryEscapeHandler,
 			);
+		this.#installGlobalInterruptListener();
+
 		// An open btw panel must stay dismissable with Esc even while another
 		// controller (auto-compaction, auto-retry, manual compaction, etc.) has
 		// temporarily replaced editor.onEscape. This priority hook is never
@@ -86,6 +211,9 @@ export class InputController {
 				}
 				this.#steerConsumePending = false;
 			}
+			if (this.#handleCancellableWorkEscape({ maintenance: true, retry: true })) {
+				return;
+			}
 			// Normal input state with user-typed text: Esc must not interrupt a
 			// running task (streaming turn, bash/eval). A double Esc within the
 			// 500ms window clears the composer instead. Bash/Python input modes
@@ -100,35 +228,19 @@ export class InputController {
 				}
 				return;
 			}
-			if (this.ctx.loadingAnimation) {
-				if (this.ctx.cancelPendingSubmission()) {
-					return;
-				}
-				this.restoreQueuedMessagesToEditor({ abort: true });
-			} else if (this.ctx.session.isBashRunning) {
-				this.ctx.session.abortBash();
-			} else if (this.ctx.isBashMode) {
-				this.ctx.editor.setText("");
-				this.ctx.isBashMode = false;
-				this.ctx.isBashNoContext = false;
-				this.ctx.updateEditorBorderColor();
-			} else if (this.ctx.session.isEvalRunning) {
-				this.ctx.session.abortEval();
-			} else if (this.ctx.isPythonMode) {
-				this.ctx.editor.setText("");
-				this.ctx.isPythonMode = false;
-				this.ctx.updateEditorBorderColor();
-			} else if (this.ctx.session.isStreaming) {
-				if (this.ctx.session.hasQueuedSteering && !this.#steerConsumePending) {
-					// First Esc with a queued steer: silently consume it and
-					// auto-continue via steer-on-interrupt instead of stalling on
-					// "Operation aborted".
-					this.#steerConsumePending = true;
-					void this.#abortInteractive({ silent: true });
-				} else {
-					void this.#abortInteractive();
-				}
-			} else if (!this.ctx.editor.getText().trim()) {
+			if (
+				this.#handleCancellableWorkEscape({
+					loading: true,
+					processes: true,
+					modes: true,
+					maintenance: true,
+					retry: true,
+					streaming: true,
+				})
+			) {
+				return;
+			}
+			if (!this.ctx.editor.getText().trim()) {
 				// Double-interrupt with empty editor triggers /tree, /branch, or nothing based on setting
 				const action = settings.get("doubleEscapeAction");
 				if (action !== "none") {
@@ -155,6 +267,8 @@ export class InputController {
 		this.ctx.editor.onSuspend = () => this.handleCtrlZ();
 		this.ctx.editor.setActionKeys("app.thinking.cycle", this.ctx.keybindings.getKeys("app.thinking.cycle"));
 		this.ctx.editor.onCycleThinkingLevel = () => this.cycleThinkingLevel();
+		this.ctx.editor.setActionKeys("app.commandPalette.open", this.ctx.keybindings.getKeys("app.commandPalette.open"));
+		this.ctx.editor.onOpenCommandPalette = () => this.openCommandPalette();
 		this.ctx.editor.setActionKeys("app.model.cycleForward", this.ctx.keybindings.getKeys("app.model.cycleForward"));
 		this.ctx.editor.onCycleModelForward = () => this.cycleRoleModel();
 		this.ctx.editor.setActionKeys("app.model.cycleBackward", this.ctx.keybindings.getKeys("app.model.cycleBackward"));
@@ -199,8 +313,17 @@ export class InputController {
 		this.ctx.editor.onDequeue = () => this.handleDequeue();
 		this.ctx.editor.setActionKeys("app.message.queue", this.ctx.keybindings.getKeys("app.message.queue"));
 		this.ctx.editor.onQueue = () => void this.handleQueueSubmit();
+		this.ctx.editor.onTab = () => {
+			if (!this.ctx.session.isStreaming && !this.ctx.session.isCompacting) return false;
+			void this.handleQueueSubmit();
+			return true;
+		};
 		this.ctx.editor.onTabDeclined = () => {
-			if (this.ctx.session.isStreaming) void this.handleQueueSubmit();
+			if (this.ctx.session.isStreaming || this.ctx.session.isCompacting) void this.handleQueueSubmit();
+		};
+		this.ctx.editor.onViewportPageScroll = direction => this.ctx.ui.scrollViewportPages(direction);
+		this.ctx.editor.onViewportFollowLive = () => {
+			this.ctx.ui.followLiveViewport();
 		};
 
 		this.ctx.editor.clearCustomKeyHandlers();
@@ -491,7 +614,7 @@ export class InputController {
 	}
 
 	handleDequeue(): void {
-		const restored = this.restoreQueuedMessagesToEditor();
+		const restored = this.restoreLatestQueuedMessageToEditor();
 		if (restored === 0) {
 			this.ctx.showStatus("No queued messages to restore");
 		} else {
@@ -521,19 +644,18 @@ export class InputController {
 
 	/**
 	 * Dispatch skill slash invocation(s) (`/skill:<name>`) through custom messages
-	 * using the supplied `streamingBehavior`. Returns true if the text was a
-	 * recognised skill command chain and was dispatched. A failure to load a skill
-	 * file is surfaced via `showError` but still returns true — the editor was
-	 * already cleared on the success path, so falling through to plain-text
-	 * handling at that point would double-submit. Returns false when the text
-	 * isn't a `/skill:` prefix or the command name isn't a registered skill,
-	 * so the caller can fall through to plain-text handling (this branch
+	 * using the supplied `streamingBehavior`. Returns true if the text contains a
+	 * recognised canonical skill command or command chain and was dispatched. A
+	 * failure to load a skill file is surfaced via `showError` but still returns
+	 * true — the editor was already cleared on the success path, so falling
+	 * through to plain-text handling at that point would double-submit. Returns
+	 * false when the text has no registered canonical skill invocation, so the
+	 * caller can fall through to plain-text handling (this branch
 	 * leaves the editor state untouched). `streamingBehavior` is only consulted
 	 * while the agent is streaming; the idle path of `promptCustomMessage`
 	 * ignores it.
 	 */
 	async #invokeSkillCommand(text: string, streamingBehavior: "steer" | "followUp"): Promise<boolean> {
-		if (!text.startsWith("/")) return false;
 		const invocations = parseSkillInvocations(text, this.ctx.skillCommands ?? new Map());
 		if (invocations.length === 0) return false;
 		this.ctx.editor.addToHistory(text);
@@ -602,13 +724,15 @@ export class InputController {
 		const text = this.ctx.editor.getText().trim();
 		if (!text) return;
 
-		// Compaction first: while compacting, free text gets queued via
-		// `queueCompactionMessage`, and `/skill:*` rides the same queue so a
-		// skill typed during compaction is not lost or short-circuited through
-		// `promptCustomMessage`. The skill text is queued verbatim; whether
-		// the queued entry is later re-parsed into a skill invocation is a
-		// separate concern owned by the compaction-resume path.
+		// Compaction first: while compacting, queue free text and `/skill:*`
+		// commands in the compaction-local queue. `flushCompactionQueue`
+		// replays skill entries through the custom-message skill path after
+		// compaction finishes so they are not degraded into plain prompts.
 		if (this.ctx.session.isCompacting) {
+			if (this.ctx.pendingImages.length > 0) {
+				this.ctx.showStatus("Compaction in progress. Retry after it completes to send images.");
+				return;
+			}
 			this.ctx.queueCompactionMessage(text, "followUp");
 			return;
 		}
@@ -642,10 +766,28 @@ export class InputController {
 		return this.handleFollowUp();
 	}
 
+	restoreLatestQueuedMessageToEditor(options?: { currentText?: string }): number {
+		const compactionQueued = this.ctx.compactionQueuedMessages.pop();
+		const queuedText = compactionQueued?.text ?? this.ctx.session.popLastQueuedMessage();
+		if (!queuedText) {
+			this.ctx.updatePendingMessagesDisplay();
+			return 0;
+		}
+
+		this.ctx.locallySubmittedUserSignatures.delete(`${queuedText}\u00000`);
+		const currentText = options?.currentText ?? this.ctx.editor.getText();
+		const combinedText = [queuedText, currentText].filter(t => t.trim()).join("\n\n");
+		this.ctx.editor.setText(combinedText);
+		this.ctx.updatePendingMessagesDisplay();
+		return 1;
+	}
+
 	restoreQueuedMessagesToEditor(options?: { abort?: boolean; currentText?: string }): number {
 		this.ctx.locallySubmittedUserSignatures.clear();
 		const { steering, followUp } = this.ctx.session.clearQueue();
-		const allQueued = [...steering, ...followUp];
+		const compactionQueued = (this.ctx.compactionQueuedMessages ?? []).map(entry => entry.text);
+		this.ctx.compactionQueuedMessages = [];
+		const allQueued = [...steering, ...followUp, ...compactionQueued];
 		if (allQueued.length === 0) {
 			this.ctx.updatePendingMessagesDisplay();
 			if (options?.abort) {
@@ -704,6 +846,7 @@ export class InputController {
 			this.ctx.editor.onEscape = this.ctx.retryEscapeHandler;
 			this.ctx.retryEscapeHandler = undefined;
 		}
+		this.ctx.retryEscapePrimed = false;
 		this.ctx.statusContainer.clear();
 		this.ctx.statusLine.dispose();
 
@@ -858,6 +1001,9 @@ export class InputController {
 			copyCurrentLine: () => this.handleCopyCurrentLine(),
 			copyPrompt: () => this.handleCopyPrompt(),
 			pasteImage: () => void this.handleImagePaste(),
+			newSession: () => void this.ctx.handleClearCommand(),
+			showHelp: () => this.ctx.handleHelpCommand(),
+			scrollTmuxToPreviousUserInput: () => this.scrollTmuxToPreviousUserInput(),
 			undo: prefix => this.ctx.editor.undoPastTransientText(prefix),
 			moveCursorToMessageEnd: () => this.ctx.editor.moveToMessageEnd(),
 			moveCursorToMessageStart: () => this.ctx.editor.moveToMessageStart(),
@@ -901,6 +1047,14 @@ export class InputController {
 		}
 	}
 
+	openCommandPalette(): void {
+		if (this.ctx.editor.getText().trim().length > 0) {
+			this.ctx.showStatus("Command palette opens from an empty prompt. Type / for inline commands.");
+			return;
+		}
+		this.ctx.editor.handleInput("/");
+	}
+
 	cycleThinkingLevel(): void {
 		const newLevel = this.ctx.session.cycleThinkingLevel();
 		if (newLevel === undefined) {
@@ -952,6 +1106,19 @@ export class InputController {
 		this.setToolsExpanded(!this.ctx.toolOutputExpanded);
 	}
 
+	scrollTmuxToPreviousUserInput(): void {
+		const result = scrollTmuxPaneToPreviousUserInput();
+		if (result.ok) return;
+
+		if (result.reason === "not_inside_tmux") {
+			this.ctx.showWarning("Previous-input scroll works only inside tmux.");
+			return;
+		}
+
+		const detail = result.error ? `: ${result.error}` : ".";
+		this.ctx.showWarning(`Failed to scroll tmux to previous user input${detail}`);
+	}
+
 	setToolsExpanded(expanded: boolean): void {
 		this.ctx.toolOutputExpanded = expanded;
 		for (const child of this.ctx.chatContainer.children) {

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

@@ -8,7 +8,8 @@ import { activateModelProfile, materializeActiveModelProfileAssignment } from ".
 import { recommendModelProfileForProvider } from "../../config/model-profiles";
 import { SKC_MODEL_ASSIGNMENT_TARGETS } from "../../config/model-registry";
 import { formatModelSelectorValue } from "../../config/model-resolver";
-import { settings } from "../../config/settings";
+import type { ModelProfileConfig } from "../../config/models-config-schema";
+import { type Settings, settings } from "../../config/settings";
 import { DebugSelectorComponent } from "../../debug";
 import { disableProvider, enableProvider } from "../../discovery";
 import { clearPluginRootsAndCaches, resolveActiveProjectRegistryPath } from "../../discovery/helpers";
@@ -74,6 +75,7 @@ import {
 import { SessionObserverOverlayComponent } from "../components/session-observer-overlay";
 import { SessionSelectorComponent } from "../components/session-selector";
 import { SettingsSelectorComponent } from "../components/settings-selector";
+import type { StatusLineSettings } from "../components/status-line";
 import { ThemeSelectorComponent } from "../components/theme-selector";
 import { ToolExecutionComponent } from "../components/tool-execution";
 import { TreeSelectorComponent } from "../components/tree-selector";
@@ -97,6 +99,24 @@ function isThemePreviewSuperseded(result: { success: boolean; error?: string }):
 	return !result.success && result.error?.includes("superseded by a newer request") === true;
 }
 
+/**
+ * Snapshot the persisted status-line settings that the status-line component
+ * cares about. Preview, cancel-restore, and commit paths all share this so the
+ * previewed row count (and every other field) can never drift out of sync.
+ */
+export function buildStatusLineSettings(settingsInstance: Settings): StatusLineSettings {
+	return {
+		preset: settingsInstance.get("statusLine.preset"),
+		leftSegments: settingsInstance.get("statusLine.leftSegments"),
+		rightSegments: settingsInstance.get("statusLine.rightSegments"),
+		separator: settingsInstance.get("statusLine.separator"),
+		showHookStatus: settingsInstance.get("statusLine.showHookStatus"),
+		sessionAccent: settingsInstance.get("statusLine.sessionAccent"),
+		maxRows: settingsInstance.get("statusLine.maxRows"),
+		segmentOptions: settingsInstance.get("statusLine.segmentOptions"),
+	};
+}
+
 function formatProviderOnboardingCommandGuide(): string {
 	return [
 		"Provider preset setup:",
@@ -243,7 +263,7 @@ export class SelectorController {
 		this.ctx.ui.requestRender();
 	}
 
-	showCustomModelPresetWizard(): void {
+	showCustomModelPresetWizard(snapshot: ModelProfileConfig): void {
 		this.showSelector(done => {
 			let wizard: CustomModelPresetWizardComponent;
 			const submit = async (input: CustomModelPresetWizardSubmit): Promise<void> => {
@@ -260,6 +280,7 @@ export class SelectorController {
 				}
 			};
 			wizard = new CustomModelPresetWizardComponent(
+				snapshot,
 				input => {
 					void submit(input);
 				},
@@ -334,21 +355,17 @@ export class SelectorController {
 						onStatusLinePreview: previewSettings => {
 							// Update status line with preview settings
 							this.ctx.statusLine.updateSettings({
-								preset: settings.get("statusLine.preset"),
-								leftSegments: settings.get("statusLine.leftSegments"),
-								rightSegments: settings.get("statusLine.rightSegments"),
-								separator: settings.get("statusLine.separator"),
-								showHookStatus: settings.get("statusLine.showHookStatus"),
-								sessionAccent: settings.get("statusLine.sessionAccent"),
+								...buildStatusLineSettings(settings),
 								...previewSettings,
 							});
 							this.ctx.updateEditorTopBorder();
 							this.ctx.ui.requestRender();
 						},
-						getStatusLinePreview: () => {
+						getStatusLinePreview: (width?: number) => {
 							// Return the rendered status line for inline preview
-							const availableWidth = this.ctx.editor.getTopBorderAvailableWidth(this.ctx.ui.terminal.columns);
-							return this.ctx.statusLine.getTopBorder(availableWidth).content;
+							const availableWidth =
+								width ?? this.ctx.editor.getTopBorderAvailableWidth(this.ctx.ui.terminal.columns);
+							return this.ctx.statusLine.getPreviewContent(availableWidth);
 						},
 						onPluginsChanged: () => {
 							this.ctx.ui.requestRender();
@@ -356,14 +373,7 @@ export class SelectorController {
 						onCancel: () => {
 							done();
 							// Restore status line to saved settings
-							this.ctx.statusLine.updateSettings({
-								preset: settings.get("statusLine.preset"),
-								leftSegments: settings.get("statusLine.leftSegments"),
-								rightSegments: settings.get("statusLine.rightSegments"),
-								separator: settings.get("statusLine.separator"),
-								showHookStatus: settings.get("statusLine.showHookStatus"),
-								sessionAccent: settings.get("statusLine.sessionAccent"),
-							});
+							this.ctx.statusLine.updateSettings(buildStatusLineSettings(settings));
 							this.ctx.updateEditorTopBorder();
 							this.ctx.ui.requestRender();
 						},
@@ -607,6 +617,10 @@ export class SelectorController {
 			case "statusLineShowHooks":
 			case "statusLine.showHookStatus":
 			case "statusLine.sessionAccent":
+			case "statusLine.maxRows":
+			case "statusLine.leftSegments":
+			case "statusLine.rightSegments":
+			case "statusLine.segmentOptions":
 			case "statusLineSegments":
 			case "statusLineModelThinking":
 			case "statusLinePathAbbreviate":
@@ -618,16 +632,7 @@ export class SelectorController {
 			case "statusLineGitShowUntracked":
 			case "statusLineTimeFormat":
 			case "statusLineTimeShowSeconds": {
-				const statusLineSettings = {
-					preset: settings.get("statusLine.preset"),
-					leftSegments: settings.get("statusLine.leftSegments"),
-					rightSegments: settings.get("statusLine.rightSegments"),
-					separator: settings.get("statusLine.separator"),
-					showHookStatus: settings.get("statusLine.showHookStatus"),
-					sessionAccent: settings.get("statusLine.sessionAccent"),
-					segmentOptions: settings.get("statusLine.segmentOptions"),
-				};
-				this.ctx.statusLine.updateSettings(statusLineSettings);
+				this.ctx.statusLine.updateSettings(buildStatusLineSettings(settings));
 				this.ctx.updateEditorTopBorder();
 				this.ctx.ui.requestRender();
 				break;
@@ -685,9 +690,6 @@ export class SelectorController {
 				async selection => {
 					try {
 						if (selection.kind === "login") {
-							// User picked an unauthenticated preset/model. Close the model
-							// selector and start OAuth for the provider if it supports it;
-							// otherwise guide them to the right command.
 							const oauth = getOAuthProviders().find(p => p.id === selection.providerId);
 							done();
 							if (oauth) {
@@ -702,7 +704,7 @@ export class SelectorController {
 						}
 						if (selection.kind === "createProfile") {
 							done();
-							this.showCustomModelPresetWizard();
+							this.showCustomModelPresetWizard(selection.profile);
 							return;
 						}
 						if (selection.kind === "profile") {

package/src/modes/interactive-mode.ts

@@ -72,7 +72,6 @@ import { normalizeLocalScheme } from "../tools/path-utils";
 import { type ResolveToolDetails, runResolveInvocation } from "../tools/resolve";
 import { formatPhaseDisplayName } from "../tools/todo-write";
 import { ToolError } from "../tools/tool-errors";
-
 import type { EventBus } from "../utils/event-bus";
 import { getEditorCommand, openInEditor } from "../utils/external-editor";
 import { getSessionAccentAnsi, getSessionAccentHex } from "../utils/session-color";
@@ -104,6 +103,7 @@ import { JobsObserver } from "./jobs-observer";
 import { OAuthManualInputManager } from "./oauth-manual-input";
 import { SessionObserverRegistry } from "./session-observer-registry";
 import { interruptHint } from "./shared";
+import { shouldShowExtensionCommand } from "./slash-command-visibility";
 import { type ShimmerPalette, shimmerSegments, shimmerText } from "./theme/shimmer";
 import type { Theme } from "./theme/theme";
 import {
@@ -322,6 +322,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	}
 	autoCompactionEscapeHandler?: () => void;
 	retryEscapeHandler?: () => void;
+	retryEscapePrimed = false;
 	retryCountdownTimer?: NodeJS.Timeout;
 	unsubscribe?: () => void;
 	onInputCallback?: (input: SubmittedUserInput) => void;
@@ -423,7 +424,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.editor.setUseTerminalCursor(this.ui.getShowHardwareCursor());
 		this.editor.setAutocompleteMaxVisible(settings.get("autocompleteMaxVisible"));
 		this.editor.onAutocompleteCancel = () => {
-			this.ui.requestRender(true);
+			this.ui.requestRender();
 		};
 		this.editor.onAutocompleteUpdate = () => {
 			this.ui.requestRender();
@@ -433,7 +434,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.#syncEditorMaxHeight();
 			this.updateEditorChrome();
 			this.editor.invalidate();
-			this.ui.requestRender(true, "resize");
+			this.ui.requestResizeRender();
 		};
 		process.stdout.on("resize", this.#resizeHandler);
 		try {
@@ -453,13 +454,16 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.hideThinkingBlock = settings.get("hideThinkingBlock");
 
 		const builtinCommandNames = new Set(BUILTIN_SLASH_COMMANDS.map(c => c.name));
+		const activeProvider = this.session.model?.provider;
 		const hookCommands: SlashCommand[] = (
 			this.session.extensionRunner?.getRegisteredCommands(builtinCommandNames) ?? []
-		).map(cmd => ({
-			name: cmd.name,
-			description: cmd.description ?? "(hook command)",
-			getArgumentCompletions: cmd.getArgumentCompletions,
-		}));
+		)
+			.filter(cmd => shouldShowExtensionCommand(cmd.name, activeProvider))
+			.map(cmd => ({
+				name: cmd.name,
+				description: cmd.description ?? "(hook command)",
+				getArgumentCompletions: cmd.getArgumentCompletions,
+			}));
 
 		// Convert custom commands (TypeScript) to SlashCommand format
 		const customCommands: SlashCommand[] = this.session.customCommands.map(loaded => ({
@@ -528,6 +532,14 @@ export class InteractiveMode implements InteractiveModeContext {
 		}
 
 		if (!startupQuiet) {
+			const getWelcomeReservedBottomRows = (width: number): number =>
+				[
+					this.statusLine,
+					this.hookWidgetContainerAbove,
+					this.editorContainer,
+					this.hookWidgetContainerBelow,
+				].reduce((rows, component) => rows + component.render(width).length, 0);
+
 			// Add welcome header
 			this.#welcomeComponent = new WelcomeComponent(
 				this.#version,
@@ -536,30 +548,16 @@ export class InteractiveMode implements InteractiveModeContext {
 				recentSessions,
 				this.#getWelcomeLspServers(),
 				welcomeLogoMode,
+				{
+					getViewportRows: () => this.ui.terminal.rows,
+					getReservedBottomRows: getWelcomeReservedBottomRows,
+					changelogMarkdown: this.#changelogMarkdown,
+					collapseChangelog: settings.get("collapseChangelog"),
+				},
 			);
 
-			// Setup UI layout
-			this.ui.addChild(new Spacer(1));
 			this.ui.addChild(this.#welcomeComponent);
-			this.ui.addChild(new Spacer(1));
 			this.#welcomeComponent.playIntro(() => this.ui.requestRender());
-
-			// Add changelog if provided
-			if (this.#changelogMarkdown) {
-				this.ui.addChild(new DynamicBorder());
-				if (settings.get("collapseChangelog")) {
-					const versionMatch = this.#changelogMarkdown.match(/##\s+\[?(\d+\.\d+\.\d+)\]?/);
-					const latestVersion = versionMatch ? versionMatch[1] : this.#version;
-					const condensedText = `Updated to v${latestVersion}. Use ${theme.bold("/changelog")} to view full changelog.`;
-					this.ui.addChild(new Text(condensedText, 1, 0));
-				} else {
-					this.ui.addChild(new Text(theme.bold(theme.fg("accent", "What's New")), 1, 0));
-					this.ui.addChild(new Spacer(1));
-					this.ui.addChild(new Markdown(this.#changelogMarkdown.trim(), 1, 0, getMarkdownTheme()));
-					this.ui.addChild(new Spacer(1));
-				}
-				this.ui.addChild(new DynamicBorder());
-			}
 		}
 
 		this.ui.addChild(this.chatContainer);
@@ -1961,6 +1959,8 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.loadingAnimation.stop();
 			this.loadingAnimation = undefined;
 		}
+		this.#welcomeComponent?.dispose();
+		this.#welcomeComponent = undefined;
 		this.#cleanupMicAnimation();
 		this.#cancelGoalContinuation();
 		if (this.#sttController) {
@@ -2036,7 +2036,9 @@ export class InteractiveMode implements InteractiveModeContext {
 		const sessionId = this.sessionManager.getSessionId();
 		const sessionFile = this.sessionManager.getSessionFile();
 		if (sessionId && sessionFile) {
-			process.stderr.write(`\n${chalk.dim(`Resume this session with ${APP_NAME} --resume ${sessionId}`)}\n`);
+			process.stderr.write(
+				`\n${chalk.dim("Resume this session with:")}\n${chalk.dim(`${APP_NAME} --resume ${sessionId}`)}\n`,
+			);
 		}
 
 		await postmortem.quit(0);
@@ -2072,7 +2074,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		nextEditor.setUseTerminalCursor(this.ui.getShowHardwareCursor());
 		nextEditor.setAutocompleteMaxVisible(this.settings.get("autocompleteMaxVisible"));
 		nextEditor.onAutocompleteCancel = () => {
-			this.ui.requestRender(true);
+			this.ui.requestRender();
 		};
 		nextEditor.onAutocompleteUpdate = () => {
 			this.ui.requestRender();
@@ -2312,6 +2314,10 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#commandController.handleHotkeysCommand();
 	}
 
+	handleHelpCommand(): void {
+		this.#commandController.handleHelpCommand();
+	}
+
 	handleToolsCommand(): void {
 		this.#commandController.handleToolsCommand();
 	}