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

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

@@ -5,10 +5,11 @@ from typing import Literal
 
 from prompt_toolkit.styles import Style
 
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.protocol import commands, events, message, model
-from klaude_code.ui.modes.repl.clipboard import copy_to_clipboard
-from klaude_code.ui.terminal.selector import SelectItem, select_one
+from klaude_code.tui.input.clipboard import copy_to_clipboard
+from klaude_code.tui.terminal.selector import SelectItem, select_one
+
+from .command_abc import Agent, CommandABC, CommandResult
 
 FORK_SELECT_STYLE = Style(
     [
@@ -207,7 +208,7 @@ class ForkSessionCommand(CommandABC):
                 session_id=agent.session.id,
                 item=message.DeveloperMessage(
                     parts=message.text_parts_from_str("(no messages to fork)"),
-                    command_output=model.CommandOutput(command_name=self.name),
+                    ui_extra=model.build_command_output_extra(self.name),
                 ),
             )
             return CommandResult(events=[event], persist_user_input=False, persist_events=False)
@@ -227,8 +228,8 @@ class ForkSessionCommand(CommandABC):
                 session_id=agent.session.id,
                 item=message.DeveloperMessage(
                     parts=message.text_parts_from_str(f"Session forked successfully. New session id: {new_session.id}"),
-                    command_output=model.CommandOutput(
-                        command_name=self.name,
+                    ui_extra=model.build_command_output_extra(
+                        self.name,
                         ui_extra=model.SessionIdUIExtra(session_id=new_session.id),
                     ),
                 ),
@@ -243,7 +244,7 @@ class ForkSessionCommand(CommandABC):
                 session_id=agent.session.id,
                 item=message.DeveloperMessage(
                     parts=message.text_parts_from_str("(fork cancelled)"),
-                    command_output=model.CommandOutput(command_name=self.name),
+                    ui_extra=model.build_command_output_extra(self.name),
                 ),
             )
             return CommandResult(events=[event], persist_user_input=False, persist_events=False)
@@ -264,8 +265,8 @@ class ForkSessionCommand(CommandABC):
                 parts=message.text_parts_from_str(
                     f"Session forked ({fork_description}). New session id: {new_session.id}"
                 ),
-                command_output=model.CommandOutput(
-                    command_name=self.name,
+                ui_extra=model.build_command_output_extra(
+                    self.name,
                     ui_extra=model.SessionIdUIExtra(session_id=new_session.id),
                 ),
             ),

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

@@ -1,6 +1,7 @@
-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 HelpCommand(CommandABC):
     """Display help information for all available slash commands."""
@@ -43,7 +44,7 @@ Available slash commands:"""
             session_id=agent.session.id,
             item=message.DeveloperMessage(
                 parts=message.text_parts_from_str("\n".join(lines)),
-                command_output=model.CommandOutput(command_name=self.name),
+                ui_extra=model.build_command_output_extra(self.name),
             ),
         )
 

klaude_code/{command → tui/command}/model_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.command.model_select import select_model_interactive
 from klaude_code.protocol import commands, events, 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
+from .model_select import select_model_interactive
 
 SELECT_STYLE = Style(
     [
@@ -76,7 +77,7 @@ class ModelCommand(CommandABC):
                         session_id=agent.session.id,
                         item=message.DeveloperMessage(
                             parts=message.text_parts_from_str("(no change)"),
-                            command_output=model.CommandOutput(command_name=self.name),
+                            ui_extra=model.build_command_output_extra(self.name),
                         ),
                     )
                 ]

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

@@ -4,7 +4,7 @@ import sys
 
 from klaude_code.config.config import load_config
 from klaude_code.config.select_model import match_model_from_config
-from klaude_code.trace import log
+from klaude_code.log import log
 
 
 def select_model_interactive(preferred: str | None = None) -> str | None:
@@ -38,7 +38,7 @@ def select_model_interactive(preferred: str | None = None) -> str | None:
     # Interactive selection
     from prompt_toolkit.styles import Style
 
-    from klaude_code.ui.terminal.selector import build_model_select_items, select_one
+    from klaude_code.tui.terminal.selector import build_model_select_items, select_one
 
     config = load_config()
     names = [m.model_name for m in result.filtered_models]

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

@@ -2,9 +2,10 @@ from importlib.resources import files
 
 import yaml
 
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
+from klaude_code.log import log_debug
 from klaude_code.protocol import commands, message, op
-from klaude_code.trace import log_debug
+
+from .command_abc import Agent, CommandABC, CommandResult
 
 
 class PromptCommand(CommandABC):
@@ -30,7 +31,7 @@ class PromptCommand(CommandABC):
             return
 
         try:
-            raw_text = files("klaude_code.command").joinpath(self.template_name).read_text(encoding="utf-8")
+            raw_text = files("klaude_code.tui.command").joinpath(self.template_name).read_text(encoding="utf-8")
 
             if raw_text.startswith("---"):
                 parts = raw_text.split("---", 2)

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

@@ -1,6 +1,7 @@
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.protocol import commands, events, message
 
+from .command_abc import Agent, CommandABC, CommandResult
+
 
 class RefreshTerminalCommand(CommandABC):
     """Refresh terminal display"""
@@ -26,6 +27,7 @@ class RefreshTerminalCommand(CommandABC):
         return CommandResult(
             events=[
                 events.WelcomeEvent(
+                    session_id=agent.session.id,
                     work_dir=str(agent.session.work_dir),
                     llm_config=agent.get_llm_client().get_llm_config(),
                 ),

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

@@ -1,10 +1,11 @@
 from importlib.resources import files
 from typing import TYPE_CHECKING
 
-from klaude_code.command.command_abc import Agent, CommandResult
-from klaude_code.command.prompt_command import PromptCommand
+from klaude_code.log import log_debug
 from klaude_code.protocol import commands, events, message, model, op
-from klaude_code.trace import log_debug
+
+from .command_abc import Agent, CommandResult
+from .prompt_command import PromptCommand
 
 if TYPE_CHECKING:
     from .command_abc import CommandABC
@@ -82,7 +83,7 @@ def register(cmd: "CommandABC") -> None:
 def load_prompt_commands():
     """Dynamically load prompt-based commands from the command directory."""
     try:
-        command_files = files("klaude_code.command").iterdir()
+        command_files = files("klaude_code.tui.command").iterdir()
         for file_path in command_files:
             name = file_path.name
             if (name.startswith("prompt_") or name.startswith("prompt-")) and name.endswith(".md"):
@@ -94,7 +95,7 @@ def load_prompt_commands():
 
 def _ensure_commands_loaded() -> None:
     """Ensure all commands are loaded (lazy initialization)."""
-    from klaude_code.command import ensure_commands_loaded
+    from klaude_code.tui.command import ensure_commands_loaded
 
     ensure_commands_loaded()
 
@@ -183,6 +184,15 @@ async def dispatch_command(user_input: message.UserInputPayload, agent: Agent, *
             if isinstance(command_identifier, commands.CommandName)
             else None
         )
+        ui_extra = (
+            model.build_command_output_extra(
+                command_output.command_name,
+                ui_extra=command_output.ui_extra,
+                is_error=command_output.is_error,
+            )
+            if command_output is not None
+            else None
+        )
         return CommandResult(
             events=[
                 events.DeveloperMessageEvent(
@@ -191,7 +201,7 @@ async def dispatch_command(user_input: message.UserInputPayload, agent: Agent, *
                         parts=message.text_parts_from_str(
                             f"Command {command_identifier} error: [{e.__class__.__name__}] {e!s}"
                         ),
-                        command_output=command_output,
+                        ui_extra=ui_extra,
                     ),
                 )
             ]

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."""
@@ -77,7 +78,7 @@ class ReleaseNotesCommand(CommandABC):
             session_id=agent.session.id,
             item=message.DeveloperMessage(
                 parts=message.text_parts_from_str(content),
-                command_output=model.CommandOutput(command_name=self.name),
+                ui_extra=model.build_command_output_extra(self.name),
             ),
         )
 

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(
     [
@@ -92,7 +93,7 @@ class ResumeCommand(CommandABC):
                     parts=message.text_parts_from_str(
                         "Cannot resume: current session already has messages. Use `klaude -r` to start a new instance with session selection."
                     ),
-                    command_output=model.CommandOutput(command_name=self.name, is_error=True),
+                    ui_extra=model.build_command_output_extra(self.name, is_error=True),
                 ),
             )
             return CommandResult(events=[event], persist_user_input=False, persist_events=False)
@@ -103,7 +104,7 @@ class ResumeCommand(CommandABC):
                 session_id=agent.session.id,
                 item=message.DeveloperMessage(
                     parts=message.text_parts_from_str("(no session selected)"),
-                    command_output=model.CommandOutput(command_name=self.name),
+                    ui_extra=model.build_command_output_extra(self.name),
                 ),
             )
             return CommandResult(events=[event], persist_user_input=False, persist_events=False)

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."""
@@ -141,8 +142,8 @@ class StatusCommand(CommandABC):
             session_id=session.id,
             item=message.DeveloperMessage(
                 parts=message.text_parts_from_str(format_status_content(aggregated)),
-                command_output=model.CommandOutput(
-                    command_name=self.name,
+                ui_extra=model.build_command_output_extra(
+                    self.name,
                     ui_extra=model.SessionStatusUIExtra(
                         usage=aggregated.total,
                         task_count=aggregated.task_count,

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"""
@@ -229,7 +230,7 @@ class TerminalSetupCommand(CommandABC):
                     session_id=agent.session.id,
                     item=message.DeveloperMessage(
                         parts=message.text_parts_from_str(msg),
-                        command_output=model.CommandOutput(command_name=self.name, is_error=False),
+                        ui_extra=model.build_command_output_extra(self.name),
                     ),
                 )
             ]
@@ -243,7 +244,7 @@ class TerminalSetupCommand(CommandABC):
                     session_id=agent.session.id,
                     item=message.DeveloperMessage(
                         parts=message.text_parts_from_str(msg),
-                        command_output=model.CommandOutput(command_name=self.name, is_error=True),
+                        ui_extra=model.build_command_output_extra(self.name, is_error=True),
                     ),
                 )
             ]

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(
     [
@@ -82,7 +83,7 @@ class ThinkingCommand(CommandABC):
                         session_id=agent.session.id,
                         item=message.DeveloperMessage(
                             parts=message.text_parts_from_str("(no change)"),
-                            command_output=model.CommandOutput(command_name=self.name),
+                            ui_extra=model.build_command_output_extra(self.name),
                         ),
                     )
                 ]

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: