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

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

@@ -0,0 +1,258 @@
+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';
+import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
+function parseDiffWithLineNumbers(diffContent) {
+    const lines = diffContent.split('\n');
+    const result = [];
+    let currentOldLine = 0;
+    let currentNewLine = 0;
+    let inHunk = false;
+    const hunkHeaderRegex = /^@@ -(\d+),?\d* \+(\d+),?\d* @@/;
+    for (const line of lines) {
+        const hunkMatch = line.match(hunkHeaderRegex);
+        if (hunkMatch) {
+            currentOldLine = parseInt(hunkMatch[1], 10);
+            currentNewLine = parseInt(hunkMatch[2], 10);
+            inHunk = true;
+            result.push({ type: 'hunk', content: line });
+            // We need to adjust the starting point because the first line number applies to the *first* actual line change/context,
+            // but we increment *before* pushing that line. So decrement here.
+            currentOldLine--;
+            currentNewLine--;
+            continue;
+        }
+        if (!inHunk) {
+            // Skip standard Git header lines more robustly
+            if (line.startsWith('--- ')) {
+                continue;
+            }
+            // If it's not a hunk or header, skip (or handle as 'other' if needed)
+            continue;
+        }
+        if (line.startsWith('+')) {
+            currentNewLine++; // Increment before pushing
+            result.push({
+                type: 'add',
+                newLine: currentNewLine,
+                content: line.substring(1),
+            });
+        }
+        else if (line.startsWith('-')) {
+            currentOldLine++; // Increment before pushing
+            result.push({
+                type: 'del',
+                oldLine: currentOldLine,
+                content: line.substring(1),
+            });
+        }
+        else if (line.startsWith(' ')) {
+            currentOldLine++; // Increment before pushing
+            currentNewLine++;
+            result.push({
+                type: 'context',
+                oldLine: currentOldLine,
+                newLine: currentNewLine,
+                content: line.substring(1),
+            });
+        }
+        else if (line.startsWith('\\')) {
+            // Handle ""
+            result.push({ type: 'other', content: line });
+        }
+    }
+    return result;
+}
+const DEFAULT_TAB_WIDTH = 4; // Spaces per tab for normalization
+export const DiffRenderer = ({ diffContent, filename, tabWidth = DEFAULT_TAB_WIDTH, availableTerminalHeight, terminalWidth, theme, }) => {
+    const settings = useSettings();
+    const isAlternateBuffer = useAlternateBuffer();
+    const screenReaderEnabled = useIsScreenReaderEnabled();
+    const parsedLines = useMemo(() => {
+        if (!diffContent || typeof diffContent !== 'string') {
+            return [];
+        }
+        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 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." }) }));
+        }
+        if (screenReaderEnabled) {
+            return (_jsx(Box, { flexDirection: "column", children: parsedLines.map((line, index) => (_jsxs(Text, { children: [line.type, ": ", line.content] }, index))) }));
+        }
+        if (isNewFile) {
+            // 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 language = fileExtension
+                ? getLanguageFromExtension(fileExtension)
+                : null;
+            return colorizeCode({
+                code: addedContent,
+                language,
+                availableHeight: availableTerminalHeight,
+                maxWidth: terminalWidth,
+                theme,
+                settings,
+            });
+        }
+        else {
+            return renderDiffContent(parsedLines, filename, tabWidth, availableTerminalHeight, terminalWidth, !isAlternateBuffer);
+        }
+    }, [
+        diffContent,
+        parsedLines,
+        screenReaderEnabled,
+        isNewFile,
+        filename,
+        availableTerminalHeight,
+        terminalWidth,
+        theme,
+        settings,
+        isAlternateBuffer,
+        tabWidth,
+    ]);
+    return renderedOutput;
+};
+const renderDiffContent = (parsedLines, filename, tabWidth = DEFAULT_TAB_WIDTH, availableTerminalHeight, terminalWidth, useMaxSizedBox) => {
+    // 1. Normalize whitespace (replace tabs with spaces) *before* further processing
+    const normalizedLines = parsedLines.map((line) => ({
+        ...line,
+        content: line.content.replace(/\t/g, ' '.repeat(tabWidth)),
+    }));
+    // 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." }) }));
+    }
+    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 language = fileExtension
+        ? getLanguageFromExtension(fileExtension)
+        : null;
+    // Calculate the minimum indentation across all displayable lines
+    let baseIndentation = Infinity; // Start high to find the minimum
+    for (const line of displayableLines) {
+        // Only consider lines with actual content for indentation calculation
+        if (line.content.trim() === '')
+            continue;
+        const firstCharIndex = line.content.search(/\S/); // Find index of first non-whitespace char
+        const currentIndent = firstCharIndex === -1 ? 0 : firstCharIndex; // Indent is 0 if no non-whitespace found
+        baseIndentation = Math.min(baseIndentation, currentIndent);
+    }
+    // If baseIndentation remained Infinity (e.g., no displayable lines with content), default to 0
+    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) => {
+        // Determine the relevant line number for gap calculation based on type
+        let relevantLineNumberForGapCalc = null;
+        if (line.type === 'add' || line.type === 'context') {
+            relevantLineNumberForGapCalc = line.newLine ?? null;
+        }
+        else if (line.type === 'del') {
+            // For deletions, the gap is typically in relation to the original file's line numbering
+            relevantLineNumberForGapCalc = line.oldLine ?? null;
+        }
+        if (lastLineNumber !== null &&
+            relevantLineNumberForGapCalc !== null &&
+            relevantLineNumberForGapCalc >
+                lastLineNumber + MAX_CONTEXT_LINES_WITHOUT_GAP + 1) {
+            acc.push(_jsx(Box, { children: useMaxSizedBox ? (_jsx(Text, { wrap: "truncate", color: semanticTheme.text.secondary, children: '═'.repeat(terminalWidth) })) : (
+                // We can use a proper separator when not using max sized box.
+                _jsx(Box, { borderStyle: "double", borderLeft: false, borderRight: false, borderBottom: false, width: terminalWidth, borderColor: semanticTheme.text.secondary, marginRight: 1 })) }, `gap-${index}`));
+        }
+        const lineKey = `diff-line-${index}`;
+        let gutterNumStr = '';
+        let prefixSymbol = ' ';
+        switch (line.type) {
+            case 'add':
+                gutterNumStr = (line.newLine ?? '').toString();
+                prefixSymbol = '+';
+                lastLineNumber = line.newLine ?? null;
+                break;
+            case 'del':
+                gutterNumStr = (line.oldLine ?? '').toString();
+                prefixSymbol = '-';
+                // For deletions, update lastLineNumber based on oldLine if it's advancing.
+                // This helps manage gaps correctly if there are multiple consecutive deletions
+                // or if a deletion is followed by a context line far away in the original file.
+                if (line.oldLine !== undefined) {
+                    lastLineNumber = line.oldLine;
+                }
+                break;
+            case 'context':
+                gutterNumStr = (line.newLine ?? '').toString();
+                prefixSymbol = ' ';
+                lastLineNumber = line.newLine ?? null;
+                break;
+            default:
+                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: [useMaxSizedBox ? (_jsxs(Text, { color: semanticTheme.text.secondary, backgroundColor: backgroundColor, children: [gutterNumStr.padStart(gutterWidth), ' '] })) : (_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));
+        return acc;
+    }, []);
+    if (useMaxSizedBox) {
+        return (_jsx(MaxSizedBox, { maxHeight: availableTerminalHeight, maxWidth: terminalWidth, children: content }, key));
+    }
+    return (_jsx(Box, { flexDirection: "column", width: terminalWidth, flexShrink: 0, children: content }, key));
+};
+const getLanguageFromExtension = (extension) => {
+    const languageMap = {
+        js: 'javascript',
+        ts: 'typescript',
+        py: 'python',
+        json: 'json',
+        css: 'css',
+        html: 'html',
+        sh: 'bash',
+        md: 'markdown',
+        yaml: 'yaml',
+        yml: 'yaml',
+        txt: 'plaintext',
+        java: 'java',
+        c: 'c',
+        cpp: 'cpp',
+        rb: 'ruby',
+    };
+    return languageMap[extension] || null; // Return null if extension not found
+};
+//# sourceMappingURL=DiffRenderer.js.map

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

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

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

