[codex] stylistic changes (#29068)

## Summary

- express remote compaction result handling as an exhaustive match
- preserve the special `TurnAborted` path without emitting a generic
compaction error
- rely on the standard `test_codex` provider setup in the compaction
budget test

Follow-up to review feedback on #28707.

## Testing

- `just test -p codex-core
compaction_budget_exhaustion_aborts_without_error_or_retry`
- `just fmt`
This commit is contained in:
rka-oai
2026-06-22 23:17:12 -07:00
committed by GitHub
Unverified
parent e0ac5d3c15
commit 802c98cab4
2 changed files with 13 additions and 18 deletions
+11 -11
View File
@@ -165,18 +165,18 @@ async fn run_remote_compact_task_inner(
attempt
.track(sess.as_ref(), status, codex_error, analytics_details)
.await;
if matches!(&result, Err(CodexErr::TurnAborted)) {
return result;
match result {
Ok(()) => Ok(()),
Err(err @ CodexErr::TurnAborted) => Err(err),
Err(err) => {
sess.track_turn_codex_error(turn_context, &err);
let event = EventMsg::Error(
err.to_error_event(Some("Error running remote compact task".to_string())),
);
sess.send_event(turn_context, event).await;
Err(err)
}
}
if let Err(err) = result {
sess.track_turn_codex_error(turn_context, &err);
let event = EventMsg::Error(
err.to_error_event(Some("Error running remote compact task".to_string())),
);
sess.send_event(turn_context, event).await;
return Err(err);
}
Ok(())
}
async fn run_remote_compact_task_inner_impl(
+2 -7
View File
@@ -284,15 +284,8 @@ async fn compaction_budget_exhaustion_aborts_without_error_or_retry(remote_v2: b
])
};
let responses = mount_sse_sequence(&server, vec![compact_response]).await;
let mut model_provider = built_in_model_providers(/*openai_base_url*/ None)["openai"].clone();
model_provider.base_url = Some(format!("{}/v1", server.uri()));
model_provider.supports_websockets = false;
if !remote_v2 {
model_provider.name = "OpenAI-compatible test provider".to_string();
}
let test = test_codex()
.with_config(move |config| {
config.model_provider = model_provider;
config.rollout_budget = Some(RolloutBudgetConfig {
limit_tokens: 10,
reminder_at_remaining_tokens: vec![5],
@@ -303,6 +296,8 @@ async fn compaction_budget_exhaustion_aborts_without_error_or_retry(remote_v2: b
.features
.enable(Feature::RemoteCompactionV2)
.expect("test config should allow remote compaction v2");
} else {
config.model_provider.name = "OpenAI-compatible test provider".to_string();
}
})
.build(&server)