klaude-code 1.2.22__py3-none-any.whl → 1.2.24__py3-none-any.whl

klaude_code/ui/modes/repl/input_prompt_toolkit.py

@@ -7,6 +7,7 @@ from typing import NamedTuple, override
 
 from prompt_toolkit import PromptSession
 from prompt_toolkit.completion import ThreadedCompleter
+from prompt_toolkit.cursor_shapes import CursorShape
 from prompt_toolkit.formatted_text import FormattedText
 from prompt_toolkit.history import FileHistory
 from prompt_toolkit.patch_stdout import patch_stdout
@@ -17,6 +18,8 @@ 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.utils.common import get_current_git_branch, show_path_with_tilde
 
 
@@ -30,18 +33,27 @@ class REPLStatusSnapshot(NamedTuple):
     update_message: str | None = None
 
 
-COMPLETION_SELECTED = "#5869f7"
+COMPLETION_SELECTED_DARK_BG = "#8b9bff"
+COMPLETION_SELECTED_LIGHT_BG = "#5869f7"
+COMPLETION_SELECTED_UNKNOWN_BG = "#7080f0"
 COMPLETION_MENU = "ansibrightblack"
-INPUT_PROMPT_STYLE = "ansimagenta"
+INPUT_PROMPT_STYLE = "ansimagenta bold"
+PLACEHOLDER_TEXT_STYLE_DARK_BG = "fg:#5a5a5a italic"
+PLACEHOLDER_TEXT_STYLE_LIGHT_BG = "fg:#7a7a7a italic"
+PLACEHOLDER_TEXT_STYLE_UNKNOWN_BG = "fg:#8a8a8a italic"
+PLACEHOLDER_SYMBOL_STYLE_DARK_BG = "bg:#2a2a2a fg:#5a5a5a"
+PLACEHOLDER_SYMBOL_STYLE_LIGHT_BG = "bg:#e6e6e6 fg:#7a7a7a"
+PLACEHOLDER_SYMBOL_STYLE_UNKNOWN_BG = "bg:#2a2a2a fg:#8a8a8a"
 
 
 class PromptToolkitInput(InputProviderABC):
     def __init__(
         self,
-        prompt: str = "❯ ",
+        prompt: str = USER_MESSAGE_MARK,
         status_provider: Callable[[], REPLStatusSnapshot] | None = None,
     ):  # ▌
         self._status_provider = status_provider
+        self._is_light_terminal_background = is_light_terminal_background(timeout=0.2)
 
         project = str(Path.cwd()).strip("/").replace("/", "-")
         history_path = Path.home() / ".klaude" / "projects" / project / "input" / "input_history.txt"
@@ -56,10 +68,19 @@ class PromptToolkitInput(InputProviderABC):
             at_token_pattern=AT_TOKEN_PATTERN,
         )
 
+        # Select completion selected color based on terminal background
+        if self._is_light_terminal_background is True:
+            completion_selected = COMPLETION_SELECTED_LIGHT_BG
+        elif self._is_light_terminal_background is False:
+            completion_selected = COMPLETION_SELECTED_DARK_BG
+        else:
+            completion_selected = COMPLETION_SELECTED_UNKNOWN_BG
+
         self._session: PromptSession[str] = PromptSession(
             [(INPUT_PROMPT_STYLE, prompt)],
             history=FileHistory(str(history_path)),
             multiline=True,
+            cursor=CursorShape.BEAM,
             prompt_continuation=[(INPUT_PROMPT_STYLE, "  ")],
             key_bindings=kb,
             completer=ThreadedCompleter(create_repl_completer()),
@@ -75,8 +96,8 @@ class PromptToolkitInput(InputProviderABC):
                     "scrollbar.button": "bg:default",
                     "completion-menu.completion": f"bg:default fg:{COMPLETION_MENU}",
                     "completion-menu.meta.completion": f"bg:default fg:{COMPLETION_MENU}",
-                    "completion-menu.completion.current": f"noreverse bg:default fg:{COMPLETION_SELECTED} bold",
-                    "completion-menu.meta.completion.current": f"bg:default fg:{COMPLETION_SELECTED} bold",
+                    "completion-menu.completion.current": f"noreverse bg:default fg:{completion_selected} bold",
+                    "completion-menu.meta.completion.current": f"bg:default fg:{completion_selected} bold",
                 }
             ),
         )
@@ -144,6 +165,34 @@ class PromptToolkitInput(InputProviderABC):
         toolbar_text = left_text + padding + right_text
         return FormattedText([("#2c7eac", toolbar_text)])
 
+    def _render_input_placeholder(self) -> FormattedText:
+        if self._is_light_terminal_background is True:
+            text_style = PLACEHOLDER_TEXT_STYLE_LIGHT_BG
+            symbol_style = PLACEHOLDER_SYMBOL_STYLE_LIGHT_BG
+        elif self._is_light_terminal_background is False:
+            text_style = PLACEHOLDER_TEXT_STYLE_DARK_BG
+            symbol_style = PLACEHOLDER_SYMBOL_STYLE_DARK_BG
+        else:
+            text_style = PLACEHOLDER_TEXT_STYLE_UNKNOWN_BG
+            symbol_style = PLACEHOLDER_SYMBOL_STYLE_UNKNOWN_BG
+
+        return FormattedText(
+            [
+                (text_style, " " * 10),
+                (symbol_style, " @ "),
+                (text_style, " "),
+                (text_style, "files"),
+                (text_style, "  "),
+                (symbol_style, " $ "),
+                (text_style, " "),
+                (text_style, "skills"),
+                (text_style, "  "),
+                (symbol_style, " / "),
+                (text_style, " "),
+                (text_style, "commands"),
+            ]
+        )
+
     async def start(self) -> None:
         pass
 
@@ -154,7 +203,7 @@ class PromptToolkitInput(InputProviderABC):
     async def iter_inputs(self) -> AsyncIterator[UserInputPayload]:
         while True:
             with patch_stdout():
-                line: str = await self._session.prompt_async()
+                line: str = await self._session.prompt_async(placeholder=self._render_input_placeholder())
 
             # Extract images referenced in the input text
             images = extract_images_from_text(line)

klaude_code/ui/modes/repl/renderer.py

@@ -5,14 +5,13 @@ from contextlib import contextmanager
 from dataclasses import dataclass
 from typing import Any
 
-from rich import box
-from rich.box import Box
 from rich.console import Console
 from rich.spinner import Spinner
 from rich.status import Status
 from rich.style import Style, StyleType
 from rich.text import Text
 
+from klaude_code import const
 from klaude_code.protocol import events, model
 from klaude_code.ui.renderers import assistant as r_assistant
 from klaude_code.ui.renderers import developer as r_developer
@@ -32,6 +31,7 @@ from klaude_code.ui.rich.theme import ThemeKey, get_theme
 @dataclass
 class SessionStatus:
     color: Style | None = None
+    color_index: int | None = None
     sub_agent_state: model.SubAgentState | None = None
 
 
@@ -43,9 +43,9 @@ class REPLRenderer:
         self.console: Console = Console(theme=self.themes.app_theme)
         self.console.push_theme(self.themes.markdown_theme)
         self._spinner: Status = self.console.status(
-            ShimmerStatusText("Thinking …", ThemeKey.SPINNER_STATUS_TEXT),
+            ShimmerStatusText(const.STATUS_DEFAULT_TEXT),
             spinner=r_status.spinner_name(),
-            spinner_style=ThemeKey.SPINNER_STATUS,
+            spinner_style=ThemeKey.STATUS_SPINNER,
         )
 
         self.session_map: dict[str, SessionStatus] = {}
@@ -57,7 +57,9 @@ class REPLRenderer:
             sub_agent_state=sub_agent_state,
         )
         if sub_agent_state is not None:
-            session_status.color = self.pick_sub_agent_color()
+            color, color_index = self.pick_sub_agent_color()
+            session_status.color = color
+            session_status.color_index = color_index
         self.session_map[session_id] = session_status
 
     def is_sub_agent_session(self, session_id: str) -> bool:
@@ -70,12 +72,12 @@ class REPLRenderer:
             return
         self.sub_agent_color_index = (self.sub_agent_color_index + 1) % palette_size
 
-    def pick_sub_agent_color(self) -> Style:
+    def pick_sub_agent_color(self) -> tuple[Style, int]:
         self._advance_sub_agent_color_index()
         palette = self.themes.sub_agent_colors
         if not palette:
