@google/gemini-cli 0.30.0-preview.5 → 0.31.0-preview.0

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

@@ -6,13 +6,17 @@ 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';
+import { OverflowProvider } from '../../contexts/OverflowContext.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 }) }), _jsxs(Box, { flexGrow: 1, flexDirection: "column", children: [_jsx(MarkdownDisplay, { text: text, isPending: isPending, availableTerminalHeight: isAlternateBuffer || availableTerminalHeight === undefined
+    const content = (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: prefixWidth, children: _jsx(Text, { color: theme.text.accent, "aria-label": SCREEN_READER_MODEL_PREFIX, children: prefix }) }), _jsxs(Box, { flexGrow: 1, flexDirection: "column", children: [_jsx(MarkdownDisplay, { text: text, isPending: isPending, availableTerminalHeight: isAlternateBuffer || availableTerminalHeight === undefined
                             ? undefined
                             : Math.max(availableTerminalHeight - 1, 1), terminalWidth: Math.max(terminalWidth - prefixWidth, 0), renderMarkdown: renderMarkdown }), _jsx(Box, { marginTop: isAlternateBuffer ? 0 : 1, marginBottom: isAlternateBuffer ? 1 : 0, children: _jsx(ShowMoreLines, { constrainHeight: availableTerminalHeight !== undefined }) })] })] }));
+    return isAlternateBuffer ? (
+    /* Shadow the global provider to maintain isolation in ASB mode. */
+    _jsx(OverflowProvider, { children: content })) : (content);
 };
 //# sourceMappingURL=GeminiMessage.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"GeminiMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/GeminiMessage.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,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,MAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,EAAE,aAAa,EAAC,QAAQ,aACtC,KAAC,eAAe,IACd,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,uBAAuB,EACrB,iBAAiB,IAAI,uBAAuB,KAAK,SAAS;4BACxD,CAAC,CAAC,SAAS;4BACX,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,uBAAuB,GAAG,CAAC,EAAE,CAAC,CAAC,EAE9C,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,GAAG,WAAW,EAAE,CAAC,CAAC,EACvD,cAAc,EAAE,cAAc,GAC9B,EACF,KAAC,GAAG,IACF,SAAS,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACpC,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAEvC,KAAC,aAAa,IACZ,eAAe,EAAE,uBAAuB,KAAK,SAAS,GACtD,GACE,IACF,IACF,CACP,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"GeminiMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/GeminiMessage.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,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;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AASrE,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,MAAM,OAAO,GAAG,CACd,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,MAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,EAAE,aAAa,EAAC,QAAQ,aACtC,KAAC,eAAe,IACd,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,uBAAuB,EACrB,iBAAiB,IAAI,uBAAuB,KAAK,SAAS;4BACxD,CAAC,CAAC,SAAS;4BACX,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,uBAAuB,GAAG,CAAC,EAAE,CAAC,CAAC,EAE9C,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,GAAG,WAAW,EAAE,CAAC,CAAC,EACvD,cAAc,EAAE,cAAc,GAC9B,EACF,KAAC,GAAG,IACF,SAAS,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACpC,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAEvC,KAAC,aAAa,IACZ,eAAe,EAAE,uBAAuB,KAAK,SAAS,GACtD,GACE,IACF,IACF,CACP,CAAC;IAEF,OAAO,iBAAiB,CAAC,CAAC,CAAC;IACzB,mEAAmE;IACnE,KAAC,gBAAgB,cAAE,OAAO,GAAoB,CAC/C,CAAC,CAAC,CAAC,CACF,OAAO,CACR,CAAC;AACJ,CAAC,CAAC"}

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

