clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 06:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Preserve realtime startup context sections under truncation"

Browse Source 
This reverts commit f091626680.
This commit is contained in:
David de Regt
2026-04-16 11:51:04 -07:00
parent 551e340cc0
commit 70fd2d0690
2 changed files with 14 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
codex-rs/core/src/realtime_context.rs
View File

@@ -108,7 +108,7 @@ pub(crate) async fn build_realtime_startup_context(
parts.push(section);
}
let context = format_startup_context_blob(&parts, budget_tokens);
let context = format_startup_context_blob(&parts.join("\n\n"), budget_tokens);
debug!(
approx_tokens = approx_token_count(&context),
bytes = context.len(),
@@ -446,58 +446,24 @@ fn format_section(title: &str, body: Option<String>, budget_tokens: usize) -> Op
))
}
fn format_startup_context_blob(parts: &[String], budget_tokens: usize) -> String {
fn format_startup_context_blob(body: &str, budget_tokens: usize) -> String {
let wrapper = format!("{STARTUP_CONTEXT_OPEN_TAG}\n\n{STARTUP_CONTEXT_CLOSE_TAG}");
let body_budget = budget_tokens.saturating_sub(approx_token_count(&wrapper));
let mut body_parts = Vec::new();
let mut used_tokens = 0usize;
let mut body_budget = budget_tokens.saturating_sub(approx_token_count(&wrapper));
for part in parts {
let separator = if !body_parts.is_empty() {
"\n\n"
} else {
Default::default()
};
let candidate = format!("{separator}{part}");
let candidate_tokens = approx_token_count(&candidate);
if used_tokens + candidate_tokens <= body_budget {
body_parts.push(part.clone());
used_tokens += candidate_tokens;
continue;
}
let remaining_budget = body_budget.saturating_sub(used_tokens);
if remaining_budget == 0 {
break;
}
let candidate = truncate_startup_context_part_to_budget(&candidate, remaining_budget);
if !candidate.is_empty() {
body_parts.push(candidate);
}
break;
}
let body = body_parts.join("\n\n");
format!("{STARTUP_CONTEXT_OPEN_TAG}\n{body}\n{STARTUP_CONTEXT_CLOSE_TAG}")
}
fn truncate_startup_context_part_to_budget(part: &str, budget_tokens: usize) -> String {
let mut truncation_budget = budget_tokens;
loop {
let candidate = truncate_text(part, TruncationPolicy::Tokens(truncation_budget));
let candidate = candidate.trim().to_string();
if approx_token_count(&candidate) <= budget_tokens {
return candidate;
let body = truncate_text(body, TruncationPolicy::Tokens(body_budget));
let wrapped = format!("{STARTUP_CONTEXT_OPEN_TAG}\n{body}\n{STARTUP_CONTEXT_CLOSE_TAG}");
let wrapped_tokens = approx_token_count(&wrapped);
if wrapped_tokens <= budget_tokens || body_budget == 0 {
return wrapped;
}
let excess_tokens = approx_token_count(&candidate).saturating_sub(budget_tokens);
let next_budget = truncation_budget.saturating_sub(excess_tokens.max(1));
if next_budget == truncation_budget {
return candidate;
let excess_tokens = wrapped_tokens.saturating_sub(budget_tokens);
let next_budget = body_budget.saturating_sub(excess_tokens.max(1));
if next_budget == body_budget {
return wrapped;
}
truncation_budget = next_budget;
body_budget = next_budget;
}
}

2
codex-rs/core/src/realtime_context_tests.rs
View File

@@ -179,7 +179,7 @@ fn startup_context_blob_is_wrapped_in_tags_and_fits_budget() {
"workspace tree ".repeat(800),
);
let wrapped = format_startup_context_blob(&[body], /*budget_tokens*/ 200);
let wrapped = format_startup_context_blob(&body, /*budget_tokens*/ 200);
assert!(wrapped.starts_with("<startup_context>\n"));
assert!(wrapped.ends_with("\n</startup_context>"));