agent: Fix race where compaction would be marked as cancelled - #59014
Merged
Conversation
cla-bot
Bot
added
the
cla-signed
zed-community-bot
Bot
added
the
staff
benbrandt
approved these changes
Jun 10, 2026
bennetbo
enabled auto-merge
June 10, 2026 09:43
This was referenced Jun 18, 2026
Closed
This was referenced Jul 1, 2026
This was referenced Jul 10, 2026
jonx
pushed a commit
to jonx/zed-aros
that referenced
this pull request
Jul 17, 2026
…dustries#59014) Fixes an issue where compaction would get marked as cancelled if the previous turn took a while to cancel. E.g. you could reproduce this when sending a normal message, and then interrupting generation by sending `/compact`. If the task for the prior turn took a while to complete, it would mark the compaction triggered by `/compact` as cancelled, even though it was not. Release Notes: - N/A
jolutz
pushed a commit
to jolutz/zed
that referenced
this pull request
Aug 8, 2026
…dustries#59014) Fixes an issue where compaction would get marked as cancelled if the previous turn took a while to cancel. E.g. you could reproduce this when sending a normal message, and then interrupting generation by sending `/compact`. If the task for the prior turn took a while to complete, it would mark the compaction triggered by `/compact` as cancelled, even though it was not. Release Notes: - N/A
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
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.
Fixes an issue where compaction would get marked as cancelled if the previous turn took a while to cancel. E.g. you could reproduce this when sending a normal message, and then interrupting generation by sending
/compact. If the task for the prior turn took a while to complete, it would mark the compaction triggered by/compactas cancelled, even though it was not.Release Notes: