feat(plan): Extend Shift+Tab Mode Cycling to include Plan Mode (#17177)

2026-04-11 05:41:08 -07:00 · 2026-01-21 10:19:47 -05:00
parent b703c87a64
commit 0605e6e3e9
13 changed files with 163 additions and 100 deletions
--- a/packages/cli/src/ui/hooks/useApprovalModeIndicator.ts
+++ b/packages/cli/src/ui/hooks/useApprovalModeIndicator.ts
@@ -0,0 +1,104 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { useState, useEffect } from 'react';
+import { ApprovalMode, type Config } from '@google/gemini-cli-core';
+import { useKeypress } from './useKeypress.js';
+import { keyMatchers, Command } from '../keyMatchers.js';
+import type { HistoryItemWithoutId } from '../types.js';
+import { MessageType } from '../types.js';
+
+export interface UseApprovalModeIndicatorArgs {
+  config: Config;
+  addItem?: (item: HistoryItemWithoutId, timestamp: number) => void;
+  onApprovalModeChange?: (mode: ApprovalMode) => void;
+  isActive?: boolean;
+}
+
+export function useApprovalModeIndicator({
+  config,
+  addItem,
+  onApprovalModeChange,
+  isActive = true,
+}: UseApprovalModeIndicatorArgs): ApprovalMode {
+  const currentConfigValue = config.getApprovalMode();
+  const [showApprovalMode, setApprovalMode] = useState(currentConfigValue);
+
+  useEffect(() => {
+    setApprovalMode(currentConfigValue);
+  }, [currentConfigValue]);
+
+  useKeypress(
+    (key) => {
+      let nextApprovalMode: ApprovalMode | undefined;
+
+      if (keyMatchers[Command.TOGGLE_YOLO](key)) {
+        if (
+          config.isYoloModeDisabled() &&
+          config.getApprovalMode() !== ApprovalMode.YOLO
+        ) {
+          if (addItem) {
+            addItem(
+              {
+                type: MessageType.WARNING,
+                text: 'You cannot enter YOLO mode since it is disabled in your settings.',
+              },
+              Date.now(),
+            );
+          }
+          return;
+        }
+        nextApprovalMode =
+          config.getApprovalMode() === ApprovalMode.YOLO
+            ? ApprovalMode.DEFAULT
+            : ApprovalMode.YOLO;
+      } else if (keyMatchers[Command.CYCLE_APPROVAL_MODE](key)) {
+        const currentMode = config.getApprovalMode();
+        switch (currentMode) {
+          case ApprovalMode.DEFAULT:
+            nextApprovalMode = config.isPlanEnabled()
+              ? ApprovalMode.PLAN
+              : ApprovalMode.AUTO_EDIT;
+            break;
+          case ApprovalMode.PLAN:
+            nextApprovalMode = ApprovalMode.AUTO_EDIT;
+            break;
+          case ApprovalMode.AUTO_EDIT:
+            nextApprovalMode = ApprovalMode.DEFAULT;
+            break;
+          case ApprovalMode.YOLO:
+            nextApprovalMode = ApprovalMode.AUTO_EDIT;
+            break;
+          default:
+        }
+      }
+
+      if (nextApprovalMode) {
+        try {
+          config.setApprovalMode(nextApprovalMode);
+          // Update local state immediately for responsiveness
+          setApprovalMode(nextApprovalMode);
+
+          // Notify the central handler about the approval mode change
+          onApprovalModeChange?.(nextApprovalMode);
+        } catch (e) {
+          if (addItem) {
+            addItem(
+              {
+                type: MessageType.INFO,
+                text: (e as Error).message,
+              },
+              Date.now(),
+            );
+          }
+        }
+      }
+    },
+    { isActive },
+  );
+
+  return showApprovalMode;
+}