fix: improve Ctrl-C/ESC cancellation handling #590
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
Previously, Ctrl-C was blocked when the agent was executing (isExecuting flag was true), requiring users to wait for completion before cancelling. This fix moves the Ctrl-C handler before the isExecuting check, ensuring users can always cancel regardless of execution state. This is especially important for long-running operations or when the agent is stuck. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Collaborator
|
@temujin9 to clarify what's the desired behavior here? (sorry having a hard time parsing) Right now, the intended design is (if streaming):
|
When conversationId is "default" (agent's primary message history), cancel requests should use the agents API endpoint instead of the conversations API. This fixes the 409 ConversationBusyError when pressing ESC during streaming with the default conversation. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
The handleInterrupt function had two code paths: 1. Tool execution path (isExecutingTool=true) - aborted client-side only 2. EAGER_CANCEL path - called backend cancel The first path was missing the backend cancel call, leaving runs in "running" state when ESC was pressed during tool execution. This caused 409 ConversationBusyError on subsequent messages. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Simplify cancelCurrentRun to always use client.agents.messages.cancel() instead of branching between agents and conversations APIs. The conversations.cancel() endpoint returns 404 on local Letta servers, while agents.messages.cancel() works universally for all conversation types. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
temujin9
changed the title
Contributor
Author
That is surprising, for people used to existing terminals and other TUI coding agents. In those contexts ctrl-C is generally a cancel command, as with esc in yours and other coding agents. (The equivalent of clear screen for terminals is ctrl-L: I'm not sure why, that's just what I know to use.) This PR is mostly about under-the-hood behaviors when a cancel is detected. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Summary
Fixes several issues with stream cancellation when pressing Ctrl-C or ESC:
Ctrl-C during agent execution: The
isExecutingcheck inuseInputreturned early before the Ctrl-C handler could run. Fixed by moving Ctrl-C check before theisExecutingreturn.Missing backend cancel during tool execution: When pressing ESC while tools were executing, the code aborted client-side but never sent a cancel to the backend, leaving runs in "running" state. This caused 409 ConversationBusyError on subsequent messages.
Cancel API compatibility: The
conversations.cancel()endpoint returns 404 on local Letta servers. Simplified to always useagents.messages.cancel()which works universally.Changes
ApprovalDialogRich.tsxto check for Ctrl-C before theisExecutingearly returnhandleInterruptcancelCurrentRunhelper to always use agents APITest plan
🤖 Generated with Claude Code