klaude-code 1.4.1__tar.gz → 1.4.3__tar.gz

{klaude_code-1.4.1 → klaude_code-1.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 1.4.1
+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.1 → klaude_code-1.4.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "klaude-code"
-version = "1.4.1"
+version = "1.4.3"
 description = "Minimal code agent CLI"
 readme = "README.md"
 requires-python = ">=3.13"

{klaude_code-1.4.1 → klaude_code-1.4.3}/src/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: bold command name, normal hint, gray summary
-            display_text = HTML(
-                f"<b>{cmd_name}</b>{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: bold skill name, cyan location tag, gray description
-            display_text = HTML(
-                f"<b>{name}</b>{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]]:
@@ -322,7 +304,8 @@ class _AtFilesCompleter(Completer):
                 yield Completion(
                     text=self._format_completion_text(s, is_quoted=is_quoted),
                     start_position=start_position,
-                    display=s,
+                    display=self._format_display_label(s, 0),
+                    display_meta=s,
                 )
             return []  # type: ignore[reportUnknownVariableType]
 
@@ -338,7 +321,8 @@ class _AtFilesCompleter(Completer):
             yield Completion(
                 text=self._format_completion_text(s, is_quoted=is_quoted),
                 start_position=start_position,
-                display=s,
+                display=self._format_display_label(s, 0),
+                display_meta=s,
             )
 
     # ---- Core logic ----
@@ -457,11 +441,13 @@ class _AtFilesCompleter(Completer):
         keyword_norm: str,
     ) -> list[str]:
         # Filter to keyword (case-insensitive) and rank by:
-        # 1. Directory depth (shallower first)
-        # 2. Basename hit first, then path hit position, then length
+        # 1. Hidden files (starting with .) are deprioritized
+        # 2. Paths containing "test" are deprioritized
+        # 3. Directory depth (shallower first)
+        # 4. Basename hit first, then path hit position, then length
         # Since both fd and rg now search from current directory, all paths are relative to cwd
         kn = keyword_norm
-        out: list[tuple[str, tuple[int, int, int, int, int]]] = []
+        out: list[tuple[str, tuple[int, int, int, int, int, int, int]]] = []
         for p in paths_from_root:
             pl = p.lower()
             if kn not in pl:
@@ -477,7 +463,15 @@ class _AtFilesCompleter(Completer):
             base_pos = base.find(kn)
             path_pos = pl.find(kn)
             depth = rel_to_cwd.rstrip("/").count("/")
+
+            # Deprioritize hidden files/directories (any path segment starting with .)
+            is_hidden = any(seg.startswith(".") for seg in rel_to_cwd.split("/") if seg)
+            # Deprioritize paths containing "test"
+            has_test = "test" in pl
+
             score = (
+                1 if is_hidden else 0,
+                1 if has_test else 0,
                 depth,
                 0 if base_pos != -1 else 1,
                 base_pos if base_pos != -1 else 10_000,
@@ -523,6 +517,34 @@ class _AtFilesCompleter(Completer):
             return f'@"{suggestion}" '
         return f"@{suggestion} "
 
+    def _format_display_label(self, suggestion: str, align_width: int) -> str:
+        """Format visible label for a completion option.
+
+        Keep this unstyled so that the completion menu's selection style can
+        fully override the selected row.
+        """
+
+        _ = align_width
+        return self._display_name(suggestion)
+
+    def _display_align_width(self, suggestions: list[str]) -> int:
+        """Calculate alignment width for display labels."""
+
+        return max((len(self._display_name(s)) for s in suggestions), default=0)
+
+    def _display_name(self, suggestion: str) -> str:
+        """Return the basename (with trailing slash for directories) for display."""
+
+        if not suggestion:
+            return suggestion
+
+        is_dir = suggestion.endswith("/")
+        stripped = suggestion.rstrip("/")
+        base = stripped.split("/")[-1] if stripped else suggestion
+        if is_dir:
+            return f"{base}/"
+        return base
+
     def _same_scope(self, prev_key: str, cur_key: str) -> bool:
         # Consider same scope if they share the same base directory and one prefix startswith the other
         try:
@@ -677,11 +699,20 @@ class _AtFilesCompleter(Completer):
 
         Avoids running external tools; shows immediate directories first, then files.
         Filters out .git, .venv, and node_modules to reduce noise.
+        Hidden files and paths containing "test" are deprioritized.
         """
         excluded = {".git", ".venv", "node_modules"}
         items: list[str] = []
         try:
-            for p in sorted(cwd.iterdir(), key=lambda x: (not x.is_dir(), x.name.lower())):
+            # Sort by: hidden files last, test paths last, directories first, then name
+            def sort_key(p: Path) -> tuple[int, int, int, str]:
+                name = p.name
+                is_hidden = name.startswith(".")
+                has_test = "test" in name.lower()
+                is_file = not p.is_dir()
+                return (1 if is_hidden else 0, 1 if has_test else 0, 1 if is_file else 0, name.lower())
+
+            for p in sorted(cwd.iterdir(), key=sort_key):
                 name = p.name
                 if name in excluded:
                     continue

{klaude_code-1.4.1 → klaude_code-1.4.3}/src/klaude_code/ui/modes/repl/input_prompt_toolkit.py

@@ -6,13 +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, 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
@@ -29,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"
@@ -42,6 +49,128 @@ PLACEHOLDER_SYMBOL_STYLE_LIGHT_BG = "bg:#e6e6e6 fg:#7a7a7a"
 PLACEHOLDER_SYMBOL_STYLE_UNKNOWN_BG = "bg:#2a2a2a fg:#8a8a8a"
 
 
+def _left_align_completion_menus(container: Container) -> None:
+    """Force completion menus to render at column 0.
+
+    prompt_toolkit's default completion menu floats are positioned relative to the
+    cursor (`xcursor=True`). That makes the popup indent as the caret moves.
+    We walk the layout tree and rewrite the Float positioning for completion menus
+    to keep them fixed at the left edge.
+    """
+
+    if isinstance(container, FloatContainer):
+        for flt in container.floats:
+            if isinstance(flt.content, (CompletionsMenu, MultiColumnCompletionsMenu)):
+                flt.xcursor = False
+                flt.left = 0
+
+    for child in container.get_children():
+        _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,
@@ -98,14 +227,22 @@ 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}",
                 }
             ),
         )
 
+        # Keep completion popups left-aligned instead of shifting with the caret.
+        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."""