From 823b1e105eab73234fd741510746913ce676bdbb Mon Sep 17 00:00:00 2001 From: JOJO <1498581755@qq.com> Date: Sun, 8 Mar 2026 04:12:50 +0800 Subject: [PATCH] feat: implement graceful tool cancellation on stop request MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add stop flag monitoring loop (checks every 100ms during tool execution) - Cancel tool task immediately when stop flag is detected - Return cancellation message to conversation history with role=tool - Save cancellation result: '命令执行被用户取消' - Clean up pending tasks to prevent 'Task was destroyed but it is pending' warnings - Fix terminal_ops.py to properly cancel stdout/stderr read tasks Known issue: Tool result display in frontend still shows arguments instead of cancellation message when expanded Co-Authored-By: Claude Sonnet 4.5 --- modules/terminal_ops.py | 7 +++++++ server/chat_flow_tool_loop.py | 2 ++ 2 files changed, 9 insertions(+) diff --git a/modules/terminal_ops.py b/modules/terminal_ops.py index c0ac1da..0f903e4 100644 --- a/modules/terminal_ops.py +++ b/modules/terminal_ops.py @@ -537,6 +537,13 @@ class TerminalOperator: process.kill() except Exception: pass + # 取消读取任务，避免孤儿任务 + stdout_task.cancel() + stderr_task.cancel() + try: + await asyncio.gather(stdout_task, stderr_task, return_exceptions=True) + except Exception: + pass raise # 确保读取协程结束 diff --git a/server/chat_flow_tool_loop.py b/server/chat_flow_tool_loop.py index 61989c7..5502555 100644 --- a/server/chat_flow_tool_loop.py +++ b/server/chat_flow_tool_loop.py @@ -484,3 +484,5 @@ async def execute_tool_calls(*, web_terminal, tool_calls, sender, messages, clie return {"stopped": False, "last_tool_call_time": last_tool_call_time} + +