klaude-code 1.2.6__py3-none-any.whl → 1.8.0__py3-none-any.whl

klaude_code/ui/rich/status.py

@@ -1,12 +1,16 @@
 from __future__ import annotations
 
+import contextlib
 import math
+import random
 import time
+from collections.abc import Callable
 
 import rich.status as rich_status
-from rich._spinners import SPINNERS
+from rich.cells import cell_len
 from rich.color import Color
 from rich.console import Console, ConsoleOptions, RenderableType, RenderResult
+from rich.measure import Measurement
 from rich.spinner import Spinner as RichSpinner
 from rich.style import Style
 from rich.table import Table
@@ -16,20 +20,21 @@ from klaude_code import const
 from klaude_code.ui.rich.theme import ThemeKey
 from klaude_code.ui.terminal.color import get_last_terminal_background_rgb
 
-BREATHING_SPINNER_NAME = "dot"
+# Use an existing Rich spinner name; BreathingSpinner overrides its rendering
+BREATHING_SPINNER_NAME = "dots"
+
+# Alternating glyphs for the breathing spinner - switches at each "transparent" point
+_BREATHING_SPINNER_GLYPHS_BASE = [
+    "✦",
+]
+
+# Shuffle glyphs on module load for variety across sessions
+BREATHING_SPINNER_GLYPHS = _BREATHING_SPINNER_GLYPHS_BASE.copy()
+random.shuffle(BREATHING_SPINNER_GLYPHS)
 
-SPINNERS.update(
-    {
-        BREATHING_SPINNER_NAME: {
-            "interval": 100,
-            # Frames content is ignored by the custom breathing spinner implementation,
-            # but we keep a single-frame list for correct width measurement.
-            "frames": ["⏺"],
-        }
-    }
-)
 
 _process_start: float | None = None
+_task_start: float | None = None
 
 
 def _elapsed_since_start() -> float:
@@ -41,6 +46,102 @@ def _elapsed_since_start() -> float:
     return now - _process_start
 
 
+def set_task_start(start: float | None = None) -> None:
+    """Set the current task start time (perf_counter seconds)."""
+
+    global _task_start
+    _task_start = time.perf_counter() if start is None else start
+
+
+def clear_task_start() -> None:
+    """Clear the current task start time."""
+
+    global _task_start
+    _task_start = None
+
+
+def _task_elapsed_seconds(now: float | None = None) -> float | None:
+    if _task_start is None:
+        return None
+    current = time.perf_counter() if now is None else now
+    return max(0.0, current - _task_start)
+
+
+def _format_elapsed_compact(seconds: float) -> str:
+    total_seconds = max(0, int(seconds))
+    if total_seconds < 60:
+        return f"{total_seconds}s"
+
+    minutes, sec = divmod(total_seconds, 60)
+    if minutes < 60:
+        return f"{minutes}m{sec:02d}s"
+
+    hours, minute = divmod(minutes, 60)
+    return f"{hours}h{minute:02d}m{sec:02d}s"
+
+
+def current_hint_text(*, min_time_width: int = 0) -> str:
+    """Return the full hint string shown on the status line.
+
+    The hint is the constant suffix shown after the main status text.
+
+    The elapsed task time is rendered on the right side of the status line
+    (near context usage), not inside the hint.
+    """
+
+    # Keep the signature stable; min_time_width is intentionally ignored.
+    _ = min_time_width
+    return const.STATUS_HINT_TEXT
+
+
+def current_elapsed_text(*, min_time_width: int = 0) -> str | None:
+    """Return the current task elapsed time text (e.g. "11s", "1m02s")."""
+
+    elapsed = _task_elapsed_seconds()
+    if elapsed is None:
+        return None
+    time_text = _format_elapsed_compact(elapsed)
+    if min_time_width > 0:
+        time_text = time_text.rjust(min_time_width)
+    return time_text
+
+
+class DynamicText:
+    """Renderable that materializes a Text instance at render time.
+
+    This is useful for status line elements that should refresh without
+    requiring explicit spinner_update calls (e.g. elapsed time).
+    """
+
+    def __init__(
+        self,
+        factory: Callable[[], Text],
+        *,
+        min_width_cells: int = 0,
+    ) -> None:
+        self._factory = factory
+        self.min_width_cells = min_width_cells
+
+    @property
+    def plain(self) -> str:
+        return self._factory().plain
+
+    def __rich_measure__(self, console: Console, options: ConsoleOptions) -> Measurement:
+        # Ensure Table/grid layout allocates a stable width for this renderable.
+        text = self._factory()
+        measured = Measurement.get(console, options, text)
+        min_width = max(measured.minimum, self.min_width_cells)
+        max_width = max(measured.maximum, self.min_width_cells)
+
+        limit = getattr(options, "max_width", options.size.width)
+        max_width = min(max_width, limit)
+        min_width = min(min_width, max_width)
+        return Measurement(min_width, max_width)
+
+    def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
+        yield self._factory()
+
+
 def _shimmer_profile(main_text: str) -> list[tuple[str, float]]:
     """Compute per-character shimmer intensity for a horizontal band.
 
@@ -55,18 +156,12 @@ def _shimmer_profile(main_text: str) -> list[tuple[str, float]]:
     char_count = len(chars)
     period = char_count + padding * 2
 
-    # Keep a roughly constant shimmer speed (characters per second)
-    # regardless of text length by deriving a character velocity from a
-    # baseline text length and the configured sweep duration.
-    # The baseline is chosen to be close to the default
-    # "Thinking … (esc to interrupt)" status line.
-    baseline_chars = 30
-    base_period = baseline_chars + padding * 2
-    sweep_seconds = const.STATUS_SHIMMER_SWEEP_SECONDS
-    char_speed = base_period / sweep_seconds if sweep_seconds > 0 else base_period
+    # Use same period as breathing spinner for visual consistency
+    sweep_seconds = max(const.SPINNER_BREATH_PERIOD_SECONDS, 0.1)
 
     elapsed = _elapsed_since_start()
-    pos_f = (elapsed * char_speed) % float(period)
+    # Complete one full sweep in sweep_seconds, regardless of text length
+    pos_f = (elapsed / sweep_seconds % 1.0) * period
     pos = int(pos_f)
     band_half_width = const.STATUS_SHIMMER_BAND_HALF_WIDTH
 
@@ -102,7 +197,6 @@ def _shimmer_style(console: Console, base_style: Style, intensity: float) -> Sty
 
     base_r, base_g, base_b = base_triplet
     bg_r, bg_g, bg_b = bg_triplet
-
     r = int(bg_r * alpha + base_r * (1.0 - alpha))
     g = int(bg_g * alpha + base_g * (1.0 - alpha))
     b = int(bg_b * alpha + base_b * (1.0 - alpha))
@@ -125,6 +219,17 @@ def _breathing_intensity() -> float:
     return 0.5 * (1.0 - math.cos(2.0 * math.pi * phase))
 
 
+def _breathing_glyph() -> str:
+    """Get the current glyph for the breathing spinner.
+
+    Alternates between glyphs at each breath cycle (when intensity reaches 0).
+    """
+    period = max(const.SPINNER_BREATH_PERIOD_SECONDS, 0.1)
+    elapsed = _elapsed_since_start()
+    cycle = int(elapsed / period)
+    return BREATHING_SPINNER_GLYPHS[cycle % len(BREATHING_SPINNER_GLYPHS)]
+
+
 def _breathing_style(console: Console, base_style: Style, intensity: float) -> Style:
     """Blend a base style's foreground color toward terminal background.
 
@@ -153,33 +258,71 @@ def _breathing_style(console: Console, base_style: Style, intensity: float) -> S
 
 
 class ShimmerStatusText:
-    """Renderable status line with shimmer effect on the main text and hint."""
+    """Renderable status line with shimmer effect on the main text and hint.
+
+    Supports optional right-aligned text that stays fixed at the right edge.
+    """
 
