Revert "feat: add explicit license selection and status visibility (#6751)" (#7057)

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

@@ -6,12 +6,12 @@
 
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
 import { aboutCommand } from './aboutCommand.js';
-import type { CommandContext } from './types.js';
+import { type CommandContext } from './types.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
 import * as versionUtils from '../../utils/version.js';
 import { MessageType } from '../types.js';
 
-import type { IdeClient } from '@google/gemini-cli-core';
+import type { IdeClient } from '../../../../core/src/ide/ide-client.js';
 
 vi.mock('../../utils/version.js', () => ({
   getCliVersion: vi.fn(),
@@ -29,11 +29,10 @@ describe('aboutCommand', () => {
           getModel: vi.fn(),
           getIdeClient: vi.fn(),
           getIdeMode: vi.fn().mockReturnValue(true),
-          getGeminiClient: vi.fn(),
         },
         settings: {
           merged: {
-            selectedAuthType: 'oauth-gca',
+            selectedAuthType: 'test-auth',
           },
         },
       },
@@ -53,11 +52,6 @@ describe('aboutCommand', () => {
     vi.spyOn(mockContext.services.config!, 'getIdeClient').mockReturnValue({
       getDetectedIdeDisplayName: vi.fn().mockReturnValue('test-ide'),
     } as Partial<IdeClient> as IdeClient);
-    vi.spyOn(mockContext.services.config!, 'getGeminiClient').mockReturnValue({
-      getUserTier: vi.fn().mockReturnValue(undefined),
-    } as unknown as ReturnType<
-      NonNullable<typeof mockContext.services.config>['getGeminiClient']
-    >);
   });
 
   afterEach(() => {
@@ -89,10 +83,9 @@ describe('aboutCommand', () => {
         osVersion: 'test-os',
         sandboxEnv: 'no sandbox',
         modelVersion: 'test-model',
-        selectedAuthType: 'oauth-gca',
+        selectedAuthType: 'test-auth',
         gcpProject: 'test-gcp-project',
         ideClient: 'test-ide',
-        userTier: undefined,
       },
       expect.any(Number),
     );
@@ -132,14 +125,11 @@ describe('aboutCommand', () => {
   });
 
   it('should not show ide client when it is not detected', async () => {
-    // Change to oauth type that doesn't use GCP project
-    mockContext.services.settings.merged.selectedAuthType = 'oauth';
-
     vi.spyOn(mockContext.services.config!, 'getIdeClient').mockReturnValue({
       getDetectedIdeDisplayName: vi.fn().mockReturnValue(undefined),
     } as Partial<IdeClient> as IdeClient);
 
-    process.env['SANDBOX'] = '';
+    process.env.SANDBOX = '';
     if (!aboutCommand.action) {
       throw new Error('The about command must have an action.');
     }
@@ -153,8 +143,8 @@ describe('aboutCommand', () => {
         osVersion: 'test-os',
         sandboxEnv: 'no sandbox',
         modelVersion: 'test-model',
-        selectedAuthType: 'oauth',
-        gcpProject: '',
+        selectedAuthType: 'test-auth',
+        gcpProject: 'test-gcp-project',
         ideClient: '',
       }),
       expect.any(Number),

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

@@ -28,18 +28,11 @@ export const aboutCommand: SlashCommand = {
     const cliVersion = await getCliVersion();
     const selectedAuthType =
       context.services.settings.merged.selectedAuthType || '';
-    // Only show GCP Project for auth types that actually use it
-    const gcpProject =
-      selectedAuthType === 'oauth-gca' ||
-      selectedAuthType === 'vertex-ai' ||
-      selectedAuthType === 'cloud-shell'
-        ? process.env['GOOGLE_CLOUD_PROJECT'] || ''
-        : '';
+    const gcpProject = process.env['GOOGLE_CLOUD_PROJECT'] || '';
     const ideClient =
       (context.services.config?.getIdeMode() &&
         context.services.config?.getIdeClient()?.getDetectedIdeDisplayName()) ||
       '';
-    const userTier = context.services.config?.getGeminiClient()?.getUserTier();
 
     const aboutItem: Omit<HistoryItemAbout, 'id'> = {
       type: MessageType.ABOUT,
@@ -50,7 +43,6 @@ export const aboutCommand: SlashCommand = {
       selectedAuthType,
       gcpProject,
       ideClient,
-      userTier,
     };
 
     context.ui.addItem(aboutItem, Date.now());

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

@@ -8,8 +8,6 @@ import type React from 'react';
 import { Box, Text } from 'ink';
 import { Colors } from '../colors.js';
 import { GIT_COMMIT_INFO } from '../../generated/git-commit.js';
-import type { UserTierId } from '@google/gemini-cli-core';
-import { getLicenseDisplay } from '../../utils/license.js';
 
 interface AboutBoxProps {
   cliVersion: string;
@@ -19,7 +17,6 @@ interface AboutBoxProps {
   selectedAuthType: string;
   gcpProject: string;
   ideClient: string;
-  userTier?: UserTierId;
 }
 
 export const AboutBox: React.FC<AboutBoxProps> = ({
@@ -30,7 +27,6 @@ export const AboutBox: React.FC<AboutBoxProps> = ({
   selectedAuthType,
   gcpProject,
   ideClient,
-  userTier,
 }) => (
   <Box
     borderStyle="round"
@@ -109,16 +105,6 @@ export const AboutBox: React.FC<AboutBoxProps> = ({
         </Text>
       </Box>
     </Box>
-    <Box flexDirection="row">
-      <Box width="35%">
-        <Text bold color={Colors.LightBlue}>
-          License
-        </Text>
-      </Box>
-      <Box>
-        <Text>{getLicenseDisplay(selectedAuthType, userTier)}</Text>
-      </Box>
-    </Box>
     {gcpProject && (
       <Box flexDirection="row">
         <Box width="35%">

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

@@ -64,14 +64,9 @@ export function AuthDialog({
   });
   const items = [
     {
-      label: 'Login with Google - Free Tier',
+      label: 'Login with Google',
       value: AuthType.LOGIN_WITH_GOOGLE,
     },
-    {
-      label:
-        'Login with Google - Gemini Code Assist (Requires GOOGLE_CLOUD_PROJECT)',
-      value: AuthType.LOGIN_WITH_GOOGLE_GCA,
-    },
     ...(process.env['CLOUD_SHELL'] === 'true'
       ? [
           {

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

@@ -74,7 +74,6 @@ export const HistoryItemDisplay: React.FC<HistoryItemDisplayProps> = ({
         selectedAuthType={item.selectedAuthType}
         gcpProject={item.gcpProject}
         ideClient={item.ideClient}
-        userTier={item.userTier}
       />
     )}
     {item.type === 'help' && commands && <Help commands={commands} />}

packages/cli/src/ui/types.ts

@@ -7,7 +7,6 @@
 import type {
   ToolCallConfirmationDetails,
   ToolResultDisplay,
-  UserTierId,
 } from '@google/gemini-cli-core';
 
 // Only defining the state enum needed by the UI
@@ -97,7 +96,6 @@ export type HistoryItemAbout = HistoryItemBase & {
   selectedAuthType: string;
   gcpProject: string;
   ideClient: string;
-  userTier?: UserTierId;
 };
 
 export type HistoryItemHelp = HistoryItemBase & {