Skip to content

chore: fix merge race (auto-compaction feature access) #29393

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
sayan-oai merged 1 commit into from
Jun 22, 2026
Merged

chore: fix merge race (auto-compaction feature access) #29393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions codex-rs/core/src/session/turn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,10 @@ pub(crate) async fn run_turn(
}

// as long as compaction works well in getting us way below the token limit, we shouldn't worry about being in an infinite loop.
if turn_context.features.enabled(Feature::AutoCompaction)
if turn_context
.config
.features
.enabled(Feature::AutoCompaction)
&& token_limit_reached
&& needs_follow_up
{
Expand Down Expand Up @@ -848,7 +851,11 @@ async fn run_pre_sampling_compact(
turn_context: &Arc<TurnContext>,
client_session: &mut ModelClientSession,
) -> CodexResult<()> {
if !turn_context.features.enabled(Feature::AutoCompaction) {
if !turn_context
.config
.features
.enabled(Feature::AutoCompaction)
{
return Ok(());
}

Expand Down
Loading