尝试整合工具和插件系统

src/plugin_system/core/component_registry.py

@@ -6,6 +6,7 @@ from src.common.logger import get_logger
 from src.plugin_system.base.component_types import (
     ComponentInfo,
     ActionInfo,
+    ToolInfo,
     CommandInfo,
     EventHandlerInfo,
     PluginInfo,
@@ -13,6 +14,7 @@ from src.plugin_system.base.component_types import (
 )
 from src.plugin_system.base.base_command import BaseCommand
 from src.plugin_system.base.base_action import BaseAction
+from src.plugin_system.base.base_tool import BaseTool
 from src.plugin_system.base.base_events_handler import BaseEventHandler
 
 logger = get_logger("component_registry")
@@ -30,7 +32,7 @@ class ComponentRegistry:
         """组件注册表 命名空间式组件名 -> 组件信息"""
         self._components_by_type: Dict[ComponentType, Dict[str, ComponentInfo]] = {types: {} for types in ComponentType}
         """类型 -> 组件原名称 -> 组件信息"""
-        self._components_classes: Dict[str, Type[Union[BaseCommand, BaseAction, BaseEventHandler]]] = {}
+        self._components_classes: Dict[str, Type[Union[BaseCommand, BaseAction, BaseTool, BaseEventHandler]]] = {}
         """命名空间式组件名 -> 组件类"""
 
         # 插件注册表
@@ -49,6 +51,10 @@ class ComponentRegistry:
         self._command_patterns: Dict[Pattern, str] = {}
         """编译后的正则 -> command名"""
 
+        # 工具特定注册表
+        self._tool_registry: Dict[str, BaseTool] = {}  # 工具名 -> 工具类
+        self._llm_available_tools: Dict[str, str] = {}  # 公开的工具名 -> 描述
+
         # EventHandler特定注册表
         self._event_handler_registry: Dict[str, Type[BaseEventHandler]] = {}
         """event_handler名 -> event_handler类"""
@@ -125,6 +131,10 @@ class ComponentRegistry:
                 assert isinstance(component_info, CommandInfo)
                 assert issubclass(component_class, BaseCommand)
                 ret = self._register_command_component(component_info, component_class)
+            case ComponentType.TOOL:
+                assert isinstance(component_info, ToolInfo)
+                assert issubclass(component_class, BaseTool)
+                ret = self._register_tool_component(component_info, component_class)
             case ComponentType.EVENT_HANDLER:
                 assert isinstance(component_info, EventHandlerInfo)
                 assert issubclass(component_class, BaseEventHandler)
@@ -180,6 +190,15 @@ class ComponentRegistry:
 
         return True
 
+    def _register_tool_component(self, tool_info: ToolInfo, tool_class: BaseTool):
+        """注册Tool组件到Tool特定注册表"""
+        tool_name = tool_info.name
+        self._tool_registry[tool_name] = tool_class
+        
+        # 如果是llm可用的且启用的工具,添加到 llm可用工具列表
+        if tool_info.available_for_llm and tool_info.enabled:
+            self._llm_available_tools[tool_name] = tool_class
+ 
     def _register_event_handler_component(
         self, handler_info: EventHandlerInfo, handler_class: Type[BaseEventHandler]
     ) -> bool:
@@ -475,7 +494,28 @@ class ComponentRegistry:
             candidates[0].match(text).groupdict(),  # type: ignore
             command_info,
         )
+    
+    # === Tool 特定查询方法 ===
+    def get_tool_registry(self) -> Dict[str, Type[BaseTool]]:
+        """获取Tool注册表"""
+        return self._tool_registry.copy()
+    
+    def get_llm_available_tools(self) -> Dict[str, str]:
+        """获取LLM可用的Tool列表"""
+        return self._llm_available_tools.copy()
 
+    def get_registered_tool_info(self, tool_name: str) -> Optional[ToolInfo]:
+        """获取Tool信息
+
+        Args:
+            tool_name: 工具名称
+
+        Returns:
+            ToolInfo: 工具信息对象，如果工具不存在则返回 None
+        """
+        info = self.get_component_info(tool_name, ComponentType.TOOL)
+        return info if isinstance(info, ToolInfo) else None
+    
     # === EventHandler 特定查询方法 ===
 
     def get_event_handler_registry(self) -> Dict[str, Type[BaseEventHandler]]:
@@ -529,17 +569,21 @@ class ComponentRegistry:
         """获取注册中心统计信息"""
         action_components: int = 0
         command_components: int = 0
-        events_handlers: int = 0
+        tool_components: int = 0
+        events_handlers: int = 0        
         for component in self._components.values():
             if component.component_type == ComponentType.ACTION:
                 action_components += 1
             elif component.component_type == ComponentType.COMMAND:
                 command_components += 1
+            elif component.component_type == ComponentType.TOOL:
+                tool_components += 1
             elif component.component_type == ComponentType.EVENT_HANDLER:
                 events_handlers += 1
         return {
             "action_components": action_components,
             "command_components": command_components,
+            "tool_components": tool_components,
             "event_handlers": events_handlers,
             "total_components": len(self._components),
             "total_plugins": len(self._plugins),