chore: fix merge race (auto-compaction feature access)#29393
Merged
Conversation
sayan-oai
changed the title
rhan-oai
approved these changes
Jun 22, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
AutoCompactionfeature flag throughTurnContext::configWhy
#28260 was validated against an older base where
TurnContextexposed a directfeaturesfield. It was then merged after that field had moved underconfig, leaving the merge result unable to compile withE0609onturn_context.features.This restores compilation for Bazel, SDK, and argument-comment-lint jobs that build
codex-core. Behavior is unchanged: disablingauto_compactionstill skips automatic compaction.Validation
just fmtCODEX_HOME=/private/tmp/codex-fix-auto-compaction-test-home just test -p codex-core auto_compaction_feature_disabled— 4 passedjust test -p codex-core—codex-corecompiled; 2,722 passed and 89 unrelated local-environment failures remained because the sandbox could not write the default Codex SQLite/proxy paths and some first-party test binaries were unavailable