[codex] fix mcp init timeout keyword mismatch

astrbot/core/provider/func_tool_manager.py

@@ -413,7 +413,7 @@ async def init_mcp_clients(
                     name=name,
                     cfg=cfg,
                     shutdown_event=shutdown_event,
-                    timeout=init_timeout,
+                    timeout_seconds=init_timeout,
                 ),
                 name=f"mcp-init:{name}",
             )

tests/unit/test_func_tool_manager.py

@@ -0,0 +1,46 @@
+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