Skip to content

fix: Only show "Cancelled" for explicitly cancelled turns#1467

Merged
charlesvien merged 1 commit intomainfrom
04-02-only_show_cancelled_for_explicitly_cancelled_turns
Apr 2, 2026
Merged

fix: Only show "Cancelled" for explicitly cancelled turns#1467
charlesvien merged 1 commit intomainfrom
04-02-only_show_cancelled_for_explicitly_cancelled_turns

Conversation

@charlesvien
Copy link
Copy Markdown
Member

@charlesvien charlesvien commented Apr 2, 2026

Problem

Tool calls pending permission incorrectly flash "(Cancelled)" because wasCancelled triggers on turnComplete, not just turnCancelled.

Closes #1267

Changes

  1. Remove turnComplete from wasCancelled check in useToolCallStatus
  2. Only show "(Cancelled)" when stopReason is actually "cancelled"

How did you test this?

Manually

Copy link
Copy Markdown
Member Author

charlesvien commented Apr 2, 2026

@charlesvien charlesvien changed the title Only show "Cancelled" for explicitly cancelled turns fix: Only show "Cancelled" for explicitly cancelled turns Apr 2, 2026
@charlesvien charlesvien marked this pull request as ready for review April 2, 2026 21:07
Copy link
Copy Markdown
Contributor

@adboio adboio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

THANK YOU i have tried to fix this so many times

Copy link
Copy Markdown
Member Author

charlesvien commented Apr 2, 2026

Merge activity

  • Apr 2, 9:44 PM UTC: A user started a stack merge that includes this pull request via Graphite.
  • Apr 2, 9:52 PM UTC: Graphite rebased this pull request as part of a merge.
  • Apr 2, 10:00 PM UTC: @charlesvien merged this pull request with Graphite.

@charlesvien charlesvien changed the base branch from 04-02-add_release_notification_workflow to graphite-base/1467 April 2, 2026 21:45
@charlesvien charlesvien changed the base branch from graphite-base/1467 to main April 2, 2026 21:51
@charlesvien charlesvien force-pushed the 04-02-only_show_cancelled_for_explicitly_cancelled_turns branch from 8bdc437 to cacf5a8 Compare April 2, 2026 21:52
@charlesvien charlesvien merged commit e7f293b into main Apr 2, 2026
16 checks passed
@charlesvien charlesvien deleted the 04-02-only_show_cancelled_for_explicitly_cancelled_turns branch April 2, 2026 22:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

False "cancelled" status shown before permission prompts and persists after selection

2 participants