Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(features): defer unknown client availability
Apply pre-feature protocol and elicitation filtering only when stateless request metadata is known, leaving existing middleware to enforce unknown contexts.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 1e4a1ca6-53f7-4158-af22-35d2448d0b13
  • Loading branch information
SamMorrowDrums and Copilot committed Sep 3, 2026
commit 0d8baadcfe37a4f083d53ef070e7700300429e16
10 changes: 6 additions & 4 deletions pkg/inventory/filters.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,12 @@ func (r *Inventory) isToolEnabled(ctx context.Context, tool *ServerTool, feature
return false
}
if availability := tool.availability(); !availability.unrestricted() {
if info, ok := ghcontext.MCPMethod(ctx); ok &&
(info.Method == MCPMethodToolsList || info.Method == MCPMethodToolsCall) &&
!toolAvailable(info.ProtocolVersion, info.ClientCapabilities, availability) {
return false
if info, ok := ghcontext.MCPMethod(ctx); ok && (info.Method == MCPMethodToolsList || info.Method == MCPMethodToolsCall) {
known := (availability.minimumProtocolVersion == "" || info.ProtocolVersion != "") &&
(availability.requiredElicitationMode == "" || info.ClientCapabilities != nil)
if known && !toolAvailable(info.ProtocolVersion, info.ClientCapabilities, availability) {
return false
}
}
}
// 4. Check feature availability.
Expand Down
5 changes: 5 additions & 0 deletions pkg/inventory/registry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1959,6 +1959,11 @@ func TestMCPAvailabilityRunsBeforeFeatureChecks(t *testing.T) {
})
require.Len(t, inv.AvailableTools(ctx), 2)
require.Equal(t, 1, calls)

calls = 0
ctx = ghcontext.WithMCPMethodInfo(context.Background(), &ghcontext.MCPMethodInfo{Method: method})
require.Len(t, inv.AvailableTools(ctx), 2)
require.Equal(t, 1, calls)
})
}
}
Expand Down
Loading