klaude-code 2.10.2__py3-none-any.whl → 2.10.4__py3-none-any.whl

klaude_code/tui/components/tools.py

@@ -10,7 +10,6 @@ from rich.style import Style
 from rich.text import Text
 
 from klaude_code.const import (
-    BASH_OUTPUT_PANEL_THRESHOLD,
     DIFF_PREFIX_WIDTH,
     INVALID_TOOL_CALL_MAX_LENGTH,
     QUERY_DISPLAY_TRUNCATE_LENGTH,
@@ -24,7 +23,6 @@ from klaude_code.tui.components import diffs as r_diffs
 from klaude_code.tui.components import mermaid_viewer as r_mermaid_viewer
 from klaude_code.tui.components.bash_syntax import highlight_bash_command
 from klaude_code.tui.components.common import create_grid, truncate_middle
-from klaude_code.tui.components.rich.code_panel import CodePanel
 from klaude_code.tui.components.rich.markdown import NoInsetMarkdown
 from klaude_code.tui.components.rich.quote import TreeQuote
 from klaude_code.tui.components.rich.theme import ThemeKey
@@ -40,6 +38,7 @@ MARK_MERMAID = "⧉"
 MARK_WEB_FETCH = "→"
 MARK_WEB_SEARCH = "✱"
 MARK_DONE = "✔"
+MARK_BACKTRACK = "↶"
 
 # Todo status markers
 MARK_TODO_PENDING = "▢"
@@ -168,22 +167,6 @@ def render_bash_tool_call(arguments: str) -> RenderableType:
         cmd_str = command.strip()
         highlighted = highlight_bash_command(cmd_str)
 
-        display_line_count = len(highlighted.plain.splitlines())
-
-        if display_line_count > BASH_OUTPUT_PANEL_THRESHOLD:
-            code_panel = CodePanel(highlighted, border_style=ThemeKey.LINES)
-            if isinstance(timeout_ms, int):
-                if timeout_ms >= 1000 and timeout_ms % 1000 == 0:
-                    timeout_text = Text(f"{timeout_ms // 1000}s", style=ThemeKey.TOOL_TIMEOUT)
-                else:
-                    timeout_text = Text(f"{timeout_ms}ms", style=ThemeKey.TOOL_TIMEOUT)
-                return _render_tool_call_tree(
-                    mark=MARK_BASH,
-                    tool_name=tool_name,
-                    details=Group(code_panel, timeout_text),
-                )
-            else:
-                return _render_tool_call_tree(mark=MARK_BASH, tool_name=tool_name, details=code_panel)
         if isinstance(timeout_ms, int):
             if timeout_ms >= 1000 and timeout_ms % 1000 == 0:
                 highlighted.append(f" {timeout_ms // 1000}s", style=ThemeKey.TOOL_TIMEOUT)
@@ -552,6 +535,33 @@ def render_report_back_tool_call() -> RenderableType:
     return _render_tool_call_tree(mark=MARK_DONE, tool_name="Report Back", details=None)
 
 
+def render_backtrack_tool_call(arguments: str) -> RenderableType:
+    tool_name = "Backtrack"
+
+    try:
+        payload: dict[str, Any] = json.loads(arguments)
+    except json.JSONDecodeError:
+        details = Text(
+            arguments.strip()[:INVALID_TOOL_CALL_MAX_LENGTH],
+            style=ThemeKey.INVALID_TOOL_CALL_ARGS,
+        )
+        return _render_tool_call_tree(mark=MARK_BACKTRACK, tool_name=tool_name, details=details)
+
+    checkpoint_id = payload.get("checkpoint_id")
+    rationale = payload.get("rationale", "")
+
+    summary = Text("", ThemeKey.TOOL_PARAM)
+    if isinstance(checkpoint_id, int):
+        summary.append(f"Checkpoint {checkpoint_id}", ThemeKey.TOOL_PARAM_BOLD)
+    if rationale:
+        rationale_preview = rationale if len(rationale) <= 50 else rationale[:47] + "..."
+        if summary.plain:
+            summary.append(" - ")
+        summary.append(rationale_preview, ThemeKey.TOOL_PARAM)
+
+    return _render_tool_call_tree(mark=MARK_BACKTRACK, tool_name=tool_name, details=summary if summary.plain else None)
+
+
 # Tool name to active form mapping (for spinner status)
 _TOOL_ACTIVE_FORM: dict[str, str] = {
     tools.BASH: "Bashing",
@@ -567,6 +577,7 @@ _TOOL_ACTIVE_FORM: dict[str, str] = {
     tools.REPORT_BACK: "Reporting",
     tools.IMAGE_GEN: "Generating Image",
     tools.TASK: "Spawning Task",
+    tools.BACKTRACK: "Backtracking",
 }
 
 
@@ -609,6 +620,8 @@ def render_tool_call(e: events.ToolCallEvent) -> RenderableType | None:
             return render_mermaid_tool_call(e.arguments)
         case tools.REPORT_BACK:
             return render_report_back_tool_call()
+        case tools.BACKTRACK:
+            return render_backtrack_tool_call(e.arguments)
         case tools.WEB_FETCH:
             return render_web_fetch_tool_call(e.arguments)
         case tools.WEB_SEARCH:

klaude_code/tui/components/user_input.py

@@ -89,7 +89,7 @@ def render_user_input(content: str) -> RenderableType:
 
     return Padding(
         Group(*renderables),
-        pad=(0, 1),
+        pad=(1, 1),
         style=ThemeKey.USER_INPUT,
         expand=False,
     )

klaude_code/tui/display.py

@@ -101,3 +101,7 @@ class TUIDisplay(DisplayABC):
             self._renderer.spinner_stop()
         with contextlib.suppress(Exception):
             self._renderer.stop_bottom_live()
+
+    def set_model_name(self, model_name: str | None) -> None:
+        """Set model name for terminal title updates."""
+        self._machine.set_model_name(model_name)

klaude_code/tui/input/completers.py

@@ -673,34 +673,68 @@ class _AtFilesCompleter(Completer):
         all_files_lower = self._git_file_list_lower or []
         kn = keyword_norm
 
-        # Bound per-keystroke work: stop scanning once enough matches are found.
+        # Bound per-keystroke work.
+        #
+        # Important: When the keyword is common (e.g. "tools"), truncating the
+        # scan purely by number of matching *files* can accidentally hide valid
+        # directory completions that appear later in the git path order.
+        #
+        # Example: multiple */tools/ directories under different parents.
+        file_quota = max_results
+        dir_quota = max_results
+        scan_cap = max(2000, max_results * 200)
+
+        keyword_stripped = keyword_norm.strip("/")
+        keyword_basename = os.path.basename(keyword_stripped)
+        explicit_parent = "/" in keyword_stripped
+
+        def dir_matches_keyword(dir_path: str) -> bool:
+            if not keyword_basename:
+                return False
+            if explicit_parent:
+                # When user typed an explicit parent segment, match against the
+                # whole directory path (not just basename).
+                return kn in f"{dir_path}/".lower()
+            # Otherwise prioritize directories by basename match.
+            return keyword_basename in os.path.basename(dir_path).lower()
+
         matching_files: list[str] = []
+        dir_list: list[str] = []
+        dir_seen: set[str] = set()
         scan_truncated = False
+        scanned = 0
+
         for p, pl in zip(all_files, all_files_lower, strict=False):
-            if kn in pl:
-                matching_files.append(p)
-                if len(matching_files) >= max_results:
+            scanned += 1
+            if kn not in pl:
+                if scanned >= scan_cap and (matching_files or dir_list):
                     scan_truncated = True
                     break
+                continue
+
+            if len(matching_files) < file_quota:
+                matching_files.append(p)
 
-        # Also include parent directories of matching files so users can
-        # complete into a folder, similar to fd's directory results.
-        dir_candidates: set[str] = set()
-        for p in matching_files[: max_results * 3]:
+            # Collect matching parent directories, walking upwards until repo root.
+            # This allows completing into directories like "image/tools/" even
+            # when the matching file is nested deeper.
             parent = os.path.dirname(p)
             while parent and parent != ".":
-                dir_candidates.add(f"{parent}/")
+                if dir_matches_keyword(parent):
+                    cand = f"{parent}/"
+                    if cand not in dir_seen:
+                        dir_seen.add(cand)
+                        dir_list.append(cand)
+                        if len(dir_list) >= dir_quota:
+                            break
                 parent = os.path.dirname(parent)
 
-        dir_list = sorted(dir_candidates)
-        dir_truncated = False
-        if len(dir_list) > max_results:
-            dir_list = dir_list[:max_results]
-            dir_truncated = True
+            if len(matching_files) >= file_quota and len(dir_list) >= dir_quota:
+                scan_truncated = True
+                break
 
-        candidates = matching_files + dir_list
-        truncated = scan_truncated or dir_truncated
-        return candidates, truncated
+        candidates = dir_list + matching_files
+        return candidates, scan_truncated
 
     def _get_git_repo_root(self, cwd: Path) -> Path | None:
         if not self._has_cmd("git"):

klaude_code/tui/input/images.py

@@ -28,6 +28,9 @@ from klaude_code.protocol.message import ImageFilePart
 
 IMAGE_SUFFIXES = frozenset({".png", ".jpg", ".jpeg", ".gif", ".webp"})
 
+# Claude API limit is 5MB, we use 4.5MB to have some margin
+MAX_IMAGE_SIZE_BYTES = 4_500_000
+
 IMAGE_MARKER_RE = re.compile(r'\[image (?P<path>"[^"]+"|[^\]]+)\]')
 
 
@@ -159,6 +162,127 @@ def _grab_clipboard_image(dest_path: Path) -> bool:
         return _grab_clipboard_image_linux(dest_path)
 
 
+# ---------------------------------------------------------------------------
+# Image resizing for size limits
+# ---------------------------------------------------------------------------
+
+
+def _get_image_dimensions_macos(path: Path) -> tuple[int, int] | None:
+    """Get image dimensions using sips on macOS."""
+    try:
+        result = subprocess.run(
+            ["sips", "-g", "pixelWidth", "-g", "pixelHeight", str(path)],
+            capture_output=True,
+            text=True,
+        )
+        if result.returncode != 0:
+            return None
+        width = height = 0
+        for line in result.stdout.splitlines():
+            if "pixelWidth" in line:
+                width = int(line.split(":")[-1].strip())
+            elif "pixelHeight" in line:
+                height = int(line.split(":")[-1].strip())
+        if width > 0 and height > 0:
+            return (width, height)
+    except (OSError, ValueError):
+        pass
+    return None
+
+
+def _resize_image_macos(path: Path, scale: float) -> bool:
+    """Resize image using sips on macOS. Modifies file in place."""
+    dims = _get_image_dimensions_macos(path)
+    if dims is None:
+        return False
+    new_width = max(1, int(dims[0] * scale))
+    try:
+        result = subprocess.run(
+            ["sips", "--resampleWidth", str(new_width), str(path)],
+            capture_output=True,
+        )
+        return result.returncode == 0
+    except OSError:
+        return False
+
+
+def _resize_image_linux(path: Path, scale: float) -> bool:
+    """Resize image using ImageMagick convert on Linux."""
+    if not shutil.which("convert"):
+        return False
+    percent = int(scale * 100)
+    try:
+        result = subprocess.run(
+            ["convert", str(path), "-resize", f"{percent}%", str(path)],
+            capture_output=True,
+        )
+        return result.returncode == 0
+    except OSError:
+        return False
+
+
+def _resize_image_windows(path: Path, scale: float) -> bool:
+    """Resize image using PowerShell on Windows."""
+    script = f'''
+    Add-Type -AssemblyName System.Drawing
+    $img = [System.Drawing.Image]::FromFile("{path}")
+    $newWidth = [int]($img.Width * {scale})
+    $newHeight = [int]($img.Height * {scale})
+    $bmp = New-Object System.Drawing.Bitmap($newWidth, $newHeight)
+    $graphics = [System.Drawing.Graphics]::FromImage($bmp)
+    $graphics.DrawImage($img, 0, 0, $newWidth, $newHeight)
+    $img.Dispose()
+    $bmp.Save("{path}", [System.Drawing.Imaging.ImageFormat]::Png)
+    $bmp.Dispose()
+    $graphics.Dispose()
+    Write-Output "ok"
+    '''
+    try:
+        result = subprocess.run(
+            ["powershell", "-Command", script],
+            capture_output=True,
+            text=True,
+        )
+        return result.returncode == 0 and "ok" in result.stdout
+    except OSError:
+        return False
+
+
+def _resize_image(path: Path, scale: float) -> bool:
+    """Resize image by scale factor. Modifies file in place."""
+    if sys.platform == "darwin":
+        return _resize_image_macos(path, scale)
+    elif sys.platform == "win32":
+        return _resize_image_windows(path, scale)
+    else:
+        return _resize_image_linux(path, scale)
+
+
+def _ensure_image_size_limit(path: Path, max_bytes: int = MAX_IMAGE_SIZE_BYTES) -> None:
+    """Resize image if it exceeds the size limit. Modifies file in place."""
+    try:
+        current_size = path.stat().st_size
+        if current_size <= max_bytes:
+            return
+
+        # Calculate scale factor based on size ratio
+        # We use sqrt because area scales with square of linear dimensions
+        scale = (max_bytes / current_size) ** 0.5
+        # Be a bit more aggressive to ensure we get under the limit
+        scale *= 0.9
+
+        for _ in range(5):  # Max 5 resize attempts
+            if not _resize_image(path, scale):
+                return
+            new_size = path.stat().st_size
+            if new_size <= max_bytes:
+                return
+            # Still too large, reduce more
+            scale = 0.8
+    except OSError:
+        pass
+
+
 def capture_clipboard_tag() -> str | None:
     """Capture an image from clipboard and return an [image ...] marker."""
 
@@ -174,6 +298,9 @@ def capture_clipboard_tag() -> str | None:
     if not _grab_clipboard_image(path):
         return None
 
+    # Resize if image exceeds size limit
+    _ensure_image_size_limit(path)
+
     return format_image_marker(str(path))
 
 

klaude_code/tui/input/prompt_toolkit.py

@@ -61,7 +61,7 @@ COMPLETION_SELECTED_DARK_BG = "ansigreen"
 COMPLETION_SELECTED_LIGHT_BG = "ansigreen"
 COMPLETION_SELECTED_UNKNOWN_BG = "ansigreen"
 COMPLETION_MENU = "ansibrightblack"
-INPUT_PROMPT_STYLE = "ansimagenta bold"
+INPUT_PROMPT_STYLE = "ansicyan bold"
 INPUT_PROMPT_BASH_STYLE = "ansigreen bold"
 PLACEHOLDER_TEXT_STYLE_DARK_BG = "fg:#5a5a5a"
 PLACEHOLDER_TEXT_STYLE_LIGHT_BG = "fg:#7a7a7a"
@@ -448,6 +448,9 @@ class PromptToolkitInput(InputProviderABC):
             # Keep a comfortable multiline editing area even when no completion
             # space is reserved. (We set reserve_space_for_menu=0 to avoid the
             # bottom toolbar jumping when completions open/close.)
+            #
+            # Also allow the input area to grow with content so that large multi-line
+            # inputs expand the prompt instead of scrolling within a fixed-height window.
             base_rows = 10
 
             def _height():  # type: ignore[no-untyped-def]
@@ -465,7 +468,18 @@ class PromptToolkitInput(InputProviderABC):
                 elif isinstance(original_height_value, int):
                     original_min = int(original_height_value)
 
-                target_rows = 24 if picker_open else base_rows
+                try:
+                    buffer_line_count = int(self._session.default_buffer.document.line_count)
+                except Exception:
+                    buffer_line_count = 1
+
+                # Grow with content (based on newline count), but keep a sensible minimum.
+                content_rows = max(1, buffer_line_count)
+                target_rows = max(base_rows, content_rows)
+
+                # When a picker overlay is open, keep enough height for it to be usable.
+                if picker_open:
+                    target_rows = max(target_rows, 24)
 
                 # Cap to the current terminal size.
                 # Leave a small buffer to avoid triggering "Window too small".

klaude_code/tui/machine.py

@@ -24,6 +24,7 @@ from klaude_code.tui.commands import (
     EndThinkingStream,
     PrintBlankLine,
     RenderAssistantImage,
+    RenderBacktrack,
     RenderBashCommandEnd,
     RenderBashCommandStart,
     RenderCommand,
@@ -47,6 +48,7 @@ from klaude_code.tui.commands import (
     StartThinkingStream,
     TaskClockClear,
     TaskClockStart,
+    UpdateTerminalTitlePrefix,
 )
 from klaude_code.tui.components.rich import status as r_status
 from klaude_code.tui.components.rich.theme import ThemeKey
@@ -65,6 +67,7 @@ FAST_TOOLS: frozenset[str] = frozenset(
         tools.UPDATE_PLAN,
         tools.APPLY_PATCH,
         tools.REPORT_BACK,
+        tools.BACKTRACK,
     }
 )
 
@@ -135,7 +138,7 @@ class ActivityState:
                 for name, count in counts.items():
                     if not first:
                         activity_text.append(", ")
-                    activity_text.append(Text(name, style=ThemeKey.STATUS_TEXT_BOLD))
+                    activity_text.append(Text(name, style=ThemeKey.STATUS_TEXT))
                     if count > 1:
                         activity_text.append(f" x {count}")
                     first = False
@@ -238,24 +241,21 @@ class SpinnerStatusState:
 
         if extra_reasoning is not None:
             if activity_text is None:
-                activity_text = Text(extra_reasoning, style=ThemeKey.STATUS_TEXT_BOLD_ITALIC)
+                activity_text = Text(extra_reasoning, style=ThemeKey.STATUS_TEXT)
             else:
-                prefixed = Text(extra_reasoning, style=ThemeKey.STATUS_TEXT_BOLD_ITALIC)
+                prefixed = Text(extra_reasoning, style=ThemeKey.STATUS_TEXT)
                 prefixed.append(" , ")
                 prefixed.append_text(activity_text)
                 activity_text = prefixed
 
         if base_status:
-            # Default "Thinking ..." uses normal style; custom headers use bold italic
-            is_default_reasoning = base_status in {STATUS_THINKING_TEXT, STATUS_RUNNING_TEXT}
-            status_style = ThemeKey.STATUS_TEXT if is_default_reasoning else ThemeKey.STATUS_TEXT_BOLD_ITALIC
             if activity_text:
                 result = Text()
-                result.append(base_status, style=status_style)
+                result.append(base_status, style=ThemeKey.STATUS_TEXT)
                 result.append(" | ")
                 result.append_text(activity_text)
             else:
-                result = Text(base_status, style=status_style)
+                result = Text(base_status, style=ThemeKey.STATUS_TEXT)
         elif activity_text:
             activity_text.append(" …")
             result = activity_text
@@ -323,6 +323,10 @@ class DisplayStateMachine:
         self._sessions: dict[str, _SessionState] = {}
         self._primary_session_id: str | None = None
         self._spinner = SpinnerStatusState()
+        self._model_name: str | None = None
+
+    def set_model_name(self, model_name: str | None) -> None:
+        self._model_name = model_name
 
     def _reset_sessions(self) -> None:
         self._sessions = {}
@@ -442,6 +446,7 @@ class DisplayStateMachine:
                         self._primary_session_id = e.session_id
                     if not is_replay:
                         cmds.append(TaskClockStart())
+                        cmds.append(UpdateTerminalTitlePrefix(prefix="\u26ac", model_name=self._model_name))
 
                 if not is_replay:
                     cmds.append(SpinnerStart())
@@ -469,6 +474,18 @@ class DisplayStateMachine:
                     cmds.append(RenderCompactionSummary(summary=e.summary, kept_items_brief=kept_brief))
                 return cmds
 
+            case events.BacktrackEvent() as e:
+                cmds.append(
+                    RenderBacktrack(
+                        checkpoint_id=e.checkpoint_id,
+                        note=e.note,
+                        rationale=e.rationale,
+                        original_user_message=e.original_user_message,
+                        messages_discarded=e.messages_discarded,
+                    )
+                )
+                return cmds
+
             case events.DeveloperMessageEvent() as e:
                 cmds.append(RenderDeveloperMessage(e))
                 return cmds
@@ -747,6 +764,7 @@ class DisplayStateMachine:
                     self._spinner.reset()
                     cmds.append(SpinnerStop())
                     cmds.append(EmitTmuxSignal())
+                    cmds.append(UpdateTerminalTitlePrefix(prefix="\u2714", model_name=self._model_name))
                 return cmds
 
             case events.InterruptEvent() as e:

klaude_code/tui/renderer.py

@@ -35,6 +35,7 @@ from klaude_code.tui.commands import (
     PrintBlankLine,
     PrintRuleLine,
     RenderAssistantImage,
+    RenderBacktrack,
     RenderBashCommandEnd,
     RenderBashCommandStart,
     RenderCommand,
@@ -59,6 +60,7 @@ from klaude_code.tui.commands import (
     StartThinkingStream,
     TaskClockClear,
     TaskClockStart,
+    UpdateTerminalTitlePrefix,
 )
 from klaude_code.tui.components import command_output as c_command_output
 from klaude_code.tui.components import developer as c_developer
@@ -85,6 +87,7 @@ from klaude_code.tui.terminal.notifier import (
     emit_tmux_signal,
 )
 from klaude_code.tui.terminal.progress_bar import OSC94States, emit_osc94
+from klaude_code.ui.terminal.title import update_terminal_title
 
 
 @dataclass
@@ -136,6 +139,7 @@ class _SessionStatus:
     color: Style | None = None
     color_index: int | None = None
     sub_agent_state: model.SubAgentState | None = None
+    turn_first_dev_msg_rendered: bool = False
 
 
 class TUICommandRenderer:
@@ -475,6 +479,10 @@ class TUICommandRenderer:
         if not c_developer.need_render_developer_message(e):
             return
         with self.session_print_context(e.session_id):
+            session_status = self._sessions.get(e.session_id)
+            if session_status and not session_status.turn_first_dev_msg_rendered:
+                session_status.turn_first_dev_msg_rendered = True
+                self.print()
             self.print(c_developer.render_developer_message(e))
 
         # Display images from @ file references and user attachments
@@ -567,6 +575,8 @@ class TUICommandRenderer:
                 )
 
     def display_turn_start(self, event: events.TurnStartEvent) -> None:
+        if event.session_id in self._sessions:
+            self._sessions[event.session_id].turn_first_dev_msg_rendered = False
         if not self.is_sub_agent_session(event.session_id):
             self.print()
 
@@ -610,6 +620,8 @@ class TUICommandRenderer:
                         sub_agent_color=self._current_sub_agent_color,
                     )
                 )
