klaude-code 2.2.0__py3-none-any.whl → 2.4.0__py3-none-any.whl

klaude_code/tui/components/metadata.py

@@ -1,24 +1,12 @@
-from importlib.metadata import PackageNotFoundError, version
-
 from rich.console import Group, RenderableType
 from rich.padding import Padding
 from rich.text import Text
 
 from klaude_code.const import DEFAULT_MAX_TOKENS
-from klaude_code.log import is_debug_enabled
 from klaude_code.protocol import events, model
 from klaude_code.tui.components.common import create_grid
-from klaude_code.tui.components.rich.quote import Quote
 from klaude_code.tui.components.rich.theme import ThemeKey
-from klaude_code.ui.common import format_model_params, format_number
-
-
-def _get_version() -> str:
-    """Get the current version of klaude-code."""
-    try:
-        return version("klaude-code")
-    except PackageNotFoundError:
-        return "unknown"
+from klaude_code.ui.common import format_number
 
 
 def _render_task_metadata_block(
@@ -195,53 +183,3 @@ def render_task_metadata(e: events.TaskMetadataEvent) -> RenderableType:
         renderables.append(Padding(grid, (0, 0, 0, 2)))
 
     return Group(*renderables)
-
-
-def render_welcome(e: events.WelcomeEvent) -> RenderableType:
-    """Render the welcome panel with model info and settings.
-
-    Args:
-        e: The welcome event.
-    """
-    debug_mode = is_debug_enabled()
-
-    panel_content = Text()
-
-    if e.show_klaude_code_info:
-        # First line: Klaude Code version
-        klaude_code_style = ThemeKey.WELCOME_DEBUG_TITLE if debug_mode else ThemeKey.WELCOME_HIGHLIGHT_BOLD
-        panel_content.append_text(Text("Klaude Code", style=klaude_code_style))
-        panel_content.append_text(Text(f" v{_get_version()}", style=ThemeKey.WELCOME_INFO))
-        panel_content.append_text(Text("\n"))
-
-    # Model line: model @ provider · params...
-    panel_content.append_text(
-        Text.assemble(
-            (str(e.llm_config.model), ThemeKey.WELCOME_HIGHLIGHT),
-            (" @ ", ThemeKey.WELCOME_INFO),
-            (e.llm_config.provider_name, ThemeKey.WELCOME_INFO),
-        )
-    )
-
-    # Use format_model_params for consistent formatting
-    param_strings = format_model_params(e.llm_config)
-
-    # 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 "├─ "
-        panel_content.append_text(
-            Text.assemble(
-                ("\n", ThemeKey.WELCOME_INFO),
-                (prefix, ThemeKey.LINES),
-                (param_str, ThemeKey.WELCOME_INFO),
-            )
-        )
-
-    border_style = ThemeKey.WELCOME_DEBUG_BORDER if debug_mode else ThemeKey.LINES
-
-    if e.show_klaude_code_info:
-        groups = ["", Quote(panel_content, style=border_style, prefix="▌ "), ""]
-    else:
-        groups = [Quote(panel_content, style=border_style, prefix="▌ "), ""]
-    return Group(*groups)

klaude_code/tui/components/rich/cjk_wrap.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import unicodedata
 from collections.abc import Callable
+from typing import Any, cast
 
 
 def _is_cjk_char(ch: str) -> bool:
@@ -222,7 +223,7 @@ def install_rich_cjk_wrap_patch() -> bool:
 
         return break_positions
 
-    _wrap.divide_line = divide_line_patched  # pyright: ignore[reportPrivateImportUsage]
-    _text.divide_line = divide_line_patched  # pyright: ignore[reportPrivateImportUsage]
+    cast(Any, _wrap).divide_line = divide_line_patched  # pyright: ignore[reportPrivateImportUsage]
+    cast(Any, _text).divide_line = divide_line_patched  # pyright: ignore[reportPrivateImportUsage]
     _rich_cjk_wrap_patch_installed = True
     return True

klaude_code/tui/components/rich/status.py

@@ -263,6 +263,53 @@ def _breathing_style(console: Console, base_style: Style, intensity: float) -> S
     return base_style + Style(color=breathing_color)
 
 
+def truncate_left(text: Text, max_cells: int, *, console: Console, ellipsis: str = "…") -> Text:
+    """Left-truncate Text to fit within max_cells.
+
+    Keeps the rightmost part of the text and prepends an ellipsis when truncation occurs.
+    Uses cell width so wide characters are handled reasonably.
+    """
+
+    max_cells = max(0, int(max_cells))
+    if max_cells == 0:
+        return Text("")
+
+    if cell_len(text.plain) <= max_cells:
+        return text
+
+    ellipsis_cells = cell_len(ellipsis)
+    if max_cells <= ellipsis_cells:
+        # Not enough space to show any meaningful suffix.
+        clipped = Text(ellipsis, style=text.style)
+        clipped.truncate(max_cells, overflow="crop", pad=False)
+        return clipped
+
+    suffix_budget = max_cells - ellipsis_cells
+    plain = text.plain
+
+    suffix_cells = 0
+    start_index = len(plain)
+    for i in range(len(plain) - 1, -1, -1):
+        ch_cells = cell_len(plain[i])
+        if suffix_cells + ch_cells > suffix_budget:
+            break
+        suffix_cells += ch_cells
+        start_index = i
+        if suffix_cells == suffix_budget:
+            break
+
+    if start_index >= len(plain):
+        return Text(ellipsis, style=text.style)
+
+    suffix = text[start_index:]
+    try:
+        ellipsis_style = suffix.get_style_at_offset(console, 0)
+    except Exception:
+        ellipsis_style = suffix.style or text.style
+
+    return Text.assemble(Text(ellipsis, style=ellipsis_style), suffix)
+
+
 class ShimmerStatusText:
     """Renderable status line with shimmer effect on the main text and hint.
 
@@ -322,12 +369,11 @@ class _StatusLeftText:
         # If the hint itself can't fit, fall back to truncating the combined text.
         if max_width <= hint_cells:
             combined = Text.assemble(main_text, hint_text)
-            combined.truncate(max(1, max_width), overflow="ellipsis", pad=False)
-            yield combined
+            yield truncate_left(combined, max(1, max_width), console=console)
             return
 
         main_budget = max_width - hint_cells
-        main_text.truncate(max(1, main_budget), overflow="ellipsis", pad=False)
+        main_text = truncate_left(main_text, max(1, main_budget), console=console)
         yield Text.assemble(main_text, hint_text)
 
 

klaude_code/tui/components/rich/theme.py

@@ -191,6 +191,7 @@ class ThemeKey(str, Enum):
     WELCOME_HIGHLIGHT_BOLD = "welcome.highlight.bold"
     WELCOME_HIGHLIGHT = "welcome.highlight"
     WELCOME_INFO = "welcome.info"
+    WELCOME_INFO_BOLD = "welcome.info.bold"
     # WELCOME DEBUG
     WELCOME_DEBUG_TITLE = "welcome.debug.title"
     WELCOME_DEBUG_BORDER = "welcome.debug.border"
@@ -307,6 +308,7 @@ def get_theme(theme: str | None = None) -> Themes:
                 ThemeKey.WELCOME_HIGHLIGHT_BOLD.value: "bold",
                 ThemeKey.WELCOME_HIGHLIGHT.value: palette.blue,
                 ThemeKey.WELCOME_INFO.value: palette.grey1,
+                ThemeKey.WELCOME_INFO_BOLD.value: "bold " + palette.grey1,
                 # WELCOME DEBUG
                 ThemeKey.WELCOME_DEBUG_TITLE.value: "bold " + palette.red,
                 ThemeKey.WELCOME_DEBUG_BORDER.value: palette.red,

klaude_code/tui/components/sub_agent.py

@@ -3,7 +3,7 @@ from typing import Any, cast
 
 from rich.console import Group, RenderableType
 from rich.json import JSON
-from rich.style import Style, StyleType
+from rich.style import Style
 from rich.text import Text
 
 from klaude_code.const import SUB_AGENT_RESULT_MAX_LINES
@@ -79,65 +79,44 @@ def _extract_agent_id_footer(text: str) -> tuple[str, str | None]:
 def render_sub_agent_result(
     result: str,
     *,
-    code_theme: str,
-    style: StyleType | None = None,
     has_structured_output: bool = False,
     description: str | None = None,
 ) -> RenderableType:
     stripped_result = result.strip()
-
-    # Extract agentId footer for separate styling
     main_content, agent_id_footer = _extract_agent_id_footer(stripped_result)
     stripped_result = main_content.strip()
 
-    # Use rich JSON for structured output
+    elements: list[RenderableType] = []
+    if description:
+        elements.append(Text(f"---\n{description}", style=ThemeKey.TOOL_RESULT))
+
+    # Try structured JSON output first
+    use_text_rendering = True
     if has_structured_output:
         try:
-            group_elements: list[RenderableType] = [
-                Text(
-                    "use /export to view full output",
-                    style=ThemeKey.TOOL_RESULT,
-                ),
-                JSON(stripped_result),
-            ]
-            if description:
-                group_elements.insert(0, Text(f"\n{description}", style=style or ""))
-            if agent_id_footer:
-                group_elements.append(Text(agent_id_footer, style=ThemeKey.SUB_AGENT_FOOTER))
-            return Group(*group_elements)
+            elements.append(Text("use /export to view full output", style=ThemeKey.TOOL_RESULT_TRUNCATED))
+            elements.append(JSON(stripped_result))
+            use_text_rendering = False
         except json.JSONDecodeError:
-            # Fall back to markdown if not valid JSON
             pass
 
-    if not stripped_result:
-        return Text()
-
-    lines = stripped_result.splitlines()
-    if len(lines) > SUB_AGENT_RESULT_MAX_LINES:
-        hidden_count = len(lines) - SUB_AGENT_RESULT_MAX_LINES
-        tail_text = "\n".join(lines[-SUB_AGENT_RESULT_MAX_LINES:])
-        truncated_elements: list[RenderableType] = []
-        # Add description heading separately so it won't be truncated
-        if description:
-            truncated_elements.append(Text(f"---\n{description}", style=style or ""))
-        truncated_elements.append(
-            Text(
-                f"( … more {hidden_count} lines)",
-                style=ThemeKey.TOOL_RESULT_TRUNCATED,
-            )
-        )
-        truncated_elements.append(Text(tail_text, style=style or ""))
-        if agent_id_footer:
-            truncated_elements.append(Text(agent_id_footer, style=ThemeKey.SUB_AGENT_FOOTER))
-        return Group(*truncated_elements)
+    # Text rendering (either fallback or non-structured)
+    if use_text_rendering:
+        if not stripped_result:
+            return Text()
+
+        lines = stripped_result.splitlines()
+        if len(lines) > SUB_AGENT_RESULT_MAX_LINES:
+            hidden_count = len(lines) - SUB_AGENT_RESULT_MAX_LINES
+            elements.append(Text(f"( ... more {hidden_count} lines)", style=ThemeKey.TOOL_RESULT_TRUNCATED))
+            elements.append(Text("\n".join(lines[-SUB_AGENT_RESULT_MAX_LINES:]), style=ThemeKey.TOOL_RESULT))
+        else:
+            elements.append(Text(stripped_result, style=ThemeKey.TOOL_RESULT))
 
-    # No truncation needed - add description heading if provided
-    if description:
-        stripped_result = f"\n# {description}\n\n{stripped_result}"
-    normal_elements: list[RenderableType] = [Text(stripped_result)]
     if agent_id_footer:
-        normal_elements.append(Text(agent_id_footer, style=ThemeKey.SUB_AGENT_FOOTER))
-    return Group(*normal_elements)
+        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:

klaude_code/tui/components/welcome.py

@@ -0,0 +1,99 @@
+from importlib.metadata import PackageNotFoundError, version
+
+from rich.console import Group, RenderableType
+from rich.text import Text
+
+from klaude_code.log import is_debug_enabled
+from klaude_code.protocol import events
+from klaude_code.tui.components.rich.quote import Quote
+from klaude_code.tui.components.rich.theme import ThemeKey
+from klaude_code.ui.common import format_model_params
+
+
+def _get_version() -> str:
+    """Get the current version of klaude-code."""
+    try:
+        return version("klaude-code")
+    except PackageNotFoundError:
+        return "unknown"
+
+
+def render_welcome(e: events.WelcomeEvent) -> RenderableType:
+    """Render the welcome panel with model info and settings.
+
+    Args:
+        e: The welcome event.
+    """
+    debug_mode = is_debug_enabled()
+
+    panel_content = Text()
+
+    if e.show_klaude_code_info:
+        # First line: Klaude Code version
+        klaude_code_style = ThemeKey.WELCOME_DEBUG_TITLE if debug_mode else ThemeKey.WELCOME_HIGHLIGHT_BOLD
+        panel_content.append_text(Text("Klaude Code", style=klaude_code_style))
+        panel_content.append_text(Text(f" v{_get_version()}", style=ThemeKey.WELCOME_INFO))
+        panel_content.append_text(Text("\n"))
+
+    # Model line: model @ provider · params...
+    panel_content.append_text(
+        Text.assemble(
+            (str(e.llm_config.model_id), ThemeKey.WELCOME_HIGHLIGHT),
+            (" @ ", ThemeKey.WELCOME_INFO),
+            (e.llm_config.provider_name, ThemeKey.WELCOME_INFO),
+        )
+    )
+
+    # Use format_model_params for consistent formatting
+    param_strings = format_model_params(e.llm_config)
+
+    # Check if we have sub-agent models to show
+    has_sub_agents = e.show_sub_agent_models and e.sub_agent_models
+
+    # Render config items with tree-style prefixes
+    for i, param_str in enumerate(param_strings):
+        is_last = i == len(param_strings) - 1 and not has_sub_agents
+        prefix = "└─ " if is_last else "├─ "
+        panel_content.append_text(
+            Text.assemble(
+                ("\n", ThemeKey.WELCOME_INFO),
+                (prefix, ThemeKey.LINES),
+                (param_str, ThemeKey.WELCOME_INFO),
+            )
+        )
+
+    # Render sub-agent models
+    if has_sub_agents:
+        # Add sub-agents header with tree prefix
+        panel_content.append_text(
+            Text.assemble(
+                ("\n", ThemeKey.WELCOME_INFO),
+                ("└─ ", ThemeKey.LINES),
+                ("sub-agents:", ThemeKey.WELCOME_INFO),
+            )
+        )
+        sub_agent_items = list(e.sub_agent_models.items())
+        max_type_len = max(len(t) for t in e.sub_agent_models)
+        for i, (sub_agent_type, sub_llm_config) in enumerate(sub_agent_items):
+            is_last = i == len(sub_agent_items) - 1
+            prefix = "└─ " if is_last else "├─ "
+            panel_content.append_text(
+                Text.assemble(
+                    ("\n", ThemeKey.WELCOME_INFO),
+                    ("   ", ThemeKey.WELCOME_INFO),  # Indentation for sub-items
+                    (prefix, ThemeKey.LINES),
+                    (sub_agent_type.lower().ljust(max_type_len), ThemeKey.WELCOME_INFO),
+                    (": ", ThemeKey.LINES),
+                    (str(sub_llm_config.model_id), ThemeKey.WELCOME_HIGHLIGHT),
+                    (" @ ", ThemeKey.WELCOME_INFO),
+                    (sub_llm_config.provider_name, ThemeKey.WELCOME_INFO),
+                )
+            )
+
+    border_style = ThemeKey.WELCOME_DEBUG_BORDER if debug_mode else ThemeKey.LINES
+
+    if e.show_klaude_code_info:
+        groups = ["", Quote(panel_content, style=border_style, prefix="▌ "), ""]
+    else:
+        groups = [Quote(panel_content, style=border_style, prefix="▌ "), ""]
+    return Group(*groups)

klaude_code/tui/input/prompt_toolkit.py

@@ -26,7 +26,7 @@ from prompt_toolkit.styles import Style
 from prompt_toolkit.utils import get_cwidth
 
 from klaude_code.config import load_config
-from klaude_code.config.config import ModelEntry
+from klaude_code.config.model_matcher import match_model_from_config
 from klaude_code.config.thinking import (
     format_current_thinking,
     get_thinking_picker_data,
@@ -452,22 +452,29 @@ class PromptToolkitInput(InputProviderABC):
     # -------------------------------------------------------------------------
 
     def _build_model_picker_items(self) -> tuple[list[SelectItem[str]], str | None]:
-        config = load_config()
-        models: list[ModelEntry] = sorted(
-            config.iter_model_entries(only_available=True),
-            key=lambda m: m.model_name.lower(),
-        )
-        if not models:
+        result = match_model_from_config()
+        if result.error_message or not result.filtered_models:
             return [], None
 
-        items = build_model_select_items(models)
+        items = build_model_select_items(result.filtered_models)
 
         initial = None
         if self._get_current_model_config_name is not None:
             with contextlib.suppress(Exception):
                 initial = self._get_current_model_config_name()
         if initial is None:
+            config = load_config()
             initial = config.main_model
+        if isinstance(initial, str) and initial and "@" not in initial:
+            config = load_config()
+            try:
+                resolved = config.resolve_model_location_prefer_available(initial) or config.resolve_model_location(
+                    initial
+                )
+            except ValueError:
+                resolved = None
+            if resolved is not None:
+                initial = f"{resolved[0]}@{resolved[1]}"
         return items, initial
 
     def _open_model_picker(self) -> None:
@@ -608,6 +615,10 @@ class PromptToolkitInput(InputProviderABC):
                 (symbol_style, " ctrl-t "),
                 (text_style, " "),
                 (text_style, "think"),
+                (text_style, "  "),
+                (symbol_style, " ctrl-v "),
+                (text_style, " "),
+                (text_style, "paste image"),
             ]
         )
 

klaude_code/tui/machine.py

@@ -21,6 +21,7 @@ from klaude_code.tui.commands import (
     PrintRuleLine,
     RenderAssistantImage,
     RenderCommand,
+    RenderCommandOutput,
     RenderDeveloperMessage,
     RenderError,
     RenderInterrupt,
@@ -365,6 +366,10 @@ class DisplayStateMachine:
                 cmds.append(RenderDeveloperMessage(e))
                 return cmds
 
+            case events.CommandOutputEvent() as e:
+                cmds.append(RenderCommandOutput(e))
+                return cmds
+
             case events.TurnStartEvent() as e:
                 cmds.append(RenderTurnStart(e))
                 self._spinner.clear_for_new_turn()

klaude_code/tui/renderer.py

@@ -31,6 +31,7 @@ from klaude_code.tui.commands import (
     PrintRuleLine,
     RenderAssistantImage,
     RenderCommand,
+    RenderCommandOutput,
     RenderDeveloperMessage,
     RenderError,
     RenderInterrupt,
@@ -53,6 +54,7 @@ from klaude_code.tui.commands import (
     TaskClockStart,
 )
 from klaude_code.tui.components import assistant as c_assistant
+from klaude_code.tui.components import command_output as c_command_output
 from klaude_code.tui.components import developer as c_developer
 from klaude_code.tui.components import errors as c_errors
 from klaude_code.tui.components import mermaid_viewer as c_mermaid_viewer
@@ -61,6 +63,7 @@ from klaude_code.tui.components import sub_agent as c_sub_agent
 from klaude_code.tui.components import thinking as c_thinking
 from klaude_code.tui.components import tools as c_tools
 from klaude_code.tui.components import user_input as c_user_input
+from klaude_code.tui.components import welcome as c_welcome
 from klaude_code.tui.components.common import truncate_head, truncate_middle
 from klaude_code.tui.components.rich import status as r_status
 from klaude_code.tui.components.rich.live import CropAboveLive, SingleLine
@@ -470,7 +473,6 @@ class TUICommandRenderer:
                             self.print()
                     case events.DeveloperMessageEvent() as e:
                         self.display_developer_message(e)
-                        self.display_command_output(e)
                     case events.UserMessageEvent() as e:
                         if is_sub_agent:
                             continue
@@ -503,15 +505,13 @@ class TUICommandRenderer:
         with self.session_print_context(e.session_id):
             self.print(c_developer.render_developer_message(e))
 
-    def display_command_output(self, e: events.DeveloperMessageEvent) -> None:
-        if not c_developer.get_command_output(e.item):
-            return
+    def display_command_output(self, e: events.CommandOutputEvent) -> None:
         with self.session_print_context(e.session_id):
-            self.print(c_developer.render_command_output(e))
+            self.print(c_command_output.render_command_output(e))
             self.print()
 
     def display_welcome(self, event: events.WelcomeEvent) -> None:
-        self.print(c_metadata.render_welcome(event))
+        self.print(c_welcome.render_welcome(event))
 
     def display_user_message(self, event: events.UserMessageEvent) -> None:
         self.print(c_user_input.render_user_input(event.content))
@@ -567,10 +567,8 @@ class TUICommandRenderer:
                 self.print(
                     c_sub_agent.render_sub_agent_result(
                         event.task_result,
-                        code_theme=self.themes.code_theme,
                         has_structured_output=event.has_structured_output,
                         description=description,
-                        style=ThemeKey.TOOL_RESULT,
                     )
                 )
 
@@ -628,6 +626,7 @@ class TUICommandRenderer:
                     self.display_task_start(event)
                 case RenderDeveloperMessage(event=event):
                     self.display_developer_message(event)
+                case RenderCommandOutput(event=event):
                     self.display_command_output(event)
                 case RenderTurnStart(event=event):
                     self.display_turn_start(event)

klaude_code/tui/runner.py

@@ -76,14 +76,8 @@ async def submit_user_input_payload(
     if len(run_ops) > 1:
         raise ValueError("Multiple RunAgentOperation results are not supported")
 
-    for run_op in run_ops:
-        run_op.persist_user_input = cmd_result.persist
-        run_op.emit_user_message_event = False
-
     if cmd_result.events:
         for evt in cmd_result.events:
-            if cmd_result.persist and isinstance(evt, events.DeveloperMessageEvent):
-                agent.session.append_history([evt.item])
             await executor.context.emit_event(evt)
 
     submitted_ids: list[str] = []

klaude_code/tui/terminal/selector.py

@@ -53,19 +53,21 @@ def build_model_select_items(models: list[Any]) -> list[SelectItem[str]]:
 
     items: list[SelectItem[str]] = []
     for idx, m in enumerate(models, 1):
-        model_id = m.model_params.model or "N/A"
-        first_line_prefix = f"{m.model_name:<{max_model_name_length}} → "
+        model_id_str = m.model_id or "N/A"
+        # Display the base model name only; provider stays in the meta section.
+        display_name = m.model_name
+        first_line_prefix = f"{display_name:<{max_model_name_length}} → "
         meta_parts: list[str] = [m.provider]
-        meta_parts.extend(format_model_params(m.model_params))
+        meta_parts.extend(format_model_params(m))
         meta_str = " · ".join(meta_parts)
         title = [
             ("class:meta", f"{idx:>{num_width}}. "),
             ("class:msg", first_line_prefix),
-            ("class:msg bold", model_id),
+            ("class:msg bold", model_id_str),
             ("class:meta", f"  {meta_str}\n"),
         ]
-        search_text = f"{m.model_name} {model_id} {m.provider}"
-        items.append(SelectItem(title=title, value=m.model_name, search_text=search_text))
+        search_text = f"{m.selector} {m.model_name} {model_id_str} {m.provider}"
+        items.append(SelectItem(title=title, value=m.selector, search_text=search_text))
 
     return items