YuJitang
9892a7d468
fix: bucket subagent token usage into parent run totals ( #2838 )
...
* fix: bucket subagent token usage into RunRow.subagent_tokens
Add caller-bucketed token tracking to RunJournal so subagent and
middleware LLM calls are written to the correct RunRow columns instead
of all falling into lead_agent_tokens (default 0).
- RunJournal: accumulate _lead_agent_tokens / _subagent_tokens /
_middleware_tokens in on_llm_end, deduped by langchain run_id.
Add record_external_llm_usage_records() for external sources
(respects track_token_usage flag). Return caller buckets from
get_completion_data().
- SubagentTokenCollector: new lightweight callback handler that
collects LLM usage within subagent execution.
- SubagentExecutor: wire collector into subagent run_config and sync
records to SubagentResult on every chunk (timeout/cancel safe).
- SubagentResult: add token_usage_records and usage_reported fields.
- task_tool: report subagent usage to parent RunJournal on every
terminal status (COMPLETED/FAILED/CANCELLED/TIMED_OUT), including
the CancelledError path, guarded against double-reporting.
No DB migration needed — RunRow columns already exist.
* Potential fix for pull request finding
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
* fix: address token usage review feedback
* Address review follow-ups
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
2026-05-10 22:47:30 +08:00
..
2026-04-26 15:09:25 +08:00
2026-05-01 13:23:26 +08:00
2026-03-27 20:03:30 +08:00
2026-04-30 11:40:28 +08:00
2026-04-26 11:13:01 +08:00
2026-05-01 22:27:02 +08:00
2026-05-06 10:17:55 +08:00
2026-04-26 11:08:11 +08:00
2026-04-26 11:08:11 +08:00
2026-04-26 11:08:11 +08:00
2026-04-26 22:20:57 +08:00
2026-04-26 11:08:11 +08:00
2026-04-28 11:34:07 +08:00
2026-05-02 15:19:28 +08:00
2026-05-06 15:27:34 +08:00
2026-04-14 10:29:44 +08:00
2026-04-26 11:09:55 +08:00
2026-05-09 09:49:08 +08:00
2026-04-19 22:00:58 +08:00
2026-03-30 07:41:18 +08:00
2026-04-25 19:40:06 +08:00
2026-04-07 18:21:22 +08:00
2026-05-01 22:19:50 +08:00
2026-03-29 21:03:58 +08:00
2026-05-04 09:56:16 +08:00
2026-05-04 09:56:16 +08:00
2026-05-02 15:04:11 +08:00
2026-03-14 22:55:52 +08:00
2026-04-26 11:05:47 +08:00
2026-03-29 15:31:18 +08:00
2026-05-07 16:15:15 +08:00
2026-05-07 16:15:15 +08:00
2026-05-09 09:27:02 +08:00
2026-05-05 23:17:42 +08:00
2026-04-12 19:11:22 +08:00
2026-05-10 22:28:29 +08:00
2026-05-10 22:28:29 +08:00
2026-04-30 11:25:33 +08:00
2026-04-11 17:48:04 +08:00
2026-03-31 22:19:27 +08:00
2026-04-10 17:43:39 +08:00
2026-05-09 19:39:36 +08:00
2026-04-26 11:09:56 +08:00
2026-04-08 17:13:39 +08:00
2026-04-26 11:09:55 +08:00
2026-04-06 22:14:12 +08:00
2026-04-18 22:47:42 +08:00
2026-04-10 17:43:39 +08:00
2026-04-28 00:13:04 +08:00
2026-04-30 10:58:32 +08:00
2026-04-23 19:41:26 +08:00
2026-05-05 14:35:55 +08:00
2026-05-09 19:43:50 +08:00
2026-03-23 18:07:33 +08:00
2026-03-14 22:55:52 +08:00
2026-03-26 14:20:18 +08:00
2026-04-28 11:34:07 +08:00
2026-05-02 06:37:49 +08:00
2026-04-24 16:00:14 +08:00
2026-04-28 11:34:07 +08:00
2026-05-07 16:15:15 +08:00
2026-05-07 08:34:43 +08:00
2026-05-07 08:34:43 +08:00
2026-04-30 12:41:09 +08:00
2026-04-11 16:52:10 +08:00
2026-05-08 10:13:11 +08:00
2026-05-01 13:23:26 +08:00
2026-05-01 13:23:26 +08:00
2026-04-30 22:27:14 +08:00
2026-05-07 16:15:15 +08:00
2026-05-07 16:15:15 +08:00
2026-03-14 22:55:52 +08:00
2026-04-25 09:18:13 +08:00
2026-03-14 22:55:52 +08:00
2026-03-26 14:20:18 +08:00
2026-04-03 11:21:58 +08:00
2026-04-26 15:09:25 +08:00
2026-04-26 11:13:01 +08:00
2026-04-26 11:13:01 +08:00
2026-04-26 15:09:25 +08:00
2026-04-17 12:00:31 +08:00
2026-04-26 11:09:55 +08:00
2026-04-26 15:09:25 +08:00
2026-04-30 17:59:57 +08:00
2026-04-14 15:01:06 +08:00
2026-05-05 23:17:42 +08:00
2026-04-28 15:09:31 +08:00
2026-03-22 20:39:26 +08:00
2026-04-26 11:05:47 +08:00
2026-04-26 11:09:55 +08:00
2026-04-09 16:07:16 +08:00
2026-03-20 17:18:59 +08:00
2026-03-26 15:07:05 +08:00
2026-05-05 23:17:42 +08:00
2026-05-09 09:49:08 +08:00
2026-04-26 11:13:01 +08:00
2026-04-10 20:40:30 +08:00
2026-04-10 20:40:30 +08:00
2026-03-14 22:55:52 +08:00
2026-03-14 22:55:52 +08:00
2026-05-05 18:53:10 +08:00
2026-04-26 15:09:25 +08:00
2026-05-08 10:17:17 +08:00
2026-05-10 22:47:30 +08:00
2026-04-26 11:20:17 +08:00
2026-05-09 19:40:32 +08:00
2026-05-02 11:25:45 +08:00
2026-04-26 15:09:25 +08:00
2026-05-03 23:40:59 +08:00
2026-04-07 17:15:24 +08:00
2026-04-09 17:21:23 +08:00
2026-04-09 17:21:23 +08:00
2026-04-18 08:46:59 +08:00
2026-04-28 12:18:41 +08:00
2026-04-24 17:06:55 +08:00
2026-03-30 16:02:23 +08:00
2026-03-26 14:20:18 +08:00
2026-05-02 16:22:35 +08:00
2026-05-09 19:43:50 +08:00
2026-05-10 22:00:57 +08:00
2026-05-01 13:23:26 +08:00
2026-03-25 16:28:33 +08:00
2026-04-23 14:06:14 +08:00
2026-05-01 13:23:26 +08:00
2026-05-01 13:23:26 +08:00
2026-05-03 23:40:59 +08:00
2026-05-07 08:34:43 +08:00
2026-05-07 08:34:43 +08:00
2026-03-30 16:02:23 +08:00
2026-04-06 14:51:10 +08:00
2026-05-07 08:34:43 +08:00
2026-05-08 10:08:53 +08:00
2026-04-23 23:59:47 +08:00
2026-05-02 06:37:49 +08:00
2026-04-12 16:40:21 +08:00
2026-05-10 22:47:30 +08:00
2026-04-28 14:53:18 +08:00
2026-05-09 19:39:36 +08:00
2026-05-10 22:47:30 +08:00
2026-03-26 17:39:16 +08:00
2026-04-26 11:09:55 +08:00
2026-04-26 15:09:25 +08:00
2026-05-09 19:40:32 +08:00
2026-05-02 15:16:16 +08:00
2026-03-14 22:55:52 +08:00
2026-05-09 18:22:58 +08:00
2026-04-14 11:11:26 +08:00
2026-05-10 22:00:57 +08:00
2026-05-09 09:27:02 +08:00
2026-03-26 14:20:18 +08:00
2026-05-08 14:50:33 +08:00
2026-04-20 20:25:03 +08:00
2026-05-01 22:21:10 +08:00
2026-04-06 15:09:57 +08:00
2026-04-24 22:45:41 +08:00
2026-04-02 13:06:10 +08:00
2026-04-02 13:06:10 +08:00
2026-05-05 23:17:42 +08:00
2026-05-09 18:21:54 +08:00
2026-04-26 11:13:01 +08:00
2026-05-09 18:02:40 +08:00
2026-04-26 15:09:25 +08:00
2026-05-02 15:16:16 +08:00
2026-04-15 23:54:30 +08:00
2026-04-28 11:13:17 +08:00
2026-04-06 15:18:34 +08:00
2026-04-10 20:49:28 +08:00