mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-07-10 00:18:36 +00:00
66b9e7f212
* feat: emit structured runtime metadata * fix: avoid subagent import cycle in replay gateway * fix: preserve legacy subtask result parsing * refactor: tighten runtime metadata contracts * fix(middleware): keep recovery hint on task exception wrapper content The structured-metadata stamp overwrote the wrapper text with the bare task-failure message, dropping the model-facing 'Continue with available context, or choose an alternative tool.' guidance that every other tool exception keeps. Append the shared hint after the formatted message. * fix(subagents): require lowercase hex for result_sha256 reader Length-only validation accepted any 64-char string; a faulty serializer or relaying wrapper could store a non-digest value in the delegation ledger. Enforce the producer's hexdigest shape with a fullmatch. --------- Co-authored-by: Willem Jiang <willem.jiang@gmail.com>
402 lines
15 KiB
Python
402 lines
15 KiB
Python
from langchain_core.messages import AIMessage, HumanMessage, ToolMessage
|
|
|
|
from deerflow.agents.middlewares.skill_context import (
|
|
build_skill_entry_metadata_from_read,
|
|
extract_skills,
|
|
render_skill_context,
|
|
)
|
|
|
|
_ROOT = "/mnt/skills"
|
|
_READ = frozenset({"read_file", "read", "view", "cat"})
|
|
_SKILL_BODY = """---
|
|
name: data-analysis
|
|
description: Analyze data with pandas and charts.
|
|
---
|
|
# Data Analysis
|
|
Use pandas. ALWAYS_USE_PANDAS_SENTINEL
|
|
"""
|
|
|
|
|
|
def _ai_read(tool_call_id: str, path: str, name: str = "read_file") -> AIMessage:
|
|
return AIMessage(
|
|
content="",
|
|
tool_calls=[{"name": name, "args": {"path": path}, "id": tool_call_id, "type": "tool_call"}],
|
|
)
|
|
|
|
|
|
def _skill_metadata(path: str = "/mnt/skills/public/data-analysis/SKILL.md", description: str = "Analyze data with pandas and charts.") -> dict:
|
|
return {
|
|
"skill_context_entry": {
|
|
"name": path.split("/")[-2],
|
|
"path": path,
|
|
"description": description,
|
|
}
|
|
}
|
|
|
|
|
|
class TestExtractSkills:
|
|
def test_build_skill_entry_metadata_from_read_rejects_non_skill_files(self):
|
|
assert (
|
|
build_skill_entry_metadata_from_read(
|
|
"/mnt/skills/public/data-analysis/README.md",
|
|
_SKILL_BODY,
|
|
skills_root=_ROOT,
|
|
)
|
|
is None
|
|
)
|
|
|
|
def test_build_skill_entry_metadata_from_read_returns_compact_reference(self):
|
|
entry = build_skill_entry_metadata_from_read(
|
|
"/mnt/skills/public/data-analysis/SKILL.md",
|
|
_SKILL_BODY,
|
|
skills_root=_ROOT,
|
|
)
|
|
assert entry == {
|
|
"path": "/mnt/skills/public/data-analysis/SKILL.md",
|
|
"description": "Analyze data with pandas and charts.",
|
|
}
|
|
assert "ALWAYS_USE_PANDAS_SENTINEL" not in repr(entry)
|
|
|
|
def test_captures_skill_reference_with_description(self):
|
|
msgs = [
|
|
HumanMessage(content="use the analysis skill"),
|
|
_ai_read("r1", "/mnt/skills/public/data-analysis/SKILL.md"),
|
|
ToolMessage(content=_SKILL_BODY, tool_call_id="r1", id="tm1", additional_kwargs=_skill_metadata()),
|
|
]
|
|
out = extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ)
|
|
assert len(out) == 1
|
|
assert out[0]["name"] == "data-analysis"
|
|
assert out[0]["path"] == "/mnt/skills/public/data-analysis/SKILL.md"
|
|
assert out[0]["description"] == "Analyze data with pandas and charts."
|
|
assert "content" not in out[0]
|
|
assert "ALWAYS_USE_PANDAS_SENTINEL" not in repr(out[0])
|
|
assert isinstance(out[0]["loaded_at"], int)
|
|
|
|
def test_description_is_capped_at_capture_time(self):
|
|
description = "x" * 500
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/public/huge/SKILL.md"),
|
|
ToolMessage(
|
|
content="BODY_SENTINEL",
|
|
tool_call_id="r1",
|
|
id="tm1",
|
|
additional_kwargs=_skill_metadata("/mnt/skills/public/huge/SKILL.md", description),
|
|
),
|
|
]
|
|
|
|
out = extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ)
|
|
|
|
assert out
|
|
assert len(out[0]["description"]) <= 500
|
|
assert "BODY_SENTINEL" not in repr(out[0])
|
|
|
|
def test_metadata_with_empty_description_yields_empty_description(self):
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/public/x/SKILL.md"),
|
|
ToolMessage(
|
|
content="# X\nno frontmatter here",
|
|
tool_call_id="r1",
|
|
id="tm1",
|
|
additional_kwargs=_skill_metadata("/mnt/skills/public/x/SKILL.md", ""),
|
|
),
|
|
]
|
|
out = extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ)
|
|
assert out and out[0]["description"] == ""
|
|
|
|
def test_missing_metadata_logs_warning_without_recovering_from_content(self, caplog):
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/public/x/SKILL.md"),
|
|
ToolMessage(content=_SKILL_BODY, tool_call_id="r1", id="tm1"),
|
|
]
|
|
|
|
with caplog.at_level("WARNING", logger="deerflow.agents.middlewares.skill_context"):
|
|
assert extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ) == []
|
|
|
|
assert "missing skill read metadata" in caplog.text
|
|
assert "tool_call_id=r1" in caplog.text
|
|
assert "/mnt/skills/public/x/SKILL.md" in caplog.text
|
|
|
|
def test_normalizes_dot_segments_under_skills_root(self):
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/public/./data-analysis/SKILL.md"),
|
|
ToolMessage(content="body", tool_call_id="r1", id="tm1", additional_kwargs=_skill_metadata()),
|
|
]
|
|
|
|
out = extract_skills(msgs, skills_root="/mnt/skills/", read_tool_names=_READ)
|
|
|
|
assert out and out[0]["path"] == "/mnt/skills/public/data-analysis/SKILL.md"
|
|
assert out[0]["name"] == "data-analysis"
|
|
|
|
def test_rejects_traversal_that_escapes_skills_root(self):
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/../workspace/secrets.txt"),
|
|
ToolMessage(content="secret", tool_call_id="r1", id="tm1"),
|
|
]
|
|
|
|
assert extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ) == []
|
|
|
|
def test_ignores_supporting_resources_under_skill_directory(self):
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/public/data-analysis/scripts/analyze.py"),
|
|
ToolMessage(content="large script body", tool_call_id="r1", id="tm1"),
|
|
]
|
|
|
|
assert extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ) == []
|
|
|
|
def test_ignores_error_tool_messages(self):
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/public/data-analysis/SKILL.md"),
|
|
ToolMessage(content="Error: File not found", tool_call_id="r1", id="tm1", status="error"),
|
|
]
|
|
|
|
assert extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ) == []
|
|
|
|
def test_ignores_read_file_error_text_even_when_tool_status_is_success(self):
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/public/missing/SKILL.md"),
|
|
ToolMessage(content="Error: File not found: /mnt/skills/public/missing/SKILL.md", tool_call_id="r1", id="tm1"),
|
|
]
|
|
|
|
assert extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ) == []
|
|
|
|
def test_ignores_reads_outside_skills_root(self):
|
|
msgs = [
|
|
_ai_read("r1", "/workspace/notes.md"),
|
|
ToolMessage(content="notes", tool_call_id="r1", id="tm1"),
|
|
]
|
|
assert extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ) == []
|
|
|
|
def test_ignores_non_read_tool_names(self):
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/a/SKILL.md", name="write_file"),
|
|
ToolMessage(content="x", tool_call_id="r1", id="tm1"),
|
|
]
|
|
assert extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ) == []
|
|
|
|
def test_read_without_result_is_skipped(self):
|
|
msgs = [_ai_read("r1", "/mnt/skills/a/SKILL.md")]
|
|
assert extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ) == []
|
|
|
|
def test_trailing_slash_root_normalized(self):
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/public/a/SKILL.md"),
|
|
ToolMessage(
|
|
content="body",
|
|
tool_call_id="r1",
|
|
id="tm1",
|
|
additional_kwargs=_skill_metadata("/mnt/skills/public/a/SKILL.md", ""),
|
|
),
|
|
]
|
|
out = extract_skills(msgs, skills_root="/mnt/skills/", read_tool_names=_READ)
|
|
assert out and out[0]["name"] == "a"
|
|
|
|
def test_multiple_skills_each_captured(self):
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/public/a/SKILL.md"),
|
|
ToolMessage(
|
|
content="A",
|
|
tool_call_id="r1",
|
|
id="tm1",
|
|
additional_kwargs=_skill_metadata("/mnt/skills/public/a/SKILL.md", "A"),
|
|
),
|
|
_ai_read("r2", "/mnt/skills/custom/b/SKILL.md"),
|
|
ToolMessage(
|
|
content="B",
|
|
tool_call_id="r2",
|
|
id="tm2",
|
|
additional_kwargs=_skill_metadata("/mnt/skills/custom/b/SKILL.md", "B"),
|
|
),
|
|
]
|
|
out = extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ)
|
|
assert [e["name"] for e in out] == ["a", "b"]
|
|
|
|
def test_extract_skills_prefers_metadata_only_when_path_matches_read_call(self):
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/public/data-analysis/SKILL.md"),
|
|
ToolMessage(
|
|
content="---\nname: wrong\ndescription: content body\n---\nbody",
|
|
tool_call_id="r1",
|
|
id="tm1",
|
|
additional_kwargs={
|
|
"skill_context_entry": {
|
|
"name": "data-analysis",
|
|
"path": "/mnt/skills/public/data-analysis/SKILL.md",
|
|
"description": "Structured description.",
|
|
}
|
|
},
|
|
),
|
|
]
|
|
|
|
out = extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ)
|
|
|
|
assert out == [
|
|
{
|
|
"name": "data-analysis",
|
|
"path": "/mnt/skills/public/data-analysis/SKILL.md",
|
|
"description": "Structured description.",
|
|
"loaded_at": 1,
|
|
}
|
|
]
|
|
|
|
def test_extract_skills_rejects_metadata_path_mismatch_without_reparsing_content(self):
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/public/data-analysis/SKILL.md"),
|
|
ToolMessage(
|
|
content=_SKILL_BODY,
|
|
tool_call_id="r1",
|
|
id="tm1",
|
|
additional_kwargs={
|
|
"skill_context_entry": {
|
|
"name": "other",
|
|
"path": "/mnt/skills/public/other/SKILL.md",
|
|
"description": "Wrong metadata.",
|
|
}
|
|
},
|
|
),
|
|
]
|
|
|
|
out = extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ)
|
|
|
|
assert out == []
|
|
|
|
def test_extract_skills_warns_on_metadata_path_mismatch(self, caplog):
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/public/data-analysis/SKILL.md"),
|
|
ToolMessage(
|
|
content=_SKILL_BODY,
|
|
tool_call_id="r1",
|
|
id="tm1",
|
|
additional_kwargs={
|
|
"skill_context_entry": {
|
|
"name": "other",
|
|
"path": "/mnt/skills/public/other/SKILL.md",
|
|
"description": "Wrong metadata.",
|
|
}
|
|
},
|
|
),
|
|
]
|
|
|
|
with caplog.at_level("WARNING", logger="deerflow.agents.middlewares.skill_context"):
|
|
assert extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ) == []
|
|
|
|
assert "mismatched skill read metadata" in caplog.text
|
|
assert "expected_path=/mnt/skills/public/data-analysis/SKILL.md" in caplog.text
|
|
assert "metadata_path=/mnt/skills/public/other/SKILL.md" in caplog.text
|
|
|
|
def test_extract_skills_rebuilds_name_from_validated_read_path(self):
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/public/data-analysis/SKILL.md"),
|
|
ToolMessage(
|
|
content="---\ndescription: content body\n---\nbody",
|
|
tool_call_id="r1",
|
|
id="tm1",
|
|
additional_kwargs={
|
|
"skill_context_entry": {
|
|
"name": "spoofed-name",
|
|
"path": "/mnt/skills/public/data-analysis/SKILL.md",
|
|
"description": "Structured description.",
|
|
}
|
|
},
|
|
),
|
|
]
|
|
|
|
out = extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ)
|
|
|
|
assert out[0]["name"] == "data-analysis"
|
|
assert out[0]["path"] == "/mnt/skills/public/data-analysis/SKILL.md"
|
|
assert out[0]["description"] == "Structured description."
|
|
|
|
def test_extract_skills_accepts_same_path_metadata_with_missing_description(self):
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/public/data-analysis/SKILL.md"),
|
|
ToolMessage(
|
|
content=_SKILL_BODY,
|
|
tool_call_id="r1",
|
|
id="tm1",
|
|
additional_kwargs={
|
|
"skill_context_entry": {
|
|
"name": "data-analysis",
|
|
"path": "/mnt/skills/public/data-analysis/SKILL.md",
|
|
}
|
|
},
|
|
),
|
|
]
|
|
|
|
out = extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ)
|
|
|
|
assert out[0]["path"] == "/mnt/skills/public/data-analysis/SKILL.md"
|
|
assert out[0]["description"] == ""
|
|
|
|
def test_extract_skills_accepts_same_path_metadata_with_non_string_description_as_empty(self):
|
|
msgs = [
|
|
_ai_read("r1", "/mnt/skills/public/data-analysis/SKILL.md"),
|
|
ToolMessage(
|
|
content=_SKILL_BODY,
|
|
tool_call_id="r1",
|
|
id="tm1",
|
|
additional_kwargs={
|
|
"skill_context_entry": {
|
|
"name": "data-analysis",
|
|
"path": "/mnt/skills/public/data-analysis/SKILL.md",
|
|
"description": 123,
|
|
}
|
|
},
|
|
),
|
|
]
|
|
|
|
out = extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ)
|
|
|
|
assert out[0]["path"] == "/mnt/skills/public/data-analysis/SKILL.md"
|
|
assert out[0]["description"] == ""
|
|
|
|
def test_extract_skills_ignores_standalone_outside_root_metadata(self):
|
|
msgs = [
|
|
_ai_read("r1", "/workspace/notes.md"),
|
|
ToolMessage(
|
|
content="notes",
|
|
tool_call_id="r1",
|
|
additional_kwargs={
|
|
"skill_context_entry": {
|
|
"name": "secret",
|
|
"path": "/mnt/skills/public/secret/SKILL.md",
|
|
"description": "Do not trust this.",
|
|
}
|
|
},
|
|
),
|
|
]
|
|
assert extract_skills(msgs, skills_root=_ROOT, read_tool_names=_READ) == []
|
|
|
|
|
|
class TestRenderSkillContext:
|
|
def test_empty_returns_empty_string(self):
|
|
assert render_skill_context([]) == ""
|
|
|
|
def test_renders_reference_reminder_not_body(self):
|
|
entries = [
|
|
{
|
|
"name": "data-analysis",
|
|
"path": "/mnt/skills/public/data-analysis/SKILL.md",
|
|
"description": "Analyze data with pandas.",
|
|
"loaded_at": 2,
|
|
}
|
|
]
|
|
out = render_skill_context(entries)
|
|
assert "Active skills" in out
|
|
assert "re-read" in out.lower()
|
|
assert "data-analysis" in out
|
|
assert "Analyze data with pandas." in out
|
|
assert "/mnt/skills/public/data-analysis/SKILL.md" in out
|
|
assert "###" not in out
|
|
|
|
def test_entry_without_description_still_renders_name_and_path(self):
|
|
entries = [{"name": "x", "path": "/mnt/skills/public/x/SKILL.md", "description": "", "loaded_at": 0}]
|
|
out = render_skill_context(entries)
|
|
assert "- x" in out
|
|
assert "/mnt/skills/public/x/SKILL.md" in out
|
|
|
|
def test_render_caps_large_description(self):
|
|
entries = [{"name": "x", "path": "/mnt/skills/public/x/SKILL.md", "description": "x" * 2000, "loaded_at": 0}]
|
|
|
|
out = render_skill_context(entries)
|
|
|
|
assert len(out) < 800
|