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

klaude_code/tui/components/tools.py

@@ -263,11 +263,7 @@ def render_write_tool_call(arguments: str) -> RenderableType:
     try:
         json_dict = json.loads(arguments)
         file_path = json_dict.get("file_path", "")
-        # Markdown files show path in result panel, skip here to avoid duplication
-        if file_path.endswith(".md"):
-            details: RenderableType | None = None
-        else:
-            details = render_path(file_path, ThemeKey.TOOL_PARAM_FILE_PATH)
+        details: RenderableType | None = render_path(file_path, ThemeKey.TOOL_PARAM_FILE_PATH)
     except json.JSONDecodeError:
         details = Text(
             arguments.strip()[:INVALID_TOOL_CALL_MAX_LENGTH],
@@ -292,24 +288,29 @@ def render_apply_patch_tool_call(arguments: str) -> RenderableType:
     details = Text("", ThemeKey.TOOL_PARAM)
 
     if isinstance(patch_content, str):
-        update_count = 0
-        add_count = 0
-        delete_count = 0
+        update_files: list[str] = []
+        add_files: list[str] = []
+        delete_files: list[str] = []
         for line in patch_content.splitlines():
             if line.startswith("*** Update File:"):
-                update_count += 1
+                update_files.append(line[len("*** Update File:") :].strip())
             elif line.startswith("*** Add File:"):
-                add_count += 1
+                add_files.append(line[len("*** Add File:") :].strip())
             elif line.startswith("*** Delete File:"):
-                delete_count += 1
+                delete_files.append(line[len("*** Delete File:") :].strip())
 
         parts: list[str] = []
-        if update_count > 0:
-            parts.append(f"Update File × {update_count}" if update_count > 1 else "Update File")
-        if add_count > 0:
-            parts.append(f"Add File × {add_count}" if add_count > 1 else "Add File")
-        if delete_count > 0:
-            parts.append(f"Delete File × {delete_count}" if delete_count > 1 else "Delete File")
+        if update_files:
+            parts.append(f"Update File × {len(update_files)}" if len(update_files) > 1 else "Update File")
+        if add_files:
+            # 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})")
+            else:
+                parts.append(f"Add File × {len(add_files)}" if len(add_files) > 1 else "Add File")
+        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)
@@ -593,14 +594,24 @@ def _extract_markdown_doc(ui_extra: model.ToolResultUIExtra | None) -> model.Mar
 
 
 def render_markdown_doc(md_ui: model.MarkdownDocUIExtra, *, code_theme: str) -> RenderableType:
-    """Render markdown document content in a panel."""
-    header = render_path(md_ui.file_path, ThemeKey.TOOL_PARAM_FILE_PATH)
-    return Panel.fit(
-        Group(header, Text(""), NoInsetMarkdown(md_ui.content, code_theme=code_theme)),
+    """Render markdown document content in a panel with 2-char left indent and top margin."""
+    import shutil
+
+    from rich.padding import Padding
+
+    # Limit panel width to min(100, terminal_width) minus left indent (2)
+    terminal_width = shutil.get_terminal_size().columns
+    panel_width = min(100, terminal_width) - 2
+
+    panel = Panel(
+        NoInsetMarkdown(md_ui.content, code_theme=code_theme),
         box=box.SIMPLE,
         border_style=ThemeKey.LINES,
         style=ThemeKey.WRITE_MARKDOWN_PANEL,
+        width=panel_width,
     )
+    # (top, right, bottom, left) - 1 line top margin, 2-char left indent
+    return Padding(panel, (1, 0, 0, 2))
 
 
 def render_tool_result(
@@ -628,11 +639,12 @@ def render_tool_result(
         rendered: list[RenderableType] = []
         for item in e.ui_extra.items:
             if isinstance(item, model.MarkdownDocUIExtra):
+                # Markdown docs render without TreeQuote wrap (already has 2-char indent)
                 rendered.append(render_markdown_doc(item, code_theme=code_theme))
             elif isinstance(item, model.DiffUIExtra):
                 show_file_name = e.tool_name == tools.APPLY_PATCH
-                rendered.append(r_diffs.render_structured_diff(item, show_file_name=show_file_name))
-        return wrap(Group(*rendered)) if rendered else None
+                rendered.append(wrap(r_diffs.render_structured_diff(item, show_file_name=show_file_name)))
+        return Group(*rendered) if rendered else None
 
     diff_ui = _extract_diff(e.ui_extra)
     md_ui = _extract_markdown_doc(e.ui_extra)
@@ -649,11 +661,13 @@ def render_tool_result(
             return wrap(r_diffs.render_structured_diff(diff_ui) if diff_ui else Text(""))
         case tools.WRITE:
             if md_ui:
-                return wrap(render_markdown_doc(md_ui, code_theme=code_theme))
+                # Markdown docs render without TreeQuote wrap (already has 2-char indent)
+                return render_markdown_doc(md_ui, code_theme=code_theme)
             return wrap(r_diffs.render_structured_diff(diff_ui) if diff_ui else Text(""))
         case tools.APPLY_PATCH:
             if md_ui:
-                return wrap(render_markdown_doc(md_ui, code_theme=code_theme))
+                # Markdown docs render without TreeQuote wrap (already has 2-char indent)
+                return render_markdown_doc(md_ui, code_theme=code_theme)
             if diff_ui:
                 return wrap(r_diffs.render_structured_diff(diff_ui, show_file_name=True))
             return _render_fallback()

klaude_code/tui/components/user_input.py

@@ -104,4 +104,4 @@ def render_user_input(content: str) -> RenderableType:
 
 
 def render_interrupt() -> RenderableType:
-    return Text(" INTERRUPTED \n", style=ThemeKey.INTERRUPT)
+    return Text("  Interrupted by user\n", style=ThemeKey.INTERRUPT)

klaude_code/tui/input/__init__.py

@@ -1,6 +1,9 @@
 from klaude_code.tui.input.prompt_toolkit import REPLStatusSnapshot
 
 
-def build_repl_status_snapshot(update_message: str | None) -> REPLStatusSnapshot:
+def build_repl_status_snapshot(
+    update_message: str | None,
+    debug_log_path: str | None = None,
+) -> REPLStatusSnapshot:
     """Build a status snapshot for the REPL bottom toolbar."""
-    return REPLStatusSnapshot(update_message=update_message)
+    return REPLStatusSnapshot(update_message=update_message, debug_log_path=debug_log_path)

klaude_code/tui/input/drag_drop.py

@@ -13,7 +13,6 @@ from __future__ import annotations
 
 import contextlib
 import re
-import shlex
 from pathlib import Path
 from urllib.parse import unquote, urlparse
 
@@ -132,66 +131,16 @@ def _replace_file_uris(
     return out, changed
 
 
-def _looks_like_path_list(text: str) -> list[str] | None:
-    """Return tokens if text looks like a pure path list, else None."""
-
-    stripped = text.strip()
-    if not stripped:
-        return None
-
-    # Avoid converting when the paste already contains our input syntax.
-    if "@" in stripped or "[image " in stripped:
-        return None
-
-    try:
-        tokens = shlex.split(stripped, posix=True)
-    except ValueError:
-        return None
-
-    if not tokens:
-        return None
-
-    # Heuristic: all tokens must exist on disk.
-    for tok in tokens:
-        p = Path(tok).expanduser()
-        try:
-            if not p.exists():
-                return None
-        except OSError:
-            return None
-
-    return tokens
-
-
 def convert_dropped_text(
     text: str,
     *,
     cwd: Path,
 ) -> str:
-    """Convert drag-and-drop text into @ tokens and/or image markers."""
-
-    out, changed = _replace_file_uris(text, cwd=cwd)
-    if changed:
-        return out
-
-    tokens = _looks_like_path_list(text)
-    if not tokens:
-        return text
+    """Convert drag-and-drop file:// URIs into @ tokens and/or image markers.
 
-    converted: list[str] = []
-    for tok in tokens:
-        p = Path(tok).expanduser()
-        try:
-            is_img = p.exists() and p.is_file() and is_image_file(p)
-        except OSError:
-            is_img = False
-
-        if is_img:
-            converted.append(format_image_marker(_normalize_path_for_at(p, cwd=cwd)))
-            continue
-
-        converted.append(_format_at_token(_normalize_path_for_at(p, cwd=cwd)))
+    Only file:// URIs are converted. Plain paths are not auto-converted to avoid
+    unintended transformations when users paste regular path strings.
+    """
 
-    # Preserve trailing newline if present (common for bracketed paste payloads).
-    suffix = "\n" if text.endswith("\n") else ""
-    return " ".join(converted) + suffix
+    out, _ = _replace_file_uris(text, cwd=cwd)
+    return out

klaude_code/tui/input/key_bindings.py

@@ -578,4 +578,14 @@ def create_key_bindings(
             with contextlib.suppress(Exception):
                 open_thinking_picker()
 
+    @kb.add("escape", "up", filter=enabled & ~has_completions)
+    def _(event: KeyPressEvent) -> None:
+        """Option+Up switches to previous history entry."""
+        event.current_buffer.history_backward()
+
+    @kb.add("escape", "down", filter=enabled & ~has_completions)
+    def _(event: KeyPressEvent) -> None:
+        """Option+Down switches to next history entry."""
+        event.current_buffer.history_forward()
+
     return kb

klaude_code/tui/input/prompt_toolkit.py

@@ -53,6 +53,7 @@ class REPLStatusSnapshot(NamedTuple):
     """Snapshot of REPL status for bottom toolbar display."""
 
     update_message: str | None = None
+    debug_log_path: str | None = None
 
 
 COMPLETION_SELECTED_DARK_BG = "ansigreen"
@@ -434,7 +435,7 @@ class PromptToolkitInput(InputProviderABC):
                 original_height_int = original_height_value if isinstance(original_height_value, int) else None
 
                 if picker_open or completion_open:
-                    target_rows = 20 if picker_open else 14
+                    target_rows = 24 if picker_open else 14
 
                     # Cap to the current terminal size.
                     # Leave a small buffer to avoid triggering "Window too small".
@@ -531,7 +532,7 @@ class PromptToolkitInput(InputProviderABC):
             return [], None
 
         items: list[SelectItem[str]] = [
-            SelectItem(title=[("class:text", opt.label + "\n")], value=opt.value, search_text=opt.label)
+            SelectItem(title=[("class:msg", opt.label + "\n")], value=opt.value, search_text=opt.label)
             for opt in data.options
         ]
         return items, data.current_value
@@ -573,24 +574,36 @@ class PromptToolkitInput(InputProviderABC):
         doing any blocking IO here.
         """
         update_message: str | None = None
+        debug_log_path: str | None = None
         if self._status_provider is not None:
             try:
                 status = self._status_provider()
                 update_message = status.update_message
+                debug_log_path = status.debug_log_path
             except (AttributeError, RuntimeError):
-                update_message = None
+                pass
+
+        # Priority: update_message > debug_log_path
+        display_text: str | None = None
+        text_style: str = ""
+        if update_message:
+            display_text = update_message
+            text_style = "#ansiyellow"
+        elif debug_log_path:
+            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 update_message:
+        if not display_text:
             try:
                 terminal_width = shutil.get_terminal_size().columns
             except (OSError, ValueError):
                 terminal_width = 0
             return FormattedText([("", " " * max(0, terminal_width))])
 
-        left_text = " " + update_message
+        left_text = " " + display_text
         try:
             terminal_width = shutil.get_terminal_size().columns
             padding = " " * max(0, terminal_width - len(left_text))
@@ -598,7 +611,7 @@ class PromptToolkitInput(InputProviderABC):
             padding = ""
 
         toolbar_text = left_text + padding
-        return FormattedText([("#ansiyellow", toolbar_text)])
+        return FormattedText([(text_style, toolbar_text)])
 
     # -------------------------------------------------------------------------
     # Placeholder

klaude_code/tui/machine.py

@@ -6,6 +6,7 @@ from rich.text import Text
 
 from klaude_code.const import (
     SIGINT_DOUBLE_PRESS_EXIT_TEXT,
+    STATUS_COMPACTING_TEXT,
     STATUS_COMPOSING_TEXT,
     STATUS_DEFAULT_TEXT,
     STATUS_SHOW_BUFFER_LENGTH,
@@ -24,6 +25,7 @@ from klaude_code.tui.commands import (
     RenderAssistantImage,
     RenderCommand,
     RenderCommandOutput,
+    RenderCompactionSummary,
     RenderDeveloperMessage,
     RenderError,
     RenderInterrupt,
@@ -311,6 +313,7 @@ class _SessionState:
     thinking_stream_active: bool = False
     assistant_char_count: int = 0
     thinking_tail: str = ""
+    task_active: bool = False
 
     @property
     def is_sub_agent(self) -> bool:
@@ -414,6 +417,7 @@ class DisplayStateMachine:
             case events.TaskStartEvent() as e:
                 s.sub_agent_state = e.sub_agent_state
                 s.model_id = e.model_id
+                s.task_active = True
                 if not s.is_sub_agent:
                     self._set_primary_if_needed(e.session_id)
                     if not is_replay:
@@ -428,6 +432,25 @@ class DisplayStateMachine:
                     cmds.extend(self._spinner_update_commands())
                 return cmds
 
+            case events.CompactionStartEvent():
+                if not is_replay:
+                    self._spinner.set_reasoning_status(STATUS_COMPACTING_TEXT)
+                    if not s.task_active:
+                        cmds.append(SpinnerStart())
+                    cmds.extend(self._spinner_update_commands())
+                return cmds
+
+            case events.CompactionEndEvent() as e:
+                if not is_replay:
+                    self._spinner.set_reasoning_status(None)
+                    if not s.task_active:
+                        cmds.append(SpinnerStop())
+                    cmds.extend(self._spinner_update_commands())
+                if e.summary and not e.aborted:
+                    kept_brief = tuple((item.item_type, item.count, item.preview) for item in e.kept_items_brief)
+                    cmds.append(RenderCompactionSummary(summary=e.summary, kept_items_brief=kept_brief))
+                return cmds
+
             case events.DeveloperMessageEvent() as e:
                 cmds.append(RenderDeveloperMessage(e))
                 return cmds
@@ -650,6 +673,7 @@ class DisplayStateMachine:
                 return []
 
             case events.TaskFinishEvent() as e:
+                s.task_active = False
                 cmds.append(RenderTaskFinish(e))
                 if not s.is_sub_agent:
                     if not is_replay:
@@ -666,6 +690,7 @@ class DisplayStateMachine:
                 if not is_replay:
                     self._spinner.reset()
                     cmds.append(SpinnerStop())
+                s.task_active = False
                 cmds.append(EndThinkingStream(session_id=e.session_id))
                 cmds.append(EndAssistantStream(session_id=e.session_id))
                 if not is_replay:

klaude_code/tui/renderer.py

@@ -1,13 +1,16 @@
 from __future__ import annotations
 
 import contextlib
+import shutil
 from collections.abc import Callable, Iterator
 from contextlib import contextmanager
 from dataclasses import dataclass
 from typing import Any
 
+from rich import box
 from rich.console import Console, Group, RenderableType
 from rich.padding import Padding
+from rich.panel import Panel
 from rich.rule import Rule
 from rich.spinner import Spinner
 from rich.style import Style, StyleType
@@ -32,6 +35,7 @@ from klaude_code.tui.commands import (
     RenderAssistantImage,
     RenderCommand,
     RenderCommandOutput,
+    RenderCompactionSummary,
     RenderDeveloperMessage,
     RenderError,
     RenderInterrupt,
@@ -66,7 +70,7 @@ from klaude_code.tui.components import welcome as c_welcome
 from klaude_code.tui.components.common import truncate_head
 from klaude_code.tui.components.rich import status as r_status
 from klaude_code.tui.components.rich.live import CropAboveLive, SingleLine
-from klaude_code.tui.components.rich.markdown import MarkdownStream, ThinkingMarkdown
+from klaude_code.tui.components.rich.markdown import MarkdownStream, NoInsetMarkdown, ThinkingMarkdown
 from klaude_code.tui.components.rich.quote import Quote
 from klaude_code.tui.components.rich.status import BreathingSpinner, ShimmerStatusText
 from klaude_code.tui.components.rich.theme import ThemeKey, get_theme
@@ -375,6 +379,7 @@ class TUICommandRenderer:
             live_sink=self.set_stream_renderable,
             mark=c_assistant.ASSISTANT_MESSAGE_MARK,
             left_margin=MARKDOWN_LEFT_MARGIN,
+            image_callback=self.display_image,
         )
 
     def _flush_thinking(self) -> None:
@@ -410,7 +415,7 @@ class TUICommandRenderer:
                 session_id=e.session_id,
             )
             if image_path is not None:
-                self.display_image(str(image_path), height=None)
+                self.display_image(str(image_path))
 
         renderable = c_tools.render_tool_result(e, code_theme=self.themes.code_theme, session_id=e.session_id)
         if renderable is not None:
@@ -472,7 +477,7 @@ class TUICommandRenderer:
         if not self.is_sub_agent_session(event.session_id):
             self.print()
 
-    def display_image(self, file_path: str, height: int | None = 40) -> None:
+    def display_image(self, file_path: str) -> None:
         # Suspend the Live status bar while emitting raw terminal output.
         had_live = self._bottom_live is not None
         was_spinner_visible = self._spinner_visible
@@ -485,7 +490,7 @@ class TUICommandRenderer:
             self._bottom_live = None
 
         try:
-            print_kitty_image(file_path, height=height, file=self.console.file)
+            print_kitty_image(file_path, file=self.console.file)
         finally:
             if resume_live:
                 if was_spinner_visible:
@@ -524,6 +529,63 @@ class TUICommandRenderer:
         else:
             self.print(c_errors.render_error(Text(event.error_message)))
 
+    def display_compaction_summary(self, summary: str, kept_items_brief: tuple[tuple[str, int, str], ...] = ()) -> None:
+        stripped = summary.strip()
+        if not stripped:
+            return
+        stripped = (
+            stripped.replace("<summary>", "")
+            .replace("</summary>", "")
+            .replace("<read_files>", "")
+            .replace("</read_files>", "")
+            .replace("<modified-files>", "")
+            .replace("</modified-files>", "")
+        )
+        self.console.print(
+            Rule(
+                Text("Context Compact", style=ThemeKey.COMPACTION_SUMMARY),
+                characters="=",
+                style=ThemeKey.COMPACTION_SUMMARY,
+            )
+        )
+        self.print()
+
+        # Limit panel width to min(100, terminal_width) minus left indent (2)
+        terminal_width = shutil.get_terminal_size().columns
+        panel_width = min(100, terminal_width) - 2
+
+        self.console.push_theme(self.themes.markdown_theme)
+        panel = Panel(
+            NoInsetMarkdown(stripped, code_theme=self.themes.code_theme, style=ThemeKey.COMPACTION_SUMMARY),
+            box=box.SIMPLE,
+            border_style=ThemeKey.LINES,
+            style=ThemeKey.COMPACTION_SUMMARY_PANEL,
+            width=panel_width,
+        )
+        self.print(Padding(panel, (0, 0, 0, MARKDOWN_LEFT_MARGIN)))
+        self.console.pop_theme()
+
+        if kept_items_brief:
+            # Collect tool call counts (skip User/Assistant entries)
+            tool_counts: dict[str, int] = {}
+            for item_type, count, _ in kept_items_brief:
+                if item_type not in ("User", "Assistant"):
+                    tool_counts[item_type] = tool_counts.get(item_type, 0) + count
+
+            if tool_counts:
+                parts: list[str] = []
+                for tool_type, tool_count in tool_counts.items():
+                    if tool_count > 1:
+                        parts.append(f"{tool_type} x {tool_count}")
+                    else:
+                        parts.append(tool_type)
+                line = Text()
+                line.append("\n  Kept uncompacted: ", style=ThemeKey.COMPACTION_SUMMARY)
+                line.append(", ".join(parts), style=ThemeKey.COMPACTION_SUMMARY)
+                self.print(line)
+
+        self.print()
+
     # ---------------------------------------------------------------------
     # Notifications
     # ---------------------------------------------------------------------
@@ -617,6 +679,8 @@ class TUICommandRenderer:
                     self.display_interrupt()
                 case RenderError(event=event):
                     self.display_error(event)
+                case RenderCompactionSummary(summary=summary, kept_items_brief=kept_items_brief):
+                    self.display_compaction_summary(summary, kept_items_brief)
                 case SpinnerStart():
                     self.spinner_start()
                 case SpinnerStop():

klaude_code/tui/runner.py

@@ -16,8 +16,9 @@ from klaude_code.app.runtime import (
 )
 from klaude_code.config import load_config
 from klaude_code.const import SIGINT_DOUBLE_PRESS_EXIT_TEXT
+from klaude_code.core.compaction import should_compact_threshold
 from klaude_code.core.executor import Executor
-from klaude_code.log import log
+from klaude_code.log import get_current_log_file, log
 from klaude_code.protocol import events, llm_param, op
 from klaude_code.protocol.message import UserInputPayload
 from klaude_code.session.session import Session
@@ -80,6 +81,19 @@ async def submit_user_input_payload(
         for evt in cmd_result.events:
             await executor.context.emit_event(evt)
 
+    if run_ops and should_compact_threshold(
+        session=agent.session,
+        config=None,
+        llm_config=agent.profile.llm_client.get_llm_config(),
+    ):
+        await executor.submit_and_wait(
+            op.CompactSessionOperation(
+                session_id=agent.session.id,
+                reason="threshold",
+                will_retry=False,
+            )
+        )
+
     submitted_ids: list[str] = []
     for operation_item in operations:
         submitted_ids.append(await executor.submit(operation_item))
@@ -124,7 +138,9 @@ async def run_interactive(init_config: AppInitConfig, session_id: str | None = N
 
     def _status_provider() -> REPLStatusSnapshot:
         update_message = get_update_message()
-        return build_repl_status_snapshot(update_message)
+        debug_log = get_current_log_file()
+        debug_log_path = str(debug_log) if debug_log else None
+        return build_repl_status_snapshot(update_message, debug_log_path=debug_log_path)
 
     def _stop_rich_bottom_ui() -> None:
         active_display = components.display