fix(teamloader): preserve deferred toolset instructions#3680
Merged
Sayt-0 merged 1 commit intoJul 16, 2026
Conversation
dgageot
approved these changes
Jul 16, 2026
Sayt-0
enabled auto-merge
July 16, 2026 11:45
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.
Description
This pull request fixes a logic bug in the teamloader where setting
defer_all: trueon a toolset would cause the entire toolset to be dropped from the agent's context.Dropping the toolset had the unintended side effect of permanently deleting the toolset's custom
Instructions, leaving the LLM completely unaware of when or how to ask for the deferred tools to be loaded.Changes Made
WithNoToolsFilterinpkg/teamloader/filter.goto wrap toolsets.Instructions, ensuring the instructions are seamlessly preserved in the agent's system prompt.continueblock inpkg/teamloader/teamloader.gowith the new filter.pkg/teamloader/filter_test.go.Verification
go testand verified all unit tests pass.go fmtandgo vet.