From 6965a1d7d63fa49d19b7414f0d7e15b2bab5942c Mon Sep 17 00:00:00 2001
From: Soulter <905617992@qq.com>
Date: Tue, 14 Apr 2026 18:46:43 +0800
Subject: [PATCH] feat: rename event types to include 'Event' suffix for
 consistency

---
 astrbot/core/astr_agent_hooks.py           | 6 +++---
 astrbot/core/star/register/star_handler.py | 4 ++--
 astrbot/core/star/star_handler.py          | 4 ++--
 astrbot/core/tools/computer_tools/fs.py    | 2 +-
 astrbot/dashboard/routes/plugin.py         | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/astrbot/core/astr_agent_hooks.py b/astrbot/core/astr_agent_hooks.py
index b45fdb2bd..1213c418a 100644
--- a/astrbot/core/astr_agent_hooks.py
+++ b/astrbot/core/astr_agent_hooks.py
@@ -17,11 +17,11 @@ class MainAgentHooks(BaseAgentRunHooks[AstrAgentContext]):
     ) -> None:
         await call_event_hook(
             run_context.context.event,
-            EventType.OnAgentBegin,
+            EventType.OnAgentBeginEvent,
             run_context,
         )
 
-    async def on_agent_done(self, run_context: ContextWrapper[AstrAgentContext], llm_response: LLMResponse) -> None:
+    async def on_agent_done(self, run_context, llm_response) -> None:
         # 执行事件钩子
         if llm_response and llm_response.reasoning_content:
             # we will use this in result_decorate stage to inject reasoning content to chain
@@ -36,7 +36,7 @@ class MainAgentHooks(BaseAgentRunHooks[AstrAgentContext]):
         )
         await call_event_hook(
             run_context.context.event,
-            EventType.OnAgentDone,
+            EventType.OnAgentDoneEvent,
             run_context,
             llm_response,
         )
diff --git a/astrbot/core/star/register/star_handler.py b/astrbot/core/star/register/star_handler.py
index 7b80505b9..10417c401 100644
--- a/astrbot/core/star/register/star_handler.py
+++ b/astrbot/core/star/register/star_handler.py
@@ -482,7 +482,7 @@ def register_on_agent_begin(**kwargs):
     """
 
     def decorator(awaitable):
-        _ = get_handler_or_create(awaitable, EventType.OnAgentBegin, **kwargs)
+        _ = get_handler_or_create(awaitable, EventType.OnAgentBeginEvent, **kwargs)
         return awaitable
 
     return decorator
@@ -512,7 +512,7 @@ def register_on_agent_done(**kwargs):
     """
 
     def decorator(awaitable):
-        _ = get_handler_or_create(awaitable, EventType.OnAgentDone, **kwargs)
+        _ = get_handler_or_create(awaitable, EventType.OnAgentDoneEvent, **kwargs)
         return awaitable
 
     return decorator
diff --git a/astrbot/core/star/star_handler.py b/astrbot/core/star/star_handler.py
index 33fc5d480..ea87e5785 100644
--- a/astrbot/core/star/star_handler.py
+++ b/astrbot/core/star/star_handler.py
@@ -74,7 +74,7 @@ class StarHandlerRegistry(Generic[T]):
     @overload
     def get_handlers_by_event_type(
         self,
-        event_type: Literal[EventType.OnAgentBegin],
+        event_type: Literal[EventType.OnAgentBeginEvent],
         only_activated=True,
         plugins_name: list[str] | None = None,
     ) -> list[StarHandlerMetadata[Callable[..., Awaitable[Any]]]]: ...
@@ -82,7 +82,7 @@ class StarHandlerRegistry(Generic[T]):
     @overload
     def get_handlers_by_event_type(
         self,
-        event_type: Literal[EventType.OnAgentDone],
+        event_type: Literal[EventType.OnAgentDoneEvent],
         only_activated=True,
         plugins_name: list[str] | None = None,
     ) -> list[StarHandlerMetadata[Callable[..., Awaitable[Any]]]]: ...
diff --git a/astrbot/core/tools/computer_tools/fs.py b/astrbot/core/tools/computer_tools/fs.py
index 8d3160ff5..36b325120 100644
--- a/astrbot/core/tools/computer_tools/fs.py
+++ b/astrbot/core/tools/computer_tools/fs.py
@@ -132,7 +132,7 @@ def _resolve_user_path(path: str, *, local_env: bool, umo: str) -> Path:
 
 def _is_path_within_allowed_roots(path: str, umo: str) -> bool:
     resolved = _resolve_user_path(path, local_env=True, umo=umo)
-    return any(
+    return any( 
         resolved == allowed_root or resolved.is_relative_to(allowed_root)
         for allowed_root in _read_allowed_roots(umo)
     )
diff --git a/astrbot/dashboard/routes/plugin.py b/astrbot/dashboard/routes/plugin.py
index a387cb242..0d289f158 100644
--- a/astrbot/dashboard/routes/plugin.py
+++ b/astrbot/dashboard/routes/plugin.py
@@ -79,8 +79,8 @@ class PluginRoute(Route):
             EventType.AdapterMessageEvent: "平台消息下发时",
             EventType.OnLLMRequestEvent: "LLM 请求时",
             EventType.OnLLMResponseEvent: "LLM 响应后",
-            EventType.OnAgentBegin: "Agent 开始运行时",
-            EventType.OnAgentDone: "Agent 运行完成后",
+            EventType.OnAgentBeginEvent: "Agent 开始运行时",
+            EventType.OnAgentDoneEvent: "Agent 运行完成后",
             EventType.OnDecoratingResultEvent: "回复消息前",
             EventType.OnCallingFuncToolEvent: "函数工具",
             EventType.OnAfterMessageSentEvent: "发送消息后",