@machina.ai/cell-cli 1.36.0-rc1 → 1.38.1-rc2

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

@@ -0,0 +1,383 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { renderWithProviders } from '../../../test-utils/render.js';
+import { createMockSettings } from '../../../test-utils/settings.js';
+import { waitFor } from '../../../test-utils/async.js';
+import { DenseToolMessage } from './DenseToolMessage.js';
+import { CoreToolCallStatus, makeFakeConfig, } from '@google/gemini-cli-core';
+describe('DenseToolMessage', () => {
+    const defaultProps = {
+        callId: 'call-1',
+        name: 'test-tool',
+        description: 'Test description',
+        status: CoreToolCallStatus.Success,
+        resultDisplay: 'Success result',
+        confirmationDetails: undefined,
+        terminalWidth: 80,
+    };
+    it('renders correctly for a successful string result', async () => {
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps }));
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('test-tool');
+        expect(output).toContain('Test description');
+        expect(output).toContain('→ Success result');
+        expect(output).toMatchSnapshot();
+    });
+    it('truncates long string results', async () => {
+        const longResult = 'A'.repeat(200);
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, resultDisplay: longResult }));
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('…');
+        expect(lastFrame()).toMatchSnapshot();
+    });
+    it('flattens newlines in string results', async () => {
+        const multilineResult = 'Line 1\nLine 2';
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, resultDisplay: multilineResult }));
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('→ Line 1 Line 2');
+        expect(output).toMatchSnapshot();
+    });
+    it('renders correctly for file diff results with stats', async () => {
+        const diffResult = {
+            fileDiff: '@@ -1,1 +1,1 @@\n-old line\n+diff content',
+            fileName: 'test.ts',
+            filePath: '/path/to/test.ts',
+            originalContent: 'old content',
+            newContent: 'new content',
+            diffStat: {
+                user_added_lines: 5,
+                user_removed_lines: 2,
+                user_added_chars: 50,
+                user_removed_chars: 20,
+                model_added_lines: 10,
+                model_removed_lines: 4,
+                model_added_chars: 100,
+                model_removed_chars: 40,
+            },
+        };
+        const { lastFrame } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, resultDisplay: diffResult }), {
+            settings: createMockSettings({
+                merged: { useAlternateBuffer: false, useTerminalBuffer: false },
+            }),
+        });
+        await waitFor(() => expect(lastFrame()).toContain('test-tool'));
+        await waitFor(() => expect(lastFrame()).toContain('test.ts → Accepted (+15, -6)'));
+        const output = lastFrame();
+        expect(output).toMatchSnapshot();
+    });
+    it('renders correctly for Edit tool using confirmationDetails', async () => {
+        const confirmationDetails = {
+            type: 'edit',
+            title: 'Confirm Edit',
+            fileName: 'styles.scss',
+            filePath: '/path/to/styles.scss',
+            fileDiff: '@@ -1,1 +1,1 @@\n-body { color: blue; }\n+body { color: red; }',
+            originalContent: 'body { color: blue; }',
+            newContent: 'body { color: red; }',
+        };
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, name: "Edit", status: CoreToolCallStatus.AwaitingApproval, resultDisplay: undefined, confirmationDetails: confirmationDetails }), {});
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('Edit');
+        expect(output).toContain('styles.scss');
+        expect(output).toContain('→ Confirming');
+        expect(output).toMatchSnapshot();
+    });
+    it('renders correctly for Rejected Edit tool', async () => {
+        const diffResult = {
+            fileDiff: '@@ -1,1 +1,1 @@\n-old line\n+new line',
+            fileName: 'styles.scss',
+            filePath: '/path/to/styles.scss',
+            originalContent: 'old line',
+            newContent: 'new line',
+            diffStat: {
+                user_added_lines: 1,
+                user_removed_lines: 1,
+                user_added_chars: 0,
+                user_removed_chars: 0,
+                model_added_lines: 0,
+                model_removed_lines: 0,
+                model_added_chars: 0,
+                model_removed_chars: 0,
+            },
+        };
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, name: "Edit", status: CoreToolCallStatus.Cancelled, resultDisplay: diffResult }), {});
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('Edit');
+        expect(output).toContain('styles.scss → Rejected (+1, -1)');
+        expect(output).toMatchSnapshot();
+    });
+    it('renders correctly for Rejected Edit tool with confirmationDetails and diffStat', async () => {
+        const confirmationDetails = {
+            type: 'edit',
+            title: 'Confirm Edit',
+            fileName: 'styles.scss',
+            filePath: '/path/to/styles.scss',
+            fileDiff: '@@ -1,1 +1,1 @@\n-body { color: blue; }\n+body { color: red; }',
+            originalContent: 'body { color: blue; }',
+            newContent: 'body { color: red; }',
+            diffStat: {
+                user_added_lines: 1,
+                user_removed_lines: 1,
+                user_added_chars: 0,
+                user_removed_chars: 0,
+                model_added_lines: 0,
+                model_removed_lines: 0,
+                model_added_chars: 0,
+                model_removed_chars: 0,
+            },
+        };
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, name: "Edit", status: CoreToolCallStatus.Cancelled, resultDisplay: undefined, confirmationDetails: confirmationDetails }), {});
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('Edit');
+        expect(output).toContain('styles.scss → Rejected (+1, -1)');
+        expect(output).toMatchSnapshot();
+    });
+    it('renders correctly for WriteFile tool', async () => {
+        const diffResult = {
+            fileDiff: '@@ -1,1 +1,1 @@\n-old content\n+new content',
+            fileName: 'config.json',
+            filePath: '/path/to/config.json',
+            originalContent: 'old content',
+            newContent: 'new content',
+            diffStat: {
+                user_added_lines: 1,
+                user_removed_lines: 1,
+                user_added_chars: 0,
+                user_removed_chars: 0,
+                model_added_lines: 0,
+                model_removed_lines: 0,
+                model_added_chars: 0,
+                model_removed_chars: 0,
+            },
+        };
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, name: "WriteFile", status: CoreToolCallStatus.Success, resultDisplay: diffResult }), {});
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('WriteFile');
+        expect(output).toContain('config.json → Accepted (+1, -1)');
+        expect(output).toMatchSnapshot();
+    });
+    it('renders correctly for Rejected WriteFile tool', async () => {
+        const diffResult = {
+            fileDiff: '@@ -1,1 +1,1 @@\n-old content\n+new content',
+            fileName: 'config.json',
+            filePath: '/path/to/config.json',
+            originalContent: 'old content',
+            newContent: 'new content',
+        };
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, name: "WriteFile", status: CoreToolCallStatus.Cancelled, resultDisplay: diffResult }), {});
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('WriteFile');
+        expect(output).toContain('config.json');
+        expect(output).toContain('→ Rejected');
+        expect(output).toMatchSnapshot();
+    });
+    it('renders correctly for Errored Edit tool', async () => {
+        const diffResult = {
+            fileDiff: '@@ -1,1 +1,1 @@\n-old line\n+new line',
+            fileName: 'styles.scss',
+            filePath: '/path/to/styles.scss',
+            originalContent: 'old line',
+            newContent: 'new line',
+            diffStat: {
+                user_added_lines: 1,
+                user_removed_lines: 1,
+                user_added_chars: 0,
+                user_removed_chars: 0,
+                model_added_lines: 0,
+                model_removed_lines: 0,
+                model_added_chars: 0,
+                model_removed_chars: 0,
+            },
+        };
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, name: "Edit", status: CoreToolCallStatus.Error, resultDisplay: diffResult }));
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('Edit');
+        expect(output).toContain('styles.scss → Failed (+1, -1)');
+        expect(output).toMatchSnapshot();
+    });
+    it('renders correctly for grep results', async () => {
+        const grepResult = {
+            summary: 'Found 2 matches',
+            matches: [
+                {
+                    filePath: 'file1.ts',
+                    absolutePath: '/file1.ts',
+                    lineNumber: 10,
+                    line: 'match 1',
+                },
+                {
+                    filePath: 'file2.ts',
+                    absolutePath: '/file2.ts',
+                    lineNumber: 20,
+                    line: 'match 2',
+                },
+            ],
+        };
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, resultDisplay: grepResult }));
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('→ Found 2 matches');
+        // Matches are rendered in a secondary list for high-signal summaries
+        expect(output).toContain('file1.ts:10: match 1');
+        expect(output).toContain('file2.ts:20: match 2');
+        expect(output).toMatchSnapshot();
+    });
+    it('renders correctly for ls results', async () => {
+        const lsResult = {
+            summary: 'Listed 2 files. (1 ignored)',
+            files: ['file1.ts', 'dir1'],
+        };
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, resultDisplay: lsResult }));
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('→ Listed 2 files. (1 ignored)');
+        // Directory listings should not have a payload in dense mode
+        expect(output).not.toContain('file1.ts');
+        expect(output).not.toContain('dir1');
+        expect(output).toMatchSnapshot();
+    });
+    it('renders correctly for ReadManyFiles results', async () => {
+        const rmfResult = {
+            summary: 'Read 3 file(s)',
+            files: ['file1.ts', 'file2.ts', 'file3.ts'],
+            include: ['**/*.ts'],
+            skipped: [{ path: 'skipped.bin', reason: 'binary' }],
+        };
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, resultDisplay: rmfResult }));
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('Attempting to read files from **/*.ts');
+        expect(output).toContain('→ Read 3 file(s) (1 ignored)');
+        expect(output).toContain('file1.ts');
+        expect(output).toContain('file2.ts');
+        expect(output).toContain('file3.ts');
+        expect(output).toMatchSnapshot();
+    });
+    it('renders correctly for todo updates', async () => {
+        const todoResult = {
+            todos: [],
+        };
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, resultDisplay: todoResult }));
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('→ Todos updated');
+        expect(output).toMatchSnapshot();
+    });
+    it('renders generic output message for unknown object results', async () => {
+        const genericResult = {
+            some: 'data',
+        };
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, resultDisplay: genericResult }));
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('→ Returned (possible empty result)');
+        expect(output).toMatchSnapshot();
+    });
+    it('renders correctly for error status with string message', async () => {
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, status: CoreToolCallStatus.Error, resultDisplay: 'Error occurred' }));
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('→ Error occurred');
+        expect(output).toMatchSnapshot();
+    });
+    it('renders generic failure message for error status without string message', async () => {
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, status: CoreToolCallStatus.Error, resultDisplay: undefined }));
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).toContain('→ Failed');
+        expect(output).toMatchSnapshot();
+    });
+    it('does not render result arrow if resultDisplay is missing', async () => {
+        const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, status: CoreToolCallStatus.Scheduled, resultDisplay: undefined }));
+        await waitUntilReady();
+        const output = lastFrame();
+        expect(output).not.toContain('→');
+        expect(output).toMatchSnapshot();
+    });
+    describe('Toggleable Diff View (Alternate Buffer)', () => {
+        const diffResult = {
+            fileDiff: '@@ -1,1 +1,1 @@\n-old line\n+new line',
+            fileName: 'test.ts',
+            filePath: '/path/to/test.ts',
+            originalContent: 'old content',
+            newContent: 'new content',
+        };
+        it('hides diff content by default when in alternate buffer mode', async () => {
+            const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, resultDisplay: diffResult, status: CoreToolCallStatus.Success }), {
+                config: makeFakeConfig({ useAlternateBuffer: true }),
+                settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
+            });
+            await waitUntilReady();
+            const output = lastFrame();
+            expect(output).toContain('Accepted');
+            expect(output).not.toContain('new line');
+            expect(output).toMatchSnapshot();
+        });
+        it('shows diff content by default when NOT in alternate buffer mode', async () => {
+            const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, resultDisplay: diffResult, status: CoreToolCallStatus.Success }), {
+                config: makeFakeConfig({ useAlternateBuffer: false }),
+                settings: createMockSettings({ ui: { useAlternateBuffer: false } }),
+            });
+            await waitUntilReady();
+            const output = lastFrame();
+            expect(output).toContain('Accepted');
+            expect(output).toMatchSnapshot();
+        });
+        it('shows diff content when expanded via ToolActionsContext', async () => {
+            const { lastFrame, waitUntilReady } = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, resultDisplay: diffResult, status: CoreToolCallStatus.Success }), {
+                config: makeFakeConfig({ useAlternateBuffer: true }),
+                settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
+                toolActions: {
+                    isExpanded: () => true,
+                },
+            });
+            await waitUntilReady();
+            // Verify it shows the diff when expanded
+            expect(lastFrame()).toContain('new line');
+        });
+    });
+    describe('Visual Regression', () => {
+        it('matches SVG snapshot for an Accepted file edit with diff stats', async () => {
+            const diffResult = {
+                fileName: 'test.ts',
+                filePath: '/mock/test.ts',
+                fileDiff: '--- a/test.ts\n+++ b/test.ts\n@@ -1 +1 @@\n-old\n+new',
+                originalContent: 'old',
+                newContent: 'new',
+                diffStat: {
+                    model_added_lines: 1,
+                    model_removed_lines: 1,
+                    model_added_chars: 3,
+                    model_removed_chars: 3,
+                    user_added_lines: 0,
+                    user_removed_lines: 0,
+                    user_added_chars: 0,
+                    user_removed_chars: 0,
+                },
+            };
+            const renderResult = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, name: "edit", description: "Editing test.ts", resultDisplay: diffResult, status: CoreToolCallStatus.Success }));
+            await renderResult.waitUntilReady();
+            await expect(renderResult).toMatchSvgSnapshot();
+        });
+        it('matches SVG snapshot for a Rejected tool call', async () => {
+            const renderResult = await renderWithProviders(_jsx(DenseToolMessage, { ...defaultProps, name: "read_file", description: "Reading important.txt", resultDisplay: "Rejected by user", status: CoreToolCallStatus.Cancelled }));
+            await renderResult.waitUntilReady();
+            await expect(renderResult).toMatchSvgSnapshot();
+        });
+    });
+});
+//# sourceMappingURL=DenseToolMessage.test.js.map

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

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

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

