Add GetSkills and SearchSkills to the provider interface

Signed-off-by: Radoslav Dimitrov <radoslav@stacklok.com>

Author: rdimitrov

pkg/registry/mocks/mock_provider.go

@@ -23,4 +23,10 @@ type Provider interface {
 
 	// ListAvailableSkills returns skills discovered from the registry data
 	ListAvailableSkills() ([]types.Skill, error)
+
+	// GetSkill returns a specific skill by namespace and name
+	GetSkill(namespace, name string) (*types.Skill, error)
+
+	// SearchSkills searches for skills matching the query
+	SearchSkills(query string) ([]types.Skill, error)
 }

pkg/registry/provider.go

@@ -24,6 +24,7 @@ type APIRegistryProvider struct {
 	allowPrivateIp bool
 	client         api.Client
 	tokenSource    auth.TokenSource
+	skillsClient   api.SkillsClient
 }
 
 // NewAPIRegistryProvider creates a new API registry provider.
@@ -35,11 +36,15 @@ func NewAPIRegistryProvider(apiURL string, allowPrivateIp bool, tokenSource auth
 		return nil, fmt.Errorf("failed to create API client: %w", err)
 	}
 
+	// Create skills client (best-effort — skills API may not be available)
+	skillsClient, _ := api.NewSkillsClient(apiURL, allowPrivateIp, tokenSource)
+
 	p := &APIRegistryProvider{
 		apiURL:         apiURL,
 		allowPrivateIp: allowPrivateIp,
 		client:         client,
 		tokenSource:    tokenSource,
+		skillsClient:   skillsClient,
 	}
 
 	// Initialize the base provider with the GetRegistry function
@@ -173,6 +178,36 @@ func (p *APIRegistryProvider) ListServers() ([]types.ServerMetadata, error) {
 	return ConvertServersToMetadata(servers)
 }
 
+// GetSkill returns a specific skill by namespace and name from the API.
+func (p *APIRegistryProvider) GetSkill(namespace, name string) (*types.Skill, error) {
+	if p.skillsClient == nil {
+		return nil, nil
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	return p.skillsClient.GetSkill(ctx, namespace, name)
+}
+
+// SearchSkills searches for skills matching the query via the API.
+func (p *APIRegistryProvider) SearchSkills(query string) ([]types.Skill, error) {
+	if p.skillsClient == nil {
+		return nil, nil
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	result, err := p.skillsClient.SearchSkills(ctx, query)
+	if err != nil {
+		return nil, err
+	}
+	skills := make([]types.Skill, 0, len(result.Skills))
+	for _, s := range result.Skills {
+		if s != nil {
+			skills = append(skills, *s)
+		}
+	}
+	return skills, nil
+}
+
 // ConvertServerJSON converts an MCP Registry API ServerJSON to ToolHive ServerMetadata
 // Uses converters from converters.go (same package)
 // Note: Only handles OCI packages and remote servers, skips npm/pypi by design

pkg/registry/provider_api.go

@@ -126,6 +126,16 @@ func (*BaseProvider) ListAvailableSkills() ([]types.Skill, error) {
 	return nil, nil
 }
 
+// GetSkill returns nil for providers that don't support skills.
+func (*BaseProvider) GetSkill(_, _ string) (*types.Skill, error) {
+	return nil, nil
+}
+
+// SearchSkills returns nil for providers that don't support skills.
+func (*BaseProvider) SearchSkills(_ string) ([]types.Skill, error) {
+	return nil, nil
+}
+
 // matchesQuery checks if a server matches the search query
 func matchesQuery(name, description string, tags []string, query string) bool {
 	// Search in name

pkg/registry/provider_base.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"log/slog"
 	"os"
+	"strings"
 	"sync"
 
 	catalog "github.com/stacklok/toolhive-catalog/pkg/catalog/toolhive"
@@ -124,6 +125,38 @@ func (p *LocalRegistryProvider) ListAvailableSkills() ([]types.Skill, error) {
 	return skills, nil
 }
 
+// GetSkill returns a specific skill by namespace and name.
+func (p *LocalRegistryProvider) GetSkill(namespace, name string) (*types.Skill, error) {
+	skills, err := p.ListAvailableSkills()
+	if err != nil {
+		return nil, err
+	}
+	for i := range skills {
+		if skills[i].Namespace == namespace && skills[i].Name == name {
+			return &skills[i], nil
+		}
+	}
+	return nil, nil
+}
+
+// SearchSkills searches for skills matching the query in name or description.
+func (p *LocalRegistryProvider) SearchSkills(query string) ([]types.Skill, error) {
+	skills, err := p.ListAvailableSkills()
+	if err != nil {
+		return nil, err
+	}
+	query = strings.ToLower(query)
+	var results []types.Skill
+	for _, s := range skills {
+		if strings.Contains(strings.ToLower(s.Name), query) ||
+			strings.Contains(strings.ToLower(s.Description), query) ||
+			strings.Contains(strings.ToLower(s.Namespace), query) {
+			results = append(results, s)
+		}
+	}
+	return results, nil
+}
+
 // parseRegistryData parses JSON data into a Registry struct
 func parseRegistryData(data []byte) (*types.Registry, error) {
 	registry := &types.Registry{}

pkg/registry/provider_local.go

@@ -9,6 +9,7 @@ import (
 	"io"
 	"log/slog"
 	"net/http"
+	"strings"
 	"sync"
 	"time"
 
@@ -194,6 +195,38 @@ func (p *RemoteRegistryProvider) ListAvailableSkills() ([]types.Skill, error) {
 	return skills, nil
 }
 
+// GetSkill returns a specific skill by namespace and name.
+func (p *RemoteRegistryProvider) GetSkill(namespace, name string) (*types.Skill, error) {
+	skills, err := p.ListAvailableSkills()
+	if err != nil {
+		return nil, err
+	}
+	for i := range skills {
+		if skills[i].Namespace == namespace && skills[i].Name == name {
+			return &skills[i], nil
+		}
+	}
+	return nil, nil
+}
+
+// SearchSkills searches for skills matching the query in name or description.
+func (p *RemoteRegistryProvider) SearchSkills(query string) ([]types.Skill, error) {
+	skills, err := p.ListAvailableSkills()
+	if err != nil {
+		return nil, err
+	}
+	query = strings.ToLower(query)
+	var results []types.Skill
+	for _, s := range skills {
+		if strings.Contains(strings.ToLower(s.Name), query) ||
+			strings.Contains(strings.ToLower(s.Description), query) ||
+			strings.Contains(strings.ToLower(s.Namespace), query) {
+			results = append(results, s)
+		}
+	}
+	return results, nil
+}
+
 func (p *RemoteRegistryProvider) setSkills(skills []types.Skill) {
 	p.skillsMu.Lock()
 	defer p.skillsMu.Unlock()