Merge branch 'feat-skill-tool-subagent-choice' into 'master'

feat: tool skill subagent choice

See merge request 2026seiii-016/agent-base!31

Author: Charliehua12

.gitignore

@@ -5,4 +5,6 @@
 .env
 
 __pycache__/
-*.py[cod]
+*.py[cod]
+Dockerfile.test
+pyproject.toml

pyproject.toml

@@ -18,6 +18,17 @@ dependencies = [
 ]
 
 
+[project.optional-dependencies]
+test = [
+    "pytest>=8.0.0",
+    "pytest-asyncio>=0.24.0",
+    "anyio[trio]>=4.0.0",
+]
+
+[tool.pytest.ini_options]
+asyncio_mode = "strict"
+pythonpath = ["."]
+
 [[tool.uv.index]]
 name = "nju"
 url = "https://mirror.nju.edu.cn/pypi/web/simple/"

src/agents/base.py

@@ -27,13 +27,13 @@ def __init__(
         metadata: Optional[Dict[str, Any]] = None,
         allowed_tool_names: Optional[Iterable[str]] = None,
         allowed_tool_prefixes: Optional[Iterable[str]] = None,
-        user_allowed_tools: Optional[List[str]] = None,
+        user_disabled_tools: Optional[List[str]] = None,
     ) -> None:
         self.agent_id = agent_id
         self.tool_registry = tool_registry
         self.prompt_provider = prompt_provider
         self.metadata = metadata or {}
-        self.user_allowed_tools = list(user_allowed_tools) if user_allowed_tools is not None else None
+        self.user_disabled_tools = list(user_disabled_tools) if user_disabled_tools is not None else None
 
         default = _ALLOCATION.get(agent_id, {})
         self.allowed_tool_names = set(
@@ -57,7 +57,7 @@ async def get_tools(self) -> List[BaseTool]:
         ctx = ToolCallContext(
             agent_id=self.agent_id,
             metadata=self.metadata,
-            user_allowed_tools=self.user_allowed_tools,
+            user_disabled_tools=self.user_disabled_tools,
         )
         tools = await self.tool_registry.get_tools_for_agent(ctx)
         return self._filter_tools(tools)

src/agents/display_names.yaml

@@ -31,15 +31,26 @@ tools:
   "12306_": "铁路查询"
   amap_: "地图服务"
 
-# 可被用户禁用的工具分组（均为 MCP 外部工具）。
-# id 与上方 tools 中的 key 对应，用于 GET /tools/disableable 接口及 tool_ids 过滤。
+# 可被用户启用/禁用的工具分组（均为 MCP 外部工具）。
+# id 与上方 tools 中的 key 对应，用于 GET /tools/options 接口及 selections 过滤。
+# amap_ 为内部基础服务，不对外暴露为可选项。
 disableable_groups:
   - id: "variflight_"
     name: "航班查询"
     description: "航班信息查询"
   - id: "12306_"
     name: "铁路查询"
     description: "高铁/火车票信息查询"
-  - id: "amap_"
-    name: "地图服务"
-    description: "POI 搜索、路线规划等地图功能"
+
+# 子智能体列表，用于 GET /tools/options 接口。
+subagents:
+  - id: "traffic"
+    description: "交通规划专家，负责长途交通（机票/火车票）的查询与规划。"
+  - id: "local_transport"
+    description: "市内出行专家，负责目的地内各景点间的短途交通规划。"
+  - id: "hotel"
+    description: "酒店住宿专家，负责搜索和推荐符合需求的住宿方案。"
+  - id: "attraction"
+    description: "景点游玩专家，负责按天数和偏好规划景点游览安排。"
+  - id: "food"
+    description: "美食餐饮专家，负责为行程安排特色餐饮推荐。"

src/agents/skill_registry.py

@@ -2,7 +2,7 @@
 import logging
 import os
 from dataclasses import dataclass
-from typing import Optional
+from typing import List, Optional
 
 import yaml
 
@@ -61,9 +61,15 @@ def all_skills(self) -> list[Skill]:
 _registry = SkillRegistry()
 
 
-def get_skills_section() -> str:
-    """返回注入 supervisor system prompt 的技能元数据文本，无技能时返回空字符串。"""
+def get_skills_section(disabled_ids: Optional[List[str]] = None) -> str:
+    """返回注入 supervisor system prompt 的技能元数据文本，无技能时返回空字符串。
+
+    disabled_ids 为 None 或空列表时返回全部技能；提供列表时排除其中的技能。
+    """
     skills = _registry.all_skills()
+    if disabled_ids:
+        disabled_set = set(disabled_ids)
+        skills = [s for s in skills if s.id not in disabled_set]
     if not skills:
         return ""
     lines = [

src/agents/subagent_tool.py

@@ -25,7 +25,7 @@ def __init__(
         prompt_provider: PromptRegistry,
         session_context: Dict[str, Any],
         bus: Optional[EventBus] = None,
-        user_allowed_tools: Optional[List[str]] = None,
+        user_disabled_tools: Optional[List[str]] = None,
     ):
         self.name = f"delegate_{agent_key}"
         self.description = (
@@ -56,7 +56,7 @@ def __init__(
         self._prompt_provider = prompt_provider
         self._session_ctx = session_context
         self._bus = bus
-        self._user_allowed_tools = user_allowed_tools
+        self._user_disabled_tools = user_disabled_tools
 
     async def execute(self, **kwargs) -> Any:
         task_text = str(kwargs.get("task", ""))
@@ -72,7 +72,7 @@ async def execute(self, **kwargs) -> Any:
             agent_id=self._agent_key,
             tool_registry=self._registry,
             prompt_provider=self._prompt_provider,
-            user_allowed_tools=self._user_allowed_tools,
+            user_disabled_tools=self._user_disabled_tools,
         )
 
         task = TaskSchema(agent=self._agent_key, task=task_text)

src/api/routers/tools.py

@@ -1,10 +1,40 @@
 from fastapi import APIRouter, Depends
 from src.api.deps import verify_token
-from src.core.display_names import get_disableable_groups
+from src.agents.skill_registry import _registry as skill_registry
+from src.core.display_names import get_disableable_groups, get_subagents
 
 router = APIRouter()
 
 
-@router.get("/tools/disableable")
-async def list_disableable_tools(token: str = Depends(verify_token)):
-    return get_disableable_groups()
+@router.get("/tools/options")
+async def list_options(token: str = Depends(verify_token)):
+    """返回所有可供用户选择的工具、技能和子智能体。
+
+    每项包含 type 字段（tool/skill/subagent）。
+    tool 类额外包含 name 字段；skill 和 subagent 只有 id 和 description。
+    """
+    items = []
+
+    for group in get_disableable_groups():
+        items.append({
+            "type": "tool",
+            "id": group["id"],
+            "name": group["name"],
+            "description": group["description"],
+        })
+
+    for skill in skill_registry.all_skills():
+        items.append({
+            "type": "skill",
+            "id": skill.id,
+            "description": skill.description,
+        })
+
+    for subagent in get_subagents():
+        items.append({
+            "type": "subagent",
+            "id": subagent["id"],
+            "description": subagent["description"],
+        })
+
+    return items

src/core/display_names.py

@@ -12,10 +12,11 @@
 _tools_exact: Dict[str, str] = {}
 _tools_prefixes: list[tuple[str, str]] = []
 _disableable_groups: list = []
+_subagents: list = []
 
 
 def _load() -> None:
-    global _agents, _tools_exact, _tools_prefixes, _disableable_groups
+    global _agents, _tools_exact, _tools_prefixes, _disableable_groups, _subagents
 
     path = os.path.join(
         os.path.dirname(__file__), "..", "agents", "display_names.yaml"
@@ -47,6 +48,15 @@ def _load() -> None:
         if item and item.get("id")
     ]
 
+    _subagents = [
+        {
+            "id": str(item.get("id", "")),
+            "description": str(item.get("description", "")),
+        }
+        for item in (data.get("subagents") or [])
+        if item and item.get("id")
+    ]
+
     logger.debug(
         "display_names loaded: agents=%d tools_exact=%d tools_prefixes=%d disableable=%d",
         len(_agents),
@@ -70,8 +80,13 @@ def resolve_tool(name: str) -> str:
 
 
 def get_disableable_groups() -> list:
-    """返回可被用户禁用的工具分组列表，供 GET /tools/disableable 使用。"""
+    """返回可被用户启用/禁用的工具分组列表。"""
     return list(_disableable_groups)
 
 
+def get_subagents() -> list:
+    """返回子智能体列表，供 GET /tools/options 使用。"""
+    return list(_subagents)
+
+
 _load()

src/core/orchestrator.py

@@ -19,7 +19,7 @@
 )
 from src.agents.skill_registry import get_skills_section
 from src.agents.subagent_tool import SubAgentTool
-from src.schemas.chat import ChatCompletionRequest, FileAttachment, UserProfile
+from src.schemas.chat import ChatCompletionRequest, FileAttachment, SelectionItem, UserProfile
 from src.services.tools import create_registry
 from src.travel_plan import plan_store, set_bus, set_token
 
@@ -251,6 +251,26 @@ async def _post_profile_callback(
         logger.exception("profile callback failed to %s", url)
 
 
+def _parse_disabled_selections(
+    selections: Optional[List[SelectionItem]],
+) -> tuple[Optional[List[str]], Optional[List[str]], Optional[List[str]]]:
+    """从 disabled_selections 中按 type 拆分出三个独立黑名单。
+
+    返回 (tool_ids, skill_ids, subagent_ids)，均表示需要禁用的 id 列表。
+    某 type 在 selections 中无条目时对应值为 None（表示该类型全部开放）。
+    selections 为 None 或空列表时三个值均为 None（全部开放）。
+    """
+    if not selections:
+        return None, None, None
+    tool_ids = [s.id for s in selections if s.type == "tool"] or None
+    skill_ids = [s.id for s in selections if s.type == "skill"] or None
+    subagent_ids = [s.id for s in selections if s.type == "subagent"] or None
+    return tool_ids, skill_ids, subagent_ids
+
+
+_parse_selections = _parse_disabled_selections  # backwards compat alias
+
+
 def _load_subagent_keys() -> List[str]:
     path = os.path.join(
         os.path.dirname(__file__), "..", "agents", "tool_allocation.yaml"
@@ -308,9 +328,14 @@ async def run_agent_workflow(
         trace = TraceCollector(query=user_request)
         set_trace(trace)
 
-        # ---- SubAgent tools ----
+        # ---- 解析 disabled_selections，拆分出三类黑名单 ----
+        tool_ids, skill_ids, subagent_ids = _parse_disabled_selections(request.disabled_selections)
+
+        # ---- SubAgent tools（subagent_ids 为 None 时全部创建，否则排除被禁用的） ----
         subagent_tools: list = []
         for key in _SUBAGENT_KEYS:
+            if subagent_ids is not None and key in subagent_ids:
+                continue
             worker_cls = WORKER_CLASSES.get(key)
             if not worker_cls:
                 continue
@@ -321,15 +346,15 @@ async def run_agent_workflow(
                 prompt_provider=prompt_provider,
                 session_context=session_ctx,
                 bus=bus,
-                user_allowed_tools=request.tool_ids,
+                user_disabled_tools=tool_ids,
             )
             subagent_tools.append(tool)
             tool_registry._tool_map[tool.name] = tool  # type: ignore[attr-defined]
 
         # ---- Supervisor tools ----
         supervisor = SupervisorAgent(
             "supervisor", tool_registry, prompt_provider, metadata,
-            user_allowed_tools=request.tool_ids,
+            user_disabled_tools=tool_ids,
         )
         supervisor_tools = await supervisor.get_tools()
 
@@ -340,7 +365,7 @@ async def run_agent_workflow(
             "user_request": user_request,
             "metadata": metadata,
             "user_profile_section": _format_user_profile(request.user_profile),
-            "skills_section": get_skills_section(),
+            "skills_section": get_skills_section(skill_ids),
         }
         supervisor_messages = supervisor.build_plan_messages(supervisor_context)
         if request.files:

src/schemas/chat.py

@@ -1,5 +1,12 @@
 from pydantic import BaseModel, Field
-from typing import List, Dict, Any, Optional
+from typing import List, Dict, Any, Literal, Optional
+
+
+class SelectionItem(BaseModel):
+    type: Literal["tool", "skill", "subagent"] = Field(
+        ..., description="类型：tool（外部工具）、skill（技能）、subagent（子智能体）。"
+    )
+    id: str = Field(..., description="对应类型的标识符，与 GET /tools/options 返回的 id 一致。")
 
 
 class ChatMessage(BaseModel):
@@ -70,8 +77,17 @@ class ChatCompletionRequest(BaseModel):
     callback_id: Optional[int] = Field(
         None, description="Callback id (question_id) for the round trace."
     )
-    tool_ids: Optional[List[str]] = Field(
-        None, description="Allowlist of tool names to expose to the LLM. None means all tools."
+    disabled_selections: Optional[List[SelectionItem]] = Field(
+        None,
+        description=(
+            "本次对话中需要禁用的工具/技能/子智能体列表。"
+            "None 或空列表表示全部开放（默认行为）。"
+            "传入条目后，对应的工具/技能/子智能体将被禁用，其余保持可用。"
+            "按 type 独立过滤：tool 控制工具禁用列表，skill 控制禁用的技能，"
+            "subagent 控制禁用的子智能体。"
+            "某 type 在列表中无条目时，该类型默认全部开放。"
+            "列表中不存在的 id 会被静默忽略。"
+        ),
     )
     files: Optional[List[FileAttachment]] = Field(
         None, description="Base64-encoded file attachments injected into the last user message."