klaude-code 1.4.2__py3-none-any.whl → 1.4.3__py3-none-any.whl

klaude_code/ui/modes/repl/completers.py

@@ -25,9 +25,9 @@ from typing import NamedTuple
 
 from prompt_toolkit.completion import Completer, Completion
 from prompt_toolkit.document import Document
-from prompt_toolkit.formatted_text import HTML
+from prompt_toolkit.formatted_text import FormattedText
 
-from klaude_code.command import get_commands
+from klaude_code.command import CommandABC, get_commands
 from klaude_code.trace.log import DebugType, log_debug
 
 # Pattern to match @token for completion refresh (used by key bindings).
@@ -88,7 +88,7 @@ class _SlashCommandCompleter(Completer):
         commands = get_commands()
 
         # Filter commands that match the fragment (preserve registration order)
-        matched: list[tuple[str, object, str]] = []
+        matched: list[tuple[str, CommandABC, str]] = []
         for cmd_name, cmd_obj in commands.items():
             if cmd_name.startswith(frag):
                 hint = f" [{cmd_obj.placeholder}]" if cmd_obj.support_addition_params else ""
@@ -97,25 +97,15 @@ class _SlashCommandCompleter(Completer):
         if not matched:
             return
 
-        # Calculate max width for alignment
-        # Find the longest command+hint length
-        max_len = max(len(name) + len(hint) for name, _, hint in matched)
-        # Set a minimum width (e.g. 20) and add some padding
-        align_width = max(max_len, 20) + 2
-
         for cmd_name, cmd_obj, hint in matched:
-            label_len = len(cmd_name) + len(hint)
-            padding = " " * (align_width - label_len)
-
-            # Using HTML for formatting: default color command name, normal hint, gray summary
-            display_text = HTML(
-                f"<style color='ansidefault'>{cmd_name}</style>{hint}{padding}<style color='ansibrightblack'>{cmd_obj.summary}</style>"  # pyright: ignore[reportUnknownMemberType, reportAttributeAccessIssue]
-            )
             completion_text = f"/{cmd_name} "
+            # Use FormattedText to style the hint (placeholder) in bright black
+            display = FormattedText([("", cmd_name), ("ansibrightblack", hint)]) if hint else cmd_name
             yield Completion(
                 text=completion_text,
                 start_position=start_position,
-                display=display_text,
+                display=display,
+                display_meta=str(cmd_obj.summary),
             )
 
     def is_slash_command_context(self, document: Document) -> bool:
@@ -171,26 +161,18 @@ class _SkillCompleter(Completer):
         if not matched:
             return
 
-        # Calculate max width for alignment
-        max_name_len = max(len(name) for name, _, _ in matched)
-        align_width = max(max_name_len, 20) + 2
+        # Calculate max location length for alignment
+        max_loc_len = max(len(loc) for _, _, loc in matched)
 
         for name, desc, location in matched:
-            # Format: name  [location]  description
-            # Align location tags (max length is "project" = 7, plus brackets = 9)
-            padding_name = " " * (align_width - len(name))
-            location_tag = f"[{location}]".ljust(9)
-
-            # Using HTML for formatting: default color skill name, cyan location tag, gray description
-            display_text = HTML(
-                f"<style color='ansidefault'>{name}</style>{padding_name}<style color='ansicyan'>{location_tag}</style> "
-                f"<style color='ansibrightblack'>{desc}</style>"
-            )
             completion_text = f"${name} "
+            # Pad location to align descriptions
+            padded_location = f"[{location}]".ljust(max_loc_len + 2)  # +2 for brackets
             yield Completion(
                 text=completion_text,
                 start_position=start_position,
-                display=display_text,
+                display=name,
+                display_meta=f"{padded_location} {desc}",
             )
 
     def _get_available_skills(self) -> list[tuple[str, str, str]]:
@@ -318,14 +300,12 @@ class _AtFilesCompleter(Completer):
             if not suggestions:
                 return []  # type: ignore[reportUnknownVariableType]
             start_position = token_start_in_input - len(text_before)
-            visible_suggestions = suggestions[: self._max_results]
-            display_align = self._display_align_width(visible_suggestions)
-
-            for s in visible_suggestions:
+            for s in suggestions[: self._max_results]:
                 yield Completion(
                     text=self._format_completion_text(s, is_quoted=is_quoted),
                     start_position=start_position,
-                    display=self._format_display_label(s, display_align),
+                    display=self._format_display_label(s, 0),
+                    display_meta=s,
                 )
             return []  # type: ignore[reportUnknownVariableType]
 
@@ -336,15 +316,13 @@ class _AtFilesCompleter(Completer):
 
         # Prepare Completion objects. Replace from the '@' character.
         start_position = token_start_in_input - len(text_before)  # negative
-        visible_suggestions = suggestions[: self._max_results]
-        display_align = self._display_align_width(visible_suggestions)
-
-        for s in visible_suggestions:
+        for s in suggestions[: self._max_results]:
             # Insert formatted text (with quoting when needed) so that subsequent typing does not keep triggering
             yield Completion(
                 text=self._format_completion_text(s, is_quoted=is_quoted),
                 start_position=start_position,
-                display=self._format_display_label(s, display_align),
+                display=self._format_display_label(s, 0),
+                display_meta=s,
             )
 
     # ---- Core logic ----
@@ -539,15 +517,15 @@ class _AtFilesCompleter(Completer):
             return f'@"{suggestion}" '
         return f"@{suggestion} "
 
-    def _format_display_label(self, suggestion: str, align_width: int) -> HTML:
+    def _format_display_label(self, suggestion: str, align_width: int) -> str:
         """Format visible label for a completion option.
 
-        Shows the basename (or directory name) aligned, followed by the full path in gray.
+        Keep this unstyled so that the completion menu's selection style can
+        fully override the selected row.
         """
 
-        name = self._display_name(suggestion)
-        padding = " " * (max(align_width - len(name), 0) + 2)
-        return HTML(f"<style color='ansidefault'>{name}</style>{padding}<style color='ansibrightblack'>{suggestion}</style>")
+        _ = align_width
+        return self._display_name(suggestion)
 
     def _display_align_width(self, suggestions: list[str]) -> int:
         """Calculate alignment width for display labels."""

klaude_code/ui/modes/repl/input_prompt_toolkit.py

@@ -6,15 +6,20 @@ from collections.abc import AsyncIterator, Callable
 from pathlib import Path
 from typing import NamedTuple, override
 
+import prompt_toolkit.layout.menus as pt_menus
 from prompt_toolkit import PromptSession
-from prompt_toolkit.completion import ThreadedCompleter
+from prompt_toolkit.application.current import get_app
+from prompt_toolkit.completion import Completion, ThreadedCompleter
 from prompt_toolkit.cursor_shapes import CursorShape
-from prompt_toolkit.formatted_text import FormattedText
+from prompt_toolkit.data_structures import Point
+from prompt_toolkit.formatted_text import FormattedText, StyleAndTextTuples, to_formatted_text
 from prompt_toolkit.history import FileHistory
-from prompt_toolkit.layout.containers import Container, FloatContainer
+from prompt_toolkit.layout.containers import Container, FloatContainer, Window
+from prompt_toolkit.layout.controls import UIContent
 from prompt_toolkit.layout.menus import CompletionsMenu, MultiColumnCompletionsMenu
 from prompt_toolkit.patch_stdout import patch_stdout
 from prompt_toolkit.styles import Style
+from prompt_toolkit.utils import get_cwidth
 
 from klaude_code.protocol.model import UserInputPayload
 from klaude_code.ui.core.input import InputProviderABC
@@ -31,9 +36,9 @@ class REPLStatusSnapshot(NamedTuple):
     update_message: str | None = None
 
 
-COMPLETION_SELECTED_DARK_BG = "#8b9bff"
-COMPLETION_SELECTED_LIGHT_BG = "#5869f7"
-COMPLETION_SELECTED_UNKNOWN_BG = "#7080f0"
+COMPLETION_SELECTED_DARK_BG = "ansigreen"
+COMPLETION_SELECTED_LIGHT_BG = "ansigreen"
+COMPLETION_SELECTED_UNKNOWN_BG = "ansigreen"
 COMPLETION_MENU = "ansibrightblack"
 INPUT_PROMPT_STYLE = "ansimagenta bold"
 PLACEHOLDER_TEXT_STYLE_DARK_BG = "fg:#5a5a5a italic"
@@ -63,6 +68,109 @@ def _left_align_completion_menus(container: Container) -> None:
         _left_align_completion_menus(child)
 
 
+class _KlaudeCompletionsMenuControl(pt_menus.CompletionsMenuControl):
+    """CompletionsMenuControl with stable 2-char left prefix.
+
+    Requirements:
+    - Add a 2-character prefix for every row.
+    - Render "→ " for the selected row, and "  " for non-selected rows.
+
+    Keep completion text unstyled so that the menu's current-row style can
+    override it entirely.
+    """
+
+    _PREFIX_WIDTH = 2
+
+    def _get_menu_width(self, max_width: int, complete_state: pt_menus.CompletionState) -> int:  # pyright: ignore[reportPrivateImportUsage]
+        """Return the width of the main column.
+
+        This is prompt_toolkit's default implementation, except we reserve one
+        extra character for the 2-char prefix ("→ "/"  ").
+        """
+
+        return min(
+            max_width,
+            max(
+                self.MIN_WIDTH,
+                max(get_cwidth(c.display_text) for c in complete_state.completions) + 3,
+            ),
+        )
+
+    def create_content(self, width: int, height: int) -> UIContent:
+        complete_state = get_app().current_buffer.complete_state
+        if complete_state:
+            completions = complete_state.completions
+            index = complete_state.complete_index
+
+            menu_width = self._get_menu_width(width, complete_state)
+            menu_meta_width = self._get_menu_meta_width(width - menu_width, complete_state)
+            show_meta = self._show_meta(complete_state)
+
+            def get_line(i: int) -> StyleAndTextTuples:
+                completion = completions[i]
+                is_current_completion = i == index
+
+                result = self._get_menu_item_fragments_with_cursor(
+                    completion,
+                    is_current_completion,
+                    menu_width,
+                    space_after=True,
+                )
+                if show_meta:
+                    result += self._get_menu_item_meta_fragments(
+                        completion,
+                        is_current_completion,
+                        menu_meta_width,
+                    )
+                return result
+
+            return UIContent(
+                get_line=get_line,
+                cursor_position=Point(x=0, y=index or 0),
+                line_count=len(completions),
+            )
+
+        return UIContent()
+
+    def _get_menu_item_fragments_with_cursor(
+        self,
+        completion: Completion,
+        is_current_completion: bool,
+        width: int,
+        *,
+        space_after: bool = False,
+    ) -> StyleAndTextTuples:
+        if is_current_completion:
+            style_str = f"class:completion-menu.completion.current {completion.style} {completion.selected_style}"
+            prefix = "→ "
+        else:
+            style_str = "class:completion-menu.completion " + completion.style
+            prefix = "  "
+
+        max_text_width = width - self._PREFIX_WIDTH - (1 if space_after else 0)
+        text, text_width = pt_menus._trim_formatted_text(completion.display, max_text_width)  # pyright: ignore[reportPrivateUsage]
+        padding = " " * (width - self._PREFIX_WIDTH - text_width)
+
+        return to_formatted_text(
+            [("", prefix), *text, ("", padding)],
+            style=style_str,
+        )
+
+
+def _patch_completion_menu_controls(container: Container) -> None:
+    """Replace prompt_toolkit completion menu controls with customized versions."""
+
+    if isinstance(container, Window):
+        content = container.content
+        if isinstance(content, pt_menus.CompletionsMenuControl) and not isinstance(
+            content, _KlaudeCompletionsMenuControl
+        ):
+            container.content = _KlaudeCompletionsMenuControl()
+
+    for child in container.get_children():
+        _patch_completion_menu_controls(child)
+
+
 class PromptToolkitInput(InputProviderABC):
     def __init__(
         self,
@@ -119,10 +227,10 @@ class PromptToolkitInput(InputProviderABC):
                     "completion-menu.border": "bg:default",
                     "scrollbar.background": "bg:default",
                     "scrollbar.button": "bg:default",
-                    "completion-menu.completion": f"bg:default fg:{COMPLETION_MENU}",
+                    "completion-menu.completion": "bg:default fg:default",
                     "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}",
+                    "completion-menu.meta.completion.current": f"bg:default fg:{completion_selected}",
                 }
             ),
         )
@@ -131,6 +239,10 @@ class PromptToolkitInput(InputProviderABC):
         with contextlib.suppress(Exception):
             _left_align_completion_menus(self._session.app.layout.container)
 
+        # Customize completion rendering (2-space indent + selected arrow prefix).
+        with contextlib.suppress(Exception):
+            _patch_completion_menu_controls(self._session.app.layout.container)
+
         def _select_first_completion_on_open(buf) -> None:  # type: ignore[no-untyped-def]
             """Default to selecting the first completion without inserting it."""
 

{klaude_code-1.4.2.dist-info → klaude_code-1.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 1.4.2
+Version: 1.4.3
 Summary: Minimal code agent CLI
 Requires-Dist: anthropic>=0.66.0
 Requires-Dist: chardet>=5.2.0

{klaude_code-1.4.2.dist-info → klaude_code-1.4.3.dist-info}/RECORD

@@ -169,10 +169,10 @@ klaude_code/ui/modes/exec/__init__.py,sha256=RsYa-DmDJj6g7iXb4H9mm2_Cu-KDQOD10RJ
 klaude_code/ui/modes/exec/display.py,sha256=m2kkgaUoGD9rEVUmcm7Vs_PyAI2iruKCJYRhANjSsKo,1965
 klaude_code/ui/modes/repl/__init__.py,sha256=_0II73jlz5JUtvJsZ9sGRJzeHIQyJJpaI0egvmryYNw,286
 klaude_code/ui/modes/repl/clipboard.py,sha256=ZCpk7kRSXGhh0Q_BWtUUuSYT7ZOqRjAoRcg9T9n48Wo,5137
-klaude_code/ui/modes/repl/completers.py,sha256=KrURg92DCrVRhjzsPkN2BM8FgB1RJJX_K5-FtsJplYA,32452
+klaude_code/ui/modes/repl/completers.py,sha256=Q2W3oCXrxjBUH-daVvTNDTqT-aZGNpljMSHQD-XxW4s,31197
 klaude_code/ui/modes/repl/display.py,sha256=06wawOHWO2ItEA9EIEh97p3GDID7TJhAtpaA03nPQXs,2335
 klaude_code/ui/modes/repl/event_handler.py,sha256=pXjiLGilSzrsrr9lsk19NeiRGFjVq91Rtfp1PNLK36A,26026
-klaude_code/ui/modes/repl/input_prompt_toolkit.py,sha256=VPS1Ys3SMoobUO-dBoQIGEljG6GtXM0jFjgtXqBNYRs,9863
+klaude_code/ui/modes/repl/input_prompt_toolkit.py,sha256=WrQ5lyFflerFpeiFdxWyFzRAIQ0O_fOhqMF-IZBvbSU,14122
 klaude_code/ui/modes/repl/key_bindings.py,sha256=NKllb1W0LfJAZEqDjlW2aedBQ2PBEOOddoTiRNY1_mU,12121
 klaude_code/ui/modes/repl/renderer.py,sha256=7cum6SuKSuuBePDSyk4UvWs6q5dwgLA0NrJZ3eD9tHw,15902
 klaude_code/ui/renderers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -205,7 +205,7 @@ klaude_code/ui/terminal/progress_bar.py,sha256=MDnhPbqCnN4GDgLOlxxOEVZPDwVC_XL2N
 klaude_code/ui/terminal/selector.py,sha256=v0akaR4Jw5U_3fgK4INqf0R2nIhRZC-JqhECsF3z22I,9633
 klaude_code/ui/utils/__init__.py,sha256=YEsCLjbCPaPza-UXTPUMTJTrc9BmNBUP5CbFWlshyOQ,15
 klaude_code/ui/utils/common.py,sha256=tqHqwgLtAyP805kwRFyoAL4EgMutcNb3Y-GAXJ4IeuM,2263
-klaude_code-1.4.2.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-klaude_code-1.4.2.dist-info/entry_points.txt,sha256=kkXIXedaTOtjXPr2rVjRVVXZYlFUcBHELaqmyVlWUFA,92
-klaude_code-1.4.2.dist-info/METADATA,sha256=Yoaz0jOUBO0huZ9nl07amskmlLVsq2tsaDRdprQB8l4,9091
-klaude_code-1.4.2.dist-info/RECORD,,
+klaude_code-1.4.3.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+klaude_code-1.4.3.dist-info/entry_points.txt,sha256=kkXIXedaTOtjXPr2rVjRVVXZYlFUcBHELaqmyVlWUFA,92
+klaude_code-1.4.3.dist-info/METADATA,sha256=QOXxiUSRdWeasTsWC7u-WqN3JIEzSxE0fyK3D2gQIjM,9091
+klaude_code-1.4.3.dist-info/RECORD,,