refactor(agent-runner): simplify event-first entry path

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

@@ -540,7 +540,7 @@ class MCPLoader(loader.ToolLoader):
                     return function
         return None
 
-    async def invoke_tool(self, name: str, parameters: dict, query: pipeline_query.Query) -> typing.Any:
+    async def invoke_tool(self, name: str, parameters: dict, query: pipeline_query.Query | None) -> typing.Any:
         """执行工具调用"""
         for session in self.sessions.values():
             for function in session.get_tools():

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

@@ -45,7 +45,12 @@ class PluginToolLoader(loader.ToolLoader):
                 return tool
         return None
 
-    async def invoke_tool(self, name: str, parameters: dict, query: pipeline_query.Query) -> typing.Any:
+    async def invoke_tool(self, name: str, parameters: dict, query: pipeline_query.Query | None) -> typing.Any:
+        if query is None:
+            raise ValueError(
+                f'Plugin tool {name} requires a query-based host context. '
+                'Use MCP tools or provide a Host tool implementation that is run-scoped.'
+            )
         try:
             return await self.ap.plugin_connector.call_tool(
                 name, parameters, session=query.session, query_id=query.query_id

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

@@ -117,7 +117,9 @@ class ToolManager:
 
         return tools
 
-    async def execute_func_call(self, name: str, parameters: dict, query: pipeline_query.Query) -> typing.Any:
+    async def execute_func_call(self, name: str, parameters: dict, query: pipeline_query.Query | None) -> typing.Any:
+        """执行函数调用"""
+
         if await self.native_tool_loader.has_tool(name):
             return await self.native_tool_loader.invoke_tool(name, parameters, query)
         if await self.plugin_tool_loader.has_tool(name):