tui: avoid Esc interrupt when skill popup active#9451
Merged
joshka-oai merged 4 commits intomainfrom Jan 19, 2026
Merged
Conversation
When a task is running, Esc should dismiss the skill dropdown without interrupting the task. Add a regression test for the skill popup case and keep the existing behavior (Esc interrupts) when no popup is active. While here, make a few macOS-focused tests more robust (Homebrew bash path and seatbelt stderr variants) and keep core tests hermetic by default by setting HOME/ZDOTDIR in the test config.
Contributor
|
All contributors have signed the CLA ✍️ ✅ |
Contributor
|
I have read the CLA Document and I hereby sign the CLA |
Contributor
|
recheck |
- Avoid hardcoding specific bash/sh install paths in shell detection tests. - Keep test harness config helper unchanged (no HOME/ZDOTDIR overrides). - Make the structured-output shell_command test pass reliably by using a non-login shell.
User requested keeping this PR focused on the TUI Esc/skill-popup fix; revert unrelated core changes.
joshka-oai
approved these changes
Jan 18, 2026
Collaborator
joshka-oai
left a comment
joshka-oai
left a comment
There was a problem hiding this comment.
LGTM - can you add a test for the / command popup too to ensure that also doesn't interrupt the conversation?
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.
4 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.
Fixes #9450
What
Escnow dismisses the popup instead of sendingOp::Interrupt.Escstill interrupts a running task when no popup is active.Tests
cargo test -p codex-tui