Filter ListBuilds to skill artifacts by ArtifactType

Author: samuv

pkg/skills/skillsvc/skillsvc.go

@@ -523,6 +523,15 @@ func (s *service) ListBuilds(ctx context.Context) ([]skills.LocalBuild, error) {
 			continue
 		}
 
+		isSkill, typeErr := s.isSkillArtifact(ctx, d)
+		if typeErr != nil {
+			slog.Debug("failed to check artifact type in local OCI store", "tag", tag, "error", typeErr)
+			continue
+		}
+		if !isSkill {
+			continue
+		}
+
 		build := skills.LocalBuild{
 			Tag:    tag,
 			Digest: d.String(),
@@ -986,6 +995,34 @@ func buildGitReferenceFromRegistryURL(rawURL string) (string, error) {
 	return gitURL, nil
 }
 
+// isSkillArtifact reports whether the OCI descriptor at digest d carries
+// ArtifactType == ArtifactTypeSkill. It inspects the top-level index or
+// manifest without descending into layers, so it is cheap to call.
+func (s *service) isSkillArtifact(ctx context.Context, d digest.Digest) (bool, error) {
+	isIndex, err := s.ociStore.IsIndex(ctx, d)
+	if err != nil {
+		return false, fmt.Errorf("checking OCI content type: %w", err)
+	}
+
+	if isIndex {
+		index, indexErr := s.ociStore.GetIndex(ctx, d)
+		if indexErr != nil {
+			return false, fmt.Errorf("reading OCI index: %w", indexErr)
+		}
+		return index.ArtifactType == ociskills.ArtifactTypeSkill, nil
+	}
+
+	manifestBytes, err := s.ociStore.GetManifest(ctx, d)
+	if err != nil {
+		return false, fmt.Errorf("reading OCI manifest: %w", err)
+	}
+	var manifest ocispec.Manifest
+	if err := json.Unmarshal(manifestBytes, &manifest); err != nil {
+		return false, fmt.Errorf("parsing OCI manifest: %w", err)
+	}
+	return manifest.ArtifactType == ociskills.ArtifactTypeSkill, nil
+}
+
 // extractOCIContent navigates the OCI content graph from a pulled digest,
 // extracting the skill config and raw layer data.
 func (s *service) extractOCIContent(ctx context.Context, d digest.Digest) ([]byte, *ociskills.SkillConfig, error) {

pkg/skills/skillsvc/skillsvc_test.go

@@ -2812,25 +2812,49 @@ func TestListBuilds(t *testing.T) {
 		assert.Equal(t, "2.0.0", names["skill-b"])
 	})
 
-	t.Run("artifact with no metadata still appears", func(t *testing.T) {
+	t.Run("skill artifact with no extractable metadata still appears", func(t *testing.T) {
 		t.Parallel()
 		ociStore, err := ociskills.NewStore(t.TempDir())
 		require.NoError(t, err)
 
-		// Store a minimal manifest with no config labels — extractOCIContent will fail
-		// but the artifact should still appear with empty metadata fields.
-		d, putErr := ociStore.PutManifest(t.Context(), []byte(`{"schemaVersion":2,"mediaType":"application/vnd.oci.image.index.v1+json","manifests":[]}`))
+		// Store an index with ArtifactType set to the skill type but no child manifests —
+		// extractOCIContent will fail but the artifact should still appear with empty metadata fields.
+		skillIndex := `{"schemaVersion":2,"mediaType":"application/vnd.oci.image.index.v1+json","artifactType":"dev.toolhive.skills.v1","manifests":[]}`
+		d, putErr := ociStore.PutManifest(t.Context(), []byte(skillIndex))
 		require.NoError(t, putErr)
-		require.NoError(t, ociStore.Tag(t.Context(), d, "bare-tag"))
+		require.NoError(t, ociStore.Tag(t.Context(), d, "bare-skill-tag"))
 
 		svc := New(&storage.NoopSkillStore{}, WithOCIStore(ociStore))
 		artifacts, err := svc.ListBuilds(t.Context())
 		require.NoError(t, err)
 		require.Len(t, artifacts, 1)
 
-		assert.Equal(t, "bare-tag", artifacts[0].Tag)
+		assert.Equal(t, "bare-skill-tag", artifacts[0].Tag)
 		assert.Contains(t, artifacts[0].Digest, "sha256:")
 		assert.Empty(t, artifacts[0].Name)
 		assert.Empty(t, artifacts[0].Version)
 	})
+
+	t.Run("non-skill artifact is excluded", func(t *testing.T) {
+		t.Parallel()
+		ociStore, err := ociskills.NewStore(t.TempDir())
+		require.NoError(t, err)
+
+		// Store a valid skill artifact that should be returned.
+		skillDigest := buildTestArtifact(t, ociStore, "real-skill", "1.0.0")
+		require.NoError(t, ociStore.Tag(t.Context(), skillDigest, "real-skill"))
+
+		// Store an index whose ArtifactType is not the skill type — simulates a
+		// remotely-pulled non-skill OCI artifact sharing the same store.
+		otherIndex := `{"schemaVersion":2,"mediaType":"application/vnd.oci.image.index.v1+json","artifactType":"application/vnd.docker.distribution.manifest.v2","manifests":[]}`
+		otherDigest, putErr := ociStore.PutManifest(t.Context(), []byte(otherIndex))
+		require.NoError(t, putErr)
+		require.NoError(t, ociStore.Tag(t.Context(), otherDigest, "non-skill-tag"))
+
+		svc := New(&storage.NoopSkillStore{}, WithOCIStore(ociStore))
+		artifacts, err := svc.ListBuilds(t.Context())
+		require.NoError(t, err)
+		require.Len(t, artifacts, 1)
+		assert.Equal(t, "real-skill", artifacts[0].Tag)
+	})
 }