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

package/dist/src/ui/App.test.js

@@ -4,17 +4,14 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { describe, it, expect, vi } from 'vitest';
-import { render } from '../test-utils/render.js';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { renderWithProviders } from '../test-utils/render.js';
 import { Text, useIsScreenReaderEnabled } from 'ink';
-import { makeFakeConfig } from '@google/gemini-cli-core';
+import {} from '@google/gemini-cli-core';
 import { App } from './App.js';
-import { UIStateContext } from './contexts/UIStateContext.js';
-import { StreamingState } from './types.js';
-import { ConfigContext } from './contexts/ConfigContext.js';
-import { AppContext } from './contexts/AppContext.js';
-import { SettingsContext } from './contexts/SettingsContext.js';
-import { LoadedSettings } from '../config/settings.js';
+import {} from './contexts/UIStateContext.js';
+import { StreamingState, ToolCallStatus } from './types.js';
+import { makeFakeConfig } from '@google/gemini-cli-core';
 vi.mock('ink', async (importOriginal) => {
     const original = await importOriginal();
     return {
@@ -44,12 +41,19 @@ vi.mock('./components/Footer.js', () => ({
     Footer: () => _jsx(Text, { children: "Footer" }),
 }));
 describe('App', () => {
+    beforeEach(() => {
+        useIsScreenReaderEnabled.mockReturnValue(false);
+    });
     const mockUIState = {
         streamingState: StreamingState.Idle,
         quittingMessages: null,
         dialogsVisible: false,
-        mainControlsRef: { current: null },
-        rootUiRef: { current: null },
+        mainControlsRef: {
+            current: null,
+        },
+        rootUiRef: {
+            current: null,
+        },
         historyManager: {
             addItem: vi.fn(),
             history: [],
@@ -59,25 +63,17 @@ describe('App', () => {
         },
         history: [],
         pendingHistoryItems: [],
+        pendingGeminiHistoryItems: [],
         bannerData: {
             defaultText: 'Mock Banner Text',
             warningText: '',
         },
     };
-    const mockConfig = makeFakeConfig();
-    const mockSettingsFile = {
-        settings: {},
-        originalSettings: {},
-        path: '/mock/path',
-    };
-    const mockLoadedSettings = new LoadedSettings(mockSettingsFile, mockSettingsFile, mockSettingsFile, mockSettingsFile, true, []);
-    const mockAppState = {
-        version: '1.0.0',
-        startupWarnings: [],
-    };
-    const renderWithProviders = (ui, state) => render(_jsx(AppContext.Provider, { value: mockAppState, children: _jsx(ConfigContext.Provider, { value: mockConfig, children: _jsx(SettingsContext.Provider, { value: mockLoadedSettings, children: _jsx(UIStateContext.Provider, { value: state, children: ui }) }) }) }));
     it('should render main content and composer when not quitting', () => {
-        const { lastFrame } = renderWithProviders(_jsx(App, {}), mockUIState);
+        const { lastFrame } = renderWithProviders(_jsx(App, {}), {
+            uiState: mockUIState,
+            useAlternateBuffer: false,
+        });
         expect(lastFrame()).toContain('MainContent');
         expect(lastFrame()).toContain('Notifications');
         expect(lastFrame()).toContain('Composer');
@@ -87,7 +83,10 @@ describe('App', () => {
             ...mockUIState,
             quittingMessages: [{ id: 1, type: 'user', text: 'test' }],
         };
-        const { lastFrame } = renderWithProviders(_jsx(App, {}), quittingUIState);
+        const { lastFrame } = renderWithProviders(_jsx(App, {}), {
+            uiState: quittingUIState,
+            useAlternateBuffer: false,
+        });
         expect(lastFrame()).toContain('Quitting...');
     });
     it('should render full history in alternate buffer mode when quittingMessages is set', () => {
@@ -97,19 +96,21 @@ describe('App', () => {
             history: [{ id: 1, type: 'user', text: 'history item' }],
             pendingHistoryItems: [{ type: 'user', text: 'pending item' }],
         };
-        mockLoadedSettings.merged.ui.useAlternateBuffer = true;
-        const { lastFrame } = renderWithProviders(_jsx(App, {}), quittingUIState);
+        const { lastFrame } = renderWithProviders(_jsx(App, {}), {
+            uiState: quittingUIState,
+            useAlternateBuffer: true,
+        });
         expect(lastFrame()).toContain('HistoryItemDisplay');
         expect(lastFrame()).toContain('Quitting...');
-        // Reset settings
-        mockLoadedSettings.merged.ui.useAlternateBuffer = false;
     });
     it('should render dialog manager when dialogs are visible', () => {
         const dialogUIState = {
             ...mockUIState,
             dialogsVisible: true,
         };
-        const { lastFrame } = renderWithProviders(_jsx(App, {}), dialogUIState);
+        const { lastFrame } = renderWithProviders(_jsx(App, {}), {
+            uiState: dialogUIState,
+        });
         expect(lastFrame()).toContain('MainContent');
         expect(lastFrame()).toContain('Notifications');
         expect(lastFrame()).toContain('DialogManager');
@@ -123,28 +124,83 @@ describe('App', () => {
             dialogsVisible: true,
             [stateKey]: true,
         };
-        const { lastFrame } = renderWithProviders(_jsx(App, {}), uiState);
+        const { lastFrame } = renderWithProviders(_jsx(App, {}), {
+            uiState,
+        });
         expect(lastFrame()).toContain(`Press Ctrl+${key} again to exit.`);
     });
     it('should render ScreenReaderAppLayout when screen reader is enabled', () => {
         useIsScreenReaderEnabled.mockReturnValue(true);
-        const { lastFrame } = renderWithProviders(_jsx(App, {}), mockUIState);
-        expect(lastFrame()).toContain('Notifications\nFooter\nMainContent\nComposer');
+        const { lastFrame } = renderWithProviders(_jsx(App, {}), {
+            uiState: mockUIState,
+        });
+        expect(lastFrame()).toContain(`Notifications
+Footer
+MainContent
+Composer`);
     });
     it('should render DefaultAppLayout when screen reader is not enabled', () => {
         useIsScreenReaderEnabled.mockReturnValue(false);
-        const { lastFrame } = renderWithProviders(_jsx(App, {}), mockUIState);
-        expect(lastFrame()).toContain('MainContent\nNotifications\nComposer');
+        const { lastFrame } = renderWithProviders(_jsx(App, {}), {
+            uiState: mockUIState,
+        });
+        expect(lastFrame()).toContain(`MainContent
+Notifications
+Composer`);
+    });
+    it('should render ToolConfirmationQueue along with Composer when tool is confirming and experiment is on', () => {
+        useIsScreenReaderEnabled.mockReturnValue(false);
+        const toolCalls = [
+            {
+                callId: 'call-1',
+                name: 'ls',
+                description: 'list directory',
+                status: ToolCallStatus.Confirming,
+                resultDisplay: '',
+                confirmationDetails: {
+                    type: 'exec',
+                    title: 'Confirm execution',
+                    command: 'ls',
+                    rootCommand: 'ls',
+                    rootCommands: ['ls'],
+                },
+            },
+        ];
+        const stateWithConfirmingTool = {
+            ...mockUIState,
+            pendingHistoryItems: [{ type: 'tool_group', tools: toolCalls }],
+            pendingGeminiHistoryItems: [{ type: 'tool_group', tools: toolCalls }],
+        };
+        const configWithExperiment = {
+            ...makeFakeConfig(),
+            isEventDrivenSchedulerEnabled: () => true,
+            isTrustedFolder: () => true,
+            getIdeMode: () => false,
+        };
+        const { lastFrame } = renderWithProviders(_jsx(App, {}), {
+            uiState: stateWithConfirmingTool,
+            config: configWithExperiment,
+        });
+        expect(lastFrame()).toContain('MainContent');
+        expect(lastFrame()).toContain('Notifications');
+        expect(lastFrame()).toContain('Action Required'); // From ToolConfirmationQueue
+        expect(lastFrame()).toContain('1 of 1');
+        expect(lastFrame()).toContain('Composer');
+        expect(lastFrame()).toMatchSnapshot();
     });
     describe('Snapshots', () => {
         it('renders default layout correctly', () => {
             useIsScreenReaderEnabled.mockReturnValue(false);
-            const { lastFrame } = renderWithProviders(_jsx(App, {}), mockUIState);
+            const { lastFrame } = renderWithProviders(_jsx(App, {}), {
+                uiState: mockUIState,
+            });
             expect(lastFrame()).toMatchSnapshot();
         });
         it('renders screen reader layout correctly', () => {
             useIsScreenReaderEnabled.mockReturnValue(true);
-            const { lastFrame } = renderWithProviders(_jsx(App, {}), mockUIState);
+            const { lastFrame } = renderWithProviders(_jsx(App, {}), {
+                uiState: mockUIState,
+            });
             expect(lastFrame()).toMatchSnapshot();
         });
         it('renders with dialogs visible', () => {
@@ -152,7 +208,9 @@ describe('App', () => {
                 ...mockUIState,
                 dialogsVisible: true,
             };
-            const { lastFrame } = renderWithProviders(_jsx(App, {}), dialogUIState);
+            const { lastFrame } = renderWithProviders(_jsx(App, {}), {
+                uiState: dialogUIState,
+            });
             expect(lastFrame()).toMatchSnapshot();
         });
     });

package/dist/src/ui/App.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"App.test.js","sourceRoot":"","sources":["../../../src/ui/App.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAa,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,wBAAwB,EAAE,MAAM,KAAK,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAgB,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAiB,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAqB,MAAM,uBAAuB,CAAC;AAE1E,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACtC,MAAM,QAAQ,GAAG,MAAM,cAAc,EAAwB,CAAC;IAC9D,OAAO;QACL,GAAG,QAAQ;QACX,wBAAwB,EAAE,EAAE,CAAC,EAAE,EAAE;KAClC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5C,WAAW,EAAE,GAAG,EAAE,CAAC,KAAC,IAAI,8BAAmB;CAC5C,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9C,aAAa,EAAE,GAAG,EAAE,CAAC,KAAC,IAAI,gCAAqB;CAChD,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,0BAA0B,EAAE,GAAG,EAAE,CAAC,CAAC;IACzC,QAAQ,EAAE,GAAG,EAAE,CAAC,KAAC,IAAI,2BAAgB;CACtC,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9C,aAAa,EAAE,GAAG,EAAE,CAAC,KAAC,IAAI,gCAAqB;CAChD,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,iCAAiC,EAAE,GAAG,EAAE,CAAC,CAAC;IAChD,eAAe,EAAE,GAAG,EAAE,CAAC,KAAC,IAAI,8BAAmB;CAChD,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,oCAAoC,EAAE,GAAG,EAAE,CAAC,CAAC;IACnD,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAC,IAAI,qCAA0B;CAC1D,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,MAAM,EAAE,GAAG,EAAE,CAAC,KAAC,IAAI,yBAAc;CAClC,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE;IACnB,MAAM,WAAW,GAAqB;QACpC,cAAc,EAAE,cAAc,CAAC,IAAI;QACnC,gBAAgB,EAAE,IAAI;QACtB,cAAc,EAAE,KAAK;QACrB,eAAe,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;QAClC,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;QAC5B,cAAc,EAAE;YACd,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;YAChB,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE;YACnB,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE;YACnB,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;SACrB;QACD,OAAO,EAAE,EAAE;QACX,mBAAmB,EAAE,EAAE;QACvB,UAAU,EAAE;YACV,WAAW,EAAE,kBAAkB;YAC/B,WAAW,EAAE,EAAE;SAChB;KACF,CAAC;IAEF,MAAM,UAAU,GAAG,cAAc,EAAE,CAAC;IAEpC,MAAM,gBAAgB,GAAiB;QACrC,QAAQ,EAAE,EAAE;QACZ,gBAAgB,EAAE,EAAE;QACpB,IAAI,EAAE,YAAY;KACnB,CAAC;IAEF,MAAM,kBAAkB,GAAG,IAAI,cAAc,CAC3C,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,IAAI,EACJ,EAAE,CACH,CAAC;IAEF,MAAM,YAAY,GAAa;QAC7B,OAAO,EAAE,OAAO;QAChB,eAAe,EAAE,EAAE;KACpB,CAAC;IAEF,MAAM,mBAAmB,GAAG,CAAC,EAAsB,EAAE,KAAc,EAAE,EAAE,CACrE,MAAM,CACJ,KAAC,UAAU,CAAC,QAAQ,IAAC,KAAK,EAAE,YAAY,YACtC,KAAC,aAAa,CAAC,QAAQ,IAAC,KAAK,EAAE,UAAU,YACvC,KAAC,eAAe,CAAC,QAAQ,IAAC,KAAK,EAAE,kBAAkB,YACjD,KAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,YAClC,EAAE,GACqB,GACD,GACJ,GACL,CACvB,CAAC;IAEJ,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC,KAAC,GAAG,KAAG,EAAE,WAAsB,CAAC,CAAC;QAE3E,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAC7C,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAC/C,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,eAAe,GAAG;YACtB,GAAG,WAAW;YACd,gBAAgB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;SAC/C,CAAC;QAEb,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC,KAAC,GAAG,KAAG,EAAE,eAAe,CAAC,CAAC;QAEpE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kFAAkF,EAAE,GAAG,EAAE;QAC1F,MAAM,eAAe,GAAG;YACtB,GAAG,WAAW;YACd,gBAAgB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;YACzD,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;YACxD,mBAAmB,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;SACnD,CAAC;QAEb,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAEvD,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC,KAAC,GAAG,KAAG,EAAE,eAAe,CAAC,CAAC;QAEpE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QACpD,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAE7C,iBAAiB;QACjB,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,kBAAkB,GAAG,KAAK,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,MAAM,aAAa,GAAG;YACpB,GAAG,WAAW;YACd,cAAc,EAAE,IAAI;SACV,CAAC;QAEb,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC,KAAC,GAAG,KAAG,EAAE,aAAa,CAAC,CAAC;QAElE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAC7C,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAC/C,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC;QACN,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,kBAAkB,EAAE;QAC1C,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,kBAAkB,EAAE;KAC3C,CAAC,CACA,kFAAkF,EAClF,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE;QACpB,MAAM,OAAO,GAAG;YACd,GAAG,WAAW;YACd,cAAc,EAAE,IAAI;YACpB,CAAC,QAAQ,CAAC,EAAE,IAAI;SACN,CAAC;QAEb,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC,KAAC,GAAG,KAAG,EAAE,OAAO,CAAC,CAAC;QAE5D,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,cAAc,GAAG,iBAAiB,CAAC,CAAC;IACpE,CAAC,CACF,CAAC;IAEF,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC1E,wBAAiC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC,KAAC,GAAG,KAAG,EAAE,WAAsB,CAAC,CAAC;QAE3E,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAC3B,8CAA8C,CAC/C,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QACzE,wBAAiC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAE1D,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC,KAAC,GAAG,KAAG,EAAE,WAAsB,CAAC,CAAC;QAE3E,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,sCAAsC,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;YACzC,wBAAiC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAC1D,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,GAAG,KAAG,EACP,WAAsB,CACvB,CAAC;YACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;YAC/C,wBAAiC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YACzD,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,GAAG,KAAG,EACP,WAAsB,CACvB,CAAC;YACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACtC,MAAM,aAAa,GAAG;gBACpB,GAAG,WAAW;gBACd,cAAc,EAAE,IAAI;aACV,CAAC;YACb,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC,KAAC,GAAG,KAAG,EAAE,aAAa,CAAC,CAAC;YAClE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"App.test.js","sourceRoot":"","sources":["../../../src/ui/App.test.tsx"],"names":[],"mappings":"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"}

package/dist/src/ui/AppContainer.js

@@ -13,6 +13,7 @@ import { UIActionsContext, } from './contexts/UIActionsContext.js';
 import { ConfigContext } from './contexts/ConfigContext.js';
 import { ToolCallStatus, AuthState, } from './types.js';
 import { MessageType, StreamingState } from './types.js';
+import { ToolActionsProvider } from './contexts/ToolActionsContext.js';
 import { IdeClient, ideContextStore, getErrorMessage, getAllGeminiMdFilenames, AuthType, clearCachedCredentialFile, recordExitFail, ShellExecutionService, saveApiKey, debugLogger, coreEvents, CoreEvent, refreshServerHierarchicalMemory, writeToStdout, disableMouseEvents, enterAlternateScreen, enableMouseEvents, disableLineWrapping, shouldEnterAlternateScreen, startupProfiler, SessionStartSource, SessionEndReason, generateSummary, } from '@google/gemini-cli-core';
 import { validateAuthMethod } from '../config/auth.js';
 import process from 'node:process';
@@ -45,6 +46,7 @@ import { useFocus } from './hooks/useFocus.js';
 import { useKeypress } from './hooks/useKeypress.js';
 import { keyMatchers, Command } from './keyMatchers.js';
 import { useLoadingIndicator } from './hooks/useLoadingIndicator.js';
+import { useShellInactivityStatus } from './hooks/useShellInactivityStatus.js';
 import { useFolderTrust } from './hooks/useFolderTrust.js';
 import { useIdeTrustListener } from './hooks/useIdeTrustListener.js';
 import {} from './IdeIntegrationNudge.js';
@@ -54,8 +56,8 @@ import { setUpdateHandler } from '../utils/handleAutoUpdate.js';
 import { registerCleanup, runExitCleanup } from '../utils/cleanup.js';
 import { RELAUNCH_EXIT_CODE } from '../utils/processUtils.js';
 import { useMessageQueue } from './hooks/useMessageQueue.js';
-import { useAutoAcceptIndicator } from './hooks/useAutoAcceptIndicator.js';
 import { useMcpStatus } from './hooks/useMcpStatus.js';
+import { useApprovalModeIndicator } from './hooks/useApprovalModeIndicator.js';
 import { useSessionStats } from './contexts/SessionContext.js';
 import { useGitBranchName } from './hooks/useGitBranchName.js';
 import { useConfirmUpdateRequests, useExtensionUpdates, } from './hooks/useExtensionUpdates.js';
@@ -72,9 +74,8 @@ import { terminalCapabilityManager } from './utils/terminalCapabilityManager.js'
 import { useInputHistoryStore } from './hooks/useInputHistoryStore.js';
 import { useBanner } from './hooks/useBanner.js';
 import { useHookDisplayState } from './hooks/useHookDisplayState.js';
-import { WARNING_PROMPT_DURATION_MS, QUEUE_ERROR_DISPLAY_DURATION_MS, SHELL_ACTION_REQUIRED_TITLE_DELAY_MS, } from './constants.js';
+import { WARNING_PROMPT_DURATION_MS, QUEUE_ERROR_DISPLAY_DURATION_MS, } from './constants.js';
 import { LoginWithGoogleRestartDialog } from './auth/LoginWithGoogleRestartDialog.js';
-import { useInactivityTimer } from './hooks/useInactivityTimer.js';
 import { isSlashCommand } from './utils/commandUtils.js';
 function isToolExecuting(pendingHistoryItems) {
     return pendingHistoryItems.some((item) => {
@@ -84,6 +85,11 @@ function isToolExecuting(pendingHistoryItems) {
         return false;
     });
 }
+function isToolAwaitingConfirmation(pendingHistoryItems) {
+    return pendingHistoryItems
+        .filter((item) => item.type === 'tool_group')
+        .some((item) => item.tools.some((tool) => ToolCallStatus.Confirming === tool.status));
+}
 /**
  * The fraction of the terminal width to allocate to the shell.
  * This provides horizontal padding.
@@ -146,6 +152,22 @@ export const AppContainer = (props) => {
         setPermissionsDialogOpen(false);
         setPermissionsDialogProps(null);
     }, []);
+    const [isAgentConfigDialogOpen, setIsAgentConfigDialogOpen] = useState(false);
+    const [selectedAgentName, setSelectedAgentName] = useState();
+    const [selectedAgentDisplayName, setSelectedAgentDisplayName] = useState();
+    const [selectedAgentDefinition, setSelectedAgentDefinition] = useState();
+    const openAgentConfigDialog = useCallback((name, displayName, definition) => {
+        setSelectedAgentName(name);
+        setSelectedAgentDisplayName(displayName);
+        setSelectedAgentDefinition(definition);
+        setIsAgentConfigDialogOpen(true);
+    }, []);
+    const closeAgentConfigDialog = useCallback(() => {
+        setIsAgentConfigDialogOpen(false);
+        setSelectedAgentName(undefined);
+        setSelectedAgentDisplayName(undefined);
+        setSelectedAgentDefinition(undefined);
+    }, []);
     const toggleDebugProfiler = useCallback(() => setShowDebugProfiler((prev) => !prev), []);
     const [currentModel, setCurrentModel] = useState(config.getModel());
     const [userTier, setUserTier] = useState(undefined);
@@ -192,7 +214,9 @@ export const AppContainer = (props) => {
                 if (additionalContext && geminiClient) {
                     await geminiClient.addHistory({
                         role: 'user',
-                        parts: [{ text: additionalContext }],
+                        parts: [
+                            { text: `<hook_context>${additionalContext}</hook_context>` },
+                        ],
                     });
                 }
             }
@@ -438,6 +462,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         openSettingsDialog,
         openSessionBrowser,
         openModelDialog,
+        openAgentConfigDialog,
         openPermissionsDialog,
         quit: (messages) => {
             setQuittingMessages(messages);
@@ -451,6 +476,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         toggleDebugProfiler,
         dispatchExtensionStateUpdate,
         addConfirmUpdateExtensionRequest,
+        setText: (text) => buffer.setText(text),
     }), [
         setAuthState,
         openThemeDialog,
@@ -458,6 +484,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         openSettingsDialog,
         openSessionBrowser,
         openModelDialog,
+        openAgentConfigDialog,
         setQuittingMessages,
         setDebugMessage,
         setShowPrivacyNotice,
@@ -466,6 +493,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         openPermissionsDialog,
         addConfirmUpdateExtensionRequest,
         toggleDebugProfiler,
+        buffer,
     ]);
     const { handleSlashCommand, slashCommands, pendingHistoryItems: pendingSlashCommandHistoryItems, commandContext, confirmationRequest, } = useSlashCommandProcessor(config, settings, historyManager.addItem, historyManager.clearItems, historyManager.loadHistory, refreshStatic, toggleVimEnabled, setIsProcessing, slashCommandActions, extensionsUpdateStateInternal, isConfigInitialized, setBannerVisible, setCustomDialog);
     const performMemoryRefresh = useCallback(async () => {
@@ -516,17 +544,23 @@ Logging in with Google... Restarting Gemini CLI to continue.
             }
         }
     }, [pendingRestorePrompt, inputHistory, historyManager.history]);
-    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, handleApprovalModeChange, activePtyId, loopDetectionConfirmationRequest, lastOutputTime, retryStatus, } = useGeminiStream(config.getGeminiClient(), historyManager.history, historyManager.addItem, config, settings, setDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onCancelSubmit, setEmbeddedShellFocused, terminalWidth, terminalHeight, embeddedShellFocused);
+    const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, pendingToolCalls, handleApprovalModeChange, activePtyId, loopDetectionConfirmationRequest, lastOutputTime, retryStatus, } = useGeminiStream(config.getGeminiClient(), historyManager.history, historyManager.addItem, config, settings, setDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onCancelSubmit, setEmbeddedShellFocused, terminalWidth, terminalHeight, embeddedShellFocused);
     const lastOutputTimeRef = useRef(0);
     useEffect(() => {
         lastOutputTimeRef.current = lastOutputTime;
     }, [lastOutputTime]);
-    const isShellAwaitingFocus = !!activePtyId &&
-        !embeddedShellFocused &&
-        config.isInteractiveShellEnabled();
-    const showShellActionRequired = useInactivityTimer(isShellAwaitingFocus, lastOutputTime, SHELL_ACTION_REQUIRED_TITLE_DELAY_MS);
+    const { shouldShowFocusHint, inactivityStatus } = useShellInactivityStatus({
+        activePtyId,
+        lastOutputTime,
+        streamingState,
+        pendingToolCalls,
+        embeddedShellFocused,
+        isInteractiveShellEnabled: config.isInteractiveShellEnabled(),
+    });
+    const shouldShowActionRequiredTitle = inactivityStatus === 'action_required';
+    const shouldShowSilentWorkingTitle = inactivityStatus === 'silent_working';
     // Auto-accept indicator
-    const showAutoAcceptIndicator = useAutoAcceptIndicator({
+    const showApprovalModeIndicator = useApprovalModeIndicator({
         config,
         addItem: historyManager.addItem,
         onApprovalModeChange: handleApprovalModeChange,
@@ -544,8 +578,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
             ...pendingSlashCommandHistoryItems,
             ...pendingGeminiHistoryItems,
         ];
+        if (isToolAwaitingConfirmation(pendingHistoryItems)) {
+            return; // Don't clear - user may be composing a follow-up message
+        }
         if (isToolExecuting(pendingHistoryItems)) {
-            buffer.setText(''); // Just clear the prompt
+            buffer.setText(''); // Clear for Ctrl+C cancellation
             return;
         }
         const lastUserMessage = inputHistory.at(-1);
@@ -602,7 +639,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
      * - Tool confirmations (WaitingForConfirmation state)
      * - Any future streaming states not explicitly allowed
      */
-    const isInputActive = !initError &&
+    const isInputActive = isConfigInitialized &&
+        !initError &&
         !isProcessing &&
         !!slashCommands &&
         (streamingState === StreamingState.Idle ||
@@ -836,7 +874,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
         }
         setIdePromptAnswered(true);
     }, [handleSlashCommand, settings]);
-    const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator(streamingState, settings.merged.ui.customWittyPhrases, !!activePtyId && !embeddedShellFocused, lastOutputTime, retryStatus);
+    const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator({
+        streamingState,
+        shouldShowFocusHint,
+        retryStatus,
+    });
     const handleGlobalKeypress = useCallback((key) => {
         if (copyModeEnabled) {
             setCopyModeEnabled(false);
@@ -953,7 +995,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
         const paddedTitle = computeTerminalTitle({
             streamingState,
             thoughtSubject: thought?.subject,
-            isConfirming: !!confirmationRequest || showShellActionRequired,
+            isConfirming: !!confirmationRequest || shouldShowActionRequiredTitle,
+            isSilentWorking: shouldShowSilentWorkingTitle,
             folderName: basename(config.getTargetDir()),
             showThoughts: !!settings.merged.ui.showStatusInTitle,
             useDynamicTitle: settings.merged.ui.dynamicWindowTitle,
@@ -968,7 +1011,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
         streamingState,
         thought,
         confirmationRequest,
-        showShellActionRequired,
+        shouldShowActionRequiredTitle,
+        shouldShowSilentWorkingTitle,
         settings.merged.ui.showStatusInTitle,
         settings.merged.ui.dynamicWindowTitle,
         settings.merged.ui.hideWindowTitle,
@@ -1029,6 +1073,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         isThemeDialogOpen ||
         isSettingsDialogOpen ||
         isModelDialogOpen ||
+        isAgentConfigDialogOpen ||
         isPermissionsDialogOpen ||
         isAuthenticating ||
         isAuthDialogOpen ||
@@ -1041,6 +1086,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
         isAuthDialogOpen ||
         authState === AuthState.AwaitingApiKeyInput;
     const pendingHistoryItems = useMemo(() => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems], [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems]);
+    const allToolCalls = useMemo(() => pendingHistoryItems
+        .filter((item) => item.type === 'tool_group')
+        .flatMap((item) => item.tools), [pendingHistoryItems]);
     const [geminiMdFileCount, setGeminiMdFileCount] = useState(config.getGeminiMdFileCount());
     useEffect(() => {
         const handleMemoryChanged = (result) => {
@@ -1095,6 +1143,10 @@ Logging in with Google... Restarting Gemini CLI to continue.
         isSettingsDialogOpen,
         isSessionBrowserOpen,
         isModelDialogOpen,
+        isAgentConfigDialogOpen,
+        selectedAgentName,
+        selectedAgentDisplayName,
+        selectedAgentDefinition,
         isPermissionsDialogOpen,
         permissionsDialogProps,
         slashCommands,
@@ -1133,7 +1185,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         activeHooks,
         messageQueue,
         queueErrorMessage,
-        showAutoAcceptIndicator,
+        showApprovalModeIndicator,
         currentModel,
         userTier,
         proQuotaRequest,
@@ -1186,6 +1238,10 @@ Logging in with Google... Restarting Gemini CLI to continue.
         isSettingsDialogOpen,
         isSessionBrowserOpen,
         isModelDialogOpen,
+        isAgentConfigDialogOpen,
+        selectedAgentName,
+        selectedAgentDisplayName,
+        selectedAgentDefinition,
         isPermissionsDialogOpen,
         permissionsDialogProps,
         slashCommands,
@@ -1224,7 +1280,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         activeHooks,
         messageQueue,
         queueErrorMessage,
-        showAutoAcceptIndicator,
+        showApprovalModeIndicator,
         userTier,
         proQuotaRequest,
         validationRequest,
@@ -1278,6 +1334,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
         exitPrivacyNotice,
         closeSettingsDialog,
         closeModelDialog,
+        openAgentConfigDialog,
+        closeAgentConfigDialog,
         openPermissionsDialog,
         closePermissionsDialog,
         setShellModeActive,
@@ -1318,6 +1376,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
         exitPrivacyNotice,
         closeSettingsDialog,
         closeModelDialog,
+        openAgentConfigDialog,
+        closeAgentConfigDialog,
         openPermissionsDialog,
         closePermissionsDialog,
         setShellModeActive,
@@ -1352,6 +1412,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
     return (_jsx(UIStateContext.Provider, { value: uiState, children: _jsx(UIActionsContext.Provider, { value: uiActions, children: _jsx(ConfigContext.Provider, { value: config, children: _jsx(AppContext.Provider, { value: {
                         version: props.version,
                         startupWarnings: props.startupWarnings || [],
-                    }, children: _jsx(ShellFocusContext.Provider, { value: isFocused, children: _jsx(App, {}) }) }) }) }) }));
+                    }, children: _jsx(ToolActionsProvider, { config: config, toolCalls: allToolCalls, children: _jsx(ShellFocusContext.Provider, { value: isFocused, children: _jsx(App, {}) }) }) }) }) }) }));
 };
 //# sourceMappingURL=AppContainer.js.map