Skip to content

[codex] stylistic changes #29068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rka-oai merged 2 commits into from
Jun 23, 2026
Merged

[codex] stylistic changes #29068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5d1cc6
[codex] match on remote compaction results
rka-oai Jun 19, 2026
5770677
[codex] simplify compaction budget test setup
rka-oai Jun 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions codex-rs/core/src/compact_remote_v2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
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);
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)
}
}
Ok(())
}

async fn run_remote_compact_task_inner_impl(
Expand Down
9 changes: 2 additions & 7 deletions codex-rs/core/tests/suite/rollout_budget.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,15 +282,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_interval_tokens: 5,
Expand All @@ -301,6 +294,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)
Expand Down
Loading