revert(ui): remove unrelated UI changes from PR

Author: sehoon38

packages/cli/src/ui/AppContainer.test.tsx

@@ -202,11 +202,6 @@ vi.mock('../utils/events.js');
 vi.mock('../utils/handleAutoUpdate.js');
 vi.mock('./utils/ConsolePatcher.js');
 vi.mock('../utils/cleanup.js');
-vi.mock('./utils/terminalSetup.js', () => ({
-  useTerminalSetupPrompt: vi.fn(),
-  shouldPromptForTerminalSetup: vi.fn().mockResolvedValue(false),
-  terminalSetup: vi.fn(),
-}));
 
 import { useHistory } from './hooks/useHistoryManager.js';
 import { useThemeCommand } from './hooks/useThemeCommand.js';

packages/cli/src/ui/AppContainer.tsx

@@ -137,7 +137,7 @@ import { useApprovalModeIndicator } from './hooks/useApprovalModeIndicator.js';
 import { useSessionStats } from './contexts/SessionContext.js';
 import { useGitBranchName } from './hooks/useGitBranchName.js';
 import {
-  useInteractiveConsentRequests,
+  useConfirmUpdateRequests,
   useExtensionUpdates,
 } from './hooks/useExtensionUpdates.js';
 import { ShellFocusContext } from './contexts/ShellFocusContext.js';
@@ -315,12 +315,12 @@ export const AppContainer = (props: AppContainerProps) => {
   const extensionManager = config.getExtensionLoader() as ExtensionManager;
   // We are in the interactive CLI, update how we request consent and settings.
   extensionManager.setRequestConsent((description) =>
-    requestConsentInteractive(description, addInteractiveConsentRequest),
+    requestConsentInteractive(description, addConfirmUpdateExtensionRequest),
   );
   extensionManager.setRequestSetting();
 
-  const { addInteractiveConsentRequest, interactiveConsentRequests } =
-    useInteractiveConsentRequests();
+  const { addConfirmUpdateExtensionRequest, confirmUpdateExtensionRequests } =
+    useConfirmUpdateRequests();
   const {
     extensionsUpdateState,
     extensionsUpdateStateInternal,
@@ -591,7 +591,7 @@ export const AppContainer = (props: AppContainerProps) => {
 
   // One-time prompt to suggest running /terminal-setup when it would help.
   useTerminalSetupPrompt({
-    addInteractiveConsentRequest,
+    addConfirmUpdateExtensionRequest,
     addItem: historyManager.addItem,
   });
 
@@ -913,7 +913,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       toggleCorgiMode: () => setCorgiMode((prev) => !prev),
       toggleDebugProfiler,
       dispatchExtensionStateUpdate,
-      addInteractiveConsentRequest,
+      addConfirmUpdateExtensionRequest,
       toggleBackgroundShell: () => {
         toggleBackgroundShellRef.current();
         if (!isBackgroundShellVisibleRef.current) {
@@ -942,7 +942,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       setCorgiMode,
       dispatchExtensionStateUpdate,
       openPermissionsDialog,
-      addInteractiveConsentRequest,
+      addConfirmUpdateExtensionRequest,
       toggleDebugProfiler,
       setShortcutsHelpVisible,
       stableSetText,
@@ -2003,7 +2003,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     !!authConsentRequest ||
     !!permissionConfirmationRequest ||
     !!customDialog ||
-    interactiveConsentRequests.length > 0 ||
+    confirmUpdateExtensionRequests.length > 0 ||
     !!loopDetectionConfirmationRequest ||
     isThemeDialogOpen ||
     isSettingsDialogOpen ||
@@ -2033,16 +2033,16 @@ Logging in with Google... Restarting Gemini CLI to continue.
     [pendingHistoryItems],
   );
 
-  const hasInteractiveConsentRequests =
-    interactiveConsentRequests.length > 0;
+  const hasConfirmUpdateExtensionRequests =
+    confirmUpdateExtensionRequests.length > 0;
   const hasLoopDetectionConfirmationRequest =
     !!loopDetectionConfirmationRequest;
 
   const hasPendingActionRequired =
     hasPendingToolConfirmation ||
     !!commandConfirmationRequest ||
     !!authConsentRequest ||
-    hasInteractiveConsentRequests ||
+    hasConfirmUpdateExtensionRequests ||
     hasLoopDetectionConfirmationRequest ||
     !!proQuotaRequest ||
     !!validationRequest ||
@@ -2073,7 +2073,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     commandConfirmationRequest,
     authConsentRequest,
     permissionConfirmationRequest,
-    hasInteractiveConsentRequests,
+    hasConfirmUpdateExtensionRequests,
     hasLoopDetectionConfirmationRequest,
   });
 
@@ -2201,7 +2201,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       commandContext,
       commandConfirmationRequest,
       authConsentRequest,
-      interactiveConsentRequests,
+      confirmUpdateExtensionRequests,
       loopDetectionConfirmationRequest,
       permissionConfirmationRequest,
       geminiMdFileCount,
@@ -2329,7 +2329,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       commandContext,
       commandConfirmationRequest,
       authConsentRequest,
-      interactiveConsentRequests,
+      confirmUpdateExtensionRequests,
       loopDetectionConfirmationRequest,
       permissionConfirmationRequest,
       geminiMdFileCount,

packages/cli/src/ui/commands/extensionsCommand.test.ts

@@ -760,29 +760,6 @@ describe('extensionsCommand', () => {
       expect(mockUninstallExtension).not.toHaveBeenCalled();
     });
 
-    it('should call uninstallExtension and show success message for multiple extensions', async () => {
-      const extensionNames = 'ext1 ext2';
-      await uninstallAction!(mockContext, extensionNames);
-      expect(mockUninstallExtension).toHaveBeenCalledWith('ext1', false);
-      expect(mockUninstallExtension).toHaveBeenCalledWith('ext2', false);
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith({
-        type: MessageType.INFO,
-        text: 'Uninstalling extension "ext1"...',
-      });
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith({
-        type: MessageType.INFO,
-        text: 'Extension "ext1" uninstalled successfully.',
-      });
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith({
-        type: MessageType.INFO,
-        text: 'Uninstalling extension "ext2"...',
-      });
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith({
-        type: MessageType.INFO,
-        text: 'Extension "ext2" uninstalled successfully.',
-      });
-    });
-
     it('should call uninstallExtension and show success message', async () => {
       const extensionName = 'test-extension';
       await uninstallAction!(mockContext, extensionName);

packages/cli/src/ui/commands/types.ts

@@ -82,7 +82,7 @@ export interface CommandContext {
     ) => void;
     extensionsUpdateState: Map<string, ExtensionUpdateStatus>;
     dispatchExtensionStateUpdate: (action: ExtensionUpdateAction) => void;
-    addInteractiveConsentRequest: (value: ConfirmationRequest) => void;
+    addConfirmUpdateExtensionRequest: (value: ConfirmationRequest) => void;
     /**
      * Sets a confirmation request to be displayed to the user.
      *

packages/cli/src/ui/components/Composer.tsx

@@ -79,7 +79,7 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
     hasPendingToolConfirmation ||
     Boolean(uiState.commandConfirmationRequest) ||
     Boolean(uiState.authConsentRequest) ||
-    (uiState.interactiveConsentRequests?.length ?? 0) > 0 ||
+    (uiState.confirmUpdateExtensionRequests?.length ?? 0) > 0 ||
     Boolean(uiState.loopDetectionConfirmationRequest) ||
     Boolean(uiState.quota.proQuotaRequest) ||
     Boolean(uiState.quota.validationRequest) ||

packages/cli/src/ui/components/DialogManager.test.tsx

@@ -73,7 +73,7 @@ describe('DialogManager', () => {
     terminalHeight: 24,
     staticExtraHeight: 0,
     terminalWidth: 80,
-    interactiveConsentRequests: [],
+    confirmUpdateExtensionRequests: [],
     showIdeRestartPrompt: false,
     quota: {
       userTier: undefined,
@@ -162,7 +162,7 @@ describe('DialogManager', () => {
     ],
     [
       {
-        interactiveConsentRequests: [{ prompt: 'foo', onConfirm: vi.fn() }],
+        confirmUpdateExtensionRequests: [{ prompt: 'foo', onConfirm: vi.fn() }],
       },
       'ConsentPrompt',
     ],

packages/cli/src/ui/components/DialogManager.tsx

@@ -194,8 +194,8 @@ export const DialogManager = ({
       />
     );
   }
-  if (uiState.interactiveConsentRequests.length > 0) {
-    const request = uiState.interactiveConsentRequests[0];
+  if (uiState.confirmUpdateExtensionRequests.length > 0) {
+    const request = uiState.confirmUpdateExtensionRequests[0];
     return (
       <ConsentPrompt
         prompt={request.prompt}

packages/cli/src/ui/contexts/UIStateContext.tsx

@@ -135,7 +135,7 @@ export interface UIState {
   commandContext: CommandContext;
   commandConfirmationRequest: ConfirmationRequest | null;
   authConsentRequest: ConfirmationRequest | null;
-  interactiveConsentRequests: ConfirmationRequest[];
+  confirmUpdateExtensionRequests: ConfirmationRequest[];
   loopDetectionConfirmationRequest: LoopDetectionConfirmationRequest | null;
   permissionConfirmationRequest: PermissionConfirmationRequest | null;
   geminiMdFileCount: number;

packages/cli/src/ui/hooks/slashCommandProcessor.ts

@@ -82,7 +82,7 @@ interface SlashCommandProcessorActions {
   toggleCorgiMode: () => void;
   toggleDebugProfiler: () => void;
   dispatchExtensionStateUpdate: (action: ExtensionUpdateAction) => void;
-  addInteractiveConsentRequest: (request: ConfirmationRequest) => void;
+  addConfirmUpdateExtensionRequest: (request: ConfirmationRequest) => void;
   toggleBackgroundShell: () => void;
   toggleShortcutsHelp: () => void;
   setText: (text: string) => void;
@@ -237,7 +237,8 @@ export const useSlashCommandProcessor = (
         openAgentConfigDialog: actions.openAgentConfigDialog,
         extensionsUpdateState,
         dispatchExtensionStateUpdate: actions.dispatchExtensionStateUpdate,
-        addInteractiveConsentRequest: actions.addInteractiveConsentRequest,
+        addConfirmUpdateExtensionRequest:
+          actions.addConfirmUpdateExtensionRequest,
         setConfirmationRequest,
         removeComponent: () => setCustomDialog(null),
         toggleBackgroundShell: actions.toggleBackgroundShell,

packages/cli/src/ui/hooks/useExtensionUpdates.ts

@@ -45,33 +45,35 @@ function confirmationRequestsReducer(
   }
 }
 
-export const useInteractiveConsentRequests = () => {
-  const [interactiveConsentRequests, dispatchInteractiveConsentRequests] =
-    useReducer(confirmationRequestsReducer, []);
-  const addInteractiveConsentRequest = useCallback(
+export const useConfirmUpdateRequests = () => {
+  const [
+    confirmUpdateExtensionRequests,
+    dispatchConfirmUpdateExtensionRequests,
+  ] = useReducer(confirmationRequestsReducer, []);
+  const addConfirmUpdateExtensionRequest = useCallback(
     (original: ConfirmationRequest) => {
       const wrappedRequest = {
         prompt: original.prompt,
         onConfirm: (confirmed: boolean) => {
           // Remove it from the outstanding list of requests by identity.
-          dispatchInteractiveConsentRequests({
+          dispatchConfirmUpdateExtensionRequests({
             type: 'remove',
             request: wrappedRequest,
           });
           original.onConfirm(confirmed);
         },
       };
-      dispatchInteractiveConsentRequests({
+      dispatchConfirmUpdateExtensionRequests({
         type: 'add',
         request: wrappedRequest,
       });
     },
-    [dispatchInteractiveConsentRequests],
+    [dispatchConfirmUpdateExtensionRequests],
   );
   return {
-    addInteractiveConsentRequest,
-    interactiveConsentRequests,
-    dispatchInteractiveConsentRequests,
+    addConfirmUpdateExtensionRequest,
+    confirmUpdateExtensionRequests,
+    dispatchConfirmUpdateExtensionRequests,
   };
 };