klaude-code 1.2.1__py3-none-any.whl → 1.2.3__py3-none-any.whl

klaude_code/ui/renderers/diffs.py

@@ -4,9 +4,9 @@ from rich.padding import Padding
 from rich.panel import Panel
 from rich.text import Text
 
-from klaude_code.const import DIFF_PREFIX_WIDTH, MAX_DIFF_LINES
-from klaude_code.ui.base.theme import ThemeKey
+from klaude_code import const
 from klaude_code.ui.renderers.common import create_grid
+from klaude_code.ui.rich.theme import ThemeKey
 
 
 def _make_diff_prefix(line: str, new_ln: int | None, width: int) -> tuple[str, int | None]:
@@ -44,6 +44,8 @@ def render_diff(diff_text: str, show_file_name: bool = False) -> RenderableType:
     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
@@ -61,15 +63,29 @@ def render_diff(diff_text: str, show_file_name: bool = False) -> RenderableType:
                 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)
+                grid.add_row(
+                    Text(f"{'+':>{const.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":
+                if raw.startswith(("a/", "b/")):
+                    from_file_name = raw[2:]
+                else:
+                    from_file_name = 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_name = raw
+                # 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:
@@ -115,7 +131,10 @@ def render_diff(diff_text: str, show_file_name: bool = False) -> RenderableType:
             else:
                 file_mark = "±"
 
-            grid.add_row(Text(f"{file_mark:>{DIFF_PREFIX_WIDTH}}  ", style=ThemeKey.DIFF_FILE_NAME), file_line)
+            grid.add_row(
+                Text(f"{file_mark:>{const.DIFF_PREFIX_WIDTH}}  ", style=ThemeKey.DIFF_FILE_NAME),
+                file_line,
+            )
             has_rendered_file_header = True
             has_rendered_diff_content = False
             continue
@@ -134,11 +153,11 @@ def render_diff(diff_text: str, show_file_name: bool = False) -> RenderableType:
             except Exception:
                 new_ln = None
             if has_rendered_diff_content:
-                grid.add_row(Text(f"{'⋮':>{DIFF_PREFIX_WIDTH}}", style=ThemeKey.TOOL_RESULT), "")
+                grid.add_row(Text(f"{'⋮':>{const.DIFF_PREFIX_WIDTH}}", style=ThemeKey.TOOL_RESULT), "")
             continue
 
-        # Skip file header lines entirely
-        if line.startswith("--- ") or line.startswith("+++ "):
+        # Skip +++ lines (already handled above)
+        if line.startswith("+++ "):
             continue
 
         # Only handle unified diff hunk lines; ignore other metadata like
@@ -147,7 +166,7 @@ def render_diff(diff_text: str, show_file_name: bool = False) -> RenderableType:
             continue
 
         # Compute line number prefix and style diff content
-        prefix, new_ln = _make_diff_prefix(line, new_ln, DIFF_PREFIX_WIDTH)
+        prefix, new_ln = _make_diff_prefix(line, new_ln, const.DIFF_PREFIX_WIDTH)
 
         if line.startswith("-"):
             text = Text(line[1:])
@@ -172,13 +191,16 @@ def render_diff_panel(
 ) -> 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)
+    if len(lines) > const.MAX_DIFF_LINES:
+        truncated_lines = len(lines) - const.MAX_DIFF_LINES
+        diff_text = "\n".join(lines[: const.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]
+    renderables: list[RenderableType] = [
+        Text(f" {heading} ", style="bold reverse"),
+        diff_body,
+    ]
     if truncated_notice is not None:
         renderables.extend([Text(""), truncated_notice])
 

klaude_code/ui/renderers/errors.py

@@ -1,8 +1,8 @@
 from rich.console import RenderableType
 from rich.text import Text
 
-from klaude_code.ui.base.theme import ThemeKey
 from klaude_code.ui.renderers.common import create_grid
+from klaude_code.ui.rich.theme import ThemeKey
 
 
 def render_error(error_msg: Text, indent: int = 2) -> RenderableType:

klaude_code/ui/renderers/metadata.py

@@ -8,8 +8,9 @@ from rich.panel import Panel
 from rich.text import Text
 
 from klaude_code.protocol import events
-from klaude_code.ui.base.theme import ThemeKey
-from klaude_code.ui.base.utils import format_number
+from klaude_code.trace import is_debug_enabled
+from klaude_code.ui.rich.theme import ThemeKey
+from klaude_code.ui.utils.common import format_number
 
 
 def _get_version() -> str:
@@ -40,30 +41,32 @@ def render_response_metadata(e: events.ResponseMetadataEvent) -> RenderableType:
 
     if metadata.usage is not None:
         # Input
-        parts.append(
-            Text.assemble(
-                ("input:", ThemeKey.METADATA_DIM),
-                (format_number(metadata.usage.input_tokens), ThemeKey.METADATA_DIM),
-            )
-        )
+        input_parts: list[tuple[str, str]] = [
+            ("input:", ThemeKey.METADATA_DIM),
+            (format_number(metadata.usage.input_tokens), ThemeKey.METADATA_DIM),
+        ]
+        if metadata.usage.input_cost is not None:
+            input_parts.append((f"(${metadata.usage.input_cost:.4f})", ThemeKey.METADATA_DIM))
+        parts.append(Text.assemble(*input_parts))
 
         # Cached
         if metadata.usage.cached_tokens > 0:
-            parts.append(
-                Text.assemble(
-                    ("cached", ThemeKey.METADATA_DIM),
-                    (":", ThemeKey.METADATA_DIM),
-                    (format_number(metadata.usage.cached_tokens), ThemeKey.METADATA_DIM),
-                )
-            )
+            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"(${metadata.usage.cache_read_cost:.4f})", ThemeKey.METADATA_DIM))
+            parts.append(Text.assemble(*cached_parts))
 
         # Output
