PyPI - klaude-code - Versions diffs - 2.9.0__py3-none-any.whl → 2.10.0__py3-none-any.whl - Mend

klaude-code 2.9.0py3-none-any.whl → 2.10.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (69) hide show

klaude_code/app/runtime.py +1 -1
klaude_code/auth/antigravity/oauth.py +33 -29
klaude_code/auth/claude/oauth.py +34 -49
klaude_code/cli/cost_cmd.py +4 -4
klaude_code/cli/list_model.py +1 -2
klaude_code/config/assets/builtin_config.yaml +17 -0
klaude_code/const.py +4 -3
klaude_code/core/agent_profile.py +2 -5
klaude_code/core/bash_mode.py +276 -0
klaude_code/core/executor.py +40 -7
klaude_code/core/manager/llm_clients.py +1 -0
klaude_code/core/manager/llm_clients_builder.py +2 -2
klaude_code/core/memory.py +140 -0
klaude_code/core/reminders.py +17 -89
klaude_code/core/task.py +1 -1
klaude_code/core/tool/file/read_tool.py +13 -2
klaude_code/core/tool/shell/bash_tool.py +1 -1
klaude_code/core/turn.py +10 -4
klaude_code/llm/bedrock_anthropic/__init__.py +3 -0
klaude_code/llm/input_common.py +18 -0
klaude_code/llm/{codex → openai_codex}/__init__.py +1 -1
klaude_code/llm/{codex → openai_codex}/client.py +3 -3
klaude_code/llm/openai_compatible/client.py +3 -1
klaude_code/llm/openai_compatible/stream.py +19 -9
klaude_code/llm/{responses → openai_responses}/client.py +1 -1
klaude_code/llm/registry.py +3 -3
klaude_code/llm/stream_parts.py +3 -1
klaude_code/llm/usage.py +1 -1
klaude_code/protocol/events.py +17 -1
klaude_code/protocol/message.py +1 -0
klaude_code/protocol/model.py +14 -1
klaude_code/protocol/op.py +12 -0
klaude_code/protocol/op_handler.py +5 -0
klaude_code/session/session.py +22 -1
klaude_code/tui/command/resume_cmd.py +1 -1
klaude_code/tui/commands.py +15 -0
klaude_code/tui/components/bash_syntax.py +4 -0
klaude_code/tui/components/command_output.py +4 -5
klaude_code/tui/components/developer.py +1 -3
klaude_code/tui/components/diffs.py +3 -2
klaude_code/tui/components/metadata.py +23 -26
klaude_code/tui/components/rich/code_panel.py +31 -16
klaude_code/tui/components/rich/markdown.py +44 -28
klaude_code/tui/components/rich/status.py +2 -2
klaude_code/tui/components/rich/theme.py +28 -16
klaude_code/tui/components/tools.py +23 -0
klaude_code/tui/components/user_input.py +49 -58
klaude_code/tui/components/welcome.py +47 -2
klaude_code/tui/display.py +15 -7
klaude_code/tui/input/completers.py +8 -0
klaude_code/tui/input/key_bindings.py +37 -1
klaude_code/tui/input/prompt_toolkit.py +58 -31
klaude_code/tui/machine.py +87 -49
klaude_code/tui/renderer.py +148 -30
klaude_code/tui/runner.py +22 -0
klaude_code/tui/terminal/image.py +24 -3
klaude_code/tui/terminal/notifier.py +11 -12
klaude_code/tui/terminal/selector.py +1 -1
klaude_code/ui/terminal/title.py +4 -2
{klaude_code-2.9.0.dist-info → klaude_code-2.10.0.dist-info}/METADATA +1 -1
{klaude_code-2.9.0.dist-info → klaude_code-2.10.0.dist-info}/RECORD +67 -66
klaude_code/llm/bedrock/__init__.py +0 -3
klaude_code/tui/components/assistant.py +0 -2
/klaude_code/llm/{bedrock → bedrock_anthropic}/client.py +0 -0
/klaude_code/llm/{codex → openai_codex}/prompt_sync.py +0 -0
/klaude_code/llm/{responses → openai_responses}/__init__.py +0 -0
/klaude_code/llm/{responses → openai_responses}/input.py +0 -0
{klaude_code-2.9.0.dist-info → klaude_code-2.10.0.dist-info}/WHEEL +0 -0
{klaude_code-2.9.0.dist-info → klaude_code-2.10.0.dist-info}/entry_points.txt +0 -0

