Add files using upload-large-folder tool

projects/ui/qwen-code/packages/cli/src/ui/themes/ansi.ts

@@ -0,0 +1,159 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { type ColorsTheme, Theme } from './theme.js';
+import { darkSemanticColors } from './semantic-tokens.js';
+
+const ansiColors: ColorsTheme = {
+  type: 'dark',
+  Background: 'black',
+  Foreground: 'white',
+  LightBlue: 'bluebright',
+  AccentBlue: 'blue',
+  AccentPurple: 'magenta',
+  AccentCyan: 'cyan',
+  AccentGreen: 'green',
+  AccentYellow: 'yellow',
+  AccentRed: 'red',
+  DiffAdded: '#003300',
+  DiffRemoved: '#4D0000',
+  Comment: 'gray',
+  Gray: 'gray',
+  GradientColors: ['cyan', 'green'],
+};
+
+export const ANSI: Theme = new Theme(
+  'ANSI',
+  'dark', // Consistent with its color palette base
+  {
+    hljs: {
+      display: 'block',
+      overflowX: 'auto',
+      padding: '0.5em',
+      background: 'black', // Mapped from #1E1E1E
+      color: 'white', // Mapped from #DCDCDC
+    },
+    'hljs-keyword': {
+      color: 'blue', // Mapped from #569CD6
+    },
+    'hljs-literal': {
+      color: 'blue', // Mapped from #569CD6
+    },
+    'hljs-symbol': {
+      color: 'blue', // Mapped from #569CD6
+    },
+    'hljs-name': {
+      color: 'blue', // Mapped from #569CD6
+    },
+    'hljs-link': {
+      color: 'blue', // Mapped from #569CD6
+      // textDecoration is ignored by Theme class
+    },
+    'hljs-built_in': {
+      color: 'cyan', // Mapped from #4EC9B0
+    },
+    'hljs-type': {
+      color: 'cyan', // Mapped from #4EC9B0
+    },
+    'hljs-number': {
+      color: 'green', // Mapped from #B8D7A3
+    },
+    'hljs-class': {
+      color: 'green', // Mapped from #B8D7A3
+    },
+    'hljs-string': {
+      color: 'yellow', // Mapped from #D69D85
+    },
+    'hljs-meta-string': {
+      color: 'yellow', // Mapped from #D69D85
+    },
+    'hljs-regexp': {
+      color: 'red', // Mapped from #9A5334
+    },
+    'hljs-template-tag': {
+      color: 'red', // Mapped from #9A5334
+    },
+    'hljs-subst': {
+      color: 'white', // Mapped from #DCDCDC
+    },
+    'hljs-function': {
+      color: 'white', // Mapped from #DCDCDC
+    },
+    'hljs-title': {
+      color: 'white', // Mapped from #DCDCDC
+    },
+    'hljs-params': {
+      color: 'white', // Mapped from #DCDCDC
+    },
+    'hljs-formula': {
+      color: 'white', // Mapped from #DCDCDC
+    },
+    'hljs-comment': {
+      color: 'green', // Mapped from #57A64A
+      // fontStyle is ignored by Theme class
+    },
+    'hljs-quote': {
+      color: 'green', // Mapped from #57A64A
+      // fontStyle is ignored by Theme class
+    },
+    'hljs-doctag': {
+      color: 'green', // Mapped from #608B4E
+    },
+    'hljs-meta': {
+      color: 'gray', // Mapped from #9B9B9B
+    },
+    'hljs-meta-keyword': {
+      color: 'gray', // Mapped from #9B9B9B
+    },
+    'hljs-tag': {
+      color: 'gray', // Mapped from #9B9B9B
+    },
+    'hljs-variable': {
+      color: 'magenta', // Mapped from #BD63C5
+    },
+    'hljs-template-variable': {
+      color: 'magenta', // Mapped from #BD63C5
+    },
+    'hljs-attr': {
+      color: 'bluebright', // Mapped from #9CDCFE
+    },
+    'hljs-attribute': {
+      color: 'bluebright', // Mapped from #9CDCFE
+    },
+    'hljs-builtin-name': {
+      color: 'bluebright', // Mapped from #9CDCFE
+    },
+    'hljs-section': {
+      color: 'yellow', // Mapped from gold
+    },
+    'hljs-emphasis': {
+      // fontStyle is ignored by Theme class
+    },
+    'hljs-strong': {
+      // fontWeight is ignored by Theme class
+    },
+    'hljs-bullet': {
+      color: 'yellow', // Mapped from #D7BA7D
+    },
+    'hljs-selector-tag': {
+      color: 'yellow', // Mapped from #D7BA7D
+    },
+    'hljs-selector-id': {
+      color: 'yellow', // Mapped from #D7BA7D
+    },
+    'hljs-selector-class': {
+      color: 'yellow', // Mapped from #D7BA7D
+    },
+    'hljs-selector-attr': {
+      color: 'yellow', // Mapped from #D7BA7D
+    },
+    'hljs-selector-pseudo': {
+      color: 'yellow', // Mapped from #D7BA7D
+    },
+  },
+  ansiColors,
+  darkSemanticColors,
+);

projects/ui/qwen-code/packages/cli/src/ui/themes/atom-one-dark.ts

@@ -0,0 +1,147 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { type ColorsTheme, Theme } from './theme.js';
+import { darkSemanticColors } from './semantic-tokens.js';
+
+const atomOneDarkColors: ColorsTheme = {
+  type: 'dark',
+  Background: '#282c34',
+  Foreground: '#abb2bf',
+  LightBlue: '#61aeee',
+  AccentBlue: '#61aeee',
+  AccentPurple: '#c678dd',
+  AccentCyan: '#56b6c2',
+  AccentGreen: '#98c379',
+  AccentYellow: '#e6c07b',
+  AccentRed: '#e06c75',
+  DiffAdded: '#39544E',
+  DiffRemoved: '#562B2F',
+  Comment: '#5c6370',
+  Gray: '#5c6370',
+  GradientColors: ['#61aeee', '#98c379'],
+};
+
+export const AtomOneDark: Theme = new Theme(
+  'Atom One',
+  'dark',
+  {
+    hljs: {
+      display: 'block',
+      overflowX: 'auto',
+      padding: '0.5em',
+      color: atomOneDarkColors.Foreground,
+      background: atomOneDarkColors.Background,
+    },
+    'hljs-comment': {
+      color: atomOneDarkColors.Comment,
+      fontStyle: 'italic',
+    },
+    'hljs-quote': {
+      color: atomOneDarkColors.Comment,
+      fontStyle: 'italic',
+    },
+    'hljs-doctag': {
+      color: atomOneDarkColors.AccentPurple,
+    },
+    'hljs-keyword': {
+      color: atomOneDarkColors.AccentPurple,
+    },
+    'hljs-formula': {
+      color: atomOneDarkColors.AccentPurple,
+    },
+    'hljs-section': {
+      color: atomOneDarkColors.AccentRed,
+    },
+    'hljs-name': {
+      color: atomOneDarkColors.AccentRed,
+    },
+    'hljs-selector-tag': {
+      color: atomOneDarkColors.AccentRed,
+    },
+    'hljs-deletion': {
+      color: atomOneDarkColors.AccentRed,
+    },
+    'hljs-subst': {
+      color: atomOneDarkColors.AccentRed,
+    },
+    'hljs-literal': {
+      color: atomOneDarkColors.AccentCyan,
+    },
+    'hljs-string': {
+      color: atomOneDarkColors.AccentGreen,
+    },
+    'hljs-regexp': {
+      color: atomOneDarkColors.AccentGreen,
+    },
+    'hljs-addition': {
+      color: atomOneDarkColors.AccentGreen,
+    },
+    'hljs-attribute': {
+      color: atomOneDarkColors.AccentGreen,
+    },
+    'hljs-meta-string': {
+      color: atomOneDarkColors.AccentGreen,
+    },
+    'hljs-built_in': {
+      color: atomOneDarkColors.AccentYellow,
+    },
+    'hljs-class .hljs-title': {
+      color: atomOneDarkColors.AccentYellow,
+    },
+    'hljs-attr': {
+      color: atomOneDarkColors.AccentYellow,
+    },
+    'hljs-variable': {
+      color: atomOneDarkColors.AccentYellow,
+    },
+    'hljs-template-variable': {
+      color: atomOneDarkColors.AccentYellow,
+    },
+    'hljs-type': {
+      color: atomOneDarkColors.AccentYellow,
+    },
+    'hljs-selector-class': {
+      color: atomOneDarkColors.AccentYellow,
+    },
+    'hljs-selector-attr': {
+      color: atomOneDarkColors.AccentYellow,
+    },
+    'hljs-selector-pseudo': {
+      color: atomOneDarkColors.AccentYellow,
+    },
+    'hljs-number': {
+      color: atomOneDarkColors.AccentYellow,
+    },
+    'hljs-symbol': {
+      color: atomOneDarkColors.AccentBlue,
+    },
+    'hljs-bullet': {
+      color: atomOneDarkColors.AccentBlue,
+    },
+    'hljs-link': {
+      color: atomOneDarkColors.AccentBlue,
+      textDecoration: 'underline',
+    },
+    'hljs-meta': {
+      color: atomOneDarkColors.AccentBlue,
+    },
+    'hljs-selector-id': {
+      color: atomOneDarkColors.AccentBlue,
+    },
+    'hljs-title': {
+      color: atomOneDarkColors.AccentBlue,
+    },
+    'hljs-emphasis': {
+      fontStyle: 'italic',
+    },
+    'hljs-strong': {
+      fontWeight: 'bold',
+    },
+  },
+  atomOneDarkColors,
+  darkSemanticColors,
+);

projects/ui/qwen-code/packages/cli/src/ui/themes/ayu-light.ts

@@ -0,0 +1,139 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { type ColorsTheme, Theme } from './theme.js';
+import { lightSemanticColors } from './semantic-tokens.js';
+
+const ayuLightColors: ColorsTheme = {
+  type: 'light',
+  Background: '#f8f9fa',
+  Foreground: '#5c6166',
+  LightBlue: '#55b4d4',
+  AccentBlue: '#399ee6',
+  AccentPurple: '#a37acc',
+  AccentCyan: '#4cbf99',
+  AccentGreen: '#86b300',
+  AccentYellow: '#f2ae49',
+  AccentRed: '#f07171',
+  DiffAdded: '#C6EAD8',
+  DiffRemoved: '#FFCCCC',
+  Comment: '#ABADB1',
+  Gray: '#a6aaaf',
+  GradientColors: ['#399ee6', '#86b300'],
+};
+
+export const AyuLight: Theme = new Theme(
+  'Ayu Light',
+  'light',
+  {
+    hljs: {
+      display: 'block',
+      overflowX: 'auto',
+      padding: '0.5em',
+      background: ayuLightColors.Background,
+      color: ayuLightColors.Foreground,
+    },
+    'hljs-comment': {
+      color: ayuLightColors.Comment,
+      fontStyle: 'italic',
+    },
+    'hljs-quote': {
+      color: ayuLightColors.AccentCyan,
+      fontStyle: 'italic',
+    },
+    'hljs-string': {
+      color: ayuLightColors.AccentGreen,
+    },
+    'hljs-constant': {
+      color: ayuLightColors.AccentCyan,
+    },
+    'hljs-number': {
+      color: ayuLightColors.AccentPurple,
+    },
+    'hljs-keyword': {
+      color: ayuLightColors.AccentYellow,
+    },
+    'hljs-selector-tag': {
+      color: ayuLightColors.AccentYellow,
+    },
+    'hljs-attribute': {
+      color: ayuLightColors.AccentYellow,
+    },
+    'hljs-variable': {
+      color: ayuLightColors.Foreground,
+    },
+    'hljs-variable.language': {
+      color: ayuLightColors.LightBlue,
+      fontStyle: 'italic',
+    },
+    'hljs-title': {
+      color: ayuLightColors.AccentBlue,
+    },
+    'hljs-section': {
+      color: ayuLightColors.AccentGreen,
+      fontWeight: 'bold',
+    },
+    'hljs-type': {
+      color: ayuLightColors.LightBlue,
+    },
+    'hljs-class .hljs-title': {
+      color: ayuLightColors.AccentBlue,
+    },
+    'hljs-tag': {
+      color: ayuLightColors.LightBlue,
+    },
+    'hljs-name': {
+      color: ayuLightColors.AccentBlue,
+    },
+    'hljs-builtin-name': {
+      color: ayuLightColors.AccentYellow,
+    },
+    'hljs-meta': {
+      color: ayuLightColors.AccentYellow,
+    },
+    'hljs-symbol': {
+      color: ayuLightColors.AccentRed,
+    },
+    'hljs-bullet': {
+      color: ayuLightColors.AccentYellow,
+    },
+    'hljs-regexp': {
+      color: ayuLightColors.AccentCyan,
+    },
+    'hljs-link': {
+      color: ayuLightColors.LightBlue,
+    },
+    'hljs-deletion': {
+      color: ayuLightColors.AccentRed,
+    },
+    'hljs-addition': {
+      color: ayuLightColors.AccentGreen,
+    },
+    'hljs-emphasis': {
+      fontStyle: 'italic',
+    },
+    'hljs-strong': {
+      fontWeight: 'bold',
+    },
+    'hljs-literal': {
+      color: ayuLightColors.AccentCyan,
+    },
+    'hljs-built_in': {
+      color: ayuLightColors.AccentRed,
+    },
+    'hljs-doctag': {
+      color: ayuLightColors.AccentRed,
+    },
+    'hljs-template-variable': {
+      color: ayuLightColors.AccentCyan,
+    },
+    'hljs-selector-id': {
+      color: ayuLightColors.AccentRed,
+    },
+  },
+  ayuLightColors,
+  lightSemanticColors,
+);

