Add files using upload-large-folder tool

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

@@ -0,0 +1,451 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { CSSProperties } from 'react';
+import { SemanticColors } from './semantic-tokens.js';
+import { resolveColor } from './color-utils.js';
+
+export type ThemeType = 'light' | 'dark' | 'ansi' | 'custom';
+
+export interface ColorsTheme {
+  type: ThemeType;
+  Background: string;
+  Foreground: string;
+  LightBlue: string;
+  AccentBlue: string;
+  AccentPurple: string;
+  AccentCyan: string;
+  AccentGreen: string;
+  AccentYellow: string;
+  AccentRed: string;
+  DiffAdded: string;
+  DiffRemoved: string;
+  Comment: string;
+  Gray: string;
+  GradientColors?: string[];
+}
+
+export interface CustomTheme {
+  type: 'custom';
+  name: string;
+
+  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[];
+  };
+  status?: {
+    error?: string;
+    success?: string;
+    warning?: string;
+  };
+
+  // Legacy properties (all optional)
+  Background?: string;
+  Foreground?: string;
+  LightBlue?: string;
+  AccentBlue?: string;
+  AccentPurple?: string;
+  AccentCyan?: string;
+  AccentGreen?: string;
+  AccentYellow?: string;
+  AccentRed?: string;
+  DiffAdded?: string;
+  DiffRemoved?: string;
+  Comment?: string;
+  Gray?: string;
+  GradientColors?: string[];
+}
+
+export const lightTheme: ColorsTheme = {
+  type: 'light',
+  Background: '#FAFAFA',
+  Foreground: '#3C3C43',
+  LightBlue: '#89BDCD',
+  AccentBlue: '#3B82F6',
+  AccentPurple: '#8B5CF6',
+  AccentCyan: '#06B6D4',
+  AccentGreen: '#3CA84B',
+  AccentYellow: '#D5A40A',
+  AccentRed: '#DD4C4C',
+  DiffAdded: '#C6EAD8',
+  DiffRemoved: '#FFCCCC',
+  Comment: '#008000',
+  Gray: '#97a0b0',
+  GradientColors: ['#4796E4', '#847ACE', '#C3677F'],
+};
+
+export const darkTheme: ColorsTheme = {
+  type: 'dark',
+  Background: '#1E1E2E',
+  Foreground: '#CDD6F4',
+  LightBlue: '#ADD8E6',
+  AccentBlue: '#89B4FA',
+  AccentPurple: '#CBA6F7',
+  AccentCyan: '#89DCEB',
+  AccentGreen: '#A6E3A1',
+  AccentYellow: '#F9E2AF',
+  AccentRed: '#F38BA8',
+  DiffAdded: '#28350B',
+  DiffRemoved: '#430000',
+  Comment: '#6C7086',
+  Gray: '#6C7086',
+  GradientColors: ['#4796E4', '#847ACE', '#C3677F'],
+};
+
+export const ansiTheme: ColorsTheme = {
+  type: 'ansi',
+  Background: 'black',
+  Foreground: 'white',
+  LightBlue: 'blue',
+  AccentBlue: 'blue',
+  AccentPurple: 'magenta',
+  AccentCyan: 'cyan',
+  AccentGreen: 'green',
+  AccentYellow: 'yellow',
+  AccentRed: 'red',
+  DiffAdded: 'green',
+  DiffRemoved: 'red',
+  Comment: 'gray',
+  Gray: 'gray',
+};
+
+export class Theme {
+  /**
+   * The default foreground color for text when no specific highlight rule applies.
+   * This is an Ink-compatible color string (hex or name).
+   */
+  readonly defaultColor: string;
+  /**
+   * Stores the mapping from highlight.js class names (e.g., 'hljs-keyword')
+   * to Ink-compatible color strings (hex or name).
+   */
+  protected readonly _colorMap: Readonly<Record<string, string>>;
+
+  /**
+   * Creates a new Theme instance.
+   * @param name The name of the theme.
+   * @param rawMappings The raw CSSProperties mappings from a react-syntax-highlighter theme object.
+   */
+  constructor(
+    readonly name: string,
+    readonly type: ThemeType,
+    rawMappings: Record<string, CSSProperties>,
+    readonly colors: ColorsTheme,
+    readonly semanticColors: SemanticColors,
+  ) {
+    this._colorMap = Object.freeze(this._buildColorMap(rawMappings)); // Build and freeze the map
+
+    // Determine the default foreground color
+    const rawDefaultColor = rawMappings['hljs']?.color;
+    this.defaultColor =
+      (rawDefaultColor ? Theme._resolveColor(rawDefaultColor) : undefined) ??
+      ''; // Default to empty string if not found or resolvable
+  }
+
+  /**
+   * Gets the Ink-compatible color string for a given highlight.js class name.
+   * @param hljsClass The highlight.js class name (e.g., 'hljs-keyword', 'hljs-string').
+   * @returns The corresponding Ink color string (hex or name) if it exists.
+   */
+  getInkColor(hljsClass: string): string | undefined {
+    return this._colorMap[hljsClass];
+  }
+
+  /**
+   * 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.
+   */
+  private static _resolveColor(colorValue: string): string | undefined {
+    return resolveColor(colorValue);
+  }
+
+  /**
+   * Builds the internal map from highlight.js class names to Ink-compatible color strings.
+   * This method is protected and primarily intended for use by the constructor.
+   * @param hljsTheme The raw CSSProperties mappings from a react-syntax-highlighter theme object.
+   * @returns An Ink-compatible theme map (Record<string, string>).
+   */
+  protected _buildColorMap(
+    hljsTheme: Record<string, CSSProperties>,
+  ): Record<string, string> {
+    const inkTheme: Record<string, string> = {};
+    for (const key in hljsTheme) {
+      // Ensure the key starts with 'hljs-' or is 'hljs' for the base style
+      if (!key.startsWith('hljs-') && key !== 'hljs') {
+        continue; // Skip keys not related to highlighting classes
+      }
+
+      const style = hljsTheme[key];
+      if (style?.color) {
+        const resolvedColor = Theme._resolveColor(style.color);
+        if (resolvedColor !== undefined) {
+          // Use the original key from the hljsTheme (e.g., 'hljs-keyword')
+          inkTheme[key] = resolvedColor;
+        }
+        // If color is not resolvable, it's omitted from the map,
+        // this enables falling back to the default foreground color.
+      }
+      // We currently only care about the 'color' property for Ink rendering.
+      // Other properties like background, fontStyle, etc., are ignored.
+    }
+    return inkTheme;
+  }
+}
+
+/**
+ * Creates a Theme instance from a custom theme configuration.
+ * @param customTheme The custom theme configuration.
+ * @returns A new Theme instance.
+ */
+export function createCustomTheme(customTheme: CustomTheme): Theme {
+  const colors: ColorsTheme = {
+    type: 'custom',
+    Background: customTheme.background?.primary ?? customTheme.Background ?? '',
+    Foreground: customTheme.text?.primary ?? customTheme.Foreground ?? '',
+    LightBlue: customTheme.text?.link ?? customTheme.LightBlue ?? '',
+    AccentBlue: customTheme.text?.link ?? customTheme.AccentBlue ?? '',
+    AccentPurple: customTheme.text?.accent ?? customTheme.AccentPurple ?? '',
+    AccentCyan: customTheme.text?.link ?? customTheme.AccentCyan ?? '',
+    AccentGreen: customTheme.status?.success ?? customTheme.AccentGreen ?? '',
+    AccentYellow: customTheme.status?.warning ?? customTheme.AccentYellow ?? '',
+    AccentRed: customTheme.status?.error ?? customTheme.AccentRed ?? '',
+    DiffAdded:
+      customTheme.background?.diff?.added ?? customTheme.DiffAdded ?? '',
+    DiffRemoved:
+      customTheme.background?.diff?.removed ?? customTheme.DiffRemoved ?? '',
+    Comment: customTheme.ui?.comment ?? customTheme.Comment ?? '',
+    Gray: customTheme.text?.secondary ?? customTheme.Gray ?? '',
+    GradientColors: customTheme.ui?.gradient ?? customTheme.GradientColors,
+  };
+
+  // Generate CSS properties mappings based on the custom theme colors
+  const rawMappings: Record<string, CSSProperties> = {
+    hljs: {
+      display: 'block',
+      overflowX: 'auto',
+      padding: '0.5em',
+      background: colors.Background,
+      color: colors.Foreground,
+    },
+    'hljs-keyword': {
+      color: colors.AccentBlue,
+    },
+    'hljs-literal': {
+      color: colors.AccentBlue,
+    },
+    'hljs-symbol': {
+      color: colors.AccentBlue,
+    },
+    'hljs-name': {
+      color: colors.AccentBlue,
+    },
+    'hljs-link': {
+      color: colors.AccentBlue,
+      textDecoration: 'underline',
+    },
+    'hljs-built_in': {
+      color: colors.AccentCyan,
+    },
+    'hljs-type': {
+      color: colors.AccentCyan,
+    },
+    'hljs-number': {
+      color: colors.AccentGreen,
+    },
+    'hljs-class': {
+      color: colors.AccentGreen,
+    },
+    'hljs-string': {
+      color: colors.AccentYellow,
+    },
+    'hljs-meta-string': {
+      color: colors.AccentYellow,
+    },
+    'hljs-regexp': {
+      color: colors.AccentRed,
+    },
+    'hljs-template-tag': {
+      color: colors.AccentRed,
+    },
+    'hljs-subst': {
+      color: colors.Foreground,
+    },
+    'hljs-function': {
+      color: colors.Foreground,
+    },
+    'hljs-title': {
+      color: colors.Foreground,
+    },
+    'hljs-params': {
+      color: colors.Foreground,
+    },
+    'hljs-formula': {
+      color: colors.Foreground,
+    },
+    'hljs-comment': {
+      color: colors.Comment,
+      fontStyle: 'italic',
+    },
+    'hljs-quote': {
+      color: colors.Comment,
+      fontStyle: 'italic',
+    },
+    'hljs-doctag': {
+      color: colors.Comment,
+    },
+    'hljs-meta': {
+      color: colors.Gray,
+    },
+    'hljs-meta-keyword': {
+      color: colors.Gray,
+    },
+    'hljs-tag': {
+      color: colors.Gray,
+    },
+    'hljs-variable': {
+      color: colors.AccentPurple,
+    },
+    'hljs-template-variable': {
+      color: colors.AccentPurple,
+    },
+    'hljs-attr': {
+      color: colors.LightBlue,
+    },
+    'hljs-attribute': {
+      color: colors.LightBlue,
+    },
+    'hljs-builtin-name': {
+      color: colors.LightBlue,
+    },
+    'hljs-section': {
+      color: colors.AccentYellow,
+    },
+    'hljs-emphasis': {
+      fontStyle: 'italic',
+    },
+    'hljs-strong': {
+      fontWeight: 'bold',
+    },
+    'hljs-bullet': {
+      color: colors.AccentYellow,
+    },
+    'hljs-selector-tag': {
+      color: colors.AccentYellow,
+    },
+    'hljs-selector-id': {
+      color: colors.AccentYellow,
+    },
+    'hljs-selector-class': {
+      color: colors.AccentYellow,
+    },
+    'hljs-selector-attr': {
+      color: colors.AccentYellow,
+    },
+    'hljs-selector-pseudo': {
+      color: colors.AccentYellow,
+    },
+    'hljs-addition': {
+      backgroundColor: colors.AccentGreen,
+      display: 'inline-block',
+      width: '100%',
+    },
+    'hljs-deletion': {
+      backgroundColor: colors.AccentRed,
+      display: 'inline-block',
+      width: '100%',
+    },
+  };
+
+  const semanticColors: SemanticColors = {
+    text: {
+      primary: colors.Foreground,
+      secondary: colors.Gray,
+      link: colors.AccentBlue,
+      accent: colors.AccentPurple,
+    },
+    background: {
+      primary: colors.Background,
+      diff: {
+        added: colors.DiffAdded,
+        removed: colors.DiffRemoved,
+      },
+    },
+    border: {
+      default: colors.Gray,
+      focused: colors.AccentBlue,
+    },
+    ui: {
+      comment: colors.Comment,
+      symbol: colors.Gray,
+      gradient: colors.GradientColors,
+    },
+    status: {
+      error: colors.AccentRed,
+      success: colors.AccentGreen,
+      warning: colors.AccentYellow,
+    },
+  };
+
+  return new Theme(
+    customTheme.name,
+    'custom',
+    rawMappings,
+    colors,
+    semanticColors,
+  );
+}
+
+/**
+ * Validates a custom theme configuration.
+ * @param customTheme The custom theme to validate.
+ * @returns An object with isValid boolean and error message if invalid.
+ */
+export function validateCustomTheme(customTheme: Partial<CustomTheme>): {
+  isValid: boolean;
+  error?: string;
+  warning?: string;
+} {
+  // Since all fields are optional, we only need to validate the name.
+  if (customTheme.name && !isValidThemeName(customTheme.name)) {
+    return {
+      isValid: false,
+      error: `Invalid theme name: ${customTheme.name}`,
+    };
+  }
+
+  return {
+    isValid: true,
+  };
+}
+
+/**
+ * Checks if a theme name is valid.
+ * @param name The theme name to validate.
+ * @returns True if the theme name is valid.
+ */
+function isValidThemeName(name: string): boolean {
+  // Theme name should be non-empty and not contain invalid characters
+  return name.trim().length > 0 && name.trim().length <= 50;
+}

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

@@ -0,0 +1,154 @@
+/**
+ * @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 xcodeColors: ColorsTheme = {
+  type: 'light',
+  Background: '#fff',
+  Foreground: '#444',
+  LightBlue: '#0E0EFF',
+  AccentBlue: '#1c00cf',
+  AccentPurple: '#aa0d91',
+  AccentCyan: '#3F6E74',
+  AccentGreen: '#007400',
+  AccentYellow: '#836C28',
+  AccentRed: '#c41a16',
+  DiffAdded: '#C6EAD8',
+  DiffRemoved: '#FEDEDE',
+  Comment: '#007400',
+  Gray: '#c0c0c0',
+  GradientColors: ['#1c00cf', '#007400'],
+};
+
+export const XCode: Theme = new Theme(
+  'Xcode',
+  'light',
+  {
+    hljs: {
+      display: 'block',
+      overflowX: 'auto',
+      padding: '0.5em',
+      background: xcodeColors.Background,
+      color: xcodeColors.Foreground,
+    },
+    'xml .hljs-meta': {
+      color: xcodeColors.Gray,
+    },
+    'hljs-comment': {
+      color: xcodeColors.Comment,
+    },
+    'hljs-quote': {
+      color: xcodeColors.Comment,
+    },
+    'hljs-tag': {
+      color: xcodeColors.AccentPurple,
+    },
+    'hljs-attribute': {
+      color: xcodeColors.AccentPurple,
+    },
+    'hljs-keyword': {
+      color: xcodeColors.AccentPurple,
+    },
+    'hljs-selector-tag': {
+      color: xcodeColors.AccentPurple,
+    },
+    'hljs-literal': {
+      color: xcodeColors.AccentPurple,
+    },
+    'hljs-name': {
+      color: xcodeColors.AccentPurple,
+    },
+    'hljs-variable': {
+      color: xcodeColors.AccentCyan,
+    },
+    'hljs-template-variable': {
+      color: xcodeColors.AccentCyan,
+    },
+    'hljs-code': {
+      color: xcodeColors.AccentRed,
+    },
+    'hljs-string': {
+      color: xcodeColors.AccentRed,
+    },
+    'hljs-meta-string': {
+      color: xcodeColors.AccentRed,
+    },
+    'hljs-regexp': {
+      color: xcodeColors.LightBlue,
+    },
+    'hljs-link': {
+      color: xcodeColors.LightBlue,
+    },
+    'hljs-title': {
+      color: xcodeColors.AccentBlue,
+    },
+    'hljs-symbol': {
+      color: xcodeColors.AccentBlue,
+    },
+    'hljs-bullet': {
+      color: xcodeColors.AccentBlue,
+    },
+    'hljs-number': {
+      color: xcodeColors.AccentBlue,
+    },
+    'hljs-section': {
+      color: xcodeColors.AccentYellow,
+    },
+    'hljs-meta': {
+      color: xcodeColors.AccentYellow,
+    },
+    'hljs-class .hljs-title': {
+      color: xcodeColors.AccentPurple,
+    },
+    'hljs-type': {
+      color: xcodeColors.AccentPurple,
+    },
+    'hljs-built_in': {
+      color: xcodeColors.AccentPurple,
+    },
+    'hljs-builtin-name': {
+      color: xcodeColors.AccentPurple,
+    },
+    'hljs-params': {
+      color: xcodeColors.AccentPurple,
+    },
+    'hljs-attr': {
+      color: xcodeColors.AccentYellow,
+    },
+    'hljs-subst': {
+      color: xcodeColors.Foreground,
+    },
+    'hljs-formula': {
+      backgroundColor: '#eee',
+      fontStyle: 'italic',
+    },
+    'hljs-addition': {
+      backgroundColor: '#baeeba',
+    },
+    'hljs-deletion': {
+      backgroundColor: '#ffc8bd',
+    },
+    'hljs-selector-id': {
+      color: xcodeColors.AccentYellow,
+    },
+    'hljs-selector-class': {
+      color: xcodeColors.AccentYellow,
+    },
+    'hljs-doctag': {
+      fontWeight: 'bold',
+    },
+    'hljs-strong': {
+      fontWeight: 'bold',
+    },
+    'hljs-emphasis': {
+      fontStyle: 'italic',
+    },
+  },
+  xcodeColors,
+  lightSemanticColors,
+);

projects/ui/qwen-code/packages/cli/src/ui/utils/CodeColorizer.tsx

@@ -0,0 +1,217 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import React from 'react';
+import { Text, Box } from 'ink';
+import { common, createLowlight } from 'lowlight';
+import type {
+  Root,
+  Element,
+  Text as HastText,
+  ElementContent,
+  RootContent,
+} from 'hast';
+import { themeManager } from '../themes/theme-manager.js';
+import { Theme } from '../themes/theme.js';
+import {
+  MaxSizedBox,
+  MINIMUM_MAX_HEIGHT,
+} from '../components/shared/MaxSizedBox.js';
+import { LoadedSettings } from '../../config/settings.js';
+
+// Configure theming and parsing utilities.
+const lowlight = createLowlight(common);
+
+function renderHastNode(
+  node: Root | Element | HastText | RootContent,
+  theme: Theme,
+  inheritedColor: string | undefined,
+): React.ReactNode {
+  if (node.type === 'text') {
+    // Use the color passed down from parent element, if any
+    return <Text color={inheritedColor}>{node.value}</Text>;
+  }
+
+  // Handle Element Nodes: Determine color and pass it down, don't wrap
+  if (node.type === 'element') {
+    const nodeClasses: string[] =
+      (node.properties?.['className'] as string[]) || [];
+    let elementColor: string | undefined = undefined;
+
+    // Find color defined specifically for this element's class
+    for (let i = nodeClasses.length - 1; i >= 0; i--) {
+      const color = theme.getInkColor(nodeClasses[i]);
+      if (color) {
+        elementColor = color;
+        break;
+      }
+    }
+
+    // Determine the color to pass down: Use this element's specific color
+    // if found; otherwise, continue passing down the already inherited color.
+    const colorToPassDown = elementColor || inheritedColor;
+
+    // Recursively render children, passing the determined color down
+    // Ensure child type matches expected HAST structure (ElementContent is common)
+    const children = node.children?.map(
+      (child: ElementContent, index: number) => (
+        <React.Fragment key={index}>
+          {renderHastNode(child, theme, colorToPassDown)}
+        </React.Fragment>
+      ),
+    );
+
+    // Element nodes now only group children; color is applied by Text nodes.
+    // Use a React Fragment to avoid adding unnecessary elements.
+    return <React.Fragment>{children}</React.Fragment>;
+  }
+
+  // Handle Root Node: Start recursion with initially inherited color
+  if (node.type === 'root') {
+    // Check if children array is empty - this happens when lowlight can't detect language – fall back to plain text
+    if (!node.children || node.children.length === 0) {
+      return null;
+    }
+
+    // Pass down the initial inheritedColor (likely undefined from the top call)
+    // Ensure child type matches expected HAST structure (RootContent is common)
+    return node.children?.map((child: RootContent, index: number) => (
+      <React.Fragment key={index}>
+        {renderHastNode(child, theme, inheritedColor)}
+      </React.Fragment>
+    ));
+  }
+
+  // Handle unknown or unsupported node types
+  return null;
+}
+
+function highlightAndRenderLine(
+  line: string,
+  language: string | null,
+  theme: Theme,
+): React.ReactNode {
+  try {
+    const getHighlightedLine = () =>
+      !language || !lowlight.registered(language)
+        ? lowlight.highlightAuto(line)
+        : lowlight.highlight(language, line);
+
+    const renderedNode = renderHastNode(getHighlightedLine(), theme, undefined);
+
+    return renderedNode !== null ? renderedNode : line;
+  } catch (_error) {
+    return line;
+  }
+}
+
+export function colorizeLine(
+  line: string,
+  language: string | null,
+  theme?: Theme,
+): React.ReactNode {
+  const activeTheme = theme || themeManager.getActiveTheme();
+  return highlightAndRenderLine(line, language, activeTheme);
+}
+
+/**
+ * Renders syntax-highlighted code for Ink applications using a selected theme.
+ *
+ * @param code The code string to highlight.
+ * @param language The language identifier (e.g., 'javascript', 'css', 'html')
+ * @returns A React.ReactNode containing Ink <Text> elements for the highlighted code.
+ */
+export function colorizeCode(
+  code: string,
+  language: string | null,
+  availableHeight?: number,
+  maxWidth?: number,
+  theme?: Theme,
+  settings?: LoadedSettings,
+): React.ReactNode {
+  const codeToHighlight = code.replace(/\n$/, '');
+  const activeTheme = theme || themeManager.getActiveTheme();
+  const showLineNumbers = settings?.merged.showLineNumbers ?? true;
+
+  try {
+    // Render the HAST tree using the adapted theme
+    // Apply the theme's default foreground color to the top-level Text element
+    let lines = codeToHighlight.split('\n');
+    const padWidth = String(lines.length).length; // Calculate padding width based on number of lines
+
+    let hiddenLinesCount = 0;
+
+    // Optimization to avoid highlighting lines that cannot possibly be displayed.
+    if (availableHeight !== undefined) {
+      availableHeight = Math.max(availableHeight, MINIMUM_MAX_HEIGHT);
+      if (lines.length > availableHeight) {
+        const sliceIndex = lines.length - availableHeight;
+        hiddenLinesCount = sliceIndex;
+        lines = lines.slice(sliceIndex);
+      }
+    }
+
+    return (
+      <MaxSizedBox
+        maxHeight={availableHeight}
+        maxWidth={maxWidth}
+        additionalHiddenLinesCount={hiddenLinesCount}
+        overflowDirection="top"
+      >
+        {lines.map((line, index) => {
+          const contentToRender = highlightAndRenderLine(
+            line,
+            language,
+            activeTheme,
+          );
+
+          return (
+            <Box key={index}>
+              {showLineNumbers && (
+                <Text color={activeTheme.colors.Gray}>
+                  {`${String(index + 1 + hiddenLinesCount).padStart(
+                    padWidth,
+                    ' ',
+                  )} `}
+                </Text>
+              )}
+              <Text color={activeTheme.defaultColor} wrap="wrap">
+                {contentToRender}
+              </Text>
+            </Box>
+          );
+        })}
+      </MaxSizedBox>
+    );
+  } catch (error) {
+    console.error(
+      `[colorizeCode] Error highlighting code for language "${language}":`,
+      error,
+    );
+    // Fall back to plain text with default color on error
+    // Also display line numbers in fallback
+    const lines = codeToHighlight.split('\n');
+    const padWidth = String(lines.length).length; // Calculate padding width based on number of lines
+    return (
+      <MaxSizedBox
+        maxHeight={availableHeight}
+        maxWidth={maxWidth}
+        overflowDirection="top"
+      >
+        {lines.map((line, index) => (
+          <Box key={index}>
+            {showLineNumbers && (
+              <Text color={activeTheme.defaultColor}>
+                {`${String(index + 1).padStart(padWidth, ' ')} `}
+              </Text>
+            )}
+            <Text color={activeTheme.colors.Gray}>{line}</Text>
+          </Box>
+        ))}
+      </MaxSizedBox>
+    );
+  }
+}

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

@@ -0,0 +1,71 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import util from 'util';
+import { ConsoleMessageItem } from '../types.js';
+
+interface ConsolePatcherParams {
+  onNewMessage?: (message: Omit<ConsoleMessageItem, 'id'>) => void;
+  debugMode: boolean;
+  stderr?: boolean;
+}
+
+export class ConsolePatcher {
+  private originalConsoleLog = console.log;
+  private originalConsoleWarn = console.warn;
+  private originalConsoleError = console.error;
+  private originalConsoleDebug = console.debug;
+  private originalConsoleInfo = console.info;
+
+  private params: ConsolePatcherParams;
+
+  constructor(params: ConsolePatcherParams) {
+    this.params = params;
+  }
+
+  patch() {
+    console.log = this.patchConsoleMethod('log', this.originalConsoleLog);
+    console.warn = this.patchConsoleMethod('warn', this.originalConsoleWarn);
+    console.error = this.patchConsoleMethod('error', this.originalConsoleError);
+    console.debug = this.patchConsoleMethod('debug', this.originalConsoleDebug);
+    console.info = this.patchConsoleMethod('info', this.originalConsoleInfo);
+  }
+
+  cleanup = () => {
+    console.log = this.originalConsoleLog;
+    console.warn = this.originalConsoleWarn;
+    console.error = this.originalConsoleError;
+    console.debug = this.originalConsoleDebug;
+    console.info = this.originalConsoleInfo;
+  };
+
+  private formatArgs = (args: unknown[]): string => util.format(...args);
+
+  private patchConsoleMethod =
+    (
+      type: 'log' | 'warn' | 'error' | 'debug' | 'info',
+      originalMethod: (...args: unknown[]) => void,
+    ) =>
+    (...args: unknown[]) => {
+      if (this.params.stderr) {
+        if (type !== 'debug' || this.params.debugMode) {
+          this.originalConsoleError(this.formatArgs(args));
+        }
+      } else {
+        if (this.params.debugMode) {
+          originalMethod.apply(console, args);
+        }
+
+        if (type !== 'debug' || this.params.debugMode) {
+          this.params.onNewMessage?.({
+            type,
+            content: this.formatArgs(args),
+            count: 1,
+          });
+        }
+      }
+    };
+}

projects/ui/qwen-code/packages/cli/src/ui/utils/InlineMarkdownRenderer.tsx

@@ -0,0 +1,173 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import React from 'react';
+import { Text } from 'ink';
+import { Colors } from '../colors.js';
+import stringWidth from 'string-width';
+
+// Constants for Markdown parsing
+const BOLD_MARKER_LENGTH = 2; // For "**"
+const ITALIC_MARKER_LENGTH = 1; // For "*" or "_"
+const STRIKETHROUGH_MARKER_LENGTH = 2; // For "~~"
+const INLINE_CODE_MARKER_LENGTH = 1; // For "`"
+const UNDERLINE_TAG_START_LENGTH = 3; // For "<u>"
+const UNDERLINE_TAG_END_LENGTH = 4; // For "</u>"
+
+interface RenderInlineProps {
+  text: string;
+}
+
+const RenderInlineInternal: React.FC<RenderInlineProps> = ({ text }) => {
+  // Early return for plain text without markdown or URLs
+  if (!/[*_~`<[https?:]/.test(text)) {
+    return <Text>{text}</Text>;
+  }
+
+  const nodes: React.ReactNode[] = [];
+  let lastIndex = 0;
+  const inlineRegex =
+    /(\*\*.*?\*\*|\*.*?\*|_.*?_|~~.*?~~|\[.*?\]\(.*?\)|`+.+?`+|<u>.*?<\/u>|https?:\/\/\S+)/g;
+  let match;
+
+  while ((match = inlineRegex.exec(text)) !== null) {
+    if (match.index > lastIndex) {
+      nodes.push(
+        <Text key={`t-${lastIndex}`}>
+          {text.slice(lastIndex, match.index)}
+        </Text>,
+      );
+    }
+
+    const fullMatch = match[0];
+    let renderedNode: React.ReactNode = null;
+    const key = `m-${match.index}`;
+
+    try {
+      if (
+        fullMatch.startsWith('**') &&
+        fullMatch.endsWith('**') &&
+        fullMatch.length > BOLD_MARKER_LENGTH * 2
+      ) {
+        renderedNode = (
+          <Text key={key} bold>
+            {fullMatch.slice(BOLD_MARKER_LENGTH, -BOLD_MARKER_LENGTH)}
+          </Text>
+        );
+      } else if (
+        fullMatch.length > ITALIC_MARKER_LENGTH * 2 &&
+        ((fullMatch.startsWith('*') && fullMatch.endsWith('*')) ||
+          (fullMatch.startsWith('_') && fullMatch.endsWith('_'))) &&
+        !/\w/.test(text.substring(match.index - 1, match.index)) &&
+        !/\w/.test(
+          text.substring(inlineRegex.lastIndex, inlineRegex.lastIndex + 1),
+        ) &&
+        !/\S[./\\]/.test(text.substring(match.index - 2, match.index)) &&
+        !/[./\\]\S/.test(
+          text.substring(inlineRegex.lastIndex, inlineRegex.lastIndex + 2),
+        )
+      ) {
+        renderedNode = (
+          <Text key={key} italic>
+            {fullMatch.slice(ITALIC_MARKER_LENGTH, -ITALIC_MARKER_LENGTH)}
+          </Text>
+        );
+      } else if (
+        fullMatch.startsWith('~~') &&
+        fullMatch.endsWith('~~') &&
+        fullMatch.length > STRIKETHROUGH_MARKER_LENGTH * 2
+      ) {
+        renderedNode = (
+          <Text key={key} strikethrough>
+            {fullMatch.slice(
+              STRIKETHROUGH_MARKER_LENGTH,
+              -STRIKETHROUGH_MARKER_LENGTH,
+            )}
+          </Text>
+        );
+      } else if (
+        fullMatch.startsWith('`') &&
+        fullMatch.endsWith('`') &&
+        fullMatch.length > INLINE_CODE_MARKER_LENGTH
+      ) {
+        const codeMatch = fullMatch.match(/^(`+)(.+?)\1$/s);
+        if (codeMatch && codeMatch[2]) {
+          renderedNode = (
+            <Text key={key} color={Colors.AccentPurple}>
+              {codeMatch[2]}
+            </Text>
+          );
+        }
+      } else if (
+        fullMatch.startsWith('[') &&
+        fullMatch.includes('](') &&
+        fullMatch.endsWith(')')
+      ) {
+        const linkMatch = fullMatch.match(/\[(.*?)\]\((.*?)\)/);
+        if (linkMatch) {
+          const linkText = linkMatch[1];
+          const url = linkMatch[2];
+          renderedNode = (
+            <Text key={key}>
+              {linkText}
+              <Text color={Colors.AccentBlue}> ({url})</Text>
+            </Text>
+          );
+        }
+      } else if (
+        fullMatch.startsWith('<u>') &&
+        fullMatch.endsWith('</u>') &&
+        fullMatch.length >
+          UNDERLINE_TAG_START_LENGTH + UNDERLINE_TAG_END_LENGTH - 1 // -1 because length is compared to combined length of start and end tags
+      ) {
+        renderedNode = (
+          <Text key={key} underline>
+            {fullMatch.slice(
+              UNDERLINE_TAG_START_LENGTH,
+              -UNDERLINE_TAG_END_LENGTH,
+            )}
+          </Text>
+        );
+      } else if (fullMatch.match(/^https?:\/\//)) {
+        renderedNode = (
+          <Text key={key} color={Colors.AccentBlue}>
+            {fullMatch}
+          </Text>
+        );
+      }
+    } catch (e) {
+      console.error('Error parsing inline markdown part:', fullMatch, e);
+      renderedNode = null;
+    }
+
+    nodes.push(renderedNode ?? <Text key={key}>{fullMatch}</Text>);
+    lastIndex = inlineRegex.lastIndex;
+  }
+
+  if (lastIndex < text.length) {
+    nodes.push(<Text key={`t-${lastIndex}`}>{text.slice(lastIndex)}</Text>);
+  }
+
+  return <>{nodes.filter((node) => node !== null)}</>;
+};
+
+export const RenderInline = React.memo(RenderInlineInternal);
+
+/**
+ * Utility function to get the plain text length of a string with markdown formatting
+ * This is useful for calculating column widths in tables
+ */
+export const getPlainTextLength = (text: string): number => {
+  const cleanText = text
+    .replace(/\*\*(.*?)\*\*/g, '$1')
+    .replace(/\*(.*?)\*/g, '$1')
+    .replace(/_(.*?)_/g, '$1')
+    .replace(/~~(.*?)~~/g, '$1')
+    .replace(/`(.*?)`/g, '$1')
+    .replace(/<u>(.*?)<\/u>/g, '$1')
+    .replace(/\[(.*?)\]\(.*?\)/g, '$1');
+  return stringWidth(cleanText);
+};

projects/ui/qwen-code/packages/cli/src/ui/utils/MarkdownDisplay.test.tsx

@@ -0,0 +1,244 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { render } from 'ink-testing-library';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { MarkdownDisplay } from './MarkdownDisplay.js';
+import { LoadedSettings } from '../../config/settings.js';
+import { SettingsContext } from '../contexts/SettingsContext.js';
+
+describe('<MarkdownDisplay />', () => {
+  const baseProps = {
+    isPending: false,
+    terminalWidth: 80,
+    availableTerminalHeight: 40,
+  };
+
+  const mockSettings = new LoadedSettings(
+    { path: '', settings: {} },
+    { path: '', settings: {} },
+    { path: '', settings: {} },
+    [],
+  );
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('renders nothing for empty text', () => {
+    const { lastFrame } = render(
+      <SettingsContext.Provider value={mockSettings}>
+        <MarkdownDisplay {...baseProps} text="" />
+      </SettingsContext.Provider>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
+
+  it('renders a simple paragraph', () => {
+    const text = 'Hello, world.';
+    const { lastFrame } = render(
+      <SettingsContext.Provider value={mockSettings}>
+        <MarkdownDisplay {...baseProps} text={text} />
+      </SettingsContext.Provider>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
+
+  it('renders headers with correct levels', () => {
+    const text = `
+# Header 1
+## Header 2
+### Header 3
+#### Header 4
+`;
+    const { lastFrame } = render(
+      <SettingsContext.Provider value={mockSettings}>
+        <MarkdownDisplay {...baseProps} text={text} />
+      </SettingsContext.Provider>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
+
+  it('renders a fenced code block with a language', () => {
+    const text = '```javascript\nconst x = 1;\nconsole.log(x);\n```';
+    const { lastFrame } = render(
+      <SettingsContext.Provider value={mockSettings}>
+        <MarkdownDisplay {...baseProps} text={text} />
+      </SettingsContext.Provider>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
+
+  it('renders a fenced code block without a language', () => {
+    const text = '```\nplain text\n```';
+    const { lastFrame } = render(
+      <SettingsContext.Provider value={mockSettings}>
+        <MarkdownDisplay {...baseProps} text={text} />
+      </SettingsContext.Provider>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
+
+  it('handles unclosed (pending) code blocks', () => {
+    const text = '```typescript\nlet y = 2;';
+    const { lastFrame } = render(
+      <SettingsContext.Provider value={mockSettings}>
+        <MarkdownDisplay {...baseProps} text={text} isPending={true} />
+      </SettingsContext.Provider>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
+
+  it('renders unordered lists with different markers', () => {
+    const text = `
+- item A
+* item B
++ item C
+`;
+    const { lastFrame } = render(
+      <SettingsContext.Provider value={mockSettings}>
+        <MarkdownDisplay {...baseProps} text={text} />
+      </SettingsContext.Provider>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
+
+  it('renders nested unordered lists', () => {
+    const text = `
+* Level 1
+  * Level 2
+    * Level 3
+`;
+    const { lastFrame } = render(
+      <SettingsContext.Provider value={mockSettings}>
+        <MarkdownDisplay {...baseProps} text={text} />
+      </SettingsContext.Provider>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
+
+  it('renders ordered lists', () => {
+    const text = `
+1. First item
+2. Second item
+`;
+    const { lastFrame } = render(
+      <SettingsContext.Provider value={mockSettings}>
+        <MarkdownDisplay {...baseProps} text={text} />
+      </SettingsContext.Provider>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
+
+  it('renders horizontal rules', () => {
+    const text = `
+Hello
+---
+World
+***
+Test
+`;
+    const { lastFrame } = render(
+      <SettingsContext.Provider value={mockSettings}>
+        <MarkdownDisplay {...baseProps} text={text} />
+      </SettingsContext.Provider>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
+
+  it('renders tables correctly', () => {
+    const text = `
+| Header 1 | Header 2 |
+|----------|:--------:|
+| Cell 1   | Cell 2   |
+| Cell 3   | Cell 4   |
+`;
+    const { lastFrame } = render(
+      <SettingsContext.Provider value={mockSettings}>
+        <MarkdownDisplay {...baseProps} text={text} />
+      </SettingsContext.Provider>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
+
+  it('handles a table at the end of the input', () => {
+    const text = `
+Some text before.
+| A | B |
+|---|
+| 1 | 2 |`;
+    const { lastFrame } = render(
+      <SettingsContext.Provider value={mockSettings}>
+        <MarkdownDisplay {...baseProps} text={text} />
+      </SettingsContext.Provider>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
+
+  it('inserts a single space between paragraphs', () => {
+    const text = `Paragraph 1.
+
+Paragraph 2.`;
+    const { lastFrame } = render(
+      <SettingsContext.Provider value={mockSettings}>
+        <MarkdownDisplay {...baseProps} text={text} />
+      </SettingsContext.Provider>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
+
+  it('correctly parses a mix of markdown elements', () => {
+    const text = `
+# Main Title
+
+Here is a paragraph.
+
+- List item 1
+- List item 2
+
+\`\`\`
+some code
+\`\`\`
+
+Another paragraph.
+`;
+    const { lastFrame } = render(
+      <SettingsContext.Provider value={mockSettings}>
+        <MarkdownDisplay {...baseProps} text={text} />
+      </SettingsContext.Provider>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
+
+  it('hides line numbers in code blocks when showLineNumbers is false', () => {
+    const text = '```javascript\nconst x = 1;\n```';
+    const settings = new LoadedSettings(
+      { path: '', settings: {} },
+      { path: '', settings: { showLineNumbers: false } },
+      { path: '', settings: {} },
+      [],
+    );
+
+    const { lastFrame } = render(
+      <SettingsContext.Provider value={settings}>
+        <MarkdownDisplay {...baseProps} text={text} />
+      </SettingsContext.Provider>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+    expect(lastFrame()).not.toContain(' 1 ');
+  });
+
+  it('shows line numbers in code blocks by default', () => {
+    const text = '```javascript\nconst x = 1;\n```';
+    const { lastFrame } = render(
+      <SettingsContext.Provider value={mockSettings}>
+        <MarkdownDisplay {...baseProps} text={text} />
+      </SettingsContext.Provider>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+    expect(lastFrame()).toContain(' 1 ');
+  });
+});

projects/ui/qwen-code/packages/cli/src/ui/utils/MarkdownDisplay.tsx

@@ -0,0 +1,415 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import React from 'react';
+import { Text, Box } from 'ink';
+import { Colors } from '../colors.js';
+import { colorizeCode } from './CodeColorizer.js';
+import { TableRenderer } from './TableRenderer.js';
+import { RenderInline } from './InlineMarkdownRenderer.js';
+import { useSettings } from '../contexts/SettingsContext.js';
+
+interface MarkdownDisplayProps {
+  text: string;
+  isPending: boolean;
+  availableTerminalHeight?: number;
+  terminalWidth: number;
+}
+
+// Constants for Markdown parsing and rendering
+
+const EMPTY_LINE_HEIGHT = 1;
+const CODE_BLOCK_PREFIX_PADDING = 1;
+const LIST_ITEM_PREFIX_PADDING = 1;
+const LIST_ITEM_TEXT_FLEX_GROW = 1;
+
+const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
+  text,
+  isPending,
+  availableTerminalHeight,
+  terminalWidth,
+}) => {
+  if (!text) return <></>;
+
+  const lines = text.split('\n');
+  const headerRegex = /^ *(#{1,4}) +(.*)/;
+  const codeFenceRegex = /^ *(`{3,}|~{3,}) *(\w*?) *$/;
+  const ulItemRegex = /^([ \t]*)([-*+]) +(.*)/;
+  const olItemRegex = /^([ \t]*)(\d+)\. +(.*)/;
+  const hrRegex = /^ *([-*_] *){3,} *$/;
+  const tableRowRegex = /^\s*\|(.+)\|\s*$/;
+  const tableSeparatorRegex = /^\s*\|?\s*(:?-+:?)\s*(\|\s*(:?-+:?)\s*)+\|?\s*$/;
+
+  const contentBlocks: React.ReactNode[] = [];
+  let inCodeBlock = false;
+  let lastLineEmpty = true;
+  let codeBlockContent: string[] = [];
+  let codeBlockLang: string | null = null;
+  let codeBlockFence = '';
+  let inTable = false;
+  let tableRows: string[][] = [];
+  let tableHeaders: string[] = [];
+
+  function addContentBlock(block: React.ReactNode) {
+    if (block) {
+      contentBlocks.push(block);
+      lastLineEmpty = false;
+    }
+  }
+
+  lines.forEach((line, index) => {
+    const key = `line-${index}`;
+
+    if (inCodeBlock) {
+      const fenceMatch = line.match(codeFenceRegex);
+      if (
+        fenceMatch &&
+        fenceMatch[1].startsWith(codeBlockFence[0]) &&
+        fenceMatch[1].length >= codeBlockFence.length
+      ) {
+        addContentBlock(
+          <RenderCodeBlock
+            key={key}
+            content={codeBlockContent}
+            lang={codeBlockLang}
+            isPending={isPending}
+            availableTerminalHeight={availableTerminalHeight}
+            terminalWidth={terminalWidth}
+          />,
+        );
+        inCodeBlock = false;
+        codeBlockContent = [];
+        codeBlockLang = null;
+        codeBlockFence = '';
+      } else {
+        codeBlockContent.push(line);
+      }
+      return;
+    }
+
+    const codeFenceMatch = line.match(codeFenceRegex);
+    const headerMatch = line.match(headerRegex);
+    const ulMatch = line.match(ulItemRegex);
+    const olMatch = line.match(olItemRegex);
+    const hrMatch = line.match(hrRegex);
+    const tableRowMatch = line.match(tableRowRegex);
+    const tableSeparatorMatch = line.match(tableSeparatorRegex);
+
+    if (codeFenceMatch) {
+      inCodeBlock = true;
+      codeBlockFence = codeFenceMatch[1];
+      codeBlockLang = codeFenceMatch[2] || null;
+    } else if (tableRowMatch && !inTable) {
+      // Potential table start - check if next line is separator
+      if (
+        index + 1 < lines.length &&
+        lines[index + 1].match(tableSeparatorRegex)
+      ) {
+        inTable = true;
+        tableHeaders = tableRowMatch[1].split('|').map((cell) => cell.trim());
+        tableRows = [];
+      } else {
+        // Not a table, treat as regular text
+        addContentBlock(
+          <Box key={key}>
+            <Text wrap="wrap">
+              <RenderInline text={line} />
+            </Text>
+          </Box>,
+        );
+      }
+    } else if (inTable && tableSeparatorMatch) {
+      // Skip separator line - already handled
+    } else if (inTable && tableRowMatch) {
+      // Add table row
+      const cells = tableRowMatch[1].split('|').map((cell) => cell.trim());
+      // Ensure row has same column count as headers
+      while (cells.length < tableHeaders.length) {
+        cells.push('');
+      }
+      if (cells.length > tableHeaders.length) {
+        cells.length = tableHeaders.length;
+      }
+      tableRows.push(cells);
+    } else if (inTable && !tableRowMatch) {
+      // End of table
+      if (tableHeaders.length > 0 && tableRows.length > 0) {
+        addContentBlock(
+          <RenderTable
+            key={`table-${contentBlocks.length}`}
+            headers={tableHeaders}
+            rows={tableRows}
+            terminalWidth={terminalWidth}
+          />,
+        );
+      }
+      inTable = false;
+      tableRows = [];
+      tableHeaders = [];
+
+      // Process current line as normal
+      if (line.trim().length > 0) {
+        addContentBlock(
+          <Box key={key}>
+            <Text wrap="wrap">
+              <RenderInline text={line} />
+            </Text>
+          </Box>,
+        );
+      }
+    } else if (hrMatch) {
+      addContentBlock(
+        <Box key={key}>
+          <Text dimColor>---</Text>
+        </Box>,
+      );
+    } else if (headerMatch) {
+      const level = headerMatch[1].length;
+      const headerText = headerMatch[2];
+      let headerNode: React.ReactNode = null;
+      switch (level) {
+        case 1:
+          headerNode = (
+            <Text bold color={Colors.AccentCyan}>
+              <RenderInline text={headerText} />
+            </Text>
+          );
+          break;
+        case 2:
+          headerNode = (
+            <Text bold color={Colors.AccentBlue}>
+              <RenderInline text={headerText} />
+            </Text>
+          );
+          break;
+        case 3:
+          headerNode = (
+            <Text bold>
+              <RenderInline text={headerText} />
+            </Text>
+          );
+          break;
+        case 4:
+          headerNode = (
+            <Text italic color={Colors.Gray}>
+              <RenderInline text={headerText} />
+            </Text>
+          );
+          break;
+        default:
+          headerNode = (
+            <Text>
+              <RenderInline text={headerText} />
+            </Text>
+          );
+          break;
+      }
+      if (headerNode) addContentBlock(<Box key={key}>{headerNode}</Box>);
+    } else if (ulMatch) {
+      const leadingWhitespace = ulMatch[1];
+      const marker = ulMatch[2];
+      const itemText = ulMatch[3];
+      addContentBlock(
+        <RenderListItem
+          key={key}
+          itemText={itemText}
+          type="ul"
+          marker={marker}
+          leadingWhitespace={leadingWhitespace}
+        />,
+      );
+    } else if (olMatch) {
+      const leadingWhitespace = olMatch[1];
+      const marker = olMatch[2];
+      const itemText = olMatch[3];
+      addContentBlock(
+        <RenderListItem
+          key={key}
+          itemText={itemText}
+          type="ol"
+          marker={marker}
+          leadingWhitespace={leadingWhitespace}
+        />,
+      );
+    } else {
+      if (line.trim().length === 0 && !inCodeBlock) {
+        if (!lastLineEmpty) {
+          contentBlocks.push(
+            <Box key={`spacer-${index}`} height={EMPTY_LINE_HEIGHT} />,
+          );
+          lastLineEmpty = true;
+        }
+      } else {
+        addContentBlock(
+          <Box key={key}>
+            <Text wrap="wrap">
+              <RenderInline text={line} />
+            </Text>
+          </Box>,
+        );
+      }
+    }
+  });
+
+  if (inCodeBlock) {
+    addContentBlock(
+      <RenderCodeBlock
+        key="line-eof"
+        content={codeBlockContent}
+        lang={codeBlockLang}
+        isPending={isPending}
+        availableTerminalHeight={availableTerminalHeight}
+        terminalWidth={terminalWidth}
+      />,
+    );
+  }
+
+  // Handle table at end of content
+  if (inTable && tableHeaders.length > 0 && tableRows.length > 0) {
+    addContentBlock(
+      <RenderTable
+        key={`table-${contentBlocks.length}`}
+        headers={tableHeaders}
+        rows={tableRows}
+        terminalWidth={terminalWidth}
+      />,
+    );
+  }
+
+  return <>{contentBlocks}</>;
+};
+
+// Helper functions (adapted from static methods of MarkdownRenderer)
+
+interface RenderCodeBlockProps {
+  content: string[];
+  lang: string | null;
+  isPending: boolean;
+  availableTerminalHeight?: number;
+  terminalWidth: number;
+}
+
+const RenderCodeBlockInternal: React.FC<RenderCodeBlockProps> = ({
+  content,
+  lang,
+  isPending,
+  availableTerminalHeight,
+  terminalWidth,
+}) => {
+  const settings = useSettings();
+  const MIN_LINES_FOR_MESSAGE = 1; // Minimum lines to show before the "generating more" message
+  const RESERVED_LINES = 2; // Lines reserved for the message itself and potential padding
+
+  if (isPending && availableTerminalHeight !== undefined) {
+    const MAX_CODE_LINES_WHEN_PENDING = Math.max(
+      0,
+      availableTerminalHeight - RESERVED_LINES,
+    );
+
+    if (content.length > MAX_CODE_LINES_WHEN_PENDING) {
+      if (MAX_CODE_LINES_WHEN_PENDING < MIN_LINES_FOR_MESSAGE) {
+        // Not enough space to even show the message meaningfully
+        return (
+          <Box paddingLeft={CODE_BLOCK_PREFIX_PADDING}>
+            <Text color={Colors.Gray}>... code is being written ...</Text>
+          </Box>
+        );
+      }
+      const truncatedContent = content.slice(0, MAX_CODE_LINES_WHEN_PENDING);
+      const colorizedTruncatedCode = colorizeCode(
+        truncatedContent.join('\n'),
+        lang,
+        availableTerminalHeight,
+        terminalWidth - CODE_BLOCK_PREFIX_PADDING,
+        undefined,
+        settings,
+      );
+      return (
+        <Box paddingLeft={CODE_BLOCK_PREFIX_PADDING} flexDirection="column">
+          {colorizedTruncatedCode}
+          <Text color={Colors.Gray}>... generating more ...</Text>
+        </Box>
+      );
+    }
+  }
+
+  const fullContent = content.join('\n');
+  const colorizedCode = colorizeCode(
+    fullContent,
+    lang,
+    availableTerminalHeight,
+    terminalWidth - CODE_BLOCK_PREFIX_PADDING,
+    undefined,
+    settings,
+  );
+
+  return (
+    <Box
+      paddingLeft={CODE_BLOCK_PREFIX_PADDING}
+      flexDirection="column"
+      width={terminalWidth}
+      flexShrink={0}
+    >
+      {colorizedCode}
+    </Box>
+  );
+};
+
+const RenderCodeBlock = React.memo(RenderCodeBlockInternal);
+
+interface RenderListItemProps {
+  itemText: string;
+  type: 'ul' | 'ol';
+  marker: string;
+  leadingWhitespace?: string;
+}
+
+const RenderListItemInternal: React.FC<RenderListItemProps> = ({
+  itemText,
+  type,
+  marker,
+  leadingWhitespace = '',
+}) => {
+  const prefix = type === 'ol' ? `${marker}. ` : `${marker} `;
+  const prefixWidth = prefix.length;
+  const indentation = leadingWhitespace.length;
+
+  return (
+    <Box
+      paddingLeft={indentation + LIST_ITEM_PREFIX_PADDING}
+      flexDirection="row"
+    >
+      <Box width={prefixWidth}>
+        <Text>{prefix}</Text>
+      </Box>
+      <Box flexGrow={LIST_ITEM_TEXT_FLEX_GROW}>
+        <Text wrap="wrap">
+          <RenderInline text={itemText} />
+        </Text>
+      </Box>
+    </Box>
+  );
+};
+
+const RenderListItem = React.memo(RenderListItemInternal);
+
+interface RenderTableProps {
+  headers: string[];
+  rows: string[][];
+  terminalWidth: number;
+}
+
+const RenderTableInternal: React.FC<RenderTableProps> = ({
+  headers,
+  rows,
+  terminalWidth,
+}) => (
+  <TableRenderer headers={headers} rows={rows} terminalWidth={terminalWidth} />
+);
+
+const RenderTable = React.memo(RenderTableInternal);
+
+export const MarkdownDisplay = React.memo(MarkdownDisplayInternal);

projects/ui/qwen-code/packages/cli/src/ui/utils/TableRenderer.tsx

@@ -0,0 +1,159 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import React from 'react';
+import { Text, Box } from 'ink';
+import { Colors } from '../colors.js';
+import { RenderInline, getPlainTextLength } from './InlineMarkdownRenderer.js';
+
+interface TableRendererProps {
+  headers: string[];
+  rows: string[][];
+  terminalWidth: number;
+}
+
+/**
+ * Custom table renderer for markdown tables
+ * We implement our own instead of using ink-table due to module compatibility issues
+ */
+export const TableRenderer: React.FC<TableRendererProps> = ({
+  headers,
+  rows,
+  terminalWidth,
+}) => {
+  // Calculate column widths using actual display width after markdown processing
+  const columnWidths = headers.map((header, index) => {
+    const headerWidth = getPlainTextLength(header);
+    const maxRowWidth = Math.max(
+      ...rows.map((row) => getPlainTextLength(row[index] || '')),
+    );
+    return Math.max(headerWidth, maxRowWidth) + 2; // Add padding
+  });
+
+  // Ensure table fits within terminal width
+  const totalWidth = columnWidths.reduce((sum, width) => sum + width + 1, 1);
+  const scaleFactor =
+    totalWidth > terminalWidth ? terminalWidth / totalWidth : 1;
+  const adjustedWidths = columnWidths.map((width) =>
+    Math.floor(width * scaleFactor),
+  );
+
+  // Helper function to render a cell with proper width
+  const renderCell = (
+    content: string,
+    width: number,
+    isHeader = false,
+  ): React.ReactNode => {
+    const contentWidth = Math.max(0, width - 2);
+    const displayWidth = getPlainTextLength(content);
+
+    let cellContent = content;
+    if (displayWidth > contentWidth) {
+      if (contentWidth <= 3) {
+        // Just truncate by character count
+        cellContent = content.substring(
+          0,
+          Math.min(content.length, contentWidth),
+        );
+      } else {
+        // Truncate preserving markdown formatting using binary search
+        let left = 0;
+        let right = content.length;
+        let bestTruncated = content;
+
+        // Binary search to find the optimal truncation point
+        while (left <= right) {
+          const mid = Math.floor((left + right) / 2);
+          const candidate = content.substring(0, mid);
+          const candidateWidth = getPlainTextLength(candidate);
+
+          if (candidateWidth <= contentWidth - 3) {
+            bestTruncated = candidate;
+            left = mid + 1;
+          } else {
+            right = mid - 1;
+          }
+        }
+
+        cellContent = bestTruncated + '...';
+      }
+    }
+
+    // Calculate exact padding needed
+    const actualDisplayWidth = getPlainTextLength(cellContent);
+    const paddingNeeded = Math.max(0, contentWidth - actualDisplayWidth);
+
+    return (
+      <Text>
+        {isHeader ? (
+          <Text bold color={Colors.AccentCyan}>
+            <RenderInline text={cellContent} />
+          </Text>
+        ) : (
+          <RenderInline text={cellContent} />
+        )}
+        {' '.repeat(paddingNeeded)}
+      </Text>
+    );
+  };
+
+  // Helper function to render border
+  const renderBorder = (type: 'top' | 'middle' | 'bottom'): React.ReactNode => {
+    const chars = {
+      top: { left: '┌', middle: '┬', right: '┐', horizontal: '─' },
+      middle: { left: '├', middle: '┼', right: '┤', horizontal: '─' },
+      bottom: { left: '└', middle: '┴', right: '┘', horizontal: '─' },
+    };
+
+    const char = chars[type];
+    const borderParts = adjustedWidths.map((w) => char.horizontal.repeat(w));
+    const border = char.left + borderParts.join(char.middle) + char.right;
+
+    return <Text>{border}</Text>;
+  };
+
+  // Helper function to render a table row
+  const renderRow = (cells: string[], isHeader = false): React.ReactNode => {
+    const renderedCells = cells.map((cell, index) => {
+      const width = adjustedWidths[index] || 0;
+      return renderCell(cell || '', width, isHeader);
+    });
+
+    return (
+      <Text>
+        │{' '}
+        {renderedCells.map((cell, index) => (
+          <React.Fragment key={index}>
+            {cell}
+            {index < renderedCells.length - 1 ? ' │ ' : ''}
+          </React.Fragment>
+        ))}{' '}
+        │
+      </Text>
+    );
+  };
+
+  return (
+    <Box flexDirection="column" marginY={1}>
+      {/* Top border */}
+      {renderBorder('top')}
+
+      {/* Header row */}
+      {renderRow(headers, true)}
+
+      {/* Middle border */}
+      {renderBorder('middle')}
+
+      {/* Data rows */}
+      {rows.map((row, index) => (
+        <React.Fragment key={index}>{renderRow(row)}</React.Fragment>
+      ))}
+
+      {/* Bottom border */}
+      {renderBorder('bottom')}
+    </Box>
+  );
+};

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

@@ -0,0 +1,76 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect } from 'vitest';
+import {
+  clipboardHasImage,
+  saveClipboardImage,
+  cleanupOldClipboardImages,
+} from './clipboardUtils.js';
+
+describe('clipboardUtils', () => {
+  describe('clipboardHasImage', () => {
+    it('should return false on non-macOS platforms', async () => {
+      if (process.platform !== 'darwin') {
+        const result = await clipboardHasImage();
+        expect(result).toBe(false);
+      } else {
+        // Skip on macOS as it would require actual clipboard state
+        expect(true).toBe(true);
+      }
+    });
+
+    it('should return boolean on macOS', async () => {
+      if (process.platform === 'darwin') {
+        const result = await clipboardHasImage();
+        expect(typeof result).toBe('boolean');
+      } else {
+        // Skip on non-macOS
+        expect(true).toBe(true);
+      }
+    });
+  });
+
+  describe('saveClipboardImage', () => {
+    it('should return null on non-macOS platforms', async () => {
+      if (process.platform !== 'darwin') {
+        const result = await saveClipboardImage();
+        expect(result).toBe(null);
+      } else {
+        // Skip on macOS
+        expect(true).toBe(true);
+      }
+    });
+
+    it('should handle errors gracefully', async () => {
+      // Test with invalid directory (should not throw)
+      const result = await saveClipboardImage(
+        '/invalid/path/that/does/not/exist',
+      );
+
+      if (process.platform === 'darwin') {
+        // On macOS, might return null due to various errors
+        expect(result === null || typeof result === 'string').toBe(true);
+      } else {
+        // On other platforms, should always return null
+        expect(result).toBe(null);
+      }
+    });
+  });
+
+  describe('cleanupOldClipboardImages', () => {
+    it('should not throw errors', async () => {
+      // Should handle missing directories gracefully
+      await expect(
+        cleanupOldClipboardImages('/path/that/does/not/exist'),
+      ).resolves.not.toThrow();
+    });
+
+    it('should complete without errors on valid directory', async () => {
+      await expect(cleanupOldClipboardImages('.')).resolves.not.toThrow();
+    });
+  });
+});

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

@@ -0,0 +1,149 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { exec } from 'child_process';
+import { promisify } from 'util';
+import * as fs from 'fs/promises';
+import * as path from 'path';
+
+const execAsync = promisify(exec);
+
+/**
+ * Checks if the system clipboard contains an image (macOS only for now)
+ * @returns true if clipboard contains an image
+ */
+export async function clipboardHasImage(): Promise<boolean> {
+  if (process.platform !== 'darwin') {
+    return false;
+  }
+
+  try {
+    // Use osascript to check clipboard type
+    const { stdout } = await execAsync(
+      `osascript -e 'clipboard info' 2>/dev/null | grep -qE "«class PNGf»|TIFF picture|JPEG picture|GIF picture|«class JPEG»|«class TIFF»" && echo "true" || echo "false"`,
+      { shell: '/bin/bash' },
+    );
+    return stdout.trim() === 'true';
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Saves the image from clipboard to a temporary file (macOS only for now)
+ * @param targetDir The target directory to create temp files within
+ * @returns The path to the saved image file, or null if no image or error
+ */
+export async function saveClipboardImage(
+  targetDir?: string,
+): Promise<string | null> {
+  if (process.platform !== 'darwin') {
+    return null;
+  }
+
+  try {
+    // Create a temporary directory for clipboard images within the target directory
+    // This avoids security restrictions on paths outside the target directory
+    const baseDir = targetDir || process.cwd();
+    const tempDir = path.join(baseDir, '.gemini-clipboard');
+    await fs.mkdir(tempDir, { recursive: true });
+
+    // Generate a unique filename with timestamp
+    const timestamp = new Date().getTime();
+
+    // Try different image formats in order of preference
+    const formats = [
+      { class: 'PNGf', extension: 'png' },
+      { class: 'JPEG', extension: 'jpg' },
+      { class: 'TIFF', extension: 'tiff' },
+      { class: 'GIFf', extension: 'gif' },
+    ];
+
+    for (const format of formats) {
+      const tempFilePath = path.join(
+        tempDir,
+        `clipboard-${timestamp}.${format.extension}`,
+      );
+
+      // Try to save clipboard as this format
+      const script = `
+        try
+          set imageData to the clipboard as «class ${format.class}»
+          set fileRef to open for access POSIX file "${tempFilePath}" with write permission
+          write imageData to fileRef
+          close access fileRef
+          return "success"
+        on error errMsg
+          try
+            close access POSIX file "${tempFilePath}"
+          end try
+          return "error"
+        end try
+      `;
+
+      const { stdout } = await execAsync(`osascript -e '${script}'`);
+
+      if (stdout.trim() === 'success') {
+        // Verify the file was created and has content
+        try {
+          const stats = await fs.stat(tempFilePath);
+          if (stats.size > 0) {
+            return tempFilePath;
+          }
+        } catch {
+          // File doesn't exist, continue to next format
+        }
+      }
+
+      // Clean up failed attempt
+      try {
+        await fs.unlink(tempFilePath);
+      } catch {
+        // Ignore cleanup errors
+      }
+    }
+
+    // No format worked
+    return null;
+  } catch (error) {
+    console.error('Error saving clipboard image:', error);
+    return null;
+  }
+}
+
+/**
+ * Cleans up old temporary clipboard image files
+ * Removes files older than 1 hour
+ * @param targetDir The target directory where temp files are stored
+ */
+export async function cleanupOldClipboardImages(
+  targetDir?: string,
+): Promise<void> {
+  try {
+    const baseDir = targetDir || process.cwd();
+    const tempDir = path.join(baseDir, '.gemini-clipboard');
+    const files = await fs.readdir(tempDir);
+    const oneHourAgo = Date.now() - 60 * 60 * 1000;
+
+    for (const file of files) {
+      if (
+        file.startsWith('clipboard-') &&
+        (file.endsWith('.png') ||
+          file.endsWith('.jpg') ||
+          file.endsWith('.tiff') ||
+          file.endsWith('.gif'))
+      ) {
+        const filePath = path.join(tempDir, file);
+        const stats = await fs.stat(filePath);
+        if (stats.mtimeMs < oneHourAgo) {
+          await fs.unlink(filePath);
+        }
+      }
+    }
+  } catch {
+    // Ignore errors in cleanup
+  }
+}

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

@@ -0,0 +1,384 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { vi, describe, it, expect, beforeEach, Mock } from 'vitest';
+import { spawn } from 'child_process';
+import { EventEmitter } from 'events';
+import {
+  isAtCommand,
+  isSlashCommand,
+  copyToClipboard,
+  getUrlOpenCommand,
+} from './commandUtils.js';
+
+// Mock child_process
+vi.mock('child_process');
+
+// Mock process.platform for platform-specific tests
+const mockProcess = vi.hoisted(() => ({
+  platform: 'darwin',
+}));
+
+vi.stubGlobal('process', {
+  ...process,
+  get platform() {
+    return mockProcess.platform;
+  },
+});
+
+interface MockChildProcess extends EventEmitter {
+  stdin: EventEmitter & {
+    write: Mock;
+    end: Mock;
+  };
+  stderr: EventEmitter;
+}
+
+describe('commandUtils', () => {
+  let mockSpawn: Mock;
+  let mockChild: MockChildProcess;
+
+  beforeEach(async () => {
+    vi.clearAllMocks();
+    // Dynamically import and set up spawn mock
+    const { spawn } = await import('child_process');
+    mockSpawn = spawn as Mock;
+
+    // Create mock child process with stdout/stderr emitters
+    mockChild = Object.assign(new EventEmitter(), {
+      stdin: Object.assign(new EventEmitter(), {
+        write: vi.fn(),
+        end: vi.fn(),
+      }),
+      stderr: new EventEmitter(),
+    }) as MockChildProcess;
+
+    mockSpawn.mockReturnValue(mockChild as unknown as ReturnType<typeof spawn>);
+  });
+
+  describe('isAtCommand', () => {
+    it('should return true when query starts with @', () => {
+      expect(isAtCommand('@file')).toBe(true);
+      expect(isAtCommand('@path/to/file')).toBe(true);
+      expect(isAtCommand('@')).toBe(true);
+    });
+
+    it('should return true when query contains @ preceded by whitespace', () => {
+      expect(isAtCommand('hello @file')).toBe(true);
+      expect(isAtCommand('some text @path/to/file')).toBe(true);
+      expect(isAtCommand('   @file')).toBe(true);
+    });
+
+    it('should return false when query does not start with @ and has no spaced @', () => {
+      expect(isAtCommand('file')).toBe(false);
+      expect(isAtCommand('hello')).toBe(false);
+      expect(isAtCommand('')).toBe(false);
+      expect(isAtCommand('email@domain.com')).toBe(false);
+      expect(isAtCommand('user@host')).toBe(false);
+    });
+
+    it('should return false when @ is not preceded by whitespace', () => {
+      expect(isAtCommand('hello@file')).toBe(false);
+      expect(isAtCommand('text@path')).toBe(false);
+    });
+  });
+
+  describe('isSlashCommand', () => {
+    it('should return true when query starts with /', () => {
+      expect(isSlashCommand('/help')).toBe(true);
+      expect(isSlashCommand('/memory show')).toBe(true);
+      expect(isSlashCommand('/clear')).toBe(true);
+      expect(isSlashCommand('/')).toBe(true);
+    });
+
+    it('should return false when query does not start with /', () => {
+      expect(isSlashCommand('help')).toBe(false);
+      expect(isSlashCommand('memory show')).toBe(false);
+      expect(isSlashCommand('')).toBe(false);
+      expect(isSlashCommand('path/to/file')).toBe(false);
+      expect(isSlashCommand(' /help')).toBe(false);
+    });
+  });
+
+  describe('copyToClipboard', () => {
+    describe('on macOS (darwin)', () => {
+      beforeEach(() => {
+        mockProcess.platform = 'darwin';
+      });
+
+      it('should successfully copy text to clipboard using pbcopy', async () => {
+        const testText = 'Hello, world!';
+
+        // Simulate successful execution
+        setTimeout(() => {
+          mockChild.emit('close', 0);
+        }, 0);
+
+        await copyToClipboard(testText);
+
+        expect(mockSpawn).toHaveBeenCalledWith('pbcopy', []);
+        expect(mockChild.stdin.write).toHaveBeenCalledWith(testText);
+        expect(mockChild.stdin.end).toHaveBeenCalled();
+      });
+
+      it('should handle pbcopy command failure', async () => {
+        const testText = 'Hello, world!';
+
+        // Simulate command failure
+        setTimeout(() => {
+          mockChild.stderr.emit('data', 'Command not found');
+          mockChild.emit('close', 1);
+        }, 0);
+
+        await expect(copyToClipboard(testText)).rejects.toThrow(
+          "'pbcopy' exited with code 1: Command not found",
+        );
+      });
+
+      it('should handle spawn error', async () => {
+        const testText = 'Hello, world!';
+
+        setTimeout(() => {
+          mockChild.emit('error', new Error('spawn error'));
+        }, 0);
+
+        await expect(copyToClipboard(testText)).rejects.toThrow('spawn error');
+      });
+
+      it('should handle stdin write error', async () => {
+        const testText = 'Hello, world!';
+
+        setTimeout(() => {
+          mockChild.stdin.emit('error', new Error('stdin error'));
+        }, 0);
+
+        await expect(copyToClipboard(testText)).rejects.toThrow('stdin error');
+      });
+    });
+
+    describe('on Windows (win32)', () => {
+      beforeEach(() => {
+        mockProcess.platform = 'win32';
+      });
+
+      it('should successfully copy text to clipboard using clip', async () => {
+        const testText = 'Hello, world!';
+
+        setTimeout(() => {
+          mockChild.emit('close', 0);
+        }, 0);
+
+        await copyToClipboard(testText);
+
+        expect(mockSpawn).toHaveBeenCalledWith('clip', []);
+        expect(mockChild.stdin.write).toHaveBeenCalledWith(testText);
+        expect(mockChild.stdin.end).toHaveBeenCalled();
+      });
+    });
+
+    describe('on Linux', () => {
+      beforeEach(() => {
+        mockProcess.platform = 'linux';
+      });
+
+      it('should successfully copy text to clipboard using xclip', async () => {
+        const testText = 'Hello, world!';
+
+        setTimeout(() => {
+          mockChild.emit('close', 0);
+        }, 0);
+
+        await copyToClipboard(testText);
+
+        expect(mockSpawn).toHaveBeenCalledWith('xclip', [
+          '-selection',
+          'clipboard',
+        ]);
+        expect(mockChild.stdin.write).toHaveBeenCalledWith(testText);
+        expect(mockChild.stdin.end).toHaveBeenCalled();
+      });
+
+      it('should fall back to xsel when xclip fails', async () => {
+        const testText = 'Hello, world!';
+        let callCount = 0;
+
+        mockSpawn.mockImplementation(() => {
+          const child = Object.assign(new EventEmitter(), {
+            stdin: Object.assign(new EventEmitter(), {
+              write: vi.fn(),
+              end: vi.fn(),
+            }),
+            stderr: new EventEmitter(),
+          }) as MockChildProcess;
+
+          setTimeout(() => {
+            if (callCount === 0) {
+              // First call (xclip) fails
+              child.stderr.emit('data', 'xclip not found');
+              child.emit('close', 1);
+              callCount++;
+            } else {
+              // Second call (xsel) succeeds
+              child.emit('close', 0);
+            }
+          }, 0);
+
+          return child as unknown as ReturnType<typeof spawn>;
+        });
+
+        await copyToClipboard(testText);
+
+        expect(mockSpawn).toHaveBeenCalledTimes(2);
+        expect(mockSpawn).toHaveBeenNthCalledWith(1, 'xclip', [
+          '-selection',
+          'clipboard',
+        ]);
+        expect(mockSpawn).toHaveBeenNthCalledWith(2, 'xsel', [
+          '--clipboard',
+          '--input',
+        ]);
+      });
+
+      it('should throw error when both xclip and xsel fail', async () => {
+        const testText = 'Hello, world!';
+        let callCount = 0;
+
+        mockSpawn.mockImplementation(() => {
+          const child = Object.assign(new EventEmitter(), {
+            stdin: Object.assign(new EventEmitter(), {
+              write: vi.fn(),
+              end: vi.fn(),
+            }),
+            stderr: new EventEmitter(),
+          });
+
+          setTimeout(() => {
+            if (callCount === 0) {
+              // First call (xclip) fails
+              child.stderr.emit('data', 'xclip command not found');
+              child.emit('close', 1);
+              callCount++;
+            } else {
+              // Second call (xsel) fails
+              child.stderr.emit('data', 'xsel command not found');
+              child.emit('close', 1);
+            }
+          }, 0);
+
+          return child as unknown as ReturnType<typeof spawn>;
+        });
+
+        await expect(copyToClipboard(testText)).rejects.toThrow(
+          /All copy commands failed/,
+        );
+
+        expect(mockSpawn).toHaveBeenCalledTimes(2);
+      });
+    });
+
+    describe('on unsupported platform', () => {
+      beforeEach(() => {
+        mockProcess.platform = 'unsupported';
+      });
+
+      it('should throw error for unsupported platform', async () => {
+        await expect(copyToClipboard('test')).rejects.toThrow(
+          'Unsupported platform: unsupported',
+        );
+      });
+    });
+
+    describe('error handling', () => {
+      beforeEach(() => {
+        mockProcess.platform = 'darwin';
+      });
+
+      it('should handle command exit without stderr', async () => {
+        const testText = 'Hello, world!';
+
+        setTimeout(() => {
+          mockChild.emit('close', 1);
+        }, 0);
+
+        await expect(copyToClipboard(testText)).rejects.toThrow(
+          "'pbcopy' exited with code 1",
+        );
+      });
+
+      it('should handle empty text', async () => {
+        setTimeout(() => {
+          mockChild.emit('close', 0);
+        }, 0);
+
+        await copyToClipboard('');
+
+        expect(mockChild.stdin.write).toHaveBeenCalledWith('');
+      });
+
+      it('should handle multiline text', async () => {
+        const multilineText = 'Line 1\nLine 2\nLine 3';
+
+        setTimeout(() => {
+          mockChild.emit('close', 0);
+        }, 0);
+
+        await copyToClipboard(multilineText);
+
+        expect(mockChild.stdin.write).toHaveBeenCalledWith(multilineText);
+      });
+
+      it('should handle special characters', async () => {
+        const specialText = 'Special chars: !@#$%^&*()_+-=[]{}|;:,.<>?';
+
+        setTimeout(() => {
+          mockChild.emit('close', 0);
+        }, 0);
+
+        await copyToClipboard(specialText);
+
+        expect(mockChild.stdin.write).toHaveBeenCalledWith(specialText);
+      });
+    });
+  });
+
+  describe('getUrlOpenCommand', () => {
+    describe('on macOS (darwin)', () => {
+      beforeEach(() => {
+        mockProcess.platform = 'darwin';
+      });
+      it('should return open', () => {
+        expect(getUrlOpenCommand()).toBe('open');
+      });
+    });
+
+    describe('on Windows (win32)', () => {
+      beforeEach(() => {
+        mockProcess.platform = 'win32';
+      });
+      it('should return start', () => {
+        expect(getUrlOpenCommand()).toBe('start');
+      });
+    });
+
+    describe('on Linux (linux)', () => {
+      beforeEach(() => {
+        mockProcess.platform = 'linux';
+      });
+      it('should return xdg-open', () => {
+        expect(getUrlOpenCommand()).toBe('xdg-open');
+      });
+    });
+
+    describe('on unmatched OS', () => {
+      beforeEach(() => {
+        mockProcess.platform = 'unmatched';
+      });
+      it('should return xdg-open', () => {
+        expect(getUrlOpenCommand()).toBe('xdg-open');
+      });
+    });
+  });
+});

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

@@ -0,0 +1,106 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { spawn } from 'child_process';
+
+/**
+ * Checks if a query string potentially represents an '@' command.
+ * It triggers if the query starts with '@' or contains '@' preceded by whitespace
+ * and followed by a non-whitespace character.
+ *
+ * @param query The input query string.
+ * @returns True if the query looks like an '@' command, false otherwise.
+ */
+export const isAtCommand = (query: string): boolean =>
+  // Check if starts with @ OR has a space, then @
+  query.startsWith('@') || /\s@/.test(query);
+
+/**
+ * Checks if a query string potentially represents an '/' command.
+ * It triggers if the query starts with '/'
+ *
+ * @param query The input query string.
+ * @returns True if the query looks like an '/' command, false otherwise.
+ */
+export const isSlashCommand = (query: string): boolean => query.startsWith('/');
+
+// Copies a string snippet to the clipboard for different platforms
+export const copyToClipboard = async (text: string): Promise<void> => {
+  const run = (cmd: string, args: string[]) =>
+    new Promise<void>((resolve, reject) => {
+      const child = spawn(cmd, args);
+      let stderr = '';
+      child.stderr.on('data', (chunk) => (stderr += chunk.toString()));
+      child.on('error', reject);
+      child.on('close', (code) => {
+        if (code === 0) return resolve();
+        const errorMsg = stderr.trim();
+        reject(
+          new Error(
+            `'${cmd}' exited with code ${code}${errorMsg ? `: ${errorMsg}` : ''}`,
+          ),
+        );
+      });
+      child.stdin.on('error', reject);
+      child.stdin.write(text);
+      child.stdin.end();
+    });
+
+  switch (process.platform) {
+    case 'win32':
+      return run('clip', []);
+    case 'darwin':
+      return run('pbcopy', []);
+    case 'linux':
+      try {
+        await run('xclip', ['-selection', 'clipboard']);
+      } catch (primaryError) {
+        try {
+          // If xclip fails for any reason, try xsel as a fallback.
+          await run('xsel', ['--clipboard', '--input']);
+        } catch (fallbackError) {
+          const primaryMsg =
+            primaryError instanceof Error
+              ? primaryError.message
+              : String(primaryError);
+          const fallbackMsg =
+            fallbackError instanceof Error
+              ? fallbackError.message
+              : String(fallbackError);
+          throw new Error(
+            `All copy commands failed. xclip: "${primaryMsg}", xsel: "${fallbackMsg}". Please ensure xclip or xsel is installed and configured.`,
+          );
+        }
+      }
+      return;
+    default:
+      throw new Error(`Unsupported platform: ${process.platform}`);
+  }
+};
+
+export const getUrlOpenCommand = (): string => {
+  // --- Determine the OS-specific command to open URLs ---
+  let openCmd: string;
+  switch (process.platform) {
+    case 'darwin':
+      openCmd = 'open';
+      break;
+    case 'win32':
+      openCmd = 'start';
+      break;
+    case 'linux':
+      openCmd = 'xdg-open';
+      break;
+    default:
+      // Default to xdg-open, which appears to be supported for the less popular operating systems.
+      openCmd = 'xdg-open';
+      console.warn(
+        `Unknown platform: ${process.platform}. Attempting to open URLs with: ${openCmd}.`,
+      );
+      break;
+  }
+  return openCmd;
+};

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

@@ -0,0 +1,292 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect } from 'vitest';
+import {
+  calculateAverageLatency,
+  calculateCacheHitRate,
+  calculateErrorRate,
+  computeSessionStats,
+} from './computeStats.js';
+import { ModelMetrics, SessionMetrics } from '../contexts/SessionContext.js';
+
+describe('calculateErrorRate', () => {
+  it('should return 0 if totalRequests is 0', () => {
+    const metrics: ModelMetrics = {
+      api: { totalRequests: 0, totalErrors: 0, totalLatencyMs: 0 },
+      tokens: {
+        prompt: 0,
+        candidates: 0,
+        total: 0,
+        cached: 0,
+        thoughts: 0,
+        tool: 0,
+      },
+    };
+    expect(calculateErrorRate(metrics)).toBe(0);
+  });
+
+  it('should calculate the error rate correctly', () => {
+    const metrics: ModelMetrics = {
+      api: { totalRequests: 10, totalErrors: 2, totalLatencyMs: 0 },
+      tokens: {
+        prompt: 0,
+        candidates: 0,
+        total: 0,
+        cached: 0,
+        thoughts: 0,
+        tool: 0,
+      },
+    };
+    expect(calculateErrorRate(metrics)).toBe(20);
+  });
+});
+
+describe('calculateAverageLatency', () => {
+  it('should return 0 if totalRequests is 0', () => {
+    const metrics: ModelMetrics = {
+      api: { totalRequests: 0, totalErrors: 0, totalLatencyMs: 1000 },
+      tokens: {
+        prompt: 0,
+        candidates: 0,
+        total: 0,
+        cached: 0,
+        thoughts: 0,
+        tool: 0,
+      },
+    };
+    expect(calculateAverageLatency(metrics)).toBe(0);
+  });
+
+  it('should calculate the average latency correctly', () => {
+    const metrics: ModelMetrics = {
+      api: { totalRequests: 10, totalErrors: 0, totalLatencyMs: 1500 },
+      tokens: {
+        prompt: 0,
+        candidates: 0,
+        total: 0,
+        cached: 0,
+        thoughts: 0,
+        tool: 0,
+      },
+    };
+    expect(calculateAverageLatency(metrics)).toBe(150);
+  });
+});
+
+describe('calculateCacheHitRate', () => {
+  it('should return 0 if prompt tokens is 0', () => {
+    const metrics: ModelMetrics = {
+      api: { totalRequests: 0, totalErrors: 0, totalLatencyMs: 0 },
+      tokens: {
+        prompt: 0,
+        candidates: 0,
+        total: 0,
+        cached: 100,
+        thoughts: 0,
+        tool: 0,
+      },
+    };
+    expect(calculateCacheHitRate(metrics)).toBe(0);
+  });
+
+  it('should calculate the cache hit rate correctly', () => {
+    const metrics: ModelMetrics = {
+      api: { totalRequests: 0, totalErrors: 0, totalLatencyMs: 0 },
+      tokens: {
+        prompt: 200,
+        candidates: 0,
+        total: 0,
+        cached: 50,
+        thoughts: 0,
+        tool: 0,
+      },
+    };
+    expect(calculateCacheHitRate(metrics)).toBe(25);
+  });
+});
+
+describe('computeSessionStats', () => {
+  it('should return all zeros for initial empty metrics', () => {
+    const metrics: SessionMetrics = {
+      models: {},
+      tools: {
+        totalCalls: 0,
+        totalSuccess: 0,
+        totalFail: 0,
+        totalDurationMs: 0,
+        totalDecisions: { accept: 0, reject: 0, modify: 0 },
+        byName: {},
+      },
+      files: {
+        totalLinesAdded: 0,
+        totalLinesRemoved: 0,
+      },
+    };
+
+    const result = computeSessionStats(metrics);
+
+    expect(result).toEqual({
+      totalApiTime: 0,
+      totalToolTime: 0,
+      agentActiveTime: 0,
+      apiTimePercent: 0,
+      toolTimePercent: 0,
+      cacheEfficiency: 0,
+      totalDecisions: 0,
+      successRate: 0,
+      agreementRate: 0,
+      totalPromptTokens: 0,
+      totalCachedTokens: 0,
+      totalLinesAdded: 0,
+      totalLinesRemoved: 0,
+    });
+  });
+
+  it('should correctly calculate API and tool time percentages', () => {
+    const metrics: SessionMetrics = {
+      models: {
+        'gemini-pro': {
+          api: { totalRequests: 1, totalErrors: 0, totalLatencyMs: 750 },
+          tokens: {
+            prompt: 10,
+            candidates: 10,
+            total: 20,
+            cached: 0,
+            thoughts: 0,
+            tool: 0,
+          },
+        },
+      },
+      tools: {
+        totalCalls: 1,
+        totalSuccess: 1,
+        totalFail: 0,
+        totalDurationMs: 250,
+        totalDecisions: { accept: 0, reject: 0, modify: 0 },
+        byName: {},
+      },
+      files: {
+        totalLinesAdded: 0,
+        totalLinesRemoved: 0,
+      },
+    };
+
+    const result = computeSessionStats(metrics);
+
+    expect(result.totalApiTime).toBe(750);
+    expect(result.totalToolTime).toBe(250);
+    expect(result.agentActiveTime).toBe(1000);
+    expect(result.apiTimePercent).toBe(75);
+    expect(result.toolTimePercent).toBe(25);
+  });
+
+  it('should correctly calculate cache efficiency', () => {
+    const metrics: SessionMetrics = {
+      models: {
+        'gemini-pro': {
+          api: { totalRequests: 2, totalErrors: 0, totalLatencyMs: 1000 },
+          tokens: {
+            prompt: 150,
+            candidates: 10,
+            total: 160,
+            cached: 50,
+            thoughts: 0,
+            tool: 0,
+          },
+        },
+      },
+      tools: {
+        totalCalls: 0,
+        totalSuccess: 0,
+        totalFail: 0,
+        totalDurationMs: 0,
+        totalDecisions: { accept: 0, reject: 0, modify: 0 },
+        byName: {},
+      },
+      files: {
+        totalLinesAdded: 0,
+        totalLinesRemoved: 0,
+      },
+    };
+
+    const result = computeSessionStats(metrics);
+
+    expect(result.cacheEfficiency).toBeCloseTo(33.33); // 50 / 150
+  });
+
+  it('should correctly calculate success and agreement rates', () => {
+    const metrics: SessionMetrics = {
+      models: {},
+      tools: {
+        totalCalls: 10,
+        totalSuccess: 8,
+        totalFail: 2,
+        totalDurationMs: 1000,
+        totalDecisions: { accept: 6, reject: 2, modify: 2 },
+        byName: {},
+      },
+      files: {
+        totalLinesAdded: 0,
+        totalLinesRemoved: 0,
+      },
+    };
+
+    const result = computeSessionStats(metrics);
+
+    expect(result.successRate).toBe(80); // 8 / 10
+    expect(result.agreementRate).toBe(60); // 6 / 10
+  });
+
+  it('should handle division by zero gracefully', () => {
+    const metrics: SessionMetrics = {
+      models: {},
+      tools: {
+        totalCalls: 0,
+        totalSuccess: 0,
+        totalFail: 0,
+        totalDurationMs: 0,
+        totalDecisions: { accept: 0, reject: 0, modify: 0 },
+        byName: {},
+      },
+      files: {
+        totalLinesAdded: 0,
+        totalLinesRemoved: 0,
+      },
+    };
+
+    const result = computeSessionStats(metrics);
+
+    expect(result.apiTimePercent).toBe(0);
+    expect(result.toolTimePercent).toBe(0);
+    expect(result.cacheEfficiency).toBe(0);
+    expect(result.successRate).toBe(0);
+    expect(result.agreementRate).toBe(0);
+  });
+
+  it('should correctly include line counts', () => {
+    const metrics: SessionMetrics = {
+      models: {},
+      tools: {
+        totalCalls: 0,
+        totalSuccess: 0,
+        totalFail: 0,
+        totalDurationMs: 0,
+        totalDecisions: { accept: 0, reject: 0, modify: 0 },
+        byName: {},
+      },
+      files: {
+        totalLinesAdded: 42,
+        totalLinesRemoved: 18,
+      },
+    };
+
+    const result = computeSessionStats(metrics);
+
+    expect(result.totalLinesAdded).toBe(42);
+    expect(result.totalLinesRemoved).toBe(18);
+  });
+});

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

@@ -0,0 +1,86 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  SessionMetrics,
+  ComputedSessionStats,
+  ModelMetrics,
+} from '../contexts/SessionContext.js';
+
+export function calculateErrorRate(metrics: ModelMetrics): number {
+  if (metrics.api.totalRequests === 0) {
+    return 0;
+  }
+  return (metrics.api.totalErrors / metrics.api.totalRequests) * 100;
+}
+
+export function calculateAverageLatency(metrics: ModelMetrics): number {
+  if (metrics.api.totalRequests === 0) {
+    return 0;
+  }
+  return metrics.api.totalLatencyMs / metrics.api.totalRequests;
+}
+
+export function calculateCacheHitRate(metrics: ModelMetrics): number {
+  if (metrics.tokens.prompt === 0) {
+    return 0;
+  }
+  return (metrics.tokens.cached / metrics.tokens.prompt) * 100;
+}
+
+export const computeSessionStats = (
+  metrics: SessionMetrics,
+): ComputedSessionStats => {
+  const { models, tools, files } = metrics;
+  const totalApiTime = Object.values(models).reduce(
+    (acc, model) => acc + model.api.totalLatencyMs,
+    0,
+  );
+  const totalToolTime = tools.totalDurationMs;
+  const agentActiveTime = totalApiTime + totalToolTime;
+  const apiTimePercent =
+    agentActiveTime > 0 ? (totalApiTime / agentActiveTime) * 100 : 0;
+  const toolTimePercent =
+    agentActiveTime > 0 ? (totalToolTime / agentActiveTime) * 100 : 0;
+
+  const totalCachedTokens = Object.values(models).reduce(
+    (acc, model) => acc + model.tokens.cached,
+    0,
+  );
+  const totalPromptTokens = Object.values(models).reduce(
+    (acc, model) => acc + model.tokens.prompt,
+    0,
+  );
+  const cacheEfficiency =
+    totalPromptTokens > 0 ? (totalCachedTokens / totalPromptTokens) * 100 : 0;
+
+  const totalDecisions =
+    tools.totalDecisions.accept +
+    tools.totalDecisions.reject +
+    tools.totalDecisions.modify;
+  const successRate =
+    tools.totalCalls > 0 ? (tools.totalSuccess / tools.totalCalls) * 100 : 0;
+  const agreementRate =
+    totalDecisions > 0
+      ? (tools.totalDecisions.accept / totalDecisions) * 100
+      : 0;
+
+  return {
+    totalApiTime,
+    totalToolTime,
+    agentActiveTime,
+    apiTimePercent,
+    toolTimePercent,
+    cacheEfficiency,
+    totalDecisions,
+    successRate,
+    agreementRate,
+    totalCachedTokens,
+    totalPromptTokens,
+    totalLinesAdded: files.totalLinesAdded,
+    totalLinesRemoved: files.totalLinesRemoved,
+  };
+};

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

@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect } from 'vitest';
+import {
+  getStatusColor,
+  TOOL_SUCCESS_RATE_HIGH,
+  TOOL_SUCCESS_RATE_MEDIUM,
+  USER_AGREEMENT_RATE_HIGH,
+  USER_AGREEMENT_RATE_MEDIUM,
+  CACHE_EFFICIENCY_HIGH,
+  CACHE_EFFICIENCY_MEDIUM,
+} from './displayUtils.js';
+import { Colors } from '../colors.js';
+
+describe('displayUtils', () => {
+  describe('getStatusColor', () => {
+    const thresholds = {
+      green: 80,
+      yellow: 50,
+    };
+
+    it('should return green for values >= green threshold', () => {
+      expect(getStatusColor(90, thresholds)).toBe(Colors.AccentGreen);
+      expect(getStatusColor(80, thresholds)).toBe(Colors.AccentGreen);
+    });
+
+    it('should return yellow for values < green and >= yellow threshold', () => {
+      expect(getStatusColor(79, thresholds)).toBe(Colors.AccentYellow);
+      expect(getStatusColor(50, thresholds)).toBe(Colors.AccentYellow);
+    });
+
+    it('should return red for values < yellow threshold', () => {
+      expect(getStatusColor(49, thresholds)).toBe(Colors.AccentRed);
+      expect(getStatusColor(0, thresholds)).toBe(Colors.AccentRed);
+    });
+
+    it('should return defaultColor for values < yellow threshold when provided', () => {
+      expect(
+        getStatusColor(49, thresholds, { defaultColor: Colors.Foreground }),
+      ).toBe(Colors.Foreground);
+    });
+  });
+
+  describe('Threshold Constants', () => {
+    it('should have the correct values', () => {
+      expect(TOOL_SUCCESS_RATE_HIGH).toBe(95);
+      expect(TOOL_SUCCESS_RATE_MEDIUM).toBe(85);
+      expect(USER_AGREEMENT_RATE_HIGH).toBe(75);
+      expect(USER_AGREEMENT_RATE_MEDIUM).toBe(45);
+      expect(CACHE_EFFICIENCY_HIGH).toBe(40);
+      expect(CACHE_EFFICIENCY_MEDIUM).toBe(15);
+    });
+  });
+});

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

@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Colors } from '../colors.js';
+
+// --- Thresholds ---
+export const TOOL_SUCCESS_RATE_HIGH = 95;
+export const TOOL_SUCCESS_RATE_MEDIUM = 85;
+
+export const USER_AGREEMENT_RATE_HIGH = 75;
+export const USER_AGREEMENT_RATE_MEDIUM = 45;
+
+export const CACHE_EFFICIENCY_HIGH = 40;
+export const CACHE_EFFICIENCY_MEDIUM = 15;
+
+// --- Color Logic ---
+export const getStatusColor = (
+  value: number,
+  thresholds: { green: number; yellow: number },
+  options: { defaultColor?: string } = {},
+) => {
+  if (value >= thresholds.green) {
+    return Colors.AccentGreen;
+  }
+  if (value >= thresholds.yellow) {
+    return Colors.AccentYellow;
+  }
+  return options.defaultColor || Colors.AccentRed;
+};

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

@@ -0,0 +1,72 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect } from 'vitest';
+import { formatDuration, formatMemoryUsage } from './formatters.js';
+
+describe('formatters', () => {
+  describe('formatMemoryUsage', () => {
+    it('should format bytes into KB', () => {
+      expect(formatMemoryUsage(12345)).toBe('12.1 KB');
+    });
+
+    it('should format bytes into MB', () => {
+      expect(formatMemoryUsage(12345678)).toBe('11.8 MB');
+    });
+
+    it('should format bytes into GB', () => {
+      expect(formatMemoryUsage(12345678901)).toBe('11.50 GB');
+    });
+  });
+
+  describe('formatDuration', () => {
+    it('should format milliseconds less than a second', () => {
+      expect(formatDuration(500)).toBe('500ms');
+    });
+
+    it('should format a duration of 0', () => {
+      expect(formatDuration(0)).toBe('0s');
+    });
+
+    it('should format an exact number of seconds', () => {
+      expect(formatDuration(5000)).toBe('5.0s');
+    });
+
+    it('should format a duration in seconds with one decimal place', () => {
+      expect(formatDuration(12345)).toBe('12.3s');
+    });
+
+    it('should format an exact number of minutes', () => {
+      expect(formatDuration(120000)).toBe('2m');
+    });
+
+    it('should format a duration in minutes and seconds', () => {
+      expect(formatDuration(123000)).toBe('2m 3s');
+    });
+
+    it('should format an exact number of hours', () => {
+      expect(formatDuration(3600000)).toBe('1h');
+    });
+
+    it('should format a duration in hours and seconds', () => {
+      expect(formatDuration(3605000)).toBe('1h 5s');
+    });
+
+    it('should format a duration in hours, minutes, and seconds', () => {
+      expect(formatDuration(3723000)).toBe('1h 2m 3s');
+    });
+
+    it('should handle large durations', () => {
+      expect(formatDuration(86400000 + 3600000 + 120000 + 1000)).toBe(
+        '25h 2m 1s',
+      );
+    });
+
+    it('should handle negative durations', () => {
+      expect(formatDuration(-100)).toBe('0s');
+    });
+  });
+});

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

@@ -0,0 +1,63 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const formatMemoryUsage = (bytes: number): string => {
+  const gb = bytes / (1024 * 1024 * 1024);
+  if (bytes < 1024 * 1024) {
+    return `${(bytes / 1024).toFixed(1)} KB`;
+  }
+  if (bytes < 1024 * 1024 * 1024) {
+    return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+  }
+  return `${gb.toFixed(2)} GB`;
+};
+
+/**
+ * Formats a duration in milliseconds into a concise, human-readable string (e.g., "1h 5s").
+ * It omits any time units that are zero.
+ * @param milliseconds The duration in milliseconds.
+ * @returns A formatted string representing the duration.
+ */
+export const formatDuration = (milliseconds: number): string => {
+  if (milliseconds <= 0) {
+    return '0s';
+  }
+
+  if (milliseconds < 1000) {
+    return `${Math.round(milliseconds)}ms`;
+  }
+
+  const totalSeconds = milliseconds / 1000;
+
+  if (totalSeconds < 60) {
+    return `${totalSeconds.toFixed(1)}s`;
+  }
+
+  const hours = Math.floor(totalSeconds / 3600);
+  const minutes = Math.floor((totalSeconds % 3600) / 60);
+  const seconds = Math.floor(totalSeconds % 60);
+
+  const parts: string[] = [];
+
+  if (hours > 0) {
+    parts.push(`${hours}h`);
+  }
+  if (minutes > 0) {
+    parts.push(`${minutes}m`);
+  }
+  if (seconds > 0) {
+    parts.push(`${seconds}s`);
+  }
+
+  // If all parts are zero (e.g., exactly 1 hour), return the largest unit.
+  if (parts.length === 0) {
+    if (hours > 0) return `${hours}h`;
+    if (minutes > 0) return `${minutes}m`;
+    return `${seconds}s`;
+  }
+
+  return parts.join(' ');
+};

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

@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export function isNarrowWidth(width: number): boolean {
+  return width < 80;
+}

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

@@ -0,0 +1,105 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+let detectionComplete = false;
+let protocolSupported = false;
+let protocolEnabled = false;
+
+/**
+ * Detects Kitty keyboard protocol support.
+ * Definitive document about this protocol lives at https://sw.kovidgoyal.net/kitty/keyboard-protocol/
+ * This function should be called once at app startup.
+ */
+export async function detectAndEnableKittyProtocol(): Promise<boolean> {
+  if (detectionComplete) {
+    return protocolSupported;
+  }
+
+  return new Promise((resolve) => {
+    if (!process.stdin.isTTY || !process.stdout.isTTY) {
+      detectionComplete = true;
+      resolve(false);
+      return;
+    }
+
+    const originalRawMode = process.stdin.isRaw;
+    if (!originalRawMode) {
+      process.stdin.setRawMode(true);
+    }
+
+    let responseBuffer = '';
+    let progressiveEnhancementReceived = false;
+    let checkFinished = false;
+
+    const handleData = (data: Buffer) => {
+      responseBuffer += data.toString();
+
+      // Check for progressive enhancement response (CSI ? <flags> u)
+      if (responseBuffer.includes('\x1b[?') && responseBuffer.includes('u')) {
+        progressiveEnhancementReceived = true;
+      }
+
+      // Check for device attributes response (CSI ? <attrs> c)
+      if (responseBuffer.includes('\x1b[?') && responseBuffer.includes('c')) {
+        if (!checkFinished) {
+          checkFinished = true;
+          process.stdin.removeListener('data', handleData);
+
+          if (!originalRawMode) {
+            process.stdin.setRawMode(false);
+          }
+
+          if (progressiveEnhancementReceived) {
+            // Enable the protocol
+            process.stdout.write('\x1b[>1u');
+            protocolSupported = true;
+            protocolEnabled = true;
+
+            // Set up cleanup on exit
+            process.on('exit', disableProtocol);
+            process.on('SIGTERM', disableProtocol);
+          }
+
+          detectionComplete = true;
+          resolve(protocolSupported);
+        }
+      }
+    };
+
+    process.stdin.on('data', handleData);
+
+    // Send queries
+    process.stdout.write('\x1b[?u'); // Query progressive enhancement
+    process.stdout.write('\x1b[c'); // Query device attributes
+
+    // Timeout after 50ms
+    setTimeout(() => {
+      if (!checkFinished) {
+        process.stdin.removeListener('data', handleData);
+        if (!originalRawMode) {
+          process.stdin.setRawMode(false);
+        }
+        detectionComplete = true;
+        resolve(false);
+      }
+    }, 50);
+  });
+}
+
+function disableProtocol() {
+  if (protocolEnabled) {
+    process.stdout.write('\x1b[<u');
+    protocolEnabled = false;
+  }
+}
+
+export function isKittyProtocolEnabled(): boolean {
+  return protocolEnabled;
+}
+
+export function isKittyProtocolSupported(): boolean {
+  return protocolSupported;
+}