fix: scope context remaining to body window

This commit is contained in:
Michael Bolin
2026-06-23 14:52:06 -07:00
parent a68df3bb0e
commit 5ffef47eb7
4 changed files with 204 additions and 33 deletions
+50 -19
View File
@@ -10,21 +10,17 @@ pub(crate) struct ContextWindowTokenStatus {
pub(crate) auto_compact_scope_tokens: i64,
pub(crate) auto_compact_scope_limit: i64,
pub(crate) full_context_window_limit: Option<i64>,
pub(crate) tokens_until_compaction: i64,
pub(crate) auto_compact_window_prefill_tokens: Option<i64>,
pub(crate) full_context_window_limit_reached: bool,
pub(crate) token_limit_reached: bool,
pub(crate) context_remaining_tokens: Option<i64>,
}
impl ContextWindowTokenStatus {
pub(crate) fn tokens_until_compaction(&self) -> i64 {
let full_context_remaining = self.full_context_window_limit.map_or(i64::MAX, |limit| {
limit.saturating_sub(self.active_context_tokens)
});
self.auto_compact_scope_limit
.saturating_sub(self.auto_compact_scope_tokens)
.min(full_context_remaining)
.max(0)
}
struct BodyAfterPrefixWindowStatus {
full_context_window_limit: Option<i64>,
auto_compact_window_prefill_tokens: Option<i64>,
has_context_remaining_limit: bool,
}
pub(crate) async fn context_window_token_status(
@@ -32,8 +28,8 @@ pub(crate) async fn context_window_token_status(
turn_context: &TurnContext,
) -> ContextWindowTokenStatus {
let active_context_tokens = sess.get_total_token_usage().await;
let mut auto_compact_window_prefill_tokens = None;
let (auto_compact_scope_tokens, auto_compact_scope_limit, full_context_window_limit) =
let (auto_compact_scope_tokens, auto_compact_scope_limit, body_window) =
match turn_context.config.model_auto_compact_token_limit_scope {
AutoCompactTokenLimitScope::Total => (
active_context_tokens,
@@ -45,32 +41,67 @@ pub(crate) async fn context_window_token_status(
),
AutoCompactTokenLimitScope::BodyAfterPrefix => {
let window = sess.auto_compact_window_snapshot().await;
auto_compact_window_prefill_tokens = window.prefill_input_tokens;
let baseline = window.prefill_input_tokens.unwrap_or(active_context_tokens);
let scope_limit = turn_context
.config
.model_auto_compact_token_limit
.or_else(|| turn_context.model_info.auto_compact_token_limit());
let full_context_window_limit = turn_context.model_context_window();
(
active_context_tokens.saturating_sub(baseline),
turn_context
.config
.model_auto_compact_token_limit
.or_else(|| turn_context.model_info.auto_compact_token_limit())
.unwrap_or(i64::MAX),
turn_context.model_context_window(),
scope_limit.unwrap_or(i64::MAX),
Some(BodyAfterPrefixWindowStatus {
full_context_window_limit,
auto_compact_window_prefill_tokens: window.prefill_input_tokens,
has_context_remaining_limit: scope_limit.is_some()
|| full_context_window_limit.is_some(),
}),
)
}
};
let full_context_window_limit = body_window
.as_ref()
.and_then(|window| window.full_context_window_limit);
let auto_compact_window_prefill_tokens = body_window
.as_ref()
.and_then(|window| window.auto_compact_window_prefill_tokens);
let full_context_window_limit_reached =
full_context_window_limit.is_some_and(|full_context_window_limit| {
active_context_tokens >= full_context_window_limit
});
let token_limit_reached =
auto_compact_scope_tokens >= auto_compact_scope_limit || full_context_window_limit_reached;
let full_context_remaining = full_context_window_limit.map_or(i64::MAX, |limit| {
limit.saturating_sub(active_context_tokens)
});
let tokens_until_compaction = auto_compact_scope_limit
.saturating_sub(auto_compact_scope_tokens)
.min(full_context_remaining)
.max(0);
let context_remaining_tokens = match body_window {
Some(body_window) => body_window
.has_context_remaining_limit
.then_some(tokens_until_compaction),
None => turn_context
.model_context_window()
.map(|limit| limit.saturating_sub(active_context_tokens).max(0)),
};
ContextWindowTokenStatus {
active_context_tokens,
auto_compact_scope_tokens,
auto_compact_scope_limit,
full_context_window_limit,
tokens_until_compaction,
auto_compact_window_prefill_tokens,
full_context_window_limit_reached,
token_limit_reached,
context_remaining_tokens,
}
}