fix(tools): prevent composite disabled_toolsets from stripping explicitly enabled tools - #60273
Closed
isheng-eqi wants to merge 3 commits into
Closed
fix(tools): prevent composite disabled_toolsets from stripping explicitly enabled tools#60273isheng-eqi wants to merge 3 commits into
isheng-eqi wants to merge 3 commits into
Conversation
…itly enabled tools
isheng-eqi
force-pushed
the
fix/disabled-toolset-preserve-enabled
branch
from
July 7, 2026 15:46
4c96161 to
798abc5
Compare
Contributor
Author
|
Branch contaminated — rebuilding with clean base from upstream/main. |
2 tasks
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
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.
What does this PR do?
Composite toolsets like
safeanddebuggingre-list tools shared by other enabled toolsets. When a composite appears indisabled_toolsets, subtracting the full toolset silently strips tools from explicitly enabled toolsets — the model receives Tools: 0 with no warning, and tool calls fail silently.The existing non-core-delta protection from #33924 covers hermes-* bundles and posture toolsets (coding) but missed safe and debugging — any composite with
includes.Related Issue
Fixes #58281
Type of Change
Changes Made
_compute_tool_definitions()to detect any composite toolset withincludes— not just hermes-* and postures. Usebundle_non_core_tools()for these composites so shared tools from enabled toolsets are preserved.How to Test
agent.enabled_toolsets: [terminal, file]andagent.disabled_toolsets: [debugging]hermes chat -v -q "run date in terminal"