feat: 报告结构支持检索方向/来源与智能新增,并修复协助卡停轮与宿主跳转
为深度研究报告结构增加检索方向与技能来源、对话式智能新增页与详情排版;澄清中间件在 after_model 可靠结束本轮,避免弱模型出卡后继续生成;任务按钮补充 host 跳转与相关深链能力。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
a5a9c952e8
commit
51afebb394
67 files changed
+4511
-699
No files matched your search
+40
-11
@@ -35,7 +35,7 @@ def _resolve_active_agent_id(runtime: ToolRuntime | None) -> str | None:
|
||||
return None
|
||||
|
||||
|
||||
def _load_agent_skill_whitelist(agent_id: str | None) -> set[str] | None:
|
||||
def _load_agent_skill_whitelist(agent_id: str | None, extra_skills: list[str] | None = None) -> set[str] | None:
|
||||
"""Return the explicit skill name set declared in an agent's config.yaml.
|
||||
|
||||
Semantics:
|
||||
@@ -49,6 +49,9 @@ def _load_agent_skill_whitelist(agent_id: str | None) -> set[str] | None:
|
||||
whose config omits ``skills`` can no longer enumerate every skill
|
||||
through this tool.
|
||||
- Non-empty set → only these names are visible to this agent.
|
||||
|
||||
``extra_skills`` only widens the **deep-research collector** allowlist
|
||||
for one run (report-structure 检索来源). Other agents ignore it.
|
||||
"""
|
||||
if not agent_id:
|
||||
return None
|
||||
@@ -58,11 +61,37 @@ def _load_agent_skill_whitelist(agent_id: str | None) -> set[str] | None:
|
||||
cfg = load_agent_config(agent_id)
|
||||
if cfg is None:
|
||||
return None
|
||||
return set(cfg.skills or [])
|
||||
allowed = set(cfg.skills or [])
|
||||
except Exception:
|
||||
logger.debug("Failed to load agent config for skill_list filter", exc_info=True)
|
||||
return None
|
||||
|
||||
if extra_skills:
|
||||
from deerflow.agents.deep_research.retrieval import merge_collector_skill_allowlist
|
||||
|
||||
merged = merge_collector_skill_allowlist(agent_id, list(allowed), extra_skills)
|
||||
return set(merged or [])
|
||||
return allowed
|
||||
|
||||
|
||||
def _resolve_extra_skills(runtime: ToolRuntime | None) -> list[str]:
|
||||
"""Extra skill names from this run's context (collector 检索来源)."""
|
||||
if runtime is None:
|
||||
return []
|
||||
try:
|
||||
from deerflow.agents.deep_research.retrieval import runtime_extra_skills
|
||||
|
||||
if getattr(runtime, "context", None):
|
||||
extras = runtime_extra_skills(runtime.context)
|
||||
if extras:
|
||||
return extras
|
||||
cfg = getattr(runtime, "config", None)
|
||||
if isinstance(cfg, dict):
|
||||
return runtime_extra_skills(cfg.get("configurable", {}) or {})
|
||||
except Exception:
|
||||
return []
|
||||
return []
|
||||
|
||||
|
||||
def _resolve_effective_user_id() -> str | None:
|
||||
"""当前请求/线程绑定的用户 id;解析失败时返回 None。"""
|
||||
@@ -100,7 +129,7 @@ def _load_owned_skill_names(user_id: str | None) -> set[str] | None:
|
||||
return None
|
||||
|
||||
|
||||
def skill_view_impl(name: str, agent_id: str | None) -> str:
|
||||
def skill_view_impl(name: str, agent_id: str | None, extra_skills: list[str] | None = None) -> str:
|
||||
"""Read a skill's SKILL.md, honoring the agent's config.yaml whitelist.
|
||||
|
||||
Custom agents may only read skills on their whitelist — same filter as
|
||||
@@ -111,7 +140,7 @@ def skill_view_impl(name: str, agent_id: str | None) -> str:
|
||||
from deerflow.skills.storage import get_or_new_skill_storage
|
||||
from deerflow.skills.usage import bump_view
|
||||
|
||||
allowed = _load_agent_skill_whitelist(agent_id)
|
||||
allowed = _load_agent_skill_whitelist(agent_id, extra_skills)
|
||||
if allowed is not None and name not in allowed:
|
||||
return f"Skill '{name}' not found."
|
||||
|
||||
@@ -149,7 +178,7 @@ def skill_view_tool(name: str, runtime: ToolRuntime) -> str:
|
||||
Args:
|
||||
name: The skill name (hyphen-case, e.g. 'my-skill').
|
||||
"""
|
||||
return skill_view_impl(name, _resolve_active_agent_id(runtime))
|
||||
return skill_view_impl(name, _resolve_active_agent_id(runtime), _resolve_extra_skills(runtime))
|
||||
|
||||
|
||||
def _resolve_skills_container_base_path() -> str:
|
||||
@@ -171,7 +200,7 @@ def _score_skill(query_terms: list[str], haystack: str) -> int:
|
||||
return score
|
||||
|
||||
|
||||
def search_skills_impl(query: str, agent_id: str | None, top_n: int = 5) -> str:
|
||||
def search_skills_impl(query: str, agent_id: str | None, top_n: int = 5, extra_skills: list[str] | None = None) -> str:
|
||||
"""按关键词检索可用技能,返回 top-N 的 name/description/category/location。
|
||||
|
||||
与 ``skill_list`` 共享可见性过滤(自定义 agent 走白名单;默认 lead agent 只
|
||||
@@ -195,7 +224,7 @@ def search_skills_impl(query: str, agent_id: str | None, top_n: int = 5) -> str:
|
||||
if whole and whole not in terms:
|
||||
terms.append(whole)
|
||||
|
||||
allowed = _load_agent_skill_whitelist(agent_id)
|
||||
allowed = _load_agent_skill_whitelist(agent_id, extra_skills)
|
||||
owned: set[str] | None = None
|
||||
if allowed is None:
|
||||
owned = _load_owned_skill_names(_resolve_effective_user_id())
|
||||
@@ -256,7 +285,7 @@ def search_skills_tool(query: str, runtime: ToolRuntime) -> str:
|
||||
Args:
|
||||
query: A short keyword query describing the task (e.g. 'pdf table extract').
|
||||
"""
|
||||
return search_skills_impl(query, _resolve_active_agent_id(runtime))
|
||||
return search_skills_impl(query, _resolve_active_agent_id(runtime), extra_skills=_resolve_extra_skills(runtime))
|
||||
|
||||
|
||||
@tool("skill_list")
|
||||
@@ -278,16 +307,16 @@ def skill_list_tool(runtime: ToolRuntime) -> str:
|
||||
state, use_count, view_count, patch_count, last_activity_at, pinned,
|
||||
source.
|
||||
"""
|
||||
return skill_list_impl(_resolve_active_agent_id(runtime))
|
||||
return skill_list_impl(_resolve_active_agent_id(runtime), _resolve_extra_skills(runtime))
|
||||
|
||||
|
||||
def skill_list_impl(agent_id: str | None) -> str:
|
||||
def skill_list_impl(agent_id: str | None, extra_skills: list[str] | None = None) -> str:
|
||||
"""List skills visible to ``agent_id`` (None = default lead agent)."""
|
||||
from deerflow.skills.storage import get_or_new_skill_storage
|
||||
from deerflow.skills.types import SkillCategory
|
||||
from deerflow.skills.usage import STATE_ARCHIVED, all_entries, latest_activity_at
|
||||
|
||||
allowed = _load_agent_skill_whitelist(agent_id)
|
||||
allowed = _load_agent_skill_whitelist(agent_id, extra_skills)
|
||||
|
||||
# 默认 lead agent 没有 per-agent 白名单 —— 改为只暴露"未归档"且"内置或属于
|
||||
# 当前用户"的技能。owned 为 None 表示 SkillStore 不可用,降级放行全部自定义
|
||||
|
||||
Reference in new issue
Block a user