@rawwee/interactive-mcp 1.4.0 → 1.4.2

package/dist/commands/input/ui.js

@@ -132,9 +132,6 @@ const App = ({ options: appOptions, onExit }) => {
             onExit();
         });
     }, [onExit, outputFile]);
-    useEffect(() => {
-        console.clear();
-    }, []);
     useEffect(() => {
         setFollowInput(false);
         scrollRef.current?.scrollTo?.({ x: 0, y: 0 });
@@ -208,6 +205,9 @@ async function startUi() {
         process.exit(1);
         return;
     }
+    // Clear before the renderer takes over so @opentui starts with a clean slate
+    // and its diff engine is in sync with what's on screen.
+    console.clear();
     const renderer = await createCliRenderer({
         exitOnCtrlC: false,
     });

package/dist/commands/intensive-chat/ui.js

@@ -104,9 +104,6 @@ const App = ({ sessionId, title, outputDir, searchRoot, timeoutSeconds, onCloseS
         setFollowInput(true);
         scrollRef.current?.scrollTo?.({ x: 0, y: Number.MAX_SAFE_INTEGER });
     }, []);
-    useEffect(() => {
-        console.clear();
-    }, []);
     useEffect(() => {
         let mounted = true;
         void resolveSearchRoot(searchRoot, { argvEntry: process.argv[1] }).then((resolvedSearchRoot) => {
@@ -234,7 +231,6 @@ const App = ({ sessionId, title, outputDir, searchRoot, timeoutSeconds, onCloseS
         };
     }, [timeLeft, currentQuestionId]);
     const addNewQuestion = async (questionId, questionText, incomingOptions, incomingSearchRoot) => {
-        console.clear();
         if (timerRef.current) {
             clearInterval(timerRef.current);
             timerRef.current = null;
@@ -289,6 +285,9 @@ const App = ({ sessionId, title, outputDir, searchRoot, timeoutSeconds, onCloseS
                                     ?.text || '', questionId: currentQuestionId, predefinedOptions: currentPredefinedOptions, searchRoot: currentSearchRoot, onSubmit: handleSubmit, onInputActivity: keepInputVisible }) }))] }) }), currentQuestionId && timeLeft !== null && (_jsx("box", { paddingLeft: 1, paddingRight: 1, paddingTop: 1, children: _jsx(PromptStatus, { value: percentage, timeLeftSeconds: timeLeft, critical: timeLeft <= 10 }) }))] }));
 };
 async function startUi() {
+    // Clear before the renderer takes over so @opentui starts with a clean slate
+    // and its diff engine is in sync with what's on screen.
+    console.clear();
     const renderer = await createCliRenderer({
         exitOnCtrlC: false,
     });

package/dist/components/InteractiveInput.js

@@ -1,14 +1,17 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "@opentui/react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "@opentui/react/jsx-runtime";
 import * as OpenTuiReact from '@opentui/react';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import path from 'node:path';
 import { getAutocompleteTarget, rankFileSuggestions, readRepositoryFiles, } from './interactive-input/autocomplete.js';
-import { extractPastedText, isPrintableCharacter, isCopyShortcut, isPasteShortcut, isReverseTabShortcut, isSubmitShortcut, textareaKeyBindings, } from './interactive-input/keyboard.js';
-import { InputEditor, ModeTabs, OptionList, SuggestionsPanel, } from './interactive-input/sections.js';
+import { textareaKeyBindings } from './interactive-input/keyboard.js';
+import { InputEditor, ModeTabs, OptionList, SuggestionsPanel, QuestionBox, SearchStatus, InputStatus, ClipboardStatus, AttachmentsDisplay, SendButton, HelpText, } from './interactive-input/sections.js';
 import { getTextareaDimensions } from './interactive-input/textarea-height.js';
 import { MarkdownText } from './MarkdownText.js';
 import { repositoryFileCache, } from './interactive-input/constants.js';
 import { createClipboardHandlers } from './interactive-input/clipboard-handlers.js';
+import { safeReadTextarea, safeWriteTextarea, focusTextarea, } from './interactive-input/textarea-operations.js';
+import { createSubmitHandler } from './interactive-input/submit-handler.js';
+import { createKeyboardRouter } from './interactive-input/keyboard-router.js';
 const { useKeyboard } = OpenTuiReact;
 const { useTerminalDimensions } = OpenTuiReact;
 export function InteractiveInput({ question, questionId, predefinedOptions = [], onSubmit, onInputActivity, searchRoot, }) {
@@ -65,53 +68,6 @@ export function InteractiveInput({ question, questionId, predefinedOptions = [],
             : `/${normalizedPath}`;
         return `vscode://file${encodeURI(vscodePath)}`;
     }, [searchRoot, selectedSuggestion]);
-    const safeReadTextarea = useCallback(() => {
-        const textarea = textareaRef.current;
-        if (!textarea) {
-            return null;
-        }
-        try {
-            return {
-                value: textarea.plainText,
-                caret: textarea.cursorOffset,
-            };
-        }
-        catch {
-            textareaRef.current = null;
-            return null;
-        }
-    }, []);
-    const safeWriteTextarea = useCallback((nextValue, nextCaretPosition) => {
-        const textarea = textareaRef.current;
-        if (!textarea) {
-            return false;
-        }
-        try {
-            if (textarea.plainText !== nextValue) {
-                textarea.setText(nextValue);
-            }
-            textarea.cursorOffset = nextCaretPosition;
-            return true;
-        }
-        catch {
-            textareaRef.current = null;
-            return false;
-        }
-    }, []);
-    const focusTextarea = useCallback(() => {
-        const textarea = textareaRef.current;
-        if (!textarea) {
-            return false;
-        }
-        try {
-            textarea.focus?.();
-            return true;
-        }
-        catch {
-            textareaRef.current = null;
-            return false;
-        }
-    }, []);
     useEffect(() => {
         latestInputValueRef.current = inputValue;
     }, [inputValue]);
@@ -206,29 +162,27 @@ export function InteractiveInput({ question, questionId, predefinedOptions = [],
         latestCaretPositionRef.current = 0;
         setFileSuggestions([]);
         setSelectedSuggestionIndex(0);
-        safeWriteTextarea('', 0);
-    }, [predefinedOptions.length, questionId, safeWriteTextarea]);
+        safeWriteTextarea(textareaRef, '', 0);
+    }, [predefinedOptions.length, questionId]);
     useEffect(() => {
         if (mode !== 'input') {
             return;
         }
         const nextValue = latestInputValueRef.current;
         const clampedCaret = Math.max(0, Math.min(latestCaretPositionRef.current, nextValue.length));
-        const didWrite = safeWriteTextarea(nextValue, clampedCaret);
+        const didWrite = safeWriteTextarea(textareaRef, nextValue, clampedCaret);
         if (!didWrite) {
             setTextareaRenderVersion((previous) => previous + 1);
             return;
         }
-        if (!focusTextarea()) {
+        if (!focusTextarea(textareaRef)) {
             setTextareaRenderVersion((previous) => previous + 1);
         }
     }, [
         focusRequestToken,
-        focusTextarea,
         height,
         mode,
         questionId,
-        safeWriteTextarea,
         textareaRenderVersion,
         width,
     ]);
@@ -253,7 +207,7 @@ export function InteractiveInput({ question, questionId, predefinedOptions = [],
             : Math.min(previous, nextSuggestions.length - 1));
     }, [caretPosition, inputValue, mode, repositoryFiles]);
     const syncInputStateFromTextarea = useCallback(() => {
-        const textareaState = safeReadTextarea();
+        const textareaState = safeReadTextarea(textareaRef);
         if (!textareaState) {
             return;
         }
@@ -269,16 +223,16 @@ export function InteractiveInput({ question, questionId, predefinedOptions = [],
         setInputValue(nextValue);
         setCaretPosition(nextCaret);
         onInputActivity?.();
-    }, [onInputActivity, safeReadTextarea]);
+    }, [onInputActivity]);
     const setTextareaValue = useCallback((nextValue, nextCaretPosition) => {
         const clampedCaret = Math.max(0, Math.min(nextCaretPosition, nextValue.length));
-        safeWriteTextarea(nextValue, clampedCaret);
+        safeWriteTextarea(textareaRef, nextValue, clampedCaret);
         latestInputValueRef.current = nextValue;
         latestCaretPositionRef.current = clampedCaret;
         setInputValue(nextValue);
         setCaretPosition(clampedCaret);
         onInputActivity?.();
-    }, [onInputActivity, safeWriteTextarea]);
+    }, [onInputActivity]);
     const setModeToInput = useCallback(() => {
         setMode('input');
         onInputActivity?.();
@@ -305,14 +259,14 @@ export function InteractiveInput({ question, questionId, predefinedOptions = [],
         if (!text) {
             return;
         }
-        const textareaState = safeReadTextarea();
+        const textareaState = safeReadTextarea(textareaRef);
         const currentValue = textareaState?.value ?? inputValue;
         const currentCaret = Math.max(0, Math.min(textareaState?.caret ?? caretPosition, currentValue.length));
         const nextValue = currentValue.slice(0, currentCaret) +
             text +
             currentValue.slice(currentCaret);
         setTextareaValue(nextValue, currentCaret + text.length);
-    }, [caretPosition, inputValue, safeReadTextarea, setTextareaValue]);
+    }, [caretPosition, inputValue, setTextareaValue]);
     const queueAttachment = useCallback((attachment) => {
         setQueuedAttachments((previous) => {
             const nextAttachments = [...previous, attachment];
@@ -343,27 +297,24 @@ export function InteractiveInput({ question, questionId, predefinedOptions = [],
         mode,
     ]);
     const { copyInputToClipboard, handlePastedText, pasteClipboardIntoInput } = clipboardHandlers;
-    const submitCurrentSelection = useCallback(() => {
-        let finalValue = mode === 'option' && predefinedOptions.length > 0
-            ? predefinedOptions[selectedIndex]
-            : (safeReadTextarea()?.value ?? inputValue);
-        // Replace [Attached file N] placeholders with actual payloads
-        queuedAttachments.forEach((attachment, index) => {
-            const placeholder = `[Attached file ${index + 1}]`;
-            const regex = new RegExp(placeholder.replace(/[[\]]/g, '\\$&'), 'g');
-            finalValue = finalValue.replace(regex, attachment.payload);
-        });
-        onSubmit(questionId, finalValue);
-        setQueuedAttachments([]);
-    }, [
-        inputValue,
+    const submitCurrentSelection = useMemo(() => createSubmitHandler({
         mode,
-        onSubmit,
         predefinedOptions,
+        selectedIndex,
+        inputValue,
         queuedAttachments,
+        textareaRef,
+        onSubmit,
         questionId,
-        safeReadTextarea,
+        setQueuedAttachments,
+    }), [
+        mode,
+        predefinedOptions,
         selectedIndex,
+        inputValue,
+        queuedAttachments,
+        onSubmit,
+        questionId,
     ]);
     const applySelectedSuggestion = useCallback((targetOverride, suggestionsOverride, selectedIndexOverride) => {
         const target = targetOverride ?? autocompleteTargetRef.current;
@@ -373,32 +324,26 @@ export function InteractiveInput({ question, questionId, predefinedOptions = [],
         }
         const index = selectedIndexOverride ?? selectedSuggestionIndex;
         const suggestion = availableSuggestions[index] ?? availableSuggestions[0];
-        const currentValue = safeReadTextarea()?.value ?? inputValue;
+        const currentValue = safeReadTextarea(textareaRef)?.value ?? inputValue;
         const nextValue = currentValue.slice(0, target.start) +
             suggestion +
             currentValue.slice(target.end);
         const nextCaret = target.start + suggestion.length;
         setTextareaValue(nextValue, nextCaret);
-    }, [
-        fileSuggestions,
-        inputValue,
-        safeReadTextarea,
-        selectedSuggestionIndex,
-        setTextareaValue,
-    ]);
+    }, [fileSuggestions, inputValue, selectedSuggestionIndex, setTextareaValue]);
     const insertCharacterInTextarea = useCallback((character) => {
         if (!character) {
             return;
         }
-        const currentValue = safeReadTextarea()?.value ?? inputValue;
+        const currentValue = safeReadTextarea(textareaRef)?.value ?? inputValue;
         const currentCaret = Math.max(0, Math.min(caretPosition, currentValue.length));
         const nextValue = currentValue.slice(0, currentCaret) +
             character +
             currentValue.slice(currentCaret);
         setTextareaValue(nextValue, currentCaret + character.length);
-    }, [caretPosition, inputValue, safeReadTextarea, setTextareaValue]);
+    }, [caretPosition, inputValue, setTextareaValue]);
     const handleTextareaSubmit = useCallback(() => {
-        const textareaState = safeReadTextarea();
+        const textareaState = safeReadTextarea(textareaRef);
         const currentValue = textareaState?.value ?? inputValue;
         const currentCaret = textareaState?.caret ?? caretPosition;
         const currentTarget = mode === 'input'
@@ -426,105 +371,41 @@ export function InteractiveInput({ question, questionId, predefinedOptions = [],
         safeReadTextarea,
         selectedSuggestionIndex,
     ]);
-    useKeyboard((key) => {
-        if (isSubmitShortcut(key)) {
-            submitCurrentSelection();
-            return;
-        }
-        const pastedText = extractPastedText(key);
-        if (pastedText !== null) {
-            if (mode === 'option' && hasOptions) {
-                setModeToInput();
-            }
-            handlePastedText(pastedText);
-            return;
-        }
-        if (isPasteShortcut(key)) {
-            pasteClipboardIntoInput();
-            return;
-        }
-        if (isCopyShortcut(key)) {
-            copyInputToClipboard();
-            return;
-        }
-        if (hasOptions && (isReverseTabShortcut(key) || key.name === 'tab')) {
-            if (mode === 'option') {
-                setModeToInput();
-            }
-            else {
-                setModeToOption();
-            }
-            return;
-        }
-        if (mode === 'option' && hasOptions) {
-            const isOptionSubmitKey = key.name === 'enter' ||
-                key.name === 'return' ||
-                key.sequence === '\r' ||
-                key.sequence === '\n';
-            if (isOptionSubmitKey) {
-                submitCurrentSelection();
-                return;
-            }
-            if (key.name === 'right') {
-                setModeToInput();
-                return;
-            }
-            if (key.name === 'left') {
-                setModeToOption();
-                return;
-            }
-            if (key.name === 'up' || key.name.toLowerCase() === 'k') {
-                setSelectedIndex((previous) => (previous - 1 + predefinedOptions.length) %
-                    predefinedOptions.length);
-                onInputActivity?.();
-                return;
-            }
-            if (key.name === 'down' || key.name.toLowerCase() === 'j') {
-                setSelectedIndex((previous) => (previous + 1) % predefinedOptions.length);
-                onInputActivity?.();
-                return;
-            }
-            const typedCharacter = isPrintableCharacter(key);
-            if (typedCharacter !== null) {
-                setModeToInput();
-                insertCharacterInTextarea(typedCharacter);
-            }
-            return;
-        }
-        if (mode !== 'input' || fileSuggestions.length === 0) {
-            return;
-        }
-        if (key.name === 'tab') {
-            applySelectedSuggestion();
-            return;
-        }
-        if ((key.ctrl || key.meta) && key.name.toLowerCase() === 'n') {
-            setSelectedSuggestionIndex((previous) => (previous + 1) % fileSuggestions.length);
-            onInputActivity?.();
-            return;
-        }
-        if ((key.ctrl || key.meta) && key.name.toLowerCase() === 'p') {
-            setSelectedSuggestionIndex((previous) => previous <= 0 ? fileSuggestions.length - 1 : previous - 1);
-            onInputActivity?.();
-            return;
-        }
-        if (key.name === 'down') {
-            setSelectedSuggestionIndex((previous) => (previous + 1) % fileSuggestions.length);
-            onInputActivity?.();
-            return;
-        }
-        if (key.name === 'up') {
-            setSelectedSuggestionIndex((previous) => previous <= 0 ? fileSuggestions.length - 1 : previous - 1);
-            onInputActivity?.();
-        }
-    });
-    return (_jsxs(_Fragment, { children: [_jsxs("box", { flexDirection: "column", marginBottom: 0, width: "100%", gap: 0, border: true, borderStyle: "single", borderColor: "cyan", backgroundColor: "#121212", paddingLeft: 1, paddingRight: 1, paddingTop: 1, paddingBottom: 1, children: [_jsx("text", { fg: "cyan", children: _jsx("strong", { children: "PROMPT" }) }), _jsx(MarkdownText, { content: question, showCodeCopyControls: true })] }), _jsx(ModeTabs, { mode: mode, hasOptions: hasOptions, onSelectOptionMode: setModeToOption, onSelectInputMode: recoverInputFocusFromClick }), _jsx(OptionList, { mode: mode, options: predefinedOptions, selectedIndex: selectedIndex, onSelectOption: setSelectedIndex, onActivateOptionMode: setModeToOption }), mode === 'input' && (_jsx(InputEditor, { questionId: questionId, textareaRenderVersion: textareaRenderVersion, textareaRef: textareaRef, textareaContainerHeight: textareaContainerHeight, textareaRows: textareaRows, hasSuggestions: fileSuggestions.length > 0, keyBindings: textareaBindings, onFocusRequest: recoverInputFocusFromClick, onContentSync: syncInputStateFromTextarea, onSubmitFromTextarea: handleTextareaSubmit })), mode === 'input' && activeAutocompleteTarget !== null && (_jsx(SuggestionsPanel, { hasOptions: hasOptions, isIndexingFiles: isIndexingFiles, fileSuggestions: fileSuggestions, selectedSuggestionIndex: selectedSuggestionIndex, selectedSuggestionVscodeLink: selectedSuggestionVscodeLink, hasSearchRoot: hasSearchRoot })), mode === 'input' && (_jsxs("box", { flexDirection: "column", marginBottom: 0, width: "100%", children: [_jsx("text", { fg: "gray", wrapMode: "char", children: hasSearchRoot
-                            ? `#search root: ${searchRoot}`
-                            : '#search root: no search root' }), _jsx("text", { fg: "gray", children: isIndexingFiles
-                            ? '#search index: indexing...'
-                            : `#search index: ${repositoryFiles.length} files indexed` })] })), _jsxs("box", { flexDirection: isNarrow ? 'column' : 'row', justifyContent: "space-between", marginBottom: 0, gap: isNarrow ? 0 : undefined, children: [_jsx("text", { fg: "gray", children: mode === 'input' ? 'Custom input' : 'Option selection' }), _jsx("text", { fg: "gray", children: mode === 'input' && queuedAttachments.length > 0
-                            ? `${inputValue.length} chars + ${queuedAttachments.length} queued`
-                            : `${inputValue.length} chars` })] }), mode === 'input' && clipboardStatus && (_jsx("text", { fg: clipboardStatus.startsWith('Copy failed:') ? 'red' : 'green', children: clipboardStatus })), mode === 'input' && queuedAttachments.length > 0 && (_jsxs("box", { flexDirection: "column", width: "100%", gap: 0, children: [_jsxs("text", { fg: "yellow", children: [_jsx("strong", { children: "QUEUED ATTACHMENTS" }), " (Delete placeholder text to remove)"] }), queuedAttachments.map((attachment, index) => (_jsxs("text", { fg: "gray", wrapMode: "word", children: ["[File ", index + 1, "] ", attachment.label] }, attachment.id)))] })), mode === 'input' && (_jsx("box", { backgroundColor: "cyan", paddingLeft: 1, paddingRight: 1, alignSelf: "flex-start", marginBottom: 0, children: _jsxs("text", { fg: "black", children: [_jsx("strong", { children: "Send" }), " \u2303S"] }) })), mode === 'input' && (_jsx("text", { fg: "gray", wrapMode: "word", children: hasOptions
-                    ? 'Enter/Ctrl+J newline (or #search apply) • #search nav: ↑/↓ or Ctrl+N/P • Tab mode switch • #path for repo file autocomplete • Cmd/Ctrl+C copy • Cmd/Ctrl+V paste/attach'
-                    : 'Enter/Ctrl+J newline • #search nav: ↑/↓ or Ctrl+N/P • Enter/Tab #search apply • #path for repo file autocomplete • Cmd/Ctrl+C copy • Cmd/Ctrl+V paste/attach' }))] }));
+    const keyboardHandler = useMemo(() => createKeyboardRouter({
+        mode,
+        hasOptions,
+        predefinedOptions,
+        selectedIndex,
+        setSelectedIndex,
+        fileSuggestions,
+        selectedSuggestionIndex,
+        setSelectedSuggestionIndex,
+        setModeToInput,
+        setModeToOption,
+        submitCurrentSelection,
+        applySelectedSuggestion,
+        insertCharacterInTextarea,
+        handlePastedText,
+        pasteClipboardIntoInput,
+        copyInputToClipboard,
+        onInputActivity,
+    }), [
+        mode,
+        hasOptions,
+        predefinedOptions,
+        selectedIndex,
+        fileSuggestions,
+        selectedSuggestionIndex,
+        setModeToInput,
+        setModeToOption,
+        submitCurrentSelection,
+        applySelectedSuggestion,
+        insertCharacterInTextarea,
+        handlePastedText,
+        pasteClipboardIntoInput,
+        copyInputToClipboard,
+        onInputActivity,
+    ]);
+    useKeyboard(keyboardHandler);
+    return (_jsxs(_Fragment, { children: [_jsx(QuestionBox, { question: question, MarkdownTextComponent: MarkdownText }), _jsx(ModeTabs, { mode: mode, hasOptions: hasOptions, onSelectOptionMode: setModeToOption, onSelectInputMode: recoverInputFocusFromClick }), _jsx(OptionList, { mode: mode, options: predefinedOptions, selectedIndex: selectedIndex, onSelectOption: setSelectedIndex, onActivateOptionMode: setModeToOption }), mode === 'input' && (_jsx(InputEditor, { questionId: questionId, textareaRenderVersion: textareaRenderVersion, textareaRef: textareaRef, textareaContainerHeight: textareaContainerHeight, textareaRows: textareaRows, hasSuggestions: fileSuggestions.length > 0, keyBindings: textareaBindings, onFocusRequest: recoverInputFocusFromClick, onContentSync: syncInputStateFromTextarea, onSubmitFromTextarea: handleTextareaSubmit })), mode === 'input' && activeAutocompleteTarget !== null && (_jsx(SuggestionsPanel, { hasOptions: hasOptions, isIndexingFiles: isIndexingFiles, fileSuggestions: fileSuggestions, selectedSuggestionIndex: selectedSuggestionIndex, selectedSuggestionVscodeLink: selectedSuggestionVscodeLink, hasSearchRoot: hasSearchRoot })), mode === 'input' && (_jsx(SearchStatus, { isIndexingFiles: isIndexingFiles, repositoryFiles: repositoryFiles, searchRoot: searchRoot, hasSearchRoot: hasSearchRoot })), _jsx(InputStatus, { mode: mode, isNarrow: isNarrow, inputValue: inputValue, queuedAttachments: queuedAttachments }), mode === 'input' && clipboardStatus && (_jsx(ClipboardStatus, { status: clipboardStatus })), mode === 'input' && queuedAttachments.length > 0 && (_jsx(AttachmentsDisplay, { queuedAttachments: queuedAttachments })), mode === 'input' && _jsx(SendButton, {}), mode === 'input' && _jsx(HelpText, { hasOptions: hasOptions })] }));
 }

package/dist/components/interactive-input/keyboard-router.js

@@ -0,0 +1,104 @@
+import { extractPastedText, isPrintableCharacter, isCopyShortcut, isPasteShortcut, isReverseTabShortcut, isSubmitShortcut, } from './keyboard.js';
+/**
+ * Creates a keyboard event handler that routes key events
+ * to appropriate actions based on current mode and state.
+ */
+export function createKeyboardRouter(deps) {
+    const { mode, hasOptions, predefinedOptions, setSelectedIndex, fileSuggestions, setSelectedSuggestionIndex, setModeToInput, setModeToOption, submitCurrentSelection, applySelectedSuggestion, insertCharacterInTextarea, handlePastedText, pasteClipboardIntoInput, copyInputToClipboard, onInputActivity, } = deps;
+    return (key) => {
+        // Global shortcuts (work in any mode)
+        if (isSubmitShortcut(key)) {
+            submitCurrentSelection();
+            return;
+        }
+        const pastedText = extractPastedText(key);
+        if (pastedText !== null) {
+            if (mode === 'option' && hasOptions) {
+                setModeToInput();
+            }
+            handlePastedText(pastedText);
+            return;
+        }
+        if (isPasteShortcut(key)) {
+            pasteClipboardIntoInput();
+            return;
+        }
+        if (isCopyShortcut(key)) {
+            copyInputToClipboard();
+            return;
+        }
+        // Tab/Shift+Tab for mode switching
+        if (hasOptions && (isReverseTabShortcut(key) || key.name === 'tab')) {
+            if (mode === 'option') {
+                setModeToInput();
+            }
+            else {
+                setModeToOption();
+            }
+            return;
+        }
+        // Option mode handling
+        if (mode === 'option' && hasOptions) {
+            const isOptionSubmitKey = key.name === 'enter' ||
+                key.name === 'return' ||
+                key.sequence === '\r' ||
+                key.sequence === '\n';
+            if (isOptionSubmitKey) {
+                submitCurrentSelection();
+                return;
+            }
+            if (key.name === 'right') {
+                setModeToInput();
+                return;
+            }
+            if (key.name === 'left') {
+                setModeToOption();
+                return;
+            }
+            if (key.name === 'up' || key.name.toLowerCase() === 'k') {
+                setSelectedIndex((previous) => (previous - 1 + predefinedOptions.length) %
+                    predefinedOptions.length);
+                onInputActivity?.();
+                return;
+            }
+            if (key.name === 'down' || key.name.toLowerCase() === 'j') {
+                setSelectedIndex((previous) => (previous + 1) % predefinedOptions.length);
+                onInputActivity?.();
+                return;
+            }
+            const typedCharacter = isPrintableCharacter(key);
+            if (typedCharacter !== null) {
+                setModeToInput();
+                insertCharacterInTextarea(typedCharacter);
+            }
+            return;
+        }
+        // Input mode with suggestions handling
+        if (mode !== 'input' || fileSuggestions.length === 0) {
+            return;
+        }
+        if (key.name === 'tab') {
+            applySelectedSuggestion();
+            return;
+        }
+        if ((key.ctrl || key.meta) && key.name.toLowerCase() === 'n') {
+            setSelectedSuggestionIndex((previous) => (previous + 1) % fileSuggestions.length);
+            onInputActivity?.();
+            return;
+        }
+        if ((key.ctrl || key.meta) && key.name.toLowerCase() === 'p') {
+            setSelectedSuggestionIndex((previous) => previous <= 0 ? fileSuggestions.length - 1 : previous - 1);
+            onInputActivity?.();
+            return;
+        }
+        if (key.name === 'down') {
+            setSelectedSuggestionIndex((previous) => (previous + 1) % fileSuggestions.length);
+            onInputActivity?.();
+            return;
+        }
+        if (key.name === 'up') {
+            setSelectedSuggestionIndex((previous) => previous <= 0 ? fileSuggestions.length - 1 : previous - 1);
+            onInputActivity?.();
+        }
+    };
+}

package/dist/components/interactive-input/sections.js

@@ -20,3 +20,18 @@ export const SuggestionsPanel = ({ hasOptions, isIndexingFiles, fileSuggestions,
                             }, children: "\u2022 VS Code Insiders" })] }))] })) : (_jsx("text", { fg: "gray", children: hasSearchRoot
                 ? '#search: no matches'
                 : '#search: no search root configured' }))] }));
+export const QuestionBox = ({ question, MarkdownTextComponent, }) => (_jsxs("box", { flexDirection: "column", marginBottom: 0, width: "100%", gap: 0, border: true, borderStyle: "single", borderColor: "cyan", backgroundColor: "#121212", paddingLeft: 1, paddingRight: 1, paddingTop: 1, paddingBottom: 1, children: [_jsx("text", { fg: "cyan", children: _jsx("strong", { children: "PROMPT" }) }), _jsx(MarkdownTextComponent, { content: question, showCodeCopyControls: true })] }));
+export const SearchStatus = ({ isIndexingFiles, repositoryFiles, searchRoot, hasSearchRoot, }) => (_jsxs("box", { flexDirection: "column", marginBottom: 0, width: "100%", children: [_jsx("text", { fg: "gray", wrapMode: "char", children: hasSearchRoot
+                ? `#search root: ${searchRoot}`
+                : '#search root: no search root' }), _jsx("text", { fg: "gray", children: isIndexingFiles
+                ? '#search index: indexing...'
+                : `#search index: ${repositoryFiles.length} files indexed` })] }));
+export const InputStatus = ({ mode, isNarrow, inputValue, queuedAttachments, }) => (_jsxs("box", { flexDirection: isNarrow ? 'column' : 'row', justifyContent: "space-between", marginBottom: 0, gap: isNarrow ? 0 : undefined, children: [_jsx("text", { fg: "gray", children: mode === 'input' ? 'Custom input' : 'Option selection' }), _jsx("text", { fg: "gray", children: mode === 'input' && queuedAttachments.length > 0
+                ? `${inputValue.length} chars + ${queuedAttachments.length} queued`
+                : `${inputValue.length} chars` })] }));
+export const ClipboardStatus = ({ status }) => (_jsx("text", { fg: status.startsWith('Copy failed:') ? 'red' : 'green', children: status }));
+export const AttachmentsDisplay = ({ queuedAttachments, }) => (_jsxs("box", { flexDirection: "column", width: "100%", gap: 0, children: [_jsxs("text", { fg: "yellow", children: [_jsx("strong", { children: "QUEUED ATTACHMENTS" }), " (Delete placeholder text to remove)"] }), queuedAttachments.map((attachment, index) => (_jsxs("text", { fg: "gray", wrapMode: "word", children: ["[File ", index + 1, "] ", attachment.label] }, attachment.id)))] }));
+export const SendButton = () => (_jsx("box", { backgroundColor: "cyan", paddingLeft: 1, paddingRight: 1, alignSelf: "flex-start", marginBottom: 0, children: _jsxs("text", { fg: "black", children: [_jsx("strong", { children: "Send" }), " \u2303S"] }) }));
+export const HelpText = ({ hasOptions }) => (_jsx("text", { fg: "gray", wrapMode: "word", children: hasOptions
+        ? 'Enter/Ctrl+J newline (or #search apply) • #search nav: ↑/↓ or Ctrl+N/P • Tab mode switch • #path for repo file autocomplete • Cmd/Ctrl+C copy • Cmd/Ctrl+V paste/attach'
+        : 'Enter/Ctrl+J newline • #search nav: ↑/↓ or Ctrl+N/P • Enter/Tab #search apply • #path for repo file autocomplete • Cmd/Ctrl+C copy • Cmd/Ctrl+V paste/attach' }));

