Skip to content

fix: keep all resources registered for resources/read requests #1792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SamMorrowDrums merged 3 commits into from
Jan 12, 2026
+7 −22
Merged

fix: keep all resources registered for resources/read requests #1792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02070e4
fix: keep all resources registered for resources/read requests
SamMorrowDrums Jan 12, 2026
41a1aae
chore: remove unused filterResourcesByURI function
SamMorrowDrums Jan 12, 2026
11d3fe7
Merge branch 'main' into fix-resource-uri-matching
SamMorrowDrums Jan 12, 2026
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
11 changes: 0 additions & 11 deletions pkg/inventory/filters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,17 +203,6 @@ func (r *Inventory) filterToolsByName(name string) []ServerTool {
return result
}

// filterResourcesByURI returns resource templates matching the given URI pattern.
// Uses linear scan - optimized for single-lookup per-request scenarios (ForMCPRequest).
func (r *Inventory) filterResourcesByURI(uri string) []ServerResourceTemplate {
for i := range r.resourceTemplates {
if r.resourceTemplates[i].Template.URITemplate == uri {
return []ServerResourceTemplate{r.resourceTemplates[i]}
}
}
return []ServerResourceTemplate{}
}

// filterPromptsByName returns prompts matching the given name.
// Uses linear scan - optimized for single-lookup per-request scenarios (ForMCPRequest).
func (r *Inventory) filterPromptsByName(name string) []ServerPrompt {
Expand Down
6 changes: 2 additions & 4 deletions pkg/inventory/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ const (
// - MCPMethodToolsList: All available tools (no resources/prompts)
// - MCPMethodToolsCall: Only the named tool
// - MCPMethodResourcesList, MCPMethodResourcesTemplatesList: All available resources (no tools/prompts)
// - MCPMethodResourcesRead: Only the named resource template
// - MCPMethodResourcesRead: All resources (SDK handles URI template matching)
// - MCPMethodPromptsList: All available prompts (no tools/resources)
// - MCPMethodPromptsGet: Only the named prompt
// - Unknown methods: Empty (no items registered)
Expand Down Expand Up @@ -134,10 +134,8 @@ func (r *Inventory) ForMCPRequest(method string, itemName string) *Inventory {
case MCPMethodResourcesList, MCPMethodResourcesTemplatesList:
result.tools, result.prompts = nil, nil
case MCPMethodResourcesRead:
// Keep all resources registered - SDK handles URI template matching internally
result.tools, result.prompts = nil, nil
if itemName != "" {
result.resourceTemplates = r.filterResourcesByURI(itemName)
}
case MCPMethodPromptsList:
result.tools, result.resourceTemplates = nil, nil
case MCPMethodPromptsGet:
Expand Down
12 changes: 5 additions & 7 deletions pkg/inventory/registry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,17 +775,15 @@ func TestForMCPRequest_ResourcesRead(t *testing.T) {
}

reg := NewBuilder().SetResources(resources).WithToolsets([]string{"all"}).Build()
filtered := reg.ForMCPRequest(MCPMethodResourcesRead, "repo://{owner}/{repo}")
// Pass a concrete URI - all resources remain registered, SDK handles matching
filtered := reg.ForMCPRequest(MCPMethodResourcesRead, "repo://owner/repo")

// All resources should be available - SDK handles URI template matching internally
available := filtered.AvailableResourceTemplates(context.Background())
if len(available) != 1 {
t.Fatalf("Expected 1 resource for resources/read, got %d", len(available))
}
if available[0].Template.URITemplate != "repo://{owner}/{repo}" {
t.Errorf("Expected URI template 'repo://{owner}/{repo}', got %q", available[0].Template.URITemplate)
if len(available) != 2 {
t.Fatalf("Expected 2 resources for resources/read (SDK handles matching), got %d", len(available))
}
}

func TestForMCPRequest_PromptsList(t *testing.T) {
tools := []ServerTool{
mockTool("tool1", "repos", true),
Expand Down