@machina.ai/cell-cli 1.22.5-rc1 → 1.25.0-rc3

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

@@ -6,6 +6,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
  */
 import { OverflowProvider } from '../../contexts/OverflowContext.js';
 import { renderWithProviders } from '../../../test-utils/render.js';
+import { waitFor } from '../../../test-utils/async.js';
 import { DiffRenderer } from './DiffRenderer.js';
 import * as CodeColorizer from '../../utils/CodeColorizer.js';
 import { vi } from 'vitest';
@@ -16,7 +17,7 @@ describe('<OverflowProvider><DiffRenderer /></OverflowProvider>', () => {
     });
     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', () => {
+        it('should call colorizeCode with correct language for new file with known extension', async () => {
             const newFileDiffContent = `
 diff --git a/test.py b/test.py
 new file mode 100644
@@ -27,16 +28,16 @@ index 0000000..e69de29
 +print("hello world")
 `;
             renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: newFileDiffContent, filename: "test.py", terminalWidth: 80 }) }), { useAlternateBuffer });
-            expect(mockColorizeCode).toHaveBeenCalledWith({
+            await waitFor(() => 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', () => {
+        it('should call colorizeCode with null language for new file with unknown extension', async () => {
             const newFileDiffContent = `
 diff --git a/test.unknown b/test.unknown
 new file mode 100644
@@ -47,16 +48,16 @@ index 0000000..e69de29
 +some content
 `;
             renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: newFileDiffContent, filename: "test.unknown", terminalWidth: 80 }) }), { useAlternateBuffer });
-            expect(mockColorizeCode).toHaveBeenCalledWith({
+            await waitFor(() => 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', () => {
+        it('should call colorizeCode with null language for new file if no filename is provided', async () => {
             const newFileDiffContent = `
 diff --git a/test.txt b/test.txt
 new file mode 100644
@@ -67,16 +68,16 @@ index 0000000..e69de29
 +some text content
 `;
             renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: newFileDiffContent, terminalWidth: 80 }) }), { useAlternateBuffer });
-            expect(mockColorizeCode).toHaveBeenCalledWith({
+            await waitFor(() => 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)', () => {
+        it('should render diff content for existing file (not calling colorizeCode directly for the whole block)', async () => {
             const existingFileDiffContent = `
 
 diff --git a/test.txt b/test.txt
@@ -89,6 +90,7 @@ index 0000001..0000002 100644
 `;
             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
+            await waitFor(() => expect(lastFrame()).toContain('new line'));
             expect(mockColorizeCode).not.toHaveBeenCalledWith(expect.objectContaining({
                 code: expect.stringContaining('old line'),
             }));
@@ -97,22 +99,24 @@ index 0000001..0000002 100644
             }));
             expect(lastFrame()).toMatchSnapshot();
         });
-        it('should handle diff with only header and no changes', () => {
+        it('should handle diff with only header and no changes', async () => {
             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 });
+            await waitFor(() => expect(lastFrame()).toBeDefined());
             expect(lastFrame()).toMatchSnapshot();
             expect(mockColorizeCode).not.toHaveBeenCalled();
         });
-        it('should handle empty diff content', () => {
+        it('should handle empty diff content', async () => {
             const { lastFrame } = renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: "", terminalWidth: 80 }) }), { useAlternateBuffer });
+            await waitFor(() => expect(lastFrame()).toBeDefined());
             expect(lastFrame()).toMatchSnapshot();
             expect(mockColorizeCode).not.toHaveBeenCalled();
         });
-        it('should render a gap indicator for skipped lines', () => {
+        it('should render a gap indicator for skipped lines', async () => {
             const diffWithGap = `
 
 diff --git a/file.txt b/file.txt
@@ -128,9 +132,10 @@ index 123..456 100644
  context line 11
 `;
             const { lastFrame } = renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: diffWithGap, filename: "file.txt", terminalWidth: 80 }) }), { useAlternateBuffer });
+            await waitFor(() => expect(lastFrame()).toContain('added line'));
             expect(lastFrame()).toMatchSnapshot();
         });
-        it('should not render a gap indicator for small gaps (<= MAX_CONTEXT_LINES_WITHOUT_GAP)', () => {
+        it('should not render a gap indicator for small gaps (<= MAX_CONTEXT_LINES_WITHOUT_GAP)', async () => {
             const diffWithSmallGap = `
 
 diff --git a/file.txt b/file.txt
@@ -151,6 +156,7 @@ index abc..def 100644
  context line 15
 `;
             const { lastFrame } = renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: diffWithSmallGap, filename: "file.txt", terminalWidth: 80 }) }), { useAlternateBuffer });
+            await waitFor(() => expect(lastFrame()).toContain('context line 15'));
             expect(lastFrame()).toMatchSnapshot();
         });
         describe('should correctly render a diff with multiple hunks and a gap indicator', () => {
@@ -184,13 +190,14 @@ index 123..789 100644
                     terminalWidth: 30,
                     height: 6,
                 },
-            ])('with terminalWidth $terminalWidth and height $height', ({ terminalWidth, height }) => {
+            ])('with terminalWidth $terminalWidth and height $height', async ({ terminalWidth, height }) => {
                 const { lastFrame } = renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: diffWithMultipleHunks, filename: "multi.js", terminalWidth: terminalWidth, availableTerminalHeight: height }) }), { useAlternateBuffer });
+                await waitFor(() => expect(lastFrame()).toContain('anotherNew'));
                 const output = lastFrame();
                 expect(sanitizeOutput(output, terminalWidth)).toMatchSnapshot();
             });
         });
-        it('should correctly render a diff with a SVN diff format', () => {
+        it('should correctly render a diff with a SVN diff format', async () => {
             const newFileDiff = `
 
 fileDiff Index: file.txt
@@ -208,9 +215,10 @@ fileDiff Index: file.txt
 \  
 `;
             const { lastFrame } = renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: newFileDiff, filename: "TEST", terminalWidth: 80 }) }), { useAlternateBuffer });
+            await waitFor(() => expect(lastFrame()).toContain('newVar'));
             expect(lastFrame()).toMatchSnapshot();
         });
-        it('should correctly render a new file with no file extension correctly', () => {
+        it('should correctly render a new file with no file extension correctly', async () => {
             const newFileDiff = `
 
 fileDiff Index: Dockerfile
@@ -224,6 +232,7 @@ fileDiff Index: Dockerfile
 \  
 `;
             const { lastFrame } = renderWithProviders(_jsx(OverflowProvider, { children: _jsx(DiffRenderer, { diffContent: newFileDiff, filename: "Dockerfile", terminalWidth: 80 }) }), { useAlternateBuffer });
+            await waitFor(() => expect(lastFrame()).toContain('RUN npm run build'));
             expect(lastFrame()).toMatchSnapshot();
         });
     });

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

