Skip to content

acp_thread: Fix compaction button stuck at loading state on error - #59161

Merged
danilo-leal merged 2 commits into
mainfrom
fix-compaction-load-button
Jun 15, 2026
Merged

acp_thread: Fix compaction button stuck at loading state on error#59161
danilo-leal merged 2 commits into
mainfrom
fix-compaction-load-button

Conversation

@danilo-leal

Copy link
Copy Markdown
Member

Closes AI-393

When the user proactively cancels a turn, we mark all pending entries as cancelled. But if something else stops/halts a turn, we weren't doing that in the case of compaction, which means we would be stuck in a loading state forever.

Release Notes:

  • N/A (feature hasn't been publicly released yet so no notes)

@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Jun 11, 2026
@zed-community-bot zed-community-bot Bot added the staff Pull requests authored by a current member of Zed staff label Jun 11, 2026
@danilo-leal
danilo-leal added this pull request to the merge queue Jun 15, 2026
Merged via the queue into main with commit d8eb569 Jun 15, 2026
43 checks passed
@danilo-leal
danilo-leal deleted the fix-compaction-load-button branch June 15, 2026 10:57
This was referenced Jun 18, 2026
liusuren123 pushed a commit to liusuren123/zed that referenced this pull request Jun 30, 2026
…d-industries#59161)

Closes AI-393

When the user proactively cancels a turn, we mark all pending entries as
cancelled. But if something else stops/halts a turn, we weren't doing
that in the case of compaction, which means we would be stuck in a
loading state forever.

Release Notes:

- N/A _(feature hasn't been publicly released yet so no notes)_
jolutz pushed a commit to jolutz/zed that referenced this pull request Aug 8, 2026
…d-industries#59161)

Closes AI-393

When the user proactively cancels a turn, we mark all pending entries as
cancelled. But if something else stops/halts a turn, we weren't doing
that in the case of compaction, which means we would be stuck in a
loading state forever.

Release Notes:

- N/A _(feature hasn't been publicly released yet so no notes)_
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants