ideacode 1.2.3 → 1.2.5

package/dist/repl.js

@@ -41,6 +41,7 @@ const INITIAL_BANNER_LINES = 12;
 const ENABLE_PARALLEL_TOOL_CALLS = process.env.IDEACODE_PARALLEL_TOOL_CALLS !== "0";
 const PARALLEL_SAFE_TOOLS = new Set(["read", "glob", "grep", "web_fetch", "web_search"]);
 const LOADING_TICK_MS = 80;
+const MAX_EMPTY_ASSISTANT_RETRIES = 3;
 const TRUNCATE_NOTE = "\n\n(Output truncated to save context. Use read with offset/limit, grep with a specific pattern, or tail with fewer lines to get more.)";
 function truncateToolResult(content) {
     if (content.length <= MAX_TOOL_RESULT_CHARS)
@@ -63,11 +64,57 @@ function listFilesWithFilter(cwd, filter) {
         return [];
     }
 }
+function stripHeredocBodies(cmdRaw) {
+    const lines = cmdRaw.replace(/\r\n/g, "\n").split("\n");
+    const out = [];
+    let i = 0;
+    while (i < lines.length) {
+        const line = lines[i] ?? "";
+        out.push(line);
+        const markerMatch = line.match(/<<-?\s*(['"]?)([A-Za-z_][A-Za-z0-9_]*)\1/);
+        if (!markerMatch) {
+            i += 1;
+            continue;
+        }
+        const marker = markerMatch[2] ?? "";
+        i += 1;
+        while (i < lines.length) {
+            const bodyLine = lines[i] ?? "";
+            if (bodyLine.trim() === marker) {
+                out.push(bodyLine);
+                break;
+            }
+            i += 1;
+        }
+        i += 1;
+    }
+    return out.join("\n");
+}
 function summarizeBashCommand(cmdRaw) {
-    const parts = cmdRaw
-        .split(/\n|&&|;|\|/g)
+    const sanitized = stripHeredocBodies(cmdRaw);
+    const parts = sanitized
+        .split(/\n|&&|\|\||;|\|/g)
         .map((s) => s.trim())
         .filter(Boolean);
+    const skipTokens = new Set([
+        "if",
+        "then",
+        "else",
+        "elif",
+        "fi",
+        "for",
+        "while",
+        "do",
+        "done",
+        "case",
+        "esac",
+        "in",
+        "function",
+        "{",
+        "}",
+        "(",
+        ")",
+    ]);
     const commands = [];
     for (const part of parts) {
         let s = part.replace(/^\(+/, "").trim();
@@ -84,9 +131,11 @@ function summarizeBashCommand(cmdRaw) {
         }
         if (!s)
             continue;
-        const token = s.split(/\s+/)[0]?.replace(/^['"]|['"]$/g, "") ?? "";
+        const token = (s.split(/\s+/)[0] ?? "").replace(/^['"]|['"]$/g, "").toLowerCase();
         if (!/^[A-Za-z0-9_./-]+$/.test(token))
             continue;
+        if (skipTokens.has(token))
+            continue;
         if (token === "echo")
             continue;
         if (token === "cat" && /<<\s*['"]?EOF/i.test(s))
@@ -232,30 +281,6 @@ function orbitDots(frame) {
         .map((ch, i) => (i === activeIndex ? colors.gray(ch) : colors.mutedDark(ch)))
         .join("");
 }
-const LoadingStatus = React.memo(function LoadingStatus({ active, label, }) {
-    const [frame, setFrame] = useState(0);
-    const startedAtRef = useRef(null);
-    useEffect(() => {
-        if (!active) {
-            startedAtRef.current = null;
-            return;
-        }
-        if (startedAtRef.current == null) {
-            startedAtRef.current = Date.now();
-            setFrame(0);
-        }
-        const anim = setInterval(() => setFrame((n) => n + 1), LOADING_TICK_MS);
-        return () => {
-            clearInterval(anim);
-        };
-    }, [active]);
-    if (!active)
-        return _jsx(Text, { color: inkColors.textSecondary, children: "\u00A0" });
-    const startedAt = startedAtRef.current ?? Date.now();
-    const elapsedSeconds = Math.max(0, (Date.now() - startedAt) / 1000);
-    const elapsedText = elapsedSeconds < 10 ? `${elapsedSeconds.toFixed(1)}s` : `${Math.floor(elapsedSeconds)}s`;
-    return (_jsxs(Text, { color: inkColors.textSecondary, children: [" ", orbitDots(frame), " ", colors.gray(label), " ", colors.gray(elapsedText)] }));
-});
 export function Repl({ apiKey, cwd, onQuit }) {
     const { rows: termRows, columns: termColumns } = useTerminalSize();
     // Big ASCII art logo for ideacode
@@ -354,7 +379,11 @@ export function Repl({ apiKey, cwd, onQuit }) {
     }, [cwd, onQuit]);
     const [loading, setLoading] = useState(false);
     const [loadingLabel, setLoadingLabel] = useState("Thinking…");
-    const [cursorBlinkOn, setCursorBlinkOn] = useState(true);
+    const loadingActiveRef = useRef(false);
+    const loadingLabelRef = useRef(loadingLabel);
+    const loadingFooterLinesRef = useRef(2);
+    const loadingRenderRef = useRef(null);
+    const cursorBlinkOn = true;
     const [showPalette, setShowPalette] = useState(false);
     const [paletteIndex, setPaletteIndex] = useState(0);
     const [showModelSelector, setShowModelSelector] = useState(false);
@@ -380,14 +409,54 @@ export function Repl({ apiKey, cwd, onQuit }) {
         };
     }, []);
     useEffect(() => {
-        setCursorBlinkOn(true);
-        if (loading)
+        loadingActiveRef.current = loading;
+        loadingLabelRef.current = loadingLabel;
+        if (!process.stdout.isTTY)
             return;
-        const timer = setInterval(() => {
-            setCursorBlinkOn((prev) => !prev);
-        }, 520);
-        return () => clearInterval(timer);
-    }, [loading, inputValue, inputCursor]);
+        const clearLoadingLine = () => {
+            const up = Math.max(1, loadingFooterLinesRef.current);
+            try {
+                writeSync(process.stdout.fd, `\x1b7\x1b[${up}A\r\x1b[2K\x1b8`);
+            }
+            catch {
+                // Best effort only.
+            }
+        };
+        if (!loading) {
+            if (loadingRenderRef.current) {
+                clearInterval(loadingRenderRef.current);
+                loadingRenderRef.current = null;
+            }
+            clearLoadingLine();
+            return;
+        }
+        const startedAt = Date.now();
+        let frame = 0;
+        const renderTick = () => {
+            if (!loadingActiveRef.current || !process.stdout.isTTY)
+                return;
+            const elapsedSeconds = Math.max(0, (Date.now() - startedAt) / 1000);
+            const elapsedText = elapsedSeconds < 10 ? `${elapsedSeconds.toFixed(1)}s` : `${Math.floor(elapsedSeconds)}s`;
+            const line = ` ${orbitDots(frame)} ${colors.gray(loadingLabelRef.current)} ${colors.gray(elapsedText)}`;
+            const up = Math.max(1, loadingFooterLinesRef.current);
+            try {
+                writeSync(process.stdout.fd, `\x1b7\x1b[${up}A\r\x1b[2K${line}\x1b8`);
+            }
+            catch {
+                // Best effort only.
+            }
+            frame = (frame + 1) % 6;
+        };
+        renderTick();
+        loadingRenderRef.current = setInterval(renderTick, LOADING_TICK_MS);
+        return () => {
+            if (loadingRenderRef.current) {
+                clearInterval(loadingRenderRef.current);
+                loadingRenderRef.current = null;
+            }
+            clearLoadingLine();
+        };
+    }, [loading, loadingLabel]);
     const estimatedTokens = useMemo(() => estimateTokens(messages, undefined), [messages]);
     const contextWindowK = useMemo(() => {
         const ctx = modelList.find((m) => m.id === currentModel)?.context_length;
@@ -588,6 +657,7 @@ export function Repl({ apiKey, cwd, onQuit }) {
             appendLog(colors.muted("  (context compressed to stay under limit)\n"));
         }
         setLoadingLabel("Thinking…");
+        let emptyAssistantRetries = 0;
         for (;;) {
             setLoading(true);
             setLoadingLabel("Thinking…");
@@ -597,6 +667,20 @@ export function Repl({ apiKey, cwd, onQuit }) {
                 },
             });
             const contentBlocks = response.content ?? [];
+            const hasMeaningfulAssistantOutput = contentBlocks.some((block) => block.type === "tool_use" || (block.type === "text" && !!block.text?.trim()));
+            if (!hasMeaningfulAssistantOutput) {
+                emptyAssistantRetries += 1;
+                if (emptyAssistantRetries <= MAX_EMPTY_ASSISTANT_RETRIES) {
+                    setLoadingLabel(`No output yet, retrying ${emptyAssistantRetries}/${MAX_EMPTY_ASSISTANT_RETRIES}…`);
+                    appendLog(colors.muted(`  ${icons.tool} model returned an empty turn, retrying (${emptyAssistantRetries}/${MAX_EMPTY_ASSISTANT_RETRIES})…`));
+                    continue;
+                }
+                appendLog(colors.error(`${icons.error} model returned empty output repeatedly. Stopping this turn; you can submit "continue" to resume.`));
+                appendLog("");
+                setMessages(state);
+                break;
+            }
+            emptyAssistantRetries = 0;
             const toolResults = [];
             const renderToolOutcome = (planned, result, extraIndent = 0) => {
                 const ok = !result.startsWith("error:");
@@ -1118,7 +1202,8 @@ export function Repl({ apiKey, cwd, onQuit }) {
         return (_jsxs(Box, { flexDirection: "column", height: termRows, overflow: "hidden", children: [_jsx(Box, { height: topPad }), _jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: leftPad }), _jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: inkColors.primary, paddingX: 2, paddingY: 1, width: paletteModalWidth, minHeight: paletteModalHeight, children: [_jsx(Text, { bold: true, children: " Command palette " }), COMMANDS.map((c, i) => (_jsxs(Text, { color: i === paletteIndex ? inkColors.primary : undefined, children: [i === paletteIndex ? "› " : "  ", c.cmd, _jsxs(Text, { color: inkColors.textSecondary, children: [" \u2014 ", c.desc] })] }, c.cmd))), _jsxs(Text, { color: paletteIndex === COMMANDS.length ? inkColors.primary : undefined, children: [paletteIndex === COMMANDS.length ? "› " : "  ", "Cancel (Esc)"] }), _jsx(Text, { color: inkColors.textSecondary, children: " \u2191/\u2193 select, Enter confirm, Esc close " })] })] }), _jsx(Box, { flexGrow: 1 })] }));
     }
     const footerLines = suggestionBoxLines + 1 + stableInputLineCount;
-    return (_jsxs(Box, { flexDirection: "column", height: termRows, overflow: "hidden", children: [_jsxs(Box, { flexDirection: "column", flexGrow: 1, minHeight: 0, overflow: "hidden", children: [_jsx(LogViewport, { lines: visibleLogLines, startIndex: logStartIndex, height: logViewportHeight }), _jsx(Box, { flexDirection: "row", marginTop: 1, marginBottom: 0, children: _jsx(LoadingStatus, { active: loading, label: loadingLabel }) })] }), _jsxs(Box, { flexDirection: "column", flexShrink: 0, height: footerLines, children: [showSlashSuggestions && (_jsxs(Box, { flexDirection: "column", marginBottom: 0, paddingLeft: 2, borderStyle: "single", borderColor: inkColors.textDisabled, children: [filteredSlashCommands.length === 0 ? (_jsx(Text, { color: inkColors.textSecondary, children: " No match " })) : ([...filteredSlashCommands].reverse().map((c, rev) => {
+    loadingFooterLinesRef.current = footerLines;
+    return (_jsxs(Box, { flexDirection: "column", height: termRows, overflow: "hidden", children: [_jsxs(Box, { flexDirection: "column", flexGrow: 1, minHeight: 0, overflow: "hidden", children: [_jsx(LogViewport, { lines: visibleLogLines, startIndex: logStartIndex, height: logViewportHeight }), _jsx(Box, { flexDirection: "row", marginTop: 1, marginBottom: 0, children: _jsx(Text, { color: inkColors.textSecondary, children: "\u00A0" }) })] }), _jsxs(Box, { flexDirection: "column", flexShrink: 0, height: footerLines, children: [showSlashSuggestions && (_jsxs(Box, { flexDirection: "column", marginBottom: 0, paddingLeft: 2, borderStyle: "single", borderColor: inkColors.textDisabled, children: [filteredSlashCommands.length === 0 ? (_jsx(Text, { color: inkColors.textSecondary, children: " No match " })) : ([...filteredSlashCommands].reverse().map((c, rev) => {
                                 const i = filteredSlashCommands.length - 1 - rev;
                                 return (_jsxs(Text, { color: i === clampedSlashIndex ? inkColors.primary : undefined, children: [i === clampedSlashIndex ? "› " : "  ", c.cmd, _jsxs(Text, { color: inkColors.textSecondary, children: [" \u2014 ", c.desc] })] }, c.cmd));
                             })), _jsx(Text, { color: inkColors.textSecondary, children: " Commands (\u2191/\u2193 select, Enter run, Esc clear) " })] })), cursorInAtSegment && !showSlashSuggestions && (_jsxs(Box, { flexDirection: "column", marginBottom: 0, paddingLeft: 2, borderStyle: "single", borderColor: inkColors.textDisabled, children: [filteredFilePaths.length === 0 ? (_jsxs(Text, { color: inkColors.textSecondary, children: [" ", hasCharsAfterAt ? "No match" : "Type to search files", " "] })) : ([...filteredFilePaths].reverse().map((p, rev) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ideacode",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "CLI TUI for AI agents via OpenRouter — agentic loop, tools, markdown",
   "type": "module",
   "repository": {