@hibanacloud/cli 0.3.15

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

@@ -0,0 +1,245 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useState } from 'react';
+import { Box, Text } from 'ink';
+import { DiffRenderer } from './DiffRenderer.js';
+import { RenderInline } from '../../utils/InlineMarkdownRenderer.js';
+import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js';
+import { IdeClient, ToolConfirmationOutcome } from '@hibanacloud/core';
+import { RadioButtonSelect } from '../shared/RadioButtonSelect.js';
+import { MaxSizedBox } from '../shared/MaxSizedBox.js';
+import { useKeypress } from '../../hooks/useKeypress.js';
+import { useSettings } from '../../contexts/SettingsContext.js';
+import { theme } from '../../semantic-colors.js';
+import { t } from '../../../i18n/index.js';
+export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused = true, availableTerminalHeight, terminalWidth, compactMode = false, }) => {
+    const { onConfirm } = confirmationDetails;
+    const childWidth = terminalWidth - 2; // 2 for padding
+    const settings = useSettings();
+    const preferredEditor = settings.merged.general?.preferredEditor;
+    const [ideClient, setIdeClient] = useState(null);
+    const [isDiffingEnabled, setIsDiffingEnabled] = useState(false);
+    useEffect(() => {
+        let isMounted = true;
+        if (config.getIdeMode()) {
+            const getIdeClient = async () => {
+                const client = await IdeClient.getInstance();
+                if (isMounted) {
+                    setIdeClient(client);
+                    setIsDiffingEnabled(client?.isDiffingEnabled() ?? false);
+                }
+            };
+            getIdeClient();
+        }
+        return () => {
+            isMounted = false;
+        };
+    }, [config]);
+    const handleConfirm = async (outcome) => {
+        if (confirmationDetails.type === 'edit') {
+            if (config.getIdeMode() && isDiffingEnabled) {
+                const cliOutcome = outcome === ToolConfirmationOutcome.Cancel ? 'rejected' : 'accepted';
+                await ideClient?.resolveDiffFromCli(confirmationDetails.filePath, cliOutcome);
+            }
+        }
+        onConfirm(outcome);
+    };
+    const isTrustedFolder = config.isTrustedFolder();
+    useKeypress((key) => {
+        if (!isFocused)
+            return;
+        if (key.name === 'escape' || (key.ctrl && key.name === 'c')) {
+            handleConfirm(ToolConfirmationOutcome.Cancel);
+        }
+    }, { isActive: isFocused });
+    const handleSelect = (item) => handleConfirm(item);
+    // Compact mode: return simple 3-option display
+    if (compactMode) {
+        const compactOptions = [
+            {
+                key: 'proceed-once',
+                label: t('Yes, allow once'),
+                value: ToolConfirmationOutcome.ProceedOnce,
+            },
+            {
+                key: 'proceed-always',
+                label: t('Allow always'),
+                value: ToolConfirmationOutcome.ProceedAlways,
+            },
+            {
+                key: 'cancel',
+                label: t('No'),
+                value: ToolConfirmationOutcome.Cancel,
+            },
+        ];
+        return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { children: _jsx(Text, { wrap: "truncate", children: t('Do you want to proceed?') }) }), _jsx(Box, { children: _jsx(RadioButtonSelect, { items: compactOptions, onSelect: handleSelect, isFocused: isFocused }) })] }));
+    }
+    // Original logic continues unchanged below
+    let bodyContent = null; // Removed contextDisplay here
+    let question;
+    const options = new Array();
+    // Body content is now the DiffRenderer, passing filename to it
+    // The bordered box is removed from here and handled within DiffRenderer
+    function availableBodyContentHeight() {
+        if (options.length === 0) {
+            // This should not happen in practice as options are always added before this is called.
+            throw new Error('Options not provided for confirmation message');
+        }
+        if (availableTerminalHeight === undefined) {
+            return undefined;
+        }
+        // Calculate the vertical space (in lines) consumed by UI elements
+        // surrounding the main body content.
+        const PADDING_OUTER_Y = 2; // Main container has `padding={1}` (top & bottom).
+        const MARGIN_BODY_BOTTOM = 1; // margin on the body container.
+        const HEIGHT_QUESTION = 1; // The question text is one line.
+        const MARGIN_QUESTION_BOTTOM = 1; // Margin on the question container.
+        const HEIGHT_OPTIONS = options.length; // Each option in the radio select takes one line.
+        const surroundingElementsHeight = PADDING_OUTER_Y +
+            MARGIN_BODY_BOTTOM +
+            HEIGHT_QUESTION +
+            MARGIN_QUESTION_BOTTOM +
+            HEIGHT_OPTIONS;
+        return Math.max(availableTerminalHeight - surroundingElementsHeight, 1);
+    }
+    if (confirmationDetails.type === 'edit') {
+        if (confirmationDetails.isModifying) {
+            return (_jsxs(Box, { minWidth: "90%", borderStyle: "round", borderColor: theme.border.default, justifyContent: "space-around", padding: 1, overflow: "hidden", children: [_jsxs(Text, { color: theme.text.primary, children: [t('Modify in progress:'), " "] }), _jsx(Text, { color: theme.status.success, children: t('Save and close external editor to continue') })] }));
+        }
+        question = t('Apply this change?');
+        options.push({
+            label: t('Yes, allow once'),
+            value: ToolConfirmationOutcome.ProceedOnce,
+            key: 'Yes, allow once',
+        });
+        if (isTrustedFolder) {
+            options.push({
+                label: t('Yes, allow always'),
+                value: ToolConfirmationOutcome.ProceedAlways,
+                key: 'Yes, allow always',
+            });
+        }
+        if ((!config.getIdeMode() || !isDiffingEnabled) && preferredEditor) {
+            options.push({
+                label: t('Modify with external editor'),
+                value: ToolConfirmationOutcome.ModifyWithEditor,
+                key: 'Modify with external editor',
+            });
+        }
+        options.push({
+            label: t('No, suggest changes (esc)'),
+            value: ToolConfirmationOutcome.Cancel,
+            key: 'No, suggest changes (esc)',
+        });
+        bodyContent = (_jsx(DiffRenderer, { diffContent: confirmationDetails.fileDiff, filename: confirmationDetails.fileName, availableTerminalHeight: availableBodyContentHeight(), terminalWidth: childWidth }));
+    }
+    else if (confirmationDetails.type === 'exec') {
+        const executionProps = confirmationDetails;
+        question = t("Allow execution of: '{{command}}'?", {
+            command: executionProps.rootCommand,
+        });
+        options.push({
+            label: t('Yes, allow once'),
+            value: ToolConfirmationOutcome.ProceedOnce,
+            key: 'Yes, allow once',
+        });
+        if (isTrustedFolder) {
+            options.push({
+                label: t('Yes, allow always ...'),
+                value: ToolConfirmationOutcome.ProceedAlways,
+                key: 'Yes, allow always ...',
+            });
+        }
+        options.push({
+            label: t('No, suggest changes (esc)'),
+            value: ToolConfirmationOutcome.Cancel,
+            key: 'No, suggest changes (esc)',
+        });
+        let bodyContentHeight = availableBodyContentHeight();
+        if (bodyContentHeight !== undefined) {
+            bodyContentHeight -= 2; // Account for padding;
+        }
+        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 }) }) }) }) }));
+    }
+    else if (confirmationDetails.type === 'plan') {
+        const planProps = confirmationDetails;
+        question = planProps.title;
+        options.push({
+            key: 'proceed-always',
+            label: t('Yes, and auto-accept edits'),
+            value: ToolConfirmationOutcome.ProceedAlways,
+        });
+        options.push({
+            key: 'proceed-once',
+            label: t('Yes, and manually approve edits'),
+            value: ToolConfirmationOutcome.ProceedOnce,
+        });
+        options.push({
+            key: 'cancel',
+            label: t('No, keep planning (esc)'),
+            value: ToolConfirmationOutcome.Cancel,
+        });
+        bodyContent = (_jsx(Box, { flexDirection: "column", paddingX: 1, marginLeft: 1, children: _jsx(MarkdownDisplay, { text: planProps.plan, isPending: false, availableTerminalHeight: availableBodyContentHeight(), terminalWidth: childWidth }) }));
+    }
+    else if (confirmationDetails.type === 'info') {
+        const infoProps = confirmationDetails;
+        const displayUrls = infoProps.urls &&
+            !(infoProps.urls.length === 1 && infoProps.urls[0] === infoProps.prompt);
+        question = t('Do you want to proceed?');
+        options.push({
+            label: t('Yes, allow once'),
+            value: ToolConfirmationOutcome.ProceedOnce,
+            key: 'Yes, allow once',
+        });
+        if (isTrustedFolder) {
+            options.push({
+                label: t('Yes, allow always'),
+                value: ToolConfirmationOutcome.ProceedAlways,
+                key: 'Yes, allow always',
+            });
+        }
+        options.push({
+            label: t('No, suggest changes (esc)'),
+            value: ToolConfirmationOutcome.Cancel,
+            key: 'No, suggest changes (esc)',
+        });
+        bodyContent = (_jsxs(Box, { flexDirection: "column", paddingX: 1, marginLeft: 1, children: [_jsx(Text, { color: theme.text.link, children: _jsx(RenderInline, { text: infoProps.prompt }) }), displayUrls && infoProps.urls && infoProps.urls.length > 0 && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: theme.text.primary, children: t('URLs to fetch:') }), infoProps.urls.map((url) => (_jsxs(Text, { children: [' ', "- ", _jsx(RenderInline, { text: url })] }, url)))] }))] }));
+    }
+    else {
+        // mcp tool confirmation
+        const mcpProps = confirmationDetails;
+        bodyContent = (_jsxs(Box, { flexDirection: "column", paddingX: 1, marginLeft: 1, children: [_jsx(Text, { color: theme.text.link, children: t('MCP Server: {{server}}', { server: mcpProps.serverName }) }), _jsx(Text, { color: theme.text.link, children: t('Tool: {{tool}}', { tool: mcpProps.toolName }) })] }));
+        question = t('Allow execution of MCP tool "{{tool}}" from server "{{server}}"?', {
+            tool: mcpProps.toolName,
+            server: mcpProps.serverName,
+        });
+        options.push({
+            label: t('Yes, allow once'),
+            value: ToolConfirmationOutcome.ProceedOnce,
+            key: 'Yes, allow once',
+        });
+        if (isTrustedFolder) {
+            options.push({
+                label: t('Yes, always allow tool "{{tool}}" from server "{{server}}"', {
+                    tool: mcpProps.toolName,
+                    server: mcpProps.serverName,
+                }),
+                value: ToolConfirmationOutcome.ProceedAlwaysTool, // Cast until types are updated
+                key: `Yes, always allow tool "${mcpProps.toolName}" from server "${mcpProps.serverName}"`,
+            });
+            options.push({
+                label: t('Yes, always allow all tools from server "{{server}}"', {
+                    server: mcpProps.serverName,
+                }),
+                value: ToolConfirmationOutcome.ProceedAlwaysServer,
+                key: `Yes, always allow all tools from server "${mcpProps.serverName}"`,
+            });
+        }
+        options.push({
+            label: t('No, suggest changes (esc)'),
+            value: ToolConfirmationOutcome.Cancel,
+            key: 'No, suggest changes (esc)',
+        });
+    }
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, width: childWidth, 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, wrap: "truncate", children: question }) }), _jsx(Box, { flexShrink: 0, children: _jsx(RadioButtonSelect, { items: options, onSelect: handleSelect, isFocused: isFocused }) })] }));
+};
+//# sourceMappingURL=ToolConfirmationMessage.js.map

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

