[codex] fix mcp init timeout keyword mismatch

astrbot/core/provider/func_tool_manager.py

@@ -347,7 +347,10 @@ def _log_safe_mcp_debug_config(cfg: dict) -> None:
             logger.debug(f"  主机: {scheme}://{host}{port}")
 
     async def init_mcp_clients(
-        self, raise_on_all_failed: bool = False
+        self,
+        raise_on_all_failed: bool = False,
+        *,
+        init_timeout: float | int | str | None = None,
     ) -> MCPInitSummary:
         """从项目根目录读取 mcp_server.json 文件，初始化 MCP 服务列表。文件格式如下：
         ```
@@ -368,6 +371,7 @@ async def init_mcp_clients(
         ```
 
         Timeout behavior:
+        - 显式 `init_timeout` 参数优先（用于测试或调用方覆盖）。
         - 初始化超时使用环境变量 ASTRBOT_MCP_INIT_TIMEOUT 或默认值。
         - 动态启用超时使用 ASTRBOT_MCP_ENABLE_TIMEOUT（独立于初始化超时）。
         """
@@ -393,8 +397,16 @@ async def init_mcp_clients(
             "mcpServers"
         ]
 
-        init_timeout = self._init_timeout_default
-        timeout_display = f"{init_timeout:g}"
+        init_timeout_value = (
+            self._init_timeout_default
+            if init_timeout is None
+            else _resolve_timeout(
+                timeout=init_timeout,
+                env_name=MCP_INIT_TIMEOUT_ENV,
+                default=self._init_timeout_default,
+            )
+        )
+        timeout_display = f"{init_timeout_value:g}"
 
         active_configs: list[tuple[str, dict, asyncio.Event]] = []
         for name, cfg in mcp_server_json_obj.items():
@@ -413,7 +425,7 @@ async def init_mcp_clients(
                     name=name,
                     cfg=cfg,
                     shutdown_event=shutdown_event,
-                    timeout=init_timeout,
+                    timeout_seconds=init_timeout_value,
                 ),
                 name=f"mcp-init:{name}",
             )

tests/unit/test_func_tool_manager.py

@@ -0,0 +1,86 @@
+import json
+
+import pytest
+
+from astrbot.core.provider import func_tool_manager
+from astrbot.core.provider.func_tool_manager import FunctionToolManager
+
+
+@pytest.mark.asyncio
+async def test_init_mcp_clients_passes_timeout_seconds_keyword(
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path,
+):
+    manager = FunctionToolManager()
+    data_dir = tmp_path / "data"
+    data_dir.mkdir()
+
+    (data_dir / "mcp_server.json").write_text(
+        json.dumps({"mcpServers": {"demo": {"active": True}}}),
+        encoding="utf-8",
+    )
+    monkeypatch.setattr(
+        func_tool_manager,
+        "get_astrbot_data_path",
+        lambda: data_dir,
+    )
+
+    called = {}
+
+    async def fake_start_mcp_server(*, name, cfg, shutdown_event, timeout_seconds):
+        called[name] = {
+            "cfg": cfg,
+            "shutdown_event_type": type(shutdown_event).__name__,
+            "timeout_seconds": timeout_seconds,
+        }
+
+    monkeypatch.setattr(manager, "_start_mcp_server", fake_start_mcp_server)
+
+    summary = await manager.init_mcp_clients()
+
+    assert summary.total == 1
+    assert summary.success == 1
+    assert summary.failed == []
+    assert called["demo"]["cfg"] == {"active": True}
+    assert called["demo"]["shutdown_event_type"] == "Event"
+    assert called["demo"]["timeout_seconds"] == manager._init_timeout_default
+
+
+@pytest.mark.asyncio
+async def test_init_mcp_clients_passes_overridden_init_timeout(
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path,
+):
+    manager = FunctionToolManager()
+    data_dir = tmp_path / "data"
+    data_dir.mkdir()
+
+    (data_dir / "mcp_server.json").write_text(
+        json.dumps({"mcpServers": {"demo": {"active": True}}}),
+        encoding="utf-8",
+    )
+    monkeypatch.setattr(
+        func_tool_manager,
+        "get_astrbot_data_path",
+        lambda: data_dir,
+    )
+
+    called = {}
+
+    async def fake_start_mcp_server(*, name, cfg, shutdown_event, timeout_seconds):
+        called[name] = {
+            "cfg": cfg,
+            "shutdown_event_type": type(shutdown_event).__name__,
+            "timeout_seconds": timeout_seconds,
+        }
+
+    monkeypatch.setattr(manager, "_start_mcp_server", fake_start_mcp_server)
+
+    summary = await manager.init_mcp_clients(init_timeout=3.5)
+
+    assert summary.total == 1
+    assert summary.success == 1
+    assert summary.failed == []
+    assert called["demo"]["cfg"] == {"active": True}
+    assert called["demo"]["shutdown_event_type"] == "Event"
+    assert called["demo"]["timeout_seconds"] == 3.5