@google/gemini-cli 0.26.0-preview.4 → 0.27.0-nightly.20260126.cb772a5b7

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

@@ -5,33 +5,20 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * SPDX-License-Identifier: Apache-2.0
  */
 import React from 'react';
-import { Box, Text } from 'ink';
-import { ToolCallStatus } from '../../types.js';
+import { Box } from 'ink';
 import { ShellInputPrompt } from '../ShellInputPrompt.js';
 import { StickyHeader } from '../StickyHeader.js';
-import { SHELL_COMMAND_NAME, SHELL_NAME, SHELL_FOCUS_HINT_DELAY_MS, } from '../../constants.js';
-import { theme } from '../../semantic-colors.js';
-import { SHELL_TOOL_NAME } from '@google/gemini-cli-core';
 import { useUIActions } from '../../contexts/UIActionsContext.js';
 import { useMouseClick } from '../../hooks/useMouseClick.js';
 import { ToolResultDisplay } from './ToolResultDisplay.js';
-import { ToolStatusIndicator, ToolInfo, TrailingIndicator, STATUS_INDICATOR_WIDTH, } from './ToolShared.js';
+import { ToolStatusIndicator, ToolInfo, TrailingIndicator, STATUS_INDICATOR_WIDTH, isThisShellFocusable as checkIsShellFocusable, isThisShellFocused as checkIsShellFocused, useFocusHint, FocusHint, } from './ToolShared.js';
 export const ShellToolMessage = ({ name, description, resultDisplay, status, availableTerminalHeight, terminalWidth, emphasis = 'medium', renderOutputAsMarkdown = true, activeShellPtyId, embeddedShellFocused, ptyId, config, isFirst, borderColor, borderDimColor, }) => {
-    const isThisShellFocused = (name === SHELL_COMMAND_NAME ||
-        name === SHELL_NAME ||
-        name === SHELL_TOOL_NAME) &&
-        status === ToolCallStatus.Executing &&
-        ptyId === activeShellPtyId &&
-        embeddedShellFocused;
+    const isThisShellFocused = checkIsShellFocused(name, status, ptyId, activeShellPtyId, embeddedShellFocused);
     const { setEmbeddedShellFocused } = useUIActions();
     const headerRef = React.useRef(null);
     const contentRef = React.useRef(null);
     // The shell is focusable if it's the shell command, it's executing, and the interactive shell is enabled.
-    const isThisShellFocusable = (name === SHELL_COMMAND_NAME ||
-        name === SHELL_NAME ||
-        name === SHELL_TOOL_NAME) &&
-        status === ToolCallStatus.Executing &&
-        config?.getEnableInteractiveShell();
+    const isThisShellFocusable = checkIsShellFocusable(name, status, config);
     const handleFocus = () => {
         if (isThisShellFocusable) {
             setEmbeddedShellFocused(true);
@@ -51,29 +38,7 @@ export const ShellToolMessage = ({ name, description, resultDisplay, status, ava
             wasFocusedRef.current = false;
         }
     }, [isThisShellFocused, embeddedShellFocused, setEmbeddedShellFocused]);
-    const [lastUpdateTime, setLastUpdateTime] = React.useState(null);
-    const [userHasFocused, setUserHasFocused] = React.useState(false);
-    const [showFocusHint, setShowFocusHint] = React.useState(false);
-    React.useEffect(() => {
-        if (resultDisplay) {
-            setLastUpdateTime(new Date());
-        }
-    }, [resultDisplay]);
-    React.useEffect(() => {
-        if (!lastUpdateTime) {
-            return;
-        }
-        const timer = setTimeout(() => {
-            setShowFocusHint(true);
-        }, SHELL_FOCUS_HINT_DELAY_MS);
-        return () => clearTimeout(timer);
-    }, [lastUpdateTime]);
-    React.useEffect(() => {
-        if (isThisShellFocused) {
-            setUserHasFocused(true);
-        }
-    }, [isThisShellFocused]);
-    const shouldShowFocusHint = isThisShellFocusable && (showFocusHint || userHasFocused);
-    return (_jsxs(_Fragment, { children: [_jsxs(StickyHeader, { width: terminalWidth, isFirst: isFirst, borderColor: borderColor, borderDimColor: borderDimColor, containerRef: headerRef, children: [_jsx(ToolStatusIndicator, { status: status, name: name }), _jsx(ToolInfo, { name: name, status: status, description: description, emphasis: emphasis }), shouldShowFocusHint && (_jsx(Box, { marginLeft: 1, flexShrink: 0, children: _jsx(Text, { color: theme.text.accent, children: isThisShellFocused ? '(Focused)' : '(tab to focus)' }) })), emphasis === 'high' && _jsx(TrailingIndicator, {})] }), _jsxs(Box, { ref: contentRef, width: terminalWidth, borderStyle: "round", borderColor: borderColor, borderDimColor: borderDimColor, borderTop: false, borderBottom: false, borderLeft: true, borderRight: true, paddingX: 1, flexDirection: "column", children: [_jsx(ToolResultDisplay, { resultDisplay: resultDisplay, availableTerminalHeight: availableTerminalHeight, terminalWidth: terminalWidth, renderOutputAsMarkdown: renderOutputAsMarkdown }), isThisShellFocused && config && (_jsx(Box, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: _jsx(ShellInputPrompt, { activeShellPtyId: activeShellPtyId ?? null, focus: embeddedShellFocused }) }))] })] }));
+    const { shouldShowFocusHint } = useFocusHint(isThisShellFocusable, isThisShellFocused, resultDisplay);
+    return (_jsxs(_Fragment, { children: [_jsxs(StickyHeader, { width: terminalWidth, isFirst: isFirst, borderColor: borderColor, borderDimColor: borderDimColor, containerRef: headerRef, children: [_jsx(ToolStatusIndicator, { status: status, name: name }), _jsx(ToolInfo, { name: name, status: status, description: description, emphasis: emphasis }), _jsx(FocusHint, { shouldShowFocusHint: shouldShowFocusHint, isThisShellFocused: isThisShellFocused }), emphasis === 'high' && _jsx(TrailingIndicator, {})] }), _jsxs(Box, { ref: contentRef, width: terminalWidth, borderStyle: "round", borderColor: borderColor, borderDimColor: borderDimColor, borderTop: false, borderBottom: false, borderLeft: true, borderRight: true, paddingX: 1, flexDirection: "column", children: [_jsx(ToolResultDisplay, { resultDisplay: resultDisplay, availableTerminalHeight: availableTerminalHeight, terminalWidth: terminalWidth, renderOutputAsMarkdown: renderOutputAsMarkdown }), isThisShellFocused && config && (_jsx(Box, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: _jsx(ShellInputPrompt, { activeShellPtyId: activeShellPtyId ?? null, focus: embeddedShellFocused }) }))] })] }));
 };
 //# sourceMappingURL=ShellToolMessage.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"ShellToolMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ShellToolMessage.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ShellToolMessage.js","sourceRoot":"","sources":["../../../../../src/ui/components/messages/ShellToolMessage.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAmB,MAAM,KAAK,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EACL,mBAAmB,EACnB,QAAQ,EACR,iBAAiB,EACjB,sBAAsB,EACtB,oBAAoB,IAAI,qBAAqB,EAC7C,kBAAkB,IAAI,mBAAmB,EACzC,YAAY,EACZ,SAAS,GACV,MAAM,iBAAiB,CAAC;AAUzB,MAAM,CAAC,MAAM,gBAAgB,GAAoC,CAAC,EAChE,IAAI,EAEJ,WAAW,EAEX,aAAa,EAEb,MAAM,EAEN,uBAAuB,EAEvB,aAAa,EAEb,QAAQ,GAAG,QAAQ,EAEnB,sBAAsB,GAAG,IAAI,EAE7B,gBAAgB,EAEhB,oBAAoB,EAEpB,KAAK,EAEL,MAAM,EAEN,OAAO,EAEP,WAAW,EAEX,cAAc,GACf,EAAE,EAAE;IACH,MAAM,kBAAkB,GAAG,mBAAmB,CAC5C,IAAI,EACJ,MAAM,EACN,KAAK,EACL,gBAAgB,EAChB,oBAAoB,CACrB,CAAC;IAEF,MAAM,EAAE,uBAAuB,EAAE,GAAG,YAAY,EAAE,CAAC;IAEnD,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAa,IAAI,CAAC,CAAC;IAEjD,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAa,IAAI,CAAC,CAAC;IAElD,0GAA0G;IAE1G,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAEzE,MAAM,WAAW,GAAG,GAAG,EAAE;QACvB,IAAI,oBAAoB,EAAE,CAAC;YACzB,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC;IACH,CAAC,CAAC;IAEF,aAAa,CAAC,SAAS,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAE5E,aAAa,CAAC,UAAU,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAE7E,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAE1C,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,kBAAkB,EAAE,CAAC;YACvB,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC;QAC/B,CAAC;aAAM,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;YACjC,IAAI,oBAAoB,EAAE,CAAC;gBACzB,uBAAuB,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC;YAED,aAAa,CAAC,OAAO,GAAG,KAAK,CAAC;QAChC,CAAC;IACH,CAAC,EAAE,CAAC,kBAAkB,EAAE,oBAAoB,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAExE,MAAM,EAAE,mBAAmB,EAAE,GAAG,YAAY,CAC1C,oBAAoB,EACpB,kBAAkB,EAClB,aAAa,CACd,CAAC;IAEF,OAAO,CACL,8BACE,MAAC,YAAY,IACX,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,SAAS,aAEvB,KAAC,mBAAmB,IAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAI,EAEnD,KAAC,QAAQ,IACP,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,GAClB,EAEF,KAAC,SAAS,IACR,mBAAmB,EAAE,mBAAmB,EACxC,kBAAkB,EAAE,kBAAkB,GACtC,EAED,QAAQ,KAAK,MAAM,IAAI,KAAC,iBAAiB,KAAG,IAChC,EAEf,MAAC,GAAG,IACF,GAAG,EAAE,UAAU,EACf,KAAK,EAAE,aAAa,EACpB,WAAW,EAAC,OAAO,EACnB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,KAAK,EAChB,YAAY,EAAE,KAAK,EACnB,UAAU,EAAE,IAAI,EAChB,WAAW,EAAE,IAAI,EACjB,QAAQ,EAAE,CAAC,EACX,aAAa,EAAC,QAAQ,aAEtB,KAAC,iBAAiB,IAChB,aAAa,EAAE,aAAa,EAC5B,uBAAuB,EAAE,uBAAuB,EAChD,aAAa,EAAE,aAAa,EAC5B,sBAAsB,EAAE,sBAAsB,GAC9C,EACD,kBAAkB,IAAI,MAAM,IAAI,CAC/B,KAAC,GAAG,IAAC,WAAW,EAAE,sBAAsB,EAAE,SAAS,EAAE,CAAC,YACpD,KAAC,gBAAgB,IACf,gBAAgB,EAAE,gBAAgB,IAAI,IAAI,EAC1C,KAAK,EAAE,oBAAoB,GAC3B,GACE,CACP,IACG,IACL,CACJ,CAAC;AACJ,CAAC,CAAC"}

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

