klaude-code 2.8.0__py3-none-any.whl → 2.9.0__py3-none-any.whl

klaude_code/skill/system_skills.py

@@ -170,23 +170,3 @@ def install_system_skills() -> bool:
 
         log_debug("System skills installation complete")
         return True
-
-
-def get_installed_system_skills() -> list[Path]:
-    """Get list of installed system skill directories.
-
-    Returns:
-        List of paths to installed skill directories
-    """
-    dest_dir = get_system_skills_dir()
-    if not dest_dir.exists():
-        return []
-
-    skills: list[Path] = []
-    for item in dest_dir.iterdir():
-        if item.is_dir() and not item.name.startswith("."):
-            skill_file = item / "SKILL.md"
-            if skill_file.exists():
-                skills.append(item)
-
-    return skills

klaude_code/tui/command/__init__.py

@@ -31,6 +31,7 @@ def ensure_commands_loaded() -> None:
     # Import and register commands in display order
     from .clear_cmd import ClearCommand
     from .compact_cmd import CompactCommand
+    from .continue_cmd import ContinueCommand
     from .copy_cmd import CopyCommand
     from .debug_cmd import DebugCommand
     from .export_cmd import ExportCommand
@@ -47,6 +48,7 @@ def ensure_commands_loaded() -> None:
     register(CopyCommand())
     register(ExportCommand())
     register(CompactCommand())
+    register(ContinueCommand())
     register(RefreshTerminalCommand())
     register(ModelCommand())
     register(SubAgentModelCommand())
@@ -67,6 +69,7 @@ def __getattr__(name: str) -> object:
     _commands_map = {
         "ClearCommand": "clear_cmd",
         "CompactCommand": "compact_cmd",
+        "ContinueCommand": "continue_cmd",
         "CopyCommand": "copy_cmd",
         "DebugCommand": "debug_cmd",
         "ExportCommand": "export_cmd",

klaude_code/tui/command/continue_cmd.py

@@ -0,0 +1,34 @@
+from klaude_code.protocol import commands, events, message, op
+
+from .command_abc import Agent, CommandABC, CommandResult
+
+
+class ContinueCommand(CommandABC):
+    """Continue agent execution without adding a new user message."""
+
+    @property
+    def name(self) -> commands.CommandName:
+        return commands.CommandName.CONTINUE
+
+    @property
+    def summary(self) -> str:
+        return "Continue agent execution (for recovery after interruptions)"
+
+    async def run(self, agent: Agent, user_input: message.UserInputPayload) -> CommandResult:
+        del user_input  # unused
+
+        if agent.session.messages_count == 0:
+            return CommandResult(
+                events=[
+                    events.CommandOutputEvent(
+                        session_id=agent.session.id,
+                        command_name=self.name,
+                        content="Cannot continue: no conversation history. Start a conversation first.",
+                        is_error=True,
+                    )
+                ]
+            )
+
+        return CommandResult(
+            operations=[op.ContinueAgentOperation(session_id=agent.session.id)],
+        )

klaude_code/tui/command/fork_session_cmd.py

@@ -6,6 +6,7 @@ from typing import Literal
 from prompt_toolkit.styles import Style, merge_styles
 
 from klaude_code.protocol import commands, events, message, model
+from klaude_code.session import Session
 from klaude_code.tui.input.key_bindings import copy_to_clipboard
 from klaude_code.tui.terminal.selector import DEFAULT_PICKER_STYLE, SelectItem, select_one
 
@@ -312,7 +313,8 @@ class ForkSessionCommand(CommandABC):
             new_session = agent.session.fork()
             await new_session.wait_for_flush()
 
-            resume_cmd = f"klaude --resume {new_session.id}"
+            short_id = Session.shortest_unique_prefix(new_session.id)
+            resume_cmd = f"klaude -r {short_id}"
             copy_to_clipboard(resume_cmd)
 
             event = events.CommandOutputEvent(
@@ -345,7 +347,8 @@ class ForkSessionCommand(CommandABC):
         else:
             fork_description = "entire conversation" if selected == -1 else f"up to message index {selected}"
 
-        resume_cmd = f"klaude --resume {new_session.id}"
+        short_id = Session.shortest_unique_prefix(new_session.id)
+        resume_cmd = f"klaude -r {short_id}"
         copy_to_clipboard(resume_cmd)
 
         event = events.CommandOutputEvent(

klaude_code/tui/command/resume_cmd.py

@@ -8,9 +8,16 @@ from klaude_code.tui.terminal.selector import DEFAULT_PICKER_STYLE, SelectItem,
 from .command_abc import Agent, CommandABC, CommandResult
 
 
-def select_session_sync() -> str | None:
-    """Interactive session selection (sync version for asyncio.to_thread)."""
+def select_session_sync(session_ids: list[str] | None = None) -> str | None:
+    """Interactive session selection (sync version for asyncio.to_thread).
+
+    Args:
+        session_ids: Optional list of session IDs to filter. If provided, only show these sessions.
+    """
     options = build_session_select_options()
+    if session_ids is not None:
+        session_id_set = set(session_ids)
+        options = [opt for opt in options if opt.session_id in session_id_set]
     if not options:
         log("No sessions found for this project.")
         return None

klaude_code/tui/command/sub_agent_model_cmd.py

@@ -1,10 +1,10 @@
-"""Command for changing sub-agent models."""
+"""Command for changing sub-agent models and compact model."""
 
 from __future__ import annotations
 
 import asyncio
 
-from klaude_code.config.config import load_config
+from klaude_code.config.config import Config, load_config
 from klaude_code.config.sub_agent_model_helper import SubAgentModelHelper, SubAgentModelInfo
 from klaude_code.protocol import commands, events, message, op
 from klaude_code.tui.terminal.selector import DEFAULT_PICKER_STYLE, SelectItem, build_model_select_items, select_one
@@ -12,16 +12,35 @@ from klaude_code.tui.terminal.selector import DEFAULT_PICKER_STYLE, SelectItem,
 from .command_abc import Agent, CommandABC, CommandResult
 
 USE_DEFAULT_BEHAVIOR = "__default__"
+COMPACT_MODEL_OPTION = "__compact__"
+
+
+def _build_compact_model_item(config: Config, max_name_len: int, main_model_name: str) -> SelectItem[str]:
+    """Build SelectItem for compact model configuration."""
+    name = "Compact"
+    model_display = config.compact_model or f"(inherit from main agent: {main_model_name})"
+
+    title = [
+        ("class:msg", f"{name:<{max_name_len}}"),
+        ("class:meta", f"  current: {model_display}\n"),
+    ]
+    return SelectItem(title=title, value=COMPACT_MODEL_OPTION, search_text="compact")
 
 
 def _build_sub_agent_select_items(
     sub_agents: list[SubAgentModelInfo],
     helper: SubAgentModelHelper,
     main_model_name: str,
+    config: Config,
 ) -> list[SelectItem[str]]:
-    """Build SelectItem list for sub-agent selection."""
+    """Build SelectItem list for sub-agent selection (including compact model)."""
     items: list[SelectItem[str]] = []
+    # Include "Compact" in max_name_len calculation
     max_name_len = max(len(sa.profile.name) for sa in sub_agents) if sub_agents else 0
+    max_name_len = max(max_name_len, len("Compact"))
+
+    # Add compact model option first
+    items.append(_build_compact_model_item(config, max_name_len, main_model_name))
 
     for sa in sub_agents:
         name = sa.profile.name
@@ -45,9 +64,10 @@ def _select_sub_agent_sync(
     sub_agents: list[SubAgentModelInfo],
     helper: SubAgentModelHelper,
     main_model_name: str,
+    config: Config,
 ) -> str | None:
-    """Synchronous sub-agent type selection."""
-    items = _build_sub_agent_select_items(sub_agents, helper, main_model_name)
+    """Synchronous sub-agent type selection (including compact model)."""
+    items = _build_sub_agent_select_items(sub_agents, helper, main_model_name, config)
     if not items:
         return None
 
@@ -98,8 +118,39 @@ def _select_model_for_sub_agent_sync(
         return None
 
 
+def _select_model_for_compact_sync(
+    config: Config,
+    main_model_name: str,
+) -> str | None:
+    """Synchronous model selection for compact model."""
+    models = config.iter_model_entries(only_available=True, include_disabled=False)
+
+    inherit_item = SelectItem[str](
+        title=[
+            ("class:msg", "(Use default behavior)"),
+            ("class:meta", f"  -> inherit from main agent: {main_model_name}\n"),
+        ],
+        value=USE_DEFAULT_BEHAVIOR,
+        search_text="default unset",
+    )
+    model_items = build_model_select_items(models)
+    all_items = [inherit_item, *model_items]
+
+    try:
+        result = select_one(
+            message="Select model for Compact:",
+            items=all_items,
+            pointer="→",
+            style=DEFAULT_PICKER_STYLE,
+            use_search_filter=True,
+        )
+        return result if isinstance(result, str) else None
+    except KeyboardInterrupt:
+        return None
+
+
 class SubAgentModelCommand(CommandABC):
-    """Configure models for sub-agents (Task, Explore, WebAgent, ImageGen)."""
+    """Configure models for sub-agents (Task, Explore, Web, ImageGen) and compact model."""
 
     @property
     def name(self) -> commands.CommandName:
@@ -119,32 +170,48 @@ class SubAgentModelCommand(CommandABC):
         main_model_name = agent.get_llm_client().model_name
 
         sub_agents = helper.get_available_sub_agents()
-        if not sub_agents:
+
+        selected_option = await asyncio.to_thread(_select_sub_agent_sync, sub_agents, helper, main_model_name, config)
+        if selected_option is None:
             return CommandResult(
                 events=[
                     events.CommandOutputEvent(
                         session_id=agent.session.id,
                         command_name=self.name,
-                        content="No sub-agents available",
-                        is_error=True,
+                        content="(cancelled)",
                     )
                 ]
             )
 
-        selected_sub_agent = await asyncio.to_thread(_select_sub_agent_sync, sub_agents, helper, main_model_name)
-        if selected_sub_agent is None:
+        # Handle compact model selection
+        if selected_option == COMPACT_MODEL_OPTION:
+            selected_model = await asyncio.to_thread(_select_model_for_compact_sync, config, main_model_name)
+            if selected_model is None:
+                return CommandResult(
+                    events=[
+                        events.CommandOutputEvent(
+                            session_id=agent.session.id,
+                            command_name=self.name,
+                            content="(cancelled)",
+                        )
+                    ]
+                )
+
+            model_name: str | None = None if selected_model == USE_DEFAULT_BEHAVIOR else selected_model
+
             return CommandResult(
-                events=[
-                    events.CommandOutputEvent(
+                operations=[
+                    op.ChangeCompactModelOperation(
                         session_id=agent.session.id,
-                        command_name=self.name,
-                        content="(cancelled)",
+                        model_name=model_name,
+                        save_as_default=True,
                     )
                 ]
             )
 
+        # Handle sub-agent model selection
         selected_model = await asyncio.to_thread(
-            _select_model_for_sub_agent_sync, helper, selected_sub_agent, main_model_name
+            _select_model_for_sub_agent_sync, helper, selected_option, main_model_name
         )
         if selected_model is None:
             return CommandResult(
@@ -157,13 +224,13 @@ class SubAgentModelCommand(CommandABC):
                 ]
             )
 
-        model_name: str | None = None if selected_model == USE_DEFAULT_BEHAVIOR else selected_model
+        model_name = None if selected_model == USE_DEFAULT_BEHAVIOR else selected_model
 
         return CommandResult(
             operations=[
                 op.ChangeSubAgentModelOperation(
                     session_id=agent.session.id,
-                    sub_agent_type=selected_sub_agent,
+                    sub_agent_type=selected_option,
                     model_name=model_name,
                     save_as_default=True,
                 )

klaude_code/tui/components/assistant.py

@@ -1,28 +1,2 @@
-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 NoInsetMarkdown
-from klaude_code.tui.components.rich.theme import ThemeKey
-
 # UI markers
 ASSISTANT_MESSAGE_MARK = "•"
-
-
-def render_assistant_message(content: str, *, code_theme: str) -> RenderableType | None:
-    """Render assistant message for replay history display.
-
-    Returns None if content is empty.
-    """
-    stripped = content.strip()
-    if len(stripped) == 0:
-        return None
-
-    grid = create_grid()
-    grid.add_row(
-        Text(ASSISTANT_MESSAGE_MARK, style=ThemeKey.ASSISTANT_MESSAGE_MARK),
-        Padding(NoInsetMarkdown(stripped, code_theme=code_theme), (0, MARKDOWN_RIGHT_MARGIN, 0, 0)),
-    )
-    return grid

klaude_code/tui/components/command_output.py

@@ -4,6 +4,7 @@ from rich.table import Table
 from rich.text import Text
 
 from klaude_code.protocol import events, model
+from klaude_code.session import Session
 from klaude_code.tui.components.common import truncate_middle
 from klaude_code.tui.components.rich.theme import ThemeKey
 
@@ -47,10 +48,11 @@ def _render_fork_session_output(e: events.CommandOutputEvent) -> RenderableType:
 
     grid = Table.grid(padding=(0, 1))
     session_id = e.ui_extra.session_id
+    short_id = Session.shortest_unique_prefix(session_id)
     grid.add_column(style=ThemeKey.TOOL_RESULT, overflow="fold")
 
     grid.add_row(Text("Session forked. Resume command copied to clipboard:", style=ThemeKey.TOOL_RESULT))
-    grid.add_row(Text(f"  klaude --resume {session_id}", style=ThemeKey.TOOL_RESULT_BOLD))
+    grid.add_row(Text(f"  klaude -r {short_id}", style=ThemeKey.TOOL_RESULT_BOLD))
 
     return Padding.indent(grid, level=2)
 

klaude_code/tui/components/developer.py

@@ -115,5 +115,8 @@ def render_developer_message(e: events.DeveloperMessageEvent) -> RenderableType:
                         ),
                     )
                     parts.append(grid)
+                case model.AtFileImagesUIItem():
+                    # Image display is handled by renderer.display_developer_message
+                    pass
 
     return Group(*parts) if parts else Text("")

klaude_code/tui/components/diffs.py

@@ -1,185 +1,12 @@
-from rich import box
-from rich.console import Group, RenderableType
-from rich.padding import Padding
-from rich.panel import Panel
+from rich.console import RenderableType
 from rich.text import Text
 
-from klaude_code.const import DIFF_PREFIX_WIDTH, MAX_DIFF_LINES
+from klaude_code.const import DIFF_PREFIX_WIDTH
 from klaude_code.protocol import model
 from klaude_code.tui.components.common import create_grid
 from klaude_code.tui.components.rich.theme import ThemeKey
 
 
-def _make_diff_prefix(line: str, new_ln: int | None, width: int) -> tuple[str, int | None]:
-    kind = line[0]
-
-    number = " " * width
-    if kind in {"+", " "} and new_ln is not None:
-        number = f"{new_ln:>{width}}"
-        new_ln += 1
-
-    if kind == "-":
-        marker = "-"
-    elif kind == "+":
-        marker = "+"
-    else:
-        marker = " "
-
-    prefix = f"{number} {marker}"
-    return prefix, new_ln
-
-
-def render_diff(diff_text: str, show_file_name: bool = False) -> RenderableType:
-    if diff_text == "":
-        return Text("")
-
-    lines = diff_text.split("\n")
-    grid = create_grid()
-    grid.padding = (0, 0)
-
-    # Track line numbers based on hunk headers
-    new_ln: int | None = None
-    # Track if we're in untracked files section
-    in_untracked_section = False
-    # Track whether we've already rendered a file header
-    has_rendered_file_header = False
-    # Track whether we have rendered actual diff content for the current file
-    has_rendered_diff_content = False
-    # Track the "from" file name from --- line (used for deleted files)
-    from_file_name: str | None = None
-
-    for i, line in enumerate(lines):
-        # Check for untracked files section header
-        if line == "git ls-files --others --exclude-standard":
-            in_untracked_section = True
-            grid.add_row("", "")
-            grid.add_row("", Text("Untracked files:", style=ThemeKey.TOOL_MARK))
-            grid.add_row("", "")
-            continue
-
-        # Handle untracked files
-        if in_untracked_section:
-            # If we hit a new section or empty line, we're done with untracked files
-            if line.startswith("diff --git") or line.strip() == "":
-                in_untracked_section = False
-            elif line.strip():  # Non-empty line in untracked section
-                file_text = Text(line.strip(), style=ThemeKey.TOOL_PARAM_BOLD)
-                grid.add_row(
-                    Text(f"{'+':>{DIFF_PREFIX_WIDTH}}", style=ThemeKey.TOOL_PARAM_BOLD),
-                    file_text,
-                )
-                continue
-
-        # Capture "from" file name from --- line (needed for deleted files)
-        if line.startswith("--- "):
-            raw = line[4:].strip()
-            if raw != "/dev/null":
-                from_file_name = raw[2:] if raw.startswith(("a/", "b/")) else raw
-            continue
-
-        # Parse file name from diff headers
-        if show_file_name and line.startswith("+++ "):
-            # Extract file name from +++ header with proper handling of /dev/null
-            raw = line[4:].strip()
-            if raw == "/dev/null":
-                # File was deleted, use the "from" file name
-                file_name = from_file_name or raw
-            elif raw.startswith(("a/", "b/")):
-                file_name = raw[2:]
-            else:
-                file_name = raw
-
-            file_text = Text(file_name, style=ThemeKey.DIFF_FILE_NAME)
-
-            # Count actual +/- lines for this file from i+1 onwards
-            file_additions = 0
-            file_deletions = 0
-            for remaining_line in lines[i + 1 :]:
-                if remaining_line.startswith("diff --git"):
-                    break
-                elif remaining_line.startswith("+") and not remaining_line.startswith("+++"):
-                    file_additions += 1
-                elif remaining_line.startswith("-") and not remaining_line.startswith("---"):
-                    file_deletions += 1
-
-            # Create stats text
-            stats_text = Text()
-            if file_additions > 0:
-                stats_text.append(f"+{file_additions}", style=ThemeKey.DIFF_STATS_ADD)
-            if file_deletions > 0:
-                if file_additions > 0:
-                    stats_text.append(" ")
-                stats_text.append(f"-{file_deletions}", style=ThemeKey.DIFF_STATS_REMOVE)
-
-            # Combine file name and stats
-            file_line = Text(style=ThemeKey.DIFF_FILE_NAME)
-            file_line.append_text(file_text)
-            if stats_text.plain:
-                file_line.append(" (")
-                file_line.append_text(stats_text)
-                file_line.append(")")
-
-            if has_rendered_file_header:
-                grid.add_row("", "")
-
-            if file_additions > 0 and file_deletions == 0:
-                file_mark = "+"
-            elif file_deletions > 0 and file_additions == 0:
-                file_mark = "-"
-            else:
-                file_mark = "±"
-
-            grid.add_row(
-                Text(f"{file_mark:>{DIFF_PREFIX_WIDTH}}  ", style=ThemeKey.DIFF_FILE_NAME),
-                file_line,
-            )
-            has_rendered_file_header = True
-            has_rendered_diff_content = False
-            continue
-
-        if line.startswith("diff --git"):
-            has_rendered_diff_content = False
-            continue
-
-        # Parse hunk headers to reset counters: @@ -l,s +l,s @@
-        if line.startswith("@@"):
-            try:
-                parts = line.split()
-                plus = parts[2]  # like '+12,4'
-                new_start = int(plus[1:].split(",")[0])
-                new_ln = new_start
-            except (IndexError, ValueError):
-                new_ln = None
-            if has_rendered_diff_content:
-                grid.add_row(Text(f"{'⋮':>{DIFF_PREFIX_WIDTH}}", style=ThemeKey.TOOL_RESULT), "")
-            continue
-
-        # Skip +++ lines (already handled above)
-        if line.startswith("+++ "):
-            continue
-
-        # Only handle unified diff hunk lines; ignore other metadata like
-        # "diff --git" or "index …" which would otherwise skew counters.
-        if not line or line[:1] not in {" ", "+", "-"}:
-            continue
-
-        # Compute line number prefix and style diff content
-        prefix, new_ln = _make_diff_prefix(line, new_ln, DIFF_PREFIX_WIDTH)
-
-        if line.startswith("-"):
-            text = Text(line[1:])
-            text.stylize(ThemeKey.DIFF_REMOVE)
-        elif line.startswith("+"):
-            text = Text(line[1:])
-            text.stylize(ThemeKey.DIFF_ADD)
-        else:
-            text = Text(line, style=ThemeKey.TOOL_RESULT)
-        grid.add_row(Text(prefix, ThemeKey.TOOL_RESULT), text)
-        has_rendered_diff_content = True
-
-    return grid
-
-
 def render_structured_diff(ui_extra: model.DiffUIExtra, show_file_name: bool = False) -> RenderableType:
     files = ui_extra.files
     if not files:
@@ -204,39 +31,6 @@ def render_structured_diff(ui_extra: model.DiffUIExtra, show_file_name: bool = F
     return grid
 
 
-def render_diff_panel(
-    diff_text: str,
-    *,
-    show_file_name: bool = True,
-    heading: str = "DIFF",
-    indent: int = 2,
-) -> RenderableType:
-    lines = diff_text.splitlines()
-    truncated_notice: Text | None = None
-    if len(lines) > MAX_DIFF_LINES:
-        truncated_lines = len(lines) - MAX_DIFF_LINES
-        diff_text = "\n".join(lines[:MAX_DIFF_LINES])
-        truncated_notice = Text(f"… truncated {truncated_lines} lines", style=ThemeKey.TOOL_MARK)
-
-    diff_body = render_diff(diff_text, show_file_name=show_file_name)
-    renderables: list[RenderableType] = [
-        Text(f" {heading} ", style="bold reverse"),
-        diff_body,
-    ]
-    if truncated_notice is not None:
-        renderables.extend([Text(""), truncated_notice])
-
-    panel = Panel.fit(
-        Group(*renderables),
-        border_style=ThemeKey.LINES,
-        title_align="center",
-        box=box.ROUNDED,
-    )
-    if indent <= 0:
-        return panel
-    return Padding.indent(panel, level=indent)
-
-
 def _render_file_header(file_diff: model.DiffFileDiff) -> tuple[Text, Text]:
     file_text = Text(file_diff.file_path, style=ThemeKey.DIFF_FILE_NAME)
     stats_text = Text()

klaude_code/tui/components/errors.py

@@ -9,6 +9,8 @@ def render_error(error_msg: Text) -> RenderableType:
     """Render error with X mark for error events."""
     grid = create_grid()
     error_msg.style = ThemeKey.ERROR
+    error_msg.overflow = "ellipsis"
+    error_msg.no_wrap = True
     grid.add_row(Text("✘", style=ThemeKey.ERROR_BOLD), error_msg)
     return grid
 
@@ -17,5 +19,7 @@ def render_tool_error(error_msg: Text) -> RenderableType:
     """Render error with indent for tool results."""
     grid = create_grid()
     error_msg.style = ThemeKey.ERROR
+    error_msg.overflow = "ellipsis"
+    error_msg.no_wrap = True
     grid.add_row(Text(" "), error_msg)
     return grid

klaude_code/tui/components/mermaid_viewer.py

@@ -16,7 +16,7 @@ _MERMAID_DEFAULT_PNG_SCALE = 2
 
 
 def artifacts_dir() -> Path:
-    return Path(TOOL_OUTPUT_TRUNCATION_DIR) / "mermaid"
+    return Path(TOOL_OUTPUT_TRUNCATION_DIR)
 
 
 def _extract_pako_from_link(link: str) -> str | None:
@@ -72,7 +72,7 @@ def ensure_viewer_file(*, code: str, link: str, tool_call_id: str) -> Path | Non
         return None
 
     safe_id = tool_call_id.replace("/", "_")
-    path = artifacts_dir() / f"mermaid-viewer-{safe_id}.html"
+    path = artifacts_dir() / f"klaude-mermaid-{safe_id}.html"
     if path.exists():
         return path