Skip to content

Prevent Esc from dismissing or rewinding /side#22710

Merged
etraut-openai merged 1 commit into
mainfrom
etraut/remove-side-esc-dismiss
May 15, 2026
Merged

Prevent Esc from dismissing or rewinding /side#22710
etraut-openai merged 1 commit into
mainfrom
etraut/remove-side-esc-dismiss

Conversation

@etraut-openai
Copy link
Copy Markdown
Collaborator

@etraut-openai etraut-openai commented May 14, 2026

Addresses #22599

Why

/side currently lets Esc return to the parent thread. Multiple users reported that this collides with queued-steer UI that also advertises Esc, so a timing-sensitive keypress can dismiss an ephemeral side chat instead of sending the queued prompt.

After removing that dismissal shortcut, the same Esc path could fall through to main-thread backtrack/edit-previous handling, which is not valid for ephemeral side conversations. This keeps /side out of both global Esc behaviors.

What changed

  • Remove Esc from the /side return shortcut matcher while keeping the existing Ctrl+C and Ctrl+D behavior.
  • Update side-conversation hints and blocked-command copy to advertise Ctrl+C as the return shortcut.
  • Rename the reserved Esc keymap label to describe backtracking only.
  • Block backtrack/edit-previous handling while a side conversation is active and report Editing previous prompts is unavailable in side conversations. when that path would have fired.
  • Keep composer-owned Esc behavior, such as Vim insert-mode escape, routed locally.
  • Refresh focused shortcut assertions and TUI snapshots for the updated footer and new side-conversation error message.

Verification

Manually tested /side use cases and Esc, Ctrl+C, Ctrl+D.

@etraut-openai etraut-openai changed the title tui: require Ctrl+C or Ctrl+D to exit /side Remove support for ESC key binding to exit /side May 14, 2026
@etraut-openai etraut-openai changed the title Remove support for ESC key binding to exit /side Remove support for Esc key binding to exit /side May 14, 2026
@etraut-openai etraut-openai force-pushed the etraut/remove-side-esc-dismiss branch 2 times, most recently from 8a64815 to 0bad551 Compare May 14, 2026 22:37
@etraut-openai etraut-openai changed the title Remove support for Esc key binding to exit /side Prevent Esc from dismissing or rewinding /side May 14, 2026
@etraut-openai etraut-openai force-pushed the etraut/remove-side-esc-dismiss branch from 0bad551 to 4c65f47 Compare May 14, 2026 22:53
@etraut-openai etraut-openai merged commit d1235a0 into main May 15, 2026
31 checks passed
@etraut-openai etraut-openai deleted the etraut/remove-side-esc-dismiss branch May 15, 2026 03:51
@github-actions github-actions Bot locked and limited conversation to collaborators May 15, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants