@qduc/term2 0.14.0 → 0.16.0

package/dist/components/message/CommandMessage.js

@@ -2,8 +2,8 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { Box, Text } from 'ink';
 import { generateDiff } from '../../utils/output/diff.js';
 import { TOOL_NAME_APPLY_PATCH, TOOL_NAME_CREATE_FILE, TOOL_NAME_SEARCH_REPLACE } from '../../tools/tool-names.js';
-import { countDiffStats, formatToolArgs, getFirstParagraph, getMatchCount, isSearchLikeTool, parseCodeOutlineOutput, parseFindFilesOutput, parseSubagentOutput, stripRgErrorLines, } from './command-message-helpers.js';
-import { COLOR_TOOL_OUTPUT, COLOR_MUTED as THEME_COLOR_MUTED } from '../theme.js';
+import { countDiffStats, extractErrorMessage, formatToolArgs, getFirstParagraph, getMatchCount, isSearchLikeTool, parseCodeOutlineOutput, parseFindFilesOutput, parseSubagentOutput, stripRgErrorLines, } from './command-message-helpers.js';
+import { COLOR_ACCENT, COLOR_ACCENT_ALT, COLOR_DANGER, COLOR_TEXT, COLOR_TEXT_MUTED, COLOR_TEXT_SUBTLE, COLOR_TOOL_OUTPUT, COLOR_WARNING, TOOL_STATUS_COLOR, TOOL_STATUS_GLYPH, } from '../theme.js';
 import DiffView from '../layout/DiffView.js';
 import { useCommandVisibility } from './useCommandVisibility.js';
 import ReadFileRenderer from './ReadFileRenderer.js';
@@ -12,16 +12,6 @@ import WebSearchRenderer from './WebSearchRenderer.js';
 import WebFetchRenderer from './WebFetchRenderer.js';
 import CodeContextSearchRenderer from './CodeContextSearchRenderer.js';
 import MemoryRenderer from './MemoryRenderer.js';
-// --- Command Message Theme Colors ---
-// Customize these values to change the color scheme per theme.
-const COLOR_ERROR = 'red';
-const COLOR_SUCCESS = '#A0A0A0';
-const COLOR_WARNING = 'yellow';
-const COLOR_INFO = 'cyan';
-const COLOR_MUTED = 'gray';
-const COLOR_CONTENT = 'white';
-const COLOR_LINK = 'blue';
-const COLOR_SPECIAL = 'magenta';
 const useRunningElapsedSeconds = (isRunning) => {
     const [elapsedSeconds, setElapsedSeconds] = useState(0);
     useEffect(() => {
@@ -56,13 +46,16 @@ const getConciseAskUserResponse = (output) => {
     }
     return output;
 };
-const CommandMessage = ({ command, output: rawOutput, status, success, failureReason, toolName, toolArgs, isApprovalRejection, autoApprovedByLlm, hadApproval, displayMode = 'standard', textColor, isSubagent = false, }) => {
+const CommandMessage = ({ command, output: rawOutput, status, success, failureReason, toolName, toolArgs, isApprovalRejection, autoApprovedByLlm, hadApproval, displayMode = 'standard', textColor, isSubagent = false, awaitingDecision = false, }) => {
     const { isVisible, isRunning } = useCommandVisibility(status);
-    const runningElapsedSeconds = useRunningElapsedSeconds(isRunning);
-    const runningElapsedLabel = isRunning ? React.createElement(Text, { color: COLOR_WARNING },
+    const isWaiting = awaitingDecision;
+    const isQueued = status === 'pending' && !awaitingDecision;
+    const isExecuting = isRunning && !awaitingDecision;
+    const runningElapsedSeconds = useRunningElapsedSeconds(isExecuting);
+    const runningElapsedLabel = isWaiting ? (React.createElement(Text, { color: COLOR_TEXT_SUBTLE }, " (waiting)")) : isQueued ? (React.createElement(Text, { color: COLOR_TEXT_SUBTLE }, " (queued)")) : isExecuting ? (React.createElement(Text, { color: COLOR_WARNING },
         " (",
         runningElapsedSeconds,
-        "s)") : null;
+        "s)")) : null;
     const { output, runtime } = useMemo(() => {
         const isShell = !toolName || toolName === 'shell';
         if (isShell && rawOutput) {
@@ -93,22 +86,10 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
             .map((line) => `+${line}`)
             .join('\n')
         : '', [toolName, toolArgs]);
-    // Parse the denial reason from the JSON wrapper that the tool rejection interceptor
-    // produces (e.g. {"output":[{"success":false,"error":"..."}]}).
+    // Parse the denial reason from the JSON wrapper or output when isApprovalRejection is true.
+    // Falls back to the standard approval-denial message when no output was provided.
     const denialReason = useMemo(() => {
-        if (!output)
-            return 'Tool execution was not approved.';
-        try {
-            const parsed = JSON.parse(output);
-            if (parsed?.output?.[0]?.error)
-                return parsed.output[0].error;
-            if (parsed?.error)
-                return parsed.error;
-        }
-        catch {
-            /* not JSON, use as-is */
-        }
-        return output;
+        return extractErrorMessage(output) || 'Tool execution was not approved.';
     }, [output]);
     const formattedArgs = useMemo(() => {
         return toolArgs ? formatToolArgs(toolName, toolArgs, 'concise') : '';
@@ -118,17 +99,17 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
         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 && React.createElement(Text, { color: COLOR_TEXT_SUBTLE },
                     " (",
                     runtime,
                     ")")));
         }
         const argsText = toolName === 'background_subagent_notification' ||
             toolName === 'background_shell_notification' ||
+            toolName === 'background_shell_output_notification' ||
             toolName === 'background_task_control_notification' ||
+            toolName === 'background_check_in_notification' ||
             !formattedArgs
             ? ''
             : ` ${formattedArgs}`;
@@ -228,6 +209,40 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
                 }
                 return renderAction(`Background shell ${jobs.length || 'job'} notification`);
             }
+            case 'background_shell_output_notification': {
+                const firings = Array.isArray(toolArgs?.firings)
+                    ? toolArgs.firings
+                    : toolArgs && (toolArgs.jobId || toolArgs.watchId || toolArgs.command || toolArgs.matchedLines)
+                        ? [toolArgs]
+                        : [];
+                if (firings.length === 1) {
+                    const [{ command, matchedLines, coalescedCount }] = firings;
+                    const label = command || 'job';
+                    const lineCount = typeof coalescedCount === 'number'
+                        ? coalescedCount
+                        : typeof matchedLines === 'string'
+                            ? matchedLines
+                                ? matchedLines.split('\n').length
+                                : 0
+                            : Array.isArray(matchedLines)
+                                ? matchedLines.length
+                                : undefined;
+                    const suffix = lineCount !== undefined && lineCount > 0 ? ` (${lineCount} line${lineCount === 1 ? '' : 's'})` : '';
+                    return renderAction(`Background shell output: ${label}${suffix}`);
+                }
+                if (firings.length > 1) {
+                    return renderAction(`Background shell output (${firings.length} jobs)`);
+                }
+                return renderAction('Background shell output');
+            }
+            case 'get_shell_job':
+                return renderAction('Checked shell job');
+            case 'cancel_shell_job':
+                return renderAction('Cancelled shell job');
+            case 'monitor_shell_job':
+                return renderAction('Monitored shell output');
+            case 'cancel_shell_monitor':
+                return renderAction('Cancelled shell monitor');
             case 'background_task_control_notification': {
                 const actions = Array.isArray(toolArgs?.actions) ? toolArgs.actions : [];
                 if (actions.length === 1) {
@@ -241,44 +256,65 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
                     if (action === 'background' && target?.kind === 'shell') {
                         return renderAction(`Moved shell ${target.id ?? 'job'} to background`);
                     }
+                    if (action === 'background' && target?.kind === 'subagent') {
+                        return renderAction(`Moved subagent ${target.id ?? 'run'} to background`);
+                    }
                 }
                 return renderAction('Background task control updated');
             }
+            case 'background_check_in_notification': {
+                const checkIns = Array.isArray(toolArgs?.checkIns) ? toolArgs.checkIns : [];
+                if (checkIns.length === 1) {
+                    const [{ target, checkInIndex }] = checkIns;
+                    const label = target?.kind === 'subagent'
+                        ? `background subagent ${target.id ?? 'run'}`
+                        : `background shell ${target?.id ?? 'job'}`;
+                    const prefix = typeof checkInIndex === 'number' ? `Check-in #${checkInIndex}` : 'Check-in';
+                    return renderAction(`${prefix} on ${label}`);
+                }
+                return renderAction(`Background check-in (${checkIns.length || 'task'})`);
+            }
             case 'memory_list':
                 return renderAction('Listed memories');
             case 'memory_get':
                 return renderAction('Retrieved memory');
             case 'memory_search':
                 return renderAction('Searched memories');
+            case 'memory_retrieve':
+                return renderAction('Retrieved relevant memories');
             case 'memory_create':
                 return renderAction('Saved memory');
             case 'memory_update':
                 return renderAction('Updated memory');
             case 'memory_delete':
                 return renderAction('Deleted memory');
+            case 'session_list':
+                return renderAction('Listed prior sessions');
+            case 'session_search':
+                return renderAction('Searched prior sessions');
+            case 'session_read':
+                return renderAction('Read prior session');
             default:
-                return (React.createElement(React.Fragment, null,
-                    React.createElement(Text, { dimColor: true },
-                        "[",
-                        toolName,
-                        "]"),
-                    React.createElement(Text, null, argsText)));
+                return renderAction(toolName || 'Ran tool');
         }
         // Depend on the whole `toolArgs`, not `toolArgs?.runs`: the React Compiler infers the
         // former and refuses to preserve the memo when the declared deps are narrower.
     }, [toolName, command, runtime, formattedArgs, toolArgs, isBackgroundSubagentLaunch]);
     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,
-                    runningElapsedLabel)));
-        }
+        // isApprovalRejection carries no `success` value of its own — it is a distinct
+        // outcome from a normal failed run — so it is checked first and maps to the
+        // same 'failed' glyph/color as success === false.
+        const statusKind = isApprovalRejection || success === false
+            ? 'failed'
+            : isWaiting || isQueued
+                ? 'pending'
+                : isRunning
+                    ? 'running'
+                    : 'completed';
+        const headerColor = TOOL_STATUS_COLOR[statusKind];
         return (React.createElement(Box, null,
             React.createElement(Text, { color: headerColor },
-                React.createElement(Text, { color: COLOR_MUTED }, "$"),
+                TOOL_STATUS_GLYPH[statusKind],
                 " ",
                 displayAction,
                 runningElapsedLabel)));
@@ -300,11 +336,11 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
     const changeStatsElement = changeStats ? (React.createElement(React.Fragment, null,
         ' ',
         "(",
-        React.createElement(Text, { color: "green" },
+        React.createElement(Text, { color: COLOR_TEXT_MUTED },
             "+",
             changeStats.added),
-        " ",
-        React.createElement(Text, { color: COLOR_ERROR },
+        ' ',
+        React.createElement(Text, { color: COLOR_DANGER },
             "-",
             changeStats.removed),
         ")")) : null;
@@ -313,18 +349,18 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
             return 0;
         if (!isSearchLikeTool(toolName, command))
             return 0;
-        if (isRunning || isApprovalRejection)
+        if (isRunning || isQueued || isApprovalRejection)
             return 0;
         return getMatchCount(toolName, command, output);
-    }, [displayMode, toolName, command, isRunning, isApprovalRejection, output]);
+    }, [displayMode, toolName, command, isRunning, isQueued, isApprovalRejection, output]);
     const matchCountElement = matchCount > 0 ? (React.createElement(Box, { paddingLeft: 2 },
-        React.createElement(Text, { color: COLOR_MUTED },
+        React.createElement(Text, { color: COLOR_TEXT_SUBTLE },
             "(",
             matchCount,
             " match",
             matchCount !== 1 ? 'es' : '',
             ")"))) : null;
-    const autoApprovalLabel = autoApprovedByLlm ? React.createElement(Text, { color: COLOR_MUTED }, "(Auto approved by LLM)") : null;
+    const autoApprovalLabel = autoApprovedByLlm ? React.createElement(Text, { color: COLOR_TEXT_SUBTLE }, "(Auto approved by LLM)") : null;
     if (!isVisible && !isSubagent) {
         return null;
     }
@@ -335,37 +371,45 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
                 isApprovalRejection ||
                 success === false ||
                 Boolean(failureReason);
-            const statusChar = isFailed ? '✖' : isRunning ? '▶' : '✔';
+            const subagentStatusKind = isFailed
+                ? 'failed'
+                : isWaiting || isQueued
+                    ? 'pending'
+                    : isRunning
+                        ? 'running'
+                        : 'completed';
             const actionText = isFailed ? command : displayAction;
             return (React.createElement(Box, null,
-                React.createElement(Text, { wrap: "truncate", color: THEME_COLOR_MUTED },
-                    statusChar,
-                    " ",
+                React.createElement(Text, { wrap: "truncate", color: COLOR_TEXT_SUBTLE },
+                    React.createElement(Text, { color: TOOL_STATUS_COLOR[subagentStatusKind] }, TOOL_STATUS_GLYPH[subagentStatusKind]),
+                    ' ',
                     actionText,
-                    isRunning && runningElapsedLabel)));
+                    runningElapsedLabel)));
         }
         if (isApprovalRejection) {
             return (React.createElement(Box, { flexDirection: "column" },
-                React.createElement(Text, { color: textColor || COLOR_SUCCESS },
-                    React.createElement(Text, { color: COLOR_ERROR, bold: true }, "\u2716"),
+                React.createElement(Text, { color: textColor || COLOR_TEXT_MUTED },
+                    React.createElement(Text, { color: TOOL_STATUS_COLOR.rejected, bold: true }, TOOL_STATUS_GLYPH.rejected),
                     ' ',
                     displayAction,
                     changeStatsElement),
-                React.createElement(Text, { color: textColor || COLOR_SUCCESS },
+                React.createElement(Text, { color: textColor || COLOR_TEXT_MUTED },
                     " \u2192 DENIED: ",
                     denialReason)));
         }
-        if (isRunning) {
+        if (isRunning || isQueued || isWaiting) {
+            const inFlightStatusKind = isWaiting || isQueued ? 'pending' : 'running';
             return (React.createElement(Box, null,
-                React.createElement(Text, { color: COLOR_WARNING },
-                    React.createElement(Text, { bold: true }, "\u25B6"),
+                React.createElement(Text, { color: TOOL_STATUS_COLOR[inFlightStatusKind] },
+                    React.createElement(Text, { bold: true }, TOOL_STATUS_GLYPH[inFlightStatusKind]),
                     " ",
                     displayAction,
                     runningElapsedLabel,
                     changeStatsElement)));
         }
         if (success === false || failureReason) {
-            const errorMsg = failureReason || denialReason || 'failed';
+            const parsedOutputError = extractErrorMessage(output);
+            const errorMsg = failureReason || parsedOutputError || 'failed';
             const displayErrorMsg = isSearchLikeTool(toolName, command)
                 ? stripRgErrorLines(errorMsg).trim() || 'failed'
                 : errorMsg;
@@ -381,47 +425,47 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
                 return displayErrorMsg;
             })();
             return (React.createElement(Box, { flexDirection: "column" },
-                React.createElement(Text, { color: textColor || COLOR_SUCCESS },
-                    React.createElement(Text, { color: COLOR_ERROR, bold: true }, "\u2716"),
+                React.createElement(Text, { color: textColor || COLOR_TEXT_MUTED },
+                    React.createElement(Text, { color: TOOL_STATUS_COLOR.failed, bold: true }, TOOL_STATUS_GLYPH.failed),
                     ' ',
                     displayAction,
                     changeStatsElement),
                 matchCountElement,
-                matchCount === 0 && React.createElement(Text, { color: textColor || COLOR_SUCCESS }, truncatedError)));
+                matchCount === 0 && React.createElement(Text, { color: textColor || COLOR_TEXT_MUTED }, truncatedError)));
         }
         // Success (one line)
         if (toolName === 'ask_user') {
             const responseText = getConciseAskUserResponse(output);
             return (React.createElement(Box, { flexDirection: "column" },
-                React.createElement(Text, { color: textColor || COLOR_SUCCESS },
-                    React.createElement(Text, { color: 'green', bold: true }, "\u2714"),
+                React.createElement(Text, { color: textColor || COLOR_TEXT_MUTED },
+                    React.createElement(Text, { color: TOOL_STATUS_COLOR.completed, bold: true }, TOOL_STATUS_GLYPH.completed),
                     ' ',
                     displayAction),
-                React.createElement(Text, { color: textColor || COLOR_SUCCESS },
+                React.createElement(Text, { color: textColor || COLOR_TEXT_MUTED },
                     " Response: ",
                     responseText)));
         }
         if (toolName === 'ask_mentor') {
             const firstParagraph = getFirstParagraph(output, 200);
             return (React.createElement(Box, { flexDirection: "column" },
-                React.createElement(Text, { color: textColor || COLOR_SUCCESS },
-                    React.createElement(Text, { color: 'green', bold: true }, "\u2714"),
+                React.createElement(Text, { color: textColor || COLOR_TEXT_MUTED },
+                    React.createElement(Text, { color: TOOL_STATUS_COLOR.completed, bold: true }, TOOL_STATUS_GLYPH.completed),
                     ' ',
                     displayAction),
-                React.createElement(Text, { color: textColor || COLOR_SUCCESS },
+                React.createElement(Text, { color: textColor || COLOR_TEXT_MUTED },
                     " Response: ",
                     firstParagraph)));
         }
         return (React.createElement(Box, { flexDirection: "column" },
-            React.createElement(Text, { color: textColor || COLOR_SUCCESS },
-                React.createElement(Text, { color: 'green', bold: true }, "\u2714"),
+            React.createElement(Text, { color: textColor || COLOR_TEXT_MUTED },
+                React.createElement(Text, { color: TOOL_STATUS_COLOR.completed, bold: true }, TOOL_STATUS_GLYPH.completed),
                 ' ',
                 displayAction,
                 changeStatsElement),
             matchCountElement,
             autoApprovalLabel));
     }
-    const outputText = output?.trim() ? output : isRunning ? '(running...)' : '(no output)';
+    const outputText = output?.trim() ? output : isRunning ? '(running...)' : isQueued ? '(queued)' : '(no output)';
     const displayed = outputText && outputText !== '(no output)'
         ? (() => {
             const trimmedOutput = (output || '').trimEnd();
@@ -439,41 +483,41 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
     if (toolName === TOOL_NAME_APPLY_PATCH && toolArgs) {
         if (hadApproval) {
             return (React.createElement(Box, { flexDirection: "column" },
-                React.createElement(Text, { color: success === false ? COLOR_ERROR : COLOR_TOOL_OUTPUT }, displayed)));
+                React.createElement(Text, { color: success === false ? COLOR_DANGER : COLOR_TOOL_OUTPUT }, displayed)));
         }
         return (React.createElement(Box, { flexDirection: "column" },
             renderStandardHeader(),
             toolArgs.diff && success !== false && React.createElement(DiffView, { diff: toolArgs.diff }),
-            failureReason && React.createElement(Text, { color: COLOR_ERROR },
+            failureReason && React.createElement(Text, { color: COLOR_DANGER },
                 "Error: ",
                 failureReason),
-            React.createElement(Text, { color: success === false ? COLOR_ERROR : COLOR_TOOL_OUTPUT }, displayed)));
+            React.createElement(Text, { color: success === false ? COLOR_DANGER : COLOR_TOOL_OUTPUT }, displayed)));
     }
     // Special handling for search_replace
     if (toolName === TOOL_NAME_SEARCH_REPLACE && toolArgs) {
         // For search_replace that had an approval prompt (user said 'y'), only show output
         if (hadApproval) {
             return (React.createElement(Box, { flexDirection: "column" },
-                React.createElement(Text, { color: success === false ? COLOR_ERROR : COLOR_TOOL_OUTPUT }, displayed)));
+                React.createElement(Text, { color: success === false ? COLOR_DANGER : COLOR_TOOL_OUTPUT }, displayed)));
         }
         // For auto-approved search_replace (no approval prompt), show diff + output
         return (React.createElement(Box, { flexDirection: "column" },
             renderStandardHeader(),
             React.createElement(DiffView, { diff: diff }),
-            failureReason && React.createElement(Text, { color: COLOR_ERROR },
+            failureReason && React.createElement(Text, { color: COLOR_DANGER },
                 "Error: ",
                 failureReason),
-            React.createElement(Text, { color: success === false ? COLOR_ERROR : COLOR_TOOL_OUTPUT }, displayed)));
+            React.createElement(Text, { color: success === false ? COLOR_DANGER : COLOR_TOOL_OUTPUT }, displayed)));
     }
     // Special handling for create_file
     if (toolName === TOOL_NAME_CREATE_FILE && toolArgs) {
         return (React.createElement(Box, { flexDirection: "column" },
             renderStandardHeader(),
             success !== false && React.createElement(DiffView, { diff: createFileDiffLines }),
-            failureReason && React.createElement(Text, { color: COLOR_ERROR },
+            failureReason && React.createElement(Text, { color: COLOR_DANGER },
                 "Error: ",
                 failureReason),
-            React.createElement(Text, { color: success === false ? COLOR_ERROR : COLOR_TOOL_OUTPUT }, displayed)));
+            React.createElement(Text, { color: success === false ? COLOR_DANGER : COLOR_TOOL_OUTPUT }, displayed)));
     }
     if ((toolName === 'run_subagent_async' || isBackgroundSubagentLaunch) && success === false) {
         let launchError = output;
@@ -487,10 +531,10 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
         return (React.createElement(Box, { flexDirection: "column" },
             renderStandardHeader(),
             React.createElement(Box, { paddingLeft: 2, marginTop: 0.5 },
-                React.createElement(Text, { color: COLOR_ERROR }, launchError))));
+                React.createElement(Text, { color: COLOR_DANGER }, launchError))));
     }
     // Standard mode custom tool renderers
-    if (displayMode === 'standard' && success !== false && !failureReason && !isRunning) {
+    if (displayMode === 'standard' && success !== false && !failureReason && !isRunning && !isQueued && !isWaiting) {
         if (toolName === 'read_file' || toolName === 'view_file') {
             const result = ReadFileRenderer({ output, renderStandardHeader });
             if (result)
@@ -516,17 +560,17 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
             const parsed = parseSubagentOutput(output, toolArgs);
             if (parsed) {
                 const { role: _role, status, toolsUsed, filesChanged, mainText } = parsed;
-                const _statusColor = status === 'completed' ? COLOR_SUCCESS : status === 'failed' ? COLOR_ERROR : COLOR_WARNING;
+                const _statusColor = status === 'completed' ? COLOR_TEXT_MUTED : status === 'failed' ? COLOR_DANGER : COLOR_WARNING;
                 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 },
+                        toolsUsed && (React.createElement(Text, { color: COLOR_TEXT_SUBTLE },
                             "Tools: ",
-                            React.createElement(Text, { color: COLOR_CONTENT }, toolsUsed))),
-                        filesChanged && (React.createElement(Text, { color: COLOR_MUTED },
+                            React.createElement(Text, { color: COLOR_TEXT }, toolsUsed))),
+                        filesChanged && (React.createElement(Text, { color: COLOR_TEXT_SUBTLE },
                             "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_TEXT }, filesChanged))))),
+                    mainText && (React.createElement(Box, { flexDirection: "column", borderStyle: "single", borderColor: COLOR_ACCENT, paddingX: 1, marginTop: 1 },
                         React.createElement(Text, { color: COLOR_TOOL_OUTPUT }, mainText)))));
             }
         }
@@ -543,8 +587,8 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
             return (React.createElement(Box, { flexDirection: "column" },
                 renderStandardHeader(),
                 React.createElement(Box, { paddingLeft: 2, marginTop: 0.5 },
-                    React.createElement(Text, { color: COLOR_MUTED }, "RunId: "),
-                    React.createElement(Text, { color: COLOR_SUCCESS }, runId || output))));
+                    React.createElement(Text, { color: COLOR_TEXT_SUBTLE }, "RunId: "),
+                    React.createElement(Text, { color: COLOR_TEXT_MUTED }, runId || output))));
         }
         if (toolName === 'web_search') {
             const result = WebSearchRenderer({ output, renderStandardHeader });
@@ -559,8 +603,8 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
         if (toolName === 'ask_mentor') {
             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 }, "Mentor Response"),
+                React.createElement(Box, { flexDirection: "column", borderStyle: "round", borderColor: COLOR_ACCENT_ALT, paddingX: 1, marginTop: 1 },
+                    React.createElement(Text, { color: COLOR_ACCENT_ALT, bold: true }, "Mentor Response"),
                     React.createElement(Text, { color: COLOR_TOOL_OUTPUT }, output))));
         }
         if (toolName === 'ask_user') {
@@ -568,16 +612,16 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
             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 },
+                    React.createElement(Text, { color: COLOR_TEXT_SUBTLE }, "Options: "),
+                    options.map((opt, idx) => (React.createElement(Text, { key: idx, color: idx === 0 ? COLOR_TEXT_MUTED : COLOR_TEXT },
                         idx > 0 ? ', ' : '',
                         "[",
                         opt,
                         "]",
                         idx === 0 ? ' (Recommended)' : ''))))),
                 React.createElement(Box, { paddingLeft: 2, marginTop: 0.5 },
-                    React.createElement(Text, { color: COLOR_MUTED }, "Response: "),
-                    React.createElement(Text, { color: COLOR_SUCCESS, bold: true }, output || 'No response yet'))));
+                    React.createElement(Text, { color: COLOR_TEXT_SUBTLE }, "Response: "),
+                    React.createElement(Text, { color: COLOR_TEXT_MUTED, bold: true }, output || 'No response yet'))));
         }
         if (toolName === 'read_code_outline') {
             const parsed = parseCodeOutlineOutput(output);
@@ -592,13 +636,13 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
                             "\u2022 ",
                             imp))))),
                     exports && exports.length > 0 && (React.createElement(Box, { flexDirection: "column", marginBottom: 1, paddingLeft: 2 },
-                        React.createElement(Text, { color: COLOR_SUCCESS, bold: true }, "Exports:"),
+                        React.createElement(Text, { color: COLOR_TEXT_MUTED, 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 }, "Declarations:"),
+                        React.createElement(Text, { color: COLOR_ACCENT, bold: true }, "Declarations:"),
                         decls.map((decl, idx) => (React.createElement(Text, { key: idx, color: COLOR_TOOL_OUTPUT },
                             ' ',
                             "\u2022 ",
@@ -611,7 +655,12 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
                 return result;
         }
         if (toolName && toolName.startsWith('memory_')) {
-            const result = MemoryRenderer({ output, toolName, renderStandardHeader });
+            const result = MemoryRenderer({
+                output,
+                toolName,
+                query: typeof toolArgs?.query === 'string' ? toolArgs.query : undefined,
+                renderStandardHeader,
+            });
             if (result)
                 return result;
         }
@@ -621,16 +670,16 @@ const CommandMessage = ({ command, output: rawOutput, status, success, failureRe
     if (isApprovalRejection) {
         return (React.createElement(Box, { flexDirection: "column" },
             renderStandardHeader(),
-            React.createElement(Text, { color: COLOR_ERROR },
+            React.createElement(Text, { color: COLOR_DANGER },
                 "\u2192 DENIED: ",
                 denialReason)));
     }
     return (React.createElement(Box, { flexDirection: "column" },
         renderStandardHeader(),
-        failureReason && React.createElement(Text, { color: COLOR_ERROR },
+        failureReason && React.createElement(Text, { color: COLOR_DANGER },
             "Error: ",
             failureReason),
-        React.createElement(Text, { color: success === false ? COLOR_ERROR : COLOR_TOOL_OUTPUT }, displayed),
+        React.createElement(Text, { color: success === false ? COLOR_DANGER : COLOR_TOOL_OUTPUT }, displayed),
         autoApprovalLabel));
 };
 export default React.memo(CommandMessage);