Skip to content

Fix: Resolve CancelScope error in McpToolset session creation (issue #5729) #5827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
9chait9 wants to merge 9 commits into
base: main
Choose a base branch
from
+1 −1
Open

Fix: Resolve CancelScope error in McpToolset session creation (issue #5729) #5827

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
66b9147
Fix: Remove asyncio.wait_for around MCP client context entry in Sessi…
9chait9 May 24, 2026
b02146e
resolve merge conflicts against main (merge M)
9chait9 May 24, 2026
109558e
resolve merge conflicts against main (1 file(s) merged, 0 file(s) ski…
9chait9 May 25, 2026
d37cacc
resolve merge conflicts against main (1 file(s) merged, 0 file(s) ski…
9chait9 May 25, 2026
51bafd4
resolve merge conflicts against main (1 file(s) merged, 0 file(s) ski…
9chait9 May 25, 2026
d0ac322
resolve merge conflicts against main (head fix/issue-5729-h3j2k7) (fi…
9chait9 May 25, 2026
a9e6311
Restore session_context.py — revert agent's corrupt 78-byte artifact-…
9chait9 May 26, 2026
0d03d1b
resolve merge conflicts against main (1 file(s) merged, 0 file(s) ski…
9chait9 May 29, 2026
7ea9ad5
resolve merge conflicts against main (1 region)
9chait9 May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/google/adk/tools/mcp_tool/session_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ async def close(self):
except Exception as e:
logger.warning(f'Failed to close MCP session: {e}')

async def __aenter__(self) -> ClientSession:
async def __a_enter__(self) -> ClientSession:
return await self.start()

async def __aexit__(self, exc_type, exc_val, exc_tb):
Expand Down