klaude-code 2.8.1__py3-none-any.whl → 2.9.1__py3-none-any.whl

klaude_code/cli/list_model.py

@@ -234,10 +234,15 @@ def _get_model_params_display(model: ModelConfig) -> list[Text]:
     return [Text("")]
 
 
-def _build_provider_info_panel(provider: ProviderConfig, available: bool) -> Quote:
+def _build_provider_info_panel(provider: ProviderConfig, available: bool, *, disabled: bool) -> Quote:
     """Build a Quote containing provider name and information using a two-column grid."""
     # Provider name as title
-    if available:
+    if disabled:
+        title = Text.assemble(
+            (provider.provider_name, ThemeKey.CONFIG_PROVIDER),
+            (" (Disabled)", "dim"),
+        )
+    elif available:
         title = Text(provider.provider_name, style=ThemeKey.CONFIG_PROVIDER)
     else:
         title = Text.assemble(
@@ -297,7 +302,8 @@ def _build_models_table(
     config: Config,
 ) -> Table:
     """Build a table for models under a provider."""
-    provider_available = not provider.is_api_key_missing()
+    provider_disabled = provider.disabled
+    provider_available = (not provider_disabled) and (not provider.is_api_key_missing())
 
     def _resolve_selector(value: str | None) -> str | None:
         if not value:
@@ -334,7 +340,15 @@ def _build_models_table(
         is_last = i == model_count - 1
         prefix = " └─ " if is_last else " ├─ "
 
-        if not provider_available:
+        if provider_disabled:
+            name = Text.assemble(
+                (prefix, ThemeKey.LINES),
+                (model.model_name, "dim strike"),
+                (" (provider disabled)", "dim"),
+            )
+            model_id = Text(model.model_id or "", style="dim")
+            params = Text("(disabled)", style="dim")
+        elif not provider_available:
             name = Text.assemble((prefix, ThemeKey.LINES), (model.model_name, "dim"))
             model_id = Text(model.model_id or "", style="dim")
             params = Text("(unavailable)", style="dim")
@@ -408,19 +422,22 @@ def display_models_and_providers(config: Config, *, show_all: bool = False):
     _display_agent_models_table(config, console)
     console.print()
 
-    # Sort providers: available (api_key set) first, unavailable (api_key not set) last
-    sorted_providers = sorted(config.provider_list, key=lambda p: (p.is_api_key_missing(), p.provider_name))
+    # Sort providers: enabled+available first, disabled/unavailable last
+    sorted_providers = sorted(
+        config.provider_list,
+        key=lambda p: (p.disabled, p.is_api_key_missing(), p.provider_name),
+    )
 
-    # Filter out unavailable providers unless show_all is True
+    # Filter out disabled/unavailable providers unless show_all is True
     if not show_all:
-        sorted_providers = [p for p in sorted_providers if not p.is_api_key_missing()]
+        sorted_providers = [p for p in sorted_providers if (not p.disabled) and (not p.is_api_key_missing())]
 
     # Display each provider with its models table
     for provider in sorted_providers:
-        provider_available = not provider.is_api_key_missing()
+        provider_available = (not provider.disabled) and (not provider.is_api_key_missing())
 
         # Provider info panel
-        provider_panel = _build_provider_info_panel(provider, provider_available)
+        provider_panel = _build_provider_info_panel(provider, provider_available, disabled=provider.disabled)
         console.print(provider_panel)
         console.print()
 

klaude_code/cli/main.py

@@ -227,10 +227,21 @@ def main_callback(
             log(("Error: --resume <id> cannot be combined with --continue or interactive --resume", "red"))
             raise typer.Exit(2)
 
+        # Resolve resume_by_id with prefix matching support
         if resume_by_id_value is not None and not Session.exists(resume_by_id_value):
-            log((f"Error: session id '{resume_by_id_value}' not found for this project", "red"))
-            log(("Hint: run `klaude --resume` to select an existing session", "yellow"))
-            raise typer.Exit(2)
+            matches = Session.find_sessions_by_prefix(resume_by_id_value)
+            if not matches:
+                log((f"Error: session id '{resume_by_id_value}' not found for this project", "red"))
+                log(("Hint: run `klaude --resume` to select an existing session", "yellow"))
+                raise typer.Exit(2)
+            if len(matches) == 1:
+                resume_by_id_value = matches[0]
+            else:
+                # Multiple matches: show interactive selection with filtered list
+                selected = select_session_sync(session_ids=matches)
+                if selected is None:
+                    raise typer.Exit(1)
+                resume_by_id_value = selected
 
         if not sys.stdin.isatty() or not sys.stdout.isatty():
             log(("Error: interactive mode requires a TTY", "red"))

klaude_code/config/assets/builtin_config.yaml

@@ -36,7 +36,7 @@ provider_list:
     verbosity: high
     thinking:
       reasoning_effort: high
-      reasoning_summary: detailed
+      reasoning_summary: concise
     cost: {input: 1.75, output: 14, cache_read: 0.17}
 
   - model_name: gpt-5.2-medium
@@ -71,7 +71,7 @@ provider_list:
     context_limit: 400000
     thinking:
       reasoning_effort: medium
-      reasoning_summary: detailed
+      reasoning_summary: concise
     cost: {input: 1.25, output: 10, cache_read: 0.13}
 
 
@@ -87,7 +87,7 @@ provider_list:
     verbosity: high
     thinking:
       reasoning_effort: high
-      reasoning_summary: detailed
+      reasoning_summary: concise
     cost: {input: 1.75, output: 14, cache_read: 0.17}
 
   - model_name: gpt-5.2-medium
@@ -148,6 +148,8 @@ provider_list:
     modalities:
     - image
     - text
+    image_config:
+      image_size: "4K"
     cost: {input: 2, output: 12, cache_read: 0.2, image: 120}
 
   - model_name: nano-banana
@@ -221,6 +223,8 @@ provider_list:
     modalities:
     - image
     - text
+    image_config:
+      image_size: "4K"
     cost: {input: 2, output: 12, cache_read: 0.2, image: 120}
 
   - model_name: nano-banana
@@ -275,8 +279,22 @@ provider_list:
     cost: {input: 4, output: 16, cache_read: 1, currency: CNY}
 
 
+- provider_name: cerebras
+  protocol: openai
+  api_key: ${CEREBRAS_API_KEY}
+  base_url: https://api.cerebras.ai/v1
+  model_list:
+
+  - model_name: glm
+    model_id: zai-glm-4.7
+    context_limit: 131072
+    max_tokens: 12800
+    cost: {input: 2.25, output: 2.75}
+
+
 - provider_name: claude-max
   protocol: claude_oauth
+  disabled: true
   model_list:
 
   - model_name: sonnet
@@ -318,7 +336,7 @@ provider_list:
     verbosity: high
     thinking:
       reasoning_effort: high
-      reasoning_summary: detailed
+      reasoning_summary: concise
     cost: {input: 1.75, output: 14, cache_read: 0.17}
 
 
@@ -329,42 +347,25 @@ provider_list:
     model_id: claude-opus-4-5-thinking
     context_limit: 200000
     max_tokens: 64000
-    thinking:
-      type: enabled
-      budget_tokens: 10240
+
   - model_name: sonnet
     model_id: claude-sonnet-4-5
     context_limit: 200000
     max_tokens: 64000
-  - model_name: sonnet-thinking
-    model_id: claude-sonnet-4-5-thinking
-    context_limit: 200000
-    max_tokens: 64000
-    thinking:
-      type: enabled
-      budget_tokens: 10240
+
   - model_name: gemini-pro-high
     model_id: gemini-3-pro-high
     context_limit: 1048576
     max_tokens: 65535
     thinking:
       reasoning_effort: high
-  - model_name: gemini-pro-low
-    model_id: gemini-3-pro-low
-    context_limit: 1048576
-    max_tokens: 65535
-    thinking:
-      reasoning_effort: low
+
   - model_name: gemini-flash
     model_id: gemini-3-flash
     context_limit: 1048576
     max_tokens: 65535
     thinking:
       reasoning_effort: medium
-  - model_name: gpt-oss
-    model_id: gpt-oss-120b-medium
-    context_limit: 131072
-    max_tokens: 32768
 
 
 compact_model: gemini-flash

klaude_code/config/config.py

@@ -44,13 +44,6 @@ def parse_env_var_syntax(value: str | None) -> tuple[str | None, str | None]:
     return None, value
 
 
-def is_env_var_syntax(value: str | None) -> bool:
-    """Check if a value uses ${ENV_VAR} syntax."""
-    if value is None:
-        return False
-    return _ENV_VAR_PATTERN.match(value) is not None
-
-
 def resolve_api_key(value: str | None) -> str | None:
     """Resolve an API key value, expanding ${ENV_VAR} syntax if present."""
     _, resolved = parse_env_var_syntax(value)
@@ -70,6 +63,7 @@ class ModelConfig(llm_param.LLMConfigModelParameter):
 class ProviderConfig(llm_param.LLMConfigProviderParameter):
     """Full provider configuration (used in merged config)."""
 
+    disabled: bool = False
     model_list: list[ModelConfig] = Field(default_factory=lambda: [])
 
     def get_resolved_api_key(self) -> str | None:
@@ -141,6 +135,7 @@ class UserProviderConfig(BaseModel):
 
     provider_name: str
     protocol: llm_param.LLMClientProtocol | None = None
+    disabled: bool = False
     base_url: str | None = None
     api_key: str | None = None
     is_azure: bool = False
@@ -290,6 +285,9 @@ class Config(BaseModel):
             if requested_provider is not None and provider.provider_name.casefold() != requested_provider.casefold():
                 continue
 
+            if provider.disabled:
+                continue
+
             api_key = provider.get_resolved_api_key()
             if (
                 provider.protocol
@@ -303,7 +301,11 @@ class Config(BaseModel):
             ):
                 continue
 
-            if any(m.model_name == requested_model for m in provider.model_list):
+            for model in provider.model_list:
+                if model.model_name != requested_model:
+                    continue
+                if model.disabled:
+                    continue
                 return requested_model, provider.provider_name
 
         return None
@@ -315,6 +317,11 @@ class Config(BaseModel):
             if requested_provider is not None and provider.provider_name.casefold() != requested_provider.casefold():
                 continue
 
+            if provider.disabled:
+                if requested_provider is not None:
+                    raise ValueError(f"Provider '{provider.provider_name}' is disabled for: {model_name}")
+                continue
+
             # Resolve ${ENV_VAR} syntax for api_key
             api_key = provider.get_resolved_api_key()
 
@@ -339,7 +346,15 @@ class Config(BaseModel):
             for model in provider.model_list:
                 if model.model_name != requested_model:
                     continue
-                provider_dump = provider.model_dump(exclude={"model_list"})
+
+                if model.disabled:
+                    if requested_provider is not None:
+                        raise ValueError(
+                            f"Model '{requested_model}' is disabled in provider '{provider.provider_name}' for: {model_name}"
+                        )
+                    break
+
+                provider_dump = provider.model_dump(exclude={"model_list", "disabled"})
                 provider_dump["api_key"] = api_key
                 return llm_param.LLMConfigParameter(
                     **provider_dump,
@@ -353,7 +368,7 @@ class Config(BaseModel):
 
         Args:
             only_available: If True, only return models from providers with valid API keys.
-            include_disabled: If False, exclude models with disabled=True.
+            include_disabled: If False, exclude models/providers with disabled=True.
         """
         return [
             ModelEntry(
@@ -362,7 +377,8 @@ class Config(BaseModel):
                 **model.model_dump(exclude={"model_name"}),
             )
             for provider in self.provider_list
-            if not only_available or not provider.is_api_key_missing()
+            if include_disabled or not provider.disabled
+            if not only_available or (not provider.disabled and not provider.is_api_key_missing())
             for model in provider.model_list
             if include_disabled or not model.disabled
         ]
@@ -374,13 +390,6 @@ class Config(BaseModel):
                 return True
         return False
 
-    def get_first_available_nano_banana_model(self) -> str | None:
-        """Get the first available nano-banana model, or None."""
-        for entry in self.iter_model_entries(only_available=True, include_disabled=False):
-            if "nano-banana" in entry.model_name:
-                return entry.model_name
-        return None
-
     def get_first_available_image_model(self) -> str | None:
         """Get the first available image generation model, or None."""
         for entry in self.iter_model_entries(only_available=True, include_disabled=False):
@@ -406,7 +415,21 @@ class Config(BaseModel):
         user_config.theme = self.theme
         # Note: provider_list is NOT synced - user providers are already in user_config
 
-        config_dict = user_config.model_dump(mode="json", exclude_none=True, exclude_defaults=True)
+        # Keep the saved file compact (exclude defaults), but preserve explicit
+        # overrides inside provider_list (e.g. `disabled: false` to re-enable a
+        # builtin provider that is disabled by default).
+        config_dict = user_config.model_dump(
+            mode="json",
+            exclude_none=True,
+            exclude_defaults=True,
+            exclude={"provider_list"},
+        )
+
+        provider_list = [
+            p.model_dump(mode="json", exclude_none=True, exclude_unset=True) for p in (user_config.provider_list or [])
+        ]
+        if provider_list:
+            config_dict["provider_list"] = provider_list
 
         def _save_config() -> None:
             config_path.parent.mkdir(parents=True, exist_ok=True)
@@ -454,12 +477,12 @@ def _get_builtin_config() -> Config:
 def _merge_model(builtin: ModelConfig, user: ModelConfig) -> ModelConfig:
     """Merge user model config with builtin model config.
 
-    Strategy: user values take precedence if explicitly set (not default).
-    This allows users to override specific fields (e.g., disabled=true)
+    Strategy: user values take precedence if explicitly set (not unset).
+    This allows users to override specific fields (e.g., disabled=true/false)
     without losing other builtin settings (e.g., model_id, max_tokens).
     """
     merged_data = builtin.model_dump()
-    user_data = user.model_dump(exclude_defaults=True, exclude={"model_name"})
+    user_data = user.model_dump(exclude_unset=True, exclude={"model_name"})
     for key, value in user_data.items():
         if value is not None:
             merged_data[key] = value
@@ -485,10 +508,9 @@ def _merge_provider(builtin: ProviderConfig, user: UserProviderConfig) -> Provid
             # New model from user
             merged_models[m.model_name] = m
 
-    # For other fields, use user values if explicitly set, otherwise use builtin
-    # We check if user explicitly provided a value by comparing to defaults
+    # For other fields, use user values if explicitly set, otherwise use builtin.
     merged_data = builtin.model_dump()
-    user_data = user.model_dump(exclude_defaults=True, exclude={"model_list"})
+    user_data = user.model_dump(exclude_unset=True, exclude={"model_list"})
 
     # Update with user's explicit settings
     for key, value in user_data.items():

klaude_code/config/sub_agent_model_helper.py

@@ -5,13 +5,12 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
+from klaude_code.protocol import tools
 from klaude_code.protocol.sub_agent import (
     AVAILABILITY_IMAGE_MODEL,
     SubAgentProfile,
     get_sub_agent_profile,
-    get_sub_agent_profile_by_tool,
     iter_sub_agent_profiles,
-    sub_agent_tool_names,
 )
 from klaude_code.protocol.tools import SubAgentType
 
@@ -30,7 +29,7 @@ class SubAgentModelInfo:
     # Effective model name used by this sub-agent.
     # - When configured_model is set: equals configured_model.
     # - When requirement-based default applies (e.g. ImageGen): resolved model.
-    # - When inheriting from main agent: None.
+    # - When inheriting from defaults: resolved model name.
     effective_model: str | None
 
 
@@ -106,10 +105,11 @@ class SubAgentModelHelper:
     ) -> EmptySubAgentModelBehavior:
         """Describe what happens when a sub-agent model is not configured.
 
-        Most sub-agents default to inheriting the main model.
+        Most sub-agents default to the Task model if configured, otherwise
+        they inherit the main model.
 
         Sub-agents with an availability requirement (e.g. ImageGen) do NOT
-        inherit from the main model; instead they auto-resolve a suitable model
+        inherit from Task/main; instead they auto-resolve a suitable model
         (currently: the first available image model).
         """
 
@@ -117,9 +117,11 @@ class SubAgentModelHelper:
 
         requirement = profile.availability_requirement
         if requirement is None:
+            task_model = self._config.sub_agent_models.get(tools.TASK)
+            resolved = task_model or main_model_name
             return EmptySubAgentModelBehavior(
-                description=f"inherit from main agent: {main_model_name}",
-                resolved_model_name=main_model_name,
+                description=f"use default behavior: {resolved}",
+                resolved_model_name=resolved,
             )
 
         resolved = self.resolve_model_for_requirement(requirement)
@@ -154,13 +156,15 @@ class SubAgentModelHelper:
         For sub-agents without explicit config, resolves model based on availability_requirement.
         """
         result: list[SubAgentModelInfo] = []
-        for profile in iter_sub_agent_profiles(enabled_only=True):
+        for profile in iter_sub_agent_profiles():
             if not self.check_availability_requirement(profile.availability_requirement):
                 continue
             configured_model = self._config.sub_agent_models.get(profile.name)
             effective_model = configured_model
             if not effective_model and profile.availability_requirement:
                 effective_model = self.resolve_model_for_requirement(profile.availability_requirement)
+            if not effective_model and profile.availability_requirement is None:
+                effective_model = self._config.sub_agent_models.get(tools.TASK) or self._config.main_model
             result.append(
                 SubAgentModelInfo(
                     profile=profile,
@@ -189,11 +193,9 @@ class SubAgentModelHelper:
 
     def get_enabled_sub_agent_tool_names(self) -> list[str]:
         """Return sub-agent tool names that should be added to main agent's tool list."""
-        result: list[str] = []
-        for name in sub_agent_tool_names(enabled_only=True):
-            profile = get_sub_agent_profile_by_tool(name)
-            if profile is not None and self.check_availability_requirement(profile.availability_requirement):
-                result.append(name)
+        result: list[str] = [tools.TASK]
+        if self.check_availability_requirement(AVAILABILITY_IMAGE_MODEL):
+            result.append(tools.IMAGE_GEN)
         return result
 
     def build_sub_agent_client_configs(self) -> dict[SubAgentType, str]:
@@ -205,4 +207,7 @@ class SubAgentModelHelper:
                 model_name = self.resolve_model_for_requirement(profile.availability_requirement)
             if model_name:
                 result[profile.name] = model_name
+        task_model = self._config.sub_agent_models.get(tools.TASK)
+        if task_model:
+            result.setdefault(tools.TASK, task_model)
         return result

klaude_code/config/thinking.py

@@ -62,14 +62,6 @@ def _is_gemini_flash_model(model_name: str | None) -> bool:
     return "gemini-3-flash" in model_name.lower()
 
 
-def should_auto_trigger_thinking(model_name: str | None) -> bool:
-    """Check if model should auto-trigger thinking selection on switch."""
-    if not model_name:
-        return False
-    model_lower = model_name.lower()
-    return "gpt-5" in model_lower or "gemini-3" in model_lower or "opus" in model_lower
-
-
 def get_levels_for_responses(model_name: str | None) -> list[str]:
     """Get thinking levels for responses protocol."""
     if _is_codex_max_model(model_name):

klaude_code/const.py

@@ -141,7 +141,7 @@ MIN_HIDDEN_LINES_FOR_INDICATOR = 5  # Minimum hidden lines before showing trunca
 SUB_AGENT_RESULT_MAX_LINES = 10  # Maximum lines for sub-agent result display
 TRUNCATE_HEAD_MAX_LINES = 2  # Maximum lines for sub-agent error display
 BASH_OUTPUT_PANEL_THRESHOLD = 10  # Bash output line threshold for CodePanel display
-BASH_MULTILINE_STRING_TRUNCATE_MAX_LINES = 2  # Max lines shown for heredoc / multiline string tokens in bash tool calls
+BASH_MULTILINE_STRING_TRUNCATE_MAX_LINES = 4  # Max lines shown for heredoc / multiline string tokens in bash tool calls
 URL_TRUNCATE_MAX_LENGTH = 400  # Maximum length for URL truncation in display
 QUERY_DISPLAY_TRUNCATE_LENGTH = 80  # Maximum length for search query display
 NOTIFY_COMPACT_LIMIT = 160  # Maximum length for notification body text

klaude_code/core/agent_profile.py

@@ -12,12 +12,10 @@ from typing import TYPE_CHECKING, Any, Protocol
 if TYPE_CHECKING:
     from klaude_code.config.config import Config
 
-from klaude_code.auth.codex.exceptions import CodexUnsupportedModelError
 from klaude_code.config.sub_agent_model_helper import SubAgentModelHelper
 from klaude_code.core.reminders import (
     at_file_reader_reminder,
     empty_todo_reminder,
-    file_changed_externally_reminder,
     image_reminder,
     last_path_memory_reminder,
     memory_reminder,
@@ -28,7 +26,7 @@ from klaude_code.core.tool.report_back_tool import ReportBackTool
 from klaude_code.core.tool.tool_registry import get_tool_schemas
 from klaude_code.llm import LLMClientABC
 from klaude_code.protocol import llm_param, message, tools
-from klaude_code.protocol.sub_agent import get_sub_agent_profile
+from klaude_code.protocol.sub_agent import AVAILABILITY_IMAGE_MODEL, get_sub_agent_profile
 from klaude_code.session import Session
 
 type Reminder = Callable[[Session], Awaitable[message.DeveloperMessage | None]]
@@ -54,12 +52,6 @@ COMMAND_DESCRIPTIONS: dict[str, str] = {
 }
 
 
-# Prompts for codex_oauth protocol - must be used exactly as-is without any additions.
-CODEX_OAUTH_PROMPTS: dict[str, str] = {
-    "gpt-5.2-codex": "prompts/prompt-codex-gpt-5-2-codex.md",
-    "gpt-5.2": "prompts/prompt-codex-gpt-5-2.md",
-}
-
 # Prompt for antigravity protocol - used exactly as-is without any additions.
 ANTIGRAVITY_PROMPT_PATH = "prompts/prompt-antigravity.md"
 
@@ -73,20 +65,6 @@ Only the content passed to `report_back` will be returned to user.\
 """
 
 
-SUB_AGENT_COMMON_PROMPT_FOR_MAIN_AGENT = """\
-
-# Sub-agent capabilities
-You have sub-agents (e.g. Task, Explore, WebAgent, ImageGen) with structured output and resume capabilites:
-- Agents can be provided with an `output_format` (JSON Schema) parameter for structured output
--   Example: `output_format={"type": "object", "properties": {"files": {"type": "array", "items": {"type": "string"}, "description": "List of file paths that match the search criteria, e.g. ['src/main.py', 'src/utils/helper.py']"}}, "required": ["files"]}`
-- Agents can be resumed using the `resume` parameter by passing the agent ID from a previous invocation. \
-When resumed, the agent continues with its full previous context preserved. \
-When NOT resuming, each invocation starts fresh and you should provide a detailed task description with all necessary context.
-- When the agent is done, it will return a single message back to you along with its agent ID. \
-You can use this ID to resume the agent later if needed for follow-up work.
-"""
-
-
 @cache
 def _load_prompt_by_path(prompt_path: str) -> str:
     """Load and cache prompt content from a file path relative to core package."""
@@ -144,19 +122,6 @@ def _build_env_info(model_name: str) -> str:
     return "\n".join(env_lines)
 
 
-def _has_sub_agents(config: Config | None) -> bool:
-    """Check if there are any sub-agent tools available for the main agent."""
-    if config is not None:
-        from klaude_code.config.sub_agent_model_helper import SubAgentModelHelper
-
-        helper = SubAgentModelHelper(config)
-        return bool(helper.get_enabled_sub_agent_tool_names())
-
-    from klaude_code.protocol.sub_agent import sub_agent_tool_names
-
-    return bool(sub_agent_tool_names(enabled_only=True))
-
-
 def load_system_prompt(
     model_name: str,
     protocol: llm_param.LLMClientProtocol,
@@ -165,12 +130,11 @@ def load_system_prompt(
 ) -> str:
     """Get system prompt content for the given model and sub-agent type."""
 
-    # For codex_oauth protocol, use exact prompts without any additions.
+    # For codex_oauth protocol, use dynamic prompts from GitHub (no additions).
     if protocol == llm_param.LLMClientProtocol.CODEX_OAUTH:
-        for model_key, prompt_path in CODEX_OAUTH_PROMPTS.items():
-            if model_key in model_name:
-                return _load_prompt_by_path(prompt_path)
-        raise CodexUnsupportedModelError(f"codex_oauth protocol does not support model: {model_name}")
+        from klaude_code.llm.openai_codex.prompt_sync import get_codex_instructions
+
+        return get_codex_instructions(model_name)
 
     # For antigravity protocol, use exact prompt without any additions.
     if protocol == llm_param.LLMClientProtocol.ANTIGRAVITY:
@@ -183,18 +147,13 @@ def load_system_prompt(
         base_prompt = _load_prompt_by_model(model_name)
 
     skills_prompt = ""
-    sub_agent_prompt = ""
     if sub_agent_type is None:
         # Skills are progressive-disclosure: keep only metadata in the system prompt.
         from klaude_code.skill.manager import format_available_skills_for_system_prompt
 
         skills_prompt = format_available_skills_for_system_prompt()
 
-        # Add sub-agent resume instructions if there are sub-agent tools available.
-        if _has_sub_agents(config):
-            sub_agent_prompt = "\n" + SUB_AGENT_COMMON_PROMPT_FOR_MAIN_AGENT
-
-    return base_prompt + _build_env_info(model_name) + skills_prompt + sub_agent_prompt
+    return base_prompt + _build_env_info(model_name) + skills_prompt
 
 
 def load_agent_tools(
@@ -217,21 +176,18 @@ def load_agent_tools(
     # Main agent tools
     if "gpt-5" in model_name:
         tool_names: list[str] = [tools.BASH, tools.READ, 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.append(tools.TASK)
     if config is not None:
         helper = SubAgentModelHelper(config)
-        tool_names.extend(helper.get_enabled_sub_agent_tool_names())
+        if helper.check_availability_requirement(AVAILABILITY_IMAGE_MODEL):
+            tool_names.append(tools.IMAGE_GEN)
     else:
-        from klaude_code.protocol.sub_agent import sub_agent_tool_names
-
-        tool_names.extend(sub_agent_tool_names(enabled_only=True))
+        tool_names.append(tools.IMAGE_GEN)
 
-    tool_names.extend([tools.MERMAID])
-    # tool_names.extend([tools.MEMORY])
+    tool_names.append(tools.MERMAID)
     return get_tool_schemas(tool_names)
 
 
@@ -258,7 +214,6 @@ def load_agent_reminders(
             memory_reminder,
             at_file_reader_reminder,
             last_path_memory_reminder,
-            file_changed_externally_reminder,
             image_reminder,
             skill_reminder,
         ]

klaude_code/core/compaction/overflow.py

@@ -24,7 +24,3 @@ def is_context_overflow(error_message: str | None) -> bool:
     if _STATUS_CODE_PATTERN.search(error_message):
         return True
     return any(pattern.search(error_message) for pattern in _OVERFLOW_PATTERNS)
-
-
-def get_overflow_patterns() -> list[re.Pattern[str]]:
-    return list(_OVERFLOW_PATTERNS)