Skip to content

Revert "Preserve Codex [tui] settings across managed CODEX_HOME remirrors (#9475)" - #10085

Merged
AmethystLiang merged 1 commit into
mainfrom
revert-codex-tui-9475
Jul 23, 2026
Merged

AmethystLiang merged 1 commit into
mainfrom
revert-codex-tui-9475

Conversation

@AmethystLiang

@AmethystLiang AmethystLiang commented Jul 23, 2026 •

Copy link
Copy Markdown
Contributor

Why

#9475 (unreleased — not in any tag, including v1.4.152) needs a hardened v1→v2 baseline migration before it can ship safely. Review of the follow-up migration work (fix-p0-codex-tui-baseline) found that making the upgrade conflict-safe requires more design than a release-window patch allows:

  • Users upgrading with a pre-tui (v1) .orca-config-settings-baseline.json hit a three-way ambiguity: a runtime↔system [tui] divergence with no baseline entry to arbitrate it.
  • The candidate fix resolved this with config.toml mtime heuristics + pausing the whole config mirror on ambiguity. That introduced two credible regressions worse than the original problem: a paused sync can become permanent on WSL (utimesSync over \\wsl$ failing leaves the tie-break anchor stale, halting all config mirroring for the distro), and after a pause the standoff is resolved by whichever config.toml gets written first for any reason (Codex trust writes, Orca hook-trust promotion) — which can silently overwrite the user's newer ~/.codex tui edit with a stale value.

Reverting is zero-cost to users (the feature never shipped) and unblocks the release. Re-land is tracked in Linear with the full analysis and a proposed content-anchored migration design.

Verification

Made with Orca 🐋

@coderabbitai

coderabbitai Bot commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 1ddcb7d8-89c6-45b8-bf53-bf9758470ec3

📥 Commits

Reviewing files that changed from the base of the PR and between 1d8ce38 and 5b93eea.

📒 Files selected for processing (5)
  • config/tsconfig.cli.json
  • src/main/codex/codex-config-settings-upsert.ts
  • src/main/codex/config-settings-promotion.test.ts
  • src/main/codex/config-settings-promotion.ts
  • src/main/codex/config-toml-key-path.ts
💤 Files with no reviewable changes (3)
  • config/tsconfig.cli.json
  • src/main/codex/config-toml-key-path.ts
  • src/main/codex/codex-config-settings-upsert.ts

📝 Walkthrough

Walkthrough

Codex configuration promotion now processes only top-level scalar settings from the TOML preamble. Runtime and system values are compared against stored baselines before updates are generated. A local upsert helper replaces or inserts top-level assignments while preserving line endings and trailing-newline behavior. Structured [tui] promotion, TOML key-path utilities, related tests, atomic-write tracking, and the removed modules’ CLI compilation entries were deleted.

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Description check ⚠️ Warning The description is missing the required template sections: Summary, Screenshots, Testing, AI Review Report, Security Audit, and Notes. Rewrite the PR description to match the repository template and add each required section, including testing results and the requested review/audit notes.
✅ Passed checks (4 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly states this is a revert of the Codex tui-settings preservation change.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@AmethystLiang
AmethystLiang merged commit 09756df into main Jul 23, 2026
2 checks passed
brennanb2025 added a commit that referenced this pull request Jul 23, 2026
…0213)

* Reapply "Preserve Codex [tui] settings across managed CODEX_HOME remirrors (#9475)" (#10085)

This reverts commit 09756df.

* fix(codex): anchor settings baseline migration
gal064 pushed a commit to gal064/orca that referenced this pull request Jul 25, 2026
enrick-dev pushed a commit to enrick-dev/orca that referenced this pull request Oct 15, 2026
enrick-dev pushed a commit to enrick-dev/orca that referenced this pull request Oct 15, 2026
…ablyai#10213)

* Reapply "Preserve Codex [tui] settings across managed CODEX_HOME remirrors (stablyai#9475)" (stablyai#10085)

This reverts commit f86e28f.

* fix(codex): anchor settings baseline migration
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant