longer-agent 0.1.1 → 0.1.3

package/dist/tui/app.js

@@ -30,6 +30,7 @@ import { LogoPanel } from "./components/logo-panel.js";
 import { StatusBar } from "./components/status-bar.js";
 import { ConversationPanel } from "./components/conversation-panel.js";
 import { AskPanel } from "./components/ask-panel.js";
+import { CommandPromptPanel, } from "./components/command-prompt-panel.js";
 import { PlanPanel } from "./components/plan-panel.js";
 import { InputPanel } from "./components/input-panel.js";
 import { InputProtocolParser } from "./input/protocol.js";
@@ -37,8 +38,8 @@ import { mapInputEventToCommand } from "./input/keymap.js";
 import { withValueAndCursor, insertText, moveLeft, moveRight, moveWordLeft, moveWordRight, moveHome, moveEnd, deleteBackward, deleteForward, deleteWordBackward, deleteWordForward, deleteToLineStart, deleteToLineEnd, } from "./input/editor-state.js";
 import { saveLog } from "../persistence.js";
 import { isCommandExitSignal } from "../commands.js";
-import { formatDisplayModelName } from "../config.js";
 import { projectToTuiEntries } from "../log-projection.js";
+import { formatStatusBarModelName } from "./status-bar-model-name.js";
 // ------------------------------------------------------------------
 // Goodbye messages
 // ------------------------------------------------------------------
@@ -48,6 +49,7 @@ const GOODBYE_MESSAGES = [
     "Peace out!", "So long!", "Off I go!", "Later, gator!",
 ];
 const CUSTOM_EMPTY_HINT = 'Custom answer is empty. Please enter an answer first, or choose "Discuss further" instead.';
+const ACTIVITY_DETAIL_FALLBACK_MS = 3000;
 // ------------------------------------------------------------------
 // Clipboard helper
 // ------------------------------------------------------------------
@@ -119,17 +121,21 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
     const [reviewMode, setReviewMode] = useState(false);
     // Plan panel state
     const [planCheckpoints, setPlanCheckpoints] = useState(null);
+    const [commandPrompt, setCommandPrompt] = useState(null);
     const cancelledRef = useRef(false);
     const lastCtrlCRef = useRef(0);
     const abortControllerRef = useRef(null);
     const inputPanelRef = useRef(null);
     const shortcutParserRef = useRef(new InputProtocolParser());
     const shortcutDecoderRef = useRef(new StringDecoder("utf8"));
+    const activityFallbackTimerRef = useRef(null);
+    const activityFallbackSeqRef = useRef(0);
     const inputHintTimerRef = useRef(null);
     const markdownModeInitializedRef = useRef(false);
     const runTurnRef = useRef(null);
     const runManualSummarizeRef = useRef(null);
     const runManualCompactRef = useRef(null);
+    const commandPromptResolveRef = useRef(null);
     // Raw mode
     useEffect(() => {
         if (!isRawModeSupported)
@@ -202,12 +208,41 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
     }, []);
     useEffect(() => {
         return () => {
+            if (activityFallbackTimerRef.current) {
+                clearTimeout(activityFallbackTimerRef.current);
+                activityFallbackTimerRef.current = null;
+            }
             if (inputHintTimerRef.current) {
                 clearTimeout(inputHintTimerRef.current);
                 inputHintTimerRef.current = null;
             }
         };
     }, []);
+    const clearActivityFallback = useCallback(() => {
+        activityFallbackSeqRef.current += 1;
+        if (activityFallbackTimerRef.current) {
+            clearTimeout(activityFallbackTimerRef.current);
+            activityFallbackTimerRef.current = null;
+        }
+    }, []);
+    const setStableActivity = useCallback((phase) => {
+        clearActivityFallback();
+        setActivityPhase(phase);
+        setActivityToolName(undefined);
+    }, [clearActivityFallback]);
+    const setTransientActivity = useCallback((phase) => {
+        clearActivityFallback();
+        const seq = activityFallbackSeqRef.current;
+        setActivityPhase(phase);
+        setActivityToolName(undefined);
+        activityFallbackTimerRef.current = setTimeout(() => {
+            if (activityFallbackSeqRef.current !== seq)
+                return;
+            activityFallbackTimerRef.current = null;
+            setActivityPhase("working");
+            setActivityToolName(undefined);
+        }, ACTIVITY_DETAIL_FALLBACK_MS);
+    }, [clearActivityFallback]);
     useEffect(() => {
         if (!markdownModeInitializedRef.current) {
             markdownModeInitializedRef.current = true;
@@ -215,6 +250,44 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
         }
         showInputHint(markdownMode === "raw" ? "Markdown raw: ON" : "Markdown raw: OFF");
     }, [markdownMode, showInputHint]);
+    const resolveCommandPrompt = useCallback((value) => {
+        const resolve = commandPromptResolveRef.current;
+        commandPromptResolveRef.current = null;
+        setCommandPrompt(null);
+        resolve?.(value);
+    }, []);
+    const promptSelect = useCallback((request) => {
+        return new Promise((resolve) => {
+            commandPromptResolveRef.current = resolve;
+            setCommandPrompt({
+                kind: "select",
+                message: request.message,
+                options: request.options,
+                selected: 0,
+            });
+        });
+    }, []);
+    const promptSecret = useCallback((request) => {
+        return new Promise((resolve) => {
+            commandPromptResolveRef.current = resolve;
+            setCommandPrompt({
+                kind: "secret",
+                message: request.message,
+                value: "",
+                cursor: 0,
+                allowEmpty: request.allowEmpty,
+                error: null,
+            });
+        });
+    }, []);
+    useEffect(() => {
+        return () => {
+            if (commandPromptResolveRef.current) {
+                commandPromptResolveRef.current(undefined);
+                commandPromptResolveRef.current = null;
+            }
+        };
+    }, []);
     useEffect(() => {
         setAskSelectionIndex(0);
         setCurrentQuestionIndex(0);
@@ -252,8 +325,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
         const controller = new AbortController();
         abortControllerRef.current = controller;
         setProcessing(true);
-        setActivityPhase("working");
-        setActivityToolName(undefined);
+        setStableActivity("working");
         setStatusError(false);
         try {
             await session.resumePendingTurn({ signal: controller.signal });
@@ -261,8 +333,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
                 autoSave();
                 return;
             }
-            setActivityPhase("idle");
-            setActivityToolName(undefined);
+            setStableActivity("idle");
             setContextTokens(session.lastInputTokens);
             setCacheReadTokens(session.lastCacheReadTokens ?? 0);
             setPendingAsk(session.getPendingAsk?.() ?? null);
@@ -275,6 +346,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
             }
             const msg = err instanceof Error ? err.message : String(err);
             session.appendErrorMessage?.(msg, "resume_pending_turn");
+            clearActivityFallback();
             setStatusError(true);
         }
         finally {
@@ -284,7 +356,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
                 setProcessing(false);
             }
         }
-    }, [session, autoSave]);
+    }, [session, autoSave, setStableActivity, clearActivityFallback]);
     // Wire incremental save callback into Session
     useEffect(() => {
         session.onSaveRequest = autoSave;
@@ -334,12 +406,12 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
                 // Reset token count on /new
                 setContextTokens(0);
                 setCacheReadTokens(0);
-                setActivityPhase("idle");
-                setActivityToolName(undefined);
+                setStableActivity("idle");
                 setStatusError(false);
                 setPendingAsk(null);
                 setAskError(null);
                 setHideProgress(false);
+                setPlanCheckpoints(null);
             },
             exit: performExit,
             onTurnRequested: (content) => {
@@ -351,8 +423,10 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
             onManualCompactRequested: (instruction) => {
                 runManualCompactRef.current?.(instruction);
             },
+            promptSelect,
+            promptSecret,
         };
-    }, [session, store, commandRegistry, autoSave, performExit, showInputHint]);
+    }, [session, store, commandRegistry, autoSave, performExit, showInputHint, promptSelect, promptSecret, setStableActivity]);
     // ------------------------------------------------------------------
     // Progress callback (streaming)
     // ------------------------------------------------------------------
@@ -364,20 +438,16 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
         if (!hasSubAgentId) {
             switch (event.action) {
                 case "reasoning_chunk":
-                    setActivityPhase("thinking");
-                    setActivityToolName(undefined);
+                    setTransientActivity("thinking");
                     break;
                 case "text_chunk":
-                    setActivityPhase("generating");
-                    setActivityToolName(undefined);
+                    setTransientActivity("generating");
                     break;
                 case "tool_call":
-                    setActivityPhase("tool_calling");
-                    setActivityToolName(event.extra?.["tool"] ?? undefined);
+                    setStableActivity("working");
                     break;
                 case "agent_no_reply":
-                    setActivityPhase("waiting");
-                    setActivityToolName(undefined);
+                    setStableActivity("waiting");
                     break;
                 case "agent_end":
                     setContextTokens(session.lastInputTokens);
@@ -395,8 +465,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
             const ask = event.extra?.["ask"] ?? session.getPendingAsk?.() ?? null;
             setPendingAsk(ask);
             setAskError(null);
-            setActivityPhase("waiting");
-            setActivityToolName(undefined);
+            setStableActivity("waiting");
             return;
         }
         if (event.action === "ask_resolved") {
@@ -415,7 +484,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
             setPlanCheckpoints(null);
             return;
         }
-    }, [session]);
+    }, [session, setStableActivity, setTransientActivity]);
     // Register progress callback on mount
     useEffect(() => {
         onProgressCallback(handleProgress);
@@ -428,8 +497,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
         const controller = new AbortController();
         abortControllerRef.current = controller;
         setProcessing(true);
-        setActivityPhase("working");
-        setActivityToolName(undefined);
+        setStableActivity("working");
         setStatusError(false);
         try {
             await session.turn(userInput, { signal: controller.signal });
@@ -437,8 +505,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
                 autoSave();
                 return;
             }
-            setActivityPhase("idle");
-            setActivityToolName(undefined);
+            setStableActivity("idle");
             setContextTokens(session.lastInputTokens);
             setCacheReadTokens(session.lastCacheReadTokens ?? 0);
             setPendingAsk(session.getPendingAsk?.() ?? null);
@@ -451,6 +518,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
             }
             const msg = err instanceof Error ? err.message : String(err);
             session.appendErrorMessage?.(msg, "turn");
+            clearActivityFallback();
             setStatusError(true);
             setPendingAsk(session.getPendingAsk?.() ?? null);
         }
@@ -461,7 +529,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
                 setProcessing(false);
             }
         }
-    }, [session, autoSave]);
+    }, [session, autoSave, setStableActivity, clearActivityFallback]);
     runTurnRef.current = runTurn;
     const runManualSummarize = useCallback(async (instruction) => {
         if (typeof session.runManualSummarize !== "function") {
@@ -472,8 +540,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
         const controller = new AbortController();
         abortControllerRef.current = controller;
         setProcessing(true);
-        setActivityPhase("working");
-        setActivityToolName(undefined);
+        setStableActivity("working");
         setStatusError(false);
         try {
             await session.runManualSummarize(instruction, { signal: controller.signal });
@@ -481,8 +548,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
                 autoSave();
                 return;
             }
-            setActivityPhase("idle");
-            setActivityToolName(undefined);
+            setStableActivity("idle");
             setContextTokens(session.lastInputTokens);
             setCacheReadTokens(session.lastCacheReadTokens ?? 0);
             setPendingAsk(session.getPendingAsk?.() ?? null);
@@ -495,6 +561,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
             }
             const msg = err instanceof Error ? err.message : String(err);
             session.appendErrorMessage?.(msg, "manual_summarize");
+            clearActivityFallback();
             setStatusError(true);
         }
         finally {
@@ -504,7 +571,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
                 setProcessing(false);
             }
         }
-    }, [session, autoSave]);
+    }, [session, autoSave, setStableActivity, clearActivityFallback]);
     runManualSummarizeRef.current = runManualSummarize;
     const runManualCompact = useCallback(async (instruction) => {
         if (typeof session.runManualCompact !== "function") {
@@ -515,8 +582,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
         const controller = new AbortController();
         abortControllerRef.current = controller;
         setProcessing(true);
-        setActivityPhase("working");
-        setActivityToolName(undefined);
+        setStableActivity("working");
         setStatusError(false);
         try {
             await session.runManualCompact(instruction, { signal: controller.signal });
@@ -524,8 +590,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
                 autoSave();
                 return;
             }
-            setActivityPhase("idle");
-            setActivityToolName(undefined);
+            setStableActivity("idle");
             setContextTokens(session.lastInputTokens);
             setCacheReadTokens(session.lastCacheReadTokens ?? 0);
             setPendingAsk(session.getPendingAsk?.() ?? null);
@@ -538,6 +603,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
             }
             const msg = err instanceof Error ? err.message : String(err);
             session.appendErrorMessage?.(msg, "manual_compact");
+            clearActivityFallback();
             setStatusError(true);
         }
         finally {
@@ -547,7 +613,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
                 setProcessing(false);
             }
         }
