feat(cli): add user identity info to stats command (#17612)

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

@@ -12,6 +12,17 @@ import { MessageType } from '../types.js';
 import { formatDuration } from '../utils/formatters.js';
 import type { Config } from '@google/gemini-cli-core';
 
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@google/gemini-cli-core')>();
+  return {
+    ...actual,
+    UserAccountManager: vi.fn().mockImplementation(() => ({
+      getCachedGoogleAccount: vi.fn().mockReturnValue('mock@example.com'),
+    })),
+  };
+});
+
 describe('statsCommand', () => {
   let mockContext: CommandContext;
   const startTime = new Date('2025-07-14T10:00:00.000Z');
@@ -40,6 +51,9 @@ describe('statsCommand', () => {
     expect(mockContext.ui.addItem).toHaveBeenCalledWith({
       type: MessageType.STATS,
       duration: expectedDuration,
+      selectedAuthType: '',
+      tier: undefined,
+      userEmail: 'mock@example.com',
     });
   });
 
@@ -48,8 +62,10 @@ describe('statsCommand', () => {
 
     const mockQuota = { buckets: [] };
     const mockRefreshUserQuota = vi.fn().mockResolvedValue(mockQuota);
+    const mockGetUserTierName = vi.fn().mockReturnValue('Basic');
     mockContext.services.config = {
       refreshUserQuota: mockRefreshUserQuota,
+      getUserTierName: mockGetUserTierName,
     } as unknown as Config;
 
     await statsCommand.action(mockContext, '');
@@ -58,6 +74,7 @@ describe('statsCommand', () => {
     expect(mockContext.ui.addItem).toHaveBeenCalledWith(
       expect.objectContaining({
         quotas: mockQuota,
+        tier: 'Basic',
       }),
     );
   });
@@ -73,6 +90,9 @@ describe('statsCommand', () => {
 
     expect(mockContext.ui.addItem).toHaveBeenCalledWith({
       type: MessageType.MODEL_STATS,
+      selectedAuthType: '',
+      tier: undefined,
+      userEmail: 'mock@example.com',
     });
   });
 

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

@@ -4,15 +4,33 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { HistoryItemStats } from '../types.js';
+import type {
+  HistoryItemStats,
+  HistoryItemModelStats,
+  HistoryItemToolStats,
+} from '../types.js';
 import { MessageType } from '../types.js';
 import { formatDuration } from '../utils/formatters.js';
+import { UserAccountManager } from '@google/gemini-cli-core';
 import {
   type CommandContext,
   type SlashCommand,
   CommandKind,
 } from './types.js';
 
+function getUserIdentity(context: CommandContext) {
+  const selectedAuthType =
+    context.services.settings.merged.security.auth.selectedType || '';
+
+  const userAccountManager = new UserAccountManager();
+  const cachedAccount = userAccountManager.getCachedGoogleAccount();
+  const userEmail = cachedAccount ?? undefined;
+
+  const tier = context.services.config?.getUserTierName();
+
+  return { selectedAuthType, userEmail, tier };
+}
+
 async function defaultSessionView(context: CommandContext) {
   const now = new Date();
   const { sessionStartTime } = context.session.stats;
@@ -25,9 +43,14 @@ async function defaultSessionView(context: CommandContext) {
   }
   const wallDuration = now.getTime() - sessionStartTime.getTime();
 
+  const { selectedAuthType, userEmail, tier } = getUserIdentity(context);
+
   const statsItem: HistoryItemStats = {
     type: MessageType.STATS,
     duration: formatDuration(wallDuration),
+    selectedAuthType,
+    userEmail,
+    tier,
   };
 
   if (context.services.config) {
@@ -65,9 +88,13 @@ export const statsCommand: SlashCommand = {
       kind: CommandKind.BUILT_IN,
       autoExecute: true,
       action: (context: CommandContext) => {
+        const { selectedAuthType, userEmail, tier } = getUserIdentity(context);
         context.ui.addItem({
           type: MessageType.MODEL_STATS,
-        });
+          selectedAuthType,
+          userEmail,
+          tier,
+        } as HistoryItemModelStats);
       },
     },
     {
@@ -78,7 +105,7 @@ export const statsCommand: SlashCommand = {
       action: (context: CommandContext) => {
         context.ui.addItem({
           type: MessageType.TOOL_STATS,
-        });
+        } as HistoryItemToolStats);
       },
     },
   ],