30d619de08
* feat(subagents): support per-subagent skill loading and custom subagent types (#2230) Add per-subagent skill configuration and custom subagent type registration, aligned with Codex's role-based config layering and per-session skill injection. Backend: - SubagentConfig gains `skills` field (None=all, []=none, list=whitelist) - New CustomSubagentConfig for user-defined subagent types in config.yaml - SubagentsAppConfig gains `custom_agents` section and `get_skills_for()` - Registry resolves custom agents with three-layer config precedence - SubagentExecutor loads skills per-session as conversation items (Codex pattern) - task_tool no longer appends skills to system_prompt - Lead agent system prompt dynamically lists all registered subagent types - setup_agent tool accepts optional skills parameter - Gateway agents API transparently passes skills in CRUD operations Frontend: - Agent/CreateAgentRequest/UpdateAgentRequest types include skills field - Agent card displays skills as badges alongside tool_groups Config: - config.example.yaml documents custom_agents and per-agent skills override Tests: - 40 new tests covering all skill config, custom agents, and registry logic - Existing tests updated for new get_skills_prompt_section signature Closes #2230 * fix: address review feedback on skills PR - Remove stale get_skills_prompt_section monkeypatches from test_task_tool_core_logic.py (task_tool no longer imports this function after skill injection moved to executor) - Add key prefixes (tg:/sk:) to agent-card badges to prevent React key collisions between tool_groups and skills * fix(ci): resolve lint and test failures - Format agent-card.tsx with prettier (lint-frontend) - Remove stale "Skills Appendix" system_prompt assertion — skills are now loaded per-session by SubagentExecutor, not appended to system_prompt * fix(ci): sort imports in test_subagent_skills_config.py (ruff I001) * fix(ci): use nullish coalescing in agent-card badge condition (eslint) * fix: address review feedback on skills PR - Use model_fields_set in AgentUpdateRequest to distinguish "field omitted" from "explicitly set to null" — fixes skills=None ambiguity where None means "inherit all" but was treated as "don't change" - Move lazy import of get_subagent_config outside loop in _build_available_subagents_description to avoid repeated import overhead --------- Co-authored-by: Willem Jiang <willem.jiang@gmail.com>
188 lines
6.3 KiB
Python
188 lines
6.3 KiB
Python
"""Configuration for the subagent system loaded from config.yaml."""
|
|
|
|
import logging
|
|
|
|
from pydantic import BaseModel, Field
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class SubagentOverrideConfig(BaseModel):
|
|
"""Per-agent configuration overrides."""
|
|
|
|
timeout_seconds: int | None = Field(
|
|
default=None,
|
|
ge=1,
|
|
description="Timeout in seconds for this subagent (None = use global default)",
|
|
)
|
|
max_turns: int | None = Field(
|
|
default=None,
|
|
ge=1,
|
|
description="Maximum turns for this subagent (None = use global or builtin default)",
|
|
)
|
|
model: str | None = Field(
|
|
default=None,
|
|
min_length=1,
|
|
description="Model name for this subagent (None = inherit from parent agent)",
|
|
)
|
|
skills: list[str] | None = Field(
|
|
default=None,
|
|
description="Skill names whitelist for this subagent (None = inherit all enabled skills, [] = no skills)",
|
|
)
|
|
|
|
|
|
class CustomSubagentConfig(BaseModel):
|
|
"""User-defined subagent type declared in config.yaml."""
|
|
|
|
description: str = Field(
|
|
description="When the lead agent should delegate to this subagent",
|
|
)
|
|
system_prompt: str = Field(
|
|
description="System prompt that guides the subagent's behavior",
|
|
)
|
|
tools: list[str] | None = Field(
|
|
default=None,
|
|
description="Tool names whitelist (None = inherit all tools from parent)",
|
|
)
|
|
disallowed_tools: list[str] | None = Field(
|
|
default_factory=lambda: ["task", "ask_clarification", "present_files"],
|
|
description="Tool names to deny",
|
|
)
|
|
skills: list[str] | None = Field(
|
|
default=None,
|
|
description="Skill names whitelist (None = inherit all enabled skills, [] = no skills)",
|
|
)
|
|
model: str = Field(
|
|
default="inherit",
|
|
description="Model to use - 'inherit' uses parent's model",
|
|
)
|
|
max_turns: int = Field(
|
|
default=50,
|
|
ge=1,
|
|
description="Maximum number of agent turns before stopping",
|
|
)
|
|
timeout_seconds: int = Field(
|
|
default=900,
|
|
ge=1,
|
|
description="Maximum execution time in seconds",
|
|
)
|
|
|
|
|
|
class SubagentsAppConfig(BaseModel):
|
|
"""Configuration for the subagent system."""
|
|
|
|
timeout_seconds: int = Field(
|
|
default=900,
|
|
ge=1,
|
|
description="Default timeout in seconds for all subagents (default: 900 = 15 minutes)",
|
|
)
|
|
max_turns: int | None = Field(
|
|
default=None,
|
|
ge=1,
|
|
description="Optional default max-turn override for all subagents (None = keep builtin defaults)",
|
|
)
|
|
agents: dict[str, SubagentOverrideConfig] = Field(
|
|
default_factory=dict,
|
|
description="Per-agent configuration overrides keyed by agent name",
|
|
)
|
|
custom_agents: dict[str, CustomSubagentConfig] = Field(
|
|
default_factory=dict,
|
|
description="User-defined subagent types keyed by agent name",
|
|
)
|
|
|
|
def get_timeout_for(self, agent_name: str) -> int:
|
|
"""Get the effective timeout for a specific agent.
|
|
|
|
Args:
|
|
agent_name: The name of the subagent.
|
|
|
|
Returns:
|
|
The timeout in seconds, using per-agent override if set, otherwise global default.
|
|
"""
|
|
override = self.agents.get(agent_name)
|
|
if override is not None and override.timeout_seconds is not None:
|
|
return override.timeout_seconds
|
|
return self.timeout_seconds
|
|
|
|
def get_model_for(self, agent_name: str) -> str | None:
|
|
"""Get the model override for a specific agent.
|
|
|
|
Args:
|
|
agent_name: The name of the subagent.
|
|
|
|
Returns:
|
|
Model name if overridden, None otherwise (subagent will inherit parent model).
|
|
"""
|
|
override = self.agents.get(agent_name)
|
|
if override is not None and override.model is not None:
|
|
return override.model
|
|
return None
|
|
|
|
def get_max_turns_for(self, agent_name: str, builtin_default: int) -> int:
|
|
"""Get the effective max_turns for a specific agent."""
|
|
override = self.agents.get(agent_name)
|
|
if override is not None and override.max_turns is not None:
|
|
return override.max_turns
|
|
if self.max_turns is not None:
|
|
return self.max_turns
|
|
return builtin_default
|
|
|
|
def get_skills_for(self, agent_name: str) -> list[str] | None:
|
|
"""Get the skills override for a specific agent.
|
|
|
|
Args:
|
|
agent_name: The name of the subagent.
|
|
|
|
Returns:
|
|
Skill names whitelist if overridden, None otherwise (subagent will inherit all enabled skills).
|
|
"""
|
|
override = self.agents.get(agent_name)
|
|
if override is not None and override.skills is not None:
|
|
return override.skills
|
|
return None
|
|
|
|
|
|
_subagents_config: SubagentsAppConfig = SubagentsAppConfig()
|
|
|
|
|
|
def get_subagents_app_config() -> SubagentsAppConfig:
|
|
"""Get the current subagents configuration."""
|
|
return _subagents_config
|
|
|
|
|
|
def load_subagents_config_from_dict(config_dict: dict) -> None:
|
|
"""Load subagents configuration from a dictionary."""
|
|
global _subagents_config
|
|
_subagents_config = SubagentsAppConfig(**config_dict)
|
|
|
|
overrides_summary = {}
|
|
for name, override in _subagents_config.agents.items():
|
|
parts = []
|
|
if override.timeout_seconds is not None:
|
|
parts.append(f"timeout={override.timeout_seconds}s")
|
|
if override.max_turns is not None:
|
|
parts.append(f"max_turns={override.max_turns}")
|
|
if override.model is not None:
|
|
parts.append(f"model={override.model}")
|
|
if override.skills is not None:
|
|
parts.append(f"skills={override.skills}")
|
|
if parts:
|
|
overrides_summary[name] = ", ".join(parts)
|
|
|
|
custom_agents_names = list(_subagents_config.custom_agents.keys())
|
|
|
|
if overrides_summary or custom_agents_names:
|
|
logger.info(
|
|
"Subagents config loaded: default timeout=%ss, default max_turns=%s, per-agent overrides=%s, custom_agents=%s",
|
|
_subagents_config.timeout_seconds,
|
|
_subagents_config.max_turns,
|
|
overrides_summary or "none",
|
|
custom_agents_names or "none",
|
|
)
|
|
else:
|
|
logger.info(
|
|
"Subagents config loaded: default timeout=%ss, default max_turns=%s, no per-agent overrides",
|
|
_subagents_config.timeout_seconds,
|
|
_subagents_config.max_turns,
|
|
)
|