single control flow for both Esc and Ctrl+C #2691
Merged
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
- Add ExecCell::into_failed() to convert active spinner into a failed, completed exec cell. - Call from interrupt and error paths to flush the active exec into history. - Add snapshot test verifying red ✗ is rendered on interrupt, and accept snapshot.
- Introduce AppEvent::InterruptRequest and have StatusIndicator send only this event. - Handle InterruptRequest in App by calling ChatWidget::interrupt_now(). - Make ChatWidget::interrupt_now() the single code path; Ctrl-C calls it when appropriate. - Remove direct Op::Interrupt send from status widget to avoid duplication. - Keep on_error() finalization as a safety net for non-UI aborts.
- Status indicator sends only Op::Interrupt via AppEvent::CodexOp. - Remove AppEvent::InterruptRequest and UI-side finalize path for Esc. - Ctrl-C now also only sends Op::Interrupt; UI finalizes on TurnAborted. - Keep on_error() finalization on TurnAborted for consistent behavior.
easong-openai
approved these changes
Aug 26, 2025
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.
Esc and Ctrl+C while a task is running should do the same thing. There were some cases where pressing Esc would leave a "stuck" widget in the history; this fixes that and cleans up the logic so there's just one path for interrupting the task. Also clean up some subtly mishandled key events (e.g. Ctrl+D would quit the app while an approval modal was showing if the textarea was empty).