klaude-code 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

klaude_code/ui/renderers/bash_syntax.py

@@ -7,6 +7,8 @@ from pygments.lexers import BashLexer  # pyright: ignore[reportUnknownVariableTy
 from pygments.token import Token
 from rich.text import Text
 
+from klaude_code.const import BASH_MULTILINE_STRING_TRUNCATE_MAX_LINES
+from klaude_code.ui.renderers.common import truncate_head
 from klaude_code.ui.rich.theme import ThemeKey
 
 # Token types for bash syntax highlighting
@@ -110,13 +112,34 @@ def _append_heredoc(result: Text, token_value: str) -> None:
         # Extra content on first line (e.g., "> file.py")
         if extra:
             result.append(extra, style=ThemeKey.BASH_ARGUMENT)
-        # Body content
-        result.append(body, style=ThemeKey.BASH_STRING)
+
+        # Body content (truncate to keep tool call rendering compact)
+        body_inner = body.strip("\n")
+        result.append("\n")
+        if body_inner:
+            body_text = truncate_head(
+                body_inner,
+                max_lines=BASH_MULTILINE_STRING_TRUNCATE_MAX_LINES,
+                base_style=ThemeKey.BASH_STRING,
+                truncated_style=ThemeKey.TOOL_RESULT_TRUNCATED,
+            )
+            result.append_text(body_text)
+            result.append("\n")
+
         # End delimiter
         result.append(end_delimiter, style=ThemeKey.BASH_HEREDOC_DELIMITER)
     else:
         # Fallback: couldn't parse heredoc structure
-        result.append(token_value, style=ThemeKey.BASH_STRING)
+        if "\n" in token_value and len(token_value.splitlines()) > BASH_MULTILINE_STRING_TRUNCATE_MAX_LINES:
+            truncated = truncate_head(
+                token_value,
+                max_lines=BASH_MULTILINE_STRING_TRUNCATE_MAX_LINES,
+                base_style=ThemeKey.BASH_STRING,
+                truncated_style=ThemeKey.TOOL_RESULT_TRUNCATED,
+            )
+            result.append_text(truncated)
+        else:
+            result.append(token_value, style=ThemeKey.BASH_STRING)
 
 
 def highlight_bash_command(command: str) -> Text:
@@ -145,7 +168,16 @@ def highlight_bash_command(command: str) -> Text:
             if token_value.startswith("<<"):
                 _append_heredoc(result, token_value)
             else:
-                result.append(token_value, style=ThemeKey.BASH_STRING)
+                if "\n" in token_value and len(token_value.splitlines()) > BASH_MULTILINE_STRING_TRUNCATE_MAX_LINES:
+                    truncated = truncate_head(
+                        token_value,
+                        max_lines=BASH_MULTILINE_STRING_TRUNCATE_MAX_LINES,
+                        base_style=ThemeKey.BASH_STRING,
+                        truncated_style=ThemeKey.TOOL_RESULT_TRUNCATED,
+                    )
+                    result.append_text(truncated)
+                else:
+                    result.append(token_value, style=ThemeKey.BASH_STRING)
             expect_subcommand = False
         elif token_type in _OPERATOR_TOKENS:
             result.append(token_value, style=ThemeKey.BASH_OPERATOR)

klaude_code/ui/renderers/common.py

@@ -1,3 +1,5 @@
+from typing import Literal
+
 from rich.style import Style
 from rich.table import Table
 from rich.text import Text