@@ -0,0 +1,231 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { OverflowProvider } from '../../contexts/OverflowContext.js';
+import { renderWithProviders } from '../../../test-utils/render.js';
+import { DiffRenderer } from './DiffRenderer.js';
+import * as CodeColorizer from '../../utils/CodeColorizer.js';
+import { vi } from 'vitest';
+describe('<OverflowProvider><DiffRenderer /></OverflowProvider>', () => {
+    const mockColorizeCode = vi.spyOn(CodeColorizer, 'colorizeCode');
+    beforeEach(() => {
+        mockColorizeCode.mockClear();
+    });
+    const sanitizeOutput = (output, terminalWidth) => output?.replace(/GAP_INDICATOR/g, '═'.repeat(terminalWidth));
+    describe.each([true, false])('with useAlternateBuffer = %s', (useAlternateBuffer) => {
+        it('should call colorizeCode with correct language for new file with known extension', () => {
+            const newFileDiffContent = `
+diff --git a/test.py b/test.py
+new file mode 100644
+index 0000000..e69de29
+--- /dev/null
++++ b/test.py
+@@ -0,0 +1 @@
++print("hello world")
+`;
+            renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: newFileDiffContent, filename: "test.py", terminalWidth: 80 }) }), { useAlternateBuffer });
+            expect(mockColorizeCode).toHaveBeenCalledWith({
+                code: 'print("hello world")',
+                language: 'python',
+                availableHeight: undefined,
+                maxWidth: 80,
+                theme: undefined,
+                settings: expect.anything(),
+            });
+        });
+        it('should call colorizeCode with null language for new file with unknown extension', () => {
+            const newFileDiffContent = `
+diff --git a/test.unknown b/test.unknown
+new file mode 100644
+index 0000000..e69de29
+--- /dev/null
++++ b/test.unknown
+@@ -0,0 +1 @@
++some content
+`;
+            renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: newFileDiffContent, filename: "test.unknown", terminalWidth: 80 }) }), { useAlternateBuffer });
+            expect(mockColorizeCode).toHaveBeenCalledWith({
+                code: 'some content',
+                language: null,
+                availableHeight: undefined,
+                maxWidth: 80,
+                theme: undefined,
+                settings: expect.anything(),
+            });
+        });
+        it('should call colorizeCode with null language for new file if no filename is provided', () => {
+            const newFileDiffContent = `
+diff --git a/test.txt b/test.txt
+new file mode 100644
+index 0000000..e69de29
+--- /dev/null
++++ b/test.txt
+@@ -0,0 +1 @@
++some text content
+`;
+            renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: newFileDiffContent, terminalWidth: 80 }) }), { useAlternateBuffer });
+            expect(mockColorizeCode).toHaveBeenCalledWith({
+                code: 'some text content',
+                language: null,
+                availableHeight: undefined,
+                maxWidth: 80,
+                theme: undefined,
+                settings: expect.anything(),
+            });
+        });
+        it('should render diff content for existing file (not calling colorizeCode directly for the whole block)', () => {
+            const existingFileDiffContent = `
+
+diff --git a/test.txt b/test.txt
+index 0000001..0000002 100644
+--- a/test.txt
++++ b/test.txt
+@@ -1 +1 @@
+-old line
++new line
+`;
+            const { lastFrame } = renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: existingFileDiffContent, filename: "test.txt", terminalWidth: 80 }) }), { useAlternateBuffer });
+            // colorizeCode is used internally by the line-by-line rendering, not for the whole block
+            expect(mockColorizeCode).not.toHaveBeenCalledWith(expect.objectContaining({
+                code: expect.stringContaining('old line'),
+            }));
+            expect(mockColorizeCode).not.toHaveBeenCalledWith(expect.objectContaining({
+                code: expect.stringContaining('new line'),
+            }));
+            expect(lastFrame()).toMatchSnapshot();
+        });
+        it('should handle diff with only header and no changes', () => {
+            const noChangeDiff = `diff --git a/file.txt b/file.txt
+index 1234567..1234567 100644
+--- a/file.txt
++++ b/file.txt
+`;
+            const { lastFrame } = renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: noChangeDiff, filename: "file.txt", terminalWidth: 80 }) }), { useAlternateBuffer });
+            expect(lastFrame()).toMatchSnapshot();
+            expect(mockColorizeCode).not.toHaveBeenCalled();
+        });
+        it('should handle empty diff content', () => {
+            const { lastFrame } = renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: "", terminalWidth: 80 }) }), { useAlternateBuffer });
+            expect(lastFrame()).toMatchSnapshot();
+            expect(mockColorizeCode).not.toHaveBeenCalled();
+        });
+        it('should render a gap indicator for skipped lines', () => {
+            const diffWithGap = `
+
+diff --git a/file.txt b/file.txt
+index 123..456 100644
+--- a/file.txt
++++ b/file.txt
+@@ -1,2 +1,2 @@
+ context line 1
+-deleted line
++added line
+@@ -10,2 +10,2 @@
+ context line 10
+ context line 11
+`;
+            const { lastFrame } = renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: diffWithGap, filename: "file.txt", terminalWidth: 80 }) }), { useAlternateBuffer });
+            expect(lastFrame()).toMatchSnapshot();
+        });
+        it('should not render a gap indicator for small gaps (<= MAX_CONTEXT_LINES_WITHOUT_GAP)', () => {
+            const diffWithSmallGap = `
+
+diff --git a/file.txt b/file.txt
+index abc..def 100644
+--- a/file.txt
++++ b/file.txt
+@@ -1,5 +1,5 @@
+ context line 1
+ context line 2
+ context line 3
+ context line 4
+ context line 5
+@@ -11,5 +11,5 @@
+ context line 11
+ context line 12
+ context line 13
+ context line 14
+ context line 15
+`;
+            const { lastFrame } = renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: diffWithSmallGap, filename: "file.txt", terminalWidth: 80 }) }), { useAlternateBuffer });
+            expect(lastFrame()).toMatchSnapshot();
+        });
+        describe('should correctly render a diff with multiple hunks and a gap indicator', () => {
+            const diffWithMultipleHunks = `
+
+diff --git a/multi.js b/multi.js
+index 123..789 100644
+--- a/multi.js
++++ b/multi.js
+@@ -1,3 +1,3 @@
+ console.log('first hunk');
+-const oldVar = 1;
++const newVar = 1;
+ console.log('end of first hunk');
+@@ -20,3 +20,3 @@
+ console.log('second hunk');
+-const anotherOld = 'test';
++const anotherNew = 'test';
+ console.log('end of second hunk');
+`;
+            it.each([
+                {
+                    terminalWidth: 80,
+                    height: undefined,
+                },
+                {
+                    terminalWidth: 80,
+                    height: 6,
+                },
+                {
+                    terminalWidth: 30,
+                    height: 6,
+                },
+            ])('with terminalWidth $terminalWidth and height $height', ({ terminalWidth, height }) => {
+                const { lastFrame } = renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: diffWithMultipleHunks, filename: "multi.js", terminalWidth: terminalWidth, availableTerminalHeight: height }) }), { useAlternateBuffer });
+                const output = lastFrame();
+                expect(sanitizeOutput(output, terminalWidth)).toMatchSnapshot();
+            });
+        });
+        it('should correctly render a diff with a SVN diff format', () => {
+            const newFileDiff = `
+
+fileDiff Index: file.txt
+===================================================================
+--- a/file.txt   Current
++++ b/file.txt   Proposed
+--- a/multi.js
++++ b/multi.js
+@@ -1,1 +1,1 @@
+-const oldVar = 1;
++const newVar = 1;
+@@ -20,1 +20,1 @@
+-const anotherOld = 'test';
++const anotherNew = 'test';
+\  
+`;
+            const { lastFrame } = renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: newFileDiff, filename: "TEST", terminalWidth: 80 }) }), { useAlternateBuffer });
+            expect(lastFrame()).toMatchSnapshot();
+        });
+        it('should correctly render a new file with no file extension correctly', () => {
+            const newFileDiff = `
+
+fileDiff Index: Dockerfile
+===================================================================
+--- Dockerfile   Current
++++ Dockerfile   Proposed
+@@ -0,0 +1,3 @@
++FROM node:14
++RUN npm install
++RUN npm run build
+\  
+`;
+            const { lastFrame } = renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: newFileDiff, filename: "Dockerfile", terminalWidth: 80 }) }), { useAlternateBuffer });
+            expect(lastFrame()).toMatchSnapshot();
+        });
+    });
+});
+//# sourceMappingURL=DiffRenderer.test.js.map

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

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

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

@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type React from 'react';
+interface ErrorMessageProps {
+    text: string;
+}
+export declare const ErrorMessage: React.FC<ErrorMessageProps>;
+export {};

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

@@ -0,0 +1,9 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Text, Box } from 'ink';
+import { theme } from '../../semantic-colors.js';
+export const ErrorMessage = ({ text }) => {
+    const prefix = '✕ ';
+    const prefixWidth = prefix.length;
+    return (_jsxs(Box, { flexDirection: "row", marginBottom: 1, children: [_jsx(Box, { width: prefixWidth, children: _jsx(Text, { color: theme.status.error, children: prefix }) }), _jsx(Box, { flexGrow: 1, children: _jsx(Text, { wrap: "wrap", color: theme.status.error, children: text }) })] }));
+};
+//# sourceMappingURL=ErrorMessage.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ErrorMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ErrorMessage.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAMjD,MAAM,CAAC,MAAM,YAAY,GAAgC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;IACpE,MAAM,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;IAElC,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,KAAK,EAAC,YAAY,EAAE,CAAC,aACtC,KAAC,GAAG,IAAC,KAAK,EAAE,WAAW,YACrB,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,YAAG,MAAM,GAAQ,GAC5C,EACN,KAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,YACd,KAAC,IAAI,IAAC,IAAI,EAAC,MAAM,EAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,YACxC,IAAI,GACA,GACH,IACF,CACP,CAAC;AACJ,CAAC,CAAC"}

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

