core/core-agent-ide
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: use proxy for encrypted summary (#7252)

Browse source
This commit is contained in:
jif-oai 2025-11-24 17:51:47 +01:00 • committed by GitHub
parent b519267d05
commit 99bcb90353
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
codex-rs/core/src/context_manager/history.rs
View file

@ -84,9 +84,19 @@ impl ContextManager {
.unwrap_or(i64::MAX);
let items_tokens = self.items.iter().fold(0i64, |acc, item| {
let serialized = serde_json::to_string(item).unwrap_or_default();
let item_tokens = i64::try_from(approx_token_count(&serialized)).unwrap_or(i64::MAX);
acc.saturating_add(item_tokens)
acc + match item {
ResponseItem::Reasoning {
encrypted_content: Some(content),
..
}
| ResponseItem::CompactionSummary {
encrypted_content: content,
} => estimate_reasoning_length(content.len()) as i64,
item => {
let serialized = serde_json::to_string(item).unwrap_or_default();
i64::try_from(approx_token_count(&serialized)).unwrap_or(i64::MAX)
}
}
});
Some(base_tokens.saturating_add(items_tokens))
@ -145,21 +155,13 @@ impl ContextManager {
None
}
})
.map(Self::estimate_reasoning_length)
.map(estimate_reasoning_length)
.fold(0usize, usize::saturating_add);
let token_estimate = approx_tokens_from_byte_count(total_reasoning_bytes);
token_estimate as usize
}
fn estimate_reasoning_length(encoded_len: usize) -> usize {
encoded_len
.saturating_mul(3)
.checked_div(4)
.unwrap_or(0)
.saturating_sub(650)
}
pub(crate) fn get_total_token_usage(&self) -> i64 {
self.token_info
.as_ref()
@ -247,6 +249,14 @@ fn is_api_message(message: &ResponseItem) -> bool {
}
}
fn estimate_reasoning_length(encoded_len: usize) -> usize {
encoded_len
.saturating_mul(3)
.checked_div(4)
.unwrap_or(0)
.saturating_sub(650)
}
#[cfg(test)]
#[path = "history_tests.rs"]
mod tests;