summaryrefslogtreecommitdiff
path: root/packages/cli/src/ui/App.tsx
diff options
context:
space:
mode:
Diffstat (limited to 'packages/cli/src/ui/App.tsx')
-rw-r--r--packages/cli/src/ui/App.tsx39
1 files changed, 7 insertions, 32 deletions
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>