projects/ui/qwen-code/packages/cli/src/ui/themes/ayu.ts

@@ -0,0 +1,113 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { type ColorsTheme, Theme } from './theme.js';
+import { darkSemanticColors } from './semantic-tokens.js';
+
+const ayuDarkColors: ColorsTheme = {
+  type: 'dark',
+  Background: '#0b0e14',
+  Foreground: '#bfbdb6',
+  LightBlue: '#59C2FF',
+  AccentBlue: '#39BAE6',
+  AccentPurple: '#D2A6FF',
+  AccentCyan: '#95E6CB',
+  AccentGreen: '#AAD94C',
+  AccentYellow: '#FFB454',
+  AccentRed: '#F26D78',
+  DiffAdded: '#293022',
+  DiffRemoved: '#3D1215',
+  Comment: '#646A71',
+  Gray: '#3D4149',
+  GradientColors: ['#FFB454', '#F26D78'],
+};
+
+export const AyuDark: Theme = new Theme(
+  'Ayu',
+  'dark',
+  {
+    hljs: {
+      display: 'block',
+      overflowX: 'auto',
+      padding: '0.5em',
+      background: ayuDarkColors.Background,
+      color: ayuDarkColors.Foreground,
+    },
+    'hljs-keyword': {
+      color: ayuDarkColors.AccentYellow,
+    },
+    'hljs-literal': {
+      color: ayuDarkColors.AccentPurple,
+    },
+    'hljs-symbol': {
+      color: ayuDarkColors.AccentCyan,
+    },
+    'hljs-name': {
+      color: ayuDarkColors.LightBlue,
+    },
+    'hljs-link': {
+      color: ayuDarkColors.AccentBlue,
+    },
+    'hljs-function .hljs-keyword': {
+      color: ayuDarkColors.AccentYellow,
+    },
+    'hljs-subst': {
+      color: ayuDarkColors.Foreground,
+    },
+    'hljs-string': {
+      color: ayuDarkColors.AccentGreen,
+    },
+    'hljs-title': {
+      color: ayuDarkColors.AccentYellow,
+    },
+    'hljs-type': {
+      color: ayuDarkColors.AccentBlue,
+    },
+    'hljs-attribute': {
+      color: ayuDarkColors.AccentYellow,
+    },
+    'hljs-bullet': {
+      color: ayuDarkColors.AccentYellow,
+    },
+    'hljs-addition': {
+      color: ayuDarkColors.AccentGreen,
+    },
+    'hljs-variable': {
+      color: ayuDarkColors.Foreground,
+    },
+    'hljs-template-tag': {
+      color: ayuDarkColors.AccentYellow,
+    },
+    'hljs-template-variable': {
+      color: ayuDarkColors.AccentYellow,
+    },
+    'hljs-comment': {
+      color: ayuDarkColors.Comment,
+      fontStyle: 'italic',
+    },
+    'hljs-quote': {
+      color: ayuDarkColors.AccentCyan,
+      fontStyle: 'italic',
+    },
+    'hljs-deletion': {
+      color: ayuDarkColors.AccentRed,
+    },
+    'hljs-meta': {
+      color: ayuDarkColors.AccentYellow,
+    },
+    'hljs-doctag': {
+      fontWeight: 'bold',
+    },
+    'hljs-strong': {
+      fontWeight: 'bold',
+    },
+    'hljs-emphasis': {
+      fontStyle: 'italic',
+    },
+  },
+  ayuDarkColors,
+  darkSemanticColors,
+);

projects/ui/qwen-code/packages/cli/src/ui/themes/color-utils.test.ts

@@ -0,0 +1,221 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect } from 'vitest';
+import {
+  isValidColor,
+  resolveColor,
+  CSS_NAME_TO_HEX_MAP,
+  INK_SUPPORTED_NAMES,
+} from './color-utils.js';
+
+describe('Color Utils', () => {
+  describe('isValidColor', () => {
+    it('should validate hex colors', () => {
+      expect(isValidColor('#ff0000')).toBe(true);
+      expect(isValidColor('#00ff00')).toBe(true);
+      expect(isValidColor('#0000ff')).toBe(true);
+      expect(isValidColor('#fff')).toBe(true);
+      expect(isValidColor('#000')).toBe(true);
+      expect(isValidColor('#FF0000')).toBe(true); // Case insensitive
+    });
+
+    it('should validate Ink-supported color names', () => {
+      expect(isValidColor('black')).toBe(true);
+      expect(isValidColor('red')).toBe(true);
+      expect(isValidColor('green')).toBe(true);
+      expect(isValidColor('yellow')).toBe(true);
+      expect(isValidColor('blue')).toBe(true);
+      expect(isValidColor('cyan')).toBe(true);
+      expect(isValidColor('magenta')).toBe(true);
+      expect(isValidColor('white')).toBe(true);
+      expect(isValidColor('gray')).toBe(true);
+      expect(isValidColor('grey')).toBe(true);
+      expect(isValidColor('blackbright')).toBe(true);
+      expect(isValidColor('redbright')).toBe(true);
+      expect(isValidColor('greenbright')).toBe(true);
+      expect(isValidColor('yellowbright')).toBe(true);
+      expect(isValidColor('bluebright')).toBe(true);
+      expect(isValidColor('cyanbright')).toBe(true);
+      expect(isValidColor('magentabright')).toBe(true);
+      expect(isValidColor('whitebright')).toBe(true);
+    });
+
+    it('should validate Ink-supported color names case insensitive', () => {
+      expect(isValidColor('BLACK')).toBe(true);
+      expect(isValidColor('Red')).toBe(true);
+      expect(isValidColor('GREEN')).toBe(true);
+    });
+
+    it('should validate CSS color names', () => {
+      expect(isValidColor('darkkhaki')).toBe(true);
+      expect(isValidColor('coral')).toBe(true);
+      expect(isValidColor('teal')).toBe(true);
+      expect(isValidColor('tomato')).toBe(true);
+      expect(isValidColor('turquoise')).toBe(true);
+      expect(isValidColor('violet')).toBe(true);
+      expect(isValidColor('wheat')).toBe(true);
+      expect(isValidColor('whitesmoke')).toBe(true);
+      expect(isValidColor('yellowgreen')).toBe(true);
+    });
+
+    it('should validate CSS color names case insensitive', () => {
+      expect(isValidColor('DARKKHAKI')).toBe(true);
+      expect(isValidColor('Coral')).toBe(true);
+      expect(isValidColor('TEAL')).toBe(true);
+    });
+
+    it('should reject invalid color names', () => {
+      expect(isValidColor('invalidcolor')).toBe(false);
+      expect(isValidColor('notacolor')).toBe(false);
+      expect(isValidColor('')).toBe(false);
+    });
+  });
+
+  describe('resolveColor', () => {
+    it('should resolve hex colors', () => {
+      expect(resolveColor('#ff0000')).toBe('#ff0000');
+      expect(resolveColor('#00ff00')).toBe('#00ff00');
+      expect(resolveColor('#0000ff')).toBe('#0000ff');
+      expect(resolveColor('#fff')).toBe('#fff');
+      expect(resolveColor('#000')).toBe('#000');
+    });
+
+    it('should resolve Ink-supported color names', () => {
+      expect(resolveColor('black')).toBe('black');
+      expect(resolveColor('red')).toBe('red');
+      expect(resolveColor('green')).toBe('green');
+      expect(resolveColor('yellow')).toBe('yellow');
+      expect(resolveColor('blue')).toBe('blue');
+      expect(resolveColor('cyan')).toBe('cyan');
+      expect(resolveColor('magenta')).toBe('magenta');
+      expect(resolveColor('white')).toBe('white');
+      expect(resolveColor('gray')).toBe('gray');
+      expect(resolveColor('grey')).toBe('grey');
+    });
+
+    it('should resolve CSS color names to hex', () => {
+      expect(resolveColor('darkkhaki')).toBe('#bdb76b');
+      expect(resolveColor('coral')).toBe('#ff7f50');
+      expect(resolveColor('teal')).toBe('#008080');
+      expect(resolveColor('tomato')).toBe('#ff6347');
+      expect(resolveColor('turquoise')).toBe('#40e0d0');
+      expect(resolveColor('violet')).toBe('#ee82ee');
+      expect(resolveColor('wheat')).toBe('#f5deb3');
+      expect(resolveColor('whitesmoke')).toBe('#f5f5f5');
+      expect(resolveColor('yellowgreen')).toBe('#9acd32');
+    });
+
+    it('should handle case insensitive color names', () => {
+      expect(resolveColor('DARKKHAKI')).toBe('#bdb76b');
+      expect(resolveColor('Coral')).toBe('#ff7f50');
+      expect(resolveColor('TEAL')).toBe('#008080');
+    });
+
+    it('should return undefined for invalid colors', () => {
+      expect(resolveColor('invalidcolor')).toBeUndefined();
+      expect(resolveColor('notacolor')).toBeUndefined();
+      expect(resolveColor('')).toBeUndefined();
+    });
+  });
+
+  describe('CSS_NAME_TO_HEX_MAP', () => {
+    it('should contain expected CSS color mappings', () => {
+      expect(CSS_NAME_TO_HEX_MAP['darkkhaki']).toBe('#bdb76b');
+      expect(CSS_NAME_TO_HEX_MAP['coral']).toBe('#ff7f50');
+      expect(CSS_NAME_TO_HEX_MAP['teal']).toBe('#008080');
+      expect(CSS_NAME_TO_HEX_MAP['tomato']).toBe('#ff6347');
+      expect(CSS_NAME_TO_HEX_MAP['turquoise']).toBe('#40e0d0');
+    });
+
+    it('should not contain Ink-supported color names', () => {
+      expect(CSS_NAME_TO_HEX_MAP['black']).toBeUndefined();
+      expect(CSS_NAME_TO_HEX_MAP['red']).toBeUndefined();
+      expect(CSS_NAME_TO_HEX_MAP['green']).toBeUndefined();
+      expect(CSS_NAME_TO_HEX_MAP['blue']).toBeUndefined();
+    });
+  });
+
+  describe('INK_SUPPORTED_NAMES', () => {
+    it('should contain all Ink-supported color names', () => {
+      expect(INK_SUPPORTED_NAMES.has('black')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('red')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('green')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('yellow')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('blue')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('cyan')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('magenta')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('white')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('gray')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('grey')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('blackbright')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('redbright')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('greenbright')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('yellowbright')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('bluebright')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('cyanbright')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('magentabright')).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has('whitebright')).toBe(true);
+    });
+
+    it('should not contain CSS color names', () => {
+      expect(INK_SUPPORTED_NAMES.has('darkkhaki')).toBe(false);
+      expect(INK_SUPPORTED_NAMES.has('coral')).toBe(false);
+      expect(INK_SUPPORTED_NAMES.has('teal')).toBe(false);
+    });
+  });
+
+  describe('Consistency between validation and resolution', () => {
+    it('should have consistent behavior between isValidColor and resolveColor', () => {
+      // Test that any color that isValidColor returns true for can be resolved
+      const testColors = [
+        '#ff0000',
+        '#00ff00',
+        '#0000ff',
+        '#fff',
+        '#000',
+        'black',
+        'red',
+        'green',
+        'yellow',
+        'blue',
+        'cyan',
+        'magenta',
+        'white',
+        'gray',
+        'grey',
+        'darkkhaki',
+        'coral',
+        'teal',
+        'tomato',
+        'turquoise',
+        'violet',
+        'wheat',
+        'whitesmoke',
+        'yellowgreen',
+      ];
+
+      for (const color of testColors) {
+        expect(isValidColor(color)).toBe(true);
+        expect(resolveColor(color)).toBeDefined();
+      }
+
+      // Test that invalid colors are consistently rejected
+      const invalidColors = [
+        'invalidcolor',
+        'notacolor',
+        '',
+        '#gg0000',
+        '#ff00',
+      ];
+
+      for (const color of invalidColors) {
+        expect(isValidColor(color)).toBe(false);
+        expect(resolveColor(color)).toBeUndefined();
+      }
+    });
+  });
+});

projects/ui/qwen-code/packages/cli/src/ui/themes/color-utils.ts

@@ -0,0 +1,231 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Mapping from common CSS color names (lowercase) to hex codes (lowercase)
+// Excludes names directly supported by Ink
+export const CSS_NAME_TO_HEX_MAP: Readonly<Record<string, string>> = {
+  aliceblue: '#f0f8ff',
+  antiquewhite: '#faebd7',
+  aqua: '#00ffff',
+  aquamarine: '#7fffd4',
+  azure: '#f0ffff',
+  beige: '#f5f5dc',
+  bisque: '#ffe4c4',
+  blanchedalmond: '#ffebcd',
+  blueviolet: '#8a2be2',
+  brown: '#a52a2a',
+  burlywood: '#deb887',
+  cadetblue: '#5f9ea0',
+  chartreuse: '#7fff00',
+  chocolate: '#d2691e',
+  coral: '#ff7f50',
+  cornflowerblue: '#6495ed',
+  cornsilk: '#fff8dc',
+  crimson: '#dc143c',
+  darkblue: '#00008b',
+  darkcyan: '#008b8b',
+  darkgoldenrod: '#b8860b',
+  darkgray: '#a9a9a9',
+  darkgrey: '#a9a9a9',
+  darkgreen: '#006400',
+  darkkhaki: '#bdb76b',
+  darkmagenta: '#8b008b',
+  darkolivegreen: '#556b2f',
+  darkorange: '#ff8c00',
+  darkorchid: '#9932cc',
+  darkred: '#8b0000',
+  darksalmon: '#e9967a',
+  darkseagreen: '#8fbc8f',
+  darkslateblue: '#483d8b',
+  darkslategray: '#2f4f4f',
+  darkslategrey: '#2f4f4f',
+  darkturquoise: '#00ced1',
+  darkviolet: '#9400d3',
+  deeppink: '#ff1493',
+  deepskyblue: '#00bfff',
+  dimgray: '#696969',
+  dimgrey: '#696969',
+  dodgerblue: '#1e90ff',
+  firebrick: '#b22222',
+  floralwhite: '#fffaf0',
+  forestgreen: '#228b22',
+  fuchsia: '#ff00ff',
+  gainsboro: '#dcdcdc',
+  ghostwhite: '#f8f8ff',
+  gold: '#ffd700',
+  goldenrod: '#daa520',
+  greenyellow: '#adff2f',
+  honeydew: '#f0fff0',
+  hotpink: '#ff69b4',
+  indianred: '#cd5c5c',
+  indigo: '#4b0082',
+  ivory: '#fffff0',
+  khaki: '#f0e68c',
+  lavender: '#e6e6fa',
+  lavenderblush: '#fff0f5',
+  lawngreen: '#7cfc00',
+  lemonchiffon: '#fffacd',
+  lightblue: '#add8e6',
+  lightcoral: '#f08080',
+  lightcyan: '#e0ffff',
+  lightgoldenrodyellow: '#fafad2',
+  lightgray: '#d3d3d3',
+  lightgrey: '#d3d3d3',
+  lightgreen: '#90ee90',
+  lightpink: '#ffb6c1',
+  lightsalmon: '#ffa07a',
+  lightseagreen: '#20b2aa',
+  lightskyblue: '#87cefa',
+  lightslategray: '#778899',
+  lightslategrey: '#778899',
+  lightsteelblue: '#b0c4de',
+  lightyellow: '#ffffe0',
+  lime: '#00ff00',
+  limegreen: '#32cd32',
+  linen: '#faf0e6',
+  maroon: '#800000',
+  mediumaquamarine: '#66cdaa',
+  mediumblue: '#0000cd',
+  mediumorchid: '#ba55d3',
+  mediumpurple: '#9370db',
+  mediumseagreen: '#3cb371',
+  mediumslateblue: '#7b68ee',
+  mediumspringgreen: '#00fa9a',
+  mediumturquoise: '#48d1cc',
+  mediumvioletred: '#c71585',
+  midnightblue: '#191970',
+  mintcream: '#f5fffa',
+  mistyrose: '#ffe4e1',
+  moccasin: '#ffe4b5',
+  navajowhite: '#ffdead',
+  navy: '#000080',
+  oldlace: '#fdf5e6',
+  olive: '#808000',
+  olivedrab: '#6b8e23',
+  orange: '#ffa500',
+  orangered: '#ff4500',
+  orchid: '#da70d6',
+  palegoldenrod: '#eee8aa',
+  palegreen: '#98fb98',
+  paleturquoise: '#afeeee',
+  palevioletred: '#db7093',
+  papayawhip: '#ffefd5',
+  peachpuff: '#ffdab9',
+  peru: '#cd853f',
+  pink: '#ffc0cb',
+  plum: '#dda0dd',
+  powderblue: '#b0e0e6',
+  purple: '#800080',
+  rebeccapurple: '#663399',
+  rosybrown: '#bc8f8f',
+  royalblue: '#4169e1',
+  saddlebrown: '#8b4513',
+  salmon: '#fa8072',
+  sandybrown: '#f4a460',
+  seagreen: '#2e8b57',
+  seashell: '#fff5ee',
+  sienna: '#a0522d',
+  silver: '#c0c0c0',
+  skyblue: '#87ceeb',
+  slateblue: '#6a5acd',
+  slategray: '#708090',
+  slategrey: '#708090',
+  snow: '#fffafa',
+  springgreen: '#00ff7f',
+  steelblue: '#4682b4',
+  tan: '#d2b48c',
+  teal: '#008080',
+  thistle: '#d8bfd8',
+  tomato: '#ff6347',
+  turquoise: '#40e0d0',
+  violet: '#ee82ee',
+  wheat: '#f5deb3',
+  whitesmoke: '#f5f5f5',
+  yellowgreen: '#9acd32',
+};
+
+// Define the set of Ink's named colors for quick lookup
+export const INK_SUPPORTED_NAMES = new Set([
+  'black',
+  'red',
+  'green',
+  'yellow',
+  'blue',
+  'cyan',
+  'magenta',
+  'white',
+  'gray',
+  'grey',
+  'blackbright',
+  'redbright',
+  'greenbright',
+  'yellowbright',
+  'bluebright',
+  'cyanbright',
+  'magentabright',
+  'whitebright',
+]);
+
+/**
+ * Checks if a color string is valid (hex, Ink-supported color name, or CSS color name).
+ * This function uses the same validation logic as the Theme class's _resolveColor method
+ * to ensure consistency between validation and resolution.
+ * @param color The color string to validate.
+ * @returns True if the color is valid.
+ */
+export function isValidColor(color: string): boolean {
+  const lowerColor = color.toLowerCase();
+
+  // 1. Check if it's a hex code
+  if (lowerColor.startsWith('#')) {
+    return /^#[0-9A-Fa-f]{3}([0-9A-Fa-f]{3})?$/.test(color);
+  }
+
+  // 2. Check if it's an Ink supported name
+  if (INK_SUPPORTED_NAMES.has(lowerColor)) {
+    return true;
+  }
+
+  // 3. Check if it's a known CSS name we can map to hex
+  if (CSS_NAME_TO_HEX_MAP[lowerColor]) {
+    return true;
+  }
+
+  // 4. Not a valid color
+  return false;
+}
+
+/**
+ * Resolves a CSS color value (name or hex) into an Ink-compatible color string.
+ * @param colorValue The raw color string (e.g., 'blue', '#ff0000', 'darkkhaki').
+ * @returns An Ink-compatible color string (hex or name), or undefined if not resolvable.
+ */
+export function resolveColor(colorValue: string): string | undefined {
+  const lowerColor = colorValue.toLowerCase();
+
+  // 1. Check if it's already a hex code and valid
+  if (lowerColor.startsWith('#')) {
+    if (/^#[0-9A-Fa-f]{3}([0-9A-Fa-f]{3})?$/.test(colorValue)) {
+      return lowerColor;
+    } else {
+      return undefined;
+    }
+  }
+  // 2. Check if it's an Ink supported name (lowercase)
+  else if (INK_SUPPORTED_NAMES.has(lowerColor)) {
+    return lowerColor; // Use Ink name directly
+  }
+  // 3. Check if it's a known CSS name we can map to hex
+  else if (CSS_NAME_TO_HEX_MAP[lowerColor]) {
+    return CSS_NAME_TO_HEX_MAP[lowerColor]; // Use mapped hex
+  }
+
+  // 4. Could not resolve
+  console.warn(
+    `[ColorUtils] Could not resolve color "${colorValue}" to an Ink-compatible format.`,
+  );
+  return undefined;
+}

projects/ui/qwen-code/packages/cli/src/ui/themes/default-light.ts

@@ -0,0 +1,108 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { lightTheme, Theme } from './theme.js';
+import { lightSemanticColors } from './semantic-tokens.js';
+
+export const DefaultLight: Theme = new Theme(
+  'Default Light',
+  'light',
+  {
+    hljs: {
+      display: 'block',
+      overflowX: 'auto',
+      padding: '0.5em',
+      background: lightTheme.Background,
+      color: lightTheme.Foreground,
+    },
+    'hljs-comment': {
+      color: lightTheme.Comment,
+    },
+    'hljs-quote': {
+      color: lightTheme.Comment,
+    },
+    'hljs-variable': {
+      color: lightTheme.Foreground,
+    },
+    'hljs-keyword': {
+      color: lightTheme.AccentBlue,
+    },
+    'hljs-selector-tag': {
+      color: lightTheme.AccentBlue,
+    },
+    'hljs-built_in': {
+      color: lightTheme.AccentBlue,
+    },
+    'hljs-name': {
+      color: lightTheme.AccentBlue,
+    },
+    'hljs-tag': {
+      color: lightTheme.AccentBlue,
+    },
+    'hljs-string': {
+      color: lightTheme.AccentRed,
+    },
+    'hljs-title': {
+      color: lightTheme.AccentRed,
+    },
+    'hljs-section': {
+      color: lightTheme.AccentRed,
+    },
+    'hljs-attribute': {
+      color: lightTheme.AccentRed,
+    },
+    'hljs-literal': {
+      color: lightTheme.AccentRed,
+    },
+    'hljs-template-tag': {
+      color: lightTheme.AccentRed,
+    },
+    'hljs-template-variable': {
+      color: lightTheme.AccentRed,
+    },
+    'hljs-type': {
+      color: lightTheme.AccentRed,
+    },
+    'hljs-addition': {
+      color: lightTheme.AccentGreen,
+    },
+    'hljs-deletion': {
+      color: lightTheme.AccentRed,
+    },
+    'hljs-selector-attr': {
+      color: lightTheme.AccentCyan,
+    },
+    'hljs-selector-pseudo': {
+      color: lightTheme.AccentCyan,
+    },
+    'hljs-meta': {
+      color: lightTheme.AccentCyan,
+    },
+    'hljs-doctag': {
+      color: lightTheme.Gray,
+    },
+    'hljs-attr': {
+      color: lightTheme.AccentRed,
+    },
+    'hljs-symbol': {
+      color: lightTheme.AccentCyan,
+    },
+    'hljs-bullet': {
+      color: lightTheme.AccentCyan,
+    },
+    'hljs-link': {
+      color: lightTheme.AccentCyan,
+    },
+    'hljs-emphasis': {
+      fontStyle: 'italic',
+    },
+    'hljs-strong': {
+      fontWeight: 'bold',
+    },
+  },
+  lightTheme,
+  lightSemanticColors,
+);

