ideacode 1.1.9 → 1.2.1

package/dist/repl.js

@@ -37,6 +37,9 @@ const CONTEXT_WINDOW_K = 128;
 const MAX_TOOL_RESULT_CHARS = 3500;
 const MAX_AT_SUGGESTIONS = 12;
 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 = Math.min(300, Math.max(80, Number.parseInt(process.env.IDEACODE_SPINNER_MS ?? "110", 10) || 110));
 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)
@@ -88,12 +91,19 @@ function wrapLine(line, width) {
     return out.length > 0 ? out : [""];
 }
 function replayMessagesToLogLines(messages) {
+    const sanitizePrompt = (value) => value
+        .replace(/\x1b\[[0-9;]*m/g, "")
+        .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g, "")
+        .trim();
     const lines = [];
     for (let i = 0; i < messages.length; i++) {
         const msg = messages[i];
         if (msg.role === "user") {
             if (typeof msg.content === "string") {
-                lines.push("", ...userPromptBox(msg.content).split("\n"), "");
+                const prompt = sanitizePrompt(msg.content);
+                if (!prompt)
+                    continue;
+                lines.push("", ...userPromptBox(prompt).split("\n"), "");
             }
             else if (Array.isArray(msg.content)) {
                 const prev = messages[i - 1];
@@ -110,8 +120,6 @@ function replayMessagesToLogLines(messages) {
                             const content = tr.content ?? "";
                             const ok = !content.startsWith("error:");
                             lines.push(toolCallBox(name, argPreview, ok));
-                            const preview = content.split("\n")[0]?.slice(0, 60) ?? "";
-                            lines.push(toolResultLine(preview, ok));
                             const tokens = estimateTokensForString(content);
                             lines.push(toolResultTokenLine(tokens, ok));
                         }
@@ -231,6 +239,7 @@ export function Repl({ apiKey, cwd, onQuit }) {
         onQuit();
     }, [cwd, onQuit]);
     const [loading, setLoading] = useState(false);
+    const [loadingLabel, setLoadingLabel] = useState("Thinking…");
     const [showPalette, setShowPalette] = useState(false);
     const [paletteIndex, setPaletteIndex] = useState(0);
     const [showModelSelector, setShowModelSelector] = useState(false);
@@ -255,7 +264,8 @@ export function Repl({ apiKey, cwd, onQuit }) {
         };
     }, []);
     const [spinnerTick, setSpinnerTick] = useState(0);
-    const SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+    const loadingStartedAtRef = useRef(0);
+    const SPINNER = ["●○○", "○●○", "○○●", "○●○"];
     const estimatedTokens = useMemo(() => estimateTokens(messages, undefined), [messages]);
     const contextWindowK = useMemo(() => {
         const ctx = modelList.find((m) => m.id === currentModel)?.context_length;
@@ -289,7 +299,9 @@ export function Repl({ apiKey, cwd, onQuit }) {
     useEffect(() => {
         if (!loading)
             return;
-        const t = setInterval(() => setSpinnerTick((n) => n + 1), 80);
+        loadingStartedAtRef.current = Date.now();
+        setSpinnerTick(0);
+        const t = setInterval(() => setSpinnerTick((n) => n + 1), LOADING_TICK_MS);
         return () => clearInterval(t);
     }, [loading]);
     const showSlashSuggestions = inputValue.startsWith("/");
@@ -434,10 +446,12 @@ export function Repl({ apiKey, cwd, onQuit }) {
         appendLog(userPromptBox(userInput));
         appendLog("");
         let state = [...messages, { role: "user", content: userInput }];
-        const systemPrompt = `Concise coding assistant. cwd: ${cwd}. PRIORITIZE grep to locate; then read with offset and limit to fetch only relevant sections. Do not read whole files unless the user explicitly asks. Use focused greps (specific patterns, narrow paths) and read in chunks when files are large; avoid one huge grep or read that floods context. When exploring a dependency, set path to that package (e.g. node_modules/<pkg>) and list/read only what you need. Prefer grep or keyword search for the most recent or specific occurrence; avoid tail/read of thousands of lines. If a tool result says it was truncated, call the tool again with offset, limit, or a narrower pattern to get what you need.`;
+        const systemPrompt = `Concise coding assistant. cwd: ${cwd}. PRIORITIZE grep to locate; then read with offset and limit to fetch only relevant sections. Do not read whole files unless the user explicitly asks. Use focused greps (specific patterns, narrow paths) and read in chunks when files are large; avoid one huge grep or read that floods context. When exploring a dependency, set path to that package (e.g. node_modules/<pkg>) and list/read only what you need. Prefer grep or keyword search for the most recent or specific occurrence; avoid tail/read of thousands of lines. If a tool result says it was truncated, call the tool again with offset, limit, or a narrower pattern to get what you need. Use as many parallel read/search/web tool calls as needed in one turn when they are independent (often more than 3 is appropriate for broad research), but keep each call high-signal, non-redundant, and minimal in output size.`;
         const modelContext = modelList.find((m) => m.id === currentModel)?.context_length;
         const maxContextTokens = Math.floor((modelContext ?? CONTEXT_WINDOW_K * 1024) * 0.85);
         const stateBeforeCompress = state;
+        setLoadingLabel("Compressing context…");
+        setLoading(true);
         state = await ensureUnderBudget(apiKey, state, systemPrompt, currentModel, {
             maxTokens: maxContextTokens,
             keepLast: 6,
@@ -446,38 +460,67 @@ export function Repl({ apiKey, cwd, onQuit }) {
             appendLog(colors.muted("  (context compressed to stay under limit)\n"));
         }
         for (;;) {
-            setLoading(true);
+            setLoadingLabel("Thinking…");
             const response = await callApi(apiKey, state, systemPrompt, currentModel);
             const contentBlocks = response.content ?? [];
             const toolResults = [];
+            const renderToolOutcome = (planned, result, extraIndent = 0) => {
+                const ok = !result.startsWith("error:");
+                appendLog(toolCallBox(planned.toolName, planned.argPreview, ok, extraIndent));
+                const contentForApi = truncateToolResult(result);
+                const tokens = estimateTokensForString(contentForApi);
+                appendLog(toolResultTokenLine(tokens, ok, extraIndent));
+                if (planned.block.id) {
+                    toolResults.push({ type: "tool_result", tool_use_id: planned.block.id, content: contentForApi });
+                }
+            };
+            const runParallelBatch = async (batch) => {
+                if (batch.length === 0)
+                    return;
+                const started = Date.now();
+                const groupedTools = Array.from(batch.reduce((acc, planned) => {
+                    acc.set(planned.toolName, (acc.get(planned.toolName) ?? 0) + 1);
+                    return acc;
+                }, new Map()))
+                    .map(([name, count]) => (count > 1 ? `${name}×${count}` : name))
+                    .join(", ");
+                appendLog(colors.gray(`  ${icons.tool} parallel batch (${batch.length}): ${groupedTools}`));
+                const settled = await Promise.all(batch.map(async (planned) => ({ planned, result: await runTool(planned.toolName, planned.toolArgs) })));
+                const elapsed = Date.now() - started;
+                appendLog(colors.gray(`    completed in ${elapsed}ms`));
+                for (const { planned, result } of settled) {
+                    renderToolOutcome(planned, result, 1);
+                }
+            };
+            let parallelBatch = [];
             for (const block of contentBlocks) {
                 if (block.type === "text" && block.text?.trim()) {
                     if (lastLogLineRef.current !== "")
                         appendLog("");
                     appendLog(agentMessage(block.text).trimEnd());
+                    continue;
                 }
-                if (block.type === "tool_use" && block.name && block.input) {
-                    const toolName = block.name.trim().toLowerCase();
-                    const toolArgs = block.input;
-                    const firstVal = Object.values(toolArgs)[0];
-                    const argPreview = String(firstVal ?? "").slice(0, 100) || "—";
-                    const result = await runTool(toolName, toolArgs);
-                    const ok = !result.startsWith("error:");
-                    appendLog(toolCallBox(toolName, argPreview, ok));
-                    const resultLines = result.split("\n");
-                    let preview = resultLines[0]?.slice(0, 80) ?? "";
-                    if (resultLines.length > 1)
-                        preview += ` ... +${resultLines.length - 1} lines`;
-                    else if (preview.length > 80)
-                        preview += "...";
-                    appendLog(toolResultLine(preview, ok));
-                    const contentForApi = truncateToolResult(result);
-                    const tokens = estimateTokensForString(contentForApi);
-                    appendLog(toolResultTokenLine(tokens, ok));
-                    if (block.id)
-                        toolResults.push({ type: "tool_result", tool_use_id: block.id, content: contentForApi });
+                if (block.type !== "tool_use" || !block.name || !block.input)
+                    continue;
+                const toolName = block.name.trim().toLowerCase();
+                const toolArgs = block.input;
+                const firstVal = Object.values(toolArgs)[0];
+                const planned = {
+                    block,
+                    toolName,
+                    toolArgs,
+                    argPreview: String(firstVal ?? "").slice(0, 100) || "—",
+                };
+                if (ENABLE_PARALLEL_TOOL_CALLS && PARALLEL_SAFE_TOOLS.has(toolName)) {
+                    parallelBatch.push(planned);
+                    continue;
                 }
+                await runParallelBatch(parallelBatch);
+                parallelBatch = [];
+                const result = await runTool(planned.toolName, planned.toolArgs);
+                renderToolOutcome(planned, result);
             }
+            await runParallelBatch(parallelBatch);
             setLoading(false);
             state = [...state, { role: "assistant", content: contentBlocks }];
             if (toolResults.length === 0) {
@@ -892,10 +935,10 @@ export function Repl({ apiKey, cwd, onQuit }) {
         const visibleModelCount = Math.min(filteredModelList.length, modelModalHeight - 4);
         const modelScrollOffset = Math.max(0, Math.min(modelIndex - Math.floor(visibleModelCount / 2), filteredModelList.length - visibleModelCount));
         const visibleModels = filteredModelList.slice(modelScrollOffset, modelScrollOffset + visibleModelCount);
-        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: modelModalWidth, minHeight: modelModalHeight, children: [_jsx(Text, { bold: true, children: " Select model " }), _jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { color: "gray", children: " Filter: " }), _jsx(Text, { children: modelSearchFilter || " " }), modelSearchFilter.length > 0 && (_jsxs(Text, { dimColor: true, color: "gray", children: [" ", "(", filteredModelList.length, " match", filteredModelList.length !== 1 ? "es" : "", ")"] }))] }), visibleModels.length === 0 ? (_jsx(Text, { color: "gray", children: " No match \u2014 type to search by id or name " })) : (visibleModels.map((m, i) => {
+        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: modelModalWidth, minHeight: modelModalHeight, children: [_jsx(Text, { bold: true, children: " Select model " }), _jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { color: inkColors.textSecondary, children: " Filter: " }), _jsx(Text, { children: modelSearchFilter || " " }), modelSearchFilter.length > 0 && (_jsxs(Text, { color: inkColors.textDisabled, children: [" ", "(", filteredModelList.length, " match", filteredModelList.length !== 1 ? "es" : "", ")"] }))] }), visibleModels.length === 0 ? (_jsx(Text, { color: inkColors.textSecondary, children: " No match \u2014 type to search by id or name " })) : (visibleModels.map((m, i) => {
                                     const actualIndex = modelScrollOffset + i;
                                     return (_jsxs(Text, { color: actualIndex === modelIndex ? inkColors.primary : undefined, children: [actualIndex === modelIndex ? "› " : "  ", m.name ? `${m.id} — ${m.name}` : m.id] }, m.id));
-                                })), _jsx(Text, { color: "gray", children: " \u2191/\u2193 select  Enter confirm  Esc cancel  Type to filter " })] })] }), _jsx(Box, { flexGrow: 1 })] }));
+                                })), _jsx(Text, { color: inkColors.textSecondary, children: " \u2191/\u2193 select  Enter confirm  Esc cancel  Type to filter " })] })] }), _jsx(Box, { flexGrow: 1 })] }));
     }
     const slashSuggestionBoxLines = showSlashSuggestions
         ? 3 + Math.max(1, filteredSlashCommands.length)
@@ -909,7 +952,8 @@ export function Repl({ apiKey, cwd, onQuit }) {
         const lines = inputValue.split("\n");
         return lines.reduce((sum, line) => sum + Math.max(1, Math.ceil(line.length / wrapWidth)), 0);
     })();
-    const reservedLines = 1 + inputLineCount + (loading ? 2 : 1);
+    // Keep a fixed loading row reserved to avoid viewport jumps/flicker when loading starts/stops.
+    const reservedLines = 1 + inputLineCount + 2;
     const logViewportHeight = Math.max(1, termRows - reservedLines - suggestionBoxLines);
     const effectiveLogLines = logLines;
     const maxLogScrollOffset = Math.max(0, effectiveLogLines.length - logViewportHeight);
@@ -919,9 +963,7 @@ export function Repl({ apiKey, cwd, onQuit }) {
         logStartIndex = 0;
     }
     const sliceEnd = logStartIndex + logViewportHeight;
-    const visibleLogLines = logStartIndex === 0 && effectiveLogLines.length > 0
-        ? ["", ...effectiveLogLines.slice(0, logViewportHeight - 1)]
-        : effectiveLogLines.slice(logStartIndex, sliceEnd);
+    const visibleLogLines = effectiveLogLines.slice(logStartIndex, sliceEnd);
     if (showHelpModal) {
         const helpModalWidth = Math.min(88, Math.max(80, termColumns - 4));
         const helpContentRows = 20;
@@ -929,29 +971,32 @@ export function Repl({ apiKey, cwd, onQuit }) {
         const helpLeftPad = Math.max(0, Math.floor((termColumns - helpModalWidth) / 2));
         const labelWidth = 20;
         const descWidth = helpModalWidth - (2 * 2) - labelWidth - 2;
-        return (_jsxs(Box, { flexDirection: "column", height: termRows, overflow: "hidden", children: [_jsx(Box, { height: helpTopPad }), _jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: helpLeftPad }), _jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: inkColors.primary, paddingX: 2, paddingY: 1, width: helpModalWidth, children: [_jsx(Text, { bold: true, children: " Help " }), _jsx(Text, { color: "gray", children: " What you can do " }), _jsxs(Box, { marginTop: 1, flexDirection: "row", alignItems: "flex-start", children: [_jsx(Box, { width: labelWidth, flexShrink: 0, children: _jsx(Text, { color: inkColors.primary, children: " Message " }) }), _jsx(Box, { width: descWidth, flexGrow: 0, children: _jsx(Text, { color: "gray", children: " Type and Enter to send to the agent. " }) })] }), _jsxs(Box, { marginTop: 1, flexDirection: "row", alignItems: "flex-start", children: [_jsx(Box, { width: labelWidth, flexShrink: 0, children: _jsx(Text, { color: inkColors.primary, children: " / " }) }), _jsx(Box, { width: descWidth, flexGrow: 0, children: _jsx(Text, { color: "gray", children: " Commands. Type / then pick: /models, /brave, /help, /clear, /status, /q. Ctrl+P palette. " }) })] }), _jsxs(Box, { marginTop: 1, flexDirection: "row", alignItems: "flex-start", children: [_jsx(Box, { width: labelWidth, flexShrink: 0, children: _jsx(Text, { color: inkColors.primary, children: " @ " }) }), _jsx(Box, { width: descWidth, flexGrow: 0, children: _jsx(Text, { color: "gray", children: " Attach files. Type @ then path; Tab to complete. " }) })] }), _jsxs(Box, { marginTop: 1, flexDirection: "row", alignItems: "flex-start", children: [_jsx(Box, { width: labelWidth, flexShrink: 0, children: _jsx(Text, { color: inkColors.primary, children: " ! " }) }), _jsx(Box, { width: descWidth, flexGrow: 0, children: _jsx(Text, { color: "gray", children: " Run a shell command. Type ! then the command. " }) })] }), _jsxs(Box, { marginTop: 1, flexDirection: "row", alignItems: "flex-start", children: [_jsx(Box, { width: labelWidth, flexShrink: 0, children: _jsx(Text, { color: inkColors.primary, children: " Word / char nav " }) }), _jsx(Box, { width: descWidth, flexGrow: 0, children: _jsx(Text, { color: "gray", children: " Ctrl+\u2190/\u2192 or Meta+\u2190/\u2192 word; Ctrl+F/B char (Emacs). Opt+\u2190/\u2192 needs terminal to send Meta (e.g. iTerm2: Esc+). " }) })] }), _jsxs(Box, { marginTop: 1, flexDirection: "row", alignItems: "flex-start", children: [_jsx(Box, { width: labelWidth, flexShrink: 0, children: _jsx(Text, { color: inkColors.primary, children: " Scroll " }) }), _jsx(Box, { width: descWidth, flexGrow: 0, children: _jsx(Text, { color: "gray", children: " Trackpad/\u2191/\u2193 scroll. To select text: hold Option (iTerm2) or Fn (Terminal.app) or Shift (Windows/Linux). " }) })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: " Press any key to close " }) })] })] }), _jsx(Box, { flexGrow: 1 })] }));
+        return (_jsxs(Box, { flexDirection: "column", height: termRows, overflow: "hidden", children: [_jsx(Box, { height: helpTopPad }), _jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: helpLeftPad }), _jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: inkColors.primary, paddingX: 2, paddingY: 1, width: helpModalWidth, children: [_jsx(Text, { bold: true, children: " Help " }), _jsx(Text, { color: inkColors.textSecondary, children: " What you can do " }), _jsxs(Box, { marginTop: 1, flexDirection: "row", alignItems: "flex-start", children: [_jsx(Box, { width: labelWidth, flexShrink: 0, children: _jsx(Text, { color: inkColors.primary, children: " Message " }) }), _jsx(Box, { width: descWidth, flexGrow: 0, children: _jsx(Text, { color: inkColors.textSecondary, children: " Type and Enter to send to the agent. " }) })] }), _jsxs(Box, { marginTop: 1, flexDirection: "row", alignItems: "flex-start", children: [_jsx(Box, { width: labelWidth, flexShrink: 0, children: _jsx(Text, { color: inkColors.primary, children: " / " }) }), _jsx(Box, { width: descWidth, flexGrow: 0, children: _jsx(Text, { color: inkColors.textSecondary, children: " Commands. Type / then pick: /models, /brave, /help, /clear, /status, /q. Ctrl+P palette. " }) })] }), _jsxs(Box, { marginTop: 1, flexDirection: "row", alignItems: "flex-start", children: [_jsx(Box, { width: labelWidth, flexShrink: 0, children: _jsx(Text, { color: inkColors.primary, children: " @ " }) }), _jsx(Box, { width: descWidth, flexGrow: 0, children: _jsx(Text, { color: inkColors.textSecondary, children: " Attach files. Type @ then path; Tab to complete. " }) })] }), _jsxs(Box, { marginTop: 1, flexDirection: "row", alignItems: "flex-start", children: [_jsx(Box, { width: labelWidth, flexShrink: 0, children: _jsx(Text, { color: inkColors.primary, children: " ! " }) }), _jsx(Box, { width: descWidth, flexGrow: 0, children: _jsx(Text, { color: inkColors.textSecondary, children: " Run a shell command. Type ! then the command. " }) })] }), _jsxs(Box, { marginTop: 1, flexDirection: "row", alignItems: "flex-start", children: [_jsx(Box, { width: labelWidth, flexShrink: 0, children: _jsx(Text, { color: inkColors.primary, children: " Word / char nav " }) }), _jsx(Box, { width: descWidth, flexGrow: 0, children: _jsx(Text, { color: inkColors.textSecondary, children: " Ctrl+\u2190/\u2192 or Meta+\u2190/\u2192 word; Ctrl+F/B char (Emacs). Opt+\u2190/\u2192 needs terminal to send Meta (e.g. iTerm2: Esc+). " }) })] }), _jsxs(Box, { marginTop: 1, flexDirection: "row", alignItems: "flex-start", children: [_jsx(Box, { width: labelWidth, flexShrink: 0, children: _jsx(Text, { color: inkColors.primary, children: " Scroll " }) }), _jsx(Box, { width: descWidth, flexGrow: 0, children: _jsx(Text, { color: inkColors.textSecondary, children: " Trackpad/\u2191/\u2193 scroll. To select text: hold Option (iTerm2) or Fn (Terminal.app) or Shift (Windows/Linux). " }) })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: inkColors.textSecondary, children: " Press any key to close " }) })] })] }), _jsx(Box, { flexGrow: 1 })] }));
     }
     if (showBraveKeyModal) {
         const braveModalWidth = 52;
         const topPad = Math.max(0, Math.floor((termRows - 6) / 2));
         const leftPad = Math.max(0, Math.floor((termColumns - braveModalWidth) / 2));
-        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: braveModalWidth, children: [_jsx(Text, { bold: true, children: " Brave Search API key " }), _jsx(Text, { color: "gray", children: " Get one at https://brave.com/search/api " }), braveKeyInput === BRAVE_KEY_PLACEHOLDER && (_jsx(Text, { color: "gray", children: " Key already set. Type or paste to replace. " })), _jsxs(Box, { flexDirection: "row", marginTop: 1, children: [_jsx(Text, { color: inkColors.primary, children: " Key: " }), _jsx(Text, { children: braveKeyInput || "\u00A0" })] }), _jsx(Text, { color: "gray", children: " Enter to save, Esc to cancel " })] })] }), _jsx(Box, { flexGrow: 1 })] }));
+        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: braveModalWidth, children: [_jsx(Text, { bold: true, children: " Brave Search API key " }), _jsx(Text, { color: inkColors.textSecondary, children: " Get one at https://brave.com/search/api " }), braveKeyInput === BRAVE_KEY_PLACEHOLDER && (_jsx(Text, { color: inkColors.textSecondary, children: " Key already set. Type or paste to replace. " })), _jsxs(Box, { flexDirection: "row", marginTop: 1, children: [_jsx(Text, { color: inkColors.primary, children: " Key: " }), _jsx(Text, { children: braveKeyInput || "\u00A0" })] }), _jsx(Text, { color: inkColors.textSecondary, children: " Enter to save, Esc to cancel " })] })] }), _jsx(Box, { flexGrow: 1 })] }));
     }
     if (showPalette) {
         const paletteModalHeight = COMMANDS.length + 4;
         const paletteModalWidth = 52;
         const topPad = Math.max(0, Math.floor((termRows - paletteModalHeight) / 2));
         const leftPad = Math.max(0, Math.floor((termColumns - paletteModalWidth) / 2));
-        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: "gray", children: [" \u2014 ", c.desc] })] }, c.cmd))), _jsxs(Text, { color: paletteIndex === COMMANDS.length ? inkColors.primary : undefined, children: [paletteIndex === COMMANDS.length ? "› " : "  ", "Cancel (Esc)"] }), _jsx(Text, { color: "gray", children: " \u2191/\u2193 select, Enter confirm, Esc close " })] })] }), _jsx(Box, { flexGrow: 1 })] }));
+        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 + inputLineCount;
-    return (_jsxs(Box, { flexDirection: "column", height: termRows, overflow: "hidden", children: [_jsxs(Box, { flexDirection: "column", flexGrow: 1, minHeight: 0, overflow: "hidden", children: [_jsx(Box, { flexDirection: "column", height: logViewportHeight, overflow: "hidden", children: visibleLogLines.map((line, i) => (_jsx(Text, { children: line === "" ? "\u00A0" : line }, effectiveLogLines.length - visibleLogLines.length + i))) }), loading && (_jsx(Box, { flexDirection: "row", marginTop: 1, marginBottom: 0, children: _jsxs(Text, { color: "gray", children: [" ", SPINNER[spinnerTick % SPINNER.length], " Thinking\u2026"] }) }))] }), _jsxs(Box, { flexDirection: "column", flexShrink: 0, height: footerLines, children: [showSlashSuggestions && (_jsxs(Box, { flexDirection: "column", marginBottom: 0, paddingLeft: 2, borderStyle: "single", borderColor: "gray", children: [filteredSlashCommands.length === 0 ? (_jsx(Text, { color: "gray", children: " No match " })) : ([...filteredSlashCommands].reverse().map((c, rev) => {
+    return (_jsxs(Box, { flexDirection: "column", height: termRows, overflow: "hidden", children: [_jsxs(Box, { flexDirection: "column", flexGrow: 1, minHeight: 0, overflow: "hidden", children: [_jsx(Box, { flexDirection: "column", height: logViewportHeight, overflow: "hidden", children: visibleLogLines.map((line, i) => (_jsx(Text, { children: line === "" ? "\u00A0" : line }, effectiveLogLines.length - visibleLogLines.length + i))) }), _jsx(Box, { flexDirection: "row", marginTop: 1, marginBottom: 0, children: _jsxs(Text, { color: inkColors.textSecondary, children: [" ", loading
+                                    ? `${SPINNER[spinnerTick % SPINNER.length]} ${loadingLabel} ${((Date.now() - loadingStartedAtRef.current) /
+                                        1000).toFixed(1)}s`
+                                    : "\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: "gray", children: [" \u2014 ", c.desc] })] }, c.cmd));
-                            })), _jsx(Text, { color: "gray", children: " Commands (\u2191/\u2193 select, Enter run, Esc clear) " })] })), cursorInAtSegment && !showSlashSuggestions && (_jsxs(Box, { flexDirection: "column", marginBottom: 0, paddingLeft: 2, borderStyle: "single", borderColor: "gray", children: [filteredFilePaths.length === 0 ? (_jsxs(Text, { color: "gray", children: [" ", hasCharsAfterAt ? "No match" : "Type to search files", " "] })) : ([...filteredFilePaths].reverse().map((p, 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) => {
                                 const i = filteredFilePaths.length - 1 - rev;
                                 return (_jsxs(Text, { color: i === clampedAtFileIndex ? inkColors.primary : undefined, children: [i === clampedAtFileIndex ? "› " : "  ", p] }, p));
-                            })), _jsx(Box, { flexDirection: "row", marginTop: 1, children: _jsx(Text, { color: "gray", children: " Files (\u2191/\u2193 select, Enter/Tab complete, Esc clear) " }) })] })), _jsxs(Box, { flexDirection: "row", marginTop: 0, children: [_jsxs(Text, { color: "gray", dimColor: true, children: [" ", icons.tool, " ", tokenDisplay] }), _jsx(Text, { color: "gray", dimColor: true, children: `  ·  / ! @  trackpad/↑/↓ scroll  Opt/Fn+select  Ctrl+J newline  Tab queue  Esc Esc edit  ${pasteShortcut} paste  Ctrl+C exit` })] }), _jsx(Box, { flexDirection: "column", marginTop: 0, children: inputValue.length === 0 ? (_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: inkColors.primary, children: [icons.prompt, " "] }), _jsx(Text, { inverse: true, color: inkColors.primary, children: " " }), _jsx(Text, { color: "gray", children: "Message or / for commands, @ for files, ! for shell, ? for help..." })] })) : ((() => {
+                            })), _jsx(Box, { flexDirection: "row", marginTop: 1, children: _jsx(Text, { color: inkColors.textSecondary, children: " Files (\u2191/\u2193 select, Enter/Tab complete, Esc clear) " }) })] })), _jsxs(Box, { flexDirection: "row", marginTop: 0, children: [_jsxs(Text, { color: "gray", children: [" ", icons.tool, " ", tokenDisplay] }), _jsx(Text, { color: "gray", children: `  ·  / ! @  trackpad/↑/↓ scroll  Opt/Fn+select  Ctrl+J newline  Tab queue  Esc Esc edit  ${pasteShortcut} paste  Ctrl+C exit` })] }), _jsx(Box, { flexDirection: "column", marginTop: 0, children: inputValue.length === 0 ? (_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: inkColors.primary, children: [icons.prompt, " "] }), _jsx(Text, { inverse: true, color: inkColors.primary, children: " " }), _jsx(Text, { color: inkColors.textSecondary, children: "Message or / for commands, @ for files, ! for shell, ? for help..." })] })) : ((() => {
                             const lines = inputValue.split("\n");
                             let lineStart = 0;
                             return (_jsx(_Fragment, { children: lines.flatMap((lineText, lineIdx) => {
@@ -1062,7 +1107,7 @@ export function Repl({ apiKey, cwd, onQuit }) {
                                         const isFirstRow = lineIdx === 0 && v === 0;
                                         const isLastLogicalLine = lineIdx === lines.length - 1;
                                         const isLastVisualOfLine = v === visualLines.length - 1;
-                                        return (_jsxs(Box, { flexDirection: "row", children: [isFirstRow ? (_jsxs(Text, { color: inkColors.primary, children: [icons.prompt, " "] })) : (_jsx(Text, { children: " ".repeat(PROMPT_INDENT_LEN) })), lineNodes, isLastLogicalLine && isLastVisualOfLine && inputValue.startsWith("!") && (_jsxs(Text, { dimColor: true, color: "gray", children: ["  — ", "type a shell command to run"] }))] }, `${lineIdx}-${v}`));
+                                        return (_jsxs(Box, { flexDirection: "row", children: [isFirstRow ? (_jsxs(Text, { color: inkColors.primary, children: [icons.prompt, " "] })) : (_jsx(Text, { children: " ".repeat(PROMPT_INDENT_LEN) })), lineNodes, isLastLogicalLine && isLastVisualOfLine && inputValue.startsWith("!") && (_jsxs(Text, { color: inkColors.textDisabled, children: ["  — ", "type a shell command to run"] }))] }, `${lineIdx}-${v}`));
                                     });
                                 }) }));
                         })()) })] })] }));

package/dist/tools/web.js

@@ -2,105 +2,226 @@ import { getBraveSearchApiKey } from "../config.js";
 const MAX_FETCH_CHARS = 40_000;
 const FETCH_TIMEOUT_MS = 20_000;
 const MAX_SEARCH_RESULTS = 8;
+const FETCH_CACHE_TTL_MS = 5 * 60_000;
+const fetchCache = new Map();
 function formatSearchResults(hits) {
     const slice = hits.slice(0, MAX_SEARCH_RESULTS);
     return slice
         .map((r, i) => `${i + 1}. ${(r.title ?? "Untitled").replace(/<[^>]+>/g, "")}\n   ${r.url ?? ""}${r.snippet ? "\n   " + String(r.snippet).replace(/<[^>]+>/g, "").slice(0, 300) : ""}`)
         .join("\n\n");
 }
-const PLAYWRIGHT_INSTALL_MSG = "Playwright Chromium not installed. Run: npx playwright install chromium (in the project directory). web_fetch uses it only when plain fetch fails (e.g. JS-rendered pages).";
-function stripHtmlToText(html) {
-    let s = html
+const PLAYWRIGHT_INSTALL_MSG = "Playwright Chromium not installed. Run: npx playwright install chromium (in the project directory). web_fetch uses it only when plain fetch cannot reliably extract content.";
+function decodeHtmlEntities(text) {
+    return text
+        .replace(/&nbsp;/gi, " ")
+        .replace(/&amp;/gi, "&")
+        .replace(/&lt;/gi, "<")
+        .replace(/&gt;/gi, ">")
+        .replace(/&quot;/gi, '"')
+        .replace(/&#39;/gi, "'")
+        .replace(/&#x([0-9a-f]+);/gi, (_m, hex) => {
+        const n = Number.parseInt(hex, 16);
+        return Number.isFinite(n) ? String.fromCodePoint(n) : _m;
+    })
+        .replace(/&#(\d+);/g, (_m, dec) => {
+        const n = Number.parseInt(dec, 10);
+        return Number.isFinite(n) ? String.fromCodePoint(n) : _m;
+    });
+}
+function pickMainHtml(html) {
+    const article = html.match(/<article\b[^>]*>[\s\S]*?<\/article>/i)?.[0];
+    if (article)
+        return article;
+    const main = html.match(/<main\b[^>]*>[\s\S]*?<\/main>/i)?.[0];
+    if (main)
+        return main;
+    return html;
+}
+function htmlToText(html) {
+    const focused = pickMainHtml(html);
+    let s = focused
         .replace(/<script\b[^>]*>[\s\S]*?<\/script>/gi, "")
         .replace(/<style\b[^>]*>[\s\S]*?<\/style>/gi, "")
+        .replace(/<svg\b[^>]*>[\s\S]*?<\/svg>/gi, "")
+        .replace(/<noscript\b[^>]*>[\s\S]*?<\/noscript>/gi, "")
+        .replace(/<nav\b[^>]*>[\s\S]*?<\/nav>/gi, "")
+        .replace(/<header\b[^>]*>[\s\S]*?<\/header>/gi, "")
+        .replace(/<footer\b[^>]*>[\s\S]*?<\/footer>/gi, "")
+        .replace(/<form\b[^>]*>[\s\S]*?<\/form>/gi, "")
+        .replace(/<aside\b[^>]*>[\s\S]*?<\/aside>/gi, "")
+        .replace(/<br\s*\/?>/gi, "\n")
+        .replace(/<\/(p|div|section|article|h[1-6]|li|tr|ul|ol|table)>/gi, "\n")
+        .replace(/<li\b[^>]*>/gi, "- ")
         .replace(/<[^>]+>/g, " ");
-    return s.replace(/\s+/g, " ").trim();
+    s = decodeHtmlEntities(s);
+    s = s
+        .replace(/[ \t]+/g, " ")
+        .replace(/ *\n */g, "\n")
+        .replace(/\n{3,}/g, "\n\n")
+        .trim();
+    return s;
+}
+function isLikelyBlockedOrThin(text) {
+    const lowered = text.toLowerCase();
+    const blockedSignals = [
+        "enable javascript",
+        "verify you are human",
+        "captcha",
+        "cloudflare",
+        "access denied",
+        "unusual traffic",
+        "robot",
+        "bot detection",
+        "request blocked",
+        "forbidden",
+    ];
+    if (blockedSignals.some((s) => lowered.includes(s)))
+        return true;
+    return text.length < 280;
+}
+function clipOutput(text) {
+    if (text.length <= MAX_FETCH_CHARS)
+        return text;
+    return text.slice(0, MAX_FETCH_CHARS) + `\n\n... (truncated, total ${text.length} chars)`;
+}
+function getCachedFetch(url) {
+    const hit = fetchCache.get(url);
+    if (!hit)
+        return null;
+    if (Date.now() - hit.cachedAt > FETCH_CACHE_TTL_MS) {
+        fetchCache.delete(url);
+        return null;
+    }
+    return hit.value;
+}
+function setCachedFetch(url, value) {
+    fetchCache.set(url, { cachedAt: Date.now(), value });
 }
 async function fetchWithTimeout(url) {
     const ac = new AbortController();
     const t = setTimeout(() => ac.abort(), FETCH_TIMEOUT_MS);
     try {
-        const res = await fetch(url, {
+        return await fetch(url, {
             signal: ac.signal,
-            headers: { "User-Agent": "ideacode-web-fetch/1" },
+            headers: {
+                "User-Agent": "ideacode-web-fetch/2",
+                Accept: "text/html,application/json,text/plain,*/*",
+            },
+            redirect: "follow",
         });
-        return res;
     }
     finally {
         clearTimeout(t);
     }
 }
+async function fetchWithPlaywright(url) {
+    const { chromium } = await import("playwright");
+    const browser = await chromium.launch({ headless: true });
+    try {
+        const page = await browser.newPage({
+            userAgent: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36",
+        });
+        await page.goto(url, { waitUntil: "domcontentloaded", timeout: FETCH_TIMEOUT_MS });
+        const text = await page.evaluate(() => {
+            const root = document.querySelector("article") ??
+                document.querySelector("main") ??
+                document.querySelector("[role='main']") ??
+                document.body;
+            if (!root)
+                return "";
+            const clone = root.cloneNode(true);
+            for (const el of clone.querySelectorAll("script, style, nav, header, footer, aside, form, noscript, svg")) {
+                el.remove();
+            }
+            return (clone.innerText ?? clone.textContent ?? "")
+                .replace(/[ \t]+/g, " ")
+                .replace(/ *\n */g, "\n")
+                .replace(/\n{3,}/g, "\n\n")
+                .trim();
+        });
+        return text || "(no text content)";
+    }
+    finally {
+        await browser.close().catch(() => { });
+    }
+}
 export async function webFetch(args) {
     const url = args.url?.trim();
     if (!url)
         return "error: url is required";
-    if (!url.startsWith("http://") && !url.startsWith("https://"))
+    if (!url.startsWith("http://") && !url.startsWith("https://")) {
         return "error: url must be http or https";
+    }
+    const cached = getCachedFetch(url);
+    if (cached)
+        return cached;
+    let needsBrowserFallback = false;
+    let fallbackReason = "";
     try {
         const res = await fetchWithTimeout(url);
+        const ct = (res.headers.get("content-type") ?? "").toLowerCase();
         if (res.ok) {
-            const ct = (res.headers.get("content-type") ?? "").toLowerCase();
-            if (ct.includes("text/plain") ||
-                ct.includes("text/html") ||
-                ct.includes("application/json") ||
-                ct.includes("text/")) {
+            if (ct.includes("application/json")) {
+                const raw = await res.text();
+                const clipped = clipOutput(raw.trim() || "(no text content)");
+                setCachedFetch(url, clipped);
+                return clipped;
+            }
+            if (ct.includes("text/plain") || ct.includes("text/") || ct.includes("application/xml") || ct.includes("application/xhtml")) {
                 const raw = await res.text();
-                const text = ct.includes("text/html") && raw.includes("<")
-                    ? stripHtmlToText(raw)
-                    : raw.replace(/\s+/g, " ").trim();
-                if (text.length > MAX_FETCH_CHARS) {
-                    return (text.slice(0, MAX_FETCH_CHARS) +
-                        "\n\n... (truncated, total " +
-                        text.length +
-                        " chars)");
+                const normalized = ct.includes("html") ? htmlToText(raw) : raw.replace(/\s+/g, " ").trim();
+                if (!normalized) {
+                    needsBrowserFallback = true;
+                    fallbackReason = "empty fetch result";
+                }
+                else if (ct.includes("html") && isLikelyBlockedOrThin(normalized)) {
+                    needsBrowserFallback = true;
+                    fallbackReason = "thin or blocked html content";
+                }
+                else {
+                    const clipped = clipOutput(normalized);
+                    setCachedFetch(url, clipped);
+                    return clipped;
                 }
-                return text || "(no text content)";
+            }
+            else {
+                return `error: unsupported content-type: ${ct || "unknown"}`;
+            }
+        }
+        else {
+            const bodyPreview = (await res.text()).slice(0, 220);
+            if (res.status === 403 || res.status === 429 || res.status === 503) {
+                needsBrowserFallback = true;
+                fallbackReason = `http ${res.status}`;
+            }
+            else {
+                return `error: HTTP ${res.status}${bodyPreview ? `: ${bodyPreview}` : ""}`;
             }
         }
     }
     catch {
-        // Fall through to Playwright for JS-rendered or when fetch fails
+        needsBrowserFallback = true;
+        fallbackReason = "fetch failed";
     }
+    if (!needsBrowserFallback)
+        return "error: unable to fetch content";
     try {
-        const { chromium } = await import("playwright");
-        const browser = await chromium.launch({ headless: true });
-        try {
-            const page = await browser.newPage();
-            await page.goto(url, { waitUntil: "domcontentloaded", timeout: FETCH_TIMEOUT_MS });
-            const text = await page.evaluate(() => {
-                const body = document.body;
-                if (!body)
-                    return "";
-                const clone = body.cloneNode(true);
-                for (const el of clone.querySelectorAll("script, style, nav, header, footer, [role='navigation']")) {
-                    el.remove();
-                }
-                return (clone.innerText ?? clone.textContent ?? "").replace(/\s+/g, " ").trim();
-            });
-            if (text.length > MAX_FETCH_CHARS) {
-                return (text.slice(0, MAX_FETCH_CHARS) +
-                    "\n\n... (truncated, total " +
-                    text.length +
-                    " chars)");
-            }
-            return text || "(no text content)";
-        }
-        finally {
-            await browser.close().catch(() => { });
-        }
+        const browserText = await fetchWithPlaywright(url);
+        const clipped = clipOutput(browserText);
+        setCachedFetch(url, clipped);
+        return clipped;
     }
     catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
         const causeMsg = err instanceof Error && err.cause instanceof Error ? String(err.cause.message) : "";
         const combined = (msg + " " + causeMsg).toLowerCase();
-        const needsPlaywright = combined.includes("executable doesn't exist") ||
+        const needsPlaywrightInstall = combined.includes("executable doesn't exist") ||
             combined.includes("browser was not found") ||
             combined.includes("chromium revision is not downloaded") ||
             (combined.includes("playwright") && (combined.includes("install") || combined.includes("not found")));
-        if (needsPlaywright) {
+        if (needsPlaywrightInstall)
             return `error: ${PLAYWRIGHT_INSTALL_MSG}`;
-        }
-        return `error: ${msg}`;
+        return `error: web_fetch failed after ${fallbackReason || "fallback"}. ${msg}`;
     }
 }
 async function braveSearchApi(query, apiKey) {

package/dist/ui/format.js

@@ -1,5 +1,5 @@
 import { marked } from "marked";
-import { markedTerminal } from "marked-terminal";
+import Table from "cli-table3";
 import chalk from "chalk";
 import boxen from "boxen";
 import { colors, icons, theme, inkColors } from "./theme.js";
@@ -7,27 +7,258 @@ const hrLine = () => {
     const cols = process.stdout.columns ?? 80;
     return colors.muted("─".repeat(Math.min(cols, 100)));
 };
-marked.use(markedTerminal({
-    code: chalk.hex(theme.syntax.code),
-    codespan: chalk.hex(theme.syntax.code),
-    blockquote: chalk.hex(theme.colors.muted.main).italic,
-    strong: chalk.bold,
-    em: chalk.italic,
-    heading: chalk.hex(theme.syntax.heading).bold,
-    firstHeading: chalk.hex(theme.colors.primary.dim).underline.bold,
-    link: chalk.hex(theme.syntax.link),
-    href: chalk.hex(theme.syntax.href).underline,
-    hr: () => hrLine(),
-}, { theme: { keyword: chalk.hex(theme.syntax.keyword), string: chalk.hex(theme.syntax.string) } }));
 const codeStyle = (s) => chalk.hex(theme.syntax.code)(s);
-export function renderMarkdown(text) {
-    let out = marked.parse(text, { async: false });
-    out = out.replace(/\`([^`]+)\`/g, (_, code) => codeStyle(code));
-    out = out.replace(/\*\*([^*]+)\*\*/g, (_, boldText) => chalk.bold(boldText));
-    out = out.replace(/(^|\n)\* /g, "$1• ");
-    out = out.replace(/(^|\n)([ \t]*[-*_]{3,}[ \t]*)(\n|$)/gm, (_, before, _rule, after) => before + hrLine() + after);
+function stripAnsi(input) {
+    return input.replace(/\x1b\[[0-9;]*m/g, "");
+}
+function visibleLen(input) {
+    return stripAnsi(input).length;
+}
+function preprocessMarkdown(input) {
+    return input
+        .replace(/\r\n/g, "\n")
+        .replace(/<br\s*\/?>/gi, " / ")
+        .replace(/\t/g, "  ");
+}
+function normalizeTableCellText(input) {
+    let s = input.replace(/\s+/g, " ").trim();
+    if (!s)
+        return s;
+    // Many models emit " / " as pseudo-newlines in tables; promote to bullet lines.
+    // Keep URL-like tokens intact by only rewriting slash tokens surrounded by spaces.
+    s = s.replace(/\s+\/\s+(?=[^\s])/g, "\n• ");
+    s = s.replace(/(^|\n)\s*•\s*•\s*/g, "$1• ");
+    if (!s.startsWith("• ") && s.includes("\n• "))
+        s = "• " + s;
+    return s;
+}
+function splitRenderedLines(rendered) {
+    return rendered.split("\n").map((l) => l.replace(/[ \t]+$/g, ""));
+}
+function renderInlineTokens(tokens) {
+    if (!tokens || tokens.length === 0)
+        return "";
+    return tokens
+        .map((token) => {
+        const t = token.type ?? "";
+        if (t === "text")
+            return token.text ?? "";
+        if (t === "escape")
+            return token.text ?? "";
+        if (t === "strong")
+            return chalk.bold(renderInlineTokens(token.tokens));
+        if (t === "em")
+            return chalk.italic(renderInlineTokens(token.tokens));
+        if (t === "codespan")
+            return codeStyle(token.text ?? "");
+        if (t === "del")
+            return chalk.strikethrough(renderInlineTokens(token.tokens));
+        if (t === "link") {
+            const label = renderInlineTokens(token.tokens) || token.text || token.href || "";
+            const labelStyled = chalk.hex(theme.syntax.link).underline(label);
+            if (!token.href || label === token.href)
+                return labelStyled;
+            return `${labelStyled}${colors.mutedDark(` (${token.href})`)}`;
+        }
+        if (t === "br")
+            return "\n";
+        if (t === "html") {
+            const raw = token.raw ?? token.text ?? "";
+            if (/^<br\s*\/?\s*>$/i.test(raw.trim()))
+                return "\n";
+            return raw.replace(/<[^>]+>/g, "");
+        }
+        return token.text ?? token.raw ?? "";
+    })
+        .join("");
+}
+function headingRule(text) {
+    const width = Math.min(96, Math.max(24, visibleLen(text) + 8));
+    return colors.muted("─".repeat(width));
+}
+function renderHeading(token) {
+    const depth = token.depth ?? 2;
+    const headingText = renderInlineTokens(token.tokens) || token.text || "";
+    const clean = headingText.trim();
+    if (!clean)
+        return [];
+    if (depth <= 1) {
+        return [chalk.hex(theme.syntax.heading).bold.underline(clean), headingRule(clean), ""];
+    }
+    if (depth === 2) {
+        return [chalk.hex(theme.syntax.heading).bold(clean), headingRule(clean), ""];
+    }
+    if (depth === 3) {
+        return [chalk.hex(theme.syntax.heading).bold(clean), ""];
+    }
+    return [colors.accentDim(clean), ""];
+}
+function renderCodeBlock(token) {
+    const raw = (token.text ?? "").replace(/\n$/, "");
+    const lang = (token.lang ?? "").trim();
+    const body = raw || "(empty)";
+    const title = lang ? ` ${lang} ` : " code ";
+    const boxed = boxen(codeStyle(body), {
+        padding: { top: 0, bottom: 0, left: 1, right: 1 },
+        margin: { top: 0, bottom: 0, left: 0, right: 0 },
+        borderColor: inkColors.mutedDim,
+        borderStyle: "round",
+        title,
+        titleAlignment: "left",
+    });
+    return splitRenderedLines(boxed).concat("");
+}
+function renderTable(token) {
+    const headerCells = (token.header ?? []).map((c) => renderInlineTokens(c.tokens) || c.text || "");
+    const rows = (token.rows ?? []).map((row) => row.map((c) => normalizeTableCellText(renderInlineTokens(c.tokens) || c.text || "")));
+    const colCount = Math.max(headerCells.length, ...rows.map((r) => r.length), 0);
+    if (colCount === 0)
+        return [];
+    const paddedHeader = [...headerCells];
+    while (paddedHeader.length < colCount)
+        paddedHeader.push("");
+    const paddedRows = rows.map((r) => {
+        const copy = [...r];
+        while (copy.length < colCount)
+            copy.push("");
+        return copy;
+    });
+    const maxColsWidth = Math.max(48, (process.stdout.columns ?? 100) - 8);
+    const minColWidth = 10;
+    const maxColWidth = 40;
+    const widths = Array.from({ length: colCount }, (_, i) => {
+        const maxLen = Math.max(visibleLen(paddedHeader[i] ?? ""), ...paddedRows.map((r) => visibleLen(r[i] ?? "")), minColWidth);
+        return Math.min(maxColWidth, maxLen + 2);
+    });
+    const currentWidth = widths.reduce((a, b) => a + b, 0) + colCount + 1;
+    if (currentWidth > maxColsWidth) {
+        let excess = currentWidth - maxColsWidth;
+        while (excess > 0) {
+            let shrunk = false;
+            for (let i = 0; i < widths.length && excess > 0; i++) {
+                if ((widths[i] ?? minColWidth) > minColWidth) {
+                    widths[i] = (widths[i] ?? minColWidth) - 1;
+                    excess--;
+                    shrunk = true;
+                }
+            }
+            if (!shrunk)
+                break;
+        }
+    }
+    const table = new Table({
+        head: paddedHeader.map((h) => chalk.bold(colors.accentPale(h))),
+        colWidths: widths,
+        wordWrap: true,
+        style: { border: [], head: [] },
+        chars: {
+            top: colors.muted("─"),
+            "top-mid": colors.muted("┬"),
+            "top-left": colors.muted("┌"),
+            "top-right": colors.muted("┐"),
+            bottom: colors.muted("─"),
+            "bottom-mid": colors.muted("┴"),
+            "bottom-left": colors.muted("└"),
+            "bottom-right": colors.muted("┘"),
+            left: colors.muted("│"),
+            "left-mid": colors.muted("├"),
+            mid: colors.muted("─"),
+            "mid-mid": colors.muted("┼"),
+            right: colors.muted("│"),
+            "right-mid": colors.muted("┤"),
+            middle: colors.muted("│"),
+        },
+    });
+    for (const row of paddedRows)
+        table.push(row);
+    return splitRenderedLines(table.toString()).concat("");
+}
+function renderList(token, indent) {
+    const out = [];
+    const ordered = !!token.ordered;
+    const start = Number(token.start ?? 1) || 1;
+    const items = token.items ?? [];
+    for (let i = 0; i < items.length; i++) {
+        const item = items[i] ?? {};
+        const marker = ordered ? `${start + i}.` : "•";
+        const itemLines = renderBlockTokens(item.tokens ?? [], indent + 2, true);
+        const first = (itemLines[0] ?? "").trimStart();
+        out.push(`${" ".repeat(indent)}${marker} ${first}`.trimEnd());
+        const continuationPrefix = " ".repeat(indent + marker.length + 1);
+        for (let j = 1; j < itemLines.length; j++) {
+            out.push(`${continuationPrefix}${itemLines[j] ?? ""}`.trimEnd());
+        }
+    }
     return out;
 }
+function renderBlockTokens(tokens, indent = 0, compact = false) {
+    const out = [];
+    for (const token of tokens) {
+        const t = token.type ?? "";
+        if (t === "space") {
+            if (!compact)
+                out.push("");
+            continue;
+        }
+        if (t === "heading") {
+            out.push(...renderHeading(token));
+            continue;
+        }
+        if (t === "paragraph" || t === "text") {
+            const line = renderInlineTokens(token.tokens ?? [{ type: "text", text: token.text ?? "" }]);
+            if (line.trim())
+                out.push(`${" ".repeat(indent)}${line}`.trimEnd());
+            if (!compact)
+                out.push("");
+            continue;
+        }
+        if (t === "blockquote") {
+            const inner = renderBlockTokens(token.tokens ?? [], indent + 2, true);
+            for (const line of inner)
+                out.push(`${colors.muted("│")} ${colors.muted(line)}`.trimEnd());
+            if (!compact)
+                out.push("");
+            continue;
+        }
+        if (t === "list") {
+            out.push(...renderList(token, indent));
+            if (!compact)
+                out.push("");
+            continue;
+        }
+        if (t === "code") {
+            out.push(...renderCodeBlock(token));
+            continue;
+        }
+        if (t === "table") {
+            out.push(...renderTable(token));
+            continue;
+        }
+        if (t === "hr") {
+            out.push(hrLine(), "");
+            continue;
+        }
+        const fallback = (token.text ?? token.raw ?? "").trim();
+        if (fallback) {
+            out.push(`${" ".repeat(indent)}${fallback}`);
+            if (!compact)
+                out.push("");
+        }
+    }
+    while (out.length > 0 && out[out.length - 1] === "")
+        out.pop();
+    return out;
+}
+export function renderMarkdown(text) {
+    const normalized = preprocessMarkdown(text);
+    const tokens = marked.lexer(normalized, { gfm: true, breaks: true });
+    const lines = renderBlockTokens(tokens, 0, false)
+        .join("\n")
+        .replace(/\n{3,}/g, "\n\n")
+        .replace(/[ \t]+\n/g, "\n")
+        .trimEnd();
+    return lines;
+}
 export function separator() {
     const cols = process.stdout.columns ?? 80;
     return colors.muted("─".repeat(Math.min(cols, 100)));
@@ -66,7 +297,7 @@ export function userPromptBox(prompt) {
     const cols = process.stdout.columns ?? 80;
     const boxWidth = Math.max(20, cols - 4);
     const innerWidth = boxWidth - 2 - 2;
-    const text = wrapToWidth((prompt.trim() || "\u00A0"), innerWidth);
+    const text = wrapToWidth(prompt.trim() || "\u00A0", innerWidth);
     return boxen(text, {
         width: boxWidth,
         padding: { top: 0, bottom: 0, left: 1, right: 1 },
@@ -76,14 +307,15 @@ export function userPromptBox(prompt) {
     });
 }
 const TOOL_INDENT = "  ";
-const toolSubdued = chalk.hex("#3d3d3d");
-export function toolCallBox(toolName, argPreview, success = true) {
+const toolSubdued = chalk.gray;
+export function toolCallBox(toolName, argPreview, success = true, extraIndent = 0) {
+    const indent = TOOL_INDENT + "  ".repeat(Math.max(0, extraIndent));
     const diamondColor = success ? colors.toolSuccess : colors.toolFail;
-    const nameColor = success ? colors.toolSuccess : colors.toolFail;
+    const nameColor = diamondColor;
     const argColor = success ? toolSubdued : colors.toolFail;
-    const parenColor = chalk.white;
-    const name = " " + toolName.charAt(0).toUpperCase() + toolName.slice(1);
-    return `${TOOL_INDENT}${diamondColor(icons.tool)}${nameColor(name)}${parenColor("(")}${argColor(argPreview)}${parenColor(")")}`;
+    const parenColor = colors.mutedDark;
+    const name = " " + toolName.trim().toLowerCase();
+    return `${indent}${diamondColor(icons.tool)}${nameColor(name)}${parenColor("(")}${argColor(argPreview)}${parenColor(")")}`;
 }
 export function toolResultLine(preview, success = true) {
     const pipeColor = success ? toolSubdued : colors.toolFail;
@@ -95,11 +327,12 @@ function formatTokenCount(n) {
         return (n / 1000).toFixed(1).replace(/\.0$/, "") + "K";
     return String(n);
 }
-export function toolResultTokenLine(tokens, success = true) {
+export function toolResultTokenLine(tokens, success = true, extraIndent = 0) {
+    const indent = TOOL_INDENT + "  ".repeat(Math.max(0, extraIndent));
     const pipeColor = success ? toolSubdued : colors.toolFail;
-    const textColor = success ? toolSubdued : colors.toolFail;
+    const textColor = toolSubdued;
     const tokenStr = `+${formatTokenCount(tokens)} tokens`;
-    return `${TOOL_INDENT}${TOOL_INDENT}${pipeColor(icons.pipe + " ")}${textColor(tokenStr)}`;
+    return `${indent}${TOOL_INDENT}${pipeColor(icons.pipe + " ")}${textColor(tokenStr)}`;
 }
 export function agentMessage(text) {
     const rendered = renderMarkdown(text.trim());

package/dist/ui/theme.js

@@ -22,7 +22,7 @@ const THEME_DARK = {
         error: { main: "#f87171", dim: "#dc2626" },
         muted: { main: "#8a9a7a", dim: "#6a7a5a", dark: "#4a5a3a" },
         background: { dark: "#1a1a1a", darker: "#0f0f0f" },
-        text: { primary: "#e2e8f0", secondary: "#94a3b8", disabled: "#64748b" },
+        text: { primary: "#e2e8f0", secondary: "#98a08f", disabled: "#6f7867" },
     },
     ui: {
         borderColor: "#7F9A65",
@@ -51,7 +51,7 @@ const THEME_LIGHT = {
         error: { main: "#dc2626", dim: "#b91c1c" },
         muted: { main: "#6b7a5a", dim: "#5a6a4a", dark: "#4a5a3a" },
         background: { dark: "#f1f5f9", darker: "#e2e8f0" },
-        text: { primary: "#1e293b", secondary: "#475569", disabled: "#64748b" },
+        text: { primary: "#1e293b", secondary: "#5f6758", disabled: "#778070" },
     },
     ui: {
         borderColor: "#5a7247",

package/package.json

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