fix(desktop): Esc closes the open modal instead of aborting the model#1685
Merged
Conversation
Two related papercuts in the desktop client: 1. Esc during streaming with a modal (settings / about / jobs popover / workdir popover) open used to fire `abort()` and leave the modal sitting on screen. Now the global Esc handler bails out when any of those flags is set; settings/about modals each install their own `keydown` listener that calls `onClose()`. JobsPop and WorkdirPop already had their own handlers, so this just rounds out the set. 2. Clicking (or Enter-ing) the already-active session in the sidebar used to round-trip a session_load and clear live in-turn state (issue #1653). Skip when `s.name === activeName`. Co-authored-by: CVEngineer <129239603+CVEngineer66@users.noreply.github.com>
esengine
pushed a commit
that referenced
this pull request
May 24, 2026
…moved, persisted usage stats, plan dispatch gate Headline themes: - Desktop: bundle the CLI-hosted React dashboard, retire Tauri+Preact duplicate (#1418) - Config: drop preset abstraction; flash/pro are direct model selections (#1657, #1630) - Stats: persist cumulative usage to session meta + auto-restore on startup (#1667, #1680, #1643, #1628) - Plans: editMode="plan" enforced at the ToolRegistry dispatch gate (#1681); step advance fix (#1629) - Context: fold once at turn start, drop pre-flight + byte-ceiling (#1642, #1646); collapsible compacted card (#1649) - Subagents: per-skill flash/pro override + Settings UI (#1632) - Desktop polish: sidebar drag-resize (#1688), responsive collapse (#1585), copy/edit overlay + msg-history nav (#1645), Esc closes modal not turn (#1685), QQ tab isolation (#1672), DiffCard for edits (#1662), theme-aware highlighting (#1655), system events toggle (#1654/#1650), macOS TCC inheritance (#1614), dashboard.enabled (#1612) - Dashboard polish: persistent session URL (#1586, #1589, #1599), theme-aware highlighting (#1664), IME confirm-enter guard (#1689), code-fence lang fix (#1677), vendor chunk split (#1587), markdown table h-scroll (#1562) - TUI: Alt+S input stash/recall; static history isolated from input rerenders (#1635); legacy mouse drop (#1637, #1648); multi-edit gated in review (#1647) - Diff: SplitDiff column border holds under CJK (#1686) - MCP: workspace roots passed to servers (#1625); codeCommand honors mcpServers (#1603) - Config plumbing: (baseUrl, apiKey) resolved as a tuple (#1658); stale model id self-heal (#1663) See CHANGELOG for the full list.
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
Two related papercuts in the desktop client:
abort()and leave the modal sitting on screen. Now the global Esc handler bails out when any ofsettingsOpen/aboutOpen/jobsOpen/wdOpenis set;SettingsModalandAboutModaleach install their ownkeydownlistener that callsonClose().JobsPopandWorkdirPopalready had their own handlers, so this just rounds out the set.session_loadand clear live in-turn state (issue 运行中的时候我点击了一下近期里面的本此对话，右边和下面状态栏里面的上下文，本次花费、缓存命中率全部清空 #1653). Skip the dispatch whens.name === activeName.Supersedes #1670
Took the focused fix from #1670 (4 files / 45 lines) and ported it on top of current main. The original PR was based on a pre-#1657 / pre-#1666 / pre-#1667 commit and would have silently rolled back the preset drop, the 4-option reasoning-effort, and the
totalCompletionTokenscarryover when squash-merged (MERGEABLEmasked the conflict). Co-authored credit preserved.Test plan
npx tsc --noEmitnpx vitest run desktop/src/App.test.ts tests/desktop-btw-status.test.ts— 12 passed