@machina.ai/cell-cli 1.41.1-rc2 → 1.45.1-rc2

package/dist/src/test-utils/settings.d.ts

@@ -8,6 +8,7 @@ export interface MockSettingsFile {
     settings: any;
     originalSettings: any;
     path: string;
+    readOnly?: boolean;
 }
 interface CreateMockSettingsOptions {
     system?: MockSettingsFile;

package/dist/src/test-utils/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../src/test-utils/settings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,uDAAuD;AAEvD,OAAO,EACL,cAAc,EACd,wBAAwB,GAEzB,MAAM,uBAAuB,CAAC;AAmB/B;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,YAAuC,EAAE,EACzB,EAAE;IAClB,MAAM,EACJ,MAAM,EACN,cAAc,EACd,IAAI,EACJ,SAAS,EACT,SAAS,EACT,MAAM,EACN,MAAM,EAAE,cAAc,EACtB,GAAG,iBAAiB,EACrB,GAAG,SAAS,CAAC;IAEd,MAAM,MAAM,GAAG,IAAI,cAAc,CAC9B,MAAc,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,EAElE,cAAsB,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,EAE1E,IAAY,IAAI;QACf,IAAI,EAAE,EAAE;QACR,QAAQ,EAAE,iBAAiB;QAC3B,gBAAgB,EAAE,iBAAiB;KACpC,EACA,SAAiB,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,EACtE,SAAS,IAAI,IAAI,EACjB,MAAM,IAAI,EAAE,CACb,CAAC;IAEF,IAAI,cAAc,EAAE,CAAC;QACnB,0DAA0D;QAC1D,MAAM,CAAC,OAAO,GAAG,wBAAwB,CAAC,cAAc,CAAC,CAAC;IAC5D,CAAC;IAED,4DAA4D;IAC5D,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC5B,IAAI,OAAO,SAAS,CAAC,GAAG,CAAC,KAAK,UAAU,EAAE,CAAC;YACxC,MAAc,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
+{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../src/test-utils/settings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,uDAAuD;AAEvD,OAAO,EACL,cAAc,EACd,wBAAwB,GAEzB,MAAM,uBAAuB,CAAC;AAoB/B;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,YAAuC,EAAE,EACzB,EAAE;IAClB,MAAM,EACJ,MAAM,EACN,cAAc,EACd,IAAI,EACJ,SAAS,EACT,SAAS,EACT,MAAM,EACN,MAAM,EAAE,cAAc,EACtB,GAAG,iBAAiB,EACrB,GAAG,SAAS,CAAC;IAEd,MAAM,MAAM,GAAG,IAAI,cAAc,CAC9B,MAAc,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,EAElE,cAAsB,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,EAE1E,IAAY,IAAI;QACf,IAAI,EAAE,EAAE;QACR,QAAQ,EAAE,iBAAiB;QAC3B,gBAAgB,EAAE,iBAAiB;KACpC,EACA,SAAiB,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,EACtE,SAAS,IAAI,IAAI,EACjB,MAAM,IAAI,EAAE,CACb,CAAC;IAEF,IAAI,cAAc,EAAE,CAAC;QACnB,0DAA0D;QAC1D,MAAM,CAAC,OAAO,GAAG,wBAAwB,CAAC,cAAc,CAAC,CAAC;IAC5D,CAAC;IAED,4DAA4D;IAC5D,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC5B,IAAI,OAAO,SAAS,CAAC,GAAG,CAAC,KAAK,UAAU,EAAE,CAAC;YACxC,MAAc,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/dist/src/ui/AppContainer.js

@@ -17,7 +17,7 @@ import { checkPermissions } from './hooks/atCommandProcessor.js';
 import { ToolActionsProvider } from './contexts/ToolActionsContext.js';
 import { MouseProvider } from './contexts/MouseContext.js';
 import { ScrollProvider } from './contexts/ScrollProvider.js';
-import { IdeClient, ideContextStore, getErrorMessage, getAllGeminiMdFilenames, AuthType, clearCachedCredentialFile, recordExitFail, ShellExecutionService, saveApiKey, debugLogger, coreEvents, CoreEvent, refreshServerHierarchicalMemory, flattenMemory, writeToStdout, disableMouseEvents, enterAlternateScreen, enableMouseEvents, disableLineWrapping, shouldEnterAlternateScreen, startupProfiler, SessionStartSource, SessionEndReason, generateSummary, ChangeAuthRequestedError, ProjectIdRequiredError, buildUserSteeringHintPrompt, logBillingEvent, ApiKeyUpdatedEvent, LegacyAgentProtocol, } from '@google/gemini-cli-core';
+import { IdeClient, ideContextStore, getErrorMessage, getAllGeminiMdFilenames, AuthType, clearCachedCredentialFile, recordExitFail, ShellExecutionService, saveApiKey, debugLogger, isValidEditorType, coreEvents, CoreEvent, flattenMemory, writeToStdout, disableMouseEvents, enterAlternateScreen, enableMouseEvents, disableLineWrapping, shouldEnterAlternateScreen, startupProfiler, SessionStartSource, SessionEndReason, generateSummary, ChangeAuthRequestedError, ProjectIdRequiredError, buildUserSteeringHintPrompt, logBillingEvent, ApiKeyUpdatedEvent, LegacyAgentProtocol, } from '@google/gemini-cli-core';
 import { validateAuthMethod } from '../config/auth.js';
 import process from 'node:process';
 import { useHistory } from './hooks/useHistoryManager.js';
@@ -84,7 +84,6 @@ import { useTerminalSetupPrompt } from './utils/terminalSetup.js';
 import { useHookDisplayState } from './hooks/useHookDisplayState.js';
 import { useBackgroundTaskManager } from './hooks/useBackgroundTaskManager.js';
 import { WARNING_PROMPT_DURATION_MS, QUEUE_ERROR_DISPLAY_DURATION_MS, EXPAND_HINT_DURATION_MS, } from './constants.js';
-import { LoginWithGoogleRestartDialog } from './auth/LoginWithGoogleRestartDialog.js';
 import { NewAgentsChoice } from './components/NewAgentsNotification.js';
 import { isSlashCommand } from './utils/commandUtils.js';
 import { parseSlashCommand } from '../utils/commands.js';
@@ -137,7 +136,6 @@ export const AppContainer = (props) => {
         }
     }, [mouseMode, setOptions]);
     const [corgiMode, setCorgiMode] = useState(false);
-    const [forceRerenderKey, setForceRerenderKey] = useState(0);
     const [debugMessage, setDebugMessage] = useState('');
     const [awaitingFeedback, setAwaitingFeedback] = useState(false);
     const [quittingMessages, setQuittingMessages] = useState(null);
@@ -303,12 +301,6 @@ export const AppContainer = (props) => {
                 .getHookSystem()
                 ?.fireSessionStartEvent(sessionStartSource);
             if (result) {
-                if (result.systemMessage) {
-                    historyManager.addItem({
-                        type: MessageType.INFO,
-                        text: result.systemMessage,
-                    }, Date.now());
-                }
                 const additionalContext = result.getAdditionalContext();
                 const geminiClient = config.getGeminiClient();
                 if (additionalContext && geminiClient) {
@@ -340,12 +332,6 @@ export const AppContainer = (props) => {
             removeCleanup(cleanupFn);
             cleanupFn().catch((e) => debugLogger.error('Error during cleanup:', e));
         };
-        // Disable the dependencies check here. historyManager gets flagged
-        // but we don't want to react to changes to it because each new history
-        // item, including the ones from the start session hook will cause a
-        // re-render and an error when we try to reload config.
-        //
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [config, resumedSessionData]);
     useEffect(() => setUpdateHandler(historyManager.addItem, setUpdateInfo), [historyManager.addItem]);
     // Subscribe to fallback mode and model changes from core
@@ -394,9 +380,10 @@ export const AppContainer = (props) => {
         return { inputWidth, suggestionsWidth };
     }, [mainAreaWidth]);
     const staticAreaMaxItemHeight = Math.max(terminalHeight * 4, 100);
-    const getPreferredEditor = useCallback(
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-    () => settings.merged.general.preferredEditor, [settings.merged.general.preferredEditor]);
+    const getPreferredEditor = useCallback(() => {
+        const val = settings.merged.general.preferredEditor;
+        return isValidEditorType(val) ? val : undefined;
+    }, [settings.merged.general.preferredEditor]);
     const buffer = useTextBuffer({
         initialText: '',
         viewport: { height: 10, width: inputWidth },
@@ -469,7 +456,7 @@ export const AppContainer = (props) => {
     const [authContext, setAuthContext] = useState({});
     useEffect(() => {
         if (authState === AuthState.Authenticated && authContext.requiresRestart) {
-            setAuthState(AuthState.AwaitingGoogleLoginRestart);
+            setAuthState(AuthState.AwaitingLoginRestart);
             setAuthContext({});
         }
     }, [authState, authContext, setAuthState]);
@@ -554,8 +541,8 @@ Logging in with Google... Restarting Cell CLI to continue.
     const handleApiKeySubmit = useCallback(async (apiKey) => {
         try {
             onAuthError(null);
-            if (!apiKey.trim() && apiKey.length > 1) {
-                onAuthError('API key cannot be empty string with length greater than 1.');
+            if (!apiKey.trim()) {
+                onAuthError('API key cannot be empty or whitespace only.');
                 return;
             }
             await saveApiKey(apiKey);
@@ -595,10 +582,21 @@ Logging in with Google... Restarting Cell CLI to continue.
             if (settings.merged.security.auth.selectedType === AuthType.USE_GEMINI) {
                 return;
             }
-            const error = validateAuthMethod(settings.merged.security.auth.selectedType);
-            if (error) {
-                onAuthError(error);
-            }
+            const authMethod = settings.merged.security.auth.selectedType;
+            void (async () => {
+                try {
+                    const error = await validateAuthMethod(authMethod);
+                    if (error &&
+                        authMethod === settings.merged.security.auth.selectedType) {
+                        onAuthError(error);
+                    }
+                }
+                catch (e) {
+                    if (authMethod === settings.merged.security.auth.selectedType) {
+                        onAuthError(getErrorMessage(e));
+                    }
+                }
+            })();
         }
     }, [
         settings.merged.security.auth.selectedType,
@@ -720,19 +718,10 @@ Logging in with Google... Restarting Cell CLI to continue.
             text: 'Refreshing hierarchical memory (GEMINI.md or other context files)...',
         }, Date.now());
         try {
-            let flattenedMemory;
-            let fileCount;
-            if (config.isJitContextEnabled()) {
-                await config.getMemoryContextManager()?.refresh();
-                config.updateSystemInstructionIfInitialized();
-                flattenedMemory = flattenMemory(config.getUserMemory());
-                fileCount = config.getGeminiMdFileCount();
-            }
-            else {
-                const result = await refreshServerHierarchicalMemory(config);
-                flattenedMemory = flattenMemory(result.memoryContent);
-                fileCount = result.fileCount;
-            }
+            await config.getMemoryContextManager()?.refresh();
+            config.updateSystemInstructionIfInitialized();
+            const flattenedMemory = flattenMemory(config.getUserMemory());
+            const fileCount = config.getGeminiMdFileCount();
             historyManager.addItem({
                 type: MessageType.INFO,
                 text: `Memory reloaded successfully. ${flattenedMemory.length > 0
@@ -753,13 +742,13 @@ Logging in with Google... Restarting Cell CLI to continue.
         }
     }, [config, historyManager]);
     const cancelHandlerRef = useRef(() => { });
-    const onCancelSubmit = useCallback((shouldRestorePrompt) => {
+    const onCancelSubmit = useCallback((shouldRestorePrompt, clearBuffer = false) => {
         if (shouldRestorePrompt) {
             setPendingRestorePrompt(true);
         }
         else {
             setPendingRestorePrompt(false);
-            cancelHandlerRef.current(false);
+            cancelHandlerRef.current(false, clearBuffer);
         }
     }, []);
     useEffect(() => {
@@ -852,23 +841,25 @@ Logging in with Google... Restarting Cell CLI to continue.
         revealCleanUiDetailsTemporarily,
     ]);
     const { isMcpReady } = useMcpStatus(config);
+    const isCompressing = useMemo(() => pendingHistoryItems.some((item) => item.type === MessageType.COMPRESSION && item.compression.isPending), [pendingHistoryItems]);
     const { messageQueue, addMessage, clearQueue, getQueuedMessagesText, popAllMessages, } = useMessageQueue({
         isConfigInitialized,
         streamingState,
         submitQuery,
         isMcpReady,
+        isCompressing,
     });
-    cancelHandlerRef.current = useCallback((shouldRestorePrompt = true) => {
-        if (isToolAwaitingConfirmation(pendingHistoryItems)) {
+    cancelHandlerRef.current = useCallback((shouldRestorePrompt = true, clearBuffer = false) => {
+        if (!clearBuffer && isToolAwaitingConfirmation(pendingHistoryItems)) {
             return; // Don't clear - user may be composing a follow-up message
         }
-        if (isToolExecuting(pendingHistoryItems)) {
-            buffer.setText(''); // Clear for Ctrl+C cancellation
-            return;
-        }
-        // If cancelling (shouldRestorePrompt=false), never modify the buffer
-        // User is in control - preserve whatever text they typed, pasted, or restored
+        // If cancelling (shouldRestorePrompt=false):
         if (!shouldRestorePrompt) {
+            // Clear the buffer if explicitly requested (e.g., Ctrl+C)
+            if (clearBuffer) {
+                buffer.setText('');
+            }
+            // Otherwise (e.g., Escape), user is in control - preserve whatever text they typed
             return;
         }
         // Restore the last message when shouldRestorePrompt=true
@@ -929,7 +920,8 @@ Logging in with Google... Restarting Cell CLI to continue.
             return;
         }
         const isMcpOrConfigReady = isConfigInitialized && isMcpReady;
-        if ((isSlash && isConfigInitialized) || (isIdle && isMcpOrConfigReady)) {
+        if ((isSlash && isConfigInitialized) ||
+            (!isCompressing && isIdle && isMcpOrConfigReady)) {
             if (!isSlash) {
                 const permissions = await checkPermissions(submittedValue, config);
                 if (permissions.length > 0) {
@@ -951,7 +943,10 @@ Logging in with Google... Restarting Cell CLI to continue.
         }
         else {
             // Check messageQueue.length === 0 to only notify on the first queued item
-            if (isIdle && !isMcpOrConfigReady && messageQueue.length === 0) {
+            if (isIdle &&
+                !isCompressing &&
+                !isMcpOrConfigReady &&
+                messageQueue.length === 0) {
                 coreEvents.emitFeedback('info', !isConfigInitialized
                     ? 'Initializing... Prompts will be queued.'
                     : 'Waiting for MCP servers to initialize... Slash commands are still available and prompts will be queued.');
@@ -967,6 +962,7 @@ Logging in with Google... Restarting Cell CLI to continue.
         slashCommands,
         isMcpReady,
         streamingState,
+        isCompressing,
         messageQueue.length,
         pendingHistoryItems,
         config,
@@ -1130,7 +1126,6 @@ Logging in with Google... Restarting Cell CLI to continue.
     const policyUpdateConfirmationRequest = config.getPolicyUpdateConfirmationRequest();
     const [isPolicyUpdateDialogOpen, setIsPolicyUpdateDialogOpen] = useState(!!policyUpdateConfirmationRequest);
     const { needsRestart: ideNeedsRestart, restartReason: ideTrustRestartReason, } = useIdeTrustListener();
-    const isInitialMount = useRef(true);
     useIncludeDirsTrust(config, isTrustedFolder, historyManager, setCustomDialog);
     const tabFocusTimeoutRef = useRef(null);
     useEffect(() => {
@@ -1170,8 +1165,6 @@ Logging in with Google... Restarting Cell CLI to continue.
     const { handleSuspend } = useSuspend({
         handleWarning,
         setRawMode,
-        refreshStatic,
-        setForceRerenderKey,
         shouldUseAlternateScreen,
     });
     useEffect(() => {
@@ -1180,18 +1173,6 @@ Logging in with Google... Restarting Cell CLI to continue.
             setShowIdeRestartPrompt(true);
         }
     }, [ideNeedsRestart]);
-    useEffect(() => {
-        if (isInitialMount.current) {
-            isInitialMount.current = false;
-            return;
-        }
-        const handler = setTimeout(() => {
-            refreshStatic();
-        }, 300);
-        return () => {
-            clearTimeout(handler);
-        };
-    }, [terminalWidth, refreshStatic]);
     useEffect(() => {
         const unsubscribe = ideContextStore.subscribe(setIdeContextState);
         setIdeContextState(ideContextStore.get());
@@ -1557,8 +1538,11 @@ Logging in with Google... Restarting Cell CLI to continue.
         };
     }, [historyManager]);
     const nightly = props.version.includes('nightly');
+    const isAwaitingLoginRestart = authState === AuthState.AwaitingLoginRestart;
+    const loginRestartMessage = settings.merged.security.auth.selectedType === AuthType.USE_VERTEX_AI
+        ? 'Authenticating to Vertex AI in Cloud Shell requires a restart to apply project settings.'
+        : undefined;
     const dialogsVisible = shouldShowIdePrompt ||
-        shouldShowIdePrompt ||
         isFolderTrustDialogOpen ||
         isPolicyUpdateDialogOpen ||
         adminSettingsChanged ||
@@ -1585,6 +1569,7 @@ Logging in with Google... Restarting Cell CLI to continue.
         !!emptyWalletRequest ||
         isSessionBrowserOpen ||
         authState === AuthState.AwaitingApiKeyInput ||
+        isAwaitingLoginRestart ||
         !!newAgents;
     const hasPendingToolConfirmation = useMemo(() => isToolAwaitingConfirmation(pendingHistoryItems), [pendingHistoryItems]);
     const hasConfirmUpdateExtensionRequests = confirmUpdateExtensionRequests.length > 0;
@@ -1767,6 +1752,8 @@ Logging in with Google... Restarting Cell CLI to continue.
         accountSuspensionInfo,
         isAuthDialogOpen,
         isAwaitingApiKeyInput: authState === AuthState.AwaitingApiKeyInput,
+        isAwaitingLoginRestart,
+        loginRestartMessage,
         apiKeyDefaultValue,
         editorError,
         isEditorDialogOpen,
@@ -1976,6 +1963,8 @@ Logging in with Google... Restarting Cell CLI to continue.
         customDialog,
         apiKeyDefaultValue,
         authState,
+        isAwaitingLoginRestart,
+        loginRestartMessage,
         transientMessage,
         bannerData,
         bannerVisible,
@@ -2043,6 +2032,10 @@ Logging in with Google... Restarting Cell CLI to continue.
         setActiveBackgroundTaskPid,
         setIsBackgroundTaskListOpen,
         setAuthContext,
+        dismissLoginRestart: () => {
+            setAuthContext({});
+            setAuthState(AuthState.Updating);
+        },
         onHintInput: () => { },
         onHintBackspace: () => { },
         onHintClear: () => { },
@@ -2142,15 +2135,9 @@ Logging in with Google... Restarting Cell CLI to continue.
         getPreferredEditor,
         setVoiceModeEnabled,
     ]);
-    if (authState === AuthState.AwaitingGoogleLoginRestart) {
-        return (_jsx(LoginWithGoogleRestartDialog, { onDismiss: () => {
-                setAuthContext({});
-                setAuthState(AuthState.Updating);
-            }, config: config }));
-    }
     return (_jsx(UIStateContext.Provider, { value: uiState, children: _jsx(QuotaContext.Provider, { value: quotaState, children: _jsx(InputContext.Provider, { value: inputState, children: _jsx(UIActionsContext.Provider, { value: uiActions, children: _jsx(ConfigContext.Provider, { value: config, children: _jsx(AppContext.Provider, { value: {
                                 version: props.version,
                                 startupWarnings: props.startupWarnings || [],
-                            }, children: _jsx(ToolActionsProvider, { config: config, toolCalls: allToolCalls, isExpanded: isExpanded, toggleExpansion: toggleExpansion, toggleAllExpansion: toggleAllExpansion, children: _jsx(ShellFocusContext.Provider, { value: isFocused, children: _jsx(MouseProvider, { mouseEventsEnabled: mouseMode, children: _jsx(ScrollProvider, { children: _jsx(App, {}, `app-${forceRerenderKey}`) }) }) }) }) }) }) }) }) }) }));
+                            }, children: _jsx(ToolActionsProvider, { config: config, toolCalls: allToolCalls, isExpanded: isExpanded, toggleExpansion: toggleExpansion, toggleAllExpansion: toggleAllExpansion, children: _jsx(ShellFocusContext.Provider, { value: isFocused, children: _jsx(MouseProvider, { mouseEventsEnabled: mouseMode, children: _jsx(ScrollProvider, { children: _jsx(App, {}) }) }) }) }) }) }) }) }) }) }));
 };
 //# sourceMappingURL=AppContainer.js.map