@google/gemini-cli 0.15.0-nightly.20251111.51f952e7 → 0.15.0-preview.1
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/google-gemini-cli-0.15.0-preview.0.tgz +0 -0
- package/dist/package.json +2 -2
- package/dist/src/config/config.d.ts +3 -0
- package/dist/src/config/config.js +31 -0
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +20 -0
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/extension-manager.js +13 -1
- package/dist/src/config/extension-manager.js.map +1 -1
- package/dist/src/config/extension.test.js +65 -0
- package/dist/src/config/extension.test.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.d.ts +2 -2
- package/dist/src/gemini.js +35 -4
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +14 -7
- 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/nonInteractiveCli.d.ts +3 -2
- package/dist/src/nonInteractiveCli.js +6 -1
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/nonInteractiveCli.test.js +1 -0
- package/dist/src/nonInteractiveCli.test.js.map +1 -1
- package/dist/src/test-utils/render.d.ts +2 -1
- package/dist/src/test-utils/render.js +13 -3
- package/dist/src/test-utils/render.js.map +1 -1
- package/dist/src/ui/App.js +9 -1
- package/dist/src/ui/App.js.map +1 -1
- package/dist/src/ui/App.test.js +25 -1
- package/dist/src/ui/App.test.js.map +1 -1
- package/dist/src/ui/AppContainer.d.ts +2 -3
- package/dist/src/ui/AppContainer.js +22 -7
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +349 -46
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/commands/toolsCommand.js +4 -1
- package/dist/src/ui/commands/toolsCommand.js.map +1 -1
- package/dist/src/ui/components/AlternateBufferQuittingDisplay.d.ts +6 -0
- package/dist/src/ui/components/AlternateBufferQuittingDisplay.js +24 -0
- package/dist/src/ui/components/AlternateBufferQuittingDisplay.js.map +1 -0
- package/dist/src/ui/components/AlternateBufferQuittingDisplay.test.d.ts +6 -0
- package/dist/src/ui/components/AlternateBufferQuittingDisplay.test.js +101 -0
- package/dist/src/ui/components/AlternateBufferQuittingDisplay.test.js.map +1 -0
- package/dist/src/ui/components/Composer.js +11 -4
- package/dist/src/ui/components/Composer.js.map +1 -1
- package/dist/src/ui/components/CopyModeWarning.d.ts +7 -0
- package/dist/src/ui/components/CopyModeWarning.js +12 -0
- package/dist/src/ui/components/CopyModeWarning.js.map +1 -0
- package/dist/src/ui/components/DetailedMessagesDisplay.js +1 -1
- package/dist/src/ui/components/Header.js +11 -1
- package/dist/src/ui/components/Header.js.map +1 -1
- package/dist/src/ui/components/Header.test.js +69 -14
- package/dist/src/ui/components/Header.test.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.js +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.test.js +43 -41
- package/dist/src/ui/components/HistoryItemDisplay.test.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.d.ts +2 -0
- package/dist/src/ui/components/InputPrompt.js +14 -8
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/MainContent.js +52 -15
- package/dist/src/ui/components/MainContent.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.test.js +1 -0
- package/dist/src/ui/components/ModelDialog.test.js.map +1 -1
- package/dist/src/ui/components/StickyHeader.d.ts +11 -0
- package/dist/src/ui/components/StickyHeader.js +5 -0
- package/dist/src/ui/components/StickyHeader.js.map +1 -0
- package/dist/src/ui/components/StickyHeader.test.d.ts +6 -0
- package/dist/src/ui/components/StickyHeader.test.js +17 -0
- package/dist/src/ui/components/StickyHeader.test.js.map +1 -0
- package/dist/src/ui/components/ThemeDialog.js +11 -3
- package/dist/src/ui/components/ThemeDialog.js.map +1 -1
- package/dist/src/ui/components/messages/DiffRenderer.js +129 -89
- package/dist/src/ui/components/messages/DiffRenderer.js.map +1 -1
- package/dist/src/ui/components/messages/DiffRenderer.test.js +107 -115
- package/dist/src/ui/components/messages/DiffRenderer.test.js.map +1 -1
- package/dist/src/ui/components/messages/GeminiMessage.js +3 -1
- package/dist/src/ui/components/messages/GeminiMessage.js.map +1 -1
- package/dist/src/ui/components/messages/GeminiMessageContent.js +3 -1
- package/dist/src/ui/components/messages/GeminiMessageContent.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js +152 -121
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.js +5 -7
- package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js +1 -5
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessage.js +39 -16
- package/dist/src/ui/components/messages/ToolMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessageRawMarkdown.test.js +33 -4
- package/dist/src/ui/components/messages/ToolMessageRawMarkdown.test.js.map +1 -1
- package/dist/src/ui/components/messages/UserMessage.d.ts +1 -0
- package/dist/src/ui/components/messages/UserMessage.js +2 -2
- package/dist/src/ui/components/messages/UserMessage.js.map +1 -1
- package/dist/src/ui/components/shared/ScrollableList.test.js +61 -24
- package/dist/src/ui/components/shared/ScrollableList.test.js.map +1 -1
- package/dist/src/ui/components/shared/VirtualizedList.js +1 -1
- package/dist/src/ui/components/shared/VirtualizedList.js.map +1 -1
- package/dist/src/ui/constants.d.ts +1 -0
- package/dist/src/ui/constants.js +5 -0
- package/dist/src/ui/constants.js.map +1 -1
- package/dist/src/ui/contexts/UIStateContext.d.ts +1 -0
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.test.js +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/useAlternateBuffer.d.ts +6 -0
- package/dist/src/ui/hooks/useAlternateBuffer.js +11 -0
- package/dist/src/ui/hooks/useAlternateBuffer.js.map +1 -0
- package/dist/src/ui/hooks/useGeminiStream.test.js +4 -0
- package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
- package/dist/src/ui/hooks/usePromptCompletion.js +2 -9
- package/dist/src/ui/hooks/usePromptCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useSessionBrowser.d.ts +18 -0
- package/dist/src/ui/hooks/useSessionBrowser.js +152 -0
- package/dist/src/ui/hooks/useSessionBrowser.js.map +1 -0
- package/dist/src/ui/hooks/useSessionBrowser.test.d.ts +6 -0
- package/dist/src/ui/hooks/useSessionBrowser.test.js +544 -0
- package/dist/src/ui/hooks/useSessionBrowser.test.js.map +1 -0
- package/dist/src/ui/hooks/useSessionResume.d.ts +30 -0
- package/dist/src/ui/hooks/useSessionResume.js +56 -0
- package/dist/src/ui/hooks/useSessionResume.js.map +1 -0
- package/dist/src/ui/hooks/useSessionResume.test.d.ts +6 -0
- package/dist/src/ui/hooks/useSessionResume.test.js +325 -0
- package/dist/src/ui/hooks/useSessionResume.test.js.map +1 -0
- package/dist/src/ui/hooks/useToolScheduler.test.js +1 -0
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/layouts/DefaultAppLayout.js +9 -3
- package/dist/src/ui/layouts/DefaultAppLayout.js.map +1 -1
- package/dist/src/ui/utils/CodeColorizer.d.ts +11 -3
- package/dist/src/ui/utils/CodeColorizer.js +18 -9
- package/dist/src/ui/utils/CodeColorizer.js.map +1 -1
- package/dist/src/ui/utils/MarkdownDisplay.js +32 -6
- package/dist/src/ui/utils/MarkdownDisplay.js.map +1 -1
- package/dist/src/ui/utils/ui-sizing.js +9 -3
- package/dist/src/ui/utils/ui-sizing.js.map +1 -1
- package/dist/src/utils/cleanup.test.js +1 -1
- package/dist/src/utils/cleanup.test.js.map +1 -1
- package/dist/src/utils/sessionCleanup.test.js +76 -0
- package/dist/src/utils/sessionCleanup.test.js.map +1 -1
- package/dist/src/utils/sessionUtils.d.ts +54 -0
- package/dist/src/utils/sessionUtils.js +141 -1
- package/dist/src/utils/sessionUtils.js.map +1 -1
- package/dist/src/utils/sessionUtils.test.d.ts +6 -0
- package/dist/src/utils/sessionUtils.test.js +260 -0
- package/dist/src/utils/sessionUtils.test.js.map +1 -0
- package/dist/src/utils/sessions.d.ts +8 -0
- package/dist/src/utils/sessions.js +64 -0
- package/dist/src/utils/sessions.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/dist/google-gemini-cli-0.15.0-nightly.20251107.b8eeb553.tgz +0 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import { useEffect, useState } from 'react';
|
|
2
|
+
import { useEffect, useState, useMemo } from 'react';
|
|
3
3
|
import { Box, Text } from 'ink';
|
|
4
4
|
import { DiffRenderer } from './DiffRenderer.js';
|
|
5
5
|
import { RenderInline } from '../../utils/InlineMarkdownRenderer.js';
|
|
@@ -8,9 +8,11 @@ import { RadioButtonSelect } from '../shared/RadioButtonSelect.js';
|
|
|
8
8
|
import { MaxSizedBox } from '../shared/MaxSizedBox.js';
|
|
9
9
|
import { useKeypress } from '../../hooks/useKeypress.js';
|
|
10
10
|
import { theme } from '../../semantic-colors.js';
|
|
11
|
+
import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
|
|
11
12
|
export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused = true, availableTerminalHeight, terminalWidth, }) => {
|
|
12
13
|
const { onConfirm } = confirmationDetails;
|
|
13
14
|
const childWidth = terminalWidth - 2; // 2 for padding
|
|
15
|
+
const isAlternateBuffer = useAlternateBuffer();
|
|
14
16
|
const [ideClient, setIdeClient] = useState(null);
|
|
15
17
|
const [isDiffingEnabled, setIsDiffingEnabled] = useState(false);
|
|
16
18
|
useEffect(() => {
|
|
@@ -47,142 +49,171 @@ export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused
|
|
|
47
49
|
}
|
|
48
50
|
}, { isActive: isFocused });
|
|
49
51
|
const handleSelect = (item) => handleConfirm(item);
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
52
|
+
const { question, bodyContent, options } = useMemo(() => {
|
|
53
|
+
let bodyContent = null;
|
|
54
|
+
let question = '';
|
|
55
|
+
const options = [];
|
|
56
|
+
if (confirmationDetails.type === 'edit') {
|
|
57
|
+
if (!confirmationDetails.isModifying) {
|
|
58
|
+
question = `Apply this change?`;
|
|
59
|
+
options.push({
|
|
60
|
+
label: 'Yes, allow once',
|
|
61
|
+
value: ToolConfirmationOutcome.ProceedOnce,
|
|
62
|
+
key: 'Yes, allow once',
|
|
63
|
+
});
|
|
64
|
+
if (isTrustedFolder) {
|
|
65
|
+
options.push({
|
|
66
|
+
label: 'Yes, allow always',
|
|
67
|
+
value: ToolConfirmationOutcome.ProceedAlways,
|
|
68
|
+
key: 'Yes, allow always',
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
if (!config.getIdeMode() || !isDiffingEnabled) {
|
|
72
|
+
options.push({
|
|
73
|
+
label: 'Modify with external editor',
|
|
74
|
+
value: ToolConfirmationOutcome.ModifyWithEditor,
|
|
75
|
+
key: 'Modify with external editor',
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
options.push({
|
|
79
|
+
label: 'No, suggest changes (esc)',
|
|
80
|
+
value: ToolConfirmationOutcome.Cancel,
|
|
81
|
+
key: 'No, suggest changes (esc)',
|
|
82
|
+
});
|
|
83
|
+
}
|
|
80
84
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
value: ToolConfirmationOutcome.ProceedOnce,
|
|
85
|
-
key: 'Yes, allow once',
|
|
86
|
-
});
|
|
87
|
-
if (isTrustedFolder) {
|
|
85
|
+
else if (confirmationDetails.type === 'exec') {
|
|
86
|
+
const executionProps = confirmationDetails;
|
|
87
|
+
question = `Allow execution of: '${executionProps.rootCommand}'?`;
|
|
88
88
|
options.push({
|
|
89
|
-
label: 'Yes, allow
|
|
90
|
-
value: ToolConfirmationOutcome.
|
|
91
|
-
key: 'Yes, allow
|
|
89
|
+
label: 'Yes, allow once',
|
|
90
|
+
value: ToolConfirmationOutcome.ProceedOnce,
|
|
91
|
+
key: 'Yes, allow once',
|
|
92
92
|
});
|
|
93
|
-
|
|
94
|
-
|
|
93
|
+
if (isTrustedFolder) {
|
|
94
|
+
options.push({
|
|
95
|
+
label: `Yes, allow always ...`,
|
|
96
|
+
value: ToolConfirmationOutcome.ProceedAlways,
|
|
97
|
+
key: `Yes, allow always ...`,
|
|
98
|
+
});
|
|
99
|
+
}
|
|
95
100
|
options.push({
|
|
96
|
-
label: '
|
|
97
|
-
value: ToolConfirmationOutcome.
|
|
98
|
-
key: '
|
|
101
|
+
label: 'No, suggest changes (esc)',
|
|
102
|
+
value: ToolConfirmationOutcome.Cancel,
|
|
103
|
+
key: 'No, suggest changes (esc)',
|
|
99
104
|
});
|
|
100
105
|
}
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
value: ToolConfirmationOutcome.Cancel,
|
|
104
|
-
key: 'No, suggest changes (esc)',
|
|
105
|
-
});
|
|
106
|
-
bodyContent = (_jsx(DiffRenderer, { diffContent: confirmationDetails.fileDiff, filename: confirmationDetails.fileName, availableTerminalHeight: availableBodyContentHeight(), terminalWidth: childWidth }));
|
|
107
|
-
}
|
|
108
|
-
else if (confirmationDetails.type === 'exec') {
|
|
109
|
-
const executionProps = confirmationDetails;
|
|
110
|
-
question = `Allow execution of: '${executionProps.rootCommand}'?`;
|
|
111
|
-
options.push({
|
|
112
|
-
label: 'Yes, allow once',
|
|
113
|
-
value: ToolConfirmationOutcome.ProceedOnce,
|
|
114
|
-
key: 'Yes, allow once',
|
|
115
|
-
});
|
|
116
|
-
if (isTrustedFolder) {
|
|
106
|
+
else if (confirmationDetails.type === 'info') {
|
|
107
|
+
question = `Do you want to proceed?`;
|
|
117
108
|
options.push({
|
|
118
|
-
label:
|
|
119
|
-
value: ToolConfirmationOutcome.
|
|
120
|
-
key:
|
|
109
|
+
label: 'Yes, allow once',
|
|
110
|
+
value: ToolConfirmationOutcome.ProceedOnce,
|
|
111
|
+
key: 'Yes, allow once',
|
|
121
112
|
});
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
if (bodyContentHeight !== undefined) {
|
|
130
|
-
bodyContentHeight -= 2; // Account for padding;
|
|
131
|
-
}
|
|
132
|
-
bodyContent = (_jsx(Box, { flexDirection: "column", children: _jsx(Box, { paddingX: 1, marginLeft: 1, children: _jsx(MaxSizedBox, { maxHeight: bodyContentHeight, maxWidth: Math.max(childWidth - 4, 1), children: _jsx(Box, { children: _jsx(Text, { color: theme.text.link, children: executionProps.command }) }) }) }) }));
|
|
133
|
-
}
|
|
134
|
-
else if (confirmationDetails.type === 'info') {
|
|
135
|
-
const infoProps = confirmationDetails;
|
|
136
|
-
const displayUrls = infoProps.urls &&
|
|
137
|
-
!(infoProps.urls.length === 1 && infoProps.urls[0] === infoProps.prompt);
|
|
138
|
-
question = `Do you want to proceed?`;
|
|
139
|
-
options.push({
|
|
140
|
-
label: 'Yes, allow once',
|
|
141
|
-
value: ToolConfirmationOutcome.ProceedOnce,
|
|
142
|
-
key: 'Yes, allow once',
|
|
143
|
-
});
|
|
144
|
-
if (isTrustedFolder) {
|
|
113
|
+
if (isTrustedFolder) {
|
|
114
|
+
options.push({
|
|
115
|
+
label: 'Yes, allow always',
|
|
116
|
+
value: ToolConfirmationOutcome.ProceedAlways,
|
|
117
|
+
key: 'Yes, allow always',
|
|
118
|
+
});
|
|
119
|
+
}
|
|
145
120
|
options.push({
|
|
146
|
-
label: '
|
|
147
|
-
value: ToolConfirmationOutcome.
|
|
148
|
-
key: '
|
|
121
|
+
label: 'No, suggest changes (esc)',
|
|
122
|
+
value: ToolConfirmationOutcome.Cancel,
|
|
123
|
+
key: 'No, suggest changes (esc)',
|
|
149
124
|
});
|
|
150
125
|
}
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
});
|
|
156
|
-
bodyContent = (_jsxs(Box, { flexDirection: "column", paddingX: 1, marginLeft: 1, 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)))] }))] }));
|
|
157
|
-
}
|
|
158
|
-
else {
|
|
159
|
-
// mcp tool confirmation
|
|
160
|
-
const mcpProps = confirmationDetails;
|
|
161
|
-
bodyContent = (_jsxs(Box, { flexDirection: "column", paddingX: 1, marginLeft: 1, children: [_jsxs(Text, { color: theme.text.link, children: ["MCP Server: ", mcpProps.serverName] }), _jsxs(Text, { color: theme.text.link, children: ["Tool: ", mcpProps.toolName] })] }));
|
|
162
|
-
question = `Allow execution of MCP tool "${mcpProps.toolName}" from server "${mcpProps.serverName}"?`;
|
|
163
|
-
options.push({
|
|
164
|
-
label: 'Yes, allow once',
|
|
165
|
-
value: ToolConfirmationOutcome.ProceedOnce,
|
|
166
|
-
key: 'Yes, allow once',
|
|
167
|
-
});
|
|
168
|
-
if (isTrustedFolder) {
|
|
126
|
+
else {
|
|
127
|
+
// mcp tool confirmation
|
|
128
|
+
const mcpProps = confirmationDetails;
|
|
129
|
+
question = `Allow execution of MCP tool "${mcpProps.toolName}" from server "${mcpProps.serverName}"?`;
|
|
169
130
|
options.push({
|
|
170
|
-
label:
|
|
171
|
-
value: ToolConfirmationOutcome.
|
|
172
|
-
key:
|
|
131
|
+
label: 'Yes, allow once',
|
|
132
|
+
value: ToolConfirmationOutcome.ProceedOnce,
|
|
133
|
+
key: 'Yes, allow once',
|
|
173
134
|
});
|
|
135
|
+
if (isTrustedFolder) {
|
|
136
|
+
options.push({
|
|
137
|
+
label: `Yes, always allow tool "${mcpProps.toolName}" from server "${mcpProps.serverName}"`,
|
|
138
|
+
value: ToolConfirmationOutcome.ProceedAlwaysTool, // Cast until types are updated
|
|
139
|
+
key: `Yes, always allow tool "${mcpProps.toolName}" from server "${mcpProps.serverName}"`,
|
|
140
|
+
});
|
|
141
|
+
options.push({
|
|
142
|
+
label: `Yes, always allow all tools from server "${mcpProps.serverName}"`,
|
|
143
|
+
value: ToolConfirmationOutcome.ProceedAlwaysServer,
|
|
144
|
+
key: `Yes, always allow all tools from server "${mcpProps.serverName}"`,
|
|
145
|
+
});
|
|
146
|
+
}
|
|
174
147
|
options.push({
|
|
175
|
-
label:
|
|
176
|
-
value: ToolConfirmationOutcome.
|
|
177
|
-
key:
|
|
148
|
+
label: 'No, suggest changes (esc)',
|
|
149
|
+
value: ToolConfirmationOutcome.Cancel,
|
|
150
|
+
key: 'No, suggest changes (esc)',
|
|
178
151
|
});
|
|
179
152
|
}
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
153
|
+
function availableBodyContentHeight() {
|
|
154
|
+
if (options.length === 0) {
|
|
155
|
+
// Should not happen if we populated options correctly above for all types
|
|
156
|
+
// except when isModifying is true, but in that case we don't call this because we don't enter the if block for it.
|
|
157
|
+
return undefined;
|
|
158
|
+
}
|
|
159
|
+
if (availableTerminalHeight === undefined) {
|
|
160
|
+
return undefined;
|
|
161
|
+
}
|
|
162
|
+
// Calculate the vertical space (in lines) consumed by UI elements
|
|
163
|
+
// surrounding the main body content.
|
|
164
|
+
const PADDING_OUTER_Y = 2; // Main container has `padding={1}` (top & bottom).
|
|
165
|
+
const MARGIN_BODY_BOTTOM = 1; // margin on the body container.
|
|
166
|
+
const HEIGHT_QUESTION = 1; // The question text is one line.
|
|
167
|
+
const MARGIN_QUESTION_BOTTOM = 1; // Margin on the question container.
|
|
168
|
+
const HEIGHT_OPTIONS = options.length; // Each option in the radio select takes one line.
|
|
169
|
+
const surroundingElementsHeight = PADDING_OUTER_Y +
|
|
170
|
+
MARGIN_BODY_BOTTOM +
|
|
171
|
+
HEIGHT_QUESTION +
|
|
172
|
+
MARGIN_QUESTION_BOTTOM +
|
|
173
|
+
HEIGHT_OPTIONS;
|
|
174
|
+
return Math.max(availableTerminalHeight - surroundingElementsHeight, 1);
|
|
175
|
+
}
|
|
176
|
+
if (confirmationDetails.type === 'edit') {
|
|
177
|
+
if (!confirmationDetails.isModifying) {
|
|
178
|
+
bodyContent = (_jsx(DiffRenderer, { diffContent: confirmationDetails.fileDiff, filename: confirmationDetails.fileName, availableTerminalHeight: availableBodyContentHeight(), terminalWidth: terminalWidth }));
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
else if (confirmationDetails.type === 'exec') {
|
|
182
|
+
const executionProps = confirmationDetails;
|
|
183
|
+
let bodyContentHeight = availableBodyContentHeight();
|
|
184
|
+
if (bodyContentHeight !== undefined) {
|
|
185
|
+
bodyContentHeight -= 2; // Account for padding;
|
|
186
|
+
}
|
|
187
|
+
const commandBox = (_jsx(Box, { children: _jsx(Text, { color: theme.text.link, children: executionProps.command }) }));
|
|
188
|
+
bodyContent = (_jsx(Box, { flexDirection: "column", children: _jsx(Box, { paddingX: 1, children: isAlternateBuffer ? (commandBox) : (_jsx(MaxSizedBox, { maxHeight: bodyContentHeight, maxWidth: Math.max(childWidth, 1), children: commandBox })) }) }));
|
|
189
|
+
}
|
|
190
|
+
else if (confirmationDetails.type === 'info') {
|
|
191
|
+
const infoProps = confirmationDetails;
|
|
192
|
+
const displayUrls = infoProps.urls &&
|
|
193
|
+
!(infoProps.urls.length === 1 && infoProps.urls[0] === infoProps.prompt);
|
|
194
|
+
bodyContent = (_jsxs(Box, { flexDirection: "column", paddingX: 1, 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
|
+
}
|
|
196
|
+
else {
|
|
197
|
+
// mcp tool confirmation
|
|
198
|
+
const mcpProps = confirmationDetails;
|
|
199
|
+
bodyContent = (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsxs(Text, { color: theme.text.link, children: ["MCP Server: ", mcpProps.serverName] }), _jsxs(Text, { color: theme.text.link, children: ["Tool: ", mcpProps.toolName] })] }));
|
|
200
|
+
}
|
|
201
|
+
return { question, bodyContent, options };
|
|
202
|
+
}, [
|
|
203
|
+
confirmationDetails,
|
|
204
|
+
isTrustedFolder,
|
|
205
|
+
config,
|
|
206
|
+
isDiffingEnabled,
|
|
207
|
+
availableTerminalHeight,
|
|
208
|
+
terminalWidth,
|
|
209
|
+
isAlternateBuffer,
|
|
210
|
+
childWidth,
|
|
211
|
+
]);
|
|
212
|
+
if (confirmationDetails.type === 'edit') {
|
|
213
|
+
if (confirmationDetails.isModifying) {
|
|
214
|
+
return (_jsxs(Box, { width: terminalWidth, borderStyle: "round", borderColor: theme.border.default, justifyContent: "space-around", padding: 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
|
+
}
|
|
185
216
|
}
|
|
186
|
-
return (_jsxs(Box, { flexDirection: "column",
|
|
217
|
+
return (_jsxs(Box, { flexDirection: "column", paddingTop: 0, paddingBottom: 1, children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, overflow: "hidden", marginBottom: 1, paddingLeft: 1, children: bodyContent }), _jsx(Box, { marginBottom: 1, flexShrink: 0, paddingX: 1, children: _jsx(Text, { color: theme.text.primary, children: question }) }), _jsx(Box, { flexShrink: 0, paddingX: 1, children: _jsx(RadioButtonSelect, { items: options, onSelect: handleSelect, isFocused: isFocused }) })] }));
|
|
187
218
|
};
|
|
188
219
|
//# 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,MAAM,OAAO,CAAC;
|
|
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;IAC1C,MAAM,UAAU,GAAG,aAAa,GAAG,CAAC,CAAC,CAAC,gBAAgB;IAEtD,MAAM,iBAAiB,GAAG,kBAAkB,EAAE,CAAC;IAE/C,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAmB,IAAI,CAAC,CAAC;IACnE,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEhE,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAI,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;YACxB,MAAM,YAAY,GAAG,KAAK,IAAI,EAAE;gBAC9B,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC;gBAC7C,IAAI,SAAS,EAAE,CAAC;oBACd,YAAY,CAAC,MAAM,CAAC,CAAC;oBACrB,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,EAAE,IAAI,KAAK,CAAC,CAAC;gBAC3D,CAAC;YACH,CAAC,CAAC;YACF,YAAY,EAAE,CAAC;QACjB,CAAC;QACD,OAAO,GAAG,EAAE;YACV,SAAS,GAAG,KAAK,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,MAAM,aAAa,GAAG,KAAK,EAAE,OAAgC,EAAE,EAAE;QAC/D,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACxC,IAAI,MAAM,CAAC,UAAU,EAAE,IAAI,gBAAgB,EAAE,CAAC;gBAC5C,MAAM,UAAU,GACd,OAAO,KAAK,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;gBACvE,MAAM,SAAS,EAAE,kBAAkB,CACjC,mBAAmB,CAAC,QAAQ,EAC5B,UAAU,CACX,CAAC;YACJ,CAAC;QACH,CAAC;QACD,SAAS,CAAC,OAAO,CAAC,CAAC;IACrB,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;IAEjD,WAAW,CACT,CAAC,GAAG,EAAE,EAAE;QACN,IAAI,CAAC,SAAS;YAAE,OAAO;QACvB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YAC5D,aAAa,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAChD,CAAC;IACH,CAAC,EACD,EAAE,QAAQ,EAAE,SAAS,EAAE,CACxB,CAAC;IAEF,MAAM,YAAY,GAAG,CAAC,IAA6B,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE;QACtD,IAAI,WAAW,GAA2B,IAAI,CAAC;QAC/C,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,MAAM,OAAO,GAAoD,EAAE,CAAC;QAEpE,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACxC,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,CAAC;gBACrC,QAAQ,GAAG,oBAAoB,CAAC;gBAChC,OAAO,CAAC,IAAI,CAAC;oBACX,KAAK,EAAE,iBAAiB;oBACxB,KAAK,EAAE,uBAAuB,CAAC,WAAW;oBAC1C,GAAG,EAAE,iBAAiB;iBACvB,CAAC,CAAC;gBACH,IAAI,eAAe,EAAE,CAAC;oBACpB,OAAO,CAAC,IAAI,CAAC;wBACX,KAAK,EAAE,mBAAmB;wBAC1B,KAAK,EAAE,uBAAuB,CAAC,aAAa;wBAC5C,GAAG,EAAE,mBAAmB;qBACzB,CAAC,CAAC;gBACL,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBAC9C,OAAO,CAAC,IAAI,CAAC;wBACX,KAAK,EAAE,6BAA6B;wBACpC,KAAK,EAAE,uBAAuB,CAAC,gBAAgB;wBAC/C,GAAG,EAAE,6BAA6B;qBACnC,CAAC,CAAC;gBACL,CAAC;gBAED,OAAO,CAAC,IAAI,CAAC;oBACX,KAAK,EAAE,2BAA2B;oBAClC,KAAK,EAAE,uBAAuB,CAAC,MAAM;oBACrC,GAAG,EAAE,2BAA2B;iBACjC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;aAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC/C,MAAM,cAAc,GAClB,mBAAqD,CAAC;YAExD,QAAQ,GAAG,wBAAwB,cAAc,CAAC,WAAW,IAAI,CAAC;YAClE,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,iBAAiB;gBACxB,KAAK,EAAE,uBAAuB,CAAC,WAAW;gBAC1C,GAAG,EAAE,iBAAiB;aACvB,CAAC,CAAC;YACH,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO,CAAC,IAAI,CAAC;oBACX,KAAK,EAAE,uBAAuB;oBAC9B,KAAK,EAAE,uBAAuB,CAAC,aAAa;oBAC5C,GAAG,EAAE,uBAAuB;iBAC7B,CAAC,CAAC;YACL,CAAC;YACD,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,2BAA2B;gBAClC,KAAK,EAAE,uBAAuB,CAAC,MAAM;gBACrC,GAAG,EAAE,2BAA2B;aACjC,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC/C,QAAQ,GAAG,yBAAyB,CAAC;YACrC,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,iBAAiB;gBACxB,KAAK,EAAE,uBAAuB,CAAC,WAAW;gBAC1C,GAAG,EAAE,iBAAiB;aACvB,CAAC,CAAC;YACH,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO,CAAC,IAAI,CAAC;oBACX,KAAK,EAAE,mBAAmB;oBAC1B,KAAK,EAAE,uBAAuB,CAAC,aAAa;oBAC5C,GAAG,EAAE,mBAAmB;iBACzB,CAAC,CAAC;YACL,CAAC;YACD,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,2BAA2B;gBAClC,KAAK,EAAE,uBAAuB,CAAC,MAAM;gBACrC,GAAG,EAAE,2BAA2B;aACjC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,wBAAwB;YACxB,MAAM,QAAQ,GAAG,mBAAiD,CAAC;YACnE,QAAQ,GAAG,gCAAgC,QAAQ,CAAC,QAAQ,kBAAkB,QAAQ,CAAC,UAAU,IAAI,CAAC;YACtG,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,iBAAiB;gBACxB,KAAK,EAAE,uBAAuB,CAAC,WAAW;gBAC1C,GAAG,EAAE,iBAAiB;aACvB,CAAC,CAAC;YACH,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO,CAAC,IAAI,CAAC;oBACX,KAAK,EAAE,2BAA2B,QAAQ,CAAC,QAAQ,kBAAkB,QAAQ,CAAC,UAAU,GAAG;oBAC3F,KAAK,EAAE,uBAAuB,CAAC,iBAAiB,EAAE,+BAA+B;oBACjF,GAAG,EAAE,2BAA2B,QAAQ,CAAC,QAAQ,kBAAkB,QAAQ,CAAC,UAAU,GAAG;iBAC1F,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC;oBACX,KAAK,EAAE,4CAA4C,QAAQ,CAAC,UAAU,GAAG;oBACzE,KAAK,EAAE,uBAAuB,CAAC,mBAAmB;oBAClD,GAAG,EAAE,4CAA4C,QAAQ,CAAC,UAAU,GAAG;iBACxE,CAAC,CAAC;YACL,CAAC;YACD,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,2BAA2B;gBAClC,KAAK,EAAE,uBAAuB,CAAC,MAAM;gBACrC,GAAG,EAAE,2BAA2B;aACjC,CAAC,CAAC;QACL,CAAC;QAED,SAAS,0BAA0B;YACjC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,0EAA0E;gBAC1E,mHAAmH;gBACnH,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,IAAI,uBAAuB,KAAK,SAAS,EAAE,CAAC;gBAC1C,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,kEAAkE;YAClE,qCAAqC;YACrC,MAAM,eAAe,GAAG,CAAC,CAAC,CAAC,mDAAmD;YAC9E,MAAM,kBAAkB,GAAG,CAAC,CAAC,CAAC,gCAAgC;YAC9D,MAAM,eAAe,GAAG,CAAC,CAAC,CAAC,iCAAiC;YAC5D,MAAM,sBAAsB,GAAG,CAAC,CAAC,CAAC,oCAAoC;YACtE,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,kDAAkD;YAEzF,MAAM,yBAAyB,GAC7B,eAAe;gBACf,kBAAkB;gBAClB,eAAe;gBACf,sBAAsB;gBACtB,cAAc,CAAC;YACjB,OAAO,IAAI,CAAC,GAAG,CAAC,uBAAuB,GAAG,yBAAyB,EAAE,CAAC,CAAC,CAAC;QAC1E,CAAC;QAED,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACxC,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,CAAC;gBACrC,WAAW,GAAG,CACZ,KAAC,YAAY,IACX,WAAW,EAAE,mBAAmB,CAAC,QAAQ,EACzC,QAAQ,EAAE,mBAAmB,CAAC,QAAQ,EACtC,uBAAuB,EAAE,0BAA0B,EAAE,EACrD,aAAa,EAAE,aAAa,GAC5B,CACH,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC/C,MAAM,cAAc,GAClB,mBAAqD,CAAC;YACxD,IAAI,iBAAiB,GAAG,0BAA0B,EAAE,CAAC;YACrD,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;gBACpC,iBAAiB,IAAI,CAAC,CAAC,CAAC,uBAAuB;YACjD,CAAC;YAED,MAAM,UAAU,GAAG,CACjB,KAAC,GAAG,cACF,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,YAAG,cAAc,CAAC,OAAO,GAAQ,GACzD,CACP,CAAC;YAEF,WAAW,GAAG,CACZ,KAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,YACzB,KAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,YACb,iBAAiB,CAAC,CAAC,CAAC,CACnB,UAAU,CACX,CAAC,CAAC,CAAC,CACF,KAAC,WAAW,IACV,SAAS,EAAE,iBAAiB,EAC5B,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,YAEhC,UAAU,GACC,CACf,GACG,GACF,CACP,CAAC;QACJ,CAAC;aAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC/C,MAAM,SAAS,GAAG,mBAAmB,CAAC;YACtC,MAAM,WAAW,GACf,SAAS,CAAC,IAAI;gBACd,CAAC,CACC,SAAS,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,MAAM,CACtE,CAAC;YAEJ,WAAW,GAAG,CACZ,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,QAAQ,EAAE,CAAC,aACrC,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,YAC1B,KAAC,YAAY,IACX,IAAI,EAAE,SAAS,CAAC,MAAM,EACtB,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,GAC7B,GACG,EACN,WAAW,IAAI,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,CAC7D,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,SAAS,EAAE,CAAC,aACtC,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,+BAAuB,EACrD,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAC3B,MAAC,IAAI,eACF,GAAG,QACF,KAAC,YAAY,IAAC,IAAI,EAAE,GAAG,GAAI,KAFpB,GAAG,CAGP,CACR,CAAC,IACE,CACP,IACG,CACP,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,wBAAwB;YACxB,MAAM,QAAQ,GAAG,mBAAiD,CAAC;YAEnE,WAAW,GAAG,CACZ,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,QAAQ,EAAE,CAAC,aACrC,MAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,6BAAe,QAAQ,CAAC,UAAU,IAAQ,EACtE,MAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,uBAAS,QAAQ,CAAC,QAAQ,IAAQ,IAC1D,CACP,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;IAC5C,CAAC,EAAE;QACD,mBAAmB;QACnB,eAAe;QACf,MAAM;QACN,gBAAgB;QAChB,uBAAuB;QACvB,aAAa;QACb,iBAAiB;QACjB,UAAU;KACX,CAAC,CAAC;IAEH,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACxC,IAAI,mBAAmB,CAAC,WAAW,EAAE,CAAC;YACpC,OAAO,CACL,MAAC,GAAG,IACF,KAAK,EAAE,aAAa,EACpB,WAAW,EAAC,OAAO,EACnB,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EACjC,cAAc,EAAC,cAAc,EAC7B,OAAO,EAAE,CAAC,EACV,QAAQ,EAAC,QAAQ,aAEjB,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,qCAA6B,EAC5D,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,2DAE1B,IACH,CACP,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,aAGzD,KAAC,GAAG,IACF,QAAQ,EAAE,CAAC,EACX,UAAU,EAAE,CAAC,EACb,QAAQ,EAAC,QAAQ,EACjB,YAAY,EAAE,CAAC,EACf,WAAW,EAAE,CAAC,YAEb,WAAW,GACR,EAGN,KAAC,GAAG,IAAC,YAAY,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,YAC9C,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,YAAG,QAAQ,GAAQ,GAC9C,EAGN,KAAC,GAAG,IAAC,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,YAC7B,KAAC,iBAAiB,IAChB,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,SAAS,GACpB,GACE,IACF,CACP,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -7,12 +7,14 @@ 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';
|
|
10
11
|
// Main component renders the border and maps the tools using ToolMessage
|
|
11
12
|
export const ToolGroupMessage = ({ toolCalls, availableTerminalHeight, terminalWidth, isFocused = true, activeShellPtyId, embeddedShellFocused, }) => {
|
|
12
13
|
const isEmbeddedShellFocused = embeddedShellFocused &&
|
|
13
14
|
toolCalls.some((t) => t.ptyId === activeShellPtyId && t.status === ToolCallStatus.Executing);
|
|
14
15
|
const hasPending = !toolCalls.every((t) => t.status === ToolCallStatus.Success);
|
|
15
16
|
const config = useConfig();
|
|
17
|
+
const isAlternateBuffer = useAlternateBuffer();
|
|
16
18
|
const isShellCommand = toolCalls.some((t) => t.name === SHELL_COMMAND_NAME || t.name === SHELL_NAME);
|
|
17
19
|
const borderColor = (isShellCommand && hasPending) || isEmbeddedShellFocused
|
|
18
20
|
? theme.ui.symbol
|
|
@@ -21,8 +23,8 @@ export const ToolGroupMessage = ({ toolCalls, availableTerminalHeight, terminalW
|
|
|
21
23
|
: theme.border.default;
|
|
22
24
|
const staticHeight = /* border */ 2 + /* marginBottom */ 1;
|
|
23
25
|
// This is a bit of a magic number, but it accounts for the border and
|
|
24
|
-
// marginLeft.
|
|
25
|
-
const innerWidth = terminalWidth - 4;
|
|
26
|
+
// marginLeft in regular mode and just the border in alternate buffer mode.
|
|
27
|
+
const innerWidth = isAlternateBuffer ? terminalWidth - 3 : terminalWidth - 4;
|
|
26
28
|
// only prompt for tool approval on the first 'confirming' tool in the list
|
|
27
29
|
// note, after the CTA, this automatically moves over to the next 'confirming' tool
|
|
28
30
|
const toolAwaitingApproval = useMemo(() => toolCalls.find((tc) => tc.status === ToolCallStatus.Confirming), [toolCalls]);
|
|
@@ -46,11 +48,7 @@ export const ToolGroupMessage = ({ toolCalls, availableTerminalHeight, terminalW
|
|
|
46
48
|
*/
|
|
47
49
|
width: terminalWidth, borderDimColor: hasPending && (!isShellCommand || !isEmbeddedShellFocused), borderColor: borderColor, gap: 1, children: toolCalls.map((tool) => {
|
|
48
50
|
const isConfirming = toolAwaitingApproval?.callId === tool.callId;
|
|
49
|
-
return (_jsxs(Box, { flexDirection: "column", minHeight: 1, children: [_jsx(
|
|
50
|
-
? 'high'
|
|
51
|
-
: toolAwaitingApproval
|
|
52
|
-
? 'low'
|
|
53
|
-
: 'medium', activeShellPtyId: activeShellPtyId, embeddedShellFocused: embeddedShellFocused, config: config }) }), tool.status === ToolCallStatus.Confirming &&
|
|
51
|
+
return (_jsxs(Box, { flexDirection: "column", minHeight: 1, width: innerWidth, children: [_jsx(ToolMessage, { ...tool, availableTerminalHeight: availableTerminalHeightPerToolMessage, terminalWidth: innerWidth, emphasis: isConfirming ? 'high' : toolAwaitingApproval ? 'low' : 'medium', activeShellPtyId: activeShellPtyId, embeddedShellFocused: embeddedShellFocused, config: config }), tool.status === ToolCallStatus.Confirming &&
|
|
54
52
|
isConfirming &&
|
|
55
53
|
tool.confirmationDetails && (_jsx(ToolConfirmationMessage, { confirmationDetails: tool.confirmationDetails, config: config, isFocused: isFocused, availableTerminalHeight: availableTerminalHeightPerToolMessage, terminalWidth: innerWidth })), tool.outputFile && (_jsx(Box, { marginX: 1, children: _jsxs(Text, { color: theme.text.primary, children: ["Output too long and was saved to: ", tool.outputFile] }) }))] }, tool.callId));
|
|
56
54
|
}) }));
|
|
@@ -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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"}
|
|
@@ -4,13 +4,12 @@ import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
|
|
|
4
4
|
* Copyright 2025 Google LLC
|
|
5
5
|
* SPDX-License-Identifier: Apache-2.0
|
|
6
6
|
*/
|
|
7
|
-
import {
|
|
7
|
+
import { renderWithProviders } from '../../../test-utils/render.js';
|
|
8
8
|
import { describe, it, expect, vi } from 'vitest';
|
|
9
9
|
import { Text } from 'ink';
|
|
10
10
|
import { ToolGroupMessage } from './ToolGroupMessage.js';
|
|
11
11
|
import { ToolCallStatus } from '../../types.js';
|
|
12
12
|
import { TOOL_STATUS } from '../../constants.js';
|
|
13
|
-
import { ConfigContext } from '../../contexts/ConfigContext.js';
|
|
14
13
|
// Mock child components to isolate ToolGroupMessage behavior
|
|
15
14
|
vi.mock('./ToolMessage.js', () => ({
|
|
16
15
|
ToolMessage: function MockToolMessage({ callId, name, description, status, emphasis, }) {
|
|
@@ -36,7 +35,6 @@ vi.mock('./ToolConfirmationMessage.js', () => ({
|
|
|
36
35
|
},
|
|
37
36
|
}));
|
|
38
37
|
describe('<ToolGroupMessage />', () => {
|
|
39
|
-
const mockConfig = {};
|
|
40
38
|
const createToolCall = (overrides = {}) => ({
|
|
41
39
|
callId: 'tool-123',
|
|
42
40
|
name: 'test-tool',
|
|
@@ -52,8 +50,6 @@ describe('<ToolGroupMessage />', () => {
|
|
|
52
50
|
terminalWidth: 80,
|
|
53
51
|
isFocused: true,
|
|
54
52
|
};
|
|
55
|
-
// Helper to wrap component with required providers
|
|
56
|
-
const renderWithProviders = (component) => render(_jsx(ConfigContext.Provider, { value: mockConfig, children: component }));
|
|
57
53
|
describe('Golden Snapshots', () => {
|
|
58
54
|
it('renders single successful tool call', () => {
|
|
59
55
|
const toolCalls = [createToolCall()];
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"ToolGroupMessage.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ToolGroupMessage.test.tsx"],"names":[],"mappings":"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"}
|