diff options
| author | N. Taylor Mullen <[email protected]> | 2025-07-28 11:13:46 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-07-28 18:13:46 +0000 |
| commit | 9aef0a8e6c133d3bf1ff43f80119664c154ffdf2 (patch) | |
| tree | 6dbc4a1011d50188dc1fc2b9b4d133f8795ec8b6 /packages/cli/src | |
| parent | a5ea113a8e485f42cc1136b6c57e337cbf369c57 (diff) | |
Revert "feat: Add /config refresh command" (#5060)
Diffstat (limited to 'packages/cli/src')
| -rw-r--r-- | packages/cli/src/services/BuiltinCommandLoader.ts | 2 | ||||
| -rw-r--r-- | packages/cli/src/ui/App.tsx | 39 | ||||
| -rw-r--r-- | packages/cli/src/ui/commands/configCommand.ts | 33 | ||||
| -rw-r--r-- | packages/cli/src/ui/commands/types.ts | 1 | ||||
| -rw-r--r-- | packages/cli/src/ui/hooks/slashCommandProcessor.ts | 3 |
5 files changed, 7 insertions, 71 deletions
diff --git a/packages/cli/src/services/BuiltinCommandLoader.ts b/packages/cli/src/services/BuiltinCommandLoader.ts index b0c85d2a..7ba0d6bb 100644 --- a/packages/cli/src/services/BuiltinCommandLoader.ts +++ b/packages/cli/src/services/BuiltinCommandLoader.ts @@ -29,7 +29,6 @@ import { statsCommand } from '../ui/commands/statsCommand.js'; import { themeCommand } from '../ui/commands/themeCommand.js'; import { toolsCommand } from '../ui/commands/toolsCommand.js'; import { vimCommand } from '../ui/commands/vimCommand.js'; -import { configCommand } from '../ui/commands/configCommand.js'; /** * Loads the core, hard-coded slash commands that are an integral part @@ -55,7 +54,6 @@ export class BuiltinCommandLoader implements ICommandLoader { compressCommand, copyCommand, corgiCommand, - configCommand, docsCommand, editorCommand, extensionsCommand, diff --git a/packages/cli/src/ui/App.tsx b/packages/cli/src/ui/App.tsx index 43060fdb..aacf45d7 100644 --- a/packages/cli/src/ui/App.tsx +++ b/packages/cli/src/ui/App.tsx @@ -39,12 +39,8 @@ import { EditorSettingsDialog } from './components/EditorSettingsDialog.js'; import { ShellConfirmationDialog } from './components/ShellConfirmationDialog.js'; import { Colors } from './colors.js'; import { Help } from './components/Help.js'; -import { - loadHierarchicalGeminiMemory, - loadCliConfig, - parseArguments, -} from '../config/config.js'; -import { LoadedSettings, loadSettings } from '../config/settings.js'; +import { loadHierarchicalGeminiMemory } from '../config/config.js'; +import { LoadedSettings } from '../config/settings.js'; import { Tips } from './components/Tips.js'; import { ConsolePatcher } from './utils/ConsolePatcher.js'; import { registerCleanup } from '../utils/cleanup.js'; @@ -66,7 +62,6 @@ import { AuthType, type IdeContext, ideContext, - sessionId, } from '@google/gemini-cli-core'; import { validateAuthMethod } from '../config/auth.js'; import { useLogger } from './hooks/useLogger.js'; @@ -94,7 +89,6 @@ import { OverflowProvider } from './contexts/OverflowContext.js'; import { ShowMoreLines } from './components/ShowMoreLines.js'; import { PrivacyNotice } from './privacy/PrivacyNotice.js'; import { appEvents, AppEvent } from '../utils/events.js'; -import { loadExtensions } from '../config/extension.js'; const CTRL_EXIT_PROMPT_DURATION_MS = 1000; @@ -113,14 +107,12 @@ export const AppWrapper = (props: AppProps) => ( </SessionStatsProvider> ); -const App = (props: AppProps) => { - const [config, setConfig] = useState<Config>(props.config); - const [settings, setSettings] = useState<LoadedSettings>(props.settings); +const App = ({ config, settings, startupWarnings = [], version }: AppProps) => { const isFocused = useFocus(); useBracketedPaste(); const [updateMessage, setUpdateMessage] = useState<string | null>(null); const { stdout } = useStdout(); - const nightly = props.version.includes('nightly'); + const nightly = version.includes('nightly'); useEffect(() => { checkForUpdates().then(setUpdateMessage); @@ -315,22 +307,6 @@ const App = (props: AppProps) => { } }, [config, addItem, settings.merged]); - const refreshConfig = useCallback(async () => { - const newSettings = loadSettings(process.cwd()); - const newExtensions = loadExtensions(process.cwd()); - const argv = await parseArguments(); - const newConfig = await loadCliConfig( - newSettings.merged, - newExtensions, - sessionId, - argv, - ); - await newConfig.initialize(); - setConfig(newConfig); - setSettings(newSettings); - setGeminiMdFileCount(newConfig.getGeminiMdFileCount()); - }, []); - // Watch for model changes (e.g., from Flash fallback) useEffect(() => { const checkModelChange = () => { @@ -498,7 +474,6 @@ const App = (props: AppProps) => { openPrivacyNotice, toggleVimEnabled, setIsProcessing, - refreshConfig, ); const { @@ -802,7 +777,7 @@ const App = (props: AppProps) => { {!settings.merged.hideBanner && ( <Header terminalWidth={terminalWidth} - version={props.version} + version={version} nightly={nightly} /> )} @@ -846,7 +821,7 @@ const App = (props: AppProps) => { {showHelp && <Help commands={slashCommands} />} <Box flexDirection="column" ref={mainControlsRef}> - {props.startupWarnings && props.startupWarnings.length > 0 && ( + {startupWarnings.length > 0 && ( <Box borderStyle="round" borderColor={Colors.AccentYellow} @@ -854,7 +829,7 @@ const App = (props: AppProps) => { marginY={1} flexDirection="column" > - {props.startupWarnings.map((warning, index) => ( + {startupWarnings.map((warning, index) => ( <Text key={index} color={Colors.AccentYellow}> {warning} </Text> diff --git a/packages/cli/src/ui/commands/configCommand.ts b/packages/cli/src/ui/commands/configCommand.ts deleted file mode 100644 index 3651b221..00000000 --- a/packages/cli/src/ui/commands/configCommand.ts +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @license - * Copyright 2025 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -import { - CommandKind, - SlashCommand, - SlashCommandActionReturn, -} from './types.js'; - -export const configCommand: SlashCommand = { - name: 'config', - description: 'Commands for interacting with the CLI configuration.', - kind: CommandKind.BUILT_IN, - subCommands: [ - { - name: 'refresh', - description: 'Reload settings and extensions from the filesystem.', - kind: CommandKind.BUILT_IN, - action: async (context): Promise<SlashCommandActionReturn> => { - await context.ui.refreshConfig(); - return { - type: 'message', - messageType: 'info', - content: - 'Configuration, extensions, memory, and tools have been refreshed.', - }; - }, - }, - ], -}; diff --git a/packages/cli/src/ui/commands/types.ts b/packages/cli/src/ui/commands/types.ts index 6665da4b..2844177f 100644 --- a/packages/cli/src/ui/commands/types.ts +++ b/packages/cli/src/ui/commands/types.ts @@ -59,7 +59,6 @@ export interface CommandContext { /** Toggles a special display mode. */ toggleCorgiMode: () => void; toggleVimEnabled: () => Promise<boolean>; - refreshConfig: () => Promise<void>; }; // Session-specific data session: { diff --git a/packages/cli/src/ui/hooks/slashCommandProcessor.ts b/packages/cli/src/ui/hooks/slashCommandProcessor.ts index 67e49c21..be32de11 100644 --- a/packages/cli/src/ui/hooks/slashCommandProcessor.ts +++ b/packages/cli/src/ui/hooks/slashCommandProcessor.ts @@ -50,7 +50,6 @@ export const useSlashCommandProcessor = ( openPrivacyNotice: () => void, toggleVimEnabled: () => Promise<boolean>, setIsProcessing: (isProcessing: boolean) => void, - refreshConfig: () => Promise<void>, ) => { const session = useSessionStats(); const [commands, setCommands] = useState<readonly SlashCommand[]>([]); @@ -159,7 +158,6 @@ export const useSlashCommandProcessor = ( setPendingItem: setPendingCompressionItem, toggleCorgiMode, toggleVimEnabled, - refreshConfig, }, session: { stats: session.stats, @@ -182,7 +180,6 @@ export const useSlashCommandProcessor = ( toggleCorgiMode, toggleVimEnabled, sessionShellAllowlist, - refreshConfig, ], ); |