+        else:
+            self.print()
 
     def display_interrupt(self) -> None:
         self.print(c_user_input.render_interrupt())
@@ -678,6 +690,75 @@ class TUICommandRenderer:
 
         self.print()
 
+    def display_backtrack(
+        self,
+        checkpoint_id: int,
+        note: str,
+        rationale: str,
+        original_user_message: str,
+        messages_discarded: int | None,
+    ) -> None:
+        self.console.print(
+            Rule(
+                Text(f"Backtracked to Checkpoint {checkpoint_id}", style=ThemeKey.BACKTRACK),
+                characters="=",
+                style=ThemeKey.LINES,
+            )
+        )
+        self.print()
+
+        if messages_discarded:
+            self.console.print(Text(f"  Discarded {messages_discarded} messages", style=ThemeKey.BACKTRACK_INFO))
+
+        if rationale:
+            self.console.print(Text("  Rationale:", style=ThemeKey.BACKTRACK_INFO))
+            rationale_preview = rationale[:300] + "..." if len(rationale) > 300 else rationale
+            self.console.print(
+                Padding(
+                    Panel(
+                        NoInsetMarkdown(
+                            rationale_preview, code_theme=self.themes.code_theme, style=ThemeKey.BACKTRACK_NOTE
+                        ),
+                        box=box.SIMPLE,
+                        border_style=ThemeKey.LINES,
+                        style=ThemeKey.BACKTRACK_NOTE,
+                    ),
+                    (0, 0, 0, 4),
+                )
+            )
+
+        if original_user_message:
+            self.console.print(Text("  Returned to:", style=ThemeKey.BACKTRACK_INFO))
+            msg_preview = (
+                original_user_message[:200] + "..." if len(original_user_message) > 200 else original_user_message
+            )
+            self.console.print(
+                Padding(
+                    Panel(
+                        Text(msg_preview, style=ThemeKey.BACKTRACK_USER_MESSAGE),
+                        box=box.SIMPLE,
+                        border_style=ThemeKey.LINES,
+                    ),
+                    (0, 0, 0, 4),
+                )
+            )
+
+        self.console.print(Text("  Summary:", style=ThemeKey.BACKTRACK_INFO))
+        note_preview = note[:300] + "..." if len(note) > 300 else note
+        self.console.print(
+            Padding(
+                Panel(
+                    NoInsetMarkdown(note_preview, code_theme=self.themes.code_theme, style=ThemeKey.BACKTRACK_NOTE),
+                    box=box.SIMPLE,
+                    border_style=ThemeKey.LINES,
+                    style=ThemeKey.BACKTRACK_NOTE,
+                ),
+                (0, 0, 0, 4),
+            )
+        )
+
+        self.print()
+
     # ---------------------------------------------------------------------
     # Notifications
     # ---------------------------------------------------------------------
