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

klaude_code/ui/modes/repl/completers.py

@@ -19,15 +19,15 @@ import re
 import shutil
 import subprocess
 import time
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from pathlib import Path
 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.protocol.commands import CommandInfo
 from klaude_code.trace.log import DebugType, log_debug
 
 # Pattern to match @token for completion refresh (used by key bindings).
@@ -40,12 +40,18 @@ AT_TOKEN_PATTERN = re.compile(r'(^|\s)@(?P<frag>"[^"]*"|[^\s]*)$')
 SKILL_TOKEN_PATTERN = re.compile(r"^[$¥](?P<frag>\S*)$")
 
 
-def create_repl_completer() -> Completer:
+def create_repl_completer(
+    command_info_provider: Callable[[], list[CommandInfo]] | None = None,
+) -> Completer:
     """Create and return the combined REPL completer.
 
+    Args:
+        command_info_provider: Optional callable that returns command metadata.
+            If None, slash command completion is disabled.
+
     Returns a completer that handles both @ file paths and / slash commands.
     """
-    return _ComboCompleter()
+    return _ComboCompleter(command_info_provider=command_info_provider)
 
 
 class _CmdResult(NamedTuple):
@@ -66,6 +72,9 @@ class _SlashCommandCompleter(Completer):
 
     _SLASH_TOKEN_RE = re.compile(r"^/(?P<frag>\S*)$")
 
+    def __init__(self, command_info_provider: Callable[[], list[CommandInfo]] | None = None) -> None:
+        self._command_info_provider = command_info_provider
+
     def get_completions(
         self,
         document: Document,
@@ -75,6 +84,9 @@ class _SlashCommandCompleter(Completer):
         if document.cursor_position_row != 0:
             return
 
+        if self._command_info_provider is None:
+            return
+
         text_before = document.current_line_before_cursor
         m = self._SLASH_TOKEN_RE.search(text_before)
         if not m:
@@ -84,38 +96,28 @@ class _SlashCommandCompleter(Completer):
         token_start = len(text_before) - len(f"/{frag}")
         start_position = token_start - len(text_before)  # negative offset
 
-        # Get available commands
-        commands = get_commands()
+        # Get available commands from provider
+        command_infos = self._command_info_provider()
 
         # Filter commands that match the fragment (preserve registration order)
-        matched: list[tuple[str, object, 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 ""
-                matched.append((cmd_name, cmd_obj, hint))
+        matched: list[tuple[str, CommandInfo, str]] = []
+        for cmd_info in command_infos:
+            if cmd_info.name.startswith(frag):
+                hint = f" [{cmd_info.placeholder}]" if cmd_info.support_addition_params else ""
+                matched.append((cmd_info.name, cmd_info, hint))
 
         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]
-            )
+        for cmd_name, cmd_info, hint in matched:
             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=cmd_info.summary,
             )
 
     def is_slash_command_context(self, document: Document) -> bool:
@@ -171,26 +173,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]]:
@@ -218,9 +212,9 @@ class _SkillCompleter(Completer):
 class _ComboCompleter(Completer):
     """Combined completer that handles @ file paths, / slash commands, and $ skills."""
 
-    def __init__(self) -> None:
+    def __init__(self, command_info_provider: Callable[[], list[CommandInfo]] | None = None) -> None:
         self._at_completer = _AtFilesCompleter()
-        self._slash_completer = _SlashCommandCompleter()
+        self._slash_completer = _SlashCommandCompleter(command_info_provider=command_info_provider)
         self._skill_completer = _SkillCompleter()
 
     def get_completions(
@@ -318,14 +312,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 +328,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 +529,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/event_handler.py

@@ -15,7 +15,7 @@ from klaude_code.ui.renderers.thinking import THINKING_MESSAGE_MARK, normalize_t
 from klaude_code.ui.rich import status as r_status
 from klaude_code.ui.rich.markdown import MarkdownStream, ThinkingMarkdown
 from klaude_code.ui.rich.theme import ThemeKey
-from klaude_code.ui.terminal.notifier import Notification, NotificationType, TerminalNotifier
+from klaude_code.ui.terminal.notifier import Notification, NotificationType, TerminalNotifier, emit_tmux_signal
 from klaude_code.ui.terminal.progress_bar import OSC94States, emit_osc94
 
 
@@ -509,6 +509,7 @@ class DisplayEventHandler:
             self.spinner_status.reset()
             self.renderer.spinner_stop()
             self.renderer.console.print(Rule(characters="─", style=ThemeKey.LINES))
+            emit_tmux_signal()  # Signal test harness if KLAUDE_TEST_SIGNAL is set
         await self.stage_manager.transition_to(Stage.WAITING)
         self._maybe_notify_task_finish(event)