refactor(provider): formalize tool lookup contract

src/langbot/pkg/provider/tools/loader.py

@@ -4,12 +4,15 @@ import abc
 import typing
 from typing import TYPE_CHECKING
 
+from langbot_plugin.api.definition.components.manifest import ComponentManifest
 from langbot_plugin.api.entities.events import pipeline_query
 import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
 
 if TYPE_CHECKING:
     from ...core import app
 
+ToolLookupResult = resource_tool.LLMTool | ComponentManifest
+
 
 preregistered_loaders: list[typing.Type[ToolLoader]] = []
 
@@ -43,6 +46,17 @@ class ToolLoader(abc.ABC):
         """获取所有工具"""
         pass
 
+    async def get_tool(self, name: str) -> ToolLookupResult | None:
+        """Get one tool by name.
+
+        Loaders with a cheaper direct lookup can override this method. The
+        default keeps simple loaders working by searching their public list.
+        """
+        for tool in await self.get_tools():
+            if tool.name == name:
+                return tool
+        return None
+
     @abc.abstractmethod
     async def has_tool(self, name: str) -> bool:
         """检查工具是否存在"""

src/langbot/pkg/provider/tools/loaders/mcp.py

@@ -525,7 +525,7 @@ class MCPLoader(loader.ToolLoader):
                     return True
         return False
 
-    async def _get_tool(self, name: str) -> resource_tool.LLMTool | None:
+    async def get_tool(self, name: str) -> resource_tool.LLMTool | None:
         """Get tool by name.
 
         Args:

src/langbot/pkg/provider/tools/loaders/plugin.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import typing
 import traceback
 
+from langbot_plugin.api.definition.components.manifest import ComponentManifest
 from langbot_plugin.api.entities.events import pipeline_query
 
 from .. import loader
@@ -39,7 +40,7 @@ class PluginToolLoader(loader.ToolLoader):
                 return True
         return False
 
-    async def _get_tool(self, name: str) -> resource_tool.LLMTool:
+    async def get_tool(self, name: str) -> ComponentManifest | None:
         for tool in await self.ap.plugin_connector.list_tools():
             if tool.metadata.name == name:
                 return tool

src/langbot/pkg/provider/tools/toolmgr.py

@@ -6,6 +6,7 @@ from typing import TYPE_CHECKING
 import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
 from langbot_plugin.api.entities.events import pipeline_query
 
+from . import loader as tool_loader
 from .errors import ToolNotFoundError
 
 if TYPE_CHECKING:
@@ -69,7 +70,7 @@ class ToolManager:
 
         return all_functions
 
-    async def get_tool_by_name(self, name: str) -> resource_tool.LLMTool | None:
+    async def get_tool_by_name(self, name: str) -> tool_loader.ToolLookupResult | None:
         """Get tool by name from any active loader.
 
         Args:
@@ -78,28 +79,18 @@ class ToolManager:
         Returns:
             LLMTool if found, None otherwise
         """
-        for tool_loader in (
+        for active_loader in (
             self.native_tool_loader,
             self.plugin_tool_loader,
             self.mcp_tool_loader,
             self.skill_tool_loader,
         ):
-            tool = await self._get_tool_from_loader(tool_loader, name)
+            tool = await active_loader.get_tool(name)
             if tool:
                 return tool
 
         return None
 
-    async def _get_tool_from_loader(self, tool_loader: typing.Any, name: str) -> resource_tool.LLMTool | None:
-        if hasattr(tool_loader, '_get_tool'):
-            return await tool_loader._get_tool(name)
-
-        for tool in await tool_loader.get_tools():
-            if tool.name == name:
-                return tool
-
-        return None
-
     async def generate_tools_for_openai(self, use_funcs: list[resource_tool.LLMTool]) -> list:
         tools = []