klaude-code 1.2.21__py3-none-any.whl → 1.2.23__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
 
 
@@ -32,16 +35,23 @@ class REPLStatusSnapshot(NamedTuple):
 
 COMPLETION_SELECTED = "#5869f7"
 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"
@@ -60,6 +70,7 @@ class PromptToolkitInput(InputProviderABC):
             [(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()),
@@ -144,6 +155,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 +193,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/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/common.py

@@ -31,16 +31,20 @@ def truncate_display(
         return Text(f"… (more {remaining} lines)", style=ThemeKey.TOOL_RESULT_TRUNCATED)
 
     lines = text.split("\n")
-    extra_lines = 0
-    if len(lines) > max_lines:
-        extra_lines = len(lines) - max_lines
-        lines = lines[:max_lines]
+    truncated_lines = 0
+    head_lines: list[str] = []
+    tail_lines: list[str] = []
 
-    out = Text()
-    if base_style is not None:
-        out.style = base_style
+    if len(lines) > max_lines:
+        truncated_lines = len(lines) - max_lines
+        head_count = max_lines // 2
+        tail_count = max_lines - head_count
+        head_lines = lines[:head_count]
+        tail_lines = lines[-tail_count:]
+    else:
+        head_lines = lines
 
-    for idx, line in enumerate(lines):
+    def append_line(out: Text, line: str) -> None:
         if len(line) > max_line_length:
             extra_chars = len(line) - max_line_length
             out.append(line[:max_line_length])
@@ -53,10 +57,21 @@ def truncate_display(
         else:
             out.append(line)
 
-        if idx != len(lines) - 1 or extra_lines > 0:
+    out = Text()
+    if base_style is not None:
+        out.style = base_style
+
+    for idx, line in enumerate(head_lines):
+        append_line(out, line)
+        if idx < len(head_lines) - 1 or truncated_lines > 0 or tail_lines:
             out.append("\n")
 
-    if extra_lines > 0:
-        out.append_text(Text(f"… (more {extra_lines} lines)", style=ThemeKey.TOOL_RESULT_TRUNCATED))
+    if truncated_lines > 0:
+        out.append_text(Text(f"⋮ (more {truncated_lines} lines)\n", style=ThemeKey.TOOL_RESULT_TRUNCATED))
+
+    for idx, line in enumerate(tail_lines):
+        append_line(out, line)
+        if idx < len(tail_lines) - 1:
+            out.append("\n")
 
     return out

klaude_code/ui/renderers/developer.py

@@ -4,7 +4,6 @@ from rich.table import Table
 from rich.text import Text
 
 from klaude_code.protocol import commands, events, model
-from klaude_code.ui.renderers import diffs as r_diffs
 from klaude_code.ui.renderers.common import create_grid, truncate_display
 from klaude_code.ui.renderers.tools import render_path
 from klaude_code.ui.rich.markdown import NoInsetMarkdown
@@ -18,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
     )
 
 
@@ -94,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("")
 
 
@@ -103,10 +114,6 @@ def render_command_output(e: events.DeveloperMessageEvent) -> RenderableType:
         return Text("")
 
     match e.item.command_output.command_name:
-        case commands.CommandName.DIFF:
-            if e.item.content is None or len(e.item.content) == 0:
-                return Padding.indent(Text("(no changes)", style=ThemeKey.TOOL_RESULT), level=2)
-            return r_diffs.render_diff_panel(e.item.content, show_file_name=True)
         case commands.CommandName.HELP:
             return Padding.indent(Text.from_markup(e.item.content or ""), level=2)
         case commands.CommandName.STATUS:

klaude_code/ui/renderers/diffs.py

@@ -5,6 +5,7 @@ from rich.panel import Panel
 from rich.text import Text
 
 from klaude_code import const
+from klaude_code.protocol import model
 from klaude_code.ui.renderers.common import create_grid
 from klaude_code.ui.rich.theme import ThemeKey
 
@@ -179,11 +180,35 @@ def render_diff(diff_text: str, show_file_name: bool = False) -> RenderableType:
     return grid
 
 
+def render_structured_diff(ui_extra: model.DiffUIExtra, show_file_name: bool = False) -> RenderableType:
+    files = ui_extra.files
+    if not files:
+        return Text("")
+
+    grid = create_grid()
+    grid.padding = (0, 0)
+    show_headers = show_file_name or len(files) > 1
+
+    for idx, file_diff in enumerate(files):
+        if idx > 0:
+            grid.add_row("", "")
+
+        if show_headers:
+            grid.add_row(*_render_file_header(file_diff))
+
+        for line in file_diff.lines:
+            prefix = _make_structured_prefix(line, const.DIFF_PREFIX_WIDTH)
+            text = _render_structured_line(line)
+            grid.add_row(Text(prefix, ThemeKey.TOOL_RESULT), text)
+
+    return grid
+
+
 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()
@@ -210,3 +235,62 @@ def render_diff_panel(
     if indent <= 0:
         return panel
     return Padding.indent(panel, level=indent)
+
+
+def _render_file_header(file_diff: model.DiffFileDiff) -> tuple[Text, Text]:
+    file_text = Text(file_diff.file_path, style=ThemeKey.DIFF_FILE_NAME)
+    stats_text = Text()
+    if file_diff.stats_add > 0:
+        stats_text.append(f"+{file_diff.stats_add}", style=ThemeKey.DIFF_STATS_ADD)
+    if file_diff.stats_remove > 0:
+        if stats_text.plain:
+            stats_text.append(" ")
+        stats_text.append(f"-{file_diff.stats_remove}", style=ThemeKey.DIFF_STATS_REMOVE)
+
+    file_line = Text(style=ThemeKey.DIFF_FILE_NAME)
+    file_line.append_text(file_text)
+    if stats_text.plain:
+        file_line.append(" (")
+        file_line.append_text(stats_text)
+        file_line.append(")")
+
+    if file_diff.stats_add > 0 and file_diff.stats_remove == 0:
+        file_mark = "+"
+    elif file_diff.stats_remove > 0 and file_diff.stats_add == 0:
+        file_mark = "-"
+    else:
+        file_mark = "±"
+
+    prefix = Text(f"{file_mark:>{const.DIFF_PREFIX_WIDTH}}  ", style=ThemeKey.DIFF_FILE_NAME)
+    return prefix, file_line
+
+
+def _make_structured_prefix(line: model.DiffLine, width: int) -> str:
+    if line.kind == "gap":
+        return f"{'⋮':>{width}}  "
+    number = " " * width
+    if line.kind in {"add", "ctx"} and line.new_line_no is not None:
+        number = f"{line.new_line_no:>{width}}"
+    marker = "+" if line.kind == "add" else "-" if line.kind == "remove" else " "
+    return f"{number} {marker}"
+
+
+def _render_structured_line(line: model.DiffLine) -> Text:
+    if line.kind == "gap":
+        return Text("")
+    text = Text()
+    for span in line.spans:
+        text.append(span.text, style=_span_style(line.kind, span.op))
+    return text
+
+
+def _span_style(line_kind: str, span_op: str) -> ThemeKey:
+    if line_kind == "add":
+        if span_op == "insert":
+            return ThemeKey.DIFF_ADD_CHAR
+        return ThemeKey.DIFF_ADD
+    if line_kind == "remove":
+        if span_op == "delete":
+            return ThemeKey.DIFF_REMOVE_CHAR
+        return ThemeKey.DIFF_REMOVE
+    return ThemeKey.TOOL_RESULT

klaude_code/ui/renderers/metadata.py

@@ -45,7 +45,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 +151,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)

klaude_code/ui/renderers/thinking.py

@@ -9,7 +9,7 @@ from klaude_code.ui.rich.theme import ThemeKey
 
 
 def thinking_prefix() -> Text:
-    return Text.from_markup("[not italic]⸫[/not italic] Thinking …", style=ThemeKey.THINKING)
+    return Text.from_markup("[not italic]⸫[/not italic] Thinking …", style=ThemeKey.THINKING_BOLD)
 
 
 def normalize_thinking_content(content: str) -> str: