mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-06-10 09:25:57 +00:00
d9f4724950
* feat(tool-search): add hash-scoped promoted state to ThreadState * feat(tool-search): add immutable DeferredToolCatalog with stable hash * feat(tool-search): add build_deferred_tool_setup + Command-writing tool_search * refactor(tool-search): replace deferred-tool ContextVar with closures + graph state (#3272) Build the deferred catalog + tool_search tool per agent from the policy-filtered tool list (after skill allowed-tools), pass deferred_names + catalog_hash explicitly to DeferredToolFilterMiddleware and the prompt, and record promotions in ThreadState.promoted (scoped by catalog_hash) via a Command-returning tool_search. Removes DeferredToolRegistry and the _registry_var ContextVar so deferral no longer depends on build/execute sharing an async context. MCP tools are tagged with metadata[deerflow_mcp]; client.py assembles deferral the same way. Catalog is built AFTER tool-policy filtering (no policy-excluded tool can leak via tool_search) and assembly is fail-closed. Migrate tests off the deleted registry APIs; delete the obsolete ContextVar-based #2884 regression (re-covered by state-based tests in a follow-up). * test(tool-search): lock tool_search promotion into next model turn via graph state * test(tool-search): cross-context, policy-leak, fail-closed, #2884 isolation regressions * test(tool-search): align real-LLM e2e with closure-based deferred setup * docs: update DeferredToolFilterMiddleware description for closure+state design * style(tests): drop unused import in test_deferred_setup (ruff) * test(tool-search): harden merge_promoted + replace tautological catalog test From independent code review: - merge_promoted: use existing.get("catalog_hash") so a forward-incompatible or externally-injected persisted promoted dict triggers a replace instead of a KeyError crash; add regression test for the malformed-existing case. - test_deferred_catalog: replace the `== [] or True` tautology (a test that could never fail) with a deterministic invalid-regex->literal-fallback check (positive match on calc + negative empty match). - DeferredToolCatalog: comment why frozen-without-slots is required for the cached_property hash/names fields (adding slots=True would break them). * fix(tool-search): read tool_search.enabled from self._app_config in client DeerFlowClient._ensure_agent called get_app_config() directly to read tool_search.enabled, but the client already resolves and stores its config as self._app_config at construction (and uses it everywhere else). The bare call re-resolves config from disk at agent-build time, which raises FileNotFoundError in environments without a config.yaml (CI) — test_client.py's fixture only patches get_app_config during __init__, so the later call hit the real loader. Use self._app_config, matching the rest of the client. * test(tool-search): lock tool_search post-policy append ordering tool_search is appended after skill-allowlist filtering, so the allowlist can no longer deny it by name. Lock the intended contract: it only appears when allowed MCP tools survive the filter, and its catalog (derived from the already policy-filtered list) can never expose a denied tool. Addresses the ordering observation from the Copilot review on #3342.
176 lines
7.3 KiB
Python
176 lines
7.3 KiB
Python
import logging
|
|
|
|
from langchain.tools import BaseTool
|
|
|
|
from deerflow.config import get_app_config
|
|
from deerflow.config.app_config import AppConfig
|
|
from deerflow.reflection import resolve_variable
|
|
from deerflow.sandbox.security import is_host_bash_allowed
|
|
from deerflow.tools.builtins import ask_clarification_tool, present_file_tool, task_tool, view_image_tool
|
|
from deerflow.tools.sync import make_sync_tool_wrapper
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
BUILTIN_TOOLS = [
|
|
present_file_tool,
|
|
ask_clarification_tool,
|
|
]
|
|
|
|
SUBAGENT_TOOLS = [
|
|
task_tool,
|
|
# task_status_tool is no longer exposed to LLM (backend handles polling internally)
|
|
]
|
|
|
|
|
|
def _is_host_bash_tool(tool: object) -> bool:
|
|
"""Return True if the tool config represents a host-bash execution surface."""
|
|
group = getattr(tool, "group", None)
|
|
use = getattr(tool, "use", None)
|
|
if group == "bash":
|
|
return True
|
|
if use == "deerflow.sandbox.tools:bash_tool":
|
|
return True
|
|
return False
|
|
|
|
|
|
def _ensure_sync_invocable_tool(tool: BaseTool) -> BaseTool:
|
|
"""Attach a sync wrapper to async-only tools used by sync agent callers."""
|
|
if getattr(tool, "func", None) is None and getattr(tool, "coroutine", None) is not None:
|
|
tool.func = make_sync_tool_wrapper(tool.coroutine, tool.name)
|
|
return tool
|
|
|
|
|
|
def get_available_tools(
|
|
groups: list[str] | None = None,
|
|
include_mcp: bool = True,
|
|
model_name: str | None = None,
|
|
subagent_enabled: bool = False,
|
|
*,
|
|
app_config: AppConfig | None = None,
|
|
) -> list[BaseTool]:
|
|
"""Get all available tools from config.
|
|
|
|
Note: MCP tools should be initialized at application startup using
|
|
`initialize_mcp_tools()` from deerflow.mcp module.
|
|
|
|
Args:
|
|
groups: Optional list of tool groups to filter by.
|
|
include_mcp: Whether to include tools from MCP servers (default: True).
|
|
model_name: Optional model name to determine if vision tools should be included.
|
|
subagent_enabled: Whether to include subagent tools (task, task_status).
|
|
|
|
Returns:
|
|
List of available tools.
|
|
"""
|
|
config = app_config or get_app_config()
|
|
tool_configs = [tool for tool in config.tools if groups is None or tool.group in groups]
|
|
|
|
# Do not expose host bash by default when LocalSandboxProvider is active.
|
|
if not is_host_bash_allowed(config):
|
|
tool_configs = [tool for tool in tool_configs if not _is_host_bash_tool(tool)]
|
|
|
|
loaded_tools_raw = [(cfg, resolve_variable(cfg.use, BaseTool)) for cfg in tool_configs]
|
|
|
|
# Warn when the config ``name`` field and the tool object's ``.name``
|
|
# attribute diverge — this mismatch is the root cause of issue #1803 where
|
|
# the LLM receives one name in its tool schema but the runtime router
|
|
# recognises a different name, producing "not a valid tool" errors.
|
|
for cfg, loaded in loaded_tools_raw:
|
|
if cfg.name != loaded.name:
|
|
logger.warning(
|
|
"Tool name mismatch: config name %r does not match tool .name %r (use: %s). The tool's own .name will be used for binding.",
|
|
cfg.name,
|
|
loaded.name,
|
|
cfg.use,
|
|
)
|
|
|
|
loaded_tools = [_ensure_sync_invocable_tool(t) for _, t in loaded_tools_raw]
|
|
|
|
# Conditionally add tools based on config
|
|
builtin_tools = BUILTIN_TOOLS.copy()
|
|
skill_evolution_config = getattr(config, "skill_evolution", None)
|
|
if getattr(skill_evolution_config, "enabled", False):
|
|
from deerflow.tools.skill_manage_tool import skill_manage_tool
|
|
|
|
builtin_tools.append(skill_manage_tool)
|
|
|
|
# Add subagent tools only if enabled via runtime parameter
|
|
if subagent_enabled:
|
|
builtin_tools.extend(SUBAGENT_TOOLS)
|
|
logger.info("Including subagent tools (task)")
|
|
|
|
# If no model_name specified, use the first model (default)
|
|
if model_name is None and config.models:
|
|
model_name = config.models[0].name
|
|
|
|
# Add view_image_tool only if the model supports vision
|
|
model_config = config.get_model_config(model_name) if model_name else None
|
|
if model_config is not None and model_config.supports_vision:
|
|
builtin_tools.append(view_image_tool)
|
|
logger.info(f"Including view_image_tool for model '{model_name}' (supports_vision=True)")
|
|
|
|
# Get cached MCP tools if enabled
|
|
# NOTE: We use ExtensionsConfig.from_file() instead of config.extensions
|
|
# to always read the latest configuration from disk. This ensures that changes
|
|
# made through the Gateway API (which runs in a separate process) are immediately
|
|
# reflected when loading MCP tools.
|
|
mcp_tools = []
|
|
if include_mcp:
|
|
try:
|
|
from deerflow.config.extensions_config import ExtensionsConfig
|
|
from deerflow.mcp.cache import get_cached_mcp_tools
|
|
|
|
extensions_config = ExtensionsConfig.from_file()
|
|
if extensions_config.get_enabled_mcp_servers():
|
|
mcp_tools = get_cached_mcp_tools()
|
|
if mcp_tools:
|
|
logger.info(f"Using {len(mcp_tools)} cached MCP tool(s)")
|
|
|
|
# Tag MCP-sourced tools so deferred-tool assembly (done at
|
|
# the agent construction site, AFTER tool-policy filtering)
|
|
# can identify them. No ContextVar / registry is built here;
|
|
# the deferred catalog + tool_search tool are assembled per
|
|
# agent from the policy-filtered tool list.
|
|
for t in mcp_tools:
|
|
t.metadata = {**(t.metadata or {}), "deerflow_mcp": True}
|
|
except ImportError:
|
|
logger.warning("MCP module not available. Install 'langchain-mcp-adapters' package to enable MCP tools.")
|
|
except Exception as e:
|
|
logger.error(f"Failed to get cached MCP tools: {e}")
|
|
|
|
# Add invoke_acp_agent tool if any ACP agents are configured
|
|
acp_tools: list[BaseTool] = []
|
|
try:
|
|
from deerflow.tools.builtins.invoke_acp_agent_tool import build_invoke_acp_agent_tool
|
|
|
|
if app_config is None:
|
|
from deerflow.config.acp_config import get_acp_agents
|
|
|
|
acp_agents = get_acp_agents()
|
|
else:
|
|
acp_agents = getattr(config, "acp_agents", {}) or {}
|
|
if acp_agents:
|
|
acp_tools.append(build_invoke_acp_agent_tool(acp_agents))
|
|
logger.info(f"Including invoke_acp_agent tool ({len(acp_agents)} agent(s): {list(acp_agents.keys())})")
|
|
except Exception as e:
|
|
logger.warning(f"Failed to load ACP tool: {e}")
|
|
|
|
logger.info(f"Total tools loaded: {len(loaded_tools)}, built-in tools: {len(builtin_tools)}, MCP tools: {len(mcp_tools)}, ACP tools: {len(acp_tools)}")
|
|
|
|
# Deduplicate by tool name — config-loaded tools take priority, followed by
|
|
# built-ins, MCP tools, and ACP tools. Duplicate names cause the LLM to
|
|
# receive ambiguous or concatenated function schemas (issue #1803).
|
|
all_tools = [_ensure_sync_invocable_tool(t) for t in loaded_tools + builtin_tools + mcp_tools + acp_tools]
|
|
seen_names: set[str] = set()
|
|
unique_tools: list[BaseTool] = []
|
|
for t in all_tools:
|
|
if t.name not in seen_names:
|
|
unique_tools.append(t)
|
|
seen_names.add(t.name)
|
|
else:
|
|
logger.warning(
|
|
"Duplicate tool name %r detected and skipped — check your config.yaml and MCP server registrations (issue #1803).",
|
|
t.name,
|
|
)
|
|
return unique_tools
|