fix(tui): preserve modal focus across dialog replacement#36656
Merged
Conversation
Closing one dialog scheduled focus restoration even when its command immediately opened another dialog. Guard the deferred restore against a non-empty dialog stack so the replacement modal retains exclusive keyboard ownership. Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
opencode-agent
Bot
force-pushed
the
v2-modal-focus-root-cause
branch
from
c71d328 to
f68ef8c
Compare
simonklee
approved these changes
Jul 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 join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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
Prevent deferred background focus restoration when a replacement dialog is already open, keeping the replacement modal as the exclusive keyboard owner.
Root cause
Selecting Settings from Commands calls
dialog.clear()before dispatching the selected command.clear()schedules the remembered prompt focus to be restored after 1 ms. The Settings command immediately opens a replacement dialog, but the stale callback still runs and focuses the prompt behind it.The guard now re-checks the live dialog stack before restoring focus.
Fixes #36652