@zgsm/costrict-cli 0.21.0-nightly.20251213.977248e09

package/dist/src/ui/components/messages/ToolGroupMessage.test.js

@@ -0,0 +1,300 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { renderWithProviders } from '../../../test-utils/render.js';
+import { describe, it, expect, vi } from 'vitest';
+import { ToolGroupMessage } from './ToolGroupMessage.js';
+import { ToolCallStatus } from '../../types.js';
+import { Scrollable } from '../shared/Scrollable.js';
+describe('<ToolGroupMessage />', () => {
+    const createToolCall = (overrides = {}) => ({
+        callId: 'tool-123',
+        name: 'test-tool',
+        description: 'A tool for testing',
+        resultDisplay: 'Test result',
+        status: ToolCallStatus.Success,
+        confirmationDetails: undefined,
+        renderOutputAsMarkdown: false,
+        ...overrides,
+    });
+    const baseProps = {
+        groupId: 1,
+        terminalWidth: 80,
+        isFocused: true,
+    };
+    describe('Golden Snapshots', () => {
+        it('renders single successful tool call', () => {
+            const toolCalls = [createToolCall()];
+            const { lastFrame, unmount } = renderWithProviders(_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls }));
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+        it('renders multiple tool calls with different statuses', () => {
+            const toolCalls = [
+                createToolCall({
+                    callId: 'tool-1',
+                    name: 'successful-tool',
+                    description: 'This tool succeeded',
+                    status: ToolCallStatus.Success,
+                }),
+                createToolCall({
+                    callId: 'tool-2',
+                    name: 'pending-tool',
+                    description: 'This tool is pending',
+                    status: ToolCallStatus.Pending,
+                }),
+                createToolCall({
+                    callId: 'tool-3',
+                    name: 'error-tool',
+                    description: 'This tool failed',
+                    status: ToolCallStatus.Error,
+                }),
+            ];
+            const { lastFrame, unmount } = renderWithProviders(_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls }));
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+        it('renders tool call awaiting confirmation', () => {
+            const toolCalls = [
+                createToolCall({
+                    callId: 'tool-confirm',
+                    name: 'confirmation-tool',
+                    description: 'This tool needs confirmation',
+                    status: ToolCallStatus.Confirming,
+                    confirmationDetails: {
+                        type: 'info',
+                        title: 'Confirm Tool Execution',
+                        prompt: 'Are you sure you want to proceed?',
+                        onConfirm: vi.fn(),
+                    },
+                }),
+            ];
+            const { lastFrame, unmount } = renderWithProviders(_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls }));
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+        it('renders shell command with yellow border', () => {
+            const toolCalls = [
+                createToolCall({
+                    callId: 'shell-1',
+                    name: 'run_shell_command',
+                    description: 'Execute shell command',
+                    status: ToolCallStatus.Success,
+                }),
+            ];
+            const { lastFrame, unmount } = renderWithProviders(_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls }));
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+        it('renders mixed tool calls including shell command', () => {
+            const toolCalls = [
+                createToolCall({
+                    callId: 'tool-1',
+                    name: 'read_file',
+                    description: 'Read a file',
+                    status: ToolCallStatus.Success,
+                }),
+                createToolCall({
+                    callId: 'tool-2',
+                    name: 'run_shell_command',
+                    description: 'Run command',
+                    status: ToolCallStatus.Executing,
+                }),
+                createToolCall({
+                    callId: 'tool-3',
+                    name: 'write_file',
+                    description: 'Write to file',
+                    status: ToolCallStatus.Pending,
+                }),
+            ];
+            const { lastFrame, unmount } = renderWithProviders(_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls }));
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+        it('renders with limited terminal height', () => {
+            const toolCalls = [
+                createToolCall({
+                    callId: 'tool-1',
+                    name: 'tool-with-result',
+                    description: 'Tool with output',
+                    resultDisplay: 'This is a long result that might need height constraints',
+                }),
+                createToolCall({
+                    callId: 'tool-2',
+                    name: 'another-tool',
+                    description: 'Another tool',
+                    resultDisplay: 'More output here',
+                }),
+            ];
+            const { lastFrame, unmount } = renderWithProviders(_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls, availableTerminalHeight: 10 }));
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+        it('renders when not focused', () => {
+            const toolCalls = [createToolCall()];
+            const { lastFrame, unmount } = renderWithProviders(_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls, isFocused: false }));
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+        it('renders with narrow terminal width', () => {
+            const toolCalls = [
+                createToolCall({
+                    name: 'very-long-tool-name-that-might-wrap',
+                    description: 'This is a very long description that might cause wrapping issues',
+                }),
+            ];
+            const { lastFrame, unmount } = renderWithProviders(_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls, terminalWidth: 40 }));
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+        it('renders empty tool calls array', () => {
+            const { lastFrame, unmount } = renderWithProviders(_jsx(ToolGroupMessage, { ...baseProps, toolCalls: [] }));
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+        it('renders header when scrolled', () => {
+            const toolCalls = [
+                createToolCall({
+                    callId: '1',
+                    name: 'tool-1',
+                    description: 'Description 1. This is a long description that will need to be truncated if the terminal width is small.',
+                    resultDisplay: 'line1\nline2\nline3\nline4\nline5',
+                }),
+                createToolCall({
+                    callId: '2',
+                    name: 'tool-2',
+                    description: 'Description 2',
+                    resultDisplay: 'line1\nline2',
+                }),
+            ];
+            const { lastFrame, unmount } = renderWithProviders(_jsx(Scrollable, { height: 10, hasFocus: true, scrollToBottom: true, children: _jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls }) }));
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+        it('renders tool call with outputFile', () => {
+            const toolCalls = [
+                createToolCall({
+                    callId: 'tool-output-file',
+                    name: 'tool-with-file',
+                    description: 'Tool that saved output to file',
+                    status: ToolCallStatus.Success,
+                    outputFile: '/path/to/output.txt',
+                }),
+            ];
+            const { lastFrame, unmount } = renderWithProviders(_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls }));
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+        it('renders two tool groups where only the last line of the previous group is visible', () => {
+            const toolCalls1 = [
+                createToolCall({
+                    callId: '1',
+                    name: 'tool-1',
+                    description: 'Description 1',
+                    resultDisplay: 'line1\nline2\nline3\nline4\nline5',
+                }),
+            ];
+            const toolCalls2 = [
+                createToolCall({
+                    callId: '2',
+                    name: 'tool-2',
+                    description: 'Description 2',
+                    resultDisplay: 'line1',
+                }),
+            ];
+            const { lastFrame, unmount } = renderWithProviders(_jsxs(Scrollable, { height: 6, hasFocus: true, scrollToBottom: true, children: [_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls1 }), _jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls2 })] }));
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+    });
+    describe('Border Color Logic', () => {
+        it('uses yellow border when tools are pending', () => {
+            const toolCalls = [createToolCall({ status: ToolCallStatus.Pending })];
+            const { lastFrame, unmount } = renderWithProviders(_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls }));
+            // The snapshot will capture the visual appearance including border color
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+        it('uses yellow border for shell commands even when successful', () => {
+            const toolCalls = [
+                createToolCall({
+                    name: 'run_shell_command',
+                    status: ToolCallStatus.Success,
+                }),
+            ];
+            const { lastFrame, unmount } = renderWithProviders(_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls }));
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+        it('uses gray border when all tools are successful and no shell commands', () => {
+            const toolCalls = [
+                createToolCall({ status: ToolCallStatus.Success }),
+                createToolCall({
+                    callId: 'tool-2',
+                    name: 'another-tool',
+                    status: ToolCallStatus.Success,
+                }),
+            ];
+            const { lastFrame, unmount } = renderWithProviders(_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls }));
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+    });
+    describe('Height Calculation', () => {
+        it('calculates available height correctly with multiple tools with results', () => {
+            const toolCalls = [
+                createToolCall({
+                    callId: 'tool-1',
+                    resultDisplay: 'Result 1',
+                }),
+                createToolCall({
+                    callId: 'tool-2',
+                    resultDisplay: 'Result 2',
+                }),
+                createToolCall({
+                    callId: 'tool-3',
+                    resultDisplay: '', // No result
+                }),
+            ];
+            const { lastFrame, unmount } = renderWithProviders(_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls, availableTerminalHeight: 20 }));
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+    });
+    describe('Confirmation Handling', () => {
+        it('shows confirmation dialog for first confirming tool only', () => {
+            const toolCalls = [
+                createToolCall({
+                    callId: 'tool-1',
+                    name: 'first-confirm',
+                    status: ToolCallStatus.Confirming,
+                    confirmationDetails: {
+                        type: 'info',
+                        title: 'Confirm First Tool',
+                        prompt: 'Confirm first tool',
+                        onConfirm: vi.fn(),
+                    },
+                }),
+                createToolCall({
+                    callId: 'tool-2',
+                    name: 'second-confirm',
+                    status: ToolCallStatus.Confirming,
+                    confirmationDetails: {
+                        type: 'info',
+                        title: 'Confirm Second Tool',
+                        prompt: 'Confirm second tool',
+                        onConfirm: vi.fn(),
+                    },
+                }),
+            ];
+            const { lastFrame, unmount } = renderWithProviders(_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls }));
+            // Should only show confirmation for the first tool
+            expect(lastFrame()).toMatchSnapshot();
+            unmount();
+        });
+    });
+});
+//# sourceMappingURL=ToolGroupMessage.test.js.map

package/dist/src/ui/components/messages/ToolGroupMessage.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ToolGroupMessage.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ToolGroupMessage.test.tsx"],"names":[],"mappings":"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"}

package/dist/src/ui/components/messages/ToolMessage.d.ts

@@ -0,0 +1,24 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type React from 'react';
+import type { IndividualToolCallDisplay } from '../../types.js';
+import { type TextEmphasis } from './ToolShared.js';
+import type { Config } from '@google/gemini-cli-core';
+export type { TextEmphasis };
+export interface ToolMessageProps extends IndividualToolCallDisplay {
+    availableTerminalHeight?: number;
+    terminalWidth: number;
+    emphasis?: TextEmphasis;
+    renderOutputAsMarkdown?: boolean;
+    isFirst: boolean;
+    borderColor: string;
+    borderDimColor: boolean;
+    activeShellPtyId?: number | null;
+    embeddedShellFocused?: boolean;
+    ptyId?: number;
+    config?: Config;
+}
+export declare const ToolMessage: React.FC<ToolMessageProps>;

package/dist/src/ui/components/messages/ToolMessage.js

@@ -0,0 +1,36 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState, useEffect } from 'react';
+import { Box, Text } from 'ink';
+import { StickyHeader } from '../StickyHeader.js';
+import { ToolResultDisplay } from './ToolResultDisplay.js';
+import { ToolStatusIndicator, ToolInfo, TrailingIndicator, STATUS_INDICATOR_WIDTH, } from './ToolShared.js';
+import { SHELL_COMMAND_NAME, SHELL_FOCUS_HINT_DELAY_MS, } from '../../constants.js';
+import { theme } from '../../semantic-colors.js';
+import { useInactivityTimer } from '../../hooks/useInactivityTimer.js';
+import { ToolCallStatus } from '../../types.js';
+import { ShellInputPrompt } from '../ShellInputPrompt.js';
+export const ToolMessage = ({ name, description, resultDisplay, status, availableTerminalHeight, terminalWidth, emphasis = 'medium', renderOutputAsMarkdown = true, isFirst, borderColor, borderDimColor, activeShellPtyId, embeddedShellFocused, ptyId, config, }) => {
+    const isThisShellFocused = (name === SHELL_COMMAND_NAME || name === 'Shell') &&
+        status === ToolCallStatus.Executing &&
+        ptyId === activeShellPtyId &&
+        embeddedShellFocused;
+    const [lastUpdateTime, setLastUpdateTime] = useState(null);
+    const [userHasFocused, setUserHasFocused] = useState(false);
+    const showFocusHint = useInactivityTimer(!!lastUpdateTime, lastUpdateTime ? lastUpdateTime.getTime() : 0, SHELL_FOCUS_HINT_DELAY_MS);
+    useEffect(() => {
+        if (resultDisplay) {
+            setLastUpdateTime(new Date());
+        }
+    }, [resultDisplay]);
+    useEffect(() => {
+        if (isThisShellFocused) {
+            setUserHasFocused(true);
+        }
+    }, [isThisShellFocused]);
+    const isThisShellFocusable = (name === SHELL_COMMAND_NAME || name === 'Shell') &&
+        status === ToolCallStatus.Executing &&
+        config?.getEnableInteractiveShell();
+    const shouldShowFocusHint = isThisShellFocusable && (showFocusHint || userHasFocused);
+    return (_jsxs(Box, { flexDirection: "column", width: terminalWidth, children: [_jsxs(StickyHeader, { width: terminalWidth, isFirst: isFirst, borderColor: borderColor, borderDimColor: borderDimColor, children: [_jsx(ToolStatusIndicator, { status: status, name: name }), _jsx(ToolInfo, { name: name, status: status, description: description, emphasis: emphasis }), shouldShowFocusHint && (_jsx(Box, { marginLeft: 1, flexShrink: 0, children: _jsx(Text, { color: theme.text.accent, children: isThisShellFocused ? '(Focused)' : '(ctrl+f to focus)' }) })), emphasis === 'high' && _jsx(TrailingIndicator, {})] }), _jsxs(Box, { width: terminalWidth, borderStyle: "round", borderColor: borderColor, borderDimColor: borderDimColor, borderTop: false, borderBottom: false, borderLeft: true, borderRight: true, paddingX: 1, flexDirection: "column", children: [_jsx(ToolResultDisplay, { resultDisplay: resultDisplay, availableTerminalHeight: availableTerminalHeight, terminalWidth: terminalWidth, renderOutputAsMarkdown: renderOutputAsMarkdown }), isThisShellFocused && config && (_jsx(Box, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: _jsx(ShellInputPrompt, { activeShellPtyId: activeShellPtyId ?? null, focus: embeddedShellFocused }) }))] })] }));
+};
+//# sourceMappingURL=ToolMessage.js.map

package/dist/src/ui/components/messages/ToolMessage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ToolMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ToolMessage.tsx"],"names":[],"mappings":"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"}

package/dist/src/ui/components/messages/ToolMessage.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/ui/components/messages/ToolMessage.test.js

@@ -0,0 +1,153 @@
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import React from 'react';
+import { ToolMessage } from './ToolMessage.js';
+import { StreamingState, ToolCallStatus } from '../../types.js';
+import { Text } from 'ink';
+import { StreamingContext } from '../../contexts/StreamingContext.js';
+import { renderWithProviders } from '../../../test-utils/render.js';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+vi.mock('../TerminalOutput.js', () => ({
+    TerminalOutput: function MockTerminalOutput({ cursor, }) {
+        return (_jsxs(Text, { children: ["MockCursor:(", cursor?.x, ",", cursor?.y, ")"] }));
+    },
+}));
+vi.mock('../AnsiOutput.js', () => ({
+    AnsiOutputText: function MockAnsiOutputText({ data }) {
+        // Simple serialization for snapshot stability
+        const serialized = data
+            .map((line) => line.map((token) => token.text || '').join(''))
+            .join('\n');
+        return _jsxs(Text, { children: ["MockAnsiOutput:", serialized] });
+    },
+}));
+// Mock child components or utilities if they are complex or have side effects
+vi.mock('../GeminiRespondingSpinner.js', () => ({
+    GeminiRespondingSpinner: ({ nonRespondingDisplay, }) => {
+        const streamingState = React.useContext(StreamingContext);
+        if (streamingState === StreamingState.Responding) {
+            return _jsx(Text, { children: "MockRespondingSpinner" });
+        }
+        return nonRespondingDisplay ? _jsx(Text, { children: nonRespondingDisplay }) : null;
+    },
+}));
+vi.mock('./DiffRenderer.js', () => ({
+    DiffRenderer: function MockDiffRenderer({ diffContent, }) {
+        return _jsxs(Text, { children: ["MockDiff:", diffContent] });
+    },
+}));
+vi.mock('../../utils/MarkdownDisplay.js', () => ({
+    MarkdownDisplay: function MockMarkdownDisplay({ text }) {
+        return _jsxs(Text, { children: ["MockMarkdown:", text] });
+    },
+}));
+describe('<ToolMessage />', () => {
+    const baseProps = {
+        callId: 'tool-123',
+        name: 'test-tool',
+        description: 'A tool for testing',
+        resultDisplay: 'Test result',
+        status: ToolCallStatus.Success,
+        terminalWidth: 80,
+        confirmationDetails: undefined,
+        emphasis: 'medium',
+        isFirst: true,
+        borderColor: 'green',
+        borderDimColor: false,
+    };
+    const mockSetEmbeddedShellFocused = vi.fn();
+    const uiActions = {
+        setEmbeddedShellFocused: mockSetEmbeddedShellFocused,
+    };
+    // Helper to render with context
+    const renderWithContext = (ui, streamingState) => renderWithProviders(ui, {
+        uiActions,
+        uiState: { streamingState },
+    });
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    it('renders basic tool information', () => {
+        const { lastFrame } = renderWithContext(_jsx(ToolMessage, { ...baseProps }), StreamingState.Idle);
+        const output = lastFrame();
+        expect(output).toMatchSnapshot();
+    });
+    describe('ToolStatusIndicator rendering', () => {
+        it('shows ✓ for Success status', () => {
+            const { lastFrame } = renderWithContext(_jsx(ToolMessage, { ...baseProps, status: ToolCallStatus.Success }), StreamingState.Idle);
+            expect(lastFrame()).toMatchSnapshot();
+        });
+        it('shows o for Pending status', () => {
+            const { lastFrame } = renderWithContext(_jsx(ToolMessage, { ...baseProps, status: ToolCallStatus.Pending }), StreamingState.Idle);
+            expect(lastFrame()).toMatchSnapshot();
+        });
+        it('shows ? for Confirming status', () => {
+            const { lastFrame } = renderWithContext(_jsx(ToolMessage, { ...baseProps, status: ToolCallStatus.Confirming }), StreamingState.Idle);
+            expect(lastFrame()).toMatchSnapshot();
+        });
+        it('shows - for Canceled status', () => {
+            const { lastFrame } = renderWithContext(_jsx(ToolMessage, { ...baseProps, status: ToolCallStatus.Canceled }), StreamingState.Idle);
+            expect(lastFrame()).toMatchSnapshot();
+        });
+        it('shows x for Error status', () => {
+            const { lastFrame } = renderWithContext(_jsx(ToolMessage, { ...baseProps, status: ToolCallStatus.Error }), StreamingState.Idle);
+            expect(lastFrame()).toMatchSnapshot();
+        });
+        it('shows paused spinner for Executing status when streamingState is Idle', () => {
+            const { lastFrame } = renderWithContext(_jsx(ToolMessage, { ...baseProps, status: ToolCallStatus.Executing }), StreamingState.Idle);
+            expect(lastFrame()).toMatchSnapshot();
+        });
+        it('shows paused spinner for Executing status when streamingState is WaitingForConfirmation', () => {
+            const { lastFrame } = renderWithContext(_jsx(ToolMessage, { ...baseProps, status: ToolCallStatus.Executing }), StreamingState.WaitingForConfirmation);
+            expect(lastFrame()).toMatchSnapshot();
+        });
+        it('shows MockRespondingSpinner for Executing status when streamingState is Responding', () => {
+            const { lastFrame } = renderWithContext(_jsx(ToolMessage, { ...baseProps, status: ToolCallStatus.Executing }), StreamingState.Responding);
+            expect(lastFrame()).toMatchSnapshot();
+        });
+    });
+    it('renders DiffRenderer for diff results', () => {
+        const diffResult = {
+            fileDiff: '--- a/file.txt\n+++ b/file.txt\n@@ -1 +1 @@\n-old\n+new',
+            fileName: 'file.txt',
+            originalContent: 'old',
+            newContent: 'new',
+        };
+        const { lastFrame } = renderWithContext(_jsx(ToolMessage, { ...baseProps, resultDisplay: diffResult }), StreamingState.Idle);
+        // Check that the output contains the MockDiff content as part of the whole message
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('renders emphasis correctly', () => {
+        const { lastFrame: highEmphasisFrame } = renderWithContext(_jsx(ToolMessage, { ...baseProps, emphasis: "high" }), StreamingState.Idle);
+        // Check for trailing indicator or specific color if applicable (Colors are not easily testable here)
+        expect(highEmphasisFrame()).toMatchSnapshot();
+        const { lastFrame: lowEmphasisFrame } = renderWithContext(_jsx(ToolMessage, { ...baseProps, emphasis: "low" }), StreamingState.Idle);
+        // For low emphasis, the name and description might be dimmed (check for dimColor if possible)
+        // This is harder to assert directly in text output without color checks.
+        // We can at least ensure it doesn't have the high emphasis indicator.
+        expect(lowEmphasisFrame()).toMatchSnapshot();
+    });
+    it('renders AnsiOutputText for AnsiOutput results', () => {
+        const ansiResult = [
+            [
+                {
+                    text: 'hello',
+                    fg: '#ffffff',
+                    bg: '#000000',
+                    bold: false,
+                    italic: false,
+                    underline: false,
+                    dim: false,
+                    inverse: false,
+                },
+            ],
+        ];
+        const { lastFrame } = renderWithContext(_jsx(ToolMessage, { ...baseProps, resultDisplay: ansiResult }), StreamingState.Idle);
+        expect(lastFrame()).toMatchSnapshot();
+    });
+});
+//# sourceMappingURL=ToolMessage.test.js.map

package/dist/src/ui/components/messages/ToolMessage.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ToolMessage.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ToolMessage.test.tsx"],"names":[],"mappings":"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"}

package/dist/src/ui/components/messages/ToolMessageRawMarkdown.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/ui/components/messages/ToolMessageRawMarkdown.test.js

@@ -0,0 +1,62 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { ToolMessage } from './ToolMessage.js';
+import { StreamingState, ToolCallStatus } from '../../types.js';
+import { StreamingContext } from '../../contexts/StreamingContext.js';
+import { renderWithProviders } from '../../../test-utils/render.js';
+describe('<ToolMessage /> - Raw Markdown Display Snapshots', () => {
+    const baseProps = {
+        callId: 'tool-123',
+        name: 'test-tool',
+        description: 'A tool for testing',
+        resultDisplay: 'Test **bold** and `code` markdown',
+        status: ToolCallStatus.Success,
+        terminalWidth: 80,
+        confirmationDetails: undefined,
+        emphasis: 'medium',
+        isFirst: true,
+        borderColor: 'green',
+        borderDimColor: false,
+    };
+    it.each([
+        {
+            renderMarkdown: true,
+            useAlternateBuffer: false,
+            description: '(default, regular buffer)',
+        },
+        {
+            renderMarkdown: true,
+            useAlternateBuffer: true,
+            description: '(default, alternate buffer)',
+        },
+        {
+            renderMarkdown: false,
+            useAlternateBuffer: false,
+            description: '(raw markdown, regular buffer)',
+        },
+        {
+            renderMarkdown: false,
+            useAlternateBuffer: true,
+            description: '(raw markdown, alternate buffer)',
+        },
+        // Test cases where height constraint affects rendering in regular buffer but not alternate
+        {
+            renderMarkdown: true,
+            useAlternateBuffer: false,
+            availableTerminalHeight: 10,
+            description: '(constrained height, regular buffer -> forces raw)',
+        },
+        {
+            renderMarkdown: true,
+            useAlternateBuffer: true,
+            availableTerminalHeight: 10,
+            description: '(constrained height, alternate buffer -> keeps markdown)',
+        },
+    ])('renders with renderMarkdown=$renderMarkdown, useAlternateBuffer=$useAlternateBuffer $description', ({ renderMarkdown, useAlternateBuffer, availableTerminalHeight }) => {
+        const { lastFrame } = renderWithProviders(_jsx(StreamingContext.Provider, { value: StreamingState.Idle, children: _jsx(ToolMessage, { ...baseProps, availableTerminalHeight: availableTerminalHeight }) }), {
+            uiState: { renderMarkdown, streamingState: StreamingState.Idle },
+            useAlternateBuffer,
+        });
+        expect(lastFrame()).toMatchSnapshot();
+    });
+});
+//# sourceMappingURL=ToolMessageRawMarkdown.test.js.map

package/dist/src/ui/components/messages/ToolMessageRawMarkdown.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ToolMessageRawMarkdown.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ToolMessageRawMarkdown.test.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,QAAQ,CAAC,kDAAkD,EAAE,GAAG,EAAE;IAChE,MAAM,SAAS,GAAqB;QAClC,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,oBAAoB;QACjC,aAAa,EAAE,mCAAmC;QAClD,MAAM,EAAE,cAAc,CAAC,OAAO;QAC9B,aAAa,EAAE,EAAE;QACjB,mBAAmB,EAAE,SAAS;QAC9B,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,OAAO;QACpB,cAAc,EAAE,KAAK;KACtB,CAAC;IAEF,EAAE,CAAC,IAAI,CAAC;QACN;YACE,cAAc,EAAE,IAAI;YACpB,kBAAkB,EAAE,KAAK;YACzB,WAAW,EAAE,2BAA2B;SACzC;QACD;YACE,cAAc,EAAE,IAAI;YACpB,kBAAkB,EAAE,IAAI;YACxB,WAAW,EAAE,6BAA6B;SAC3C;QACD;YACE,cAAc,EAAE,KAAK;YACrB,kBAAkB,EAAE,KAAK;YACzB,WAAW,EAAE,gCAAgC;SAC9C;QACD;YACE,cAAc,EAAE,KAAK;YACrB,kBAAkB,EAAE,IAAI;YACxB,WAAW,EAAE,kCAAkC;SAChD;QACD,2FAA2F;QAC3F;YACE,cAAc,EAAE,IAAI;YACpB,kBAAkB,EAAE,KAAK;YACzB,uBAAuB,EAAE,EAAE;YAC3B,WAAW,EAAE,oDAAoD;SAClE;QACD;YACE,cAAc,EAAE,IAAI;YACpB,kBAAkB,EAAE,IAAI;YACxB,uBAAuB,EAAE,EAAE;YAC3B,WAAW,EAAE,0DAA0D;SACxE;KACF,CAAC,CACA,kGAAkG,EAClG,CAAC,EAAE,cAAc,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,EAAE,EAAE;QAClE,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,CAAC,QAAQ,IAAC,KAAK,EAAE,cAAc,CAAC,IAAI,YACnD,KAAC,WAAW,OACN,SAAS,EACb,uBAAuB,EAAE,uBAAuB,GAChD,GACwB,EAC5B;YACE,OAAO,EAAE,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,IAAI,EAAE;YAChE,kBAAkB;SACnB,CACF,CAAC;QACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;IACxC,CAAC,CACF,CAAC;AACJ,CAAC,CAAC,CAAC"}