fix(cli): allow switching approval mode by clicking the indicator

This PR implements click-to-change-mode functionality for the `ApprovalModeIndicator` component, as requested in issue #27035.

Changes:
- Refactored `useApprovalModeIndicator` hook to return an object with `cycleApprovalMode` and `toggleYolo` functions.
- Added `cycleApprovalMode` to `UIActions` context to allow components to trigger mode changes.
- Updated `AppContainer.tsx` to expose `cycleApprovalMode` via `uiActions`.
- Updated `ApprovalModeIndicator.tsx` to use `useMouseClick` and call `cycleApprovalMode` on click.
- Added a "click or " hint to the indicator text when mouse mode is enabled.
- Updated unit tests for `useApprovalModeIndicator` and `ApprovalModeIndicator`.

CC: @google-gemini-maintainers
This commit is contained in:
gemini-cli[bot]
2026-05-15 04:11:28 +00:00
parent b213fd68ec
commit e99c836eb6
7 changed files with 190 additions and 110 deletions
@@ -4,27 +4,40 @@
* SPDX-License-Identifier: Apache-2.0
*/
import type React from 'react';
import type { FC } from 'react';
import { useRef } from 'react';
import { Box, Text } from 'ink';
import { theme } from '../semantic-colors.js';
import { ApprovalMode } from '@google/gemini-cli-core';
import { formatCommand } from '../key/keybindingUtils.js';
import { Command } from '../key/keyBindings.js';
import { useMouseClick } from '../hooks/useMouseClick.js';
import { useUIActions } from '../contexts/UIActionsContext.js';
import { useUIState } from '../contexts/UIStateContext.js';
interface ApprovalModeIndicatorProps {
approvalMode: ApprovalMode;
allowPlanMode?: boolean;
}
export const ApprovalModeIndicator: React.FC<ApprovalModeIndicatorProps> = ({
export const ApprovalModeIndicator: FC<ApprovalModeIndicatorProps> = ({
approvalMode,
allowPlanMode,
}) => {
const { mouseMode } = useUIState();
const { cycleApprovalMode } = useUIActions();
const boxRef = useRef(null);
useMouseClick(boxRef, () => {
cycleApprovalMode();
});
let textColor = '';
let textContent = '';
let subText = '';
const cycleHint = formatCommand(Command.CYCLE_APPROVAL_MODE);
const clickHint = mouseMode ? 'click or ' : '';
const yoloHint = formatCommand(Command.TOGGLE_YOLO);
switch (approvalMode) {
@@ -32,13 +45,13 @@ export const ApprovalModeIndicator: React.FC<ApprovalModeIndicatorProps> = ({
textColor = theme.status.warning;
textContent = 'auto-accept edits';
subText = allowPlanMode
? `${cycleHint} to plan`
: `${cycleHint} to manual`;
? `${clickHint}${cycleHint} to plan`
: `${clickHint}${cycleHint} to manual`;
break;
case ApprovalMode.PLAN:
textColor = theme.status.success;
textContent = 'plan';
subText = `${cycleHint} to manual`;
subText = `${clickHint}${cycleHint} to manual`;
break;
case ApprovalMode.YOLO:
textColor = theme.status.error;
@@ -49,12 +62,12 @@ export const ApprovalModeIndicator: React.FC<ApprovalModeIndicatorProps> = ({
default:
textColor = theme.text.accent;
textContent = '';
subText = `${cycleHint} to accept edits`;
subText = `${clickHint}${cycleHint} to accept edits`;
break;
}
return (
<Box>
<Box ref={boxRef}>
<Text color={textColor}>
{textContent ? textContent : null}
{subText ? (