summaryrefslogtreecommitdiff
path: root/packages/cli/src
diff options
context:
space:
mode:
authorBrandon Keiji <[email protected]>2025-04-25 20:15:05 +0000
committerGitHub <[email protected]>2025-04-25 13:15:05 -0700
commit1a64268bb058049d94a9265c839265607606ec88 (patch)
tree2b448e4dbf4d00ca34aec659e702a1d8a1a0b3ce /packages/cli/src
parent86c3a3234f390df6a31e43b2bd43d1f449fd1160 (diff)
fix: remove extra initError (#173)
Diffstat (limited to 'packages/cli/src')
-rw-r--r--packages/cli/src/ui/App.tsx68
-rw-r--r--packages/cli/src/ui/hooks/useAppEffects.ts26
2 files changed, 32 insertions, 62 deletions
diff --git a/packages/cli/src/ui/App.tsx b/packages/cli/src/ui/App.tsx
index cd8295f7..2366a235 100644
--- a/packages/cli/src/ui/App.tsx
+++ b/packages/cli/src/ui/App.tsx
@@ -18,10 +18,7 @@ import { InputPrompt } from './components/InputPrompt.js';
import { Footer } from './components/Footer.js';
import { ThemeDialog } from './components/ThemeDialog.js';
import { ITermDetectionWarning } from './utils/itermDetection.js';
-import {
- useStartupWarnings,
- useInitializationErrorEffect,
-} from './hooks/useAppEffects.js';
+import { useStartupWarnings } from './hooks/useAppEffects.js';
import { shortenPath, type Config } from '@gemini-code/server';
import { Colors } from './colors.js';
import { Tips } from './components/Tips.js';
@@ -47,7 +44,6 @@ export const App = ({ config, cliVersion }: AppProps) => {
} = useThemeCommand();
useStartupWarnings(setStartupWarnings);
- useInitializationErrorEffect(initError, history, setHistory);
const handleFinalSubmit = useCallback(
(submittedValue: string) => {
@@ -105,6 +101,37 @@ export const App = ({ config, cliVersion }: AppProps) => {
</Box>
)}
+ {isThemeDialogOpen ? (
+ <ThemeDialog
+ onSelect={handleThemeSelect}
+ onHighlight={handleThemeHighlight}
+ />
+ ) : (
+ <>
+ <Box flexDirection="column">
+ <HistoryDisplay history={history} onSubmit={submitQuery} />
+ <LoadingIndicator
+ isLoading={streamingState === StreamingState.Responding}
+ currentLoadingPhrase={currentLoadingPhrase}
+ elapsedTime={elapsedTime}
+ />
+ </Box>
+
+ {isInputActive && (
+ <>
+ <Box>
+ <Text color={Colors.SubtleComment}>cwd: </Text>
+ <Text color={Colors.LightBlue}>
+ {shortenPath(config.getTargetDir(), /*maxLength*/ 70)}
+ </Text>
+ </Box>
+
+ <InputPrompt onSubmit={handleHistorySubmit} />
+ </>
+ )}
+ </>
+ )}
+
{initError && streamingState !== StreamingState.Responding && (
<Box
borderStyle="round"
@@ -137,37 +164,6 @@ export const App = ({ config, cliVersion }: AppProps) => {
</Box>
)}
- {isThemeDialogOpen ? (
- <ThemeDialog
- onSelect={handleThemeSelect}
- onHighlight={handleThemeHighlight}
- />
- ) : (
- <>
- <Box flexDirection="column">
- <HistoryDisplay history={history} onSubmit={submitQuery} />
- <LoadingIndicator
- isLoading={streamingState === StreamingState.Responding}
- currentLoadingPhrase={currentLoadingPhrase}
- elapsedTime={elapsedTime}
- />
- </Box>
-
- {isInputActive && (
- <>
- <Box>
- <Text color={Colors.SubtleComment}>cwd: </Text>
- <Text color={Colors.LightBlue}>
- {shortenPath(config.getTargetDir(), /*maxLength*/ 70)}
- </Text>
- </Box>
-
- <InputPrompt onSubmit={handleHistorySubmit} />
- </>
- )}
- </>
- )}
-
<Footer
config={config}
queryLength={query.length}
diff --git a/packages/cli/src/ui/hooks/useAppEffects.ts b/packages/cli/src/ui/hooks/useAppEffects.ts
index 4576ce33..da1ab203 100644
--- a/packages/cli/src/ui/hooks/useAppEffects.ts
+++ b/packages/cli/src/ui/hooks/useAppEffects.ts
@@ -8,7 +8,6 @@ import { useEffect } from 'react';
import fs from 'fs';
import path from 'path';
import os from 'os';
-import { HistoryItem } from '../types.js';
import { getErrorMessage } from '@gemini-code/server';
const warningsFilePath = path.join(os.tmpdir(), 'gemini-code-cli-warnings.txt');
@@ -41,28 +40,3 @@ export function useStartupWarnings(
}
}, [setStartupWarnings]); // Include setStartupWarnings in dependency array
}
-
-// Effect to handle initialization errors
-export function useInitializationErrorEffect(
- initError: string | null,
- history: HistoryItem[],
- setHistory: React.Dispatch<React.SetStateAction<HistoryItem[]>>,
-) {
- useEffect(() => {
- if (
- initError &&
- !history.some(
- (item) => item.type === 'error' && item.text?.includes(initError),
- )
- ) {
- setHistory((prev) => [
- ...prev,
- {
- id: Date.now(),
- type: 'error',
- text: `Initialization Error: ${initError}. Please check API key and configuration.`,
- } as HistoryItem,
- ]);
- }
- }, [initError, history, setHistory]); // Include setHistory in dependency array
-}