fix(tui): persist ctrl-c draft via app event#21397
Merged
Merged
Conversation
pakrym-oai
approved these changes
May 6, 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
The main branch started failing after #21351 merged because the merge commit kept calling
AppCommand::add_to_historyfromBottomPane::clear_composer_for_ctrl_c, but main had already removed that helper as part of the history persistence refactor. The PR head passed because it was based on an older main commit where the helper still existed.This restores the Ctrl+C draft-stashing behavior using the current app-event path instead of the removed command helper.
What Changed
ThreadIdinBottomPanewhen history metadata is provided.AppEvent::AppendMessageHistoryEntryfor Ctrl+C-cleared drafts.How to Test
Targeted tests:
cargo test -p codex-tui slash_clear_after_ctrl_c_keeps_stashed_draft_recallableBroader local checks:
just fix -p codex-tuijust argument-comment-lint -p codex-tuigit diff --check origin/main...HEADcargo test -p codex-tuireached completion; the fixed test passed, and the only local failures werestatus::tests::status_permissions_full_disk_managed_*, blocked by this machine config rejectingDangerFullAccessvia/etc/codex/requirements.toml.