klaude-code 2.5.2__py3-none-any.whl → 2.5.3__py3-none-any.whl

klaude_code/tui/command/sub_agent_model_cmd.py

@@ -4,27 +4,13 @@ from __future__ import annotations
 
 import asyncio
 
-from prompt_toolkit.styles import Style
-
 from klaude_code.config.config import load_config
 from klaude_code.config.sub_agent_model_helper import SubAgentModelHelper, SubAgentModelInfo
 from klaude_code.protocol import commands, events, message, op
-from klaude_code.tui.terminal.selector import SelectItem, build_model_select_items, select_one
+from klaude_code.tui.terminal.selector import DEFAULT_PICKER_STYLE, SelectItem, build_model_select_items, select_one
 
 from .command_abc import Agent, CommandABC, CommandResult
 
-SELECT_STYLE = Style(
-    [
-        ("instruction", "ansibrightblack"),
-        ("pointer", "ansigreen"),
-        ("highlighted", "ansigreen"),
-        ("text", "ansibrightblack"),
-        ("question", "bold"),
-        ("meta", "fg:ansibrightblack"),
-        ("msg", ""),
-    ]
-)
-
 USE_DEFAULT_BEHAVIOR = "__default__"
 
 
@@ -69,8 +55,8 @@ def _select_sub_agent_sync(
         result = select_one(
             message="Select sub-agent to configure:",
             items=items,
-            pointer="->",
-            style=SELECT_STYLE,
+            pointer="→",
+            style=DEFAULT_PICKER_STYLE,
             use_search_filter=False,
         )
         return result if isinstance(result, str) else None
@@ -103,8 +89,8 @@ def _select_model_for_sub_agent_sync(
         result = select_one(
             message=f"Select model for {sub_agent_type}:",
             items=all_items,
-            pointer="->",
-            style=SELECT_STYLE,
+            pointer="→",
+            style=DEFAULT_PICKER_STYLE,
             use_search_filter=True,
         )
         return result if isinstance(result, str) else None

klaude_code/tui/command/thinking_cmd.py

@@ -1,23 +1,11 @@
 import asyncio
 
-from prompt_toolkit.styles import Style
-
 from klaude_code.config.thinking import get_thinking_picker_data, parse_thinking_value
 from klaude_code.protocol import commands, events, llm_param, message, op
-from klaude_code.tui.terminal.selector import SelectItem, select_one
+from klaude_code.tui.terminal.selector import DEFAULT_PICKER_STYLE, SelectItem, select_one
 
 from .command_abc import Agent, CommandABC, CommandResult
 
-SELECT_STYLE = Style(
-    [
-        ("instruction", "ansibrightblack"),
-        ("pointer", "ansigreen"),
-        ("highlighted", "ansigreen"),
-        ("text", "ansibrightblack"),
-        ("question", "bold"),
-    ]
-)
-
 
 def _select_thinking_sync(config: llm_param.LLMConfigParameter) -> llm_param.Thinking | None:
     """Select thinking level (sync version)."""
@@ -35,7 +23,7 @@ def _select_thinking_sync(config: llm_param.LLMConfigParameter) -> llm_param.Thi
             message=data.message,
             items=items,
             pointer="→",
-            style=SELECT_STYLE,
+            style=DEFAULT_PICKER_STYLE,
             use_search_filter=False,
         )
         if result is None:

klaude_code/tui/components/common.py

@@ -40,7 +40,7 @@ def truncate_middle(
         remaining = max(0, len(truncated_lines))
         return Text(f"  … (more {remaining} lines)", style=ThemeKey.TOOL_RESULT_TRUNCATED)
 
-    lines = text.split("\n")
+    lines = [line for line in text.split("\n") if line.strip()]
     truncated_lines = 0
     head_lines: list[str] = []
     tail_lines: list[str] = []

klaude_code/tui/components/metadata.py

@@ -1,5 +1,4 @@
 from rich.console import Group, RenderableType
-from rich.padding import Padding
 from rich.text import Text
 
 from klaude_code.const import DEFAULT_MAX_TOKENS
@@ -12,14 +11,14 @@ from klaude_code.ui.common import format_number
 def _render_task_metadata_block(
     metadata: model.TaskMetadata,
     *,
-    is_sub_agent: bool = False,
+    mark: Text,
     show_context_and_time: bool = True,
 ) -> RenderableType:
     """Render a single TaskMetadata block.
 
     Args:
         metadata: The TaskMetadata to render.
-        is_sub_agent: Whether this is a sub-agent block.
+        mark: The mark to display in the first column.
         show_context_and_time: Whether to show context usage percent and time.
 
     Returns:
@@ -31,9 +30,6 @@ def _render_task_metadata_block(
     currency = metadata.usage.currency if metadata.usage else "USD"
     currency_symbol = "¥" if currency == "CNY" else "$"
 
-    # First column: mark only
-    mark = Text("└", style=ThemeKey.METADATA_DIM) if is_sub_agent else Text("◆", style=ThemeKey.METADATA)
-
     # Second column: model@provider description / tokens / cost / …
     content = Text()
     content.append_text(Text(metadata.model_name, style=ThemeKey.METADATA_BOLD))
@@ -43,7 +39,7 @@ def _render_task_metadata_block(
         )
     if metadata.description:
         content.append_text(Text(" ", style=ThemeKey.METADATA)).append_text(
-            Text(metadata.description, style=ThemeKey.METADATA_DIM)
+            Text(metadata.description, style=ThemeKey.METADATA_ITALIC)
         )
 
     # All info parts (tokens, cost, context, etc.)
@@ -63,7 +59,7 @@ def _render_task_metadata_block(
             token_text.append(" ∿", style=ThemeKey.METADATA_DIM)
             token_text.append(format_number(metadata.usage.reasoning_tokens), style=ThemeKey.METADATA)
         if metadata.usage.image_tokens > 0:
-            token_text.append(" ⌗ ", style=ThemeKey.METADATA_DIM)
+            token_text.append(" ⊡", style=ThemeKey.METADATA_DIM)
             token_text.append(format_number(metadata.usage.image_tokens), style=ThemeKey.METADATA)
         parts.append(token_text)
 
@@ -134,7 +130,7 @@ def _render_task_metadata_block(
         content.append_text(Text(" ", style=ThemeKey.METADATA_DIM).join(parts))
 
     grid.add_row(mark, content)
-    return grid if not is_sub_agent else Padding(grid, (0, 0, 0, 2))
+    return grid
 
 
 def render_task_metadata(e: events.TaskMetadataEvent) -> RenderableType:
@@ -144,16 +140,20 @@ def render_task_metadata(e: events.TaskMetadataEvent) -> RenderableType:
     if e.cancelled:
         renderables.append(Text())
 
-    renderables.append(
-        _render_task_metadata_block(e.metadata.main_agent, is_sub_agent=False, show_context_and_time=True)
-    )
+    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 = "✓"
+    main_mark = Text(main_mark_text, style=ThemeKey.METADATA)
+
+    renderables.append(_render_task_metadata_block(e.metadata.main_agent, mark=main_mark, show_context_and_time=True))
 
     # Render each sub-agent metadata block
     for meta in e.metadata.sub_agent_task_metadata:
-        renderables.append(_render_task_metadata_block(meta, is_sub_agent=True, show_context_and_time=True))
+        sub_mark = Text("  └", style=ThemeKey.METADATA_DIM)
+        renderables.append(_render_task_metadata_block(meta, mark=sub_mark, show_context_and_time=True))
 
     # Add total cost line when there are sub-agents
-    if e.metadata.sub_agent_task_metadata:
+    if has_sub_agents:
         total_cost = 0.0
         currency = "USD"
         # Sum up costs from main agent and all sub-agents
@@ -166,12 +166,13 @@ def render_task_metadata(e: events.TaskMetadataEvent) -> RenderableType:
 
         currency_symbol = "¥" if currency == "CNY" else "$"
         total_line = Text.assemble(
-            ("Σ ", ThemeKey.METADATA_DIM),
+            ("  └", ThemeKey.METADATA_DIM),
+            (" Σ ", ThemeKey.METADATA_DIM),
             ("total ", ThemeKey.METADATA_DIM),
             (currency_symbol, ThemeKey.METADATA_DIM),
             (f"{total_cost:.4f}", ThemeKey.METADATA_DIM),
         )
 
-        renderables.append(Padding(total_line, (0, 0, 0, 2)))
+        renderables.append(total_line)
 
     return Group(*renderables)

klaude_code/tui/components/rich/quote.py

@@ -1,6 +1,8 @@
 from typing import TYPE_CHECKING, Any, Self
 
+from rich.cells import cell_len
 from rich.console import Console, ConsoleOptions, RenderResult
+from rich.measure import Measurement
 from rich.segment import Segment
 from rich.style import Style
 
@@ -16,10 +18,20 @@ class Quote:
         self.prefix = prefix
         self.style = style
 
+    def __rich_measure__(self, console: Console, options: ConsoleOptions) -> Measurement:
+        prefix_width = cell_len(self.prefix)
+        available_width = max(1, options.max_width - prefix_width)
+        content_measurement = Measurement.get(console, options.update(width=available_width), self.content)
+
+        minimum = min(options.max_width, content_measurement.minimum + prefix_width)
+        maximum = min(options.max_width, content_measurement.maximum + prefix_width)
+        return Measurement(minimum, maximum)
+
     def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
         # Reduce width to leave space for prefix
-        prefix_width = len(self.prefix)
-        render_options = options.update(width=options.max_width - prefix_width)
+        prefix_width = cell_len(self.prefix)
+        available_width = max(1, options.max_width - prefix_width)
+        render_options = options.update(width=available_width)
 
         # Get style
         quote_style = console.get_style(self.style) if isinstance(self.style, str) else self.style
@@ -29,7 +41,9 @@ class Quote:
         new_line = Segment("\n")
 
         # Render content as lines
-        lines = console.render_lines(self.content, render_options)
+        # Avoid padding to full width.
+        # Trailing spaces can cause terminals to reflow wrapped lines on resize.
+        lines = console.render_lines(self.content, render_options, pad=False)
 
         for line in lines:
             yield prefix_segment
@@ -57,6 +71,19 @@ class TreeQuote:
         self.style = style
         self.style_first = style_first
 
+    def __rich_measure__(self, console: Console, options: ConsoleOptions) -> Measurement:
+        prefix_width = max(
+            cell_len(self.prefix_middle),
+            cell_len(self.prefix_last),
+            cell_len(self.prefix_first) if self.prefix_first is not None else 0,
+        )
+        available_width = max(1, options.max_width - prefix_width)
+        content_measurement = Measurement.get(console, options.update(width=available_width), self.content)
+
+        minimum = min(options.max_width, content_measurement.minimum + prefix_width)
+        maximum = min(options.max_width, content_measurement.maximum + prefix_width)
+        return Measurement(minimum, maximum)
+
     @classmethod
     def for_tool_call(cls, content: "RenderableType", *, mark: str, style: str, style_first: str) -> Self:
         """Create a tree quote for tool call display.
@@ -85,17 +112,18 @@ class TreeQuote:
     def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
         # Reduce width to leave space for prefix
         prefix_width = max(
-            len(self.prefix_middle),
-            len(self.prefix_last),
-            len(self.prefix_first) if self.prefix_first is not None else 0,
+            cell_len(self.prefix_middle),
+            cell_len(self.prefix_last),
+            cell_len(self.prefix_first) if self.prefix_first is not None else 0,
         )
-        render_options = options.update(width=options.max_width - prefix_width)
+        available_width = max(1, options.max_width - prefix_width)
+        render_options = options.update(width=available_width)
 
         quote_style = console.get_style(self.style) if isinstance(self.style, str) else self.style
         first_style = console.get_style(self.style_first) if isinstance(self.style_first, str) else self.style_first
 
         new_line = Segment("\n")
-        lines = console.render_lines(self.content, render_options)
+        lines = console.render_lines(self.content, render_options, pad=False)
         line_count = len(lines)
 
         for idx, line in enumerate(lines):

klaude_code/tui/components/rich/theme.py

@@ -133,6 +133,7 @@ class ThemeKey(str, Enum):
     METADATA = "metadata"
     METADATA_DIM = "metadata.dim"
     METADATA_BOLD = "metadata.bold"
+    METADATA_ITALIC = "metadata.italic"
     # SPINNER_STATUS
     STATUS_SPINNER = "spinner.status"
     STATUS_TEXT = "spinner.status.text"
@@ -259,6 +260,7 @@ def get_theme(theme: str | None = None) -> Themes:
                 ThemeKey.METADATA.value: palette.lavender,
                 ThemeKey.METADATA_DIM.value: "dim " + palette.lavender,
                 ThemeKey.METADATA_BOLD.value: "bold " + palette.lavender,
+                ThemeKey.METADATA_ITALIC.value: "italic " + palette.lavender,
                 # STATUS
                 ThemeKey.STATUS_SPINNER.value: palette.blue,
                 ThemeKey.STATUS_TEXT.value: palette.blue,

klaude_code/tui/input/prompt_toolkit.py

@@ -315,9 +315,11 @@ class PromptToolkitInput(InputProviderABC):
                     "msg": "",
                     "meta": "fg:ansibrightblack",
                     "frame.border": "fg:ansibrightblack dim",
-                    "search_prefix": "fg:ansibrightblack",
+                    "search_prefix": "ansibrightblack",
                     "search_placeholder": "fg:ansibrightblack italic",
                     "search_input": "",
+                    "search_success": "noinherit fg:ansigreen",
+                    "search_none": "noinherit fg:ansired",
                     # Empty bottom-toolbar style
                     "bottom-toolbar": "bg:default fg:default noreverse",
                     "bottom-toolbar.text": "bg:default fg:default noreverse",

klaude_code/tui/machine.py

@@ -243,7 +243,24 @@ class SpinnerStatusState:
             return Text(self._toast_status, style=ThemeKey.STATUS_TOAST)
 
         activity_text = self._activity.get_activity_text()
-        base_status = self._reasoning_status or self._todo_status
+        todo_status = self._todo_status
+        reasoning_status = self._reasoning_status
+
+        if todo_status is not None:
+            base_status = todo_status
+            extra_reasoning = None if reasoning_status in (None, STATUS_THINKING_TEXT) else reasoning_status
+        else:
+            base_status = reasoning_status
+            extra_reasoning = None
+
+        if extra_reasoning is not None:
+            if activity_text is None:
+                activity_text = Text(extra_reasoning, style=ThemeKey.STATUS_TEXT_BOLD_ITALIC)
+            else:
+                prefixed = Text(extra_reasoning, style=ThemeKey.STATUS_TEXT_BOLD_ITALIC)
+                prefixed.append(" , ")
+                prefixed.append_text(activity_text)
+                activity_text = prefixed
 
         if base_status:
             # Default "Thinking ..." uses normal style; custom headers use bold italic
@@ -306,6 +323,7 @@ class _SessionState:
     @property
     def should_extract_reasoning_header(self) -> bool:
         """Gemini and GPT-5 models use markdown bold headers in thinking."""
+        return False  # Temporarily disabled for all models
         if self.model_id is None:
             return False
         model_lower = self.model_id.lower()

klaude_code/tui/renderer.py

@@ -64,7 +64,7 @@ from klaude_code.tui.components import thinking as c_thinking
 from klaude_code.tui.components import tools as c_tools
 from klaude_code.tui.components import user_input as c_user_input
 from klaude_code.tui.components import welcome as c_welcome
-from klaude_code.tui.components.common import truncate_head, truncate_middle
+from klaude_code.tui.components.common import truncate_head
 from klaude_code.tui.components.rich import status as r_status
 from klaude_code.tui.components.rich.live import CropAboveLive, SingleLine
 from klaude_code.tui.components.rich.markdown import MarkdownStream, ThinkingMarkdown
@@ -578,9 +578,9 @@ class TUICommandRenderer:
     def display_error(self, event: events.ErrorEvent) -> None:
         if event.session_id:
             with self.session_print_context(event.session_id):
-                self.print(c_errors.render_error(truncate_middle(event.error_message)))
+                self.print(c_errors.render_error(Text(event.error_message)))
         else:
-            self.print(c_errors.render_error(truncate_middle(event.error_message)))
+            self.print(c_errors.render_error(Text(event.error_message)))
 
     # ---------------------------------------------------------------------
     # Notifications