@@ -1 +1 @@
-{"version":3,"file":"DiffRenderer.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/DiffRenderer.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,aAAa,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE5B,QAAQ,CAAC,uDAAuD,EAAE,GAAG,EAAE;IACrE,MAAM,gBAAgB,GAAG,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAEjE,UAAU,CAAC,GAAG,EAAE;QACd,gBAAgB,CAAC,SAAS,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,CAAC,MAA0B,EAAE,aAAqB,EAAE,EAAE,CAC3E,MAAM,EAAE,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;IAE/D,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAC1B,8BAA8B,EAC9B,CAAC,kBAAkB,EAAE,EAAE;QACrB,EAAE,CAAC,kFAAkF,EAAE,GAAG,EAAE;YAC1F,MAAM,kBAAkB,GAAG;;;;;;;;CAQlC,CAAC;YACM,mBAAmB,CACjB,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,kBAAkB,EAC/B,QAAQ,EAAC,SAAS,EAClB,aAAa,EAAE,EAAE,GACjB,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,CAAC,gBAAgB,CAAC,CAAC,oBAAoB,CAAC;gBAC5C,IAAI,EAAE,sBAAsB;gBAC5B,QAAQ,EAAE,QAAQ;gBAClB,eAAe,EAAE,SAAS;gBAC1B,QAAQ,EAAE,EAAE;gBACZ,KAAK,EAAE,SAAS;gBAChB,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;aAC5B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iFAAiF,EAAE,GAAG,EAAE;YACzF,MAAM,kBAAkB,GAAG;;;;;;;;CAQlC,CAAC;YACM,mBAAmB,CACjB,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,kBAAkB,EAC/B,QAAQ,EAAC,cAAc,EACvB,aAAa,EAAE,EAAE,GACjB,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,CAAC,gBAAgB,CAAC,CAAC,oBAAoB,CAAC;gBAC5C,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE,SAAS;gBAC1B,QAAQ,EAAE,EAAE;gBACZ,KAAK,EAAE,SAAS;gBAChB,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;aAC5B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qFAAqF,EAAE,GAAG,EAAE;YAC7F,MAAM,kBAAkB,GAAG;;;;;;;;CAQlC,CAAC;YACM,mBAAmB,CACjB,KAAC,gBAAgB,cACf,KAAC,YAAY,IAAC,WAAW,EAAE,kBAAkB,EAAE,aAAa,EAAE,EAAE,GAAI,GACnD,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,CAAC,gBAAgB,CAAC,CAAC,oBAAoB,CAAC;gBAC5C,IAAI,EAAE,mBAAmB;gBACzB,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE,SAAS;gBAC1B,QAAQ,EAAE,EAAE;gBACZ,KAAK,EAAE,SAAS;gBAChB,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;aAC5B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sGAAsG,EAAE,GAAG,EAAE;YAC9G,MAAM,uBAAuB,GAAG;;;;;;;;;CASvC,CAAC;YACM,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,uBAAuB,EACpC,QAAQ,EAAC,UAAU,EACnB,aAAa,EAAE,EAAE,GACjB,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,yFAAyF;YACzF,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,oBAAoB,CAC/C,MAAM,CAAC,gBAAgB,CAAC;gBACtB,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,UAAU,CAAC;aAC1C,CAAC,CACH,CAAC;YACF,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,oBAAoB,CAC/C,MAAM,CAAC,gBAAgB,CAAC;gBACtB,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,UAAU,CAAC;aAC1C,CAAC,CACH,CAAC;YACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;YAC5D,MAAM,YAAY,GAAG;;;;CAI5B,CAAC;YACM,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,YAAY,EACzB,QAAQ,EAAC,UAAU,EACnB,aAAa,EAAE,EAAE,GACjB,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;YACtC,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;YAC1C,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,cACf,KAAC,YAAY,IAAC,WAAW,EAAC,EAAE,EAAC,aAAa,EAAE,EAAE,GAAI,GACjC,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;YACtC,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;YACzD,MAAM,WAAW,GAAG;;;;;;;;;;;;;CAa3B,CAAC;YACM,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAC,UAAU,EACnB,aAAa,EAAE,EAAE,GACjB,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qFAAqF,EAAE,GAAG,EAAE;YAC7F,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;CAkBhC,CAAC;YACM,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,gBAAgB,EAC7B,QAAQ,EAAC,UAAU,EACnB,aAAa,EAAE,EAAE,GACjB,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,wEAAwE,EAAE,GAAG,EAAE;YACtF,MAAM,qBAAqB,GAAG;;;;;;;;;;;;;;;;CAgBrC,CAAC;YAEM,EAAE,CAAC,IAAI,CAAC;gBACN;oBACE,aAAa,EAAE,EAAE;oBACjB,MAAM,EAAE,SAAS;iBAClB;gBACD;oBACE,aAAa,EAAE,EAAE;oBACjB,MAAM,EAAE,CAAC;iBACV;gBACD;oBACE,aAAa,EAAE,EAAE;oBACjB,MAAM,EAAE,CAAC;iBACV;aACF,CAAC,CACA,sDAAsD,EACtD,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,EAAE;gBAC5B,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,qBAAqB,EAClC,QAAQ,EAAC,UAAU,EACnB,aAAa,EAAE,aAAa,EAC5B,uBAAuB,EAAE,MAAM,GAC/B,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;gBACF,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;gBAC3B,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC;YAClE,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAC/D,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;CAe3B,CAAC;YACM,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAC,MAAM,EACf,aAAa,EAAE,EAAE,GACjB,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;YAC7E,MAAM,WAAW,GAAG;;;;;;;;;;;CAW3B,CAAC;YACM,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAC,YAAY,EACrB,aAAa,EAAE,EAAE,GACjB,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC,CACF,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"DiffRenderer.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/DiffRenderer.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,aAAa,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE5B,QAAQ,CAAC,uDAAuD,EAAE,GAAG,EAAE;IACrE,MAAM,gBAAgB,GAAG,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAEjE,UAAU,CAAC,GAAG,EAAE;QACd,gBAAgB,CAAC,SAAS,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,CAAC,MAA0B,EAAE,aAAqB,EAAE,EAAE,CAC3E,MAAM,EAAE,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;IAE/D,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAC1B,8BAA8B,EAC9B,CAAC,kBAAkB,EAAE,EAAE;QACrB,EAAE,CAAC,kFAAkF,EAAE,KAAK,IAAI,EAAE;YAChG,MAAM,kBAAkB,GAAG;;;;;;;;CAQlC,CAAC;YACM,mBAAmB,CACjB,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,kBAAkB,EAC/B,QAAQ,EAAC,SAAS,EAClB,aAAa,EAAE,EAAE,GACjB,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,OAAO,CAAC,GAAG,EAAE,CACjB,MAAM,CAAC,gBAAgB,CAAC,CAAC,oBAAoB,CAAC;gBAC5C,IAAI,EAAE,sBAAsB;gBAC5B,QAAQ,EAAE,QAAQ;gBAClB,eAAe,EAAE,SAAS;gBAC1B,QAAQ,EAAE,EAAE;gBACZ,KAAK,EAAE,SAAS;gBAChB,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;aAC5B,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iFAAiF,EAAE,KAAK,IAAI,EAAE;YAC/F,MAAM,kBAAkB,GAAG;;;;;;;;CAQlC,CAAC;YACM,mBAAmB,CACjB,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,kBAAkB,EAC/B,QAAQ,EAAC,cAAc,EACvB,aAAa,EAAE,EAAE,GACjB,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,OAAO,CAAC,GAAG,EAAE,CACjB,MAAM,CAAC,gBAAgB,CAAC,CAAC,oBAAoB,CAAC;gBAC5C,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE,SAAS;gBAC1B,QAAQ,EAAE,EAAE;gBACZ,KAAK,EAAE,SAAS;gBAChB,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;aAC5B,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qFAAqF,EAAE,KAAK,IAAI,EAAE;YACnG,MAAM,kBAAkB,GAAG;;;;;;;;CAQlC,CAAC;YACM,mBAAmB,CACjB,KAAC,gBAAgB,cACf,KAAC,YAAY,IAAC,WAAW,EAAE,kBAAkB,EAAE,aAAa,EAAE,EAAE,GAAI,GACnD,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,OAAO,CAAC,GAAG,EAAE,CACjB,MAAM,CAAC,gBAAgB,CAAC,CAAC,oBAAoB,CAAC;gBAC5C,IAAI,EAAE,mBAAmB;gBACzB,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE,SAAS;gBAC1B,QAAQ,EAAE,EAAE;gBACZ,KAAK,EAAE,SAAS;gBAChB,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;aAC5B,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sGAAsG,EAAE,KAAK,IAAI,EAAE;YACpH,MAAM,uBAAuB,GAAG;;;;;;;;;CASvC,CAAC;YACM,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,uBAAuB,EACpC,QAAQ,EAAC,UAAU,EACnB,aAAa,EAAE,EAAE,GACjB,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,yFAAyF;YACzF,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/D,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,oBAAoB,CAC/C,MAAM,CAAC,gBAAgB,CAAC;gBACtB,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,UAAU,CAAC;aAC1C,CAAC,CACH,CAAC;YACF,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,oBAAoB,CAC/C,MAAM,CAAC,gBAAgB,CAAC;gBACtB,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,UAAU,CAAC;aAC1C,CAAC,CACH,CAAC;YACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YAClE,MAAM,YAAY,GAAG;;;;CAI5B,CAAC;YACM,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,YAAY,EACzB,QAAQ,EAAC,UAAU,EACnB,aAAa,EAAE,EAAE,GACjB,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;YACvD,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;YACtC,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;YAChD,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,cACf,KAAC,YAAY,IAAC,WAAW,EAAC,EAAE,EAAC,aAAa,EAAE,EAAE,GAAI,GACjC,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;YACvD,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;YACtC,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC/D,MAAM,WAAW,GAAG;;;;;;;;;;;;;CAa3B,CAAC;YACM,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAC,UAAU,EACnB,aAAa,EAAE,EAAE,GACjB,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;YACjE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qFAAqF,EAAE,KAAK,IAAI,EAAE;YACnG,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;CAkBhC,CAAC;YACM,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,gBAAgB,EAC7B,QAAQ,EAAC,UAAU,EACnB,aAAa,EAAE,EAAE,GACjB,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACtE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,wEAAwE,EAAE,GAAG,EAAE;YACtF,MAAM,qBAAqB,GAAG;;;;;;;;;;;;;;;;CAgBrC,CAAC;YAEM,EAAE,CAAC,IAAI,CAAC;gBACN;oBACE,aAAa,EAAE,EAAE;oBACjB,MAAM,EAAE,SAAS;iBAClB;gBACD;oBACE,aAAa,EAAE,EAAE;oBACjB,MAAM,EAAE,CAAC;iBACV;gBACD;oBACE,aAAa,EAAE,EAAE;oBACjB,MAAM,EAAE,CAAC;iBACV;aACF,CAAC,CACA,sDAAsD,EACtD,KAAK,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,EAAE;gBAClC,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,qBAAqB,EAClC,QAAQ,EAAC,UAAU,EACnB,aAAa,EAAE,aAAa,EAC5B,uBAAuB,EAAE,MAAM,GAC/B,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;gBACF,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;gBACjE,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;gBAC3B,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC;YAClE,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;YACrE,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;CAe3B,CAAC;YACM,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAC,MAAM,EACf,aAAa,EAAE,EAAE,GACjB,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC7D,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;YACnF,MAAM,WAAW,GAAG;;;;;;;;;;;CAW3B,CAAC;YACM,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,gBAAgB,cACf,KAAC,YAAY,IACX,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAC,YAAY,EACrB,aAAa,EAAE,EAAE,GACjB,GACe,EACnB,EAAE,kBAAkB,EAAE,CACvB,CAAC;YACF,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAC;YACxE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC,CACF,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/dist/src/ui/components/messages/ShellToolMessage.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
@@ -24,18 +24,21 @@ export const ShellToolMessage = ({ name, description, resultDisplay, status, ava
         ptyId === activeShellPtyId &&
         embeddedShellFocused;
     const { setEmbeddedShellFocused } = useUIActions();
-    const containerRef = React.useRef(null);
+    const headerRef = React.useRef(null);
+    const contentRef = React.useRef(null);
     // The shell is focusable if it's the shell command, it's executing, and the interactive shell is enabled.
     const isThisShellFocusable = (name === SHELL_COMMAND_NAME ||
         name === SHELL_NAME ||
         name === SHELL_TOOL_NAME) &&
         status === ToolCallStatus.Executing &&
         config?.getEnableInteractiveShell();
-    useMouseClick(containerRef, () => {
+    const handleFocus = () => {
         if (isThisShellFocusable) {
             setEmbeddedShellFocused(true);
         }
-    }, { isActive: !!isThisShellFocusable });
+    };
+    useMouseClick(headerRef, handleFocus, { isActive: !!isThisShellFocusable });
+    useMouseClick(contentRef, handleFocus, { isActive: !!isThisShellFocusable });
     const wasFocusedRef = React.useRef(false);
     React.useEffect(() => {
         if (isThisShellFocused) {
@@ -71,6 +74,6 @@ export const ShellToolMessage = ({ name, description, resultDisplay, status, ava
         }
     }, [isThisShellFocused]);
     const shouldShowFocusHint = isThisShellFocusable && (showFocusHint || userHasFocused);
-    return (_jsxs(Box, { ref: containerRef, flexDirection: "column", width: terminalWidth, children: [_jsxs(StickyHeader, { width: terminalWidth, isFirst: isFirst, borderColor: borderColor, borderDimColor: borderDimColor, children: [_jsx(ToolStatusIndicator, { status: status, name: name }), _jsx(ToolInfo, { name: name, status: status, description: description, emphasis: emphasis }), shouldShowFocusHint && (_jsx(Box, { marginLeft: 1, flexShrink: 0, children: _jsx(Text, { color: theme.text.accent, children: isThisShellFocused ? '(Focused)' : '(ctrl+f to focus)' }) })), emphasis === 'high' && _jsx(TrailingIndicator, {})] }), _jsxs(Box, { width: terminalWidth, borderStyle: "round", borderColor: borderColor, borderDimColor: borderDimColor, borderTop: false, borderBottom: false, borderLeft: true, borderRight: true, paddingX: 1, flexDirection: "column", children: [_jsx(ToolResultDisplay, { resultDisplay: resultDisplay, availableTerminalHeight: availableTerminalHeight, terminalWidth: terminalWidth, renderOutputAsMarkdown: renderOutputAsMarkdown }), isThisShellFocused && config && (_jsx(Box, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: _jsx(ShellInputPrompt, { activeShellPtyId: activeShellPtyId ?? null, focus: embeddedShellFocused }) }))] })] }));
+    return (_jsxs(_Fragment, { children: [_jsxs(StickyHeader, { width: terminalWidth, isFirst: isFirst, borderColor: borderColor, borderDimColor: borderDimColor, containerRef: headerRef, 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)' : '(tab to focus)' }) })), emphasis === 'high' && _jsx(TrailingIndicator, {})] }), _jsxs(Box, { ref: contentRef, width: terminalWidth, borderStyle: "round", borderColor: borderColor, borderDimColor: borderDimColor, borderTop: false, borderBottom: false, borderLeft: true, borderRight: true, paddingX: 1, flexDirection: "column", children: [_jsx(ToolResultDisplay, { resultDisplay: resultDisplay, availableTerminalHeight: availableTerminalHeight, terminalWidth: terminalWidth, renderOutputAsMarkdown: renderOutputAsMarkdown }), isThisShellFocused && config && (_jsx(Box, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: _jsx(ShellInputPrompt, { activeShellPtyId: activeShellPtyId ?? null, focus: embeddedShellFocused }) }))] })] }));
 };
 //# sourceMappingURL=ShellToolMessage.js.map

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

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

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

@@ -8,11 +8,9 @@ import { RadioButtonSelect } from '../shared/RadioButtonSelect.js';
 import { MaxSizedBox } from '../shared/MaxSizedBox.js';
 import { useKeypress } from '../../hooks/useKeypress.js';
 import { theme } from '../../semantic-colors.js';
-import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
 import { useSettings } from '../../contexts/SettingsContext.js';
 export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused = true, availableTerminalHeight, terminalWidth, }) => {
     const { onConfirm } = confirmationDetails;
-    const isAlternateBuffer = useAlternateBuffer();
     const settings = useSettings();
     const allowPermanentApproval = settings.merged.security?.enablePermanentToolApproval ?? false;
     const [ideClient, setIdeClient] = useState(null);
@@ -217,8 +215,7 @@ export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused
             if (bodyContentHeight !== undefined) {
                 bodyContentHeight -= 2; // Account for padding;
             }
-            const commandBox = (_jsx(Box, { children: _jsx(Text, { color: theme.text.link, children: executionProps.command }) }));
-            bodyContent = isAlternateBuffer ? (commandBox) : (_jsx(MaxSizedBox, { maxHeight: bodyContentHeight, maxWidth: Math.max(terminalWidth, 1), children: commandBox }));
+            bodyContent = (_jsx(MaxSizedBox, { maxHeight: bodyContentHeight, maxWidth: Math.max(terminalWidth, 1), children: _jsx(Box, { children: _jsx(Text, { color: theme.text.link, children: executionProps.command }) }) }));
         }
         else if (confirmationDetails.type === 'info') {
             const infoProps = confirmationDetails;
@@ -239,7 +236,6 @@ export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused
         isDiffingEnabled,
         availableTerminalHeight,
         terminalWidth,
-        isAlternateBuffer,
         allowPermanentApproval,
     ]);
     if (confirmationDetails.type === 'edit') {

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

@@ -1 +1 @@
-{"version":3,"file":"ToolConfirmationMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ToolConfirmationMessage.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ToolConfirmationMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ToolConfirmationMessage.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAKrE,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAE7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAUhE,MAAM,CAAC,MAAM,uBAAuB,GAEhC,CAAC,EACH,mBAAmB,EACnB,MAAM,EACN,SAAS,GAAG,IAAI,EAChB,uBAAuB,EACvB,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC;IAE1C,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,sBAAsB,GAC1B,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,2BAA2B,IAAI,KAAK,CAAC;IAEjE,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAmB,IAAI,CAAC,CAAC;IACnE,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEhE,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAI,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;YACxB,MAAM,YAAY,GAAG,KAAK,IAAI,EAAE;gBAC9B,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC;gBAC7C,IAAI,SAAS,EAAE,CAAC;oBACd,YAAY,CAAC,MAAM,CAAC,CAAC;oBACrB,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,EAAE,IAAI,KAAK,CAAC,CAAC;gBAC3D,CAAC;YACH,CAAC,CAAC;YACF,mEAAmE;YACnE,YAAY,EAAE,CAAC;QACjB,CAAC;QACD,OAAO,GAAG,EAAE;YACV,SAAS,GAAG,KAAK,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,MAAM,aAAa,GAAG,KAAK,EAAE,OAAgC,EAAE,EAAE;QAC/D,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACxC,IAAI,MAAM,CAAC,UAAU,EAAE,IAAI,gBAAgB,EAAE,CAAC;gBAC5C,MAAM,UAAU,GACd,OAAO,KAAK,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;gBACvE,MAAM,SAAS,EAAE,kBAAkB,CACjC,mBAAmB,CAAC,QAAQ,EAC5B,UAAU,CACX,CAAC;YACJ,CAAC;QACH,CAAC;QACD,mEAAmE;QACnE,SAAS,CAAC,OAAO,CAAC,CAAC;IACrB,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;IAEjD,WAAW,CACT,CAAC,GAAG,EAAE,EAAE;QACN,IAAI,CAAC,SAAS;YAAE,OAAO;QACvB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YAC5D,mEAAmE;YACnE,aAAa,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAChD,CAAC;IACH,CAAC,EACD,EAAE,QAAQ,EAAE,SAAS,EAAE,CACxB,CAAC;IAEF,MAAM,YAAY,GAAG,CAAC,IAA6B,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE;QACtD,IAAI,WAAW,GAA2B,IAAI,CAAC;QAC/C,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,MAAM,OAAO,GAAoD,EAAE,CAAC;QAEpE,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACxC,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,CAAC;gBACrC,QAAQ,GAAG,oBAAoB,CAAC;gBAChC,OAAO,CAAC,IAAI,CAAC;oBACX,KAAK,EAAE,YAAY;oBACnB,KAAK,EAAE,uBAAuB,CAAC,WAAW;oBAC1C,GAAG,EAAE,YAAY;iBAClB,CAAC,CAAC;gBACH,IAAI,eAAe,EAAE,CAAC;oBACpB,OAAO,CAAC,IAAI,CAAC;wBACX,KAAK,EAAE,wBAAwB;wBAC/B,KAAK,EAAE,uBAAuB,CAAC,aAAa;wBAC5C,GAAG,EAAE,wBAAwB;qBAC9B,CAAC,CAAC;oBACH,IAAI,sBAAsB,EAAE,CAAC;wBAC3B,OAAO,CAAC,IAAI,CAAC;4BACX,KAAK,EAAE,+BAA+B;4BACtC,KAAK,EAAE,uBAAuB,CAAC,oBAAoB;4BACnD,GAAG,EAAE,+BAA+B;yBACrC,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBAC9C,OAAO,CAAC,IAAI,CAAC;wBACX,KAAK,EAAE,6BAA6B;wBACpC,KAAK,EAAE,uBAAuB,CAAC,gBAAgB;wBAC/C,GAAG,EAAE,6BAA6B;qBACnC,CAAC,CAAC;gBACL,CAAC;gBAED,OAAO,CAAC,IAAI,CAAC;oBACX,KAAK,EAAE,2BAA2B;oBAClC,KAAK,EAAE,uBAAuB,CAAC,MAAM;oBACrC,GAAG,EAAE,2BAA2B;iBACjC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;aAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC/C,MAAM,cAAc,GAAG,mBAAmB,CAAC;YAE3C,QAAQ,GAAG,wBAAwB,cAAc,CAAC,WAAW,IAAI,CAAC;YAClE,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,YAAY;gBACnB,KAAK,EAAE,uBAAuB,CAAC,WAAW;gBAC1C,GAAG,EAAE,YAAY;aAClB,CAAC,CAAC;YACH,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO,CAAC,IAAI,CAAC;oBACX,KAAK,EAAE,wBAAwB;oBAC/B,KAAK,EAAE,uBAAuB,CAAC,aAAa;oBAC5C,GAAG,EAAE,wBAAwB;iBAC9B,CAAC,CAAC;gBACH,IAAI,sBAAsB,EAAE,CAAC;oBAC3B,OAAO,CAAC,IAAI,CAAC;wBACX,KAAK,EAAE,+BAA+B;wBACtC,KAAK,EAAE,uBAAuB,CAAC,oBAAoB;wBACnD,GAAG,EAAE,+BAA+B;qBACrC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YACD,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,2BAA2B;gBAClC,KAAK,EAAE,uBAAuB,CAAC,MAAM;gBACrC,GAAG,EAAE,2BAA2B;aACjC,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC/C,QAAQ,GAAG,yBAAyB,CAAC;YACrC,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,YAAY;gBACnB,KAAK,EAAE,uBAAuB,CAAC,WAAW;gBAC1C,GAAG,EAAE,YAAY;aAClB,CAAC,CAAC;YACH,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO,CAAC,IAAI,CAAC;oBACX,KAAK,EAAE,wBAAwB;oBAC/B,KAAK,EAAE,uBAAuB,CAAC,aAAa;oBAC5C,GAAG,EAAE,wBAAwB;iBAC9B,CAAC,CAAC;gBACH,IAAI,sBAAsB,EAAE,CAAC;oBAC3B,OAAO,CAAC,IAAI,CAAC;wBACX,KAAK,EAAE,+BAA+B;wBACtC,KAAK,EAAE,uBAAuB,CAAC,oBAAoB;wBACnD,GAAG,EAAE,+BAA+B;qBACrC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YACD,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,2BAA2B;gBAClC,KAAK,EAAE,uBAAuB,CAAC,MAAM;gBACrC,GAAG,EAAE,2BAA2B;aACjC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,wBAAwB;YACxB,MAAM,QAAQ,GAAG,mBAAmB,CAAC;YACrC,QAAQ,GAAG,gCAAgC,QAAQ,CAAC,QAAQ,kBAAkB,QAAQ,CAAC,UAAU,IAAI,CAAC;YACtG,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,YAAY;gBACnB,KAAK,EAAE,uBAAuB,CAAC,WAAW;gBAC1C,GAAG,EAAE,YAAY;aAClB,CAAC,CAAC;YACH,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO,CAAC,IAAI,CAAC;oBACX,KAAK,EAAE,6BAA6B;oBACpC,KAAK,EAAE,uBAAuB,CAAC,iBAAiB;oBAChD,GAAG,EAAE,6BAA6B;iBACnC,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC;oBACX,KAAK,EAAE,yCAAyC;oBAChD,KAAK,EAAE,uBAAuB,CAAC,mBAAmB;oBAClD,GAAG,EAAE,yCAAyC;iBAC/C,CAAC,CAAC;gBACH,IAAI,sBAAsB,EAAE,CAAC;oBAC3B,OAAO,CAAC,IAAI,CAAC;wBACX,KAAK,EAAE,oCAAoC;wBAC3C,KAAK,EAAE,uBAAuB,CAAC,oBAAoB;wBACnD,GAAG,EAAE,oCAAoC;qBAC1C,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YACD,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,2BAA2B;gBAClC,KAAK,EAAE,uBAAuB,CAAC,MAAM;gBACrC,GAAG,EAAE,2BAA2B;aACjC,CAAC,CAAC;QACL,CAAC;QAED,SAAS,0BAA0B;YACjC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,0EAA0E;gBAC1E,mHAAmH;gBACnH,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,IAAI,uBAAuB,KAAK,SAAS,EAAE,CAAC;gBAC1C,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,kEAAkE;YAClE,qCAAqC;YACrC,MAAM,eAAe,GAAG,CAAC,CAAC,CAAC,mDAAmD;YAC9E,MAAM,kBAAkB,GAAG,CAAC,CAAC,CAAC,gCAAgC;YAC9D,MAAM,eAAe,GAAG,CAAC,CAAC,CAAC,iCAAiC;YAC5D,MAAM,sBAAsB,GAAG,CAAC,CAAC,CAAC,oCAAoC;YACtE,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,kDAAkD;YAEzF,MAAM,yBAAyB,GAC7B,eAAe;gBACf,kBAAkB;gBAClB,eAAe;gBACf,sBAAsB;gBACtB,cAAc,CAAC;YACjB,OAAO,IAAI,CAAC,GAAG,CAAC,uBAAuB,GAAG,yBAAyB,EAAE,CAAC,CAAC,CAAC;QAC1E,CAAC;QAED,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACxC,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,CAAC;gBACrC,WAAW,GAAG,CACZ,KAAC,YAAY,IACX,WAAW,EAAE,mBAAmB,CAAC,QAAQ,EACzC,QAAQ,EAAE,mBAAmB,CAAC,QAAQ,EACtC,uBAAuB,EAAE,0BAA0B,EAAE,EACrD,aAAa,EAAE,aAAa,GAC5B,CACH,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC/C,MAAM,cAAc,GAAG,mBAAmB,CAAC;YAC3C,IAAI,iBAAiB,GAAG,0BAA0B,EAAE,CAAC;YACrD,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;gBACpC,iBAAiB,IAAI,CAAC,CAAC,CAAC,uBAAuB;YACjD,CAAC;YAED,WAAW,GAAG,CACZ,KAAC,WAAW,IACV,SAAS,EAAE,iBAAiB,EAC5B,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,YAEpC,KAAC,GAAG,cACF,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,YAAG,cAAc,CAAC,OAAO,GAAQ,GACzD,GACM,CACf,CAAC;QACJ,CAAC;aAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC/C,MAAM,SAAS,GAAG,mBAAmB,CAAC;YACtC,MAAM,WAAW,GACf,SAAS,CAAC,IAAI;gBACd,CAAC,CACC,SAAS,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,MAAM,CACtE,CAAC;YAEJ,WAAW,GAAG,CACZ,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,YAC1B,KAAC,YAAY,IACX,IAAI,EAAE,SAAS,CAAC,MAAM,EACtB,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,GAC7B,GACG,EACN,WAAW,IAAI,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,CAC7D,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,SAAS,EAAE,CAAC,aACtC,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,+BAAuB,EACrD,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAC3B,MAAC,IAAI,eACF,GAAG,QACF,KAAC,YAAY,IAAC,IAAI,EAAE,GAAG,GAAI,KAFpB,GAAG,CAGP,CACR,CAAC,IACE,CACP,IACG,CACP,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,wBAAwB;YACxB,MAAM,QAAQ,GAAG,mBAAmB,CAAC;YAErC,WAAW,GAAG,CACZ,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,MAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,6BAAe,QAAQ,CAAC,UAAU,IAAQ,EACtE,MAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,uBAAS,QAAQ,CAAC,QAAQ,IAAQ,IAC1D,CACP,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;IAC5C,CAAC,EAAE;QACD,mBAAmB;QACnB,eAAe;QACf,MAAM;QACN,gBAAgB;QAChB,uBAAuB;QACvB,aAAa;QACb,sBAAsB;KACvB,CAAC,CAAC;IAEH,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACxC,IAAI,mBAAmB,CAAC,WAAW,EAAE,CAAC;YACpC,OAAO,CACL,MAAC,GAAG,IACF,KAAK,EAAE,aAAa,EACpB,WAAW,EAAC,OAAO,EACnB,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EACjC,cAAc,EAAC,cAAc,EAC7B,UAAU,EAAE,CAAC,EACb,aAAa,EAAE,CAAC,EAChB,QAAQ,EAAC,QAAQ,aAEjB,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,qCAA6B,EAC5D,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,2DAE1B,IACH,CACP,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,aAGzD,KAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAC,QAAQ,EAAC,YAAY,EAAE,CAAC,YAC/D,WAAW,GACR,EAGN,KAAC,GAAG,IAAC,YAAY,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,YACjC,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,YAAG,QAAQ,GAAQ,GAC9C,EAGN,KAAC,GAAG,IAAC,UAAU,EAAE,CAAC,YAChB,KAAC,iBAAiB,IAChB,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,SAAS,GACpB,GACE,IACF,CACP,CAAC;AACJ,CAAC,CAAC"}

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";
 import { useState, useEffect } from 'react';
 import { Box, Text } from 'ink';
 import { StickyHeader } from '../StickyHeader.js';
@@ -31,6 +31,10 @@ export const ToolMessage = ({ name, description, resultDisplay, status, availabl
         status === ToolCallStatus.Executing &&
         config?.getEnableInteractiveShell();
     const shouldShowFocusHint = isThisShellFocusable && (showFocusHint || userHasFocused);
-    return (_jsxs(Box, { flexDirection: "column", width: terminalWidth, children: [_jsxs(StickyHeader, { width: terminalWidth, isFirst: isFirst, borderColor: borderColor, borderDimColor: borderDimColor, children: [_jsx(ToolStatusIndicator, { status: status, name: name }), _jsx(ToolInfo, { name: name, status: status, description: description, emphasis: emphasis }), shouldShowFocusHint && (_jsx(Box, { marginLeft: 1, flexShrink: 0, children: _jsx(Text, { color: theme.text.accent, children: isThisShellFocused ? '(Focused)' : '(ctrl+f to focus)' }) })), emphasis === 'high' && _jsx(TrailingIndicator, {})] }), _jsxs(Box, { width: terminalWidth, borderStyle: "round", borderColor: borderColor, borderDimColor: borderDimColor, borderTop: false, borderBottom: false, borderLeft: true, borderRight: true, paddingX: 1, flexDirection: "column", children: [_jsx(ToolResultDisplay, { resultDisplay: resultDisplay, availableTerminalHeight: availableTerminalHeight, terminalWidth: terminalWidth, renderOutputAsMarkdown: renderOutputAsMarkdown }), isThisShellFocused && config && (_jsx(Box, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: _jsx(ShellInputPrompt, { activeShellPtyId: activeShellPtyId ?? null, focus: embeddedShellFocused }) }))] })] }));
+    return (
+    // It is crucial we don't replace this <> with a Box because otherwise the
+    // sticky header inside it would be sticky to that box rather than to the
+    // parent component of this ToolMessage.
+    _jsxs(_Fragment, { children: [_jsxs(StickyHeader, { width: terminalWidth, isFirst: isFirst, borderColor: borderColor, borderDimColor: borderDimColor, children: [_jsx(ToolStatusIndicator, { status: status, name: name }), _jsx(ToolInfo, { name: name, status: status, description: description, emphasis: emphasis }), shouldShowFocusHint && (_jsx(Box, { marginLeft: 1, flexShrink: 0, children: _jsx(Text, { color: theme.text.accent, children: isThisShellFocused ? '(Focused)' : '(tab to focus)' }) })), emphasis === 'high' && _jsx(TrailingIndicator, {})] }), _jsxs(Box, { width: terminalWidth, borderStyle: "round", borderColor: borderColor, borderDimColor: borderDimColor, borderTop: false, borderBottom: false, borderLeft: true, borderRight: true, paddingX: 1, flexDirection: "column", children: [_jsx(ToolResultDisplay, { resultDisplay: resultDisplay, availableTerminalHeight: availableTerminalHeight, terminalWidth: terminalWidth, renderOutputAsMarkdown: renderOutputAsMarkdown }), isThisShellFocused && config && (_jsx(Box, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: _jsx(ShellInputPrompt, { activeShellPtyId: activeShellPtyId ?? null, focus: embeddedShellFocused }) }))] })] }));
 };
 //# sourceMappingURL=ToolMessage.js.map

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

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

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

@@ -116,6 +116,7 @@ describe('<ToolMessage />', () => {
             fileName: 'file.txt',
             originalContent: 'old',
             newContent: 'new',
+            filePath: 'file.txt',
         };
         const { lastFrame } = renderWithContext(_jsx(ToolMessage, { ...baseProps, resultDisplay: diffResult }), StreamingState.Idle);
         // Check that the output contains the MockDiff content as part of the whole message

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

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

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

@@ -1,4 +1,4 @@
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -12,7 +12,6 @@ import { AnsiOutputText } from '../AnsiOutput.js';
 import { MaxSizedBox } from '../shared/MaxSizedBox.js';
 import { theme } from '../../semantic-colors.js';
 import { useUIState } from '../../contexts/UIStateContext.js';
-import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
 const STATIC_HEIGHT = 1;
 const RESERVED_LINE_COUNT = 5; // for tool name, status, padding etc.
 const MIN_LINES_SHOWN = 2; // show at least this many lines
@@ -21,16 +20,9 @@ const MIN_LINES_SHOWN = 2; // show at least this many lines
 const MAXIMUM_RESULT_DISPLAY_CHARACTERS = 20000;
 export const ToolResultDisplay = ({ resultDisplay, availableTerminalHeight, terminalWidth, renderOutputAsMarkdown = true, }) => {
     const { renderMarkdown } = useUIState();
-    const isAlternateBuffer = useAlternateBuffer();
     const availableHeight = availableTerminalHeight
         ? Math.max(availableTerminalHeight - STATIC_HEIGHT - RESERVED_LINE_COUNT, MIN_LINES_SHOWN + 1)
         : undefined;
-    // Long tool call response in MarkdownDisplay doesn't respect availableTerminalHeight properly,
-    // so if we aren't using alternate buffer mode, we're forcing it to not render as markdown when the response is too long, it will fallback
-    // to render as plain text, which is contained within the terminal using MaxSizedBox
-    if (availableHeight && !isAlternateBuffer) {
-        renderOutputAsMarkdown = false;
-    }
     const combinedPaddingAndBorderWidth = 4;
     const childWidth = terminalWidth - combinedPaddingAndBorderWidth;
     const truncatedResultDisplay = React.useMemo(() => {
@@ -43,12 +35,26 @@ export const ToolResultDisplay = ({ resultDisplay, availableTerminalHeight, term
     }, [resultDisplay]);
     if (!truncatedResultDisplay)
         return null;
-    return (_jsx(Box, { width: childWidth, flexDirection: "column", children: _jsx(Box, { flexDirection: "column", children: typeof truncatedResultDisplay === 'string' &&
-                renderOutputAsMarkdown ? (_jsx(Box, { flexDirection: "column", children: _jsx(MarkdownDisplay, { text: truncatedResultDisplay, terminalWidth: childWidth, renderMarkdown: renderMarkdown, isPending: false }) })) : typeof truncatedResultDisplay === 'string' &&
-                !renderOutputAsMarkdown ? (isAlternateBuffer ? (_jsx(Box, { flexDirection: "column", width: childWidth, children: _jsx(Text, { wrap: "wrap", color: theme.text.primary, children: truncatedResultDisplay }) })) : (_jsx(MaxSizedBox, { maxHeight: availableHeight, maxWidth: childWidth, children: _jsx(Box, { children: _jsx(Text, { wrap: "wrap", color: theme.text.primary, children: truncatedResultDisplay }) }) }))) : typeof truncatedResultDisplay === 'object' &&
-                'fileDiff' in truncatedResultDisplay ? (_jsx(DiffRenderer, { diffContent: truncatedResultDisplay.fileDiff, filename: truncatedResultDisplay.fileName, availableTerminalHeight: availableHeight, terminalWidth: childWidth })) : typeof truncatedResultDisplay === 'object' &&
-                'todos' in truncatedResultDisplay ? (
-            // display nothing, as the TodoTray will handle rendering todos
-            _jsx(_Fragment, {})) : (_jsx(AnsiOutputText, { data: truncatedResultDisplay, availableTerminalHeight: availableHeight, width: childWidth })) }) }));
+    let content;
+    if (typeof truncatedResultDisplay === 'string' && renderOutputAsMarkdown) {
+        content = (_jsx(MarkdownDisplay, { text: truncatedResultDisplay, terminalWidth: childWidth, renderMarkdown: renderMarkdown, isPending: false }));
+    }
+    else if (typeof truncatedResultDisplay === 'string' &&
+        !renderOutputAsMarkdown) {
+        content = (_jsx(Text, { wrap: "wrap", color: theme.text.primary, children: truncatedResultDisplay }));
+    }
+    else if (typeof truncatedResultDisplay === 'object' &&
+        'fileDiff' in truncatedResultDisplay) {
+        content = (_jsx(DiffRenderer, { diffContent: truncatedResultDisplay.fileDiff, filename: truncatedResultDisplay.fileName, availableTerminalHeight: availableHeight, terminalWidth: childWidth }));
+    }
+    else if (typeof truncatedResultDisplay === 'object' &&
+        'todos' in truncatedResultDisplay) {
+        // display nothing, as the TodoTray will handle rendering todos
+        return null;
+    }
+    else {
+        content = (_jsx(AnsiOutputText, { data: truncatedResultDisplay, availableTerminalHeight: availableHeight, width: childWidth }));
+    }
+    return (_jsx(Box, { width: childWidth, flexDirection: "column", children: _jsx(MaxSizedBox, { maxHeight: availableHeight, maxWidth: childWidth, children: content }) }));
 };
 //# sourceMappingURL=ToolResultDisplay.js.map

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

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

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

@@ -12,15 +12,6 @@ import { Box, Text } from 'ink';
 vi.mock('./DiffRenderer.js', () => ({
     DiffRenderer: ({ diffContent, filename, }) => (_jsx(Box, { children: _jsxs(Text, { children: ["DiffRenderer: ", filename, " - ", diffContent] }) })),
 }));
-vi.mock('../../utils/MarkdownDisplay.js', () => ({
-    MarkdownDisplay: ({ text }) => (_jsx(Box, { children: _jsxs(Text, { children: ["MarkdownDisplay: ", text] }) })),
-}));
-vi.mock('../AnsiOutput.js', () => ({
-    AnsiOutputText: ({ data }) => (_jsx(Box, { children: _jsxs(Text, { children: ["AnsiOutputText: ", JSON.stringify(data)] }) })),
-}));
-vi.mock('../shared/MaxSizedBox.js', () => ({
-    MaxSizedBox: ({ children }) => (_jsxs(Box, { children: [_jsx(Text, { children: "MaxSizedBox:" }), children] })),
-}));
 // Mock UIStateContext
 const mockUseUIState = vi.fn();
 vi.mock('../../contexts/UIStateContext.js', () => ({
@@ -31,6 +22,23 @@ const mockUseAlternateBuffer = vi.fn();
 vi.mock('../../hooks/useAlternateBuffer.js', () => ({
     useAlternateBuffer: () => mockUseAlternateBuffer(),
 }));
+// Mock useSettings
+vi.mock('../../contexts/SettingsContext.js', () => ({
+    useSettings: () => ({
+        merged: {
+            ui: {
+                useAlternateBuffer: false,
+            },
+        },
+    }),
+}));
+// Mock useOverflowActions
+vi.mock('../../contexts/OverflowContext.js', () => ({
+    useOverflowActions: () => ({
+        addOverflowingId: vi.fn(),
+        removeOverflowingId: vi.fn(),
+    }),
+}));
 describe('ToolResultDisplay', () => {
     beforeEach(() => {
         vi.clearAllMocks();
@@ -38,12 +46,12 @@ describe('ToolResultDisplay', () => {
         mockUseAlternateBuffer.mockReturnValue(false);
     });
     it('renders string result as markdown by default', () => {
-        const { lastFrame } = render(_jsx(ToolResultDisplay, { resultDisplay: "Some result", terminalWidth: 80 }));
+        const { lastFrame } = render(_jsx(ToolResultDisplay, { resultDisplay: "**Some result**", terminalWidth: 80 }));
         const output = lastFrame();
         expect(output).toMatchSnapshot();
     });
     it('renders string result as plain text when renderOutputAsMarkdown is false', () => {
-        const { lastFrame } = render(_jsx(ToolResultDisplay, { resultDisplay: "Some result", terminalWidth: 80, availableTerminalHeight: 20, renderOutputAsMarkdown: false }));
+        const { lastFrame } = render(_jsx(ToolResultDisplay, { resultDisplay: "**Some result**", terminalWidth: 80, availableTerminalHeight: 20, renderOutputAsMarkdown: false }));
         const output = lastFrame();
         expect(output).toMatchSnapshot();
     });
@@ -63,9 +71,20 @@ describe('ToolResultDisplay', () => {
         expect(output).toMatchSnapshot();
     });
     it('renders ANSI output result', () => {
-        const ansiResult = {
-            text: 'ansi content',
-        };
+        const ansiResult = [
+            [
+                {
+                    text: 'ansi content',
+                    fg: 'red',
+                    bg: 'black',
+                    bold: false,
+                    italic: false,
+                    underline: false,
+                    dim: false,
+                    inverse: false,
+                },
+            ],
+        ];
         const { lastFrame } = render(_jsx(ToolResultDisplay, { resultDisplay: ansiResult, terminalWidth: 80, availableTerminalHeight: 20 }));
         const output = lastFrame();
         expect(output).toMatchSnapshot();
@@ -78,17 +97,16 @@ describe('ToolResultDisplay', () => {
         const output = lastFrame();
         expect(output).toMatchSnapshot();
     });
-    it('falls back to plain text if availableHeight is set and not in alternate buffer', () => {
+    it('does not fall back to plain text if availableHeight is set and not in alternate buffer', () => {
         mockUseAlternateBuffer.mockReturnValue(false);
         // availableHeight calculation: 20 - 1 - 5 = 14 > 3
-        const { lastFrame } = render(_jsx(ToolResultDisplay, { resultDisplay: "Some result", terminalWidth: 80, availableTerminalHeight: 20, renderOutputAsMarkdown: true }));
+        const { lastFrame } = render(_jsx(ToolResultDisplay, { resultDisplay: "**Some result**", terminalWidth: 80, availableTerminalHeight: 20, renderOutputAsMarkdown: true }));
         const output = lastFrame();
-        // Should force renderOutputAsMarkdown to false
         expect(output).toMatchSnapshot();
     });
     it('keeps markdown if in alternate buffer even with availableHeight', () => {
         mockUseAlternateBuffer.mockReturnValue(true);
-        const { lastFrame } = render(_jsx(ToolResultDisplay, { resultDisplay: "Some result", terminalWidth: 80, availableTerminalHeight: 20, renderOutputAsMarkdown: true }));
+        const { lastFrame } = render(_jsx(ToolResultDisplay, { resultDisplay: "**Some result**", terminalWidth: 80, availableTerminalHeight: 20, renderOutputAsMarkdown: true }));
         const output = lastFrame();
         expect(output).toMatchSnapshot();
     });