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

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
@@ -410,7 +414,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 +476,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 +489,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 +528,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 +678,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

klaude_code/tui/terminal/image.py

@@ -1,23 +1,64 @@
 from __future__ import annotations
 
 import base64
+import shutil
+import struct
+import subprocess
 import sys
+import tempfile
 from pathlib import Path
 from typing import IO
 
 # Kitty graphics protocol chunk size (4096 is the recommended max)
 _CHUNK_SIZE = 4096
 
+# Max columns for non-wide images
+_MAX_COLS = 120
 
-def print_kitty_image(file_path: str | Path, *, height: int | None = None, file: IO[str] | None = None) -> None:
+# Image formats that need conversion to PNG
+_NEEDS_CONVERSION = {".jpg", ".jpeg", ".gif", ".bmp", ".webp", ".tiff", ".tif"}
+
+
+def _convert_to_png(path: Path) -> bytes | None:
+    """Convert image to PNG using sips (macOS) or convert (ImageMagick)."""
+    with tempfile.NamedTemporaryFile(suffix=".png", delete=True) as tmp:
+        tmp_path = tmp.name
+        # Try sips first (macOS built-in)
+        result = subprocess.run(
+            ["sips", "-s", "format", "png", str(path), "--out", tmp_path],
+            capture_output=True,
+        )
+        if result.returncode == 0:
+            return Path(tmp_path).read_bytes()
+        # Fallback to ImageMagick convert
+        result = subprocess.run(
+            ["convert", str(path), tmp_path],
+            capture_output=True,
+        )
+        if result.returncode == 0:
+            return Path(tmp_path).read_bytes()
+    return None
+
+
+def _get_png_dimensions(data: bytes) -> tuple[int, int] | None:
+    """Extract width and height from PNG file header."""
+    # PNG: 8-byte signature + IHDR chunk (4 len + 4 type + 4 width + 4 height)
+    if len(data) < 24 or data[:8] != b"\x89PNG\r\n\x1a\n":
+        return None
+    width, height = struct.unpack(">II", data[16:24])
+    return width, height
+
+
+def print_kitty_image(file_path: str | Path, *, file: IO[str] | None = None) -> None:
     """Print an image to the terminal using Kitty graphics protocol.
 
     This intentionally bypasses Rich rendering to avoid interleaving Live refreshes
-    with raw escape sequences.
+    with raw escape sequences. Image size adapts based on aspect ratio:
+    - Landscape images: fill terminal width
+    - Portrait images: limit height to avoid oversized display
 
     Args:
         file_path: Path to the image file (PNG recommended).
-        height: Display height in terminal rows. If None, uses terminal default.
         file: Output file stream. Defaults to stdout.
     """
     path = Path(file_path) if isinstance(file_path, str) else file_path
@@ -26,24 +67,48 @@ def print_kitty_image(file_path: str | Path, *, height: int | None = None, file:
         return
 
     try:
-        data = path.read_bytes()
+        # Convert non-PNG formats to PNG for Kitty graphics protocol compatibility
+        if path.suffix.lower() in _NEEDS_CONVERSION:
+            data = _convert_to_png(path)
+            if data is None:
+                print(f"Saved image: {path}", file=file or sys.stdout, flush=True)
+                return
+        else:
+            data = path.read_bytes()
+
         encoded = base64.standard_b64encode(data).decode("ascii")
         out = file or sys.stdout
 
+        term_size = shutil.get_terminal_size()
+        dimensions = _get_png_dimensions(data)
+
+        # Determine sizing strategy based on aspect ratio
+        if dimensions is not None:
+            img_width, img_height = dimensions
+            if img_width > 2 * img_height:
+                # Wide landscape (width > 2x height): fill terminal width
+                size_param = f"c={term_size.columns}"
+            else:
+                # Other images: limit width to 80% of terminal
+                size_param = f"c={min(_MAX_COLS, term_size.columns * 4 // 5)}"
+        else:
+            # Fallback: limit width to 80% of terminal
+            size_param = f"c={min(_MAX_COLS, term_size.columns * 4 // 5)}"
         print("", file=out)
-        _write_kitty_graphics(out, encoded, height=height)
+        _write_kitty_graphics(out, encoded, size_param=size_param)
         print("", file=out)
         out.flush()
     except Exception:
         print(f"Saved image: {path}", file=file or sys.stdout, flush=True)
 
 
-def _write_kitty_graphics(out: IO[str], encoded_data: str, *, height: int | None = None) -> None:
+def _write_kitty_graphics(out: IO[str], encoded_data: str, *, size_param: str) -> None:
     """Write Kitty graphics protocol escape sequences.
 
     Protocol format: ESC _ G <control>;<payload> ESC \\
     - a=T: direct transmission (data in payload)
     - f=100: PNG format (auto-detected by Kitty)
+    - c=N: display width in columns
     - r=N: display height in rows
     - m=1: more data follows, m=0: last chunk
     """
@@ -55,10 +120,7 @@ def _write_kitty_graphics(out: IO[str], encoded_data: str, *, height: int | None
 
         if i == 0:
             # First chunk: include control parameters
-            ctrl = "a=T,f=100"
-            if height is not None:
-                ctrl += f",r={height}"
-            ctrl += f",m={0 if is_last else 1}"
+            ctrl = f"a=T,f=100,{size_param},m={0 if is_last else 1}"
             out.write(f"\033_G{ctrl};{chunk}\033\\")
         else:
             # Subsequent chunks: only m parameter needed

klaude_code/tui/terminal/selector.py

@@ -81,13 +81,13 @@ def build_model_select_items(models: list[Any]) -> list[SelectItem[str]]:
 
     items: list[SelectItem[str]] = []
     model_idx = 0
-    separator_base_len = 40
+    separator_base_len = 80
     for provider, provider_models in grouped.items():
         provider_text = provider.lower()
         count_text = f"({len(provider_models)})"
         header_len = len(provider_text) + 1 + len(count_text)
         separator_len = separator_base_len + max_header_len - header_len
-        separator = "─" * separator_len
+        separator = "-" * separator_len
         items.append(
             SelectItem(
                 title=[
@@ -574,7 +574,10 @@ def select_one[T](
     )
     list_window = Window(
         FormattedTextControl(get_choices_tokens),
-        scroll_offsets=ScrollOffsets(top=0, bottom=2),
+        # Keep 1 line of context above the cursor so non-selectable header rows
+        # (e.g. provider group labels) remain visible when wrapping back to the
+        # first selectable item in a scrolled list.
+        scroll_offsets=ScrollOffsets(top=1, bottom=2),
         allow_scroll_beyond_bottom=True,
         dont_extend_height=Always(),
         always_hide_cursor=Always(),
@@ -796,6 +799,7 @@ class SelectOverlay[T]:
             dont_extend_height=Always(),
             always_hide_cursor=Always(),
         )
+
         def get_list_height() -> int:
             # Dynamic height: min of configured height and available terminal space
             # Overhead: header(1) + spacer(1) + search(1) + frame borders(2) + prompt area(3)
@@ -803,15 +807,35 @@ class SelectOverlay[T]:
             try:
                 terminal_height = get_app().output.get_size().rows
                 available = max(3, terminal_height - overhead)
-                return min(self._list_height, available)
+                cap = min(self._list_height, available)
             except Exception:
-                return self._list_height
+                cap = self._list_height
+
+            # Shrink list height when content is shorter than the configured cap.
+            # This is especially helpful for small pickers (e.g. thinking level)
+            # where a fixed list_height would otherwise render extra blank rows.
+            indices, _ = self._get_visible_indices()
+            if not indices:
+                return max(1, cap)
+
+            visible_lines = 0
+            for idx in indices:
+                item = self._items[idx]
+                newlines = sum(text.count("\n") for _style, text in item.title)
+                visible_lines += max(1, newlines)
+                if visible_lines >= cap:
+                    break
+
+            return max(1, min(cap, visible_lines))
 
         list_window = Window(
             FormattedTextControl(get_choices_tokens),
             height=get_list_height,
-            scroll_offsets=ScrollOffsets(top=0, bottom=2),
-            allow_scroll_beyond_bottom=True,
+            # See select_one(): keep header rows visible when wrapping.
+            # For embedded overlays, avoid reserving extra blank lines near the
+            # bottom when the list height is tight (e.g. short pickers).
+            scroll_offsets=ScrollOffsets(top=1, bottom=0),
+            allow_scroll_beyond_bottom=False,
             dont_extend_height=Always(),
             always_hide_cursor=Always(),
         )

{klaude_code-2.7.0.dist-info → klaude_code-2.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 2.7.0
+Version: 2.8.0
 Summary: Minimal code agent CLI
 Requires-Dist: anthropic>=0.66.0
 Requires-Dist: chardet>=5.2.0