@google/gemini-cli 0.16.0-nightly.20251113.ad1f0d99 → 0.16.0-preview.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +3 -3
- package/dist/src/config/keyBindings.d.ts +6 -0
- package/dist/src/config/keyBindings.js +31 -0
- package/dist/src/config/keyBindings.js.map +1 -1
- package/dist/src/config/settingPaths.d.ts +10 -0
- package/dist/src/config/settingPaths.js +11 -0
- package/dist/src/config/settingPaths.js.map +1 -0
- package/dist/src/config/settings.js +2 -1
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +10 -1
- package/dist/src/config/settingsSchema.js +10 -1
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/gemini.js +14 -22
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +4 -0
- package/dist/src/gemini.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/test-utils/render.js +5 -1
- package/dist/src/test-utils/render.js.map +1 -1
- package/dist/src/ui/commands/chatCommand.js +15 -3
- package/dist/src/ui/commands/chatCommand.js.map +1 -1
- package/dist/src/ui/commands/chatCommand.test.js +44 -5
- package/dist/src/ui/commands/chatCommand.test.js.map +1 -1
- package/dist/src/ui/commands/toolsCommand.js +1 -4
- package/dist/src/ui/commands/toolsCommand.js.map +1 -1
- package/dist/src/ui/components/AlternateBufferQuittingDisplay.test.js +1 -4
- package/dist/src/ui/components/AlternateBufferQuittingDisplay.test.js.map +1 -1
- package/dist/src/ui/components/AsciiArt.d.ts +3 -0
- package/dist/src/ui/components/AsciiArt.js +36 -0
- package/dist/src/ui/components/AsciiArt.js.map +1 -1
- package/dist/src/ui/components/Header.js +6 -4
- package/dist/src/ui/components/Header.js.map +1 -1
- package/dist/src/ui/components/Header.test.js +25 -1
- package/dist/src/ui/components/Header.test.js.map +1 -1
- package/dist/src/ui/components/StickyHeader.d.ts +3 -0
- package/dist/src/ui/components/StickyHeader.js +2 -2
- package/dist/src/ui/components/StickyHeader.js.map +1 -1
- package/dist/src/ui/components/StickyHeader.test.js +2 -2
- package/dist/src/ui/components/StickyHeader.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js +5 -7
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.js +18 -12
- package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js +56 -27
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessage.d.ts +3 -0
- package/dist/src/ui/components/messages/ToolMessage.js +6 -10
- package/dist/src/ui/components/messages/ToolMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessage.test.js +3 -0
- package/dist/src/ui/components/messages/ToolMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessageRawMarkdown.test.js +3 -0
- package/dist/src/ui/components/messages/ToolMessageRawMarkdown.test.js.map +1 -1
- package/dist/src/ui/components/shared/ScrollableList.js +99 -9
- package/dist/src/ui/components/shared/ScrollableList.js.map +1 -1
- package/dist/src/ui/components/shared/ScrollableList.test.js +66 -0
- package/dist/src/ui/components/shared/ScrollableList.test.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.js +0 -6
- package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
- package/dist/src/ui/contexts/ScrollProvider.d.ts +1 -0
- package/dist/src/ui/contexts/ScrollProvider.drag.test.d.ts +6 -0
- package/dist/src/ui/contexts/ScrollProvider.drag.test.js +307 -0
- package/dist/src/ui/contexts/ScrollProvider.drag.test.js.map +1 -0
- package/dist/src/ui/contexts/ScrollProvider.js +112 -2
- package/dist/src/ui/contexts/ScrollProvider.js.map +1 -1
- package/dist/src/ui/contexts/ScrollProvider.test.js +138 -0
- package/dist/src/ui/contexts/ScrollProvider.test.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.js +2 -2
- package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.js +0 -1
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.test.js +0 -28
- package/dist/src/ui/hooks/slashCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/useAlternateBuffer.d.ts +2 -0
- package/dist/src/ui/hooks/useAlternateBuffer.js +2 -1
- package/dist/src/ui/hooks/useAlternateBuffer.js.map +1 -1
- package/dist/src/ui/hooks/useEditorSettings.js +2 -1
- package/dist/src/ui/hooks/useEditorSettings.js.map +1 -1
- package/dist/src/ui/hooks/useEditorSettings.test.js +5 -4
- package/dist/src/ui/hooks/useEditorSettings.test.js.map +1 -1
- package/dist/src/ui/hooks/useKeypress.test.js +0 -19
- package/dist/src/ui/hooks/useKeypress.test.js.map +1 -1
- package/dist/src/ui/keyMatchers.test.js +37 -0
- package/dist/src/ui/keyMatchers.test.js.map +1 -1
- package/dist/src/ui/utils/CodeColorizer.js +5 -5
- package/dist/src/ui/utils/CodeColorizer.js.map +1 -1
- package/dist/src/ui/utils/CodeColorizer.test.d.ts +6 -0
- package/dist/src/ui/utils/CodeColorizer.test.js +38 -0
- package/dist/src/ui/utils/CodeColorizer.test.js.map +1 -0
- package/dist/src/ui/utils/terminalSetup.d.ts +3 -0
- package/dist/src/ui/utils/terminalSetup.js +9 -2
- package/dist/src/ui/utils/terminalSetup.js.map +1 -1
- package/dist/src/ui/utils/ui-sizing.js +2 -1
- package/dist/src/ui/utils/ui-sizing.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
- package/dist/google-gemini-cli-0.16.0-nightly.20251112.c961f274.tgz +0 -0
|
@@ -2,9 +2,10 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
|
2
2
|
import { Box, Text } from 'ink';
|
|
3
3
|
import Gradient from 'ink-gradient';
|
|
4
4
|
import { theme } from '../semantic-colors.js';
|
|
5
|
-
import { shortAsciiLogo, longAsciiLogo, tinyAsciiLogo } from './AsciiArt.js';
|
|
5
|
+
import { shortAsciiLogo, longAsciiLogo, tinyAsciiLogo, shortAsciiLogoIde, longAsciiLogoIde, tinyAsciiLogoIde, } from './AsciiArt.js';
|
|
6
6
|
import { getAsciiArtWidth } from '../utils/textUtils.js';
|
|
7
7
|
import { useTerminalSize } from '../hooks/useTerminalSize.js';
|
|
8
|
+
import { getTerminalProgram } from '../utils/terminalSetup.js';
|
|
8
9
|
const ThemedGradient = ({ children, }) => {
|
|
9
10
|
const gradient = theme.ui.gradient;
|
|
10
11
|
if (gradient && gradient.length >= 2) {
|
|
@@ -17,6 +18,7 @@ const ThemedGradient = ({ children, }) => {
|
|
|
17
18
|
};
|
|
18
19
|
export const Header = ({ customAsciiArt, version, nightly, }) => {
|
|
19
20
|
const { columns: terminalWidth } = useTerminalSize();
|
|
21
|
+
const isIde = getTerminalProgram();
|
|
20
22
|
let displayTitle;
|
|
21
23
|
const widthOfLongLogo = getAsciiArtWidth(longAsciiLogo);
|
|
22
24
|
const widthOfShortLogo = getAsciiArtWidth(shortAsciiLogo);
|
|
@@ -24,13 +26,13 @@ export const Header = ({ customAsciiArt, version, nightly, }) => {
|
|
|
24
26
|
displayTitle = customAsciiArt;
|
|
25
27
|
}
|
|
26
28
|
else if (terminalWidth >= widthOfLongLogo) {
|
|
27
|
-
displayTitle = longAsciiLogo;
|
|
29
|
+
displayTitle = isIde ? longAsciiLogoIde : longAsciiLogo;
|
|
28
30
|
}
|
|
29
31
|
else if (terminalWidth >= widthOfShortLogo) {
|
|
30
|
-
displayTitle = shortAsciiLogo;
|
|
32
|
+
displayTitle = isIde ? shortAsciiLogoIde : shortAsciiLogo;
|
|
31
33
|
}
|
|
32
34
|
else {
|
|
33
|
-
displayTitle = tinyAsciiLogo;
|
|
35
|
+
displayTitle = isIde ? tinyAsciiLogoIde : tinyAsciiLogo;
|
|
34
36
|
}
|
|
35
37
|
const artWidth = getAsciiArtWidth(displayTitle);
|
|
36
38
|
return (_jsxs(Box, { alignItems: "flex-start", width: artWidth, flexShrink: 0, flexDirection: "column", children: [_jsx(ThemedGradient, { children: displayTitle }), nightly && (_jsx(Box, { width: "100%", flexDirection: "row", justifyContent: "flex-end", children: _jsxs(ThemedGradient, { children: ["v", version] }) }))] }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../../src/ui/components/Header.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,QAAQ,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../../src/ui/components/Header.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,QAAQ,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EACL,cAAc,EACd,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAQ/D,MAAM,cAAc,GAA4C,CAAC,EAC/D,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,QAAQ,GAAG,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC;IAEnC,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QACrC,OAAO,CACL,KAAC,QAAQ,IAAC,MAAM,EAAE,QAAQ,YACxB,KAAC,IAAI,cAAE,QAAQ,GAAQ,GACd,CACZ,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtC,OAAO,KAAC,IAAI,IAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,YAAG,QAAQ,GAAQ,CAAC;IACrD,CAAC;IAED,OAAO,KAAC,IAAI,cAAE,QAAQ,GAAQ,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAA0B,CAAC,EAC5C,cAAc,EACd,OAAO,EACP,OAAO,GACR,EAAE,EAAE;IACH,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,eAAe,EAAE,CAAC;IACrD,MAAM,KAAK,GAAG,kBAAkB,EAAE,CAAC;IACnC,IAAI,YAAY,CAAC;IACjB,MAAM,eAAe,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACxD,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAE1D,IAAI,cAAc,EAAE,CAAC;QACnB,YAAY,GAAG,cAAc,CAAC;IAChC,CAAC;SAAM,IAAI,aAAa,IAAI,eAAe,EAAE,CAAC;QAC5C,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,aAAa,CAAC;IAC1D,CAAC;SAAM,IAAI,aAAa,IAAI,gBAAgB,EAAE,CAAC;QAC7C,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,cAAc,CAAC;IAC5D,CAAC;SAAM,CAAC;QACN,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,aAAa,CAAC;IAC1D,CAAC;IAED,MAAM,QAAQ,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAEhD,OAAO,CACL,MAAC,GAAG,IACF,UAAU,EAAC,YAAY,EACvB,KAAK,EAAE,QAAQ,EACf,UAAU,EAAE,CAAC,EACb,aAAa,EAAC,QAAQ,aAEtB,KAAC,cAAc,cAAE,YAAY,GAAkB,EAC9C,OAAO,IAAI,CACV,KAAC,GAAG,IAAC,KAAK,EAAC,MAAM,EAAC,aAAa,EAAC,KAAK,EAAC,cAAc,EAAC,UAAU,YAC7D,MAAC,cAAc,oBAAG,OAAO,IAAkB,GACvC,CACP,IACG,CACP,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -8,10 +8,14 @@ import { render } from '../../test-utils/render.js';
|
|
|
8
8
|
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
9
9
|
import { Header } from './Header.js';
|
|
10
10
|
import * as useTerminalSize from '../hooks/useTerminalSize.js';
|
|
11
|
-
import { longAsciiLogo } from './AsciiArt.js';
|
|
11
|
+
import { longAsciiLogo, longAsciiLogoIde } from './AsciiArt.js';
|
|
12
12
|
import * as semanticColors from '../semantic-colors.js';
|
|
13
|
+
import * as terminalSetup from '../utils/terminalSetup.js';
|
|
13
14
|
import { Text } from 'ink';
|
|
14
15
|
vi.mock('../hooks/useTerminalSize.js');
|
|
16
|
+
vi.mock('../utils/terminalSetup.js', () => ({
|
|
17
|
+
getTerminalProgram: vi.fn(),
|
|
18
|
+
}));
|
|
15
19
|
vi.mock('ink-gradient', () => {
|
|
16
20
|
const MockGradient = ({ children }) => (_jsx(_Fragment, { children: children }));
|
|
17
21
|
return {
|
|
@@ -29,6 +33,7 @@ vi.mock('ink', async () => {
|
|
|
29
33
|
describe('<Header />', () => {
|
|
30
34
|
beforeEach(() => {
|
|
31
35
|
vi.clearAllMocks();
|
|
36
|
+
vi.mocked(terminalSetup.getTerminalProgram).mockReturnValue(null);
|
|
32
37
|
});
|
|
33
38
|
it('renders the long logo on a wide terminal', () => {
|
|
34
39
|
vi.spyOn(useTerminalSize, 'useTerminalSize').mockReturnValue({
|
|
@@ -40,6 +45,17 @@ describe('<Header />', () => {
|
|
|
40
45
|
children: longAsciiLogo,
|
|
41
46
|
}), undefined);
|
|
42
47
|
});
|
|
48
|
+
it('uses the IDE logo when running in an IDE', () => {
|
|
49
|
+
vi.spyOn(useTerminalSize, 'useTerminalSize').mockReturnValue({
|
|
50
|
+
columns: 120,
|
|
51
|
+
rows: 20,
|
|
52
|
+
});
|
|
53
|
+
vi.mocked(terminalSetup.getTerminalProgram).mockReturnValue('vscode');
|
|
54
|
+
render(_jsx(Header, { version: "1.0.0", nightly: false }));
|
|
55
|
+
expect(Text).toHaveBeenCalledWith(expect.objectContaining({
|
|
56
|
+
children: longAsciiLogoIde,
|
|
57
|
+
}), undefined);
|
|
58
|
+
});
|
|
43
59
|
it('renders custom ASCII art when provided', () => {
|
|
44
60
|
const customArt = 'CUSTOM ART';
|
|
45
61
|
render(_jsx(Header, { version: "1.0.0", nightly: false, customAsciiArt: customArt }));
|
|
@@ -47,6 +63,14 @@ describe('<Header />', () => {
|
|
|
47
63
|
children: customArt,
|
|
48
64
|
}), undefined);
|
|
49
65
|
});
|
|
66
|
+
it('renders custom ASCII art as is when running in an IDE', () => {
|
|
67
|
+
const customArt = 'CUSTOM ART';
|
|
68
|
+
vi.mocked(terminalSetup.getTerminalProgram).mockReturnValue('vscode');
|
|
69
|
+
render(_jsx(Header, { version: "1.0.0", nightly: false, customAsciiArt: customArt }));
|
|
70
|
+
expect(Text).toHaveBeenCalledWith(expect.objectContaining({
|
|
71
|
+
children: customArt,
|
|
72
|
+
}), undefined);
|
|
73
|
+
});
|
|
50
74
|
it('displays the version number when nightly is true', () => {
|
|
51
75
|
render(_jsx(Header, { version: "1.0.0", nightly: true }));
|
|
52
76
|
const textCalls = Text.mock.calls;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Header.test.js","sourceRoot":"","sources":["../../../../src/ui/components/Header.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAa,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,eAAe,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"Header.test.js","sourceRoot":"","sources":["../../../../src/ui/components/Header.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { jsx as _jsx } from "react/jsx-runtime";
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { Box } from 'ink';
|
|
3
3
|
import { theme } from '../semantic-colors.js';
|
|
4
|
-
export const StickyHeader = ({ children, width, }) => (_jsx(Box, { sticky: true, minHeight: 1, flexShrink: 0, width: width, stickyChildren:
|
|
4
|
+
export const StickyHeader = ({ children, width, isFirst, borderColor, borderDimColor, }) => (_jsx(Box, { sticky: true, minHeight: 1, flexShrink: 0, width: width, stickyChildren: _jsxs(Box, { borderStyle: "round", flexDirection: "column", width: width, opaque: true, borderColor: borderColor, borderDimColor: borderDimColor, borderBottom: false, borderTop: isFirst, paddingTop: isFirst ? 0 : 1, children: [_jsx(Box, { paddingX: 1, children: children }), _jsx(Box, { width: width - 2, borderColor: theme.ui.dark, borderStyle: "single", borderTop: false, borderBottom: true, borderLeft: false, borderRight: false })] }), children: _jsx(Box, { borderStyle: "round", width: width, borderColor: borderColor, borderDimColor: borderDimColor, borderBottom: false, borderTop: isFirst, borderLeft: true, borderRight: true, paddingX: 1, paddingBottom: 1, paddingTop: isFirst ? 0 : 1, children: children }) }));
|
|
5
5
|
//# sourceMappingURL=StickyHeader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StickyHeader.js","sourceRoot":"","sources":["../../../../src/ui/components/StickyHeader.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"StickyHeader.js","sourceRoot":"","sources":["../../../../src/ui/components/StickyHeader.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAU9C,MAAM,CAAC,MAAM,YAAY,GAAgC,CAAC,EACxD,QAAQ,EACR,KAAK,EACL,OAAO,EACP,WAAW,EACX,cAAc,GACf,EAAE,EAAE,CAAC,CACJ,KAAC,GAAG,IACF,MAAM,QACN,SAAS,EAAE,CAAC,EACZ,UAAU,EAAE,CAAC,EACb,KAAK,EAAE,KAAK,EACZ,cAAc,EACZ,MAAC,GAAG,IACF,WAAW,EAAC,OAAO,EACnB,aAAa,EAAC,QAAQ,EACtB,KAAK,EAAE,KAAK,EACZ,MAAM,QACN,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,KAAK,EACnB,SAAS,EAAE,OAAO,EAClB,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAE3B,KAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,YAAG,QAAQ,GAAO,EAElC,KAAC,GAAG,IACF,KAAK,EAAE,KAAK,GAAG,CAAC,EAChB,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,EAC1B,WAAW,EAAC,QAAQ,EACpB,SAAS,EAAE,KAAK,EAChB,YAAY,EAAE,IAAI,EAClB,UAAU,EAAE,KAAK,EACjB,WAAW,EAAE,KAAK,GACb,IACH,YAGR,KAAC,GAAG,IACF,WAAW,EAAC,OAAO,EACnB,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,KAAK,EACnB,SAAS,EAAE,OAAO,EAClB,UAAU,EAAE,IAAI,EAChB,WAAW,EAAE,IAAI,EACjB,QAAQ,EAAE,CAAC,EACX,aAAa,EAAE,CAAC,EAChB,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAE1B,QAAQ,GACL,GACF,CACP,CAAC"}
|
|
@@ -9,8 +9,8 @@ import { describe, it, expect } from 'vitest';
|
|
|
9
9
|
import { StickyHeader } from './StickyHeader.js';
|
|
10
10
|
import { renderWithProviders } from '../../test-utils/render.js';
|
|
11
11
|
describe('StickyHeader', () => {
|
|
12
|
-
it('renders children', () => {
|
|
13
|
-
const { lastFrame } = renderWithProviders(_jsx(StickyHeader, { width: 80, children: _jsx(Text, { children: "Hello Sticky" }) }));
|
|
12
|
+
it.each([true, false])('renders children with isFirst=%s', (isFirst) => {
|
|
13
|
+
const { lastFrame } = renderWithProviders(_jsx(StickyHeader, { isFirst: isFirst, width: 80, borderColor: "green", borderDimColor: false, children: _jsx(Text, { children: "Hello Sticky" }) }));
|
|
14
14
|
expect(lastFrame()).toContain('Hello Sticky');
|
|
15
15
|
});
|
|
16
16
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StickyHeader.test.js","sourceRoot":"","sources":["../../../../src/ui/components/StickyHeader.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"StickyHeader.test.js","sourceRoot":"","sources":["../../../../src/ui/components/StickyHeader.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,kCAAkC,EAAE,CAAC,OAAO,EAAE,EAAE;QACrE,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,YAAY,IACX,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,EAAE,EACT,WAAW,EAAC,OAAO,EACnB,cAAc,EAAE,KAAK,YAErB,KAAC,IAAI,+BAAoB,GACZ,CAChB,CAAC;QACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -11,7 +11,6 @@ import { theme } from '../../semantic-colors.js';
|
|
|
11
11
|
import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
|
|
12
12
|
export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused = true, availableTerminalHeight, terminalWidth, }) => {
|
|
13
13
|
const { onConfirm } = confirmationDetails;
|
|
14
|
-
const childWidth = terminalWidth - 2; // 2 for padding
|
|
15
14
|
const isAlternateBuffer = useAlternateBuffer();
|
|
16
15
|
const [ideClient, setIdeClient] = useState(null);
|
|
17
16
|
const [isDiffingEnabled, setIsDiffingEnabled] = useState(false);
|
|
@@ -185,18 +184,18 @@ export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused
|
|
|
185
184
|
bodyContentHeight -= 2; // Account for padding;
|
|
186
185
|
}
|
|
187
186
|
const commandBox = (_jsx(Box, { children: _jsx(Text, { color: theme.text.link, children: executionProps.command }) }));
|
|
188
|
-
bodyContent =
|
|
187
|
+
bodyContent = isAlternateBuffer ? (commandBox) : (_jsx(MaxSizedBox, { maxHeight: bodyContentHeight, maxWidth: Math.max(terminalWidth, 1), children: commandBox }));
|
|
189
188
|
}
|
|
190
189
|
else if (confirmationDetails.type === 'info') {
|
|
191
190
|
const infoProps = confirmationDetails;
|
|
192
191
|
const displayUrls = infoProps.urls &&
|
|
193
192
|
!(infoProps.urls.length === 1 && infoProps.urls[0] === infoProps.prompt);
|
|
194
|
-
bodyContent = (_jsxs(Box, { flexDirection: "column",
|
|
193
|
+
bodyContent = (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.text.link, children: _jsx(RenderInline, { text: infoProps.prompt, defaultColor: theme.text.link }) }), displayUrls && infoProps.urls && infoProps.urls.length > 0 && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: theme.text.primary, children: "URLs to fetch:" }), infoProps.urls.map((url) => (_jsxs(Text, { children: [' ', "- ", _jsx(RenderInline, { text: url })] }, url)))] }))] }));
|
|
195
194
|
}
|
|
196
195
|
else {
|
|
197
196
|
// mcp tool confirmation
|
|
198
197
|
const mcpProps = confirmationDetails;
|
|
199
|
-
bodyContent = (_jsxs(Box, { flexDirection: "column",
|
|
198
|
+
bodyContent = (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: theme.text.link, children: ["MCP Server: ", mcpProps.serverName] }), _jsxs(Text, { color: theme.text.link, children: ["Tool: ", mcpProps.toolName] })] }));
|
|
200
199
|
}
|
|
201
200
|
return { question, bodyContent, options };
|
|
202
201
|
}, [
|
|
@@ -207,13 +206,12 @@ export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused
|
|
|
207
206
|
availableTerminalHeight,
|
|
208
207
|
terminalWidth,
|
|
209
208
|
isAlternateBuffer,
|
|
210
|
-
childWidth,
|
|
211
209
|
]);
|
|
212
210
|
if (confirmationDetails.type === 'edit') {
|
|
213
211
|
if (confirmationDetails.isModifying) {
|
|
214
|
-
return (_jsxs(Box, { width: terminalWidth, borderStyle: "round", borderColor: theme.border.default, justifyContent: "space-around",
|
|
212
|
+
return (_jsxs(Box, { width: terminalWidth, borderStyle: "round", borderColor: theme.border.default, justifyContent: "space-around", paddingTop: 1, paddingBottom: 1, overflow: "hidden", children: [_jsx(Text, { color: theme.text.primary, children: "Modify in progress: " }), _jsx(Text, { color: theme.status.success, children: "Save and close external editor to continue" })] }));
|
|
215
213
|
}
|
|
216
214
|
}
|
|
217
|
-
return (_jsxs(Box, { flexDirection: "column", paddingTop: 0, paddingBottom: 1, children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, overflow: "hidden", marginBottom: 1,
|
|
215
|
+
return (_jsxs(Box, { flexDirection: "column", paddingTop: 0, paddingBottom: 1, children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, overflow: "hidden", marginBottom: 1, children: bodyContent }), _jsx(Box, { marginBottom: 1, flexShrink: 0, children: _jsx(Text, { color: theme.text.primary, children: question }) }), _jsx(Box, { flexShrink: 0, children: _jsx(RadioButtonSelect, { items: options, onSelect: handleSelect, isFocused: isFocused }) })] }));
|
|
218
216
|
};
|
|
219
217
|
//# sourceMappingURL=ToolConfirmationMessage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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;AAOrE,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,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAUvE,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;
|
|
1
|
+
{"version":3,"file":"ToolConfirmationMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ToolConfirmationMessage.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,24 +7,20 @@ import { ToolConfirmationMessage } from './ToolConfirmationMessage.js';
|
|
|
7
7
|
import { theme } from '../../semantic-colors.js';
|
|
8
8
|
import { SHELL_COMMAND_NAME, SHELL_NAME } from '../../constants.js';
|
|
9
9
|
import { useConfig } from '../../contexts/ConfigContext.js';
|
|
10
|
-
import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
|
|
11
10
|
// Main component renders the border and maps the tools using ToolMessage
|
|
12
11
|
export const ToolGroupMessage = ({ toolCalls, availableTerminalHeight, terminalWidth, isFocused = true, activeShellPtyId, embeddedShellFocused, }) => {
|
|
13
12
|
const isEmbeddedShellFocused = embeddedShellFocused &&
|
|
14
13
|
toolCalls.some((t) => t.ptyId === activeShellPtyId && t.status === ToolCallStatus.Executing);
|
|
15
14
|
const hasPending = !toolCalls.every((t) => t.status === ToolCallStatus.Success);
|
|
16
15
|
const config = useConfig();
|
|
17
|
-
const isAlternateBuffer = useAlternateBuffer();
|
|
18
16
|
const isShellCommand = toolCalls.some((t) => t.name === SHELL_COMMAND_NAME || t.name === SHELL_NAME);
|
|
19
17
|
const borderColor = (isShellCommand && hasPending) || isEmbeddedShellFocused
|
|
20
18
|
? theme.ui.symbol
|
|
21
19
|
: hasPending
|
|
22
20
|
? theme.status.warning
|
|
23
21
|
: theme.border.default;
|
|
22
|
+
const borderDimColor = hasPending && (!isShellCommand || !isEmbeddedShellFocused);
|
|
24
23
|
const staticHeight = /* border */ 2 + /* marginBottom */ 1;
|
|
25
|
-
// This is a bit of a magic number, but it accounts for the border and
|
|
26
|
-
// marginLeft in regular mode and just the border in alternate buffer mode.
|
|
27
|
-
const innerWidth = isAlternateBuffer ? terminalWidth - 3 : terminalWidth - 4;
|
|
28
24
|
// only prompt for tool approval on the first 'confirming' tool in the list
|
|
29
25
|
// note, after the CTA, this automatically moves over to the next 'confirming' tool
|
|
30
26
|
const toolAwaitingApproval = useMemo(() => toolCalls.find((tc) => tc.status === ToolCallStatus.Confirming), [toolCalls]);
|
|
@@ -39,18 +35,28 @@ export const ToolGroupMessage = ({ toolCalls, availableTerminalHeight, terminalW
|
|
|
39
35
|
? Math.max(Math.floor((availableTerminalHeight - staticHeight - countOneLineToolCalls) /
|
|
40
36
|
Math.max(1, countToolCallsWithResults)), 1)
|
|
41
37
|
: undefined;
|
|
42
|
-
return (
|
|
38
|
+
return (
|
|
39
|
+
// This box doesn't have a border even though it conceptually does because
|
|
40
|
+
// we need to allow the sticky headers to render the borders themselves so
|
|
41
|
+
// that the top border can be sticky.
|
|
42
|
+
_jsxs(Box, { flexDirection: "column",
|
|
43
43
|
/*
|
|
44
44
|
This width constraint is highly important and protects us from an Ink rendering bug.
|
|
45
45
|
Since the ToolGroup can typically change rendering states frequently, it can cause
|
|
46
46
|
Ink to render the border of the box incorrectly and span multiple lines and even
|
|
47
47
|
cause tearing.
|
|
48
48
|
*/
|
|
49
|
-
width: terminalWidth,
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
49
|
+
width: terminalWidth, children: [toolCalls.map((tool, index) => {
|
|
50
|
+
const isConfirming = toolAwaitingApproval?.callId === tool.callId;
|
|
51
|
+
const isFirst = index === 0;
|
|
52
|
+
return (_jsxs(Box, { flexDirection: "column", minHeight: 1, width: terminalWidth, children: [_jsx(ToolMessage, { ...tool, availableTerminalHeight: availableTerminalHeightPerToolMessage, terminalWidth: terminalWidth, emphasis: isConfirming ? 'high' : toolAwaitingApproval ? 'low' : 'medium', activeShellPtyId: activeShellPtyId, embeddedShellFocused: embeddedShellFocused, config: config, isFirst: isFirst, borderColor: borderColor, borderDimColor: borderDimColor }), _jsxs(Box, { borderLeft: true, borderRight: true, borderTop: false, borderBottom: false, borderColor: borderColor, borderDimColor: borderDimColor, flexDirection: "column", borderStyle: "round", paddingLeft: 1, paddingRight: 1, children: [tool.status === ToolCallStatus.Confirming &&
|
|
53
|
+
isConfirming &&
|
|
54
|
+
tool.confirmationDetails && (_jsx(ToolConfirmationMessage, { confirmationDetails: tool.confirmationDetails, config: config, isFocused: isFocused, availableTerminalHeight: availableTerminalHeightPerToolMessage, terminalWidth: terminalWidth - 4 })), tool.outputFile && (_jsx(Box, { children: _jsxs(Text, { color: theme.text.primary, children: ["Output too long and was saved to: ", tool.outputFile] }) }))] })] }, tool.callId));
|
|
55
|
+
}),
|
|
56
|
+
/*
|
|
57
|
+
We have to keep the bottom border separate so it doesn't get
|
|
58
|
+
drawn over by the sticky header directly inside it.
|
|
59
|
+
*/
|
|
60
|
+
toolCalls.length > 0 && (_jsx(Box, { height: 0, width: terminalWidth, borderLeft: true, borderRight: true, borderTop: false, borderBottom: true, borderColor: borderColor, borderDimColor: borderDimColor, borderStyle: "round" }))] }));
|
|
55
61
|
};
|
|
56
62
|
//# sourceMappingURL=ToolGroupMessage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolGroupMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ToolGroupMessage.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAEhC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"ToolGroupMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ToolGroupMessage.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
/**
|
|
3
3
|
* @license
|
|
4
4
|
* Copyright 2025 Google LLC
|
|
@@ -6,34 +6,9 @@ import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
|
|
|
6
6
|
*/
|
|
7
7
|
import { renderWithProviders } from '../../../test-utils/render.js';
|
|
8
8
|
import { describe, it, expect, vi } from 'vitest';
|
|
9
|
-
import { Text } from 'ink';
|
|
10
9
|
import { ToolGroupMessage } from './ToolGroupMessage.js';
|
|
11
10
|
import { ToolCallStatus } from '../../types.js';
|
|
12
|
-
import {
|
|
13
|
-
// Mock child components to isolate ToolGroupMessage behavior
|
|
14
|
-
vi.mock('./ToolMessage.js', () => ({
|
|
15
|
-
ToolMessage: function MockToolMessage({ callId, name, description, status, emphasis, }) {
|
|
16
|
-
// Use the same constants as the real component
|
|
17
|
-
const statusSymbolMap = {
|
|
18
|
-
[ToolCallStatus.Success]: TOOL_STATUS.SUCCESS,
|
|
19
|
-
[ToolCallStatus.Pending]: TOOL_STATUS.PENDING,
|
|
20
|
-
[ToolCallStatus.Executing]: TOOL_STATUS.EXECUTING,
|
|
21
|
-
[ToolCallStatus.Confirming]: TOOL_STATUS.CONFIRMING,
|
|
22
|
-
[ToolCallStatus.Canceled]: TOOL_STATUS.CANCELED,
|
|
23
|
-
[ToolCallStatus.Error]: TOOL_STATUS.ERROR,
|
|
24
|
-
};
|
|
25
|
-
const statusSymbol = statusSymbolMap[status] || '?';
|
|
26
|
-
return (_jsxs(Text, { children: ["MockTool[", callId, "]: ", statusSymbol, " ", name, " - ", description, " (", emphasis, ")"] }));
|
|
27
|
-
},
|
|
28
|
-
}));
|
|
29
|
-
vi.mock('./ToolConfirmationMessage.js', () => ({
|
|
30
|
-
ToolConfirmationMessage: function MockToolConfirmationMessage({ confirmationDetails, }) {
|
|
31
|
-
const displayText = confirmationDetails?.type === 'info'
|
|
32
|
-
? confirmationDetails.prompt
|
|
33
|
-
: confirmationDetails?.title || 'confirm';
|
|
34
|
-
return _jsxs(Text, { children: ["MockConfirmation: ", displayText] });
|
|
35
|
-
},
|
|
36
|
-
}));
|
|
11
|
+
import { Scrollable } from '../shared/Scrollable.js';
|
|
37
12
|
describe('<ToolGroupMessage />', () => {
|
|
38
13
|
const createToolCall = (overrides = {}) => ({
|
|
39
14
|
callId: 'tool-123',
|
|
@@ -180,6 +155,60 @@ describe('<ToolGroupMessage />', () => {
|
|
|
180
155
|
expect(lastFrame()).toMatchSnapshot();
|
|
181
156
|
unmount();
|
|
182
157
|
});
|
|
158
|
+
it('renders header when scrolled', () => {
|
|
159
|
+
const toolCalls = [
|
|
160
|
+
createToolCall({
|
|
161
|
+
callId: '1',
|
|
162
|
+
name: 'tool-1',
|
|
163
|
+
description: 'Description 1. This is a long description that will need to be truncated if the terminal width is small.',
|
|
164
|
+
resultDisplay: 'line1\nline2\nline3\nline4\nline5',
|
|
165
|
+
}),
|
|
166
|
+
createToolCall({
|
|
167
|
+
callId: '2',
|
|
168
|
+
name: 'tool-2',
|
|
169
|
+
description: 'Description 2',
|
|
170
|
+
resultDisplay: 'line1\nline2',
|
|
171
|
+
}),
|
|
172
|
+
];
|
|
173
|
+
const { lastFrame, unmount } = renderWithProviders(_jsx(Scrollable, { height: 10, hasFocus: true, scrollToBottom: true, children: _jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls }) }));
|
|
174
|
+
expect(lastFrame()).toMatchSnapshot();
|
|
175
|
+
unmount();
|
|
176
|
+
});
|
|
177
|
+
it('renders tool call with outputFile', () => {
|
|
178
|
+
const toolCalls = [
|
|
179
|
+
createToolCall({
|
|
180
|
+
callId: 'tool-output-file',
|
|
181
|
+
name: 'tool-with-file',
|
|
182
|
+
description: 'Tool that saved output to file',
|
|
183
|
+
status: ToolCallStatus.Success,
|
|
184
|
+
outputFile: '/path/to/output.txt',
|
|
185
|
+
}),
|
|
186
|
+
];
|
|
187
|
+
const { lastFrame, unmount } = renderWithProviders(_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls }));
|
|
188
|
+
expect(lastFrame()).toMatchSnapshot();
|
|
189
|
+
unmount();
|
|
190
|
+
});
|
|
191
|
+
it('renders two tool groups where only the last line of the previous group is visible', () => {
|
|
192
|
+
const toolCalls1 = [
|
|
193
|
+
createToolCall({
|
|
194
|
+
callId: '1',
|
|
195
|
+
name: 'tool-1',
|
|
196
|
+
description: 'Description 1',
|
|
197
|
+
resultDisplay: 'line1\nline2\nline3\nline4\nline5',
|
|
198
|
+
}),
|
|
199
|
+
];
|
|
200
|
+
const toolCalls2 = [
|
|
201
|
+
createToolCall({
|
|
202
|
+
callId: '2',
|
|
203
|
+
name: 'tool-2',
|
|
204
|
+
description: 'Description 2',
|
|
205
|
+
resultDisplay: 'line1',
|
|
206
|
+
}),
|
|
207
|
+
];
|
|
208
|
+
const { lastFrame, unmount } = renderWithProviders(_jsxs(Scrollable, { height: 6, hasFocus: true, scrollToBottom: true, children: [_jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls1 }), _jsx(ToolGroupMessage, { ...baseProps, toolCalls: toolCalls2 })] }));
|
|
209
|
+
expect(lastFrame()).toMatchSnapshot();
|
|
210
|
+
unmount();
|
|
211
|
+
});
|
|
183
212
|
});
|
|
184
213
|
describe('Border Color Logic', () => {
|
|
185
214
|
it('uses yellow border when tools are pending', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolGroupMessage.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ToolGroupMessage.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ToolGroupMessage.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ToolGroupMessage.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,9 @@ export interface ToolMessageProps extends IndividualToolCallDisplay {
|
|
|
14
14
|
renderOutputAsMarkdown?: boolean;
|
|
15
15
|
activeShellPtyId?: number | null;
|
|
16
16
|
embeddedShellFocused?: boolean;
|
|
17
|
+
isFirst: boolean;
|
|
18
|
+
borderColor: string;
|
|
19
|
+
borderDimColor: boolean;
|
|
17
20
|
config?: Config;
|
|
18
21
|
}
|
|
19
22
|
export declare const ToolMessage: React.FC<ToolMessageProps>;
|
|
@@ -25,7 +25,7 @@ const MIN_LINES_SHOWN = 2; // show at least this many lines
|
|
|
25
25
|
// Large threshold to ensure we don't cause performance issues for very large
|
|
26
26
|
// outputs that will get truncated further MaxSizedBox anyway.
|
|
27
27
|
const MAXIMUM_RESULT_DISPLAY_CHARACTERS = 1000000;
|
|
28
|
-
export const ToolMessage = ({ name, description, resultDisplay, status, availableTerminalHeight, terminalWidth, emphasis = 'medium', renderOutputAsMarkdown = true, activeShellPtyId, embeddedShellFocused, ptyId, config, }) => {
|
|
28
|
+
export const ToolMessage = ({ name, description, resultDisplay, status, availableTerminalHeight, terminalWidth, emphasis = 'medium', renderOutputAsMarkdown = true, activeShellPtyId, embeddedShellFocused, ptyId, config, isFirst, borderColor, borderDimColor, }) => {
|
|
29
29
|
const { renderMarkdown } = useUIState();
|
|
30
30
|
const isAlternateBuffer = useAlternateBuffer();
|
|
31
31
|
const isThisShellFocused = (name === SHELL_COMMAND_NAME || name === 'Shell') &&
|
|
@@ -67,7 +67,8 @@ export const ToolMessage = ({ name, description, resultDisplay, status, availabl
|
|
|
67
67
|
if (availableHeight && !isAlternateBuffer) {
|
|
68
68
|
renderOutputAsMarkdown = false;
|
|
69
69
|
}
|
|
70
|
-
const
|
|
70
|
+
const combinedPaddingAndBorderWidth = 4;
|
|
71
|
+
const childWidth = terminalWidth - combinedPaddingAndBorderWidth;
|
|
71
72
|
const truncatedResultDisplay = React.useMemo(() => {
|
|
72
73
|
if (typeof resultDisplay === 'string') {
|
|
73
74
|
if (resultDisplay.length > MAXIMUM_RESULT_DISPLAY_CHARACTERS) {
|
|
@@ -79,7 +80,7 @@ export const ToolMessage = ({ name, description, resultDisplay, status, availabl
|
|
|
79
80
|
const renderedResult = React.useMemo(() => {
|
|
80
81
|
if (!truncatedResultDisplay)
|
|
81
82
|
return null;
|
|
82
|
-
return (_jsx(Box, { width:
|
|
83
|
+
return (_jsx(Box, { width: childWidth, flexDirection: "column", children: _jsx(Box, { flexDirection: "column", children: typeof truncatedResultDisplay === 'string' &&
|
|
83
84
|
renderOutputAsMarkdown ? (_jsx(Box, { flexDirection: "column", children: _jsx(MarkdownDisplay, { text: truncatedResultDisplay, terminalWidth: childWidth, renderMarkdown: renderMarkdown, isPending: false }) })) : typeof truncatedResultDisplay === 'string' &&
|
|
84
85
|
!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' &&
|
|
85
86
|
'fileDiff' in truncatedResultDisplay ? (_jsx(DiffRenderer, { diffContent: truncatedResultDisplay.fileDiff, filename: truncatedResultDisplay.fileName, availableTerminalHeight: availableHeight, terminalWidth: childWidth })) : typeof truncatedResultDisplay === 'object' &&
|
|
@@ -93,13 +94,8 @@ export const ToolMessage = ({ name, description, resultDisplay, status, availabl
|
|
|
93
94
|
renderMarkdown,
|
|
94
95
|
isAlternateBuffer,
|
|
95
96
|
availableHeight,
|
|
96
|
-
terminalWidth,
|
|
97
97
|
]);
|
|
98
|
-
return (
|
|
99
|
-
// We have the StickyHeader intentionally exceedsthe allowed width for this
|
|
100
|
-
// component by 1 so tne horizontal line it renders can extend into the 1
|
|
101
|
-
// pixel of padding of the box drawn by the parent of the ToolMessage.
|
|
102
|
-
_jsxs(_Fragment, { children: [_jsxs(StickyHeader, { width: terminalWidth + 1, children: [_jsx(ToolStatusIndicator, { status: status, name: name }), _jsx(ToolInfo, { name: name, status: status, description: description, emphasis: emphasis }), shouldShowFocusHint && (_jsx(Box, { marginLeft: 1, flexShrink: 0, children: _jsx(Text, { color: theme.text.accent, children: isThisShellFocused ? '(Focused)' : '(ctrl+f to focus)' }) })), emphasis === 'high' && _jsx(TrailingIndicator, {})] }), renderedResult, isThisShellFocused && config && (_jsx(Box, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: _jsx(ShellInputPrompt, { activeShellPtyId: activeShellPtyId ?? null, focus: embeddedShellFocused }) }))] }));
|
|
98
|
+
return (_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)' : '(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: [renderedResult, isThisShellFocused && config && (_jsx(Box, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: _jsx(ShellInputPrompt, { activeShellPtyId: activeShellPtyId ?? null, focus: embeddedShellFocused }) }))] })] }));
|
|
103
99
|
};
|
|
104
100
|
const ToolStatusIndicator = ({ status, name, }) => {
|
|
105
101
|
const isShell = name === SHELL_COMMAND_NAME || name === SHELL_NAME;
|
|
@@ -121,7 +117,7 @@ const ToolInfo = ({ name, description, status, emphasis, }) => {
|
|
|
121
117
|
}
|
|
122
118
|
}
|
|
123
119
|
}, [emphasis]);
|
|
124
|
-
return (_jsx(Box, { children: _jsxs(Text, { strikethrough: status === ToolCallStatus.Canceled, children: [_jsx(Text, { color: nameColor, bold: true, children: name }), ' ', _jsx(Text, { color: theme.text.secondary, children: description })] }) }));
|
|
120
|
+
return (_jsx(Box, { overflow: "hidden", height: 1, flexGrow: 1, flexShrink: 1, children: _jsxs(Text, { strikethrough: status === ToolCallStatus.Canceled, wrap: "truncate", children: [_jsx(Text, { color: nameColor, bold: true, children: name }), ' ', _jsx(Text, { color: theme.text.secondary, children: description })] }) }));
|
|
125
121
|
};
|
|
126
122
|
const TrailingIndicator = () => (_jsxs(Text, { color: theme.text.primary, wrap: "truncate", children: [' ', "\u2190"] }));
|
|
127
123
|
//# sourceMappingURL=ToolMessage.js.map
|