Follow up fixes

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

Author: rdimitrov

pkg/api/server.go

@@ -39,7 +39,6 @@ import (
 	"github.com/stacklok/toolhive/pkg/container/runtime"
 	"github.com/stacklok/toolhive/pkg/groups"
 	"github.com/stacklok/toolhive/pkg/recovery"
-	"github.com/stacklok/toolhive/pkg/registry"
 	"github.com/stacklok/toolhive/pkg/skills"
 	"github.com/stacklok/toolhive/pkg/skills/skillsvc"
 	"github.com/stacklok/toolhive/pkg/storage/sqlite"
@@ -252,29 +251,20 @@ func (b *ServerBuilder) createDefaultManagers(ctx context.Context) error {
 			_ = store.Close()
 			return fmt.Errorf("failed to create OCI skill store: %w", ociErr)
 		}
-		ociRegistry, regErr := ociskills.NewRegistry()
+		registry, regErr := ociskills.NewRegistry()
 		if regErr != nil {
 			_ = store.Close()
 			// ociStore is directory-backed with no open handles; no cleanup needed.
 			return fmt.Errorf("failed to create OCI registry client: %w", regErr)
 		}
 		packager := ociskills.NewPackager(ociStore)
 
-		// Get registry provider for skill discovery (best-effort)
-		regProvider, regProviderErr := registry.GetDefaultProvider()
-		var regOpts []skillsvc.Option
-		if regProviderErr == nil {
-			regOpts = append(regOpts, skillsvc.WithRegistryProvider(regProvider))
-		}
-
 		b.skillManager = skillsvc.New(store,
-			append([]skillsvc.Option{
-				skillsvc.WithPathResolver(&clientPathAdapter{cm: cm}),
-				skillsvc.WithOCIStore(ociStore),
-				skillsvc.WithPackager(packager),
-				skillsvc.WithRegistryClient(ociRegistry),
-				skillsvc.WithGroupManager(b.groupManager),
-			}, regOpts...)...,
+			skillsvc.WithPathResolver(&clientPathAdapter{cm: cm}),
+			skillsvc.WithOCIStore(ociStore),
+			skillsvc.WithPackager(packager),
+			skillsvc.WithRegistryClient(registry),
+			skillsvc.WithGroupManager(b.groupManager),
 		)
 	}
 

pkg/api/v1/skills.go

