fix(auth): update terminology to 'sign in' and 'sign out' (#20892)

Co-authored-by: Jacob Richman <jacob314@gmail.com>

packages/cli/src/config/settingsSchema.ts

@@ -676,7 +676,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: true,
         description:
-          "Show the logged-in user's identity (e.g. email) in the UI.",
+          "Show the signed-in user's identity (e.g. email) in the UI.",
         showInDialog: true,
       },
       useAlternateBuffer: {

packages/cli/src/core/auth.test.ts

@@ -48,14 +48,14 @@ describe('auth', () => {
   });
 
   it('should return error message on failed auth', async () => {
-    const error = new Error('Auth failed');
+    const error = new Error('Authentication failed');
     vi.mocked(mockConfig.refreshAuth).mockRejectedValue(error);
     const result = await performInitialAuth(
       mockConfig,
       AuthType.LOGIN_WITH_GOOGLE,
     );
     expect(result).toEqual({
-      authError: 'Failed to login. Message: Auth failed',
+      authError: 'Failed to sign in. Message: Authentication failed',
       accountSuspensionInfo: null,
     });
     expect(mockConfig.refreshAuth).toHaveBeenCalledWith(

packages/cli/src/core/auth.ts

@@ -64,7 +64,7 @@ export async function performInitialAuth(
       };
     }
     return {
-      authError: `Failed to login. Message: ${getErrorMessage(e)}`,
+      authError: `Failed to sign in. Message: ${getErrorMessage(e)}`,
       accountSuspensionInfo: null,
     };
   }

packages/cli/src/ui/auth/AuthDialog.test.tsx

@@ -209,7 +209,7 @@ describe('AuthDialog', () => {
       {
         setup: () => {},
         expected: AuthType.LOGIN_WITH_GOOGLE,
-        desc: 'defaults to Login with Google',
+        desc: 'defaults to Sign in with Google',
       },
     ])('selects initial auth type $desc', async ({ setup, expected }) => {
       setup();
@@ -351,7 +351,7 @@ describe('AuthDialog', () => {
       unmount();
     });
 
-    it('exits process for Login with Google when browser is suppressed', async () => {
+    it('exits process for Sign in with Google when browser is suppressed', async () => {
       vi.useFakeTimers();
       const exitSpy = vi
         .spyOn(process, 'exit')

packages/cli/src/ui/auth/AuthDialog.tsx

@@ -44,7 +44,7 @@ export function AuthDialog({
   const [exiting, setExiting] = useState(false);
   let items = [
     {
-      label: 'Login with Google',
+      label: 'Sign in with Google',
       value: AuthType.LOGIN_WITH_GOOGLE,
       key: AuthType.LOGIN_WITH_GOOGLE,
     },

packages/cli/src/ui/auth/AuthInProgress.test.tsx

@@ -59,8 +59,8 @@ describe('AuthInProgress', () => {
       <AuthInProgress onTimeout={onTimeout} />,
     );
     await waitUntilReady();
-    expect(lastFrame()).toContain('[Spinner] Waiting for auth...');
-    expect(lastFrame()).toContain('Press ESC or CTRL+C to cancel');
+    expect(lastFrame()).toContain('[Spinner] Waiting for authentication...');
+    expect(lastFrame()).toContain('Press Esc or Ctrl+C to cancel');
     unmount();
   });
 

packages/cli/src/ui/auth/AuthInProgress.tsx

@@ -53,8 +53,8 @@ export function AuthInProgress({
       ) : (
         <Box>
           <Text>
-            <CliSpinner type="dots" /> Waiting for auth... (Press ESC or CTRL+C
-            to cancel)
+            <CliSpinner type="dots" /> Waiting for authentication... (Press Esc
+            or Ctrl+C to cancel)
           </Text>
         </Box>
       )}

packages/cli/src/ui/auth/LoginWithGoogleRestartDialog.tsx

@@ -45,13 +45,13 @@ export const LoginWithGoogleRestartDialog = ({
   );
 
   const message =
-    'You have successfully logged in with Google. Gemini CLI needs to be restarted.';
+    "You've successfully signed in with Google. Gemini CLI needs to be restarted.";
 
   return (
     <Box borderStyle="round" borderColor={theme.status.warning} paddingX={1}>
       <Text color={theme.status.warning}>
-        {message} Press &apos;r&apos; to restart, or &apos;escape&apos; to
-        choose a different auth method.
+        {message} Press R to restart, or Esc to choose a different
+        authentication method.
       </Text>
     </Box>
   );

packages/cli/src/ui/auth/__snapshots__/AuthDialog.test.tsx.snap

@@ -7,7 +7,7 @@ exports[`AuthDialog > Snapshots > renders correctly with auth error 1`] = `
 │                                                                                                  │
 │   How would you like to authenticate for this project?                                           │
 │                                                                                                  │
-│   (selected) Login with Google(not selected) Use Gemini API Key(not selected) Vertex AI          │
+│   (selected) Sign in with Google(not selected) Use Gemini API Key(not selected) Vertex AI        │
 │                                                                                                  │
 │   Something went wrong                                                                           │
 │                                                                                                  │
@@ -28,7 +28,7 @@ exports[`AuthDialog > Snapshots > renders correctly with default props 1`] = `
 │                                                                                                  │
 │   How would you like to authenticate for this project?                                           │
 │                                                                                                  │
-│   (selected) Login with Google(not selected) Use Gemini API Key(not selected) Vertex AI          │
+│   (selected) Sign in with Google(not selected) Use Gemini API Key(not selected) Vertex AI        │
 │                                                                                                  │
 │   (Use Enter to select)                                                                          │
 │                                                                                                  │

packages/cli/src/ui/auth/__snapshots__/LoginWithGoogleRestartDialog.test.tsx.snap

@@ -2,8 +2,8 @@
 
 exports[`LoginWithGoogleRestartDialog > renders correctly 1`] = `
 "╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ You have successfully logged in with Google. Gemini CLI needs to be restarted. Press 'r' to      │
-│ restart, or 'escape' to choose a different auth method.                                          │
+│ You've successfully signed in with Google. Gemini CLI needs to be restarted. Press R to restart, │
+│ or Esc to choose a different authentication method.                                              │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
 "
 `;

packages/cli/src/ui/auth/useAuth.test.tsx

@@ -288,7 +288,7 @@ describe('useAuth', () => {
       );
 
       await waitFor(() => {
-        expect(result.current.authError).toContain('Failed to login');
+        expect(result.current.authError).toContain('Failed to sign in');
         expect(result.current.authState).toBe(AuthState.Updating);
       });
     });

packages/cli/src/ui/auth/useAuth.ts

@@ -149,7 +149,7 @@ export const useAuthCommand = (
           // Show the error message directly without "Failed to login" prefix
           onAuthError(getErrorMessage(e));
         } else {
-          onAuthError(`Failed to login. Message: ${getErrorMessage(e)}`);
+          onAuthError(`Failed to sign in. Message: ${getErrorMessage(e)}`);
         }
       }
     })();

packages/cli/src/ui/commands/authCommand.test.ts

@@ -34,11 +34,13 @@ describe('authCommand', () => {
     vi.clearAllMocks();
   });
 
-  it('should have subcommands: login and logout', () => {
+  it('should have subcommands: signin and signout', () => {
     expect(authCommand.subCommands).toBeDefined();
     expect(authCommand.subCommands).toHaveLength(2);
-    expect(authCommand.subCommands?.[0]?.name).toBe('login');
-    expect(authCommand.subCommands?.[1]?.name).toBe('logout');
+    expect(authCommand.subCommands?.[0]?.name).toBe('signin');
+    expect(authCommand.subCommands?.[0]?.altNames).toContain('login');
+    expect(authCommand.subCommands?.[1]?.name).toBe('signout');
+    expect(authCommand.subCommands?.[1]?.altNames).toContain('logout');
   });
 
   it('should return a dialog action to open the auth dialog when called with no args', () => {
@@ -59,19 +61,19 @@ describe('authCommand', () => {
     expect(authCommand.description).toBe('Manage authentication');
   });
 
-  describe('auth login subcommand', () => {
+  describe('auth signin subcommand', () => {
     it('should return auth dialog action', () => {
       const loginCommand = authCommand.subCommands?.[0];
-      expect(loginCommand?.name).toBe('login');
+      expect(loginCommand?.name).toBe('signin');
       const result = loginCommand!.action!(mockContext, '');
       expect(result).toEqual({ type: 'dialog', dialog: 'auth' });
     });
   });
 
-  describe('auth logout subcommand', () => {
+  describe('auth signout subcommand', () => {
     it('should clear cached credentials', async () => {
       const logoutCommand = authCommand.subCommands?.[1];
-      expect(logoutCommand?.name).toBe('logout');
+      expect(logoutCommand?.name).toBe('signout');
 
       const { clearCachedCredentialFile } = await import(
         '@google/gemini-cli-core'

packages/cli/src/ui/commands/authCommand.ts

@@ -14,8 +14,9 @@ import { clearCachedCredentialFile } from '@google/gemini-cli-core';
 import { SettingScope } from '../../config/settings.js';
 
 const authLoginCommand: SlashCommand = {
-  name: 'login',
-  description: 'Login or change the auth method',
+  name: 'signin',
+  altNames: ['login'],
+  description: 'Sign in or change the authentication method',
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: (_context, _args): OpenDialogActionReturn => ({
@@ -25,8 +26,9 @@ const authLoginCommand: SlashCommand = {
 };
 
 const authLogoutCommand: SlashCommand = {
-  name: 'logout',
-  description: 'Log out and clear all cached credentials',
+  name: 'signout',
+  altNames: ['logout'],
+  description: 'Sign out and clear all cached credentials',
   kind: CommandKind.BUILT_IN,
   action: async (context, _args): Promise<LogoutActionReturn> => {
     await clearCachedCredentialFile();

packages/cli/src/ui/components/AboutBox.test.tsx

@@ -36,7 +36,7 @@ describe('AboutBox', () => {
     expect(output).toContain('gemini-pro');
     expect(output).toContain('default');
     expect(output).toContain('macOS');
-    expect(output).toContain('Logged in with Google');
+    expect(output).toContain('Signed in with Google');
     unmount();
   });
 
@@ -63,7 +63,7 @@ describe('AboutBox', () => {
     );
     await waitUntilReady();
     const output = lastFrame();
-    expect(output).toContain('Logged in with Google (test@example.com)');
+    expect(output).toContain('Signed in with Google (test@example.com)');
     unmount();
   });
 

packages/cli/src/ui/components/AboutBox.tsx

@@ -116,8 +116,8 @@ export const AboutBox: React.FC<AboutBoxProps> = ({
             <Text color={theme.text.primary}>
               {selectedAuthType.startsWith('oauth')
                 ? userEmail
-                  ? `Logged in with Google (${userEmail})`
-                  : 'Logged in with Google'
+                  ? `Signed in with Google (${userEmail})`
+                  : 'Signed in with Google'
                 : selectedAuthType}
             </Text>
           </Box>

packages/cli/src/ui/components/LogoutConfirmationDialog.test.tsx

@@ -28,9 +28,9 @@ describe('LogoutConfirmationDialog', () => {
     );
     await waitUntilReady();
 
-    expect(lastFrame()).toContain('You are now logged out.');
+    expect(lastFrame()).toContain('You are now signed out');
     expect(lastFrame()).toContain(
-      'Login again to continue using Gemini CLI, or exit the application.',
+      'Sign in again to continue using Gemini CLI, or exit the application.',
     );
     expect(lastFrame()).toContain('(Use Enter to select, Esc to close)');
     unmount();
@@ -45,7 +45,7 @@ describe('LogoutConfirmationDialog', () => {
     expect(RadioButtonSelect).toHaveBeenCalled();
     const mockCall = vi.mocked(RadioButtonSelect).mock.calls[0][0];
     expect(mockCall.items).toEqual([
-      { label: 'Login', value: LogoutChoice.LOGIN, key: 'login' },
+      { label: 'Sign in', value: LogoutChoice.LOGIN, key: 'login' },
       { label: 'Exit', value: LogoutChoice.EXIT, key: 'exit' },
     ]);
     expect(mockCall.isFocused).toBe(true);

packages/cli/src/ui/components/LogoutConfirmationDialog.tsx

@@ -37,7 +37,7 @@ export const LogoutConfirmationDialog: React.FC<
 
   const options: Array<RadioSelectItem<LogoutChoice>> = [
     {
-      label: 'Login',
+      label: 'Sign in',
       value: LogoutChoice.LOGIN,
       key: 'login',
     },
@@ -61,10 +61,10 @@ export const LogoutConfirmationDialog: React.FC<
       >
         <Box flexDirection="column" marginBottom={1}>
           <Text bold color={theme.text.primary}>
-            You are now logged out.
+            You are now signed out
           </Text>
           <Text color={theme.text.secondary}>
-            Login again to continue using Gemini CLI, or exit the application.
+            Sign in again to continue using Gemini CLI, or exit the application.
           </Text>
         </Box>
 

packages/cli/src/ui/components/ModelStatsDisplay.test.tsx

@@ -539,7 +539,7 @@ describe('<ModelStatsDisplay />', () => {
 
     const output = lastFrame();
     expect(output).toContain('Auth Method:');
-    expect(output).toContain('Logged in with Google');
+    expect(output).toContain('Signed in with Google');
     expect(output).toContain('(test@example.com)');
     expect(output).toContain('Tier:');
     expect(output).toContain('Pro');

packages/cli/src/ui/components/ModelStatsDisplay.tsx

@@ -340,8 +340,8 @@ export const ModelStatsDisplay: React.FC<ModelStatsDisplayProps> = ({
           <Text color={theme.text.primary}>
             {selectedAuthType.startsWith('oauth')
               ? userEmail
-                ? `Logged in with Google (${userEmail})`
-                : 'Logged in with Google'
+                ? `Signed in with Google (${userEmail})`
+                : 'Signed in with Google'
               : selectedAuthType}
           </Text>
         </Box>

packages/cli/src/ui/components/StatsDisplay.test.tsx

@@ -616,7 +616,7 @@ describe('<StatsDisplay />', () => {
       const output = lastFrame();
 
       expect(output).toContain('Auth Method:');
-      expect(output).toContain('Logged in with Google (test@example.com)');
+      expect(output).toContain('Signed in with Google (test@example.com)');
       expect(output).toContain('Tier:');
       expect(output).toContain('Pro');
     });

packages/cli/src/ui/components/StatsDisplay.tsx

@@ -589,8 +589,8 @@ export const StatsDisplay: React.FC<StatsDisplayProps> = ({
             <Text color={theme.text.primary}>
               {selectedAuthType.startsWith('oauth')
                 ? userEmail
-                  ? `Logged in with Google (${userEmail})`
-                  : 'Logged in with Google'
+                  ? `Signed in with Google (${userEmail})`
+                  : 'Signed in with Google'
                 : selectedAuthType}
             </Text>
           </StatRow>

packages/cli/src/ui/components/UserIdentity.test.tsx

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -45,7 +45,7 @@ describe('<UserIdentity />', () => {
     await waitUntilReady();
 
     const output = lastFrame();
-    expect(output).toContain('test@example.com');
+    expect(output).toContain('Signed in with Google: test@example.com');
     expect(output).toContain('/auth');
     expect(output).not.toContain('/upgrade');
     unmount();
@@ -91,7 +91,8 @@ describe('<UserIdentity />', () => {
     await waitUntilReady();
 
     const output = lastFrame();
-    expect(output).toContain('Logged in with Google');
+    expect(output).toContain('Signed in with Google');
+    expect(output).not.toContain('Signed in with Google:');
     expect(output).toContain('/auth');
     expect(output).not.toContain('/upgrade');
     unmount();
@@ -111,11 +112,20 @@ describe('<UserIdentity />', () => {
     await waitUntilReady();
 
     const output = lastFrame();
-    expect(output).toContain('test@example.com');
+    expect(output).toContain('Signed in with Google: test@example.com');
     expect(output).toContain('/auth');
-    expect(output).toContain('Premium Plan');
+    expect(output).toContain('Plan: Premium Plan');
     expect(output).toContain('/upgrade');
 
+    // Check for two lines (or more if wrapped, but here it should be separate)
+    const lines = output?.split('\n').filter((line) => line.trim().length > 0);
+    expect(lines?.some((line) => line.includes('Signed in with Google'))).toBe(
+      true,
+    );
+    expect(lines?.some((line) => line.includes('Plan: Premium Plan'))).toBe(
+      true,
+    );
+
     unmount();
   });
 
@@ -168,7 +178,7 @@ describe('<UserIdentity />', () => {
     await waitUntilReady();
 
     const output = lastFrame();
-    expect(output).toContain('Enterprise Tier');
+    expect(output).toContain('Plan: Enterprise Tier');
     expect(output).toContain('/upgrade');
     unmount();
   });

packages/cli/src/ui/components/UserIdentity.tsx

@@ -43,7 +43,10 @@ export const UserIdentity: React.FC<UserIdentityProps> = ({ config }) => {
       <Box>
         <Text color={theme.text.primary} wrap="truncate-end">
           {authType === AuthType.LOGIN_WITH_GOOGLE ? (
-            <Text>{email ?? 'Logged in with Google'}</Text>
+            <Text>
+              <Text bold>Signed in with Google{email ? ':' : ''}</Text>
+              {email ? ` ${email}` : ''}
+            </Text>
           ) : (
             `Authenticated with ${authType}`
           )}
@@ -55,7 +58,7 @@ export const UserIdentity: React.FC<UserIdentityProps> = ({ config }) => {
       {tierName && (
         <Box>
           <Text color={theme.text.primary} wrap="truncate-end">
-            {tierName}
+            <Text bold>Plan:</Text> {tierName}
           </Text>
           <Text color={theme.text.secondary}> /upgrade</Text>
         </Box>

packages/cli/src/ui/components/ValidationDialog.tsx

@@ -136,7 +136,7 @@ export function ValidationDialog({
           <CliSpinner />
           <Text>
             {' '}
-            Waiting for verification... (Press ESC or CTRL+C to cancel)
+            Waiting for verification... (Press Esc or Ctrl+C to cancel)
           </Text>
         </Box>
         {errorMessage && (