fix: implement tool execution timeout handling and improve blocking call management

app/agent/tools/impl/_plugin_tool_utils.py

@@ -1,6 +1,5 @@
 """插件 Agent 工具共享辅助方法"""
 
-import asyncio
 import json
 import shutil
 from typing import Any, Optional
@@ -251,7 +250,9 @@ async def install_plugin_runtime(
             SystemConfigKey.UserInstalledPlugins, install_plugins
         )
 
-    await asyncio.to_thread(reload_plugin_runtime, plugin_id)
+    from app.agent.tools.base import run_agent_blocking
+
+    await run_agent_blocking("plugin", reload_plugin_runtime, plugin_id)
     return True, message or "插件安装成功", refreshed_only
 
 

app/agent/tools/impl/browse_webpage.py

@@ -1,6 +1,5 @@
 """浏览器操作工具 - 让Agent能够通过Playwright控制浏览器进行网页交互"""
 
-import asyncio
 import base64
 import json
 from enum import Enum
@@ -167,21 +166,18 @@ class BrowseWebpageTool(MoviePilotTool):
             if browser_action == BrowserAction.EVALUATE and not script:
                 return "错误: 'evaluate' 操作需要提供 script 参数"
 
-            # 在线程池中运行同步的 Playwright 操作
-            loop = asyncio.get_running_loop()
-            result = await loop.run_in_executor(
-                None,
-                lambda: self._execute_browser_action(
-                    browser_action=browser_action,
-                    url=url,
-                    selector=selector,
-                    value=value,
-                    script=script,
-                    content_type=content_type,
-                    timeout=timeout,
-                    cookies=cookies,
-                    user_agent=user_agent,
-                ),
+            result = await self.run_blocking(
+                "web",
+                self._execute_browser_action,
+                browser_action=browser_action,
+                url=url,
+                selector=selector,
+                value=value,
+                script=script,
+                content_type=content_type,
+                timeout=timeout,
+                cookies=cookies,
+                user_agent=user_agent,
             )
             return result
 

app/agent/tools/impl/execute_command.py

@@ -451,6 +451,9 @@ class ExecuteCommandTool(MoviePilotTool):
             except asyncio.TimeoutError:
                 timed_out = True
                 await self._cleanup_process(process, wait_task)
+            except asyncio.CancelledError:
+                await self._cleanup_process(process, wait_task)
+                raise
 
             try:
                 await self._finish_reader_tasks(reader_tasks)

app/agent/tools/impl/search_web.py

@@ -1,4 +1,3 @@
-import asyncio
 import json
 import re
 from dataclasses import dataclass
@@ -445,8 +444,7 @@ class SearchWebTool(MoviePilotTool):
                     logger.warning(f"搜索引擎搜索进程失败: {err}")
                 return results
 
-            loop = asyncio.get_running_loop()
-            results = await loop.run_in_executor(None, sync_search)
+            results = await self.run_blocking("web", sync_search)
             return self._filter_results_by_site(results, site_filter)
 
         except Exception as e:

app/agent/tools/impl/send_voice_message.py

@@ -1,6 +1,4 @@
 """发送语音消息工具。"""
-
-import asyncio
 from typing import Optional, Type
 
 from pydantic import BaseModel, Field
@@ -74,7 +72,8 @@ class SendVoiceMessageTool(MoviePilotTool):
             reply_mode == AgentCapabilityManager.REPLY_MODE_NATIVE
             and AgentCapabilityManager.is_audio_output_available()
         ):
-            voice_file = await asyncio.to_thread(
+            voice_file = await self.run_blocking(
+                "default",
                 AgentCapabilityManager.synthesize_speech, message
             )
             if voice_file: