Move token usage/context information to session level #3221
Conversation
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
Replace EventMsg::TokenCount(Option<TokenUsageInfo>) with EventMsg::TokenCount(TokenCountEvent) and update all sites and consumers to use the new struct. Remove ZDR documentation/config references no longer in use.
pakrym-oai
changed the title
jif-oai
approved these changes
Sep 6, 2025
codex-rs/core/src/codex.rs
Outdated
| .send(Event { | ||
| id: sub_id.to_string(), | ||
| msg: EventMsg::TokenCount(crate::protocol::TokenCountEvent { | ||
| info: info.clone(), |
| @@ -521,12 +521,54 @@ pub struct TaskStartedEvent { | |||
| #[derive(Debug, Clone, Deserialize, Serialize, Default)] | |||
| pub struct TokenUsage { | |||
| pub input_tokens: u64, | |||
| pub cached_input_tokens: Option<u64>, | |||
| pub cached_input_tokens: u64, | |||
There was a problem hiding this comment.
General comment: we should not used unsigned int for this kind of thing. Unsigned arithmetic is not as good as signed one, it can fail gracefully in a lot of ways etc
This is a good reading on the topic (TLDR; this is not because it must be non-negative that we should use unsigned ints)
https://hamstergene.github.io/posts/2021-10-30-do-not-use-unsigned-for-nonnegativity/
There was a problem hiding this comment.
Good to know! I won't churn this PR but make sure to avoid unsigned where possible.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Move context information into the main loop so it can be used to interrupt the loop or start auto-compaction.