@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import type React from 'react';
-import type { ToolCallConfirmationDetails, Config } from '@google/gemini-cli-core';
+import { type SerializableConfirmationDetails, type ToolCallConfirmationDetails, type Config } from '@google/gemini-cli-core';
 export interface ToolConfirmationMessageProps {
-    confirmationDetails: ToolCallConfirmationDetails;
+    callId: string;
+    confirmationDetails: ToolCallConfirmationDetails | SerializableConfirmationDetails;
     config: Config;
     isFocused?: boolean;
     availableTerminalHeight?: number;

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

@@ -1,65 +1,38 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useEffect, useState, useMemo } from 'react';
+import { useMemo, useCallback } from 'react';
 import { Box, Text } from 'ink';
 import { DiffRenderer } from './DiffRenderer.js';
 import { RenderInline } from '../../utils/InlineMarkdownRenderer.js';
-import { IdeClient, ToolConfirmationOutcome, hasRedirection, } from '@google/gemini-cli-core';
+import { ToolConfirmationOutcome, hasRedirection, debugLogger, } from '@google/gemini-cli-core';
+import { useToolActions } from '../../contexts/ToolActionsContext.js';
 import { RadioButtonSelect } from '../shared/RadioButtonSelect.js';
 import { MaxSizedBox, MINIMUM_MAX_HEIGHT } from '../shared/MaxSizedBox.js';
 import { useKeypress } from '../../hooks/useKeypress.js';
 import { theme } from '../../semantic-colors.js';
 import { useSettings } from '../../contexts/SettingsContext.js';
 import { REDIRECTION_WARNING_NOTE_LABEL, REDIRECTION_WARNING_NOTE_TEXT, REDIRECTION_WARNING_TIP_LABEL, REDIRECTION_WARNING_TIP_TEXT, } from '../../textConstants.js';
