klaude-code 2.0.1__py3-none-any.whl → 2.1.0__py3-none-any.whl

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 = "⚒"
@@ -33,7 +33,6 @@ MARK_PLAN = "◈"
 MARK_READ = "→"
 MARK_EDIT = "±"
 MARK_WRITE = "+"
-MARK_MOVE = "±"
 MARK_MERMAID = "⧉"
 MARK_WEB_FETCH = "→"
 MARK_WEB_SEARCH = "✱"
@@ -139,6 +138,7 @@ def render_bash_tool_call(arguments: str) -> RenderableType:
     if isinstance(command, str) and command.strip():
         cmd_str = command.strip()
         highlighted = highlight_bash_command(cmd_str)
+        highlighted.stylize(ThemeKey.CODE_BACKGROUND)
 
         display_line_count = len(highlighted.plain.splitlines())
 
@@ -277,35 +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", "")
-
-    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"
 
@@ -516,7 +487,7 @@ 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:
@@ -561,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",
@@ -609,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:
@@ -691,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
 
@@ -718,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))

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

@@ -1,29 +1,12 @@
 import re
-from collections.abc import Callable
 
 from rich.console import Group, RenderableType
 from rich.text import Text
 
 from klaude_code.skill import get_available_skills
-from klaude_code.ui.renderers.common import create_grid
-from klaude_code.ui.rich.theme import ThemeKey
-
-# Module-level command name checker. Set by cli/runtime.py on startup.
-_command_name_checker: Callable[[str], bool] | None = None
-
-
-def set_command_name_checker(checker: Callable[[str], bool]) -> None:
-    """Set the command name validation function (called from runtime layer)."""
-    global _command_name_checker
-    _command_name_checker = checker
-
-
-def is_slash_command_name(name: str) -> bool:
-    """Check if name is a valid slash command using the injected checker."""
-    if _command_name_checker is None:
-        return False
-    return _command_name_checker(name)
-
+from klaude_code.tui.command import is_slash_command_name
+from klaude_code.tui.components.common import create_grid
+from klaude_code.tui.components.rich.theme import ThemeKey
 
 # Match @-file patterns only when they appear at the beginning of the line
 # or immediately after whitespace, to avoid treating mid-word email-like

klaude_code/tui/display.py

@@ -0,0 +1,85 @@
+from __future__ import annotations
+
+import asyncio
+import contextlib
+from collections.abc import Coroutine
+from typing import Any, override
+
+from klaude_code.protocol import events
+from klaude_code.tui.machine import DisplayStateMachine
+from klaude_code.tui.renderer import TUICommandRenderer
+from klaude_code.tui.terminal.notifier import TerminalNotifier
+from klaude_code.ui.core.display import DisplayABC
+
+
+class TUIDisplay(DisplayABC):
+    """Interactive terminal display using Rich for rendering."""
+
+    def __init__(self, theme: str | None = None, notifier: TerminalNotifier | None = None):
+        self._notifier = notifier or TerminalNotifier()
+        self._machine = DisplayStateMachine()
+        self._renderer = TUICommandRenderer(theme=theme, notifier=self._notifier)
+
+        self._sigint_toast_clear_handle: asyncio.Handle | None = None
+        self._bg_tasks: set[asyncio.Task[None]] = set()
+
+    def _create_bg_task(self, coro: Coroutine[Any, Any, None]) -> None:
+        task = asyncio.create_task(coro)
+        self._bg_tasks.add(task)
+        task.add_done_callback(self._bg_tasks.discard)
+
+    @override
+    async def consume_event(self, event: events.Event) -> None:
+        commands = self._machine.transition(event)
+        await self._renderer.execute(commands)
+
+    @override
+    async def start(self) -> None:
+        pass
+
+    @override
+    async def stop(self) -> None:
+        if self._sigint_toast_clear_handle is not None:
+            with contextlib.suppress(Exception):
+                self._sigint_toast_clear_handle.cancel()
+            self._sigint_toast_clear_handle = None
+
+        for task in list(self._bg_tasks):
+            with contextlib.suppress(Exception):
+                task.cancel()
+        self._bg_tasks.clear()
+
+        await self._renderer.stop()
+
+        with contextlib.suppress(Exception):
+            self._renderer.stop_bottom_live()
+
+    def show_sigint_exit_toast(self, *, window_seconds: float = 2.0) -> None:
+        """Show a transient Ctrl+C hint in the TUI status line."""
+
+        async def _apply_show() -> None:
+            await self._renderer.execute(self._machine.show_sigint_exit_toast())
+
+        async def _apply_clear() -> None:
+            await self._renderer.execute(self._machine.clear_sigint_exit_toast())
+
+        loop = asyncio.get_running_loop()
+        self._create_bg_task(_apply_show())
+
+        if self._sigint_toast_clear_handle is not None:
+            with contextlib.suppress(Exception):
+                self._sigint_toast_clear_handle.cancel()
+            self._sigint_toast_clear_handle = None
+
+        def _schedule_clear() -> None:
+            self._create_bg_task(_apply_clear())
+
+        self._sigint_toast_clear_handle = loop.call_later(window_seconds, _schedule_clear)
+
+    def hide_progress_ui(self) -> None:
+        """Stop transient Rich UI elements before prompt-toolkit takes control."""
+
+        with contextlib.suppress(Exception):
+            self._renderer.spinner_stop()
+        with contextlib.suppress(Exception):
+            self._renderer.stop_bottom_live()

klaude_code/{ui/modes/repl → tui/input}/__init__.py

@@ -1,4 +1,4 @@
-from klaude_code.ui.modes.repl.input_prompt_toolkit import REPLStatusSnapshot
+from klaude_code.tui.input.prompt_toolkit import REPLStatusSnapshot
 
 
 def build_repl_status_snapshot(update_message: str | None) -> REPLStatusSnapshot:

klaude_code/{ui/modes/repl → tui/input}/completers.py

@@ -28,8 +28,8 @@ from prompt_toolkit.document import Document
 from prompt_toolkit.formatted_text import FormattedText
 
 from klaude_code.const import COMPLETER_CACHE_TTL_SEC, COMPLETER_CMD_TIMEOUT_SEC, COMPLETER_DEBOUNCE_SEC
+from klaude_code.log import DebugType, log_debug
 from klaude_code.protocol.commands import CommandInfo
-from klaude_code.trace.log import DebugType, log_debug
 
 # Pattern to match @token for completion refresh (used by key bindings).
 # Supports both plain tokens like `@src/file.py` and quoted tokens like

klaude_code/{ui/modes/repl/input_prompt_toolkit.py → tui/input/prompt_toolkit.py}

@@ -35,13 +35,13 @@ from klaude_code.config.thinking import (
 from klaude_code.protocol import llm_param
 from klaude_code.protocol.commands import CommandInfo
 from klaude_code.protocol.message import UserInputPayload
+from klaude_code.tui.components.user_input import USER_MESSAGE_MARK
+from klaude_code.tui.input.clipboard import capture_clipboard_tag, copy_to_clipboard, extract_images_from_text
+from klaude_code.tui.input.completers import AT_TOKEN_PATTERN, create_repl_completer
+from klaude_code.tui.input.key_bindings import create_key_bindings
+from klaude_code.tui.terminal.color import is_light_terminal_background
+from klaude_code.tui.terminal.selector import SelectItem, SelectOverlay, build_model_select_items
 from klaude_code.ui.core.input import InputProviderABC
-from klaude_code.ui.modes.repl.clipboard import capture_clipboard_tag, copy_to_clipboard, extract_images_from_text
-from klaude_code.ui.modes.repl.completers import AT_TOKEN_PATTERN, create_repl_completer
-from klaude_code.ui.modes.repl.key_bindings import create_key_bindings
-from klaude_code.ui.renderers.user_input import USER_MESSAGE_MARK
-from klaude_code.ui.terminal.color import is_light_terminal_background
-from klaude_code.ui.terminal.selector import SelectItem, SelectOverlay, build_model_select_items
 
 
 class REPLStatusSnapshot(NamedTuple):
@@ -314,7 +314,7 @@ class PromptToolkitInput(InputProviderABC):
                     "question": "bold",
                     "msg": "",
                     "meta": "fg:ansibrightblack",
-                    "frame.border": "fg:ansibrightblack",
+                    "frame.border": "fg:ansibrightblack dim",
                     "search_prefix": "fg:ansibrightblack",
                     "search_placeholder": "fg:ansibrightblack italic",
                     "search_input": "",
@@ -604,6 +604,10 @@ class PromptToolkitInput(InputProviderABC):
                 (symbol_style, " ctrl-l "),
                 (text_style, " "),
                 (text_style, "models"),
+                (text_style, "  "),
+                (symbol_style, " ctrl-t "),
+                (text_style, " "),
+                (text_style, "think"),
             ]
         )