fix: mcp cancel scope cross task spin

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

Author: GlowingBrick

astrbot/core/provider/func_tool_manager.py

@@ -740,15 +740,17 @@ async def connect_and_lifecycle() -> None:
 
         try:
             await asyncio.wait_for(connect_done.wait(), timeout=timeout)
-        except asyncio.TimeoutError:
+        except (asyncio.TimeoutError, asyncio.CancelledError) as e:
             lifecycle_task.cancel()
             await asyncio.gather(lifecycle_task, return_exceptions=True)
             async with self._runtime_lock:
                 self._mcp_starting.discard(name)
                 self._mcp_server_runtime.pop(name, None)
-            raise MCPInitTimeoutError(
-                f"Connected to MCP server {name} timeout ({timeout:g} seconds)"
-            )
+            if isinstance(e, asyncio.TimeoutError):
+                raise MCPInitTimeoutError(
+                    f"Connected to MCP server {name} timeout ({timeout:g} seconds)"
+                ) from e
+            raise
 
         if connect_error is not None:
             async with self._runtime_lock: