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.
184 lines
7.0 KiB
Python
184 lines
7.0 KiB
Python
"""Regressions for the deferred-tool redesign (#3272).
|
|
|
|
- Cross-context: building the graph in one async context and running it in a
|
|
sibling context (that did NOT inherit the build context) must still hide
|
|
deferred tools. The old ContextVar implementation failed this; the closure +
|
|
graph-state implementation must pass.
|
|
- Policy leak (Finding 1): a tool removed by policy must not be searchable.
|
|
- Fail-closed (Finding 2): a wiring regression must raise, not silently leak.
|
|
- #2884 isolation: a second (subagent-style) setup build must not affect the
|
|
lead agent's middleware/promotion.
|
|
"""
|
|
|
|
import asyncio
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
from langchain.agents import create_agent
|
|
from langchain_core.language_models.fake_chat_models import GenericFakeChatModel
|
|
from langchain_core.messages import AIMessage, HumanMessage
|
|
from langchain_core.tools import tool as as_tool
|
|
|
|
from deerflow.agents.middlewares.deferred_tool_filter_middleware import DeferredToolFilterMiddleware
|
|
from deerflow.skills.tool_policy import filter_tools_by_skill_allowed_tools
|
|
from deerflow.skills.types import Skill
|
|
from deerflow.tools.builtins.tool_search import DeferredToolSetup, build_deferred_tool_setup
|
|
|
|
|
|
@as_tool
|
|
def active_tool(x: str) -> str:
|
|
"active"
|
|
return x
|
|
|
|
|
|
@as_tool
|
|
def mcp_secret(x: str) -> str:
|
|
"deferred mcp tool — must be hidden from bind_tools until promoted"
|
|
return x
|
|
|
|
|
|
def _tag(t):
|
|
t.metadata = {**(t.metadata or {}), "deerflow_mcp": True}
|
|
return t
|
|
|
|
|
|
_BOUND: list[list[str]] = []
|
|
|
|
|
|
class _RecordingModel(GenericFakeChatModel):
|
|
def bind_tools(self, tools, **kwargs):
|
|
_BOUND.append([getattr(t, "name", None) for t in tools])
|
|
return self
|
|
|
|
|
|
def _build_graph():
|
|
filtered = [active_tool, _tag(mcp_secret)]
|
|
setup = build_deferred_tool_setup(filtered, enabled=True)
|
|
final = [*filtered, setup.tool_search_tool]
|
|
model = _RecordingModel(messages=iter([AIMessage(content="done")] * 4))
|
|
return create_agent(
|
|
model=model,
|
|
tools=final,
|
|
middleware=[DeferredToolFilterMiddleware(setup.deferred_names, setup.catalog_hash)],
|
|
system_prompt="t",
|
|
)
|
|
|
|
|
|
async def _abuild():
|
|
return _build_graph()
|
|
|
|
|
|
def test_deferred_hidden_when_built_and_run_in_different_contexts():
|
|
"""Build in one task, run in a sibling task that did not inherit it."""
|
|
_BOUND.clear()
|
|
|
|
async def main():
|
|
graph = await asyncio.create_task(_abuild())
|
|
|
|
async def run():
|
|
await graph.ainvoke({"messages": [HumanMessage(content="hi")]})
|
|
|
|
await asyncio.create_task(run())
|
|
|
|
asyncio.run(main())
|
|
|
|
assert _BOUND, "model was never bound"
|
|
assert not any("mcp_secret" in names for names in _BOUND), f"deferred MCP tool leaked into bind_tools: {_BOUND}"
|
|
|
|
|
|
def test_policy_excluded_mcp_tool_not_in_catalog():
|
|
"""Finding 1: a tool removed by policy is not searchable/exposed."""
|
|
filtered_after_policy = [active_tool] # mcp_secret denied by skill allowed-tools
|
|
setup = build_deferred_tool_setup(filtered_after_policy, enabled=True)
|
|
assert setup.deferred_names == frozenset()
|
|
assert setup.tool_search_tool is None
|
|
|
|
|
|
def test_fail_closed_when_mcp_survives_without_setup(monkeypatch):
|
|
"""Finding 2: simulate a wiring regression and assert it fails loudly.
|
|
|
|
``_assemble_deferred`` lazy-imports ``build_deferred_tool_setup`` from the
|
|
source module, so patch it there (not on the agent module).
|
|
"""
|
|
from deerflow.agents.lead_agent import agent as agentmod
|
|
|
|
monkeypatch.setattr(
|
|
"deerflow.tools.builtins.tool_search.build_deferred_tool_setup",
|
|
lambda tools, *, enabled: DeferredToolSetup(None, frozenset(), None),
|
|
)
|
|
with pytest.raises(RuntimeError, match="fail-closed"):
|
|
agentmod._assemble_deferred([_tag(mcp_secret)], enabled=True)
|
|
|
|
|
|
def test_subagent_reentry_does_not_touch_lead_state():
|
|
"""#2884: building a second (subagent) setup must not affect the lead's
|
|
middleware. With no shared registry/ContextVar, the lead middleware depends
|
|
only on its own deferred_names + the passed state."""
|
|
lead_setup = build_deferred_tool_setup([active_tool, _tag(mcp_secret)], enabled=True)
|
|
mw = DeferredToolFilterMiddleware(lead_setup.deferred_names, lead_setup.catalog_hash)
|
|
|
|
# Simulate a subagent build re-entering tool assembly with its own setup.
|
|
_ = build_deferred_tool_setup([_tag(mcp_secret)], enabled=True)
|
|
|
|
class _Req:
|
|
def __init__(self):
|
|
self.tools = [active_tool, mcp_secret]
|
|
self.state = {"promoted": {"catalog_hash": lead_setup.catalog_hash, "names": ["mcp_secret"]}}
|
|
|
|
def override(self, tools):
|
|
self.tools = tools
|
|
return self
|
|
|
|
out = mw._filter_tools(_Req())
|
|
assert {t.name for t in out.tools} == {"active_tool", "mcp_secret"} # promotion intact
|
|
|
|
|
|
def _make_skill(allowed_tools):
|
|
"""Skill carrying an explicit allowed-tools allowlist (None = legacy allow-all)."""
|
|
return Skill(
|
|
name="s",
|
|
description="d",
|
|
license="MIT",
|
|
skill_dir=Path("/tmp/s"),
|
|
skill_file=Path("/tmp/s/SKILL.md"),
|
|
relative_path=Path("s"),
|
|
category="public",
|
|
allowed_tools=allowed_tools,
|
|
enabled=True,
|
|
)
|
|
|
|
|
|
def test_policy_denied_mcp_yields_no_tool_search_end_to_end():
|
|
"""An allowlist that denies the MCP tool gates it end-to-end: after the real
|
|
policy filter no MCP tool survives, so ``_assemble_deferred`` adds no
|
|
tool_search (and does not fail-closed, because no MCP tool leaked through)."""
|
|
from deerflow.agents.lead_agent import agent as agentmod
|
|
|
|
filtered = filter_tools_by_skill_allowed_tools([active_tool, _tag(mcp_secret)], [_make_skill(["active_tool"])])
|
|
final_tools, setup = agentmod._assemble_deferred(filtered, enabled=True)
|
|
|
|
assert [t.name for t in final_tools] == ["active_tool"]
|
|
assert "tool_search" not in {t.name for t in final_tools}
|
|
assert setup.deferred_names == frozenset()
|
|
|
|
|
|
def test_tool_search_appended_after_policy_but_never_exposes_denied_tool():
|
|
"""Intentional behavior change vs. upstream (Copilot review on PR #3342).
|
|
|
|
``tool_search`` is appended AFTER skill-allowlist filtering, so an allowlist
|
|
can no longer deny ``tool_search`` by name. This is safe by construction: the
|
|
tool only appears when allowed MCP tools survive the filter, and its catalog
|
|
is derived from the already policy-filtered list — so it can never expose a
|
|
tool the allowlist denied. Locks that contract so the ordering cannot regress.
|
|
"""
|
|
from deerflow.agents.lead_agent import agent as agentmod
|
|
|
|
allowed = ["active_tool", "mcp_secret"] # permits the MCP tool, does NOT list tool_search
|
|
filtered = filter_tools_by_skill_allowed_tools([active_tool, _tag(mcp_secret)], [_make_skill(allowed)])
|
|
final_tools, setup = agentmod._assemble_deferred(filtered, enabled=True)
|
|
|
|
names = {t.name for t in final_tools}
|
|
assert "tool_search" in names # appended despite not being in the allowlist
|
|
assert setup.deferred_names == frozenset({"mcp_secret"})
|
|
assert set(setup.deferred_names) <= set(allowed) # catalog never exceeds the allowlist
|