修改import顺序，把魔法字变为枚举型

src/chat/planner_actions/action_manager.py

@@ -3,14 +3,10 @@ from src.plugin_system.base.base_action import BaseAction
 from src.chat.message_receive.chat_stream import ChatStream
 from src.common.logger import get_logger
 from src.plugin_system.core.component_registry import component_registry
-from src.plugin_system.base.component_types import ComponentType
+from src.plugin_system.base.component_types import ComponentType, ActionActivationType, ChatMode, ActionInfo
 
 logger = get_logger("action_manager")
 
-# 定义动作信息类型
-ActionInfo = Dict[str, Any]
-
-
 class ActionManager:
     """
     动作管理器，用于管理各种类型的动作
@@ -20,8 +16,8 @@ class ActionManager:
 
     # 类常量
     DEFAULT_RANDOM_PROBABILITY = 0.3
-    DEFAULT_MODE = "all"
-    DEFAULT_ACTIVATION_TYPE = "always"
+    DEFAULT_MODE = ChatMode.ALL
+    DEFAULT_ACTIVATION_TYPE = ActionActivationType.ALWAYS
 
     def __init__(self):
         """初始化动作管理器"""
@@ -54,11 +50,8 @@ class ActionManager:
     def _load_plugin_system_actions(self) -> None:
         """从插件系统的component_registry加载Action组件"""
         try:
-            from src.plugin_system.core.component_registry import component_registry
-            from src.plugin_system.base.component_types import ComponentType
-
             # 获取所有Action组件
-            action_components = component_registry.get_components_by_type(ComponentType.ACTION)
+            action_components: Dict[str, ActionInfo] = component_registry.get_components_by_type(ComponentType.ACTION)
 
             for action_name, action_info in action_components.items():
                 if action_name in self._registered_actions:
@@ -181,28 +174,28 @@ class ActionManager:
         """获取当前正在使用的动作集合"""
         return self._using_actions.copy()
 
-    def get_using_actions_for_mode(self, mode: str) -> Dict[str, ActionInfo]:
+    def get_using_actions_for_mode(self, mode: ChatMode) -> Dict[str, ActionInfo]:
         """
         根据聊天模式获取可用的动作集合
 
         Args:
-            mode: 聊天模式 ("focus", "normal", "all")
+            mode: 聊天模式 (ChatMode.FOCUS, ChatMode.NORMAL, ChatMode.ALL)
 
         Returns:
             Dict[str, ActionInfo]: 在指定模式下可用的动作集合
         """
-        filtered_actions = {}
+        enabled_actions = {}
 
         for action_name, action_info in self._using_actions.items():
-            action_mode = action_info.get("mode_enable", "all")
+            action_mode = action_info.mode_enable
 
             # 检查动作是否在当前模式下启用
-            if action_mode == "all" or action_mode == mode:
-                filtered_actions[action_name] = action_info
+            if action_mode in [ChatMode.ALL, mode]:
+                enabled_actions[action_name] = action_info
                 logger.debug(f"动作 {action_name} 在模式 {mode} 下可用 (mode_enable: {action_mode})")
 
-        logger.debug(f"模式 {mode} 下可用动作: {list(filtered_actions.keys())}")
-        return filtered_actions
+        logger.debug(f"模式 {mode} 下可用动作: {list(enabled_actions.keys())}")
+        return enabled_actions
 
     def add_action_to_using(self, action_name: str) -> bool:
         """

src/chat/planner_actions/action_modifier.py

@@ -1,15 +1,17 @@
-from typing import List, Optional, Any, Dict
-from src.common.logger import get_logger
-from src.chat.focus_chat.focus_loop_info import FocusLoopInfo
-from src.chat.message_receive.chat_stream import get_chat_manager
-from src.config.config import global_config
-from src.llm_models.utils_model import LLMRequest
 import random
 import asyncio
 import hashlib
 import time
+from typing import List, Optional, Any, Dict
+
+from src.common.logger import get_logger
+from src.config.config import global_config
+from src.llm_models.utils_model import LLMRequest
+from src.chat.focus_chat.focus_loop_info import FocusLoopInfo
+from src.chat.message_receive.chat_stream import get_chat_manager
 from src.chat.planner_actions.action_manager import ActionManager
 from src.chat.utils.chat_message_builder import get_raw_msg_before_timestamp_with_chat, build_readable_messages
+from src.plugin_system.base.component_types import ChatMode
 
 logger = get_logger("action_manager")
 
@@ -44,7 +46,7 @@ class ActionModifier:
     async def modify_actions(
         self,
         loop_info=None,
-        mode: str = "focus",
+        mode: ChatMode = ChatMode.FOCUS,
         message_content: str = "",
     ):
         """
@@ -528,7 +530,7 @@ class ActionModifier:
 
     def get_available_actions_count(self) -> int:
         """获取当前可用动作数量（排除默认的no_action）"""
-        current_actions = self.action_manager.get_using_actions_for_mode("normal")
+        current_actions = self.action_manager.get_using_actions_for_mode(ChatMode.NORMAL)
         # 排除no_action（如果存在）
         filtered_actions = {k: v for k, v in current_actions.items() if k != "no_action"}
         return len(filtered_actions)

src/chat/planner_actions/planner.py

@@ -1,18 +1,21 @@
-import json  # <--- 确保导入 json
+import json
+import time
 import traceback
 from typing import Dict, Any, Optional
 from rich.traceback import install
+from datetime import datetime
+from json_repair import repair_json
+
 from src.llm_models.utils_model import LLMRequest
 from src.config.config import global_config
 from src.common.logger import get_logger
 from src.chat.utils.prompt_builder import Prompt, global_prompt_manager
-from src.chat.planner_actions.action_manager import ActionManager
-from json_repair import repair_json
-from src.chat.utils.utils import get_chat_type_and_target_info
-from datetime import datetime
-from src.chat.message_receive.chat_stream import get_chat_manager
 from src.chat.utils.chat_message_builder import build_readable_messages, get_raw_msg_before_timestamp_with_chat
-import time
+from src.chat.utils.utils import get_chat_type_and_target_info
+from src.chat.planner_actions.action_manager import ActionManager
+from src.chat.message_receive.chat_stream import get_chat_manager
+from src.plugin_system.base.component_types import ChatMode
+
 
 logger = get_logger("planner")
 
@@ -54,7 +57,7 @@ def init_prompt():
 
 
 class ActionPlanner:
-    def __init__(self, chat_id: str, action_manager: ActionManager, mode: str = "focus"):
+    def __init__(self, chat_id: str, action_manager: ActionManager, mode: ChatMode = ChatMode.FOCUS):
         self.chat_id = chat_id
         self.log_prefix = f"[{get_chat_manager().get_stream_name(chat_id) or chat_id}]"
         self.mode = mode
@@ -62,7 +65,7 @@ class ActionPlanner:
         # LLM规划器配置
         self.planner_llm = LLMRequest(
             model=global_config.model.planner,
-            request_type=f"{self.mode}.planner",  # 用于动作规划
+            request_type=f"{self.mode.value}.planner",  # 用于动作规划
         )
 
         self.last_obs_time_mark = 0.0
@@ -224,7 +227,7 @@ class ActionPlanner:
 
             self.last_obs_time_mark = time.time()
 
-            if self.mode == "focus":
+            if self.mode == ChatMode.FOCUS:
                 by_what = "聊天内容"
                 no_action_block = ""
             else: