klaude-code 1.2.6__py3-none-any.whl → 1.8.0__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/todo/update_plan_tool.py

@@ -99,6 +99,6 @@ class UpdatePlanTool(ToolABC):
         return model.ToolResultItem(
             status="success",
             output="Plan updated",
-            ui_extra=model.ToolResultUIExtra(type=model.ToolResultUIExtraType.TODO_LIST, todo_list=ui_extra),
+            ui_extra=model.TodoListUIExtra(todo_list=ui_extra),
             side_effects=[model.ToolSideEffect.TODO_CHANGE],
         )

klaude_code/core/tool/tool_abc.py

@@ -1,5 +1,7 @@
 import string
 from abc import ABC, abstractmethod
+from dataclasses import dataclass
+from enum import Enum
 from pathlib import Path
 
 from klaude_code.protocol import llm_param, model
@@ -14,6 +16,10 @@ def load_desc(path: Path, substitutions: dict[str, str] | None = None) -> str:
 
 
 class ToolABC(ABC):
+    @classmethod
+    def metadata(cls) -> "ToolMetadata":
+        return ToolMetadata()
+
     @classmethod
     @abstractmethod
     def schema(cls) -> llm_param.ToolSchema:
@@ -23,3 +29,15 @@ class ToolABC(ABC):
     @abstractmethod
     async def call(cls, arguments: str) -> model.ToolResultItem:
         raise NotImplementedError
+
+
+class ToolConcurrencyPolicy(str, Enum):
+    SEQUENTIAL = "sequential"
+    CONCURRENT = "concurrent"
+
+
+@dataclass(frozen=True)
+class ToolMetadata:
+    concurrency_policy: ToolConcurrencyPolicy = ToolConcurrencyPolicy.SEQUENTIAL
+    has_side_effects: bool = False
+    requires_tool_context: bool = True

klaude_code/core/tool/tool_context.py

@@ -9,6 +9,8 @@ from klaude_code.protocol import model
 from klaude_code.protocol.sub_agent import SubAgentResult
 from klaude_code.session.session import Session
 
+type FileTracker = MutableMapping[str, model.FileStatus]
+
 
 @dataclass
 class TodoContext:
@@ -22,6 +24,19 @@ class TodoContext:
     set_todos: Callable[[list[model.TodoItem]], None]
 
 
+@dataclass
+class SessionTodoStore:
+    """Adapter exposing session todos through an explicit interface."""
+
+    session: Session
+
+    def get(self) -> list[model.TodoItem]:
+        return self.session.todos
+
+    def set(self, todos: list[model.TodoItem]) -> None:
+        self.session.todos = todos
+
+
 @dataclass
 class ToolContextToken:
     """Tokens used to restore tool execution context.
@@ -31,15 +46,13 @@ class ToolContextToken:
     finishes running.
     """
 
-    file_tracker_token: Token[MutableMapping[str, float] | None] | None
+    file_tracker_token: Token[FileTracker | None] | None
     todo_token: Token[TodoContext | None] | None
 
 
 # Holds the current file tracker mapping for tool execution context.
 # Set by Agent/Reminder right before invoking a tool.
-current_file_tracker_var: ContextVar[MutableMapping[str, float] | None] = ContextVar(
-    "current_file_tracker", default=None
-)
+current_file_tracker_var: ContextVar[FileTracker | None] = ContextVar("current_file_tracker", default=None)
 
 
 # Holds the todo access context for tools.