projects/ui/qwen-code/packages/cli/src/ui/themes/default.ts

@@ -0,0 +1,151 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { darkTheme, Theme } from './theme.js';
+import { darkSemanticColors } from './semantic-tokens.js';
+
+export const DefaultDark: Theme = new Theme(
+  'Default',
+  'dark',
+  {
+    hljs: {
+      display: 'block',
+      overflowX: 'auto',
+      padding: '0.5em',
+      background: darkTheme.Background,
+      color: darkTheme.Foreground,
+    },
+    'hljs-keyword': {
+      color: darkTheme.AccentBlue,
+    },
+    'hljs-literal': {
+      color: darkTheme.AccentBlue,
+    },
+    'hljs-symbol': {
+      color: darkTheme.AccentBlue,
+    },
+    'hljs-name': {
+      color: darkTheme.AccentBlue,
+    },
+    'hljs-link': {
+      color: darkTheme.AccentBlue,
+      textDecoration: 'underline',
+    },
+    'hljs-built_in': {
+      color: darkTheme.AccentCyan,
+    },
+    'hljs-type': {
+      color: darkTheme.AccentCyan,
+    },
+    'hljs-number': {
+      color: darkTheme.AccentGreen,
+    },
+    'hljs-class': {
+      color: darkTheme.AccentGreen,
+    },
+    'hljs-string': {
+      color: darkTheme.AccentYellow,
+    },
+    'hljs-meta-string': {
+      color: darkTheme.AccentYellow,
+    },
+    'hljs-regexp': {
+      color: darkTheme.AccentRed,
+    },
+    'hljs-template-tag': {
+      color: darkTheme.AccentRed,
+    },
+    'hljs-subst': {
+      color: darkTheme.Foreground,
+    },
+    'hljs-function': {
+      color: darkTheme.Foreground,
+    },
+    'hljs-title': {
+      color: darkTheme.Foreground,
+    },
+    'hljs-params': {
+      color: darkTheme.Foreground,
+    },
+    'hljs-formula': {
+      color: darkTheme.Foreground,
+    },
+    'hljs-comment': {
+      color: darkTheme.Comment,
+      fontStyle: 'italic',
+    },
+    'hljs-quote': {
+      color: darkTheme.Comment,
+      fontStyle: 'italic',
+    },
+    'hljs-doctag': {
+      color: darkTheme.Comment,
+    },
+    'hljs-meta': {
+      color: darkTheme.Gray,
+    },
+    'hljs-meta-keyword': {
+      color: darkTheme.Gray,
+    },
+    'hljs-tag': {
+      color: darkTheme.Gray,
+    },
+    'hljs-variable': {
+      color: darkTheme.AccentPurple,
+    },
+    'hljs-template-variable': {
+      color: darkTheme.AccentPurple,
+    },
+    'hljs-attr': {
+      color: darkTheme.LightBlue,
+    },
+    'hljs-attribute': {
+      color: darkTheme.LightBlue,
+    },
+    'hljs-builtin-name': {
+      color: darkTheme.LightBlue,
+    },
+    'hljs-section': {
+      color: darkTheme.AccentYellow,
+    },
+    'hljs-emphasis': {
+      fontStyle: 'italic',
+    },
+    'hljs-strong': {
+      fontWeight: 'bold',
+    },
+    'hljs-bullet': {
+      color: darkTheme.AccentYellow,
+    },
+    'hljs-selector-tag': {
+      color: darkTheme.AccentYellow,
+    },
+    'hljs-selector-id': {
+      color: darkTheme.AccentYellow,
+    },
+    'hljs-selector-class': {
+      color: darkTheme.AccentYellow,
+    },
+    'hljs-selector-attr': {
+      color: darkTheme.AccentYellow,
+    },
+    'hljs-selector-pseudo': {
+      color: darkTheme.AccentYellow,
+    },
+    'hljs-addition': {
+      backgroundColor: '#144212',
+      display: 'inline-block',
+      width: '100%',
+    },
+    'hljs-deletion': {
+      backgroundColor: '#600',
+      display: 'inline-block',
+      width: '100%',
+    },
+  },
+  darkTheme,
+  darkSemanticColors,
+);

projects/ui/qwen-code/packages/cli/src/ui/themes/dracula.ts

@@ -0,0 +1,124 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { type ColorsTheme, Theme } from './theme.js';
+import { darkSemanticColors } from './semantic-tokens.js';
+
+const draculaColors: ColorsTheme = {
+  type: 'dark',
+  Background: '#282a36',
+  Foreground: '#f8f8f2',
+  LightBlue: '#8be9fd',
+  AccentBlue: '#8be9fd',
+  AccentPurple: '#ff79c6',
+  AccentCyan: '#8be9fd',
+  AccentGreen: '#50fa7b',
+  AccentYellow: '#f1fa8c',
+  AccentRed: '#ff5555',
+  DiffAdded: '#11431d',
+  DiffRemoved: '#6e1818',
+  Comment: '#6272a4',
+  Gray: '#6272a4',
+  GradientColors: ['#ff79c6', '#8be9fd'],
+};
+
+export const Dracula: Theme = new Theme(
+  'Dracula',
+  'dark',
+  {
+    hljs: {
+      display: 'block',
+      overflowX: 'auto',
+      padding: '0.5em',
+      background: draculaColors.Background,
+      color: draculaColors.Foreground,
+    },
+    'hljs-keyword': {
+      color: draculaColors.AccentBlue,
+      fontWeight: 'bold',
+    },
+    'hljs-selector-tag': {
+      color: draculaColors.AccentBlue,
+      fontWeight: 'bold',
+    },
+    'hljs-literal': {
+      color: draculaColors.AccentBlue,
+      fontWeight: 'bold',
+    },
+    'hljs-section': {
+      color: draculaColors.AccentBlue,
+      fontWeight: 'bold',
+    },
+    'hljs-link': {
+      color: draculaColors.AccentBlue,
+    },
+    'hljs-function .hljs-keyword': {
+      color: draculaColors.AccentPurple,
+    },
+    'hljs-subst': {
+      color: draculaColors.Foreground,
+    },
+    'hljs-string': {
+      color: draculaColors.AccentYellow,
+    },
+    'hljs-title': {
+      color: draculaColors.AccentYellow,
+      fontWeight: 'bold',
+    },
+    'hljs-name': {
+      color: draculaColors.AccentYellow,
+      fontWeight: 'bold',
+    },
+    'hljs-type': {
+      color: draculaColors.AccentYellow,
+      fontWeight: 'bold',
+    },
+    'hljs-attribute': {
+      color: draculaColors.AccentYellow,
+    },
+    'hljs-symbol': {
+      color: draculaColors.AccentYellow,
+    },
+    'hljs-bullet': {
+      color: draculaColors.AccentYellow,
+    },
+    'hljs-addition': {
+      color: draculaColors.AccentGreen,
+    },
+    'hljs-variable': {
+      color: draculaColors.AccentYellow,
+    },
+    'hljs-template-tag': {
+      color: draculaColors.AccentYellow,
+    },
+    'hljs-template-variable': {
+      color: draculaColors.AccentYellow,
+    },
+    'hljs-comment': {
+      color: draculaColors.Comment,
+    },
+    'hljs-quote': {
+      color: draculaColors.Comment,
+    },
+    'hljs-deletion': {
+      color: draculaColors.AccentRed,
+    },
+    'hljs-meta': {
+      color: draculaColors.Comment,
+    },
+    'hljs-doctag': {
+      fontWeight: 'bold',
+    },
+    'hljs-strong': {
+      fontWeight: 'bold',
+    },
+    'hljs-emphasis': {
+      fontStyle: 'italic',
+    },
+  },
+  draculaColors,
+  darkSemanticColors,
+);

projects/ui/qwen-code/packages/cli/src/ui/themes/github-dark.ts

@@ -0,0 +1,147 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { type ColorsTheme, Theme } from './theme.js';
+import { darkSemanticColors } from './semantic-tokens.js';
+
+const githubDarkColors: ColorsTheme = {
+  type: 'dark',
+  Background: '#24292e',
+  Foreground: '#d1d5da',
+  LightBlue: '#79B8FF',
+  AccentBlue: '#79B8FF',
+  AccentPurple: '#B392F0',
+  AccentCyan: '#9ECBFF',
+  AccentGreen: '#85E89D',
+  AccentYellow: '#FFAB70',
+  AccentRed: '#F97583',
+  DiffAdded: '#3C4636',
+  DiffRemoved: '#502125',
+  Comment: '#6A737D',
+  Gray: '#6A737D',
+  GradientColors: ['#79B8FF', '#85E89D'],
+};
+
+export const GitHubDark: Theme = new Theme(
+  'GitHub',
+  'dark',
+  {
+    hljs: {
+      display: 'block',
+      overflowX: 'auto',
+      padding: '0.5em',
+      color: githubDarkColors.Foreground,
+      background: githubDarkColors.Background,
+    },
+    'hljs-comment': {
+      color: githubDarkColors.Comment,
+      fontStyle: 'italic',
+    },
+    'hljs-quote': {
+      color: githubDarkColors.Comment,
+      fontStyle: 'italic',
+    },
+    'hljs-keyword': {
+      color: githubDarkColors.AccentRed,
+      fontWeight: 'bold',
+    },
+    'hljs-selector-tag': {
+      color: githubDarkColors.AccentRed,
+      fontWeight: 'bold',
+    },
+    'hljs-subst': {
+      color: githubDarkColors.Foreground,
+    },
+    'hljs-number': {
+      color: githubDarkColors.LightBlue,
+    },
+    'hljs-literal': {
+      color: githubDarkColors.LightBlue,
+    },
+    'hljs-variable': {
+      color: githubDarkColors.AccentYellow,
+    },
+    'hljs-template-variable': {
+      color: githubDarkColors.AccentYellow,
+    },
+    'hljs-tag .hljs-attr': {
+      color: githubDarkColors.AccentYellow,
+    },
+    'hljs-string': {
+      color: githubDarkColors.AccentCyan,
+    },
+    'hljs-doctag': {
+      color: githubDarkColors.AccentCyan,
+    },
+    'hljs-title': {
+      color: githubDarkColors.AccentPurple,
+      fontWeight: 'bold',
+    },
+    'hljs-section': {
+      color: githubDarkColors.AccentPurple,
+      fontWeight: 'bold',
+    },
+    'hljs-selector-id': {
+      color: githubDarkColors.AccentPurple,
+      fontWeight: 'bold',
+    },
+    'hljs-type': {
+      color: githubDarkColors.AccentGreen,
+      fontWeight: 'bold',
+    },
+    'hljs-class .hljs-title': {
+      color: githubDarkColors.AccentGreen,
+      fontWeight: 'bold',
+    },
+    'hljs-tag': {
+      color: githubDarkColors.AccentGreen,
+    },
+    'hljs-name': {
+      color: githubDarkColors.AccentGreen,
+    },
+    'hljs-attribute': {
+      color: githubDarkColors.LightBlue,
+    },
+    'hljs-regexp': {
+      color: githubDarkColors.AccentCyan,
+    },
+    'hljs-link': {
+      color: githubDarkColors.AccentCyan,
+    },
+    'hljs-symbol': {
+      color: githubDarkColors.AccentPurple,
+    },
+    'hljs-bullet': {
+      color: githubDarkColors.AccentPurple,
+    },
+    'hljs-built_in': {
+      color: githubDarkColors.LightBlue,
+    },
+    'hljs-builtin-name': {
+      color: githubDarkColors.LightBlue,
+    },
+    'hljs-meta': {
+      color: githubDarkColors.LightBlue,
+      fontWeight: 'bold',
+    },
+    'hljs-deletion': {
+      background: '#86181D',
+      color: githubDarkColors.AccentRed,
+    },
+    'hljs-addition': {
+      background: '#144620',
+      color: githubDarkColors.AccentGreen,
+    },
+    'hljs-emphasis': {
+      fontStyle: 'italic',
+    },
+    'hljs-strong': {
+      fontWeight: 'bold',
+    },
+  },
+  githubDarkColors,
+  darkSemanticColors,
+);

projects/ui/qwen-code/packages/cli/src/ui/themes/github-light.ts

@@ -0,0 +1,149 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { type ColorsTheme, Theme } from './theme.js';
+import { lightSemanticColors } from './semantic-tokens.js';
+
+const githubLightColors: ColorsTheme = {
+  type: 'light',
+  Background: '#f8f8f8',
+  Foreground: '#24292E',
+  LightBlue: '#0086b3',
+  AccentBlue: '#458',
+  AccentPurple: '#900',
+  AccentCyan: '#009926',
+  AccentGreen: '#008080',
+  AccentYellow: '#990073',
+  AccentRed: '#d14',
+  DiffAdded: '#C6EAD8',
+  DiffRemoved: '#FFCCCC',
+  Comment: '#998',
+  Gray: '#999',
+  GradientColors: ['#458', '#008080'],
+};
+
+export const GitHubLight: Theme = new Theme(
+  'GitHub Light',
+  'light',
+  {
+    hljs: {
+      display: 'block',
+      overflowX: 'auto',
+      padding: '0.5em',
+      color: githubLightColors.Foreground,
+      background: githubLightColors.Background,
+    },
+    'hljs-comment': {
+      color: githubLightColors.Comment,
+      fontStyle: 'italic',
+    },
+    'hljs-quote': {
+      color: githubLightColors.Comment,
+      fontStyle: 'italic',
+    },
+    'hljs-keyword': {
+      color: githubLightColors.Foreground,
+      fontWeight: 'bold',
+    },
+    'hljs-selector-tag': {
+      color: githubLightColors.Foreground,
+      fontWeight: 'bold',
+    },
+    'hljs-subst': {
+      color: githubLightColors.Foreground,
+      fontWeight: 'normal',
+    },
+    'hljs-number': {
+      color: githubLightColors.AccentGreen,
+    },
+    'hljs-literal': {
+      color: githubLightColors.AccentGreen,
+    },
+    'hljs-variable': {
+      color: githubLightColors.AccentGreen,
+    },
+    'hljs-template-variable': {
+      color: githubLightColors.AccentGreen,
+    },
+    'hljs-tag .hljs-attr': {
+      color: githubLightColors.AccentGreen,
+    },
+    'hljs-string': {
+      color: githubLightColors.AccentRed,
+    },
+    'hljs-doctag': {
+      color: githubLightColors.AccentRed,
+    },
+    'hljs-title': {
+      color: githubLightColors.AccentPurple,
+      fontWeight: 'bold',
+    },
+    'hljs-section': {
+      color: githubLightColors.AccentPurple,
+      fontWeight: 'bold',
+    },
+    'hljs-selector-id': {
+      color: githubLightColors.AccentPurple,
+      fontWeight: 'bold',
+    },
+    'hljs-type': {
+      color: githubLightColors.AccentBlue,
+      fontWeight: 'bold',
+    },
+    'hljs-class .hljs-title': {
+      color: githubLightColors.AccentBlue,
+      fontWeight: 'bold',
+    },
+    'hljs-tag': {
+      color: githubLightColors.AccentBlue,
+      fontWeight: 'normal',
+    },
+    'hljs-name': {
+      color: githubLightColors.AccentBlue,
+      fontWeight: 'normal',
+    },
+    'hljs-attribute': {
+      color: githubLightColors.AccentBlue,
+      fontWeight: 'normal',
+    },
+    'hljs-regexp': {
+      color: githubLightColors.AccentCyan,
+    },
+    'hljs-link': {
+      color: githubLightColors.AccentCyan,
+    },
+    'hljs-symbol': {
+      color: githubLightColors.AccentYellow,
+    },
+    'hljs-bullet': {
+      color: githubLightColors.AccentYellow,
+    },
+    'hljs-built_in': {
+      color: githubLightColors.LightBlue,
+    },
+    'hljs-builtin-name': {
+      color: githubLightColors.LightBlue,
+    },
+    'hljs-meta': {
+      color: githubLightColors.Gray,
+      fontWeight: 'bold',
+    },
+    'hljs-deletion': {
+      background: '#fdd',
+    },
+    'hljs-addition': {
+      background: '#dfd',
+    },
+    'hljs-emphasis': {
+      fontStyle: 'italic',
+    },
+    'hljs-strong': {
+      fontWeight: 'bold',
+    },
+  },
+  githubLightColors,
+  lightSemanticColors,
+);

projects/ui/qwen-code/packages/cli/src/ui/themes/googlecode.ts

@@ -0,0 +1,146 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { lightTheme, Theme, type ColorsTheme } from './theme.js';
+import { lightSemanticColors } from './semantic-tokens.js';
+
+const googleCodeColors: ColorsTheme = {
+  type: 'light',
+  Background: 'white',
+  Foreground: '#444',
+  LightBlue: '#066',
+  AccentBlue: '#008',
+  AccentPurple: '#606',
+  AccentCyan: '#066',
+  AccentGreen: '#080',
+  AccentYellow: '#660',
+  AccentRed: '#800',
+  DiffAdded: '#C6EAD8',
+  DiffRemoved: '#FEDEDE',
+  Comment: '#5f6368',
+  Gray: lightTheme.Gray,
+  GradientColors: ['#066', '#606'],
+};
+
+export const GoogleCode: Theme = new Theme(
+  'Google Code',
+  'light',
+  {
+    hljs: {
+      display: 'block',
+      overflowX: 'auto',
+      padding: '0.5em',
+      background: googleCodeColors.Background,
+      color: googleCodeColors.Foreground,
+    },
+    'hljs-comment': {
+      color: googleCodeColors.AccentRed,
+    },
+    'hljs-quote': {
+      color: googleCodeColors.AccentRed,
+    },
+    'hljs-keyword': {
+      color: googleCodeColors.AccentBlue,
+    },
+    'hljs-selector-tag': {
+      color: googleCodeColors.AccentBlue,
+    },
+    'hljs-section': {
+      color: googleCodeColors.AccentBlue,
+    },
+    'hljs-title': {
+      color: googleCodeColors.AccentPurple,
+    },
+    'hljs-name': {
+      color: googleCodeColors.AccentBlue,
+    },
+    'hljs-variable': {
+      color: googleCodeColors.AccentYellow,
+    },
+    'hljs-template-variable': {
+      color: googleCodeColors.AccentYellow,
+    },
+    'hljs-string': {
+      color: googleCodeColors.AccentGreen,
+    },
+    'hljs-selector-attr': {
+      color: googleCodeColors.AccentGreen,
+    },
+    'hljs-selector-pseudo': {
+      color: googleCodeColors.AccentGreen,
+    },
+    'hljs-regexp': {
+      color: googleCodeColors.AccentGreen,
+    },
+    'hljs-literal': {
+      color: googleCodeColors.AccentCyan,
+    },
+    'hljs-symbol': {
+      color: googleCodeColors.AccentCyan,
+    },
+    'hljs-bullet': {
+      color: googleCodeColors.AccentCyan,
+    },
+    'hljs-meta': {
+      color: googleCodeColors.AccentCyan,
+    },
+    'hljs-number': {
+      color: googleCodeColors.AccentCyan,
+    },
+    'hljs-link': {
+      color: googleCodeColors.AccentCyan,
+    },
+    'hljs-doctag': {
+      color: googleCodeColors.AccentPurple,
+      fontWeight: 'bold',
+    },
+    'hljs-type': {
+      color: googleCodeColors.AccentPurple,
+    },
+    'hljs-attr': {
+      color: googleCodeColors.AccentPurple,
+    },
+    'hljs-built_in': {
+      color: googleCodeColors.AccentPurple,
+    },
+    'hljs-builtin-name': {
+      color: googleCodeColors.AccentPurple,
+    },
+    'hljs-params': {
+      color: googleCodeColors.AccentPurple,
+    },
+    'hljs-attribute': {
+      color: googleCodeColors.Foreground,
+    },
+    'hljs-subst': {
+      color: googleCodeColors.Foreground,
+    },
+    'hljs-formula': {
+      backgroundColor: '#eee',
+      fontStyle: 'italic',
+    },
+    'hljs-selector-id': {
+      color: googleCodeColors.AccentYellow,
+    },
+    'hljs-selector-class': {
+      color: googleCodeColors.AccentYellow,
+    },
+    'hljs-addition': {
+      backgroundColor: '#baeeba',
+    },
+    'hljs-deletion': {
+      backgroundColor: '#ffc8bd',
+    },
+    'hljs-strong': {
+      fontWeight: 'bold',
+    },
+    'hljs-emphasis': {
+      fontStyle: 'italic',
+    },
+  },
+  googleCodeColors,
+  lightSemanticColors,
+);

projects/ui/qwen-code/packages/cli/src/ui/themes/no-color.ts

@@ -0,0 +1,125 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Theme, ColorsTheme } from './theme.js';
+import { SemanticColors } from './semantic-tokens.js';
+
+const noColorColorsTheme: ColorsTheme = {
+  type: 'ansi',
+  Background: '',
+  Foreground: '',
+  LightBlue: '',
+  AccentBlue: '',
+  AccentPurple: '',
+  AccentCyan: '',
+  AccentGreen: '',
+  AccentYellow: '',
+  AccentRed: '',
+  DiffAdded: '',
+  DiffRemoved: '',
+  Comment: '',
+  Gray: '',
+};
+
+const noColorSemanticColors: SemanticColors = {
+  text: {
+    primary: '',
+    secondary: '',
+    link: '',
+    accent: '',
+  },
+  background: {
+    primary: '',
+    diff: {
+      added: '',
+      removed: '',
+    },
+  },
+  border: {
+    default: '',
+    focused: '',
+  },
+  ui: {
+    comment: '',
+    symbol: '',
+    gradient: [],
+  },
+  status: {
+    error: '',
+    success: '',
+    warning: '',
+  },
+};
+
+export const NoColorTheme: Theme = new Theme(
+  'NoColor',
+  'dark',
+  {
+    hljs: {
+      display: 'block',
+      overflowX: 'auto',
+      padding: '0.5em',
+    },
+    'hljs-keyword': {},
+    'hljs-literal': {},
+    'hljs-symbol': {},
+    'hljs-name': {},
+    'hljs-link': {
+      textDecoration: 'underline',
+    },
+    'hljs-built_in': {},
+    'hljs-type': {},
+    'hljs-number': {},
+    'hljs-class': {},
+    'hljs-string': {},
+    'hljs-meta-string': {},
+    'hljs-regexp': {},
+    'hljs-template-tag': {},
+    'hljs-subst': {},
+    'hljs-function': {},
+    'hljs-title': {},
+    'hljs-params': {},
+    'hljs-formula': {},
+    'hljs-comment': {
+      fontStyle: 'italic',
+    },
+    'hljs-quote': {
+      fontStyle: 'italic',
+    },
+    'hljs-doctag': {},
+    'hljs-meta': {},
+    'hljs-meta-keyword': {},
+    'hljs-tag': {},
+    'hljs-variable': {},
+    'hljs-template-variable': {},
+    'hljs-attr': {},
+    'hljs-attribute': {},
+    'hljs-builtin-name': {},
+    'hljs-section': {},
+    'hljs-emphasis': {
+      fontStyle: 'italic',
+    },
+    'hljs-strong': {
+      fontWeight: 'bold',
+    },
+    'hljs-bullet': {},
+    'hljs-selector-tag': {},
+    'hljs-selector-id': {},
+    'hljs-selector-class': {},
+    'hljs-selector-attr': {},
+    'hljs-selector-pseudo': {},
+    'hljs-addition': {
+      display: 'inline-block',
+      width: '100%',
+    },
+    'hljs-deletion': {
+      display: 'inline-block',
+      width: '100%',
+    },
+  },
+  noColorColorsTheme,
+  noColorSemanticColors,
+);

