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

klaude_code/{command → tui/command}/release_notes_cmd.py

@@ -1,8 +1,9 @@
 from pathlib import Path
 
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.protocol import commands, events, message, model
 
+from .command_abc import Agent, CommandABC, CommandResult
+
 
 def _read_changelog() -> str:
     """Read CHANGELOG.md from project root."""

klaude_code/{command → tui/command}/resume_cmd.py

@@ -2,11 +2,12 @@ import asyncio
 
 from prompt_toolkit.styles import Style
 
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
+from klaude_code.log import log
 from klaude_code.protocol import commands, events, message, model, op
 from klaude_code.session.selector import build_session_select_options, format_user_messages_display
-from klaude_code.trace import log
-from klaude_code.ui.terminal.selector import SelectItem, select_one
+from klaude_code.tui.terminal.selector import SelectItem, select_one
+
+from .command_abc import Agent, CommandABC, CommandResult
 
 SESSION_SELECT_STYLE = Style(
     [

klaude_code/{command → tui/command}/status_cmd.py

@@ -1,7 +1,8 @@
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.protocol import commands, events, message, model
 from klaude_code.session.session import Session
 
+from .command_abc import Agent, CommandABC, CommandResult
+
 
 class AggregatedUsage(model.BaseModel):
     """Aggregated usage statistics including per-model breakdown."""

klaude_code/{command → tui/command}/terminal_setup_cmd.py

@@ -2,9 +2,10 @@ import os
 import subprocess
 from pathlib import Path
 
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.protocol import commands, events, message, model
 
+from .command_abc import Agent, CommandABC, CommandResult
+
 
 class TerminalSetupCommand(CommandABC):
     """Setup shift+enter newline functionality in terminal"""

klaude_code/{command → tui/command}/thinking_cmd.py

@@ -2,10 +2,11 @@ import asyncio
 
 from prompt_toolkit.styles import Style
 
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.config.thinking import get_thinking_picker_data, parse_thinking_value
 from klaude_code.protocol import commands, events, llm_param, message, model, op
-from klaude_code.ui.terminal.selector import SelectItem, select_one
+from klaude_code.tui.terminal.selector import SelectItem, select_one
+
+from .command_abc import Agent, CommandABC, CommandResult
 
 SELECT_STYLE = Style(
     [

klaude_code/tui/commands.py

@@ -0,0 +1,164 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from rich.console import RenderableType
+from rich.text import Text
+
+from klaude_code.protocol import events
+
+
+@dataclass(frozen=True, slots=True)
+class RenderCommand:
+    pass
+
+
+@dataclass(frozen=True, slots=True)
+class RenderReplayHistory(RenderCommand):
+    event: events.ReplayHistoryEvent
+
+
+@dataclass(frozen=True, slots=True)
+class RenderWelcome(RenderCommand):
+    event: events.WelcomeEvent
+
+
+@dataclass(frozen=True, slots=True)
+class RenderUserMessage(RenderCommand):
+    event: events.UserMessageEvent
+
+
+@dataclass(frozen=True, slots=True)
+class RenderTaskStart(RenderCommand):
+    event: events.TaskStartEvent
+
+
+@dataclass(frozen=True, slots=True)
+class RenderDeveloperMessage(RenderCommand):
+    event: events.DeveloperMessageEvent
+
+
+@dataclass(frozen=True, slots=True)
+class RenderTurnStart(RenderCommand):
+    event: events.TurnStartEvent
+
+
+@dataclass(frozen=True, slots=True)
+class RenderAssistantImage(RenderCommand):
+    session_id: str
+    file_path: str
+
+
+@dataclass(frozen=True, slots=True)
+class RenderToolCall(RenderCommand):
+    event: events.ToolCallEvent
+
+
+@dataclass(frozen=True, slots=True)
+class RenderToolResult(RenderCommand):
+    event: events.ToolResultEvent
+    is_sub_agent_session: bool
+
+
+@dataclass(frozen=True, slots=True)
+class RenderTaskMetadata(RenderCommand):
+    event: events.TaskMetadataEvent
+
+
+@dataclass(frozen=True, slots=True)
+class RenderTaskFinish(RenderCommand):
+    event: events.TaskFinishEvent
+
+
+@dataclass(frozen=True, slots=True)
+class RenderInterrupt(RenderCommand):
+    session_id: str
+
+
+@dataclass(frozen=True, slots=True)
+class RenderError(RenderCommand):
+    event: events.ErrorEvent
+
+
+@dataclass(frozen=True, slots=True)
+class StartThinkingStream(RenderCommand):
+    session_id: str
+
+
+@dataclass(frozen=True, slots=True)
+class AppendThinking(RenderCommand):
+    session_id: str
+    content: str
+
+
+@dataclass(frozen=True, slots=True)
+class EndThinkingStream(RenderCommand):
+    session_id: str
+
+
+@dataclass(frozen=True, slots=True)
+class StartAssistantStream(RenderCommand):
+    session_id: str
+
+
+@dataclass(frozen=True, slots=True)
+class AppendAssistant(RenderCommand):
+    session_id: str
+    content: str
+
+
+@dataclass(frozen=True, slots=True)
+class EndAssistantStream(RenderCommand):
+    session_id: str
+
+
+@dataclass(frozen=True, slots=True)
+class RenderThinkingHeader(RenderCommand):
+    session_id: str
+    header: str
+
+
+@dataclass(frozen=True, slots=True)
+class SpinnerStart(RenderCommand):
+    pass
+
+
+@dataclass(frozen=True, slots=True)
+class SpinnerStop(RenderCommand):
+    pass
+
+
+@dataclass(frozen=True, slots=True)
+class SpinnerUpdate(RenderCommand):
+    status_text: str | Text
+    right_text: RenderableType | None
+
+
+@dataclass(frozen=True, slots=True)
+class PrintBlankLine(RenderCommand):
+    pass
+
+
+@dataclass(frozen=True, slots=True)
+class PrintRuleLine(RenderCommand):
+    pass
+
+
+@dataclass(frozen=True, slots=True)
+class EmitOsc94Error(RenderCommand):
+    pass
+
+
+@dataclass(frozen=True, slots=True)
+class EmitTmuxSignal(RenderCommand):
+    pass
+
+
+@dataclass(frozen=True, slots=True)
+class TaskClockStart(RenderCommand):
+    pass
+
+
+@dataclass(frozen=True, slots=True)
+class TaskClockClear(RenderCommand):
+    pass

klaude_code/{ui/renderers → tui/components}/assistant.py

@@ -3,9 +3,9 @@ from rich.padding import Padding
 from rich.text import Text
 
 from klaude_code.const import MARKDOWN_RIGHT_MARGIN
-from klaude_code.ui.renderers.common import create_grid
-from klaude_code.ui.rich.markdown import NoInsetMarkdown
-from klaude_code.ui.rich.theme import ThemeKey
+from klaude_code.tui.components.common import create_grid
+from klaude_code.tui.components.rich.markdown import NoInsetMarkdown
+from klaude_code.tui.components.rich.theme import ThemeKey
 
 # UI markers
 ASSISTANT_MESSAGE_MARK = "•"

klaude_code/{ui/renderers → tui/components}/bash_syntax.py

@@ -8,8 +8,8 @@ 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
+from klaude_code.tui.components.common import truncate_head
+from klaude_code.tui.components.rich.theme import ThemeKey
 
 # Token types for bash syntax highlighting
 _STRING_TOKENS = frozenset(

klaude_code/{ui/renderers → tui/components}/common.py

@@ -11,7 +11,7 @@ from klaude_code.const import (
     TRUNCATE_DISPLAY_MAX_LINES,
     TRUNCATE_HEAD_MAX_LINES,
 )
-from klaude_code.ui.rich.theme import ThemeKey
+from klaude_code.tui.components.rich.theme import ThemeKey
 
 
 def create_grid(*, overflow: Literal["fold", "crop", "ellipsis", "ignore"] = "fold") -> Table:

klaude_code/{ui/renderers → tui/components}/developer.py

@@ -4,10 +4,10 @@ from rich.table import Table
 from rich.text import Text
 
 from klaude_code.protocol import commands, events, message, model
-from klaude_code.ui.renderers.common import create_grid, truncate_middle
-from klaude_code.ui.renderers.tools import render_path
-from klaude_code.ui.rich.markdown import NoInsetMarkdown
-from klaude_code.ui.rich.theme import ThemeKey
+from klaude_code.tui.components.common import create_grid, truncate_middle
+from klaude_code.tui.components.rich.markdown import NoInsetMarkdown
+from klaude_code.tui.components.rich.theme import ThemeKey
+from klaude_code.tui.components.tools import render_path
 
 REMINDER_BULLET = "  ⧉"
 

klaude_code/{ui/renderers → tui/components}/diffs.py

@@ -6,8 +6,8 @@ from rich.text import Text
 
 from klaude_code.const import DIFF_PREFIX_WIDTH, MAX_DIFF_LINES
 from klaude_code.protocol import model
-from klaude_code.ui.renderers.common import create_grid
-from klaude_code.ui.rich.theme import ThemeKey
+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]:

klaude_code/{ui/renderers → tui/components}/errors.py

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

klaude_code/{ui/renderers → tui/components}/metadata.py

@@ -5,12 +5,12 @@ from rich.padding import Padding
 from rich.text import Text
 
 from klaude_code.const import DEFAULT_MAX_TOKENS
+from klaude_code.log import is_debug_enabled
 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
+from klaude_code.tui.components.common import create_grid
+from klaude_code.tui.components.rich.quote import Quote
+from klaude_code.tui.components.rich.theme import ThemeKey
+from klaude_code.ui.common import format_model_params, format_number
 
 
 def _get_version() -> str:
@@ -99,7 +99,7 @@ def _render_task_metadata_block(
             )
         )
     if metadata.usage is not None:
-        # Context (only for main agent)
+        # Context usage
         if show_context_and_time and metadata.usage.context_usage_percent is not None:
             context_size = format_number(metadata.usage.context_size or 0)
             # Calculate effective limit (same as Usage.context_usage_percent)
@@ -169,7 +169,7 @@ def render_task_metadata(e: events.TaskMetadataEvent) -> RenderableType:
 
     # 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=False))
+        renderables.append(_render_task_metadata_block(meta, is_sub_agent=True, show_context_and_time=True))
 
     # Add total cost line when there are sub-agents
     if e.metadata.sub_agent_task_metadata:

klaude_code/{ui → tui/components}/rich/markdown.py

@@ -24,7 +24,7 @@ from klaude_code.const import (
     MARKDOWN_STREAM_SYNCHRONIZED_OUTPUT_ENABLED,
     UI_REFRESH_RATE_FPS,
 )
-from klaude_code.ui.rich.code_panel import CodePanel
+from klaude_code.tui.components.rich.code_panel import CodePanel
 
 
 class NoInsetCodeBlock(CodeBlock):
@@ -61,7 +61,13 @@ class Divider(MarkdownElement):
 
 class MarkdownTable(TableElement):
     def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
-        table = Table(box=box.MARKDOWN, border_style=console.get_style("markdown.table.border"))
+        # rich.box.MARKDOWN intentionally includes a blank top/bottom edge row. Rather than
+        # post-processing rendered segments, disable outer edges to avoid emitting those rows.
+        table = Table(
+            box=box.MARKDOWN,
+            show_edge=False,
+            border_style=console.get_style("markdown.table.border"),
+        )
 
         if self.header is not None and self.header.row is not None:
             for column in self.header.row.cells:
@@ -72,27 +78,7 @@ class MarkdownTable(TableElement):
                 row_content = [element.content for element in row.cells]
                 table.add_row(*row_content)
 
-        # Render table and strip top/bottom blank lines that MARKDOWN box adds
-        segments = list(console.render(table, options))
-
-        # Skip leading blank line (before first newline)
-        first_newline_idx = next((i for i, s in enumerate(segments) if s.text == "\n"), None)
-        if first_newline_idx is not None:
-            first_line = "".join(s.text for s in segments[:first_newline_idx])
-            if not first_line.strip():
-                segments = segments[first_newline_idx + 1 :]
-
-        # Skip trailing blank line (after last newline)
-        while len(segments) >= 2 and segments[-1].text == "\n":
-            prev_newline = next((i for i in range(len(segments) - 2, -1, -1) if segments[i].text == "\n"), None)
-            if prev_newline is not None:
-                between = "".join(s.text for s in segments[prev_newline + 1 : -1])
-                if not between.strip():
-                    segments = segments[: prev_newline + 1]
-                    continue
-            break
-
-        yield from segments
+        yield table
 
 
 class LeftHeading(Heading):

klaude_code/{ui → tui/components}/rich/status.py

@@ -23,8 +23,8 @@ from klaude_code.const import (
     STATUS_SHIMMER_BAND_HALF_WIDTH,
     STATUS_SHIMMER_PADDING,
 )
-from klaude_code.ui.rich.theme import ThemeKey
-from klaude_code.ui.terminal.color import get_last_terminal_background_rgb
+from klaude_code.tui.components.rich.theme import ThemeKey
+from klaude_code.tui.terminal.color import get_last_terminal_background_rgb
 
 # Use an existing Rich spinner name; BreathingSpinner overrides its rendering
 BREATHING_SPINNER_NAME = "dots"

klaude_code/{ui → tui/components}/rich/theme.py

@@ -138,6 +138,7 @@ class ThemeKey(str, Enum):
     STATUS_TEXT = "spinner.status.text"
     STATUS_TEXT_BOLD = "spinner.status.text.bold"
     STATUS_TEXT_BOLD_ITALIC = "spinner.status.text.bold_italic"
+    STATUS_TOAST = "spinner.status.toast"
     # STATUS
     STATUS_HINT = "status.hint"
     # USER_INPUT
@@ -262,6 +263,7 @@ def get_theme(theme: str | None = None) -> Themes:
                 ThemeKey.STATUS_TEXT.value: palette.blue,
                 ThemeKey.STATUS_TEXT_BOLD.value: "bold " + palette.blue,
                 ThemeKey.STATUS_TEXT_BOLD_ITALIC.value: "bold italic " + palette.blue,
+                ThemeKey.STATUS_TOAST.value: "bold " + palette.yellow,
                 ThemeKey.STATUS_HINT.value: palette.grey2,
                 # REMINDER
                 ThemeKey.REMINDER.value: palette.grey1,
@@ -275,7 +277,7 @@ def get_theme(theme: str | None = None) -> Themes:
                 ThemeKey.TOOL_RESULT.value: palette.grey_green,
                 ThemeKey.TOOL_RESULT_TREE_PREFIX.value: palette.grey3 + " dim",
                 ThemeKey.TOOL_RESULT_BOLD.value: "bold " + palette.grey_green,
-                ThemeKey.TOOL_RESULT_TRUNCATED.value: palette.grey1,
+                ThemeKey.TOOL_RESULT_TRUNCATED.value: palette.grey1 + " dim",
                 ThemeKey.TOOL_MARK.value: "bold",
                 ThemeKey.TOOL_APPROVED.value: palette.green + " bold reverse",
                 ThemeKey.TOOL_REJECTED.value: palette.red + " bold reverse",

klaude_code/{ui/renderers → tui/components}/sub_agent.py

@@ -1,19 +1,16 @@
 import json
 from typing import Any, cast
 
-from rich import box
 from rich.console import Group, RenderableType
 from rich.json import JSON
-from rich.panel import Panel
-from rich.style import Style
+from rich.style import Style, StyleType
 from rich.text import Text
 
 from klaude_code.const import SUB_AGENT_RESULT_MAX_LINES
 from klaude_code.protocol import events, model
 from klaude_code.protocol.sub_agent import get_sub_agent_profile_by_tool
-from klaude_code.ui.renderers.common import truncate_head
-from klaude_code.ui.rich.markdown import NoInsetMarkdown
-from klaude_code.ui.rich.theme import ThemeKey
+from klaude_code.tui.components.common import truncate_head
+from klaude_code.tui.components.rich.theme import ThemeKey
 
 
 def _compact_schema_value(value: dict[str, Any]) -> str | list[Any] | dict[str, Any]:
@@ -83,13 +80,11 @@ def render_sub_agent_result(
     result: str,
     *,
     code_theme: str,
-    style: Style | None = None,
+    style: StyleType | None = None,
     has_structured_output: bool = False,
     description: str | None = None,
-    panel_style: Style | None = None,
 ) -> RenderableType:
     stripped_result = result.strip()
-    result_panel_style = panel_style or ThemeKey.SUB_AGENT_RESULT_PANEL
 
     # Extract agentId footer for separate styling
     main_content, agent_id_footer = _extract_agent_id_footer(stripped_result)
@@ -106,15 +101,10 @@ def render_sub_agent_result(
                 JSON(stripped_result),
             ]
             if description:
-                group_elements.insert(0, NoInsetMarkdown(f"# {description}", code_theme=code_theme, style=style or ""))
+                group_elements.insert(0, Text(f"\n{description}", style=style or ""))
             if agent_id_footer:
                 group_elements.append(Text(agent_id_footer, style=ThemeKey.SUB_AGENT_FOOTER))
-            return Panel.fit(
-                Group(*group_elements),
-                box=box.SIMPLE,
-                border_style=ThemeKey.LINES,
-                style=result_panel_style,
-            )
+            return Group(*group_elements)
         except json.JSONDecodeError:
             # Fall back to markdown if not valid JSON
             pass
@@ -122,42 +112,32 @@ def render_sub_agent_result(
     if not stripped_result:
         return Text()
 
-    # Add markdown heading if description is provided for non-structured output
-    if description:
-        stripped_result = f"# {description}\n\n{stripped_result}"
-
     lines = stripped_result.splitlines()
     if len(lines) > SUB_AGENT_RESULT_MAX_LINES:
         hidden_count = len(lines) - SUB_AGENT_RESULT_MAX_LINES
-        head_count = SUB_AGENT_RESULT_MAX_LINES // 2
-        tail_count = SUB_AGENT_RESULT_MAX_LINES - head_count
-        head_text = "\n".join(lines[:head_count])
-        tail_text = "\n".join(lines[-tail_count:])
-        truncated_elements: list[RenderableType] = [
-            NoInsetMarkdown(head_text, code_theme=code_theme, style=style or ""),
+        tail_text = "\n".join(lines[-SUB_AGENT_RESULT_MAX_LINES:])
+        truncated_elements: list[RenderableType] = []
+        # Add description heading separately so it won't be truncated
+        if description:
+            truncated_elements.append(Text(f"---\n{description}", style=style or ""))
+        truncated_elements.append(
             Text(
-                f"( … more {hidden_count} lines — use /export to view full output )",
+                f"( … more {hidden_count} lines)",
                 style=ThemeKey.TOOL_RESULT_TRUNCATED,
-            ),
-            NoInsetMarkdown(tail_text, code_theme=code_theme, style=style or ""),
-        ]
+            )
+        )
+        truncated_elements.append(Text(tail_text, style=style or ""))
         if agent_id_footer:
             truncated_elements.append(Text(agent_id_footer, style=ThemeKey.SUB_AGENT_FOOTER))
-        return Panel.fit(
-            Group(*truncated_elements),
-            box=box.SIMPLE,
-            border_style=ThemeKey.LINES,
-            style=result_panel_style,
-        )
-    normal_elements: list[RenderableType] = [NoInsetMarkdown(stripped_result, code_theme=code_theme)]
+        return Group(*truncated_elements)
+
+    # No truncation needed - add description heading if provided
+    if description:
+        stripped_result = f"\n# {description}\n\n{stripped_result}"
+    normal_elements: list[RenderableType] = [Text(stripped_result)]
     if agent_id_footer:
         normal_elements.append(Text(agent_id_footer, style=ThemeKey.SUB_AGENT_FOOTER))
-    return Panel.fit(
-        Group(*normal_elements),
-        box=box.SIMPLE,
-        border_style=ThemeKey.LINES,
-        style=result_panel_style,
-    )
+    return Group(*normal_elements)
 
 
 def build_sub_agent_state_from_tool_call(e: events.ToolCallEvent) -> model.SubAgentState | None:

klaude_code/{ui/renderers → tui/components}/thinking.py

@@ -5,9 +5,9 @@ from rich.padding import Padding
 from rich.text import Text
 
 from klaude_code.const import MARKDOWN_RIGHT_MARGIN
-from klaude_code.ui.renderers.common import create_grid
-from klaude_code.ui.rich.markdown import ThinkingMarkdown
-from klaude_code.ui.rich.theme import ThemeKey
+from klaude_code.tui.components.common import create_grid
+from klaude_code.tui.components.rich.markdown import ThinkingMarkdown
+from klaude_code.tui.components.rich.theme import ThemeKey
 
 # UI markers
 THINKING_MESSAGE_MARK = "∴"

klaude_code/{ui/renderers → tui/components}/tools.py

@@ -17,14 +17,14 @@ from klaude_code.const import (
 )
 from klaude_code.protocol import events, model, tools
 from klaude_code.protocol.sub_agent import is_sub_agent_tool as _is_sub_agent_tool
-from klaude_code.ui.renderers import diffs as r_diffs
-from klaude_code.ui.renderers import mermaid_viewer as r_mermaid_viewer
-from klaude_code.ui.renderers.bash_syntax import highlight_bash_command
-from klaude_code.ui.renderers.common import create_grid, truncate_middle
-from klaude_code.ui.rich.code_panel import CodePanel
-from klaude_code.ui.rich.markdown import NoInsetMarkdown
-from klaude_code.ui.rich.quote import TreeQuote
-from klaude_code.ui.rich.theme import ThemeKey
+from klaude_code.tui.components import diffs as r_diffs
+from klaude_code.tui.components import mermaid_viewer as r_mermaid_viewer
+from klaude_code.tui.components.bash_syntax import highlight_bash_command
+from klaude_code.tui.components.common import create_grid, truncate_middle
+from klaude_code.tui.components.rich.code_panel import CodePanel
+from klaude_code.tui.components.rich.markdown import NoInsetMarkdown
+from klaude_code.tui.components.rich.quote import TreeQuote
+from klaude_code.tui.components.rich.theme import ThemeKey
 
 # Tool markers (Unicode symbols for UI display)
 MARK_GENERIC = "⚒"
@@ -37,7 +37,6 @@ MARK_MERMAID = "⧉"
 MARK_WEB_FETCH = "→"
 MARK_WEB_SEARCH = "✱"
 MARK_DONE = "✔"
-MARK_SKILL = "✪"
 
 # Todo status markers
 MARK_TODO_PENDING = "▢"
@@ -487,11 +486,11 @@ def render_mermaid_tool_result(
     *,
     session_id: str | None = None,
 ) -> RenderableType:
-    from klaude_code.ui.terminal import supports_osc8_hyperlinks
+    from klaude_code.tui.terminal import supports_osc8_hyperlinks
 
     link_info = _extract_mermaid_link(tr.ui_extra)
     if link_info is None:
-        return render_generic_tool_result(tr.result, is_error=tr.status == "error")
+        return render_generic_tool_result(tr.result, is_error=tr.is_error)
 
     use_osc8 = supports_osc8_hyperlinks()
     viewer = _render_mermaid_viewer_link(tr, link_info, use_osc8=use_osc8)
@@ -537,7 +536,6 @@ _TOOL_ACTIVE_FORM: dict[str, str] = {
     tools.WRITE: "Writing",
     tools.TODO_WRITE: "Planning",
     tools.UPDATE_PLAN: "Planning",
-    tools.SKILL: "Skilling",
     tools.MERMAID: "Diagramming",
     tools.WEB_FETCH: "Fetching Web",
     tools.WEB_SEARCH: "Searching Web",
@@ -589,8 +587,6 @@ def render_tool_call(e: events.ToolCallEvent) -> RenderableType | None:
             return render_update_plan_tool_call(e.arguments)
         case tools.MERMAID:
             return render_mermaid_tool_call(e.arguments)
-        case tools.SKILL:
-            return render_generic_tool_call(e.tool_name, e.arguments, MARK_SKILL)
         case tools.REPORT_BACK:
             return render_report_back_tool_call()
         case tools.WEB_FETCH:
@@ -649,7 +645,7 @@ def render_tool_result(
         return TreeQuote.for_tool_result(content, is_last=e.is_last_in_turn)
 
     # Handle error case
-    if e.status == "error" and e.ui_extra is None:
+    if e.is_error and e.ui_extra is None:
         return wrap(render_generic_tool_result(e.result, is_error=True))
 
     # Render multiple ui blocks if present
@@ -666,7 +662,7 @@ def render_tool_result(
     # Show truncation info if output was truncated and saved to file
     truncation_info = get_truncation_info(e)
     if truncation_info:
-        result = render_generic_tool_result(e.result, is_error=e.status == "error")
+        result = render_generic_tool_result(e.result, is_error=e.is_error)
         return wrap(Group(render_truncation_info(truncation_info), result))
 
     diff_ui = _extract_diff(e.ui_extra)
@@ -675,7 +671,7 @@ def render_tool_result(
     def _render_fallback() -> TreeQuote:
         if len(e.result.strip()) == 0:
             return wrap(render_generic_tool_result("(no content)"))
-        return wrap(render_generic_tool_result(e.result, is_error=e.status == "error"))
+        return wrap(render_generic_tool_result(e.result, is_error=e.is_error))
 
     match e.tool_name:
         case tools.READ: