@riverbankcms/sdk 0.90.1 → 0.92.0

package/dist/cli/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import z42, { z, ZodError } from 'zod';
+import z41, { z } from 'zod';
 import 'react/jsx-runtime';
 import { createJiti } from 'jiti';
 import * as fs11 from 'fs';
@@ -56,13 +56,14 @@ function parseUuidBrand(value, unsafeConstructor) {
   }
   return ok(unsafeConstructor(normalized));
 }
-var UUID_PATTERN, unsafeAsSiteId, unsafeAsStorageBucketName, unsafeAsPositiveByteCount, unsafeAsPositiveSeconds, parseSiteId;
+var UUID_PATTERN, unsafeAsSiteId, unsafeAsStorageBucketName, unsafeAsStoragePath, unsafeAsPositiveByteCount, unsafeAsPositiveSeconds, parseSiteId;
 var init_branded = __esm({
   "../core/src/branded.ts"() {
     init_result();
     UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
     unsafeAsSiteId = (id) => id;
     unsafeAsStorageBucketName = (value) => value;
+    unsafeAsStoragePath = (value) => value;
     unsafeAsPositiveByteCount = (value) => value;
     unsafeAsPositiveSeconds = (value) => value;
     parseSiteId = (value) => parseUuidBrand(value, unsafeAsSiteId);
@@ -168,6 +169,7 @@ function publicEventPricingType(pricing) {
       return "free";
     case "single_paid":
     case "ticket_types":
+    case "sliding_scale":
     case "course":
       return isFreePublicEventPriceDisplay(pricing.display) ? "free" : "paid";
     case "external":
@@ -229,11 +231,11 @@ function isValidTimeZone(timeZone) {
 }
 function getSafeTimeZone(timeZone) {
   const normalized = typeof timeZone === "string" ? timeZone.trim() : "";
-  return normalized && isValidTimeZone(normalized) ? normalized : FALLBACK_TIMEZONE;
+  return normalized.length > 0 && isValidTimeZone(normalized) ? normalized : FALLBACK_TIMEZONE;
 }
 function parseStrictBookingTimeZone(timeZone) {
   const normalized = timeZone.trim();
-  if (!normalized || !isValidTimeZone(normalized)) {
+  if (normalized.length === 0 || !isValidTimeZone(normalized)) {
     return null;
   }
   return normalized;
@@ -307,7 +309,7 @@ function parseScheduledBookingDateTime(input) {
   try {
     const startsAt = toUtcIsoDateTimeString(input.startsAt);
     const timeZone = parseStrictBookingTimeZone(input.timeZone);
-    if (!timeZone) {
+    if (timeZone === null) {
       return {
         ok: false,
         field: "timeZone",
@@ -373,10 +375,10 @@ function normalizeLocationAddressText(value) {
     return null;
   }
   const trimmed = value.trim();
-  return trimmed ? trimmed : null;
+  return trimmed.length > 0 ? trimmed : null;
 }
 function hasLocationCoordinates(value) {
-  return typeof value?.lat === "number" && typeof value?.lng === "number";
+  return value != null && typeof value.lat === "number" && typeof value.lng === "number";
 }
 function toLocationCoordinates(value) {
   if (!hasLocationCoordinates(value)) {
@@ -392,6 +394,18 @@ var init_location = __esm({
   }
 });
 
+// ../core/src/string.ts
+function isNonEmptyString(value) {
+  return typeof value === "string" && value.length > 0;
+}
+function hasText(value) {
+  return isNonEmptyString(value);
+}
+var init_string = __esm({
+  "../core/src/string.ts"() {
+  }
+});
+
 // ../core/src/business-address.ts
 var init_business_address = __esm({
   "../core/src/business-address.ts"() {
@@ -512,12 +526,6 @@ var init_slug = __esm({
   }
 });
 
-// ../core/src/string.ts
-var init_string = __esm({
-  "../core/src/string.ts"() {
-  }
-});
-
 // ../core/src/uuid.ts
 var init_uuid = __esm({
   "../core/src/uuid.ts"() {
@@ -644,8 +652,19 @@ var init_types = __esm({
 });
 
 // ../media-core/src/fileSafety.ts
+function containsUnsafePathSegmentCharacter(value) {
+  return value.includes("/") || value.includes("\\") || CONTROL_CHARACTER_PATTERN.test(value);
+}
+function isReservedPathSegment(value) {
+  return value === "." || value === "..";
+}
+function isUnsafePathSegment(segment) {
+  return segment.trim().length === 0 || segment !== segment.trim() || isReservedPathSegment(segment) || containsUnsafePathSegmentCharacter(segment);
+}
+var CONTROL_CHARACTER_PATTERN;
 var init_fileSafety = __esm({
   "../media-core/src/fileSafety.ts"() {
+    CONTROL_CHARACTER_PATTERN = /[\u0000-\u001f\u007f]/u;
   }
 });
 
@@ -684,10 +703,20 @@ var init_fileDomain = __esm({
 });
 
 // ../media-core/src/fileStorage.ts
+function parseStoragePath(value) {
+  return joinStoragePathSegments(value.split("/"));
+}
+function joinStoragePathSegments(segments) {
+  if (segments.some(isUnsafePathSegment)) {
+    return err("unsafe-path-segment");
+  }
+  return ok(unsafeAsStoragePath(segments.join("/")));
+}
 var FILE_STORAGE_BUCKETS, PRIVATE_SITE_FILE_BUCKET_MIME_TYPES;
 var init_fileStorage = __esm({
   "../media-core/src/fileStorage.ts"() {
     init_src();
+    init_fileSafety();
     FILE_STORAGE_BUCKETS = {
       publicSite: unsafeAsStorageBucketName("media"),
       privateSite: unsafeAsStorageBucketName("site-files-private"),
@@ -839,8 +868,20 @@ var init_uploadVerificationContract = __esm({
     new Set(PRODUCT_FILE_EXTENSION_TAGS);
   }
 });
+
+// ../media-core/src/videoPrep.ts
+function unsafeAsPositiveVideoDurationSeconds(value) {
+  return value;
+}
 var init_videoPrep = __esm({
   "../media-core/src/videoPrep.ts"() {
+    init_src();
+    ({
+      maxRawByteCount: unsafeAsPositiveByteCount(500 * 1024 * 1024),
+      inlineContentMaxDurationSeconds: unsafeAsPositiveVideoDurationSeconds(60),
+      backgroundVideoMaxDurationSeconds: unsafeAsPositiveVideoDurationSeconds(30),
+      targetMaxDimensionPixels: 1080
+    });
   }
 });
 
@@ -922,10 +963,10 @@ var init_identifiers = __esm({
 
 // ../media-core/src/url.ts
 function isRelativeDirectImageStoragePath(storagePath) {
-  return RELATIVE_STORAGE_PATH_PREFIXES.some((prefix) => storagePath.startsWith(prefix));
+  return RELATIVE_STORAGE_PATH_PREFIXES.some((prefix) => storagePath.startsWith(prefix)) && parseStoragePath(storagePath).ok;
 }
 function isSiteScopedDirectImageStoragePath(storagePath) {
-  return storagePath.startsWith("sites/");
+  return storagePath.startsWith("sites/") && parseStoragePath(storagePath).ok;
 }
 function encodeStoragePath(storagePath) {
   return storagePath.split("/").map((segment) => encodeURIComponent(segment)).join("/");
@@ -991,6 +1032,7 @@ function getDirectImageUrl(supabaseUrl, storagePath, storageBucket = "media", si
 var RELATIVE_STORAGE_PATH_PREFIXES;
 var init_url = __esm({
   "../media-core/src/url.ts"() {
+    init_fileStorage();
     RELATIVE_STORAGE_PATH_PREFIXES = [
       "originals/",
       "variants/",
@@ -4894,44 +4936,44 @@ var init_styleTags = __esm({
 var hotspotSchema, rotationSchema, rectSchema, aspectCropSchema, transformSchema, mediaSchema;
 var init_media = __esm({
   "../theme-core/src/lib/media.ts"() {
-    hotspotSchema = z42.object({
-      x: z42.number().min(0).max(1),
-      y: z42.number().min(0).max(1),
-      radius: z42.number().optional()
+    hotspotSchema = z41.object({
+      x: z41.number().min(0).max(1),
+      y: z41.number().min(0).max(1),
+      radius: z41.number().optional()
     });
-    rotationSchema = z42.union([z42.literal(0), z42.literal(90), z42.literal(180), z42.literal(270)]);
-    rectSchema = z42.tuple([z42.number(), z42.number(), z42.number(), z42.number()]);
-    aspectCropSchema = z42.object({
-      aspect: z42.preprocess((value) => value == null ? void 0 : value, z42.string().optional()),
-      rect: z42.preprocess((value) => value == null ? void 0 : value, rectSchema.optional()),
-      hotspot: z42.preprocess((value) => value == null ? void 0 : value, hotspotSchema.optional()),
-      rotation: z42.preprocess((value) => value == null ? void 0 : value, rotationSchema.optional())
+    rotationSchema = z41.union([z41.literal(0), z41.literal(90), z41.literal(180), z41.literal(270)]);
+    rectSchema = z41.tuple([z41.number(), z41.number(), z41.number(), z41.number()]);
+    aspectCropSchema = z41.object({
+      aspect: z41.preprocess((value) => value == null ? void 0 : value, z41.string().optional()),
+      rect: z41.preprocess((value) => value == null ? void 0 : value, rectSchema.optional()),
+      hotspot: z41.preprocess((value) => value == null ? void 0 : value, hotspotSchema.optional()),
+      rotation: z41.preprocess((value) => value == null ? void 0 : value, rotationSchema.optional())
     });
-    transformSchema = z42.object({
-      aspectCrops: z42.preprocess((value) => {
+    transformSchema = z41.object({
+      aspectCrops: z41.preprocess((value) => {
         if (!value || typeof value !== "object" || Array.isArray(value)) {
           return void 0;
         }
         return value;
-      }, z42.record(z42.string(), aspectCropSchema.catch({}))).optional(),
+      }, z41.record(z41.string(), aspectCropSchema.catch({}))).optional(),
       rect: rectSchema.optional(),
       hotspot: hotspotSchema.optional(),
       rotation: rotationSchema.optional()
     });
-    mediaSchema = z42.object({
-      type: z42.enum(["image", "video", "audio", "document", "spreadsheet", "archive"]),
-      purpose: z42.string().optional(),
-      placeholder: z42.boolean().default(true).optional(),
-      assetId: z42.string().optional(),
-      identifier: z42.string().optional(),
-      src: z42.string().optional(),
-      alt: z42.string().optional(),
-      filename: z42.string().optional(),
-      mimeType: z42.string().optional(),
-      width: z42.number().optional(),
-      height: z42.number().optional(),
-      storageBucket: z42.string().optional(),
-      storagePath: z42.string().optional(),
+    mediaSchema = z41.object({
+      type: z41.enum(["image", "video", "audio", "document", "spreadsheet", "archive"]),
+      purpose: z41.string().optional(),
+      placeholder: z41.boolean().default(true).optional(),
+      assetId: z41.string().optional(),
+      identifier: z41.string().optional(),
+      src: z41.string().optional(),
+      alt: z41.string().optional(),
+      filename: z41.string().optional(),
+      mimeType: z41.string().optional(),
+      width: z41.number().optional(),
+      height: z41.number().optional(),
+      storageBucket: z41.string().optional(),
+      storagePath: z41.string().optional(),
       transform: transformSchema.optional()
     });
   }
@@ -18545,66 +18587,66 @@ var init_media2 = __esm({
       "archive",
       "audio"
     ];
-    hotspotSchema2 = z42.object({
-      x: z42.number().min(0).max(1),
-      y: z42.number().min(0).max(1),
-      radius: z42.number().optional()
+    hotspotSchema2 = z41.object({
+      x: z41.number().min(0).max(1),
+      y: z41.number().min(0).max(1),
+      radius: z41.number().optional()
     });
-    rotationSchema2 = z42.union([z42.literal(0), z42.literal(90), z42.literal(180), z42.literal(270)]);
-    rectSchema2 = z42.tuple([z42.number(), z42.number(), z42.number(), z42.number()]);
-    aspectCropSchema2 = z42.object({
-      aspect: z42.preprocess((value) => value == null ? void 0 : value, z42.string().optional()),
-      rect: z42.preprocess((value) => value == null ? void 0 : value, rectSchema2.optional()),
-      hotspot: z42.preprocess((value) => value == null ? void 0 : value, hotspotSchema2.optional()),
-      rotation: z42.preprocess((value) => value == null ? void 0 : value, rotationSchema2.optional())
+    rotationSchema2 = z41.union([z41.literal(0), z41.literal(90), z41.literal(180), z41.literal(270)]);
+    rectSchema2 = z41.tuple([z41.number(), z41.number(), z41.number(), z41.number()]);
+    aspectCropSchema2 = z41.object({
+      aspect: z41.preprocess((value) => value == null ? void 0 : value, z41.string().optional()),
+      rect: z41.preprocess((value) => value == null ? void 0 : value, rectSchema2.optional()),
+      hotspot: z41.preprocess((value) => value == null ? void 0 : value, hotspotSchema2.optional()),
+      rotation: z41.preprocess((value) => value == null ? void 0 : value, rotationSchema2.optional())
     });
-    transformSchema2 = z42.object({
-      aspectCrops: z42.preprocess((value) => {
+    transformSchema2 = z41.object({
+      aspectCrops: z41.preprocess((value) => {
         if (!value || typeof value !== "object" || Array.isArray(value)) {
           return void 0;
         }
         return value;
-      }, z42.record(z42.string(), aspectCropSchema2.catch({}))).optional(),
+      }, z41.record(z41.string(), aspectCropSchema2.catch({}))).optional(),
       rect: rectSchema2.optional(),
       hotspot: hotspotSchema2.optional(),
       rotation: rotationSchema2.optional()
     });
-    mediaPosterSchema = z42.discriminatedUnion("tag", [
-      z42.object({
-        tag: z42.literal("storage"),
-        assetId: z42.string().optional(),
-        storageBucket: z42.string().min(1),
-        storagePath: z42.string().min(1)
+    mediaPosterSchema = z41.discriminatedUnion("tag", [
+      z41.object({
+        tag: z41.literal("storage"),
+        assetId: z41.string().optional(),
+        storageBucket: z41.string().min(1),
+        storagePath: z41.string().min(1)
       }),
-      z42.object({
-        tag: z42.literal("external-src"),
-        assetId: z42.string().optional(),
-        src: z42.string().url()
+      z41.object({
+        tag: z41.literal("external-src"),
+        assetId: z41.string().optional(),
+        src: z41.string().url()
       })
     ]);
-    mediaBaseSchema = z42.object({
-      purpose: z42.string().optional(),
-      placeholder: z42.boolean().default(true).optional(),
-      assetId: z42.string().optional(),
-      identifier: z42.string().optional(),
-      src: z42.string().optional(),
-      alt: z42.string().optional(),
-      filename: z42.string().optional(),
-      mimeType: z42.string().optional(),
-      width: z42.number().optional(),
-      height: z42.number().optional(),
-      storageBucket: z42.string().optional(),
-      storagePath: z42.string().optional(),
+    mediaBaseSchema = z41.object({
+      purpose: z41.string().optional(),
+      placeholder: z41.boolean().default(true).optional(),
+      assetId: z41.string().optional(),
+      identifier: z41.string().optional(),
+      src: z41.string().optional(),
+      alt: z41.string().optional(),
+      filename: z41.string().optional(),
+      mimeType: z41.string().optional(),
+      width: z41.number().optional(),
+      height: z41.number().optional(),
+      storageBucket: z41.string().optional(),
+      storagePath: z41.string().optional(),
       poster: mediaPosterSchema.optional(),
       transform: transformSchema2.optional()
     });
-    imageMediaSchema = mediaBaseSchema.extend({ type: z42.literal("image") });
-    videoMediaSchema = mediaBaseSchema.extend({ type: z42.literal("video") });
-    audioMediaSchema = mediaBaseSchema.extend({ type: z42.literal("audio") });
-    documentMediaSchema = mediaBaseSchema.extend({ type: z42.literal("document") });
-    spreadsheetMediaSchema = mediaBaseSchema.extend({ type: z42.literal("spreadsheet") });
-    archiveMediaSchema = mediaBaseSchema.extend({ type: z42.literal("archive") });
-    mediaSchema2 = z42.discriminatedUnion("type", [
+    imageMediaSchema = mediaBaseSchema.extend({ type: z41.literal("image") });
+    videoMediaSchema = mediaBaseSchema.extend({ type: z41.literal("video") });
+    audioMediaSchema = mediaBaseSchema.extend({ type: z41.literal("audio") });
+    documentMediaSchema = mediaBaseSchema.extend({ type: z41.literal("document") });
+    spreadsheetMediaSchema = mediaBaseSchema.extend({ type: z41.literal("spreadsheet") });
+    archiveMediaSchema = mediaBaseSchema.extend({ type: z41.literal("archive") });
+    mediaSchema2 = z41.discriminatedUnion("type", [
       imageMediaSchema,
       videoMediaSchema,
       audioMediaSchema,
@@ -18795,9 +18837,12 @@ var init_schemas = __esm({
     });
     coursePricingSchema = z.object({
       bookingRequirement: z.enum(["none", "required"]),
-      pricingStrategy: z.enum(["free", "single", "tiered"]),
+      pricingStrategy: z.enum(["free", "single", "tiered", "sliding_scale"]),
       currency: z.string(),
       singlePriceAmount: z.number().nullable(),
+      slidingMinAmount: z.number().nullable().optional(),
+      slidingMaxAmount: z.number().nullable().optional(),
+      slidingSuggestedAmount: z.number().nullable().optional(),
       paymentTerms: blockBookingPaymentTermsSchema,
       options: z.array(coursePricingOptionSchema)
     });
@@ -18958,6 +19003,19 @@ var init_schemas2 = __esm({
         ticketTypes: z.array(publicEventTicketTypeSchema),
         display: publicEventTicketTypePriceDisplaySchema
       }),
+      z.object({
+        kind: z.literal("sliding_scale"),
+        minAmount: z.number(),
+        maxAmount: z.number(),
+        suggestedAmount: z.number().nullable(),
+        currency: z.string(),
+        display: z.object({
+          kind: z.literal("range"),
+          minAmount: z.number(),
+          maxAmount: z.number(),
+          currency: z.string()
+        })
+      }),
       z.object({
         kind: z.literal("course"),
         display: z.object({ kind: z.literal("course"), display: publicCoursePriceDisplaySchema })
@@ -19412,7 +19470,7 @@ function isRecord5(value) {
 }
 function isPublicEventPricing(value) {
   if (!isRecord5(value) || typeof value.kind !== "string") return false;
-  return value.kind === "drop_in" || value.kind === "free_registration" || value.kind === "single_paid" || value.kind === "ticket_types" || value.kind === "course" || value.kind === "external";
+  return value.kind === "drop_in" || value.kind === "free_registration" || value.kind === "single_paid" || value.kind === "sliding_scale" || value.kind === "ticket_types" || value.kind === "course" || value.kind === "external";
 }
 function isPublicEventTicketType(value) {
   return isRecord5(value) && typeof value.id === "string";
@@ -21840,6 +21898,7 @@ var init_booking_form_reserved_fields = __esm({
       "selectedDate",
       "selectedSlot",
       "discountCode",
+      "selectedSlidingAmountInput",
       "selectedCollectionOptionKind",
       "selectedAppointmentPackageId"
     ];
@@ -29017,12 +29076,16 @@ function validationContext(options = {}) {
     allowIncomplete: isDraft || (options.allowIncomplete ?? false)
   };
 }
+function strictValidationContext(options = {}) {
+  const ctx = validationContext(options);
+  return {
+    ...ctx,
+    allowNull: options.allowNull ?? false
+  };
+}
 function formatFieldPath(path28) {
   return path28.map((segment) => String(segment)).join(".");
 }
-function toZodIssuePath(path28) {
-  return [...path28];
-}
 function fieldIssueToMessage(issue5) {
   switch (issue5.kind) {
     case "required":
@@ -29259,70 +29322,10 @@ function resolveSelectConstraintSource(field) {
       return assertNever2(source);
   }
 }
-function normalizeStoredContentValues(plans, content, options = {}) {
-  if (!content || typeof content !== "object" || Array.isArray(content)) {
-    return {};
-  }
-  const planMap = new Map(plans.map((plan) => [plan.fieldId, plan]));
-  const normalized = {};
-  const ctx = validationContext(options);
-  for (const [key, value] of Object.entries(content)) {
-    const plan = planMap.get(key);
-    normalized[key] = plan ? normalizeStoredFieldValueWithContext(plan, value, ctx) : value;
-  }
-  return normalized;
-}
-function normalizeStoredFieldValueWithContext(plan, value, ctx) {
-  if (value === null && !plan.required) {
-    return void 0;
-  }
-  switch (plan.kind) {
-    case "group":
-      return normalizeStoredObjectChildren(plan.children, value, childValidationContext(plan, ctx));
-    case "repeater":
-      return normalizeStoredRepeaterItems(plan, value, ctx);
-    case "string":
-    case "number":
-    case "boolean":
-    case "richText":
-    case "media":
-    case "link":
-    case "select":
-    case "passthrough":
-      return normalizeFieldValue(plan, value, ctx);
-    default:
-      return assertNever2(plan);
-  }
-}
-function normalizeStoredObjectChildren(children, value, ctx) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
-    return value;
-  }
-  const normalized = { ...value };
-  for (const child of children) {
-    normalized[child.fieldId] = normalizeStoredFieldValueWithContext(
-      child,
-      normalized[child.fieldId],
-      ctx
-    );
-  }
-  return normalized;
-}
-function normalizeStoredRepeaterItems(plan, value, ctx) {
-  if (!isUnknownArray(value)) {
-    return value;
-  }
-  return value.map((item) => {
-    if (!item || typeof item !== "object" || Array.isArray(item)) {
-      return item;
-    }
-    const itemRecord = item;
-    const fields3 = plan.repeatedItemVariants ? plan.repeatedItemVariants.find((variant) => variant.typeId === itemRecord._type)?.fields : plan.repeatedItemPlan;
-    if (!fields3) {
-      return item;
-    }
-    return normalizeStoredObjectChildren(fields3, itemRecord, ctx);
-  });
+function validateFieldValue(plan, value, options = {}) {
+  const ctx = strictValidationContext(options);
+  const normalized = normalizeFieldValue(plan, value, ctx);
+  return validateNormalizedFieldValue(plan, normalized, ctx);
 }
 function normalizeFieldValue(plan, value, ctx) {
   switch (plan.kind) {
@@ -29600,72 +29603,32 @@ function requiredIssue(plan, value) {
   if (Array.isArray(value)) return issue(plan, "required", { emptyOrigin: "array" });
   return issue(plan, "required");
 }
-function fieldPlanToZod(plan, options = {}) {
-  const ctx = validationContext(options);
-  return z.any().transform((value) => normalizeFieldValue(plan, value, ctx)).superRefine((value, zodCtx) => {
-    for (const validationIssue of validateNormalizedFieldValue(plan, value, ctx)) {
-      addFieldIssueToZodContext(zodCtx, validationIssue, plan.path);
-    }
-  });
+function validateManifestValues(fields3, values, options = {}) {
+  return deriveFieldValidationPlans(fields3).flatMap(
+    (plan) => validateFieldValue(plan, values[plan.fieldId], options)
+  );
 }
-function addFieldIssueToZodContext(zodCtx, validationIssue, rootPath) {
-  const message = fieldIssueToMessage(validationIssue);
-  const path28 = relativeZodIssuePath(validationIssue.path, rootPath);
-  const issuePath = path28.length > 0 ? { path: toZodIssuePath(path28) } : {};
-  switch (validationIssue.kind) {
-    case "required":
-      if (validationIssue.emptyOrigin) {
-        zodCtx.addIssue({
-          ...issuePath,
-          code: "too_small",
-          origin: validationIssue.emptyOrigin,
-          minimum: 1,
-          inclusive: true,
-          message
-        });
-        return;
-      }
-      zodCtx.addIssue({ ...issuePath, code: "invalid_type", expected: "nonoptional", message });
-      return;
-    case "tooLong":
-      zodCtx.addIssue({
-        ...issuePath,
-        code: "too_big",
-        origin: "string",
-        maximum: validationIssue.maximum,
-        inclusive: true,
-        message
-      });
-      return;
-    case "invalidOption":
-      zodCtx.addIssue({ ...issuePath, code: "invalid_value", values: [], message });
-      return;
-    case "wrongType":
-    case "invalidEmail":
-    case "invalidPhone":
-    case "invalidPattern":
-    case "invalidUrl":
-    case "invalidDate":
-    case "invalidTime":
-    case "invalidDateTime":
-    case "invalidNumber":
-    case "tooSmall":
-    case "tooLarge":
-    case "invalidSlug":
-    case "tooFewItems":
-    case "tooManyItems":
-    case "invalidRichText":
-    case "invalidMedia":
-    case "invalidLink":
-    case "invalidReference":
-      zodCtx.addIssue({ ...issuePath, code: "custom", message });
-      return;
-    default:
-      assertNever2(validationIssue);
-  }
+function validateManifestContentForPush(fields3, values, options = {}) {
+  const issues = validateManifestValues(fields3, values, options).map(toManifestContentValidationIssue);
+  return issues.length === 0 ? { kind: "valid", issues: [] } : { kind: "invalid", issues };
+}
+function isTopLevelRequiredManifestContentIssue(issue5) {
+  return issue5.requiredScope === "topLevel";
+}
+function formatManifestContentValidationIssue(issue5) {
+  return `Invalid content${issue5.field ? ` in "${issue5.field}"` : ""}: ${issue5.message}`;
+}
+function toManifestContentValidationIssue(issue5) {
+  return {
+    kind: issue5.kind,
+    field: formatFieldPath(issue5.path),
+    message: fieldIssueToMessage(issue5),
+    requiredScope: requiredScopeForIssue(issue5)
+  };
 }
-function relativeZodIssuePath(path28, rootPath) {
-  return startsWithFieldPath(path28, rootPath) ? path28.slice(rootPath.length) : path28;
+function requiredScopeForIssue(issue5) {
+  if (issue5.kind !== "required") return null;
+  return issue5.path.length === 1 ? "topLevel" : "nested";
 }
 function compilePattern(pattern) {
   try {
@@ -29746,13 +29709,6 @@ function isValidSelectValue(value, values, multiple) {
   }
   return typeof value === "string" && values.includes(value);
 }
-function isEmptyValue(value) {
-  if (value === null || value === void 0) return true;
-  if (typeof value === "string" && value.trim() === "") return true;
-  if (Array.isArray(value) && value.length === 0) return true;
-  if (isEmptyRichTextDoc(value)) return true;
-  return false;
-}
 function isPlainObject(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
@@ -29763,16 +29719,6 @@ function isValidRichTextDoc(value) {
   const doc = richTextDoc(value);
   return Boolean(isPlainObject(doc) && doc.type === "doc");
 }
-function isEmptyRichTextDoc(value) {
-  const doc = richTextDoc(value);
-  if (!isPlainObject(doc)) return false;
-  if (doc.type !== "doc") return false;
-  const content = doc.content;
-  if (!Array.isArray(content) || content.length === 0) return true;
-  if (content.length !== 1) return false;
-  const first = content[0];
-  return first?.type === "paragraph" && (!Array.isArray(first.content) || first.content.length === 0);
-}
 function richTextDoc(value) {
   if (!isPlainObject(value)) return value;
   return isPlainObject(value.doc) ? value.doc : value;
@@ -29787,44 +29733,6 @@ function registerManifest(manifest) {
   manifestStore.set(manifest.name, manifest);
   return manifest;
 }
-function preprocessEmptyValues(content) {
-  if (!content || typeof content !== "object" || Array.isArray(content)) {
-    return {};
-  }
-  const result = {};
-  for (const [key, value] of Object.entries(content)) {
-    result[key] = isEmptyValue(value) ? void 0 : value;
-  }
-  return result;
-}
-function createManifestValidator(manifestOrFields, options = {}) {
-  const isDraft = options.mode === "draft";
-  const plans = derivePlansFromManifestOrFields(manifestOrFields);
-  const baseSchema = deriveContentZodFromPlans(plans, options);
-  if (isDraft) {
-    return z.preprocess(
-      (content) => preprocessEmptyValues(
-        normalizeStoredContentValues(plans, content, options)
-      ),
-      baseSchema
-    );
-  }
-  return z.preprocess(
-    (content) => normalizeStoredContentValues(plans, content, options),
-    baseSchema
-  );
-}
-function deriveContentZodFromPlans(plans, options) {
-  const shape = {};
-  for (const plan of plans) {
-    shape[plan.fieldId] = fieldPlanToZod(plan, options);
-  }
-  return z.object(shape).catchall(z.unknown()).passthrough();
-}
-function derivePlansFromManifestOrFields(manifestOrFields) {
-  const fields3 = Array.isArray(manifestOrFields) ? manifestOrFields : manifestOrFields.fields ?? [];
-  return deriveFieldValidationPlans(fields3);
-}
 
 // ../blocks/src/system/blocks/index.ts
 init_site_styles();
@@ -41542,11 +41450,11 @@ function extractRouteUpdatedAt(candidate) {
 }
 function resolveRouteTargetForStage(routeIdValue, routes, stageInput) {
   const routeId = typeof routeIdValue === "string" ? routeIdValue : null;
-  if (!routeId || !routes) return null;
+  if (routeId === null || routeId.length === 0 || routes === void 0) return null;
   const routeEntry = routes[routeId];
   if (!isRouteVisibleInStage(routeEntry, stageInput)) return null;
   const href = extractRouteHref(routeEntry, stageInput);
-  if (!href) return null;
+  if (href === null) return null;
   return {
     routeId,
     href,
@@ -46152,6 +46060,11 @@ function createOutput(options) {
     }
   };
 }
+function formatSize(bytes) {
+  if (bytes < 1024) return `${bytes} B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
+  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+}
 
 // src/cli/errors.ts
 var ErrorCodes = {
@@ -48481,6 +48394,11 @@ var MIME_TYPES = {
   ".mp4": "video/mp4",
   ".webm": "video/webm",
   ".mov": "video/quicktime",
+  ".mp3": "audio/mpeg",
+  ".m4a": "audio/mp4",
+  ".wav": "audio/wav",
+  ".ogg": "audio/ogg",
+  ".flac": "audio/flac",
   ".pdf": "application/pdf"
 };
 var EXTENSIONS_BY_MIME = {
@@ -48494,6 +48412,13 @@ var EXTENSIONS_BY_MIME = {
   "video/mp4": ".mp4",
   "video/webm": ".webm",
   "video/quicktime": ".mov",
+  "audio/mpeg": ".mp3",
+  "audio/mp4": ".m4a",
+  "audio/wav": ".wav",
+  "audio/x-wav": ".wav",
+  "audio/ogg": ".ogg",
+  "audio/webm": ".webm",
+  "audio/flac": ".flac",
   "application/pdf": ".pdf"
 };
 function getMimeType(filename) {
@@ -48952,6 +48877,81 @@ var buildLocationNote = (locationsByIdentifier, identifier) => {
   const locations = locationsByIdentifier.get(identifier);
   return locations?.length ? ` Referenced at: ${locations.join(", ")}.` : "";
 };
+var locationsForIdentifier = (locationsByIdentifier, identifier) => {
+  const locations = locationsByIdentifier.get(identifier);
+  return locations?.length ? [...locations] : void 0;
+};
+var fileReportFields = (file) => {
+  if (!file) return {};
+  return {
+    filename: file.filename,
+    sizeBytes: file.data.length,
+    mimeType: file.mimeType
+  };
+};
+function classifyManagementApiError(error) {
+  const code = error.code.toLowerCase();
+  const message = error.message.toLowerCase();
+  if (error.statusCode === 413 || code.includes("too_large") || message.includes("too large")) {
+    return "max_object_size";
+  }
+  if (error.statusCode === 415 || code.includes("mime") || code.includes("content-type") || message.includes("mime") || message.includes("content-type")) {
+    return "unsupported_mime";
+  }
+  if (error.statusCode === 402 || error.statusCode === 507 || code.includes("quota") || code.includes("storage") || message.includes("quota") || message.includes("storage limit")) {
+    return "quota_or_storage_limit";
+  }
+  if (error.statusCode === 401 || error.statusCode === 403 || code.includes("auth") || code.includes("permission")) {
+    return "auth_or_permission";
+  }
+  if (code === "sdk:network-error" || code === "sdk:timeout") {
+    return "network";
+  }
+  if (code.startsWith("sdk:") || typeof error.statusCode === "number") {
+    return "cms_api";
+  }
+  return "unknown";
+}
+function classifyErrorMessage(error) {
+  const message = error.message.toLowerCase();
+  if (message.includes("network") || message.includes("timeout") || message.includes("timed out")) {
+    return "network";
+  }
+  if (message.includes("too large") || message.includes("payload too large") || message.includes("413")) {
+    return "max_object_size";
+  }
+  if (message.includes("mime") || message.includes("content-type") || message.includes("unsupported media")) {
+    return "unsupported_mime";
+  }
+  if (message.includes("quota") || message.includes("storage limit")) {
+    return "quota_or_storage_limit";
+  }
+  if (message.includes("unauthorized") || message.includes("forbidden") || message.includes("permission")) {
+    return "auth_or_permission";
+  }
+  return "unknown";
+}
+function classifyLocalMediaUploadFailure(error) {
+  if (error instanceof ManagementApiError) {
+    return classifyManagementApiError(error);
+  }
+  if (error instanceof Error) {
+    return classifyErrorMessage(error);
+  }
+  return "unknown";
+}
+var rawErrorMessage = (error) => error instanceof Error ? error.message : String(error);
+var makeReport = (params) => {
+  const failedIdentifiers = params.items.filter((item) => item.status === "failed").map((item) => item.identifier);
+  const missingIdentifiers = params.items.filter((item) => item.status === "missing_local_file").map((item) => item.identifier);
+  return {
+    targetEnv: params.targetEnv,
+    summary: { ...params.summary },
+    items: params.items,
+    failedIdentifiers,
+    missingIdentifiers
+  };
+};
 var loadLocalMediaFiles = async (contentDir, identifiers, manifest, errors) => {
   const localFiles = /* @__PURE__ */ new Map();
   for (const identifier of identifiers) {
@@ -48985,10 +48985,12 @@ var handleChecksumConflicts = async (options) => {
     assetsByIdentifier,
     missingIdentifiers,
     summary,
+    reportItems,
     warnings,
     errors,
     locationsByIdentifier,
     dryRun,
+    targetEnv,
     forceUpdateAsset
   } = options;
   const identifiersToReplace = /* @__PURE__ */ new Set();
@@ -48998,6 +49000,13 @@ var handleChecksumConflicts = async (options) => {
       summary.skipped += 1;
       const locationNote = buildLocationNote(locationsByIdentifier, identifier);
       warnings.push(`Missing local file for "${identifier}". Using CMS asset instead.${locationNote}`);
+      reportItems.push({
+        identifier,
+        status: "skipped",
+        targetEnv,
+        locations: locationsForIdentifier(locationsByIdentifier, identifier),
+        message: "Using existing CMS asset because no local file was found."
+      });
       continue;
     }
     if (asset.checksumSha256 && asset.checksumSha256 !== localFile.checksum) {
@@ -49009,6 +49018,14 @@ var handleChecksumConflicts = async (options) => {
       } else {
         identifiersToReplace.add(identifier);
       }
+    } else {
+      reportItems.push({
+        identifier,
+        status: "resolved",
+        targetEnv,
+        ...fileReportFields(localFile),
+        locations: locationsForIdentifier(locationsByIdentifier, identifier)
+      });
     }
   }
   if (identifiersToReplace.size === 0) {
@@ -49031,10 +49048,12 @@ var resolveMissingByChecksum = async (options) => {
     localFiles,
     assetsByIdentifier,
     summary,
+    reportItems,
     errors,
     warnings,
     locationsByIdentifier,
     dryRun,
+    targetEnv,
     forceUpdateAsset
   } = options;
   const checksumCandidates = /* @__PURE__ */ new Map();
@@ -49045,6 +49064,13 @@ var resolveMissingByChecksum = async (options) => {
       errors.push(
         `Identifier "${identifier}" does not exist on the CMS and no local file was found. Add content/media/${identifier}.* or pull with --local-media first.${locationNote}`
       );
+      reportItems.push({
+        identifier,
+        status: "missing_local_file",
+        targetEnv,
+        locations: locationsForIdentifier(locationsByIdentifier, identifier),
+        message: `Add content/media/${identifier}.* or pull with --local-media first.`
+      });
       continue;
     }
     checksumCandidates.set(identifier, localFile);
@@ -49065,6 +49091,15 @@ var resolveMissingByChecksum = async (options) => {
     const matches = assetsByChecksum.get(localFile.checksum) ?? [];
     if (matches.length === 0) {
       uploadPlans.push({ identifier, file: localFile });
+      if (dryRun) {
+        reportItems.push({
+          identifier,
+          status: "pending_upload",
+          targetEnv,
+          ...fileReportFields(localFile),
+          locations: locationsForIdentifier(locationsByIdentifier, identifier)
+        });
+      }
       continue;
     }
     const exact = matches.find((asset) => asset.identifier === identifier);
@@ -49072,6 +49107,14 @@ var resolveMissingByChecksum = async (options) => {
       mapIdentifierToAsset(assetsByIdentifier, identifier, exact);
       missingIdentifiers.delete(identifier);
       summary.reused += 1;
+      reportItems.push({
+        identifier,
+        status: "reused",
+        targetEnv,
+        ...fileReportFields(localFile),
+        locations: locationsForIdentifier(locationsByIdentifier, identifier),
+        message: "Reused existing CMS asset with matching identifier and checksum."
+      });
       continue;
     }
     const unassigned = matches.filter((asset) => !asset.identifier);
@@ -49092,9 +49135,25 @@ var resolveMissingByChecksum = async (options) => {
         });
         summary.assigned += 1;
         mapIdentifierToAsset(assetsByIdentifier, identifier, assigned);
+        reportItems.push({
+          identifier,
+          status: "assigned",
+          targetEnv,
+          ...fileReportFields(localFile),
+          locations: locationsForIdentifier(locationsByIdentifier, identifier),
+          message: "Assigned identifier to an existing matching CMS asset."
+        });
       } else {
         summary.pendingAssignments += 1;
         mapIdentifierToAsset(assetsByIdentifier, identifier, { ...candidate, identifier });
+        reportItems.push({
+          identifier,
+          status: "assigned",
+          targetEnv,
+          ...fileReportFields(localFile),
+          locations: locationsForIdentifier(locationsByIdentifier, identifier),
+          message: "Would assign identifier to an existing matching CMS asset."
+        });
       }
       missingIdentifiers.delete(identifier);
       summary.reused += 1;
@@ -49113,9 +49172,25 @@ var resolveMissingByChecksum = async (options) => {
         });
         summary.assigned += 1;
         mapIdentifierToAsset(assetsByIdentifier, identifier, reassigned);
+        reportItems.push({
+          identifier,
+          status: "assigned",
+          targetEnv,
+          ...fileReportFields(localFile),
+          locations: locationsForIdentifier(locationsByIdentifier, identifier),
+          message: "Assigned identifier to an existing matching CMS asset."
+        });
       } else {
         summary.pendingAssignments += 1;
         mapIdentifierToAsset(assetsByIdentifier, identifier, { ...candidate, identifier });
+        reportItems.push({
+          identifier,
+          status: "assigned",
+          targetEnv,
+          ...fileReportFields(localFile),
+          locations: locationsForIdentifier(locationsByIdentifier, identifier),
+          message: "Would assign identifier to an existing matching CMS asset."
+        });
       }
       missingIdentifiers.delete(identifier);
       summary.reused += 1;
@@ -49129,7 +49204,7 @@ var resolveMissingByChecksum = async (options) => {
   return uploadPlans;
 };
 var uploadMissingAssets = async (options) => {
-  const { client, uploadPlans, assetsByIdentifier, summary, errors, dryRun } = options;
+  const { client, uploadPlans, assetsByIdentifier, summary, reportItems, errors, dryRun, targetEnv, onEvent } = options;
   if (uploadPlans.length === 0) {
     return;
   }
@@ -49139,6 +49214,13 @@ var uploadMissingAssets = async (options) => {
   }
   const uploadedIdentifiers = [];
   for (const plan of uploadPlans) {
+    const startedItem = {
+      identifier: plan.identifier,
+      status: "pending_upload",
+      targetEnv,
+      ...fileReportFields(plan.file)
+    };
+    onEvent?.({ type: "upload_started", item: startedItem });
     try {
       const result = await client.media.upload({
         data: plan.file.data,
@@ -49150,9 +49232,30 @@ var uploadMissingAssets = async (options) => {
       if (result.status === "created") {
         summary.uploaded += 1;
       }
+      const uploadedItem = {
+        identifier: plan.identifier,
+        status: "uploaded",
+        targetEnv,
+        ...fileReportFields(plan.file),
+        message: result.status === "created" ? "Uploaded local media file." : "CMS reported media already exists."
+      };
+      reportItems.push(uploadedItem);
+      onEvent?.({ type: "upload_succeeded", item: uploadedItem });
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      errors.push(`Failed to upload "${plan.identifier}": ${message}`);
+      const failureKind = classifyLocalMediaUploadFailure(error);
+      const failedItem = {
+        identifier: plan.identifier,
+        status: "failed",
+        targetEnv,
+        ...fileReportFields(plan.file),
+        message: `Failed to upload "${plan.identifier}": ${message}`,
+        failureKind,
+        rawError: rawErrorMessage(error)
+      };
+      reportItems.push(failedItem);
+      onEvent?.({ type: "upload_failed", item: failedItem });
+      errors.push(`Failed to upload "${plan.identifier}" (${plan.file.filename}, ${plan.file.mimeType}): ${message}`);
     }
   }
   if (uploadedIdentifiers.length === 0) {
@@ -49169,10 +49272,11 @@ var uploadMissingAssets = async (options) => {
   }
 };
 async function syncLocalMediaForPush(options) {
-  const { contentDir, content, client, dryRun, forceUpdateAsset } = options;
+  const { contentDir, content, client, dryRun, forceUpdateAsset, targetEnv, onEvent } = options;
   const manifest = await readMediaManifest(contentDir);
   const warnings = [];
   const errors = [];
+  const reportItems = [];
   const existingIdentifiers = /* @__PURE__ */ new Set();
   walkLocalContentMedia(content, (value) => {
     if (typeof value.identifier === "string" && value.identifier.trim().length > 0) {
@@ -49238,6 +49342,7 @@ async function syncLocalMediaForPush(options) {
       content,
       manifest,
       summary,
+      report: makeReport({ targetEnv, summary, items: reportItems }),
       warnings,
       errors,
       hasChanges: false
@@ -49254,10 +49359,12 @@ async function syncLocalMediaForPush(options) {
     assetsByIdentifier,
     missingIdentifiers,
     summary,
+    reportItems,
     warnings,
     errors,
     locationsByIdentifier,
     dryRun,
+    targetEnv,
     forceUpdateAsset
   });
   const uploadPlans = await resolveMissingByChecksum({
@@ -49266,10 +49373,12 @@ async function syncLocalMediaForPush(options) {
     localFiles,
     assetsByIdentifier,
     summary,
+    reportItems,
     errors,
     warnings,
     locationsByIdentifier,
     dryRun,
+    targetEnv,
     forceUpdateAsset
   });
   await uploadMissingAssets({
@@ -49277,8 +49386,11 @@ async function syncLocalMediaForPush(options) {
     uploadPlans,
     assetsByIdentifier,
     summary,
+    reportItems,
     errors,
-    dryRun
+    dryRun,
+    targetEnv,
+    onEvent
   });
   summary.resolved = assetsByIdentifier.size;
   for (const reference of mediaReferences) {
@@ -49301,6 +49413,7 @@ async function syncLocalMediaForPush(options) {
     content,
     manifest,
     summary,
+    report: makeReport({ targetEnv, summary, items: reportItems }),
     warnings,
     errors,
     hasChanges
@@ -54067,18 +54180,22 @@ async function readJsonSafe(filePath) {
 
 // src/cli/commands/push/execute/diff.ts
 function displayDiff(params) {
-  const { output, diff, config: config2, dryRun, isRemote, jsonOutput, jsonDiffMode, localContent, remoteContent, humanDiff } = params;
+  const { output, diff, config: config2, dryRun, isRemote, jsonOutput, jsonDiffMode, localContent, remoteContent, humanDiff, mediaReport } = params;
   const envLabel = isRemote ? "REMOTE" : "LOCAL";
   if (jsonDiffMode) {
     const jsonDiff = buildJsonDiff(diff, localContent, remoteContent, jsonDiffMode);
-    output.json(jsonDiff);
+    output.json({
+      ...jsonDiff,
+      ...mediaReport ? { media: mediaReport } : {}
+    });
     return;
   }
   if (jsonOutput) {
     output.json({
       summary: diff.summary,
       syncConfig: config2.sync,
-      dryRun
+      dryRun,
+      ...mediaReport ? { media: mediaReport } : {}
     });
     return;
   }
@@ -54408,7 +54525,8 @@ var salesWindowSchema = z.object({
   });
 });
 function validateChronologicalFields(input) {
-  if (!input.start || !input.end) return;
+  if (input.start === void 0 || input.start.length === 0) return;
+  if (input.end === void 0 || input.end.length === 0) return;
   if (Date.parse(input.start) < Date.parse(input.end)) return;
   input.ctx.addIssue({
     code: "custom",
@@ -54592,7 +54710,7 @@ var upsertNavigationMenuCommandSchema = z.object({
     location: z.enum(navigationLocations).optional(),
     role: z.enum(navigationMenuRoles).optional(),
     items: z.array(navigationItemSchema).readonly()
-  }).strict().refine((input) => input.name || input.location, {
+  }).strict().refine((input) => input.name !== void 0 || input.location !== void 0, {
     message: "Navigation commands require either input.name or input.location."
   })
 }).strict();
@@ -54932,14 +55050,14 @@ var upsertBookingPassProductCommandSchema = z.object({
     productUseCase: z.enum(bookingPassProductUseCases).default("event_pass"),
     appointmentScope: appointmentPackageScopeSchema.optional()
   }).strict().superRefine((input, ctx) => {
-    if (input.productUseCase === "event_pass" && input.appointmentScope) {
+    if (input.productUseCase === "event_pass" && input.appointmentScope !== void 0) {
       ctx.addIssue({
         code: "custom",
         path: ["appointmentScope"],
         message: "appointmentScope is only valid for appointment_package passes"
       });
     }
-    if (input.productUseCase === "appointment_package" && !input.appointmentScope) {
+    if (input.productUseCase === "appointment_package" && input.appointmentScope === void 0) {
       ctx.addIssue({
         code: "custom",
         path: ["appointmentScope"],
@@ -55248,7 +55366,7 @@ var siteCommandBatchSchema = z.object({
   commands: z.array(siteCommandSchema).readonly()
 }).strict();
 function entryIdentifierForCommand(command) {
-  if (command.input.identifier) return command.input.identifier;
+  if (command.input.identifier !== void 0 && command.input.identifier.length > 0) return command.input.identifier;
   switch (command.type) {
     case "upsertContentEntry":
       return refSlug(command.ref);
@@ -55259,13 +55377,13 @@ function entryIdentifierForCommand(command) {
   }
 }
 function pageIdentifierForCommand(command) {
-  if (command.input.identifier) return command.input.identifier;
+  if (command.input.identifier !== void 0 && command.input.identifier.length > 0) return command.input.identifier;
   switch (command.type) {
     case "upsertPage":
       return refSlug(command.ref);
     case "publishPage":
     case "unpublishPage": {
-      if (!command.input.pageRef) {
+      if (command.input.pageRef === void 0) {
         throw new Error(`Page command ${command.ref} is missing identifier and pageRef.`);
       }
       return refSlug(command.input.pageRef);
@@ -55279,7 +55397,7 @@ function pageIdentifierForBlockCommand(command) {
   return command.input.pageIdentifier;
 }
 function blockIdentifierForCommand(command) {
-  if (command.input.identifier) return command.input.identifier;
+  if (command.input.identifier !== void 0 && command.input.identifier.length > 0) return command.input.identifier;
   switch (command.type) {
     case "upsertPageBlock":
       return refSlug(command.ref);
@@ -55885,7 +56003,7 @@ function getSiteCommandMetadata(type) {
 }
 function getSiteCommandLifecycleIntent(command) {
   if (command.type === "ensureTeamMemberProfile") {
-    return command.input.publish ? "publish" : "mutation";
+    return command.input.publish === true ? "publish" : "mutation";
   }
   return getSiteCommandMetadata(command.type).lifecycleIntent;
 }
@@ -56040,7 +56158,7 @@ function commandRefContributions(command) {
         provides: [{ ref: command.ref, field: "ref" }],
         requires: [
           { ref: command.input.resourceRef, field: "input.resourceRef" },
-          ...command.input.serviceRef ? [{ ref: command.input.serviceRef, field: "input.serviceRef" }] : []
+          ...command.input.serviceRef !== void 0 && command.input.serviceRef !== null ? [{ ref: command.input.serviceRef, field: "input.serviceRef" }] : []
         ]
       };
     case "upsertBlockTree":
@@ -56054,22 +56172,22 @@ function commandRefContributions(command) {
     case "upsertPageBlock":
       return {
         provides: [{ ref: command.ref, field: "ref" }],
-        requires: command.input.pageRef ? [{ ref: command.input.pageRef, field: "input.pageRef" }] : []
+        requires: command.input.pageRef !== void 0 ? [{ ref: command.input.pageRef, field: "input.pageRef" }] : []
       };
     case "patchPageBlockContent":
       return {
         provides: [],
-        requires: command.input.pageRef ? [{ ref: command.input.pageRef, field: "input.pageRef" }] : []
+        requires: command.input.pageRef !== void 0 ? [{ ref: command.input.pageRef, field: "input.pageRef" }] : []
       };
     case "deletePageBlock":
       return {
         provides: [],
-        requires: command.input.pageRef ? [{ ref: command.input.pageRef, field: "input.pageRef" }] : []
+        requires: command.input.pageRef !== void 0 ? [{ ref: command.input.pageRef, field: "input.pageRef" }] : []
       };
     case "reorderPageBlocks":
       return {
         provides: [{ ref: command.ref, field: "ref" }],
-        requires: command.input.pageRef ? [{ ref: command.input.pageRef, field: "input.pageRef" }] : [],
+        requires: command.input.pageRef !== void 0 ? [{ ref: command.input.pageRef, field: "input.pageRef" }] : [],
         requiresIfProvided: command.input.blocks.map((block, index) => ({
           ref: block.blockRef,
           field: `input.blocks[${index}].blockRef`
@@ -56079,7 +56197,7 @@ function commandRefContributions(command) {
       return {
         provides: [{ ref: command.ref, field: "ref" }],
         requires: [
-          ...command.input.linkedSubjectRef ? [{ ref: command.input.linkedSubjectRef, field: "input.linkedSubjectRef" }] : [],
+          ...command.input.linkedSubjectRef !== void 0 ? [{ ref: command.input.linkedSubjectRef, field: "input.linkedSubjectRef" }] : [],
           ...(command.input.mediaRefs ?? []).map((ref, index) => ({
             ref,
             field: `input.mediaRefs[${index}]`
@@ -56096,18 +56214,18 @@ function commandRefContributions(command) {
     case "unpublishPage":
       return {
         provides: [],
-        requires: command.input.pageRef ? [{ ref: command.input.pageRef, field: "input.pageRef" }] : []
+        requires: command.input.pageRef !== void 0 ? [{ ref: command.input.pageRef, field: "input.pageRef" }] : []
       };
     case "publishContentEntry":
       return {
         provides: [],
-        requires: command.input.contentEntryRef ? [{ ref: command.input.contentEntryRef, field: "input.contentEntryRef" }] : []
+        requires: command.input.contentEntryRef !== void 0 ? [{ ref: command.input.contentEntryRef, field: "input.contentEntryRef" }] : []
       };
     case "unpublishContentEntry":
     case "deleteContentEntry":
       return {
         provides: [],
-        requires: command.input.contentEntryRef ? [{ ref: command.input.contentEntryRef, field: "input.contentEntryRef" }] : []
+        requires: command.input.contentEntryRef !== void 0 ? [{ ref: command.input.contentEntryRef, field: "input.contentEntryRef" }] : []
       };
     default:
       return assertNever(command);
@@ -56152,7 +56270,7 @@ function collectOfferingRequires(input, intervals, intervalPath) {
   ];
 }
 function optionalRef(ref, field) {
-  return ref ? [{ ref, field }] : [];
+  return ref !== void 0 && ref.length > 0 ? [{ ref, field }] : [];
 }
 function collectVenueRefsFromIntervals(intervals, path28) {
   return intervals.flatMap((interval, index) => optionalRef(interval.venueRef, `${path28}[${index}].venueRef`));
@@ -56217,19 +56335,19 @@ function eventSeriesStaticExecutionGaps(command) {
       "event_external_payment_unsupported",
       "External-payment event commands need public checkout/link policy mapping before mutation."
     )] : [],
-    ...command.input.waitlist && command.input.waitlist.kind !== "disabled" ? [staticGap(
+    ...command.input.waitlist !== void 0 && command.input.waitlist.kind !== "disabled" ? [staticGap(
       "event_waitlist_requires_waitlist_adapter",
       "Event waitlist commands need waitlist service mapping before mutation."
     )] : [],
-    ...command.input.content?.imageRef || command.input.content?.mediaRefs ? [staticGap(
+    ...command.input.content?.imageRef !== void 0 || command.input.content?.mediaRefs !== void 0 ? [staticGap(
       "event_media_content_requires_media_adapter",
       "Event media content needs media adapter mapping before mutation."
     )] : [],
-    ...command.input.content?.contentEntryRef ? [staticGap(
+    ...command.input.content?.contentEntryRef !== void 0 ? [staticGap(
       "event_linked_content_requires_content_adapter",
       "Event linked content-entry refs need content adapter mapping before mutation."
     )] : [],
-    ...command.input.staffRefs?.length ? [staticGap(
+    ...(command.input.staffRefs?.length ?? 0) > 0 ? [staticGap(
       "event_staff_assignment_unsupported",
       "Event staff refs need staff assignment mapping before mutation."
     )] : [],
@@ -56255,11 +56373,11 @@ function courseStaticExecutionGaps(command) {
       "course_external_payment_unsupported",
       "External-payment course commands need public checkout/link policy mapping before mutation."
     )] : [],
-    ...command.input.waitlist && command.input.waitlist.kind !== "disabled" ? [staticGap(
+    ...command.input.waitlist !== void 0 && command.input.waitlist.kind !== "disabled" ? [staticGap(
       "course_waitlist_requires_waitlist_adapter",
       "Course waitlist commands need waitlist service mapping before mutation."
     )] : [],
-    ...command.input.staffRefs?.length ? [staticGap(
+    ...(command.input.staffRefs?.length ?? 0) > 0 ? [staticGap(
       "course_staff_assignment_unsupported",
       "Course staff refs need staff assignment mapping before mutation."
     )] : []
@@ -56526,7 +56644,7 @@ function validateBatchRefs(batch) {
     requiresByCommand.set(command.ref, [...dedupeContributions(requires)]);
     for (const { ref } of provides) {
       const existing = providerByRef.get(ref);
-      if (existing) {
+      if (existing !== void 0) {
         errors.push({
           code: "duplicate_resource_ref",
           resourceRef: ref,
@@ -56583,7 +56701,7 @@ function addInBatchProvidedRefRequirement(input) {
   const nextRequires = [...dedupeContributions([...currentRequires, input.requirement])];
   input.requiresByCommand.set(input.commandRef, nextRequires);
   const contribution = input.contributionsByCommand.get(input.commandRef);
-  if (contribution) {
+  if (contribution !== void 0) {
     input.contributionsByCommand.set(input.commandRef, {
       ...contribution,
       requires: nextRequires
@@ -56629,7 +56747,7 @@ function checkPortalOrdersHaveUniqueSubjects(batch) {
     if (command.type !== "seedPortalOrder") continue;
     const key = portalOrderSubjectKey(command.input.subject);
     const previous = seenBySubject.get(key);
-    if (previous) {
+    if (previous !== void 0) {
       errors.push(commandInvariantViolation(
         command.ref,
         "input.subject",
@@ -56751,7 +56869,7 @@ function checkTicketQuantitiesWithinCapacity(indexes) {
 function checkTicketsTargetTicketPricedEvents(indexes) {
   return indexes.ticketGroups.flatMap((tickets) => tickets.flatMap((ticket) => {
     const event = indexes.eventByRef.get(ticket.input.eventRef);
-    if (!event || event.input.pricing.kind === "ticket_types") return [];
+    if (event === void 0 || event.input.pricing.kind === "ticket_types") return [];
     return [commandInvariantViolation(
       ticket.ref,
       "input.eventRef",
@@ -56762,10 +56880,10 @@ function checkTicketsTargetTicketPricedEvents(indexes) {
 function checkTicketCurrencyMatchesEvent(indexes) {
   return indexes.ticketGroups.flatMap((tickets) => tickets.flatMap((ticket) => {
     const event = indexes.eventByRef.get(ticket.input.eventRef);
-    if (!event || event.input.pricing.kind !== "ticket_types") return [];
+    if (event === void 0 || event.input.pricing.kind !== "ticket_types") return [];
     const expectedCurrency = event.input.pricing.currency;
     const ticketCurrency = ticket.input.price.currency;
-    if (!expectedCurrency || !ticketCurrency || ticketCurrency === expectedCurrency) return [];
+    if (!hasText(expectedCurrency) || !hasText(ticketCurrency) || ticketCurrency === expectedCurrency) return [];
     return [commandInvariantViolation(
       ticket.ref,
       "input.price.currency",
@@ -56793,10 +56911,11 @@ function orderCommands(commands, providerByRef, requiresByCommand) {
     const requires = requiresByCommand.get(command.ref) ?? [];
     for (const { ref } of requires) {
       const provider = providerByRef.get(ref);
-      if (!provider || provider === command.ref) continue;
+      if (provider === void 0 || provider === command.ref) continue;
       if (!outgoing.has(provider)) outgoing.set(provider, /* @__PURE__ */ new Set());
-      if (!outgoing.get(provider)?.has(command.ref)) {
-        outgoing.get(provider)?.add(command.ref);
+      const dependents = outgoing.get(provider);
+      if (dependents !== void 0 && !dependents.has(command.ref)) {
+        dependents.add(command.ref);
         indegree.set(command.ref, (indegree.get(command.ref) ?? 0) + 1);
       }
     }
@@ -56806,9 +56925,9 @@ function orderCommands(commands, providerByRef, requiresByCommand) {
   while (ready.length > 0) {
     ready.sort((left, right) => (authorIndex.get(left) ?? 0) - (authorIndex.get(right) ?? 0) || left.localeCompare(right));
     const nextRef = ready.shift();
-    if (!nextRef) continue;
+    if (nextRef === void 0) continue;
     const command = commandByRef.get(nextRef);
-    if (command) ordered.push(command);
+    if (command !== void 0) ordered.push(command);
     for (const dependent of outgoing.get(nextRef) ?? []) {
       const nextDegree = (indegree.get(dependent) ?? 0) - 1;
       indegree.set(dependent, nextDegree);
@@ -56931,7 +57050,7 @@ function stableStringify(value) {
 }
 function sortValue(value) {
   if (Array.isArray(value)) return value.map(sortValue);
-  if (value && typeof value === "object") return sortRecord(value);
+  if (value !== null && typeof value === "object") return sortRecord(value);
   return value;
 }
 function sortRecord(record) {
@@ -58728,6 +58847,8 @@ function recordNavigationFailure(result, identifier, message) {
 
 // src/cli/site-commands/pageCommands.ts
 init_src();
+
+// src/cli/sync/validation.ts
 function assertNeverField(field) {
   throw new Error(`Unhandled field type while extracting field ids: ${JSON.stringify(field)}`);
 }
@@ -58805,31 +58926,17 @@ function getDataKeys(data) {
   return new Set(Object.keys(data));
 }
 function validateBlockContent(data, manifest, customFields) {
-  const warnings = [];
-  try {
-    const manifestWithCustomFields = customFields ? { ...manifest, fields: [...manifest.fields, ...customFields] } : manifest;
-    const normalizedFields = parseFieldDefinitions([...manifestWithCustomFields.fields]);
-    const validator = createManifestValidator(normalizedFields, {
-      allowNull: true,
-      allowIncomplete: true
-    });
-    validator.parse(data);
-  } catch (error) {
-    if (error instanceof ZodError) {
-      for (const issue5 of error.issues) {
-        const fieldPath = issue5.path.join(".");
-        if (issue5.code === "invalid_type" && issue5.received === "undefined") {
-          continue;
-        }
-        warnings.push({
-          type: "invalid_content",
-          field: fieldPath || "(root)",
-          message: `Invalid content${fieldPath ? ` in "${fieldPath}"` : ""}: ${issue5.message}`
-        });
-      }
-    }
-  }
-  return warnings;
+  const manifestWithCustomFields = customFields ? { ...manifest, fields: [...manifest.fields, ...customFields] } : manifest;
+  const normalizedFields = parseFieldDefinitions([...manifestWithCustomFields.fields]);
+  const validation = validateManifestContentForPush(normalizedFields, data);
+  if (validation.kind === "valid") return [];
+  return validation.issues.filter((issue5) => !isTopLevelRequiredManifestContentIssue(issue5)).map((issue5) => {
+    return {
+      type: "invalid_content",
+      field: issue5.field || "(root)",
+      message: formatManifestContentValidationIssue(issue5)
+    };
+  });
 }
 function validateBlockData(data, manifest, customFields) {
   const warnings = [];
@@ -60190,6 +60297,113 @@ async function syncMediaFilesForPush(params) {
   });
 }
 
+// src/cli/commands/push/execute/localMediaReporting.ts
+function targetSuffix(item) {
+  return item.targetEnv ? ` to ${item.targetEnv}` : "";
+}
+function fileDetails(item) {
+  const parts = [
+    item.filename,
+    typeof item.sizeBytes === "number" ? formatSize(item.sizeBytes) : void 0,
+    item.mimeType
+  ].filter((part) => Boolean(part));
+  return parts.length ? ` (${parts.join(", ")})` : "";
+}
+function reportLocalMediaPushEvent(output, event) {
+  switch (event.type) {
+    case "upload_started":
+      output.info(
+        `Uploading media "${event.item.identifier}"${fileDetails(event.item)}${targetSuffix(event.item)}...`
+      );
+      return;
+    case "upload_succeeded":
+      output.info(
+        `Uploaded media "${event.item.identifier}"${fileDetails(event.item)}${targetSuffix(event.item)}`
+      );
+      return;
+    case "upload_failed":
+      output.warn(
+        `Failed to upload media "${event.item.identifier}"${fileDetails(event.item)}${targetSuffix(event.item)}: ${event.item.rawError ?? event.item.message ?? "Unknown error"}`
+      );
+      return;
+  }
+}
+function reportLocalMediaPushSummary(params) {
+  const { output, report, dryRun, includeResolved = false } = params;
+  const { summary } = report;
+  const pendingLabel = dryRun ? `${summary.pendingUploads} uploads, ${summary.pendingAssignments} identifier updates pending` : `${summary.uploaded} uploaded, ${summary.assigned} identifier updates`;
+  output.info(
+    `Local media${report.targetEnv ? ` (${report.targetEnv})` : ""}: ${summary.resolved} resolved, ${pendingLabel}`
+  );
+  for (const item of report.items) {
+    if (!includeResolved && (item.status === "resolved" || item.status === "reused")) {
+      continue;
+    }
+    switch (item.status) {
+      case "pending_upload":
+        output.info(
+          `  Would upload "${item.identifier}"${fileDetails(item)}${targetSuffix(item)}`
+        );
+        break;
+      case "assigned":
+        output.info(`  ${dryRun ? "Would assign" : "Assigned"} identifier "${item.identifier}"`);
+        break;
+      case "uploaded":
+        output.info(`  Uploaded "${item.identifier}"${fileDetails(item)}${targetSuffix(item)}`);
+        break;
+      case "missing_local_file":
+        output.warn(`  Missing local file for "${item.identifier}"${item.message ? `: ${item.message}` : ""}`);
+        break;
+      case "failed":
+        output.warn(
+          `  Failed "${item.identifier}"${fileDetails(item)}${item.failureKind ? ` [${item.failureKind}]` : ""}: ${item.rawError ?? item.message ?? "Unknown error"}`
+        );
+        break;
+      case "skipped":
+        output.info(`  Skipped "${item.identifier}"${item.message ? `: ${item.message}` : ""}`);
+        break;
+      case "resolved":
+      case "reused":
+        output.info(`  ${item.status === "reused" ? "Reused" : "Resolved"} "${item.identifier}"`);
+        break;
+    }
+  }
+}
+async function syncLocalMediaForPushWithReporting(params) {
+  const {
+    output,
+    contentDir,
+    content,
+    client,
+    dryRun,
+    targetEnv,
+    isStructuredOutput,
+    forceUpdateAsset,
+    printSummary = true
+  } = params;
+  if (!isStructuredOutput) {
+    output.info("Resolving local media identifiers...");
+  }
+  const result = await syncLocalMediaForPush({
+    contentDir,
+    content,
+    client,
+    dryRun,
+    forceUpdateAsset,
+    targetEnv,
+    onEvent: isStructuredOutput ? void 0 : (event) => reportLocalMediaPushEvent(output, event)
+  });
+  result.warnings.forEach((warning) => output.warn(warning));
+  if (!isStructuredOutput && printSummary && (result.report.items.length > 0 || result.hasChanges)) {
+    reportLocalMediaPushSummary({
+      output,
+      report: result.report,
+      dryRun
+    });
+  }
+  return result;
+}
+
 // src/cli/commands/push/execute/metadata.ts
 function mapIfUpdating(shouldUpdate, items, mapper) {
   return shouldUpdate ? items.map(mapper) : [];
@@ -60293,6 +60507,100 @@ ${errors}`
     output.error(message);
   }
 }
+
+// src/cli/commands/push/scopes/commandBackedDatedOfferingScope.ts
+var VOLATILE_DATED_OFFERING_FIELDS = /* @__PURE__ */ new Set([
+  "id",
+  "siteId",
+  "createdAt",
+  "updatedAt",
+  "contentUpdatedAt"
+]);
+function normalizeDatedOfferingForComparison(value) {
+  const normalized = JSON.parse(JSON.stringify(value));
+  for (const field of VOLATILE_DATED_OFFERING_FIELDS) {
+    delete normalized[field];
+  }
+  return normalized;
+}
+function createEmptyDryRunSummary() {
+  return { created: 0, updated: 0, unchanged: 0, deleted: 0 };
+}
+function incrementDryRunSummary(summary, status) {
+  switch (status) {
+    case "created":
+      return { ...summary, created: summary.created + 1 };
+    case "updated":
+      return { ...summary, updated: summary.updated + 1 };
+    case "unchanged":
+      return { ...summary, unchanged: summary.unchanged + 1 };
+    case "deleted":
+      return { ...summary, deleted: summary.deleted + 1 };
+  }
+}
+function buildDatedOfferingDryRunPlan(input) {
+  let summary = createEmptyDryRunSummary();
+  const items = [];
+  for (const item of input.localItems) {
+    const identifier = input.config.getIdentifier(item);
+    const remoteItem = input.config.findRemote(input.remoteItems, identifier);
+    if (!remoteItem) {
+      summary = incrementDryRunSummary(summary, "created");
+      items.push({
+        identifier,
+        label: input.config.getDisplayLabel(item),
+        status: "created",
+        changes: []
+      });
+      continue;
+    }
+    const localObject = normalizeDatedOfferingForComparison(item);
+    const remoteObject = normalizeDatedOfferingForComparison(remoteItem);
+    const changes = findChangedFieldsWithValues(localObject, remoteObject);
+    const status = changes.length > 0 ? "updated" : "unchanged";
+    summary = incrementDryRunSummary(summary, status);
+    items.push({
+      identifier,
+      label: input.config.getDisplayLabel(item),
+      status,
+      changes
+    });
+  }
+  for (const identifier of input.orphanIdentifiers) {
+    summary = incrementDryRunSummary(summary, "deleted");
+    items.push({
+      identifier,
+      label: identifier,
+      status: "deleted",
+      changes: []
+    });
+  }
+  return { summary, items };
+}
+function jsonDryRunReport(params) {
+  const mode = params.jsonDiffMode ?? "summary";
+  const changes = params.plan.items.filter((item) => item.status !== "unchanged").map((item) => ({
+    type: params.scope,
+    identifier: item.identifier,
+    operation: item.status === "deleted" ? "delete" : item.status === "created" ? "create" : "update",
+    ...mode === "full" ? { changes: item.changes } : {}
+  }));
+  return {
+    mode,
+    direction: "push",
+    scope: params.scope,
+    targetEnv: params.targetEnv,
+    dryRun: true,
+    summary: {
+      creates: params.plan.summary.created,
+      updates: params.plan.summary.updated,
+      deletes: params.plan.summary.deleted,
+      unchanged: params.plan.summary.unchanged
+    },
+    changes,
+    ...params.media ? { media: params.media } : {}
+  };
+}
 async function pushCommandBackedDatedOfferingScope(ctx, config2) {
   const noopResult = {
     status: "noop",
@@ -60372,58 +60680,84 @@ Run "riverbankcms pull ${config2.scopeCommand}" first to get latest, or use --fo
   const allLocalIdentifierSet = new Set(allLocalItems.map(config2.getIdentifier));
   const orphanIdentifiers = ctx.deleteOrphaned && !config2.shouldPushItem && remoteItems ? remoteItems.map(config2.getRemoteIdentifier).filter((identifier) => !allLocalIdentifierSet.has(identifier)) : [];
   if (ctx.dryRun) {
-    if (localItems.length > 0) {
-      ctx.output.info(`[DRY RUN] Would push ${localItems.length} ${config2.scopeName}`);
+    const dryRunPlan = buildDatedOfferingDryRunPlan({
+      localItems,
+      remoteItems: remoteItems ?? [],
+      orphanIdentifiers,
+      config: config2
+    });
+    const plannedPushes = dryRunPlan.summary.created + dryRunPlan.summary.updated;
+    if (ctx.jsonDiffMode) {
+      ctx.output.json(jsonDryRunReport({
+        scope: config2.scopeCommand,
+        targetEnv: ctx.targetEnv,
+        jsonDiffMode: ctx.jsonDiffMode,
+        plan: dryRunPlan,
+        media: config2.dryRunReportExtras?.media
+      }));
+      return {
+        status: "dry-run",
+        scopeCommand: config2.scopeCommand,
+        scopeName: config2.scopeName,
+        created: dryRunPlan.summary.created,
+        updated: dryRunPlan.summary.updated,
+        unchanged: dryRunPlan.summary.unchanged,
+        deleted: dryRunPlan.summary.deleted,
+        failed: 0,
+        errors: [],
+        media: config2.dryRunReportExtras?.media
+      };
+    }
+    if (plannedPushes > 0) {
+      ctx.output.info(
+        `[DRY RUN] Would push ${plannedPushes} ${config2.scopeName} (${dryRunPlan.summary.created} create, ${dryRunPlan.summary.updated} update, ${dryRunPlan.summary.unchanged} unchanged)`
+      );
       if (skippedUnchanged > 0) {
-        ctx.output.info(`  (skipping ${skippedUnchanged} unchanged)`);
-      }
-      if (ctx.humanDiff && remoteItems) {
-        for (const item of localItems) {
-          const identifier = config2.getIdentifier(item);
-          const remoteItem = config2.findRemote(remoteItems, identifier);
-          if (!remoteItem) {
-            ctx.output.info(`  + ${identifier}: ${config2.getDisplayLabel(item)} (new)`);
-            continue;
-          }
-          const localObject = JSON.parse(JSON.stringify(item));
-          const remoteObject = JSON.parse(JSON.stringify(remoteItem));
-          delete remoteObject.createdAt;
-          delete remoteObject.updatedAt;
-          delete remoteObject.contentUpdatedAt;
-          if (equal(localObject, remoteObject)) {
-            ctx.output.info(`  = ${identifier}: ${config2.getDisplayLabel(item)} (unchanged)`);
-          } else {
-            ctx.output.info(`  ~ ${identifier}: ${config2.getDisplayLabel(item)}`);
-            const changes = findChangedFieldsWithValues(localObject, remoteObject);
-            for (const change of changes) {
+        ctx.output.info(`  (skipping ${skippedUnchanged} filtered out)`);
+      }
+    } else if (dryRunPlan.summary.deleted === 0) {
+      ctx.output.info(
+        `[DRY RUN] No ${config2.scopeName} changes to push (${dryRunPlan.summary.unchanged} unchanged)`
+      );
+    }
+    for (const item of dryRunPlan.items) {
+      switch (item.status) {
+        case "created":
+          ctx.output.info(`  + ${item.identifier}: ${item.label} (new)`);
+          break;
+        case "updated":
+          ctx.output.info(`  ~ ${item.identifier}: ${item.label}`);
+          if (ctx.humanDiff) {
+            for (const change of item.changes) {
               ctx.output.info(`    ${change.path}: ${formatValue(change.before)} -> ${formatValue(change.after)}`);
             }
           }
-        }
-      } else {
-        for (const item of localItems) {
-          ctx.output.info(`  - ${config2.getIdentifier(item)}: ${config2.getDisplayLabel(item)}`);
-        }
+          break;
+        case "unchanged":
+          ctx.output.info(`  = ${item.identifier}: ${item.label} (unchanged)`);
+          break;
       }
     }
-    if (orphanIdentifiers.length > 0) {
-      ctx.output.info(`[DRY RUN] Would delete ${orphanIdentifiers.length} orphaned ${config2.scopeName}:`);
-      for (const identifier of orphanIdentifiers) {
-        ctx.output.info(`  - ${identifier}`);
+    if (dryRunPlan.summary.deleted > 0) {
+      ctx.output.info(`[DRY RUN] Would delete ${dryRunPlan.summary.deleted} orphaned ${config2.scopeName}:`);
+      for (const item of dryRunPlan.items.filter((candidate) => candidate.status === "deleted")) {
+        ctx.output.info(`  - ${item.identifier}`);
       }
     }
-    if (localItems.length > 0 || orphanIdentifiers.length > 0) {
+    if (plannedPushes > 0 || dryRunPlan.summary.deleted > 0) {
       ctx.output.info("\nUse --yes (for remote) or remove --dry-run (for local) to apply changes.");
     }
     return {
       status: "dry-run",
       scopeCommand: config2.scopeCommand,
       scopeName: config2.scopeName,
-      created: 0,
-      updated: 0,
-      deleted: orphanIdentifiers.length,
+      created: dryRunPlan.summary.created,
+      updated: dryRunPlan.summary.updated,
+      unchanged: dryRunPlan.summary.unchanged,
+      deleted: dryRunPlan.summary.deleted,
       failed: 0,
-      errors: []
+      errors: [],
+      media: config2.dryRunReportExtras?.media
     };
   }
   const upserts = localItems.map((item) => ({
@@ -60548,22 +60882,23 @@ function createEmptyLocalContent() {
   };
 }
 async function syncLocalMediaForScopePush(ctx, content) {
-  ctx.output.info("Resolving local media identifiers...");
-  const result = await syncLocalMediaForPush({
+  const result = await syncLocalMediaForPushWithReporting({
+    output: ctx.output,
     contentDir: ctx.contentDir,
     content,
     client: ctx.client,
     dryRun: ctx.dryRun,
-    forceUpdateAsset: ctx.forceUpdateAsset
+    forceUpdateAsset: ctx.forceUpdateAsset,
+    targetEnv: ctx.targetEnv,
+    isStructuredOutput: ctx.isStructuredOutput ?? ctx.isJsonOutput
   });
-  result.warnings.forEach((warning) => ctx.output.warn(warning));
   if (result.errors.length > 0) {
-    return { ok: false, errors: result.errors };
+    return { ok: false, errors: result.errors, mediaReport: result.report };
   }
   if (!ctx.dryRun && !ctx.skipMeta) {
     await writeMediaManifest(ctx.contentDir, result.manifest);
   }
-  return { ok: true };
+  return { ok: true, mediaReport: result.report };
 }
 
 // src/cli/commands/push/scopes/courses.ts
@@ -60785,7 +61120,8 @@ ${duplicate.filePaths.map((filePath) => `    - ${formatDuplicateEventFilePath(ct
       updated: 0,
       deleted: 0,
       failed: 0,
-      errors: []
+      errors: [],
+      media: mediaResult.mediaReport
     };
   }
   return pushCommandBackedDatedOfferingScope(ctx, {
@@ -60819,6 +61155,9 @@ ${duplicate.filePaths.map((filePath) => `    - ${formatDuplicateEventFilePath(ct
       await writeEvents(dir, pulledEvents, opts);
     },
     readOnlyStatusWarning: (event) => event.status === "completed" ? `Event ${event.identifier}: status "completed" is read-only; omitting status on push.` : null,
+    dryRunReportExtras: {
+      media: mediaResult.mediaReport
+    },
     buildCompileInput: ({ source, siteId, targetEnv, upserts, deletes }) => ({
       source,
       siteId,
@@ -61679,6 +62018,8 @@ async function executeScopedPush(output, isRemote, options, globalOpts, scopeLab
       dryRun: options.dryRun,
       force: options.force ?? false,
       isJsonOutput: globalOpts.json ?? false,
+      isStructuredOutput: Boolean(globalOpts.json || options.jsonDiffMode),
+      jsonDiffMode: options.jsonDiffMode,
       forceUpdateAsset: options.forceUpdateAsset,
       deleteOrphaned: shouldDeleteOrphans,
       autoPullStale: options.autoPullStale ?? false,
@@ -62180,17 +62521,16 @@ ${errors}`
         }
       }
     }
-    output.info("Resolving local media identifiers...");
-    const localMediaResult = await syncLocalMediaForPush({
+    const localMediaResult = await syncLocalMediaForPushWithReporting({
+      output,
       contentDir,
       content: filteredLocal,
       client,
       dryRun,
-      forceUpdateAsset: options.forceUpdateAsset
+      forceUpdateAsset: options.forceUpdateAsset,
+      targetEnv: target,
+      isStructuredOutput: jsonOutput || Boolean(jsonDiffMode)
     });
-    if (localMediaResult.warnings.length > 0) {
-      localMediaResult.warnings.forEach((warning) => output.warn(warning));
-    }
     if (localMediaResult.errors.length > 0) {
       output.error("Local media sync failed", {
         details: localMediaResult.errors.map((message) => `  - ${message}`).join("\n")
@@ -62228,15 +62568,12 @@ ${errors}`
           jsonDiffMode: jsonDiffMode ?? void 0,
           localContent: filteredLocal,
           remoteContent,
-          humanDiff
+          humanDiff,
+          mediaReport: localMediaResult.report
         });
         return { success: true };
       }
       if (localMediaResult && !dryRun) {
-        const mediaSummary = localMediaResult.summary;
-        output.info(
-          `Local media: ${mediaSummary.resolved} resolved, ${mediaSummary.uploaded} uploaded, ${mediaSummary.assigned} identifier updates`
-        );
         if (!skipMeta) {
           await writeMediaManifest(contentDir, localMediaResult.manifest);
         }
@@ -62269,7 +62606,8 @@ ${errors}`
       jsonDiffMode: jsonDiffMode ?? void 0,
       localContent: filteredLocal,
       remoteContent,
-      humanDiff
+      humanDiff,
+      mediaReport: localMediaResult.report
     });
     if (dryRun) {
       const preflight = preflightContentPushPlanAsCommandReport({
@@ -62340,13 +62678,6 @@ ${errors}`
 [DRY RUN] Would also push theme: ${themeName}`);
         }
       }
-      if (localMediaResult) {
-        const mediaSummary = localMediaResult.summary;
-        output.info(
-          `
-[DRY RUN] Local media: ${mediaSummary.resolved} resolved, ${mediaSummary.pendingUploads} uploads, ${mediaSummary.pendingAssignments} identifier updates`
-        );
-      }
       if (options.syncMedia) {
         const extractable = localContentToExtractable(filteredLocal);
         const identifiers = extractMediaIdentifiers(extractable);
@@ -62385,10 +62716,6 @@ ${errors}`
     let hasFailures = syncResult.errors.length > 0;
     reportSyncResults({ output, result: syncResult, hasErrors: syncResult.errors.length > 0 });
     if (localMediaResult && !dryRun) {
-      const mediaSummary = localMediaResult.summary;
-      output.info(
-        `Local media: ${mediaSummary.resolved} resolved, ${mediaSummary.uploaded} uploaded, ${mediaSummary.assigned} identifier updates`
-      );
       if (!skipMeta) {
         await writeMediaManifest(contentDir, localMediaResult.manifest);
       }
@@ -62452,6 +62779,8 @@ ${errors}`
         dryRun: false,
         force: options.force ?? false,
         isJsonOutput,
+        isStructuredOutput: isJsonOutput,
+        jsonDiffMode: null,
         deleteOrphaned: false,
         autoPullStale: options.autoPullStale ?? false,
         skipMeta,
@@ -64508,6 +64837,12 @@ function buildBlockTypesTemplate() {
     "",
     "Reference list of all built-in CMS block types.",
     "The generated section is updated by `riverbankcms init-docs`.",
+    "",
+    "Authoring notes:",
+    "- Fields marked `required` must be present with a valid value.",
+    "- Optional fields may be omitted from pushed JSON; you do not need to include every key or set unused fields to `null`.",
+    "- Defaults shown here document the editor/rendering contract. Include an optional field only when you want to override the default.",
+    "- Required nested fields apply when their parent object or repeater item is present.",
     ""
   ].join("\n");
   const generated = buildBlockTypesGeneratedSection();
@@ -64526,6 +64861,12 @@ function buildSiteBlockTypesTemplate(state) {
     "- System blocks (`block.*`) with `blockFieldExtensions` and `blockFieldOptions` merged in",
     "- Custom blocks (`custom.*`) from `riverbank.config.ts`",
     "",
+    "Authoring notes:",
+    "- Fields marked `required` must be present with a valid value.",
+    "- Optional fields may be omitted from pushed JSON; you do not need to include every key or set unused fields to `null`.",
+    "- Defaults shown here document the editor/rendering contract. Include an optional field only when you want to override the default.",
+    "- Required nested fields apply when their parent object or repeater item is present.",
+    "",
     "The generated section is updated by `riverbankcms init-docs`.",
     ""
   ].join("\n");
@@ -65565,7 +65906,7 @@ var SimpleCache = class {
 };
 
 // src/version.ts
-var SDK_VERSION = "0.90.1";
+var SDK_VERSION = "0.92.0";
 
 // src/client/error.ts
 var RiverbankApiError = class _RiverbankApiError extends Error {