Finalize structured diagnostic aggregation

internal/cli/run_result.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"gitea.maximumdirect.net/eric/notarius/internal/core/artifacts"
+	"gitea.maximumdirect.net/eric/notarius/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
 )
 
@@ -59,7 +60,7 @@ func newRunResult(resolved pipeline.ResolvedPipeline, output pipeline.RunOutput,
 		OutputDirectory:       absOutputDirectory,
 		NormalizedOutputCount: len(output.NormalizeOutputs),
 		RejectedOutputCount:   len(output.Rejected),
-		WarningCount:          len(output.Warnings),
+		WarningCount:          warningGroupCount(output.Diagnostics),
 		ValidationStatus:      output.Manifest.ValidationStatus,
 		ValidationSummaries:   cloneValidationSummaries(output.Manifest.ValidationSummaries),
 	}
@@ -88,6 +89,16 @@ func newRunResult(resolved pipeline.ResolvedPipeline, output pipeline.RunOutput,
 	return result, nil
 }
 
+func warningGroupCount(diagnostics contracts.DiagnosticCollection) int {
+	count := 0
+	for _, group := range diagnostics.Groups {
+		if group.Disposition == contracts.DiagnosticDispositionWarning {
+			count++
+		}
+	}
+	return count
+}
+
 func cloneValidationSummaries(summaries []artifacts.ValidationSummary) []artifacts.ValidationSummary {
 	if len(summaries) == 0 {
 		return nil