klaude_code/tui/components/rich/markdown.py CHANGED Viewed

@@ -14,7 +14,6 @@ from rich import box
 from rich._loop import loop_first
 from rich.console import Console, ConsoleOptions, RenderableType, RenderResult
 from rich.markdown import CodeBlock, Heading, ImageItem, ListItem, Markdown, MarkdownElement, TableElement
-from rich.rule import Rule
 from rich.segment import Segment
 from rich.style import Style, StyleType
 from rich.syntax import Syntax
@@ -23,12 +22,10 @@ from rich.text import Text
 from rich.theme import Theme
 from klaude_code.const import (
-    MARKDOWN_RIGHT_MARGIN,
     MARKDOWN_STREAM_LIVE_REPAINT_ENABLED,
     MARKDOWN_STREAM_SYNCHRONIZED_OUTPUT_ENABLED,
     UI_REFRESH_RATE_FPS,
 )
-from klaude_code.tui.components.rich.code_panel import CodePanel
 _THINKING_HTML_BLOCK_RE = re.compile(
     r"\A\s*<thinking>\s*\n?(?P<body>.*?)(?:\n\s*)?</thinking>\s*\Z",
@@ -92,10 +89,15 @@ class ThinkingHTMLBlock(MarkdownElement):
 class NoInsetCodeBlock(CodeBlock):
-    """A code block with syntax highlighting and no padding."""
+    """A code block with syntax highlighting using markdown fence style."""
     def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
         code = str(self.text).rstrip()
+        lang = self.lexer_name if self.lexer_name != "text" else ""
+        fence_style = console.get_style("markdown.code.fence", default="none")
+        fence_title_style = console.get_style("markdown.code.fence.title", default="none")
+        yield Text.assemble(("```", fence_style), (lang, fence_title_style))
         syntax = Syntax(
             code,
             self.lexer_name,
@@ -103,16 +105,21 @@ class NoInsetCodeBlock(CodeBlock):
             word_wrap=True,
             padding=(0, 0),
         )
-        yield CodePanel(syntax, border_style="markdown.code.border")
+        yield syntax
+        yield Text("```", style=fence_style)
 class ThinkingCodeBlock(CodeBlock):
-    """A code block for thinking content that uses grey styling instead of syntax highlighting."""
+    """A code block for thinking content that uses simple ``` delimiters."""
     def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
         code = str(self.text).rstrip()
-        text = Text(code, "markdown.code.block")
-        yield CodePanel(text, border_style="markdown.code.border")
+        fence_style = "markdown.code.fence"
+        code_style = "markdown.code.block"
+        lang = self.lexer_name if self.lexer_name != "text" else ""
+        yield Text(f"```{lang}", style=fence_style)
+        yield Text(code, style=code_style)
+        yield Text("```", style=fence_style)
 class Divider(MarkdownElement):
@@ -120,7 +127,8 @@ class Divider(MarkdownElement):
     def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
         style = console.get_style("markdown.hr", default="none")
-        yield Rule(style=style, characters="-")
+        width = min(options.max_width, 100)
+        yield Text("-" * width, style=style)
 class MarkdownTable(TableElement):
@@ -153,7 +161,8 @@ class LeftHeading(Heading):
             h1_text = text.assemble((" ", "markdown.h1"), text, (" ", "markdown.h1"))
             yield h1_text
         elif self.tag == "h2":
-            text.stylize(Style(bold=True, underline=False))
+            h2_style = console.get_style("markdown.h2", default="bold")
+            text.stylize(h2_style + Style(underline=False))
             yield text
         else:
             yield text
@@ -288,7 +297,7 @@ class MarkdownStream:
         mark: str | None = None,
         mark_style: StyleType | None = None,
         left_margin: int = 0,
-        right_margin: int = MARKDOWN_RIGHT_MARGIN,
+        right_margin: int = 0,
         markdown_class: Callable[..., Markdown] | None = None,
         image_callback: Callable[[str], None] | None = None,
     ) -> None:
@@ -324,10 +333,10 @@ class MarkdownStream:
         self.theme = theme
         self.console = console
-        self.mark: str | None = mark
-        self.mark_style: StyleType | None = mark_style
         self.left_margin: int = max(left_margin, 0)
+        # Default mark "•" when left_margin >= 2 and no mark specified
+        self.mark: str | None = mark if mark is not None else ("•" if self.left_margin >= 2 else None)
+        self.mark_style: StyleType | None = mark_style
         self.right_margin: int = max(right_margin, 0)
         self.markdown_class: Callable[..., Markdown] = markdown_class or NoInsetMarkdown
@@ -512,12 +521,17 @@ class MarkdownStream:
         collected_images = getattr(markdown, "collected_images", [])
-        # Split rendered output into lines, strip trailing spaces, and apply left margin.
         lines = output.splitlines(keepends=True)
-        indent_prefix = " " * self.left_margin if self.left_margin > 0 else ""
+        use_mark = apply_mark and bool(self.mark) and self.left_margin >= 2
+        # Fast path: no margin, no mark -> just rstrip each line
+        if self.left_margin == 0 and not use_mark:
+            processed_lines = [line.rstrip() + "\n" if line.endswith("\n") else line.rstrip() for line in lines]
+            return processed_lines, list(collected_images)
+        indent_prefix = " " * self.left_margin
         processed_lines: list[str] = []
         mark_applied = False
-        use_mark = apply_mark and bool(self.mark) and self.left_margin >= 2
         # Pre-render styled mark if needed
         styled_mark: str | None = None
@@ -538,7 +552,7 @@ class MarkdownStream:
             if use_mark and not mark_applied and stripped:
                 stripped = f"{styled_mark} {stripped}"
                 mark_applied = True
-            elif indent_prefix:
+            else:
                 stripped = indent_prefix + stripped
             if line.endswith("\n"):
@@ -595,8 +609,11 @@ class MarkdownStream:
         live_text_to_set: Text | None = None
         if not final and MARKDOWN_STREAM_LIVE_REPAINT_ENABLED and self._live_sink is not None:
-            apply_mark_live = self._stable_source_line_count == 0
-            live_lines, _ = self._render_markdown_to_lines(live_source, apply_mark=apply_mark_live)
+            # When nothing is stable yet, we still want to show incremental output.
+            # Apply the mark only for the first (all-live) frame so it stays anchored
+            # to the first visible line of the full message.
+            apply_mark_to_live = stable_line == 0
+            live_lines, _ = self._render_markdown_to_lines(live_source, apply_mark=apply_mark_to_live)
             if self._stable_rendered_lines:
                 stable_trailing_blank = 0
@@ -619,6 +636,13 @@ class MarkdownStream:
             live_text_to_set = Text.from_ansi("".join(live_lines))
         with self._synchronized_output():
+            # Update/clear live area first to avoid blank padding when stable block appears
+            if final:
+                if self._live_sink is not None:
+                    self._live_sink(None)
+            elif live_text_to_set is not None and self._live_sink is not None:
+                self._live_sink(live_text_to_set)
             if stable_chunk_to_print:
                 self.console.print(Text.from_ansi(stable_chunk_to_print), end="\n")
@@ -626,13 +650,5 @@ class MarkdownStream:
                 for img_path in new_images:
                     self._image_callback(img_path)
-            if final:
-                if self._live_sink is not None:
-                    self._live_sink(None)
-                return
-            if live_text_to_set is not None and self._live_sink is not None:
-                self._live_sink(live_text_to_set)
         elapsed = time.time() - start
         self.min_delay = min(max(elapsed * 6, 1.0 / 30), 0.5)

klaude_code/tui/components/rich/status.py CHANGED Viewed