-    }, [session, autoSave]);
+    }, [session, autoSave, setStableActivity, clearActivityFallback]);
     runManualCompactRef.current = runManualCompact;
     const resolveAgentQuestion = useCallback((answersOverride, notesOverride) => {
         if (!pendingAsk || pendingAsk.kind !== "agent_question")
@@ -693,6 +759,7 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
     // ------------------------------------------------------------------
     const handleSubmit = useCallback((input) => {
         clearInputHint();
+        // If a command is waiting for user input (e.g. API key paste), resolve it.
         if (pendingAsk) {
             if (pendingAsk.kind === "agent_question") {
                 showInputHint("Use ↑/↓ to select options, ←/→ to navigate questions, Enter to confirm.", 2500);
@@ -757,6 +824,11 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
     // Ctrl+C / Ctrl+L / Ctrl+Y handling
     // ------------------------------------------------------------------
     const handleCtrlC = useCallback(() => {
+        if (commandPrompt) {
+            resolveCommandPrompt(undefined);
+            clearInputHint();
+            return;
+        }
         if (inputPanelRef.current?.dismissOverlay()) {
             clearInputHint();
             return;
@@ -794,18 +866,20 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
             cancelledRef.current = true;
             abortControllerRef.current?.abort();
             setProcessing(false);
-            setActivityPhase("idle");
-            setActivityToolName(undefined);
+            setStableActivity("idle");
             clearInputHint();
         }
         else {
             showInputHint("Press Ctrl+C again to exit");
         }
     }, [
+        commandPrompt,
+        resolveCommandPrompt,
         processing,
         clearInputHint,
         showInputHint,
         performExit,
+        setStableActivity,
     ]);
     const handleCtrlL = useCallback(() => {
         setHideProgress((prev) => {
@@ -840,6 +914,67 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
             const chunk = typeof data === "string" ? data : shortcutDecoderRef.current.write(data);
             const events = shortcutParserRef.current.push(chunk);
             for (const event of events) {
+                if (commandPrompt) {
+                    if (event.type !== "key" && event.type !== "insert")
+                        continue;
+                    if (commandPrompt.kind === "select") {
+                        if (event.type !== "key")
+                            continue;
+                        if (event.key === "up" && commandPrompt.options.length > 0) {
+                            setCommandPrompt((prev) => {
+                                if (!prev || prev.kind !== "select" || prev.options.length === 0)
+                                    return prev;
+                                return {
+                                    ...prev,
+                                    selected: (prev.selected - 1 + prev.options.length) % prev.options.length,
+                                };
+                            });
+                            continue;
+                        }
+                        if (event.key === "down" && commandPrompt.options.length > 0) {
+                            setCommandPrompt((prev) => {
+                                if (!prev || prev.kind !== "select" || prev.options.length === 0)
+                                    return prev;
+                                return {
+                                    ...prev,
+                                    selected: (prev.selected + 1) % prev.options.length,
+                                };
+                            });
+                            continue;
+                        }
+                        if (event.key === "enter") {
+                            const selected = commandPrompt.options[commandPrompt.selected];
+                            resolveCommandPrompt(selected?.value);
+                            continue;
+                        }
+                        if (event.key === "escape" || event.key === "ctrl_c") {
+                            resolveCommandPrompt(undefined);
+                            continue;
+                        }
+                        continue;
+                    }
+                    if (event.type === "key" && event.key === "enter") {
+                        if (!commandPrompt.allowEmpty && commandPrompt.value.trim() === "") {
+                            setCommandPrompt((prev) => prev && prev.kind === "secret"
+                                ? { ...prev, error: "API key cannot be empty." }
+                                : prev);
+                            continue;
+                        }
+                        resolveCommandPrompt(commandPrompt.value);
+                        continue;
+                    }
+                    if (event.type === "key" && (event.key === "escape" || event.key === "ctrl_c")) {
+                        resolveCommandPrompt(undefined);
+                        continue;
+                    }
+                    const result = applyInlineEdit(commandPrompt.value, commandPrompt.cursor, event);
+                    if (result) {
+                        setCommandPrompt((prev) => prev && prev.kind === "secret"
+                            ? { ...prev, value: result.value, cursor: result.cursor, error: null }
+                            : prev);
+                    }
+                    continue;
+                }
                 // --- Review mode for multi-question ask ---
                 if (pendingAsk?.kind === "agent_question" && reviewMode) {
                     if (event.type !== "key")
@@ -1015,6 +1150,8 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
         };
     }, [
         stdin,
+        commandPrompt,
+        resolveCommandPrompt,
         pendingAsk,
         resolveSelectedPendingAsk,
         resolveAgentQuestion,
@@ -1035,8 +1172,8 @@ export function App({ session, commandRegistry, store, onProgressCallback, }) {
     // ------------------------------------------------------------------
     // Render
     // ------------------------------------------------------------------
-    return (_jsxs(Box, { flexDirection: "column", height: "100%", children: [_jsx(Box, { flexShrink: 0, children: _jsx(Text, { children: " " }) }), _jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [_jsx(Text, { children: " " }), _jsx(LogoPanel, { cwd: process.cwd() })] }), _jsx(ConversationPanel, { entries: entries, markdownMode: markdownMode, streamingAssistantEntryId: null }), planCheckpoints ? _jsx(PlanPanel, { checkpoints: planCheckpoints }) : null, pendingAsk ? (_jsx(AskPanel, { ask: pendingAsk, error: askError, selectedIndex: askSelectionIndex, currentQuestionIndex: currentQuestionIndex, totalQuestions: pendingAsk.kind === "agent_question"
+    return (_jsxs(Box, { flexDirection: "column", height: "100%", children: [_jsx(Box, { flexShrink: 0, children: _jsx(Text, { children: " " }) }), _jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [_jsx(Text, { children: " " }), _jsx(LogoPanel, { cwd: process.cwd() })] }), _jsx(ConversationPanel, { entries: entries, markdownMode: markdownMode, streamingAssistantEntryId: null }), planCheckpoints ? _jsx(PlanPanel, { checkpoints: planCheckpoints, active: activityPhase !== "idle" }) : null, pendingAsk ? (_jsx(AskPanel, { ask: pendingAsk, error: askError, selectedIndex: askSelectionIndex, currentQuestionIndex: currentQuestionIndex, totalQuestions: pendingAsk.kind === "agent_question"
                     ? (pendingAsk.payload["questions"] ?? []).length
-                    : 1, questionAnswers: questionAnswers, customInputMode: customInputMode, noteInputMode: noteInputMode, reviewMode: reviewMode, inlineEditorValue: inlineEditor.value, inlineEditorCursor: inlineEditor.cursor, optionNotes: optionNotes })) : null, _jsx(InputPanel, { ref: inputPanelRef, onSubmit: handleSubmit, disabled: !!pendingAsk, commandRegistry: commandRegistry, store: store, hint: inputHint, onHintRequested: showInputHint, session: session }), _jsx(StatusBar, { phase: activityPhase, toolName: activityToolName, error: statusError, modelName: formatDisplayModelName(session.primaryAgent.modelConfig?.provider, session.primaryAgent.modelConfig?.model), contextTokens: contextTokens, contextLimit: session.primaryAgent.modelConfig?.contextLength, cacheReadTokens: cacheReadTokens })] }));
+                    : 1, questionAnswers: questionAnswers, customInputMode: customInputMode, noteInputMode: noteInputMode, reviewMode: reviewMode, inlineEditorValue: inlineEditor.value, inlineEditorCursor: inlineEditor.cursor, optionNotes: optionNotes })) : null, commandPrompt ? _jsx(CommandPromptPanel, { prompt: commandPrompt }) : null, _jsx(InputPanel, { ref: inputPanelRef, onSubmit: handleSubmit, disabled: !!pendingAsk || !!commandPrompt, commandRegistry: commandRegistry, store: store, hint: inputHint, onHintRequested: showInputHint, session: session }), _jsx(StatusBar, { phase: activityPhase, toolName: activityToolName, error: statusError, modelName: formatStatusBarModelName(session.primaryAgent.modelConfig?.provider, session.primaryAgent.modelConfig?.model), contextTokens: contextTokens, contextLimit: session.primaryAgent.modelConfig?.contextLength, cacheReadTokens: cacheReadTokens })] }));
 }
 //# sourceMappingURL=app.js.map