klaude-code 1.2.14__tar.gz → 1.2.15__tar.gz

{klaude_code-1.2.14 → klaude_code-1.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 1.2.14
+Version: 1.2.15
 Summary: Add your description here
 Requires-Dist: anthropic>=0.66.0
 Requires-Dist: openai>=1.102.0

{klaude_code-1.2.14 → klaude_code-1.2.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "klaude-code"
-version = "1.2.14"
+version = "1.2.15"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.13"

{klaude_code-1.2.14 → klaude_code-1.2.15}/src/klaude_code/command/thinking_cmd.py

@@ -142,7 +142,7 @@ def _select_anthropic_thinking_sync() -> llm_param.Thinking | None:
             use_jk_keys=False,
             style=SELECT_STYLE,
         ).ask()
-        if result is None:
+        if not result:
             return llm_param.Thinking(type="disabled", budget_tokens=0)
         return llm_param.Thinking(type="enabled", budget_tokens=result or 0)
     except KeyboardInterrupt:

{klaude_code-1.2.14 → klaude_code-1.2.15}/src/klaude_code/llm/input_common.py

@@ -149,7 +149,7 @@ def parse_message_groups(history: list[model.ConversationItem]) -> list[MessageG
                 for item in items:
                     if isinstance(item, (model.UserMessageItem, model.DeveloperMessageItem)):
                         if item.content:
-                            group.text_parts.append(item.content)
+                            group.text_parts.append(item.content + "\n")
                         if item.images:
                             group.images.extend(item.images)
                 groups.append(group)

{klaude_code-1.2.14 → klaude_code-1.2.15}/src/klaude_code/session/templates/export_session.html

@@ -9,19 +9,15 @@
       href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%230851b2%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22><polyline points=%2216 18 22 12 16 6%22></polyline><polyline points=%228 6 2 12 8 18%22></polyline></svg>"
     />
     <link
-      href="https://cdn.jsdelivr.net/npm/@fontsource/iosevka/400.css"
+      href="https://cdn.jsdelivr.net/npm/@fontsource/geist-sans/latin-400.css"
       rel="stylesheet"
     />
     <link
-      href="https://cdn.jsdelivr.net/npm/@fontsource/iosevka/500.css"
+      href="https://cdn.jsdelivr.net/npm/@fontsource/geist-sans/latin-500.css"
       rel="stylesheet"
     />
     <link
-      href="https://cdn.jsdelivr.net/npm/@fontsource/iosevka/800.css"
-      rel="stylesheet"
-    />
-    <link
-      href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700&family=IBM+Plex+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700&display=swap"
+      href="https://cdn.jsdelivr.net/npm/@fontsource/geist-sans/latin-700.css"
       rel="stylesheet"
     />
     <style>
@@ -39,9 +35,9 @@
         --bg-error: #ffebee;
         --bg-code: #f3f3f3;
         --fg-inline-code: #4f4fc7;
-        --font-mono: "Iosevka", "SF Mono", Menlo, monospace;
-        --font-markdown-mono: "IBM Plex Mono", Menlo, monospace;
-        --font-markdown: "IBM Plex Sans", system-ui, sans-serif;
+        --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace;
+        --font-markdown-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace;
+        --font-markdown: "Geist Sans", system-ui, sans-serif;
         --font-weight-bold: 800;
         --font-size-xs: 13px;
         --font-size-sm: 14px;
@@ -114,7 +110,7 @@
 
       .meta-value {
         font-family: var(--font-mono);
-        font-size: var(--font-size-base);
+        font-size: var(--font-size-xs);
         color: var(--text);
         overflow: hidden;
         text-overflow: ellipsis;
@@ -1199,7 +1195,7 @@
       mermaid.initialize({
         startOnLoad: true,
         theme: "neutral",
-        fontFamily: '"Iosevka", "SF Mono", Menlo, monospace',
+        fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace',
       });
     </script>
     <script>

{klaude_code-1.2.14 → klaude_code-1.2.15}/src/klaude_code/ui/modes/repl/event_handler.py

@@ -9,7 +9,7 @@ from klaude_code import const
 from klaude_code.protocol import events
 from klaude_code.ui.core.stage_manager import Stage, StageManager
 from klaude_code.ui.modes.repl.renderer import REPLRenderer
-from klaude_code.ui.rich.markdown import MarkdownStream
+from klaude_code.ui.rich.markdown import MarkdownStream, ThinkingMarkdown
 from klaude_code.ui.rich.theme import ThemeKey
 from klaude_code.ui.terminal.notifier import Notification, NotificationType, TerminalNotifier
 from klaude_code.ui.terminal.progress_bar import OSC94States, emit_osc94
@@ -318,6 +318,7 @@ class DisplayEventHandler:
                 console=self.renderer.console,
                 spinner=self.renderer.spinner_renderable(),
                 indent=2,
+                markdown_class=ThinkingMarkdown,
             )
             self.thinking_stream.start(mdstream)
             self.renderer.spinner_stop()

{klaude_code-1.2.14 → klaude_code-1.2.15}/src/klaude_code/ui/modes/repl/renderer.py

@@ -145,9 +145,7 @@ class REPLRenderer:
                     case events.AssistantMessageEvent() as e:
                         if is_sub_agent:
                             continue
-                        renderable = r_assistant.render_assistant_message(
-                            e.content, code_theme=self.themes.code_theme
-                        )
+                        renderable = r_assistant.render_assistant_message(e.content, code_theme=self.themes.code_theme)
                         if renderable is not None:
                             self.print(renderable)
                             self.print()

{klaude_code-1.2.14 → klaude_code-1.2.15}/src/klaude_code/ui/renderers/metadata.py

@@ -9,6 +9,7 @@ from rich.text import Text
 
 from klaude_code.protocol import events, model
 from klaude_code.trace import is_debug_enabled
+from klaude_code.ui.renderers.common import create_grid
 from klaude_code.ui.rich.theme import ThemeKey
 from klaude_code.ui.utils.common import format_number
 
@@ -24,163 +25,123 @@ def _get_version() -> str:
 def _render_task_metadata_block(
     metadata: model.TaskMetadata,
     *,
-    indent: int = 0,
+    is_sub_agent: bool = False,
     show_context_and_time: bool = True,
-) -> list[RenderableType]:
+) -> RenderableType:
     """Render a single TaskMetadata block.
 
     Args:
         metadata: The TaskMetadata to render.
-        indent: Number of spaces to indent (0 for main, 2 for sub-agents).
+        is_sub_agent: Whether this is a sub-agent block.
         show_context_and_time: Whether to show context usage percent and time.
 
     Returns:
-        List of renderables for this metadata block.
+        A renderable for this metadata block.
     """
+    grid = create_grid()
+
     # Get currency symbol
     currency = metadata.usage.currency if metadata.usage else "USD"
     currency_symbol = "¥" if currency == "CNY" else "$"
 
-    # Line 1: Model and Provider
-    prefix = (
-        Text(" " * indent + "• ", style=ThemeKey.METADATA_BOLD)
-        if indent == 0
-        else Text(" " * indent + "└ ", style=ThemeKey.METADATA_DIM)
-    )
-    model_text = Text()
-    model_text.append_text(prefix).append_text(Text(metadata.model_name, style=ThemeKey.METADATA_BOLD))
+    # First column: mark only
+    mark = Text("└", style=ThemeKey.METADATA_DIM) if is_sub_agent else Text("•", style=ThemeKey.METADATA_BOLD)
+
+    # Second column: model@provider / tokens / cost / ...
+    content = Text()
+    content.append_text(Text(metadata.model_name, style=ThemeKey.METADATA_BOLD))
     if metadata.provider is not None:
-        model_text.append_text(Text("@", style=ThemeKey.METADATA)).append_text(
+        content.append_text(Text("@", style=ThemeKey.METADATA)).append_text(
             Text(metadata.provider.lower().replace(" ", "-"), style=ThemeKey.METADATA)
         )
 
-    renderables: list[RenderableType] = [model_text]
-
-    # Line 2: Token consumption, Context, TPS, Cost
-    parts2: list[Text] = []
+    # All info parts (tokens, cost, context, etc.)
+    parts: list[Text] = []
 
     if metadata.usage is not None:
-        # Input
-        input_parts: list[tuple[str, str]] = [
-            ("input:", ThemeKey.METADATA_DIM),
-            (format_number(metadata.usage.input_tokens), ThemeKey.METADATA_DIM),
+        # Tokens: ↑37k c5k ↓907 r45k
+        token_parts: list[tuple[str, str]] = [
+            ("↑", ThemeKey.METADATA_DIM),
+            (format_number(metadata.usage.input_tokens), ThemeKey.METADATA),
         ]
-        if metadata.usage.input_cost is not None:
-            input_parts.append((f"({currency_symbol}{metadata.usage.input_cost:.4f})", ThemeKey.METADATA_DIM))
-        parts2.append(Text.assemble(*input_parts))
-
-        # Cached
         if metadata.usage.cached_tokens > 0:
-            cached_parts: list[tuple[str, str]] = [
-                ("cached:", ThemeKey.METADATA_DIM),
-                (format_number(metadata.usage.cached_tokens), ThemeKey.METADATA_DIM),
-            ]
-            if metadata.usage.cache_read_cost is not None:
-                cached_parts.append((f"({currency_symbol}{metadata.usage.cache_read_cost:.4f})", ThemeKey.METADATA_DIM))
-            parts2.append(Text.assemble(*cached_parts))
-
-        # Output
-        output_parts: list[tuple[str, str]] = [
-            ("output:", ThemeKey.METADATA_DIM),
-            (format_number(metadata.usage.output_tokens), ThemeKey.METADATA_DIM),
-        ]
-        if metadata.usage.output_cost is not None:
-            output_parts.append((f"({currency_symbol}{metadata.usage.output_cost:.4f})", ThemeKey.METADATA_DIM))
-        parts2.append(Text.assemble(*output_parts))
-
-        # Reasoning
+            token_parts.append((" c", ThemeKey.METADATA_DIM))
+            token_parts.append((format_number(metadata.usage.cached_tokens), ThemeKey.METADATA))
+        token_parts.append((" ↓", ThemeKey.METADATA_DIM))
+        token_parts.append((format_number(metadata.usage.output_tokens), ThemeKey.METADATA))
         if metadata.usage.reasoning_tokens > 0:
-            parts2.append(
-                Text.assemble(
-                    ("thinking", ThemeKey.METADATA_DIM),
-                    (":", ThemeKey.METADATA_DIM),
-                    (
-                        format_number(metadata.usage.reasoning_tokens),
-                        ThemeKey.METADATA_DIM,
-                    ),
-                )
-            )
+            token_parts.append((" r", ThemeKey.METADATA_DIM))
+            token_parts.append((format_number(metadata.usage.reasoning_tokens), ThemeKey.METADATA))
+        parts.append(Text.assemble(*token_parts))
 
     # Cost
     if metadata.usage is not None and metadata.usage.total_cost is not None:
-        parts2.append(
+        parts.append(
             Text.assemble(
-                ("cost", ThemeKey.METADATA_DIM),
-                (":", ThemeKey.METADATA_DIM),
-                (f"{currency_symbol}{metadata.usage.total_cost:.4f}", ThemeKey.METADATA_DIM),
+                (currency_symbol, ThemeKey.METADATA_DIM),
+                (f"{metadata.usage.total_cost:.4f}", ThemeKey.METADATA),
             )
         )
-    if parts2:
-        line2 = Text(" / ", style=ThemeKey.METADATA_DIM).join(parts2)
-        renderables.append(Padding(line2, (0, 0, 0, indent + 2)))
-
-    parts3: list[Text] = []
     if metadata.usage is not None:
         # Context (only for main agent)
         if show_context_and_time and metadata.usage.context_usage_percent is not None:
             context_size = format_number(metadata.usage.context_size or 0)
-            parts3.append(
+            parts.append(
                 Text.assemble(
-                    ("context", ThemeKey.METADATA_DIM),
-                    (":", ThemeKey.METADATA_DIM),
-                    (
-                        f"{context_size}({metadata.usage.context_usage_percent:.1f}%)",
-                        ThemeKey.METADATA_DIM,
-                    ),
+                    (context_size, ThemeKey.METADATA),
+                    (f" ({metadata.usage.context_usage_percent:.1f}%)", ThemeKey.METADATA_DIM),
                 )
             )
 
         # TPS
         if metadata.usage.throughput_tps is not None:
-            parts3.append(
+            parts.append(
                 Text.assemble(
+                    (f"{metadata.usage.throughput_tps:.1f} ", ThemeKey.METADATA),
                     ("tps", ThemeKey.METADATA_DIM),
-                    (":", ThemeKey.METADATA_DIM),
-                    (f"{metadata.usage.throughput_tps:.1f}", ThemeKey.METADATA_DIM),
                 )
             )
 
     # Duration
     if show_context_and_time and metadata.task_duration_s is not None:
-        parts3.append(
+        parts.append(
             Text.assemble(
-                ("time", ThemeKey.METADATA_DIM),
-                (":", ThemeKey.METADATA_DIM),
-                (f"{metadata.task_duration_s:.1f}s", ThemeKey.METADATA_DIM),
+                (f"{metadata.task_duration_s:.1f}", ThemeKey.METADATA),
+                ("s", ThemeKey.METADATA_DIM),
             )
         )
 
     # Turn count
     if show_context_and_time and metadata.turn_count > 0:
-        parts3.append(
+        parts.append(
             Text.assemble(
-                ("turns", ThemeKey.METADATA_DIM),
-                (":", ThemeKey.METADATA_DIM),
-                (str(metadata.turn_count), ThemeKey.METADATA_DIM),
+                (str(metadata.turn_count), ThemeKey.METADATA),
+                (" turns", ThemeKey.METADATA_DIM),
             )
         )
 
-    if parts3:
-        line2 = Text(" / ", style=ThemeKey.METADATA_DIM).join(parts3)
-        renderables.append(Padding(line2, (0, 0, 0, indent + 2)))
+    if parts:
+        content.append_text(Text(" · ", style=ThemeKey.METADATA_DIM))
+        content.append_text(Text(" · ", style=ThemeKey.METADATA_DIM).join(parts))
 
-    return renderables
+    grid.add_row(mark, content)
+    return grid if not is_sub_agent else Padding(grid, (0, 0, 0, 2))
 
 
 def render_task_metadata(e: events.TaskMetadataEvent) -> RenderableType:
     """Render task metadata including main agent and sub-agents, aggregated by model+provider."""
     renderables: list[RenderableType] = []
 
-    renderables.extend(_render_task_metadata_block(e.metadata.main, indent=0, show_context_and_time=True))
+    renderables.append(_render_task_metadata_block(e.metadata.main, is_sub_agent=False, show_context_and_time=True))
 
     # Aggregate by (model_name, provider), sorted by total_cost descending
     sorted_items = model.TaskMetadata.aggregate_by_model(e.metadata.sub_agent_task_metadata)
 
     # Render each aggregated model block
     for meta in sorted_items:
-        renderables.extend(_render_task_metadata_block(meta, indent=2, show_context_and_time=False))
+        renderables.append(_render_task_metadata_block(meta, is_sub_agent=True, show_context_and_time=False))
 
-    return Group(*renderables)
+    return Padding(Group(*renderables), (0, 0, 0, 1))
 
 
 def render_welcome(e: events.WelcomeEvent, *, box_style: Box | None = None) -> RenderableType:

{klaude_code-1.2.14 → klaude_code-1.2.15}/src/klaude_code/ui/renderers/thinking.py

@@ -2,7 +2,7 @@ from rich.console import RenderableType
 from rich.padding import Padding
 from rich.text import Text
 
-from klaude_code.ui.rich.markdown import NoInsetMarkdown
+from klaude_code.ui.rich.markdown import ThinkingMarkdown
 from klaude_code.ui.rich.theme import ThemeKey
 
 
@@ -30,7 +30,7 @@ def render_thinking(content: str, *, code_theme: str, style: str) -> RenderableT
         return None
 
     return Padding.indent(
-        NoInsetMarkdown(
+        ThinkingMarkdown(
             _normalize_thinking_content(content),
             code_theme=code_theme,
             style=style,

{klaude_code-1.2.14 → klaude_code-1.2.15}/src/klaude_code/ui/renderers/tools.py

@@ -1,5 +1,6 @@
 import json
 from pathlib import Path
+from typing import Any, cast
 
 from rich.console import RenderableType
 from rich.padding import Padding
@@ -58,6 +59,49 @@ def render_generic_tool_call(tool_name: str, arguments: str, markup: str = "•"
     return grid
 
 
+def render_bash_tool_call(arguments: str) -> RenderableType:
+    grid = create_grid()
+    tool_name_column = Text.assemble((">", ThemeKey.TOOL_MARK), " ", ("Bash", ThemeKey.TOOL_NAME))
+
+    try:
+        payload_raw: Any = json.loads(arguments) if arguments else {}
+    except json.JSONDecodeError:
+        summary = Text(
+            arguments.strip()[: const.INVALID_TOOL_CALL_MAX_LENGTH],
+            style=ThemeKey.INVALID_TOOL_CALL_ARGS,
+        )
+        grid.add_row(tool_name_column, summary)
+        return grid
+
+    if not isinstance(payload_raw, dict):
+        summary = Text(
+            str(payload_raw)[: const.INVALID_TOOL_CALL_MAX_LENGTH],
+            style=ThemeKey.INVALID_TOOL_CALL_ARGS,
+        )
+        grid.add_row(tool_name_column, summary)
+        return grid
+
+    payload: dict[str, object] = cast(dict[str, object], payload_raw)
+
+    summary = Text("", ThemeKey.TOOL_PARAM)
+    command = payload.get("command")
+    timeout_ms = payload.get("timeout_ms")
+
+    if isinstance(command, str) and command.strip():
+        summary.append(command.strip(), style=ThemeKey.TOOL_PARAM)
+
+    if isinstance(timeout_ms, int):
+        if summary:
+            summary.append(" ")
+        if timeout_ms >= 1000 and timeout_ms % 1000 == 0:
+            summary.append(f"{timeout_ms // 1000}s", style=ThemeKey.TOOL_TIMEOUT)
+        else:
+            summary.append(f"{timeout_ms}ms", style=ThemeKey.TOOL_TIMEOUT)
+
+    grid.add_row(tool_name_column, summary)
+    return grid
+
+
 def render_update_plan_tool_call(arguments: str) -> RenderableType:
     grid = create_grid()
     tool_name_column = Text.assemble(("◎", ThemeKey.TOOL_MARK), " ", ("Update Plan", ThemeKey.TOOL_NAME))
@@ -461,7 +505,7 @@ def render_tool_call(e: events.ToolCallEvent) -> RenderableType | None:
         case tools.MULTI_EDIT:
             return render_multi_edit_tool_call(e.arguments)
         case tools.BASH:
-            return render_generic_tool_call(e.tool_name, e.arguments, ">")
+            return render_bash_tool_call(e.arguments)
         case tools.APPLY_PATCH:
             return render_apply_patch_tool_call(e.arguments)
         case tools.TODO_WRITE:

{klaude_code-1.2.14 → klaude_code-1.2.15}/src/klaude_code/ui/rich/markdown.py

@@ -4,8 +4,10 @@ from __future__ import annotations
 import contextlib
 import io
 import time
+from collections.abc import Callable
 from typing import Any, ClassVar
 
+from rich import box
 from rich.console import Console, ConsoleOptions, Group, RenderableType, RenderResult
 from rich.live import Live
 from rich.markdown import CodeBlock, Heading, Markdown
@@ -32,7 +34,16 @@ class NoInsetCodeBlock(CodeBlock):
             word_wrap=True,
             padding=(0, 1),
         )
-        yield Panel.fit(syntax, padding=0, border_style="markdown.code.panel")
+        yield Panel.fit(syntax, padding=(0, 0), style="markdown.code.block", box=box.SIMPLE)
+
+
+class ThinkingCodeBlock(CodeBlock):
+    """A code block for thinking content that uses grey styling instead of syntax highlighting."""
+
+    def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
+        code = str(self.text).rstrip()
+        text = Text("```\n" + code + "\n```")
+        yield text
 
 
 class LeftHeading(Heading):
@@ -41,15 +52,6 @@ class LeftHeading(Heading):
     def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
         text = self.text
         text.justify = "left"  # Override justification
-        # if self.tag == "h1":
-        #     from rich.panel import Panel
-        #     from rich import box
-        #     # Draw a border around h1s, but keep text left-aligned
-        #     yield Panel(
-        #         text,
-        #         box=box.SQUARE,
-        #         style="markdown.h1.border",
-        #     )
         if self.tag == "h2":
             text.stylize(Style(bold=True, underline=False))
             yield Rule(title=text, characters="-", style="markdown.h2.border", align="left")
@@ -68,6 +70,17 @@ class NoInsetMarkdown(Markdown):
     }
 
 
+class ThinkingMarkdown(Markdown):
+    """Markdown for thinking content with grey-styled code blocks and left-justified headings."""
+
+    elements: ClassVar[dict[str, type[Any]]] = {
+        **Markdown.elements,
+        "fence": ThinkingCodeBlock,
+        "code_block": ThinkingCodeBlock,
+        "heading_open": LeftHeading,
+    }
+
+
 class MarkdownStream:
     """Streaming markdown renderer that progressively displays content with a live updating window.
 
@@ -84,6 +97,7 @@ class MarkdownStream:
         spinner: Spinner | None = None,
         mark: str | None = None,
         indent: int = 0,
+        markdown_class: Callable[..., Markdown] | None = None,
     ) -> None:
         """Initialize the markdown stream.
 
@@ -93,6 +107,7 @@ class MarkdownStream:
             console (Console, optional): External console to use for rendering
             mark (str | None, optional): Marker shown before the first non-empty line when indent >= 2
             indent (int, optional): Number of spaces to indent all rendered lines on the left
+            markdown_class: Markdown class to use for rendering (defaults to NoInsetMarkdown)
         """
         self.printed: list[str] = []  # Stores lines that have already been printed
 
@@ -118,6 +133,7 @@ class MarkdownStream:
         self.spinner: Spinner | None = spinner
         self.mark: str | None = mark
         self.indent: int = max(indent, 0)
+        self.markdown_class: Callable[..., Markdown] = markdown_class or NoInsetMarkdown
 
     @property
     def _live_started(self) -> bool:
@@ -154,7 +170,7 @@ class MarkdownStream:
             width=effective_width,
         )
 
-        markdown = NoInsetMarkdown(text, **self.mdargs)
+        markdown = self.markdown_class(text, **self.mdargs)
         temp_console.print(markdown)
         output = string_io.getvalue()
 

{klaude_code-1.2.14 → klaude_code-1.2.15}/src/klaude_code/ui/rich/theme.py

@@ -14,12 +14,12 @@ class Palette:
     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_remove: str
     code_theme: str
@@ -31,15 +31,15 @@ LIGHT_PALETTE = Palette(
     yellow="yellow",
     green="spring_green4",
     cyan="cyan",
-    blue="#3678b7",
+    blue="#3078C5",
     orange="#d77757",
     magenta="magenta",
-    grey_blue="steel_blue",
     grey1="#667e90",
     grey2="#93a4b1",
     grey3="#c4ced4",
-    grey_green="#96a696",
+    grey_green="#96a096",
     purple="slate_blue3",
+    lavender="steel_blue",
     diff_add="#2e5a32 on #e8f5e9",
     diff_remove="#5a2e32 on #ffebee",
     code_theme="ansi_light",
@@ -54,12 +54,12 @@ DARK_PALETTE = Palette(
     blue="deep_sky_blue1",
     orange="#e6704e",
     magenta="magenta",
-    grey_blue="steel_blue",
     grey1="#99aabb",
     grey2="#778899",
     grey3="#646464",
     grey_green="#6d8672",
     purple="#afbafe",
+    lavender="#9898b8",
     diff_add="#c8e6c9 on #2e4a32",
     diff_remove="#ffcdd2 on #4a2e32",
     code_theme="ansi_dark",
@@ -107,6 +107,7 @@ class ThemeKey(str, Enum):
     TOOL_MARK = "tool.mark"
     TOOL_APPROVED = "tool.approved"
     TOOL_REJECTED = "tool.rejected"
+    TOOL_TIMEOUT = "tool.timeout"
     # THINKING
     THINKING = "thinking"
     THINKING_BOLD = "thinking.bold"
@@ -174,9 +175,9 @@ def get_theme(theme: str | None = None) -> Themes:
                 ThemeKey.USER_INPUT_AT_PATTERN.value: palette.purple,
                 ThemeKey.USER_INPUT_SLASH_COMMAND.value: "bold reverse " + palette.blue,
                 # METADATA
-                ThemeKey.METADATA.value: palette.grey_blue,
-                ThemeKey.METADATA_DIM.value: "dim " + palette.grey_blue,
-                ThemeKey.METADATA_BOLD.value: "bold " + palette.grey_blue,
+                ThemeKey.METADATA.value: palette.lavender,
+                ThemeKey.METADATA_DIM.value: "dim " + palette.lavender,
+                ThemeKey.METADATA_BOLD.value: "bold " + palette.lavender,
                 # SPINNER_STATUS
                 ThemeKey.SPINNER_STATUS.value: palette.blue,
                 ThemeKey.SPINNER_STATUS_TEXT.value: palette.blue,
@@ -196,6 +197,7 @@ def get_theme(theme: str | None = None) -> Themes:
                 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,
                 # THINKING
                 ThemeKey.THINKING.value: "italic " + palette.grey2,
                 ThemeKey.THINKING_BOLD.value: "bold italic " + palette.grey1,
@@ -232,7 +234,7 @@ def get_theme(theme: str | None = None) -> Themes:
         markdown_theme=Theme(
             styles={
                 "markdown.code": palette.purple,
-                "markdown.code.panel": palette.grey3,
+                "markdown.code.block": "on " + palette.text_background,
                 "markdown.h1": "bold reverse",
                 "markdown.h1.border": palette.grey3,
                 "markdown.h2.border": palette.grey3,
@@ -245,8 +247,7 @@ def get_theme(theme: str | None = None) -> Themes:
         ),
         thinking_markdown_theme=Theme(
             styles={
-                "markdown.code": palette.grey1 + " on " + palette.text_background,
-                "markdown.code.panel": palette.grey3,
+                "markdown.code": palette.grey1 + " italic on " + palette.text_background,
                 "markdown.h1": "bold reverse",
                 "markdown.h1.border": palette.grey3,
                 "markdown.h2.border": palette.grey3,
@@ -265,7 +266,6 @@ 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),