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

klaude_code/config/select_model.py

@@ -1,6 +1,5 @@
 from klaude_code.config.config import load_config
 from klaude_code.trace import log
-from klaude_code.ui.rich.searchable_text import SearchableFormattedList
 
 
 def select_model_from_config(preferred: str | None = None) -> str | None:
@@ -16,9 +15,6 @@ def select_model_from_config(preferred: str | None = None) -> str | None:
         raise ValueError("No models configured. Please update your config.yaml")
 
     names: list[str] = [m.model_name for m in models]
-    default_name: str | None = (
-        preferred if preferred in names else (config.main_model if config.main_model in names else None)
-    )
 
     try:
         import questionary
@@ -28,29 +24,23 @@ def select_model_from_config(preferred: str | None = None) -> str | None:
         max_model_name_length = max(len(m.model_name) for m in models)
         for m in models:
             star = "★ " if m.model_name == config.main_model else "  "
-            fragments = [
-                ("class:t", f"{star}{m.model_name:<{max_model_name_length}}   → "),
-                ("class:b", m.model_params.model or "N/A"),
-                ("class:d", f" {m.provider}"),
-            ]
-            # Provide a formatted title for display and a plain text for search.
-            title = SearchableFormattedList(fragments)
+            title = f"{star}{m.model_name:<{max_model_name_length}}   →  {m.model_params.model or 'N/A'} @ {m.provider}"
             choices.append(questionary.Choice(title=title, value=m.model_name))
 
         try:
             result = questionary.select(
                 message="Select a model:",
                 choices=choices,
-                default=default_name,
                 pointer="→",
                 instruction="↑↓ to move • Enter to select",
                 use_jk_keys=False,
                 use_search_filter=True,
                 style=questionary.Style(
                     [
-                        ("t", ""),
-                        ("b", "bold"),
-                        ("d", "dim"),
+                        ("instruction", "ansibrightblack"),
+                        ("pointer", "ansicyan"),
+                        ("highlighted", "ansicyan"),
+                        ("text", "ansibrightblack"),
                         # search filter colors at the bottom
                         ("search_success", "noinherit fg:ansigreen"),
                         ("search_none", "noinherit fg:ansired"),

klaude_code/const/__init__.py

@@ -62,7 +62,7 @@ BASH_DEFAULT_TIMEOUT_MS = 120000
 
 # -- Tool Output --
 # Maximum length for tool output before truncation
-TOOL_OUTPUT_MAX_LENGTH = 50000
+TOOL_OUTPUT_MAX_LENGTH = 40000
 
 # Characters to show from the beginning of truncated output
 TOOL_OUTPUT_DISPLAY_HEAD = 10000

klaude_code/core/agent.py

@@ -4,7 +4,7 @@ from collections.abc import AsyncGenerator, Callable, Iterable
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Protocol
 
-from klaude_code.core.prompt import get_system_prompt as load_system_prompt
+from klaude_code.core.prompt import load_system_prompt
 from klaude_code.core.reminders import Reminder, load_agent_reminders
 from klaude_code.core.task import SessionContext, TaskExecutionContext, TaskExecutor
 from klaude_code.core.tool import build_todo_context, get_registry, load_agent_tools

klaude_code/core/executor.py

@@ -114,10 +114,7 @@ class ExecutorContext:
 
     async def handle_init_agent(self, operation: op.InitAgentOperation) -> None:
         """Initialize an agent for a session and replay history to UI."""
-        if operation.session_id is None:
-            raise ValueError("session_id cannot be None")
-
-        await self.agent_manager.ensure_agent(operation.session_id, is_new_session=operation.is_new_session)
+        await self.agent_manager.ensure_agent(operation.session_id)
 
     async def handle_user_input(self, operation: op.UserInputOperation) -> None:
         """Handle a user input operation by running it through an agent."""

klaude_code/core/manager/agent_manager.py

@@ -38,13 +38,19 @@ class AgentManager:
 
         await self._event_queue.put(event)
 
-    async def ensure_agent(self, session_id: str, *, is_new_session: bool = False) -> Agent:
-        """Return an existing agent for the session or create a new one."""
-        agent = self._active_agents.get(session_id)
-        if agent is not None:
-            return agent
-
-        session = Session.load(session_id, skip_if_missing=is_new_session)
+    async def ensure_agent(self, session_id: str | None = None) -> Agent:
+        """Return an existing agent for the session or create a new one.
+
+        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.
+        """
+        if session_id is None:
+            session = Session.create()
+        else:
+            agent = self._active_agents.get(session_id)
+            if agent is not None:
+                return agent
+            session = Session.load(session_id)
         profile = self._model_profile_provider.build_profile(self._llm_clients)
         agent = Agent(session=session, profile=profile, model_name=self._llm_clients.main_model_name)
 
@@ -58,9 +64,9 @@ class AgentManager:
             )
         )
 
-        self._active_agents[session_id] = agent
+        self._active_agents[session.id] = agent
         log_debug(
-            f"Initialized agent for session: {session_id}",
+            f"Initialized agent for session: {session.id}",
             style="cyan",
             debug_type=DebugType.EXECUTION,
         )

klaude_code/core/manager/llm_clients_builder.py

@@ -6,8 +6,7 @@ from klaude_code.config import Config
 from klaude_code.core.manager.llm_clients import LLMClients
 from klaude_code.llm.client import LLMClientABC
 from klaude_code.llm.registry import create_llm_client
-from klaude_code.protocol.sub_agent import get_sub_agent_profile
-from klaude_code.protocol.tools import SubAgentType
+from klaude_code.protocol.sub_agent import iter_sub_agent_profiles
 from klaude_code.trace import DebugType, log_debug
 
 
@@ -15,7 +14,6 @@ def build_llm_clients(
     config: Config,
     *,
     model_override: str | None = None,
-    enabled_sub_agents: list[SubAgentType] | None = None,
 ) -> LLMClients:
     """Create an ``LLMClients`` bundle driven by application config."""
 
@@ -43,12 +41,11 @@ def build_llm_clients(
         main_llm_config=llm_config,
     )
 
-    for sub_agent_type in enabled_sub_agents or []:
-        model_name = config.subagent_models.get(sub_agent_type)
+    for profile in iter_sub_agent_profiles():
+        model_name = config.subagent_models.get(profile.name)
         if not model_name:
             continue
 
-        profile = get_sub_agent_profile(sub_agent_type)
         if not profile.enabled_for_model(main_model_name):
             continue
 
@@ -56,6 +53,6 @@ def build_llm_clients(
             sub_llm_config = config.get_model_config(model_name_for_factory)
             return create_llm_client(sub_llm_config)
 
-        clients.register_sub_client_factory(sub_agent_type, _factory)
+        clients.register_sub_client_factory(profile.name, _factory)
 
     return clients

klaude_code/core/prompt.py

@@ -6,8 +6,8 @@ from pathlib import Path
 
 COMMAND_DESCRIPTIONS: dict[str, str] = {
     "rg": "ripgrep - fast text search",
-    "fd": "fd - simple and fast alternative to find",
-    "tree": "tree - directory listing as a tree",
+    "fd": "simple and fast alternative to find",
+    "tree": "directory listing as a tree",
     "sg": "ast-grep - AST-aware code search",
 }
 
@@ -15,7 +15,7 @@ COMMAND_DESCRIPTIONS: dict[str, str] = {
 PROMPT_FILES: dict[str, str] = {
     "main_gpt_5_1": "prompts/prompt-codex-gpt-5-1.md",
     "main_gpt_5_1_codex_max": "prompts/prompt-codex-gpt-5-1-codex-max.md",
-    "main_claude": "prompts/prompt-claude-code.md",
+    "main": "prompts/prompt-claude-code.md",
     "main_gemini": "prompts/prompt-gemini.md",  # https://ai.google.dev/gemini-api/docs/prompting-strategies?hl=zh-cn#agentic-si-template
     # Sub-agent prompts keyed by their name
     "Task": "prompts/prompt-subagent.md",
@@ -49,7 +49,7 @@ def _get_file_key(model_name: str, sub_agent_type: str | None) -> str:
         case name if "gemini" in name:
             return "main_gemini"
         case _:
-            return "main_claude"
+            return "main"
 
 
 def _build_env_info(model_name: str) -> str:
@@ -84,7 +84,7 @@ def _build_env_info(model_name: str) -> str:
     return "\n".join(env_lines)
 
 
-def get_system_prompt(model_name: str, sub_agent_type: str | None = None) -> str:
+def load_system_prompt(model_name: str, sub_agent_type: str | None = None) -> str:
     """Get system prompt content for the given model and sub-agent type."""
     file_key = _get_file_key(model_name, sub_agent_type)
     base_prompt = _load_base_prompt(file_key)

klaude_code/core/prompts/prompt-claude-code.md

@@ -84,15 +84,4 @@ assistant: [Uses the Explore tool to find the files that handle client errors in
 <example>
 user: What is the codebase structure?
 assistant: [Uses the Explore tool]
-</example>
-
-## Memory
-MEMORY PROTOCOL:
-1. Use the `view` command of your `Memory` tool to check for earlier progress.
-2. ... (work on the task) ...
-     - As you make progress, record status / progress / thoughts etc in your memory.
-ASSUME INTERRUPTION: Your context window might be reset at any moment, so you risk losing any progress that is not recorded in your memory directory.
-
-Note: when editing your memory folder, always try to keep its content up-to-date, coherent and organized. You can rename or delete files that are no longer relevant. Do not create new files unless necessary.
-
-Only write down information relevant to current project in your memory system.
+</example>

klaude_code/core/prompts/prompt-minimal.md

@@ -0,0 +1,12 @@
+You are an interactive CLI tool. Use the tools available to you to assist the user.
+
+## Guidelines
+- Never use emojis.
+- Your output will be displayed on a command line interface. Your responses should be short and concise.
+- Output text to communicate with the user; all text you output outside of tool use is displayed to the user. Only use tools to complete tasks. Never use tools like Bash or code comments as means to communicate with the user during the session.
+- NEVER create Markdown files unless they're absolutely necessary for achieving your goal.
+- Use TodoWrite tool to help you manage and plan tasks.
+- For maximum efficiency, whenever you need to perform multiple independent operations, invoke all relevant tools simultaneously rather than sequentially.
+
+## Professional objectivity
+Prioritize technical accuracy and truthfulness over validating the user's beliefs. Focus on facts and problem-solving, providing direct, objective technical info without any unnecessary superlatives, praise, or emotional validation. It is best for the user if you honestly applies the same rigorous standards to all ideas and disagrees when necessary, even if it may not be what the user wants to hear. Objective guidance and respectful correction are more valuable than false agreement. Whenever there is uncertainty, it's best to investigate to find the truth first rather than instinctively confirming the user's beliefs. Avoid using over-the-top validation or excessive praise when responding to users such as "You're absolutely right" or similar phrases.

klaude_code/core/task.py

@@ -29,9 +29,11 @@ class MetadataAccumulator:
         self._sub_agent_metadata: list[model.TaskMetadata] = []
         self._throughput_weighted_sum: float = 0.0
         self._throughput_tracked_tokens: int = 0
+        self._turn_count: int = 0
 
     def add(self, turn_metadata: model.ResponseMetadataItem) -> None:
         """Merge a turn's metadata into the accumulated state."""
+        self._turn_count += 1
         main = self._main
         usage = turn_metadata.usage
 
@@ -45,8 +47,8 @@ class MetadataAccumulator:
             acc_usage.output_tokens += usage.output_tokens
             acc_usage.currency = usage.currency
 
-            if usage.context_token is not None:
-                acc_usage.context_token = usage.context_token
+            if usage.context_size is not None:
+                acc_usage.context_size = usage.context_size
             if usage.context_limit is not None:
                 acc_usage.context_limit = usage.context_limit
 
@@ -91,6 +93,7 @@ class MetadataAccumulator:
                 main.usage.throughput_tps = None
 
         main.task_duration_s = task_duration_s
+        main.turn_count = self._turn_count
         return model.TaskMetadataItem(main=main, sub_agent_task_metadata=self._sub_agent_metadata)
 
 

klaude_code/core/tool/memory/memory_tool.md

@@ -14,3 +14,7 @@ Usage tips:
 - Check your memory directory before starting tasks to recall previous context
 - Record important decisions, progress, and learnings as you work
 - Keep memory files organized and up-to-date; delete obsolete files
+
+Note: when editing your memory folder, always try to keep its content up-to-date, coherent and organized. You can rename or delete files that are no longer relevant. Do not create new files unless necessary.
+
+Only write down information relevant to current project in your memory system.

klaude_code/core/tool/memory/skill_loader.py

@@ -39,7 +39,7 @@ class SkillLoader:
     USER_SKILLS_DIRS = [
         Path("~/.claude/skills"),
         Path("~/.klaude/skills"),
-        Path("~/.claude/plugins/marketplaces"),
+        # Path("~/.claude/plugins/marketplaces"),
     ]
     # Project-level skills directory
     PROJECT_SKILLS_DIR = Path("./.claude/skills")

klaude_code/core/tool/todo/todo_write_tool.md

@@ -22,161 +22,4 @@ Skip using this tool when:
 
 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/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)