@google/gemini-cli 0.1.18 → 0.1.19

package/dist/src/ui/components/SettingsDialog.js

@@ -0,0 +1,247 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import React, { useState, useEffect } from 'react';
+import { Box, Text, useInput } from 'ink';
+import { Colors } from '../colors.js';
+import { SettingScope, } from '../../config/settings.js';
+import { getScopeItems, getScopeMessageForSetting, } from '../../utils/dialogScopeUtils.js';
+import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
+import { getDialogSettingKeys, getSettingValue, setPendingSettingValue, getDisplayValue, hasRestartRequiredSettings, saveModifiedSettings, getSettingDefinition, isDefaultValue, requiresRestart, getRestartRequiredFromModified, getDefaultValue, } from '../../utils/settingsUtils.js';
+import { useVimMode } from '../contexts/VimModeContext.js';
+const maxItemsToShow = 8;
+export function SettingsDialog({ settings, onSelect, onRestartRequest, }) {
+    // Get vim mode context to sync vim mode changes
+    const { vimEnabled, toggleVimEnabled } = useVimMode();
+    // Focus state: 'settings' or 'scope'
+    const [focusSection, setFocusSection] = useState('settings');
+    // Scope selector state (User by default)
+    const [selectedScope, setSelectedScope] = useState(SettingScope.User);
+    // Active indices
+    const [activeSettingIndex, setActiveSettingIndex] = useState(0);
+    // Scroll offset for settings
+    const [scrollOffset, setScrollOffset] = useState(0);
+    const [showRestartPrompt, setShowRestartPrompt] = useState(false);
+    // Local pending settings state for the selected scope
+    const [pendingSettings, setPendingSettings] = useState(() => 
+    // Deep clone to avoid mutation
+    structuredClone(settings.forScope(selectedScope).settings));
+    // Track which settings have been modified by the user
+    const [modifiedSettings, setModifiedSettings] = useState(new Set());
+    // Track the intended values for modified settings
+    const [modifiedValues, setModifiedValues] = useState(new Map());
+    // Track restart-required settings across scope changes
+    const [restartRequiredSettings, setRestartRequiredSettings] = useState(new Set());
+    useEffect(() => {
+        setPendingSettings(structuredClone(settings.forScope(selectedScope).settings));
+        // Don't reset modifiedSettings when scope changes - preserve user's pending changes
+        if (restartRequiredSettings.size === 0) {
+            setShowRestartPrompt(false);
+        }
+    }, [selectedScope, settings, restartRequiredSettings]);
+    // Preserve pending changes when scope changes
+    useEffect(() => {
+        if (modifiedSettings.size > 0) {
+            setPendingSettings((prevPending) => {
+                let updatedPending = { ...prevPending };
+                // Reapply all modified settings to the new pending settings using stored values
+                modifiedSettings.forEach((key) => {
+                    const storedValue = modifiedValues.get(key);
+                    if (storedValue !== undefined) {
+                        updatedPending = setPendingSettingValue(key, storedValue, updatedPending);
+                    }
+                });
+                return updatedPending;
+            });
+        }
+    }, [selectedScope, modifiedSettings, modifiedValues, settings]);
+    const generateSettingsItems = () => {
+        const settingKeys = getDialogSettingKeys();
+        return settingKeys.map((key) => {
+            const currentValue = getSettingValue(key, pendingSettings, {});
+            const definition = getSettingDefinition(key);
+            return {
+                label: definition?.label || key,
+                value: key,
+                checked: currentValue,
+                toggle: () => {
+                    const newValue = !currentValue;
+                    setPendingSettings((prev) => setPendingSettingValue(key, newValue, prev));
+                    if (!requiresRestart(key)) {
+                        const immediateSettings = new Set([key]);
+                        const immediateSettingsObject = setPendingSettingValue(key, newValue, {});
+                        console.log(`[DEBUG SettingsDialog] Saving ${key} immediately with value:`, newValue);
+                        saveModifiedSettings(immediateSettings, immediateSettingsObject, settings, selectedScope);
+                        // Special handling for vim mode to sync with VimModeContext
+                        if (key === 'vimMode' && newValue !== vimEnabled) {
+                            // Call toggleVimEnabled to sync the VimModeContext local state
+                            toggleVimEnabled().catch((error) => {
+                                console.error('Failed to toggle vim mode:', error);
+                            });
+                        }
+                        // Capture the current modified settings before updating state
+                        const currentModifiedSettings = new Set(modifiedSettings);
+                        // Remove the saved setting from modifiedSettings since it's now saved
+                        setModifiedSettings((prev) => {
+                            const updated = new Set(prev);
+                            updated.delete(key);
+                            return updated;
+                        });
+                        // Remove from modifiedValues as well
+                        setModifiedValues((prev) => {
+                            const updated = new Map(prev);
+                            updated.delete(key);
+                            return updated;
+                        });
+                        // Also remove from restart-required settings if it was there
+                        setRestartRequiredSettings((prev) => {
+                            const updated = new Set(prev);
+                            updated.delete(key);
+                            return updated;
+                        });
+                        setPendingSettings((_prevPending) => {
+                            let updatedPending = structuredClone(settings.forScope(selectedScope).settings);
+                            currentModifiedSettings.forEach((modifiedKey) => {
+                                if (modifiedKey !== key) {
+                                    const modifiedValue = modifiedValues.get(modifiedKey);
+                                    if (modifiedValue !== undefined) {
+                                        updatedPending = setPendingSettingValue(modifiedKey, modifiedValue, updatedPending);
+                                    }
+                                }
+                            });
+                            return updatedPending;
+                        });
+                    }
+                    else {
+                        // For restart-required settings, store the actual value
+                        setModifiedValues((prev) => {
+                            const updated = new Map(prev);
+                            updated.set(key, newValue);
+                            return updated;
+                        });
+                        setModifiedSettings((prev) => {
+                            const updated = new Set(prev).add(key);
+                            const needsRestart = hasRestartRequiredSettings(updated);
+                            console.log(`[DEBUG SettingsDialog] Modified settings:`, Array.from(updated), 'Needs restart:', needsRestart);
+                            if (needsRestart) {
+                                setShowRestartPrompt(true);
+                                setRestartRequiredSettings((prevRestart) => new Set(prevRestart).add(key));
+                            }
+                            return updated;
+                        });
+                    }
+                },
+            };
+        });
+    };
+    const items = generateSettingsItems();
+    // Scope selector items
+    const scopeItems = getScopeItems();
+    const handleScopeHighlight = (scope) => {
+        setSelectedScope(scope);
+    };
+    const handleScopeSelect = (scope) => {
+        handleScopeHighlight(scope);
+        setFocusSection('settings');
+    };
+    // Scroll logic for settings
+    const visibleItems = items.slice(scrollOffset, scrollOffset + maxItemsToShow);
+    // Always show arrows for consistent UI and to indicate circular navigation
+    const showScrollUp = true;
+    const showScrollDown = true;
+    useInput((input, key) => {
+        if (key.tab) {
+            setFocusSection((prev) => (prev === 'settings' ? 'scope' : 'settings'));
+        }
+        if (focusSection === 'settings') {
+            if (key.upArrow || input === 'k') {
+                const newIndex = activeSettingIndex > 0 ? activeSettingIndex - 1 : items.length - 1;
+                setActiveSettingIndex(newIndex);
+                // Adjust scroll offset for wrap-around
+                if (newIndex === items.length - 1) {
+                    setScrollOffset(Math.max(0, items.length - maxItemsToShow));
+                }
+                else if (newIndex < scrollOffset) {
+                    setScrollOffset(newIndex);
+                }
+            }
+            else if (key.downArrow || input === 'j') {
+                const newIndex = activeSettingIndex < items.length - 1 ? activeSettingIndex + 1 : 0;
+                setActiveSettingIndex(newIndex);
+                // Adjust scroll offset for wrap-around
+                if (newIndex === 0) {
+                    setScrollOffset(0);
+                }
+                else if (newIndex >= scrollOffset + maxItemsToShow) {
+                    setScrollOffset(newIndex - maxItemsToShow + 1);
+                }
+            }
+            else if (key.return || input === ' ') {
+                items[activeSettingIndex]?.toggle();
+            }
+            else if ((key.ctrl && input === 'c') || (key.ctrl && input === 'l')) {
+                // Ctrl+C or Ctrl+L: Clear current setting and reset to default
+                const currentSetting = items[activeSettingIndex];
+                if (currentSetting) {
+                    const defaultValue = getDefaultValue(currentSetting.value);
+                    // Ensure defaultValue is a boolean for setPendingSettingValue
+                    const booleanDefaultValue = typeof defaultValue === 'boolean' ? defaultValue : false;
+                    // Update pending settings to default value
+                    setPendingSettings((prev) => setPendingSettingValue(currentSetting.value, booleanDefaultValue, prev));
+                    // Remove from modified settings since it's now at default
+                    setModifiedSettings((prev) => {
+                        const updated = new Set(prev);
+                        updated.delete(currentSetting.value);
+                        return updated;
+                    });
+                    // Remove from restart-required settings if it was there
+                    setRestartRequiredSettings((prev) => {
+                        const updated = new Set(prev);
+                        updated.delete(currentSetting.value);
+                        return updated;
+                    });
+                    // If this setting doesn't require restart, save it immediately
+                    if (!requiresRestart(currentSetting.value)) {
+                        const immediateSettings = new Set([currentSetting.value]);
+                        const immediateSettingsObject = setPendingSettingValue(currentSetting.value, booleanDefaultValue, {});
+                        saveModifiedSettings(immediateSettings, immediateSettingsObject, settings, selectedScope);
+                    }
+                }
+            }
+        }
+        if (showRestartPrompt && input === 'r') {
+            // Only save settings that require restart (non-restart settings were already saved immediately)
+            const restartRequiredSettings = getRestartRequiredFromModified(modifiedSettings);
+            const restartRequiredSet = new Set(restartRequiredSettings);
+            if (restartRequiredSet.size > 0) {
+                saveModifiedSettings(restartRequiredSet, pendingSettings, settings, selectedScope);
+            }
+            setShowRestartPrompt(false);
+            setRestartRequiredSettings(new Set()); // Clear restart-required settings
+            if (onRestartRequest)
+                onRestartRequest();
+        }
+        if (key.escape) {
+            onSelect(undefined, selectedScope);
+        }
+    });
+    return (_jsx(Box, { borderStyle: "round", borderColor: Colors.Gray, flexDirection: "row", padding: 1, width: "100%", height: "100%", children: _jsxs(Box, { flexDirection: "column", flexGrow: 1, children: [_jsx(Text, { bold: true, color: Colors.AccentBlue, children: "Settings" }), _jsx(Box, { height: 1 }), showScrollUp && _jsx(Text, { color: Colors.Gray, children: "\u25B2" }), visibleItems.map((item, idx) => {
+                    const isActive = focusSection === 'settings' &&
+                        activeSettingIndex === idx + scrollOffset;
+                    const scopeSettings = settings.forScope(selectedScope).settings;
+                    const mergedSettings = settings.merged;
+                    const displayValue = getDisplayValue(item.value, scopeSettings, mergedSettings, modifiedSettings, pendingSettings);
+                    const shouldBeGreyedOut = isDefaultValue(item.value, scopeSettings);
+                    // Generate scope message for this setting
+                    const scopeMessage = getScopeMessageForSetting(item.value, selectedScope, settings);
+                    return (_jsxs(React.Fragment, { children: [_jsxs(Box, { flexDirection: "row", alignItems: "center", children: [_jsx(Box, { minWidth: 2, flexShrink: 0, children: _jsx(Text, { color: isActive ? Colors.AccentGreen : Colors.Gray, children: isActive ? '●' : '' }) }), _jsx(Box, { minWidth: 50, children: _jsxs(Text, { color: isActive ? Colors.AccentGreen : Colors.Foreground, children: [item.label, scopeMessage && (_jsxs(Text, { color: Colors.Gray, children: [" ", scopeMessage] }))] }) }), _jsx(Box, { minWidth: 3 }), _jsx(Text, { color: isActive
+                                            ? Colors.AccentGreen
+                                            : shouldBeGreyedOut
+                                                ? Colors.Gray
+                                                : Colors.Foreground, children: displayValue })] }), _jsx(Box, { height: 1 })] }, item.value));
+                }), showScrollDown && _jsx(Text, { color: Colors.Gray, children: "\u25BC" }), _jsx(Box, { height: 1 }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { bold: focusSection === 'scope', wrap: "truncate", children: [focusSection === 'scope' ? '> ' : '  ', "Apply To"] }), _jsx(RadioButtonSelect, { items: scopeItems, initialIndex: 0, onSelect: handleScopeSelect, onHighlight: handleScopeHighlight, isFocused: focusSection === 'scope', showNumbers: focusSection === 'scope' })] }), _jsx(Box, { height: 1 }), _jsx(Text, { color: Colors.Gray, children: "(Use Enter to select, Tab to change focus)" }), showRestartPrompt && (_jsx(Text, { color: Colors.AccentYellow, children: "To see changes, Gemini CLI must be restarted. Press r to exit and apply changes now." }))] }) }));
+}
+//# sourceMappingURL=SettingsDialog.js.map

