fix: allow multiple AsyncToolsets by deduplicating management tools#5369
Merged
fix: allow multiple AsyncToolsets by deduplicating management tools#5369
Conversation
Move get_running_tasks and cancel_task from instance methods to module-level singleton function tools with a module-level registry. This allows multiple AsyncToolsets to coexist on the same agent without duplicate tool name errors. ToolContext now skips duplicate tools that are the same instance (is check) rather than raising ValueError.
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
Use dict[AgentSession, set[AsyncToolset]] registry with lazy registration on first tool call and cleanup in aclose(). Management tools filter by ctx.session so sessions in thread mode can't see each other's tasks.
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
Replace session-scoped toolset registry with a flat task registry keyed by (JobContext | None, call_id). Tasks auto-register in _wrap_tool and auto-remove via done callback. No setup/aclose overrides needed. Add get_job_context(required=False) overload that returns None instead of raising, and use it to simplify agent_session.py as well.
theomonnom
approved these changes
Apr 13, 2026
jayeshp19
pushed a commit
to jayeshp19/agents
that referenced
this pull request
Apr 14, 2026
* fix: allow multiple AsyncToolsets by deduplicating management tools (livekit#5369) * feat(beta/workflows): add InstructionParts for modular instruction customization (livekit#5077) * add ToolSearchToolset and ToolProxyToolset for dynamic tool discovery (livekit#5140) * Feature - Configurable session close transcript timeout (livekit#5328) * Fix FrameProcessor lifecycle for selector based noise cancellation (livekit#5433) --------- Co-authored-by: Long Chen <longch1024@gmail.com> Co-authored-by: Benjamin Lowe <ben.lowe.uk@googlemail.com> Co-authored-by: Topherhindman <topher.hindman@livekit.io>
osimhi213
added a commit
to de-id/livekit-agents
that referenced
this pull request
Apr 15, 2026
* upstream/main: (31 commits) chore: reduce renovate noise (livekit#5421) Rename e2ee to encryption in JobContext.connect (livekit#5454) feat: add Runway Characters avatar plugin (livekit#5355) Fix FrameProcessor lifecycle for selector based noise cancellation (livekit#5433) Feature - Configurable session close transcript timeout (livekit#5328) add ToolSearchToolset and ToolProxyToolset for dynamic tool discovery (livekit#5140) feat(beta/workflows): add InstructionParts for modular instruction customization (livekit#5077) fix: allow multiple AsyncToolsets by deduplicating management tools (livekit#5369) fix: empty transcript blocks commit_user_turn until timeout (livekit#5429) Feature/krisp viva sdk support (livekit#4370) feat: add service_tier parameter to Responses API LLM (livekit#5346) fix(inworld): do not leak connections when when cancelled (livekit#5427) update: Sarvam STT - add verbose error loggin and remove retry connection (livekit#5373) chore(deps): update github workflows (major) (livekit#5424) (azure openai): ensure gpt-realtime-1.5 compatibility (livekit#5407) chore(deps): update dependency nltk to v3.9.4 [security] (livekit#5418) chore(deps): update dependency aiohttp to v3.13.4 [security] (livekit#5416) chore(deps): update dependency langchain-core to v1.2.28 [security] (livekit#5417) chore: pin GHA by commit (livekit#5415) fix(aws): unwrap doubly-encoded JSON tool arguments from Nova Sonic (livekit#5411) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
get_running_tasksandcancel_taskfromAsyncToolsetinstance methods to module-level singleton@function_tools, fixing duplicate tool name errors when multipleAsyncToolsets are used on the same agentAgentSession(dict[AgentSession, set[AsyncToolset]]) so sessions in thread mode can't see each other's tasksRunContext.session, unregister inaclose()ToolContext.update_toolsnow deduplicates same-instance tools (ischeck) instead of raisingValueError