@@ -28,7 +28,6 @@ func SkillsRouter(skillService skills.SkillService) http.Handler {
 
 	r := chi.NewRouter()
 	r.Get("/", apierrors.ErrorHandler(routes.listSkills))
-	r.Get("/available", apierrors.ErrorHandler(routes.listAvailableSkills))
 	r.Post("/", apierrors.ErrorHandler(routes.installSkill))
 	r.Delete("/{name}", apierrors.ErrorHandler(routes.uninstallSkill))
 	r.Get("/{name}", apierrors.ErrorHandler(routes.getSkillInfo))
@@ -39,25 +38,6 @@ func SkillsRouter(skillService skills.SkillService) http.Handler {
 	return r
 }
 
-// listAvailableSkills returns skills available from the registry.
-//
-//	@Summary		List available skills
-//	@Description	Get a list of skills available from the registry
-//	@Tags			skills
-//	@Produce		json
-//	@Success		200		{object}	availableSkillsResponse
-//	@Failure		500		{string}	string	"Internal Server Error"
-//	@Router			/api/v1beta/skills/available [get]
-func (s *SkillsRoutes) listAvailableSkills(w http.ResponseWriter, r *http.Request) error {
-	result, err := s.skillService.ListAvailable(r.Context())
-	if err != nil {
-		return err
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	return json.NewEncoder(w).Encode(availableSkillsResponse{Skills: result})
-}
-
 // listSkills returns a list of installed skills.
 //
 //	@Summary		List all installed skills

pkg/api/v1/skills_types.go

@@ -3,10 +3,7 @@
 
 package v1
 
-import (
-	types "github.com/stacklok/toolhive-core/registry/types"
-	"github.com/stacklok/toolhive/pkg/skills"
-)
+import "github.com/stacklok/toolhive/pkg/skills"
 
 // skillListResponse represents the response for listing skills.
 //
@@ -69,11 +66,3 @@ type pushSkillRequest struct {
 	// OCI reference to push
 	Reference string `json:"reference"`
 }
-
-// availableSkillsResponse represents the response for listing available skills from the registry.
-//
-//	@Description	Response containing skills available from the registry
-type availableSkillsResponse struct {
-	// List of available skills from the registry
-	Skills []types.Skill `json:"skills"`
-}

pkg/registry/provider_local.go

@@ -105,10 +105,23 @@ func (p *LocalRegistryProvider) setSkills(skills []types.Skill) {
 }
 
 // ListAvailableSkills returns skills discovered from the upstream registry data.
+// Triggers a registry load if skills haven't been populated yet.
 func (p *LocalRegistryProvider) ListAvailableSkills() ([]types.Skill, error) {
 	p.skillsMu.RLock()
-	defer p.skillsMu.RUnlock()
-	return p.skills, nil
+	skills := p.skills
+	p.skillsMu.RUnlock()
+
+	if skills == nil {
+		// Skills are populated as a side effect of GetRegistry
+		if _, err := p.GetRegistry(); err != nil {
+			return nil, err
+		}
+		p.skillsMu.RLock()
+		skills = p.skills
+		p.skillsMu.RUnlock()
+	}
+
+	return skills, nil
 }
 
 // parseRegistryData parses JSON data into a Registry struct

pkg/registry/provider_remote.go

@@ -175,10 +175,23 @@ func (p *RemoteRegistryProvider) GetRegistry() (*types.Registry, error) {
 }
 
 // ListAvailableSkills returns skills discovered from the remote registry data.
+// Triggers a registry load if skills haven't been populated yet.
 func (p *RemoteRegistryProvider) ListAvailableSkills() ([]types.Skill, error) {
 	p.skillsMu.RLock()
-	defer p.skillsMu.RUnlock()
-	return p.skills, nil
+	skills := p.skills
+	p.skillsMu.RUnlock()
+
+	if skills == nil {
+		// Skills are populated as a side effect of GetRegistry
+		if _, err := p.GetRegistry(); err != nil {
+			return nil, err
+		}
+		p.skillsMu.RLock()
+		skills = p.skills
+		p.skillsMu.RUnlock()
+	}
+
+	return skills, nil
 }
 
 func (p *RemoteRegistryProvider) setSkills(skills []types.Skill) {

pkg/skills/client/client.go

@@ -18,7 +18,6 @@ import (
 
 	"github.com/stacklok/toolhive-core/env"
 	"github.com/stacklok/toolhive-core/httperr"
-	types "github.com/stacklok/toolhive-core/registry/types"
 	"github.com/stacklok/toolhive/pkg/skills"
 )
 
@@ -254,15 +253,6 @@ func (c *Client) doJSONRequest(
 	return nil
 }
 
-// ListAvailable returns skills available from the registry via the API.
-func (c *Client) ListAvailable(ctx context.Context) ([]types.Skill, error) {
-	var resp availableSkillsResponse
-	if err := c.doJSONRequest(ctx, http.MethodGet, "/available", nil, nil, &resp); err != nil {
-		return nil, err
-	}
-	return resp.Skills, nil
-}
-
 // handleErrorResponse reads the response body and returns an *httperr.CodedError.
 func handleErrorResponse(resp *http.Response) error {
 	body, err := io.ReadAll(io.LimitReader(resp.Body, maxErrorBodySize))

pkg/skills/client/dto.go

@@ -3,10 +3,7 @@
 
 package client
 
-import (
-	types "github.com/stacklok/toolhive-core/registry/types"
-	"github.com/stacklok/toolhive/pkg/skills"
-)
+import "github.com/stacklok/toolhive/pkg/skills"
 
 // --- request/response dto (mirror pkg/api/v1/skills_types.go) ---
 
@@ -39,7 +36,3 @@ type listResponse struct {
 type installResponse struct {
 	Skill skills.InstalledSkill `json:"skill"`
 }
-
-type availableSkillsResponse struct {
-	Skills []types.Skill `json:"skills"`
-}

pkg/skills/mocks/mock_service.go

@@ -3,11 +3,7 @@
 
 package skills
 
-import (
-	"context"
-
-	types "github.com/stacklok/toolhive-core/registry/types"
-)
+import "context"
 
 //go:generate mockgen -destination=mocks/mock_service.go -package=mocks -source=service.go SkillService
 
@@ -27,6 +23,4 @@ type SkillService interface {
 	Build(ctx context.Context, opts BuildOptions) (*BuildResult, error)
 	// Push pushes a built skill artifact to a remote registry.
 	Push(ctx context.Context, opts PushOptions) error
-	// ListAvailable returns skills available from the registry.
-	ListAvailable(ctx context.Context) ([]types.Skill, error)
 }

pkg/skills/service.go

@@ -23,9 +23,7 @@ import (
 
 	"github.com/stacklok/toolhive-core/httperr"
 	ociskills "github.com/stacklok/toolhive-core/oci/skills"
-	types "github.com/stacklok/toolhive-core/registry/types"
 	"github.com/stacklok/toolhive/pkg/groups"
-	"github.com/stacklok/toolhive/pkg/registry"
 	"github.com/stacklok/toolhive/pkg/skills"
 	"github.com/stacklok/toolhive/pkg/storage"
 )
@@ -75,13 +73,6 @@ func WithGroupManager(mgr groups.Manager) Option {
 	}
 }
 
-// WithRegistryProvider sets the registry provider for discovering available skills.
-func WithRegistryProvider(p registry.Provider) Option {
-	return func(s *service) {
-		s.registryProvider = p
-	}
-}
-
 // skillLock provides per-skill mutual exclusion keyed by scope/name/projectRoot.
 // Entries are never evicted. This is acceptable because the number of distinct
 // skills on a single machine is expected to remain small (< 1000).
@@ -110,15 +101,14 @@ func (sl *skillLock) lock(name string, scope skills.Scope, projectRoot string) f
 
 // service is the default implementation of skills.SkillService.
 type service struct {
-	locks            skillLock
-	store            storage.SkillStore
-	groupManager     groups.Manager
-	pathResolver     skills.PathResolver
-	installer        skills.Installer
-	ociStore         *ociskills.Store
-	packager         ociskills.SkillPackager
-	registry         ociskills.RegistryClient
-	registryProvider registry.Provider
+	locks        skillLock
+	store        storage.SkillStore
+	groupManager groups.Manager
+	pathResolver skills.PathResolver
+	installer    skills.Installer
+	ociStore     *ociskills.Store
+	packager     ociskills.SkillPackager
+	registry     ociskills.RegistryClient
 }
 
 // New creates a new SkillService backed by the given store.
@@ -183,14 +173,6 @@ func (s *service) List(ctx context.Context, opts skills.ListOptions) ([]skills.I
 	return filtered, nil
 }
 
-// ListAvailable returns skills available from the registry provider.
-func (s *service) ListAvailable(_ context.Context) ([]types.Skill, error) {
-	if s.registryProvider == nil {
-		return nil, nil
-	}
-	return s.registryProvider.ListAvailableSkills()
-}
-
 // Install installs a skill. When the Name field contains an OCI reference
 // (detected by the presence of '/', ':', or '@'), the artifact is pulled from
 // the registry and extracted. When LayerData is provided, the skill is extracted