@@ -5,6 +5,13 @@
  */
 import type React from 'react';
 import type { Theme } from '../../themes/theme.js';
+export interface DiffLine {
+    type: 'add' | 'del' | 'context' | 'hunk' | 'other';
+    oldLine?: number;
+    newLine?: number;
+    content: string;
+}
+export declare function parseDiffWithLineNumbers(diffContent: string): DiffLine[];
 interface DiffRendererProps {
     diffContent: string;
     filename?: string;
@@ -12,6 +19,17 @@ interface DiffRendererProps {
     availableTerminalHeight?: number;
     terminalWidth: number;
     theme?: Theme;
+    disableColor?: boolean;
+    paddingX?: number;
 }
 export declare const DiffRenderer: React.FC<DiffRendererProps>;
+export declare const isNewFile: (parsedLines: DiffLine[]) => boolean;
+export interface RenderDiffLinesOptions {
+    parsedLines: DiffLine[];
+    filename?: string;
+    tabWidth?: number;
+    terminalWidth: number;
+    disableColor?: boolean;
+}
+export declare const renderDiffLines: ({ parsedLines, filename, tabWidth, terminalWidth, disableColor, }: RenderDiffLinesOptions) => React.ReactNode[];
 export {};

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

@@ -1,12 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useMemo } from 'react';
 import { Box, Text, useIsScreenReaderEnabled } from 'ink';
