klaude-code 2.8.1__py3-none-any.whl → 2.9.1__py3-none-any.whl

klaude_code/tui/components/sub_agent.py

@@ -1,5 +1,5 @@
 import json
-from typing import Any, cast
+from typing import Any
 
 from rich.console import Group, RenderableType
 from rich.json import JSON
@@ -7,8 +7,7 @@ from rich.style import Style
 from rich.text import Text
 
 from klaude_code.const import SUB_AGENT_RESULT_MAX_LINES
-from klaude_code.protocol import events, model
-from klaude_code.protocol.sub_agent import get_sub_agent_profile_by_tool
+from klaude_code.protocol import model
 from klaude_code.tui.components.common import truncate_head
 from klaude_code.tui.components.rich.theme import ThemeKey
 
@@ -125,46 +124,3 @@ def render_sub_agent_result(
         elements.append(Text(agent_id_footer, style=ThemeKey.SUB_AGENT_FOOTER))
 
     return Group(*elements)
-
-
-def build_sub_agent_state_from_tool_call(e: events.ToolCallEvent) -> model.SubAgentState | None:
-    """Build SubAgentState from a tool call event for replay rendering."""
-    profile = get_sub_agent_profile_by_tool(e.tool_name)
-    if profile is None:
-        return None
-    description = profile.name
-    prompt = ""
-    output_schema: dict[str, Any] | None = None
-    generation: dict[str, Any] | None = None
-    resume: str | None = None
-    if e.arguments:
-        try:
-            payload: dict[str, object] = json.loads(e.arguments)
-        except json.JSONDecodeError:
-            payload = {}
-        desc_value = payload.get("description")
-        if isinstance(desc_value, str) and desc_value.strip():
-            description = desc_value.strip()
-        prompt_value = payload.get("prompt") or payload.get("task")
-        if isinstance(prompt_value, str):
-            prompt = prompt_value.strip()
-        resume_value = payload.get("resume")
-        if isinstance(resume_value, str) and resume_value.strip():
-            resume = resume_value.strip()
-        # Extract output_schema if profile supports it
-        if profile.output_schema_arg:
-            schema_value = payload.get(profile.output_schema_arg)
-            if isinstance(schema_value, dict):
-                output_schema = cast(dict[str, Any], schema_value)
-        # Extract generation config for ImageGen
-        generation_value = payload.get("generation")
-        if isinstance(generation_value, dict):
-            generation = cast(dict[str, Any], generation_value)
-    return model.SubAgentState(
-        sub_agent_type=profile.name,
-        sub_agent_desc=description,
-        sub_agent_prompt=prompt,
-        resume=resume,
-        output_schema=output_schema,
-        generation=generation,
-    )

klaude_code/tui/components/thinking.py

@@ -1,14 +1,5 @@
 import re
 
-from rich.console import RenderableType
-from rich.padding import Padding
-from rich.text import Text
-
-from klaude_code.const import MARKDOWN_RIGHT_MARGIN
-from klaude_code.tui.components.common import create_grid
-from klaude_code.tui.components.rich.markdown import ThinkingMarkdown
-from klaude_code.tui.components.rich.theme import ThemeKey
-
 # UI markers
 THINKING_MESSAGE_MARK = "∴"
 
@@ -70,27 +61,3 @@ def extract_last_bold_header(text: str) -> str | None:
         i = end + 2
 
     return last
-
-
-def render_thinking(content: str, *, code_theme: str, style: str) -> RenderableType | None:
-    """Render thinking content as markdown with left mark.
-
-    Returns None if content is empty.
-    Note: Caller should push thinking_markdown_theme before printing.
-    """
-    if len(content.strip()) == 0:
-        return None
-
-    grid = create_grid()
-    grid.add_row(
-        Text(THINKING_MESSAGE_MARK, style=ThemeKey.THINKING),
-        Padding(
-            ThinkingMarkdown(
-                normalize_thinking_content(content),
-                code_theme=code_theme,
-                style=style,
-            ),
-            (0, MARKDOWN_RIGHT_MARGIN, 0, 0),
-        ),
-    )
-    return grid

klaude_code/tui/components/tools.py

@@ -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,
 )
@@ -48,6 +50,33 @@ def is_sub_agent_tool(tool_name: str) -> bool:
     return _is_sub_agent_tool(tool_name)
 
 
+def get_task_active_form(arguments: str) -> str:
+    """Return active form text for Task tool based on its arguments."""
+    import json
+
+    try:
+        parsed = json.loads(arguments)
+    except json.JSONDecodeError:
+        return "Tasking"
+
+    if not isinstance(parsed, dict):
+        return "Tasking"
+
+    args = cast(dict[str, Any], parsed)
+
+    type_raw = args.get("type")
+    if not isinstance(type_raw, str):
+        return "Tasking"
+
+    match type_raw.strip():
+        case "explore":
+            return "Exploring"
+        case "web":
+            return "Surfing"
+        case _:
+            return "Tasking"
+
+
 def render_path(path: str, style: str, is_directory: bool = False) -> Text:
     if path.startswith(str(Path().cwd())):
         path = path.replace(str(Path().cwd()), "").lstrip("/")
@@ -173,7 +202,7 @@ def render_bash_tool_call(arguments: str) -> RenderableType:
 
 
 def render_update_plan_tool_call(arguments: str) -> RenderableType:
-    tool_name = "Update Plan"
+    tool_name = "Plan"
     details: RenderableType | None = None
 
     if arguments:
@@ -273,7 +302,7 @@ def render_write_tool_call(arguments: str) -> RenderableType:
 
 
 def render_apply_patch_tool_call(arguments: str) -> RenderableType:
-    tool_name = "Apply Patch"
+    tool_name = "Patch"
 
     try:
         payload = json.loads(arguments)
@@ -299,21 +328,22 @@ def render_apply_patch_tool_call(arguments: str) -> RenderableType:
             elif line.startswith("*** Delete File:"):
                 delete_files.append(line[len("*** Delete File:") :].strip())
 
-        parts: list[str] = []
+        details = Text("", ThemeKey.TOOL_PARAM)
         if update_files:
-            parts.append(f"Update File × {len(update_files)}" if len(update_files) > 1 else "Update File")
+            details.append(f"Edit × {len(update_files)}")
         if add_files:
+            if details.plain:
+                details.append(", ")
             # For single .md file addition, show filename in parentheses
             if len(add_files) == 1 and add_files[0].endswith(".md"):
-                file_name = Path(add_files[0]).name
-                parts.append(f"Add File ({file_name})")
+                details.append("Create ")
+                details.append_text(render_path(add_files[0], ThemeKey.TOOL_PARAM_FILE_PATH))
             else:
-                parts.append(f"Add File × {len(add_files)}" if len(add_files) > 1 else "Add File")
+                details.append(f"Create × {len(add_files)}")
         if delete_files:
