[codex] rollout budget implementation (2/N) by rka-oai · Pull Request #28494 · openai/codex

rka-oai · 2026-06-16T08:59:43Z

Stack

Depends on #28746. This PR implements shared rollout-budget accounting and model-visible reminders using the configuration defined in #28746.

Description / Main changes to Core:

AgentControl will now be the area where "rollout level" features & accounting will have to live. It is incorrectly named for this responsibility, but I think it can hold all the necessary shared state & features (rollout token budget, mutliple thread interruption responsibilitym etc)

In this PR, we have one "token ledger" that each thread will subtract from when sampling. The "charge" will occur when response.completed() is done and the calculation will be done on the responses api usage carrier. The calculation will weigh sampling and pre-fill tokens as specified.

Every time the budget crosses the configured reminder threshold, a developer message is appended before the thread's next request

This remaining budget will always be restated/reminded after a compaction event.

Expiration and fan-out interruption will be in the stacked follow-up (and also live in Agent Control).

Reminders

"You have weighted {session_tokens_left} tokens left in the shared session token budget."

The first request in each thread context receives the current remainder. Later reminders are emitted after aggregate weighted usage crosses a configured interval. If several intervals are crossed before a thread sends another request, Core inserts one reminder with the latest remainder.

Compaction response usage is charged before the next context starts. The next reminder is appended after the compaction summary, leaving the initial context content stable.

Tests

Integration coverage verifies:

weighted output and non-cached input accounting
initial and periodic reminders
shared accounting between a root and sub-agent
post-compaction remainder and message placement

Local checks:

just fmt
just test -p codex-core rollout_budget
git diff --check

The full workspace test suite was not run locally.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: cbb207243d

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-06-17T21:27:28Z

+        self.state.get_or_init(|| {
+            Mutex::new(RolloutBudgetState {
+                config,
+                weighted_tokens_used: 0.0,


Seed budget usage when resuming rollouts

When a root thread is resumed or forked from an existing rollout that already contains TokenCount usage, this initialization still starts weighted_tokens_used at zero. The session later restores TokenUsageInfo from the rollout history, but the new budget state is never seeded from it, so the first resumed request can incorrectly tell the model it has the full budget remaining and only counts post-resume usage.

AGENTS.md reference: AGENTS.md:L103-L110

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-06-17T21:27:28Z

+    });
+    sess.record_conversation_items(turn_context, std::slice::from_ref(&response_item))
+        .await;
+    budget.mark_reminder_delivered(sess.thread_id(), window_id, reminder);


Re-arm reminders after rollback

When a turn is interrupted or rolled back after this call, the contextual <rollout_budget> developer item can be trimmed from history, but the deliveries entry remains advanced. A later retry in the same thread/window at the same reminder index will skip the reminder even though it is no longer in model-visible context, so crossed budget thresholds can be silently missed after rollback.

Useful? React with 👍 / 👎.

added support for fresh reminder with latest after rollback (but will not increase the shared budget from a rollback to 1. keep complexity low and 2. work was technically done in those turns and should rightfully consume token budget from the ledger

chatgpt-codex-connector · 2026-06-17T21:27:28Z

        token_usage,
    } = compaction_output_result?;
    if let Some(token_usage) = token_usage {
+        sess.record_rollout_budget_usage(&token_usage);


Charge legacy remote compactions against the budget

This budget charge only runs for the RemoteCompactionV2 stream. When a provider uses remote compaction with RemoteCompactionV2 disabled, tasks/compact.rs routes through compact_remote.rs, whose compact_conversation_history path never records compaction token usage, so those potentially large compaction calls do not reduce the shared rollout budget while local/v2 compactions do.

Useful? React with 👍 / 👎.

not relevant

pakrym-oai · 2026-06-17T21:45:48Z

+    config: RolloutBudgetConfig,
+    weighted_tokens_used: f64,
+    /// Last reminder delivered to each thread, so every thread observes crossed thresholds.
+    deliveries: HashMap<ThreadId, ThreadBudgetDelivery>,


what happens to these post resume?

pakrym-oai · 2026-06-17T21:47:46Z

+            if !session_configuration.session_source.is_non_root_agent()
+                && let Some(rollout_budget) = config.rollout_budget
+            {
+                agent_control.rollout_budget().configure(rollout_budget);


can we do this when we create agent_control?

pakrym-oai

Let's init agent control in one place if possible.

## What This PR defines the structured configuration contract for shared rollout token budgets (across ALL agent threads under 1 rollout). ```toml [features.rollout_budget] enabled = true limit_tokens = 100000 reminder_interval_tokens = 10000 sampling_token_weight = 1.0 prefill_token_weight = 0.1 ``` The reminder interval defaults to 10% of the rollout limit. Sampling and prefill weights default to `1.0`. ## Scope This PR only defines and validates configuration. It does not track usage, inject reminders, or stop a rollout. Accounting and reminders are implemented in the stacked follow-up #28494. The existing `token_budget` feature remains unchanged. `rollout_budget` has its own feature key and configuration type. ## Tests The config test verifies that the structured fields resolve into `RolloutBudgetConfig` and do not enable the existing `token_budget` feature. Local checks: - `just write-config-schema` - `just test -p codex-core load_config_resolves_rollout_budget` - `cargo check -p codex-thread-manager-sample` - `git diff --check` The full workspace test suite was not run locally.

rka-oai commented Jun 16, 2026

View reviewed changes

Comment thread codex-rs/core/src/agent/control.rs Outdated

This was referenced Jun 17, 2026

📊 AI CLI 工具社区动态日报 2026-06-17 zx0828/big_model_radar#136

Open

📊 AI CLI 工具社区动态日报 2026-06-17 litang9/big_model_radar#75

Open

rka-oai changed the title ~~[codex] add shared session token budgets~~ [codex] add shared rollout token budgets Jun 17, 2026

rka-oai mentioned this pull request Jun 17, 2026

[codex] abort turns when rollout budgets expire (token budget 3/3) #28707

Merged

rka-oai force-pushed the codex/minimal-session-token-budget branch from b984e14 to 0cf2c87 Compare June 17, 2026 16:10

rka-oai changed the title ~~[codex] add shared rollout token budgets~~ [codex] track and remind shared rollout budgets Jun 17, 2026

rka-oai changed the base branch from main to codex/rollout-budget-config June 17, 2026 16:10

rka-oai mentioned this pull request Jun 17, 2026

[codex] add rollout token budget configuration (1/N) #28746

Merged

rka-oai force-pushed the codex/minimal-session-token-budget branch from 0cf2c87 to 845074e Compare June 17, 2026 20:28

rka-oai commented Jun 17, 2026

View reviewed changes

Comment thread codex-rs/core/tests/suite/rollout_budget.rs

rka-oai force-pushed the codex/minimal-session-token-budget branch from 4473161 to cbb2072 Compare June 17, 2026 21:16

rka-oai changed the title ~~[codex] track and remind shared rollout budgets~~ [codex] track and remind shared rollout budgets (varlength 2/N) Jun 17, 2026

rka-oai marked this pull request as ready for review June 17, 2026 21:20

rka-oai requested a review from a team as a code owner June 17, 2026 21:20

rka-oai changed the title ~~[codex] track and remind shared rollout budgets (varlength 2/N)~~ [codex] rollout budget implementation (varlength 2/N) Jun 17, 2026

chatgpt-codex-connector Bot reviewed Jun 17, 2026

View reviewed changes

pakrym-oai reviewed Jun 17, 2026

View reviewed changes

rka-oai force-pushed the codex/minimal-session-token-budget branch from cbb2072 to 7df6e0e Compare June 17, 2026 21:46

pakrym-oai reviewed Jun 17, 2026

View reviewed changes

pakrym-oai approved these changes Jun 17, 2026

View reviewed changes

Base automatically changed from codex/rollout-budget-config to main June 18, 2026 11:29

rka-oai force-pushed the codex/minimal-session-token-budget branch 2 times, most recently from e012ce9 to 0e01b88 Compare June 18, 2026 12:11

rka-oai enabled auto-merge (squash) June 18, 2026 12:37

rka-oai force-pushed the codex/minimal-session-token-budget branch from 0e01b88 to 9d97673 Compare June 18, 2026 12:39

github-actions Bot mentioned this pull request Jun 18, 2026

📊 AI CLI 工具社区动态日报 2026-06-18 litang9/big_model_radar#84

Open

rka-oai force-pushed the codex/minimal-session-token-budget branch 2 times, most recently from 1807f7f to 4333d42 Compare June 18, 2026 17:19

rka-oai added 6 commits June 18, 2026 11:07

Track and remind shared rollout budgets

90ed11f

Isolate post-compaction budget reminder coverage

445a679

Rearm rollout budget reminders after rollback

004733d

Initialize rollout budgets with agent control

c36d29a

Fix rollout budget argument annotation

2de3b84

Update rollout budget MAv2 request matching

bc62a74

rka-oai force-pushed the codex/minimal-session-token-budget branch from 4333d42 to bc62a74 Compare June 18, 2026 18:07

rka-oai merged commit 32a696d into main Jun 18, 2026
43 of 47 checks passed

rka-oai deleted the codex/minimal-session-token-budget branch June 18, 2026 18:52

github-actions Bot locked and limited conversation to collaborators Jun 18, 2026

rka-oai changed the title ~~[codex] rollout budget implementation (varlength 2/N)~~ [codex] rollout budget implementation (2/N) Jun 18, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[codex] rollout budget implementation (2/N)#28494

[codex] rollout budget implementation (2/N)#28494
rka-oai merged 6 commits into
mainfrom
codex/minimal-session-token-budget

rka-oai commented Jun 16, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

Uh oh!

chatgpt-codex-connector Bot Jun 17, 2026

Uh oh!

chatgpt-codex-connector Bot Jun 17, 2026

Uh oh!

rka-oai Jun 17, 2026 •

edited

Loading

Uh oh!

chatgpt-codex-connector Bot Jun 17, 2026

Uh oh!

rka-oai Jun 17, 2026

Uh oh!

pakrym-oai Jun 17, 2026

Uh oh!

pakrym-oai Jun 17, 2026

Uh oh!

rka-oai Jun 17, 2026

Uh oh!

pakrym-oai left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

rka-oai commented Jun 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Stack

Description / Main changes to Core:

Reminders

Tests

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector Bot Jun 17, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jun 17, 2026

Choose a reason for hiding this comment

Uh oh!

rka-oai Jun 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jun 17, 2026

Choose a reason for hiding this comment

Uh oh!

rka-oai Jun 17, 2026

Choose a reason for hiding this comment

Uh oh!

pakrym-oai Jun 17, 2026

Choose a reason for hiding this comment

Uh oh!

pakrym-oai Jun 17, 2026

Choose a reason for hiding this comment

Uh oh!

rka-oai Jun 17, 2026

Choose a reason for hiding this comment

Uh oh!

pakrym-oai left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

rka-oai commented Jun 16, 2026 •

edited

Loading

rka-oai Jun 17, 2026 •

edited

Loading