feat: 一个指令只允许一个handler处理, 匹配最长指令序列, 同时兼容前缀指令, 增加指令冲突检查

astrbot/core/pipeline/waking_check/stage.py

@@ -1,5 +1,6 @@
+import re
+from collections import defaultdict
 from typing import AsyncGenerator, Union
-
 from astrbot import logger
 from astrbot.core.message.components import At, AtAll, Reply
 from astrbot.core.message.message_event_result import MessageChain, MessageEventResult
@@ -8,7 +9,6 @@
 from astrbot.core.star.session_plugin_manager import SessionPluginManager
 from astrbot.core.star.star import star_map
 from astrbot.core.star.star_handler import EventType, star_handlers_registry
-
 from ..context import PipelineContext
 from ..stage import Stage, register_stage
 
@@ -46,6 +46,220 @@ async def initialize(self, ctx: PipelineContext) -> None:
             "ignore_at_all", False
         )
 
+    def _find_command_filter(self, handler):
+        """查找command filter
+
+        Args:
+            handler (StarHandlerMetadata): handler 元数据对象
+        Returns:
+            CommandFilter | None: 找到则返回 CommandFilter 对象，否则返回 None
+        """
+        for f in handler.event_filters:
+            if hasattr(f, "command_name"):
+                return f
+        return None
+
+    async def _find_best_command_handlers(self, command_handlers, event):
+        """查找最长匹配的handler
+
+        Args:
+            command_handlers (List[Tuple[StarHandlerMetadata, CommandFilter]]): 候选的指令 handler 列表
+            event (AstrMessageEvent): 消息事件对象
+        Returns:
+            StarHandlerMetadata | None: 找到则返回 handler 元数据对象，否则返回 None
+        """
+
+        if not event.is_at_or_wake_command:
+            return None
+
+        message_str = re.sub(r"\s+", " ", event.get_message_str().strip())
+        best_match = None
+        best_length = 0
+        best_params = None
+
+        # 找到所有可能的匹配
+        for handler, command_filter in command_handlers:
+            match_result = self._match_command(command_filter, message_str, event)
+            if match_result:
+                match_length, parsed_params = match_result
+                if match_length > best_length:
+                    best_length = match_length
+                    best_match = handler
+                    best_params = parsed_params
+
+        if best_match:
+            # 解析的参数
+            if best_params is not None:
+                event.set_extra("parsed_params", best_params)
+
+            # 还需要执行完整的filter检查
+            result = await self._check_handler_filters(best_match, event)
+            if result == "activate":
+                return best_match
+            elif result == "permission_error":
+                raise PermissionError("权限不足")
+
+        return None
+
+    def _match_command(self, command_filter, message_str, event):
+        """匹配指令
+
+        Args:
+            command_filter (CommandFilter): 指令过滤器对象
+            message_str (str): 消息字符串
+            event (AstrMessageEvent): 消息事件对象
+        Returns:
+            Tuple[int, dict] | None: 如果匹配成功，返回 (匹配长度, 解析参数)；否则返回 None
+        """
+        # 检查自定义过滤器
+        if not command_filter.custom_filter_ok(event, self.ctx.astrbot_config):
+            return None
+
+        candidates = [command_filter.command_name] + list(command_filter.alias)
+
+        for candidate in candidates:
+            for parent_command_name in command_filter.parent_command_names:
+                if parent_command_name:
+                    full_command = f"{parent_command_name} {candidate}"
+                else:
+                    full_command = candidate
+
+                matched_params = None
+                if message_str == full_command:
+                    # 完全匹配，无参数
+                    try:
+                        matched_params = command_filter.validate_and_convert_params(
+                            [], command_filter.handler_params
+                        )
+                        return (len(full_command), matched_params)
+                    except ValueError:
+                        continue
+                elif message_str.startswith(full_command + " "):
+                    # 前缀匹配，有参数
+                    param_str = message_str[len(full_command) :].strip()
+                    params_list = [p for p in param_str.split(" ") if p]
+                    try:
+                        matched_params = command_filter.validate_and_convert_params(
+                            params_list, command_filter.handler_params
+                        )
+                        return (len(full_command), matched_params)
+                    except ValueError:
+                        continue
+                elif message_str.startswith(full_command) and len(message_str) > len(
+                    full_command
+                ):
+                    # 前缀匹配 忘了加空格的情况
+                    param_str = message_str[len(full_command) :]
+                    # 将整个剩余部分作为一个参数
+                    params_list = [param_str] if param_str else []
+                    try:
+                        matched_params = command_filter.validate_and_convert_params(
+                            params_list, command_filter.handler_params
+                        )
+                        return (len(full_command), matched_params)
+                    except ValueError:
+                        continue
+
+        return None
+
+    async def _check_handler_filters(self, handler, event):
+        """检查处理器的所有过滤器
+
+        Args:
+            handler (StarHandlerMetadata): handler 元数据对象
+            event (AstrMessageEvent): 消息事件对象
+        Returns:
+            "activate": 通过所有检查，可以激活
+            "skip": 跳过（权限不足但不报错，或其他过滤器不通过）
+            "permission_error": 权限不足且需要报错
+        """
+        permission_not_pass = False
+        permission_filter_raise_error = False
+
+        for filter_obj in handler.event_filters:
+            try:
+                if isinstance(filter_obj, PermissionTypeFilter):
+                    if not filter_obj.filter(event, self.ctx.astrbot_config):
+                        permission_not_pass = True
+                        permission_filter_raise_error = filter_obj.raise_error
+                elif hasattr(filter_obj, "command_name"):
+                    # 不需要再检查 command filter
+                    continue
+                else:
+                    if not filter_obj.filter(event, self.ctx.astrbot_config):
+                        return "skip"
+            except Exception as e:
+                await event.send(
+                    MessageEventResult().message(
+                        f"插件 {star_map[handler.handler_module_path].name}: {e}"
+                    )
+                )
+                event.stop_event()
+                return "skip"
+
+        # 处理权限检查结果
+        if permission_not_pass:
+            if not permission_filter_raise_error:
+                return "skip"
+
+            if self.no_permission_reply:
+                await event.send(
+                    MessageChain().message(
+                        f"您(ID: {event.get_sender_id()})的权限不足以使用此指令。通过 /sid 获取 ID 并请管理员添加。"
+                    )
+                )
+            logger.info(
+                f"触发 {star_map[handler.handler_module_path].name} 时, 用户(ID={event.get_sender_id()}) 权限不足。"
+            )
+            return "permission_error"
+
+        return "activate"
+
+    def _detect_command_conflicts(self, command_handlers):
+        """检测指令冲突
+
+        Args:
+            command_handlers (List[Tuple[StarHandlerMetadata, CommandFilter]]): 候选的指令 handler 列表
+        """
+        # 完整指令名 -> [(handler, plugin_name)] 映射
+        command_map = defaultdict(list)
+
+        for handler, command_filter in command_handlers:
+            star_metadata = star_map.get(handler.handler_module_path)
+            if star_metadata:
+                plugin_name = star_metadata.name
+            else:
+                plugin_name = "不知道是哪个插件"
+
+            # 所有可能的指令名
+            candidates = [command_filter.command_name] + list(command_filter.alias)
+
+            for candidate in candidates:
+                for parent_command_name in command_filter.parent_command_names:
+                    if parent_command_name:
+                        full_command = f"{parent_command_name} {candidate}"
+                    else:
+                        full_command = candidate
+
+                    command_map[full_command].append((handler, plugin_name, candidate))
+
+        # 检查冲突
+        conflicts_detected = False
+        for command_name, handlers_list in command_map.items():
+            if len(handlers_list) > 1:
+                if not conflicts_detected:
+                    logger.warning("检测到指令名冲突！")
+                    conflicts_detected = True
+
+                conflict_info = []
+                for handler, plugin_name, original_command in handlers_list:
+                    conflict_info.append(
+                        f"插件 '{plugin_name}' 的指令 '{original_command}'"
+                    )
+                logger.warning(f"指令 '{command_name}' 存在冲突:")
+                for info in conflict_info:
+                    logger.warning(f"  - {info}")
+
     async def process(
         self, event: AstrMessageEvent
     ) -> Union[None, AsyncGenerator[None, None]]:
