diff --git a/backend/app/gateway/routers/agents.py b/backend/app/gateway/routers/agents.py
index 92002d75b..ff4476893 100644
--- a/backend/app/gateway/routers/agents.py
+++ b/backend/app/gateway/routers/agents.py
@@ -25,6 +25,7 @@ class AgentResponse(BaseModel):
     description: str = Field(default="", description="Agent description")
     model: str | None = Field(default=None, description="Optional model override")
     tool_groups: list[str] | None = Field(default=None, description="Optional tool group whitelist")
+    skills: list[str] | None = Field(default=None, description="Optional skill whitelist (None=all, []=none)")
     soul: str | None = Field(default=None, description="SOUL.md content")
 
 
@@ -41,6 +42,7 @@ class AgentCreateRequest(BaseModel):
     description: str = Field(default="", description="Agent description")
     model: str | None = Field(default=None, description="Optional model override")
     tool_groups: list[str] | None = Field(default=None, description="Optional tool group whitelist")
+    skills: list[str] | None = Field(default=None, description="Optional skill whitelist (None=all enabled, []=none)")
     soul: str = Field(default="", description="SOUL.md content — agent personality and behavioral guardrails")
 
 
@@ -50,6 +52,7 @@ class AgentUpdateRequest(BaseModel):
     description: str | None = Field(default=None, description="Updated description")
     model: str | None = Field(default=None, description="Updated model override")
     tool_groups: list[str] | None = Field(default=None, description="Updated tool group whitelist")
+    skills: list[str] | None = Field(default=None, description="Updated skill whitelist (None=all, []=none)")
     soul: str | None = Field(default=None, description="Updated SOUL.md content")
 
 
@@ -94,6 +97,7 @@ def _agent_config_to_response(agent_cfg: AgentConfig, include_soul: bool = False
         description=agent_cfg.description,
         model=agent_cfg.model,
         tool_groups=agent_cfg.tool_groups,
+        skills=agent_cfg.skills,
         soul=soul,
     )
 
@@ -215,6 +219,8 @@ async def create_agent_endpoint(request: AgentCreateRequest) -> AgentResponse:
             config_data["model"] = request.model
         if request.tool_groups is not None:
             config_data["tool_groups"] = request.tool_groups
+        if request.skills is not None:
+            config_data["skills"] = request.skills
 
         config_file = agent_dir / "config.yaml"
         with open(config_file, "w", encoding="utf-8") as f:
@@ -271,21 +277,32 @@ async def update_agent(name: str, request: AgentUpdateRequest) -> AgentResponse:
 
     try:
         # Update config if any config fields changed
-        config_changed = any(v is not None for v in [request.description, request.model, request.tool_groups])
+        # Use model_fields_set to distinguish "field omitted" from "explicitly set to null".
+        # This is critical for skills where None means "inherit all" (not "don't change").
+        fields_set = request.model_fields_set
+        config_changed = bool(fields_set & {"description", "model", "tool_groups", "skills"})
 
         if config_changed:
             updated: dict = {
                 "name": agent_cfg.name,
-                "description": request.description if request.description is not None else agent_cfg.description,
+                "description": request.description if "description" in fields_set else agent_cfg.description,
             }
-            new_model = request.model if request.model is not None else agent_cfg.model
+            new_model = request.model if "model" in fields_set else agent_cfg.model
             if new_model is not None:
                 updated["model"] = new_model
 
-            new_tool_groups = request.tool_groups if request.tool_groups is not None else agent_cfg.tool_groups
+            new_tool_groups = request.tool_groups if "tool_groups" in fields_set else agent_cfg.tool_groups
             if new_tool_groups is not None:
                 updated["tool_groups"] = new_tool_groups
 
+            # skills: None = inherit all, [] = no skills, ["a","b"] = whitelist
+            if "skills" in fields_set:
+                new_skills = request.skills
+            else:
+                new_skills = agent_cfg.skills
+            if new_skills is not None:
+                updated["skills"] = new_skills
+
             config_file = agent_dir / "config.yaml"
             with open(config_file, "w", encoding="utf-8") as f:
                 yaml.dump(updated, f, default_flow_style=False, allow_unicode=True)
diff --git a/backend/packages/harness/deerflow/agents/lead_agent/prompt.py b/backend/packages/harness/deerflow/agents/lead_agent/prompt.py
index dda49a1de..2ccacac68 100644
--- a/backend/packages/harness/deerflow/agents/lead_agent/prompt.py
+++ b/backend/packages/harness/deerflow/agents/lead_agent/prompt.py
@@ -164,6 +164,36 @@ Skip simple one-off tasks.
 """
 
 
+def _build_available_subagents_description(available_names: list[str], bash_available: bool) -> str:
+    """Dynamically build subagent type descriptions from registry.
+
+    Mirrors Codex's pattern where agent_type_description is dynamically generated
+    from all registered roles, so the LLM knows about every available type.
+    """
+    # Built-in descriptions (kept for backward compatibility with existing prompt quality)
+    builtin_descriptions = {
+        "general-purpose": "For ANY non-trivial task - web research, code exploration, file operations, analysis, etc.",
+        "bash": (
+            "For command execution (git, build, test, deploy operations)" if bash_available else "Not available in the current sandbox configuration. Use direct file/web tools or switch to AioSandboxProvider for isolated shell access."
+        ),
+    }
+
+    # Lazy import moved outside loop to avoid repeated import overhead
+    from deerflow.subagents.registry import get_subagent_config
+
+    lines = []
+    for name in available_names:
+        if name in builtin_descriptions:
+            lines.append(f"- **{name}**: {builtin_descriptions[name]}")
+        else:
+            config = get_subagent_config(name)
+            if config is not None:
+                desc = config.description.split("\n")[0].strip()  # First line only for brevity
+                lines.append(f"- **{name}**: {desc}")
+
+    return "\n".join(lines)
+
+
 def _build_subagent_section(max_concurrent: int) -> str:
     """Build the subagent system prompt section with dynamic concurrency limit.
 