@@ -277,7 +277,7 @@ def truncate_left(text: Text, max_cells: int, *, console: Console, ellipsis: str
     if cell_len(text.plain) <= max_cells:
         return text
-    ellipsis_cells = cell_len(ellipsis)
+    ellipsis_cells = cell_len(ellipsis) + 1  # +1 for trailing space
     if max_cells <= ellipsis_cells:
         # Not enough space to show any meaningful suffix.
         clipped = Text(ellipsis, style=text.style)
@@ -307,7 +307,7 @@ def truncate_left(text: Text, max_cells: int, *, console: Console, ellipsis: str
     except Exception:
         ellipsis_style = suffix.style or text.style
-    return Text.assemble(Text(ellipsis, style=ellipsis_style), suffix)
+    return Text.assemble(Text(ellipsis + " ", style=ellipsis_style), suffix)
 class ShimmerStatusText:

klaude_code/tui/components/rich/theme.py CHANGED Viewed

@@ -21,6 +21,7 @@ class Palette:
     grey_green: str
     purple: str
     lavender: str
+    black: str
     diff_add: str
     diff_add_char: str
     diff_remove: str
@@ -38,6 +39,7 @@ class Palette:
     red_background: str
     grey_background: str
     yellow_background: str
+    user_message_background: str
 LIGHT_PALETTE = Palette(
@@ -55,6 +57,7 @@ LIGHT_PALETTE = Palette(
     grey_green="#96a096",
     purple="#5f5fb7",
     lavender="#7878b0",
+    black="#101827",
     diff_add="#2e5a32 on #dafbe1",
     diff_add_char="#2e5a32 on #aceebb",
     diff_remove="#82071e on #ffecec",
@@ -71,6 +74,7 @@ LIGHT_PALETTE = Palette(
     red_background="#f9ecec",
     grey_background="#f0f0f0",
     yellow_background="#f9f9ec",
+    user_message_background="#f0f0f0",
 )
 DARK_PALETTE = Palette(
@@ -88,6 +92,7 @@ DARK_PALETTE = Palette(
     grey_green="#6d8672",
     purple="#afbafe",
     lavender="#9898b8",
+    black="white",
     diff_add="#c8e6c9 on #1b3928",
     diff_add_char="#c8e6c9 on #2d6b42",
     diff_remove="#ffcdd2 on #3d1f23",
@@ -104,6 +109,7 @@ DARK_PALETTE = Palette(
     red_background="#3d1f23",
     grey_background="#2a2d30",
     yellow_background="#3d3a1a",
+    user_message_background="#2a2d30",
 )
@@ -113,6 +119,7 @@ class ThemeKey(str, Enum):
     # CODE
     CODE_BACKGROUND = "code_background"
+    CODE_PANEL_TITLE = "code_panel.title"
     # PANEL
     SUB_AGENT_RESULT_PANEL = "panel.sub_agent_result"
@@ -255,18 +262,18 @@ def get_theme(theme: str | None = None) -> Themes:
                 ThemeKey.ERROR_DIM.value: "dim " + palette.red,
                 ThemeKey.INTERRUPT.value: palette.red,
                 # USER_INPUT
-                ThemeKey.USER_INPUT.value: palette.magenta,
-                ThemeKey.USER_INPUT_PROMPT.value: "bold " + palette.magenta,
-                ThemeKey.USER_INPUT_AT_PATTERN.value: palette.purple,
-                ThemeKey.USER_INPUT_SLASH_COMMAND.value: "bold " + palette.blue,
-                ThemeKey.USER_INPUT_SKILL.value: "bold " + palette.green,
+                ThemeKey.USER_INPUT.value: f"{palette.magenta} on {palette.user_message_background}",
+                ThemeKey.USER_INPUT_PROMPT.value: f"bold {palette.magenta} on {palette.user_message_background}",
+                ThemeKey.USER_INPUT_AT_PATTERN.value: f"{palette.purple} on {palette.user_message_background}",
+                ThemeKey.USER_INPUT_SLASH_COMMAND.value: f"bold {palette.blue} on {palette.user_message_background}",
+                ThemeKey.USER_INPUT_SKILL.value: f"bold {palette.green} on {palette.user_message_background}",
                 # ASSISTANT
                 ThemeKey.ASSISTANT_MESSAGE_MARK.value: "bold",
                 # METADATA
-                ThemeKey.METADATA.value: palette.lavender,
-                ThemeKey.METADATA_DIM.value: "dim " + palette.lavender,
-                ThemeKey.METADATA_BOLD.value: "bold " + palette.lavender,
-                ThemeKey.METADATA_ITALIC.value: "italic " + palette.lavender,
+                ThemeKey.METADATA.value: palette.blue,
+                ThemeKey.METADATA_DIM.value: "dim " + palette.blue,
+                ThemeKey.METADATA_BOLD.value: "bold " + palette.blue,
+                ThemeKey.METADATA_ITALIC.value: "italic " + palette.blue,
                 # STATUS
                 ThemeKey.STATUS_SPINNER.value: palette.blue,
                 ThemeKey.STATUS_TEXT.value: palette.blue,
@@ -301,9 +308,9 @@ def get_theme(theme: str | None = None) -> Themes:
                 ThemeKey.BASH_HEREDOC_DELIMITER.value: "bold " + palette.grey1,
                 # THINKING
                 ThemeKey.THINKING.value: "italic " + palette.grey2,
-                ThemeKey.THINKING_BOLD.value: "bold italic " + palette.grey1,
+                ThemeKey.THINKING_BOLD.value: "italic " + palette.grey1,
                 # COMPACTION
-                ThemeKey.COMPACTION_SUMMARY.value: "italic " + palette.grey1,
+                ThemeKey.COMPACTION_SUMMARY.value: palette.grey1,
                 # TODO_ITEM
                 ThemeKey.TODO_EXPLANATION.value: palette.grey1 + " italic",
                 ThemeKey.TODO_PENDING_MARK.value: "bold " + palette.grey1,
@@ -345,11 +352,13 @@ def get_theme(theme: str | None = None) -> Themes:
                 "markdown.thinking": "italic " + palette.grey2,
                 "markdown.thinking.tag": palette.grey2,
                 "markdown.code.border": palette.grey3,
+                "markdown.code.fence": palette.grey3,
+                "markdown.code.fence.title": palette.grey1,
                 # Used by ThinkingMarkdown when rendering `<thinking>` blocks.
                 "markdown.code.block": palette.grey1,
-                "markdown.h1": "bold reverse",
+                "markdown.h1": "bold reverse " + palette.black,
                 "markdown.h1.border": palette.grey3,
-                "markdown.h2": "bold underline",
+                "markdown.h2": "bold underline " + palette.black,
                 "markdown.h3": "bold " + palette.grey1,
                 "markdown.h4": "bold " + palette.grey2,
                 "markdown.hr": palette.grey3,
@@ -359,15 +368,18 @@ def get_theme(theme: str | None = None) -> Themes:
                 "markdown.link_url": "underline " + palette.blue,
                 "markdown.table.border": palette.grey2,
                 "markdown.checkbox.checked": palette.green,
+                "markdown.block_quote": palette.cyan,
             }
         ),
         thinking_markdown_theme=Theme(
             styles={
                 # THINKING (used for left-side mark in thinking output)
                 ThemeKey.THINKING.value: "italic " + palette.grey2,
-                ThemeKey.THINKING_BOLD.value: "bold italic " + palette.grey1,
+                ThemeKey.THINKING_BOLD.value: "italic " + palette.grey1,
+                "markdown.strong": "italic " + palette.grey1,
                 "markdown.code": palette.grey1 + " italic on " + palette.code_background,
-                "markdown.code.block": palette.grey1,
+                "markdown.code.block": palette.grey2,
+                "markdown.code.fence": palette.grey3,
                 "markdown.code.border": palette.grey3,
                 "markdown.thinking.tag": palette.grey2 + " dim",
                 "markdown.h1": "bold reverse",
@@ -379,9 +391,9 @@ def get_theme(theme: str | None = None) -> Themes:
                 "markdown.item.number": palette.grey2,
                 "markdown.link": "underline " + palette.blue,
                 "markdown.link_url": "underline " + palette.blue,
-                "markdown.strong": "bold italic " + palette.grey1,
                 "markdown.table.border": palette.grey2,
                 "markdown.checkbox.checked": palette.green,
+                "markdown.block_quote": palette.grey1,
             }
         ),
         code_theme=palette.code_theme,

klaude_code/tui/components/tools.py CHANGED Viewed

@@ -10,8 +10,10 @@ from rich.text import Text
 from klaude_code.const import (
     BASH_OUTPUT_PANEL_THRESHOLD,
+    DIFF_PREFIX_WIDTH,
     INVALID_TOOL_CALL_MAX_LENGTH,
     QUERY_DISPLAY_TRUNCATE_LENGTH,
+    TAB_EXPAND_WIDTH,
     URL_TRUNCATE_MAX_LENGTH,
     WEB_SEARCH_DEFAULT_MAX_RESULTS,
 )
@@ -387,6 +389,24 @@ def render_generic_tool_result(result: str, *, is_error: bool = False) -> Render
     return text
+def render_read_preview(ui_extra: model.ReadPreviewUIExtra) -> RenderableType:
+    """Render read preview with line numbers aligned to diff style."""
+    grid = create_grid()
+    grid.padding = (0, 0)
+    for line in ui_extra.lines:
+        prefix = f"{line.line_no:>{DIFF_PREFIX_WIDTH}}  "
+        content = line.content.expandtabs(TAB_EXPAND_WIDTH)
+        grid.add_row(Text(prefix, ThemeKey.TOOL_RESULT), Text(content, ThemeKey.TOOL_RESULT))
+    if ui_extra.remaining_lines > 0:
+        remaining_prefix = f"{'⋮':>{DIFF_PREFIX_WIDTH}}  "
+        remaining_text = Text(f"(more {ui_extra.remaining_lines} lines)", ThemeKey.TOOL_RESULT_TRUNCATED)
+        grid.add_row(Text(remaining_prefix, ThemeKey.TOOL_RESULT_TRUNCATED), remaining_text)
+    return grid
 def _extract_mermaid_link(
     ui_extra: model.ToolResultUIExtra | None,
 ) -> model.MermaidLinkUIExtra | None:
@@ -545,6 +565,7 @@ _TOOL_ACTIVE_FORM: dict[str, str] = {
     tools.WEB_SEARCH: "Searching Web",
     tools.REPORT_BACK: "Reporting",
     tools.IMAGE_GEN: "Generating Image",
+    tools.TASK: "Spawning Task",
 }
@@ -678,6 +699,8 @@ def render_tool_result(
     match e.tool_name:
         case tools.READ:
+            if isinstance(e.ui_extra, model.ReadPreviewUIExtra):
+                return wrap(render_read_preview(e.ui_extra))
             return None
         case tools.EDIT:
             return wrap(r_diffs.render_structured_diff(diff_ui) if diff_ui else Text(""))

klaude_code/tui/components/user_input.py CHANGED Viewed

@@ -1,20 +1,19 @@
 import re
 from rich.console import Group, RenderableType
+from rich.padding import Padding
 from rich.text import Text
-from klaude_code.skill import get_available_skills
-from klaude_code.tui.components.common import create_grid
+from klaude_code.const import TAB_EXPAND_WIDTH
+from klaude_code.skill import list_skill_names
+from klaude_code.tui.components.bash_syntax import highlight_bash_command
 from klaude_code.tui.components.rich.theme import ThemeKey
-# Match @-file patterns only when they appear at the beginning of the line
+# Match inline patterns only when they appear at the beginning of the line
 # or immediately after whitespace, to avoid treating mid-word email-like
 # patterns such as foo@bar.com as file references.
-AT_FILE_RENDER_PATTERN = re.compile(r'(?<!\S)@("([^"]+)"|\S+)')
-# Match $skill or ¥skill pattern inline (at start of line or after whitespace)
-SKILL_RENDER_PATTERN = re.compile(r"(?<!\S)[$¥](\S+)")
+# Group 1 is present only for $/¥ skills and captures the skill token (without the $/¥).
+INLINE_RENDER_PATTERN = re.compile(r'(?<!\S)(?:@(?:"[^"]+"|\S+)|[$¥](\S+))')
 USER_MESSAGE_MARK = "❯ "
@@ -23,85 +22,77 @@ def render_at_and_skill_patterns(
     at_style: str = ThemeKey.USER_INPUT_AT_PATTERN,
     skill_style: str = ThemeKey.USER_INPUT_SKILL,
     other_style: str = ThemeKey.USER_INPUT,
+    available_skill_names: set[str] | None = None,
 ) -> Text:
     """Render text with highlighted @file and $skill patterns."""
-    has_at = "@" in text
-    has_skill = "$" in text or "\u00a5" in text  # $ or ¥
-    if not has_at and not has_skill:
-        return Text(text, style=other_style)
-    # Collect all matches with their styles
-    matches: list[tuple[int, int, str]] = []  # (start, end, style)
-    if has_at:
-        for match in AT_FILE_RENDER_PATTERN.finditer(text):
-            matches.append((match.start(), match.end(), at_style))
-    if has_skill:
-        for match in SKILL_RENDER_PATTERN.finditer(text):
-            skill_name = match.group(1)
-            if _is_valid_skill_name(skill_name):
-                matches.append((match.start(), match.end(), skill_style))
-    if not matches:
-        return Text(text, style=other_style)
-    # Sort by start position
-    matches.sort(key=lambda x: x[0])
+    result = Text(text, style=other_style)
+    for match in INLINE_RENDER_PATTERN.finditer(text):
+        skill_name = match.group(1)
+        if skill_name is None:
+            result.stylize(at_style, match.start(), match.end())
+            continue
-    result = Text("")
-    last_end = 0
-    for start, end, style in matches:
-        if start < last_end:
-            continue  # Skip overlapping matches
-        if start > last_end:
-            result.append_text(Text(text[last_end:start], other_style))
-        result.append_text(Text(text[start:end], style))
-        last_end = end
+        if available_skill_names is None:
+            available_skill_names = set(list_skill_names())
-    if last_end < len(text):
-        result.append_text(Text(text[last_end:], other_style))
+        short = skill_name.split(":")[-1] if ":" in skill_name else skill_name
+        if skill_name in available_skill_names or short in available_skill_names:
+            result.stylize(skill_style, match.start(), match.end())
     return result
-def _is_valid_skill_name(name: str) -> bool:
-    """Check if a skill name is valid (exists in loaded skills)."""
-    short = name.split(":")[-1] if ":" in name else name
-    available_skills = get_available_skills()
-    return any(skill_name in (name, short) for skill_name, _, _ in available_skills)
 def render_user_input(content: str) -> RenderableType:
     """Render a user message as a group of quoted lines with styles.
     - Highlights slash command token on the first line
     - Highlights @file and $skill patterns in all lines
+    - Wrapped in a Panel for block-style background
     """
     lines = content.strip().split("\n")
+    is_bash_mode = bool(lines) and lines[0].startswith("!")
+    available_skill_names: set[str] | None = None
     renderables: list[RenderableType] = []
     for i, line in enumerate(lines):
+        if not line.strip():
+            continue
+        if "\t" in line:
+            line = line.expandtabs(TAB_EXPAND_WIDTH)
+        if is_bash_mode and i == 0:
+            renderables.append(highlight_bash_command(line[1:]))
+            continue
+        if is_bash_mode and i > 0:
+            renderables.append(highlight_bash_command(line))
+            continue
+        if available_skill_names is None and ("$" in line or "\u00a5" in line):
+            available_skill_names = set(list_skill_names())
         # Handle slash command on first line
         if i == 0 and line.startswith("/"):
             splits = line.split(" ", maxsplit=1)
             line_text = Text.assemble(
                 (splits[0], ThemeKey.USER_INPUT_SLASH_COMMAND),
                 " ",
-                render_at_and_skill_patterns(splits[1]) if len(splits) > 1 else Text(""),
+                render_at_and_skill_patterns(splits[1], available_skill_names=available_skill_names)
+                if len(splits) > 1
+                else Text(""),
             )
             renderables.append(line_text)
             continue
         # Render @file and $skill patterns
-        renderables.append(render_at_and_skill_patterns(line))
+        renderables.append(render_at_and_skill_patterns(line, available_skill_names=available_skill_names))
-    grid = create_grid()
-    grid.padding = (0, 0)
-    mark = Text(USER_MESSAGE_MARK, style=ThemeKey.USER_INPUT_PROMPT)
-    grid.add_row(mark, Group(*renderables))
-    return grid
+    return Padding(
+        Group(*renderables),
+        pad=(0, 1),
+        style=ThemeKey.USER_INPUT,
+        expand=False,
+    )
 def render_interrupt() -> RenderableType:
-    return Text("  Interrupted by user\n", style=ThemeKey.INTERRUPT)
+    return Text("Interrupted by user", style=ThemeKey.INTERRUPT)

klaude_code/tui/components/welcome.py CHANGED Viewed

@@ -1,4 +1,5 @@
 from importlib.metadata import PackageNotFoundError, version
+from pathlib import Path
 from rich.console import Group, RenderableType
 from rich.text import Text
@@ -10,6 +11,19 @@ from klaude_code.tui.components.rich.theme import ThemeKey
 from klaude_code.ui.common import format_model_params
+def _format_memory_path(path: str, *, work_dir: Path) -> str:
+    """Format memory path for display - show relative path or ~ for home."""
+    p = Path(path)
+    try:
+        return str(p.relative_to(work_dir))
+    except ValueError:
+        pass
+    try:
+        return f"~/{p.relative_to(Path.home())}"
+    except ValueError:
+        return path
 def _get_version() -> str:
     """Get the current version of klaude-code."""
     try:
@@ -50,7 +64,7 @@ def render_welcome(e: events.WelcomeEvent) -> RenderableType:
     # Render config items with tree-style prefixes
     for i, param_str in enumerate(param_strings):
         is_last = i == len(param_strings) - 1
-        prefix = "└─ " if is_last else "├─ "
+        prefix = "╰─ " if is_last else "├─ "
         panel_content.append_text(
             Text.assemble(
                 ("\n", ThemeKey.WELCOME_INFO),
@@ -59,6 +73,37 @@ def render_welcome(e: events.WelcomeEvent) -> RenderableType:
             )
         )
+    # Loaded memories summary
+    work_dir = Path(e.work_dir)
+    loaded_memories = e.loaded_memories or {}
+    user_memories = loaded_memories.get("user") or []
+    project_memories = loaded_memories.get("project") or []
+    memory_groups: list[tuple[str, list[str]]] = []
+    if user_memories:
+        memory_groups.append(("user", user_memories))
+    if project_memories:
+        memory_groups.append(("project", project_memories))
+    if memory_groups:
+        panel_content.append_text(Text("\n\n", style=ThemeKey.WELCOME_INFO))
+        panel_content.append_text(Text("context", style=ThemeKey.WELCOME_HIGHLIGHT))
+        label_width = len("[project]")
+        for i, (group_name, paths) in enumerate(memory_groups):
+            is_last = i == len(memory_groups) - 1
+            prefix = "╰─ " if is_last else "├─ "
+            label = f"[{group_name}]"
+            formatted_paths = ", ".join(_format_memory_path(p, work_dir=work_dir) for p in paths)
+            panel_content.append_text(
+                Text.assemble(
+                    ("\n", ThemeKey.WELCOME_INFO),
+                    (prefix, ThemeKey.LINES),
+                    (f"{label.ljust(label_width)} {formatted_paths}", ThemeKey.WELCOME_INFO),
+                )
+            )
     # Loaded skills summary is provided by core via WelcomeEvent to keep TUI decoupled.
     loaded_skills = e.loaded_skills or {}
     user_skills = loaded_skills.get("user") or []
@@ -81,7 +126,7 @@ def render_welcome(e: events.WelcomeEvent) -> RenderableType:
         for i, (group_name, skills) in enumerate(skill_groups):
             is_last = i == len(skill_groups) - 1
-            prefix = "└─ " if is_last else "├─ "
+            prefix = "╰─ " if is_last else "├─ "
             label = f"[{group_name}]"
             panel_content.append_text(
                 Text.assemble(

klaude_code/tui/display.py CHANGED Viewed

@@ -31,12 +31,20 @@ class TUIDisplay(DisplayABC):
     @override
     async def consume_event(self, event: events.Event) -> None:
         if isinstance(event, events.ReplayHistoryEvent):
-            await self._renderer.execute(self._machine.begin_replay())
-            for item in event.events:
-                commands = self._machine.transition_replay(item)
-                if commands:
-                    await self._renderer.execute(commands)
-            await self._renderer.execute(self._machine.end_replay())
+            # Replay does not need streaming UI; disable bottom Live rendering to avoid
+            # repaint overhead and flicker while reconstructing history.
+            self._renderer.stop_bottom_live()
+            self._renderer.set_stream_renderable(None)
+            self._renderer.set_replay_mode(True)
+            try:
+                await self._renderer.execute(self._machine.begin_replay())
+                for item in event.events:
+                    commands = self._machine.transition_replay(item)
+                    if commands:
+                        await self._renderer.execute(commands)
+                await self._renderer.execute(self._machine.end_replay())
+            finally:
+                self._renderer.set_replay_mode(False)
             return
         commands = self._machine.transition(event)
@@ -92,4 +100,4 @@ class TUIDisplay(DisplayABC):
         with contextlib.suppress(Exception):
             self._renderer.spinner_stop()
         with contextlib.suppress(Exception):
-            self._renderer.stop_bottom_live()
+            self._renderer.stop_bottom_live()

klaude-code 2.9.0__py3-none-any.whl → 2.10.0__py3-none-any.whl

klaude-code 2.9.0py3-none-any.whl → 2.10.0py3-none-any.whl