@google/gemini-cli 0.10.0-preview.2 → 0.11.0-nightly.20251020.a96f0659

package/dist/src/ui/components/ToolStatsDisplay.test.js

@@ -0,0 +1,227 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { render } from 'ink-testing-library';
+import { describe, it, expect, vi } from 'vitest';
+import { ToolStatsDisplay } from './ToolStatsDisplay.js';
+import * as SessionContext from '../contexts/SessionContext.js';
+import { ToolCallDecision } from '@google/gemini-cli-core';
+// Mock the context to provide controlled data for testing
+vi.mock('../contexts/SessionContext.js', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        useSessionStats: vi.fn(),
+    };
+});
+const useSessionStatsMock = vi.mocked(SessionContext.useSessionStats);
+const renderWithMockedStats = (metrics) => {
+    useSessionStatsMock.mockReturnValue({
+        stats: {
+            sessionId: 'test-session-id',
+            sessionStartTime: new Date(),
+            metrics,
+            lastPromptTokenCount: 0,
+            promptCount: 5,
+        },
+        getPromptCount: () => 5,
+        startNewPrompt: vi.fn(),
+    });
+    return render(_jsx(ToolStatsDisplay, {}));
+};
+describe('<ToolStatsDisplay />', () => {
+    it('should render "no tool calls" message when there are no active tools', () => {
+        const { lastFrame } = renderWithMockedStats({
+            models: {},
+            tools: {
+                totalCalls: 0,
+                totalSuccess: 0,
+                totalFail: 0,
+                totalDurationMs: 0,
+                totalDecisions: {
+                    accept: 0,
+                    reject: 0,
+                    modify: 0,
+                    [ToolCallDecision.AUTO_ACCEPT]: 0,
+                },
+                byName: {},
+            },
+            files: {
+                totalLinesAdded: 0,
+                totalLinesRemoved: 0,
+            },
+        });
+        expect(lastFrame()).toContain('No tool calls have been made in this session.');
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('should display stats for a single tool correctly', () => {
+        const { lastFrame } = renderWithMockedStats({
+            models: {},
+            tools: {
+                totalCalls: 1,
+                totalSuccess: 1,
+                totalFail: 0,
+                totalDurationMs: 100,
+                totalDecisions: {
+                    accept: 1,
+                    reject: 0,
+                    modify: 0,
+                    [ToolCallDecision.AUTO_ACCEPT]: 0,
+                },
+                byName: {
+                    'test-tool': {
+                        count: 1,
+                        success: 1,
+                        fail: 0,
+                        durationMs: 100,
+                        decisions: {
+                            accept: 1,
+                            reject: 0,
+                            modify: 0,
+                            [ToolCallDecision.AUTO_ACCEPT]: 0,
+                        },
+                    },
+                },
+            },
+            files: {
+                totalLinesAdded: 0,
+                totalLinesRemoved: 0,
+            },
+        });
+        const output = lastFrame();
+        expect(output).toContain('test-tool');
+        expect(output).toMatchSnapshot();
+    });
+    it('should display stats for multiple tools correctly', () => {
+        const { lastFrame } = renderWithMockedStats({
+            models: {},
+            tools: {
+                totalCalls: 3,
+                totalSuccess: 2,
+                totalFail: 1,
+                totalDurationMs: 300,
+                totalDecisions: {
+                    accept: 1,
+                    reject: 1,
+                    modify: 1,
+                    [ToolCallDecision.AUTO_ACCEPT]: 0,
+                },
+                byName: {
+                    'tool-a': {
+                        count: 2,
+                        success: 1,
+                        fail: 1,
+                        durationMs: 200,
+                        decisions: {
+                            accept: 1,
+                            reject: 1,
+                            modify: 0,
+                            [ToolCallDecision.AUTO_ACCEPT]: 0,
+                        },
+                    },
+                    'tool-b': {
+                        count: 1,
+                        success: 1,
+                        fail: 0,
+                        durationMs: 100,
+                        decisions: {
+                            accept: 0,
+                            reject: 0,
+                            modify: 1,
+                            [ToolCallDecision.AUTO_ACCEPT]: 0,
+                        },
+                    },
+                },
+            },
+            files: {
+                totalLinesAdded: 0,
+                totalLinesRemoved: 0,
+            },
+        });
+        const output = lastFrame();
+        expect(output).toContain('tool-a');
+        expect(output).toContain('tool-b');
+        expect(output).toMatchSnapshot();
+    });
+    it('should handle large values without wrapping or overlapping', () => {
+        const { lastFrame } = renderWithMockedStats({
+            models: {},
+            tools: {
+                totalCalls: 999999999,
+                totalSuccess: 888888888,
+                totalFail: 111111111,
+                totalDurationMs: 987654321,
+                totalDecisions: {
+                    accept: 123456789,
+                    reject: 98765432,
+                    modify: 12345,
+                    [ToolCallDecision.AUTO_ACCEPT]: 0,
+                },
+                byName: {
+                    'long-named-tool-for-testing-wrapping-and-such': {
+                        count: 999999999,
+                        success: 888888888,
+                        fail: 111111111,
+                        durationMs: 987654321,
+                        decisions: {
+                            accept: 123456789,
+                            reject: 98765432,
+                            modify: 12345,
+                            [ToolCallDecision.AUTO_ACCEPT]: 0,
+                        },
+                    },
+                },
+            },
+            files: {
+                totalLinesAdded: 0,
+                totalLinesRemoved: 0,
+            },
+        });
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('should handle zero decisions gracefully', () => {
+        const { lastFrame } = renderWithMockedStats({
+            models: {},
+            tools: {
+                totalCalls: 1,
+                totalSuccess: 1,
+                totalFail: 0,
+                totalDurationMs: 100,
+                totalDecisions: {
+                    accept: 0,
+                    reject: 0,
+                    modify: 0,
+                    [ToolCallDecision.AUTO_ACCEPT]: 0,
+                },
+                byName: {
+                    'test-tool': {
+                        count: 1,
+                        success: 1,
+                        fail: 0,
+                        durationMs: 100,
+                        decisions: {
+                            accept: 0,
+                            reject: 0,
+                            modify: 0,
+                            [ToolCallDecision.AUTO_ACCEPT]: 0,
+                        },
+                    },
+                },
+            },
+            files: {
+                totalLinesAdded: 0,
+                totalLinesRemoved: 0,
+            },
+        });
+        const output = lastFrame();
+        expect(output).toContain('Total Reviewed Suggestions:');
+        expect(output).toContain('0');
+        expect(output).toContain('Overall Agreement Rate:');
+        expect(output).toContain('--');
+        expect(output).toMatchSnapshot();
+    });
+});
+//# sourceMappingURL=ToolStatsDisplay.test.js.map

package/dist/src/ui/components/ToolStatsDisplay.test.js.map

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

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

@@ -3,9 +3,11 @@ import { Text, Box } from 'ink';
 import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js';
 import { theme } from '../../semantic-colors.js';
 import { SCREEN_READER_MODEL_PREFIX } from '../../textConstants.js';
+import { useUIState } from '../../contexts/UIStateContext.js';
 export const GeminiMessage = ({ text, isPending, availableTerminalHeight, terminalWidth, }) => {
+    const { renderMarkdown } = useUIState();
     const prefix = '✦ ';
     const prefixWidth = prefix.length;
-    return (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: prefixWidth, children: _jsx(Text, { color: theme.text.accent, "aria-label": SCREEN_READER_MODEL_PREFIX, children: prefix }) }), _jsx(Box, { flexGrow: 1, flexDirection: "column", children: _jsx(MarkdownDisplay, { text: text, isPending: isPending, availableTerminalHeight: availableTerminalHeight, terminalWidth: terminalWidth }) })] }));
+    return (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: prefixWidth, children: _jsx(Text, { color: theme.text.accent, "aria-label": SCREEN_READER_MODEL_PREFIX, children: prefix }) }), _jsx(Box, { flexGrow: 1, flexDirection: "column", children: _jsx(MarkdownDisplay, { text: text, isPending: isPending, availableTerminalHeight: availableTerminalHeight, terminalWidth: terminalWidth, renderMarkdown: renderMarkdown }) })] }));
 };
 //# sourceMappingURL=GeminiMessage.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"GeminiMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/GeminiMessage.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AASpE,MAAM,CAAC,MAAM,aAAa,GAAiC,CAAC,EAC1D,IAAI,EACJ,SAAS,EACT,uBAAuB,EACvB,aAAa,GACd,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;IAElC,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,KAAK,aACtB,KAAC,GAAG,IAAC,KAAK,EAAE,WAAW,YACrB,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,gBAAc,0BAA0B,YACnE,MAAM,GACF,GACH,EACN,KAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,EAAE,aAAa,EAAC,QAAQ,YACtC,KAAC,eAAe,IACd,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,uBAAuB,EAAE,uBAAuB,EAChD,aAAa,EAAE,aAAa,GAC5B,GACE,IACF,CACP,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"GeminiMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/GeminiMessage.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAS9D,MAAM,CAAC,MAAM,aAAa,GAAiC,CAAC,EAC1D,IAAI,EACJ,SAAS,EACT,uBAAuB,EACvB,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,CAAC;IACxC,MAAM,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;IAElC,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,KAAK,aACtB,KAAC,GAAG,IAAC,KAAK,EAAE,WAAW,YACrB,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,gBAAc,0BAA0B,YACnE,MAAM,GACF,GACH,EACN,KAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,EAAE,aAAa,EAAC,QAAQ,YACtC,KAAC,eAAe,IACd,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,uBAAuB,EAAE,uBAAuB,EAChD,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,cAAc,GAC9B,GACE,IACF,CACP,CAAC;AACJ,CAAC,CAAC"}

package/dist/src/ui/components/messages/GeminiMessage.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/GeminiMessage.test.js

@@ -0,0 +1,35 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { GeminiMessage } from './GeminiMessage.js';
+import { StreamingState } from '../../types.js';
+import { renderWithProviders } from '../../../test-utils/render.js';
+describe('<GeminiMessage /> - Raw Markdown Display Snapshots', () => {
+    const baseProps = {
+        text: 'Test **bold** and `code` markdown\n\n```javascript\nconst x = 1;\n```',
+        isPending: false,
+        terminalWidth: 80,
+    };
+    it.each([
+        { renderMarkdown: true, description: '(default)' },
+        {
+            renderMarkdown: false,
+            description: '(raw markdown with syntax highlighting, no line numbers)',
+        },
+    ])('renders with renderMarkdown=$renderMarkdown $description', ({ renderMarkdown }) => {
+        const { lastFrame } = renderWithProviders(_jsx(GeminiMessage, { ...baseProps }), {
+            uiState: { renderMarkdown, streamingState: StreamingState.Idle },
+        });
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it.each([{ renderMarkdown: true }, { renderMarkdown: false }])('renders pending state with renderMarkdown=$renderMarkdown', ({ renderMarkdown }) => {
+        const { lastFrame } = renderWithProviders(_jsx(GeminiMessage, { ...baseProps, isPending: true }), {
+            uiState: { renderMarkdown, streamingState: StreamingState.Idle },
+        });
+        expect(lastFrame()).toMatchSnapshot();
+    });
+});
+//# sourceMappingURL=GeminiMessage.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"GeminiMessage.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/GeminiMessage.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,QAAQ,CAAC,oDAAoD,EAAE,GAAG,EAAE;IAClE,MAAM,SAAS,GAAG;QAChB,IAAI,EAAE,uEAAuE;QAC7E,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,EAAE;KAClB,CAAC;IAEF,EAAE,CAAC,IAAI,CAAC;QACN,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE;QAClD;YACE,cAAc,EAAE,KAAK;YACrB,WAAW,EAAE,0DAA0D;SACxE;KACF,CAAC,CACA,0DAA0D,EAC1D,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE;QACrB,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,aAAa,OAAK,SAAS,GAAI,EAChC;YACE,OAAO,EAAE,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,IAAI,EAAE;SACjE,CACF,CAAC;QACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;IACxC,CAAC,CACF,CAAC;IAEF,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC,CAC5D,2DAA2D,EAC3D,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE;QACrB,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,aAAa,OAAK,SAAS,EAAE,SAAS,EAAE,IAAI,GAAI,EACjD;YACE,OAAO,EAAE,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,IAAI,EAAE;SACjE,CACF,CAAC;QACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;IACxC,CAAC,CACF,CAAC;AACJ,CAAC,CAAC,CAAC"}

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

@@ -1,6 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Box } from 'ink';
 import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js';
+import { useUIState } from '../../contexts/UIStateContext.js';
 /*
  * Gemini message content is a semi-hacked component. The intention is to represent a partial
  * of GeminiMessage and is only used when a response gets too long. In that instance messages
@@ -8,8 +9,9 @@ import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js';
  * App.tsx to be as performant as humanly possible.
  */
 export const GeminiMessageContent = ({ text, isPending, availableTerminalHeight, terminalWidth, }) => {
+    const { renderMarkdown } = useUIState();
     const originalPrefix = '✦ ';
     const prefixWidth = originalPrefix.length;
-    return (_jsx(Box, { flexDirection: "column", paddingLeft: prefixWidth, children: _jsx(MarkdownDisplay, { text: text, isPending: isPending, availableTerminalHeight: availableTerminalHeight, terminalWidth: terminalWidth }) }));
+    return (_jsx(Box, { flexDirection: "column", paddingLeft: prefixWidth, children: _jsx(MarkdownDisplay, { text: text, isPending: isPending, availableTerminalHeight: availableTerminalHeight, terminalWidth: terminalWidth, renderMarkdown: renderMarkdown }) }));
 };
 //# sourceMappingURL=GeminiMessageContent.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"GeminiMessageContent.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/GeminiMessageContent.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AASjE;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAwC,CAAC,EACxE,IAAI,EACJ,SAAS,EACT,uBAAuB,EACvB,aAAa,GACd,EAAE,EAAE;IACH,MAAM,cAAc,GAAG,IAAI,CAAC;IAC5B,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC;IAE1C,OAAO,CACL,KAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,WAAW,EAAE,WAAW,YAClD,KAAC,eAAe,IACd,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,uBAAuB,EAAE,uBAAuB,EAChD,aAAa,EAAE,aAAa,GAC5B,GACE,CACP,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"GeminiMessageContent.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/GeminiMessageContent.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAS9D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAwC,CAAC,EACxE,IAAI,EACJ,SAAS,EACT,uBAAuB,EACvB,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,CAAC;IACxC,MAAM,cAAc,GAAG,IAAI,CAAC;IAC5B,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC;IAE1C,OAAO,CACL,KAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,WAAW,EAAE,WAAW,YAClD,KAAC,eAAe,IACd,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,uBAAuB,EAAE,uBAAuB,EAChD,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,cAAc,GAC9B,GACE,CACP,CAAC;AACJ,CAAC,CAAC"}

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

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type React from 'react';
+export declare const TodoTray: React.FC;

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

@@ -0,0 +1,59 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Box, Text } from 'ink';
+import {} from '@google/gemini-cli-core';
+import { theme } from '../../semantic-colors.js';
+import { useUIState } from '../../contexts/UIStateContext.js';
+import { useMemo } from 'react';
+const TodoStatusDisplay = ({ status }) => {
+    switch (status) {
+        case 'completed':
+            return _jsx(Text, { color: theme.status.success, children: "\u2713" });
+        case 'in_progress':
+            return _jsx(Text, { color: theme.text.accent, children: "\u00BB" });
+        case 'pending':
+            return _jsx(Text, { color: theme.text.primary, children: "\u2610" });
+        case 'cancelled':
+        default:
+            return _jsx(Text, { color: theme.status.error, children: "\u2717" });
+    }
+};
+const TodoItemDisplay = ({ todo }) => (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { marginRight: 1, children: _jsx(TodoStatusDisplay, { status: todo.status }) }), _jsx(Box, { flexShrink: 1, children: _jsx(Text, { color: theme.text.primary, children: todo.description }) })] }));
+export const TodoTray = () => {
+    const uiState = useUIState();
+    const todos = useMemo(() => {
+        // Find the most recent todo list written by the WriteTodosTool
+        for (let i = uiState.history.length - 1; i >= 0; i--) {
+            const entry = uiState.history[i];
+            if (entry.type !== 'tool_group') {
+                continue;
+            }
+            const toolGroup = entry;
+            for (const tool of toolGroup.tools) {
+                if (typeof tool.resultDisplay !== 'object' ||
+                    !('todos' in tool.resultDisplay)) {
+                    continue;
+                }
+                return tool.resultDisplay;
+            }
+        }
+        return null;
+    }, [uiState.history]);
+    const inProgress = useMemo(() => {
+        if (todos === null) {
+            return null;
+        }
+        return todos.todos.find((todo) => todo.status === 'in_progress') || null;
+    }, [todos]);
+    if (todos === null) {
+        return null;
+    }
+    if (uiState.showFullTodos) {
+        return (_jsxs(Box, { borderStyle: "single", paddingLeft: 1, paddingRight: 1, borderBottom: false, flexDirection: "column", borderColor: theme.border.default, children: [_jsxs(Text, { color: theme.text.accent, children: ["\uD83D\uDCDD Todo:", _jsx(Text, { color: theme.text.secondary, children: "(ctrl+t to collapse)" })] }), _jsx(Box, { paddingLeft: 4, paddingRight: 2, paddingTop: 1, children: _jsx(TodoListDisplay, { todos: todos }) })] }));
+    }
+    if (inProgress === null) {
+        return null;
+    }
+    return (_jsxs(Box, { borderStyle: "single", paddingLeft: 1, paddingRight: 1, borderBottom: false, flexDirection: "row", borderColor: theme.border.default, children: [_jsxs(Text, { color: theme.text.accent, children: ["\uD83D\uDCDD Todo:", _jsx(Text, { color: theme.text.secondary, children: "(ctrl+t to expand)" })] }), _jsx(TodoItemDisplay, { todo: inProgress })] }));
+};
+const TodoListDisplay = ({ todos }) => (_jsx(Box, { flexDirection: "column", children: todos.todos.map((todo, index) => (_jsx(TodoItemDisplay, { todo: todo }, index))) }));
+//# sourceMappingURL=Todo.js.map

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

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

