klaude-code 2.8.1__py3-none-any.whl → 2.9.1__py3-none-any.whl

klaude_code/tui/components/diffs.py

@@ -1,185 +1,12 @@
-from rich import box
-from rich.console import Group, RenderableType
-from rich.padding import Padding
-from rich.panel import Panel
+from rich.console import RenderableType
 from rich.text import Text
 
-from klaude_code.const import DIFF_PREFIX_WIDTH, MAX_DIFF_LINES
+from klaude_code.const import DIFF_PREFIX_WIDTH, TAB_EXPAND_WIDTH
 from klaude_code.protocol import model
 from klaude_code.tui.components.common import create_grid
 from klaude_code.tui.components.rich.theme import ThemeKey
 
 
-def _make_diff_prefix(line: str, new_ln: int | None, width: int) -> tuple[str, int | None]:
-    kind = line[0]
-
-    number = " " * width
-    if kind in {"+", " "} and new_ln is not None:
-        number = f"{new_ln:>{width}}"
-        new_ln += 1
-
-    if kind == "-":
-        marker = "-"
-    elif kind == "+":
-        marker = "+"
-    else:
-        marker = " "
-
-    prefix = f"{number} {marker}"
-    return prefix, new_ln
-
-
-def render_diff(diff_text: str, show_file_name: bool = False) -> RenderableType:
-    if diff_text == "":
-        return Text("")
-
-    lines = diff_text.split("\n")
-    grid = create_grid()
-    grid.padding = (0, 0)
-
-    # Track line numbers based on hunk headers
-    new_ln: int | None = None
-    # Track if we're in untracked files section
-    in_untracked_section = False
-    # Track whether we've already rendered a file header
-    has_rendered_file_header = False
-    # Track whether we have rendered actual diff content for the current file
-    has_rendered_diff_content = False
-    # Track the "from" file name from --- line (used for deleted files)
-    from_file_name: str | None = None
-
-    for i, line in enumerate(lines):
-        # Check for untracked files section header
-        if line == "git ls-files --others --exclude-standard":
-            in_untracked_section = True
-            grid.add_row("", "")
-            grid.add_row("", Text("Untracked files:", style=ThemeKey.TOOL_MARK))
-            grid.add_row("", "")
-            continue
-
-        # Handle untracked files
-        if in_untracked_section:
-            # If we hit a new section or empty line, we're done with untracked files
-            if line.startswith("diff --git") or line.strip() == "":
-                in_untracked_section = False
-            elif line.strip():  # Non-empty line in untracked section
-                file_text = Text(line.strip(), style=ThemeKey.TOOL_PARAM_BOLD)
-                grid.add_row(
-                    Text(f"{'+':>{DIFF_PREFIX_WIDTH}}", style=ThemeKey.TOOL_PARAM_BOLD),
-                    file_text,
-                )
-                continue
-
-        # Capture "from" file name from --- line (needed for deleted files)
-        if line.startswith("--- "):
-            raw = line[4:].strip()
-            if raw != "/dev/null":
-                from_file_name = raw[2:] if raw.startswith(("a/", "b/")) else raw
-            continue
-
-        # Parse file name from diff headers
-        if show_file_name and line.startswith("+++ "):
-            # Extract file name from +++ header with proper handling of /dev/null
-            raw = line[4:].strip()
-            if raw == "/dev/null":
-                # File was deleted, use the "from" file name
-                file_name = from_file_name or raw
-            elif raw.startswith(("a/", "b/")):
-                file_name = raw[2:]
-            else:
-                file_name = raw
-
-            file_text = Text(file_name, style=ThemeKey.DIFF_FILE_NAME)
-
-            # Count actual +/- lines for this file from i+1 onwards
-            file_additions = 0
-            file_deletions = 0
-            for remaining_line in lines[i + 1 :]:
-                if remaining_line.startswith("diff --git"):
-                    break
-                elif remaining_line.startswith("+") and not remaining_line.startswith("+++"):
-                    file_additions += 1
-                elif remaining_line.startswith("-") and not remaining_line.startswith("---"):
-                    file_deletions += 1
-
-            # Create stats text
-            stats_text = Text()
-            if file_additions > 0:
-                stats_text.append(f"+{file_additions}", style=ThemeKey.DIFF_STATS_ADD)
-            if file_deletions > 0:
-                if file_additions > 0:
-                    stats_text.append(" ")
-                stats_text.append(f"-{file_deletions}", style=ThemeKey.DIFF_STATS_REMOVE)
-
-            # Combine file name and stats
-            file_line = Text(style=ThemeKey.DIFF_FILE_NAME)
-            file_line.append_text(file_text)
-            if stats_text.plain:
-                file_line.append(" (")
-                file_line.append_text(stats_text)
-                file_line.append(")")
-
-            if has_rendered_file_header:
-                grid.add_row("", "")
-
-            if file_additions > 0 and file_deletions == 0:
-                file_mark = "+"
-            elif file_deletions > 0 and file_additions == 0:
-                file_mark = "-"
-            else:
-                file_mark = "±"
-
-            grid.add_row(
-                Text(f"{file_mark:>{DIFF_PREFIX_WIDTH}}  ", style=ThemeKey.DIFF_FILE_NAME),
-                file_line,
-            )
-            has_rendered_file_header = True
-            has_rendered_diff_content = False
-            continue
-
-        if line.startswith("diff --git"):
-            has_rendered_diff_content = False
-            continue
-
-        # Parse hunk headers to reset counters: @@ -l,s +l,s @@
-        if line.startswith("@@"):
-            try:
-                parts = line.split()
-                plus = parts[2]  # like '+12,4'
-                new_start = int(plus[1:].split(",")[0])
-                new_ln = new_start
-            except (IndexError, ValueError):
-                new_ln = None
-            if has_rendered_diff_content:
-                grid.add_row(Text(f"{'⋮':>{DIFF_PREFIX_WIDTH}}", style=ThemeKey.TOOL_RESULT), "")
-            continue
-
-        # Skip +++ lines (already handled above)
-        if line.startswith("+++ "):
-            continue
-
-        # Only handle unified diff hunk lines; ignore other metadata like
-        # "diff --git" or "index …" which would otherwise skew counters.
-        if not line or line[:1] not in {" ", "+", "-"}:
-            continue
-
-        # Compute line number prefix and style diff content
-        prefix, new_ln = _make_diff_prefix(line, new_ln, DIFF_PREFIX_WIDTH)
-
-        if line.startswith("-"):
-            text = Text(line[1:])
-            text.stylize(ThemeKey.DIFF_REMOVE)
-        elif line.startswith("+"):
-            text = Text(line[1:])
-            text.stylize(ThemeKey.DIFF_ADD)
-        else:
-            text = Text(line, style=ThemeKey.TOOL_RESULT)
-        grid.add_row(Text(prefix, ThemeKey.TOOL_RESULT), text)
-        has_rendered_diff_content = True
-
-    return grid
-
-
 def render_structured_diff(ui_extra: model.DiffUIExtra, show_file_name: bool = False) -> RenderableType:
     files = ui_extra.files
     if not files:
@@ -204,39 +31,6 @@ def render_structured_diff(ui_extra: model.DiffUIExtra, show_file_name: bool = F
     return grid
 
 
-def render_diff_panel(
-    diff_text: str,
-    *,
-    show_file_name: bool = True,
-    heading: str = "DIFF",
-    indent: int = 2,
-) -> RenderableType:
-    lines = diff_text.splitlines()
-    truncated_notice: Text | None = None
-    if len(lines) > MAX_DIFF_LINES:
-        truncated_lines = len(lines) - MAX_DIFF_LINES
-        diff_text = "\n".join(lines[:MAX_DIFF_LINES])
-        truncated_notice = Text(f"… truncated {truncated_lines} lines", style=ThemeKey.TOOL_MARK)
-
-    diff_body = render_diff(diff_text, show_file_name=show_file_name)
-    renderables: list[RenderableType] = [
-        Text(f" {heading} ", style="bold reverse"),
-        diff_body,
-    ]
-    if truncated_notice is not None:
-        renderables.extend([Text(""), truncated_notice])
-
-    panel = Panel.fit(
-        Group(*renderables),
-        border_style=ThemeKey.LINES,
-        title_align="center",
-        box=box.ROUNDED,
-    )
-    if indent <= 0:
-        return panel
-    return Padding.indent(panel, level=indent)
-
-
 def _render_file_header(file_diff: model.DiffFileDiff) -> tuple[Text, Text]:
     file_text = Text(file_diff.file_path, style=ThemeKey.DIFF_FILE_NAME)
     stats_text = Text()
@@ -280,7 +74,8 @@ def _render_structured_line(line: model.DiffLine) -> Text:
         return Text("")
     text = Text()
     for span in line.spans:
-        text.append(span.text, style=_span_style(line.kind, span.op))
+        content = span.text.expandtabs(TAB_EXPAND_WIDTH)
+        text.append(content, style=_span_style(line.kind, span.op))
     return text
 
 

klaude_code/tui/components/errors.py

@@ -9,6 +9,8 @@ def render_error(error_msg: Text) -> RenderableType:
     """Render error with X mark for error events."""
     grid = create_grid()
     error_msg.style = ThemeKey.ERROR
+    error_msg.overflow = "ellipsis"
+    error_msg.no_wrap = True
     grid.add_row(Text("✘", style=ThemeKey.ERROR_BOLD), error_msg)
     return grid
 
@@ -17,5 +19,7 @@ def render_tool_error(error_msg: Text) -> RenderableType:
     """Render error with indent for tool results."""
     grid = create_grid()
     error_msg.style = ThemeKey.ERROR
+    error_msg.overflow = "ellipsis"
+    error_msg.no_wrap = True
     grid.add_row(Text(" "), error_msg)
     return grid

klaude_code/tui/components/mermaid_viewer.py

@@ -16,7 +16,7 @@ _MERMAID_DEFAULT_PNG_SCALE = 2
 
 
 def artifacts_dir() -> Path:
-    return Path(TOOL_OUTPUT_TRUNCATION_DIR) / "mermaid"
+    return Path(TOOL_OUTPUT_TRUNCATION_DIR)
 
 
 def _extract_pako_from_link(link: str) -> str | None:
@@ -72,7 +72,7 @@ def ensure_viewer_file(*, code: str, link: str, tool_call_id: str) -> Path | Non
         return None
 
     safe_id = tool_call_id.replace("/", "_")
-    path = artifacts_dir() / f"mermaid-viewer-{safe_id}.html"
+    path = artifacts_dir() / f"klaude-mermaid-{safe_id}.html"
     if path.exists():
         return path
 

klaude_code/tui/components/metadata.py

@@ -136,9 +136,6 @@ def render_task_metadata(e: events.TaskMetadataEvent) -> RenderableType:
     """Render task metadata including main agent and sub-agents."""
     renderables: list[RenderableType] = []
 
-    if e.cancelled:
-        renderables.append(Text())
-
     has_sub_agents = len(e.metadata.sub_agent_task_metadata) > 0
     # Use an extra space for the main agent mark to align with two-character marks (├─, └─)
     main_mark_text = "✓"

klaude_code/tui/components/rich/markdown.py

@@ -14,7 +14,6 @@ from rich import box
 from rich._loop import loop_first
 from rich.console import Console, ConsoleOptions, RenderableType, RenderResult
 from rich.markdown import CodeBlock, Heading, ImageItem, ListItem, Markdown, MarkdownElement, TableElement
-from rich.rule import Rule
 from rich.segment import Segment
 from rich.style import Style, StyleType
 from rich.syntax import Syntax
@@ -120,7 +119,8 @@ class Divider(MarkdownElement):
 
     def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
         style = console.get_style("markdown.hr", default="none")
-        yield Rule(style=style, characters="-")
+        width = min(options.max_width, 100)
+        yield Text("-" * width, style=style)
 
 
 class MarkdownTable(TableElement):
@@ -153,7 +153,8 @@ class LeftHeading(Heading):
             h1_text = text.assemble((" ", "markdown.h1"), text, (" ", "markdown.h1"))
             yield h1_text
         elif self.tag == "h2":
-            text.stylize(Style(bold=True, underline=False))
+            h2_style = console.get_style("markdown.h2", default="bold")
+            text.stylize(h2_style + Style(underline=False))
             yield text
         else:
             yield text
@@ -332,11 +333,6 @@ class MarkdownStream:
         self.right_margin: int = max(right_margin, 0)
         self.markdown_class: Callable[..., Markdown] = markdown_class or NoInsetMarkdown
 
-    @property
-    def _live_started(self) -> bool:
-        """Check if Live display has been started (derived from self.live)."""
-        return self._live_sink is not None
-
     def _get_base_width(self) -> int:
         return self.console.options.max_width
 
@@ -399,12 +395,25 @@ class MarkdownStream:
             return 0
 
         top_level: list[Token] = [token for token in tokens if token.level == 0 and token.map is not None]
-        if len(top_level) < 2:
+        if not top_level:
             return 0
 
         last = top_level[-1]
         assert last.map is not None
 
+        # Lists are a special case: markdown-it-py treats the whole list as one
+        # top-level block, which would keep the entire list in the live area
+        # until the list ends.
+        #
+        # For streaming UX, we want all but the final list item to be eligible
+        # for stabilization, leaving only the *last* item in the live area.
+        if last.type in {"bullet_list_open", "ordered_list_open"}:
+            stable_line = self._compute_list_item_boundary(tokens, last)
+            return max(stable_line, 0)
+
+        if len(top_level) < 2:
+            return 0
+
         # When the buffer ends mid-line, markdown-it-py can temporarily classify
         # some lines as a thematic break (hr). For example, a trailing "- --"
         # parses as an hr, but appending a non-hr character ("- --0") turns it
@@ -421,6 +430,59 @@ class MarkdownStream:
         start_line = last.map[0]
         return max(start_line, 0)
 
+    def _compute_list_item_boundary(self, tokens: list[Token], list_open: Token) -> int:
+        """Return the start line of the last list item in a list.
+
+        This allows stabilizing all list items except the final one.
+        """
+
+        if list_open.map is None:
+            return 0
+
+        list_start, list_end = list_open.map
+        item_level = list_open.level + 1
+
+        last_item_start: int | None = None
+        for token in tokens:
+            if token.type != "list_item_open":
+                continue
+            if token.level != item_level:
+                continue
+            if token.map is None:
+                continue
+            start_line = token.map[0]
+            if start_line < list_start or start_line >= list_end:
+                continue
+            last_item_start = start_line
+
+        return last_item_start if last_item_start is not None else list_start
+
+    def _stable_boundary_continues_list(self, text: str, stable_line: int, *, final: bool) -> bool:
+        """Whether the stable/live split point is inside the final top-level list."""
+
+        if final:
+            return False
+        if stable_line <= 0:
+            return False
+
+        try:
+            tokens = self._parser.parse(text)
+        except Exception:
+            return False
+
+        top_level: list[Token] = [token for token in tokens if token.level == 0 and token.map is not None]
+        if not top_level:
+            return False
+
+        last = top_level[-1]
+        if last.type not in {"bullet_list_open", "ordered_list_open"}:
+            return False
+        if last.map is None:
+            return False
+
+        list_start, list_end = last.map
+        return list_start < stable_line < list_end
+
     def split_blocks(self, text: str, *, min_stable_line: int = 0, final: bool = False) -> tuple[str, str, int]:
         """Split full markdown into stable and live sources.
 
@@ -450,15 +512,14 @@ class MarkdownStream:
             return "", text, 0
         return stable_source, live_source, stable_line
 
-    def render_ansi(self, text: str, *, apply_mark: bool) -> str:
-        """Render markdown source to an ANSI string.
-
-        This is primarily intended for internal debugging and tests.
-        """
-        lines, _ = self._render_markdown_to_lines(text, apply_mark=apply_mark)
-        return "".join(lines)
-
-    def render_stable_ansi(self, stable_source: str, *, has_live_suffix: bool, final: bool) -> tuple[str, list[str]]:
+    def render_stable_ansi(
+        self,
+        stable_source: str,
+        *,
+        has_live_suffix: bool,
+        final: bool,
+        continues_list: bool = False,
+    ) -> tuple[str, list[str]]:
         """Render stable prefix to ANSI, preserving inter-block spacing.
 
         Returns:
@@ -468,52 +529,15 @@ class MarkdownStream:
             return "", []
 
         render_source = stable_source
-        if not final and has_live_suffix:
+        if not final and has_live_suffix and not continues_list:
             render_source = self._append_nonfinal_sentinel(stable_source)
 
         lines, images = self._render_markdown_to_lines(render_source, apply_mark=True)
-        return "".join(lines), images
 
-    @staticmethod
-    def normalize_live_ansi_for_boundary(*, stable_ansi: str, live_ansi: str) -> str:
-        """Normalize whitespace at the stable/live boundary.
-
-        Some Rich Markdown blocks (e.g. lists) render with a leading blank line.
-        If the stable prefix already renders a trailing blank line, rendering the
-        live suffix separately may introduce an extra blank line that wouldn't
-        appear when rendering the full document.
-
-        This function removes *overlapping* blank lines from the live ANSI when
-        the stable ANSI already ends with one or more blank lines.
-
-        Important: don't remove *all* leading blank lines from the live suffix.
-        In some incomplete-block cases, the live render may begin with multiple
-        blank lines while the full-document render would keep one of them.
-        """
-
-        stable_lines = stable_ansi.splitlines(keepends=True)
-        if not stable_lines:
-            return live_ansi
-
-        stable_trailing_blank = 0
-        for line in reversed(stable_lines):
-            if line.strip():
-                break
-            stable_trailing_blank += 1
-        if stable_trailing_blank <= 0:
-            return live_ansi
-
-        live_lines = live_ansi.splitlines(keepends=True)
-        live_leading_blank = 0
-        for line in live_lines:
-            if line.strip():
-                break
-            live_leading_blank += 1
-
-        drop = min(stable_trailing_blank, live_leading_blank)
-        if drop > 0:
-            live_lines = live_lines[drop:]
-        return "".join(live_lines)
+        if continues_list:
+            while lines and not lines[-1].strip():
+                lines.pop()
+        return "".join(lines), images
 
     def _append_nonfinal_sentinel(self, stable_source: str) -> str:
         """Make Rich render stable content as if it isn't the last block.
@@ -624,6 +648,8 @@ class MarkdownStream:
             final=final,
         )
 
+        continues_list = self._stable_boundary_continues_list(text, stable_line, final=final) and bool(live_source)
+
         start = time.time()
 
         stable_chunk_to_print: str | None = None
@@ -631,7 +657,10 @@ class MarkdownStream:
         stable_changed = final or stable_line > self._stable_source_line_count
         if stable_changed and stable_source:
             stable_ansi, collected_images = self.render_stable_ansi(
-                stable_source, has_live_suffix=bool(live_source), final=final
+                stable_source,
+                has_live_suffix=bool(live_source),
+                final=final,
+                continues_list=continues_list,
             )
             stable_lines = stable_ansi.splitlines(keepends=True)
             new_lines = stable_lines[len(self._stable_rendered_lines) :]
@@ -649,30 +678,42 @@ class MarkdownStream:
 
         live_text_to_set: Text | None = None
         if not final and MARKDOWN_STREAM_LIVE_REPAINT_ENABLED and self._live_sink is not None:
-            apply_mark_live = self._stable_source_line_count == 0
-            live_lines, _ = self._render_markdown_to_lines(live_source, apply_mark=apply_mark_live)
-
-            if self._stable_rendered_lines:
-                stable_trailing_blank = 0
-                for line in reversed(self._stable_rendered_lines):
-                    if line.strip():
-                        break
-                    stable_trailing_blank += 1
-
-                if stable_trailing_blank > 0:
-                    live_leading_blank = 0
-                    for line in live_lines:
+            if continues_list and self._stable_rendered_lines:
+                full_lines, _ = self._render_markdown_to_lines(text, apply_mark=True)
+                skip = min(len(self._stable_rendered_lines), len(full_lines))
+                live_text_to_set = Text.from_ansi("".join(full_lines[skip:]))
+            else:
+                apply_mark = not self._stable_rendered_lines
+                live_lines, _ = self._render_markdown_to_lines(live_source, apply_mark=apply_mark)
+
+                if self._stable_rendered_lines:
+                    stable_trailing_blank = 0
+                    for line in reversed(self._stable_rendered_lines):
                         if line.strip():
                             break
-                        live_leading_blank += 1
+                        stable_trailing_blank += 1
 
-                    drop = min(stable_trailing_blank, live_leading_blank)
-                    if drop > 0:
-                        live_lines = live_lines[drop:]
+                    if stable_trailing_blank > 0:
+                        live_leading_blank = 0
+                        for line in live_lines:
+                            if line.strip():
+                                break
+                            live_leading_blank += 1
 
-            live_text_to_set = Text.from_ansi("".join(live_lines))
+                        drop = min(stable_trailing_blank, live_leading_blank)
+                        if drop > 0:
+                            live_lines = live_lines[drop:]
+
+                live_text_to_set = Text.from_ansi("".join(live_lines))
 
         with self._synchronized_output():
+            # Update/clear live area first to avoid blank padding when stable block appears
+            if final:
+                if self._live_sink is not None:
+                    self._live_sink(None)
+            elif live_text_to_set is not None and self._live_sink is not None:
+                self._live_sink(live_text_to_set)
+
             if stable_chunk_to_print:
                 self.console.print(Text.from_ansi(stable_chunk_to_print), end="\n")
 
@@ -680,13 +721,5 @@ class MarkdownStream:
                 for img_path in new_images:
                     self._image_callback(img_path)
 
-            if final:
-                if self._live_sink is not None:
-                    self._live_sink(None)
-                return
-
-            if live_text_to_set is not None and self._live_sink is not None:
-                self._live_sink(live_text_to_set)
-
         elapsed = time.time() - start
         self.min_delay = min(max(elapsed * 6, 1.0 / 30), 0.5)

klaude_code/tui/components/rich/status.py

@@ -277,7 +277,7 @@ def truncate_left(text: Text, max_cells: int, *, console: Console, ellipsis: str
     if cell_len(text.plain) <= max_cells:
         return text
 
-    ellipsis_cells = cell_len(ellipsis)
+    ellipsis_cells = cell_len(ellipsis) + 1  # +1 for trailing space
     if max_cells <= ellipsis_cells:
         # Not enough space to show any meaningful suffix.
         clipped = Text(ellipsis, style=text.style)
@@ -307,7 +307,7 @@ def truncate_left(text: Text, max_cells: int, *, console: Console, ellipsis: str
     except Exception:
         ellipsis_style = suffix.style or text.style
 
-    return Text.assemble(Text(ellipsis, style=ellipsis_style), suffix)
+    return Text.assemble(Text(ellipsis + " ", style=ellipsis_style), suffix)
 
 
 class ShimmerStatusText:

klaude_code/tui/components/rich/theme.py

@@ -21,6 +21,7 @@ class Palette:
     grey_green: str
     purple: str
     lavender: str
+    black: str
     diff_add: str
     diff_add_char: str
     diff_remove: str
@@ -55,6 +56,7 @@ LIGHT_PALETTE = Palette(
     grey_green="#96a096",
     purple="#5f5fb7",
     lavender="#7878b0",
+    black="#101827",
     diff_add="#2e5a32 on #dafbe1",
     diff_add_char="#2e5a32 on #aceebb",
     diff_remove="#82071e on #ffecec",
@@ -88,6 +90,7 @@ DARK_PALETTE = Palette(
     grey_green="#6d8672",
     purple="#afbafe",
     lavender="#9898b8",
+    black="white",
     diff_add="#c8e6c9 on #1b3928",
     diff_add_char="#c8e6c9 on #2d6b42",
     diff_remove="#ffcdd2 on #3d1f23",
@@ -109,6 +112,7 @@ DARK_PALETTE = Palette(
 
 class ThemeKey(str, Enum):
     LINES = "lines"
+    LINES_DIM = "lines.dim"
 
     # CODE
     CODE_BACKGROUND = "code_background"
@@ -233,6 +237,7 @@ def get_theme(theme: str | None = None) -> Themes:
         app_theme=Theme(
             styles={
                 ThemeKey.LINES.value: palette.grey3,
+                ThemeKey.LINES_DIM.value: "dim " + palette.grey3,
                 # CODE
                 ThemeKey.CODE_BACKGROUND.value: f"on {palette.code_background}",
                 # PANEL
@@ -299,9 +304,9 @@ def get_theme(theme: str | None = None) -> Themes:
                 ThemeKey.BASH_HEREDOC_DELIMITER.value: "bold " + palette.grey1,
                 # THINKING
                 ThemeKey.THINKING.value: "italic " + palette.grey2,
-                ThemeKey.THINKING_BOLD.value: "bold italic " + palette.grey1,
+                ThemeKey.THINKING_BOLD.value: "italic " + palette.grey1,
                 # COMPACTION
-                ThemeKey.COMPACTION_SUMMARY.value: "italic " + palette.grey1,
+                ThemeKey.COMPACTION_SUMMARY.value: palette.grey1,
                 # TODO_ITEM
                 ThemeKey.TODO_EXPLANATION.value: palette.grey1 + " italic",
                 ThemeKey.TODO_PENDING_MARK.value: "bold " + palette.grey1,
@@ -345,9 +350,9 @@ def get_theme(theme: str | None = None) -> Themes:
                 "markdown.code.border": palette.grey3,
                 # Used by ThinkingMarkdown when rendering `<thinking>` blocks.
                 "markdown.code.block": palette.grey1,
-                "markdown.h1": "bold reverse",
+                "markdown.h1": "bold reverse " + palette.black,
                 "markdown.h1.border": palette.grey3,
-                "markdown.h2": "bold underline",
+                "markdown.h2": "bold underline " + palette.black,
                 "markdown.h3": "bold " + palette.grey1,
                 "markdown.h4": "bold " + palette.grey2,
                 "markdown.hr": palette.grey3,
@@ -363,7 +368,8 @@ def get_theme(theme: str | None = None) -> Themes:
             styles={
                 # THINKING (used for left-side mark in thinking output)
                 ThemeKey.THINKING.value: "italic " + palette.grey2,
-                ThemeKey.THINKING_BOLD.value: "bold italic " + palette.grey1,
+                ThemeKey.THINKING_BOLD.value: "italic " + palette.grey1,
+                "markdown.strong": "italic " + palette.grey1,
                 "markdown.code": palette.grey1 + " italic on " + palette.code_background,
                 "markdown.code.block": palette.grey1,
                 "markdown.code.border": palette.grey3,
@@ -377,7 +383,6 @@ def get_theme(theme: str | None = None) -> Themes:
                 "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,
                 "markdown.checkbox.checked": palette.green,
             }