@@ -19,25 +19,31 @@ describe('<GeminiMessage /> - Raw Markdown Display Snapshots', () => {
             renderMarkdown: false,
             description: '(raw markdown with syntax highlighting, no line numbers)',
         },
-    ])('renders with renderMarkdown=$renderMarkdown $description', ({ renderMarkdown }) => {
-        const { lastFrame } = renderWithProviders(_jsx(GeminiMessage, { ...baseProps }), {
+    ])('renders with renderMarkdown=$renderMarkdown $description', async ({ renderMarkdown }) => {
+        const { lastFrame, waitUntilReady, unmount } = renderWithProviders(_jsx(GeminiMessage, { ...baseProps }), {
             uiState: { renderMarkdown, streamingState: StreamingState.Idle },
         });
+        await waitUntilReady();
         expect(lastFrame()).toMatchSnapshot();
+        unmount();
     });
-    it.each([{ renderMarkdown: true }, { renderMarkdown: false }])('renders pending state with renderMarkdown=$renderMarkdown', ({ renderMarkdown }) => {
-        const { lastFrame } = renderWithProviders(_jsx(GeminiMessage, { ...baseProps, isPending: true }), {
+    it.each([{ renderMarkdown: true }, { renderMarkdown: false }])('renders pending state with renderMarkdown=$renderMarkdown', async ({ renderMarkdown }) => {
+        const { lastFrame, waitUntilReady, unmount } = renderWithProviders(_jsx(GeminiMessage, { ...baseProps, isPending: true }), {
             uiState: { renderMarkdown, streamingState: StreamingState.Idle },
         });
+        await waitUntilReady();
         expect(lastFrame()).toMatchSnapshot();
+        unmount();
     });
-    it('wraps long lines correctly in raw markdown mode', () => {
+    it('wraps long lines correctly in raw markdown mode', async () => {
         const terminalWidth = 20;
         const text = 'This is a long line that should wrap correctly without truncation';
-        const { lastFrame } = renderWithProviders(_jsx(GeminiMessage, { text: text, isPending: false, terminalWidth: terminalWidth }), {
+        const { lastFrame, waitUntilReady, unmount } = renderWithProviders(_jsx(GeminiMessage, { text: text, isPending: false, terminalWidth: terminalWidth }), {
             uiState: { renderMarkdown: false, streamingState: StreamingState.Idle },
         });
+        await waitUntilReady();
         expect(lastFrame()).toMatchSnapshot();
+        unmount();
     });
 });
 //# sourceMappingURL=GeminiMessage.test.js.map

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

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

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

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

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

@@ -0,0 +1,14 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Text, Box } from 'ink';
+import { theme } from '../../semantic-colors.js';
+import { SCREEN_READER_USER_PREFIX } from '../../textConstants.js';
+import { HalfLinePaddedBox } from '../shared/HalfLinePaddedBox.js';
+import { useConfig } from '../../contexts/ConfigContext.js';
+export const HintMessage = ({ text }) => {
+    const prefix = '💡 ';
+    const prefixWidth = prefix.length;
+    const config = useConfig();
+    const useBackgroundColor = config.getUseBackgroundColor();
+    return (_jsx(HalfLinePaddedBox, { backgroundBaseColor: theme.text.accent, backgroundOpacity: 0.1, useBackgroundColor: useBackgroundColor, children: _jsxs(Box, { flexDirection: "row", paddingY: 0, marginY: useBackgroundColor ? 0 : 1, paddingX: useBackgroundColor ? 1 : 0, alignSelf: "flex-start", children: [_jsx(Box, { width: prefixWidth, flexShrink: 0, children: _jsx(Text, { color: theme.text.accent, "aria-label": SCREEN_READER_USER_PREFIX, children: prefix }) }), _jsx(Box, { flexGrow: 1, children: _jsx(Text, { wrap: "wrap", italic: true, color: theme.text.accent, children: `Steering Hint: ${text}` }) })] }) }));
+};
+//# sourceMappingURL=HintMessage.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"HintMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/HintMessage.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAM5D,MAAM,CAAC,MAAM,WAAW,GAA+B,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;IAClE,MAAM,MAAM,GAAG,KAAK,CAAC;IACrB,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;IAClC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,kBAAkB,GAAG,MAAM,CAAC,qBAAqB,EAAE,CAAC;IAE1D,OAAO,CACL,KAAC,iBAAiB,IAChB,mBAAmB,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,EACtC,iBAAiB,EAAE,GAAG,EACtB,kBAAkB,EAAE,kBAAkB,YAEtC,MAAC,GAAG,IACF,aAAa,EAAC,KAAK,EACnB,QAAQ,EAAE,CAAC,EACX,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACnC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACpC,SAAS,EAAC,YAAY,aAEtB,KAAC,GAAG,IAAC,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,YACpC,KAAC,IAAI,IACH,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,gBACZ,yBAAyB,YAEpC,MAAM,GACF,GACH,EACN,KAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,YACd,KAAC,IAAI,IAAC,IAAI,EAAC,MAAM,EAAC,MAAM,QAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,YAC9C,kBAAkB,IAAI,EAAE,GACpB,GACH,IACF,GACY,CACrB,CAAC;AACJ,CAAC,CAAC"}

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

@@ -8,6 +8,7 @@ interface InfoMessageProps {
     text: string;
     icon?: string;
     color?: string;
+    marginBottom?: number;
 }
 export declare const InfoMessage: React.FC<InfoMessageProps>;
 export {};

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

@@ -2,10 +2,10 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Text, Box } from 'ink';
 import { theme } from '../../semantic-colors.js';
 import { RenderInline } from '../../utils/InlineMarkdownRenderer.js';
-export const InfoMessage = ({ text, icon, color, }) => {
+export const InfoMessage = ({ text, icon, color, marginBottom, }) => {
     color ??= theme.status.warning;
     const prefix = icon ?? 'ℹ ';
     const prefixWidth = prefix.length;
-    return (_jsxs(Box, { flexDirection: "row", marginTop: 1, children: [_jsx(Box, { width: prefixWidth, children: _jsx(Text, { color: color, children: prefix }) }), _jsx(Box, { flexGrow: 1, flexDirection: "column", children: text.split('\n').map((line, index) => (_jsx(Text, { wrap: "wrap", children: _jsx(RenderInline, { text: line, defaultColor: color }) }, index))) })] }));
+    return (_jsxs(Box, { flexDirection: "row", marginTop: 1, marginBottom: marginBottom ?? 0, children: [_jsx(Box, { width: prefixWidth, children: _jsx(Text, { color: color, children: prefix }) }), _jsx(Box, { flexGrow: 1, flexDirection: "column", children: text.split('\n').map((line, index) => (_jsx(Text, { wrap: "wrap", children: _jsx(RenderInline, { text: line, defaultColor: color }) }, index))) })] }));
 };
 //# sourceMappingURL=InfoMessage.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"InfoMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/InfoMessage.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAQrE,MAAM,CAAC,MAAM,WAAW,GAA+B,CAAC,EACtD,IAAI,EACJ,IAAI,EACJ,KAAK,GACN,EAAE,EAAE;IACH,KAAK,KAAK,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;IAC/B,MAAM,MAAM,GAAG,IAAI,IAAI,IAAI,CAAC;IAC5B,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;IAElC,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,KAAK,EAAC,SAAS,EAAE,CAAC,aACnC,KAAC,GAAG,IAAC,KAAK,EAAE,WAAW,YACrB,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,YAAG,MAAM,GAAQ,GAC/B,EACN,KAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,EAAE,aAAa,EAAC,QAAQ,YACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CACrC,KAAC,IAAI,IAAC,IAAI,EAAC,MAAM,YACf,KAAC,YAAY,IAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,GAAI,IAD5B,KAAK,CAErB,CACR,CAAC,GACE,IACF,CACP,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"InfoMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/InfoMessage.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AASrE,MAAM,CAAC,MAAM,WAAW,GAA+B,CAAC,EACtD,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,YAAY,GACb,EAAE,EAAE;IACH,KAAK,KAAK,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;IAC/B,MAAM,MAAM,GAAG,IAAI,IAAI,IAAI,CAAC;IAC5B,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;IAElC,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,KAAK,EAAC,SAAS,EAAE,CAAC,EAAE,YAAY,EAAE,YAAY,IAAI,CAAC,aACpE,KAAC,GAAG,IAAC,KAAK,EAAE,WAAW,YACrB,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,YAAG,MAAM,GAAQ,GAC/B,EACN,KAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,EAAE,aAAa,EAAC,QAAQ,YACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CACrC,KAAC,IAAI,IAAC,IAAI,EAAC,MAAM,YACf,KAAC,YAAY,IAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,GAAI,IAD5B,KAAK,CAErB,CACR,CAAC,GACE,IACF,CACP,CAAC;AACJ,CAAC,CAAC"}

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

@@ -8,21 +8,27 @@ import { render } from '../../../test-utils/render.js';
 import { InfoMessage } from './InfoMessage.js';
 import { describe, it, expect } from 'vitest';
 describe('InfoMessage', () => {
-    it('renders with the correct default prefix and text', () => {
-        const { lastFrame } = render(_jsx(InfoMessage, { text: "Just so you know" }));
+    it('renders with the correct default prefix and text', async () => {
+        const { lastFrame, waitUntilReady, unmount } = render(_jsx(InfoMessage, { text: "Just so you know" }));
+        await waitUntilReady();
         const output = lastFrame();
         expect(output).toMatchSnapshot();
+        unmount();
     });
-    it('renders with a custom icon', () => {
-        const { lastFrame } = render(_jsx(InfoMessage, { text: "Custom icon test", icon: "\u2605" }));
+    it('renders with a custom icon', async () => {
+        const { lastFrame, waitUntilReady, unmount } = render(_jsx(InfoMessage, { text: "Custom icon test", icon: "\u2605" }));
+        await waitUntilReady();
         const output = lastFrame();
         expect(output).toMatchSnapshot();
+        unmount();
     });
-    it('renders multiline info messages', () => {
+    it('renders multiline info messages', async () => {
         const message = 'Info line 1\nInfo line 2';
-        const { lastFrame } = render(_jsx(InfoMessage, { text: message }));
+        const { lastFrame, waitUntilReady, unmount } = render(_jsx(InfoMessage, { text: message }));
+        await waitUntilReady();
         const output = lastFrame();
         expect(output).toMatchSnapshot();
+        unmount();
     });
 });
 //# sourceMappingURL=InfoMessage.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"InfoMessage.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/InfoMessage.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE9C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,KAAC,WAAW,IAAC,IAAI,EAAC,kBAAkB,GAAG,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAE3B,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QACpC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAC1B,KAAC,WAAW,IAAC,IAAI,EAAC,kBAAkB,EAAC,IAAI,EAAC,QAAG,GAAG,CACjD,CAAC;QACF,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAE3B,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,OAAO,GAAG,0BAA0B,CAAC;QAC3C,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,KAAC,WAAW,IAAC,IAAI,EAAE,OAAO,GAAI,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAE3B,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"InfoMessage.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/InfoMessage.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE9C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,CACnD,KAAC,WAAW,IAAC,IAAI,EAAC,kBAAkB,GAAG,CACxC,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAE3B,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAC;QACjC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAC1C,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,CACnD,KAAC,WAAW,IAAC,IAAI,EAAC,kBAAkB,EAAC,IAAI,EAAC,QAAG,GAAG,CACjD,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAE3B,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAC;QACjC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;QAC/C,MAAM,OAAO,GAAG,0BAA0B,CAAC;QAC3C,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,CACnD,KAAC,WAAW,IAAC,IAAI,EAAE,OAAO,GAAI,CAC/B,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAE3B,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAC;QACjC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -16,7 +16,7 @@ describe('ToolConfirmationMessage Redirection', () => {
         isTrustedFolder: () => true,
         getIdeMode: () => false,
     };
-    it('should display redirection warning and tip for redirected commands', () => {
+    it('should display redirection warning and tip for redirected commands', async () => {
         const confirmationDetails = {
             type: 'exec',
             title: 'Confirm Shell Command',
@@ -24,9 +24,11 @@ describe('ToolConfirmationMessage Redirection', () => {
             rootCommand: 'echo, redirection (>)',
             rootCommands: ['echo'],
         };
-        const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { callId: "test-call-id", confirmationDetails: confirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 100 }));
+        const { lastFrame, waitUntilReady, unmount } = renderWithProviders(_jsx(ToolConfirmationMessage, { callId: "test-call-id", confirmationDetails: confirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 100 }));
+        await waitUntilReady();
         const output = lastFrame();
         expect(output).toMatchSnapshot();
+        unmount();
     });
 });
 //# sourceMappingURL=RedirectionConfirmation.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"RedirectionConfirmation.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/RedirectionConfirmation.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAKvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;IACnD,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,sBAAsB,EAAE,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG;QACjB,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI;QAC3B,UAAU,EAAE,GAAG,EAAE,CAAC,KAAK;KACH,CAAC;IAEvB,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC5E,MAAM,mBAAmB,GAAoC;YAC3D,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,uBAAuB;YAC9B,OAAO,EAAE,yBAAyB;YAClC,WAAW,EAAE,uBAAuB;YACpC,YAAY,EAAE,CAAC,MAAM,CAAC;SACvB,CAAC;QAEF,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,uBAAuB,IACtB,MAAM,EAAC,cAAc,EACrB,mBAAmB,EAAE,mBAAmB,EACxC,MAAM,EAAE,UAAU,EAClB,uBAAuB,EAAE,EAAE,EAC3B,aAAa,EAAE,GAAG,GAClB,CACH,CAAC;QAEF,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"RedirectionConfirmation.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/RedirectionConfirmation.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAKvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;IACnD,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,sBAAsB,EAAE,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG;QACjB,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI;QAC3B,UAAU,EAAE,GAAG,EAAE,CAAC,KAAK;KACH,CAAC;IAEvB,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;QAClF,MAAM,mBAAmB,GAAoC;YAC3D,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,uBAAuB;YAC9B,OAAO,EAAE,yBAAyB;YAClC,WAAW,EAAE,uBAAuB;YACpC,YAAY,EAAE,CAAC,MAAM,CAAC;SACvB,CAAC;QAEF,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,KAAC,uBAAuB,IACtB,MAAM,EAAC,cAAc,EACrB,mBAAmB,EAAE,mBAAmB,EACxC,MAAM,EAAE,UAAU,EAClB,uBAAuB,EAAE,EAAE,EAC3B,aAAa,EAAE,GAAG,GAClB,CACH,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QAEvB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAC;QACjC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -7,8 +7,7 @@ import React from 'react';
 import type { ToolMessageProps } from './ToolMessage.js';
 import { type Config } from '@google/gemini-cli-core';
 export interface ShellToolMessageProps extends ToolMessageProps {
-    activeShellPtyId?: number | null;
-    embeddedShellFocused?: boolean;
     config?: Config;
+    isExpandable?: boolean;
 }
 export declare const ShellToolMessage: React.FC<ShellToolMessageProps>;

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

@@ -11,11 +11,14 @@ import { StickyHeader } from '../StickyHeader.js';
 import { useUIActions } from '../../contexts/UIActionsContext.js';
 import { useMouseClick } from '../../hooks/useMouseClick.js';
 import { ToolResultDisplay } from './ToolResultDisplay.js';
-import { ToolStatusIndicator, ToolInfo, TrailingIndicator, STATUS_INDICATOR_WIDTH, isThisShellFocusable as checkIsShellFocusable, isThisShellFocused as checkIsShellFocused, useFocusHint, FocusHint, } from './ToolShared.js';
-import { ACTIVE_SHELL_MAX_LINES, COMPLETED_SHELL_MAX_LINES, } from '../../constants.js';
+import { ToolStatusIndicator, ToolInfo, TrailingIndicator, isThisShellFocusable as checkIsShellFocusable, isThisShellFocused as checkIsShellFocused, useFocusHint, FocusHint, } from './ToolShared.js';
+import { ACTIVE_SHELL_MAX_LINES } from '../../constants.js';
 import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
-import { CoreToolCallStatus } from '@google/gemini-cli-core';
-export const ShellToolMessage = ({ name, description, resultDisplay, status, availableTerminalHeight, terminalWidth, emphasis = 'medium', renderOutputAsMarkdown = true, activeShellPtyId, embeddedShellFocused, ptyId, config, isFirst, borderColor, borderDimColor, }) => {
+import { useUIState } from '../../contexts/UIStateContext.js';
+import {} from '@google/gemini-cli-core';
+import { calculateShellMaxLines } from '../../utils/toolLayoutUtils.js';
+export const ShellToolMessage = ({ name, description, resultDisplay, status, availableTerminalHeight, terminalWidth, emphasis = 'medium', renderOutputAsMarkdown = true, ptyId, config, isFirst, borderColor, borderDimColor, isExpandable, originalRequestName, }) => {
+    const { activePtyId: activeShellPtyId, embeddedShellFocused, constrainHeight, } = useUIState();
     const isAlternateBuffer = useAlternateBuffer();
     const isThisShellFocused = checkIsShellFocused(name, status, ptyId, activeShellPtyId, embeddedShellFocused);
     const { setEmbeddedShellFocused } = useUIActions();
@@ -43,30 +46,13 @@ export const ShellToolMessage = ({ name, description, resultDisplay, status, ava
     useMouseClick(headerRef, handleFocus, { isActive: !!isThisShellFocusable });
     useMouseClick(contentRef, handleFocus, { isActive: !!isThisShellFocusable });
     const { shouldShowFocusHint } = useFocusHint(isThisShellFocusable, isThisShellFocused, resultDisplay);
-    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 }), _jsx(FocusHint, { shouldShowFocusHint: shouldShowFocusHint, isThisShellFocused: isThisShellFocused }), 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, hasFocus: isThisShellFocused, maxLines: getShellMaxLines(status, isAlternateBuffer, isThisShellFocused, availableTerminalHeight) }), isThisShellFocused && config && (_jsx(Box, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: _jsx(ShellInputPrompt, { activeShellPtyId: activeShellPtyId ?? null, focus: embeddedShellFocused, scrollPageSize: availableTerminalHeight ?? ACTIVE_SHELL_MAX_LINES }) }))] })] }));
+    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, originalRequestName: originalRequestName }), _jsx(FocusHint, { shouldShowFocusHint: shouldShowFocusHint, isThisShellFocused: isThisShellFocused }), 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, hasFocus: isThisShellFocused, maxLines: calculateShellMaxLines({
+                            status,
+                            isAlternateBuffer,
+                            isThisShellFocused,
+                            availableTerminalHeight,
+                            constrainHeight,
+                            isExpandable,
+                        }) }), isThisShellFocused && config && (_jsx(ShellInputPrompt, { activeShellPtyId: activeShellPtyId ?? null, focus: embeddedShellFocused, scrollPageSize: availableTerminalHeight ?? ACTIVE_SHELL_MAX_LINES }))] })] }));
 };
-/**
- * Calculates the maximum number of lines to display for shell output.
- *
- * For completed processes (Success, Error, Canceled), it returns COMPLETED_SHELL_MAX_LINES.
- * For active processes, it returns the available terminal height if in alternate buffer mode
- * and focused. Otherwise, it returns ACTIVE_SHELL_MAX_LINES.
- *
- * This function ensures a finite number of lines is always returned to prevent performance issues.
- */
-function getShellMaxLines(status, isAlternateBuffer, isThisShellFocused, availableTerminalHeight) {
-    if (status === CoreToolCallStatus.Success ||
-        status === CoreToolCallStatus.Error ||
-        status === CoreToolCallStatus.Cancelled) {
-        return COMPLETED_SHELL_MAX_LINES;
-    }
-    if (availableTerminalHeight === undefined) {
-        return ACTIVE_SHELL_MAX_LINES;
-    }
-    const maxLinesBasedOnHeight = Math.max(1, availableTerminalHeight - 2);
-    if (isAlternateBuffer && isThisShellFocused) {
-        return maxLinesBasedOnHeight;
-    }
-    return Math.min(maxLinesBasedOnHeight, ACTIVE_SHELL_MAX_LINES);
-}
 //# 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/ShellToolMessage.test.js

@@ -46,11 +46,11 @@ describe('<ShellToolMessage />', () => {
             ['SHELL_COMMAND_NAME', SHELL_COMMAND_NAME],
             ['SHELL_TOOL_NAME', SHELL_TOOL_NAME],
         ])('clicks inside the shell area sets focus for %s', async (_, name) => {
-            const { stdin, lastFrame, simulateClick } = renderShell({ name }, { mouseEventsEnabled: true });
+            const { lastFrame, simulateClick } = renderShell({ name }, { mouseEventsEnabled: true });
             await waitFor(() => {
                 expect(lastFrame()).toContain('A shell command');
             });
-            await simulateClick(stdin, 2, 2);
+            await simulateClick(2, 2);
             await waitFor(() => {
                 expect(mockSetEmbeddedShellFocused).toHaveBeenCalledWith(true);
             });
@@ -60,11 +60,15 @@ describe('<ShellToolMessage />', () => {
             const Wrapper = () => {
                 const [status, setStatus] = React.useState(CoreToolCallStatus.Executing);
                 updateStatus = setStatus;
-                return (_jsx(ShellToolMessage, { ...baseProps, status: status, embeddedShellFocused: true, activeShellPtyId: 1, ptyId: 1 }));
+                return _jsx(ShellToolMessage, { ...baseProps, status: status, ptyId: 1 });
             };
             const { lastFrame } = renderWithProviders(_jsx(Wrapper, {}), {
                 uiActions,
-                uiState: { streamingState: StreamingState.Idle },
+                uiState: {
+                    streamingState: StreamingState.Idle,
+                    embeddedShellFocused: true,
+                    activePtyId: 1,
+                },
             });
             // Verify it is initially focused
             await waitFor(() => {
@@ -102,27 +106,34 @@ describe('<ShellToolMessage />', () => {
                 'renders in Alternate Buffer mode while focused',
                 {
                     status: CoreToolCallStatus.Executing,
-                    embeddedShellFocused: true,
-                    activeShellPtyId: 1,
                     ptyId: 1,
                 },
-                { useAlternateBuffer: true },
+                {
+                    useAlternateBuffer: true,
+                    uiState: {
+                        embeddedShellFocused: true,
+                        activePtyId: 1,
+                    },
+                },
             ],
             [
                 'renders in Alternate Buffer mode while unfocused',
                 {
                     status: CoreToolCallStatus.Executing,
-                    embeddedShellFocused: false,
-                    activeShellPtyId: 1,
                     ptyId: 1,
                 },
-                { useAlternateBuffer: true },
+                {
+                    useAlternateBuffer: true,
+                    uiState: {
+                        embeddedShellFocused: false,
+                        activePtyId: 1,
+                    },
+                },
             ],
         ])('%s', async (_, props, options) => {
-            const { lastFrame } = renderShell(props, options);
-            await waitFor(() => {
-                expect(lastFrame()).toMatchSnapshot();
-            });
+            const { lastFrame, waitUntilReady } = renderShell(props, options);
+            await waitUntilReady();
+            expect(lastFrame()).toMatchSnapshot();
         });
     });
     describe('Height Constraints', () => {
@@ -146,26 +157,84 @@ describe('<ShellToolMessage />', () => {
                 true,
             ],
             [
-                'defaults to ACTIVE_SHELL_MAX_LINES when availableTerminalHeight is undefined',
+                'defaults to ACTIVE_SHELL_MAX_LINES in alternate buffer when availableTerminalHeight is undefined',
                 undefined,
                 ACTIVE_SHELL_MAX_LINES,
                 false,
             ],
         ])('%s', async (_, availableTerminalHeight, expectedMaxLines, focused) => {
-            const { lastFrame } = renderShell({
+            const { lastFrame, waitUntilReady } = renderShell({
                 resultDisplay: LONG_OUTPUT,
                 renderOutputAsMarkdown: false,
                 availableTerminalHeight,
-                activeShellPtyId: 1,
-                ptyId: focused ? 1 : 2,
+                ptyId: 1,
+                status: CoreToolCallStatus.Executing,
+            }, {
+                useAlternateBuffer: true,
+                uiState: {
+                    activePtyId: focused ? 1 : 2,
+                    embeddedShellFocused: focused,
+                },
+            });
+            await waitUntilReady();
+            const frame = lastFrame();
+            expect(frame.match(/Line \d+/g)?.length).toBe(expectedMaxLines);
+            expect(frame).toMatchSnapshot();
+        });
+        it('fully expands in standard mode when availableTerminalHeight is undefined', async () => {
+            const { lastFrame } = renderShell({
+                resultDisplay: LONG_OUTPUT,
+                renderOutputAsMarkdown: false,
+                availableTerminalHeight: undefined,
                 status: CoreToolCallStatus.Executing,
-                embeddedShellFocused: focused,
-            }, { useAlternateBuffer: true });
+            }, { useAlternateBuffer: false });
+            await waitFor(() => {
+                const frame = lastFrame();
+                // Should show all 100 lines
+                expect(frame.match(/Line \d+/g)?.length).toBe(100);
+            });
+        });
+        it('fully expands in alternate buffer mode when constrainHeight is false and isExpandable is true', async () => {
+            const { lastFrame, waitUntilReady } = renderShell({
+                resultDisplay: LONG_OUTPUT,
+                renderOutputAsMarkdown: false,
+                availableTerminalHeight: undefined,
+                status: CoreToolCallStatus.Success,
+                isExpandable: true,
+            }, {
+                useAlternateBuffer: true,
+                uiState: {
+                    constrainHeight: false,
+                },
+            });
+            await waitUntilReady();
+            await waitFor(() => {
+                const frame = lastFrame();
+                // Should show all 100 lines because constrainHeight is false and isExpandable is true
+                expect(frame.match(/Line \d+/g)?.length).toBe(100);
+            });
+            expect(lastFrame()).toMatchSnapshot();
+        });
+        it('stays constrained in alternate buffer mode when isExpandable is false even if constrainHeight is false', async () => {
+            const { lastFrame, waitUntilReady } = renderShell({
+                resultDisplay: LONG_OUTPUT,
+                renderOutputAsMarkdown: false,
+                availableTerminalHeight: undefined,
+                status: CoreToolCallStatus.Success,
+                isExpandable: false,
+            }, {
+                useAlternateBuffer: true,
+                uiState: {
+                    constrainHeight: false,
+                },
+            });
+            await waitUntilReady();
             await waitFor(() => {
                 const frame = lastFrame();
-                expect(frame.match(/Line \d+/g)?.length).toBe(expectedMaxLines);
-                expect(frame).toMatchSnapshot();
+                // Should still be constrained to ACTIVE_SHELL_MAX_LINES (15) because isExpandable is false
+                expect(frame.match(/Line \d+/g)?.length).toBe(15);
             });
+            expect(lastFrame()).toMatchSnapshot();
         });
     });
 });

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

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

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

@@ -8,38 +8,50 @@ import { describe, it, expect } from 'vitest';
 import { renderWithProviders } from '../../../test-utils/render.js';
 import { ThinkingMessage } from './ThinkingMessage.js';
 describe('ThinkingMessage', () => {
-    it('renders subject line', () => {
-        const { lastFrame } = renderWithProviders(_jsx(ThinkingMessage, { thought: { subject: 'Planning', description: 'test' } }));
+    it('renders subject line', async () => {
+        const { lastFrame, waitUntilReady, unmount } = renderWithProviders(_jsx(ThinkingMessage, { thought: { subject: 'Planning', description: 'test' } }));
+        await waitUntilReady();
         expect(lastFrame()).toMatchSnapshot();
+        unmount();
     });
-    it('uses description when subject is empty', () => {
-        const { lastFrame } = renderWithProviders(_jsx(ThinkingMessage, { thought: { subject: '', description: 'Processing details' } }));
+    it('uses description when subject is empty', async () => {
+        const { lastFrame, waitUntilReady, unmount } = renderWithProviders(_jsx(ThinkingMessage, { thought: { subject: '', description: 'Processing details' } }));
+        await waitUntilReady();
         expect(lastFrame()).toMatchSnapshot();
+        unmount();
     });
-    it('renders full mode with left border and full text', () => {
-        const { lastFrame } = renderWithProviders(_jsx(ThinkingMessage, { thought: {
+    it('renders full mode with left border and full text', async () => {
+        const { lastFrame, waitUntilReady, unmount } = renderWithProviders(_jsx(ThinkingMessage, { thought: {
                 subject: 'Planning',
                 description: 'I am planning the solution.',
             } }));
+        await waitUntilReady();
         expect(lastFrame()).toMatchSnapshot();
+        unmount();
     });
-    it('indents summary line correctly', () => {
-        const { lastFrame } = renderWithProviders(_jsx(ThinkingMessage, { thought: {
+    it('indents summary line correctly', async () => {
+        const { lastFrame, waitUntilReady, unmount } = renderWithProviders(_jsx(ThinkingMessage, { thought: {
                 subject: 'Summary line',
                 description: 'First body line',
             } }));
+        await waitUntilReady();
         expect(lastFrame()).toMatchSnapshot();
+        unmount();
     });
-    it('normalizes escaped newline tokens', () => {
-        const { lastFrame } = renderWithProviders(_jsx(ThinkingMessage, { thought: {
+    it('normalizes escaped newline tokens', async () => {
+        const { lastFrame, waitUntilReady, unmount } = renderWithProviders(_jsx(ThinkingMessage, { thought: {
                 subject: 'Matching the Blocks',
                 description: '\\n\\nSome more text',
             } }));
+        await waitUntilReady();
         expect(lastFrame()).toMatchSnapshot();
+        unmount();
     });
-    it('renders empty state gracefully', () => {
-        const { lastFrame } = renderWithProviders(_jsx(ThinkingMessage, { thought: { subject: '', description: '' } }));
-        expect(lastFrame()).toBe('');
+    it('renders empty state gracefully', async () => {
+        const { lastFrame, waitUntilReady, unmount } = renderWithProviders(_jsx(ThinkingMessage, { thought: { subject: '', description: '' } }));
+        await waitUntilReady();
+        expect(lastFrame({ allowEmpty: true })).toBe('');
+        unmount();
     });
 });
 //# sourceMappingURL=ThinkingMessage.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"ThinkingMessage.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ThinkingMessage.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;QAC9B,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,eAAe,IACd,OAAO,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,GACrD,CACH,CAAC;QAEF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,eAAe,IACd,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,oBAAoB,EAAE,GAC3D,CACH,CAAC;QAEF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,eAAe,IACd,OAAO,EAAE;gBACP,OAAO,EAAE,UAAU;gBACnB,WAAW,EAAE,6BAA6B;aAC3C,GACD,CACH,CAAC;QAEF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,eAAe,IACd,OAAO,EAAE;gBACP,OAAO,EAAE,cAAc;gBACvB,WAAW,EAAE,iBAAiB;aAC/B,GACD,CACH,CAAC;QAEF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,eAAe,IACd,OAAO,EAAE;gBACP,OAAO,EAAE,qBAAqB;gBAC9B,WAAW,EAAE,sBAAsB;aACpC,GACD,CACH,CAAC;QAEF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,eAAe,IAAC,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,GAAI,CAC/D,CAAC;QAEF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"ThinkingMessage.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ThinkingMessage.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;QACpC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,KAAC,eAAe,IACd,OAAO,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,GACrD,CACH,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QAEvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACtD,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,KAAC,eAAe,IACd,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,oBAAoB,EAAE,GAC3D,CACH,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QAEvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,KAAC,eAAe,IACd,OAAO,EAAE;gBACP,OAAO,EAAE,UAAU;gBACnB,WAAW,EAAE,6BAA6B;aAC3C,GACD,CACH,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QAEvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC9C,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,KAAC,eAAe,IACd,OAAO,EAAE;gBACP,OAAO,EAAE,cAAc;gBACvB,WAAW,EAAE,iBAAiB;aAC/B,GACD,CACH,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QAEvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACjD,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,KAAC,eAAe,IACd,OAAO,EAAE;gBACP,OAAO,EAAE,qBAAqB;gBAC9B,WAAW,EAAE,sBAAsB;aACpC,GACD,CACH,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QAEvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC9C,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,KAAC,eAAe,IAAC,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,GAAI,CAC/D,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QAEvB,MAAM,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}