package/dist/src/ui/components/SettingsDialog.js.map

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

package/dist/src/ui/components/SuggestionsDisplay.js

@@ -26,7 +26,7 @@ export function SuggestionsDisplay({ suggestions, activeIndex, isLoading, width,
                 const labelElement = (_jsx(PrepareLabel, { label: suggestion.label, matchedIndex: suggestion.matchedIndex, userInput: userInput, textColor: textColor }));
                 return (_jsx(Box, { width: width, children: _jsxs(Box, { flexDirection: "row", children: [userInput.startsWith('/') ? (
                             // only use box model for (/) command mode
-                            _jsx(Box, { width: 20, flexShrink: 0, children: labelElement })) : (labelElement), suggestion.description ? (_jsx(Box, { flexGrow: 1, children: _jsx(Text, { color: textColor, wrap: "wrap", children: suggestion.description }) })) : null] }) }, `${suggestion.value}-${originalIndex}`));
+                            _jsx(Box, { width: 20, flexShrink: 0, children: labelElement })) : (labelElement), suggestion.description ? (_jsx(Box, { flexGrow: 1, children: _jsx(Text, { color: textColor, wrap: "truncate", children: suggestion.description }) })) : null] }) }, `${suggestion.value}-${originalIndex}`));
             }), endIndex < suggestions.length && _jsx(Text, { color: "gray", children: "\u25BC" }), suggestions.length > MAX_SUGGESTIONS_TO_SHOW && (_jsxs(Text, { color: "gray", children: ["(", activeIndex + 1, "/", suggestions.length, ")"] }))] }));
 }
 //# sourceMappingURL=SuggestionsDisplay.js.map

