refactor(cli): categorize built-in themes into dark/ and light/ directories (google-gemini#18634)

Author: JayadityaGit

packages/cli/src/config/settings.ts

@@ -20,8 +20,8 @@ import {
   type AdminControlsSettings,
 } from '@google/gemini-cli-core';
 import stripJsonComments from 'strip-json-comments';
-import { DefaultLight } from '../ui/themes/default-light.js';
-import { DefaultDark } from '../ui/themes/default.js';
+import { DefaultLight } from '../ui/themes/builtin/light/default-light.js';
+import { DefaultDark } from '../ui/themes/builtin/dark/default-dark.js';
 import { isWorkspaceTrusted } from './trustedFolders.js';
 import {
   type Settings,

packages/cli/src/test-utils/render.tsx

@@ -50,7 +50,7 @@ import { AppContext, type AppState } from '../ui/contexts/AppContext.js';
 import { createMockSettings } from './settings.js';
 import { SessionStatsProvider } from '../ui/contexts/SessionContext.js';
 import { themeManager, DEFAULT_THEME } from '../ui/themes/theme-manager.js';
-import { DefaultLight } from '../ui/themes/default-light.js';
+import { DefaultLight } from '../ui/themes/builtin/light/default-light.js';
 import { pickDefaultThemeName } from '../ui/themes/theme.js';
 import { generateSvgForTerminal } from './svg.js';
 

packages/cli/src/ui/hooks/useSnowfall.test.tsx

@@ -23,7 +23,7 @@ vi.mock('../themes/theme-manager.js', () => ({
   DEFAULT_THEME: { name: 'Default' },
 }));
 
-vi.mock('../themes/holiday.js', () => ({
+vi.mock('../themes/builtin/dark/holiday-dark.js', () => ({
   Holiday: { name: 'Holiday' },
 }));
 

packages/cli/src/ui/hooks/useSnowfall.ts

@@ -8,7 +8,7 @@ import { useState, useEffect, useMemo } from 'react';
 import { getAsciiArtWidth } from '../utils/textUtils.js';
 import { debugState } from '../debug.js';
 import { themeManager } from '../themes/theme-manager.js';
-import { Holiday } from '../themes/holiday.js';
+import { Holiday } from '../themes/builtin/dark/holiday-dark.js';
 import { useUIState } from '../contexts/UIStateContext.js';
 import { useTerminalSize } from './useTerminalSize.js';
 import { shortAsciiLogo } from '../components/AsciiArt.js';

packages/cli/src/ui/hooks/useTerminalTheme.test.tsx

@@ -65,7 +65,7 @@ vi.mock('../themes/theme-manager.js', async (importOriginal) => {
   };
 });
 
-vi.mock('../themes/default-light.js', () => ({
+vi.mock('../themes/builtin/light/default-light.js', () => ({
   DefaultLight: { name: 'default-light' },
 }));
 

packages/cli/src/ui/hooks/useTerminalTheme.ts

@@ -11,7 +11,7 @@ import {
   shouldSwitchTheme,
 } from '../themes/color-utils.js';
 import { themeManager, DEFAULT_THEME } from '../themes/theme-manager.js';
-import { DefaultLight } from '../themes/default-light.js';
+import { DefaultLight } from '../themes/builtin/light/default-light.js';
 import { useSettings } from '../contexts/SettingsContext.js';
 import type { Config } from '@google/gemini-cli-core';
 import { useTerminalContext } from '../contexts/TerminalContext.js';

packages/cli/src/ui/themes/ansi.ts …/src/ui/themes/builtin/dark/ansi-dark.tspackages/cli/src/ui/themes/ansi.ts renamed to packages/cli/src/ui/themes/builtin/dark/ansi-dark.ts packages/cli/src/ui/themes/ansi.ts renamed to packages/cli/src/ui/themes/builtin/dark/ansi-dark.ts

@@ -1,11 +1,11 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { darkSemanticColors } from './semantic-tokens.js';
+import { type ColorsTheme, Theme } from '../../theme.js';
+import { darkSemanticColors } from '../../semantic-tokens.js';
 
 const ansiColors: ColorsTheme = {
   type: 'dark',

…kages/cli/src/ui/themes/atom-one-dark.ts …/ui/themes/builtin/dark/atom-one-dark.tspackages/cli/src/ui/themes/atom-one-dark.ts renamed to packages/cli/src/ui/themes/builtin/dark/atom-one-dark.ts packages/cli/src/ui/themes/atom-one-dark.ts renamed to packages/cli/src/ui/themes/builtin/dark/atom-one-dark.ts

@@ -1,11 +1,11 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { interpolateColor } from './color-utils.js';
+import { type ColorsTheme, Theme } from '../../theme.js';
+import { interpolateColor } from '../../color-utils.js';
 
 const atomOneDarkColors: ColorsTheme = {
   type: 'dark',

packages/cli/src/ui/themes/ayu.ts …i/src/ui/themes/builtin/dark/ayu-dark.tspackages/cli/src/ui/themes/ayu.ts renamed to packages/cli/src/ui/themes/builtin/dark/ayu-dark.ts packages/cli/src/ui/themes/ayu.ts renamed to packages/cli/src/ui/themes/builtin/dark/ayu-dark.ts

@@ -1,11 +1,11 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { interpolateColor } from './color-utils.js';
+import { type ColorsTheme, Theme } from '../../theme.js';
+import { interpolateColor } from '../../color-utils.js';
 
 const ayuDarkColors: ColorsTheme = {
   type: 'dark',

packages/cli/src/ui/themes/default.ts …c/ui/themes/builtin/dark/default-dark.tspackages/cli/src/ui/themes/default.ts renamed to packages/cli/src/ui/themes/builtin/dark/default-dark.ts packages/cli/src/ui/themes/default.ts renamed to packages/cli/src/ui/themes/builtin/dark/default-dark.ts

@@ -1,10 +1,10 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { darkTheme, Theme } from './theme.js';
+import { darkTheme, Theme } from '../../theme.js';
 
 export const DefaultDark: Theme = new Theme(
   'Default',