@selesai/code 0.3.10 → 0.5.0

package/dist/extensions/question/index.ts

@@ -11,23 +11,21 @@ import {
 	Key,
 	Markdown,
 	matchesKey,
-	type OverlayHandle,
 	Spacer,
 	Text,
 	type TUI,
 	truncateToWidth,
-	wrapTextWithAnsi,
 } from "@earendil-works/pi-tui";
 
-import { BOX_BORDER_LEFT, BOX_BORDER_OVERHEAD, BOX_BORDER_RIGHT, OVERLAY_MAX_HEIGHT_RATIO, QUESTION_STATUS_KEY, QUESTION_VERSION } from "./constants.ts";
+import { BOX_BORDER_LEFT, BOX_BORDER_OVERHEAD, BOX_BORDER_RIGHT, QUESTION_VERSION } from "./constants.ts";
 import { DialogFallback } from "./dialog-adapter.ts";
 import { createFreeformResponse, createSelectionResponse, formatOptionsForMessage, formatResponseSummary, getOptionsFormatError, normalizeOptions, oneLine, safeMarkdownTheme } from "./helpers.ts";
 import { QuestionList } from "./question-list.ts";
 import { MultiSelect, SingleSelect } from "./selection-mode.ts";
 import { resolveShortcuts } from "./shortcuts.ts";
 import { QuestionParamsSchema } from "./schemas.ts";
-import type { DisplayMode, QuestionDetails, QuestionMode, QuestionOption, QuestionResponse, RawOption, ResolvedShortcuts } from "./types.ts";
-import { buildCustomUIOptions, createTUIProtocol } from "./tui-adapter.ts";
+import type { QuestionDetails, QuestionMode, QuestionOption, QuestionResponse, RawOption, ResolvedShortcuts } from "./types.ts";
+import { createTUIProtocol } from "./tui-adapter.ts";
 import type { CustomFactory, UIProtocol } from "./ui-protocol.ts";
 
 // ---------------------------------------------------------------------------