package/dist/src/ui/components/SuggestionsDisplay.js.map

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

package/dist/src/ui/components/ThemeDialog.js

@@ -12,6 +12,7 @@ import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
 import { DiffRenderer } from './messages/DiffRenderer.js';
 import { colorizeCode } from '../utils/CodeColorizer.js';
 import { SettingScope } from '../../config/settings.js';
+import { getScopeItems, getScopeMessageForSetting, } from '../../utils/dialogScopeUtils.js';
 export function ThemeDialog({ onSelect, onHighlight, settings, availableTerminalHeight, terminalWidth, }) {
     const [selectedScope, setSelectedScope] = useState(SettingScope.User);
     // Track the currently highlighted theme name
@@ -46,11 +47,7 @@ export function ThemeDialog({ onSelect, onHighlight, settings, availableTerminal
     const initialThemeIndex = themeItems.findIndex((item) => item.value === selectedThemeName);
     // If not found, fall back to the first theme
     const safeInitialThemeIndex = initialThemeIndex >= 0 ? initialThemeIndex : 0;
-    const scopeItems = [
-        { label: 'User Settings', value: SettingScope.User },
-        { label: 'Workspace Settings', value: SettingScope.Workspace },
-        { label: 'System Settings', value: SettingScope.System },
-    ];
+    const scopeItems = getScopeItems();
     const handleThemeSelect = useCallback((themeName) => {
         onSelect(themeName, selectedScope);
     }, [onSelect, selectedScope]);
@@ -75,16 +72,8 @@ export function ThemeDialog({ onSelect, onHighlight, settings, availableTerminal
             onSelect(undefined, selectedScope);
         }
     });
-    const otherScopes = Object.values(SettingScope).filter((scope) => scope !== selectedScope);
-    const modifiedInOtherScopes = otherScopes.filter((scope) => settings.forScope(scope).settings.theme !== undefined);
-    let otherScopeModifiedMessage = '';
-    if (modifiedInOtherScopes.length > 0) {
-        const modifiedScopesStr = modifiedInOtherScopes.join(', ');
-        otherScopeModifiedMessage =
-            settings.forScope(selectedScope).settings.theme !== undefined
-                ? `(Also modified in ${modifiedScopesStr})`
-                : `(Modified in ${modifiedScopesStr})`;
-    }
+    // Generate scope message for theme setting
+    const otherScopeModifiedMessage = getScopeMessageForSetting('theme', selectedScope, settings);
     // Constants for calculating preview pane layout.
     // These values are based on the JSX structure below.
     const PREVIEW_PANE_WIDTH_PERCENTAGE = 0.55;

package/dist/src/ui/components/ThemeDialog.js.map

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

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

@@ -5,17 +5,27 @@ import { Colors } from '../../colors.js';
 import { ToolConfirmationOutcome, } from '@google/gemini-cli-core';
 import { RadioButtonSelect, } from '../shared/RadioButtonSelect.js';
 import { MaxSizedBox } from '../shared/MaxSizedBox.js';
-export const ToolConfirmationMessage = ({ confirmationDetails, isFocused = true, availableTerminalHeight, terminalWidth, }) => {
+export const ToolConfirmationMessage = ({ confirmationDetails, config, isFocused = true, availableTerminalHeight, terminalWidth, }) => {
     const { onConfirm } = confirmationDetails;
     const childWidth = terminalWidth - 2; // 2 for padding
-    useInput((_, key) => {
+    const handleConfirm = async (outcome) => {
+        if (confirmationDetails.type === 'edit') {
+            const ideClient = config?.getIdeClient();
+            if (config?.getIdeMode() && config?.getIdeModeFeature()) {
+                const cliOutcome = outcome === ToolConfirmationOutcome.Cancel ? 'rejected' : 'accepted';
+                await ideClient?.resolveDiffFromCli(confirmationDetails.filePath, cliOutcome);
+            }
+        }
+        onConfirm(outcome);
+    };
+    useInput((input, key) => {
         if (!isFocused)
             return;
-        if (key.escape) {
-            onConfirm(ToolConfirmationOutcome.Cancel);
+        if (key.escape || (key.ctrl && (input === 'c' || input === 'C'))) {
+            handleConfirm(ToolConfirmationOutcome.Cancel);
         }
     });
-    const handleSelect = (item) => onConfirm(item);
+    const handleSelect = (item) => handleConfirm(item);
     let bodyContent = null; // Removed contextDisplay here
     let question;
     const options = new Array();
@@ -54,13 +64,23 @@ export const ToolConfirmationMessage = ({ confirmationDetails, isFocused = true,
         }, {
             label: 'Yes, allow always',
             value: ToolConfirmationOutcome.ProceedAlways,
-        }, {
-            label: 'Modify with external editor',
-            value: ToolConfirmationOutcome.ModifyWithEditor,
-        }, {
-            label: 'No, suggest changes (esc)',
-            value: ToolConfirmationOutcome.Cancel,
         });
+        if (config?.getIdeMode() && config?.getIdeModeFeature()) {
+            options.push({
+                label: 'No (esc)',
+                value: ToolConfirmationOutcome.Cancel,
+            });
+        }
+        else {
+            options.push({
+                label: 'Modify with external editor',
+                value: ToolConfirmationOutcome.ModifyWithEditor,
+            });
+            options.push({
+                label: 'No, suggest changes (esc)',
+                value: ToolConfirmationOutcome.Cancel,
+            });
+        }
         bodyContent = (_jsx(DiffRenderer, { diffContent: confirmationDetails.fileDiff, filename: confirmationDetails.fileName, availableTerminalHeight: availableBodyContentHeight(), terminalWidth: childWidth }));
     }
     else if (confirmationDetails.type === 'exec') {

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/shared/text-buffer.d.ts

@@ -4,10 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 export type Direction = 'left' | 'right' | 'up' | 'down' | 'wordLeft' | 'wordRight' | 'home' | 'end';
-export declare const findNextWordStart: (text: string, currentOffset: number) => number;
-export declare const findPrevWordStart: (text: string, currentOffset: number) => number;
-export declare const findWordEnd: (text: string, currentOffset: number) => number;
-export declare const getOffsetFromPosition: (row: number, col: number, lines: string[]) => number;
+export declare const isWordCharStrict: (char: string) => boolean;
+export declare const isWhitespace: (char: string) => boolean;
+export declare const isCombiningMark: (char: string) => boolean;
+export declare const isWordCharWithCombining: (char: string) => boolean;
+export declare const getCharScript: (char: string) => string;
+export declare const isDifferentScript: (char1: string, char2: string) => boolean;
+export declare const findNextWordStartInLine: (line: string, col: number) => number | null;
+export declare const findPrevWordStartInLine: (line: string, col: number) => number | null;
+export declare const findWordEndInLine: (line: string, col: number) => number | null;
+export declare const findNextWordAcrossLines: (lines: string[], cursorRow: number, cursorCol: number, searchForWordStart: boolean) => {
+    row: number;
+    col: number;
+} | null;
+export declare const findPrevWordAcrossLines: (lines: string[], cursorRow: number, cursorCol: number) => {
+    row: number;
+    col: number;
+} | null;
 export declare const getPositionFromOffsets: (startOffset: number, endOffset: number, lines: string[]) => {
     startRow: number;
     startCol: number;