[peyton-alt]

https://entire.com/gh/entireio/-/trails/2340/changes/cli/1616

What was missing

OpenCode child sessions and Factory AI Droid Workers keep their token usage in their own sessions. The parent's transcript never includes it, so it was missing from every total: status, sessions, session tokens, attach and checkpoint metadata. The entire explain header total also left out subagents.

The fix

• A child is credited exactly once, in the same locked state change that completes its task record.
• The credit goes to a new summed field, ChildSessionTokens. It stays separate from TokenUsage.SubagentTokens, which each turn's snapshot replaces, so a later snapshot cannot erase a Worker.
• A bounded ledger, CreditedChildCalls (last 256), survives condensation. It is keyed like completion-record keying: call ID, child and start. A stop repeated after condensation is not credited again. A reused call ID with a new start is still credited. An unknown start on either side matches any entry for the same child and call.
• OpenCode declares agent.ChildSessionSubagents, so every completion of its children credits, including the SessionEnd sweep's completion of a child still running when the session ends. The sweep records the call's start as unknown, and an unknown start on either side matches in the ledger, so a later stop adds nothing. Droid Worker turns are credited on the existing per-turn path.
• A child's task entry is not recounted from its transcript at condensation, so task.json shows the same figure the parent was credited. A child whose export failed keeps no usage in either place.
• Checkpoints add the pending child share to their subagent total. Displays use SessionState.TotalTokenUsage().
• entire explain now counts subagents in its header total.

Overlaps

• factoryai-droid: count tokens from the session's settings file #2820 (merged): TestFactoryDroidWorkerTokensComeFromItsOwnSettings now also checks that TotalTokenUsage() counts the Worker once.
• Count session and checkpoint tokens from each agent's running total #2782: if totals later switch to cumulative sources, OpenCode children must keep this credit, and Droid Workers must not be added a second time.

Known limits

• A child the SessionEnd sweep completes while it is still running counts only the usage its export held at that moment.
• Tasks launched inside an OpenCode child are still skipped, both files and tokens.
• Sessions that were already condensed are not backfilled.
• After entire session attach, a child's tokens go into the attach checkpoint while its task.json goes into the next one. Nothing is counted twice.

Tests

New strategy, session, explain and integration tests. Each one fails on main, and the ledger tests also fail without the ledger. mise run test:integration and the canary pass, and lint reports 0 issues.

Size: +728/-39.

🤖 Generated with Claude Code

[Copilot]

🟡 Changes recommended

Finalization and recovery can omit child usage, while concurrent attach can count it twice.

3 open issues

• Checkpoint reconsumes child tokens credited during concurrent attach · New
• Synthesized OpenCode completions omit child usage from parent totals · New
• Recovered OpenCode usage is missing from checkpoint and parent totals · New

What changed in this PR

Includes OpenCode child-session and Droid Worker usage in parent-session totals and checkpoint metadata.

Changes:

• Adds separate child-token accounting and a bounded deduplication ledger.
• Updates checkpoint, attach, adopt, and display paths.
• Adds regression tests and documents accounting behavior.

File	Description
docs/​development/​checkpoint-implementation.md	Documents child-token accounting.
cmd/​entire/​cli/​strategy/​task_token_usage_test.go	Tests credits and checkpoint windows.
cmd/​entire/​cli/​strategy/​manual_commit_git.go	Credits completed child tasks.
cmd/​entire/​cli/​strategy/​manual_commit_condensation.go	Includes pending child usage in checkpoints.
cmd/​entire/​cli/​status.go	Displays combined totals.
cmd/​entire/​cli/​sessions.go	Updates session token displays.
cmd/​entire/​cli/​session/​state.go	Adds child totals, baselines, and ledger.
cmd/​entire/​cli/​session/​state_test.go	Tests deduplication and totals.
cmd/​entire/​cli/​session_tokens.go	Includes children in token reports.
cmd/​entire/​cli/​session_adopt.go	Preserves child accounting during adoption.
cmd/​entire/​cli/​lifecycle.go	Routes child completions to crediting.
cmd/​entire/​cli/​integration_test/​opencode_subagent_test.go	Tests child totals across commits.
cmd/​entire/​cli/​integration_test/​factoryai_worker_session_test.go	Checks Worker totals across checkpoints.
cmd/​entire/​cli/​explain.go	Includes subagents in header totals.
cmd/​entire/​cli/​explain_test.go	Tests subagent-inclusive headers.
cmd/​entire/​cli/​attach.go	Detects concurrent child-token changes.
cmd/​entire/​cli/​agent/​opencode/​lifecycle.go	Marks separately accounted child usage.
cmd/​entire/​cli/​agent/​event.go	Defines the child-usage event flag.

_{Review effort: Balanced}