fix(codemode): forward capability handlers to inner toolsets#3809
Merged
Conversation
An agent with code_mode_tools:true wraps all its toolsets in a single codeModeTool meta-toolset. That wrapper implemented none of the capability interfaces (Elicitable, Sampleable, SampleableWithTools, OAuthCapable, ChangeNotifier) and, wrapping N inner toolsets, is not an Unwrapper that tools.As can walk through. As a result tools.ConfigureHandlers stopped at the wrapper boundary and the inner MCP toolset never received its elicitation/OAuth handlers: an OAuth elicitation found no handler wired up and deferred forever, so the toolset never surfaced its authorization dialog and registered 0 tools. Implement the five capability interfaces on codeModeTool, forwarding each to every inner toolset that supports it (mirroring the mcpcatalog toolset pattern). Add unit tests covering forwarding through tools.ConfigureHandlers and a runtime regression test exercising configureToolsetHandlers through the code-mode wrapper.
rumpl
approved these changes
Jul 23, 2026
aheritier
added
area/runtime
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.
Problem
With
code_mode_tools: true, the code-mode wrapper prevents capability handlers from reaching wrapped remote MCP toolsets. OAuth elicitation is therefore never surfaced, and the toolset registers 0 tools.Fix
Forward the five capability interfaces (
Elicitable,Sampleable,SampleableWithTools,OAuthCapable, andChangeNotifier) fromcodemode.codeModeToolto every inner toolset that supports them.Fixes #3808
Testing
pkg/tools/codemode/codemode_test.gocovering forwarding viatools.ConfigureHandlersand through atools.NewStartablewrapper.TestConfigureToolsetHandlers_ReachesThroughCodeModeWrapperinpkg/runtime/runtime_test.go(fails pre-fix, passes post-fix).task buildtask testtask lintAll pass.