projects/ui/qwen-code/packages/cli/src/ui/themes/qwen-dark.ts

@@ -0,0 +1,113 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { type ColorsTheme, Theme } from './theme.js';
+import { darkSemanticColors } from './semantic-tokens.js';
+
+const qwenDarkColors: ColorsTheme = {
+  type: 'dark',
+  Background: '#0b0e14',
+  Foreground: '#bfbdb6',
+  LightBlue: '#59C2FF',
+  AccentBlue: '#39BAE6',
+  AccentPurple: '#D2A6FF',
+  AccentCyan: '#95E6CB',
+  AccentGreen: '#AAD94C',
+  AccentYellow: '#FFD700',
+  AccentRed: '#F26D78',
+  DiffAdded: '#AAD94C',
+  DiffRemoved: '#F26D78',
+  Comment: '#646A71',
+  Gray: '#3D4149',
+  GradientColors: ['#FFD700', '#da7959'],
+};
+
+export const QwenDark: Theme = new Theme(
+  'Qwen Dark',
+  'dark',
+  {
+    hljs: {
+      display: 'block',
+      overflowX: 'auto',
+      padding: '0.5em',
+      background: qwenDarkColors.Background,
+      color: qwenDarkColors.Foreground,
+    },
+    'hljs-keyword': {
+      color: qwenDarkColors.AccentYellow,
+    },
+    'hljs-literal': {
+      color: qwenDarkColors.AccentPurple,
+    },
+    'hljs-symbol': {
+      color: qwenDarkColors.AccentCyan,
+    },
+    'hljs-name': {
+      color: qwenDarkColors.LightBlue,
+    },
+    'hljs-link': {
+      color: qwenDarkColors.AccentBlue,
+    },
+    'hljs-function .hljs-keyword': {
+      color: qwenDarkColors.AccentYellow,
+    },
+    'hljs-subst': {
+      color: qwenDarkColors.Foreground,
+    },
+    'hljs-string': {
+      color: qwenDarkColors.AccentGreen,
+    },
+    'hljs-title': {
+      color: qwenDarkColors.AccentYellow,
+    },
+    'hljs-type': {
+      color: qwenDarkColors.AccentBlue,
+    },
+    'hljs-attribute': {
+      color: qwenDarkColors.AccentYellow,
+    },
+    'hljs-bullet': {
+      color: qwenDarkColors.AccentYellow,
+    },
+    'hljs-addition': {
+      color: qwenDarkColors.AccentGreen,
+    },
+    'hljs-variable': {
+      color: qwenDarkColors.Foreground,
+    },
+    'hljs-template-tag': {
+      color: qwenDarkColors.AccentYellow,
+    },
+    'hljs-template-variable': {
+      color: qwenDarkColors.AccentYellow,
+    },
+    'hljs-comment': {
+      color: qwenDarkColors.Comment,
+      fontStyle: 'italic',
+    },
+    'hljs-quote': {
+      color: qwenDarkColors.AccentCyan,
+      fontStyle: 'italic',
+    },
+    'hljs-deletion': {
+      color: qwenDarkColors.AccentRed,
+    },
+    'hljs-meta': {
+      color: qwenDarkColors.AccentYellow,
+    },
+    'hljs-doctag': {
+      fontWeight: 'bold',
+    },
+    'hljs-strong': {
+      fontWeight: 'bold',
+    },
+    'hljs-emphasis': {
+      fontStyle: 'italic',
+    },
+  },
+  qwenDarkColors,
+  darkSemanticColors,
+);

projects/ui/qwen-code/packages/cli/src/ui/themes/qwen-light.ts

@@ -0,0 +1,139 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { type ColorsTheme, Theme } from './theme.js';
+import { lightSemanticColors } from './semantic-tokens.js';
+
+const qwenLightColors: ColorsTheme = {
+  type: 'light',
+  Background: '#f8f9fa',
+  Foreground: '#5c6166',
+  LightBlue: '#55b4d4',
+  AccentBlue: '#399ee6',
+  AccentPurple: '#a37acc',
+  AccentCyan: '#4cbf99',
+  AccentGreen: '#86b300',
+  AccentYellow: '#f2ae49',
+  AccentRed: '#f07171',
+  DiffAdded: '#86b300',
+  DiffRemoved: '#f07171',
+  Comment: '#ABADB1',
+  Gray: '#CCCFD3',
+  GradientColors: ['#399ee6', '#86b300'],
+};
+
+export const QwenLight: Theme = new Theme(
+  'Qwen Light',
+  'light',
+  {
+    hljs: {
+      display: 'block',
+      overflowX: 'auto',
+      padding: '0.5em',
+      background: qwenLightColors.Background,
+      color: qwenLightColors.Foreground,
+    },
+    'hljs-comment': {
+      color: qwenLightColors.Comment,
+      fontStyle: 'italic',
+    },
+    'hljs-quote': {
+      color: qwenLightColors.AccentCyan,
+      fontStyle: 'italic',
+    },
+    'hljs-string': {
+      color: qwenLightColors.AccentGreen,
+    },
+    'hljs-constant': {
+      color: qwenLightColors.AccentCyan,
+    },
+    'hljs-number': {
+      color: qwenLightColors.AccentPurple,
+    },
+    'hljs-keyword': {
+      color: qwenLightColors.AccentYellow,
+    },
+    'hljs-selector-tag': {
+      color: qwenLightColors.AccentYellow,
+    },
+    'hljs-attribute': {
+      color: qwenLightColors.AccentYellow,
+    },
+    'hljs-variable': {
+      color: qwenLightColors.Foreground,
+    },
+    'hljs-variable.language': {
+      color: qwenLightColors.LightBlue,
+      fontStyle: 'italic',
+    },
+    'hljs-title': {
+      color: qwenLightColors.AccentBlue,
+    },
+    'hljs-section': {
+      color: qwenLightColors.AccentGreen,
+      fontWeight: 'bold',
+    },
+    'hljs-type': {
+      color: qwenLightColors.LightBlue,
+    },
+    'hljs-class .hljs-title': {
+      color: qwenLightColors.AccentBlue,
+    },
+    'hljs-tag': {
+      color: qwenLightColors.LightBlue,
+    },
+    'hljs-name': {
+      color: qwenLightColors.AccentBlue,
+    },
+    'hljs-builtin-name': {
+      color: qwenLightColors.AccentYellow,
+    },
+    'hljs-meta': {
+      color: qwenLightColors.AccentYellow,
+    },
+    'hljs-symbol': {
+      color: qwenLightColors.AccentRed,
+    },
+    'hljs-bullet': {
+      color: qwenLightColors.AccentYellow,
+    },
+    'hljs-regexp': {
+      color: qwenLightColors.AccentCyan,
+    },
+    'hljs-link': {
+      color: qwenLightColors.LightBlue,
+    },
+    'hljs-deletion': {
+      color: qwenLightColors.AccentRed,
+    },
+    'hljs-addition': {
+      color: qwenLightColors.AccentGreen,
+    },
+    'hljs-emphasis': {
+      fontStyle: 'italic',
+    },
+    'hljs-strong': {
+      fontWeight: 'bold',
+    },
+    'hljs-literal': {
+      color: qwenLightColors.AccentCyan,
+    },
+    'hljs-built_in': {
+      color: qwenLightColors.AccentRed,
+    },
+    'hljs-doctag': {
+      color: qwenLightColors.AccentRed,
+    },
+    'hljs-template-variable': {
+      color: qwenLightColors.AccentCyan,
+    },
+    'hljs-selector-id': {
+      color: qwenLightColors.AccentRed,
+    },
+  },
+  qwenLightColors,
+  lightSemanticColors,
+);

projects/ui/qwen-code/packages/cli/src/ui/themes/semantic-tokens.ts

@@ -0,0 +1,127 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { lightTheme, darkTheme, ansiTheme } from './theme.js';
+
+export interface SemanticColors {
+  text: {
+    primary: string;
+    secondary: string;
+    link: string;
+    accent: string;
+  };
+  background: {
+    primary: string;
+    diff: {
+      added: string;
+      removed: string;
+    };
+  };
+  border: {
+    default: string;
+    focused: string;
+  };
+  ui: {
+    comment: string;
+    symbol: string;
+    gradient: string[] | undefined;
+  };
+  status: {
+    error: string;
+    success: string;
+    warning: string;
+  };
+}
+
+export const lightSemanticColors: SemanticColors = {
+  text: {
+    primary: lightTheme.Foreground,
+    secondary: lightTheme.Gray,
+    link: lightTheme.AccentBlue,
+    accent: lightTheme.AccentPurple,
+  },
+  background: {
+    primary: lightTheme.Background,
+    diff: {
+      added: lightTheme.DiffAdded,
+      removed: lightTheme.DiffRemoved,
+    },
+  },
+  border: {
+    default: lightTheme.Gray,
+    focused: lightTheme.AccentBlue,
+  },
+  ui: {
+    comment: lightTheme.Comment,
+    symbol: lightTheme.Gray,
+    gradient: lightTheme.GradientColors,
+  },
+  status: {
+    error: lightTheme.AccentRed,
+    success: lightTheme.AccentGreen,
+    warning: lightTheme.AccentYellow,
+  },
+};
+
+export const darkSemanticColors: SemanticColors = {
+  text: {
+    primary: darkTheme.Foreground,
+    secondary: darkTheme.Gray,
+    link: darkTheme.AccentBlue,
+    accent: darkTheme.AccentPurple,
+  },
+  background: {
+    primary: darkTheme.Background,
+    diff: {
+      added: darkTheme.DiffAdded,
+      removed: darkTheme.DiffRemoved,
+    },
+  },
+  border: {
+    default: darkTheme.Gray,
+    focused: darkTheme.AccentBlue,
+  },
+  ui: {
+    comment: darkTheme.Comment,
+    symbol: darkTheme.Gray,
+    gradient: darkTheme.GradientColors,
+  },
+  status: {
+    error: darkTheme.AccentRed,
+    success: darkTheme.AccentGreen,
+    warning: darkTheme.AccentYellow,
+  },
+};
+
+export const ansiSemanticColors: SemanticColors = {
+  text: {
+    primary: ansiTheme.Foreground,
+    secondary: ansiTheme.Gray,
+    link: ansiTheme.AccentBlue,
+    accent: ansiTheme.AccentPurple,
+  },
+  background: {
+    primary: ansiTheme.Background,
+    diff: {
+      added: ansiTheme.DiffAdded,
+      removed: ansiTheme.DiffRemoved,
+    },
+  },
+  border: {
+    default: ansiTheme.Gray,
+    focused: ansiTheme.AccentBlue,
+  },
+  ui: {
+    comment: ansiTheme.Comment,
+    symbol: ansiTheme.Gray,
+    gradient: ansiTheme.GradientColors,
+  },
+  status: {
+    error: ansiTheme.AccentRed,
+    success: ansiTheme.AccentGreen,
+    warning: ansiTheme.AccentYellow,
+  },
+};

projects/ui/qwen-code/packages/cli/src/ui/themes/shades-of-purple.ts

@@ -0,0 +1,352 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Shades of Purple Theme — for Highlight.js.
+ * @author Ahmad Awais <https://twitter.com/mrahmadawais/>
+ */
+import { type ColorsTheme, Theme } from './theme.js';
+import { darkSemanticColors } from './semantic-tokens.js';
+
+const shadesOfPurpleColors: ColorsTheme = {
+  type: 'dark',
+  // Required colors for ColorsTheme interface
+  Background: '#2d2b57', // Main background
+  Foreground: '#e3dfff', // Default text color (hljs, hljs-subst)
+  LightBlue: '#847ace', // Light blue/purple accent
+  AccentBlue: '#a599e9', // Borders, secondary blue
+  AccentPurple: '#ac65ff', // Comments (main purple)
+  AccentCyan: '#a1feff', // Names
+  AccentGreen: '#A5FF90', // Strings and many others
+  AccentYellow: '#fad000', // Title, main yellow
+  AccentRed: '#ff628c', // Error/deletion accent
+  DiffAdded: '#383E45',
+  DiffRemoved: '#572244',
+  Comment: '#B362FF', // Comment color (same as AccentPurple)
+  Gray: '#726c86', // Gray color
+  GradientColors: ['#4d21fc', '#847ace', '#ff628c'],
+};
+
+// Additional colors from CSS that don't fit in the ColorsTheme interface
+const additionalColors = {
+  AccentYellowAlt: '#f8d000', // Attr yellow (slightly different)
+  AccentOrange: '#fb9e00', // Keywords, built_in, meta
+  AccentPink: '#fa658d', // Numbers, literals
+  AccentLightPurple: '#c991ff', // For params and properties
+  AccentDarkPurple: '#6943ff', // For operators
+  AccentTeal: '#2ee2fa', // For special constructs
+};
+
+export const ShadesOfPurple = new Theme(
+  'Shades Of Purple',
+  'dark',
+  {
+    // Base styles
+    hljs: {
+      display: 'block',
+      overflowX: 'auto',
+      background: shadesOfPurpleColors.Background,
+      color: shadesOfPurpleColors.Foreground,
+    },
+
+    // Title elements
+    'hljs-title': {
+      color: shadesOfPurpleColors.AccentYellow,
+      fontWeight: 'normal',
+    },
+
+    // Names
+    'hljs-name': {
+      color: shadesOfPurpleColors.AccentCyan,
+      fontWeight: 'normal',
+    },
+
+    // Tags
+    'hljs-tag': {
+      color: shadesOfPurpleColors.Foreground,
+    },
+
+    // Attributes
+    'hljs-attr': {
+      color: additionalColors.AccentYellowAlt,
+      fontStyle: 'italic',
+    },
+
+    // Built-ins, selector tags, sections
+    'hljs-built_in': {
+      color: additionalColors.AccentOrange,
+    },
+    'hljs-selector-tag': {
+      color: additionalColors.AccentOrange,
+      fontWeight: 'normal',
+    },
+    'hljs-section': {
+      color: additionalColors.AccentOrange,
+    },
+
+    // Keywords
+    'hljs-keyword': {
+      color: additionalColors.AccentOrange,
+      fontWeight: 'normal',
+    },
+
+    // Default text and substitutions
+    'hljs-subst': {
+      color: shadesOfPurpleColors.Foreground,
+    },
+
+    // Strings and related elements (all green)
+    'hljs-string': {
+      color: shadesOfPurpleColors.AccentGreen,
+    },
+    'hljs-attribute': {
+      color: shadesOfPurpleColors.AccentGreen,
+    },
+    'hljs-symbol': {
+      color: shadesOfPurpleColors.AccentGreen,
+    },
+    'hljs-bullet': {
+      color: shadesOfPurpleColors.AccentGreen,
+    },
+    'hljs-addition': {
+      color: shadesOfPurpleColors.AccentGreen,
+    },
+    'hljs-code': {
+      color: shadesOfPurpleColors.AccentGreen,
+    },
+    'hljs-regexp': {
+      color: shadesOfPurpleColors.AccentGreen,
+    },
+    'hljs-selector-class': {
+      color: shadesOfPurpleColors.AccentGreen,
+    },
+    'hljs-selector-attr': {
+      color: shadesOfPurpleColors.AccentGreen,
+    },
+    'hljs-selector-pseudo': {
+      color: shadesOfPurpleColors.AccentGreen,
+    },
+    'hljs-template-tag': {
+      color: shadesOfPurpleColors.AccentGreen,
+    },
+    'hljs-quote': {
+      color: shadesOfPurpleColors.AccentGreen,
+    },
+    'hljs-deletion': {
+      color: shadesOfPurpleColors.AccentRed,
+    },
+
+    // Meta elements
+    'hljs-meta': {
+      color: additionalColors.AccentOrange,
+    },
+    'hljs-meta-string': {
+      color: additionalColors.AccentOrange,
+    },
+
+    // Comments
+    'hljs-comment': {
+      color: shadesOfPurpleColors.AccentPurple,
+    },
+
+    // Literals and numbers
+    'hljs-literal': {
+      color: additionalColors.AccentPink,
+      fontWeight: 'normal',
+    },
+    'hljs-number': {
+      color: additionalColors.AccentPink,
+    },
+
+    // Emphasis and strong
+    'hljs-emphasis': {
+      fontStyle: 'italic',
+    },
+    'hljs-strong': {
+      fontWeight: 'bold',
+    },
+
+    // Diff-specific classes
+    'hljs-diff': {
+      color: shadesOfPurpleColors.Foreground,
+    },
+    'hljs-meta.hljs-diff': {
+      color: shadesOfPurpleColors.AccentBlue,
+    },
+    'hljs-ln': {
+      color: shadesOfPurpleColors.Gray,
+    },
+
+    // Additional elements that might be needed
+    'hljs-type': {
+      color: shadesOfPurpleColors.AccentYellow,
+      fontWeight: 'normal',
+    },
+    'hljs-variable': {
+      color: shadesOfPurpleColors.AccentYellow,
+    },
+    'hljs-template-variable': {
+      color: shadesOfPurpleColors.AccentGreen,
+    },
+    'hljs-function .hljs-keyword': {
+      color: additionalColors.AccentOrange,
+    },
+    'hljs-link': {
+      color: shadesOfPurpleColors.LightBlue,
+    },
+    'hljs-doctag': {
+      fontWeight: 'bold',
+    },
+
+    // Function parameters
+    'hljs-params': {
+      color: additionalColors.AccentLightPurple,
+      fontStyle: 'italic',
+    },
+
+    // Class definitions
+    'hljs-class': {
+      color: shadesOfPurpleColors.AccentCyan,
+      fontWeight: 'bold',
+    },
+
+    // Function definitions
+    'hljs-function': {
+      color: shadesOfPurpleColors.AccentCyan,
+    },
+
+    // Object properties
+    'hljs-property': {
+      color: shadesOfPurpleColors.AccentBlue,
+    },
+
+    // Operators
+    'hljs-operator': {
+      color: additionalColors.AccentDarkPurple,
+    },
+
+    // Punctuation (if supported by the parser)
+    'hljs-punctuation': {
+      color: shadesOfPurpleColors.Gray,
+    },
+
+    // CSS ID selectors
+    'hljs-selector-id': {
+      color: shadesOfPurpleColors.AccentYellow,
+      fontWeight: 'bold',
+    },
+
+    // Character literals
+    'hljs-char': {
+      color: shadesOfPurpleColors.AccentGreen,
+    },
+
+    // Escape sequences
+    'hljs-escape': {
+      color: additionalColors.AccentPink,
+      fontWeight: 'bold',
+    },
+
+    // Meta keywords
+    'hljs-meta-keyword': {
+      color: additionalColors.AccentOrange,
+      fontWeight: 'bold',
+    },
+
+    // Built-in names
+    'hljs-builtin-name': {
+      color: additionalColors.AccentTeal,
+    },
+
+    // Modules
+    'hljs-module': {
+      color: shadesOfPurpleColors.AccentCyan,
+    },
+
+    // Namespaces
+    'hljs-namespace': {
+      color: shadesOfPurpleColors.LightBlue,
+    },
+
+    // Important annotations
+    'hljs-important': {
+      color: shadesOfPurpleColors.AccentRed,
+      fontWeight: 'bold',
+    },
+
+    // Formulas (for LaTeX, etc.)
+    'hljs-formula': {
+      color: shadesOfPurpleColors.AccentCyan,
+      fontStyle: 'italic',
+    },
+
+    // Language-specific additions
+    // Python decorators
+    'hljs-decorator': {
+      color: additionalColors.AccentTeal,
+      fontWeight: 'bold',
+    },
+
+    // Ruby symbols
+    'hljs-symbol.ruby': {
+      color: additionalColors.AccentPink,
+    },
+
+    // SQL keywords
+    'hljs-keyword.sql': {
+      color: additionalColors.AccentOrange,
+      textTransform: 'uppercase',
+    },
+
+    // Markdown specific
+    'hljs-section.markdown': {
+      color: shadesOfPurpleColors.AccentYellow,
+      fontWeight: 'bold',
+    },
+
+    // JSON keys
+    'hljs-attr.json': {
+      color: shadesOfPurpleColors.AccentCyan,
+    },
+
+    // XML/HTML specific
+    'hljs-tag .hljs-name': {
+      color: shadesOfPurpleColors.AccentRed,
+    },
+    'hljs-tag .hljs-attr': {
+      color: additionalColors.AccentYellowAlt,
+    },
+
+    // Line highlighting (if line numbers are enabled)
+    'hljs.hljs-line-numbers': {
+      borderRight: `1px solid ${shadesOfPurpleColors.Gray}`,
+    },
+    'hljs.hljs-line-numbers .hljs-ln-numbers': {
+      color: shadesOfPurpleColors.Gray,
+      paddingRight: '1em',
+    },
+    'hljs.hljs-line-numbers .hljs-ln-code': {
+      paddingLeft: '1em',
+    },
+
+    // Selection styling
+    'hljs::selection': {
+      background: shadesOfPurpleColors.AccentBlue + '40', // 40 = 25% opacity
+    },
+    'hljs ::-moz-selection': {
+      background: shadesOfPurpleColors.AccentBlue + '40',
+    },
+
+    // Highlighted lines (for emphasis)
+    'hljs .hljs-highlight': {
+      background: shadesOfPurpleColors.AccentPurple + '20', // 20 = 12.5% opacity
+      display: 'block',
+      width: '100%',
+    },
+  },
+  shadesOfPurpleColors,
+  darkSemanticColors,
+);

projects/ui/qwen-code/packages/cli/src/ui/themes/theme-manager.test.ts

@@ -0,0 +1,99 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Patch: Unset NO_COLOR at the very top before any imports
+if (process.env['NO_COLOR'] !== undefined) {
+  delete process.env['NO_COLOR'];
+}
+
+import { describe, it, expect, beforeEach } from 'vitest';
+import { themeManager, DEFAULT_THEME } from './theme-manager.js';
+import { CustomTheme } from './theme.js';
+
+const validCustomTheme: CustomTheme = {
+  type: 'custom',
+  name: 'MyCustomTheme',
+  Background: '#000000',
+  Foreground: '#ffffff',
+  LightBlue: '#89BDCD',
+  AccentBlue: '#3B82F6',
+  AccentPurple: '#8B5CF6',
+  AccentCyan: '#06B6D4',
+  AccentGreen: '#3CA84B',
+  AccentYellow: 'yellow',
+  AccentRed: 'red',
+  DiffAdded: 'green',
+  DiffRemoved: 'red',
+  Comment: 'gray',
+  Gray: 'gray',
+};
+
+describe('ThemeManager', () => {
+  beforeEach(() => {
+    // Reset themeManager state
+    themeManager.loadCustomThemes({});
+    themeManager.setActiveTheme(DEFAULT_THEME.name);
+  });
+
+  it('should load valid custom themes', () => {
+    themeManager.loadCustomThemes({ MyCustomTheme: validCustomTheme });
+    expect(themeManager.getCustomThemeNames()).toContain('MyCustomTheme');
+    expect(themeManager.isCustomTheme('MyCustomTheme')).toBe(true);
+  });
+
+  it('should set and get the active theme', () => {
+    expect(themeManager.getActiveTheme().name).toBe(DEFAULT_THEME.name);
+    themeManager.setActiveTheme('Ayu');
+    expect(themeManager.getActiveTheme().name).toBe('Ayu');
+  });
+
+  it('should set and get a custom active theme', () => {
+    themeManager.loadCustomThemes({ MyCustomTheme: validCustomTheme });
+    themeManager.setActiveTheme('MyCustomTheme');
+    expect(themeManager.getActiveTheme().name).toBe('MyCustomTheme');
+  });
+
+  it('should return false when setting a non-existent theme', () => {
+    expect(themeManager.setActiveTheme('NonExistentTheme')).toBe(false);
+    expect(themeManager.getActiveTheme().name).toBe(DEFAULT_THEME.name);
+  });
+
+  it('should list available themes including custom themes', () => {
+    themeManager.loadCustomThemes({ MyCustomTheme: validCustomTheme });
+    const available = themeManager.getAvailableThemes();
+    expect(
+      available.some(
+        (t: { name: string; isCustom?: boolean }) =>
+          t.name === 'MyCustomTheme' && t.isCustom,
+      ),
+    ).toBe(true);
+  });
+
+  it('should get a theme by name', () => {
+    expect(themeManager.getTheme('Ayu')).toBeDefined();
+    themeManager.loadCustomThemes({ MyCustomTheme: validCustomTheme });
+    expect(themeManager.getTheme('MyCustomTheme')).toBeDefined();
+  });
+
+  it('should fall back to default theme if active theme is invalid', () => {
+    (themeManager as unknown as { activeTheme: unknown }).activeTheme = {
+      name: 'NonExistent',
+      type: 'custom',
+    };
+    expect(themeManager.getActiveTheme().name).toBe(DEFAULT_THEME.name);
+  });
+
+  it('should return NoColorTheme if NO_COLOR is set', () => {
+    const original = process.env['NO_COLOR'];
+    process.env['NO_COLOR'] = '1';
+    expect(themeManager.getActiveTheme().name).toBe('NoColor');
+    if (original === undefined) {
+      delete process.env['NO_COLOR'];
+    } else {
+      process.env['NO_COLOR'] = original;
+    }
+  });
+});

projects/ui/qwen-code/packages/cli/src/ui/themes/theme-manager.ts

@@ -0,0 +1,251 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AyuDark } from './ayu.js';
+import { AyuLight } from './ayu-light.js';
+import { AtomOneDark } from './atom-one-dark.js';
+import { Dracula } from './dracula.js';
+import { GitHubDark } from './github-dark.js';
+import { GitHubLight } from './github-light.js';
+import { GoogleCode } from './googlecode.js';
+import { DefaultLight } from './default-light.js';
+import { DefaultDark } from './default.js';
+import { ShadesOfPurple } from './shades-of-purple.js';
+import { XCode } from './xcode.js';
+import { QwenLight } from './qwen-light.js';
+import { QwenDark } from './qwen-dark.js';
+import {
+  Theme,
+  ThemeType,
+  CustomTheme,
+  createCustomTheme,
+  validateCustomTheme,
+} from './theme.js';
+import { SemanticColors } from './semantic-tokens.js';
+import { ANSI } from './ansi.js';
+import { ANSILight } from './ansi-light.js';
+import { NoColorTheme } from './no-color.js';
+import process from 'node:process';
+
+export interface ThemeDisplay {
+  name: string;
+  type: ThemeType;
+  isCustom?: boolean;
+}
+
+export const DEFAULT_THEME: Theme = QwenDark;
+
+class ThemeManager {
+  private readonly availableThemes: Theme[];
+  private activeTheme: Theme;
+  private customThemes: Map<string, Theme> = new Map();
+
+  constructor() {
+    this.availableThemes = [
+      AyuDark,
+      AyuLight,
+      AtomOneDark,
+      Dracula,
+      DefaultLight,
+      DefaultDark,
+      GitHubDark,
+      GitHubLight,
+      GoogleCode,
+      QwenLight,
+      QwenDark,
+      ShadesOfPurple,
+      XCode,
+      ANSI,
+      ANSILight,
+    ];
+    this.activeTheme = DEFAULT_THEME;
+  }
+
+  /**
+   * Loads custom themes from settings.
+   * @param customThemesSettings Custom themes from settings.
+   */
+  loadCustomThemes(customThemesSettings?: Record<string, CustomTheme>): void {
+    this.customThemes.clear();
+
+    if (!customThemesSettings) {
+      return;
+    }
+
+    for (const [name, customThemeConfig] of Object.entries(
+      customThemesSettings,
+    )) {
+      const validation = validateCustomTheme(customThemeConfig);
+      if (validation.isValid) {
+        if (validation.warning) {
+          console.warn(`Theme "${name}": ${validation.warning}`);
+        }
+        const themeWithDefaults: CustomTheme = {
+          ...DEFAULT_THEME.colors,
+          ...customThemeConfig,
+          name: customThemeConfig.name || name,
+          type: 'custom',
+        };
+
+        try {
+          const theme = createCustomTheme(themeWithDefaults);
+          this.customThemes.set(name, theme);
+        } catch (error) {
+          console.warn(`Failed to load custom theme "${name}":`, error);
+        }
+      } else {
+        console.warn(`Invalid custom theme "${name}": ${validation.error}`);
+      }
+    }
+    // If the current active theme is a custom theme, keep it if still valid
+    if (
+      this.activeTheme &&
+      this.activeTheme.type === 'custom' &&
+      this.customThemes.has(this.activeTheme.name)
+    ) {
+      this.activeTheme = this.customThemes.get(this.activeTheme.name)!;
+    }
+  }
+
+  /**
+   * Sets the active theme.
+   * @param themeName The name of the theme to set as active.
+   * @returns True if the theme was successfully set, false otherwise.
+   */
+  setActiveTheme(themeName: string | undefined): boolean {
+    const theme = this.findThemeByName(themeName);
+    if (!theme) {
+      return false;
+    }
+    this.activeTheme = theme;
+    return true;
+  }
+
+  /**
+   * Gets the currently active theme.
+   * @returns The active theme.
+   */
+  getActiveTheme(): Theme {
+    if (process.env['NO_COLOR']) {
+      return NoColorTheme;
+    }
+    // Ensure the active theme is always valid (fall back to default if not)
+    if (!this.activeTheme || !this.findThemeByName(this.activeTheme.name)) {
+      this.activeTheme = DEFAULT_THEME;
+    }
+    return this.activeTheme;
+  }
+
+  /**
+   * Gets the semantic colors for the active theme.
+   * @returns The semantic colors.
+   */
+  getSemanticColors(): SemanticColors {
+    return this.getActiveTheme().semanticColors;
+  }
+
+  /**
+   * Gets a list of custom theme names.
+   * @returns Array of custom theme names.
+   */
+  getCustomThemeNames(): string[] {
+    return Array.from(this.customThemes.keys());
+  }
+
+  /**
+   * Checks if a theme name is a custom theme.
+   * @param themeName The theme name to check.
+   * @returns True if the theme is custom.
+   */
+  isCustomTheme(themeName: string): boolean {
+    return this.customThemes.has(themeName);
+  }
+
+  /**
+   * Returns a list of available theme names.
+   */
+  getAvailableThemes(): ThemeDisplay[] {
+    const builtInThemes = this.availableThemes.map((theme) => ({
+      name: theme.name,
+      type: theme.type,
+      isCustom: false,
+    }));
+
+    const customThemes = Array.from(this.customThemes.values()).map(
+      (theme) => ({
+        name: theme.name,
+        type: theme.type,
+        isCustom: true,
+      }),
+    );
+
+    // Separate Qwen themes
+    const qwenThemes = builtInThemes.filter(
+      (theme) => theme.name === QwenLight.name || theme.name === QwenDark.name,
+    );
+    const otherBuiltInThemes = builtInThemes.filter(
+      (theme) => theme.name !== QwenLight.name && theme.name !== QwenDark.name,
+    );
+
+    // Sort other themes by type and then name
+    const sortedOtherThemes = [...otherBuiltInThemes, ...customThemes].sort(
+      (a, b) => {
+        const typeOrder = (type: ThemeType): number => {
+          switch (type) {
+            case 'dark':
+              return 1;
+            case 'light':
+              return 2;
+            case 'ansi':
+              return 3;
+            case 'custom':
+              return 4; // Custom themes at the end
+            default:
+              return 5;
+          }
+        };
+
+        const typeComparison = typeOrder(a.type) - typeOrder(b.type);
+        if (typeComparison !== 0) {
+          return typeComparison;
+        }
+        return a.name.localeCompare(b.name);
+      },
+    );
+
+    // Combine Qwen themes first, then sorted others
+    return [...qwenThemes, ...sortedOtherThemes];
+  }
+
+  /**
+   * Gets a theme by name.
+   * @param themeName The name of the theme to get.
+   * @returns The theme if found, undefined otherwise.
+   */
+  getTheme(themeName: string): Theme | undefined {
+    return this.findThemeByName(themeName);
+  }
+
+  findThemeByName(themeName: string | undefined): Theme | undefined {
+    if (!themeName) {
+      return DEFAULT_THEME;
+    }
+
+    // First check built-in themes
+    const builtInTheme = this.availableThemes.find(
+      (theme) => theme.name === themeName,
+    );
+    if (builtInTheme) {
+      return builtInTheme;
+    }
+
+    // Then check custom themes
+    return this.customThemes.get(themeName);
+  }
+}
+
+// Export an instance of the ThemeManager
+export const themeManager = new ThemeManager();

projects/ui/qwen-code/packages/cli/src/ui/themes/theme.test.ts

@@ -0,0 +1,97 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect } from 'vitest';
+import * as themeModule from './theme.js';
+import { themeManager } from './theme-manager.js';
+
+const { validateCustomTheme } = themeModule;
+type CustomTheme = themeModule.CustomTheme;
+
+describe('validateCustomTheme', () => {
+  const validTheme: CustomTheme = {
+    type: 'custom',
+    name: 'My Custom Theme',
+    Background: '#FFFFFF',
+    Foreground: '#000000',
+    LightBlue: '#ADD8E6',
+    AccentBlue: '#0000FF',
+    AccentPurple: '#800080',
+    AccentCyan: '#00FFFF',
+    AccentGreen: '#008000',
+    AccentYellow: '#FFFF00',
+    AccentRed: '#FF0000',
+    DiffAdded: '#00FF00',
+    DiffRemoved: '#FF0000',
+    Comment: '#808080',
+    Gray: '#808080',
+  };
+
+  it('should return isValid: true for a valid theme', () => {
+    const result = validateCustomTheme(validTheme);
+    expect(result.isValid).toBe(true);
+    expect(result.error).toBeUndefined();
+  });
+
+  it('should return isValid: false for a theme with an invalid name', () => {
+    const invalidTheme = { ...validTheme, name: ' ' };
+    const result = validateCustomTheme(invalidTheme);
+    expect(result.isValid).toBe(false);
+    expect(result.error).toBe('Invalid theme name:  ');
+  });
+
+  it('should return isValid: true for a theme missing optional DiffAdded and DiffRemoved colors', () => {
+    const legacyTheme: Partial<CustomTheme> = { ...validTheme };
+    delete legacyTheme.DiffAdded;
+    delete legacyTheme.DiffRemoved;
+    const result = validateCustomTheme(legacyTheme);
+    expect(result.isValid).toBe(true);
+    expect(result.error).toBeUndefined();
+  });
+
+  it('should return isValid: false for a theme with a very long name', () => {
+    const invalidTheme = { ...validTheme, name: 'a'.repeat(51) };
+    const result = validateCustomTheme(invalidTheme);
+    expect(result.isValid).toBe(false);
+    expect(result.error).toBe(`Invalid theme name: ${'a'.repeat(51)}`);
+  });
+});
+
+describe('themeManager.loadCustomThemes', () => {
+  const baseTheme: Omit<CustomTheme, 'DiffAdded' | 'DiffRemoved'> & {
+    DiffAdded?: string;
+    DiffRemoved?: string;
+  } = {
+    type: 'custom',
+    name: 'Test Theme',
+    Background: '#FFF',
+    Foreground: '#000',
+    LightBlue: '#ADD8E6',
+    AccentBlue: '#00F',
+    AccentPurple: '#808',
+    AccentCyan: '#0FF',
+    AccentGreen: '#080',
+    AccentYellow: '#FF0',
+    AccentRed: '#F00',
+    Comment: '#888',
+    Gray: '#888',
+  };
+
+  it('should use values from DEFAULT_THEME when DiffAdded and DiffRemoved are not provided', () => {
+    const legacyTheme: Partial<CustomTheme> = { ...baseTheme };
+    delete legacyTheme.DiffAdded;
+    delete legacyTheme.DiffRemoved;
+
+    themeManager.loadCustomThemes({ 'Legacy Custom Theme': legacyTheme });
+    const result = themeManager.getTheme('Legacy Custom Theme')!;
+
+    // Should use DEFAULT_THEME (QwenDark) values for missing fields
+    expect(result.colors.DiffAdded).toBe('#AAD94C');
+    expect(result.colors.DiffRemoved).toBe('#F26D78');
+    expect(result.colors.AccentBlue).toBe(legacyTheme.AccentBlue);
+    expect(result.name).toBe(legacyTheme.name);
+  });
+});