Account subagent token usage toward root goals - #41183
Merged
copyberry[bot] merged 1 commit intoAug 27, 2026
Merged
Conversation
copyberry Bot
pushed a commit
that referenced
this pull request
Aug 27, 2026
## What changed - Roll token usage from spawned descendants, including nested subagents, into the root goal's usage. - Apply descendant usage during active and idle progress accounting so it contributes to token budgets. - Reset descendant accounting baselines when the active goal changes and preserve usage recorded concurrently with a checkpoint. ## Testing - Cover child and grandchild usage, budget exhaustion, unloaded parent runtimes, goal replacement, idle accounting, and concurrent checkpoints. GitOrigin-RevId: 8f97ec6778c55b9adf94b887b5fd03999ed0eb94
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/8f97ec6778c55b9adf94b887b5fd03999ed0eb94
branch
2 times, most recently
from
August 27, 2026 19:10
3a45310 to
83a9387
Compare
copyberry Bot
pushed a commit
that referenced
this pull request
Aug 27, 2026
## What changed - Roll token usage from spawned descendants, including nested subagents, into the root goal's usage. - Apply descendant usage during active and idle progress accounting so it contributes to token budgets. - Reset descendant accounting baselines when the active goal changes and preserve usage recorded concurrently with a checkpoint. ## Testing - Cover child and grandchild usage, budget exhaustion, unloaded parent runtimes, goal replacement, idle accounting, and concurrent checkpoints. GitOrigin-RevId: 8f97ec6778c55b9adf94b887b5fd03999ed0eb94
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/8f97ec6778c55b9adf94b887b5fd03999ed0eb94
branch
2 times, most recently
from
August 27, 2026 19:13
73e22b2 to
5a7563c
Compare
copyberry Bot
pushed a commit
that referenced
this pull request
Aug 27, 2026
## What changed - Roll token usage from spawned descendants, including nested subagents, into the root goal's usage. - Apply descendant usage during active and idle progress accounting so it contributes to token budgets. - Reset descendant accounting baselines when the active goal changes and preserve usage recorded concurrently with a checkpoint. ## Testing - Cover child and grandchild usage, budget exhaustion, unloaded parent runtimes, goal replacement, idle accounting, and concurrent checkpoints. GitOrigin-RevId: 8f97ec6778c55b9adf94b887b5fd03999ed0eb94
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/8f97ec6778c55b9adf94b887b5fd03999ed0eb94
branch
2 times, most recently
from
August 27, 2026 19:16
eb1fa10 to
779a81b
Compare
copyberry Bot
pushed a commit
that referenced
this pull request
Aug 27, 2026
## What changed - Roll token usage from spawned descendants, including nested subagents, into the root goal's usage. - Apply descendant usage during active and idle progress accounting so it contributes to token budgets. - Reset descendant accounting baselines when the active goal changes and preserve usage recorded concurrently with a checkpoint. ## Testing - Cover child and grandchild usage, budget exhaustion, unloaded parent runtimes, goal replacement, idle accounting, and concurrent checkpoints. GitOrigin-RevId: 8f97ec6778c55b9adf94b887b5fd03999ed0eb94
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/8f97ec6778c55b9adf94b887b5fd03999ed0eb94
branch
2 times, most recently
from
August 27, 2026 19:20
2ecbd3f to
145b14b
Compare
copyberry Bot
pushed a commit
that referenced
this pull request
Aug 27, 2026
## What changed - Roll token usage from spawned descendants, including nested subagents, into the root goal's usage. - Apply descendant usage during active and idle progress accounting so it contributes to token budgets. - Reset descendant accounting baselines when the active goal changes and preserve usage recorded concurrently with a checkpoint. ## Testing - Cover child and grandchild usage, budget exhaustion, unloaded parent runtimes, goal replacement, idle accounting, and concurrent checkpoints. GitOrigin-RevId: 8f97ec6778c55b9adf94b887b5fd03999ed0eb94
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/8f97ec6778c55b9adf94b887b5fd03999ed0eb94
branch
2 times, most recently
from
August 27, 2026 19:22
696b961 to
9b64d81
Compare
copyberry Bot
pushed a commit
that referenced
this pull request
Aug 27, 2026
## What changed - Roll token usage from spawned descendants, including nested subagents, into the root goal's usage. - Apply descendant usage during active and idle progress accounting so it contributes to token budgets. - Reset descendant accounting baselines when the active goal changes and preserve usage recorded concurrently with a checkpoint. ## Testing - Cover child and grandchild usage, budget exhaustion, unloaded parent runtimes, goal replacement, idle accounting, and concurrent checkpoints. GitOrigin-RevId: 8f97ec6778c55b9adf94b887b5fd03999ed0eb94
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/8f97ec6778c55b9adf94b887b5fd03999ed0eb94
branch
2 times, most recently
from
August 27, 2026 19:29
a5750bf to
0267213
Compare
copyberry Bot
pushed a commit
that referenced
this pull request
Aug 27, 2026
## What changed - Roll token usage from spawned descendants, including nested subagents, into the root goal's usage. - Apply descendant usage during active and idle progress accounting so it contributes to token budgets. - Reset descendant accounting baselines when the active goal changes and preserve usage recorded concurrently with a checkpoint. ## Testing - Cover child and grandchild usage, budget exhaustion, unloaded parent runtimes, goal replacement, idle accounting, and concurrent checkpoints. GitOrigin-RevId: 8f97ec6778c55b9adf94b887b5fd03999ed0eb94
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/8f97ec6778c55b9adf94b887b5fd03999ed0eb94
branch
from
August 27, 2026 19:29
0267213 to
dd9a452
Compare
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: cde20814f7
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
Comment on lines
+132
to
+135
| .map(|parent| { | ||
| parent | ||
| .root_accounting_state() | ||
| .unwrap_or_else(|| parent.accounting_state()) |
Contributor
There was a problem hiding this comment.
When an existing child rollout is resumed before its root runtime, this one-time lookup produces no root_accounting_state; similarly, a child that survives a root runtime reload retains the obsolete state. Because the value is captured for the lifetime of the child runtime, later token usage never reaches the resumed root goal, silently undercounting tokensUsed and delaying budget enforcement. Resolve or rebind the root state when the root runtime registers or when descendant usage is recorded.
AGENTS.md reference: AGENTS.md:L102-L110
Useful? React with 👍 / 👎.
Comment on lines
+412
to
+413
| #[tokio::test] | ||
| async fn spawned_descendant_usage_exhausts_root_goal_budget_once() -> anyhow::Result<()> { |
Contributor
There was a problem hiding this comment.
This coverage directly invokes extension callbacks and manually constructs TokenUsageInfo.last_token_usage, so it cannot catch failures in the real subagent spawn/session-source propagation or production token-update path on which this feature depends. Add a test_codex integration test that actually spawns descendants and verifies the root goal's usage and budget status.
AGENTS.md reference: AGENTS.md:L112-L118
Useful? React with 👍 / 👎.
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/8f97ec6778c55b9adf94b887b5fd03999ed0eb94
branch
from
August 27, 2026 19:32
dd9a452 to
4af26c0
Compare
copyberry Bot
pushed a commit
that referenced
this pull request
Aug 27, 2026
## What changed - Roll token usage from spawned descendants, including nested subagents, into the root goal's usage. - Apply descendant usage during active and idle progress accounting so it contributes to token budgets. - Reset descendant accounting baselines when the active goal changes and preserve usage recorded concurrently with a checkpoint. ## Testing - Cover child and grandchild usage, budget exhaustion, unloaded parent runtimes, goal replacement, idle accounting, and concurrent checkpoints. GitOrigin-RevId: 8f97ec6778c55b9adf94b887b5fd03999ed0eb94
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/8f97ec6778c55b9adf94b887b5fd03999ed0eb94
branch
2 times, most recently
from
August 27, 2026 19:35
34ad9ae to
101ef43
Compare
copyberry Bot
pushed a commit
that referenced
this pull request
Aug 27, 2026
## What changed - Roll token usage from spawned descendants, including nested subagents, into the root goal's usage. - Apply descendant usage during active and idle progress accounting so it contributes to token budgets. - Reset descendant accounting baselines when the active goal changes and preserve usage recorded concurrently with a checkpoint. ## Testing - Cover child and grandchild usage, budget exhaustion, unloaded parent runtimes, goal replacement, idle accounting, and concurrent checkpoints. GitOrigin-RevId: 8f97ec6778c55b9adf94b887b5fd03999ed0eb94
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/8f97ec6778c55b9adf94b887b5fd03999ed0eb94
branch
2 times, most recently
from
August 27, 2026 19:37
72036bd to
b11e0db
Compare
copyberry Bot
pushed a commit
that referenced
this pull request
Aug 27, 2026
## What changed - Roll token usage from spawned descendants, including nested subagents, into the root goal's usage. - Apply descendant usage during active and idle progress accounting so it contributes to token budgets. - Reset descendant accounting baselines when the active goal changes and preserve usage recorded concurrently with a checkpoint. ## Testing - Cover child and grandchild usage, budget exhaustion, unloaded parent runtimes, goal replacement, idle accounting, and concurrent checkpoints. GitOrigin-RevId: 8f97ec6778c55b9adf94b887b5fd03999ed0eb94
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/8f97ec6778c55b9adf94b887b5fd03999ed0eb94
branch
from
August 27, 2026 19:37
b11e0db to
16a7765
Compare
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/8f97ec6778c55b9adf94b887b5fd03999ed0eb94
branch
from
August 27, 2026 19:39
16a7765 to
ab86c0f
Compare
copyberry Bot
pushed a commit
that referenced
this pull request
Aug 27, 2026
## What changed - Roll token usage from spawned descendants, including nested subagents, into the root goal's usage. - Apply descendant usage during active and idle progress accounting so it contributes to token budgets. - Reset descendant accounting baselines when the active goal changes and preserve usage recorded concurrently with a checkpoint. ## Testing - Cover child and grandchild usage, budget exhaustion, unloaded parent runtimes, goal replacement, idle accounting, and concurrent checkpoints. GitOrigin-RevId: 8f97ec6778c55b9adf94b887b5fd03999ed0eb94
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/8f97ec6778c55b9adf94b887b5fd03999ed0eb94
branch
from
August 27, 2026 19:40
ab86c0f to
5657ebe
Compare
## What changed - Roll token usage from spawned descendants, including nested subagents, into the root goal's usage. - Apply descendant usage during active and idle progress accounting so it contributes to token budgets. - Reset descendant accounting baselines when the active goal changes and preserve usage recorded concurrently with a checkpoint. ## Testing - Cover child and grandchild usage, budget exhaustion, unloaded parent runtimes, goal replacement, idle accounting, and concurrent checkpoints. GitOrigin-RevId: 8f97ec6778c55b9adf94b887b5fd03999ed0eb94
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/8f97ec6778c55b9adf94b887b5fd03999ed0eb94
branch
2 times, most recently
from
August 27, 2026 19:42
beaf273 to
4761851
Compare
copyberry
Bot
deleted the
copyberry/codex-internal-to-codex-oss/8f97ec6778c55b9adf94b887b5fd03999ed0eb94
branch
August 27, 2026 19:43
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Account subagent token usage toward root goals
What changed
Testing