@@ -0,0 +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;AAC5C,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;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAQjE,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAEvE,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,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,CAAC,EAAE,MAAM,wBAAwB,CAAC;AAW3C,MAAM,CAAC,MAAM,uBAAuB,GAEhC,CAAC,EACH,mBAAmB,EACnB,MAAM,EACN,SAAS,GAAG,IAAI,EAChB,uBAAuB,EACvB,aAAa,EACb,WAAW,GAAG,KAAK,GACpB,EAAE,EAAE;IACH,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC;IAC1C,MAAM,UAAU,GAAG,aAAa,GAAG,CAAC,CAAC,CAAC,gBAAgB;IAEtD,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,eAEpC,CAAC;IAEd,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,+CAA+C;IAC/C,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,cAAc,GAAoD;YACtE;gBACE,GAAG,EAAE,cAAc;gBACnB,KAAK,EAAE,CAAC,CAAC,iBAAiB,CAAC;gBAC3B,KAAK,EAAE,uBAAuB,CAAC,WAAW;aAC3C;YACD;gBACE,GAAG,EAAE,gBAAgB;gBACrB,KAAK,EAAE,CAAC,CAAC,cAAc,CAAC;gBACxB,KAAK,EAAE,uBAAuB,CAAC,aAAa;aAC7C;YACD;gBACE,GAAG,EAAE,QAAQ;gBACb,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC;gBACd,KAAK,EAAE,uBAAuB,CAAC,MAAM;aACtC;SACF,CAAC;QAEF,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,KAAC,GAAG,cACF,KAAC,IAAI,IAAC,IAAI,EAAC,UAAU,YAAE,CAAC,CAAC,yBAAyB,CAAC,GAAQ,GACvD,EACN,KAAC,GAAG,cACF,KAAC,iBAAiB,IAChB,KAAK,EAAE,cAAc,EACrB,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,SAAS,GACpB,GACE,IACF,CACP,CAAC;IACJ,CAAC;IAED,2CAA2C;IAC3C,IAAI,WAAW,GAA2B,IAAI,CAAC,CAAC,8BAA8B;IAC9E,IAAI,QAAgB,CAAC;IAErB,MAAM,OAAO,GAAoD,IAAI,KAAK,EAEvE,CAAC;IAEJ,+DAA+D;IAC/D,wEAAwE;IAExE,SAAS,0BAA0B;QACjC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,wFAAwF;YACxF,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACnE,CAAC;QAED,IAAI,uBAAuB,KAAK,SAAS,EAAE,CAAC;YAC1C,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,kEAAkE;QAClE,qCAAqC;QACrC,MAAM,eAAe,GAAG,CAAC,CAAC,CAAC,mDAAmD;QAC9E,MAAM,kBAAkB,GAAG,CAAC,CAAC,CAAC,gCAAgC;QAC9D,MAAM,eAAe,GAAG,CAAC,CAAC,CAAC,iCAAiC;QAC5D,MAAM,sBAAsB,GAAG,CAAC,CAAC,CAAC,oCAAoC;QACtE,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,kDAAkD;QAEzF,MAAM,yBAAyB,GAC7B,eAAe;YACf,kBAAkB;YAClB,eAAe;YACf,sBAAsB;YACtB,cAAc,CAAC;QACjB,OAAO,IAAI,CAAC,GAAG,CAAC,uBAAuB,GAAG,yBAAyB,EAAE,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACxC,IAAI,mBAAmB,CAAC,WAAW,EAAE,CAAC;YACpC,OAAO,CACL,MAAC,GAAG,IACF,QAAQ,EAAC,KAAK,EACd,WAAW,EAAC,OAAO,EACnB,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EACjC,cAAc,EAAC,cAAc,EAC7B,OAAO,EAAE,CAAC,EACV,QAAQ,EAAC,QAAQ,aAEjB,MAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,aAAG,CAAC,CAAC,qBAAqB,CAAC,SAAS,EACnE,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,YAC9B,CAAC,CAAC,4CAA4C,CAAC,GAC3C,IACH,CACP,CAAC;QACJ,CAAC;QAED,QAAQ,GAAG,CAAC,CAAC,oBAAoB,CAAC,CAAC;QACnC,OAAO,CAAC,IAAI,CAAC;YACX,KAAK,EAAE,CAAC,CAAC,iBAAiB,CAAC;YAC3B,KAAK,EAAE,uBAAuB,CAAC,WAAW;YAC1C,GAAG,EAAE,iBAAiB;SACvB,CAAC,CAAC;QACH,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,CAAC,CAAC,mBAAmB,CAAC;gBAC7B,KAAK,EAAE,uBAAuB,CAAC,aAAa;gBAC5C,GAAG,EAAE,mBAAmB;aACzB,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,eAAe,EAAE,CAAC;YACnE,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,CAAC,CAAC,6BAA6B,CAAC;gBACvC,KAAK,EAAE,uBAAuB,CAAC,gBAAgB;gBAC/C,GAAG,EAAE,6BAA6B;aACnC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,CAAC,IAAI,CAAC;YACX,KAAK,EAAE,CAAC,CAAC,2BAA2B,CAAC;YACrC,KAAK,EAAE,uBAAuB,CAAC,MAAM;YACrC,GAAG,EAAE,2BAA2B;SACjC,CAAC,CAAC;QAEH,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,UAAU,GACzB,CACH,CAAC;IACJ,CAAC;SAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC/C,MAAM,cAAc,GAClB,mBAAqD,CAAC;QAExD,QAAQ,GAAG,CAAC,CAAC,oCAAoC,EAAE;YACjD,OAAO,EAAE,cAAc,CAAC,WAAW;SACpC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC;YACX,KAAK,EAAE,CAAC,CAAC,iBAAiB,CAAC;YAC3B,KAAK,EAAE,uBAAuB,CAAC,WAAW;YAC1C,GAAG,EAAE,iBAAiB;SACvB,CAAC,CAAC;QACH,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,CAAC,CAAC,uBAAuB,CAAC;gBACjC,KAAK,EAAE,uBAAuB,CAAC,aAAa;gBAC5C,GAAG,EAAE,uBAAuB;aAC7B,CAAC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,IAAI,CAAC;YACX,KAAK,EAAE,CAAC,CAAC,2BAA2B,CAAC;YACrC,KAAK,EAAE,uBAAuB,CAAC,MAAM;YACrC,GAAG,EAAE,2BAA2B;SACjC,CAAC,CAAC;QAEH,IAAI,iBAAiB,GAAG,0BAA0B,EAAE,CAAC;QACrD,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;YACpC,iBAAiB,IAAI,CAAC,CAAC,CAAC,uBAAuB;QACjD,CAAC;QACD,WAAW,GAAG,CACZ,KAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,YACzB,KAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,YAC7B,KAAC,WAAW,IACV,SAAS,EAAE,iBAAiB,EAC5B,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,CAAC,YAErC,KAAC,GAAG,cACF,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,YAAG,cAAc,CAAC,OAAO,GAAQ,GACzD,GACM,GACV,GACF,CACP,CAAC;IACJ,CAAC;SAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC/C,MAAM,SAAS,GAAG,mBAAmB,CAAC;QAEtC,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC;YACX,GAAG,EAAE,gBAAgB;YACrB,KAAK,EAAE,CAAC,CAAC,4BAA4B,CAAC;YACtC,KAAK,EAAE,uBAAuB,CAAC,aAAa;SAC7C,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC;YACX,GAAG,EAAE,cAAc;YACnB,KAAK,EAAE,CAAC,CAAC,iCAAiC,CAAC;YAC3C,KAAK,EAAE,uBAAuB,CAAC,WAAW;SAC3C,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC;YACX,GAAG,EAAE,QAAQ;YACb,KAAK,EAAE,CAAC,CAAC,yBAAyB,CAAC;YACnC,KAAK,EAAE,uBAAuB,CAAC,MAAM;SACtC,CAAC,CAAC;QAEH,WAAW,GAAG,CACZ,KAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,YACpD,KAAC,eAAe,IACd,IAAI,EAAE,SAAS,CAAC,IAAI,EACpB,SAAS,EAAE,KAAK,EAChB,uBAAuB,EAAE,0BAA0B,EAAE,EACrD,aAAa,EAAE,UAAU,GACzB,GACE,CACP,CAAC;IACJ,CAAC;SAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC/C,MAAM,SAAS,GAAG,mBAAmB,CAAC;QACtC,MAAM,WAAW,GACf,SAAS,CAAC,IAAI;YACd,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,MAAM,CAAC,CAAC;QAE3E,QAAQ,GAAG,CAAC,CAAC,yBAAyB,CAAC,CAAC;QACxC,OAAO,CAAC,IAAI,CAAC;YACX,KAAK,EAAE,CAAC,CAAC,iBAAiB,CAAC;YAC3B,KAAK,EAAE,uBAAuB,CAAC,WAAW;YAC1C,GAAG,EAAE,iBAAiB;SACvB,CAAC,CAAC;QACH,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,CAAC,CAAC,mBAAmB,CAAC;gBAC7B,KAAK,EAAE,uBAAuB,CAAC,aAAa;gBAC5C,GAAG,EAAE,mBAAmB;aACzB,CAAC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,IAAI,CAAC;YACX,KAAK,EAAE,CAAC,CAAC,2BAA2B,CAAC;YACrC,KAAK,EAAE,uBAAuB,CAAC,MAAM;YACrC,GAAG,EAAE,2BAA2B;SACjC,CAAC,CAAC;QAEH,WAAW,GAAG,CACZ,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,aACpD,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,YAC1B,KAAC,YAAY,IAAC,IAAI,EAAE,SAAS,CAAC,MAAM,GAAI,GACnC,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,YAAG,CAAC,CAAC,gBAAgB,CAAC,GAAQ,EAC5D,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;IACJ,CAAC;SAAM,CAAC;QACN,wBAAwB;QACxB,MAAM,QAAQ,GAAG,mBAAiD,CAAC;QAEnE,WAAW,GAAG,CACZ,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,aACpD,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,YACzB,CAAC,CAAC,wBAAwB,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,GACxD,EACP,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,YACzB,CAAC,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAC5C,IACH,CACP,CAAC;QAEF,QAAQ,GAAG,CAAC,CACV,kEAAkE,EAClE;YACE,IAAI,EAAE,QAAQ,CAAC,QAAQ;YACvB,MAAM,EAAE,QAAQ,CAAC,UAAU;SAC5B,CACF,CAAC;QACF,OAAO,CAAC,IAAI,CAAC;YACX,KAAK,EAAE,CAAC,CAAC,iBAAiB,CAAC;YAC3B,KAAK,EAAE,uBAAuB,CAAC,WAAW;YAC1C,GAAG,EAAE,iBAAiB;SACvB,CAAC,CAAC;QACH,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,CAAC,CAAC,4DAA4D,EAAE;oBACrE,IAAI,EAAE,QAAQ,CAAC,QAAQ;oBACvB,MAAM,EAAE,QAAQ,CAAC,UAAU;iBAC5B,CAAC;gBACF,KAAK,EAAE,uBAAuB,CAAC,iBAAiB,EAAE,+BAA+B;gBACjF,GAAG,EAAE,2BAA2B,QAAQ,CAAC,QAAQ,kBAAkB,QAAQ,CAAC,UAAU,GAAG;aAC1F,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,CAAC,CAAC,sDAAsD,EAAE;oBAC/D,MAAM,EAAE,QAAQ,CAAC,UAAU;iBAC5B,CAAC;gBACF,KAAK,EAAE,uBAAuB,CAAC,mBAAmB;gBAClD,GAAG,EAAE,4CAA4C,QAAQ,CAAC,UAAU,GAAG;aACxE,CAAC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,IAAI,CAAC;YACX,KAAK,EAAE,CAAC,CAAC,2BAA2B,CAAC;YACrC,KAAK,EAAE,uBAAuB,CAAC,MAAM;YACrC,GAAG,EAAE,2BAA2B;SACjC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,aAGvD,KAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAC,QAAQ,EAAC,YAAY,EAAE,CAAC,YAC/D,WAAW,GACR,EAGN,KAAC,GAAG,IAAC,YAAY,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,YACjC,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAC,UAAU,YAC7C,QAAQ,GACJ,GACH,EAGN,KAAC,GAAG,IAAC,UAAU,EAAE,CAAC,YAChB,KAAC,iBAAiB,IAChB,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,SAAS,GACpB,GACE,IACF,CACP,CAAC;AACJ,CAAC,CAAC"}

package/dist/src/ui/components/messages/ToolConfirmationMessage.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

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

@@ -0,0 +1,165 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi } from 'vitest';
+import { EOL } from 'node:os';
+import { ToolConfirmationMessage } from './ToolConfirmationMessage.js';
+import { renderWithProviders } from '../../../test-utils/render.js';
+describe('ToolConfirmationMessage', () => {
+    const mockConfig = {
+        isTrustedFolder: () => true,
+        getIdeMode: () => false,
+    };
+    it('should not display urls if prompt and url are the same', () => {
+        const confirmationDetails = {
+            type: 'info',
+            title: 'Confirm Web Fetch',
+            prompt: 'https://example.com',
+            urls: ['https://example.com'],
+            onConfirm: vi.fn(),
+        };
+        const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { confirmationDetails: confirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }));
+        expect(lastFrame()).not.toContain('URLs to fetch:');
+    });
+    it('should display urls if prompt and url are different', () => {
+        const confirmationDetails = {
+            type: 'info',
+            title: 'Confirm Web Fetch',
+            prompt: 'fetch https://github.com/google/gemini-react/blob/main/README.md',
+            urls: [
+                'https://raw.githubusercontent.com/google/gemini-react/main/README.md',
+            ],
+            onConfirm: vi.fn(),
+        };
+        const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { confirmationDetails: confirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }));
+        expect(lastFrame()).toContain('URLs to fetch:');
+        expect(lastFrame()).toContain('- https://raw.githubusercontent.com/google/gemini-react/main/README.md');
+    });
+    it('should render plan confirmation with markdown plan content', () => {
+        const confirmationDetails = {
+            type: 'plan',
+            title: 'Would you like to proceed?',
+            plan: '# Implementation Plan\n- Step one\n- Step two'.replace(/\n/g, EOL),
+            onConfirm: vi.fn(),
+        };
+        const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { confirmationDetails: confirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }));
+        expect(lastFrame()).toContain('Yes, and auto-accept edits');
+        expect(lastFrame()).toContain('Yes, and manually approve edits');
+        expect(lastFrame()).toContain('No, keep planning');
+        expect(lastFrame()).toContain('Implementation Plan');
+        expect(lastFrame()).toContain('Step one');
+    });
+    describe('with folder trust', () => {
+        const editConfirmationDetails = {
+            type: 'edit',
+            title: 'Confirm Edit',
+            fileName: 'test.txt',
+            filePath: '/test.txt',
+            fileDiff: '...diff...',
+            originalContent: 'a',
+            newContent: 'b',
+            onConfirm: vi.fn(),
+        };
+        const execConfirmationDetails = {
+            type: 'exec',
+            title: 'Confirm Execution',
+            command: 'echo "hello"',
+            rootCommand: 'echo',
+            onConfirm: vi.fn(),
+        };
+        const infoConfirmationDetails = {
+            type: 'info',
+            title: 'Confirm Web Fetch',
+            prompt: 'https://example.com',
+            urls: ['https://example.com'],
+            onConfirm: vi.fn(),
+        };
+        const mcpConfirmationDetails = {
+            type: 'mcp',
+            title: 'Confirm MCP Tool',
+            serverName: 'test-server',
+            toolName: 'test-tool',
+            toolDisplayName: 'Test Tool',
+            onConfirm: vi.fn(),
+        };
+        describe.each([
+            {
+                description: 'for edit confirmations',
+                details: editConfirmationDetails,
+                alwaysAllowText: 'Yes, allow always',
+            },
+            {
+                description: 'for exec confirmations',
+                details: execConfirmationDetails,
+                alwaysAllowText: 'Yes, allow always',
+            },
+            {
+                description: 'for info confirmations',
+                details: infoConfirmationDetails,
+                alwaysAllowText: 'Yes, allow always',
+            },
+            {
+                description: 'for mcp confirmations',
+                details: mcpConfirmationDetails,
+                alwaysAllowText: 'always allow',
+            },
+        ])('$description', ({ details, alwaysAllowText }) => {
+            it('should show "allow always" when folder is trusted', () => {
+                const mockConfig = {
+                    isTrustedFolder: () => true,
+                    getIdeMode: () => false,
+                };
+                const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { confirmationDetails: details, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }));
+                expect(lastFrame()).toContain(alwaysAllowText);
+            });
+            it('should NOT show "allow always" when folder is untrusted', () => {
+                const mockConfig = {
+                    isTrustedFolder: () => false,
+                    getIdeMode: () => false,
+                };
+                const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { confirmationDetails: details, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }));
+                expect(lastFrame()).not.toContain(alwaysAllowText);
+            });
+        });
+    });
+    describe('external editor option', () => {
+        const editConfirmationDetails = {
+            type: 'edit',
+            title: 'Confirm Edit',
+            fileName: 'test.txt',
+            filePath: '/test.txt',
+            fileDiff: '...diff...',
+            originalContent: 'a',
+            newContent: 'b',
+            onConfirm: vi.fn(),
+        };
+        it('should show "Modify with external editor" when preferredEditor is set', () => {
+            const mockConfig = {
+                isTrustedFolder: () => true,
+                getIdeMode: () => false,
+            };
+            const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { confirmationDetails: editConfirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }), {
+                settings: {
+                    merged: { general: { preferredEditor: 'vscode' } },
+                },
+            });
+            expect(lastFrame()).toContain('Modify with external editor');
+        });
+        it('should NOT show "Modify with external editor" when preferredEditor is not set', () => {
+            const mockConfig = {
+                isTrustedFolder: () => true,
+                getIdeMode: () => false,
+            };
+            const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { confirmationDetails: editConfirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }), {
+                settings: {
+                    merged: { general: {} },
+                },
+            });
+            expect(lastFrame()).not.toContain('Modify with external editor');
+        });
+    });
+});
+//# sourceMappingURL=ToolConfirmationMessage.test.js.map

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

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

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

@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type React from 'react';
+import type { IndividualToolCallDisplay } from '../../types.js';
+interface ToolGroupMessageProps {
+    groupId: number;
+    toolCalls: IndividualToolCallDisplay[];
+    availableTerminalHeight?: number;
+    terminalWidth: number;
+    isFocused?: boolean;
+    activeShellPtyId?: number | null;
+    embeddedShellFocused?: boolean;
+    onShellInputSubmit?: (input: string) => void;
+}
+export declare const ToolGroupMessage: React.FC<ToolGroupMessageProps>;
+export {};

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

@@ -0,0 +1,58 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useMemo } from 'react';
+import { Box, Text } from 'ink';
+import { ToolCallStatus } from '../../types.js';
+import { ToolMessage } from './ToolMessage.js';
+import { ToolConfirmationMessage } from './ToolConfirmationMessage.js';
+import { theme } from '../../semantic-colors.js';
+import { SHELL_COMMAND_NAME, SHELL_NAME } from '../../constants.js';
+import { useConfig } from '../../contexts/ConfigContext.js';
+// Main component renders the border and maps the tools using ToolMessage
+export const ToolGroupMessage = ({ toolCalls, availableTerminalHeight, terminalWidth, isFocused = true, activeShellPtyId, embeddedShellFocused, }) => {
+    const isEmbeddedShellFocused = embeddedShellFocused &&
+        toolCalls.some((t) => t.ptyId === activeShellPtyId && t.status === ToolCallStatus.Executing);
+    const hasPending = !toolCalls.every((t) => t.status === ToolCallStatus.Success);
+    const config = useConfig();
+    const isShellCommand = toolCalls.some((t) => t.name === SHELL_COMMAND_NAME || t.name === SHELL_NAME);
+    const borderColor = isShellCommand || isEmbeddedShellFocused
+        ? theme.ui.symbol
+        : hasPending
+            ? theme.status.warning
+            : theme.border.default;
+    const staticHeight = /* border */ 2 + /* marginBottom */ 1;
+    // This is a bit of a magic number, but it accounts for the border and
+    // marginLeft.
+    const innerWidth = terminalWidth - 4;
+    // only prompt for tool approval on the first 'confirming' tool in the list
+    // note, after the CTA, this automatically moves over to the next 'confirming' tool
+    const toolAwaitingApproval = useMemo(() => toolCalls.find((tc) => tc.status === ToolCallStatus.Confirming), [toolCalls]);
+    let countToolCallsWithResults = 0;
+    for (const tool of toolCalls) {
+        if (tool.resultDisplay !== undefined && tool.resultDisplay !== '') {
+            countToolCallsWithResults++;
+        }
+    }
+    const countOneLineToolCalls = toolCalls.length - countToolCallsWithResults;
+    const availableTerminalHeightPerToolMessage = availableTerminalHeight
+        ? Math.max(Math.floor((availableTerminalHeight - staticHeight - countOneLineToolCalls) /
+            Math.max(1, countToolCallsWithResults)), 1)
+        : undefined;
+    return (_jsx(Box, { flexDirection: "column", borderStyle: "round", 
+        /*
+          This width constraint is highly important and protects us from an Ink rendering bug.
+          Since the ToolGroup can typically change rendering states frequently, it can cause
+          Ink to render the border of the box incorrectly and span multiple lines and even
+          cause tearing.
+        */
+        width: "100%", marginLeft: 1, borderDimColor: hasPending && (!isShellCommand || !isEmbeddedShellFocused), borderColor: borderColor, gap: 1, children: toolCalls.map((tool) => {
+            const isConfirming = toolAwaitingApproval?.callId === tool.callId;
+            return (_jsxs(Box, { flexDirection: "column", minHeight: 1, children: [_jsx(Box, { flexDirection: "row", alignItems: "center", children: _jsx(ToolMessage, { ...tool, availableTerminalHeight: availableTerminalHeightPerToolMessage, terminalWidth: innerWidth, emphasis: isConfirming
+                                ? 'high'
+                                : toolAwaitingApproval
+                                    ? 'low'
+                                    : 'medium', activeShellPtyId: activeShellPtyId, embeddedShellFocused: embeddedShellFocused, config: config }) }), tool.status === ToolCallStatus.Confirming &&
+                        isConfirming &&
+                        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));
+        }) }));
+};
+//# sourceMappingURL=ToolGroupMessage.js.map

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

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

package/dist/src/ui/components/messages/ToolGroupMessage.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};