klaude-code 1.2.10__py3-none-any.whl → 1.2.11__py3-none-any.whl

klaude_code/core/tool/todo/todo_write_tool_raw.md

@@ -0,0 +1,182 @@
+Use this tool to create and manage a structured task list for your current coding session. This helps you track progress, organize complex tasks, and demonstrate thoroughness to the user.
+It also helps the user understand the progress of the task and overall progress of their requests.
+
+#### When to Use This Tool
+Use this tool proactively in these scenarios:
+
+1. Complex multi-step tasks - When a task requires 3 or more distinct steps or actions
+2. Non-trivial and complex tasks - Tasks that require careful planning or multiple operations
+3. User explicitly requests todo list - When the user directly asks you to use the todo list
+4. User provides multiple tasks - When users provide a list of things to be done (numbered or comma-separated)
+5. After receiving new instructions - Immediately capture user requirements as todos
+6. When you start working on a task - Mark it as in_progress BEFORE beginning work. Ideally you should only have one todo as in_progress at a time
+7. After completing a task - Mark it as completed and add any new follow-up tasks discovered during implementation
+
+#### When NOT to Use This Tool
+
+Skip using this tool when:
+1. There is only a single, straightforward task
+2. The task is trivial and tracking it provides no organizational benefit
+3. The task can be completed in less than 3 trivial steps
+4. The task is purely conversational or informational
+
+NOTE that you should not use this tool if there is only one trivial task to do. In this case you are better off just doing the task directly.
+
+#### Examples of When to Use the Todo List
+
+<example>
+User: I want to add a dark mode toggle to the application settings. Make sure you run the tests and build when you're done!
+Assistant: I'll help add a dark mode toggle to your application settings. Let me create a todo list to track this implementation.
+*Creates todo list with the following items:*
+1. Creating dark mode toggle component in Settings page
+2. Adding dark mode state management (context/store)
+3. Implementing CSS-in-JS styles for dark theme
+4. Updating existing components to support theme switching
+5. Running tests and build process, addressing any failures or errors that occur
+*Begins working on the first task*
+
+<reasoning>
+The assistant used the todo list because:
+1. Adding dark mode is a multi-step feature requiring UI, state management, and styling changes
+2. The user explicitly requested tests and build be run afterward
+3. The assistant inferred that tests and build need to pass by adding "Ensure tests and build succeed" as the final task
+</reasoning>
+</example>
+
+<example>
+User: Help me rename the function getCwd to getCurrentWorkingDirectory across my project
+Assistant: Let me first search through your codebase to find all occurrences of 'getCwd'.
+*Uses grep or search tools to locate all instances of getCwd in the codebase*
+Assistant: I've found 15 instances of 'getCwd' across 8 different files. Let me create a todo list to track these changes.
+*Creates todo list with specific items for each file that needs updating*
+
+<reasoning>
+The assistant used the todo list because:
+1. First, the assistant searched to understand the scope of the task
+2. Upon finding multiple occurrences across different files, it determined this was a complex task with multiple steps
+3. The todo list helps ensure every instance is tracked and updated systematically
+4. This approach prevents missing any occurrences and maintains code consistency
+</reasoning>
+</example>
+
+
+<example>
+User: I need to implement these features for my e-commerce site: user registration, product catalog, shopping cart, and checkout flow.
+Assistant: I'll help implement these features. First, let's add all the features to the todo list.
+*Creates a todo list breaking down each feature into specific tasks based on the project architecture*
+Assistant: Let's start with user registration. This will involve creating database models, API endpoints, and frontend forms that integrate with your existing authentication system.
+
+<reasoning>
+The assistant used the todo list because:
+1. The user provided multiple complex features to implement in a comma separated list
+2. The todo list helps organize these large features into manageable tasks
+3. This approach allows for tracking progress across the entire implementation
+</reasoning>
+</example>
+
+<example>
+User: Can you help optimize my React application? It's rendering slowly and has performance issues.</user>
+Assistant: I'll help optimize your React application. First, let me examine your codebase to identify potential performance bottlenecks.
+*Reviews component structure, render patterns, state management, and data fetching*
+Assistant: After analyzing your codebase, I've identified several performance issues. Let me create a todo list to track our optimization efforts.
+*Creates todo list with items like: 1) Implementing memoization for expensive calculations in ProductList, 2) Adding virtualization for long lists in Dashboard, 3) Optimizing image loading in Gallery component, 4) Fixing state update loops in ShoppingCart, 5) Reviewing bundle size and implementing code splitting*
+Let's start by implementing memoization for the expensive calculations in your ProductList component.</assistant>
+
+<reasoning>
+The assistant used the todo list because:
+1. First, the assistant examined the codebase to identify specific performance issues
+2. Based on this analysis, it identified multiple optimization opportunities
+3. Performance optimization is a non-trivial task requiring multiple steps
+4. The todo list helps methodically track improvements across different components
+5. This systematic approach ensures all performance bottlenecks are addressed
+</reasoning>
+</example>
+
+#### Examples of When NOT to Use the Todo List
+
+<example>
+User: How do I print 'Hello World' in Python?
+Assistant: In Python, you can print "Hello World" with this simple code:
+
+python
+print("Hello World")
+
+This will output the text "Hello World" to the console when executed.</assistant>
+
+<reasoning>
+The assistant did not use the todo list because this is a single, trivial task that can be completed in one step. There's no need to track multiple tasks or steps for such a straightforward request.
+</reasoning>
+</example>
+
+<example>
+User: What does the git status command do?
+Assistant: The git status command shows the current state of your working directory and staging area. It displays which changes have been staged, which haven't, and which files aren't being tracked by Git. This is a fundamental command for understanding the current state of your repository before making commits.
+
+<reasoning>
+The assistant did not use the todo list because this is an informational request with no actual coding task to complete. The user is simply asking for an explanation, not for the assistant to perform multiple steps or tasks.
+</reasoning>
+</example>
+
+<example>
+User: Can you add a comment to the calculateTotal function to explain what it does?
+Assistant: Sure, let me add a comment to the calculateTotal function to explain what it does.
+* Uses the Edit tool to add a comment to the calculateTotal function *
+
+<reasoning>
+The assistant did not use the todo list because this is a single, straightforward task confined to one location in the code. Adding a comment doesn't require tracking multiple steps or systematic organization.
+</reasoning>
+</example>
+
+<example>
+User: Run npm install for me and tell me what happens.
+Assistant: I'll run the npm install command for you.
+
+*Executes: npm install*
+
+The command completed successfully. Here's the output:
+[Output of npm install command]
+
+All dependencies have been installed according to your package.json file.
+
+<reasoning>
+The assistant did not use the todo list because this is a single command execution with immediate results. There are no multiple steps to track or organize, making the todo list unnecessary for this straightforward task.
+</reasoning>
+</example>
+
+#### Task States and Management
+
+1. **Task States**: Use these states to track progress:
+   - pending: Task not yet started
+   - in_progress: Currently working on (limit to ONE task at a time)
+   - completed: Task finished successfully
+
+   **IMPORTANT**: Task descriptions must have two forms:
+   - content: The imperative form describing what needs to be done (e.g., "Run tests", "Build the project")
+   - activeForm: The present continuous form shown during execution (e.g., "Running tests", "Building the project")
+
+2. **Task Management**:
+   - Update task status in real-time as you work
+   - Mark tasks complete IMMEDIATELY after finishing (don't batch completions)
+   - Exactly ONE task must be in_progress at any time (not less, not more)
+   - Complete current tasks before starting new ones
+   - Remove tasks that are no longer relevant from the list entirely
+
+3. **Task Completion Requirements**:
+   - ONLY mark a task as completed when you have FULLY accomplished it
+   - If you encounter errors, blockers, or cannot finish, keep the task as in_progress
+   - When blocked, create a new task describing what needs to be resolved
+   - Never mark a task as completed if:
+     - Tests are failing
+     - Implementation is partial
+     - You encountered unresolved errors
+     - You couldn't find necessary files or dependencies
+
+4. **Task Breakdown**:
+   - Create specific, actionable items
+   - Break complex tasks into smaller, manageable steps
+   - Use clear, descriptive task names
+   - Always provide both forms:
+     - content: "Fix authentication bug"
+     - activeForm: "Fixing authentication bug"
+
+When in doubt, use this tool. Being proactive with task management demonstrates attentiveness and ensures you complete all requirements successfully.

klaude_code/core/tool/tool_registry.py

@@ -61,18 +61,17 @@ def load_agent_tools(
 
     if sub_agent_type is not None:
         profile = get_sub_agent_profile(sub_agent_type)
-        if not profile.enabled_for_model(model_name):
-            return []
         return get_tool_schemas(list(profile.tool_set))
 
     # Main agent tools
     if "gpt-5" in model_name:
-        tool_names = [tools.BASH, tools.READ, tools.APPLY_PATCH, tools.UPDATE_PLAN]
+        tool_names = [tools.BASH, tools.APPLY_PATCH, tools.UPDATE_PLAN]
     elif "gemini-3" in model_name:
         tool_names = [tools.BASH, tools.READ, tools.EDIT, tools.WRITE]
     else:
         tool_names = [tools.BASH, tools.READ, tools.EDIT, tools.WRITE, tools.TODO_WRITE]
 
     tool_names.extend(sub_agent_tool_names(enabled_only=True, model_name=model_name))
-    tool_names.extend([tools.SKILL, tools.MERMAID, tools.MEMORY])
+    tool_names.extend([tools.SKILL, tools.MERMAID])
+    # tool_names.extend([tools.MEMORY])
     return get_tool_schemas(tool_names)

klaude_code/llm/client.py

@@ -42,7 +42,7 @@ def call_with_logged_payload(func: Callable[P, R], *args: P.args, **kwargs: P.kw
 
     payload = {k: v for k, v in kwargs.items() if v is not None}
     log_debug(
-        json.dumps(payload, ensure_ascii=False, default=str, sort_keys=True),
+        json.dumps(payload, ensure_ascii=False, default=str),
         style="yellow",
         debug_type=DebugType.LLM_PAYLOAD,
     )

klaude_code/protocol/model.py

@@ -21,6 +21,8 @@ class Usage(BaseModel):
 
     # Context window tracking
     context_token: int | None = None  # Peak total_tokens seen (for context usage display)
+    context_delta: int | None = None  # Context growth since last task (for cache ratio calculation)
+    last_turn_output_token: int | None = None  # Context growth since last task (for cache ratio calculation)
     context_limit: int | None = None  # Model's context limit
     max_tokens: int | None = None  # Max output tokens for this request
 
@@ -319,6 +321,7 @@ class TaskMetadata(BaseModel):
     model_name: str = ""
     provider: str | None = None
     task_duration_s: float | None = None
+    turn_count: int = 0
 
     @staticmethod
     def aggregate_by_model(metadata_list: list["TaskMetadata"]) -> list["TaskMetadata"]:

klaude_code/protocol/op.py

@@ -63,11 +63,14 @@ class InterruptOperation(Operation):
 
 
 class InitAgentOperation(Operation):
-    """Operation for initializing an agent and replaying history if any."""
+    """Operation for initializing an agent and replaying history if any.
+
+    If session_id is None, a new session is created with an auto-generated ID.
+    If session_id is provided, attempts to load existing session or creates new one.
+    """
 
     type: OperationType = OperationType.INIT_AGENT
     session_id: str | None = None
-    is_new_session: bool = False
 
     async def execute(self, handler: OperationHandler) -> None:
         await handler.handle_init_agent(self)

klaude_code/protocol/sub_agent.py

@@ -290,6 +290,7 @@ register_sub_agent(
         tool_set=(tools.BASH, tools.READ),
         prompt_builder=_explore_prompt_builder,
         active_form="Exploring",
+        target_model_filter=lambda model: ("haiku" not in model) and ("kimi" not in model) and ("grok" not in model),
     )
 )
 

klaude_code/session/export.py

@@ -194,11 +194,18 @@ def _render_single_metadata(
             input_stat += f"({_format_cost(u.input_cost, u.currency)})"
         parts.append(f'<span class="metadata-stat">{input_stat}</span>')
 
-        # Cached with cost
+        # Cached with cost and cache ratio
         if u.cached_tokens > 0:
             cached_stat = f"cached: {_format_token_count(u.cached_tokens)}"
             if u.cache_read_cost is not None:
                 cached_stat += f"({_format_cost(u.cache_read_cost, u.currency)})"
+            # Cache ratio: (cached + context_delta - last_turn_output) / input tokens
+            # Shows how much of the input was cached (not new context growth)
+            if u.input_tokens > 0:
+                context_delta = u.context_delta or 0
+                last_turn_output_token = u.last_turn_output_token or 0
+                cache_ratio = (u.cached_tokens + context_delta - last_turn_output_token) / u.input_tokens * 100
+                cached_stat += f"[{cache_ratio:.0f}%]"
             parts.append(f'<span class="metadata-stat">{cached_stat}</span>')
 
         # Output with cost
@@ -403,6 +410,9 @@ def _get_mermaid_link_html(
         buttons_html.append(
             f'<button type="button" class="copy-mermaid-btn" data-code="{escaped_code}" title="Copy Mermaid Code">Copy Code</button>'
         )
+        buttons_html.append(
+            '<button type="button" class="fullscreen-mermaid-btn" title="View Fullscreen">Fullscreen</button>'
+        )
 
     link = ui_extra.link if isinstance(ui_extra, model.MermaidLinkUIExtra) else None
 

klaude_code/session/session.py

@@ -108,12 +108,8 @@ class Session(BaseModel):
         return Session(id=id or uuid.uuid4().hex, work_dir=Path.cwd())
 
     @classmethod
-    def load(cls, id: str, *, skip_if_missing: bool = False) -> "Session":
+    def load(cls, id: str) -> "Session":
         """Load an existing session or create a new one if not found."""
-
-        if skip_if_missing:
-            return Session(id=id, work_dir=Path.cwd())
-
         # Load session metadata
         sessions_dir = cls._sessions_dir()
         session_candidates = sorted(

klaude_code/session/templates/export_session.html

@@ -338,6 +338,57 @@
         border-color: var(--accent);
       }
 
+      .mermaid-modal {
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100vw;
+        height: 100vh;
+        background: rgba(255, 255, 255, 0.98);
+        z-index: 1000;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        opacity: 0;
+        pointer-events: none;
+        transition: opacity 0.2s;
+      }
+      .mermaid-modal.active {
+        opacity: 1;
+        pointer-events: auto;
+      }
+      .mermaid-modal-content {
+        width: 95%;
+        height: 90%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        overflow: auto;
+      }
+      .mermaid-modal-content svg {
+        width: auto !important;
+        height: auto !important;
+        max-width: 100%;
+        max-height: 100%;
+      }
+      .mermaid-modal-close {
+        position: absolute;
+        top: 20px;
+        right: 20px;
+        background: transparent;
+        border: none;
+        font-size: 32px;
+        cursor: pointer;
+        color: var(--text-dim);
+        z-index: 1001;
+        line-height: 1;
+        padding: 8px;
+      }
+      .mermaid-modal-close:hover {
+        color: var(--text);
+      }
+
       .copy-mermaid-btn {
         border: 1px solid var(--border);
         background: transparent;
@@ -356,6 +407,25 @@
         border-color: var(--accent);
       }
 
+      .fullscreen-mermaid-btn {
+        margin-left: 8px;
+        border: 1px solid var(--border);
+        background: transparent;
+        color: var(--text-dim);
+        font-family: var(--font-mono);
+        font-size: var(--font-size-xs);
+        text-transform: uppercase;
+        padding: 2px 10px;
+        border-radius: 999px;
+        cursor: pointer;
+        transition: color 0.2s, border-color 0.2s, background 0.2s;
+        font-weight: var(--font-weight-bold);
+      }
+      .fullscreen-mermaid-btn:hover {
+        color: var(--text);
+        border-color: var(--accent);
+      }
+
       .assistant-rendered {
         width: 100%;
       }
@@ -1065,6 +1135,13 @@
       </svg>
     </div>
 
+    <div id="mermaid-modal" class="mermaid-modal">
+      <button class="mermaid-modal-close" id="mermaid-modal-close">
+        &times;
+      </button>
+      <div class="mermaid-modal-content" id="mermaid-modal-content"></div>
+    </div>
+
     <link
       rel="stylesheet"
       href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.9.0/build/styles/github.min.css"
@@ -1280,6 +1357,84 @@
         });
       });
 
+      // Mermaid Fullscreen Logic
+      const modal = document.getElementById("mermaid-modal");
+      const modalContent = document.getElementById("mermaid-modal-content");
+      const modalClose = document.getElementById("mermaid-modal-close");
+
+      if (modal && modalContent && modalClose) {
+        const closeModal = () => {
+          modal.classList.remove("active");
+          modalContent.innerHTML = "";
+        };
+
+        modalClose.addEventListener("click", closeModal);
+
+        modal.addEventListener("click", (e) => {
+          if (e.target === modal) {
+            closeModal();
+          }
+        });
+
+        // Handle Escape key
+        document.addEventListener("keydown", (e) => {
+          if (e.key === "Escape" && modal.classList.contains("active")) {
+            closeModal();
+          }
+        });
+
+        document.querySelectorAll(".fullscreen-mermaid-btn").forEach((btn) => {
+          btn.addEventListener("click", (e) => {
+            // The structure is:
+            // wrapper > mermaid > svg
+            // wrapper > toolbar > buttons > btn
+
+            // We need to find the mermaid div that is a sibling of the toolbar
+
+            // Traverse up to the wrapper
+            let wrapper = btn.closest("div[style*='background: white']");
+
+            if (!wrapper) {
+              // Fallback: try to find by traversing up and looking for .mermaid
+              let p = btn.parentElement;
+              while (p) {
+                if (p.querySelector(".mermaid")) {
+                  wrapper = p;
+                  break;
+                }
+                p = p.parentElement;
+                if (p === document.body) break;
+              }
+            }
+
+            if (wrapper) {
+              const mermaidDiv = wrapper.querySelector(".mermaid");
+              if (mermaidDiv) {
+                const svg = mermaidDiv.querySelector("svg");
+
+                if (svg) {
+                  // Clone the SVG to put in modal
+                  // We treat the SVG as the source
+                  const clone = svg.cloneNode(true);
+                  // Remove fixed sizes to let it scale in flex container
+                  clone.removeAttribute("height");
+                  clone.removeAttribute("width");
+                  clone.style.maxWidth = "100%";
+                  clone.style.maxHeight = "100%";
+
+                  modalContent.appendChild(clone);
+                  modal.classList.add("active");
+                } else if (mermaidDiv.textContent.trim()) {
+                  // Fallback if not rendered yet (should not happen on export usually)
+                  modalContent.textContent = "Diagram not rendered yet.";
+                  modal.classList.add("active");
+                }
+              }
+            }
+          });
+        });
+      }
+
       // Scroll to bottom button
       const scrollBtn = document.getElementById("scroll-btn");
 

klaude_code/ui/modes/repl/event_handler.py

@@ -453,14 +453,10 @@ class DisplayEventHandler:
                 if len(todo.content) > 0:
                     status_text = todo.content
         status_text = status_text.replace("\n", "")
-        return self._truncate_status_text(status_text, max_length=30)
+        return self._truncate_status_text(status_text, max_length=100)
 
     def _truncate_status_text(self, text: str, max_length: int) -> str:
-        """Truncate text to max_length while preserving complete words."""
         if len(text) <= max_length:
             return text
         truncated = text[:max_length]
-        last_space = truncated.rfind(" ")
-        if last_space > 0:
-            return truncated[:last_space] + "..."
         return truncated + "..."

klaude_code/ui/modes/repl/input_prompt_toolkit.py

@@ -6,9 +6,7 @@ from pathlib import Path
 from typing import NamedTuple, override
 
 from prompt_toolkit import PromptSession
-from prompt_toolkit.buffer import Buffer
 from prompt_toolkit.completion import ThreadedCompleter
-from prompt_toolkit.filters import Condition
 from prompt_toolkit.formatted_text import FormattedText
 from prompt_toolkit.history import FileHistory
 from prompt_toolkit.patch_stdout import patch_stdout
@@ -45,9 +43,6 @@ class PromptToolkitInput(InputProviderABC):
     ):  # ▌
         self._status_provider = status_provider
 
-        # Mouse is disabled by default; only enabled when input becomes multi-line.
-        self._mouse_enabled: bool = False
-
         project = str(Path.cwd()).strip("/").replace("/", "-")
         history_path = Path.home() / ".klaude" / "projects" / f"{project}" / "input_history.txt"
 
@@ -56,8 +51,6 @@ class PromptToolkitInput(InputProviderABC):
         if not history_path.exists():
             history_path.touch()
 
-        mouse_support_filter = Condition(lambda: self._mouse_enabled)
-
         # Create key bindings with injected dependencies
         kb = create_key_bindings(
             capture_clipboard_tag=capture_clipboard_tag,
@@ -75,7 +68,7 @@ class PromptToolkitInput(InputProviderABC):
             complete_while_typing=True,
             erase_when_done=True,
             bottom_toolbar=self._render_bottom_toolbar,
-            mouse_support=mouse_support_filter,
+            mouse_support=False,
             style=Style.from_dict(
                 {
                     "completion-menu": "bg:default",
@@ -90,12 +83,6 @@ class PromptToolkitInput(InputProviderABC):
             ),
         )
 
-        try:
-            self._session.default_buffer.on_text_changed += self._on_buffer_text_changed
-        except Exception:
-            # If we can't hook the buffer events for any reason, fall back to static behavior.
-            pass
-
     def _render_bottom_toolbar(self) -> FormattedText:
         """Render bottom toolbar with working directory, git branch on left, model name and context usage on right.
 
@@ -168,8 +155,6 @@ class PromptToolkitInput(InputProviderABC):
     @override
     async def iter_inputs(self) -> AsyncIterator[UserInputPayload]:
         while True:
-            # For each new prompt, start with mouse disabled so users can select history.
-            self._mouse_enabled = False
             with patch_stdout():
                 line: str = await self._session.prompt_async()
 
@@ -178,21 +163,5 @@ class PromptToolkitInput(InputProviderABC):
 
             yield UserInputPayload(text=line, images=images if images else None)
 
-    def _on_buffer_text_changed(self, buf: Buffer) -> None:
-        """Toggle mouse support based on current buffer content.
-
-        Mouse stays disabled when input is empty. It is enabled only when
-        the user has entered more than one line of text.
-        """
-        try:
-            text = buf.text
-        except Exception:
-            return
-        self._mouse_enabled = self._should_enable_mouse(text)
-
-    def _should_enable_mouse(self, text: str) -> bool:
-        """Return True when mouse support should be enabled for current input."""
-        if not text.strip():
-            return False
-        # Enable mouse only when input spans multiple lines.
-        return "\n" in text
+    # Note: Mouse support is intentionally disabled at the PromptSession
+    # level so that terminals retain their native scrollback behavior.

klaude_code/ui/renderers/metadata.py

@@ -77,6 +77,17 @@ def _render_task_metadata_block(
             ]
             if metadata.usage.cache_read_cost is not None:
                 cached_parts.append((f"({currency_symbol}{metadata.usage.cache_read_cost:.4f})", ThemeKey.METADATA_DIM))
+            # Cache ratio: (content + cached - last turn output) / input tokens, this might caclulate over 100% if system prompt is cached in first turn
+            # Shows how much of the input was cached (not new context growth)
+            if show_context_and_time and metadata.usage.input_tokens > 0:
+                context_delta = metadata.usage.context_delta or 0
+                last_turn_output_token = metadata.usage.last_turn_output_token or 0
+                cache_ratio = (
+                    (metadata.usage.cached_tokens + context_delta - last_turn_output_token)
+                    / metadata.usage.input_tokens
+                    * 100
+                )
+                cached_parts.append((f"[{cache_ratio:.0f}%]", ThemeKey.METADATA_DIM))
             parts2.append(Text.assemble(*cached_parts))
 
         # Output
@@ -150,6 +161,16 @@ def _render_task_metadata_block(
             )
         )
 
+    # Turn count
+    if show_context_and_time and metadata.turn_count > 0:
+        parts3.append(
+            Text.assemble(
+                ("turns", ThemeKey.METADATA_DIM),
+                (":", ThemeKey.METADATA_DIM),
+                (str(metadata.turn_count), ThemeKey.METADATA_DIM),
+            )
+        )
+
     if parts3:
         line2 = Text(" / ", style=ThemeKey.METADATA_DIM).join(parts3)
         renderables.append(Padding(line2, (0, 0, 0, indent + 2)))

klaude_code/ui/renderers/tools.py

@@ -339,12 +339,23 @@ def render_mermaid_tool_call(arguments: str) -> RenderableType:
 
 
 def render_mermaid_tool_result(tr: events.ToolResultEvent) -> RenderableType:
+    from klaude_code.ui.terminal import supports_osc8_hyperlinks
+
     link_info = _extract_mermaid_link(tr.ui_extra)
     if link_info is None:
         return render_generic_tool_result(tr.result, is_error=tr.status == "error")
 
-    link_text = Text.from_markup(f"[blue u][link={link_info.link}]Command+click to view[/link][/blue u]")
-    return Padding.indent(link_text, level=2)
+    if supports_osc8_hyperlinks():
+        link_text = Text.from_markup(f"[blue u][link={link_info.link}]Command+click to view[/link][/blue u]")
+        return Padding.indent(link_text, level=2)
+
+    # For terminals that don't support OSC 8, show a hint to use /export
+    hint_text = Text.assemble(
+        ("Use ", ThemeKey.TOOL_RESULT),
+        ("/export", ThemeKey.TOOL_RESULT_BOLD),
+        (" to view the diagram.", ThemeKey.TOOL_RESULT),
+    )
+    return Padding.indent(hint_text, level=2)
 
 
 def _extract_truncation(

klaude_code/ui/rich/markdown.py

@@ -284,7 +284,10 @@ class MarkdownStream:
 
             target_height = min(self._live_window_seen_height, self.live_window)
             if target_height > 0 and current_height < target_height:
-                pad_count = target_height - current_height + 1
+                # Pad only up to the maximum height we've seen so far.
+                # This keeps the Live region height stable without overshooting,
+                # which can cause the spinner to jump by a line.
+                pad_count = target_height - current_height
                 # Pad after the existing lines so spinner visually stays at the bottom.
                 rest_lines = rest_lines + ["\n"] * pad_count