@qduc/term2 0.8.0 → 0.9.1

package/dist/components/message/CommandMessage.js

@@ -57,13 +57,13 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
                 .join('\n');
         }
         return generateDiff(toolArgs.search_content, toolArgs.replace_content);
-    }, [toolName, toolArgs?.search_content, toolArgs?.replace_content, toolArgs?.replacements]);
+    }, [toolName, toolArgs]);
     const createFileDiffLines = useMemo(() => toolName === TOOL_NAME_CREATE_FILE && toolArgs
         ? (toolArgs.content ?? '')
             .split('\n')
             .map((line) => `+${line}`)
             .join('\n')
-        : '', [toolName, toolArgs?.content]);
+        : '', [toolName, toolArgs]);
     // Parse the denial reason from the JSON wrapper that the tool rejection interceptor
     // produces (e.g. {"output":[{"success":false,"error":"..."}]}).
     const denialReason = useMemo(() => {
@@ -82,8 +82,74 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
         return output;
     }, [output]);
     const formattedArgs = useMemo(() => {
-        return toolArgs ? formatToolArgs(toolName, toolArgs, displayMode) : '';
-    }, [toolName, toolArgs, displayMode]);
+        return toolArgs ? formatToolArgs(toolName, toolArgs, 'concise') : '';
+    }, [toolName, toolArgs]);
+    const displayAction = useMemo(() => {
+        const isShell = !toolName || toolName === 'shell';
+        if (isShell) {
+            return (React.createElement(React.Fragment, null,
+                React.createElement(Text, { color: COLOR_MUTED }, "$"),
+                " ",
+                React.createElement(Text, { bold: true }, command),
+                runtime && React.createElement(Text, { color: COLOR_MUTED },
+                    " (",
+                    runtime,
+                    ")")));
+        }
+        const argsText = formattedArgs ? ` ${formattedArgs}` : '';
+        const renderAction = (verb) => (React.createElement(React.Fragment, null,
+            React.createElement(Text, { dimColor: true }, verb),
+            React.createElement(Text, null, argsText)));
+        switch (toolName) {
+            case 'grep':
+                return renderAction('Searched');
+            case 'glob':
+                return renderAction('Searched files');
+            case 'read_file':
+            case 'view_file':
+                return renderAction('Read');
+            case TOOL_NAME_APPLY_PATCH:
+                return renderAction('Patched');
+            case TOOL_NAME_SEARCH_REPLACE:
+                return renderAction('Edited');
+            case TOOL_NAME_CREATE_FILE:
+                return renderAction('Created');
+            case 'ask_mentor':
+                return renderAction('Asked mentor');
+            case 'ask_user':
+                return renderAction('Asked user');
+            case 'web_search':
+                return renderAction('Web searched');
+            case 'web_fetch':
+                return renderAction('Web fetched');
+            case 'read_code_outline':
+                return renderAction('Read outline');
+            case 'code_context_search':
+                return renderAction('Searched context');
+            case 'run_subagent':
+                return renderAction('Delegated');
+            default:
+                return (React.createElement(React.Fragment, null,
+                    React.createElement(Text, { dimColor: true },
+                        "[",
+                        toolName,
+                        "]"),
+                    React.createElement(Text, null, argsText)));
+        }
+    }, [toolName, command, runtime, formattedArgs]);
+    const renderStandardHeader = () => {
+        const headerColor = success === false ? COLOR_ERROR : isRunning ? COLOR_WARNING : COLOR_INFO;
+        const isShell = !toolName || toolName === 'shell';
+        if (isShell) {
+            return (React.createElement(Box, null,
+                React.createElement(Text, { color: headerColor }, displayAction)));
+        }
+        return (React.createElement(Box, null,
+            React.createElement(Text, { color: headerColor },
+                React.createElement(Text, { color: COLOR_MUTED }, "$"),
+                " ",
+                displayAction)));
+    };
     const changeStats = useMemo(() => {
         const diffText = toolName === TOOL_NAME_APPLY_PATCH
             ? toolArgs?.diff
@@ -128,6 +194,7 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
     useEffect(() => {
         if (!isRunning) {
             if (!isVisible) {
+                // eslint-disable-next-line react-hooks/set-state-in-effect -- show-after-delay is an inherent side effect
                 setIsVisible(true);
             }
             return;
@@ -136,66 +203,18 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
             setIsVisible(true);
         }, 1000);
         return () => clearTimeout(timer);
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- isVisible drives show-after-delay which is inherently side-effect; adding isVisible would cause a re-render loop
     }, [isRunning]);
     if (!isVisible && !isSubagent) {
         return null;
     }
     if (displayMode === 'concise') {
-        const displayAction = (() => {
-            const isShell = !toolName || toolName === 'shell';
-            if (isShell) {
-                return (React.createElement(React.Fragment, null,
-                    React.createElement(Text, { color: COLOR_MUTED }, "$"),
-                    " ",
-                    React.createElement(Text, null, command),
-                    runtime && React.createElement(Text, { color: COLOR_MUTED },
-                        " (",
-                        runtime,
-                        ")")));
-            }
-            const argsText = formattedArgs ? ` ${formattedArgs}` : '';
-            const renderAction = (verb) => (React.createElement(React.Fragment, null,
-                React.createElement(Text, { dimColor: true }, verb),
-                React.createElement(Text, null, argsText)));
-            switch (toolName) {
-                case 'grep':
-                    return renderAction('Searched');
-                case 'find_files':
-                    return renderAction('Searched files');
-                case 'read_file':
-                case 'view_file':
-                    return renderAction('Read');
-                case TOOL_NAME_APPLY_PATCH:
-                    return renderAction('Patched');
-                case TOOL_NAME_SEARCH_REPLACE:
-                    return renderAction('Edited');
-                case TOOL_NAME_CREATE_FILE:
-                    return renderAction('Created');
-                case 'ask_mentor':
-                    return renderAction('Asked mentor');
-                case 'ask_user':
-                    return renderAction('Asked user');
-                case 'web_search':
-                    return renderAction('Web searched');
-                case 'web_fetch':
-                    return renderAction('Web fetched');
-                case 'read_code_outline':
-                    return renderAction('Read outline');
-                case 'code_context_search':
-                    return renderAction('Searched context');
-                case 'run_subagent':
-                    return renderAction('Delegated');
-                default:
-                    return (React.createElement(React.Fragment, null,
-                        React.createElement(Text, { dimColor: true },
-                            "[",
-                            toolName,
-                            "]"),
-                        React.createElement(Text, null, argsText)));
-            }
-        })();
         if (isSubagent) {
-            const isFailed = status === 'failed' || isApprovalRejection || success === false || Boolean(failureReason);
+            const isFailed = status === 'failed' ||
+                status === 'aborted' ||
+                isApprovalRejection ||
+                success === false ||
+                Boolean(failureReason);
             const statusChar = isFailed ? '✖' : isRunning ? '▶' : '✔';
             const actionText = isFailed ? command : displayAction;
             return (React.createElement(Box, null,
@@ -299,13 +318,8 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
             return (React.createElement(Box, { flexDirection: "column" },
                 React.createElement(Text, { color: success === false ? COLOR_ERROR : COLOR_TOOL_OUTPUT }, displayed)));
         }
-        const isCreate = toolArgs.type === 'create_file';
         return (React.createElement(Box, { flexDirection: "column" },
-            React.createElement(Box, null,
-                React.createElement(Text, { color: isCreate ? COLOR_SUCCESS : COLOR_WARNING, bold: true }, isCreate ? '[CREATE FILE]' : '[PATCH]'),
-                React.createElement(Text, null,
-                    " ",
-                    toolArgs.path)),
+            renderStandardHeader(),
             toolArgs.diff && success !== false && React.createElement(DiffView, { diff: toolArgs.diff }),
             failureReason && React.createElement(Text, { color: COLOR_ERROR },
                 "Error: ",
@@ -321,11 +335,7 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
         }
         // For auto-approved search_replace (no approval prompt), show diff + output
         return (React.createElement(Box, { flexDirection: "column" },
-            React.createElement(Box, null,
-                React.createElement(Text, { color: COLOR_WARNING, bold: true }, "[SEARCH & REPLACE]"),
-                React.createElement(Text, null,
-                    " ",
-                    toolArgs.path)),
+            renderStandardHeader(),
             React.createElement(DiffView, { diff: diff }),
             failureReason && React.createElement(Text, { color: COLOR_ERROR },
                 "Error: ",
@@ -335,11 +345,7 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
     // Special handling for create_file
     if (toolName === TOOL_NAME_CREATE_FILE && toolArgs) {
         return (React.createElement(Box, { flexDirection: "column" },
-            React.createElement(Box, null,
-                React.createElement(Text, { color: success === false ? COLOR_ERROR : COLOR_SUCCESS, bold: true }, "[CREATE]"),
-                React.createElement(Text, null,
-                    " ",
-                    toolArgs.path)),
+            renderStandardHeader(),
             success !== false && React.createElement(DiffView, { diff: createFileDiffLines }),
             failureReason && React.createElement(Text, { color: COLOR_ERROR },
                 "Error: ",
@@ -372,30 +378,25 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
                         displayLines.push({ lineNum: startLine + i, content });
                     });
                 }
-                return (React.createElement(Box, { flexDirection: "column", marginY: 1 },
-                    React.createElement(Box, null,
-                        React.createElement(Text, { color: COLOR_INFO, bold: true }, "\uD83D\uDCD6 [READ FILE]"),
-                        React.createElement(Text, null,
-                            ' ',
-                            filePath,
-                            " (Lines ",
-                            startLine,
-                            "-",
-                            endLine,
-                            " of ",
-                            totalLines,
-                            ")")),
+                return (React.createElement(Box, { flexDirection: "column" },
+                    renderStandardHeader(),
                     React.createElement(Box, { flexDirection: "column", borderStyle: "single", borderColor: COLOR_MUTED, paddingX: 1, marginTop: 1 }, displayLines.map((line, idx) => {
                         if (line.lineNum === -1) {
-                            return (React.createElement(Text, { key: idx, color: COLOR_MUTED, dimColor: true }, line.content));
+                            return (React.createElement(Box, { key: idx, flexDirection: "row" },
+                                React.createElement(Box, { width: 8, flexShrink: 0 },
+                                    React.createElement(Text, { color: COLOR_MUTED, dimColor: true }, '      │ ')),
+                                React.createElement(Box, { flexGrow: 1 },
+                                    React.createElement(Text, { color: COLOR_MUTED, dimColor: true }, line.content))));
                         }
                         const lineNumStr = String(line.lineNum).padStart(5, ' ');
-                        return (React.createElement(Text, { key: idx },
-                            React.createElement(Text, { color: COLOR_MUTED, dimColor: true },
-                                lineNumStr,
-                                " \u2502",
-                                ' '),
-                            React.createElement(Text, { color: COLOR_TOOL_OUTPUT }, line.content)));
+                        return (React.createElement(Box, { key: idx, flexDirection: "row" },
+                            React.createElement(Box, { width: 8, flexShrink: 0 },
+                                React.createElement(Text, { color: COLOR_MUTED, dimColor: true },
+                                    lineNumStr,
+                                    " \u2502",
+                                    ' ')),
+                            React.createElement(Box, { flexGrow: 1 },
+                                React.createElement(Text, { color: COLOR_TOOL_OUTPUT }, line.content))));
                     }))));
             }
         }
@@ -404,56 +405,93 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
             if (parsed) {
                 const { matchesByFile, note } = parsed;
                 const filePaths = Object.keys(matchesByFile);
-                return (React.createElement(Box, { flexDirection: "column", marginY: 1 },
-                    React.createElement(Box, { marginBottom: 1 },
-                        React.createElement(Text, { color: COLOR_INFO, bold: true }, "\uD83D\uDD0D [GREP RESULTS]"),
-                        React.createElement(Text, null,
-                            " for ",
-                            toolArgs?.pattern || '')),
-                    filePaths.map((filePath, fileIdx) => {
-                        const matches = matchesByFile[filePath] ?? [];
+                const MAX_DISPLAY_MATCHES = 10;
+                let displayedMatchesCount = 0;
+                let truncatedMatchesCount = 0;
+                let truncatedFilesCount = 0;
+                const filesToRender = [];
+                for (const filePath of filePaths) {
+                    const matches = matchesByFile[filePath] ?? [];
+                    if (displayedMatchesCount >= MAX_DISPLAY_MATCHES) {
+                        truncatedMatchesCount += matches.length;
+                        truncatedFilesCount++;
+                    }
+                    else {
+                        const remainingSlots = MAX_DISPLAY_MATCHES - displayedMatchesCount;
+                        if (matches.length <= remainingSlots) {
+                            filesToRender.push({
+                                filePath,
+                                matches,
+                                truncatedCount: 0,
+                            });
+                            displayedMatchesCount += matches.length;
+                        }
+                        else {
+                            filesToRender.push({
+                                filePath,
+                                matches: matches.slice(0, remainingSlots),
+                                truncatedCount: matches.length - remainingSlots,
+                            });
+                            displayedMatchesCount += remainingSlots;
+                            truncatedMatchesCount += matches.length - remainingSlots;
+                        }
+                    }
+                }
+                return (React.createElement(Box, { flexDirection: "column" },
+                    React.createElement(Box, { marginBottom: 1 }, renderStandardHeader()),
+                    filesToRender.map((file, fileIdx) => {
+                        if (file.matches.length === 0)
+                            return null;
                         return (React.createElement(Box, { key: fileIdx, flexDirection: "column", marginBottom: 1 },
                             React.createElement(Box, null,
-                                React.createElement(Text, { color: COLOR_INFO, bold: true },
-                                    "\uD83D\uDCC4 ",
-                                    filePath),
+                                React.createElement(Text, { color: COLOR_INFO, bold: true }, file.filePath),
                                 React.createElement(Text, { color: COLOR_MUTED },
                                     ' ',
                                     "(",
-                                    matches.length,
+                                    file.matches.length,
                                     " match",
-                                    matches.length !== 1 ? 'es' : '',
+                                    file.matches.length !== 1 ? 'es' : '',
+                                    file.truncatedCount > 0 ? `, ${file.truncatedCount} truncated` : '',
                                     ")")),
-                            React.createElement(Box, { flexDirection: "column", paddingLeft: 2 }, matches.map((match, matchIdx) => {
-                                const lineNumStr = String(match.lineNum).padStart(4, ' ');
-                                return (React.createElement(Text, { key: matchIdx },
-                                    React.createElement(Text, { color: COLOR_MUTED, dimColor: true },
-                                        lineNumStr,
-                                        ":",
-                                        ' '),
-                                    React.createElement(Text, { color: COLOR_TOOL_OUTPUT }, match.content)));
-                            }))));
+                            React.createElement(Box, { flexDirection: "column", paddingLeft: 2 },
+                                file.matches.map((match, matchIdx) => {
+                                    const lineNumStr = String(match.lineNum).padStart(4, ' ');
+                                    return (React.createElement(Text, { key: matchIdx },
+                                        React.createElement(Text, { color: COLOR_MUTED, dimColor: true },
+                                            lineNumStr,
+                                            ":",
+                                            ' '),
+                                        React.createElement(Text, { color: COLOR_TOOL_OUTPUT }, match.content)));
+                                }),
+                                file.truncatedCount > 0 && (React.createElement(Text, { color: COLOR_MUTED, dimColor: true },
+                                    "... (",
+                                    file.truncatedCount,
+                                    " more match",
+                                    file.truncatedCount !== 1 ? 'es' : '',
+                                    " truncated in this file) ...")))));
                     }),
+                    truncatedMatchesCount > 0 && (React.createElement(Box, { marginTop: 1 },
+                        React.createElement(Text, { color: COLOR_WARNING },
+                            "... (",
+                            truncatedMatchesCount,
+                            " match",
+                            truncatedMatchesCount !== 1 ? 'es' : '',
+                            truncatedFilesCount > 0
+                                ? ` in ${truncatedFilesCount} more file${truncatedFilesCount !== 1 ? 's' : ''}`
+                                : '',
+                            ' ',
+                            "truncated) ..."))),
                     note && (React.createElement(Box, { marginTop: 1 },
                         React.createElement(Text, { color: COLOR_WARNING }, note)))));
             }
         }
-        if (toolName === 'find_files') {
+        if (toolName === 'glob') {
             const parsed = parseFindFilesOutput(output);
             if (parsed) {
                 const { files, note } = parsed;
-                return (React.createElement(Box, { flexDirection: "column", marginY: 1 },
-                    React.createElement(Box, { marginBottom: 1 },
-                        React.createElement(Text, { color: COLOR_INFO, bold: true }, "\uD83D\uDCC2 [FILE SEARCH]"),
-                        React.createElement(Text, null,
-                            ' ',
-                            "found ",
-                            files.length,
-                            " file",
-                            files.length !== 1 ? 's' : '')),
-                    React.createElement(Box, { flexDirection: "column", paddingLeft: 2 }, files.map((file, idx) => (React.createElement(Text, { key: idx, color: COLOR_TOOL_OUTPUT },
-                        "\uD83D\uDCC4 ",
-                        file)))),
+                return (React.createElement(Box, { flexDirection: "column" },
+                    React.createElement(Box, { marginBottom: 1 }, renderStandardHeader()),
+                    React.createElement(Box, { flexDirection: "column", paddingLeft: 2 }, files.map((file, idx) => (React.createElement(Text, { key: idx, color: COLOR_TOOL_OUTPUT }, file)))),
                     note && (React.createElement(Box, { marginTop: 1 },
                         React.createElement(Text, { color: COLOR_WARNING }, note)))));
             }
@@ -463,23 +501,14 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
             if (parsed) {
                 const { role, status, toolsUsed, filesChanged, mainText } = parsed;
                 const statusColor = status === 'completed' ? COLOR_SUCCESS : status === 'failed' ? COLOR_ERROR : COLOR_WARNING;
-                return (React.createElement(Box, { flexDirection: "column", marginY: 1 },
-                    React.createElement(Box, null,
-                        React.createElement(Text, { color: COLOR_INFO, bold: true }, "\uD83E\uDD16 [SUBAGENT]"),
-                        React.createElement(Text, null,
-                            " ",
-                            role,
-                            " "),
-                        React.createElement(Text, { color: statusColor, bold: true },
-                            "(",
-                            status.toUpperCase(),
-                            ")")),
+                return (React.createElement(Box, { flexDirection: "column" },
+                    renderStandardHeader(),
                     (toolsUsed || filesChanged) && (React.createElement(Box, { flexDirection: "column", paddingLeft: 2, marginY: 0.5 },
                         toolsUsed && (React.createElement(Text, { color: COLOR_MUTED },
-                            "\uD83D\uDEE0\uFE0F Tools: ",
+                            "Tools: ",
                             React.createElement(Text, { color: COLOR_CONTENT }, toolsUsed))),
                         filesChanged && (React.createElement(Text, { color: COLOR_MUTED },
-                            "\uD83D\uDCDD Changed: ",
+                            "Changed: ",
                             React.createElement(Text, { color: COLOR_CONTENT }, filesChanged))))),
                     mainText && (React.createElement(Box, { flexDirection: "column", borderStyle: "single", borderColor: COLOR_INFO, paddingX: 1, marginTop: 1 },
                         React.createElement(Text, { color: COLOR_TOOL_OUTPUT }, mainText)))));
@@ -489,28 +518,21 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
             const parsed = parseWebSearchOutput(output);
             if (parsed) {
                 const { answer, results } = parsed;
-                return (React.createElement(Box, { flexDirection: "column", marginY: 1 },
-                    React.createElement(Box, { marginBottom: 1 },
-                        React.createElement(Text, { color: COLOR_INFO, bold: true }, "\uD83C\uDF10 [WEB SEARCH]"),
-                        React.createElement(Text, null,
-                            " \"",
-                            toolArgs?.query || '',
-                            "\"")),
+                return (React.createElement(Box, { flexDirection: "column" },
+                    React.createElement(Box, { marginBottom: 1 }, renderStandardHeader()),
                     answer && (React.createElement(Box, { flexDirection: "column", borderStyle: "round", borderColor: COLOR_WARNING, paddingX: 1, marginBottom: 1 },
-                        React.createElement(Text, { color: COLOR_WARNING, bold: true }, "\uD83D\uDCA1 Answer Summary"),
+                        React.createElement(Text, { color: COLOR_WARNING, bold: true }, "Answer Summary"),
                         React.createElement(Text, { color: COLOR_TOOL_OUTPUT }, answer))),
                     results && results.length > 0 && (React.createElement(Box, { flexDirection: "column" },
-                        React.createElement(Text, { color: COLOR_INFO, bold: true }, "\uD83D\uDCCB Search Results:"),
+                        React.createElement(Text, { color: COLOR_INFO, bold: true }, "Search Results:"),
                         results.map((res, idx) => (React.createElement(Box, { key: idx, flexDirection: "column", marginTop: 1, paddingLeft: 2 },
                             React.createElement(Text, { bold: true, color: COLOR_CONTENT },
                                 idx + 1,
                                 ". ",
                                 res.title),
-                            React.createElement(Text, { color: COLOR_LINK, underline: true },
-                                "\uD83D\uDD17 ",
-                                res.url),
+                            React.createElement(Text, { color: COLOR_LINK, underline: true }, res.url),
                             res.published && (React.createElement(Text, { color: COLOR_MUTED, dimColor: true },
-                                "\uD83D\uDCC5 Published: ",
+                                "Published: ",
                                 res.published)),
                             React.createElement(Box, { marginTop: 1 },
                                 React.createElement(Text, { color: COLOR_TOOL_OUTPUT }, res.content)))))))));
@@ -530,53 +552,39 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
                     truncatedCount = contentLines.length - maxLines - 1;
                     displayContent = `${firstPart}\n\n... (${truncatedCount} lines of content truncated for preview) ...\n\n${lastLine}`;
                 }
-                return (React.createElement(Box, { flexDirection: "column", marginY: 1 },
-                    React.createElement(Box, null,
-                        React.createElement(Text, { color: COLOR_INFO, bold: true }, "\uD83D\uDCE5 [WEB FETCH]"),
-                        React.createElement(Text, null,
-                            " ",
-                            title)),
+                return (React.createElement(Box, { flexDirection: "column" },
+                    renderStandardHeader(),
+                    title && (React.createElement(Box, { paddingLeft: 2 },
+                        React.createElement(Text, { color: COLOR_CONTENT, bold: true }, title))),
                     React.createElement(Box, { paddingLeft: 2 },
-                        React.createElement(Text, { color: COLOR_LINK, underline: true },
-                            "\uD83D\uDD17 ",
-                            url)),
+                        React.createElement(Text, { color: COLOR_LINK, underline: true }, url)),
                     toc && (React.createElement(Box, { flexDirection: "column", borderStyle: "classic", borderColor: COLOR_MUTED, paddingX: 1, marginY: 1, width: 50 },
-                        React.createElement(Text, { color: COLOR_WARNING, bold: true }, "\uD83D\uDCCB Table of Contents"),
+                        React.createElement(Text, { color: COLOR_WARNING, bold: true }, "Table of Contents"),
                         React.createElement(Text, { color: COLOR_MUTED }, toc))),
                     content && (React.createElement(Box, { flexDirection: "column", borderStyle: "single", borderColor: COLOR_MUTED, paddingX: 1, marginTop: 1 },
                         React.createElement(Text, { color: COLOR_TOOL_OUTPUT }, displayContent))),
                     tempFile && (React.createElement(Box, { marginTop: 1 },
                         React.createElement(Text, { color: COLOR_WARNING },
-                            "\uD83D\uDCBE Full content saved to:",
+                            "Full content saved to:",
                             ' ',
                             React.createElement(Text, { bold: true, color: COLOR_CONTENT }, tempFile)))),
                     notes && (React.createElement(Box, { marginTop: 0.5 },
                         React.createElement(Text, { color: COLOR_WARNING },
-                            "\u26A0\uFE0F ",
+                            "Warning: ",
                             notes)))));
             }
         }
         if (toolName === 'ask_mentor') {
-            return (React.createElement(Box, { flexDirection: "column", marginY: 1 },
-                React.createElement(Box, null,
-                    React.createElement(Text, { color: COLOR_INFO, bold: true }, "\uD83E\uDDE0 [MENTOR QUESTION]"),
-                    React.createElement(Text, { color: COLOR_CONTENT, italic: true },
-                        ' ',
-                        "\"",
-                        toolArgs?.question || '',
-                        "\"")),
+            return (React.createElement(Box, { flexDirection: "column" },
+                renderStandardHeader(),
                 React.createElement(Box, { flexDirection: "column", borderStyle: "round", borderColor: COLOR_SPECIAL, paddingX: 1, marginTop: 1 },
-                    React.createElement(Text, { color: COLOR_SPECIAL, bold: true }, "\uD83D\uDCAC Mentor Response"),
+                    React.createElement(Text, { color: COLOR_SPECIAL, bold: true }, "Mentor Response"),
                     React.createElement(Text, { color: COLOR_TOOL_OUTPUT }, output))));
         }
         if (toolName === 'ask_user') {
             const options = toolArgs?.options;
-            return (React.createElement(Box, { flexDirection: "column", marginY: 1 },
-                React.createElement(Box, null,
-                    React.createElement(Text, { color: COLOR_INFO, bold: true }, "\u2753 [ASK USER]"),
-                    React.createElement(Text, { color: COLOR_CONTENT },
-                        " ",
-                        toolArgs?.question || 'Unknown question')),
+            return (React.createElement(Box, { flexDirection: "column" },
+                renderStandardHeader(),
                 options && Array.isArray(options) && options.length > 0 && (React.createElement(Box, { paddingLeft: 2, marginY: 0.5 },
                     React.createElement(Text, { color: COLOR_MUTED }, "Options: "),
                     options.map((opt, idx) => (React.createElement(Text, { key: idx, color: idx === 0 ? COLOR_SUCCESS : COLOR_CONTENT },
@@ -586,36 +594,29 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
                         "]",
                         idx === 0 ? ' (Recommended)' : ''))))),
                 React.createElement(Box, { paddingLeft: 2, marginTop: 0.5 },
-                    React.createElement(Text, { color: COLOR_MUTED }, "\uD83D\uDDE3\uFE0F Response: "),
+                    React.createElement(Text, { color: COLOR_MUTED }, "Response: "),
                     React.createElement(Text, { color: COLOR_SUCCESS, bold: true }, output || 'No response yet'))));
         }
         if (toolName === 'read_code_outline') {
             const parsed = parseCodeOutlineOutput(output);
             if (parsed) {
                 const { filePath, lang, imports, exports, decls } = parsed;
-                return (React.createElement(Box, { flexDirection: "column", marginY: 1 },
-                    React.createElement(Box, { marginBottom: 1 },
-                        React.createElement(Text, { color: COLOR_INFO, bold: true }, "\uD83D\uDCD1 [CODE OUTLINE]"),
-                        React.createElement(Text, null,
-                            ' ',
-                            filePath,
-                            " (",
-                            lang,
-                            ")")),
+                return (React.createElement(Box, { flexDirection: "column" },
+                    React.createElement(Box, { marginBottom: 1 }, renderStandardHeader()),
                     imports && imports.length > 0 && (React.createElement(Box, { flexDirection: "column", marginBottom: 1, paddingLeft: 2 },
-                        React.createElement(Text, { color: COLOR_WARNING, bold: true }, "\uD83D\uDCE6 Imports:"),
+                        React.createElement(Text, { color: COLOR_WARNING, bold: true }, "Imports:"),
                         imports.map((imp, idx) => (React.createElement(Text, { key: idx, color: COLOR_TOOL_OUTPUT },
                             ' ',
                             "\u2022 ",
                             imp))))),
                     exports && exports.length > 0 && (React.createElement(Box, { flexDirection: "column", marginBottom: 1, paddingLeft: 2 },
-                        React.createElement(Text, { color: COLOR_SUCCESS, bold: true }, "\uD83D\uDCE4 Exports:"),
+                        React.createElement(Text, { color: COLOR_SUCCESS, bold: true }, "Exports:"),
                         exports.map((exp, idx) => (React.createElement(Text, { key: idx, color: COLOR_TOOL_OUTPUT },
                             ' ',
                             "\u2022 ",
                             exp))))),
                     decls && decls.length > 0 && (React.createElement(Box, { flexDirection: "column", paddingLeft: 2 },
-                        React.createElement(Text, { color: COLOR_LINK, bold: true }, "\uD83D\uDEE0\uFE0F Declarations:"),
+                        React.createElement(Text, { color: COLOR_LINK, bold: true }, "Declarations:"),
                         decls.map((decl, idx) => (React.createElement(Text, { key: idx, color: COLOR_TOOL_OUTPUT },
                             ' ',
                             "\u2022 ",
@@ -628,17 +629,11 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
                 const { queryType } = parsed;
                 if (queryType === 'related') {
                     const { target, relatedFiles } = parsed;
-                    return (React.createElement(Box, { flexDirection: "column", marginY: 1 },
-                        React.createElement(Box, { marginBottom: 1 },
-                            React.createElement(Text, { color: COLOR_INFO, bold: true }, "\uD83D\uDD17 [RELATED FILES]"),
-                            React.createElement(Text, null,
-                                " for ",
-                                target)),
+                    return (React.createElement(Box, { flexDirection: "column" },
+                        React.createElement(Box, { marginBottom: 1 }, renderStandardHeader()),
                         !relatedFiles || relatedFiles.length === 0 ? (React.createElement(Box, { paddingLeft: 2 },
                             React.createElement(Text, { color: COLOR_MUTED }, "No related files found."))) : (React.createElement(Box, { flexDirection: "column", paddingLeft: 2 }, relatedFiles.map((f, idx) => (React.createElement(Box, { key: idx, flexDirection: "column", marginBottom: 0.5 },
-                            React.createElement(Text, { color: COLOR_CONTENT },
-                                "\uD83D\uDCC4 ",
-                                f.filePath),
+                            React.createElement(Text, { color: COLOR_CONTENT }, f.filePath),
                             React.createElement(Text, { color: COLOR_MUTED, dimColor: true },
                                 ' ',
                                 "Relations: ",
@@ -646,17 +641,11 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
                 }
                 else {
                     const { symbol, results } = parsed;
-                    return (React.createElement(Box, { flexDirection: "column", marginY: 1 },
-                        React.createElement(Box, { marginBottom: 1 },
-                            React.createElement(Text, { color: COLOR_INFO, bold: true }, "\uD83D\uDD0D [SYMBOL SEARCH]"),
-                            React.createElement(Text, null,
-                                " \"",
-                                symbol,
-                                "\"")),
+                    return (React.createElement(Box, { flexDirection: "column" },
+                        React.createElement(Box, { marginBottom: 1 }, renderStandardHeader()),
                         !results || results.length === 0 ? (React.createElement(Box, { paddingLeft: 2 },
                             React.createElement(Text, { color: COLOR_MUTED }, "No symbol declarations found."))) : (React.createElement(Box, { flexDirection: "column", paddingLeft: 2 }, results.map((res, idx) => (React.createElement(Text, { key: idx },
                             React.createElement(Text, { color: COLOR_CONTENT },
-                                "\uD83D\uDCC4 ",
                                 res.filePath,
                                 ":",
                                 res.lineNum),
@@ -678,27 +667,14 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
     // Special handling for approval-rejected shell commands: show the denial message
     // with a clear [DENIED] label so the user knows what was attempted and why.
     if (isApprovalRejection) {
-        // Extract just the command part for display (e.g. "rm -rf /dangerous").
-        const displayCommand = formattedArgs || command;
         return (React.createElement(Box, { flexDirection: "column" },
-            React.createElement(Text, { color: COLOR_ERROR, bold: true },
-                "$ ",
-                React.createElement(Text, { bold: true }, displayCommand)),
+            renderStandardHeader(),
             React.createElement(Text, { color: COLOR_ERROR },
                 "\u2192 DENIED: ",
                 denialReason)));
     }
     return (React.createElement(Box, { flexDirection: "column" },
-        React.createElement(Text, { color: success === false ? COLOR_ERROR : isRunning ? COLOR_WARNING : COLOR_INFO },
-            "$ ",
-            React.createElement(Text, { bold: true }, command),
-            isRunning && formattedArgs && command === toolName && React.createElement(Text, { color: COLOR_WARNING },
-                " ",
-                formattedArgs),
-            runtime && React.createElement(Text, { color: COLOR_MUTED },
-                " (",
-                runtime,
-                ")")),
+        renderStandardHeader(),
         failureReason && React.createElement(Text, { color: COLOR_ERROR },
             "Error: ",
             failureReason),