Skip to content

feat(events): id + result text on workflow subagent tool events #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justrach merged 1 commit into from
Aug 1, 2026
Merged

feat(events): id + result text on workflow subagent tool events #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/schema_protocol.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ pub const json =
\\ {"type": "started", "provider": "provider", "model": "model"},
\\ {"type": "model_call_started", "provider": "provider", "model": "model"},
\\ {"type": "model_call_finished", "provider": "provider", "model": "model", "ok": true, "ms": 0},
\\ {"type": "tool_call", "name": "tool", "input": {}},
\\ {"type": "tool_call", "name": "tool", "input": {}, "id": "sa-… on workflow subagent rows only; pairs with tool_result/agent_usage"},
\\ {"type": "tool_call_started", "name": "tool", "input": {}},
\\ {"type": "tool_rejected", "name": "tool", "reason": "budget|duplicate", "input": {}, "message": "..."},
\\ {"type": "ask_user", "call_id": "...", "question": "...", "input": {"question": "...", "options": ["..."]}},
\\ {"type": "tool_result", "name": "tool", "is_error": false, "text": "..."},
\\ {"type": "tool_result", "name": "tool", "is_error": false, "text": "...", "id": "sa-… on workflow subagent rows only"},
\\ {"type": "tool_call_finished", "name": "tool", "is_error": false, "ms": 0},
\\ {"type": "agent_usage", "id": "sa-...", "ok": true, "duration_ms": 0, "tool_calls": 0, "context_tokens": 0, "cache_read_tokens": 0},
\\ {"type": "finalizing"},
Expand Down
12 changes: 10 additions & 2 deletions src/subagent_run.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ pub fn runSub(ctx: ToolCtx, kind: []const u8, label: []const u8, prompt: []const
agent.agent_cwd = if (wt) |w| w.path else null;

const wf_task = std.mem.eql(u8, kind, "workflow_task");
if (wf_task) guiEmit(ctx.io, .{ .type = "tool_call", .name = "subagent", .input = .{ .description = label } });
if (wf_task) guiEmit(ctx.io, .{ .type = "tool_call", .name = "subagent", .input = .{ .description = label }, .id = sub_id });
// A /loop deadline on the parent reaches the child as guidance on its own
// task prompt (goal_pacing.childTaskPrompt): same absolute deadline, minus
// the margin the parent needs to integrate the result. No-op without one.
Expand All @@ -265,7 +265,15 @@ pub fn runSub(ctx: ToolCtx, kind: []const u8, label: []const u8, prompt: []const
const report = agent.runTurn();
const run_ms: i64 = @intCast(@max(0, sub_start.untilNow(ctx.io, .awake).toMilliseconds()));
const run_ok = if (report) |r| r.len > 0 else |_| false;
if (wf_task) guiEmit(ctx.io, .{ .type = "tool_result", .name = "subagent", .is_error = !run_ok });
if (wf_task) {
// The sa- id (shared with agent_usage) pairs parallel workflow rows;
// without it a consumer can only match tool_call/tool_result by order.
const sub_report: []const u8 = if (report) |r|
(if (r.len > 0) r else "subagent returned no report")
else |_|
(agent.last_api_error orelse "subagent failed");
guiEmit(ctx.io, .{ .type = "tool_result", .name = "subagent", .is_error = !run_ok, .text = util.utf8Prefix(sub_report, 600), .id = sub_id });
}
const used_tools = agent.tools_used.render(arena);
const usage: AgentUsage = .{
.duration_ms = @intCast(run_ms),
Expand Down