-    def __init__(self, main_text: str | Text, main_style: ThemeKey) -> None:
-        self._main_text = main_text if isinstance(main_text, Text) else Text(main_text)
-        self._main_style = main_style
-        self._hint_text = Text(" (esc to interrupt)")
+    def __init__(
+        self,
+        main_text: str | Text,
+        right_text: RenderableType | None = None,
+        main_style: ThemeKey = ThemeKey.STATUS_TEXT,
+    ) -> None:
+        if isinstance(main_text, Text):
+            text = main_text.copy()
+            if not text.style:
+                text.style = str(main_style)
+            self._main_text = text
+        else:
+            self._main_text = Text(main_text, style=main_style)
         self._hint_style = ThemeKey.STATUS_HINT
+        self._right_text = right_text
+
+    def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
+        left_text = _StatusLeftText(main=self._main_text, hint_style=self._hint_style)
+
+        if self._right_text is None:
+            yield left_text
+            return
+
+        # Use Table.grid to create left-right aligned layout with a stable gap.
+        table = Table.grid(expand=True, padding=(0, 1, 0, 0), collapse_padding=True, pad_edge=False)
+        table.add_column(justify="left", ratio=1)
+        table.add_column(justify="right")
+        table.add_row(left_text, self._right_text)
+        yield table
+
+
+class _StatusLeftText:
+    def __init__(self, *, main: Text, hint_style: ThemeKey) -> None:
+        self._main = main
+        self._hint_style = hint_style
 
     def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
-        result = Text()
-        main_style = console.get_style(str(self._main_style))
-        hint_style = console.get_style(str(self._hint_style))
-
-        combined_text = self._main_text.plain + self._hint_text.plain
-        split_index = len(self._main_text.plain)
-
-        for index, (ch, intensity) in enumerate(_shimmer_profile(combined_text)):
-            if index < split_index:
-                # Get style from main_text, merge with main_style
-                char_style = self._main_text.get_style_at_offset(console, index)
-                base_style = main_style + char_style
-            else:
-                base_style = hint_style
+        max_width = getattr(options, "max_width", options.size.width)
+
+        # Keep the hint visually attached to the status text, while truncating only
+        # the main status segment when space is tight.
+        hint_text = Text(current_hint_text().strip("\n"), style=console.get_style(str(self._hint_style)))
+        hint_cells = cell_len(hint_text.plain)
+
+        main_text = Text()
+        for index, (ch, intensity) in enumerate(_shimmer_profile(self._main.plain)):
+            base_style = self._main.get_style_at_offset(console, index)
             style = _shimmer_style(console, base_style, intensity)
-            result.append(ch, style=style)
+            main_text.append(ch, style=style)
+
+        # If the hint itself can't fit, fall back to truncating the combined text.
+        if max_width <= hint_cells:
+            combined = Text.assemble(main_text, hint_text)
+            combined.truncate(max(1, max_width), overflow="ellipsis", pad=False)
+            yield combined
+            return
 
-        yield result
+        main_budget = max_width - hint_cells
+        main_text.truncate(max(1, main_budget), overflow="ellipsis", pad=False)
+        yield Text.assemble(main_text, hint_text)
 
 
 def spinner_name() -> str:
@@ -218,7 +361,7 @@ class BreathingSpinner(RichSpinner):
         intensity = _breathing_intensity()
         style = _breathing_style(console, base_style, intensity)
 
-        glyph = self.frames[0] if self.frames else "⏺"
+        glyph = _breathing_glyph()
         frame = Text(glyph, style=style)
 
         if not self.text:
@@ -233,8 +376,6 @@ class BreathingSpinner(RichSpinner):
 
 # Monkey-patch Rich's Status module to use the breathing spinner implementation
 # for the configured spinner name, while preserving default behavior elsewhere.
-try:
+# Best-effort patch; if it fails we silently fall back to default spinner.
+with contextlib.suppress(Exception):
     rich_status.Spinner = BreathingSpinner  # type: ignore[assignment]
-except Exception:
-    # Best-effort patch; if it fails we silently fall back to default spinner.
-    pass

klaude_code/ui/rich/theme.py

@@ -10,69 +10,115 @@ class Palette:
     red: str
     yellow: str
     green: str
+    grey_yellow: str
     cyan: str
     blue: str
     orange: str
     magenta: str
-    grey_blue: str
     grey1: str
     grey2: str
     grey3: str
     grey_green: str
     purple: str
+    lavender: str
     diff_add: str
+    diff_add_char: str
     diff_remove: str
+    diff_remove_char: str
     code_theme: str
-    text_background: str
+    code_background: str
+    green_background: str
+    blue_grey_background: str
+    # Sub-agent backgrounds (corresponding to sub_agent_colors order)
+    cyan_background: str
+    green_sub_background: str
+    blue_sub_background: str
+    purple_background: str
+    orange_background: str
+    red_background: str
+    grey_background: str
+    yellow_background: str
 
 
 LIGHT_PALETTE = Palette(
     red="red",
     yellow="yellow",
-    green="spring_green4",
+    green="#00875f",
+    grey_yellow="#5f9f7a",
     cyan="cyan",
-    blue="#3678b7",
+    blue="#3078C5",
     orange="#d77757",
     magenta="magenta",
-    grey_blue="steel_blue",
     grey1="#667e90",
     grey2="#93a4b1",
     grey3="#c4ced4",
-    grey_green="#96a696",
-    purple="slate_blue3",
-    diff_add="#2e5a32 on #e8f5e9",
-    diff_remove="#5a2e32 on #ffebee",
+    grey_green="#96a096",
+    purple="#5f5fd7",
+    lavender="#5f87af",
+    diff_add="#2e5a32 on #dafbe1",
+    diff_add_char="#2e5a32 on #aceebb",
+    diff_remove="#82071e on #ffecec",
+    diff_remove_char="#82071e on #ffcfcf",
     code_theme="ansi_light",
-    text_background="#f0f0f0",
+    code_background="#e0e0e0",
+    green_background="#e8f1e9",
+    blue_grey_background="#e8e9f1",
+    cyan_background="#e0f0f0",
+    green_sub_background="#e0f0e0",
+    blue_sub_background="#e0e8f5",
+    purple_background="#ede0f5",
+    orange_background="#f5ebe0",
+    red_background="#f5e0e0",
+    grey_background="#e8e8e8",
+    yellow_background="#f5f5e0",
 )
 
 DARK_PALETTE = Palette(
-    red="indian_red",
+    red="#d75f5f",
     yellow="yellow",
-    green="sea_green3",
+    green="#5fd787",
+    grey_yellow="#8ac89a",
     cyan="cyan",
-    blue="deep_sky_blue1",
+    blue="#00afff",
     orange="#e6704e",
     magenta="magenta",
-    grey_blue="steel_blue",
     grey1="#99aabb",
     grey2="#778899",
-    grey3="#646464",
+    grey3="#545c6c",
     grey_green="#6d8672",
     purple="#afbafe",
-    diff_add="#c8e6c9 on #2e4a32",
-    diff_remove="#ffcdd2 on #4a2e32",
+    lavender="#9898b8",
+    diff_add="#c8e6c9 on #1b3928",
+    diff_add_char="#c8e6c9 on #2d6b42",
+    diff_remove="#ffcdd2 on #3d1f23",
+    diff_remove_char="#ffcdd2 on #7a3a42",
     code_theme="ansi_dark",
-    text_background="#2f3440",
+    code_background="#2f3440",
+    green_background="#23342c",
+    blue_grey_background="#313848",
+    cyan_background="#1a3333",
+    green_sub_background="#1b3928",
+    blue_sub_background="#1a2a3d",
+    purple_background="#2a2640",
+    orange_background="#3d2a1a",
+    red_background="#3d1f23",
+    grey_background="#2a2d30",
+    yellow_background="#3d3a1a",
 )
 
 
 class ThemeKey(str, Enum):
     LINES = "lines"
+
+    # PANEL
+    SUB_AGENT_RESULT_PANEL = "panel.sub_agent_result"
+    WRITE_MARKDOWN_PANEL = "panel.write_markdown"
     # DIFF
     DIFF_FILE_NAME = "diff.file_name"
     DIFF_REMOVE = "diff.remove"
     DIFF_ADD = "diff.add"
+    DIFF_ADD_CHAR = "diff.add.char"
+    DIFF_REMOVE_CHAR = "diff.remove.char"
     DIFF_STATS_ADD = "diff.stats.add"
     DIFF_STATS_REMOVE = "diff.stats.remove"
     # ERROR
@@ -84,8 +130,10 @@ class ThemeKey(str, Enum):
     METADATA_DIM = "metadata.dim"
     METADATA_BOLD = "metadata.bold"
     # SPINNER_STATUS
-    SPINNER_STATUS = "spinner.status"
-    SPINNER_STATUS_TEXT = "spinner.status.text"
+    STATUS_SPINNER = "spinner.status"
+    STATUS_TEXT = "spinner.status.text"
+    STATUS_TEXT_BOLD = "spinner.status.text.bold"
+    STATUS_TEXT_BOLD_ITALIC = "spinner.status.text.bold_italic"
     # STATUS
     STATUS_HINT = "status.hint"
     # USER_INPUT
@@ -93,6 +141,9 @@ class ThemeKey(str, Enum):
     USER_INPUT_PROMPT = "user.input.prompt"
     USER_INPUT_AT_PATTERN = "user.at_pattern"
     USER_INPUT_SLASH_COMMAND = "user.slash_command"
+    USER_INPUT_SKILL = "user.skill"
+    # ASSISTANT
+    ASSISTANT_MESSAGE_MARK = "assistant.message_mark"
     # REMINDER
     REMINDER = "reminder"
     REMINDER_BOLD = "reminder.bold"
@@ -103,10 +154,19 @@ class ThemeKey(str, Enum):
     TOOL_PARAM = "tool.param"
     TOOL_PARAM_BOLD = "tool.param.bold"
     TOOL_RESULT = "tool.result"
+    TOOL_RESULT_TRUNCATED = "tool.result.truncated"
     TOOL_RESULT_BOLD = "tool.result.bold"
     TOOL_MARK = "tool.mark"
     TOOL_APPROVED = "tool.approved"
     TOOL_REJECTED = "tool.rejected"
+    TOOL_TIMEOUT = "tool.timeout"
+    TOOL_RESULT_MERMAID = "tool.result.mermaid"
+    # BASH SYNTAX
+    BASH_COMMAND = "bash.command"
+    BASH_ARGUMENT = "bash.argument"
+    BASH_OPERATOR = "bash.operator"
+    BASH_STRING = "bash.string"
+    BASH_HEREDOC_DELIMITER = "bash.heredoc.delimiter"
     # THINKING
     THINKING = "thinking"
     THINKING_BOLD = "thinking.bold"
@@ -131,9 +191,11 @@ class ThemeKey(str, Enum):
     RESUME_FLAG = "resume.flag"
     RESUME_INFO = "resume.info"
     # CONFIGURATION DISPLAY
+    CONFIG_PROVIDER = "config.provider"
     CONFIG_TABLE_HEADER = "config.table.header"
     CONFIG_STATUS_OK = "config.status.ok"
     CONFIG_STATUS_PRIMARY = "config.status.primary"
+    CONFIG_STATUS_ERROR = "config.status.error"
     CONFIG_ITEM_NAME = "config.item.name"
     CONFIG_PARAM_LABEL = "config.param.label"
     CONFIG_PANEL_BORDER = "config.panel.border"
@@ -149,21 +211,24 @@ class Themes:
     thinking_markdown_theme: Theme
     code_theme: str
     sub_agent_colors: list[Style]
+    sub_agent_backgrounds: list[Style]
 
 
 def get_theme(theme: str | None = None) -> Themes:
-    if theme == "light":
-        palette = LIGHT_PALETTE
-    else:
-        palette = DARK_PALETTE
+    palette = LIGHT_PALETTE if theme == "light" else DARK_PALETTE
     return Themes(
         app_theme=Theme(
             styles={
                 ThemeKey.LINES.value: palette.grey3,
+                # PANEL
+                ThemeKey.SUB_AGENT_RESULT_PANEL.value: f"on {palette.blue_grey_background}",
+                ThemeKey.WRITE_MARKDOWN_PANEL.value: f"on {palette.green_background}",
                 # DIFF
                 ThemeKey.DIFF_FILE_NAME.value: palette.blue,
                 ThemeKey.DIFF_REMOVE.value: palette.diff_remove,
                 ThemeKey.DIFF_ADD.value: palette.diff_add,
+                ThemeKey.DIFF_ADD_CHAR.value: palette.diff_add_char,
+                ThemeKey.DIFF_REMOVE_CHAR.value: palette.diff_remove_char,
                 ThemeKey.DIFF_STATS_ADD.value: palette.green,
                 ThemeKey.DIFF_STATS_REMOVE.value: palette.red,
                 # ERROR
@@ -172,17 +237,21 @@ def get_theme(theme: str | None = None) -> Themes:
                 ThemeKey.INTERRUPT.value: "reverse bold " + palette.red,
                 # USER_INPUT
                 ThemeKey.USER_INPUT.value: palette.magenta,
-                ThemeKey.USER_INPUT_PROMPT.value: palette.magenta,
+                ThemeKey.USER_INPUT_PROMPT.value: "bold " + palette.magenta,
                 ThemeKey.USER_INPUT_AT_PATTERN.value: palette.purple,
                 ThemeKey.USER_INPUT_SLASH_COMMAND.value: "bold reverse " + palette.blue,
+                ThemeKey.USER_INPUT_SKILL.value: "bold reverse " + palette.green,
+                # ASSISTANT
+                ThemeKey.ASSISTANT_MESSAGE_MARK.value: "bold",
                 # METADATA
-                ThemeKey.METADATA.value: palette.grey_blue,
-                ThemeKey.METADATA_DIM.value: "dim " + palette.grey_blue,
-                ThemeKey.METADATA_BOLD.value: "bold " + palette.grey_blue,
-                # SPINNER_STATUS
-                ThemeKey.SPINNER_STATUS.value: palette.blue,
-                ThemeKey.SPINNER_STATUS_TEXT.value: palette.blue,
+                ThemeKey.METADATA.value: palette.lavender,
+                ThemeKey.METADATA_DIM.value: "dim " + palette.lavender,
+                ThemeKey.METADATA_BOLD.value: "bold " + palette.lavender,
                 # STATUS
+                ThemeKey.STATUS_SPINNER.value: palette.blue,
+                ThemeKey.STATUS_TEXT.value: palette.blue,
+                ThemeKey.STATUS_TEXT_BOLD.value: "bold " + palette.blue,
+                ThemeKey.STATUS_TEXT_BOLD_ITALIC.value: "bold italic " + palette.blue,
                 ThemeKey.STATUS_HINT.value: palette.grey2,
                 # REMINDER
                 ThemeKey.REMINDER.value: palette.grey1,
@@ -195,9 +264,18 @@ def get_theme(theme: str | None = None) -> Themes:
                 ThemeKey.TOOL_PARAM_BOLD.value: "bold " + palette.green,
                 ThemeKey.TOOL_RESULT.value: palette.grey_green,
                 ThemeKey.TOOL_RESULT_BOLD.value: "bold " + palette.grey_green,
+                ThemeKey.TOOL_RESULT_TRUNCATED.value: palette.yellow,
                 ThemeKey.TOOL_MARK.value: "bold",
                 ThemeKey.TOOL_APPROVED.value: palette.green + " bold reverse",
                 ThemeKey.TOOL_REJECTED.value: palette.red + " bold reverse",
+                ThemeKey.TOOL_TIMEOUT.value: palette.yellow,
+                ThemeKey.TOOL_RESULT_MERMAID: palette.blue + " underline",
+                # BASH SYNTAX
+                ThemeKey.BASH_COMMAND.value: "bold " + palette.green,
+                ThemeKey.BASH_ARGUMENT.value: palette.green,
+                ThemeKey.BASH_OPERATOR.value: palette.grey2,
+                ThemeKey.BASH_STRING.value: palette.grey_yellow,
+                ThemeKey.BASH_HEREDOC_DELIMITER.value: "bold " + palette.grey1,
                 # THINKING
                 ThemeKey.THINKING.value: "italic " + palette.grey2,
                 ThemeKey.THINKING_BOLD.value: "bold italic " + palette.grey1,
@@ -222,41 +300,52 @@ def get_theme(theme: str | None = None) -> Themes:
                 ThemeKey.RESUME_FLAG.value: "bold reverse " + palette.green,
                 ThemeKey.RESUME_INFO.value: palette.green,
                 # CONFIGURATION DISPLAY
-                ThemeKey.CONFIG_TABLE_HEADER.value: palette.green,
+                ThemeKey.CONFIG_TABLE_HEADER.value: palette.grey1,
                 ThemeKey.CONFIG_STATUS_OK.value: palette.green,
                 ThemeKey.CONFIG_STATUS_PRIMARY.value: palette.yellow,
+                ThemeKey.CONFIG_STATUS_ERROR.value: palette.red,
                 ThemeKey.CONFIG_ITEM_NAME.value: palette.cyan,
                 ThemeKey.CONFIG_PARAM_LABEL.value: palette.grey1,
                 ThemeKey.CONFIG_PANEL_BORDER.value: palette.grey3,
+                ThemeKey.CONFIG_PROVIDER.value: palette.cyan + " bold",
             }
         ),
         markdown_theme=Theme(
             styles={
                 "markdown.code": palette.purple,
-                "markdown.code.panel": palette.grey3,
+                "markdown.code.border": palette.grey3,
                 "markdown.h1": "bold reverse",
                 "markdown.h1.border": palette.grey3,
-                "markdown.h2.border": palette.grey3,
+                "markdown.h2": "bold underline",
                 "markdown.h3": "bold " + palette.grey1,
                 "markdown.h4": "bold " + palette.grey2,
                 "markdown.hr": palette.grey3,
                 "markdown.item.bullet": palette.grey2,
                 "markdown.item.number": palette.grey2,
+                "markdown.link": "underline " + palette.blue,
+                "markdown.link_url": "underline " + palette.blue,
+                "markdown.table.border": palette.grey2,
             }
         ),
         thinking_markdown_theme=Theme(
             styles={
-                "markdown.code": palette.grey1 + " on " + palette.text_background,
-                "markdown.code.panel": palette.grey3,
+                # THINKING (used for left-side mark in thinking output)
+                ThemeKey.THINKING.value: "italic " + palette.grey2,
+                ThemeKey.THINKING_BOLD.value: "bold italic " + palette.grey1,
+                "markdown.code": palette.grey1 + " italic on " + palette.code_background,
+                "markdown.code.block": palette.grey1,
+                "markdown.code.border": palette.grey3,
                 "markdown.h1": "bold reverse",
                 "markdown.h1.border": palette.grey3,
-                "markdown.h2.border": palette.grey3,
                 "markdown.h3": "bold " + palette.grey1,
                 "markdown.h4": "bold " + palette.grey2,
                 "markdown.hr": palette.grey3,
                 "markdown.item.bullet": palette.grey2,
                 "markdown.item.number": palette.grey2,
+                "markdown.link": "underline " + palette.blue,
+                "markdown.link_url": "underline " + palette.blue,
                 "markdown.strong": "bold italic " + palette.grey1,
+                "markdown.table.border": palette.grey2,
             }
         ),
         code_theme=palette.code_theme,
@@ -266,9 +355,16 @@ def get_theme(theme: str | None = None) -> Themes:
             Style(color=palette.blue),
             Style(color=palette.purple),
             Style(color=palette.orange),
-            Style(color=palette.grey_blue),
-            Style(color=palette.red),
             Style(color=palette.grey1),
             Style(color=palette.yellow),
         ],
+        sub_agent_backgrounds=[
+            Style(bgcolor=palette.cyan_background),
+            Style(bgcolor=palette.green_sub_background),
+            Style(bgcolor=palette.blue_sub_background),
+            Style(bgcolor=palette.purple_background),
+            Style(bgcolor=palette.orange_background),
+            Style(bgcolor=palette.grey_background),
+            Style(bgcolor=palette.yellow_background),
+        ],
     )