mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-05-21 15:36:48 +00:00
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>
162 lines
6.1 KiB
Python
162 lines
6.1 KiB
Python
"""Subagent registry for managing available subagents."""
|
|
|
|
import logging
|
|
from dataclasses import replace
|
|
|
|
from deerflow.sandbox.security import is_host_bash_allowed
|
|
from deerflow.subagents.builtins import BUILTIN_SUBAGENTS
|
|
from deerflow.subagents.config import SubagentConfig
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def _build_custom_subagent_config(name: str) -> SubagentConfig | None:
|
|
"""Build a SubagentConfig from config.yaml custom_agents section.
|
|
|
|
Args:
|
|
name: The name of the custom subagent.
|
|
|
|
Returns:
|
|
SubagentConfig if found in custom_agents, None otherwise.
|
|
"""
|
|
from deerflow.config.subagents_config import get_subagents_app_config
|
|
|
|
app_config = get_subagents_app_config()
|
|
custom = app_config.custom_agents.get(name)
|
|
if custom is None:
|
|
return None
|
|
|
|
return SubagentConfig(
|
|
name=name,
|
|
description=custom.description,
|
|
system_prompt=custom.system_prompt,
|
|
tools=custom.tools,
|
|
disallowed_tools=custom.disallowed_tools,
|
|
skills=custom.skills,
|
|
model=custom.model,
|
|
max_turns=custom.max_turns,
|
|
timeout_seconds=custom.timeout_seconds,
|
|
)
|
|
|
|
|
|
def get_subagent_config(name: str) -> SubagentConfig | None:
|
|
"""Get a subagent configuration by name, with config.yaml overrides applied.
|
|
|
|
Resolution order (mirrors Codex's config layering):
|
|
1. Built-in subagents (general-purpose, bash)
|
|
2. Custom subagents from config.yaml custom_agents section
|
|
3. Per-agent overrides from config.yaml agents section (timeout, max_turns, model, skills)
|
|
|
|
Args:
|
|
name: The name of the subagent.
|
|
|
|
Returns:
|
|
SubagentConfig if found (with any config.yaml overrides applied), None otherwise.
|
|
"""
|
|
# Step 1: Look up built-in, then fall back to custom_agents
|
|
config = BUILTIN_SUBAGENTS.get(name)
|
|
if config is None:
|
|
config = _build_custom_subagent_config(name)
|
|
if config is None:
|
|
return None
|
|
|
|
# Step 2: Apply per-agent overrides from config.yaml agents section.
|
|
# Only explicit per-agent overrides are applied here. Global defaults
|
|
# (timeout_seconds, max_turns at the top level) apply to built-in agents
|
|
# but must NOT override custom agents' own values — custom agents define
|
|
# their own defaults in the custom_agents section.
|
|
# Lazy import to avoid circular deps.
|
|
from deerflow.config.subagents_config import get_subagents_app_config
|
|
|
|
app_config = get_subagents_app_config()
|
|
is_builtin = name in BUILTIN_SUBAGENTS
|
|
agent_override = app_config.agents.get(name)
|
|
|
|
overrides = {}
|
|
|
|
# Timeout: per-agent override > global default (builtins only) > config's own value
|
|
if agent_override is not None and agent_override.timeout_seconds is not None:
|
|
if agent_override.timeout_seconds != config.timeout_seconds:
|
|
logger.debug("Subagent '%s': timeout overridden (%ss -> %ss)", name, config.timeout_seconds, agent_override.timeout_seconds)
|
|
overrides["timeout_seconds"] = agent_override.timeout_seconds
|
|
elif is_builtin and app_config.timeout_seconds != config.timeout_seconds:
|
|
logger.debug("Subagent '%s': timeout from global default (%ss -> %ss)", name, config.timeout_seconds, app_config.timeout_seconds)
|
|
overrides["timeout_seconds"] = app_config.timeout_seconds
|
|
|
|
# Max turns: per-agent override > global default (builtins only) > config's own value
|
|
if agent_override is not None and agent_override.max_turns is not None:
|
|
if agent_override.max_turns != config.max_turns:
|
|
logger.debug("Subagent '%s': max_turns overridden (%s -> %s)", name, config.max_turns, agent_override.max_turns)
|
|
overrides["max_turns"] = agent_override.max_turns
|
|
elif is_builtin and app_config.max_turns is not None and app_config.max_turns != config.max_turns:
|
|
logger.debug("Subagent '%s': max_turns from global default (%s -> %s)", name, config.max_turns, app_config.max_turns)
|
|
overrides["max_turns"] = app_config.max_turns
|
|
|
|
# Model: per-agent override only (no global default for model)
|
|
effective_model = app_config.get_model_for(name)
|
|
if effective_model is not None and effective_model != config.model:
|
|
logger.debug("Subagent '%s': model overridden (%s -> %s)", name, config.model, effective_model)
|
|
overrides["model"] = effective_model
|
|
|
|
# Skills: per-agent override only (no global default for skills)
|
|
effective_skills = app_config.get_skills_for(name)
|
|
if effective_skills is not None and effective_skills != config.skills:
|
|
logger.debug("Subagent '%s': skills overridden (%s -> %s)", name, config.skills, effective_skills)
|
|
overrides["skills"] = effective_skills
|
|
|
|
if overrides:
|
|
config = replace(config, **overrides)
|
|
|
|
return config
|
|
|
|
|
|
def list_subagents() -> list[SubagentConfig]:
|
|
"""List all available subagent configurations (with config.yaml overrides applied).
|
|
|
|
Returns:
|
|
List of all registered SubagentConfig instances (built-in + custom).
|
|
"""
|
|
configs = []
|
|
for name in get_subagent_names():
|
|
config = get_subagent_config(name)
|
|
if config is not None:
|
|
configs.append(config)
|
|
return configs
|
|
|
|
|
|
def get_subagent_names() -> list[str]:
|
|
"""Get all available subagent names (built-in + custom).
|
|
|
|
Returns:
|
|
List of subagent names.
|
|
"""
|
|
names = list(BUILTIN_SUBAGENTS.keys())
|
|
|
|
# Merge custom_agents from config.yaml
|
|
from deerflow.config.subagents_config import get_subagents_app_config
|
|
|
|
app_config = get_subagents_app_config()
|
|
for custom_name in app_config.custom_agents:
|
|
if custom_name not in names:
|
|
names.append(custom_name)
|
|
|
|
return names
|
|
|
|
|
|
def get_available_subagent_names() -> list[str]:
|
|
"""Get subagent names that should be exposed to the active runtime.
|
|
|
|
Returns:
|
|
List of subagent names visible to the current sandbox configuration.
|
|
"""
|
|
names = get_subagent_names()
|
|
try:
|
|
host_bash_allowed = is_host_bash_allowed()
|
|
except Exception:
|
|
logger.debug("Could not determine host bash availability; exposing all subagents")
|
|
return names
|
|
|
|
if not host_bash_allowed:
|
|
names = [name for name in names if name != "bash"]
|
|
return names
|