@@ -55,10 +68,7 @@ def set_tool_context_from_session(session: Session) -> ToolContextToken:
     """
 
     file_tracker_token = current_file_tracker_var.set(session.file_tracker)
-    todo_ctx = TodoContext(
-        get_todos=lambda: session.todos,
-        set_todos=lambda todos: setattr(session, "todos", todos),
-    )
+    todo_ctx = build_todo_context(session)
     todo_token = current_todo_context_var.set(todo_ctx)
     return ToolContextToken(file_tracker_token=file_tracker_token, todo_token=todo_token)
 
@@ -73,9 +83,7 @@ def reset_tool_context(token: ToolContextToken) -> None:
 
 
 @contextmanager
-def tool_context(
-    file_tracker: MutableMapping[str, float], todo_ctx: TodoContext
-) -> Generator[ToolContextToken, None, None]:
+def tool_context(file_tracker: FileTracker, todo_ctx: TodoContext) -> Generator[ToolContextToken]:
     """Context manager for setting and resetting tool execution context."""
 
     file_tracker_token = current_file_tracker_var.set(file_tracker)
@@ -87,7 +95,14 @@ def tool_context(
         reset_tool_context(token)
 
 
-def get_current_file_tracker() -> MutableMapping[str, float] | None:
+def build_todo_context(session: Session) -> TodoContext:
+    """Create a TodoContext backed by the given session."""
+
+    store = SessionTodoStore(session)
+    return TodoContext(get_todos=store.get, set_todos=store.set)
+
+
+def get_current_file_tracker() -> FileTracker | None:
     """Return the current file tracker mapping for this tool context."""
 
     return current_file_tracker_var.get()

klaude_code/core/tool/tool_registry.py

@@ -1,4 +1,5 @@
-from typing import Callable, TypeVar
+from collections.abc import Callable
+from typing import TypeVar
 
 from klaude_code.core.tool.sub_agent_tool import SubAgentTool
 from klaude_code.core.tool.tool_abc import ToolABC
@@ -61,18 +62,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.READ, tools.APPLY_PATCH, tools.MOVE, tools.UPDATE_PLAN]
     elif "gemini-3" in model_name:
-        tool_names = [tools.BASH, tools.READ, tools.EDIT, tools.WRITE]
+        tool_names = [tools.BASH, tools.READ, tools.EDIT, tools.WRITE, tools.MOVE]
     else:
-        tool_names = [tools.BASH, tools.READ, tools.EDIT, tools.WRITE, tools.TODO_WRITE]
+        tool_names = [tools.BASH, tools.READ, tools.EDIT, tools.WRITE, tools.MOVE, 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/core/tool/tool_runner.py

@@ -3,10 +3,10 @@ from collections.abc import AsyncGenerator, Callable, Iterable, Sequence
 from dataclasses import dataclass
 
 from klaude_code import const
-from klaude_code.core.tool.tool_abc import ToolABC
+from klaude_code.core.tool.report_back_tool import ReportBackTool
+from klaude_code.core.tool.tool_abc import ToolABC, ToolConcurrencyPolicy
 from klaude_code.core.tool.truncation import truncate_tool_output
-from klaude_code.protocol import model
-from klaude_code.protocol.sub_agent import is_sub_agent_tool
+from klaude_code.protocol import model, tools
 
 
 async def run_tool(tool_call: model.ToolCallItem, registry: dict[str, type[ToolABC]]) -> model.ToolResultItem:
@@ -19,6 +19,13 @@ async def run_tool(tool_call: model.ToolCallItem, registry: dict[str, type[ToolA
     Returns:
         The result of the tool execution.
     """
+    # Special handling for report_back tool (not registered in global registry)
+    if tool_call.name == tools.REPORT_BACK:
+        tool_result = await ReportBackTool.call(tool_call.arguments)
+        tool_result.call_id = tool_call.call_id
+        tool_result.tool_name = tool_call.name
+        return tool_result
+
     if tool_call.name not in registry:
         return model.ToolResultItem(
             call_id=tool_call.call_id,
@@ -34,13 +41,10 @@ async def run_tool(tool_call: model.ToolCallItem, registry: dict[str, type[ToolA
             truncation_result = truncate_tool_output(tool_result.output, tool_call)
             tool_result.output = truncation_result.output
             if truncation_result.was_truncated and truncation_result.saved_file_path:
-                tool_result.ui_extra = model.ToolResultUIExtra(
-                    type=model.ToolResultUIExtraType.TRUNCATION,
-                    truncation=model.TruncationUIExtra(
-                        saved_file_path=truncation_result.saved_file_path,
-                        original_length=truncation_result.original_length,
-                        truncated_length=truncation_result.truncated_length,
-                    ),
+                tool_result.ui_extra = model.TruncationUIExtra(
+                    saved_file_path=truncation_result.saved_file_path,
+                    original_length=truncation_result.original_length,
+                    truncated_length=truncation_result.truncated_length,
                 )
         return tool_result
     except asyncio.CancelledError:
@@ -84,8 +88,8 @@ class ToolExecutor:
     """Execute and coordinate a batch of tool calls for a single turn.
 
     The executor is responsible for:
-    - Partitioning tool calls into regular tools and sub-agent tools
-    - Running regular tools sequentially and sub-agent tools concurrently
+    - Partitioning tool calls into sequential and concurrent tools
+    - Running sequential tools one by one and concurrent tools in parallel
     - Emitting ToolCall/ToolResult events and tool side-effect events
     - Tracking unfinished calls so `cancel()` can synthesize cancellation results
     """
@@ -101,9 +105,9 @@ class ToolExecutor:
 
         self._unfinished_calls: dict[str, model.ToolCallItem] = {}
         self._call_event_emitted: set[str] = set()
-        self._sub_agent_tasks: set[asyncio.Task[list[ToolExecutorEvent]]] = set()
+        self._concurrent_tasks: set[asyncio.Task[list[ToolExecutorEvent]]] = set()
 
-    async def run_tools(self, tool_calls: list[model.ToolCallItem]) -> AsyncGenerator[ToolExecutorEvent, None]:
+    async def run_tools(self, tool_calls: list[model.ToolCallItem]) -> AsyncGenerator[ToolExecutorEvent]:
         """Run the given tool calls and yield execution events.
 
         Tool calls are partitioned into regular tools and sub-agent tools. Regular tools
@@ -114,10 +118,10 @@ class ToolExecutor:
         for tool_call in tool_calls:
             self._unfinished_calls[tool_call.call_id] = tool_call
 
-        regular_tool_calls, sub_agent_tool_calls = self._partition_tool_calls(tool_calls)
+        sequential_tool_calls, concurrent_tool_calls = self._partition_tool_calls(tool_calls)
 
-        # Run regular tools sequentially.
-        for tool_call in regular_tool_calls:
+        # Run sequential tools one by one.
+        for tool_call in sequential_tool_calls:
             tool_call_event = self._build_tool_call_started(tool_call)
             self._call_event_emitted.add(tool_call.call_id)
             yield tool_call_event
@@ -131,16 +135,16 @@ class ToolExecutor:
             for exec_event in result_events:
                 yield exec_event
 
-        # Run sub-agent tools concurrently.
-        if sub_agent_tool_calls:
+        # Run concurrent tools (sub-agents, web tools) in parallel.
+        if concurrent_tool_calls:
             execution_tasks: list[asyncio.Task[list[ToolExecutorEvent]]] = []
-            for tool_call in sub_agent_tool_calls:
+            for tool_call in concurrent_tool_calls:
                 tool_call_event = self._build_tool_call_started(tool_call)
                 self._call_event_emitted.add(tool_call.call_id)
                 yield tool_call_event
 
                 task = asyncio.create_task(self._run_single_tool_call(tool_call))
-                self._register_sub_agent_task(task)
+                self._register_concurrent_task(task)
                 execution_tasks.append(task)
 
             for task in asyncio.as_completed(execution_tasks):
@@ -160,7 +164,7 @@ class ToolExecutor:
     def cancel(self) -> Iterable[ToolExecutorEvent]:
         """Cancel unfinished tool calls and synthesize error results.
 
-        - Cancels any running sub-agent tool tasks so they stop emitting events.
+        - Cancels any running concurrent tool tasks so they stop emitting events.
         - For each unfinished tool call, yields a ToolExecutionCallStarted (if not
           already emitted for this turn) followed by a ToolExecutionResult with
           error status and a standard cancellation output. The corresponding
@@ -169,11 +173,11 @@ class ToolExecutor:
 
         events_to_yield: list[ToolExecutorEvent] = []
 
-        # Cancel running sub-agent tool tasks.
-        for task in list(self._sub_agent_tasks):
+        # Cancel running concurrent tool tasks.
+        for task in list(self._concurrent_tasks):
             if not task.done():
                 task.cancel()
-        self._sub_agent_tasks.clear()
+        self._concurrent_tasks.clear()
 
         if not self._unfinished_calls:
             return events_to_yield
@@ -198,26 +202,30 @@ class ToolExecutor:
 
         return events_to_yield
 
-    def _register_sub_agent_task(self, task: asyncio.Task[list[ToolExecutorEvent]]) -> None:
-        self._sub_agent_tasks.add(task)
+    def _register_concurrent_task(self, task: asyncio.Task[list[ToolExecutorEvent]]) -> None:
+        self._concurrent_tasks.add(task)
 
         def _cleanup(completed: asyncio.Task[list[ToolExecutorEvent]]) -> None:
-            self._sub_agent_tasks.discard(completed)
+            self._concurrent_tasks.discard(completed)
 
         task.add_done_callback(_cleanup)
 
-    @staticmethod
     def _partition_tool_calls(
+        self,
         tool_calls: list[model.ToolCallItem],
     ) -> tuple[list[model.ToolCallItem], list[model.ToolCallItem]]:
-        regular_tool_calls: list[model.ToolCallItem] = []
-        sub_agent_tool_calls: list[model.ToolCallItem] = []
+        sequential_tool_calls: list[model.ToolCallItem] = []
+        concurrent_tool_calls: list[model.ToolCallItem] = []
         for tool_call in tool_calls:
-            if is_sub_agent_tool(tool_call.name):
-                sub_agent_tool_calls.append(tool_call)
+            tool_cls = self._registry.get(tool_call.name)
+            policy = (
+                tool_cls.metadata().concurrency_policy if tool_cls is not None else ToolConcurrencyPolicy.SEQUENTIAL
+            )
+            if policy == ToolConcurrencyPolicy.CONCURRENT:
+                concurrent_tool_calls.append(tool_call)
             else:
-                regular_tool_calls.append(tool_call)
-        return regular_tool_calls, sub_agent_tool_calls
+                sequential_tool_calls.append(tool_call)
+        return sequential_tool_calls, concurrent_tool_calls
 
     def _build_tool_call_started(self, tool_call: model.ToolCallItem) -> ToolExecutionCallStarted:
         return ToolExecutionCallStarted(tool_call=tool_call)
@@ -244,7 +252,7 @@ class ToolExecutor:
         for side_effect in side_effects:
             if side_effect == model.ToolSideEffect.TODO_CHANGE:
                 todos: list[model.TodoItem] | None = None
-                if tool_result.ui_extra is not None and tool_result.ui_extra.todo_list is not None:
+                if isinstance(tool_result.ui_extra, model.TodoListUIExtra):
                     todos = tool_result.ui_extra.todo_list.todos
                 if todos is not None:
                     side_effect_events.append(ToolExecutionTodoChange(todos=todos))

klaude_code/core/tool/truncation.py

@@ -21,16 +21,22 @@ class TruncationResult:
     truncated_length: int = 0
 
 
+FILE_SAVED_PATTERN = re.compile(r"<file_saved>([^<]+)</file_saved>")
+
+
+def _extract_saved_file_path(output: str) -> str | None:
+    """Extract file path from <file_saved> tag if present."""
+    match = FILE_SAVED_PATTERN.search(output)
+    return match.group(1) if match else None
+
+
 def _extract_url_filename(url: str) -> str:
     """Extract a safe filename from a URL."""
     parsed = urlparse(url)
     # Combine host and path for a meaningful filename
     host = parsed.netloc.replace(".", "_").replace(":", "_")
     path = parsed.path.strip("/").replace("/", "_")
-    if path:
-        name = f"{host}_{path}"
-    else:
-        name = host
+    name = f"{host}_{path}" if path else host
     # Sanitize: keep only alphanumeric, underscore, hyphen
     name = re.sub(r"[^a-zA-Z0-9_\-]", "_", name)
     # Limit length
@@ -106,33 +112,42 @@ class SmartTruncationStrategy(TruncationStrategy):
             file_path = self.truncation_dir / filename
             file_path.write_text(output, encoding="utf-8")
             return str(file_path)
-        except (OSError, IOError):
+        except OSError:
             return None
 
     def truncate(self, output: str, tool_call: model.ToolCallItem | None = None) -> TruncationResult:
+        if tool_call and tool_call.name == tools.READ:
+            # Do not truncate Read tool outputs
+            return TruncationResult(output=output, was_truncated=False, original_length=len(output))
+
         original_length = len(output)
 
         if original_length <= self.max_length:
             return TruncationResult(output=output, was_truncated=False, original_length=original_length)
 
-        # Save full output to file
-        saved_file_path = self._save_to_file(output, tool_call)
+        # Check if file was already saved (e.g., by WebFetch)
+        existing_file_path = _extract_saved_file_path(output)
+        saved_file_path = existing_file_path or self._save_to_file(output, tool_call)
+
+        # Strip existing <file_saved> tag to avoid duplication in head/tail
+        content_to_truncate = FILE_SAVED_PATTERN.sub("", output).lstrip("\n") if existing_file_path else output
+        content_length = len(content_to_truncate)
 
-        truncated_length = original_length - self.head_chars - self.tail_chars
-        head_content = output[: self.head_chars]
-        tail_content = output[-self.tail_chars :]
+        truncated_length = content_length - self.head_chars - self.tail_chars
+        head_content = content_to_truncate[: self.head_chars]
+        tail_content = content_to_truncate[-self.tail_chars :]
 
         # Build truncated output with file info
         if saved_file_path:
             header = (
-                f"<system-reminder>Output truncated: {truncated_length} chars hidden. "
-                f"Full tool output saved to {saved_file_path}. "
-                f"Use Read with limit+offset or rg/grep to inspect.\n"
+                f"<system-reminder>Output truncated ({truncated_length} chars hidden) to reduce context usage. "
+                f"Full content saved to <file_saved>{saved_file_path}</file_saved>. "
+                f"Use Read(offset, limit) or rg to inspect if needed. "
                 f"Showing first {self.head_chars} and last {self.tail_chars} chars:</system-reminder>\n\n"
             )
         else:
             header = (
-                f"<system-reminder>Output truncated: {truncated_length} chars hidden. "
+                f"<system-reminder>Output truncated ({truncated_length} chars hidden) to reduce context usage. "
                 f"Showing first {self.head_chars} and last {self.tail_chars} chars:</system-reminder>\n\n"
             )
 

klaude_code/core/tool/web/mermaid_tool.md

@@ -17,5 +17,48 @@ Diagrams are especially valuable for visualizing:
 - Sequence and timing of operations
 - Decision trees and conditional logic
 
+# Syntax
+- ALWAYS wrap node labels in double quotes, especially when they contain spaces, special characters, or non-ASCII text
+- This applies to all node types: regular nodes, subgraph titles, and edge labels
+
+Examples:
+```mermaid
+graph LR
+  A["User Input"] --> B["Process Data"]
+  B --> C["Output Result"]
+```
+
+```mermaid
+flowchart TD
+  subgraph auth["Authentication Module"]
+    login["Login Service"]
+    oauth["OAuth Provider"]
+  end
+```
+
+```mermaid
+sequenceDiagram
+  participant client as "Web Client"
+  participant server as "API Server"
+  client ->> server: "Send Request"
+```
+
 # Styling
 - When defining custom classDefs, always define fill color, stroke color, and text color ("fill", "stroke", "color") explicitly
+- Use colors to distinguish node types and improve readability
+
+## Color Palette
+- Cyan #e0f0f0 - information, data flow
+- Green #e0f0e0 - success, completion
+- Blue #e0e8f5 - primary actions, main flow
+- Purple #ede0f5 - highlights, special nodes
+- Orange #f5ebe0 - warnings, pending
+- Red #f5e0e0 - errors, critical
+- Grey #e8e8e8 - neutral elements
+- Yellow #f5f5e0 - attention, notes
+
+Example:
+```mermaid
+classDef primary fill:#e0e8f5,stroke:#3078C5,color:#1a1a1a
+classDef success fill:#e0f0e0,stroke:#00875f,color:#1a1a1a
+```

klaude_code/core/tool/web/mermaid_tool.py

@@ -31,7 +31,7 @@ class MermaidTool(ToolABC):
                 "type": "object",
                 "properties": {
                     "code": {
-                        "description": "The Mermaid diagram code to render (DO NOT override with custom colors or other styles, DO NOT use HTML tags in node labels)",
+                        "description": "The Mermaid diagram code to render (DO NOT use HTML tags in node labels)",
                         "type": "string",
                     },
                 },
@@ -49,10 +49,7 @@ class MermaidTool(ToolABC):
 
         link = cls._build_link(args.code)
         line_count = cls._count_lines(args.code)
-        ui_extra = model.ToolResultUIExtra(
-            type=model.ToolResultUIExtraType.MERMAID_LINK,
-            mermaid_link=model.MermaidLinkUIExtra(link=link, line_count=line_count),
-        )
+        ui_extra = model.MermaidLinkUIExtra(code=args.code, link=link, line_count=line_count)
         output = f"Mermaid diagram rendered successfully ({line_count} lines)."
         return model.ToolResultItem(status="success", output=output, ui_extra=ui_extra)