@@ -110,73 +324,72 @@ async def process(
 
         # 检查插件的 handler filter
         activated_handlers = []
-        handlers_parsed_params = {}  # 注册了指令的 handler
+        handlers_parsed_params = {}
 
         # 将 plugins_name 设置到 event 中
         enabled_plugins_name = self.ctx.astrbot_config.get("plugin_set", ["*"])
         if enabled_plugins_name == ["*"]:
-            # 如果是 *，则表示所有插件都启用
             event.plugins_name = None
         else:
             event.plugins_name = enabled_plugins_name
         logger.debug(f"enabled_plugins_name: {enabled_plugins_name}")
 
+        command_handlers = []
+        non_command_handlers = []
+
         for handler in star_handlers_registry.get_handlers_by_event_type(
             EventType.AdapterMessageEvent, plugins_name=event.plugins_name
         ):
-            # filter 需满足 AND 逻辑关系
-            passed = True
-            permission_not_pass = False
-            permission_filter_raise_error = False
             if len(handler.event_filters) == 0:
                 continue
 
-            for filter in handler.event_filters:
-                try:
-                    if isinstance(filter, PermissionTypeFilter):
-                        if not filter.filter(event, self.ctx.astrbot_config):
-                            permission_not_pass = True
-                            permission_filter_raise_error = filter.raise_error
-                    else:
-                        if not filter.filter(event, self.ctx.astrbot_config):
-                            passed = False
-                            break
-                except Exception as e:
-                    await event.send(
-                        MessageEventResult().message(
-                            f"插件 {star_map[handler.handler_module_path].name}: {e}"
-                        )
-                    )
-                    event.stop_event()
-                    passed = False
-                    break
-            if passed:
-                if permission_not_pass:
-                    if not permission_filter_raise_error:
-                        # 跳过
-                        continue
-                    if self.no_permission_reply:
-                        await event.send(
-                            MessageChain().message(
-                                f"您(ID: {event.get_sender_id()})的权限不足以使用此指令。通过 /sid 获取 ID 并请管理员添加。"
-                            )
-                        )
-                    logger.info(
-                        f"触发 {star_map[handler.handler_module_path].name} 时, 用户(ID={event.get_sender_id()}) 权限不足。"
-                    )
-                    event.stop_event()
-                    return
+            # 检查是否为指令
+            command_filter = self._find_command_filter(handler)
+            if command_filter:
+                command_handlers.append((handler, command_filter))
+            else:
+                non_command_handlers.append(handler)
 
-                is_wake = True
-                event.is_wake = True
+        self._detect_command_conflicts(command_handlers)
 
-                activated_handlers.append(handler)
+        # 指令
+        command_matched = False
+        try:
+            best_command_handler = await self._find_best_command_handlers(
+                command_handlers, event
+            )
+            if best_command_handler:
+                activated_handlers.append(best_command_handler)
                 if "parsed_params" in event.get_extra():
-                    handlers_parsed_params[handler.handler_full_name] = event.get_extra(
-                        "parsed_params"
+                    handlers_parsed_params[best_command_handler.handler_full_name] = (
+                        event.get_extra("parsed_params")
                     )
+                command_matched = True
+                is_wake = True
+                event.is_wake = True
+        except PermissionError:
+            event.stop_event()
+            return
+
+        event._extras.pop("parsed_params", None)
+
+        # 非指令
+        if not command_matched:
+            for handler in non_command_handlers:
+                result = await self._check_handler_filters(handler, event)
+                if result == "activate":
+                    activated_handlers.append(handler)
+                    if "parsed_params" in event.get_extra():
+                        handlers_parsed_params[handler.handler_full_name] = (
+                            event.get_extra("parsed_params")
+                        )
+                    is_wake = True
+                    event.is_wake = True
+                elif result == "permission_error":
+                    event.stop_event()
+                    return
 
-            event._extras.pop("parsed_params", None)
+        event._extras.pop("parsed_params", None)
 
         # 根据会话配置过滤插件处理器
         activated_handlers = SessionPluginManager.filter_handlers_by_session(

astrbot/core/star/filter/command.py

@@ -7,6 +7,7 @@
 from .custom_filter import CustomFilter
 from ..star_handler import StarHandlerMetadata
 
+
 class GreedyStr(str):
     """标记指令完成其他参数接收后的所有剩余文本。"""
 
@@ -136,6 +137,10 @@ def validate_and_convert_params(
         return result
 
     def filter(self, event: AstrMessageEvent, cfg: AstrBotConfig) -> bool:
+        """向后兼容
+
+        注意：实际的指令匹配逻辑已经移到 WakingCheckStage 中处理
+        """
         if not event.is_at_or_wake_command:
             return False
 
@@ -159,7 +164,7 @@ def filter(self, event: AstrMessageEvent, cfg: AstrBotConfig) -> bool:
                     break
                 elif message_str.startswith(_full):
                     # 命令名后面无论是空格还是直接连参数都可以
-                    message_str = message_str[len(_full):].lstrip()
+                    message_str = message_str[len(_full) :].lstrip()
                     ok = True
                     break