@@ -12,10 +14,10 @@ from klaude_code.const import (
 from klaude_code.ui.rich.theme import ThemeKey
 
 
-def create_grid() -> Table:
+def create_grid(*, overflow: Literal["fold", "crop", "ellipsis", "ignore"] = "fold") -> Table:
     grid = Table.grid(padding=(0, 1))
     grid.add_column(no_wrap=True)
-    grid.add_column(overflow="fold")
+    grid.add_column(overflow=overflow)
     return grid
 
 
@@ -36,7 +38,7 @@ def truncate_middle(
     if max_lines <= 0:
         truncated_lines = text.split("\n")
         remaining = max(0, len(truncated_lines))
-        return Text(f"… (more {remaining} lines)", style=ThemeKey.TOOL_RESULT_TRUNCATED)
+        return Text(f"  … (more {remaining} lines)", style=ThemeKey.TOOL_RESULT_TRUNCATED)
 
     lines = text.split("\n")
     truncated_lines = 0
@@ -65,7 +67,7 @@ def truncate_middle(
             out.append(line[:max_line_length])
             out.append_text(
                 Text(
-                    f"… (more {extra_chars} characters in this line)",
+                    f" … (more {extra_chars} characters in this line)",
                     style=ThemeKey.TOOL_RESULT_TRUNCATED,
                 )
             )
@@ -82,7 +84,7 @@ def truncate_middle(
             out.append("\n")
 
     if truncated_lines > 0:
-        out.append_text(Text(f"⋮ (more {truncated_lines} lines)\n", style=ThemeKey.TOOL_RESULT_TRUNCATED))
+        out.append_text(Text(f"  … (more {truncated_lines} lines)\n", style=ThemeKey.TOOL_RESULT_TRUNCATED))
 
     for idx, line in enumerate(tail_lines):
         append_line(out, line)
@@ -139,6 +141,6 @@ def truncate_head(
         out.append("\n")
 
     remaining = len(lines) - max_lines
-    out.append_text(Text(f"… more {remaining} lines", style=truncated_style or ThemeKey.TOOL_RESULT_TRUNCATED))
+    out.append_text(Text(f"  … (more {remaining} lines)", style=truncated_style or ThemeKey.TOOL_RESULT_TRUNCATED))
 
     return out

klaude_code/ui/renderers/developer.py

@@ -12,15 +12,19 @@ from klaude_code.ui.rich.theme import ThemeKey
 REMINDER_BULLET = "  ⧉"
 
 
+def get_command_output(item: message.DeveloperMessage) -> model.CommandOutput | None:
+    if not item.ui_extra:
+        return None
+    for ui_item in item.ui_extra.items:
+        if isinstance(ui_item, model.CommandOutputUIItem):
+            return ui_item.output
+    return None
+
+
 def need_render_developer_message(e: events.DeveloperMessageEvent) -> bool:
-    return bool(
-        e.item.memory_paths
-        or e.item.external_file_changes
-        or e.item.todo_use
-        or e.item.at_files
-        or e.item.user_image_count
-        or e.item.skill_name
-    )
+    if not e.item.ui_extra:
+        return False
+    return any(not isinstance(ui_item, model.CommandOutputUIItem) for ui_item in e.item.ui_extra.items)
 
 
 def render_developer_message(e: events.DeveloperMessageEvent) -> RenderableType:
@@ -31,112 +35,124 @@ def render_developer_message(e: events.DeveloperMessageEvent) -> RenderableType:
     """
     parts: list[RenderableType] = []
 
-    if mp := e.item.memory_paths:
-        grid = create_grid()
-        grid.add_row(
-            Text(REMINDER_BULLET, style=ThemeKey.REMINDER),
-            Text.assemble(
-                ("Load memory ", ThemeKey.REMINDER),
-                Text(", ", ThemeKey.REMINDER).join(
-                    render_path(memory_path, ThemeKey.REMINDER_BOLD) for memory_path in mp
-                ),
-            ),
-        )
-        parts.append(grid)
-
-    if fc := e.item.external_file_changes:
-        grid = create_grid()
-        for file_path in fc:
-            grid.add_row(
-                Text(REMINDER_BULLET, style=ThemeKey.REMINDER),
-                Text.assemble(
-                    ("Read ", ThemeKey.REMINDER),
-                    render_path(file_path, ThemeKey.REMINDER_BOLD),
-                    (" after external changes", ThemeKey.REMINDER),
-                ),
-            )
-        parts.append(grid)
-
-    if e.item.todo_use:
-        grid = create_grid()
-        grid.add_row(
-            Text(REMINDER_BULLET, style=ThemeKey.REMINDER),
-            Text("Todo hasn't been updated recently", ThemeKey.REMINDER),
-        )
-        parts.append(grid)
-
-    if e.item.at_files:
-        grid = create_grid()
-        # Group at_files by (operation, mentioned_in)
-        grouped: dict[tuple[str, str | None], list[str]] = {}
-        for at_file in e.item.at_files:
-            key = (at_file.operation, at_file.mentioned_in)
-            if key not in grouped:
-                grouped[key] = []
-            grouped[key].append(at_file.path)
-
-        for (operation, mentioned_in), paths in grouped.items():
-            path_texts = Text(", ", ThemeKey.REMINDER).join(render_path(p, ThemeKey.REMINDER_BOLD) for p in paths)
-            if mentioned_in:
-                grid.add_row(
-                    Text(REMINDER_BULLET, style=ThemeKey.REMINDER),
-                    Text.assemble(
-                        (f"{operation} ", ThemeKey.REMINDER),
-                        path_texts,
-                        (" mentioned in ", ThemeKey.REMINDER),
-                        render_path(mentioned_in, ThemeKey.REMINDER_BOLD),
-                    ),
-                )
-            else:
-                grid.add_row(
-                    Text(REMINDER_BULLET, style=ThemeKey.REMINDER),
-                    Text.assemble(
-                        (f"{operation} ", ThemeKey.REMINDER),
-                        path_texts,
-                    ),
-                )
-        parts.append(grid)
-
-    if uic := e.item.user_image_count:
-        grid = create_grid()
-        grid.add_row(
-            Text(REMINDER_BULLET, style=ThemeKey.REMINDER),
-            Text(f"Attached {uic} image{'s' if uic > 1 else ''}", style=ThemeKey.REMINDER),
-        )
-        parts.append(grid)
-
-    if sn := e.item.skill_name:
-        grid = create_grid()
-        grid.add_row(
-            Text(REMINDER_BULLET, style=ThemeKey.REMINDER),
-            Text.assemble(
-                ("Activated skill ", ThemeKey.REMINDER),
-                (sn, ThemeKey.REMINDER_BOLD),
-            ),
-        )
-        parts.append(grid)
+    if e.item.ui_extra:
+        for ui_item in e.item.ui_extra.items:
+            match ui_item:
+                case model.MemoryLoadedUIItem() as item:
+                    grid = create_grid()
+                    grid.add_row(
+                        Text(REMINDER_BULLET, style=ThemeKey.REMINDER),
+                        Text.assemble(
+                            ("Load memory ", ThemeKey.REMINDER),
+                            Text(", ", ThemeKey.REMINDER).join(
+                                render_path(mem.path, ThemeKey.REMINDER_BOLD) for mem in item.files
+                            ),
+                        ),
+                    )
+                    parts.append(grid)
+                case model.ExternalFileChangesUIItem() as item:
+                    grid = create_grid()
+                    for file_path in item.paths:
+                        grid.add_row(
+                            Text(REMINDER_BULLET, style=ThemeKey.REMINDER),
+                            Text.assemble(
+                                ("Read ", ThemeKey.REMINDER),
+                                render_path(file_path, ThemeKey.REMINDER_BOLD),
+                                (" after external changes", ThemeKey.REMINDER),
+                            ),
+                        )
+                    parts.append(grid)
+                case model.TodoReminderUIItem() as item:
+                    match item.reason:
+                        case "not_used_recently":
+                            text = "Todo hasn't been updated recently"
+                        case "empty":
+                            text = "Todo list is empty"
+                        case _:
+                            text = "Todo reminder"
+                    grid = create_grid()
+                    grid.add_row(
+                        Text(REMINDER_BULLET, style=ThemeKey.REMINDER),
+                        Text(text, ThemeKey.REMINDER),
+                    )
+                    parts.append(grid)
+                case model.AtFileOpsUIItem() as item:
+                    grid = create_grid()
+                    grouped: dict[tuple[str, str | None], list[str]] = {}
+                    for op in item.ops:
+                        key = (op.operation, op.mentioned_in)
+                        grouped.setdefault(key, []).append(op.path)
+
+                    for (operation, mentioned_in), paths in grouped.items():
+                        path_texts = Text(", ", ThemeKey.REMINDER).join(
+                            render_path(p, ThemeKey.REMINDER_BOLD) for p in paths
+                        )
+                        if mentioned_in:
+                            grid.add_row(
+                                Text(REMINDER_BULLET, style=ThemeKey.REMINDER),
+                                Text.assemble(
+                                    (f"{operation} ", ThemeKey.REMINDER),
+                                    path_texts,
+                                    (" mentioned in ", ThemeKey.REMINDER),
+                                    render_path(mentioned_in, ThemeKey.REMINDER_BOLD),
+                                ),
+                            )
+                        else:
+                            grid.add_row(
+                                Text(REMINDER_BULLET, style=ThemeKey.REMINDER),
+                                Text.assemble(
+                                    (f"{operation} ", ThemeKey.REMINDER),
+                                    path_texts,
+                                ),
+                            )
+                    parts.append(grid)
+                case model.UserImagesUIItem() as item:
+                    grid = create_grid()
+                    count = item.count
+                    grid.add_row(
+                        Text(REMINDER_BULLET, style=ThemeKey.REMINDER),
+                        Text(
+                            f"Attached {count} image{'s' if count > 1 else ''}",
+                            style=ThemeKey.REMINDER,
+                        ),
+                    )
+                    parts.append(grid)
+                case model.SkillActivatedUIItem() as item:
+                    grid = create_grid()
+                    grid.add_row(
+                        Text(REMINDER_BULLET, style=ThemeKey.REMINDER),
+                        Text.assemble(
+                            ("Activated skill ", ThemeKey.REMINDER),
+                            (item.name, ThemeKey.REMINDER_BOLD),
+                        ),
+                    )
+                    parts.append(grid)
+                case model.CommandOutputUIItem():
+                    # Rendered via render_command_output
+                    pass
 
     return Group(*parts) if parts else Text("")
 
 
 def render_command_output(e: events.DeveloperMessageEvent) -> RenderableType:
     """Render developer command output content."""
-    if not e.item.command_output:
+    command_output = get_command_output(e.item)
+    if not command_output:
         return Text("")
 
     content = message.join_text_parts(e.item.parts)
-    match e.item.command_output.command_name:
+    match command_output.command_name:
         case commands.CommandName.HELP:
             return Padding.indent(Text.from_markup(content or ""), level=2)
         case commands.CommandName.STATUS:
-            return _render_status_output(e.item.command_output)
+            return _render_status_output(command_output)
         case commands.CommandName.RELEASE_NOTES:
             return Padding.indent(NoInsetMarkdown(content or ""), level=2)
         case commands.CommandName.FORK_SESSION:
-            return _render_fork_session_output(e.item.command_output)
+            return _render_fork_session_output(command_output)
         case _:
             content = content or "(no content)"
-            style = ThemeKey.TOOL_RESULT if not e.item.command_output.is_error else ThemeKey.ERROR
+            style = ThemeKey.TOOL_RESULT if not command_output.is_error else ThemeKey.ERROR
             return Padding.indent(truncate_middle(content, base_style=style), level=2)
 
 

klaude_code/ui/renderers/metadata.py

@@ -1,15 +1,14 @@
 from importlib.metadata import PackageNotFoundError, version
 
-from rich import box
 from rich.console import Group, RenderableType
 from rich.padding import Padding
-from rich.panel import Panel
 from rich.text import Text
 
 from klaude_code.const import DEFAULT_MAX_TOKENS
 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.quote import Quote
 from klaude_code.ui.rich.theme import ThemeKey
 from klaude_code.ui.utils.common import format_model_params, format_number
 
@@ -199,17 +198,29 @@ def render_task_metadata(e: events.TaskMetadataEvent) -> RenderableType:
 
 
 def render_welcome(e: events.WelcomeEvent) -> RenderableType:
-    """Render the welcome panel with model info and settings."""
+    """Render the welcome panel with model info and settings.
+
+    Args:
+        e: The welcome event.
+    """
     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", klaude_code_style),
-        (f" v{_get_version()}\n", ThemeKey.WELCOME_INFO),
-        (str(e.llm_config.model), ThemeKey.WELCOME_HIGHLIGHT),
-        (" @ ", ThemeKey.WELCOME_INFO),
-        (e.llm_config.provider_name, ThemeKey.WELCOME_INFO),
+    panel_content = Text()
+
+    if e.show_klaude_code_info:
+        # First line: Klaude Code version
+        klaude_code_style = ThemeKey.WELCOME_DEBUG_TITLE if debug_mode else ThemeKey.WELCOME_HIGHLIGHT_BOLD
+        panel_content.append_text(Text("Klaude Code", style=klaude_code_style))
+        panel_content.append_text(Text(f" v{_get_version()}", style=ThemeKey.WELCOME_INFO))
+        panel_content.append_text(Text("\n"))
+
+    # Model line: model @ provider · params...
+    panel_content.append_text(
+        Text.assemble(
+            (str(e.llm_config.model), ThemeKey.WELCOME_HIGHLIGHT),
+            (" @ ", ThemeKey.WELCOME_INFO),
+            (e.llm_config.provider_name, ThemeKey.WELCOME_INFO),
+        )
     )
 
     # Use format_model_params for consistent formatting
@@ -228,7 +239,9 @@ def render_welcome(e: events.WelcomeEvent) -> RenderableType:
         )
 
     border_style = ThemeKey.WELCOME_DEBUG_BORDER if debug_mode else ThemeKey.LINES
-    return Group(
-        Panel.fit(panel_content, border_style=border_style, box=box.ROUNDED),
-        "",  # empty line
-    )
+
+    if e.show_klaude_code_info:
+        groups = ["", Quote(panel_content, style=border_style, prefix="▌ "), ""]
+    else:
+        groups = [Quote(panel_content, style=border_style, prefix="▌ "), ""]
+    return Group(*groups)

klaude_code/ui/renderers/tools.py

@@ -33,7 +33,6 @@ MARK_PLAN = "◈"
 MARK_READ = "→"
 MARK_EDIT = "±"
 MARK_WRITE = "+"
-MARK_MOVE = "±"
 MARK_MERMAID = "⧉"
 MARK_WEB_FETCH = "→"
 MARK_WEB_SEARCH = "✱"
@@ -68,9 +67,7 @@ def _render_tool_call_tree(
     tool_name: str,
     details: RenderableType | None,
 ) -> RenderableType:
-    # Keep the original 2-column layout (tool name on the left, details on the right),
-    # but move the tool mark into the tree prefix so it can connect to the tool result.
-    grid = create_grid()
+    grid = create_grid(overflow="ellipsis")
     grid.add_row(
         Text(tool_name, style=ThemeKey.TOOL_NAME),
         details if details is not None else Text(""),
@@ -138,15 +135,14 @@ def render_bash_tool_call(arguments: str) -> RenderableType:
     command = payload.get("command")
     timeout_ms = payload.get("timeout_ms")
 
-    # Build the command display with optional timeout suffix
     if isinstance(command, str) and command.strip():
         cmd_str = command.strip()
-        line_count = len(cmd_str.splitlines())
-
         highlighted = highlight_bash_command(cmd_str)
+        highlighted.stylize(ThemeKey.CODE_BACKGROUND)
+
+        display_line_count = len(highlighted.plain.splitlines())
 
-        # For commands > threshold lines, use CodePanel for better display
-        if line_count > BASH_OUTPUT_PANEL_THRESHOLD:
+        if display_line_count > BASH_OUTPUT_PANEL_THRESHOLD:
             code_panel = CodePanel(highlighted, border_style=ThemeKey.LINES)
             if isinstance(timeout_ms, int):
                 if timeout_ms >= 1000 and timeout_ms % 1000 == 0:
@@ -281,36 +277,6 @@ def render_write_tool_call(arguments: str) -> RenderableType:
     return _render_tool_call_tree(mark=MARK_WRITE, tool_name=tool_name, details=details)
 
 
-def render_move_tool_call(arguments: str) -> RenderableType:
-    tool_name = "Move"
-
-    try:
-        payload = json.loads(arguments)
-    except json.JSONDecodeError:
-        details = Text(
-            arguments.strip()[:INVALID_TOOL_CALL_MAX_LENGTH],
-            style=ThemeKey.INVALID_TOOL_CALL_ARGS,
-        )
-        return _render_tool_call_tree(mark=MARK_MOVE, tool_name=tool_name, details=details)
-
-    source_path = payload.get("source_file_path", "")
-    target_path = payload.get("target_file_path", "")
-    start_line = payload.get("start_line", "")
-    end_line = payload.get("end_line", "")
-
-    # Build display: source:start-end -> target
-    parts = Text()
-    if source_path:
-        parts.append_text(render_path(source_path, ThemeKey.TOOL_PARAM_FILE_PATH))
-        if start_line and end_line:
-            parts.append(f":{start_line}-{end_line}", style=ThemeKey.TOOL_PARAM)
-    parts.append(" -> ", style=ThemeKey.TOOL_PARAM)
-    if target_path:
-        parts.append_text(render_path(target_path, ThemeKey.TOOL_PARAM_FILE_PATH))
-
-    return _render_tool_call_tree(mark=MARK_MOVE, tool_name=tool_name, details=parts)
-
-
 def render_apply_patch_tool_call(arguments: str) -> RenderableType:
     tool_name = "Apply Patch"
 
@@ -386,15 +352,17 @@ def render_todo(tr: events.ToolResultEvent) -> RenderableType:
 def render_generic_tool_result(result: str, *, is_error: bool = False) -> RenderableType:
     """Render a generic tool result as truncated text."""
     style = ThemeKey.ERROR if is_error else ThemeKey.TOOL_RESULT
-    return truncate_middle(result, base_style=style)
+    text = truncate_middle(result, base_style=style)
+    # Tool results should not reflow/wrap; use ellipsis when exceeding terminal width.
+    text.no_wrap = True
+    text.overflow = "ellipsis"
+    return text
 
 
 def _extract_mermaid_link(
     ui_extra: model.ToolResultUIExtra | None,
 ) -> model.MermaidLinkUIExtra | None:
-    if isinstance(ui_extra, model.MermaidLinkUIExtra):
-        return ui_extra
-    return None
+    return ui_extra if isinstance(ui_extra, model.MermaidLinkUIExtra) else None
 
 
 def render_mermaid_tool_call(arguments: str) -> RenderableType:
@@ -443,7 +411,7 @@ def _render_mermaid_viewer_link(
 ) -> RenderableType:
     viewer_path = r_mermaid_viewer.build_viewer(code=link_info.code, link=link_info.link, tool_call_id=tr.tool_call_id)
     if viewer_path is None:
-        return Text(link_info.link, style=ThemeKey.TOOL_RESULT_MERMAID, overflow="fold")
+        return Text(link_info.link, style=ThemeKey.TOOL_RESULT_MERMAID, overflow="ellipsis", no_wrap=True)
 
     display_path = str(viewer_path)
 
@@ -534,9 +502,7 @@ def render_mermaid_tool_result(
 def _extract_truncation(
     ui_extra: model.ToolResultUIExtra | None,
 ) -> model.TruncationUIExtra | None:
-    if isinstance(ui_extra, model.TruncationUIExtra):
-        return ui_extra
-    return None
+    return ui_extra if isinstance(ui_extra, model.TruncationUIExtra) else None
 
 
 def render_truncation_info(ui_extra: model.TruncationUIExtra) -> RenderableType:
@@ -548,6 +514,8 @@ def render_truncation_info(ui_extra: model.TruncationUIExtra) -> RenderableType:
         (ui_extra.saved_file_path, ThemeKey.TOOL_RESULT_TRUNCATED),
         (f", {truncated_kb:.1f}KB truncated", ThemeKey.TOOL_RESULT_TRUNCATED),
     )
+    text.no_wrap = True
+    text.overflow = "ellipsis"
     return text
 
 
@@ -564,7 +532,6 @@ def render_report_back_tool_call() -> RenderableType:
 _TOOL_ACTIVE_FORM: dict[str, str] = {
     tools.BASH: "Bashing",
     tools.APPLY_PATCH: "Patching",
-    tools.MOVE: "Moving",
     tools.EDIT: "Editing",
     tools.READ: "Reading",
     tools.WRITE: "Writing",
@@ -612,8 +579,6 @@ def render_tool_call(e: events.ToolCallEvent) -> RenderableType | None:
             return render_edit_tool_call(e.arguments)
         case tools.WRITE:
             return render_write_tool_call(e.arguments)
-        case tools.MOVE:
-            return render_move_tool_call(e.arguments)
         case tools.BASH:
             return render_bash_tool_call(e.arguments)
         case tools.APPLY_PATCH:
@@ -685,7 +650,7 @@ def render_tool_result(
 
     # Handle error case
     if e.status == "error" and e.ui_extra is None:
-        return wrap(truncate_middle(e.result, base_style=ThemeKey.ERROR))
+        return wrap(render_generic_tool_result(e.result, is_error=True))
 
     # Render multiple ui blocks if present
     if isinstance(e.ui_extra, model.MultiUIExtra) and e.ui_extra.items:
@@ -694,7 +659,7 @@ def render_tool_result(
             if isinstance(item, model.MarkdownDocUIExtra):
                 rendered.append(render_markdown_doc(item, code_theme=code_theme))
             elif isinstance(item, model.DiffUIExtra):
-                show_file_name = e.tool_name in (tools.APPLY_PATCH, tools.MOVE)
+                show_file_name = e.tool_name == tools.APPLY_PATCH
                 rendered.append(r_diffs.render_structured_diff(item, show_file_name=show_file_name))
         return wrap(Group(*rendered)) if rendered else None
 
@@ -721,11 +686,6 @@ def render_tool_result(
             if md_ui:
                 return wrap(render_markdown_doc(md_ui, code_theme=code_theme))
             return wrap(r_diffs.render_structured_diff(diff_ui) if diff_ui else Text(""))
-        case tools.MOVE:
-            # Same-file move returns single DiffUIExtra, cross-file returns MultiUIExtra (handled above)
-            if diff_ui:
-                return wrap(r_diffs.render_structured_diff(diff_ui, show_file_name=True))
-            return None
         case tools.APPLY_PATCH:
             if md_ui:
                 return wrap(render_markdown_doc(md_ui, code_theme=code_theme))
@@ -737,8 +697,6 @@ def render_tool_result(
         case tools.MERMAID:
             return wrap(render_mermaid_tool_result(e, session_id=session_id))
         case tools.BASH:
-            if e.result.startswith("diff --git"):
-                return wrap(r_diffs.render_diff_panel(e.result, show_file_name=True))
             return _render_fallback()
         case _:
             return _render_fallback()