@@ -797,6 +878,20 @@ class TUICommandRenderer:
                     self.display_error(event)
                 case RenderCompactionSummary(summary=summary, kept_items_brief=kept_items_brief):
                     self.display_compaction_summary(summary, kept_items_brief)
+                case RenderBacktrack(
+                    checkpoint_id=checkpoint_id,
+                    note=note,
+                    rationale=rationale,
+                    original_user_message=original_user_message,
+                    messages_discarded=messages_discarded,
+                ):
+                    self.display_backtrack(
+                        checkpoint_id=checkpoint_id,
+                        note=note,
+                        rationale=rationale,
+                        original_user_message=original_user_message,
+                        messages_discarded=messages_discarded,
+                    )
                 case SpinnerStart():
                     self.spinner_start()
                 case SpinnerStop():
@@ -815,6 +910,8 @@ class TUICommandRenderer:
                     r_status.set_task_start()
                 case TaskClockClear():
                     r_status.clear_task_start()
+                case UpdateTerminalTitlePrefix(prefix=prefix, model_name=model_name):
+                    update_terminal_title(model_name, prefix=prefix)
                 case _:
                     continue
 

klaude_code/tui/runner.py

@@ -142,14 +142,19 @@ async def run_interactive(init_config: AppInitConfig, session_id: str | None = N
         elif detected is False:
             theme = "dark"
 
-    display: ui.DisplayABC = TUIDisplay(theme=theme)
+    tui_display = TUIDisplay(theme=theme)
+    display: ui.DisplayABC = tui_display
     if init_config.debug:
         display = ui.DebugEventDisplay(display)
 
+    def _on_model_change(model_name: str) -> None:
+        update_terminal_title(model_name)
+        tui_display.set_model_name(model_name)
+
     components = await initialize_app_components(
         init_config=init_config,
         display=display,
-        on_model_change=update_terminal_title,
+        on_model_change=_on_model_change,
     )
 
     def _status_provider() -> REPLStatusSnapshot: