fix(chat-state): reasoning estimate and calibration reseed on every rewrite
A Reasoning item counted its text and its encrypted blob as two separate payloads, inflating the estimate for retained reasoning; the estimate now takes the larger of the two (base64 runs 4/3 over the raw bytes). Only compaction carried the provider-confirmed ratio into the reseeded total; a rewind or a non-compaction replace sprang the context meter back to the raw estimate. reseed_total_tokens applies the ratio (capped at the pre-rewrite total) to every rewrite, and the truncate path uses it too. Ported from upstream 1.0.1x (grok-build xai-chat-state actor/state.rs, mutations.rs, queries.rs). Claude-Session: https://claude.ai/code/session_01RUqV8HVGXcAETyYbZ2tPQ4
This commit is contained in:
1 parent
00a5e318bb
commit
fc7113ba3c
4 files changed
+73
-33
No files matched your search
@@ -658,22 +658,66 @@ async fn compaction_reseed_without_provider_count_matches_plain_estimate() {
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn non_compaction_replace_does_not_carry_overhead() {
|
||||
async fn non_compaction_replace_carries_confirmed_total() {
|
||||
// A rewind/mode-switch replace scales from the provider-confirmed count, not the raw estimate.
|
||||
let h = TestHarness::new();
|
||||
h.handle
|
||||
.push_user_message(ConversationItem::user("x".repeat(4000)));
|
||||
h.handle.record_token_usage(51_000);
|
||||
h.handle.record_token_usage(500);
|
||||
// Estimate at last response = 1_000, confirmed = 500 → ratio 0.5.
|
||||
|
||||
h.handle
|
||||
.replace_conversation(vec![ConversationItem::user("q".repeat(4000))]);
|
||||
|
||||
let total = h.handle.get_total_tokens().await;
|
||||
assert_eq!(
|
||||
total, 1_000,
|
||||
"non-compaction replace (e.g. rewind) keeps the plain estimate"
|
||||
total, 500,
|
||||
"same-size replace carries the provider-confirmed count"
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn replace_never_increases_total_tokens() {
|
||||
// A growing replace is capped at the confirmed total; the under-count self-heals on the next usage.
|
||||
let h = TestHarness::new();
|
||||
h.handle
|
||||
.push_user_message(ConversationItem::user("x".repeat(4000)));
|
||||
h.handle.record_token_usage(1_500);
|
||||
|
||||
h.handle
|
||||
.replace_conversation(vec![ConversationItem::user("q".repeat(40_000))]);
|
||||
|
||||
assert_eq!(h.handle.get_total_tokens().await, 1_500);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn truncate_scales_from_confirmed_total() {
|
||||
// Rewind path: TruncateToPromptIndex must use the same carry as replace_conversation.
|
||||
let h = TestHarness::new();
|
||||
h.handle
|
||||
.push_user_message(ConversationItem::user("x".repeat(4000)));
|
||||
h.handle.increment_prompt_index();
|
||||
h.handle
|
||||
.push_user_message(ConversationItem::user("y".repeat(4000)));
|
||||
h.handle.increment_prompt_index();
|
||||
h.handle.record_token_usage(1_000);
|
||||
// Estimate at last response = 2_000, confirmed = 1_000 → ratio 0.5.
|
||||
|
||||
h.handle.truncate_to_prompt_index(1).await;
|
||||
|
||||
// Keeps the first user item (raw estimate 1_000) → scaled to 500.
|
||||
assert_eq!(h.handle.get_total_tokens().await, 500);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn reasoning_estimate_takes_the_larger_of_text_and_ciphertext() {
|
||||
// "thinking for r1" is 15 bytes; 800 base64 bytes are ~600 raw bytes.
|
||||
let encrypted = reasoning_sibling("r1", Some(&"A".repeat(800)));
|
||||
assert_eq!(crate::estimate_conversation_tokens(&[encrypted]), 150);
|
||||
let plain = reasoning_sibling("r1", None);
|
||||
assert_eq!(crate::estimate_conversation_tokens(&[plain]), 3);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn flush_calls_persistence_flush() {
|
||||
let mut h = TestHarness::new();
|
||||
|
||||
Reference in new issue
Block a user