-import crypto from 'node:crypto';
 import { colorizeCode, colorizeLine } from '../../utils/CodeColorizer.js';
 import { MaxSizedBox } from '../shared/MaxSizedBox.js';
 import { theme as semanticTheme } from '../../semantic-colors.js';
 import { useSettings } from '../../contexts/SettingsContext.js';
-function parseDiffWithLineNumbers(diffContent) {
+import { getFileExtension } from '../../utils/fileUtils.js';
+export function parseDiffWithLineNumbers(diffContent) {
     const lines = diffContent.split(/\r?\n/);
     const result = [];
     let currentOldLine = 0;
@@ -16,6 +16,7 @@ function parseDiffWithLineNumbers(diffContent) {
     for (const line of lines) {
         const hunkMatch = line.match(hunkHeaderRegex);
         if (hunkMatch) {
+            currentOldLine = parseInt(hunkMatch[1], 10);
             currentOldLine = parseInt(hunkMatch[1], 10);
             currentNewLine = parseInt(hunkMatch[2], 10);
             inHunk = true;
@@ -68,7 +69,7 @@ function parseDiffWithLineNumbers(diffContent) {
     return result;
 }
 const DEFAULT_TAB_WIDTH = 4; // Spaces per tab for normalization
-export const DiffRenderer = ({ diffContent, filename, tabWidth = DEFAULT_TAB_WIDTH, availableTerminalHeight, terminalWidth, theme, }) => {
+export const DiffRenderer = ({ diffContent, filename, tabWidth = DEFAULT_TAB_WIDTH, availableTerminalHeight, terminalWidth, theme, disableColor = false, paddingX = 0, }) => {
     const settings = useSettings();
     const screenReaderEnabled = useIsScreenReaderEnabled();
     const parsedLines = useMemo(() => {
@@ -77,33 +78,25 @@ export const DiffRenderer = ({ diffContent, filename, tabWidth = DEFAULT_TAB_WID
         }
         return parseDiffWithLineNumbers(diffContent);
     }, [diffContent]);
-    const isNewFile = useMemo(() => {
-        if (parsedLines.length === 0)
-            return false;
-        return parsedLines.every((line) => line.type === 'add' ||
-            line.type === 'hunk' ||
-            line.type === 'other' ||
-            line.content.startsWith('diff --git') ||
-            line.content.startsWith('new file mode'));
-    }, [parsedLines]);
+    const isNewFileResult = useMemo(() => isNewFile(parsedLines), [parsedLines]);
     const renderedOutput = useMemo(() => {
         if (!diffContent || typeof diffContent !== 'string') {
             return _jsx(Text, { color: semanticTheme.status.warning, children: "No diff content." });
         }
         if (parsedLines.length === 0) {
-            return (_jsx(Box, { borderStyle: "round", borderColor: semanticTheme.border.default, padding: 1, children: _jsx(Text, { dimColor: true, children: "No changes detected." }) }));
+            return (_jsx(Box, { padding: 1, children: _jsx(Text, { dimColor: true, children: "No changes detected." }) }));
         }
         if (screenReaderEnabled) {
             return (_jsx(Box, { flexDirection: "column", children: parsedLines.map((line, index) => (_jsxs(Text, { children: [line.type, ": ", line.content] }, index))) }));
         }
-        if (isNewFile) {
+        if (isNewFileResult) {
             // Extract only the added lines' content
             const addedContent = parsedLines
                 .filter((line) => line.type === 'add')
                 .map((line) => line.content)
                 .join('\n');
             // Attempt to infer language from filename, default to plain text if no filename
-            const fileExtension = filename?.split('.').pop() || null;
+            const fileExtension = getFileExtension(filename);
             const language = fileExtension
                 ? getLanguageFromExtension(fileExtension)
                 : null;
@@ -114,26 +107,46 @@ export const DiffRenderer = ({ diffContent, filename, tabWidth = DEFAULT_TAB_WID
                 maxWidth: terminalWidth,
                 theme,
                 settings,
+                disableColor,
+                paddingX,
             });
         }
         else {
-            return renderDiffContent(parsedLines, filename, tabWidth, availableTerminalHeight, terminalWidth);
+            const key = filename ? `diff-box-${filename}` : undefined;
+            return (_jsx(MaxSizedBox, { paddingX: paddingX, maxHeight: availableTerminalHeight, maxWidth: terminalWidth, children: renderDiffLines({
+                    parsedLines,
+                    filename,
+                    tabWidth,
+                    terminalWidth,
+                    disableColor,
+                }) }, key));
         }
     }, [
         diffContent,
         parsedLines,
         screenReaderEnabled,
-        isNewFile,
+        isNewFileResult,
         filename,
         availableTerminalHeight,
         terminalWidth,
         theme,
         settings,
         tabWidth,
+        disableColor,
+        paddingX,
     ]);
     return renderedOutput;
 };
-const renderDiffContent = (parsedLines, filename, tabWidth = DEFAULT_TAB_WIDTH, availableTerminalHeight, terminalWidth) => {
+export const isNewFile = (parsedLines) => {
+    if (parsedLines.length === 0)
+        return false;
+    return parsedLines.every((line) => line.type === 'add' ||
+        line.type === 'hunk' ||
+        line.type === 'other' ||
+        line.content.startsWith('diff --git') ||
+        line.content.startsWith('new file mode'));
+};
+export const renderDiffLines = ({ parsedLines, filename, tabWidth = DEFAULT_TAB_WIDTH, terminalWidth, disableColor = false, }) => {
     // 1. Normalize whitespace (replace tabs with spaces) *before* further processing
     const normalizedLines = parsedLines.map((line) => ({
         ...line,
@@ -142,11 +155,13 @@ const renderDiffContent = (parsedLines, filename, tabWidth = DEFAULT_TAB_WIDTH,
     // Filter out non-displayable lines (hunks, potentially 'other') using the normalized list
     const displayableLines = normalizedLines.filter((l) => l.type !== 'hunk' && l.type !== 'other');
     if (displayableLines.length === 0) {
-        return (_jsx(Box, { borderStyle: "round", borderColor: semanticTheme.border.default, padding: 1, children: _jsx(Text, { dimColor: true, children: "No changes detected." }) }));
+        return [
+            _jsx(Box, { padding: 1, children: _jsx(Text, { dimColor: true, children: "No changes detected." }) }, "no-changes"),
+        ];
     }
     const maxLineNumber = Math.max(0, ...displayableLines.map((l) => l.oldLine ?? 0), ...displayableLines.map((l) => l.newLine ?? 0));
     const gutterWidth = Math.max(1, maxLineNumber.toString().length);
-    const fileExtension = filename?.split('.').pop() || null;
+    const fileExtension = getFileExtension(filename);
     const language = fileExtension
         ? getLanguageFromExtension(fileExtension)
         : null;
@@ -164,9 +179,6 @@ const renderDiffContent = (parsedLines, filename, tabWidth = DEFAULT_TAB_WIDTH,
     if (!isFinite(baseIndentation)) {
         baseIndentation = 0;
     }
-    const key = filename
-        ? `diff-box-${filename}`
-        : `diff-box-${crypto.createHash('sha1').update(JSON.stringify(parsedLines)).digest('hex')}`;
     let lastLineNumber = null;
     const MAX_CONTEXT_LINES_WITHOUT_GAP = 5;
     const content = displayableLines.reduce((acc, line, index) => {
@@ -213,19 +225,27 @@ const renderDiffContent = (parsedLines, filename, tabWidth = DEFAULT_TAB_WIDTH,
                 return acc;
         }
         const displayContent = line.content.substring(baseIndentation);
-        const backgroundColor = line.type === 'add'
-            ? semanticTheme.background.diff.added
-            : line.type === 'del'
-                ? semanticTheme.background.diff.removed
-                : undefined;
-        acc.push(_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: gutterWidth + 1, paddingRight: 1, flexShrink: 0, backgroundColor: backgroundColor, justifyContent: "flex-end", children: _jsx(Text, { color: semanticTheme.text.secondary, children: gutterNumStr }) }), line.type === 'context' ? (_jsxs(_Fragment, { children: [_jsxs(Text, { children: [prefixSymbol, " "] }), _jsx(Text, { wrap: "wrap", children: colorizeLine(displayContent, language) })] })) : (_jsxs(Text, { backgroundColor: line.type === 'add'
-                        ? semanticTheme.background.diff.added
-                        : semanticTheme.background.diff.removed, wrap: "wrap", children: [_jsx(Text, { color: line.type === 'add'
-                                ? semanticTheme.status.success
-                                : semanticTheme.status.error, children: prefixSymbol }), ' ', colorizeLine(displayContent, language)] }))] }, lineKey));
+        const backgroundColor = disableColor
+            ? undefined
+            : line.type === 'add'
+                ? semanticTheme.background.diff.added
+                : line.type === 'del'
+                    ? semanticTheme.background.diff.removed
+                    : undefined;
+        const gutterColor = disableColor
+            ? undefined
+            : semanticTheme.text.secondary;
+        const symbolColor = disableColor
+            ? undefined
+            : line.type === 'add'
+                ? semanticTheme.status.success
+                : line.type === 'del'
+                    ? semanticTheme.status.error
+                    : undefined;
+        acc.push(_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: gutterWidth + 1, paddingRight: 1, flexShrink: 0, backgroundColor: backgroundColor, justifyContent: "flex-end", children: _jsx(Text, { color: gutterColor, children: gutterNumStr }) }), line.type === 'context' ? (_jsxs(_Fragment, { children: [_jsxs(Text, { children: [prefixSymbol, " "] }), _jsx(Text, { wrap: "wrap", children: colorizeLine(displayContent, language, undefined, disableColor) })] })) : (_jsxs(Text, { backgroundColor: backgroundColor, wrap: "wrap", children: [_jsx(Text, { color: symbolColor, children: prefixSymbol }), ' ', colorizeLine(displayContent, language, undefined, disableColor)] }))] }, lineKey));
         return acc;
     }, []);
-    return (_jsx(MaxSizedBox, { maxHeight: availableTerminalHeight, maxWidth: terminalWidth, children: content }, key));
+    return content;
 };
 const getLanguageFromExtension = (extension) => {
     const languageMap = {