@machina.ai/cell-cli 1.16.0-rc2 → 1.19.4-rc1

package/dist/src/ui/auth/AuthDialog.test.js

@@ -7,7 +7,7 @@ import { jsxs as _jsxs, Fragment as _Fragment, jsx as _jsx } from "react/jsx-run
 import { renderWithProviders } from '../../test-utils/render.js';
 import { describe, it, expect, vi, beforeEach, afterEach, } from 'vitest';
 import { AuthDialog } from './AuthDialog.js';
-import { AuthType } from '@google/gemini-cli-core';
+import { AuthType, debugLogger } from '@google/gemini-cli-core';
 import { SettingScope } from '../../config/settings.js';
 import { AuthState } from '../types.js';
 import { RadioButtonSelect } from '../components/shared/RadioButtonSelect.js';
@@ -16,6 +16,7 @@ import { validateAuthMethodWithSettings } from './useAuth.js';
 import { runExitCleanup } from '../../utils/cleanup.js';
 import { clearCachedCredentialFile } from '@google/gemini-cli-core';
 import { Text } from 'ink';
+import { RELAUNCH_EXIT_CODE } from '../../utils/processUtils.js';
 // Mocks
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     const actual = await importOriginal();
@@ -127,20 +128,22 @@ describe('AuthDialog', () => {
             expect(props.setAuthState).toHaveBeenCalledWith(AuthState.Unauthenticated);
         });
         it('exits process for Login with Google when browser is suppressed', async () => {
+            vi.useFakeTimers();
             const exitSpy = vi
                 .spyOn(process, 'exit')
                 .mockImplementation(() => undefined);
-            const logSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+            const logSpy = vi.spyOn(debugLogger, 'log').mockImplementation(() => { });
             vi.mocked(props.config.isBrowserLaunchSuppressed).mockReturnValue(true);
             mockedValidateAuthMethod.mockReturnValue(null);
             renderWithProviders(_jsx(AuthDialog, { ...props }));
             const { onSelect: handleAuthSelect } = mockedRadioButtonSelect.mock.calls[0][0];
             await handleAuthSelect(AuthType.LOGIN_WITH_GOOGLE);
+            await vi.runAllTimersAsync();
             expect(mockedRunExitCleanup).toHaveBeenCalled();
-            expect(logSpy).toHaveBeenCalledWith(expect.stringContaining('Please restart Cell CLI'));
-            expect(exitSpy).toHaveBeenCalledWith(0);
+            expect(exitSpy).toHaveBeenCalledWith(RELAUNCH_EXIT_CODE);
             exitSpy.mockRestore();
             logSpy.mockRestore();
+            vi.useRealTimers();
         });
     });
     it('displays authError when provided', () => {
@@ -149,28 +152,59 @@ describe('AuthDialog', () => {
         expect(lastFrame()).toContain('Something went wrong');
     });
     describe('useKeypress', () => {
-        it('does nothing on escape if authError is present', () => {
-            props.authError = 'Some error';
+        it.each([
+            {
+                desc: 'does nothing on escape if authError is present',
+                setup: () => {
+                    props.authError = 'Some error';
+                },
+                expectations: (p) => {
+                    expect(p.onAuthError).not.toHaveBeenCalled();
+                    expect(p.setAuthState).not.toHaveBeenCalled();
+                },
+            },
+            {
+                desc: 'calls onAuthError on escape if no auth method is set',
+                setup: () => {
+                    props.settings.merged.security.auth.selectedType = undefined;
+                },
+                expectations: (p) => {
+                    expect(p.onAuthError).toHaveBeenCalledWith('You must select an auth method to proceed. Press Ctrl+C twice to exit.');
+                },
+            },
+            {
+                desc: 'calls setAuthState(Unauthenticated) on escape if auth method is set',
+                setup: () => {
+                    props.settings.merged.security.auth.selectedType =
+                        AuthType.USE_GEMINI;
+                },
+                expectations: (p) => {
+                    expect(p.setAuthState).toHaveBeenCalledWith(AuthState.Unauthenticated);
+                    expect(p.settings.setValue).not.toHaveBeenCalled();
+                },
+            },
+        ])('$desc', ({ setup, expectations }) => {
+            setup();
             renderWithProviders(_jsx(AuthDialog, { ...props }));
             const keypressHandler = mockedUseKeypress.mock.calls[0][0];
             keypressHandler({ name: 'escape' });
-            expect(props.onAuthError).not.toHaveBeenCalled();
-            expect(props.setAuthState).not.toHaveBeenCalled();
+            expectations(props);
         });
-        it('calls onAuthError on escape if no auth method is set', () => {
-            props.settings.merged.security.auth.selectedType = undefined;
-            renderWithProviders(_jsx(AuthDialog, { ...props }));
-            const keypressHandler = mockedUseKeypress.mock.calls[0][0];
-            keypressHandler({ name: 'escape' });
-            expect(props.onAuthError).toHaveBeenCalledWith('You must select an auth method to proceed. Press Ctrl+C twice to exit.');
+    });
+    describe('Snapshots', () => {
+        it('renders correctly with default props', () => {
+            const { lastFrame } = renderWithProviders(_jsx(AuthDialog, { ...props }));
+            expect(lastFrame()).toMatchSnapshot();
         });
-        it('calls onSelect(undefined) on escape if auth method is set', () => {
-            props.settings.merged.security.auth.selectedType = AuthType.KEYCLOAK;
-            renderWithProviders(_jsx(AuthDialog, { ...props }));
-            const keypressHandler = mockedUseKeypress.mock.calls[0][0];
-            keypressHandler({ name: 'escape' });
-            expect(props.setAuthState).toHaveBeenCalledWith(AuthState.Unauthenticated);
-            expect(props.settings.setValue).not.toHaveBeenCalled();
+        it('renders correctly with auth error', () => {
+            props.authError = 'Something went wrong';
+            const { lastFrame } = renderWithProviders(_jsx(AuthDialog, { ...props }));
+            expect(lastFrame()).toMatchSnapshot();
+        });
+        it('renders correctly with enforced auth type', () => {
+            props.settings.merged.security.auth.enforcedType = AuthType.KEYCLOAK;
+            const { lastFrame } = renderWithProviders(_jsx(AuthDialog, { ...props }));
+            expect(lastFrame()).toMatchSnapshot();
         });
     });
 });

package/dist/src/ui/auth/AuthDialog.test.js.map

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

package/dist/src/ui/auth/AuthInProgress.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/ui/auth/AuthInProgress.test.js

@@ -0,0 +1,71 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { render } from 'ink-testing-library';
+import { act } from 'react';
+import { AuthInProgress } from './AuthInProgress.js';
+import { useKeypress } from '../hooks/useKeypress.js';
+// Mock dependencies
+vi.mock('../hooks/useKeypress.js', () => ({
+    useKeypress: vi.fn(),
+}));
+vi.mock('../components/CliSpinner.js', () => ({
+    CliSpinner: () => '[Spinner]',
+}));
+describe('AuthInProgress', () => {
+    const onTimeout = vi.fn();
+    const originalError = console.error;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        vi.useFakeTimers();
+        console.error = (...args) => {
+            if (typeof args[0] === 'string' &&
+                args[0].includes('was not wrapped in act')) {
+                return;
+            }
+            originalError.call(console, ...args);
+        };
+    });
+    afterEach(() => {
+        console.error = originalError;
+        vi.useRealTimers();
+    });
+    it('renders initial state with spinner', () => {
+        const { lastFrame } = render(_jsx(AuthInProgress, { onTimeout: onTimeout, authMessage: null }));
+        expect(lastFrame()).toContain('[Spinner] Waiting for auth...');
+        expect(lastFrame()).toContain('Press ESC or CTRL+C to cancel');
+    });
+    it('calls onTimeout when ESC is pressed', () => {
+        render(_jsx(AuthInProgress, { onTimeout: onTimeout, authMessage: null }));
+        const keypressHandler = vi.mocked(useKeypress).mock.calls[0][0];
+        keypressHandler({ name: 'escape' });
+        expect(onTimeout).toHaveBeenCalled();
+    });
+    it('calls onTimeout when Ctrl+C is pressed', () => {
+        render(_jsx(AuthInProgress, { onTimeout: onTimeout, authMessage: null }));
+        const keypressHandler = vi.mocked(useKeypress).mock.calls[0][0];
+        keypressHandler({ name: 'c', ctrl: true });
+        expect(onTimeout).toHaveBeenCalled();
+    });
+    it('calls onTimeout and shows timeout message after 3 minutes', async () => {
+        const { lastFrame } = render(_jsx(AuthInProgress, { onTimeout: onTimeout, authMessage: null }));
+        await act(async () => {
+            vi.advanceTimersByTime(180000);
+        });
+        expect(onTimeout).toHaveBeenCalled();
+        await vi.waitUntil(() => lastFrame()?.includes('Authentication timed out'), { timeout: 1000 });
+    });
+    it('clears timer on unmount', () => {
+        const { unmount } = render(_jsx(AuthInProgress, { onTimeout: onTimeout, authMessage: null }));
+        act(() => {
+            unmount();
+        });
+        vi.advanceTimersByTime(180000);
+        expect(onTimeout).not.toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=AuthInProgress.test.js.map

package/dist/src/ui/auth/AuthInProgress.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AuthInProgress.test.js","sourceRoot":"","sources":["../../../../src/ui/auth/AuthInProgress.test.tsx"],"names":[],"mappings":"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"}

package/dist/src/ui/auth/useAuth.d.ts

@@ -11,6 +11,8 @@ export declare const useAuthCommand: (settings: LoadedSettings, config: Config)
     authState: AuthState;
     setAuthState: import("react").Dispatch<import("react").SetStateAction<AuthState>>;
     authError: string | null;
+    authInfo: string | null;
+    setAuthInfo: import("react").Dispatch<import("react").SetStateAction<string | null>>;
     onAuthError: (error: string | null) => void;
     apiKeyDefaultValue: string | undefined;
     reloadApiKey: () => Promise<string>;

package/dist/src/ui/auth/useAuth.js

@@ -25,6 +25,7 @@ export function validateAuthMethodWithSettings(authType, settings) {
 export const useAuthCommand = (settings, config) => {
     const [authState, setAuthState] = useState(AuthState.Unauthenticated);
     const [authError, setAuthError] = useState(null);
+    const [authInfo, setAuthInfo] = useState(null);
     const [apiKeyDefaultValue, setApiKeyDefaultValue] = useState(undefined);
     const onAuthError = useCallback((error) => {
         setAuthError(error);
@@ -74,9 +75,11 @@ export const useAuthCommand = (settings, config) => {
                 return;
             }
             try {
-                await config.refreshAuth(authType);
+                setAuthInfo(null);
+                await config.refreshAuth(authType, (msg) => setAuthInfo(msg));
                 debugLogger.log(`Authenticated via "${authType}".`);
                 setAuthError(null);
+                setAuthInfo(null);
                 setAuthState(AuthState.Authenticated);
             }
             catch (e) {
@@ -96,6 +99,8 @@ export const useAuthCommand = (settings, config) => {
         authState,
         setAuthState,
         authError,
+        authInfo,
+        setAuthInfo,
         onAuthError,
         apiKeyDefaultValue,
         reloadApiKey,

package/dist/src/ui/auth/useAuth.js.map

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

package/dist/src/ui/auth/useAuth.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/ui/auth/useAuth.test.js

@@ -0,0 +1,178 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach, } from 'vitest';
+import { renderHook } from '../../test-utils/render.js';
+import { useAuthCommand, validateAuthMethodWithSettings } from './useAuth.js';
+import { AuthType } from '@google/gemini-cli-core';
+import { AuthState } from '../types.js';
+import { waitFor } from '../../test-utils/async.js';
+// Mock dependencies
+const mockLoadApiKey = vi.fn();
+const mockValidateAuthMethod = vi.fn();
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        loadApiKey: () => mockLoadApiKey(),
+    };
+});
+vi.mock('../../config/auth.js', () => ({
+    validateAuthMethod: (authType) => mockValidateAuthMethod(authType),
+}));
+describe('useAuth', () => {
+    beforeEach(() => {
+        vi.resetAllMocks();
+        process.env['GEMINI_API_KEY'] = '';
+        process.env['GEMINI_DEFAULT_AUTH_TYPE'] = '';
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    describe('validateAuthMethodWithSettings', () => {
+        it('should return error if auth type is enforced and does not match', () => {
+            const settings = {
+                merged: {
+                    security: {
+                        auth: {
+                            enforcedType: AuthType.LOGIN_WITH_GOOGLE,
+                        },
+                    },
+                },
+            };
+            const error = validateAuthMethodWithSettings(AuthType.USE_GEMINI, settings);
+            expect(error).toContain('Authentication is enforced to be oauth');
+        });
+        it('should return null if useExternal is true', () => {
+            const settings = {
+                merged: {
+                    security: {
+                        auth: {
+                            useExternal: true,
+                        },
+                    },
+                },
+            };
+            const error = validateAuthMethodWithSettings(AuthType.LOGIN_WITH_GOOGLE, settings);
+            expect(error).toBeNull();
+        });
+        it('should return null if authType is USE_GEMINI', () => {
+            const settings = {
+                merged: {
+                    security: {
+                        auth: {},
+                    },
+                },
+            };
+            const error = validateAuthMethodWithSettings(AuthType.USE_GEMINI, settings);
+            expect(error).toBeNull();
+        });
+        it('should call validateAuthMethod for other auth types', () => {
+            const settings = {
+                merged: {
+                    security: {
+                        auth: {},
+                    },
+                },
+            };
+            mockValidateAuthMethod.mockReturnValue('Validation Error');
+            const error = validateAuthMethodWithSettings(AuthType.LOGIN_WITH_GOOGLE, settings);
+            expect(error).toBe('Validation Error');
+            expect(mockValidateAuthMethod).toHaveBeenCalledWith(AuthType.LOGIN_WITH_GOOGLE);
+        });
+    });
+    describe('useAuthCommand', () => {
+        const mockConfig = {
+            refreshAuth: vi.fn(),
+        };
+        const createSettings = (selectedType) => ({
+            merged: {
+                security: {
+                    auth: {
+                        selectedType,
+                    },
+                },
+            },
+        });
+        it('should initialize with Unauthenticated state', () => {
+            const { result } = renderHook(() => useAuthCommand(createSettings(AuthType.LOGIN_WITH_GOOGLE), mockConfig));
+            expect(result.current.authState).toBe(AuthState.Unauthenticated);
+        });
+        it('should set error if no auth type is selected and no env key', async () => {
+            const { result } = renderHook(() => useAuthCommand(createSettings(undefined), mockConfig));
+            await waitFor(() => {
+                expect(result.current.authError).toBe('No authentication method selected.');
+                expect(result.current.authState).toBe(AuthState.Updating);
+            });
+        });
+        it('should set error if no auth type is selected but env key exists', async () => {
+            process.env['GEMINI_API_KEY'] = 'env-key';
+            const { result } = renderHook(() => useAuthCommand(createSettings(undefined), mockConfig));
+            await waitFor(() => {
+                expect(result.current.authError).toContain('Existing API key detected (GEMINI_API_KEY)');
+                expect(result.current.authState).toBe(AuthState.Updating);
+            });
+        });
+        it('should transition to AwaitingApiKeyInput if USE_GEMINI and no key found', async () => {
+            mockLoadApiKey.mockResolvedValue(null);
+            const { result } = renderHook(() => useAuthCommand(createSettings(AuthType.USE_GEMINI), mockConfig));
+            await waitFor(() => {
+                expect(result.current.authState).toBe(AuthState.AwaitingApiKeyInput);
+            });
+        });
+        it('should authenticate if USE_GEMINI and key is found', async () => {
+            mockLoadApiKey.mockResolvedValue('stored-key');
+            const { result } = renderHook(() => useAuthCommand(createSettings(AuthType.USE_GEMINI), mockConfig));
+            await waitFor(() => {
+                expect(mockConfig.refreshAuth).toHaveBeenCalledWith(AuthType.USE_GEMINI, expect.anything());
+                expect(result.current.authState).toBe(AuthState.Authenticated);
+                expect(result.current.apiKeyDefaultValue).toBe('stored-key');
+            });
+        });
+        it('should authenticate if USE_GEMINI and env key is found', async () => {
+            mockLoadApiKey.mockResolvedValue(null);
+            process.env['GEMINI_API_KEY'] = 'env-key';
+            const { result } = renderHook(() => useAuthCommand(createSettings(AuthType.USE_GEMINI), mockConfig));
+            await waitFor(() => {
+                expect(mockConfig.refreshAuth).toHaveBeenCalledWith(AuthType.USE_GEMINI, expect.anything());
+                expect(result.current.authState).toBe(AuthState.Authenticated);
+                expect(result.current.apiKeyDefaultValue).toBe('env-key');
+            });
+        });
+        it('should set error if validation fails', async () => {
+            mockValidateAuthMethod.mockReturnValue('Validation Failed');
+            const { result } = renderHook(() => useAuthCommand(createSettings(AuthType.LOGIN_WITH_GOOGLE), mockConfig));
+            await waitFor(() => {
+                expect(result.current.authError).toBe('Validation Failed');
+                expect(result.current.authState).toBe(AuthState.Updating);
+            });
+        });
+        it('should set error if GEMINI_DEFAULT_AUTH_TYPE is invalid', async () => {
+            process.env['GEMINI_DEFAULT_AUTH_TYPE'] = 'INVALID_TYPE';
+            const { result } = renderHook(() => useAuthCommand(createSettings(AuthType.LOGIN_WITH_GOOGLE), mockConfig));
+            await waitFor(() => {
+                expect(result.current.authError).toContain('Invalid value for GEMINI_DEFAULT_AUTH_TYPE');
+                expect(result.current.authState).toBe(AuthState.Updating);
+            });
+        });
+        it('should authenticate successfully for valid auth type', async () => {
+            const { result } = renderHook(() => useAuthCommand(createSettings(AuthType.LOGIN_WITH_GOOGLE), mockConfig));
+            await waitFor(() => {
+                expect(mockConfig.refreshAuth).toHaveBeenCalledWith(AuthType.LOGIN_WITH_GOOGLE, expect.anything());
+                expect(result.current.authState).toBe(AuthState.Authenticated);
+                expect(result.current.authError).toBeNull();
+            });
+        });
+        it('should handle refreshAuth failure', async () => {
+            mockConfig.refreshAuth.mockRejectedValue(new Error('Auth Failed'));
+            const { result } = renderHook(() => useAuthCommand(createSettings(AuthType.LOGIN_WITH_GOOGLE), mockConfig));
+            await waitFor(() => {
+                expect(result.current.authError).toContain('Failed to login');
+                expect(result.current.authState).toBe(AuthState.Updating);
+            });
+        });
+    });
+});
+//# sourceMappingURL=useAuth.test.js.map

package/dist/src/ui/auth/useAuth.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useAuth.test.js","sourceRoot":"","sources":["../../../../src/ui/auth/useAuth.test.tsx"],"names":[],"mappings":"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"}

package/dist/src/ui/commands/aboutCommand.js

@@ -7,7 +7,7 @@ import { getCliVersion } from '../../utils/version.js';
 import { CommandKind } from './types.js';
 import process from 'node:process';
 import { MessageType } from '../types.js';
-import { IdeClient } from '@google/gemini-cli-core';
+import { IdeClient, UserAccountManager, debugLogger, } from '@google/gemini-cli-core';
 export const aboutCommand = {
     name: 'about',
     description: 'Show version info',
@@ -26,6 +26,12 @@ export const aboutCommand = {
         const selectedAuthType = context.services.settings.merged.security?.auth?.selectedType || '';
         const gcpProject = process.env['GOOGLE_CLOUD_PROJECT'] || '';
         const ideClient = await getIdeClientName(context);
+        const userAccountManager = new UserAccountManager();
+        const cachedAccount = userAccountManager.getCachedGoogleAccount();
+        debugLogger.log('AboutCommand: Retrieved cached Google account', {
+            cachedAccount,
+        });
+        const userEmail = cachedAccount ?? undefined;
         const aboutItem = {
             type: MessageType.ABOUT,
             cliVersion,
@@ -35,6 +41,7 @@ export const aboutCommand = {
             selectedAuthType,
             gcpProject,
             ideClient,
+            userEmail,
         };
         context.ui.addItem(aboutItem, Date.now());
     },

package/dist/src/ui/commands/aboutCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"aboutCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/aboutCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,WAAW,EAAyB,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,MAAM,CAAC,MAAM,YAAY,GAAiB;IACxC,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,mBAAmB;IAChC,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;QACnC,IAAI,UAAU,GAAG,YAAY,CAAC;QAC9B,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE,CAAC;YACxE,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;aAAM,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE,CAAC;YACrD,UAAU,GAAG,iBACX,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,SACrC,GAAG,CAAC;QACN,CAAC;QACD,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,SAAS,CAAC;QACtE,MAAM,UAAU,GAAG,MAAM,aAAa,EAAE,CAAC;QACzC,MAAM,gBAAgB,GACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,IAAI,EAAE,CAAC;QACtE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC;QAC7D,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAElD,MAAM,SAAS,GAAiC;YAC9C,IAAI,EAAE,WAAW,CAAC,KAAK;YACvB,UAAU;YACV,SAAS;YACT,UAAU;YACV,YAAY;YACZ,gBAAgB;YAChB,UAAU;YACV,SAAS;SACV,CAAC;QAEF,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5C,CAAC;CACF,CAAC;AAEF,KAAK,UAAU,gBAAgB,CAAC,OAAuB;IACrD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC;QAC3C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC;IAChD,OAAO,SAAS,EAAE,yBAAyB,EAAE,IAAI,EAAE,CAAC;AACtD,CAAC"}
+{"version":3,"file":"aboutCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/aboutCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,WAAW,EAAyB,MAAM,aAAa,CAAC;AACjE,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,WAAW,GACZ,MAAM,yBAAyB,CAAC;AAEjC,MAAM,CAAC,MAAM,YAAY,GAAiB;IACxC,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,mBAAmB;IAChC,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;QACnC,IAAI,UAAU,GAAG,YAAY,CAAC;QAC9B,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE,CAAC;YACxE,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;aAAM,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE,CAAC;YACrD,UAAU,GAAG,iBACX,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,SACrC,GAAG,CAAC;QACN,CAAC;QACD,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,SAAS,CAAC;QACtE,MAAM,UAAU,GAAG,MAAM,aAAa,EAAE,CAAC;QACzC,MAAM,gBAAgB,GACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,IAAI,EAAE,CAAC;QACtE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC;QAC7D,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAElD,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACpD,MAAM,aAAa,GAAG,kBAAkB,CAAC,sBAAsB,EAAE,CAAC;QAClE,WAAW,CAAC,GAAG,CAAC,+CAA+C,EAAE;YAC/D,aAAa;SACd,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,aAAa,IAAI,SAAS,CAAC;QAE7C,MAAM,SAAS,GAAiC;YAC9C,IAAI,EAAE,WAAW,CAAC,KAAK;YACvB,UAAU;YACV,SAAS;YACT,UAAU;YACV,YAAY;YACZ,gBAAgB;YAChB,UAAU;YACV,SAAS;YACT,SAAS;SACV,CAAC;QAEF,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5C,CAAC;CACF,CAAC;AAEF,KAAK,UAAU,gBAAgB,CAAC,OAAuB;IACrD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC;QAC3C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC;IAChD,OAAO,SAAS,EAAE,yBAAyB,EAAE,IAAI,EAAE,CAAC;AACtD,CAAC"}

package/dist/src/ui/commands/aboutCommand.test.js

@@ -19,6 +19,9 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
                 getDetectedIdeDisplayName: vi.fn().mockReturnValue('test-ide'),
             }),
         },
+        UserAccountManager: vi.fn().mockImplementation(() => ({
+            getCachedGoogleAccount: vi.fn().mockReturnValue('test-email@example.com'),
+        })),
     };
 });
 vi.mock('../../utils/version.js', () => ({
@@ -83,6 +86,7 @@ describe('aboutCommand', () => {
             selectedAuthType: 'test-auth',
             gcpProject: 'test-gcp-project',
             ideClient: 'test-ide',
+            userEmail: 'test-email@example.com',
         }, expect.any(Number));
     });
     it('should show the correct sandbox environment variable', async () => {

package/dist/src/ui/commands/aboutCommand.test.js.map

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

package/dist/src/ui/commands/clearCommand.js

@@ -5,12 +5,18 @@
  */
 import { uiTelemetryService } from '@google/gemini-cli-core';
 import { CommandKind } from './types.js';
+import { randomUUID } from 'node:crypto';
 export const clearCommand = {
     name: 'clear',
     description: 'Clear the screen and conversation history',
     kind: CommandKind.BUILT_IN,
     action: async (context, _args) => {
         const geminiClient = context.services.config?.getGeminiClient();
+        const config = context.services.config;
+        const chatRecordingService = context.services.config
+            ?.getGeminiClient()
+            ?.getChat()
+            .getChatRecordingService();
         if (geminiClient) {
             context.ui.setDebugMessage('Clearing terminal and resetting chat.');
             // If resetChat fails, the exception will propagate and halt the command,
@@ -20,6 +26,12 @@ export const clearCommand = {
         else {
             context.ui.setDebugMessage('Clearing terminal.');
         }
+        // Start a new conversation recording with a new session ID
+        if (config && chatRecordingService) {
+            const newSessionId = randomUUID();
+            config.setSessionId(newSessionId);
+            chatRecordingService.initialize();
+        }
         uiTelemetryService.setLastPromptTokenCount(0);
         context.ui.clear();
     },