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

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):