From 0d5f7686d7c4cd355cc2d327a2f04c8d7d31e09e Mon Sep 17 00:00:00 2001
From: Olcan <olcans@gmail.com>
Date: Tue, 27 May 2025 15:22:30 -0700
Subject: [PATCH] fix tool cancellation while executing (#575)

---
 packages/cli/src/ui/hooks/useToolScheduler.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/ui/hooks/useToolScheduler.ts b/packages/cli/src/ui/hooks/useToolScheduler.ts
index 1bb44133..36493332 100644
--- a/packages/cli/src/ui/hooks/useToolScheduler.ts
+++ b/packages/cli/src/ui/hooks/useToolScheduler.ts
@@ -186,7 +186,7 @@ export function useToolScheduler(
       setAbortController(new AbortController());
       setToolCalls((tc) =>
         tc.map((c) =>
-          c.status !== 'error'
+          c.status !== 'error' && c.status !== 'executing'
             ? {
                 ...c,
                 status: 'cancelled',
@@ -229,7 +229,7 @@ export function useToolScheduler(
             .then((result) => {
               if (signal.aborted) {
                 setToolCalls(
-                  setStatus(callId, 'cancelled', 'Cancelled during execution'),
+                  setStatus(callId, 'cancelled', String(result.llmContent)),
                 );
                 return;
               }