mirror of
https://github.com/openai/codex.git
synced 2026-11-15 22:53:30 +00:00
Persist response token usage in rollout history (#41912)
## Why Resumed threads need to continue per-turn and per-thread token totals without scanning arbitrarily far beyond the latest compaction checkpoint. ## What changed - Add durable `TokenUsageRecord` rollout items with response, turn, thread, session, and root-turn attribution. - Restore accumulated usage on resume and snapshot the latest record plus the compaction response ID in compaction checkpoints. - Preserve root-turn lineage in persisted turn context, while ensuring forked child threads start with their own usage totals. ## Testing - Cover usage accumulation across multiple responses and resumed turns. - Cover local and remote compaction checkpoints, invalid remote compaction output, rollout reconstruction, and fork isolation. GitOrigin-RevId: ef9e0c4a9102a08a2c382be4cdac68c84353c90a
This commit is contained in:
1 parent
a7913390f7
commit
5f79a92e39
67 files changed
+932
-162
No files matched your search
@@ -35,7 +35,7 @@ impl Session {
|
||||
}
|
||||
}
|
||||
|
||||
/// Injects hook context while classifying its actual receiving turn atomically.
|
||||
/// Injects hook context into the running turn atomically.
|
||||
#[expect(
|
||||
clippy::await_holding_invalid_type,
|
||||
reason = "active turn provenance and turn state updates must remain atomic"
|
||||
@@ -43,19 +43,13 @@ impl Session {
|
||||
pub(crate) async fn inject_hook_context_if_running(
|
||||
&self,
|
||||
input: Vec<ResponseItem>,
|
||||
source_turn_id: Option<&str>,
|
||||
) -> Result<(), Vec<ResponseItem>> {
|
||||
let mut active = self.active_turn.lock().await;
|
||||
let Some(active_turn) = active.as_mut() else {
|
||||
return Err(input);
|
||||
};
|
||||
let Some(task) = active_turn.task.as_ref() else {
|
||||
if active_turn.task.is_none() {
|
||||
return Err(input);
|
||||
};
|
||||
if source_turn_id != Some(task.turn_context.sub_id.as_str()) {
|
||||
task.turn_context
|
||||
.turn_metadata_state
|
||||
.mark_root_turn_ambiguous();
|
||||
}
|
||||
self.input_queue
|
||||
.extend_pending_input_and_accept_mailbox_delivery_for_turn_state(
|
||||
@@ -86,11 +80,6 @@ impl Session {
|
||||
.collect::<Vec<_>>();
|
||||
let mut active = self.active_turn.lock().await;
|
||||
if let Some(active_turn) = active.as_mut() {
|
||||
if let Some(task) = active_turn.task.as_ref() {
|
||||
task.turn_context
|
||||
.turn_metadata_state
|
||||
.mark_root_turn_ambiguous();
|
||||
}
|
||||
self.input_queue
|
||||
.extend_pending_input_and_accept_mailbox_delivery_for_turn_state(
|
||||
active_turn.turn_state.as_ref(),
|
||||
|
||||
Reference in new issue
Block a user