@google/gemini-cli 0.5.0-nightly.20250908.4693137b → 0.5.0-preview

package/dist/src/generated/git-commit.d.ts

@@ -3,5 +3,5 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-export declare const GIT_COMMIT_INFO = "4693137b";
-export declare const CLI_VERSION = "0.5.0-nightly.20250908.4693137b";
+export declare const GIT_COMMIT_INFO = "a31830a3";
+export declare const CLI_VERSION = "0.5.0-preview";

package/dist/src/generated/git-commit.js

@@ -5,6 +5,6 @@
  */
 // This file is auto-generated by the build script (scripts/generate-git-commit-info.js)
 // Do not edit this file manually.
-export const GIT_COMMIT_INFO = '4693137b';
-export const CLI_VERSION = '0.5.0-nightly.20250908.4693137b';
+export const GIT_COMMIT_INFO = 'a31830a3';
+export const CLI_VERSION = '0.5.0-preview';
 //# sourceMappingURL=git-commit.js.map

package/dist/src/generated/git-commit.js.map

@@ -1 +1 @@
-{"version":3,"file":"git-commit.js","sourceRoot":"","sources":["../../../src/generated/git-commit.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,wFAAwF;AACxF,kCAAkC;AAClC,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,CAAC;AAC1C,MAAM,CAAC,MAAM,WAAW,GAAG,iCAAiC,CAAC"}
+{"version":3,"file":"git-commit.js","sourceRoot":"","sources":["../../../src/generated/git-commit.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,wFAAwF;AACxF,kCAAkC;AAClC,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,CAAC;AAC1C,MAAM,CAAC,MAAM,WAAW,GAAG,eAAe,CAAC"}

package/dist/src/nonInteractiveCli.js

@@ -3,90 +3,92 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { executeToolCall, shutdownTelemetry, isTelemetrySdkInitialized, GeminiEventType, parseAndFormatApiError, FatalInputError, FatalTurnLimitedError, } from '@google/gemini-cli-core';
+import { executeToolCall, shutdownTelemetry, isTelemetrySdkInitialized, GeminiEventType, parseAndFormatApiError, FatalInputError, FatalTurnLimitedError, promptIdContext, } from '@google/gemini-cli-core';
 import { ConsolePatcher } from './ui/utils/ConsolePatcher.js';
 import { handleAtCommand } from './ui/hooks/atCommandProcessor.js';
 export async function runNonInteractive(config, input, prompt_id) {
-    const consolePatcher = new ConsolePatcher({
-        stderr: true,
-        debugMode: config.getDebugMode(),
-    });
-    try {
-        consolePatcher.patch();
-        // Handle EPIPE errors when the output is piped to a command that closes early.
-        process.stdout.on('error', (err) => {
-            if (err.code === 'EPIPE') {
-                // Exit gracefully if the pipe is closed.
-                process.exit(0);
-            }
-        });
-        const geminiClient = config.getGeminiClient();
-        const abortController = new AbortController();
-        const { processedQuery, shouldProceed } = await handleAtCommand({
-            query: input,
-            config,
-            addItem: (_item, _timestamp) => 0,
-            onDebugMessage: () => { },
-            messageId: Date.now(),
-            signal: abortController.signal,
+    return promptIdContext.run(prompt_id, async () => {
+        const consolePatcher = new ConsolePatcher({
+            stderr: true,
+            debugMode: config.getDebugMode(),
         });
-        if (!shouldProceed || !processedQuery) {
-            // An error occurred during @include processing (e.g., file not found).
-            // The error message is already logged by handleAtCommand.
-            throw new FatalInputError('Exiting due to an error processing the @ command.');
-        }
-        let currentMessages = [
-            { role: 'user', parts: processedQuery },
-        ];
-        let turnCount = 0;
-        while (true) {
-            turnCount++;
-            if (config.getMaxSessionTurns() >= 0 &&
-                turnCount > config.getMaxSessionTurns()) {
-                throw new FatalTurnLimitedError('Reached max session turns for this session. Increase the number of turns by specifying maxSessionTurns in settings.json.');
-            }
-            const toolCallRequests = [];
-            const responseStream = geminiClient.sendMessageStream(currentMessages[0]?.parts || [], abortController.signal, prompt_id);
-            for await (const event of responseStream) {
-                if (abortController.signal.aborted) {
-                    console.error('Operation cancelled.');
-                    return;
-                }
-                if (event.type === GeminiEventType.Content) {
-                    process.stdout.write(event.value);
-                }
-                else if (event.type === GeminiEventType.ToolCallRequest) {
-                    toolCallRequests.push(event.value);
+        try {
+            consolePatcher.patch();
+            // Handle EPIPE errors when the output is piped to a command that closes early.
+            process.stdout.on('error', (err) => {
+                if (err.code === 'EPIPE') {
+                    // Exit gracefully if the pipe is closed.
+                    process.exit(0);
                 }
+            });
+            const geminiClient = config.getGeminiClient();
+            const abortController = new AbortController();
+            const { processedQuery, shouldProceed } = await handleAtCommand({
+                query: input,
+                config,
+                addItem: (_item, _timestamp) => 0,
+                onDebugMessage: () => { },
+                messageId: Date.now(),
+                signal: abortController.signal,
+            });
+            if (!shouldProceed || !processedQuery) {
+                // An error occurred during @include processing (e.g., file not found).
+                // The error message is already logged by handleAtCommand.
+                throw new FatalInputError('Exiting due to an error processing the @ command.');
             }
-            if (toolCallRequests.length > 0) {
-                const toolResponseParts = [];
-                for (const requestInfo of toolCallRequests) {
-                    const toolResponse = await executeToolCall(config, requestInfo, abortController.signal);
-                    if (toolResponse.error) {
-                        console.error(`Error executing tool ${requestInfo.name}: ${toolResponse.resultDisplay || toolResponse.error.message}`);
+            let currentMessages = [
+                { role: 'user', parts: processedQuery },
+            ];
+            let turnCount = 0;
+            while (true) {
+                turnCount++;
+                if (config.getMaxSessionTurns() >= 0 &&
+                    turnCount > config.getMaxSessionTurns()) {
+                    throw new FatalTurnLimitedError('Reached max session turns for this session. Increase the number of turns by specifying maxSessionTurns in settings.json.');
+                }
+                const toolCallRequests = [];
+                const responseStream = geminiClient.sendMessageStream(currentMessages[0]?.parts || [], abortController.signal, prompt_id);
+                for await (const event of responseStream) {
+                    if (abortController.signal.aborted) {
+                        console.error('Operation cancelled.');
+                        return;
                     }
-                    if (toolResponse.responseParts) {
-                        toolResponseParts.push(...toolResponse.responseParts);
+                    if (event.type === GeminiEventType.Content) {
+                        process.stdout.write(event.value);
+                    }
+                    else if (event.type === GeminiEventType.ToolCallRequest) {
+                        toolCallRequests.push(event.value);
                     }
                 }
-                currentMessages = [{ role: 'user', parts: toolResponseParts }];
-            }
-            else {
-                process.stdout.write('\n'); // Ensure a final newline
-                return;
+                if (toolCallRequests.length > 0) {
+                    const toolResponseParts = [];
+                    for (const requestInfo of toolCallRequests) {
+                        const toolResponse = await executeToolCall(config, requestInfo, abortController.signal);
+                        if (toolResponse.error) {
+                            console.error(`Error executing tool ${requestInfo.name}: ${toolResponse.resultDisplay || toolResponse.error.message}`);
+                        }
+                        if (toolResponse.responseParts) {
+                            toolResponseParts.push(...toolResponse.responseParts);
+                        }
+                    }
+                    currentMessages = [{ role: 'user', parts: toolResponseParts }];
+                }
+                else {
+                    process.stdout.write('\n'); // Ensure a final newline
+                    return;
+                }
             }
         }
-    }
-    catch (error) {
-        console.error(parseAndFormatApiError(error, config.getContentGeneratorConfig()?.authType));
-        throw error;
-    }
-    finally {
-        consolePatcher.cleanup();
-        if (isTelemetrySdkInitialized()) {
-            await shutdownTelemetry(config);
+        catch (error) {
+            console.error(parseAndFormatApiError(error, config.getContentGeneratorConfig()?.authType));
+            throw error;
+        }
+        finally {
+            consolePatcher.cleanup();
+            if (isTelemetrySdkInitialized()) {
+                await shutdownTelemetry(config);
+            }
         }
-    }
+    });
 }
 //# sourceMappingURL=nonInteractiveCli.js.map

package/dist/src/nonInteractiveCli.js.map

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

package/dist/src/ui/AppContainer.js

@@ -13,13 +13,14 @@ import { UIActionsContext, } from './contexts/UIActionsContext.js';
 import { ConfigContext } from './contexts/ConfigContext.js';
 import { ToolCallStatus, AuthState, } from './types.js';
 import { MessageType, StreamingState } from './types.js';
-import { IdeClient, ideContext, getErrorMessage, getAllGeminiMdFilenames, UserTierId, AuthType, isProQuotaExceededError, isGenericQuotaExceededError, logFlashFallback, FlashFallbackEvent, clearCachedCredentialFile, } from '@google/gemini-cli-core';
+import { DEFAULT_GEMINI_FLASH_MODEL, IdeClient, ideContext, getErrorMessage, getAllGeminiMdFilenames, AuthType, clearCachedCredentialFile, } from '@google/gemini-cli-core';
 import { validateAuthMethod } from '../config/auth.js';
 import { loadHierarchicalGeminiMemory } from '../config/config.js';
 import process from 'node:process';
 import { useHistory } from './hooks/useHistoryManager.js';
 import { useThemeCommand } from './hooks/useThemeCommand.js';
 import { useAuthCommand } from './auth/useAuth.js';
+import { useQuotaAndFallback } from './hooks/useQuotaAndFallback.js';
 import { useEditorSettings } from './hooks/useEditorSettings.js';
 import { useSettingsCommand } from './hooks/useSettingsCommand.js';
 import { useSlashCommandProcessor } from './hooks/slashCommandProcessor.js';
@@ -77,10 +78,16 @@ export const AppContainer = (props) => {
     const [historyRemountKey, setHistoryRemountKey] = useState(0);
     const [updateInfo, setUpdateInfo] = useState(null);
     const [isTrustedFolder, setIsTrustedFolder] = useState(config.isTrustedFolder());
-    const [currentModel, setCurrentModel] = useState(config.getModel());
+    // Helper to determine the effective model, considering the fallback state.
+    const getEffectiveModel = useCallback(() => {
+        if (config.isInFallbackMode()) {
+            return DEFAULT_GEMINI_FLASH_MODEL;
+        }
+        return config.getModel();
+    }, [config]);
+    const [currentModel, setCurrentModel] = useState(getEffectiveModel());
     const [userTier, setUserTier] = useState(undefined);
-    const [isProQuotaDialogOpen, setIsProQuotaDialogOpen] = useState(false);
-    const [proQuotaDialogResolver, setProQuotaDialogResolver] = useState(null);
+    const [isConfigInitialized, setConfigInitialized] = useState(false);
     // Auto-accept indicator
     const showAutoAcceptIndicator = useAutoAcceptIndicator({
         config,
@@ -99,28 +106,30 @@ export const AppContainer = (props) => {
     const mainControlsRef = useRef(null);
     const staticExtraHeight = 3;
     useEffect(() => {
+        (async () => {
+            // Note: the program will not work if this fails so let errors be
+            // handled by the global catch.
+            await config.initialize();
+            setConfigInitialized(true);
+        })();
         registerCleanup(async () => {
             const ideClient = await IdeClient.getInstance();
             await ideClient.disconnect();
         });
     }, [config]);
-    useEffect(() => {
-        const cleanup = setUpdateHandler(historyManager.addItem, setUpdateInfo);
-        return cleanup;
-    }, [historyManager.addItem]);
+    useEffect(() => setUpdateHandler(historyManager.addItem, setUpdateInfo), [historyManager.addItem]);
     // Watch for model changes (e.g., from Flash fallback)
     useEffect(() => {
         const checkModelChange = () => {
-            const configModel = config.getModel();
-            if (configModel !== currentModel) {
-                setCurrentModel(configModel);
+            const effectiveModel = getEffectiveModel();
+            if (effectiveModel !== currentModel) {
+                setCurrentModel(effectiveModel);
             }
         };
-        // Check immediately and then periodically
         checkModelChange();
         const interval = setInterval(checkModelChange, 1000); // Check every second
         return () => clearInterval(interval);
-    }, [config, currentModel]);
+    }, [config, currentModel, getEffectiveModel]);
     const { consoleMessages, handleNewMessage, clearConsoleMessages: clearConsoleMessagesState, } = useConsoleMessages();
     useEffect(() => {
         const consolePatcher = new ConsolePatcher({
@@ -183,6 +192,13 @@ export const AppContainer = (props) => {
     }, [setHistoryRemountKey, stdout]);
     const { isThemeDialogOpen, openThemeDialog, handleThemeSelect, handleThemeHighlight, } = useThemeCommand(settings, setThemeError, historyManager.addItem, initializationResult.themeError);
     const { authState, setAuthState, authError, onAuthError } = useAuthCommand(settings, config);
+    const { proQuotaRequest, handleProQuotaChoice } = useQuotaAndFallback({
+        config,
+        historyManager,
+        userTier,
+        setAuthState,
+        setModelSwitchedFromQuotaError,
+    });
     // Derive auth state variables for backward compatibility with UIStateContext
     const isAuthDialogOpen = authState === AuthState.Updating;
     const isAuthenticating = authState === AuthState.Unauthenticated;
@@ -303,108 +319,10 @@ Logging in with Google... Please restart Gemini CLI to continue.
             console.error('Error refreshing memory:', error);
         }
     }, [config, historyManager, settings.merged]);
-    // Set up Flash fallback handler
-    useEffect(() => {
-        const flashFallbackHandler = async (currentModel, fallbackModel, error) => {
-            // Check if we've already switched to the fallback model
-            if (config.isInFallbackMode()) {
-                // If we're already in fallback mode, don't show the dialog again
-                return false;
-            }
-            let message;
-            if (config.getContentGeneratorConfig().authType ===
-                AuthType.LOGIN_WITH_GOOGLE) {
-                // Use actual user tier if available; otherwise, default to FREE tier behavior (safe default)
-                const isPaidTier = userTier === UserTierId.LEGACY || userTier === UserTierId.STANDARD;
-                // Check if this is a Pro quota exceeded error
-                if (error && isProQuotaExceededError(error)) {
-                    if (isPaidTier) {
-                        message = `⚡ You have reached your daily ${currentModel} quota limit.
-⚡ You can choose to authenticate with a paid API key or continue with the fallback model.
-⚡ To continue accessing the ${currentModel} model today, consider using /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey`;
-                    }
-                    else {
-                        message = `⚡ You have reached your daily ${currentModel} quota limit.
-⚡ You can choose to authenticate with a paid API key or continue with the fallback model.
-⚡ To increase your limits, upgrade to a Gemini Code Assist Standard or Enterprise plan with higher limits at https://goo.gle/set-up-gemini-code-assist
-⚡ Or you can utilize a Gemini API Key. See: https://goo.gle/gemini-cli-docs-auth#gemini-api-key
-⚡ You can switch authentication methods by typing /auth`;
-                    }
-                }
-                else if (error && isGenericQuotaExceededError(error)) {
-                    if (isPaidTier) {
-                        message = `⚡ You have reached your daily quota limit.
-⚡ Automatically switching from ${currentModel} to ${fallbackModel} for the remainder of this session.
-⚡ To continue accessing the ${currentModel} model today, consider using /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey`;
-                    }
-                    else {
-                        message = `⚡ You have reached your daily quota limit.
-⚡ Automatically switching from ${currentModel} to ${fallbackModel} for the remainder of this session.
-⚡ To increase your limits, upgrade to a Gemini Code Assist Standard or Enterprise plan with higher limits at https://goo.gle/set-up-gemini-code-assist
-⚡ Or you can utilize a Gemini API Key. See: https://goo.gle/gemini-cli-docs-auth#gemini-api-key
-⚡ You can switch authentication methods by typing /auth`;
-                    }
-                }
-                else {
-                    if (isPaidTier) {
-                        // Default fallback message for other cases (like consecutive 429s)
-                        message = `⚡ Automatically switching from ${currentModel} to ${fallbackModel} for faster responses for the remainder of this session.
-⚡ Possible reasons for this are that you have received multiple consecutive capacity errors or you have reached your daily ${currentModel} quota limit
-⚡ To continue accessing the ${currentModel} model today, consider using /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey`;
-                    }
-                    else {
-                        // Default fallback message for other cases (like consecutive 429s)
-                        message = `⚡ Automatically switching from ${currentModel} to ${fallbackModel} for faster responses for the remainder of this session.
-⚡ Possible reasons for this are that you have received multiple consecutive capacity errors or you have reached your daily ${currentModel} quota limit
-⚡ To increase your limits, upgrade to a Gemini Code Assist Standard or Enterprise plan with higher limits at https://goo.gle/set-up-gemini-code-assist
-⚡ Or you can utilize a Gemini API Key. See: https://goo.gle/gemini-cli-docs-auth#gemini-api-key
-⚡ You can switch authentication methods by typing /auth`;
-                    }
-                }
-                // Add message to UI history
-                historyManager.addItem({
-                    type: MessageType.INFO,
-                    text: message,
-                }, Date.now());
-                // For Pro quota errors, show the dialog and wait for user's choice
-                if (error && isProQuotaExceededError(error)) {
-                    // Set the flag to prevent tool continuation
-                    setModelSwitchedFromQuotaError(true);
-                    // Set global quota error flag to prevent Flash model calls
-                    config.setQuotaErrorOccurred(true);
-                    // Show the ProQuotaDialog and wait for user's choice
-                    const shouldContinueWithFallback = await new Promise((resolve) => {
-                        setIsProQuotaDialogOpen(true);
-                        setProQuotaDialogResolver(() => resolve);
-                    });
-                    // If user chose to continue with fallback, we don't need to stop the current prompt
-                    if (shouldContinueWithFallback) {
-                        // Switch to fallback model for future use
-                        config.setModel(fallbackModel);
-                        config.setFallbackMode(true);
-                        logFlashFallback(config, new FlashFallbackEvent(config.getContentGeneratorConfig().authType));
-                        return true; // Continue with current prompt using fallback model
-                    }
-                    // If user chose to authenticate, stop current prompt
-                    return false;
-                }
-                // For other quota errors, automatically switch to fallback model
-                // Set the flag to prevent tool continuation
-                setModelSwitchedFromQuotaError(true);
-                // Set global quota error flag to prevent Flash model calls
-                config.setQuotaErrorOccurred(true);
-            }
-            // Switch model for future use but return false to stop current retry
-            config.setModel(fallbackModel);
-            config.setFallbackMode(true);
-            logFlashFallback(config, new FlashFallbackEvent(config.getContentGeneratorConfig().authType));
-            return false; // Don't continue with current prompt
-        };
-        config.setFlashFallbackHandler(flashFallbackHandler);
-    }, [config, historyManager, userTier]);
     const cancelHandlerRef = useRef(() => { });
     const { streamingState, submitQuery, initError, pendingHistoryItems: pendingGeminiHistoryItems, thought, cancelOngoingRequest, } = useGeminiStream(config.getGeminiClient(), historyManager.history, historyManager.addItem, config, settings, setDebugMessage, handleSlashCommand, shellModeActive, () => settings.merged.general?.preferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, refreshStatic, () => cancelHandlerRef.current());
     const { messageQueue, addMessage, clearQueue, getQueuedMessagesText } = useMessageQueue({
+        isConfigInitialized,
         streamingState,
         submitQuery,
     });
@@ -444,19 +362,6 @@ Logging in with Google... Please restart Gemini CLI to continue.
         console.clear();
         refreshStatic();
     }, [historyManager, clearConsoleMessagesState, refreshStatic]);
-    const handleProQuotaChoice = useCallback((choice) => {
-        setIsProQuotaDialogOpen(false);
-        if (proQuotaDialogResolver) {
-            if (choice === 'auth') {
-                proQuotaDialogResolver(false); // Don't continue with fallback, show auth dialog
-                setAuthState(AuthState.Updating);
-            }
-            else {
-                proQuotaDialogResolver(true); // Continue with fallback model
-            }
-            setProQuotaDialogResolver(null);
-        }
-    }, [proQuotaDialogResolver, setAuthState]);
     const { handleInput: vimHandleInput } = useVim(buffer, handleFinalSubmit);
     /**
      * Determines if the input prompt should be active and accept user input.
@@ -470,7 +375,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         !isProcessing &&
         (streamingState === StreamingState.Idle ||
             streamingState === StreamingState.Responding) &&
-        !isProQuotaDialogOpen;
+        !proQuotaRequest;
     // Compute available terminal height based on controls measurement
     const availableTerminalHeight = useMemo(() => {
         if (mainControlsRef.current) {
@@ -496,6 +401,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
     const geminiClient = config.getGeminiClient();
     useEffect(() => {
         if (initialPrompt &&
+            isConfigInitialized &&
             !initialPromptSubmitted.current &&
             !isAuthenticating &&
             !isAuthDialogOpen &&
@@ -508,6 +414,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         }
     }, [
         initialPrompt,
+        isConfigInitialized,
         handleFinalSubmit,
         isAuthenticating,
         isAuthDialogOpen,
@@ -540,7 +447,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
     const [ideContextState, setIdeContextState] = useState();
     const [showEscapePrompt, setShowEscapePrompt] = useState(false);
     const [showIdeRestartPrompt, setShowIdeRestartPrompt] = useState(false);
-    const { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } = useFolderTrust(settings, config, setIsTrustedFolder);
+    const { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } = useFolderTrust(settings, setIsTrustedFolder, refreshStatic);
     const { needsRestart: ideNeedsRestart } = useIdeTrustListener();
     const isInitialMount = useRef(true);
     useEffect(() => {
@@ -719,7 +626,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         isAuthDialogOpen ||
         isEditorDialogOpen ||
         showPrivacyNotice ||
-        isProQuotaDialogOpen, [
+        !!proQuotaRequest, [
         showWorkspaceMigrationDialog,
         shouldShowIdePrompt,
         isFolderTrustDialogOpen,
@@ -731,7 +638,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         isAuthDialogOpen,
         isEditorDialogOpen,
         showPrivacyNotice,
-        isProQuotaDialogOpen,
+        proQuotaRequest,
     ]);
     const pendingHistoryItems = useMemo(() => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems], [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems]);
     const uiState = useMemo(() => ({
@@ -739,6 +646,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         isThemeDialogOpen,
         themeError,
         isAuthenticating,
+        isConfigInitialized,
         authError,
         isAuthDialogOpen,
         editorError,
@@ -783,11 +691,9 @@ Logging in with Google... Please restart Gemini CLI to continue.
         showAutoAcceptIndicator,
         showWorkspaceMigrationDialog,
         workspaceExtensions,
-        // Use current state values instead of config.getModel()
         currentModel,
         userTier,
-        isProQuotaDialogOpen,
-        // New fields
+        proQuotaRequest,
         contextFileNames,
         errorCount,
         availableTerminalHeight,
@@ -811,6 +717,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
         isThemeDialogOpen,
         themeError,
         isAuthenticating,
+        isConfigInitialized,
         authError,
         isAuthDialogOpen,
         editorError,
@@ -855,10 +762,8 @@ Logging in with Google... Please restart Gemini CLI to continue.
         showAutoAcceptIndicator,
         showWorkspaceMigrationDialog,
         workspaceExtensions,
-        // Quota-related state dependencies
         userTier,
-        isProQuotaDialogOpen,
-        // New fields dependencies
+        proQuotaRequest,
         contextFileNames,
         errorCount,
         availableTerminalHeight,
@@ -877,7 +782,6 @@ Logging in with Google... Please restart Gemini CLI to continue.
         updateInfo,
         showIdeRestartPrompt,
         isRestarting,
-        // Quota-related dependencies
         currentModel,
     ]);
     const uiActions = useMemo(() => ({