@@ -0,0 +1,23 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { render } from '../../../test-utils/render.js';
+import { ErrorMessage } from './ErrorMessage.js';
+import { describe, it, expect } from 'vitest';
+describe('ErrorMessage', () => {
+    it('renders with the correct prefix and text', () => {
+        const { lastFrame } = render(_jsx(ErrorMessage, { text: "Something went wrong" }));
+        const output = lastFrame();
+        expect(output).toMatchSnapshot();
+    });
+    it('renders multiline error messages', () => {
+        const message = 'Error line 1\nError line 2';
+        const { lastFrame } = render(_jsx(ErrorMessage, { text: message }));
+        const output = lastFrame();
+        expect(output).toMatchSnapshot();
+    });
+});
+//# sourceMappingURL=ErrorMessage.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ErrorMessage.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ErrorMessage.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE9C,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,KAAC,YAAY,IAAC,IAAI,EAAC,sBAAsB,GAAG,CAAC,CAAC;QAC3E,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAE3B,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,OAAO,GAAG,4BAA4B,CAAC;QAC7C,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,KAAC,YAAY,IAAC,IAAI,EAAE,OAAO,GAAI,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAE3B,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -0,0 +1,14 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type React from 'react';
+interface GeminiMessageProps {
+    text: string;
+    isPending: boolean;
+    availableTerminalHeight?: number;
+    terminalWidth: number;
+}
+export declare const GeminiMessage: React.FC<GeminiMessageProps>;
+export {};

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

@@ -0,0 +1,15 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+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';
+import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
+export const GeminiMessage = ({ text, isPending, availableTerminalHeight, terminalWidth, }) => {
+    const { renderMarkdown } = useUIState();
+    const prefix = '✦ ';
+    const prefixWidth = prefix.length;
+    const isAlternateBuffer = useAlternateBuffer();
+    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: isAlternateBuffer ? undefined : availableTerminalHeight, terminalWidth: terminalWidth, renderMarkdown: renderMarkdown }) })] }));
+};
+//# sourceMappingURL=GeminiMessage.js.map

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

@@ -0,0 +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;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AASvE,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,MAAM,iBAAiB,GAAG,kBAAkB,EAAE,CAAC;IAC/C,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,EACrB,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,uBAAuB,EAEzD,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 {};