auq-mcp-server 3.2.5 → 3.2.6

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "auq-mcp-server",
-    "version": "3.2.5",
+    "version": "3.2.6",
     "main": "dist/index.js",
     "bin": {
         "auq": "bin/auq"

package/dist/src/tui/components/Footer.js

@@ -33,8 +33,8 @@ export const Footer = ({ focusContext, multiSelect, isReviewScreen = false, show
             return [
                 { key: KEY_LABELS.NAVIGATE_OPTIONS, action: t("footer.options") },
                 { key: KEY_LABELS.CURSOR, action: t("footer.cursor") },
-                { key: KEY_LABELS.NAVIGATE_QUESTIONS_TAB, action: t("footer.questions") },
                 { key: KEY_LABELS.NEWLINE, action: t("footer.newline") },
+                { key: KEY_LABELS.ADVANCE_INPUT, action: t("footer.next") },
                 { key: KEY_LABELS.REJECT, action: t("footer.reject") },
             ];
         }
@@ -43,7 +43,8 @@ export const Footer = ({ focusContext, multiSelect, isReviewScreen = false, show
             return [
                 { key: KEY_LABELS.NAVIGATE_OPTIONS, action: t("footer.options") },
                 { key: KEY_LABELS.CURSOR, action: t("footer.cursor") },
-                { key: "Enter/Tab", action: t("footer.next") },
+                { key: KEY_LABELS.NEWLINE, action: t("footer.newline") },
+                { key: KEY_LABELS.ADVANCE_INPUT, action: t("footer.next") },
                 { key: KEY_LABELS.REJECT, action: t("footer.reject") },
             ];
         }

package/dist/src/tui/components/MultiLineTextInput.js

@@ -5,9 +5,9 @@ import { useTheme } from "../ThemeContext.js";
 /**
  * Multi-line text input component for Ink with cursor positioning
  * Supports left/right arrow keys for cursor movement
- * Enter for newlines, Tab to submit (portable across terminals)
+ * Enter to submit/advance, Shift+Enter for newlines, Tab also submits
  */
-export const MultiLineTextInput = ({ isFocused = true, onChange, onSubmit, placeholder = t("input.multiLinePlaceholder"), value, enterSubmits = false, }) => {
+export const MultiLineTextInput = ({ isFocused = true, onChange, onSubmit, placeholder = t("input.multiLinePlaceholder"), value, enterSubmits: _enterSubmits = false, }) => {
     const { theme } = useTheme();
     // Initialize cursor at end of text (using character count for CJK support)
     const [cursorPosition, setCursorPosition] = useState([...value].length);
@@ -45,18 +45,20 @@ export const MultiLineTextInput = ({ isFocused = true, onChange, onSubmit, place
         if (key.tab && key.shift) {
             return;
         }
-        // Enter: Submit if enterSubmits mode, otherwise add newline
+        // Enter: Submit/advance; Shift+Enter inserts newline
         if (input === "\r" || input === "\n" || key.return) {
-            if (enterSubmits) {
-                onSubmit?.();
+            if (key.shift) {
+                // Shift+Enter: Insert newline at cursor position
+                const chars = [...currentValue];
+                const before = chars.slice(0, currentCursor).join("");
+                const after = chars.slice(currentCursor).join("");
+                const newValue = before + "\n" + after;
+                onChange(newValue);
+                setCursorPosition(currentCursor + 1);
                 return;
             }
-            const chars = [...currentValue];
-            const before = chars.slice(0, currentCursor).join("");
-            const after = chars.slice(currentCursor).join("");
-            const newValue = before + "\n" + after;
-            onChange(newValue);
-            setCursorPosition(currentCursor + 1);
+            // Enter (without Shift): Submit/advance
+            onSubmit?.();
             return;
         }
         // Left arrow: Move cursor left (accounting for CJK characters)

package/dist/src/tui/components/StepperView.js

@@ -77,24 +77,37 @@ export const StepperView = ({ onComplete, onProgress, hasMultipleSessions, initi
     }, [currentQuestionIndex]);
     // Handle option selection (single-select mode)
     const handleSelectOption = (label) => {
+        const existing = answers.get(currentQuestionIndex) || {};
+        const isDeselecting = existing.selectedOption === label;
         setAnswers((prev) => {
             const newAnswers = new Map(prev);
-            const existing = newAnswers.get(currentQuestionIndex) || {};
-            newAnswers.set(currentQuestionIndex, {
-                ...existing,
-                selectedOption: label,
-            });
-            return newAnswers;
-        });
-        // Clear elaborate mark when selecting a regular option (single-select behavior)
-        setElaborateMarks((prev) => {
-            if (prev.has(currentQuestionIndex)) {
-                const newMarks = new Map(prev);
-                newMarks.delete(currentQuestionIndex);
-                return newMarks;
+            const existingAnswer = newAnswers.get(currentQuestionIndex) || {};
+            if (isDeselecting) {
+                newAnswers.set(currentQuestionIndex, {
+                    ...existingAnswer,
+                    selectedOption: undefined,
+                });
             }
-            return prev;
+            else {
+                newAnswers.set(currentQuestionIndex, {
+                    ...existingAnswer,
+                    selectedOption: label,
+                    customText: undefined,
+                });
+            }
+            return newAnswers;
         });
+        // Clear elaborate mark only when SELECTING (not deselecting)
+        if (!isDeselecting) {
+            setElaborateMarks((prev) => {
+                if (prev.has(currentQuestionIndex)) {
+                    const newMarks = new Map(prev);
+                    newMarks.delete(currentQuestionIndex);
+                    return newMarks;
+                }
+                return prev;
+            });
+        }
     };
     const handleToggleOption = (label) => {
         setAnswers((prev) => {
@@ -125,13 +138,17 @@ export const StepperView = ({ onComplete, onProgress, hasMultipleSessions, initi
         }
     };
     // Handle custom answer text
+    // Handle custom answer text
     const handleChangeCustomAnswer = (text) => {
         setAnswers((prev) => {
             const newAnswers = new Map(prev);
             const existing = newAnswers.get(currentQuestionIndex) || {};
+            const question = sessionRequest.questions[currentQuestionIndex];
             newAnswers.set(currentQuestionIndex, {
                 ...existing,
                 customText: text,
+                // Single-choice: clear selectedOption when typing custom text
+                ...(text.trim().length > 0 && !question?.multiSelect ? { selectedOption: undefined } : {}),
             });
             return newAnswers;
         });
@@ -331,14 +348,16 @@ export const StepperView = ({ onComplete, onProgress, hasMultipleSessions, initi
             return newMarks;
         });
         // In single-select mode, clear selected option when marking elaborate
+        // In single-select mode, clear selected option and customText when marking elaborate
         if (isMarking && !currentQuestion.multiSelect) {
             setAnswers((prev) => {
                 const existing = prev.get(currentQuestionIndex);
-                if (existing?.selectedOption) {
+                if (existing?.selectedOption || existing?.customText) {
                     const newAnswers = new Map(prev);
                     newAnswers.set(currentQuestionIndex, {
                         ...existing,
                         selectedOption: undefined,
+                        customText: undefined,
                     });
                     return newAnswers;
                 }

package/dist/src/tui/components/__tests__/Footer.test.js

@@ -42,8 +42,8 @@ describe("Footer keybinding labels", () => {
         const output = getOutput(instance.lastFrame());
         expect(output).toContain(KEY_LABELS.NAVIGATE_OPTIONS); // "↑↓"
         expect(output).toContain(KEY_LABELS.CURSOR); // "←→"
-        expect(output).toContain(KEY_LABELS.NAVIGATE_QUESTIONS_TAB); // "Tab/S+Tab"
-        expect(output).toContain(KEY_LABELS.NEWLINE); // "Enter"
+        expect(output).toContain(KEY_LABELS.NEWLINE); // "Shift+Enter"
+        expect(output).toContain(KEY_LABELS.ADVANCE_INPUT); // "Enter"
         expect(output).toContain(KEY_LABELS.REJECT); // "Esc"
     });
     it("elaborate-input context shows correct keybindings", () => {
@@ -51,7 +51,8 @@ describe("Footer keybinding labels", () => {
         const output = getOutput(instance.lastFrame());
         expect(output).toContain(KEY_LABELS.NAVIGATE_OPTIONS); // "↑↓"
         expect(output).toContain(KEY_LABELS.CURSOR); // "←→"
-        expect(output).toContain("Enter/Tab");
+        expect(output).toContain(KEY_LABELS.NEWLINE); // "Shift+Enter"
+        expect(output).toContain(KEY_LABELS.ADVANCE_INPUT); // "Enter"
         expect(output).toContain(KEY_LABELS.REJECT); // "Esc"
     });
     it("review screen shows Submit and Back labels", () => {

package/dist/src/tui/constants/keybindings.js

@@ -35,7 +35,8 @@ export const KEY_LABELS = {
     SELECT_NEXT: "Enter",
     NEXT: "Enter",
     CURSOR: "←→",
-    NEWLINE: "Enter",
+    NEWLINE: "Shift+Enter",
+    ADVANCE_INPUT: "Enter",
     REJECT: "Esc",
     BACK: "n",
     SUBMIT: "Enter",

package/dist/src/tui-opentui/components/Footer.js

@@ -33,7 +33,8 @@ export const Footer = ({ focusContext, multiSelect, isReviewScreen = false, show
             return [
                 { key: KEY_LABELS.NAVIGATE_OPTIONS, action: t("footer.options") },
                 { key: KEY_LABELS.CURSOR, action: t("footer.cursor") },
-                { key: "Enter/Tab", action: t("footer.next") },
+                { key: KEY_LABELS.NEWLINE, action: t("footer.newline") },
+                { key: KEY_LABELS.ADVANCE_INPUT, action: t("footer.next") },
                 { key: KEY_LABELS.REJECT, action: t("footer.reject") },
             ];
         }
@@ -42,7 +43,8 @@ export const Footer = ({ focusContext, multiSelect, isReviewScreen = false, show
             return [
                 { key: KEY_LABELS.NAVIGATE_OPTIONS, action: t("footer.options") },
                 { key: KEY_LABELS.CURSOR, action: t("footer.cursor") },
-                { key: "Enter/Tab", action: t("footer.next") },
+                { key: KEY_LABELS.NEWLINE, action: t("footer.newline") },
+                { key: KEY_LABELS.ADVANCE_INPUT, action: t("footer.next") },
                 { key: KEY_LABELS.REJECT, action: t("footer.reject") },
             ];
         }

package/dist/src/tui-opentui/components/OptionsList.js

@@ -82,7 +82,7 @@ export const OptionsList = ({ isFocused, onSelect, options, selectedOption, show
             setFocusedIndex(newIndex);
             return;
         }
-        // When custom input is focused, only handle escape and tab to exit
+        // When custom input is focused, handle all keyboard input here
         if (isCustomInputFocused) {
             if (key.name === "escape") {
                 setFocusedIndex(Math.max(0, options.length - 1));
@@ -90,9 +90,32 @@ export const OptionsList = ({ isFocused, onSelect, options, selectedOption, show
             else if (key.name === "tab" && !key.shift) {
                 onAdvance?.();
             }
+            else if (key.name === "return") {
+                if (key.shift) {
+                    // Shift+Enter: insert newline
+                    onCustomChange?.(customValue + "\n");
+                }
+                else {
+                    // Enter: advance to next question
+                    onAdvance?.();
+                }
+            }
+            else if (key.name === "backspace" || key.name === "delete") {
+                if (customValue.length > 0) {
+                    onCustomChange?.(customValue.slice(0, -1));
+                }
+            }
+            else if (key.sequence && !key.ctrl && !key.meta && key.name !== "up" && key.name !== "down") {
+                const sanitized = key.sequence
+                    .replace(/\x1b?\[<[\d;]*[Mm]/g, '')
+                    .replace(/\[?[OI]/g, '');
+                if (sanitized.length > 0) {
+                    onCustomChange?.(customValue + sanitized);
+                }
+            }
             return;
         }
-        // When elaborate input is focused, only handle escape and tab to exit
+        // When elaborate input is focused, handle all keyboard input here
         if (isElaborateFocused) {
             if (key.name === "escape") {
                 setFocusedIndex(customInputIndex);
@@ -100,6 +123,32 @@ export const OptionsList = ({ isFocused, onSelect, options, selectedOption, show
             else if (key.name === "tab" && !key.shift) {
                 onAdvance?.();
             }
+            else if (key.name === "return") {
+                if (key.shift) {
+                    // Shift+Enter: insert newline
+                    onElaborateTextChange?.(elaborateText + "\n");
+                }
+                else {
+                    // Enter: advance to next question
+                    if (!elaborateText.trim()) {
+                        onElaborateSelect?.();
+                    }
+                    onAdvance?.();
+                }
+            }
+            else if (key.name === "backspace" || key.name === "delete") {
+                if (elaborateText.length > 0) {
+                    onElaborateTextChange?.(elaborateText.slice(0, -1));
+                }
+            }
+            else if (key.sequence && !key.ctrl && !key.meta && key.name !== "up" && key.name !== "down") {
+                const sanitized = key.sequence
+                    .replace(/\x1b?\[<[\d;]*[Mm]/g, '')
+                    .replace(/\[?[OI]/g, '');
+                if (sanitized.length > 0) {
+                    onElaborateTextChange?.(elaborateText + sanitized);
+                }
+            }
             return;
         }
         // Spacebar: Select/toggle WITHOUT advancing (works for both modes)
@@ -109,6 +158,8 @@ export const OptionsList = ({ isFocused, onSelect, options, selectedOption, show
                     onToggle?.(options[focusedIndex].label);
                 }
                 else {
+                    // Single-select: toggle (deselect if already selected)
+                    // Parent handleSelectOption handles the toggle logic
                     onSelect(options[focusedIndex].label);
                 }
             }
@@ -203,15 +254,7 @@ export const OptionsList = ({ isFocused, onSelect, options, selectedOption, show
                                 marginTop: 0,
                                 paddingX: 1,
                                 paddingY: 0,
-                            }, children: _jsx("input", { placeholder: t("input.placeholder"), value: customValue, focused: true, onInput: (val) => {
-                                    // Filter SGR mouse escape sequences that leak through stdin parser
-                                    const sanitized = val
-                                        .replace(/\x1b?\[<[\d;]*[Mm]/g, '')
-                                        .replace(/\[?[OI]/g, '');
-                                    if (sanitized !== val && sanitized.length === 0)
-                                        return;
-                                    onCustomChange?.(sanitized);
-                                }, onSubmit: () => onAdvance?.() }) })), !isCustomInputFocused && customValue && (_jsx("box", { style: { marginLeft: 2, marginTop: 0 }, children: _jsxs("text", { style: { fg: theme.components.options.hint, attributes: TextAttributes.DIM }, children: ["   ", customLines.slice(0, 3).join("\n   "), customLines.length > 3 ? "\n   \u2026" : ""] }) }))] }) })), showCustomInput && (_jsx("box", { style: { marginTop: 0 }, children: _jsxs("box", { style: { flexDirection: "column" }, children: [(() => {
+                            }, children: customValue ? (_jsx("text", { style: { fg: theme.components.options.focused }, children: customValue + "▌" })) : (_jsx("text", { style: { fg: theme.components.options.hint, attributes: TextAttributes.DIM }, children: t("input.placeholder") + "▌" })) })), !isCustomInputFocused && customValue && (_jsx("box", { style: { marginLeft: 2, marginTop: 0 }, children: _jsxs("text", { style: { fg: theme.components.options.hint, attributes: TextAttributes.DIM }, children: ["   ", customLines.slice(0, 3).join("\n   "), customLines.length > 3 ? "\n   \u2026" : ""] }) }))] }) })), showCustomInput && (_jsx("box", { style: { marginTop: 0 }, children: _jsxs("box", { style: { flexDirection: "column" }, children: [(() => {
                             const rowBg = isElaborateFocused
                                 ? theme.components.options.focusedBg
                                 : isElaborateMarked
@@ -240,19 +283,5 @@ export const OptionsList = ({ isFocused, onSelect, options, selectedOption, show
                                 marginTop: 0,
                                 paddingX: 1,
                                 paddingY: 0,
-                            }, children: _jsx("input", { placeholder: t("input.elaboratePlaceholder"), value: elaborateText, focused: true, onInput: (val) => {
-                                    // Filter SGR mouse escape sequences that leak through stdin parser
-                                    const sanitized = val
-                                        .replace(/\x1b?\[<[\d;]*[Mm]/g, '')
-                                        .replace(/\[?[OI]/g, '');
-                                    if (sanitized !== val && sanitized.length === 0)
-                                        return;
-                                    onElaborateTextChange?.(sanitized);
-                                }, onSubmit: () => {
-                                    // Enter submits and advance
-                                    if (!elaborateText.trim()) {
-                                        onElaborateSelect?.();
-                                    }
-                                    onAdvance?.();
-                                } }) })), !isElaborateFocused && elaborateText && (_jsx("box", { style: { marginLeft: 2, marginTop: 0 }, children: _jsxs("text", { style: { fg: theme.components.options.hint, attributes: TextAttributes.DIM }, children: ["   ", elaborateLines.slice(0, 3).join("\n   "), elaborateLines.length > 3 ? "\n   \u2026" : ""] }) }))] }) }))] }));
+                            }, children: elaborateText ? (_jsx("text", { style: { fg: theme.components.options.focused }, children: elaborateText + "▌" })) : (_jsx("text", { style: { fg: theme.components.options.hint, attributes: TextAttributes.DIM }, children: t("input.elaboratePlaceholder") + "▌" })) })), !isElaborateFocused && elaborateText && (_jsx("box", { style: { marginLeft: 2, marginTop: 0 }, children: _jsxs("text", { style: { fg: theme.components.options.hint, attributes: TextAttributes.DIM }, children: ["   ", elaborateLines.slice(0, 3).join("\n   "), elaborateLines.length > 3 ? "\n   \u2026" : ""] }) }))] }) }))] }));
 };

package/dist/src/tui-opentui/components/StepperView.js

@@ -73,24 +73,37 @@ export const StepperView = ({ onComplete, onProgress, hasMultipleSessions, initi
     }, [currentQuestionIndex]);
     // Handle option selection (single-select mode)
     const handleSelectOption = (label) => {
+        const existing = answers.get(currentQuestionIndex) || {};
+        const isDeselecting = existing.selectedOption === label;
         setAnswers((prev) => {
             const newAnswers = new Map(prev);
-            const existing = newAnswers.get(currentQuestionIndex) || {};
-            newAnswers.set(currentQuestionIndex, {
-                ...existing,
-                selectedOption: label,
-            });
-            return newAnswers;
-        });
-        // Clear elaborate mark when selecting a regular option (single-select behavior)
-        setElaborateMarks((prev) => {
-            if (prev.has(currentQuestionIndex)) {
-                const newMarks = new Map(prev);
-                newMarks.delete(currentQuestionIndex);
-                return newMarks;
+            const existingAnswer = newAnswers.get(currentQuestionIndex) || {};
+            if (isDeselecting) {
+                newAnswers.set(currentQuestionIndex, {
+                    ...existingAnswer,
+                    selectedOption: undefined,
+                });
+            }
+            else {
+                newAnswers.set(currentQuestionIndex, {
+                    ...existingAnswer,
+                    selectedOption: label,
+                    customText: undefined,
+                });
             }
-            return prev;
+            return newAnswers;
         });
+        // Clear elaborate mark only when SELECTING (not deselecting) a regular option
+        if (!isDeselecting) {
+            setElaborateMarks((prev) => {
+                if (prev.has(currentQuestionIndex)) {
+                    const newMarks = new Map(prev);
+                    newMarks.delete(currentQuestionIndex);
+                    return newMarks;
+                }
+                return prev;
+            });
+        }
     };
     const handleToggleOption = (label) => {
         setAnswers((prev) => {
@@ -123,9 +136,12 @@ export const StepperView = ({ onComplete, onProgress, hasMultipleSessions, initi
         setAnswers((prev) => {
             const newAnswers = new Map(prev);
             const existing = newAnswers.get(currentQuestionIndex) || {};
+            const question = sessionRequest.questions[currentQuestionIndex];
             newAnswers.set(currentQuestionIndex, {
                 ...existing,
                 customText: text,
+                // Single-choice: clear selectedOption when typing custom text
+                ...(text.trim().length > 0 && !question?.multiSelect ? { selectedOption: undefined } : {}),
             });
             return newAnswers;
         });
@@ -327,11 +343,12 @@ export const StepperView = ({ onComplete, onProgress, hasMultipleSessions, initi
         if (isMarking && !currentQuestion.multiSelect) {
             setAnswers((prev) => {
                 const existing = prev.get(currentQuestionIndex);
-                if (existing?.selectedOption) {
+                if (existing?.selectedOption || existing?.customText) {
                     const newAnswers = new Map(prev);
                     newAnswers.set(currentQuestionIndex, {
                         ...existing,
                         selectedOption: undefined,
+                        customText: undefined,
                     });
                     return newAnswers;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auq-mcp-server",
-  "version": "3.2.5",
+  "version": "3.2.6",
   "main": "dist/index.js",
   "bin": {
     "auq": "bin/auq"