Merge remote-tracking branch 'origin/master' into ji

# Conflicts:
#	.gitignore
#	frontend-web/src/components/workspace/artifacts/context.tsx
#	frontend-web/src/components/workspace/messages/message-group.tsx
#	offline-backend-20260512/backend/CLAUDE.md
#	offline-backend-20260512/backend/README.md
#	offline-backend-20260512/backend/app/gateway/app.py
#	offline-backend-20260512/backend/app/gateway/deps.py
#	offline-backend-20260512/backend/app/gateway/routers/llmwiki.py
This commit is contained in:
吉鑫升 committed 2026-08-24 14:21:19 +08:00
commit e818c24769
262 files changed
+29527 -5236

No files matched your search

@@ -4,12 +4,14 @@ from .memory_tool import memory_tool
from .present_file_tool import present_file_tool
from .scheduled_task_tool import scheduled_task_tool
from .setup_agent_tool import setup_agent
from .setup_report_structure_tool import setup_report_structure
from .setup_writing_tool import setup_writing
from .task_tool import task_tool
from .view_image_tool import view_image_tool
__all__ = [
"setup_agent",
"setup_report_structure",
"setup_writing",
"present_file_tool",
"ask_clarification_tool",
@@ -0,0 +1,55 @@
"""报告结构「智能新增」用的提交工具。
与 ``setup_writing`` 同构:模型在几轮对话里问清用户想要的报告结构后,调用本工具把建议字段
「提交」出来。实际总是被 ``SetupReportStructureApprovalMiddleware`` 在 ``after_model``
拦截(不真正执行)——拦截后把字段打包进审批 ToolMessage,前端据此回填右侧表单。
函数体只是兜底:万一未被拦截,也只回一句确认、不落任何盘。
"""
from __future__ import annotations
import logging
from langchain_core.messages import ToolMessage
from langchain_core.tools import tool
from langgraph.prebuilt import ToolRuntime
from langgraph.types import Command
logger = logging.getLogger(__name__)
@tool
def setup_report_structure(
title: str,
content: str,
runtime: ToolRuntime,
name: str | None = None,
structure_mode: str | None = None,
retrieval_directions: list[str] | None = None,
retrieval_skills: list[str] | None = None,
) -> Command:
"""把与用户聊清的报告结构配置提交给前端表单(不直接入库)。
Args:
title: 报告结构标题(必填,短、可展示,如「市场分析报告模板」)。
content: **已与用户确认的报告大纲全文**,使用 Markdown 标题层级
(`#` / `##` / `###`),只写结构与小节要点,不写正文。
name: 一句话描述这套结构的适用场景(可选)。
structure_mode: 结构约束。``fixed`` = 固定大纲(按章节逐一成文,不得改写/合并/省略);
``adaptive`` = 弹性大纲(可按材料合并或省略无依据小节)。不确定时用 ``adaptive``。
retrieval_directions: 检索方向列表(可选)。每项是一个拆词维度,例如「各品牌汽车销量」,
**不是**直接拿去搜索的关键词。用户没提就留空。
retrieval_skills: 检索来源技能 name 列表(可选,hyphen-case 文件夹 id)。
只填用户明确点名、且出现在系统给定技能列表里的项;不确定就留空,交给用户在表单里选。
"""
logger.info("[setup_report_structure] proposed config submitted (intercepted by approval middleware)")
return Command(
update={
"messages": [
ToolMessage(
content="报告结构已生成,请在对话里确认后应用到右侧表单,再点保存。",
tool_call_id=runtime.tool_call_id,
)
]
}
)
@@ -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 不可用,降级放行全部自定义