-        parts.append(
-            Text.assemble(
-                ("output:", ThemeKey.METADATA_DIM),
-                (format_number(metadata.usage.output_tokens), ThemeKey.METADATA_DIM),
-            )
-        )
+        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"(${metadata.usage.output_cost:.4f})", ThemeKey.METADATA_DIM))
+        parts.append(Text.assemble(*output_parts))
 
         # Reasoning
         if metadata.usage.reasoning_tokens > 0:
@@ -71,7 +74,10 @@ def render_response_metadata(e: events.ResponseMetadataEvent) -> RenderableType:
                 Text.assemble(
                     ("thinking", ThemeKey.METADATA_DIM),
                     (":", ThemeKey.METADATA_DIM),
-                    (format_number(metadata.usage.reasoning_tokens), ThemeKey.METADATA_DIM),
+                    (
+                        format_number(metadata.usage.reasoning_tokens),
+                        ThemeKey.METADATA_DIM,
+                    ),
                 )
             )
 
@@ -81,7 +87,10 @@ def render_response_metadata(e: events.ResponseMetadataEvent) -> RenderableType:
                 Text.assemble(
                     ("context", ThemeKey.METADATA_DIM),
                     (":", ThemeKey.METADATA_DIM),
-                    (f"{metadata.usage.context_usage_percent:.1f}%", ThemeKey.METADATA_DIM),
+                    (
+                        f"{metadata.usage.context_usage_percent:.1f}%",
+                        ThemeKey.METADATA_DIM,
+                    ),
                 )
             )
 
@@ -95,16 +104,26 @@ def render_response_metadata(e: events.ResponseMetadataEvent) -> RenderableType:
                 )
             )
 
-    # Cost
+    # Duration
     if metadata.task_duration_s is not None:
         parts.append(
             Text.assemble(
-                ("cost", ThemeKey.METADATA_DIM),
+                ("time", ThemeKey.METADATA_DIM),
                 (":", ThemeKey.METADATA_DIM),
                 (f"{metadata.task_duration_s:.1f}s", ThemeKey.METADATA_DIM),
             )
         )
 
+    # Cost (USD)
+    if metadata.usage is not None and metadata.usage.total_cost is not None:
+        parts.append(
+            Text.assemble(
+                ("cost", ThemeKey.METADATA_DIM),
+                (":", ThemeKey.METADATA_DIM),
+                (f"${metadata.usage.total_cost:.4f}", ThemeKey.METADATA_DIM),
+            )
+        )
+
     if parts:
         line2 = Text("/", style=ThemeKey.METADATA_DIM).join(parts)
         renderables.append(Padding(line2, (0, 0, 0, 2)))
@@ -117,9 +136,12 @@ def render_welcome(e: events.WelcomeEvent, *, box_style: Box | None = None) -> R
     if box_style is None:
         box_style = box.ROUNDED
 
+    debug_mode = is_debug_enabled()
+
     # First line: Klaude Code version
+    klaude_code_style = ThemeKey.WELCOME_DEBUG_TITLE if debug_mode else ThemeKey.WELCOME_HIGHLIGHT_BOLD
     panel_content = Text.assemble(
-        ("Klaude Code", ThemeKey.WELCOME_HIGHLIGHT_BOLD),
+        ("Klaude Code", klaude_code_style),
         (f" v{_get_version()}\n", ThemeKey.WELCOME_INFO),
         (str(e.llm_config.model), ThemeKey.WELCOME_HIGHLIGHT),
         (" @ ", ThemeKey.WELCOME_INFO),
@@ -161,7 +183,8 @@ def render_welcome(e: events.WelcomeEvent, *, box_style: Box | None = None) -> R
             )
         )
 
+    border_style = ThemeKey.WELCOME_DEBUG_BORDER if debug_mode else ThemeKey.LINES
     return Group(
-        Panel.fit(panel_content, border_style=ThemeKey.LINES, box=box_style),
+        Panel.fit(panel_content, border_style=border_style, box=box_style),
         "",  # empty line
     )

klaude_code/ui/renderers/sub_agent.py

@@ -1,12 +1,15 @@
+import json
+
 from rich.console import Group, RenderableType
 from rich.panel import Panel
 from rich.style import Style
 from rich.text import Text
 
-from klaude_code.const import SUB_AGENT_RESULT_MAX_LINES
-from klaude_code.protocol import model
-from klaude_code.ui.base.theme import ThemeKey
-from klaude_code.ui.rich_ext.markdown import NoInsetMarkdown
+from klaude_code import const
+from klaude_code.protocol import events, model
+from klaude_code.protocol.sub_agent import get_sub_agent_profile_by_tool
+from klaude_code.ui.rich.markdown import NoInsetMarkdown
+from klaude_code.ui.rich.theme import ThemeKey
 
 
 def render_sub_agent_call(e: model.SubAgentState, style: Style | None = None) -> RenderableType:
@@ -24,14 +27,45 @@ def render_sub_agent_call(e: model.SubAgentState, style: Style | None = None) ->
 def render_sub_agent_result(result: str, *, code_theme: str, style: Style | None = None) -> RenderableType:
     stripped_result = result.strip()
     lines = stripped_result.splitlines()
-    if len(lines) > SUB_AGENT_RESULT_MAX_LINES:
-        hidden_count = len(lines) - SUB_AGENT_RESULT_MAX_LINES
-        truncated_text = "\n".join(lines[-SUB_AGENT_RESULT_MAX_LINES:])
+    if len(lines) > const.SUB_AGENT_RESULT_MAX_LINES:
+        hidden_count = len(lines) - const.SUB_AGENT_RESULT_MAX_LINES
+        truncated_text = "\n".join(lines[-const.SUB_AGENT_RESULT_MAX_LINES :])
         return Panel.fit(
             Group(
-                Text(f"... more {hidden_count} lines — use /export to view full output", style=ThemeKey.TOOL_RESULT),
+                Text(
+                    f"… more {hidden_count} lines — use /export to view full output",
+                    style=ThemeKey.TOOL_RESULT,
+                ),
                 NoInsetMarkdown(truncated_text, code_theme=code_theme, style=style or ""),
             ),
             border_style=ThemeKey.LINES,
         )
-    return Panel.fit(NoInsetMarkdown(stripped_result, code_theme=code_theme), border_style=ThemeKey.LINES)
+    return Panel.fit(
+        NoInsetMarkdown(stripped_result, code_theme=code_theme),
+        border_style=ThemeKey.LINES,
+    )
+
+
+def build_sub_agent_state_from_tool_call(e: events.ToolCallEvent) -> model.SubAgentState | None:
+    """Build SubAgentState from a tool call event for replay rendering."""
+    profile = get_sub_agent_profile_by_tool(e.tool_name)
+    if profile is None:
+        return None
+    description = profile.name
+    prompt = ""
+    if e.arguments:
+        try:
+            payload: dict[str, object] = json.loads(e.arguments)
+        except json.JSONDecodeError:
+            payload = {}
+        desc_value = payload.get("description")
+        if isinstance(desc_value, str) and desc_value.strip():
+            description = desc_value.strip()
+        prompt_value = payload.get("prompt") or payload.get("task")
+        if isinstance(prompt_value, str):
+            prompt = prompt_value.strip()
+    return model.SubAgentState(
+        sub_agent_type=profile.name,
+        sub_agent_desc=description,
+        sub_agent_prompt=prompt,
+    )

klaude_code/ui/renderers/thinking.py

@@ -1,7 +1,39 @@
+from rich.console import RenderableType
+from rich.padding import Padding
 from rich.text import Text
 
-from klaude_code.ui.base.theme import ThemeKey
+from klaude_code.ui.rich.markdown import NoInsetMarkdown
+from klaude_code.ui.rich.theme import ThemeKey
 
 
 def thinking_prefix() -> Text:
     return Text.from_markup("[not italic]⸫[/not italic] Thinking …", style=ThemeKey.THINKING)
+
+
+def _normalize_thinking_content(content: str) -> str:
+    """Normalize thinking content for display."""
+    return (
+        content.rstrip()
+        .replace("**\n\n", "**  \n")
+        .replace("\\n\\n\n\n", "")  # Weird case of Gemini 3
+        .replace("****", "**\n\n**")  # remove extra newlines after bold titles
+    )
+
+
+def render_thinking(content: str, *, code_theme: str, style: str) -> RenderableType | None:
+    """Render thinking content as indented markdown.
+
+    Returns None if content is empty.
+    Note: Caller should push thinking_markdown_theme before printing.
+    """
+    if len(content.strip()) == 0:
+        return None
+
+    return Padding.indent(
+        NoInsetMarkdown(
+            _normalize_thinking_content(content),
+            code_theme=code_theme,
+            style=style,
+        ),
+        level=2,
+    )