package/dist/components/interactive-input/submit-handler.js

@@ -0,0 +1,21 @@
+import { safeReadTextarea } from './textarea-operations.js';
+/**
+ * Creates a submit handler that processes the current selection/input
+ * and replaces attachment placeholders with actual payloads.
+ */
+export function createSubmitHandler(deps) {
+    const { mode, predefinedOptions, selectedIndex, inputValue, queuedAttachments, textareaRef, onSubmit, questionId, setQueuedAttachments, } = deps;
+    return () => {
+        let finalValue = mode === 'option' && predefinedOptions.length > 0
+            ? predefinedOptions[selectedIndex]
+            : (safeReadTextarea(textareaRef)?.value ?? inputValue);
+        // Replace [Attached file N] placeholders with actual payloads
+        queuedAttachments.forEach((attachment, index) => {
+            const placeholder = `[Attached file ${index + 1}]`;
+            const regex = new RegExp(placeholder.replace(/[[\]]/g, '\\$&'), 'g');
+            finalValue = finalValue.replace(regex, attachment.payload);
+        });
+        onSubmit(questionId, finalValue);
+        setQueuedAttachments([]);
+    };
+}

package/dist/components/interactive-input/textarea-operations.js

@@ -0,0 +1,62 @@
+/**
+ * Safely reads text and caret position from textarea.
+ * Returns null if textarea is not available or throws an error.
+ */
+export function safeReadTextarea(textareaRef) {
+    const textarea = textareaRef.current;
+    if (!textarea) {
+        return null;
+    }
+    try {
+        return {
+            value: textarea.plainText,
+            caret: textarea.cursorOffset,
+        };
+    }
+    catch {
+        // Clear the ref if it's stale
+        textareaRef.current = null;
+        return null;
+    }
+}
+/**
+ * Safely writes text and caret position to textarea.
+ * Returns true if successful, false otherwise.
+ */
+export function safeWriteTextarea(textareaRef, nextValue, nextCaretPosition) {
+    const textarea = textareaRef.current;
+    if (!textarea) {
+        return false;
+    }
+    try {
+        if (textarea.plainText !== nextValue) {
+            textarea.setText(nextValue);
+        }
+        textarea.cursorOffset = nextCaretPosition;
+        return true;
+    }
+    catch {
+        // Clear the ref if it's stale
+        textareaRef.current = null;
+        return false;
+    }
+}
+/**
+ * Attempts to focus the textarea.
+ * Returns true if successful, false otherwise.
+ */
+export function focusTextarea(textareaRef) {
+    const textarea = textareaRef.current;
+    if (!textarea) {
+        return false;
+    }
+    try {
+        textarea.focus?.();
+        return true;
+    }
+    catch {
+        // Clear the ref if it's stale
+        textareaRef.current = null;
+        return false;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rawwee/interactive-mcp",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "main": "dist/index.js",
   "type": "module",
   "bin": {