Refactor chatwidget orchestration into modules (phase 5)#22537
Merged
Conversation
canvrno-oai
approved these changes
May 13, 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.
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.
Why
chatwidget.rsis still carrying too many unrelated responsibilities in one file. #22269 started a five-phase cleanup to move coherent behavior domains into focused modules while keepingchatwidget.rsas the composition layer. #22407 completed phase 2 by extracting input and submission flow, #22433 completed phase 3 by extracting protocol, replay, streaming, and tool lifecycle handling, and #22518 completed phase 4 by extracting settings, popups, and status surfaces.This PR is phase 5. It cleans up the remaining constructor and orchestration code now that the larger behavior domains have moved out, leaving
chatwidget.rsmuch closer to the composition layer the cleanup was aiming for. This is once again a mechanical movement of existing functions. No functional changes.What Changed
codex-rs/tui/src/chatwidget.rs.codex-rs/tui/src/chatwidget.rsas the registration and composition surface for the extracted behavior modules.Cleanup Phases
The five-phase cleanup plan from #22269 is:
chatwidget.rsas the composition layer. This PR.Verification
cargo check -p codex-tuicargo test -p codex-tui chatwidget::tests::popups_and_settingscargo test -p codex-tui chatwidget::tests::plan_modecargo test -p codex-tui chatwidget::tests::review_modecargo test -p codex-tui chatwidget::tests::status_and_layoutcargo test -p codex-tuialso compiles and begins running, but aborts in the unchanged app-side testapp::tests::discard_side_thread_keeps_local_state_when_server_close_failswith the same reproducible stack overflow noted in phase 4.