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

klaude_code/session/session.py

@@ -289,7 +289,7 @@ class Session(BaseModel):
             return True
         return isinstance(prev_item, (message.UserMessage, message.ToolResultMessage, message.DeveloperMessage))
 
-    def get_history_item(self) -> Iterable[events.HistoryItemEvent]:
+    def get_history_item(self) -> Iterable[events.ReplayEventUnion]:
         seen_sub_agent_sessions: set[str] = set()
         prev_item: message.HistoryEvent | None = None
         last_assistant_content: str = ""
@@ -314,8 +314,8 @@ class Session(BaseModel):
                             response_id=am.response_id,
                             session_id=self.id,
                         )
-                    yield events.AssistantMessageEvent(
-                        thinking_text=thinking_text,
+                    yield events.ResponseCompleteEvent(
+                        thinking_text=thinking_text or None,
                         content=content,
                         response_id=am.response_id,
                         session_id=self.id,
@@ -360,7 +360,8 @@ class Session(BaseModel):
                         images=images or None,
                     )
                 case model.TaskMetadataItem() as mt:
-                    yield events.TaskMetadataEvent(session_id=self.id, metadata=mt)
+                    if self.sub_agent_state is None:
+                        yield events.TaskMetadataEvent(session_id=self.id, metadata=mt)
                 case message.DeveloperMessage() as dm:
                     yield events.DeveloperMessageEvent(session_id=self.id, item=dm)
                 case message.StreamErrorItem() as se:
@@ -377,7 +378,7 @@ class Session(BaseModel):
 
     def _iter_sub_agent_history(
         self, tool_result: message.ToolResultMessage, seen_sub_agent_sessions: set[str]
-    ) -> Iterable[events.HistoryItemEvent]:
+    ) -> Iterable[events.ReplayEventUnion]:
         ui_extra = tool_result.ui_extra
         if not isinstance(ui_extra, model.SessionIdUIExtra):
             return

klaude_code/skill/assets/create-plan/SKILL.md

@@ -0,0 +1,76 @@
+---
+name: create-plan
+description: Create a concise plan. Use when a user explicitly asks for a plan related to a coding task.
+metadata:
+  short-description: Create a plan
+---
+
+# Create Plan
+
+## Goal
+
+Turn a user prompt into a **single, actionable plan** delivered in the final assistant message.
+
+## Minimal workflow
+
+1. **Scan context quickly**
+   - Read `README.md` and any obvious docs (`docs/`, `CONTRIBUTING.md`, `ARCHITECTURE.md`).
+   - Skim relevant files (the ones most likely touched).
+   - Identify constraints (language, frameworks, CI/test commands, deployment shape).
+
+2. **Ask follow-ups only if blocking**
+   - Ask **at most 1–2 questions**.
+   - Only ask if you cannot responsibly plan without the answer; prefer multiple-choice.
+   - If unsure but not blocked, make a reasonable assumption and proceed.
+
+3. **Create a plan using the template below**
+   - Start with **1 short paragraph** describing the intent and approach.
+   - Clearly call out what is **in scope** and what is **not in scope** in short.
+   - Then provide a **small checklist** of action items (default 6–10 items).
+      - Each checklist item should be a concrete action and, when helpful, mention files/commands.
+      - **Make items atomic and ordered**: discovery → changes → tests → rollout.
+      - **Verb-first**: “Add…”, “Refactor…”, “Verify…”, “Ship…”.
+   - Include at least one item for **tests/validation** and one for **edge cases/risk** when applicable.
+   - If there are unknowns, include a tiny **Open questions** section (max 3).
+
+4. **Write the plan to `plan.md` in the current working directory**
+   - Use the Write tool to save the plan to `./plan.md`
+   - If `plan.md` already exists, overwrite it with the new plan
+
+5. **Do not preface the plan with meta explanations; output only the plan as per template**
+
+## Plan template (follow exactly)
+
+```markdown
+# Plan
+
+<1–3 sentences: what we’re doing, why, and the high-level approach.>
+
+## Scope
+- In:
+- Out:
+
+## Action items
+[ ] <Step 1>
+[ ] <Step 2>
+[ ] <Step 3>
+[ ] <Step 4>
+[ ] <Step 5>
+[ ] <Step 6>
+
+## Open questions
+- <Question 1>
+- <Question 2>
+- <Question 3>
+```
+
+## Checklist item guidance
+Good checklist items:
+- Point to likely files/modules: src/..., app/..., services/...
+- Name concrete validation: “Run npm test”, “Add unit tests for X”
+- Include safe rollout when relevant: feature flag, migration plan, rollback note
+
+Avoid:
+- Vague steps (“handle backend”, “do auth”)
+- Too many micro-steps
+- Writing code snippets (keep the plan implementation-agnostic)

klaude_code/skill/loader.py

@@ -5,7 +5,7 @@ from typing import ClassVar
 
 import yaml
 
-from klaude_code.trace import log_debug
+from klaude_code.log import log_debug
 
 
 @dataclass

klaude_code/skill/system_skills.py

@@ -11,7 +11,7 @@ from contextlib import contextmanager
 from importlib import resources
 from pathlib import Path
 
-from klaude_code.trace import log_debug
+from klaude_code.log import log_debug
 
 # Marker file name for tracking installed skills version
 SYSTEM_SKILLS_MARKER_FILENAME = ".klaude-system-skills.marker"

klaude_code/tui/__init__.py

@@ -0,0 +1,8 @@
+"""Terminal (TUI) frontend for klaude-code.
+
+This package contains all terminal-specific UI code (Rich rendering,
+prompt-toolkit input, and terminal integrations).
+
+The tui layer may depend on `klaude_code.ui`, but `klaude_code.ui` must not
+depend on `klaude_code.tui`.
+"""

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

@@ -1,6 +1,7 @@
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.protocol import commands, message, op
 
+from .command_abc import Agent, CommandABC, CommandResult
+
 
 class ClearCommand(CommandABC):
     """Clear current session and start a new conversation"""

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

@@ -1,6 +1,7 @@
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
+from klaude_code.log import DebugType, get_current_log_file, is_debug_enabled, set_debug_logging
 from klaude_code.protocol import commands, events, message, model
-from klaude_code.trace import DebugType, get_current_log_file, is_debug_enabled, set_debug_logging
+
+from .command_abc import Agent, CommandABC, CommandResult
 
 
 def _format_status() -> str:

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

@@ -2,9 +2,10 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.protocol import commands, message, op
 
+from .command_abc import Agent, CommandABC, CommandResult
+
 
 class ExportCommand(CommandABC):
     """Export the current session into a standalone HTML transcript."""

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

@@ -9,10 +9,11 @@ from pathlib import Path
 from rich.console import Console
 from rich.text import Text
 
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.protocol import commands, events, message, model
 from klaude_code.session.export import build_export_html
 
+from .command_abc import Agent, CommandABC, CommandResult
+
 
 class ExportOnlineCommand(CommandABC):
     """Export and deploy the current session to surge.sh as a static webpage."""

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(
     [

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."""

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(
     [

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

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: