mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-08-01 02:46:02 +00:00
* feat(subagents): persist and display subagent step history (#3779) Capture both assistant turns and tool outputs during subagent execution, stream them in task_running events, and persist them as subagent.* run events so the subtask card's step timeline survives a reload. Backend: - step_events.py: pure layer (capture_step_message, build_subagent_step, subagent_run_event) shared by streaming and persistence - executor.py: capture ToolMessage outputs, not just AIMessage turns - worker.py: persist task_* custom events to RunEventStore (category "subagent" keeps them out of the thread feed; list_events backfills) Frontend: - core/tasks/steps.ts + api.ts: SubtaskStep model, messageToStep, eventsToSteps, mergeSteps, fetchSubtaskSteps - subtask card accumulates live steps and backfills on expand - carry run_id onto history content messages for the events endpoint * fix(subagents): show AI turns in subtask card + paginate step backfill (#3779) Two follow-ups to the subagent step-history feature: Problem 1 — reload backfill could silently truncate the step timeline because list_events capped at 500 events (seq-ASC) across the whole run. Add task_id filtering + an after_seq forward cursor to list_events (all three stores + abstract base + the /events route), and make fetchSubtaskSteps page through one task's subagent.step events until a short page. No schema migration: the DB filter rides the existing run-scoped index via event_metadata["task_id"]. Problem 2 — the card only rendered tool steps, so persisted AI turns were never shown. Replace toolStepsForDisplay with stepsForDisplay: interleave AI reasoning turns (with text) and tool steps by message_index, drop blank-text AI turns, and drop the trailing final-answer AI turn when completed (already shown as result). Card renders AI steps as muted clamped markdown with a sparkles icon. Tests: store task_id/after_seq filtering + pagination across memory/db/jsonl, the /events route forwarding, stepsForDisplay rules, and fetchSubtaskSteps pagination. Docs updated in both AGENTS.md. * make format * fix(subagents): capture full multi-tool step tail, batch step persistence, cap tool-call args (#3779) Address PR review findings on the subagent step-history feature: 1. executor.py streamed on stream_mode="values" and captured only messages[-1] per chunk, so a multi-tool-call turn (ToolNode appends one ToolMessage per call in a single super-step) lost all but the last tool output in both the live task_running stream and the persisted history. Replace with capture_new_step_messages, which walks the newly-appended tail (and still re-checks the trailing message on no-growth chunks so id-less in-place replacements survive). 2. worker.py persisted each step with the store's low-frequency put() (a per-thread advisory lock per call); a deep subagent (max_turns=150) emits hundreds of steps on the hot stream loop. Replace with _SubagentEventBuffer, which batches via put_batch (flush on terminal subagent.end, at FLUSH_THRESHOLD, and in the worker finally). 3. build_subagent_step capped only text; tool_calls[].args were copied verbatim, so a large write_file/bash payload produced an unbounded subagent.step row. Cap each call's serialized args at SUBAGENT_STEP_MAX_CHARS, flagged args_truncated. Tests updated/added for all three; AGENTS.md refreshed. * fix(subagents): merge backfill into latest subtask state; reuse message_content_to_text (#3779) Address the remaining two PR review findings: 4. subtask-card's fetchSubtaskSteps().then(updateSubtask) closed over a stale tasks snapshot: a late-resolving backfill wrote setTasks({...stale}), clobbering SSE steps/status and sibling subtasks that arrived during the fetch. useUpdateSubtask now reads/writes through a tasksRef mirroring the latest state (ref-to-latest), and the pure per-subtask transition is extracted to core/tasks/subtask-update.ts::computeNextSubtask (unit-tested). 5. step_events._content_to_text duplicated deerflow.utils.messages. message_content_to_text; call the shared helper instead (guarding None content with 'or ""' so a tool-call-only turn still renders as ""). Tests added for computeNextSubtask and the None-content case; AGENTS.md docs updated.
228 lines
9.1 KiB
Python
228 lines
9.1 KiB
Python
"""Build compact subagent step payloads for streaming + persistence.
|
|
|
|
Issue #3779: subagent (subtask) execution steps were only visible as the
|
|
latest streamed frame and were never persisted, so users could not review
|
|
what tools a subagent ran or what each step produced after a reload.
|
|
|
|
This module is the pure data-shaping layer. It converts a captured subagent
|
|
message dict — the ``model_dump()`` of an ``AIMessage`` (an assistant turn:
|
|
text + tool-call requests) or a ``ToolMessage`` (a tool's output) — into the
|
|
small, JSON-serializable ``step`` payload that is:
|
|
|
|
- streamed live inside the ``task_running`` custom event (``task_tool.py``), and
|
|
- persisted as a ``subagent.step`` run event (``runtime/runs/worker.py``).
|
|
|
|
Keeping it pure means it is unit-tested without spinning up a graph, and both
|
|
the streaming and persistence call sites share one definition of a "step".
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from typing import Any
|
|
|
|
from langchain_core.messages import AIMessage, BaseMessage, ToolMessage
|
|
|
|
from deerflow.utils.messages import message_content_to_text
|
|
|
|
#: Default per-step character cap for the ``text`` field. Tool outputs (web
|
|
#: search results, file contents) can be large; this cap bounds the persisted
|
|
#: run-event row and the streamed frame. It only affects display/storage — the
|
|
#: subagent's own LLM context is bounded separately by ToolOutputBudgetMiddleware.
|
|
SUBAGENT_STEP_MAX_CHARS = 8192
|
|
|
|
#: ``RunEvent.category`` for persisted subagent steps. A dedicated category (not
|
|
#: ``"message"``) keeps these events out of ``list_messages`` (the thread message
|
|
#: feed) while still being returned by ``list_events`` for fetch-on-expand (#3779).
|
|
SUBAGENT_EVENT_CATEGORY = "subagent"
|
|
|
|
#: Map of ``task_*`` terminal custom-event types to their persisted status.
|
|
_TERMINAL_EVENT_STATUS: dict[str, str] = {
|
|
"task_completed": "completed",
|
|
"task_failed": "failed",
|
|
"task_cancelled": "cancelled",
|
|
"task_timed_out": "timed_out",
|
|
}
|
|
|
|
|
|
def capture_step_message(
|
|
message: BaseMessage,
|
|
captured: list[dict[str, Any]],
|
|
seen_ids: set[str],
|
|
) -> bool:
|
|
"""Append ``message.model_dump()`` to ``captured`` if it is a new step.
|
|
|
|
A "step" is an assistant turn (``AIMessage``) or a tool result
|
|
(``ToolMessage``) — issue #3779 added the latter so tool outputs survive.
|
|
Other message types (e.g. ``HumanMessage``) are ignored. Dedup is by id
|
|
when present, falling back to a full-dict compare for id-less messages so
|
|
``stream_mode="values"`` re-yielding the same trailing message stays O(1).
|
|
|
|
Returns ``True`` when a message was appended.
|
|
"""
|
|
if not isinstance(message, (AIMessage, ToolMessage)):
|
|
return False
|
|
|
|
message_dict = message.model_dump()
|
|
message_id = message_dict.get("id")
|
|
if message_id:
|
|
if message_id in seen_ids:
|
|
return False
|
|
elif message_dict in captured:
|
|
return False
|
|
|
|
captured.append(message_dict)
|
|
if message_id:
|
|
seen_ids.add(message_id)
|
|
return True
|
|
|
|
|
|
def capture_new_step_messages(
|
|
messages: list[BaseMessage],
|
|
captured: list[dict[str, Any]],
|
|
seen_ids: set[str],
|
|
processed_count: int,
|
|
) -> int:
|
|
"""Capture every step message appended since ``processed_count`` (#3779).
|
|
|
|
``stream_mode="values"`` re-yields the full message history on each chunk,
|
|
and a single LangGraph super-step can append several messages at once — most
|
|
importantly one ``ToolMessage`` per tool call when the model emits multiple
|
|
tool calls in one turn. Capturing only ``messages[-1]`` (the previous
|
|
behaviour) silently dropped all but the last tool output.
|
|
|
|
When the history grew, walk every newly-appended message. When it did not
|
|
grow, re-examine only the trailing message so an id-less in-place replacement
|
|
(same length, new content) is still captured — ``capture_step_message``'s
|
|
dedup makes an unchanged re-yield a no-op. Returns the new cursor.
|
|
"""
|
|
total = len(messages)
|
|
if total > processed_count:
|
|
for message in messages[processed_count:total]:
|
|
capture_step_message(message, captured, seen_ids)
|
|
return total
|
|
if messages:
|
|
capture_step_message(messages[-1], captured, seen_ids)
|
|
return max(processed_count, total)
|
|
|
|
|
|
def truncate_step_text(text: str, max_chars: int) -> tuple[str, bool]:
|
|
"""Return ``(text, truncated)``, clipping to ``max_chars`` when longer."""
|
|
if max_chars >= 0 and len(text) > max_chars:
|
|
return text[:max_chars], True
|
|
return text, False
|
|
|
|
|
|
def _bounded_tool_call(call: dict[str, Any], max_chars: int) -> dict[str, Any]:
|
|
"""Return ``{name, args}`` for a captured tool call, capping large args (#3779).
|
|
|
|
``build_subagent_step`` caps the ``text`` field, but tool-call ``args`` were
|
|
copied verbatim, so a ``write_file``/``bash`` call carrying a big payload (full
|
|
file contents, a heredoc) produced an unbounded persisted ``subagent.step``
|
|
row and streamed frame. When the JSON-serialized args exceed ``max_chars`` we
|
|
replace the structured value with a truncated serialized preview and flag it
|
|
with ``args_truncated`` — small args stay structured for the card to inspect.
|
|
"""
|
|
name = call.get("name")
|
|
args = call.get("args")
|
|
serialized = args if isinstance(args, str) else json.dumps(args, default=str, ensure_ascii=False)
|
|
if max_chars >= 0 and len(serialized) > max_chars:
|
|
return {"name": name, "args": serialized[:max_chars], "args_truncated": True}
|
|
return {"name": name, "args": args}
|
|
|
|
|
|
def build_subagent_step(
|
|
message: dict[str, Any],
|
|
*,
|
|
task_id: str,
|
|
message_index: int,
|
|
max_chars: int = SUBAGENT_STEP_MAX_CHARS,
|
|
) -> dict[str, Any]:
|
|
"""Build the compact step payload from a captured subagent message dict.
|
|
|
|
``kind`` is ``"tool"`` for a ToolMessage (``type == "tool"``) and ``"ai"``
|
|
otherwise. AI steps carry their ``tool_calls`` (name + args only, with large
|
|
args capped to ``max_chars`` — see ``_bounded_tool_call``); tool steps carry
|
|
the originating ``tool_name``. ``text`` is truncated to ``max_chars`` with the
|
|
``truncated`` flag set accordingly.
|
|
"""
|
|
kind = "tool" if message.get("type") == "tool" else "ai"
|
|
# ``... or ""`` keeps a tool-call-only turn's content=None rendering as ""
|
|
# (message_content_to_text would otherwise str()-ify it to "None").
|
|
text, truncated = truncate_step_text(message_content_to_text(message.get("content") or ""), max_chars)
|
|
|
|
step: dict[str, Any] = {
|
|
"task_id": task_id,
|
|
"message_index": message_index,
|
|
"kind": kind,
|
|
"text": text,
|
|
"truncated": truncated,
|
|
}
|
|
|
|
if kind == "tool":
|
|
step["tool_name"] = message.get("name")
|
|
else:
|
|
step["tool_calls"] = [_bounded_tool_call(call, max_chars) for call in (message.get("tool_calls") or [])]
|
|
|
|
return step
|
|
|
|
|
|
def subagent_run_event(chunk: Any) -> dict[str, Any] | None:
|
|
"""Map a ``task_*`` custom stream chunk to ``RunEventStore.put`` kwargs.
|
|
|
|
Returns the ``event_type`` / ``category`` / ``content`` / ``metadata`` for a
|
|
persistable subagent lifecycle event, or ``None`` for any chunk that is not a
|
|
subagent event (so the worker only persists what it recognizes). ``thread_id``
|
|
/ ``run_id`` are filled in by the caller.
|
|
"""
|
|
if not isinstance(chunk, dict):
|
|
return None
|
|
|
|
event = chunk.get("type")
|
|
if not isinstance(event, str) or not event.startswith("task_"):
|
|
return None
|
|
|
|
task_id = chunk.get("task_id")
|
|
|
|
if event == "task_started":
|
|
return {
|
|
"event_type": "subagent.start",
|
|
"category": SUBAGENT_EVENT_CATEGORY,
|
|
"content": {"task_id": task_id, "description": chunk.get("description")},
|
|
"metadata": {"task_id": task_id},
|
|
}
|
|
|
|
if event == "task_running":
|
|
message_index = chunk.get("message_index")
|
|
return {
|
|
"event_type": "subagent.step",
|
|
"category": SUBAGENT_EVENT_CATEGORY,
|
|
"content": build_subagent_step(chunk.get("message") or {}, task_id=task_id, message_index=message_index),
|
|
"metadata": {"task_id": task_id, "message_index": message_index},
|
|
}
|
|
|
|
status = _TERMINAL_EVENT_STATUS.get(event)
|
|
if status is not None:
|
|
content: dict[str, Any] = {"task_id": task_id, "status": status}
|
|
# The final result/error can be a multi-page report; cap it so the
|
|
# persisted run-event row stays bounded (it is also kept verbatim on the
|
|
# terminal ToolMessage, which the card reads separately).
|
|
if chunk.get("result") is not None:
|
|
result, result_truncated = truncate_step_text(str(chunk["result"]), SUBAGENT_STEP_MAX_CHARS)
|
|
content["result"] = result
|
|
if result_truncated:
|
|
content["result_truncated"] = True
|
|
if chunk.get("error") is not None:
|
|
error, error_truncated = truncate_step_text(str(chunk["error"]), SUBAGENT_STEP_MAX_CHARS)
|
|
content["error"] = error
|
|
if error_truncated:
|
|
content["error_truncated"] = True
|
|
return {
|
|
"event_type": "subagent.end",
|
|
"category": SUBAGENT_EVENT_CATEGORY,
|
|
"content": content,
|
|
"metadata": {"task_id": task_id},
|
|
}
|
|
|
|
return None
|