package/dist/src/ui/components/messages/Todo.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/Todo.test.js

@@ -0,0 +1,113 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { render } from 'ink-testing-library';
+import { describe, it, expect } from 'vitest';
+import { Box } from 'ink';
+import { TodoTray } from './Todo.js';
+import { UIStateContext } from '../../contexts/UIStateContext.js';
+import { ToolCallStatus } from '../../types.js';
+const createTodoHistoryItem = (todos) => ({
+    type: 'tool_group',
+    id: '1',
+    tools: [
+        {
+            name: 'write_todos_list',
+            callId: 'tool-1',
+            status: ToolCallStatus.Success,
+            resultDisplay: {
+                todos,
+            },
+        },
+    ],
+});
+describe('<TodoTray />', () => {
+    const mockHistoryItem = createTodoHistoryItem([
+        { description: 'Pending Task', status: 'pending' },
+        { description: 'In Progress Task', status: 'in_progress' },
+        { description: 'Completed Task', status: 'completed' },
+    ]);
+    const renderWithUiState = (uiState) => render(_jsx(UIStateContext.Provider, { value: uiState, children: _jsx(TodoTray, {}) }));
+    it('renders null when no todos are in the history', () => {
+        const { lastFrame } = renderWithUiState({ history: [] });
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('renders null when todos exist but none are in progress and full view is off', () => {
+        const historyWithNoInProgress = createTodoHistoryItem([
+            { description: 'Pending Task', status: 'pending' },
+            { description: 'In Progress Task', status: 'cancelled' },
+            { description: 'Completed Task', status: 'completed' },
+        ]);
+        const { lastFrame } = renderWithUiState({
+            history: [historyWithNoInProgress],
+            showFullTodos: false,
+        });
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('renders an empty todo list when full view is on', () => {
+        const emptyTodosHistoryItem = createTodoHistoryItem([]);
+        const { lastFrame } = renderWithUiState({
+            history: [emptyTodosHistoryItem],
+            showFullTodos: true,
+        });
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('renders a todo list with various statuses when full view is on', () => {
+        const variousTodosHistoryItem = createTodoHistoryItem([
+            { description: 'Task 1', status: 'pending' },
+            { description: 'Task 2', status: 'in_progress' },
+            { description: 'Task 3', status: 'completed' },
+            { description: 'Task 4', status: 'cancelled' },
+        ]);
+        const { lastFrame } = renderWithUiState({
+            history: [variousTodosHistoryItem],
+            showFullTodos: true,
+        });
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('renders a todo list with long descriptions that wrap when full view is on', () => {
+        const longDescriptionTodosHistoryItem = createTodoHistoryItem([
+            {
+                description: 'This is a very long description for a pending task that should wrap around multiple lines when the terminal width is constrained.',
+                status: 'pending',
+            },
+            {
+                description: 'Another completed task with an equally verbose description to test wrapping behavior.',
+                status: 'completed',
+            },
+        ]);
+        const { lastFrame } = render(_jsx(Box, { width: "30", children: _jsx(UIStateContext.Provider, { value: {
+                    history: [longDescriptionTodosHistoryItem],
+                    showFullTodos: true,
+                }, children: _jsx(TodoTray, {}) }) }));
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('renders a single todo item when full view is on', () => {
+        const singleTodoHistoryItem = createTodoHistoryItem([
+            { description: 'Single task', status: 'pending' },
+        ]);
+        const { lastFrame } = renderWithUiState({
+            history: [singleTodoHistoryItem],
+            showFullTodos: true,
+        });
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('renders only the in-progress task when full view is off', () => {
+        const { lastFrame } = renderWithUiState({
+            history: [mockHistoryItem],
+            showFullTodos: false,
+        });
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('renders the full todo list when full view is on', () => {
+        const { lastFrame } = renderWithUiState({
+            history: [mockHistoryItem],
+            showFullTodos: true,
+        });
+        expect(lastFrame()).toMatchSnapshot();
+    });
+});
+//# sourceMappingURL=Todo.test.js.map

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

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

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

@@ -14,7 +14,7 @@ export const ToolGroupMessage = ({ toolCalls, availableTerminalHeight, terminalW
     const hasPending = !toolCalls.every((t) => t.status === ToolCallStatus.Success);
     const config = useConfig();
     const isShellCommand = toolCalls.some((t) => t.name === SHELL_COMMAND_NAME || t.name === SHELL_NAME);
-    const borderColor = isShellCommand || isEmbeddedShellFocused
+    const borderColor = (isShellCommand && hasPending) || isEmbeddedShellFocused
         ? theme.ui.symbol
         : hasPending
             ? theme.status.warning

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

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

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

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -15,6 +15,7 @@ import { MaxSizedBox } from '../shared/MaxSizedBox.js';
 import { ShellInputPrompt } from '../ShellInputPrompt.js';
 import { SHELL_COMMAND_NAME, SHELL_NAME, TOOL_STATUS, } from '../../constants.js';
 import { theme } from '../../semantic-colors.js';
+import { useUIState } from '../../contexts/UIStateContext.js';
 const STATIC_HEIGHT = 1;
 const RESERVED_LINE_COUNT = 5; // for tool name, status, padding etc.
 const STATUS_INDICATOR_WIDTH = 3;
@@ -23,6 +24,7 @@ const MIN_LINES_SHOWN = 2; // show at least this many lines
 // outputs that will get truncated further MaxSizedBox anyway.
 const MAXIMUM_RESULT_DISPLAY_CHARACTERS = 1000000;
 export const ToolMessage = ({ name, description, resultDisplay, status, availableTerminalHeight, terminalWidth, emphasis = 'medium', renderOutputAsMarkdown = true, activeShellPtyId, embeddedShellFocused, ptyId, config, }) => {
+    const { renderMarkdown } = useUIState();
     const isThisShellFocused = (name === SHELL_COMMAND_NAME || name === 'Shell') &&
         status === ToolCallStatus.Executing &&
         ptyId === activeShellPtyId &&
@@ -70,8 +72,11 @@ export const ToolMessage = ({ name, description, resultDisplay, status, availabl
                 '...' + resultDisplay.slice(-MAXIMUM_RESULT_DISPLAY_CHARACTERS);
         }
     }
-    return (_jsxs(Box, { paddingX: 1, paddingY: 0, flexDirection: "column", children: [_jsxs(Box, { minHeight: 1, 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, {})] }), resultDisplay && (_jsx(Box, { paddingLeft: STATUS_INDICATOR_WIDTH, width: "100%", marginTop: 1, children: _jsx(Box, { flexDirection: "column", children: typeof resultDisplay === 'string' && renderOutputAsMarkdown ? (_jsx(Box, { flexDirection: "column", children: _jsx(MarkdownDisplay, { text: resultDisplay, isPending: false, availableTerminalHeight: availableHeight, terminalWidth: childWidth }) })) : typeof resultDisplay === 'string' && !renderOutputAsMarkdown ? (_jsx(MaxSizedBox, { maxHeight: availableHeight, maxWidth: childWidth, children: _jsx(Box, { children: _jsx(Text, { wrap: "wrap", color: theme.text.primary, children: resultDisplay }) }) })) : typeof resultDisplay === 'object' &&
-                        'fileDiff' in resultDisplay ? (_jsx(DiffRenderer, { diffContent: resultDisplay.fileDiff, filename: resultDisplay.fileName, availableTerminalHeight: availableHeight, terminalWidth: childWidth })) : (_jsx(AnsiOutputText, { data: resultDisplay, availableTerminalHeight: availableHeight, width: childWidth })) }) })), isThisShellFocused && config && (_jsx(Box, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: _jsx(ShellInputPrompt, { activeShellPtyId: activeShellPtyId ?? null, focus: embeddedShellFocused }) }))] }));
+    return (_jsxs(Box, { paddingX: 1, paddingY: 0, flexDirection: "column", children: [_jsxs(Box, { minHeight: 1, 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, {})] }), resultDisplay && (_jsx(Box, { paddingLeft: STATUS_INDICATOR_WIDTH, width: "100%", marginTop: 1, children: _jsx(Box, { flexDirection: "column", children: typeof resultDisplay === 'string' && renderOutputAsMarkdown ? (_jsx(Box, { flexDirection: "column", children: _jsx(MarkdownDisplay, { text: resultDisplay, isPending: false, availableTerminalHeight: availableHeight, terminalWidth: childWidth, renderMarkdown: renderMarkdown }) })) : typeof resultDisplay === 'string' && !renderOutputAsMarkdown ? (_jsx(MaxSizedBox, { maxHeight: availableHeight, maxWidth: childWidth, children: _jsx(Box, { children: _jsx(Text, { wrap: "wrap", color: theme.text.primary, children: resultDisplay }) }) })) : typeof resultDisplay === 'object' &&
+                        'fileDiff' in resultDisplay ? (_jsx(DiffRenderer, { diffContent: resultDisplay.fileDiff, filename: resultDisplay.fileName, availableTerminalHeight: availableHeight, terminalWidth: childWidth })) : typeof resultDisplay === 'object' &&
+                        'todos' in resultDisplay ? (
+                    // display nothing, as the TodoTray will handle rendering todos
+                    _jsx(_Fragment, {})) : (_jsx(AnsiOutputText, { data: resultDisplay, availableTerminalHeight: availableHeight, width: childWidth })) }) })), isThisShellFocused && config && (_jsx(Box, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: _jsx(ShellInputPrompt, { activeShellPtyId: activeShellPtyId ?? null, focus: embeddedShellFocused }) }))] }));
 };
 const ToolStatusIndicator = ({ status, name, }) => {
     const isShell = name === SHELL_COMMAND_NAME || name === SHELL_NAME;