-export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused = true, availableTerminalHeight, terminalWidth, }) => {
-    const { onConfirm } = confirmationDetails;
+export const ToolConfirmationMessage = ({ callId, confirmationDetails, config, isFocused = true, availableTerminalHeight, terminalWidth, }) => {
+    const { confirm } = useToolActions();
     const settings = useSettings();
     const allowPermanentApproval = settings.merged.security.enablePermanentToolApproval;
-    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);
-                }
-            };
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            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);
-            }
-        }
-        // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        onConfirm(outcome);
-    };
+    const handleConfirm = useCallback((outcome) => {
+        void confirm(callId, outcome).catch((error) => {
+            debugLogger.error(`Failed to handle tool confirmation for ${callId}:`, error);
+        });
+    }, [confirm, callId]);
     const isTrustedFolder = config.isTrustedFolder();
     useKeypress((key) => {
         if (!isFocused)
             return;
         if (key.name === 'escape' || (key.ctrl && key.name === 'c')) {
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
             handleConfirm(ToolConfirmationOutcome.Cancel);
         }
     }, { isActive: isFocused });
-    const handleSelect = (item) => handleConfirm(item);
-    const { question, bodyContent, options } = useMemo(() => {
-        let bodyContent = null;
-        let question = '';
+    const handleSelect = useCallback((item) => handleConfirm(item), [handleConfirm]);
+    const getOptions = useCallback(() => {
         const options = [];
         if (confirmationDetails.type === 'edit') {
             if (!confirmationDetails.isModifying) {
-                question = `Apply this change?`;
                 options.push({
                     label: 'Allow once',
                     value: ToolConfirmationOutcome.ProceedOnce,
@@ -79,7 +52,9 @@ export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused
                         });
                     }
                 }
-                if (!config.getIdeMode() || !isDiffingEnabled) {
+                // We hide "Modify with external editor" if IDE mode is active, assuming
+                // the IDE provides a better interface (diff view) for this.
+                if (!config.getIdeMode()) {
                     options.push({
                         label: 'Modify with external editor',
                         value: ToolConfirmationOutcome.ModifyWithEditor,
@@ -94,13 +69,6 @@ export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused
             }
         }
         else if (confirmationDetails.type === 'exec') {
-            const executionProps = confirmationDetails;
-            if (executionProps.commands && executionProps.commands.length > 1) {
-                question = `Allow execution of ${executionProps.commands.length} commands?`;
-            }
-            else {
-                question = `Allow execution of: '${executionProps.rootCommand}'?`;
-            }
             options.push({
                 label: 'Allow once',
                 value: ToolConfirmationOutcome.ProceedOnce,
@@ -127,7 +95,6 @@ export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused
             });
         }
         else if (confirmationDetails.type === 'info') {
-            question = `Do you want to proceed?`;
             options.push({
                 label: 'Allow once',
                 value: ToolConfirmationOutcome.ProceedOnce,
@@ -155,8 +122,6 @@ export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused
         }
         else {
             // mcp tool confirmation
-            const mcpProps = confirmationDetails;
-            question = `Allow execution of MCP tool "${mcpProps.toolName}" from server "${mcpProps.serverName}"?`;
             options.push({
                 label: 'Allow once',
                 value: ToolConfirmationOutcome.ProceedOnce,
@@ -187,28 +152,51 @@ export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused
                 key: 'No, suggest changes (esc)',
             });
         }
-        function availableBodyContentHeight() {
-            if (options.length === 0) {
-                // Should not happen if we populated options correctly above for all types
-                // except when isModifying is true, but in that case we don't call this because we don't enter the if block for it.
-                return undefined;
+        return options;
+    }, [confirmationDetails, isTrustedFolder, allowPermanentApproval, config]);
+    const availableBodyContentHeight = useCallback(() => {
+        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 optionsCount = getOptions().length;
+        const surroundingElementsHeight = PADDING_OUTER_Y +
+            MARGIN_BODY_BOTTOM +
+            HEIGHT_QUESTION +
+            MARGIN_QUESTION_BOTTOM +
+            optionsCount;
+        return Math.max(availableTerminalHeight - surroundingElementsHeight, 1);
+    }, [availableTerminalHeight, getOptions]);
+    const { question, bodyContent, options } = useMemo(() => {
+        let bodyContent = null;
+        let question = '';
+        const options = getOptions();
+        if (confirmationDetails.type === 'edit') {
+            if (!confirmationDetails.isModifying) {
+                question = `Apply this change?`;
+            }
+        }
+        else if (confirmationDetails.type === 'exec') {
+            const executionProps = confirmationDetails;
+            if (executionProps.commands && executionProps.commands.length > 1) {
+                question = `Allow execution of ${executionProps.commands.length} commands?`;
             }
-            if (availableTerminalHeight === undefined) {
-                return undefined;
+            else {
+                question = `Allow execution of: '${executionProps.rootCommand}'?`;
             }
-            // 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);
+        }
+        else if (confirmationDetails.type === 'info') {
+            question = `Do you want to proceed?`;
+        }
+        else {
+            // mcp tool confirmation
+            const mcpProps = confirmationDetails;
+            question = `Allow execution of MCP tool "${mcpProps.toolName}" from server "${mcpProps.serverName}"?`;
         }
         if (confirmationDetails.type === 'edit') {
             if (!confirmationDetails.isModifying) {
@@ -258,18 +246,15 @@ export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused
         return { question, bodyContent, options };
     }, [
         confirmationDetails,
-        isTrustedFolder,
-        config,
-        isDiffingEnabled,
-        availableTerminalHeight,
+        getOptions,
+        availableBodyContentHeight,
         terminalWidth,
-        allowPermanentApproval,
     ]);
     if (confirmationDetails.type === 'edit') {
         if (confirmationDetails.isModifying) {
             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" })] }));
         }
     }
-    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 }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", paddingTop: 0, paddingBottom: 1, children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, overflow: "hidden", marginBottom: 1, children: _jsx(MaxSizedBox, { maxHeight: availableBodyContentHeight(), maxWidth: terminalWidth, overflowDirection: "top", 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 }) })] }));
 };
 //# sourceMappingURL=ToolConfirmationMessage.js.map

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

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

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

@@ -7,7 +7,20 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { describe, it, expect, vi } from 'vitest';
 import { ToolConfirmationMessage } from './ToolConfirmationMessage.js';
 import { renderWithProviders, createMockSettings, } from '../../../test-utils/render.js';
+import { useToolActions } from '../../contexts/ToolActionsContext.js';
+vi.mock('../../contexts/ToolActionsContext.js', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        useToolActions: vi.fn(),
+    };
+});
 describe('ToolConfirmationMessage', () => {
+    const mockConfirm = vi.fn();
+    vi.mocked(useToolActions).mockReturnValue({
+        confirm: mockConfirm,
+        cancel: vi.fn(),
+    });
     const mockConfig = {
         isTrustedFolder: () => true,
         getIdeMode: () => false,
@@ -20,7 +33,7 @@ describe('ToolConfirmationMessage', () => {
             urls: ['https://example.com'],
             onConfirm: vi.fn(),
         };
-        const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { confirmationDetails: confirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }));
+        const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { callId: "test-call-id", confirmationDetails: confirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }));
         expect(lastFrame()).toMatchSnapshot();
     });
     it('should display urls if prompt and url are different', () => {
@@ -33,7 +46,7 @@ describe('ToolConfirmationMessage', () => {
             ],
             onConfirm: vi.fn(),
         };
-        const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { confirmationDetails: confirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }));
+        const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { callId: "test-call-id", confirmationDetails: confirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }));
         expect(lastFrame()).toMatchSnapshot();
     });
     it('should display multiple commands for exec type when provided', () => {
@@ -46,7 +59,7 @@ describe('ToolConfirmationMessage', () => {
             commands: ['echo "hello"', 'ls -la', 'whoami'], // Multi-command list
             onConfirm: vi.fn(),
         };
-        const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { confirmationDetails: confirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }));
+        const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { callId: "test-call-id", confirmationDetails: confirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }));
         const output = lastFrame();
         expect(output).toContain('echo "hello"');
         expect(output).toContain('ls -la');
@@ -114,7 +127,7 @@ describe('ToolConfirmationMessage', () => {
                     isTrustedFolder: () => true,
                     getIdeMode: () => false,
                 };
-                const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { confirmationDetails: details, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }));
+                const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { callId: "test-call-id", confirmationDetails: details, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }));
                 expect(lastFrame()).toMatchSnapshot();
             });
             it('should NOT show "allow always" when folder is untrusted', () => {
@@ -122,7 +135,7 @@ describe('ToolConfirmationMessage', () => {
                     isTrustedFolder: () => false,
                     getIdeMode: () => false,
                 };
-                const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { confirmationDetails: details, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }));
+                const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { callId: "test-call-id", confirmationDetails: details, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }));
                 expect(lastFrame()).toMatchSnapshot();
             });
         });
@@ -143,7 +156,7 @@ describe('ToolConfirmationMessage', () => {
                 isTrustedFolder: () => true,
                 getIdeMode: () => false,
             };
-            const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { confirmationDetails: editConfirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }), {
+            const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { callId: "test-call-id", confirmationDetails: editConfirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }), {
                 settings: createMockSettings({
                     security: { enablePermanentToolApproval: false },
                 }),
@@ -155,7 +168,7 @@ describe('ToolConfirmationMessage', () => {
                 isTrustedFolder: () => true,
                 getIdeMode: () => false,
             };
-            const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { confirmationDetails: editConfirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }), {
+            const { lastFrame } = renderWithProviders(_jsx(ToolConfirmationMessage, { callId: "test-call-id", confirmationDetails: editConfirmationDetails, config: mockConfig, availableTerminalHeight: 30, terminalWidth: 80 }), {
                 settings: createMockSettings({
                     security: { enablePermanentToolApproval: true },
                 }),

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

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

@@ -6,16 +6,28 @@ import { ToolMessage } from './ToolMessage.js';
 import { ShellToolMessage } from './ShellToolMessage.js';
 import { ToolConfirmationMessage } from './ToolConfirmationMessage.js';
 import { theme } from '../../semantic-colors.js';
-import { SHELL_COMMAND_NAME, SHELL_NAME } from '../../constants.js';
-import { SHELL_TOOL_NAME } from '@google/gemini-cli-core';
 import { useConfig } from '../../contexts/ConfigContext.js';
+import { isShellTool, isThisShellFocused } from './ToolShared.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 isEventDriven = config.isEventDrivenSchedulerEnabled();
+    // If Event-Driven Scheduler is enabled, we HIDE tools that are still in
+    // pre-execution states (Confirming, Pending) from the History log.
+    // They live in the Global Queue or wait for their turn.
+    const visibleToolCalls = useMemo(() => {
+        if (!isEventDriven) {
+            return toolCalls;
+        }
+        // Only show tools that are actually running or finished.
+        // We explicitly exclude Pending and Confirming to ensure they only
+        // appear in the Global Queue until they are approved and start executing.
+        return toolCalls.filter((t) => t.status !== ToolCallStatus.Pending &&
+            t.status !== ToolCallStatus.Confirming);
+    }, [toolCalls, isEventDriven]);
+    const isEmbeddedShellFocused = visibleToolCalls.some((t) => isThisShellFocused(t.name, t.status, t.ptyId, activeShellPtyId, embeddedShellFocused));
+    const hasPending = !visibleToolCalls.every((t) => t.status === ToolCallStatus.Success);
+    const isShellCommand = toolCalls.some((t) => isShellTool(t.name));
     const borderColor = (isShellCommand && hasPending) || isEmbeddedShellFocused
         ? theme.ui.symbol
         : hasPending
@@ -23,16 +35,22 @@ export const ToolGroupMessage = ({ toolCalls, availableTerminalHeight, terminalW
             : theme.border.default;
     const borderDimColor = hasPending && (!isShellCommand || !isEmbeddedShellFocused);
     const staticHeight = /* border */ 2 + /* marginBottom */ 1;
-    // 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]);
+    // Inline confirmations are ONLY used when the Global Queue is disabled.
+    const toolAwaitingApproval = useMemo(() => isEventDriven
+        ? undefined
+        : toolCalls.find((tc) => tc.status === ToolCallStatus.Confirming), [toolCalls, isEventDriven]);
+    // If all tools are hidden (e.g. group only contains confirming or pending tools),
+    // render nothing in the history log.
+    if (visibleToolCalls.length === 0) {
+        return null;
+    }
     let countToolCallsWithResults = 0;
-    for (const tool of toolCalls) {
+    for (const tool of visibleToolCalls) {
         if (tool.resultDisplay !== undefined && tool.resultDisplay !== '') {
             countToolCallsWithResults++;
         }
     }
-    const countOneLineToolCalls = toolCalls.length - countToolCallsWithResults;
+    const countOneLineToolCalls = visibleToolCalls.length - countToolCallsWithResults;
     const availableTerminalHeightPerToolMessage = availableTerminalHeight
         ? Math.max(Math.floor((availableTerminalHeight - staticHeight - countOneLineToolCalls) /
             Math.max(1, countToolCallsWithResults)), 1)
@@ -48,12 +66,10 @@ export const ToolGroupMessage = ({ toolCalls, availableTerminalHeight, terminalW
           Ink to render the border of the box incorrectly and span multiple lines and even
           cause tearing.
         */
-        width: terminalWidth, children: [toolCalls.map((tool, index) => {
+        width: terminalWidth, children: [visibleToolCalls.map((tool, index) => {
                 const isConfirming = toolAwaitingApproval?.callId === tool.callId;
                 const isFirst = index === 0;
-                const isShellTool = tool.name === SHELL_COMMAND_NAME ||
-                    tool.name === SHELL_NAME ||
-                    tool.name === SHELL_TOOL_NAME;
+                const isShellToolCall = isShellTool(tool.name);
                 const commonProps = {
                     ...tool,
                     availableTerminalHeight: availableTerminalHeightPerToolMessage,
@@ -67,14 +83,14 @@ export const ToolGroupMessage = ({ toolCalls, availableTerminalHeight, terminalW
                     borderColor,
                     borderDimColor,
                 };
-                return (_jsxs(Box, { flexDirection: "column", minHeight: 1, width: terminalWidth, children: [isShellTool ? (_jsx(ShellToolMessage, { ...commonProps, activeShellPtyId: activeShellPtyId, embeddedShellFocused: embeddedShellFocused, config: config })) : (_jsx(ToolMessage, { ...commonProps })), _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 &&
+                return (_jsxs(Box, { flexDirection: "column", minHeight: 1, width: terminalWidth, children: [isShellToolCall ? (_jsx(ShellToolMessage, { ...commonProps, activeShellPtyId: activeShellPtyId, embeddedShellFocused: embeddedShellFocused, config: config })) : (_jsx(ToolMessage, { ...commonProps })), _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 &&
                                     isConfirming &&
-                                    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));
+                                    tool.confirmationDetails && (_jsx(ToolConfirmationMessage, { callId: tool.callId, 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));
             }), 
             /*
                   We have to keep the bottom border separate so it doesn't get
                   drawn over by the sticky header directly inside it.
                  */
-            toolCalls.length > 0 && (_jsx(Box, { height: 0, width: terminalWidth, borderLeft: true, borderRight: true, borderTop: false, borderBottom: true, borderColor: borderColor, borderDimColor: borderDimColor, borderStyle: "round" }))] }));
+            visibleToolCalls.length > 0 && (_jsx(Box, { height: 0, width: terminalWidth, borderLeft: true, borderRight: true, borderTop: false, borderBottom: true, borderColor: borderColor, borderDimColor: borderDimColor, borderStyle: "round" }))] }));
 };
 //# sourceMappingURL=ToolGroupMessage.js.map

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

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