@@ -113,7 +111,6 @@ class QuestionComponent extends Container implements Component {
 		private allowMultiple: boolean,
 		private allowFreeform: boolean,
 		private allowComment: boolean,
-		private displayMode: DisplayMode,
 		private tui: TUI,
 		private theme: Theme,
 		private keybindings: KeybindingsManager,
@@ -183,14 +180,6 @@ class QuestionComponent extends Container implements Component {
 
 	override render(width: number): string[] {
 		const innerWidth = Math.max(1, width - BOX_BORDER_OVERHEAD);
-
-		if (this.mode === "select" && !this.allowMultiple) {
-			const overlayMaxHeight = Math.max(12, Math.floor(this.tui.terminal.rows * OVERLAY_MAX_HEIGHT_RATIO));
-			const staticLines = this.countStaticLines(innerWidth);
-			const availableOptionRows = Math.max(4, overlayMaxHeight - staticLines);
-			this.ensureList().setMaxVisibleRows(availableOptionRows);
-		}
-
 		const rawLines = super.render(innerWidth);
 		const borderColor = (s: string) => this.theme.fg("accent", s);
 		const titleColor = (s: string) => this.theme.fg("dim", this.theme.bold(s));
@@ -203,20 +192,6 @@ class QuestionComponent extends Container implements Component {
 		});
 	}
 
-	private countWrappedLines(text: string, width: number): number {
-		return Math.max(1, wrapTextWithAnsi(text, Math.max(10, width - 2)).length);
-	}
-
-	private countStaticLines(width: number): number {
-		const titleLines = 1;
-		const questionLines = this.countWrappedLines(this.question, width);
-		const contextLines = this.context ? 1 + this.countWrappedLines(this.context, width) : 0;
-		const helpLines = 1;
-		const borderLines = 2;
-		const spacerLines = this.context ? 6 : 5;
-		return borderLines + spacerLines + titleLines + questionLines + contextLines + helpLines;
-	}
-
 	private updateStaticText(): void {
 		const theme = this.theme;
 		const title = this.mode === "comment" ? "Optional comment" : "Question";
@@ -235,10 +210,6 @@ class QuestionComponent extends Container implements Component {
 	private updateHelpText(): void {
 		const theme = this.theme;
 		const kb = this.keybindings;
-		const overlayHint =
-			this.displayMode === "overlay" && !this.shortcuts.overlayToggle.disabled
-				? `${theme.fg("dim", this.shortcuts.overlayToggle.spec)}${theme.fg("muted", " hide")}`
-				: null;
 		const commentHint =
 			this.allowComment && !this.shortcuts.commentToggle.disabled
 				? `${theme.fg("dim", this.shortcuts.commentToggle.spec)}${theme.fg("muted", " toggle context")}`
@@ -249,7 +220,6 @@ class QuestionComponent extends Container implements Component {
 				`${theme.fg("dim", kb.getKeys("tui.input.submit").join("/"))}${theme.fg("muted", this.mode === "comment" ? " submit/skip" : " submit")}`,
 				`${theme.fg("dim", kb.getKeys("tui.input.newLine").join("/"))}${theme.fg("muted", " newline")}`,
 				`${theme.fg("dim", "esc")}${theme.fg("muted", " back")}`,
-				overlayHint,
 			]
 				.filter((h): h is string => !!h)
 				.join(" • ");
@@ -262,7 +232,6 @@ class QuestionComponent extends Container implements Component {
 				`${theme.fg("dim", "↑↓")}${theme.fg("muted", " navigate")}`,
 				`${theme.fg("dim", "space")}${theme.fg("muted", " toggle")}`,
 				commentHint,
-				overlayHint,
 				`${theme.fg("dim", kb.getKeys("tui.select.confirm").join("/"))}${theme.fg("muted", " submit")}`,
 				`${theme.fg("dim", kb.getKeys("tui.select.cancel").join("/"))}${theme.fg("muted", " cancel")}`,
 			]
@@ -275,7 +244,6 @@ class QuestionComponent extends Container implements Component {
 				`${theme.fg("dim", kb.getKeys("tui.editor.deleteCharBackward").join("/"))}${theme.fg("muted", " erase")}`,
 				`${theme.fg("dim", "↑↓")}${theme.fg("muted", " navigate")}`,
 				commentHint,
-				overlayHint,
 				`${theme.fg("dim", kb.getKeys("tui.select.confirm").join("/"))}${theme.fg("muted", " select")}`,
 				`${theme.fg("dim", "esc")}${theme.fg("muted", " clear/cancel")}`,
 			]
@@ -433,13 +401,7 @@ export default function questionExtension(pi: ExtensionAPI) {
 			const allowComment = params.allowComment ?? false;
 			const timeout = params.timeout as number | undefined;
 
-			const envMode = process.env.PI_QUESTION_DISPLAY_MODE;
-			const envDisplayMode: DisplayMode | undefined = envMode === "overlay" || envMode === "inline" ? envMode : undefined;
-			const effectiveDisplayMode: DisplayMode = (params.displayMode as DisplayMode | undefined) ?? envDisplayMode ?? "overlay";
-
 			const shortcuts: ResolvedShortcuts = resolveShortcuts(
-				params.overlayToggleKey as string | null | undefined,
-				process.env.PI_QUESTION_OVERLAY_TOGGLE_KEY,
 				params.commentToggleKey as string | null | undefined,
 				process.env.PI_QUESTION_COMMENT_TOGGLE_KEY,
 			);
@@ -473,42 +435,12 @@ export default function questionExtension(pi: ExtensionAPI) {
 				};
 			}
 
-			protocol.setStatus(
-				QUESTION_STATUS_KEY,
-				protocol.theme.fg("accent", `waiting: ${oneLine((normalizedContext ? `${normalizedContext}: ` : "") + rawQuestion, 48)}`),
-			);
-
-			// No options: pure freeform via dialog input.
-			if (options.length === 0) {
-				if (!allowFreeform) {
-					protocol.setStatus(QUESTION_STATUS_KEY, protocol.theme.fg("error", "question failed"));
-					return {
-						content: [{ type: "text", text: "Question options are empty and allowFreeform is false." }],
-						isError: true,
-						details: { ...detailsBase, response: null, cancelled: true } satisfies QuestionDetails,
-					};
-				}
-				try {
-					const prompt = normalizedContext ? `${rawQuestion}\n\nContext:\n${normalizedContext}` : rawQuestion;
-					const answer = await protocol.input(prompt, "Type your answer...", timeout ? { timeout } : undefined);
-					const response = createFreeformResponse(answer);
-					if (!response) {
-						protocol.setStatus(QUESTION_STATUS_KEY, protocol.theme.fg("warning", "question cancelled"));
-						return {
-							content: [{ type: "text", text: "User cancelled the question" }],
-							details: { ...detailsBase, response: null, cancelled: true } satisfies QuestionDetails,
-						};
-					}
-					pi.events.emit("question:answered", { question: rawQuestion, context: normalizedContext, response });
-					protocol.setStatus(QUESTION_STATUS_KEY, protocol.theme.fg("success", "question answered"));
-					return {
-						content: [{ type: "text", text: `User answered: ${formatResponseSummary(response)}` }],
-						details: { ...detailsBase, response, cancelled: false } satisfies QuestionDetails,
-					};
-				} catch (error) {
-					protocol.setStatus(QUESTION_STATUS_KEY, protocol.theme.fg("error", "question failed"));
-					throw error;
-				}
+			if (options.length === 0 && !allowFreeform) {
+				return {
+					content: [{ type: "text", text: "Question options are empty and allowFreeform is false." }],
+					isError: true,
+					details: { ...detailsBase, response: null, cancelled: true } satisfies QuestionDetails,
+				};
 			}
 
 			onUpdate?.({
@@ -517,9 +449,6 @@ export default function questionExtension(pi: ExtensionAPI) {
 			});
 
 			let result: QuestionResponse | null;
-			let overlayHandle: OverlayHandle | undefined;
-			let removeOverlayInputListener: (() => void) | undefined;
-			let hasAnnouncedHide = false;
 
 			try {
 				const customFactory: CustomFactory = (
@@ -541,7 +470,6 @@ export default function questionExtension(pi: ExtensionAPI) {
 						allowMultiple,
 						allowFreeform,
 						allowComment,
-						effectiveDisplayMode,
 						tui,
 						theme,
 						keybindings,
@@ -550,51 +478,27 @@ export default function questionExtension(pi: ExtensionAPI) {
 					);
 				};
 
-				const overlayToggle = shortcuts.overlayToggle;
-				if (
-					effectiveDisplayMode === "overlay" &&
-					!overlayToggle.disabled &&
-					typeof protocol.onTerminalInput === "function"
-				) {
-					removeOverlayInputListener = protocol.onTerminalInput((data) => {
-						if (!overlayToggle.matches(data) || !overlayHandle) return undefined;
-						const nextHidden = !overlayHandle.isHidden();
-						overlayHandle.setHidden(nextHidden);
-						if (nextHidden && !hasAnnouncedHide) {
-							hasAnnouncedHide = true;
-							protocol.notify?.(`question hidden — press ${overlayToggle.spec} to reopen`, "info");
-						}
-						return { consume: true };
-					});
-				}
-
-				const customResult = await protocol.custom(customFactory, buildCustomUIOptions(effectiveDisplayMode, (handle) => {
-					overlayHandle = handle;
-				}));
+				const customResult = await protocol.custom(customFactory);
 
 				if (customResult !== undefined) {
 					result = customResult;
 				} else {
 					// RPC/headless: custom() returns undefined — degrade to dialog protocol.
 					result = await DialogFallback.ask(
-						{ question: rawQuestion, context: normalizedContext, options, allowMultiple, allowFreeform, allowComment, displayMode: effectiveDisplayMode, shortcuts, timeout },
+						{ question: rawQuestion, context: normalizedContext, options, allowMultiple, allowFreeform, allowComment, shortcuts, timeout },
 						protocol,
 					);
 				}
 			} catch (error) {
 				const message = error instanceof Error ? `${error.message}\n${error.stack ?? ""}` : String(error);
-				protocol.setStatus(QUESTION_STATUS_KEY, protocol.theme.fg("error", "question failed"));
 				return {
 					content: [{ type: "text", text: `Question tool failed: ${message}` }],
 					isError: true,
 					details: { error: message } as unknown as QuestionDetails,
 				};
-			} finally {
-				removeOverlayInputListener?.();
 			}
 
 			if (result === null) {
-				protocol.setStatus(QUESTION_STATUS_KEY, protocol.theme.fg("warning", "question cancelled"));
 				pi.events.emit("question:cancelled", { question: rawQuestion, context: normalizedContext, options });
 				return {
 					content: [{ type: "text", text: "User cancelled the question" }],
@@ -602,7 +506,6 @@ export default function questionExtension(pi: ExtensionAPI) {
 				};
 			}
 
-			protocol.setStatus(QUESTION_STATUS_KEY, protocol.theme.fg("success", "question answered"));
 			pi.events.emit("question:answered", { question: rawQuestion, context: normalizedContext, response: result });
 			return {
 				content: [{ type: "text", text: `User answered: ${formatResponseSummary(result)}` }],

package/dist/extensions/question/schemas.ts

@@ -1,6 +1,6 @@
 // Typebox schemas for the question tool parameters.
 
-import { Type, type TUnsafe } from "typebox";
+import { Type } from "typebox";
 
 const OptionSchema = Type.Union([
 	Type.String({ description: "Option label" }),
@@ -10,19 +10,6 @@ const OptionSchema = Type.Union([
 	}),
 ]);
 
-/** Flat { type: "string", enum: [...] } instead of anyOf — Google function-calling rejects unions. */
-export function StringEnum<const T extends readonly string[]>(
-	values: T,
-	options?: { description?: string; default?: T[number] },
-): TUnsafe<T[number]> {
-	return Type.Unsafe<T[number]>({
-		type: "string",
-		enum: [...values],
-		...(options?.description ? { description: options.description } : {}),
-		...(options?.default !== undefined ? { default: options.default } : {}),
-	});
-}
-
 export const QuestionParamsSchema = Type.Object({
 	question: Type.String({ description: "Question to ask the user before continuing" }),
 	title: Type.Optional(Type.String({ description: "Short title for the question UI (deprecated alias of context summary)" })),
@@ -45,18 +32,6 @@ export const QuestionParamsSchema = Type.Object({
 	allowComment: Type.Optional(
 		Type.Boolean({ description: "Collect an optional comment after selecting one or more options. Default: false" }),
 	),
-	displayMode: Type.Optional(
-		StringEnum(["overlay", "inline"] as const, {
-			description:
-				"UI rendering mode. 'overlay' shows a centered modal, 'inline' renders in-place. Default: PI_QUESTION_DISPLAY_MODE env var if set, otherwise 'overlay'.",
-		}),
-	),
-	overlayToggleKey: Type.Optional(
-		Type.String({
-			description:
-				"Shortcut for hiding/showing the overlay popup (overlay mode only), e.g. 'alt+o'. Pass 'off' to disable. Default: PI_QUESTION_OVERLAY_TOGGLE_KEY env var if set, otherwise 'alt+o'.",
-		}),
-	),
 	commentToggleKey: Type.Optional(
 		Type.String({
 			description:

package/dist/extensions/question/shortcuts.ts

@@ -1,10 +1,9 @@
-// Shortcut resolution for overlay-toggle and comment-toggle keys.
+// Shortcut resolution for the optional-comment toggle key.
 
 import { matchesKey } from "@earendil-works/pi-tui";
 
-import { DISABLED_SHORTCUT, SHORTCUT_DISABLE_VALUES } from "./constants.ts";
+import { DEFAULT_COMMENT_TOGGLE_KEY, DISABLED_SHORTCUT, SHORTCUT_DISABLE_VALUES } from "./constants.ts";
 import type { ResolvedShortcut, ResolvedShortcuts } from "./types.ts";
-import { DEFAULT_COMMENT_TOGGLE_KEY, DEFAULT_OVERLAY_TOGGLE_KEY } from "./constants.ts";
 
 export function normalizeShortcutSpec(value: string | null | undefined): string | null | undefined {
 	if (value === undefined) return undefined;
@@ -40,14 +39,6 @@ export function resolveShortcut(
 	return DISABLED_SHORTCUT;
 }
 
-export function resolveShortcuts(
-	overlayToggleKey: string | null | undefined,
-	overlayEnv: string | undefined,
-	commentToggleKey: string | null | undefined,
-	commentEnv: string | undefined,
-): ResolvedShortcuts {
-	return {
-		overlayToggle: resolveShortcut(overlayToggleKey, overlayEnv, DEFAULT_OVERLAY_TOGGLE_KEY),
-		commentToggle: resolveShortcut(commentToggleKey, commentEnv, DEFAULT_COMMENT_TOGGLE_KEY),
-	};
-}
+export function resolveShortcuts(commentToggleKey: string | null | undefined, commentEnv: string | undefined): ResolvedShortcuts {
+	return { commentToggle: resolveShortcut(commentToggleKey, commentEnv, DEFAULT_COMMENT_TOGGLE_KEY) };
+}

package/dist/extensions/question/tests/question-list.test.ts

@@ -86,6 +86,14 @@ test("SingleSelect: confirm on freeform row → onEnterFreeform", () => {
 	assert.equal(called, true);
 });
 
+test("SingleSelect: no options with freeform → opens custom response", () => {
+	const list = new QuestionList([], SingleSelect, true, false, fakeTheme, fakeKeybindings(["tui.select.confirm"]), disabledShortcut);
+	let called = false;
+	list.onEnterFreeform = () => (called = true);
+	list.handleInput(ENTER);
+	assert.equal(called, true);
+});
+
 test("SingleSelect: confirm on comment-toggle → toggles comment, no submit", () => {
 	const list = new QuestionList(opts(["a"]), SingleSelect, false, true, fakeTheme, fakeKeybindings(["tui.select.confirm"]), disabledShortcut);
 	let submitted = false;

package/dist/extensions/question/tests/ui-protocol.test.ts

@@ -23,8 +23,6 @@ function fakeProtocol(overrides: Partial<UIProtocol> = {}): UIProtocol {
 			calls.push({ method: "input", args: [prompt, placeholder, opts] });
 			return overrides.input?.(prompt, placeholder, opts);
 		},
-		setStatus: () => {},
-		notify: () => {},
 		...overrides,
 	} as UIProtocol;
 }
@@ -37,11 +35,7 @@ function makeParams(overrides: Partial<ResolvedQuestionParams> = {}): ResolvedQu
 		allowMultiple: false,
 		allowFreeform: false,
 		allowComment: false,
-		displayMode: "overlay",
-		shortcuts: {
-			overlayToggle: { disabled: true, spec: null, matches: () => false },
-			commentToggle: { disabled: true, spec: null, matches: () => false },
-		},
+		shortcuts: { commentToggle: { disabled: true, spec: null, matches: () => false } },
 		timeout: undefined,
 		...overrides,
 	};

package/dist/extensions/question/tui-adapter.ts

@@ -1,33 +1,16 @@
 // TUI protocol adapter — wraps ctx.ui into UIProtocol.
 
 import type { ExtensionContext } from "@selesai/code";
-import type { OverlayHandle } from "@earendil-works/pi-tui";
 
-import { OVERLAY_MIN_WIDTH, OVERLAY_OVERLAY_MAX_HEIGHT, OVERLAY_WIDTH } from "./constants.ts";
-import type { DisplayMode, QuestionResponse } from "./types.ts";
-import type { CustomUIOptions, UIProtocol } from "./ui-protocol.ts";
-
-export function buildCustomUIOptions(
-	displayMode: DisplayMode,
-	onHandle?: (handle: OverlayHandle) => void,
-): CustomUIOptions | undefined {
-	if (displayMode === "inline") return undefined;
-	return {
-		overlay: true,
-		overlayOptions: { anchor: "center", width: OVERLAY_WIDTH, minWidth: OVERLAY_MIN_WIDTH, maxHeight: OVERLAY_OVERLAY_MAX_HEIGHT, margin: 1 },
-		...(onHandle ? { onHandle } : {}),
-	};
-}
+import type { QuestionResponse } from "./types.ts";
+import type { UIProtocol } from "./ui-protocol.ts";
 
 export function createTUIProtocol(ctx: ExtensionContext): UIProtocol {
 	return {
 		hasUI: ctx.hasUI,
 		theme: ctx.ui.theme,
-		custom: (factory, options) => ctx.ui.custom(factory as any, options as any) as Promise<QuestionResponse | null | undefined>,
+		custom: (factory) => ctx.ui.custom(factory as any) as Promise<QuestionResponse | null | undefined>,
 		select: (prompt, options, opts) => ctx.ui.select(prompt, options, opts),
 		input: (prompt, placeholder, opts) => ctx.ui.input(prompt, placeholder, opts),
-		onTerminalInput: typeof ctx.ui.onTerminalInput === "function" ? ctx.ui.onTerminalInput.bind(ctx.ui) : undefined,
-		setStatus: (key, text) => ctx.ui.setStatus(key, text),
-		notify: (msg, level) => ctx.ui.notify(msg, level),
 	};
 }

package/dist/extensions/question/types.ts

@@ -21,8 +21,6 @@ export interface QuestionDetails {
 	cancelled: boolean;
 }
 
-export type DisplayMode = "overlay" | "inline";
-
 export interface QuestionParams {
 	question: string;
 	context?: string;
@@ -30,8 +28,6 @@ export interface QuestionParams {
 	allowMultiple?: boolean;
 	allowFreeform?: boolean;
 	allowComment?: boolean;
-	displayMode?: DisplayMode;
-	overlayToggleKey?: string | null;
 	commentToggleKey?: string | null;
 	timeout?: number;
 }
@@ -45,7 +41,6 @@ export type ResolvedShortcut =
 	| { disabled: true; spec: null; matches: (data: string) => false };
 
 export interface ResolvedShortcuts {
-	overlayToggle: ResolvedShortcut;
 	commentToggle: ResolvedShortcut;
 }
 
@@ -96,7 +91,6 @@ export interface ResolvedQuestionParams {
 	allowMultiple: boolean;
 	allowFreeform: boolean;
 	allowComment: boolean;
-	displayMode: DisplayMode;
 	shortcuts: ResolvedShortcuts;
 	timeout: number | undefined;
 }

package/dist/extensions/question/ui-protocol.ts

@@ -1,7 +1,7 @@
 // UIProtocol port — abstracts TUI vs dialog/RPC transport.
 
 import type { KeybindingsManager } from "@selesai/code";
-import type { OverlayHandle, Theme, TUI } from "@earendil-works/pi-tui";
+import type { Theme, TUI } from "@earendil-works/pi-tui";
 
 import type { QuestionResponse, ResolvedQuestionParams } from "./types.ts";
 
@@ -18,27 +18,12 @@ export type CustomFactory = (
 	done: (result: QuestionResponse | null) => void,
 ) => CustomFactoryResult;
 
-export interface CustomUIOptions {
-	overlay?: boolean;
-	overlayOptions?: {
-		anchor: string;
-		width: string;
-		minWidth: number;
-		maxHeight: string;
-		margin: number;
-	};
-	onHandle?: (handle: OverlayHandle) => void;
-}
-
 export interface UIProtocol {
 	readonly hasUI: boolean;
 	readonly theme: Theme;
-	custom(factory: CustomFactory, options?: CustomUIOptions): Promise<QuestionResponse | null | undefined>;
+	custom(factory: CustomFactory): Promise<QuestionResponse | null | undefined>;
 	select(prompt: string, options: string[], opts?: { timeout?: number }): Promise<string | undefined>;
 	input(prompt: string, placeholder?: string, opts?: { timeout?: number }): Promise<string | undefined>;
-	onTerminalInput?(handler: (data: string) => { consume: boolean } | void): () => void;
-	setStatus(key: string, text: string): void;
-	notify(message: string, level: "info" | "warning" | "error"): void;
 }
 
 export interface FallbackProtocol {