@sayknow-cli/coding-agent 0.3.5 → 0.3.7

package/src/main.ts

@@ -30,6 +30,7 @@ import { activateModelProfile } from "./config/model-profile-activation";
 import { ModelRegistry, ModelsConfigFile } from "./config/model-registry";
 import { resolveCliModel, resolveModelRoleValue, resolveModelScope, type ScopedModel } from "./config/model-resolver";
 import { getDefault, type SettingPath, Settings, settings } from "./config/settings";
+import { maybeAutostartTelegramRemote } from "./config/telegram-autostart";
 import { BUNDLED_GROK_BUILD_EXTENSION_ID, getBundledGrokBuildExtensionFactory } from "./defaults/skc-grok-cli";
 import { initializeWithSettings } from "./discovery";
 import { exportFromFile } from "./export/html";
@@ -671,7 +672,7 @@ async function buildSessionOptions(
 		options.thinkingLevel = scopedModels[0].thinkingLevel;
 	}
 
-	// Scoped models for Ctrl+P cycling - fill in default thinking levels when not explicit
+	// Scoped models for Alt+N cycling - fill in default thinking levels when not explicit
 	if (scopedModels.length > 0) {
 		const defaultThinkingLevel = activeSettings.get("defaultThinkingLevel");
 		options.scopedModels = scopedModels.map(scopedModel => ({
@@ -845,6 +846,8 @@ export async function runRootCommand(
 
 	// Initialize discovery system with settings for provider persistence
 	logger.time("initializeWithSettings", initializeWithSettings, settingsInstance);
+	// Auto-start Telegram Remote gateway if enabled in settings
+	if (!parsedArgs.print && !autoPrint) await maybeAutostartTelegramRemote();
 
 	// Apply model role overrides from CLI args or env vars (ephemeral, not persisted)
 	const smolModel = parsedArgs.smol ?? $env.PI_SMOL_MODEL;
@@ -1067,7 +1070,7 @@ export async function runRootCommand(
 						return `${scopedModel.model.id}${thinkingStr}`;
 					})
 					.join(", ");
-				process.stdout.write(`${chalk.dim(`Model scope: ${modelList} ${chalk.gray("(Ctrl+P to cycle)")}`)}\n`);
+				process.stdout.write(`${chalk.dim(`Model scope: ${modelList} ${chalk.gray("(Alt+N to cycle)")}`)}\n`);
 			}
 
 			if ($env.PI_TIMING) {

package/src/migrate/executor.ts

@@ -12,11 +12,28 @@ import * as path from "node:path";
 import { upsertMCPServer } from "../runtime-mcp/config-writer";
 import type { MigrateAction } from "./types";
 
-async function ensureRealDirectoryPathNoFollow(directory: string): Promise<void> {
-	const resolved = path.resolve(directory);
-	const parsed = path.parse(resolved);
-	let current = parsed.root;
-	for (const part of resolved.slice(parsed.root.length).split(path.sep).filter(Boolean)) {
+function trustedSkillDestinationBase(destination: string): string {
+	const skillDir = path.dirname(path.resolve(destination));
+	const skillsRoot = path.dirname(skillDir);
+	const scopeRoot = path.dirname(skillsRoot);
+	return path.basename(scopeRoot) === ".skc" ? path.dirname(scopeRoot) : scopeRoot;
+}
+
+async function ensureRealDirectoryPathNoFollow(directory: string, trustedBase: string): Promise<void> {
+	const resolvedBase = path.resolve(trustedBase);
+	const resolvedDirectory = path.resolve(directory);
+	const relative = path.relative(resolvedBase, resolvedDirectory);
+	if (relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative)) {
+		throw new Error(`skill destination escapes trusted base: ${resolvedDirectory}`);
+	}
+
+	const baseStat = await fs.stat(resolvedBase);
+	if (!baseStat.isDirectory()) {
+		throw new Error(`skill destination base is not a directory: ${resolvedBase}`);
+	}
+
+	let current = resolvedBase;
+	for (const part of relative.split(path.sep).filter(part => part && part !== ".")) {
 		current = path.join(current, part);
 		try {
 			const stat = await fs.lstat(current);
@@ -36,7 +53,7 @@ async function ensureRealDirectoryPathNoFollow(directory: string): Promise<void>
 
 async function writeSkillFileNoFollow(destination: string, content: string): Promise<void> {
 	const skillDir = path.dirname(destination);
-	await ensureRealDirectoryPathNoFollow(skillDir);
+	await ensureRealDirectoryPathNoFollow(skillDir, trustedSkillDestinationBase(destination));
 	const handle = await fs.open(
 		destination,
 		fsSync.constants.O_WRONLY | fsSync.constants.O_CREAT | fsSync.constants.O_TRUNC | fsSync.constants.O_NOFOLLOW,

package/src/modes/acp/acp-agent.ts

@@ -710,9 +710,6 @@ export class AcpAgent implements Agent {
 		text: string,
 		options: { directAliasMayCollide?: boolean } = {},
 	): Promise<boolean> {
-		if (!text.startsWith("/")) {
-			return false;
-		}
 		if (!record.session.skillsSettings?.enableSkillCommands) {
 			return false;
 		}
@@ -758,9 +755,13 @@ export class AcpAgent implements Agent {
 			}
 			return true;
 		}
-		const spaceIndex = text.indexOf(" ");
-		const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
-		const args = spaceIndex === -1 ? "" : text.slice(spaceIndex + 1).trim();
+		const slashText = text.trimStart();
+		if (!slashText.startsWith("/")) {
+			return false;
+		}
+		const spaceIndex = slashText.indexOf(" ");
+		const commandName = spaceIndex === -1 ? slashText.slice(1) : slashText.slice(1, spaceIndex);
+		const args = spaceIndex === -1 ? "" : slashText.slice(spaceIndex + 1).trim();
 		if (
 			!isNamespacedSkillSlashCommandName(commandName) &&
 			options.directAliasMayCollide !== true &&

package/src/modes/components/agent-dashboard.ts

@@ -23,12 +23,11 @@ import {
 	extractPrintableText,
 	Input,
 	matchesKey,
-	padding,
 	replaceTabs,
+	resolveTerminalColumns,
 	Spacer,
 	Text,
 	truncateToWidth,
-	visibleWidth,
 	wrapTextWithAnsi,
 } from "@sayknow-cli/tui";
 import { isEnoent, prompt } from "@sayknow-cli/utils";
@@ -51,6 +50,7 @@ import { shortenPath } from "../../tools/render-utils";
 import { theme } from "../theme/theme";
 import { matchesAppInterrupt } from "../utils/keybinding-matchers";
 import { DynamicBorder } from "./dynamic-border";
+import { TwoColumnBody } from "./two-column-body";
 
 type SourceTabId = "all" | AgentSource;
 type AgentScope = "project" | "user";
@@ -295,38 +295,6 @@ class AgentInspectorPane implements Component {
 	invalidate(): void {}
 }
 
-class TwoColumnBody implements Component {
-	constructor(
-		private readonly leftPane: AgentListPane,
-		private readonly rightPane: AgentInspectorPane,
-		private readonly maxHeight: number,
-	) {}
-
-	render(width: number): string[] {
-		const leftWidth = Math.floor(width * 0.5);
-		const rightWidth = width - leftWidth - 3;
-		const leftLines = this.leftPane.render(leftWidth);
-		const rightLines = this.rightPane.render(rightWidth);
-		const lineCount = Math.min(this.maxHeight, Math.max(leftLines.length, rightLines.length));
-		const out: string[] = [];
-		const separator = theme.fg("dim", ` ${theme.boxSharp.vertical} `);
-
-		for (let i = 0; i < lineCount; i++) {
-			const left = truncateToWidth(leftLines[i] ?? "", leftWidth);
-			const leftPadded = left + padding(Math.max(0, leftWidth - visibleWidth(left)));
-			const right = truncateToWidth(rightLines[i] ?? "", rightWidth);
-			out.push(leftPadded + separator + right);
-		}
-
-		return out;
-	}
-
-	invalidate(): void {
-		this.leftPane.invalidate?.();
-		this.rightPane.invalidate?.();
-	}
-}
-
 export class AgentDashboard extends Container {
 	#settingsManager: Settings | null = null;
 	#allAgents: DashboardAgent[] = [];
@@ -870,7 +838,7 @@ export class AgentDashboard extends Container {
 	}
 
 	#uiWidth(): number {
-		return Math.max(40, process.stdout.columns ?? 100);
+		return Math.max(40, resolveTerminalColumns());
 	}
 
 	/** Rebuild layout and request a TUI render pass (for use after async state changes). */

package/src/modes/components/custom-editor.ts

@@ -9,6 +9,7 @@ type ConfigurableEditorAction = Extract<
 	| "app.exit"
 	| "app.suspend"
 	| "app.thinking.cycle"
+	| "app.commandPalette.open"
 	| "app.model.cycleForward"
 	| "app.model.cycleBackward"
 	| "app.model.select"
@@ -33,6 +34,7 @@ const CONFIGURABLE_EDITOR_ACTIONS = [
 	"app.exit",
 	"app.suspend",
 	"app.thinking.cycle",
+	"app.commandPalette.open",
 	"app.model.cycleForward",
 	"app.model.cycleBackward",
 	"app.model.select",
@@ -76,6 +78,7 @@ export class CustomEditor extends Editor {
 	onClear?: () => void;
 	onExit?: () => void;
 	onCycleThinkingLevel?: () => void;
+	onOpenCommandPalette?: () => void;
 	onCycleModelForward?: () => void;
 	onCycleModelBackward?: () => void;
 	onSelectModel?: () => void;
@@ -100,6 +103,10 @@ export class CustomEditor extends Editor {
 	onQueue?: () => void;
 	/** Called when Caps Lock is pressed. */
 	onCapsLock?: () => void;
+	/** Called when PageUp/PageDown should scroll the transcript viewport instead of prompt history. */
+	onViewportPageScroll?: (direction: -1 | 1) => void;
+	/** Called before regular composer input should return the transcript viewport to the live bottom. */
+	onViewportFollowLive?: () => void;
 
 	/** Custom key handlers from extensions and non-built-in app actions. */
 	#customKeyHandlers = new Map<KeyId, () => boolean | undefined>();
@@ -240,6 +247,20 @@ export class CustomEditor extends Editor {
 				return;
 			}
 		}
+		if (!this.isShowingAutocomplete()) {
+			if (matchesKey(data, "pageUp") && this.onViewportPageScroll) {
+				this.onViewportPageScroll(-1);
+				return;
+			}
+			if (matchesKey(data, "pageDown") && this.onViewportPageScroll) {
+				this.onViewportPageScroll(1);
+				return;
+			}
+		}
+
+		if (!matchesKey(data, "pageUp") && !matchesKey(data, "pageDown")) {
+			this.onViewportFollowLive?.();
+		}
 		// Intercept configured image paste (async - fires and handles result)
 		if (this.#matchesAction(data, "app.clipboard.pasteImage") && this.onPasteImage) {
 			void this.onPasteImage();
@@ -288,6 +309,11 @@ export class CustomEditor extends Editor {
 			return;
 		}
 
+		// Intercept configured command palette shortcut before model cycling (Ctrl+P default).
+		if (this.#matchesAction(data, "app.commandPalette.open") && this.onOpenCommandPalette) {
+			this.onOpenCommandPalette();
+			return;
+		}
 		// Intercept configured backward model cycling (check before forward cycling)
 		if (this.#matchesAction(data, "app.model.cycleBackward") && this.onCycleModelBackward) {
 			this.onCycleModelBackward();

package/src/modes/components/custom-model-preset-wizard.ts

@@ -6,15 +6,6 @@ import { DynamicBorder } from "./dynamic-border";
 
 const PROFILE_NAME_PATTERN = /^[a-z0-9][a-z0-9._-]*$/;
 
-type WizardStep = "name" | "display-name" | "provider" | "model" | "confirm";
-
-interface WizardState {
-	name: string;
-	displayName: string;
-	provider: string;
-	model: string;
-}
-
 export interface CustomModelPresetWizardSubmit {
 	name: string;
 	profile: ModelProfileConfig;
@@ -23,25 +14,21 @@ export interface CustomModelPresetWizardSubmit {
 export class CustomModelPresetWizardComponent extends Container {
 	#contentContainer: Container;
 	#input: Input | null = null;
-	#step: WizardStep = "name";
-	#selectedIndex = 0;
 	#lastError: string | null = null;
-	#state: WizardState = {
-		name: "",
-		displayName: "",
-		provider: "",
-		model: "",
-	};
+	#name = "";
+	#snapshot: ModelProfileConfig;
 	#onSubmit: (input: CustomModelPresetWizardSubmit) => void;
 	#onCancel: () => void;
 	#onRender: () => void;
 
 	constructor(
+		snapshot: ModelProfileConfig,
 		onSubmit: (input: CustomModelPresetWizardSubmit) => void,
 		onCancel: () => void,
 		onRender: () => void = () => {},
 	) {
 		super();
+		this.#snapshot = snapshot;
 		this.#onSubmit = onSubmit;
 		this.#onCancel = onCancel;
 		this.#onRender = onRender;
@@ -51,7 +38,7 @@ export class CustomModelPresetWizardComponent extends Container {
 		this.addChild(new TruncatedText(theme.bold("Create custom model preset")));
 		this.addChild(
 			new TruncatedText(
-				theme.fg("muted", "  Save provider/model as a selectable profile. Secrets are not requested."),
+				theme.fg("muted", "  Save the current default and explicit role models as a selectable profile."),
 				0,
 				0,
 			),
@@ -72,222 +59,76 @@ export class CustomModelPresetWizardComponent extends Container {
 
 	handleInput(keyData: string): void {
 		if (matchesAppInterrupt(keyData)) {
-			if (this.#step === "name") {
-				this.#onCancel();
-				return;
-			}
-			this.#goBack();
+			this.#onCancel();
 			return;
 		}
 
 		if (this.#input) {
 			if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
-				this.#saveInputAndProceed();
+				this.#saveInputAndSubmit();
 				return;
 			}
 			this.#input.handleInput(keyData);
-			return;
-		}
-
-		if (matchesKey(keyData, "up")) {
-			this.#moveSelection(-1);
-			return;
-		}
-		if (matchesKey(keyData, "down")) {
-			this.#moveSelection(1);
-			return;
-		}
-		if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
-			this.#selectCurrentOption();
 		}
 	}
 
 	#renderStep(): void {
 		this.#contentContainer.clear();
 		this.#input = null;
-		switch (this.#step) {
-			case "name":
-				this.#renderInputStep(
-					"Step 1: Preset id",
-					"Enter a unique preset id:",
-					this.#state.name,
-					"e.g. my-fast-coder",
-				);
-				break;
-			case "display-name":
-				this.#renderInputStep(
-					"Step 2: Display name",
-					"Enter a display name:",
-					this.#state.displayName,
-					"e.g. My Fast Coder",
-				);
-				break;
-			case "provider":
-				this.#renderInputStep(
-					"Step 3: Provider",
-					"Enter the provider id:",
-					this.#state.provider,
-					"e.g. openai-codex, anthropic, my-oai",
-				);
-				break;
-			case "model":
-				this.#renderInputStep(
-					"Step 4: Model",
-					"Enter the model id or provider/model selector:",
-					this.#state.model,
-					"e.g. gpt-5.5:medium or my-oai/gpt-example:low",
-				);
-				break;
-			case "confirm":
-				this.#renderConfirmStep();
-				break;
-		}
-	}
-
-	#renderInputStep(title: string, prompt: string, value: string, hint: string): void {
-		this.#contentContainer.addChild(new Text(theme.fg("accent", title)));
+		this.#contentContainer.addChild(new Text(theme.fg("accent", "Preset id")));
 		this.#contentContainer.addChild(new Spacer(1));
 		if (this.#lastError) {
 			this.#contentContainer.addChild(new Text(theme.fg("error", this.#lastError), 0, 0));
 			this.#contentContainer.addChild(new Spacer(1));
 		}
-		this.#contentContainer.addChild(new Text(prompt, 0, 0));
+		this.#contentContainer.addChild(new Text("Enter a unique preset id:", 0, 0));
 		this.#contentContainer.addChild(new Spacer(1));
 		this.#input = new Input();
-		this.#input.setValue(value);
+		this.#input.setValue(this.#name);
 		this.#contentContainer.addChild(this.#input);
 		this.#contentContainer.addChild(new Spacer(1));
-		this.#addHelp(hint);
-		this.#addHelp("[Enter to continue, Esc to go back]");
+		this.#addSnapshotPreview();
+		this.#addHelp("e.g. my-fast-coder");
+		this.#addHelp("[Enter to create, Esc to cancel]");
 	}
 
-	#renderConfirmStep(): void {
-		this.#contentContainer.addChild(new Text(theme.fg("accent", "Confirm custom preset")));
-		this.#contentContainer.addChild(new Spacer(1));
-		if (this.#lastError) {
-			this.#contentContainer.addChild(new Text(theme.fg("error", this.#lastError), 0, 0));
-			this.#contentContainer.addChild(new Spacer(1));
+	#addSnapshotPreview(): void {
+		this.#contentContainer.addChild(new Text(theme.fg("muted", "Snapshot:"), 0, 0));
+		for (const [role, selector] of Object.entries(this.#snapshot.model_mapping)) {
+			this.#contentContainer.addChild(new Text(`  ${role}: ${selector}`, 0, 0));
 		}
-		this.#contentContainer.addChild(new Text(`Preset id: ${this.#state.name}`, 0, 0));
-		this.#contentContainer.addChild(new Text(`Display name: ${this.#state.displayName}`, 0, 0));
-		this.#contentContainer.addChild(new Text(`Provider: ${this.#state.provider}`, 0, 0));
-		this.#contentContainer.addChild(new Text(`Default model: ${this.#selector()}`, 0, 0));
+		this.#contentContainer.addChild(new Text(`  providers: ${this.#snapshot.required_providers.join(", ")}`, 0, 0));
 		this.#contentContainer.addChild(new Spacer(1));
-		this.#addOption(0, "Create preset");
-		this.#addOption(1, "Go back");
-		this.#addHelp("[↑↓ to navigate, Enter to select, Esc to go back]");
-	}
-
-	#addOption(index: number, label: string): void {
-		const selected = index === this.#selectedIndex;
-		const prefix = selected ? theme.fg("accent", `${theme.nav.cursor} `) : "  ";
-		this.#contentContainer.addChild(new Text(`${prefix}${selected ? theme.fg("accent", label) : label}`, 0, 0));
 	}
 
 	#addHelp(text: string): void {
 		this.#contentContainer.addChild(new Text(theme.fg("muted", text), 0, 0));
 	}
 
-	#saveInputAndProceed(): void {
+	#saveInputAndSubmit(): void {
 		const value = this.#input?.getValue().trim() ?? "";
 		if (!value) {
-			this.#lastError = this.#emptyFieldMessage();
+			this.#lastError = "Preset id is required.";
 			this.#renderStep();
 			this.#onRender();
 			return;
 		}
-		const validationError = this.#validateCurrentInput(value);
-		if (validationError) {
-			this.#lastError = validationError;
+		if (!PROFILE_NAME_PATTERN.test(value)) {
+			this.#lastError = "Preset id must use lowercase letters, numbers, dots, underscores, or hyphens.";
 			this.#renderStep();
 			this.#onRender();
 			return;
 		}
+		this.#name = value;
 		this.#lastError = null;
-		if (this.#step === "name") {
-			this.#state.name = value;
-			this.#step = "display-name";
-		} else if (this.#step === "display-name") {
-			this.#state.displayName = value;
-			this.#step = "provider";
-		} else if (this.#step === "provider") {
-			this.#state.provider = value;
-			this.#step = "model";
-		} else if (this.#step === "model") {
-			this.#state.model = value;
-			this.#step = "confirm";
-			this.#selectedIndex = 0;
-		}
-		this.#renderStep();
-		this.#onRender();
-	}
-
-	#emptyFieldMessage(): string {
-		switch (this.#step) {
-			case "name":
-				return "Preset id is required.";
-			case "display-name":
-				return "Display name is required.";
-			case "provider":
-				return "Provider is required.";
-			case "model":
-				return "Model is required.";
-			case "confirm":
-				return "Value is required.";
-		}
-	}
-
-	#validateCurrentInput(value: string): string | undefined {
-		if (this.#step === "name" && !PROFILE_NAME_PATTERN.test(value)) {
-			return "Preset id must use lowercase letters, numbers, dots, underscores, or hyphens.";
-		}
-		if (this.#step === "provider" && !PROFILE_NAME_PATTERN.test(value)) {
-			return "Provider id must use lowercase letters, numbers, dots, underscores, or hyphens.";
-		}
-		if (this.#step === "model" && value.includes(",")) {
-			return "Model must be one selector, not a comma-separated list.";
-		}
-		return undefined;
-	}
-
-	#selectCurrentOption(): void {
-		if (this.#step !== "confirm") return;
-		if (this.#selectedIndex === 0) {
-			this.#onSubmit(this.#buildInput());
-			return;
-		}
-		this.#goBack();
-	}
-
-	#buildInput(): CustomModelPresetWizardSubmit {
-		return {
-			name: this.#state.name,
+		this.#onSubmit({
+			name: value,
 			profile: {
-				required_providers: [this.#state.provider],
-				display_name: this.#state.displayName,
-				model_mapping: { default: this.#selector() },
+				...this.#snapshot,
+				display_name: value,
+				model_mapping: { ...this.#snapshot.model_mapping },
+				required_providers: [...this.#snapshot.required_providers],
 			},
-		};
-	}
-
-	#selector(): string {
-		return this.#state.model.includes("/") ? this.#state.model : `${this.#state.provider}/${this.#state.model}`;
-	}
-
-	#moveSelection(delta: number): void {
-		this.#selectedIndex = (this.#selectedIndex + delta + 2) % 2;
-		this.#renderStep();
-		this.#onRender();
-	}
-
-	#goBack(): void {
-		if (this.#step === "display-name") this.#step = "name";
-		else if (this.#step === "provider") this.#step = "display-name";
-		else if (this.#step === "model") this.#step = "provider";
-		else if (this.#step === "confirm") this.#step = "model";
-		this.#selectedIndex = 0;
-		this.#lastError = null;
-		this.#renderStep();
-		this.#onRender();
+		});
 	}
 }

package/src/modes/components/extensions/extension-dashboard.ts

@@ -11,20 +11,12 @@
  * - Space: Toggle selected item (or master switch)
  * - Esc: Close dashboard (clears search first if active)
  */
-import {
-	type Component,
-	Container,
-	matchesKey,
-	padding,
-	Spacer,
-	Text,
-	truncateToWidth,
-	visibleWidth,
-} from "@sayknow-cli/tui";
+import { Container, matchesKey, Spacer, Text } from "@sayknow-cli/tui";
 import { Settings } from "../../../config/settings";
 import { DynamicBorder } from "../../../modes/components/dynamic-border";
 import { theme } from "../../../modes/theme/theme";
 import { matchesAppInterrupt } from "../../../modes/utils/keybinding-matchers";
+import { TwoColumnBody } from "../two-column-body";
 import { ExtensionList } from "./extension-list";
 import { InspectorPanel } from "./inspector-panel";
 import {
@@ -310,41 +302,3 @@ export class ExtensionDashboard extends Container {
 		}
 	}
 }
-
-/**
- * Two-column body component for side-by-side rendering.
- */
-class TwoColumnBody implements Component {
-	constructor(
-		private readonly leftPane: ExtensionList,
-		private readonly rightPane: InspectorPanel,
-		private readonly maxHeight: number,
-	) {}
-
-	render(width: number): string[] {
-		const leftWidth = Math.floor(width * 0.5);
-		const rightWidth = Math.max(0, width - leftWidth - 3);
-
-		const leftLines = this.leftPane.render(leftWidth);
-		const rightLines = this.rightPane.render(rightWidth);
-
-		// Limit to maxHeight lines
-		const numLines = Math.min(this.maxHeight, Math.max(leftLines.length, rightLines.length));
-		const combined: string[] = [];
-		const separator = theme.fg("dim", ` ${theme.boxSharp.vertical} `);
-
-		for (let i = 0; i < numLines; i++) {
-			const left = truncateToWidth(leftLines[i] ?? "", leftWidth);
-			const leftPadded = left + padding(Math.max(0, leftWidth - visibleWidth(left)));
-			const right = truncateToWidth(rightLines[i] ?? "", rightWidth);
-			combined.push(leftPadded + separator + right);
-		}
-
-		return combined;
-	}
-
-	invalidate(): void {
-		this.leftPane.invalidate?.();
-		this.rightPane.invalidate?.();
-	}
-}

package/src/modes/components/hook-selector.ts

@@ -59,6 +59,11 @@ export interface HookSelectorOptions {
 		optionLabel: string;
 		onSubmit: (text: string) => void;
 	};
+	clarificationInput?: {
+		optionLabel: string;
+		onSubmit: (text: string) => void;
+		allowEmpty?: boolean;
+	};
 	/**
 	 * Autocomplete provider for the inline custom-input editor. When present,
 	 * the "Other (type your own)" editor gains the same `@` file-link and `/`
@@ -339,6 +344,8 @@ export class HookSelectorComponent extends Container {
 	#outline: boolean;
 	#scrollTitleRows: number | undefined;
 	#customInput: { optionLabel: string; onSubmit: (text: string) => void } | undefined;
+	#clarificationInput: { optionLabel: string; onSubmit: (text: string) => void; allowEmpty?: boolean } | undefined;
+	#activeInput: { onSubmit: (text: string) => void; allowEmpty?: boolean } | undefined;
 	#inputArea: Container;
 	#inlineEditor: Editor | undefined;
 	#helpTextComponent: Text;
@@ -366,6 +373,7 @@ export class HookSelectorComponent extends Container {
 		this.#wrapFocused = opts?.wrapFocused === true;
 		this.#outline = opts?.outline === true;
 		this.#customInput = opts?.customInput;
+		this.#clarificationInput = opts?.clarificationInput;
 		this.#tui = opts?.tui;
 		this.#autocompleteProvider = opts?.autocompleteProvider;
 
@@ -501,7 +509,11 @@ export class HookSelectorComponent extends Container {
 			const selected = this.#options[this.#selectedIndex];
 			if (!selected) return;
 			if (this.#customInput && selected === this.#customInput.optionLabel) {
-				this.#enterInputMode();
+				this.#enterInputMode(this.#customInput);
+				return;
+			}
+			if (this.#clarificationInput && selected === this.#clarificationInput.optionLabel) {
+				this.#enterInputMode(this.#clarificationInput);
 				return;
 			}
 			this.#onSelectCallback(selected);
@@ -536,14 +548,19 @@ export class HookSelectorComponent extends Container {
 			return;
 		}
 		if (matchesKey(keyData, "enter") || matchesKey(keyData, "return")) {
-			this.#customInput?.onSubmit(editor.getExpandedText());
+			const text = editor.getExpandedText();
+			if (this.#activeInput?.allowEmpty === false && text.trim() === "") {
+				return;
+			}
+			this.#activeInput?.onSubmit(text);
 			return;
 		}
 		editor.handleInput(keyData);
 	}
 
-	#enterInputMode(): void {
+	#enterInputMode(input: { onSubmit: (text: string) => void; allowEmpty?: boolean }): void {
 		if (this.#inlineEditor) return;
+		this.#activeInput = input;
 		// Stop the auto-select countdown for good: the user is actively typing,
 		// matching the old behavior where the separate editor had no timeout.
 		if (this.#countdown) {
@@ -578,6 +595,7 @@ export class HookSelectorComponent extends Container {
 	#exitInputMode(): void {
 		if (!this.#inlineEditor) return;
 		this.#inlineEditor = undefined;
+		this.#activeInput = undefined;
 		this.#inputArea.clear();
 		this.#helpTextComponent.setText(theme.fg("dim", this.#baseHelpText));
 		this.invalidate();