-            return Style()
-        return palette[self.sub_agent_color_index]
+            return Style(), 0
+        return palette[self.sub_agent_color_index], self.sub_agent_color_index
 
     def get_session_sub_agent_color(self, session_id: str) -> Style:
         status = self.session_map.get(session_id)
@@ -83,8 +85,12 @@ class REPLRenderer:
             return status.color
         return Style()
 
-    def box_style(self) -> Box:
-        return box.ROUNDED
+    def get_session_sub_agent_background(self, session_id: str) -> Style:
+        status = self.session_map.get(session_id)
+        backgrounds = self.themes.sub_agent_backgrounds
+        if status and status.color_index is not None and backgrounds:
+            return backgrounds[status.color_index]
+        return Style()
 
     @contextmanager
     def session_print_context(self, session_id: str) -> Iterator[None]:
@@ -114,7 +120,7 @@ class REPLRenderer:
     def display_tool_call_result(self, e: events.ToolResultEvent) -> None:
         if r_tools.is_sub_agent_tool(e.tool_name):
             return
-        renderable = r_tools.render_tool_result(e)
+        renderable = r_tools.render_tool_result(e, code_theme=self.themes.code_theme)
         if renderable is not None:
             self.print(renderable)
 
@@ -152,7 +158,6 @@ class REPLRenderer:
                     case events.ThinkingEvent() as e:
                         if is_sub_agent:
                             continue
-                        self.display_thinking_prefix()
                         self.display_thinking(e.content)
                     case events.DeveloperMessageEvent() as e:
                         self.display_developer_message(e)
@@ -196,7 +201,7 @@ class REPLRenderer:
             self.print()
 
     def display_welcome(self, event: events.WelcomeEvent) -> None:
-        self.print(r_metadata.render_welcome(event, box_style=self.box_style()))
+        self.print(r_metadata.render_welcome(event))
 
     def display_user_message(self, event: events.UserMessageEvent) -> None:
         self.print(r_user_input.render_user_input(event.content))
@@ -229,12 +234,17 @@ class REPLRenderer:
 
     def display_task_finish(self, event: events.TaskFinishEvent) -> None:
         if self.is_sub_agent_session(event.session_id):
+            session_status = self.session_map.get(event.session_id)
+            description = session_status.sub_agent_state.sub_agent_desc if session_status and session_status.sub_agent_state else None
+            panel_style = self.get_session_sub_agent_background(event.session_id)
             with self.session_print_context(event.session_id):
                 self.print(
                     r_sub_agent.render_sub_agent_result(
                         event.task_result,
                         code_theme=self.themes.code_theme,
                         has_structured_output=event.has_structured_output,
+                        description=description,
+                        panel_style=panel_style,
                     )
                 )
 
@@ -249,9 +259,6 @@ class REPLRenderer:
             )
         )
 
-    def display_thinking_prefix(self) -> None:
-        self.print(r_thinking.thinking_prefix())
-
     # -------------------------------------------------------------------------
     # Spinner control methods
     # -------------------------------------------------------------------------
@@ -266,7 +273,7 @@ class REPLRenderer:
 
     def spinner_update(self, status_text: str | Text, right_text: Text | None = None) -> None:
         """Update the spinner status text with optional right-aligned text."""
-        self._spinner.update(ShimmerStatusText(status_text, ThemeKey.SPINNER_STATUS_TEXT, right_text))
+        self._spinner.update(ShimmerStatusText(status_text, right_text))
 
     def spinner_renderable(self) -> Spinner:
         """Return the spinner's renderable for embedding in other components."""

klaude_code/ui/renderers/assistant.py

@@ -1,8 +1,13 @@
 from rich.console import RenderableType
+from rich.padding import Padding
 
+from klaude_code import const
 from klaude_code.ui.renderers.common import create_grid
 from klaude_code.ui.rich.markdown import NoInsetMarkdown
 
+# UI markers
+ASSISTANT_MESSAGE_MARK = "◆"
+
 
 def render_assistant_message(content: str, *, code_theme: str) -> RenderableType | None:
     """Render assistant message for replay history display.
@@ -15,7 +20,7 @@ def render_assistant_message(content: str, *, code_theme: str) -> RenderableType
 
     grid = create_grid()
     grid.add_row(
-        "•",
-        NoInsetMarkdown(stripped, code_theme=code_theme),
+        ASSISTANT_MESSAGE_MARK,
+        Padding(NoInsetMarkdown(stripped, code_theme=code_theme), (0, const.MARKDOWN_RIGHT_MARGIN, 0, 0)),
     )
     return grid

klaude_code/ui/renderers/developer.py

@@ -17,6 +17,7 @@ def need_render_developer_message(e: events.DeveloperMessageEvent) -> bool:
         or e.item.todo_use
         or e.item.at_files
         or e.item.user_image_count
+        or e.item.skill_name
     )
 
 
@@ -93,6 +94,17 @@ def render_developer_message(e: events.DeveloperMessageEvent) -> RenderableType:
         )
         parts.append(grid)
 
+    if sn := e.item.skill_name:
+        grid = create_grid()
+        grid.add_row(
+            Text("  +", style=ThemeKey.REMINDER),
+            Text.assemble(
+                ("Activated skill ", ThemeKey.REMINDER),
+                (sn, ThemeKey.REMINDER_BOLD),
+            ),
+        )
+        parts.append(grid)
+
     return Group(*parts) if parts else Text("")
 
 

klaude_code/ui/renderers/diffs.py

@@ -208,7 +208,7 @@ def render_diff_panel(
     diff_text: str,
     *,
     show_file_name: bool = True,
-    heading: str = "Git Diff",
+    heading: str = "DIFF",
     indent: int = 2,
 ) -> RenderableType:
     lines = diff_text.splitlines()

klaude_code/ui/renderers/metadata.py

@@ -1,7 +1,6 @@
 from importlib.metadata import version
 
 from rich import box
-from rich.box import Box
 from rich.console import Group, RenderableType
 from rich.padding import Padding
 from rich.panel import Panel
@@ -45,7 +44,7 @@ def _render_task_metadata_block(
     currency_symbol = "¥" if currency == "CNY" else "$"
 
     # First column: mark only
-    mark = Text("└", style=ThemeKey.METADATA_DIM) if is_sub_agent else Text("•", style=ThemeKey.METADATA_BOLD)
+    mark = Text("└", style=ThemeKey.METADATA_DIM) if is_sub_agent else Text("⇅", style=ThemeKey.METADATA)
 
     # Second column: model@provider / tokens / cost / ...
     content = Text()
@@ -151,7 +150,9 @@ def render_task_metadata(e: events.TaskMetadataEvent) -> RenderableType:
     """Render task metadata including main agent and sub-agents, aggregated by model+provider."""
     renderables: list[RenderableType] = []
 
-    renderables.append(_render_task_metadata_block(e.metadata.main, is_sub_agent=False, show_context_and_time=True))
+    renderables.append(
+        _render_task_metadata_block(e.metadata.main_agent, is_sub_agent=False, show_context_and_time=True)
+    )
 
     # Aggregate by (model_name, provider), sorted by total_cost descending
     sorted_items = model.TaskMetadata.aggregate_by_model(e.metadata.sub_agent_task_metadata)
@@ -163,11 +164,8 @@ def render_task_metadata(e: events.TaskMetadataEvent) -> RenderableType:
     return Group(*renderables)
 
 
-def render_welcome(e: events.WelcomeEvent, *, box_style: Box | None = None) -> RenderableType:
+def render_welcome(e: events.WelcomeEvent) -> RenderableType:
     """Render the welcome panel with model info and settings."""
-    if box_style is None:
-        box_style = box.ROUNDED
-
     debug_mode = is_debug_enabled()
 
     # First line: Klaude Code version
@@ -217,6 +215,6 @@ def render_welcome(e: events.WelcomeEvent, *, box_style: Box | None = None) -> R
 
     border_style = ThemeKey.WELCOME_DEBUG_BORDER if debug_mode else ThemeKey.LINES
     return Group(
-        Panel.fit(panel_content, border_style=border_style, box=box_style),
+        Panel.fit(panel_content, border_style=border_style, box=box.ROUNDED),
         "",  # empty line
     )

klaude_code/ui/renderers/sub_agent.py

@@ -1,6 +1,7 @@
 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
@@ -58,10 +59,22 @@ def render_sub_agent_call(e: model.SubAgentState, style: Style | None = None) ->
 
 
 def render_sub_agent_result(
-    result: str, *, code_theme: str, style: Style | None = None, has_structured_output: bool = False
+    result: str,
+    *,
+    code_theme: str,
+    style: Style | None = None,
+    has_structured_output: bool = False,
+    description: str | None = None,
+    panel_style: Style | None = None,
 ) -> RenderableType:
     stripped_result = result.strip()
 
+    # Add markdown heading if description is provided
+    if description:
+        stripped_result = f"# {description}\n\n{stripped_result}"
+
+    result_panel_style = panel_style or ThemeKey.SUB_AGENT_RESULT_PANEL
+
     # Use rich JSON for structured output
     if has_structured_output:
         try:
@@ -73,7 +86,9 @@ def render_sub_agent_result(
                     ),
                     JSON(stripped_result),
                 ),
+                box=box.SIMPLE,
                 border_style=ThemeKey.LINES,
+                style=result_panel_style,
             )
         except json.JSONDecodeError:
             # Fall back to markdown if not valid JSON
@@ -82,20 +97,28 @@ def render_sub_agent_result(
     lines = stripped_result.splitlines()
     if len(lines) > const.SUB_AGENT_RESULT_MAX_LINES:
         hidden_count = len(lines) - const.SUB_AGENT_RESULT_MAX_LINES
-        truncated_text = "\n".join(lines[-const.SUB_AGENT_RESULT_MAX_LINES :])
+        head_count = const.SUB_AGENT_RESULT_MAX_LINES // 2
+        tail_count = const.SUB_AGENT_RESULT_MAX_LINES - head_count
+        head_text = "\n".join(lines[:head_count])
+        tail_text = "\n".join(lines[-tail_count:])
         return Panel.fit(
             Group(
+                NoInsetMarkdown(head_text, code_theme=code_theme, style=style or ""),
                 Text(
-                    f"… more {hidden_count} lines — use /export to view full output",
-                    style=ThemeKey.TOOL_RESULT,
+                    f"\n… more {hidden_count} lines — use /export to view full output\n",
+                    style=ThemeKey.TOOL_RESULT_TRUNCATED,
                 ),
-                NoInsetMarkdown(truncated_text, code_theme=code_theme, style=style or ""),
+                NoInsetMarkdown(tail_text, code_theme=code_theme, style=style or ""),
             ),
+            box=box.SIMPLE,
             border_style=ThemeKey.LINES,
+            style=result_panel_style,
         )
     return Panel.fit(
         NoInsetMarkdown(stripped_result, code_theme=code_theme),
+        box=box.SIMPLE,
         border_style=ThemeKey.LINES,
+        style=result_panel_style,
     )
 
 

klaude_code/ui/renderers/thinking.py

@@ -4,12 +4,13 @@ from rich.console import RenderableType
 from rich.padding import Padding
 from rich.text import Text
 
+from klaude_code import const
+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
 
-
-def thinking_prefix() -> Text:
-    return Text.from_markup("[not italic]⸫[/not italic] Thinking …", style=ThemeKey.THINKING)
+# UI markers
+THINKING_MESSAGE_MARK = "⠶"
 
 
 def normalize_thinking_content(content: str) -> str:
@@ -37,7 +38,7 @@ def normalize_thinking_content(content: str) -> str:
 
 
 def render_thinking(content: str, *, code_theme: str, style: str) -> RenderableType | None:
-    """Render thinking content as indented markdown.
+    """Render thinking content as markdown with left mark.
 
     Returns None if content is empty.
     Note: Caller should push thinking_markdown_theme before printing.
@@ -45,11 +46,16 @@ def render_thinking(content: str, *, code_theme: str, style: str) -> RenderableT
     if len(content.strip()) == 0:
         return None
 
-    return Padding.indent(
-        ThinkingMarkdown(
-            normalize_thinking_content(content),
-            code_theme=code_theme,
-            style=style,
+    grid = create_grid()
+    grid.add_row(
+        Text(THINKING_MESSAGE_MARK, style=ThemeKey.THINKING),
+        Padding(
+            ThinkingMarkdown(
+                normalize_thinking_content(content),
+                code_theme=code_theme,
+                style=style,
+            ),
+            (0, const.MARKDOWN_RIGHT_MARGIN, 0, 0),
         ),
-        level=2,
     )
+    return grid