mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-07-28 17:06:05 +00:00
1ebf59fe24
`select:` names its targets explicitly, so capping it silently drops schemas the
model asked for by name -- and picks the survivors by catalog order, not request
order. The model is told the tool it wanted was not returned by nothing at all;
it then tries to call a tool that is still deferred.
The rule is already stated three times in the repo, and this is the one place
that breaks it:
- backend/AGENTS.md:447 -- "select: returns all requested skills without a
result cap; other modes cap at MAX_RESULTS=5"
- skills/catalog.py:71 -- SkillCatalog.search returns select: uncapped; the
ranked modes slice. DeferredToolCatalog shares its query grammar and its
MAX_RESULTS = 5, and is capped.
- tool_search's own docstring -- "select:Read,Edit -- fetch these exact tools
by name" versus "notebook jupyter -- keyword search, up to max_results best
matches". Only the ranked form promises a cap.
The cap is applied twice: once inside `DeferredToolCatalog.search` and again in
the tool closure. `search` already caps the ranked branches internally, so the
closure's slice is redundant for them and is the only thing capping `select:`
once the first is removed -- fixing one site alone changes nothing the model can
observe. Its sibling closure, `skills/describe.py::describe_skill`, calls
`catalog.search(name)` with no slice.
Both slices are removed. The ranked modes keep their cap.
90 lines
3.2 KiB
Python
90 lines
3.2 KiB
Python
from langchain_core.tools import tool as as_tool
|
|
from langgraph.types import Command
|
|
|
|
from deerflow.tools.builtins.tool_search import DeferredToolCatalog, build_deferred_tool_setup, build_tool_search_tool
|
|
from deerflow.tools.mcp_metadata import is_mcp_tool, tag_mcp_tool
|
|
|
|
|
|
@as_tool
|
|
def mcp_calc(expression: str) -> str:
|
|
"Evaluate arithmetic."
|
|
return expression
|
|
|
|
|
|
@as_tool
|
|
def local_echo(text: str) -> str:
|
|
"Echo text."
|
|
return text
|
|
|
|
|
|
def test_is_mcp_tool_reads_metadata():
|
|
assert is_mcp_tool(tag_mcp_tool(mcp_calc)) is True
|
|
assert is_mcp_tool(local_echo) is False
|
|
|
|
|
|
def test_setup_disabled_returns_empty():
|
|
setup = build_deferred_tool_setup([tag_mcp_tool(mcp_calc), local_echo], enabled=False)
|
|
assert setup.tool_search_tool is None
|
|
assert setup.deferred_names == frozenset()
|
|
assert setup.catalog_hash is None
|
|
|
|
|
|
def test_setup_no_mcp_returns_empty():
|
|
setup = build_deferred_tool_setup([local_echo], enabled=True)
|
|
assert setup.tool_search_tool is None
|
|
assert setup.deferred_names == frozenset()
|
|
|
|
|
|
def test_setup_builds_from_mcp_survivors():
|
|
setup = build_deferred_tool_setup([tag_mcp_tool(mcp_calc), local_echo], enabled=True)
|
|
assert setup.deferred_names == frozenset({"mcp_calc"})
|
|
assert setup.tool_search_tool is not None
|
|
assert setup.tool_search_tool.name == "tool_search"
|
|
assert setup.catalog_hash
|
|
|
|
|
|
def test_tool_search_returns_command_with_hash_scoped_promotion():
|
|
catalog = DeferredToolCatalog((mcp_calc,))
|
|
ts = build_tool_search_tool(catalog)
|
|
out = ts.invoke({"type": "tool_call", "name": "tool_search", "args": {"query": "select:mcp_calc"}, "id": "tc1"})
|
|
assert isinstance(out, Command)
|
|
promoted = out.update["promoted"]
|
|
assert promoted == {"catalog_hash": catalog.hash, "names": ["mcp_calc"]}
|
|
msg = out.update["messages"][0]
|
|
assert msg.tool_call_id == "tc1" and msg.name == "tool_search"
|
|
assert "mcp_calc" in msg.content
|
|
|
|
|
|
def test_tool_search_promotes_every_selected_tool():
|
|
"""``select:`` promotes all named tools -- the tool closure must not re-cap.
|
|
|
|
``DeferredToolCatalog.search`` already caps the ranked modes internally, so
|
|
a second ``[:MAX_RESULTS]`` in the closure only truncates ``select:``. Its
|
|
sibling closure, ``skills/describe.py::describe_skill``, calls
|
|
``catalog.search(name)`` with no slice. Without this test, dropping the cap
|
|
inside ``search`` alone would still leave ``select:`` capped here.
|
|
"""
|
|
|
|
def _t(name: str):
|
|
@as_tool(name)
|
|
def _f(query: str) -> str:
|
|
"A deferred tool."
|
|
return query
|
|
|
|
return _f
|
|
|
|
names = [f"mcp_t{i}" for i in range(6)] # 6 > MAX_RESULTS
|
|
catalog = DeferredToolCatalog(tuple(_t(n) for n in names))
|
|
ts = build_tool_search_tool(catalog)
|
|
|
|
out = ts.invoke({"type": "tool_call", "name": "tool_search", "args": {"query": "select:" + ",".join(names)}, "id": "tc3"})
|
|
|
|
assert out.update["promoted"]["names"] == names
|
|
|
|
|
|
def test_tool_search_no_match_empty_names():
|
|
catalog = DeferredToolCatalog((mcp_calc,))
|
|
ts = build_tool_search_tool(catalog)
|
|
out = ts.invoke({"type": "tool_call", "name": "tool_search", "args": {"query": "select:nonexistent"}, "id": "tc2"})
|
|
assert out.update["promoted"]["names"] == []
|