-            parts.append(f"Delete File × {len(delete_files)}" if len(delete_files) > 1 else "Delete File")
-
-        if parts:
-            details = Text(", ".join(parts), ThemeKey.TOOL_PARAM)
+            if details.plain:
+                details.append(", ")
+            details.append(f"Delete × {len(delete_files)}")
     else:
         details = Text(
             str(patch_content)[:INVALID_TOOL_CALL_MAX_LENGTH],
@@ -359,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:
@@ -434,7 +482,7 @@ def _render_mermaid_viewer_link(
 
 
 def render_web_fetch_tool_call(arguments: str) -> RenderableType:
-    tool_name = "Fetch"
+    tool_name = "Fetch Web"
 
     try:
         payload: dict[str, str] = json.loads(arguments)
@@ -452,7 +500,7 @@ def render_web_fetch_tool_call(arguments: str) -> RenderableType:
 
 
 def render_web_search_tool_call(arguments: str) -> RenderableType:
-    tool_name = "Web Search"
+    tool_name = "Search Web"
 
     try:
         payload: dict[str, Any] = json.loads(arguments)
@@ -516,6 +564,7 @@ _TOOL_ACTIVE_FORM: dict[str, str] = {
     tools.WEB_FETCH: "Fetching Web",
     tools.WEB_SEARCH: "Searching Web",
     tools.REPORT_BACK: "Reporting",
+    tools.IMAGE_GEN: "Generating Image",
 }
 
 
@@ -527,13 +576,6 @@ def get_tool_active_form(tool_name: str) -> str:
     if tool_name in _TOOL_ACTIVE_FORM:
         return _TOOL_ACTIVE_FORM[tool_name]
 
-    # Check sub agent profiles
-    from klaude_code.protocol.sub_agent import get_sub_agent_profile_by_tool
-
-    profile = get_sub_agent_profile_by_tool(tool_name)
-    if profile and profile.active_form:
-        return profile.active_form
-
     return f"Calling {tool_name}"
 
 
@@ -558,7 +600,7 @@ def render_tool_call(e: events.ToolCallEvent) -> RenderableType | None:
         case tools.APPLY_PATCH:
             return render_apply_patch_tool_call(e.arguments)
         case tools.TODO_WRITE:
-            return render_generic_tool_call("Update Todos", "", MARK_PLAN)
+            return render_generic_tool_call("Update To-Dos", "", MARK_PLAN)
         case tools.UPDATE_PLAN:
             return render_update_plan_tool_call(e.arguments)
         case tools.MERMAID:
@@ -656,6 +698,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

@@ -3,6 +3,7 @@ import re
 from rich.console import Group, RenderableType
 from rich.text import Text
 
+from klaude_code.const import TAB_EXPAND_WIDTH
 from klaude_code.skill import get_available_skills
 from klaude_code.tui.components.common import create_grid
 from klaude_code.tui.components.rich.theme import ThemeKey
@@ -82,6 +83,7 @@ def render_user_input(content: str) -> RenderableType:
     lines = content.strip().split("\n")
     renderables: list[RenderableType] = []
     for i, line in enumerate(lines):
+        line = line.expandtabs(TAB_EXPAND_WIDTH)
         # Handle slash command on first line
         if i == 0 and line.startswith("/"):
             splits = line.split(" ", maxsplit=1)

klaude_code/tui/input/images.py

@@ -17,11 +17,10 @@ import shutil
 import subprocess
 import sys
 import uuid
-from base64 import b64encode
 from pathlib import Path
 
 from klaude_code.const import get_system_temp
-from klaude_code.protocol.message import ImageURLPart
+from klaude_code.protocol.message import ImageFilePart
 
 # ---------------------------------------------------------------------------
 # Constants and marker syntax
@@ -183,36 +182,40 @@ def capture_clipboard_tag() -> str | None:
 # ---------------------------------------------------------------------------
 
 
-def _encode_image_file(file_path: str) -> ImageURLPart | None:
-    """Encode an image file as base64 data URL and create ImageURLPart."""
+_MIME_TYPES: dict[str, str] = {
+    ".png": "image/png",
+    ".jpg": "image/jpeg",
+    ".jpeg": "image/jpeg",
+    ".gif": "image/gif",
+    ".webp": "image/webp",
+}
+
+
+def _create_image_file_part(file_path: str) -> ImageFilePart | None:
+    """Create an ImageFilePart from a file path."""
     try:
         path = Path(file_path)
         if not path.exists():
             return None
-        with open(path, "rb") as f:
-            encoded = b64encode(f.read()).decode("ascii")
 
         suffix = path.suffix.lower()
-        mime = {
-            ".png": "image/png",
-            ".jpg": "image/jpeg",
-            ".jpeg": "image/jpeg",
-            ".gif": "image/gif",
-            ".webp": "image/webp",
-        }.get(suffix)
+        mime = _MIME_TYPES.get(suffix)
         if mime is None:
             return None
 
-        data_url = f"data:{mime};base64,{encoded}"
-        return ImageURLPart(url=data_url, id=None)
+        return ImageFilePart(
+            file_path=str(path),
+            mime_type=mime,
+            byte_size=path.stat().st_size,
+        )
     except OSError:
         return None
 
 
-def extract_images_from_text(text: str) -> list[ImageURLPart]:
+def extract_images_from_text(text: str) -> list[ImageFilePart]:
     """Extract images referenced by [image ...] markers in text."""
 
-    images: list[ImageURLPart] = []
+    images: list[ImageFilePart] = []
     for m in IMAGE_MARKER_RE.finditer(text):
         raw = m.group("path")
         path_str = parse_image_marker_path(raw)
@@ -221,7 +224,7 @@ def extract_images_from_text(text: str) -> list[ImageURLPart]:
         p = Path(path_str).expanduser()
         if not p.is_absolute():
             p = (Path.cwd() / p).resolve()
-        image_part = _encode_image_file(str(p))
+        image_part = _create_image_file_part(str(p))
         if image_part:
             images.append(image_part)
     return images

klaude_code/tui/input/key_bindings.py

@@ -19,7 +19,7 @@ from typing import cast
 from prompt_toolkit.application.current import get_app
 from prompt_toolkit.buffer import Buffer
 from prompt_toolkit.filters import Always, Condition, Filter
-from prompt_toolkit.filters.app import has_completions
+from prompt_toolkit.filters.app import has_completions, is_searching
 from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.key_binding.key_processor import KeyPressEvent
 from prompt_toolkit.keys import Keys
@@ -367,7 +367,7 @@ def create_key_bindings(
 
         _insert_newline(event)
 
-    @kb.add("enter", filter=enabled)
+    @kb.add("enter", filter=enabled & ~is_searching)
     def _(event: KeyPressEvent) -> None:
         nonlocal swallow_next_control_j
 

klaude_code/tui/input/prompt_toolkit.py

@@ -20,6 +20,7 @@ from prompt_toolkit.key_binding import merge_key_bindings
 from prompt_toolkit.layout import Float
 from prompt_toolkit.layout.containers import Container, FloatContainer, Window
 from prompt_toolkit.layout.controls import BufferControl, UIContent
+from prompt_toolkit.layout.dimension import Dimension
 from prompt_toolkit.layout.menus import CompletionsMenu, MultiColumnCompletionsMenu
 from prompt_toolkit.patch_stdout import patch_stdout
 from prompt_toolkit.styles import Style
@@ -61,9 +62,9 @@ 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"
-PLACEHOLDER_TEXT_STYLE_LIGHT_BG = "fg:#7a7a7a italic"
-PLACEHOLDER_TEXT_STYLE_UNKNOWN_BG = "fg:#8a8a8a italic"
+PLACEHOLDER_TEXT_STYLE_DARK_BG = "fg:#5a5a5a"
+PLACEHOLDER_TEXT_STYLE_LIGHT_BG = "fg:#7a7a7a"
+PLACEHOLDER_TEXT_STYLE_UNKNOWN_BG = "fg:#8a8a8a"
 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"
@@ -81,6 +82,9 @@ def _left_align_completion_menus(container: Container) -> None:
     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.
+
+    Note: We intentionally keep Y positioning (ycursor) unchanged so that the
+    completion menu stays near the cursor/input line.
     """
     if isinstance(container, FloatContainer):
         for flt in container.floats:
@@ -300,6 +304,10 @@ class PromptToolkitInput(InputProviderABC):
             key_bindings=kb,
             completer=ThreadedCompleter(create_repl_completer(command_info_provider=self._command_info_provider)),
             complete_while_typing=True,
+            # Keep the bottom toolbar stable while completion menus open/close.
+            # Reserving space dynamically can make the non-fullscreen prompt
+            # "jump" by printing extra lines.
+            reserve_space_for_menu=0,
             erase_when_done=True,
             mouse_support=False,
             style=Style.from_dict(
@@ -417,41 +425,40 @@ class PromptToolkitInput(InputProviderABC):
 
             original_height = input_window.height
 
+            # Keep a comfortable multiline editing area even when no completion
+            # space is reserved. (We set reserve_space_for_menu=0 to avoid the
+            # bottom toolbar jumping when completions open/close.)
+            base_rows = 10
+
             def _height():  # type: ignore[no-untyped-def]
                 picker_open = (self._model_picker is not None and self._model_picker.is_open) or (
                     self._thinking_picker is not None and self._thinking_picker.is_open
                 )
 
-                try:
-                    complete_state = self._session.default_buffer.complete_state
-                    completion_open = complete_state is not None and bool(complete_state.completions)
-                except Exception:
-                    completion_open = False
-
                 try:
                     original_height_value = original_height() if callable(original_height) else original_height
                 except Exception:
                     original_height_value = None
-                original_height_int = original_height_value if isinstance(original_height_value, int) else None
+                original_min = 0
+                if isinstance(original_height_value, Dimension):
+                    original_min = int(original_height_value.min)
+                elif isinstance(original_height_value, int):
+                    original_min = int(original_height_value)
 
-                if picker_open or completion_open:
-                    target_rows = 24 if picker_open else 14
+                target_rows = 24 if picker_open else base_rows
 
-                    # Cap to the current terminal size.
-                    # Leave a small buffer to avoid triggering "Window too small".
-                    try:
-                        rows = get_app().output.get_size().rows
-                    except Exception:
-                        rows = 0
+                # Cap to the current terminal size.
+                # Leave a small buffer to avoid triggering "Window too small".
+                try:
+                    rows = get_app().output.get_size().rows
+                except Exception:
+                    rows = 0
 
-                    expanded = max(3, min(target_rows, rows - 2))
-                    if original_height_int is not None:
-                        expanded = max(original_height_int, expanded)
-                    return expanded
+                desired = max(original_min, target_rows)
+                if rows > 0:
+                    desired = max(3, min(desired, rows - 2))
 
-                if callable(original_height):
-                    return original_height()
-                return original_height
+                return Dimension(min=desired, preferred=desired)
 
             input_window.height = _height
 
@@ -583,7 +590,7 @@ class PromptToolkitInput(InputProviderABC):
             except (AttributeError, RuntimeError):
                 pass
 
-        # Priority: update_message > debug_log_path
+        # Priority: update_message > debug_log_path > shortcut hints
         display_text: str | None = None
         text_style: str = ""
         if update_message:
@@ -593,31 +600,25 @@ class PromptToolkitInput(InputProviderABC):
             display_text = f"Debug log: {debug_log_path}"
             text_style = "fg:ansibrightblack"
 
-        # If nothing to show, return a blank line to actively clear any previously
-        # rendered content. (When `bottom_toolbar` is a callable, prompt_toolkit
-        # will still reserve the toolbar line.)
-        if not display_text:
+        if display_text:
+            left_text = " " + display_text
             try:
                 terminal_width = shutil.get_terminal_size().columns
+                padding = " " * max(0, terminal_width - len(left_text))
             except (OSError, ValueError):
-                terminal_width = 0
-            return FormattedText([("", " " * max(0, terminal_width))])
+                padding = ""
 
-        left_text = " " + display_text
-        try:
-            terminal_width = shutil.get_terminal_size().columns
-            padding = " " * max(0, terminal_width - len(left_text))
-        except (OSError, ValueError):
-            padding = ""
+            toolbar_text = left_text + padding
+            return FormattedText([(text_style, toolbar_text)])
 
-        toolbar_text = left_text + padding
-        return FormattedText([(text_style, toolbar_text)])
+        # Show shortcut hints when nothing else to display
+        return self._render_shortcut_hints()
 
     # -------------------------------------------------------------------------
-    # Placeholder
+    # Shortcut hints (bottom toolbar)
     # -------------------------------------------------------------------------
 
-    def _render_input_placeholder(self) -> FormattedText:
+    def _render_shortcut_hints(self) -> FormattedText:
         if self._is_light_terminal_background is True:
             text_style = PLACEHOLDER_TEXT_STYLE_LIGHT_BG
             symbol_style = PLACEHOLDER_SYMBOL_STYLE_LIGHT_BG
@@ -630,27 +631,27 @@ class PromptToolkitInput(InputProviderABC):
 
         return FormattedText(
             [
-                (text_style, " " * 10),
+                (text_style, " "),
                 (symbol_style, " @ "),
                 (text_style, " "),
                 (text_style, "files"),
-                (text_style, "  "),
+                (text_style, " • "),
                 (symbol_style, " $ "),
                 (text_style, " "),
                 (text_style, "skills"),
-                (text_style, "  "),
+                (text_style, " • "),
                 (symbol_style, " / "),
                 (text_style, " "),
                 (text_style, "commands"),
-                (text_style, "  "),
+                (text_style, " • "),
                 (symbol_style, " ctrl-l "),
                 (text_style, " "),
                 (text_style, "models"),
-                (text_style, "  "),
+                (text_style, " • "),
                 (symbol_style, " ctrl-t "),
                 (text_style, " "),
                 (text_style, "think"),
-                (text_style, "  "),
+                (text_style, " • "),
                 (symbol_style, " ctrl-v "),
                 (text_style, " "),
                 (text_style, "paste image"),
@@ -679,7 +680,6 @@ class PromptToolkitInput(InputProviderABC):
             # proper styling instead of showing raw escape codes.
             with patch_stdout(raw=True):
                 line: str = await self._session.prompt_async(
-                    placeholder=self._render_input_placeholder(),
                     bottom_toolbar=self._get_bottom_toolbar,
                 )
             if self._post_prompt is not None: