Update raw output files and manifests

internal/modules/output/json/encoder.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	stdjson "encoding/json"
 	"fmt"
+	"mime"
 	"regexp"
 	"sort"
 	"strings"
@@ -158,27 +159,36 @@ func rawOutputFile(name string, payload contracts.RawPayload) (contracts.OutputF
 	if len(content) == 0 {
 		content = []byte("null")
 	}
-	if payload.MediaType == contentTypeJSON && stdjson.Valid(content) {
-		var decoded any
-		if err := stdjson.Unmarshal(content, &decoded); err == nil {
-			pretty, err := marshalPretty(decoded)
-			if err != nil {
-				return contracts.OutputFile{}, err
-			}
-			content = pretty
-		}
-	}
 	mediaType := strings.TrimSpace(payload.MediaType)
 	if mediaType == "" {
 		mediaType = "application/octet-stream"
 	}
+	if !isJSONMediaType(mediaType) {
+		return contracts.OutputFile{}, encoderErrorf("normalized output %q has unsupported media type %q", name, mediaType)
+	}
+	var decoded any
+	if err := stdjson.Unmarshal(content, &decoded); err != nil {
+		return contracts.OutputFile{}, encoderErrorf("normalized output %q contains invalid JSON: %w", name, err)
+	}
+	pretty, err := marshalPretty(decoded)
+	if err != nil {
+		return contracts.OutputFile{}, err
+	}
 	return contracts.OutputFile{
 		Name:        name,
 		ContentType: mediaType,
-		Bytes:       append([]byte(nil), content...),
+		Bytes:       pretty,
 	}, nil
 }
 
+func isJSONMediaType(mediaType string) bool {
+	base, _, err := mime.ParseMediaType(strings.TrimSpace(mediaType))
+	if err != nil {
+		base = strings.TrimSpace(mediaType)
+	}
+	return strings.EqualFold(base, contentTypeJSON)
+}
+
 func jsonFile(name string, value any) (contracts.OutputFile, error) {
 	data, err := marshalPretty(value)
 	if err != nil {
@@ -208,7 +218,7 @@ func outputFileName(laneID string) (string, error) {
 	if sanitized == "" {
 		return "", encoderErrorf("lane id %q cannot produce a safe file name", laneID)
 	}
-	return "outputs/" + sanitized + ".json", nil
+	return "lanes/" + sanitized + ".json", nil
 }
 
 func cloneNormalizeOutputs(outputs []contracts.NormalizeOutput) []contracts.NormalizeOutput {