@@ -174,13 +204,12 @@ def _build_subagent_section(max_concurrent: int) -> str:
         Formatted subagent section string.
     """
     n = max_concurrent
-    bash_available = "bash" in get_available_subagent_names()
-    available_subagents = (
-        "- **general-purpose**: For ANY non-trivial task - web research, code exploration, file operations, analysis, etc.\n- **bash**: For command execution (git, build, test, deploy operations)"
-        if bash_available
-        else "- **general-purpose**: For ANY non-trivial task - web research, code exploration, file operations, analysis, etc.\n"
-        "- **bash**: Not available in the current sandbox configuration. Use direct file/web tools or switch to AioSandboxProvider for isolated shell access."
-    )
+    available_names = get_available_subagent_names()
+    bash_available = "bash" in available_names
+
+    # Dynamically build subagent type descriptions from registry (aligned with Codex's
+    # agent_type_description pattern where all registered roles are listed in the tool spec).
+    available_subagents = _build_available_subagents_description(available_names, bash_available)
     direct_tool_examples = "bash, ls, read_file, web_search, etc." if bash_available else "ls, read_file, web_search, etc."
     direct_execution_example = (
         '# User asks: "Run the tests"\n# Thinking: Cannot decompose into parallel sub-tasks\n# → Execute directly\n\nbash("npm test")  # Direct execution, not task()'
diff --git a/backend/packages/harness/deerflow/config/subagents_config.py b/backend/packages/harness/deerflow/config/subagents_config.py
index b5f885d5a..e7219284d 100644
--- a/backend/packages/harness/deerflow/config/subagents_config.py
+++ b/backend/packages/harness/deerflow/config/subagents_config.py
@@ -25,6 +25,47 @@ class SubagentOverrideConfig(BaseModel):
         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):
@@ -44,6 +85,10 @@ class SubagentsAppConfig(BaseModel):
         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.
@@ -82,6 +127,20 @@ class SubagentsAppConfig(BaseModel):
             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()
 
@@ -105,15 +164,20 @@ def load_subagents_config_from_dict(config_dict: dict) -> 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)
 
-    if overrides_summary:
+    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",
+            "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,
+            overrides_summary or "none",
+            custom_agents_names or "none",
         )
     else:
         logger.info(
diff --git a/backend/packages/harness/deerflow/subagents/config.py b/backend/packages/harness/deerflow/subagents/config.py
index 8554e7d4d..a2c961b9d 100644
--- a/backend/packages/harness/deerflow/subagents/config.py
+++ b/backend/packages/harness/deerflow/subagents/config.py
@@ -13,6 +13,8 @@ class SubagentConfig:
         system_prompt: The system prompt that guides the subagent's behavior.
         tools: Optional list of tool names to allow. If None, inherits all tools.
         disallowed_tools: Optional list of tool names to deny.
+        skills: Optional list of skill names to load. If None, inherits all enabled skills.
+                If an empty list, no skills are loaded.
         model: Model to use - 'inherit' uses parent's model.
         max_turns: Maximum number of agent turns before stopping.
         timeout_seconds: Maximum execution time in seconds (default: 900 = 15 minutes).
@@ -23,6 +25,7 @@ class SubagentConfig:
     system_prompt: str
     tools: list[str] | None = None
     disallowed_tools: list[str] | None = field(default_factory=lambda: ["task"])
+    skills: list[str] | None = None
     model: str = "inherit"
     max_turns: int = 50
     timeout_seconds: int = 900
diff --git a/backend/packages/harness/deerflow/subagents/executor.py b/backend/packages/harness/deerflow/subagents/executor.py
index 5529bec2c..b42cebacf 100644
--- a/backend/packages/harness/deerflow/subagents/executor.py
+++ b/backend/packages/harness/deerflow/subagents/executor.py
@@ -13,7 +13,7 @@ from typing import Any
 
 from langchain.agents import create_agent
 from langchain.tools import BaseTool
-from langchain_core.messages import AIMessage, HumanMessage
+from langchain_core.messages import AIMessage, HumanMessage, SystemMessage
 from langchain_core.runnables import RunnableConfig
 
 from deerflow.agents.thread_state import SandboxState, ThreadDataState, ThreadState
@@ -184,7 +184,63 @@ class SubagentExecutor:
             state_schema=ThreadState,
         )
 
-    def _build_initial_state(self, task: str) -> dict[str, Any]:
+    async def _load_skill_messages(self) -> list[SystemMessage]:
+        """Load skill content as conversation items based on config.skills.
+
+        Aligned with Codex's pattern: each subagent loads its own skills
+        per-session and injects them as conversation items (developer messages),
+        not as system prompt text. The config.skills whitelist controls which
+        skills are loaded:
+        - None: load all enabled skills
+        - []: no skills
+        - ["skill-a", "skill-b"]: only these skills
+
+        Returns:
+            List of SystemMessages containing skill content.
+        """
+        if self.config.skills is not None and len(self.config.skills) == 0:
+            logger.info(f"[trace={self.trace_id}] Subagent {self.config.name} skills=[] — skipping skill loading")
+            return []
+
+        try:
+            from deerflow.skills.loader import load_skills
+
+            # Use asyncio.to_thread to avoid blocking the event loop (LangGraph ASGI requirement)
+            all_skills = await asyncio.to_thread(load_skills, enabled_only=True)
+            logger.info(f"[trace={self.trace_id}] Subagent {self.config.name} loaded {len(all_skills)} enabled skills from disk")
+        except Exception:
+            logger.warning(f"[trace={self.trace_id}] Failed to load skills for subagent {self.config.name}", exc_info=True)
+            return []
+
+        if not all_skills:
+            logger.info(f"[trace={self.trace_id}] Subagent {self.config.name} no enabled skills found")
+            return []
+
+        # Filter by config.skills whitelist
+        if self.config.skills is not None:
+            allowed = set(self.config.skills)
+            skills = [s for s in all_skills if s.name in allowed]
+        else:
+            skills = all_skills
+
+        if not skills:
+            return []
+
+        # Read each skill's SKILL.md content and create conversation items
+        messages = []
+        for skill in skills:
+            try:
+                content = await asyncio.to_thread(skill.skill_file.read_text, encoding="utf-8")
+                content = content.strip()
+                if content:
+                    messages.append(SystemMessage(content=f'<skill name="{skill.name}">\n{content}\n</skill>'))
+                    logger.info(f"[trace={self.trace_id}] Subagent {self.config.name} loaded skill: {skill.name}")
+            except Exception:
+                logger.debug(f"[trace={self.trace_id}] Failed to read skill {skill.name}", exc_info=True)
+
+        return messages
+
+    async def _build_initial_state(self, task: str) -> dict[str, Any]:
         """Build the initial state for agent execution.
 
         Args:
@@ -193,8 +249,17 @@ class SubagentExecutor:
         Returns:
             Initial state dictionary.
         """
+        # Load skills as conversation items (Codex pattern)
+        skill_messages = await self._load_skill_messages()
+
+        messages: list = []
+        # Skill content injected as developer/system messages before the task
+        messages.extend(skill_messages)
+        # Then the actual task
+        messages.append(HumanMessage(content=task))
+
         state: dict[str, Any] = {
-            "messages": [HumanMessage(content=task)],
+            "messages": messages,
         }
 
         # Pass through sandbox and thread data from parent
@@ -230,7 +295,7 @@ class SubagentExecutor:
 
         try:
             agent = self._create_agent()
-            state = self._build_initial_state(task)
+            state = await self._build_initial_state(task)
 
             # Build config with thread_id for sandbox access and recursion limit
             run_config: RunnableConfig = {
diff --git a/backend/packages/harness/deerflow/subagents/registry.py b/backend/packages/harness/deerflow/subagents/registry.py
index e54f69f76..b34d7e9bd 100644
--- a/backend/packages/harness/deerflow/subagents/registry.py
+++ b/backend/packages/harness/deerflow/subagents/registry.py
@@ -10,53 +10,100 @@ 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
 
-    # Apply runtime overrides (timeout, max_turns, model) from config.yaml
+    # 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()
-    effective_timeout = app_config.get_timeout_for(name)
-    effective_max_turns = app_config.get_max_turns_for(name, config.max_turns)
+    is_builtin = name in BUILTIN_SUBAGENTS
+    agent_override = app_config.agents.get(name)
 
     overrides = {}
-    if effective_timeout != config.timeout_seconds:
-        logger.debug(
-            "Subagent '%s': timeout overridden by config.yaml (%ss -> %ss)",
-            name,
-            config.timeout_seconds,
-            effective_timeout,
-        )
-        overrides["timeout_seconds"] = effective_timeout
-    if effective_max_turns != config.max_turns:
-        logger.debug(
-            "Subagent '%s': max_turns overridden by config.yaml (%s -> %s)",
-            name,
-            config.max_turns,
-            effective_max_turns,
-        )
-        overrides["max_turns"] = effective_max_turns
+
+    # 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 by config.yaml (%s -> %s)",
-            name,
-            config.model,
-            effective_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)
 
@@ -67,18 +114,33 @@ def list_subagents() -> list[SubagentConfig]:
     """List all available subagent configurations (with config.yaml overrides applied).
 
     Returns:
-        List of all registered SubagentConfig instances.
+        List of all registered SubagentConfig instances (built-in + custom).
     """
-    return [get_subagent_config(name) for name in BUILTIN_SUBAGENTS]
+    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.
+    """Get all available subagent names (built-in + custom).
 
     Returns:
         List of subagent names.
     """
-    return list(BUILTIN_SUBAGENTS.keys())
+    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]:
@@ -87,11 +149,11 @@ def get_available_subagent_names() -> list[str]:
     Returns:
         List of subagent names visible to the current sandbox configuration.
     """
-    names = list(BUILTIN_SUBAGENTS.keys())
+    names = get_subagent_names()
     try:
         host_bash_allowed = is_host_bash_allowed()
     except Exception:
-        logger.debug("Could not determine host bash availability; exposing all built-in subagents")
+        logger.debug("Could not determine host bash availability; exposing all subagents")
         return names
 
     if not host_bash_allowed:
diff --git a/backend/packages/harness/deerflow/tools/builtins/setup_agent_tool.py b/backend/packages/harness/deerflow/tools/builtins/setup_agent_tool.py
index a42f8bbef..793ccb13a 100644
--- a/backend/packages/harness/deerflow/tools/builtins/setup_agent_tool.py
+++ b/backend/packages/harness/deerflow/tools/builtins/setup_agent_tool.py
@@ -17,12 +17,14 @@ def setup_agent(
     soul: str,
     description: str,
     runtime: ToolRuntime,
+    skills: list[str] | None = None,
 ) -> Command:
     """Setup the custom DeerFlow agent.
 
     Args:
         soul: Full SOUL.md content defining the agent's personality and behavior.
         description: One-line description of what the agent does.
+        skills: Optional list of skill names this agent should use. None means use all enabled skills, empty list means no skills.
     """
 
     agent_name: str | None = runtime.context.get("agent_name") if runtime.context else None
@@ -41,6 +43,8 @@ def setup_agent(
             config_data: dict = {"name": agent_name}
             if description:
                 config_data["description"] = description
+            if skills is not None:
+                config_data["skills"] = skills
 
             config_file = agent_dir / "config.yaml"
             with open(config_file, "w", encoding="utf-8") as f:
diff --git a/backend/packages/harness/deerflow/tools/builtins/task_tool.py b/backend/packages/harness/deerflow/tools/builtins/task_tool.py
index 437fb37ac..fbe41ded7 100644
--- a/backend/packages/harness/deerflow/tools/builtins/task_tool.py
+++ b/backend/packages/harness/deerflow/tools/builtins/task_tool.py
@@ -10,7 +10,6 @@ from langchain.tools import InjectedToolCallId, ToolRuntime, tool
 from langgraph.config import get_stream_writer
 from langgraph.typing import ContextT
 
-from deerflow.agents.lead_agent.prompt import get_skills_prompt_section
 from deerflow.agents.thread_state import ThreadState
 from deerflow.sandbox.security import LOCAL_BASH_SUBAGENT_DISABLED_MESSAGE, is_host_bash_allowed
 from deerflow.subagents import SubagentExecutor, get_available_subagent_names, get_subagent_config
@@ -35,7 +34,7 @@ async def task_tool(
     - Handle complex multi-step tasks autonomously
     - Execute commands or operations in isolated contexts
 
-    Available subagent types depend on the active sandbox configuration:
+    Built-in subagent types:
     - **general-purpose**: A capable agent for complex, multi-step tasks that require
       both exploration and action. Use when the task requires complex reasoning,
       multiple dependent steps, or would benefit from isolated context.
@@ -43,6 +42,11 @@ async def task_tool(
       available when host bash is explicitly allowed or when using an isolated shell
       sandbox such as `AioSandboxProvider`.
 
+    Additional custom subagent types may be defined in config.yaml under
+    `subagents.custom_agents`. Each custom type can have its own system prompt,
+    tools, skills, model, and timeout configuration. If an unknown subagent_type
+    is provided, the error message will list all available types.
+
     When to use this tool:
     - Complex tasks requiring multiple steps or tools
     - Tasks that produce verbose output
@@ -72,9 +76,9 @@ async def task_tool(
     # Build config overrides
     overrides: dict = {}
 
-    skills_section = get_skills_prompt_section()
-    if skills_section:
-        overrides["system_prompt"] = config.system_prompt + "\n\n" + skills_section
+    # Skills are loaded by SubagentExecutor per-session (aligned with Codex's pattern:
+    # each subagent loads its own skills based on config, injected as conversation items).
+    # No longer appended to system_prompt here.
 
     if max_turns is not None:
         overrides["max_turns"] = max_turns
diff --git a/backend/tests/test_subagent_prompt_security.py b/backend/tests/test_subagent_prompt_security.py
index d0e5a949f..015206877 100644
--- a/backend/tests/test_subagent_prompt_security.py
+++ b/backend/tests/test_subagent_prompt_security.py
@@ -25,7 +25,9 @@ def test_build_subagent_section_hides_bash_examples_when_unavailable(monkeypatch
 
     section = prompt_module._build_subagent_section(3)
 
-    assert "Not available in the current sandbox configuration" in section
+    # When bash is not available, it should not appear at all (aligned with Codex:
+    # unavailable roles are omitted, not listed as disabled)
+    assert "**bash**" not in section
     assert 'bash("npm test")' not in section
     assert 'read_file("/mnt/user-data/workspace/README.md")' in section
     assert "available tools (ls, read_file, web_search, etc.)" in section
diff --git a/backend/tests/test_subagent_skills_config.py b/backend/tests/test_subagent_skills_config.py
new file mode 100644
index 000000000..f121ccf25
--- /dev/null
+++ b/backend/tests/test_subagent_skills_config.py
@@ -0,0 +1,596 @@
+"""Tests for subagent per-agent skill configuration and custom subagent types.
+
+Covers:
+- SubagentConfig.skills field
+- SubagentOverrideConfig.skills field
+- CustomSubagentConfig model validation
+- SubagentsAppConfig.custom_agents and get_skills_for()
+- Registry: custom agent lookup, skills override, merged available names
+- Skills filter passthrough in task_tool config assembly
+"""
+
+import pytest
+
+from deerflow.config.subagents_config import (
+    CustomSubagentConfig,
+    SubagentOverrideConfig,
+    SubagentsAppConfig,
+    get_subagents_app_config,
+    load_subagents_config_from_dict,
+)
+from deerflow.subagents.config import SubagentConfig
+
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
+
+
+def _reset_subagents_config(**kwargs) -> None:
+    """Reset global subagents config to a known state."""
+    load_subagents_config_from_dict(kwargs)
+
+
+# ---------------------------------------------------------------------------
+# SubagentConfig.skills field
+# ---------------------------------------------------------------------------
+
+
+class TestSubagentConfigSkills:
+    def test_default_skills_is_none(self):
+        config = SubagentConfig(name="test", description="test", system_prompt="test")
+        assert config.skills is None
+
+    def test_skills_whitelist(self):
+        config = SubagentConfig(
+            name="test",
+            description="test",
+            system_prompt="test",
+            skills=["data-analysis", "visualization"],
+        )
+        assert config.skills == ["data-analysis", "visualization"]
+
+    def test_skills_empty_list_means_no_skills(self):
+        config = SubagentConfig(
+            name="test",
+            description="test",
+            system_prompt="test",
+            skills=[],
+        )
+        assert config.skills == []
+
+
+# ---------------------------------------------------------------------------
+# SubagentOverrideConfig.skills field
+# ---------------------------------------------------------------------------
+
+
+class TestSubagentOverrideConfigSkills:
+    def test_default_skills_is_none(self):
+        override = SubagentOverrideConfig()
+        assert override.skills is None
+
+    def test_skills_whitelist(self):
+        override = SubagentOverrideConfig(skills=["web-search", "data-analysis"])
+        assert override.skills == ["web-search", "data-analysis"]
+
+    def test_skills_empty_list(self):
+        override = SubagentOverrideConfig(skills=[])
+        assert override.skills == []
+
+    def test_skills_coexists_with_other_fields(self):
+        override = SubagentOverrideConfig(
+            timeout_seconds=300,
+            model="gpt-5",
+            skills=["my-skill"],
+        )
+        assert override.timeout_seconds == 300
+        assert override.model == "gpt-5"
+        assert override.skills == ["my-skill"]
+
+
+# ---------------------------------------------------------------------------
+# CustomSubagentConfig model
+# ---------------------------------------------------------------------------
+
+
+class TestCustomSubagentConfig:
+    def test_minimal_valid(self):
+        config = CustomSubagentConfig(
+            description="A test agent",
+            system_prompt="You are a test agent.",
+        )
+        assert config.description == "A test agent"
+        assert config.system_prompt == "You are a test agent."
+        assert config.tools is None
+        assert config.disallowed_tools == ["task", "ask_clarification", "present_files"]
+        assert config.skills is None
+        assert config.model == "inherit"
+        assert config.max_turns == 50
+        assert config.timeout_seconds == 900
+
+    def test_full_configuration(self):
+        config = CustomSubagentConfig(
+            description="Data analysis specialist",
+            system_prompt="You are a data analysis subagent.",
+            tools=["bash", "read_file", "write_file"],
+            disallowed_tools=["task"],
+            skills=["data-analysis", "visualization"],
+            model="qwen3:32b",
+            max_turns=80,
+            timeout_seconds=600,
+        )
+        assert config.tools == ["bash", "read_file", "write_file"]
+        assert config.skills == ["data-analysis", "visualization"]
+        assert config.model == "qwen3:32b"
+        assert config.max_turns == 80
+        assert config.timeout_seconds == 600
+
+    def test_skills_empty_list_no_skills(self):
+        config = CustomSubagentConfig(
+            description="test",
+            system_prompt="test",
+            skills=[],
+        )
+        assert config.skills == []
+
+    def test_rejects_zero_max_turns(self):
+        with pytest.raises(ValueError):
+            CustomSubagentConfig(
+                description="test",
+                system_prompt="test",
+                max_turns=0,
+            )
+
+    def test_rejects_zero_timeout(self):
+        with pytest.raises(ValueError):
+            CustomSubagentConfig(
+                description="test",
+                system_prompt="test",
+                timeout_seconds=0,
+            )
+
+
+# ---------------------------------------------------------------------------
+# SubagentsAppConfig.custom_agents and get_skills_for()
+# ---------------------------------------------------------------------------
+
+
+class TestSubagentsAppConfigCustomAgents:
+    def test_default_custom_agents_empty(self):
+        config = SubagentsAppConfig()
+        assert config.custom_agents == {}
+
+    def test_custom_agents_loaded(self):
+        config = SubagentsAppConfig(
+            custom_agents={
+                "analysis": CustomSubagentConfig(
+                    description="Analysis agent",
+                    system_prompt="You analyze data.",
+                    skills=["data-analysis"],
+                ),
+            }
+        )
+        assert "analysis" in config.custom_agents
+        assert config.custom_agents["analysis"].skills == ["data-analysis"]
+
+    def test_multiple_custom_agents(self):
+        config = SubagentsAppConfig(
+            custom_agents={
+                "analysis": CustomSubagentConfig(
+                    description="Analysis",
+                    system_prompt="analyze",
+                    skills=["data-analysis"],
+                ),
+                "researcher": CustomSubagentConfig(
+                    description="Research",
+                    system_prompt="research",
+                    skills=["web-search"],
+                ),
+            }
+        )
+        assert len(config.custom_agents) == 2
+
+
+class TestGetSkillsFor:
+    def test_returns_none_when_no_override(self):
+        config = SubagentsAppConfig()
+        assert config.get_skills_for("general-purpose") is None
+        assert config.get_skills_for("unknown") is None
+
+    def test_returns_skills_whitelist(self):
+        config = SubagentsAppConfig(
+            agents={
+                "general-purpose": SubagentOverrideConfig(skills=["web-search", "coding"]),
+            }
+        )
+        assert config.get_skills_for("general-purpose") == ["web-search", "coding"]
+
+    def test_returns_empty_list_for_no_skills(self):
+        config = SubagentsAppConfig(
+            agents={
+                "bash": SubagentOverrideConfig(skills=[]),
+            }
+        )
+        assert config.get_skills_for("bash") == []
+
+    def test_returns_none_for_unrelated_agent(self):
+        config = SubagentsAppConfig(
+            agents={
+                "bash": SubagentOverrideConfig(skills=["web-search"]),
+            }
+        )
+        assert config.get_skills_for("general-purpose") is None
+
+    def test_returns_none_when_skills_not_set(self):
+        config = SubagentsAppConfig(
+            agents={
+                "bash": SubagentOverrideConfig(timeout_seconds=300),
+            }
+        )
+        assert config.get_skills_for("bash") is None
+
+
+# ---------------------------------------------------------------------------
+# load_subagents_config_from_dict with skills and custom_agents
+# ---------------------------------------------------------------------------
+
+
+class TestLoadSubagentsConfigWithSkills:
+    def teardown_method(self):
+        _reset_subagents_config()
+
+    def test_load_with_skills_override(self):
+        load_subagents_config_from_dict(
+            {
+                "timeout_seconds": 900,
+                "agents": {
+                    "general-purpose": {"skills": ["web-search", "data-analysis"]},
+                },
+            }
+        )
+        cfg = get_subagents_app_config()
+        assert cfg.get_skills_for("general-purpose") == ["web-search", "data-analysis"]
+
+    def test_load_with_empty_skills(self):
+        load_subagents_config_from_dict(
+            {
+                "timeout_seconds": 900,
+                "agents": {
+                    "bash": {"skills": []},
+                },
+            }
+        )
+        cfg = get_subagents_app_config()
+        assert cfg.get_skills_for("bash") == []
+
+    def test_load_with_custom_agents(self):
+        load_subagents_config_from_dict(
+            {
+                "timeout_seconds": 900,
+                "custom_agents": {
+                    "analysis": {
+                        "description": "Data analysis specialist",
+                        "system_prompt": "You are a data analysis subagent.",
+                        "skills": ["data-analysis", "visualization"],
+                        "tools": ["bash", "read_file"],
+                        "max_turns": 80,
+                        "timeout_seconds": 600,
+                    },
+                },
+            }
+        )
+        cfg = get_subagents_app_config()
+        assert "analysis" in cfg.custom_agents
+        custom = cfg.custom_agents["analysis"]
+        assert custom.skills == ["data-analysis", "visualization"]
+        assert custom.tools == ["bash", "read_file"]
+        assert custom.max_turns == 80
+        assert custom.timeout_seconds == 600
+
+    def test_load_with_both_overrides_and_custom(self):
+        load_subagents_config_from_dict(
+            {
+                "timeout_seconds": 900,
+                "agents": {
+                    "general-purpose": {"skills": ["web-search"]},
+                },
+                "custom_agents": {
+                    "analysis": {
+                        "description": "Analysis",
+                        "system_prompt": "Analyze.",
+                        "skills": ["data-analysis"],
+                    },
+                },
+            }
+        )
+        cfg = get_subagents_app_config()
+        assert cfg.get_skills_for("general-purpose") == ["web-search"]
+        assert cfg.custom_agents["analysis"].skills == ["data-analysis"]
+
+
+# ---------------------------------------------------------------------------
+# Registry: custom agent lookup
+# ---------------------------------------------------------------------------
+
+
+class TestRegistryCustomAgentLookup:
+    def teardown_method(self):
+        _reset_subagents_config()
+
+    def test_custom_agent_found(self):
+        from deerflow.subagents.registry import get_subagent_config
+
+        load_subagents_config_from_dict(
+            {
+                "custom_agents": {
+                    "analysis": {
+                        "description": "Data analysis specialist",
+                        "system_prompt": "You are a data analysis subagent.",
+                        "skills": ["data-analysis"],
+                        "tools": ["bash", "read_file"],
+                        "max_turns": 80,
+                        "timeout_seconds": 600,
+                    },
+                },
+            }
+        )
+        config = get_subagent_config("analysis")
+        assert config is not None
+        assert config.name == "analysis"
+        assert config.skills == ["data-analysis"]
+        assert config.tools == ["bash", "read_file"]
+        assert config.max_turns == 80
+        assert config.timeout_seconds == 600
+        assert config.model == "inherit"
+
+    def test_custom_agent_not_found(self):
+        from deerflow.subagents.registry import get_subagent_config
+
+        _reset_subagents_config()
+        assert get_subagent_config("nonexistent") is None
+
+    def test_builtin_takes_priority_over_custom(self):
+        """If a custom agent has the same name as a builtin, builtin wins."""
+        from deerflow.subagents.builtins import BUILTIN_SUBAGENTS
+        from deerflow.subagents.registry import get_subagent_config
+
+        load_subagents_config_from_dict(
+            {
+                "custom_agents": {
+                    "general-purpose": {
+                        "description": "Custom override attempt",
+                        "system_prompt": "Should not be used",
+                    },
+                },
+            }
+        )
+        config = get_subagent_config("general-purpose")
+        # Should get the builtin description, not the custom one
+        assert config.description == BUILTIN_SUBAGENTS["general-purpose"].description
+
+    def test_custom_agent_with_override(self):
+        """Per-agent overrides also apply to custom agents."""
+        from deerflow.subagents.registry import get_subagent_config
+
+        load_subagents_config_from_dict(
+            {
+                "custom_agents": {
+                    "analysis": {
+                        "description": "Analysis",
+                        "system_prompt": "Analyze.",
+                        "timeout_seconds": 600,
+                    },
+                },
+                "agents": {
+                    "analysis": {"timeout_seconds": 300, "skills": ["overridden-skill"]},
+                },
+            }
+        )
+        config = get_subagent_config("analysis")
+        assert config is not None
+        assert config.timeout_seconds == 300  # Override applied
+        assert config.skills == ["overridden-skill"]  # Override applied
+
+
+# ---------------------------------------------------------------------------
+# Registry: skills override on builtin agents
+# ---------------------------------------------------------------------------
+
+
+class TestRegistrySkillsOverride:
+    def teardown_method(self):
+        _reset_subagents_config()
+
+    def test_skills_override_applied_to_builtin(self):
+        from deerflow.subagents.registry import get_subagent_config
+
+        load_subagents_config_from_dict(
+            {
+                "agents": {
+                    "general-purpose": {"skills": ["web-search", "data-analysis"]},
+                },
+            }
+        )
+        config = get_subagent_config("general-purpose")
+        assert config.skills == ["web-search", "data-analysis"]
+
+    def test_empty_skills_override(self):
+        from deerflow.subagents.registry import get_subagent_config
+
+        load_subagents_config_from_dict(
+            {
+                "agents": {
+                    "bash": {"skills": []},
+                },
+            }
+        )
+        config = get_subagent_config("bash")
+        assert config.skills == []
+
+    def test_no_skills_override_keeps_default(self):
+        from deerflow.subagents.registry import get_subagent_config
+
+        _reset_subagents_config()
+        config = get_subagent_config("general-purpose")
+        assert config.skills is None  # Default: inherit all
+
+    def test_skills_override_does_not_mutate_builtin(self):
+        from deerflow.subagents.builtins import BUILTIN_SUBAGENTS
+        from deerflow.subagents.registry import get_subagent_config
+
+        load_subagents_config_from_dict(
+            {
+                "agents": {
+                    "general-purpose": {"skills": ["web-search"]},
+                },
+            }
+        )
+        _ = get_subagent_config("general-purpose")
+        assert BUILTIN_SUBAGENTS["general-purpose"].skills is None
+
+
+# ---------------------------------------------------------------------------
+# Registry: get_available_subagent_names merges custom types
+# ---------------------------------------------------------------------------
+
+
+class TestRegistryAvailableNames:
+    def teardown_method(self):
+        _reset_subagents_config()
+
+    def test_includes_builtin_names(self):
+        from deerflow.subagents.registry import get_subagent_names
+
+        _reset_subagents_config()
+        names = get_subagent_names()
+        assert "general-purpose" in names
+        assert "bash" in names
+
+    def test_includes_custom_names(self):
+        from deerflow.subagents.registry import get_subagent_names
+
+        load_subagents_config_from_dict(
+            {
+                "custom_agents": {
+                    "analysis": {
+                        "description": "Analysis",
+                        "system_prompt": "Analyze.",
+                    },
+                    "researcher": {
+                        "description": "Research",
+                        "system_prompt": "Research.",
+                    },
+                },
+            }
+        )
+        names = get_subagent_names()
+        assert "general-purpose" in names
+        assert "bash" in names
+        assert "analysis" in names
+        assert "researcher" in names
+
+    def test_no_duplicates_when_custom_name_matches_builtin(self):
+        from deerflow.subagents.registry import get_subagent_names
+
+        load_subagents_config_from_dict(
+            {
+                "custom_agents": {
+                    "general-purpose": {
+                        "description": "Duplicate name",
+                        "system_prompt": "test",
+                    },
+                },
+            }
+        )
+        names = get_subagent_names()
+        assert names.count("general-purpose") == 1
+
+
+# ---------------------------------------------------------------------------
+# Registry: list_subagents includes custom agents
+# ---------------------------------------------------------------------------
+
+
+class TestRegistryListSubagentsWithCustom:
+    def teardown_method(self):
+        _reset_subagents_config()
+
+    def test_list_includes_custom_agents(self):
+        from deerflow.subagents.registry import list_subagents
+
+        load_subagents_config_from_dict(
+            {
+                "custom_agents": {
+                    "analysis": {
+                        "description": "Analysis",
+                        "system_prompt": "Analyze.",
+                        "skills": ["data-analysis"],
+                    },
+                },
+            }
+        )
+        configs = list_subagents()
+        names = {c.name for c in configs}
+        assert "general-purpose" in names
+        assert "bash" in names
+        assert "analysis" in names
+
+    def test_list_custom_agent_has_correct_skills(self):
+        from deerflow.subagents.registry import list_subagents
+
+        load_subagents_config_from_dict(
+            {
+                "custom_agents": {
+                    "analysis": {
+                        "description": "Analysis",
+                        "system_prompt": "Analyze.",
+                        "skills": ["data-analysis", "visualization"],
+                    },
+                },
+            }
+        )
+        by_name = {c.name: c for c in list_subagents()}
+        assert by_name["analysis"].skills == ["data-analysis", "visualization"]
+
+
+# ---------------------------------------------------------------------------
+# Skills filter passthrough: verify config.skills is used in task_tool assembly
+# ---------------------------------------------------------------------------
+
+
+class TestSkillsFilterPassthrough:
+    """Test that SubagentConfig.skills is correctly passed to get_skills_prompt_section."""
+
+    def test_none_skills_passes_none_to_prompt(self):
+        """When config.skills is None, available_skills=None should be passed (inherit all)."""
+        config = SubagentConfig(
+            name="test",
+            description="test",
+            system_prompt="test",
+            skills=None,
+        )
+        # Verify: set(None) would raise, so the code must check for None first
+        available = set(config.skills) if config.skills is not None else None
+        assert available is None
+
+    def test_empty_skills_passes_empty_set(self):
+        """When config.skills is [], available_skills=set() should be passed (no skills)."""
+        config = SubagentConfig(
+            name="test",
+            description="test",
+            system_prompt="test",
+            skills=[],
+        )
+        available = set(config.skills) if config.skills is not None else None
+        assert available == set()
+
+    def test_skills_whitelist_passes_correct_set(self):
+        """When config.skills has values, those should be passed as available_skills."""
+        config = SubagentConfig(
+            name="test",
+            description="test",
+            system_prompt="test",
+            skills=["data-analysis", "web-search"],
+        )
+        available = set(config.skills) if config.skills is not None else None
+        assert available == {"data-analysis", "web-search"}
diff --git a/backend/tests/test_task_tool_core_logic.py b/backend/tests/test_task_tool_core_logic.py
index 5251c69ed..1358c5bec 100644
--- a/backend/tests/test_task_tool_core_logic.py
+++ b/backend/tests/test_task_tool_core_logic.py
@@ -143,7 +143,7 @@ def test_task_tool_emits_running_and_completed_events(monkeypatch):
     monkeypatch.setattr(task_tool_module, "SubagentStatus", FakeSubagentStatus)
     monkeypatch.setattr(task_tool_module, "SubagentExecutor", DummyExecutor)
     monkeypatch.setattr(task_tool_module, "get_subagent_config", lambda _: config)
-    monkeypatch.setattr(task_tool_module, "get_skills_prompt_section", lambda: "Skills Appendix")
+
     monkeypatch.setattr(task_tool_module, "get_background_task_result", lambda _: next(responses))
     monkeypatch.setattr(task_tool_module, "get_stream_writer", lambda: events.append)
     monkeypatch.setattr(task_tool_module.asyncio, "sleep", _no_sleep)
@@ -165,7 +165,9 @@ def test_task_tool_emits_running_and_completed_events(monkeypatch):
     assert captured["executor_kwargs"]["thread_id"] == "thread-1"
     assert captured["executor_kwargs"]["parent_model"] == "ark-model"
     assert captured["executor_kwargs"]["config"].max_turns == 7
-    assert "Skills Appendix" in captured["executor_kwargs"]["config"].system_prompt
+    # Skills are no longer appended to system_prompt; they are loaded per-session
+    # by SubagentExecutor and injected as conversation items (Codex pattern).
+    assert captured["executor_kwargs"]["config"].system_prompt == "Base system prompt"
 
     get_available_tools.assert_called_once_with(model_name="ark-model", groups=None, subagent_enabled=False)
 
@@ -311,7 +313,7 @@ def test_task_tool_runtime_none_passes_groups_none(monkeypatch):
         type("DummyExecutor", (), {"__init__": lambda self, **kwargs: None, "execute_async": lambda self, prompt, task_id=None: task_id}),
     )
     monkeypatch.setattr(task_tool_module, "get_subagent_config", lambda _: config)
-    monkeypatch.setattr(task_tool_module, "get_skills_prompt_section", lambda: "")
+
     monkeypatch.setattr(
         task_tool_module,
         "get_background_task_result",
@@ -345,7 +347,7 @@ def test_task_tool_returns_timed_out_message(monkeypatch):
         type("DummyExecutor", (), {"__init__": lambda self, **kwargs: None, "execute_async": lambda self, prompt, task_id=None: task_id}),
     )
     monkeypatch.setattr(task_tool_module, "get_subagent_config", lambda _: config)
-    monkeypatch.setattr(task_tool_module, "get_skills_prompt_section", lambda: "")
+
     monkeypatch.setattr(
         task_tool_module,
         "get_background_task_result",
@@ -381,7 +383,7 @@ def test_task_tool_polling_safety_timeout(monkeypatch):
         type("DummyExecutor", (), {"__init__": lambda self, **kwargs: None, "execute_async": lambda self, prompt, task_id=None: task_id}),
     )
     monkeypatch.setattr(task_tool_module, "get_subagent_config", lambda _: config)
-    monkeypatch.setattr(task_tool_module, "get_skills_prompt_section", lambda: "")
+
     monkeypatch.setattr(
         task_tool_module,
         "get_background_task_result",
@@ -417,7 +419,7 @@ def test_cleanup_called_on_completed(monkeypatch):
         type("DummyExecutor", (), {"__init__": lambda self, **kwargs: None, "execute_async": lambda self, prompt, task_id=None: task_id}),
     )
     monkeypatch.setattr(task_tool_module, "get_subagent_config", lambda _: config)
-    monkeypatch.setattr(task_tool_module, "get_skills_prompt_section", lambda: "")
+
     monkeypatch.setattr(
         task_tool_module,
         "get_background_task_result",
@@ -457,7 +459,7 @@ def test_cleanup_called_on_failed(monkeypatch):
         type("DummyExecutor", (), {"__init__": lambda self, **kwargs: None, "execute_async": lambda self, prompt, task_id=None: task_id}),
     )
     monkeypatch.setattr(task_tool_module, "get_subagent_config", lambda _: config)
-    monkeypatch.setattr(task_tool_module, "get_skills_prompt_section", lambda: "")
+
     monkeypatch.setattr(
         task_tool_module,
         "get_background_task_result",
@@ -497,7 +499,7 @@ def test_cleanup_called_on_timed_out(monkeypatch):
         type("DummyExecutor", (), {"__init__": lambda self, **kwargs: None, "execute_async": lambda self, prompt, task_id=None: task_id}),
     )
     monkeypatch.setattr(task_tool_module, "get_subagent_config", lambda _: config)
-    monkeypatch.setattr(task_tool_module, "get_skills_prompt_section", lambda: "")
+
     monkeypatch.setattr(
         task_tool_module,
         "get_background_task_result",
@@ -544,7 +546,7 @@ def test_cleanup_not_called_on_polling_safety_timeout(monkeypatch):
         type("DummyExecutor", (), {"__init__": lambda self, **kwargs: None, "execute_async": lambda self, prompt, task_id=None: task_id}),
     )
     monkeypatch.setattr(task_tool_module, "get_subagent_config", lambda _: config)
-    monkeypatch.setattr(task_tool_module, "get_skills_prompt_section", lambda: "")
+
     monkeypatch.setattr(
         task_tool_module,
         "get_background_task_result",
@@ -597,7 +599,7 @@ def test_cleanup_scheduled_on_cancellation(monkeypatch):
         type("DummyExecutor", (), {"__init__": lambda self, **kwargs: None, "execute_async": lambda self, prompt, task_id=None: task_id}),
     )
     monkeypatch.setattr(task_tool_module, "get_subagent_config", lambda _: config)
-    monkeypatch.setattr(task_tool_module, "get_skills_prompt_section", lambda: "")
+
     monkeypatch.setattr(task_tool_module, "get_background_task_result", get_result)
     monkeypatch.setattr(task_tool_module, "get_stream_writer", lambda: events.append)
     monkeypatch.setattr(task_tool_module.asyncio, "sleep", cancel_on_first_sleep)
@@ -648,7 +650,7 @@ def test_cancelled_cleanup_stops_after_timeout(monkeypatch):
         type("DummyExecutor", (), {"__init__": lambda self, **kwargs: None, "execute_async": lambda self, prompt, task_id=None: task_id}),
     )
     monkeypatch.setattr(task_tool_module, "get_subagent_config", lambda _: config)
-    monkeypatch.setattr(task_tool_module, "get_skills_prompt_section", lambda: "")
+
     monkeypatch.setattr(
         task_tool_module,
         "get_background_task_result",
@@ -703,7 +705,7 @@ def test_cancellation_calls_request_cancel(monkeypatch):
         type("DummyExecutor", (), {"__init__": lambda self, **kwargs: None, "execute_async": lambda self, prompt, task_id=None: task_id}),
     )
     monkeypatch.setattr(task_tool_module, "get_subagent_config", lambda _: config)
-    monkeypatch.setattr(task_tool_module, "get_skills_prompt_section", lambda: "")
+
     monkeypatch.setattr(
         task_tool_module,
         "get_background_task_result",
@@ -761,7 +763,7 @@ def test_task_tool_returns_cancelled_message(monkeypatch):
         type("DummyExecutor", (), {"__init__": lambda self, **kwargs: None, "execute_async": lambda self, prompt, task_id=None: task_id}),
     )
     monkeypatch.setattr(task_tool_module, "get_subagent_config", lambda _: config)
-    monkeypatch.setattr(task_tool_module, "get_skills_prompt_section", lambda: "")
+
     monkeypatch.setattr(task_tool_module, "get_background_task_result", lambda _: next(responses))
     monkeypatch.setattr(task_tool_module, "get_stream_writer", lambda: events.append)
     monkeypatch.setattr(task_tool_module.asyncio, "sleep", _no_sleep)
diff --git a/config.example.yaml b/config.example.yaml
index fc3d9c8c1..1e649bba9 100644
--- a/config.example.yaml
+++ b/config.example.yaml
@@ -577,15 +577,41 @@ sandbox:
 #   # Optional global max-turn override for all subagents
 #   # max_turns: 120
 #
-#   # Optional per-agent overrides
+#   # Optional per-agent overrides (applies to both built-in and custom agents)
 #   agents:
 #     general-purpose:
 #       timeout_seconds: 1800  # 30 minutes for complex multi-step tasks
 #       max_turns: 160
 #       # model: qwen3:32b     # Use a specific model (default: inherit from lead agent)
+#       # skills:               # Skill whitelist (default: inherit all enabled skills)
+#       #   - web-search
+#       #   - data-analysis
 #     bash:
 #       timeout_seconds: 300   # 5 minutes for quick command execution
 #       max_turns: 80
+#       # skills: []            # No skills for bash agent
+#
+#   # Custom subagent types: define specialized agents with their own prompts,
+#   # tools, skills, and model configuration. Custom agents are available via
+#   # the `task` tool alongside built-in types (general-purpose, bash).
+#   # custom_agents:
+#   #   analysis:
+#   #     description: "Data analysis specialist for processing datasets and generating insights"
+#   #     system_prompt: |
+#   #       You are a data analysis subagent. Focus on:
+#   #       - Processing and analyzing datasets
+#   #       - Generating visualizations
+#   #       - Providing statistical insights
+#   #     tools:                  # Tool whitelist (null = inherit all)
+#   #       - bash
+#   #       - read_file
+#   #       - write_file
+#   #     skills:                 # Skill whitelist (null = inherit all, [] = none)
+#   #       - data-analysis
+#   #       - visualization
+#   #     model: inherit          # 'inherit' uses parent's model
+#   #     max_turns: 80
+#   #     timeout_seconds: 600
 #
 #   # Model override: by default, subagents inherit the lead agent's model.
 #   # Set `model` to use a different model (e.g., a local Ollama model for cost savings).
diff --git a/frontend/src/components/workspace/agents/agent-card.tsx b/frontend/src/components/workspace/agents/agent-card.tsx
index 6b2a510bf..ce1d8ce18 100644
--- a/frontend/src/components/workspace/agents/agent-card.tsx
+++ b/frontend/src/components/workspace/agents/agent-card.tsx
@@ -79,14 +79,27 @@ export function AgentCard({ agent }: AgentCardProps) {
           )}
         </CardHeader>
 
-        {agent.tool_groups && agent.tool_groups.length > 0 && (
+        {(agent.tool_groups?.length ?? agent.skills?.length ?? 0) > 0 && (
           <CardContent className="pt-0 pb-3">
             <div className="flex flex-wrap gap-1">
-              {agent.tool_groups.map((group) => (
-                <Badge key={group} variant="outline" className="text-xs">
+              {agent.tool_groups?.map((group) => (
+                <Badge
+                  key={`tg:${group}`}
+                  variant="outline"
+                  className="text-xs"
+                >
                   {group}
                 </Badge>
               ))}
+              {agent.skills?.map((skill) => (
+                <Badge
+                  key={`sk:${skill}`}
+                  variant="secondary"
+                  className="text-xs"
+                >
+                  {skill}
+                </Badge>
+              ))}
             </div>
           </CardContent>
         )}
diff --git a/frontend/src/core/agents/types.ts b/frontend/src/core/agents/types.ts
index 0ff0efff1..53e09ba66 100644
--- a/frontend/src/core/agents/types.ts
+++ b/frontend/src/core/agents/types.ts
@@ -3,6 +3,7 @@ export interface Agent {
   description: string;
   model: string | null;
   tool_groups: string[] | null;
+  skills: string[] | null;
   soul?: string | null;
 }
 
@@ -11,6 +12,7 @@ export interface CreateAgentRequest {
   description?: string;
   model?: string | null;
   tool_groups?: string[] | null;
+  skills?: string[] | null;
   soul?: string;
 }
 
@@ -18,5 +20,6 @@ export interface UpdateAgentRequest {
   description?: string | null;
   model?: string | null;
   tool_groups?: string[] | null;
+  skills?: string[] | null;
   soul?: string | null;
 }