fix: prevent panic in code mode when tool handler is nil#2388
Merged
dgageot merged 1 commit intodocker:mainfrom Apr 12, 2026
Merged
fix: prevent panic in code mode when tool handler is nil#2388dgageot merged 1 commit intodocker:mainfrom
dgageot merged 1 commit intodocker:mainfrom
Conversation
Tools like run_skill have their handler wired at the runtime layer, not in the toolset definition. When code mode calls tool.Handler directly, this causes a nil pointer dereference. Add a nil handler check returning a clear error, guard against nil ToolCallResult, and simplify callTool by extracting invokeTool with centralized tracking. Fixes docker#2383 Assisted-By: docker-agent
rumpl
approved these changes
Apr 12, 2026
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
2 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.
Tools like
run_skillhave their handler wired at the runtime layer, not in the toolset definition. When code mode callstool.Handlerdirectly, this causes a nil pointer dereference.Changes:
callToolreturning a clear error*ToolCallResultfrom handlerscallToolby extractinginvokeToolwith centralized tracking (removes 4 duplicatedtracker.recordblocks)Fixes #2383