From 3e9e1d993ded7e93ba07985f16730a5ce4732bbc Mon Sep 17 00:00:00 2001
From: jif-oai <jif@openai.com>
Date: Wed, 19 Nov 2025 11:26:01 +0000
Subject: [PATCH] chore: consolidate compaction token usage (#6894)

---
 codex-rs/core/src/codex.rs          | 13 ++++++++-----
 codex-rs/core/src/compact.rs        | 10 +---------
 codex-rs/core/src/compact_remote.rs | 10 +---------
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs
index b32650e28..a68ea2fd4 100644
--- a/codex-rs/core/src/codex.rs
+++ b/codex-rs/core/src/codex.rs
@@ -1085,11 +1085,14 @@ impl Session {
         self.send_token_count_event(turn_context).await;
     }
 
-    pub(crate) async fn override_last_token_usage_estimate(
-        &self,
-        turn_context: &TurnContext,
-        estimated_total_tokens: i64,
-    ) {
+    pub(crate) async fn recompute_token_usage(&self, turn_context: &TurnContext) {
+        let Some(estimated_total_tokens) = self
+            .clone_history()
+            .await
+            .estimate_token_count(turn_context)
+        else {
+            return;
+        };
         {
             let mut state = self.state.lock().await;
             let mut info = state.token_info().unwrap_or(TokenUsageInfo {
diff --git a/codex-rs/core/src/compact.rs b/codex-rs/core/src/compact.rs
index b5ece9089..8c38f9393 100644
--- a/codex-rs/core/src/compact.rs
+++ b/codex-rs/core/src/compact.rs
@@ -171,15 +171,7 @@ async fn run_compact_task_inner(
         .collect();
     new_history.extend(ghost_snapshots);
     sess.replace_history(new_history).await;
-
-    if let Some(estimated_tokens) = sess
-        .clone_history()
-        .await
-        .estimate_token_count(&turn_context)
-    {
-        sess.override_last_token_usage_estimate(&turn_context, estimated_tokens)
-            .await;
-    }
+    sess.recompute_token_usage(&turn_context).await;
 
     let rollout_item = RolloutItem::Compacted(CompactedItem {
         message: summary_text.clone(),
diff --git a/codex-rs/core/src/compact_remote.rs b/codex-rs/core/src/compact_remote.rs
index 51c35baf3..0d2e0f138 100644
--- a/codex-rs/core/src/compact_remote.rs
+++ b/codex-rs/core/src/compact_remote.rs
@@ -66,15 +66,7 @@ async fn run_remote_compact_task_inner_impl(
         new_history.extend(ghost_snapshots);
     }
     sess.replace_history(new_history.clone()).await;
-
-    if let Some(estimated_tokens) = sess
-        .clone_history()
-        .await
-        .estimate_token_count(turn_context.as_ref())
-    {
-        sess.override_last_token_usage_estimate(turn_context.as_ref(), estimated_tokens)
-            .await;
-    }
+    sess.recompute_token_usage(turn_context).await;
 
     let compacted_item = CompactedItem {
         message: String::new(),