pi-ask-tool-extension 0.2.4 → 0.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-ask-tool-extension",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Ask tool extension for pi with tabbed questioning and inline note editing",
   "repository": {
     "type": "git",

package/src/ask-inline-note.ts

@@ -1,4 +1,4 @@
-import { wrapTextWithAnsi } from "@mariozechner/pi-tui";
+import { CURSOR_MARKER, wrapTextWithAnsi } from "@mariozechner/pi-tui";
 
 const INLINE_NOTE_SEPARATOR = " — note: ";
 const INLINE_EDIT_CURSOR_INVERT_ON = "\u001b[7m";
@@ -17,14 +17,19 @@ function clampCursorIndex(index: number, rawTextLength: number): number {
 	return Math.floor(index);
 }
 
-function buildEditingInlineNote(rawNote: string, editingCursorIndex?: number): string {
+function buildEditingInlineNote(
+	rawNote: string,
+	editingCursorIndex?: number,
+	includeHardwareCursorMarker = false,
+): string {
 	const cursorIndex = clampCursorIndex(editingCursorIndex ?? rawNote.length, rawNote.length);
 	const beforeCursor = sanitizeNoteForInlineDisplay(rawNote.slice(0, cursorIndex));
 	const rawCharAtCursor = rawNote.slice(cursorIndex, cursorIndex + 1);
 	const charAtCursor = sanitizeNoteForInlineDisplay(rawCharAtCursor) || " ";
 	const afterCursorStartIndex = rawCharAtCursor.length > 0 ? cursorIndex + 1 : cursorIndex;
 	const afterCursor = sanitizeNoteForInlineDisplay(rawNote.slice(afterCursorStartIndex));
-	const cursorCell = `${INLINE_EDIT_CURSOR_INVERT_ON}${charAtCursor}${INLINE_EDIT_CURSOR_INVERT_OFF}`;
+	const cursorMarker = includeHardwareCursorMarker ? CURSOR_MARKER : "";
+	const cursorCell = `${cursorMarker}${INLINE_EDIT_CURSOR_INVERT_ON}${charAtCursor}${INLINE_EDIT_CURSOR_INVERT_OFF}`;
 	return `${beforeCursor}${cursorCell}${afterCursor}`;
 }
 
@@ -48,6 +53,7 @@ export function buildOptionLabelWithInlineNote(
 	isEditingNote: boolean,
 	maxInlineLabelLength?: number,
 	editingCursorIndex?: number,
+	includeHardwareCursorMarker = false,
 ): string {
 	const sanitizedNote = sanitizeNoteForInlineDisplay(rawNote);
 	if (!isEditingNote && sanitizedNote.trim().length === 0) {
@@ -55,7 +61,9 @@ export function buildOptionLabelWithInlineNote(
 	}
 
 	const labelPrefix = `${baseOptionLabel}${INLINE_NOTE_SEPARATOR}`;
-	const inlineNote = isEditingNote ? buildEditingInlineNote(rawNote, editingCursorIndex) : sanitizedNote.trim();
+	const inlineNote = isEditingNote
+		? buildEditingInlineNote(rawNote, editingCursorIndex, includeHardwareCursorMarker)
+		: sanitizedNote.trim();
 	const inlineLabel = `${labelPrefix}${inlineNote}`;
 
 	if (maxInlineLabelLength == null) {
@@ -74,6 +82,7 @@ export function buildWrappedOptionLabelWithInlineNote(
 	maxInlineLabelLength: number,
 	wrapPadding = INLINE_NOTE_WRAP_PADDING,
 	editingCursorIndex?: number,
+	includeHardwareCursorMarker = false,
 ): string[] {
 	const inlineLabel = buildOptionLabelWithInlineNote(
 		baseOptionLabel,
@@ -81,6 +90,7 @@ export function buildWrappedOptionLabelWithInlineNote(
 		isEditingNote,
 		undefined,
 		editingCursorIndex,
+		includeHardwareCursorMarker,
 	);
 	const sanitizedWrapPadding = Number.isFinite(wrapPadding) ? Math.max(0, Math.floor(wrapPadding)) : 0;
 	const sanitizedMaxInlineLabelLength = Number.isFinite(maxInlineLabelLength)

package/src/ask-inline-ui.ts

@@ -111,6 +111,12 @@ export async function askSingleQuestionWithInlineNote(
 			noteEditor.setText(getRawNoteForOption(cursorOptionIndex));
 		};
 
+		const openNoteEditorForCurrentOption = () => {
+			if (isNoteEditorOpen) return;
+			isNoteEditorOpen = true;
+			loadCurrentNoteIntoEditor();
+		};
+
 		const saveCurrentNoteFromEditor = (value: string) => {
 			noteByOptionIndex.set(cursorOptionIndex, value);
 		};
@@ -181,6 +187,7 @@ export async function askSingleQuestionWithInlineNote(
 					Math.max(1, width - prefixWidth),
 					INLINE_NOTE_WRAP_PADDING,
 					isEditingThisOption ? activeEditingCursorIndex : undefined,
+					isEditingThisOption,
 				);
 				const continuationPrefix = " ".repeat(prefixWidth);
 				addLine(`${cursorPrefix}${theme.fg(optionColor, `${markerText}${wrappedInlineLabelLines[0] ?? ""}`)}`);
@@ -217,25 +224,38 @@ export async function askSingleQuestionWithInlineNote(
 					requestUiRerender();
 					return;
 				}
-				noteEditor.handleInput(data);
-				requestUiRerender();
-				return;
+
+				if (
+					(matchesKey(data, Key.up) || matchesKey(data, Key.down)) &&
+					getTrimmedNoteForOption(cursorOptionIndex).length === 0
+				) {
+					isNoteEditorOpen = false;
+				} else {
+					noteEditor.handleInput(data);
+					requestUiRerender();
+					return;
+				}
 			}
 
 			if (matchesKey(data, Key.up)) {
 				cursorOptionIndex = Math.max(0, cursorOptionIndex - 1);
+				if (selectableOptionLabels[cursorOptionIndex] === OTHER_OPTION) {
+					openNoteEditorForCurrentOption();
+				}
 				requestUiRerender();
 				return;
 			}
 			if (matchesKey(data, Key.down)) {
 				cursorOptionIndex = Math.min(selectableOptionLabels.length - 1, cursorOptionIndex + 1);
+				if (selectableOptionLabels[cursorOptionIndex] === OTHER_OPTION) {
+					openNoteEditorForCurrentOption();
+				}
 				requestUiRerender();
 				return;
 			}
 
 			if (matchesKey(data, Key.tab)) {
-				isNoteEditorOpen = true;
-				loadCurrentNoteIntoEditor();
+				openNoteEditorForCurrentOption();
 				requestUiRerender();
 				return;
 			}
@@ -257,10 +277,19 @@ export async function askSingleQuestionWithInlineNote(
 
 			if (matchesKey(data, Key.escape)) {
 				done({ cancelled: true });
+				return;
+			}
+
+			if (selectableOptionLabels[cursorOptionIndex] === OTHER_OPTION) {
+				openNoteEditorForCurrentOption();
+				noteEditor.handleInput(data);
+				requestUiRerender();
+				return;
 			}
 		};
 
 		return {
+			focused: true,
 			render,
 			invalidate: () => {
 				cachedRenderedLines = undefined;

package/src/ask-tabs-ui.ts

@@ -388,6 +388,7 @@ export async function askQuestionsWithTabs(
 					Math.max(1, width - prefixWidth),
 					INLINE_NOTE_WRAP_PADDING,
 					isEditingThisOption ? activeEditingCursorIndex : undefined,
+					isEditingThisOption,
 				);
 				const continuationPrefix = " ".repeat(prefixWidth);
 				addLine(`${cursorPrefix}${theme.fg(optionColor, `${markerText}${wrappedInlineLabelLines[0] ?? ""}`)}`);
@@ -404,12 +405,12 @@ export async function askQuestionsWithTabs(
 					addLine(
 						theme.fg(
 							"dim",
-							" ↑↓ move • Enter toggle/select • Tab add note • ←/→ switch tabs • Esc cancel",
+							" ↑↓ move • Space toggle/select • Enter next • Tab add note • ←/→ switch tabs • Esc cancel",
 						),
 					);
 				} else {
 					addLine(
-						theme.fg("dim", " ↑↓ move • Enter select • Tab add note • ←/→ switch tabs • Esc cancel"),
+						theme.fg("dim", " ↑↓ move • Space/Enter select • Tab add note • ←/→ switch tabs • Esc cancel"),
 					);
 				}
 			}
@@ -449,19 +450,44 @@ export async function askQuestionsWithTabs(
 					requestUiRerender();
 					return;
 				}
-				noteEditor.handleInput(data);
-				requestUiRerender();
-				return;
+
+				const questionIndex = getActiveQuestionIndex();
+				const cursorOptionIndex = questionIndex == null ? 0 : cursorOptionIndexByQuestion[questionIndex];
+				const noteIsEmpty = questionIndex == null || getTrimmedQuestionNote(questionIndex, cursorOptionIndex).length === 0;
+				if (
+					noteIsEmpty &&
+					(matchesKey(data, Key.up) || matchesKey(data, Key.down) || matchesKey(data, Key.left) || matchesKey(data, Key.right))
+				) {
+					isNoteEditorOpen = false;
+				} else {
+					noteEditor.handleInput(data);
+					requestUiRerender();
+					return;
+				}
 			}
 
 			if (matchesKey(data, Key.left)) {
 				activeTabIndex = (activeTabIndex - 1 + preparedQuestions.length + 1) % (preparedQuestions.length + 1);
+				if (getActiveQuestionIndex() != null) {
+					const questionIndex = getActiveQuestionIndex() as number;
+					if (preparedQuestions[questionIndex].options[cursorOptionIndexByQuestion[questionIndex]] === OTHER_OPTION) {
+						openNoteEditorForActiveOption();
+						return;
+					}
+				}
 				requestUiRerender();
 				return;
 			}
 
 			if (matchesKey(data, Key.right)) {
 				activeTabIndex = (activeTabIndex + 1) % (preparedQuestions.length + 1);
+				if (getActiveQuestionIndex() != null) {
+					const questionIndex = getActiveQuestionIndex() as number;
+					if (preparedQuestions[questionIndex].options[cursorOptionIndexByQuestion[questionIndex]] === OTHER_OPTION) {
+						openNoteEditorForActiveOption();
+						return;
+					}
+				}
 				requestUiRerender();
 				return;
 			}
@@ -482,6 +508,10 @@ export async function askQuestionsWithTabs(
 
 			if (matchesKey(data, Key.up)) {
 				cursorOptionIndexByQuestion[questionIndex] = Math.max(0, cursorOptionIndexByQuestion[questionIndex] - 1);
+				if (preparedQuestion.options[cursorOptionIndexByQuestion[questionIndex]] === OTHER_OPTION) {
+					openNoteEditorForActiveOption();
+					return;
+				}
 				requestUiRerender();
 				return;
 			}
@@ -491,6 +521,10 @@ export async function askQuestionsWithTabs(
 					preparedQuestion.options.length - 1,
 					cursorOptionIndexByQuestion[questionIndex] + 1,
 				);
+				if (preparedQuestion.options[cursorOptionIndexByQuestion[questionIndex]] === OTHER_OPTION) {
+					openNoteEditorForActiveOption();
+					return;
+				}
 				requestUiRerender();
 				return;
 			}
@@ -500,7 +534,7 @@ export async function askQuestionsWithTabs(
 				return;
 			}
 
-			if (matchesKey(data, Key.enter)) {
+			if (matchesKey(data, Key.space)) {
 				const cursorOptionIndex = cursorOptionIndexByQuestion[questionIndex];
 
 				if (preparedQuestion.multi) {
@@ -533,6 +567,37 @@ export async function askQuestionsWithTabs(
 					return;
 				}
 
+				requestUiRerender();
+				return;
+			}
+
+			if (matchesKey(data, Key.enter)) {
+				const cursorOptionIndex = cursorOptionIndexByQuestion[questionIndex];
+
+				if (preparedQuestion.multi) {
+					if (
+						cursorOptionIndex === preparedQuestion.otherOptionIndex &&
+						selectedOptionIndexesByQuestion[questionIndex].includes(cursorOptionIndex) &&
+						getTrimmedQuestionNote(questionIndex, cursorOptionIndex).length === 0
+					) {
+						openNoteEditorForActiveOption();
+						return;
+					}
+
+					advanceToNextTabOrSubmit();
+					requestUiRerender();
+					return;
+				}
+
+				selectedOptionIndexesByQuestion[questionIndex] = [cursorOptionIndex];
+				if (
+					cursorOptionIndex === preparedQuestion.otherOptionIndex &&
+					getTrimmedQuestionNote(questionIndex, cursorOptionIndex).length === 0
+				) {
+					openNoteEditorForActiveOption();
+					return;
+				}
+
 				advanceToNextTabOrSubmit();
 				requestUiRerender();
 				return;
@@ -540,10 +605,19 @@ export async function askQuestionsWithTabs(
 
 			if (matchesKey(data, Key.escape)) {
 				done(createTabsUiStateSnapshot(true, selectedOptionIndexesByQuestion, noteByQuestionByOption));
+				return;
+			}
+
+			if (preparedQuestion.options[cursorOptionIndexByQuestion[questionIndex]] === OTHER_OPTION) {
+				openNoteEditorForActiveOption();
+				noteEditor.handleInput(data);
+				requestUiRerender();
+				return;
 			}
 		};
 
 		return {
+			focused: true,
 			render,
 			invalidate: () => {
 				cachedRenderedLines = undefined;