@riverbankcms/sdk 0.78.0 → 0.79.0

package/dist/cli/index.mjs

@@ -30,14 +30,42 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
+// ../core/src/result.ts
+function ok(value) {
+  return { ok: true, value };
+}
+function err(error) {
+  return { ok: false, error };
+}
+var init_result = __esm({
+  "../core/src/result.ts"() {
+  }
+});
+
 // ../core/src/branded.ts
-var asSiteId, asStorageBucketName, unsafeAsPositiveByteCount, unsafeAsPositiveSeconds;
+function parseUuidBrand(value, unsafeConstructor) {
+  if (typeof value !== "string") {
+    return err({ kind: "not_string" });
+  }
+  const normalized = value.trim().toLowerCase();
+  if (normalized.length === 0) {
+    return err({ kind: "empty_string" });
+  }
+  if (!UUID_PATTERN.test(normalized)) {
+    return err({ kind: "invalid_uuid" });
+  }
+  return ok(unsafeConstructor(normalized));
+}
+var UUID_PATTERN, unsafeAsSiteId, unsafeAsStorageBucketName, unsafeAsPositiveByteCount, unsafeAsPositiveSeconds, parseSiteId;
 var init_branded = __esm({
   "../core/src/branded.ts"() {
-    asSiteId = (id) => id;
-    asStorageBucketName = (value) => value;
+    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;
     unsafeAsPositiveByteCount = (value) => value;
     unsafeAsPositiveSeconds = (value) => value;
+    parseSiteId = (value) => parseUuidBrand(value, unsafeAsSiteId);
   }
 });
 
@@ -111,18 +139,6 @@ var init_booking_instalments = __esm({
   }
 });
 
-// ../core/src/result.ts
-function ok(value) {
-  return { ok: true, value };
-}
-function err(error) {
-  return { ok: false, error };
-}
-var init_result = __esm({
-  "../core/src/result.ts"() {
-  }
-});
-
 // ../core/src/booking-date-time.ts
 var init_booking_date_time = __esm({
   "../core/src/booking-date-time.ts"() {
@@ -423,9 +439,24 @@ var init_fileSafety = __esm({
   "../media-core/src/fileSafety.ts"() {
   }
 });
+
+// ../media-core/src/fileDomain.ts
+var AMBIENT_BACKGROUND_ROLES2;
 var init_fileDomain = __esm({
   "../media-core/src/fileDomain.ts"() {
     init_src();
+    AMBIENT_BACKGROUND_ROLES2 = [
+      "light-texture",
+      "proof-band-dark",
+      "cta-wash",
+      "footer-detail",
+      "style-atmosphere-1",
+      "style-atmosphere-2"
+    ];
+    [
+      "selected-background",
+      ...AMBIENT_BACKGROUND_ROLES2
+    ];
     ({
       audio: unsafeAsPositiveByteCount(250 * 1024 * 1024),
       rawVideoBeforeCompression: unsafeAsPositiveByteCount(500 * 1024 * 1024),
@@ -449,15 +480,15 @@ var init_fileStorage = __esm({
   "../media-core/src/fileStorage.ts"() {
     init_src();
     FILE_STORAGE_BUCKETS = {
-      publicSite: asStorageBucketName("media"),
-      privateSite: asStorageBucketName("site-files-private"),
-      temporary: asStorageBucketName("temp-uploads")
+      publicSite: unsafeAsStorageBucketName("media"),
+      privateSite: unsafeAsStorageBucketName("site-files-private"),
+      temporary: unsafeAsStorageBucketName("temp-uploads")
     };
     [
       FILE_STORAGE_BUCKETS.publicSite,
       // Existing site logo and font uploads predate the unified file buckets.
-      asStorageBucketName("site-assets"),
-      asStorageBucketName("site-fonts")
+      unsafeAsStorageBucketName("site-assets"),
+      unsafeAsStorageBucketName("site-fonts")
     ];
     PRIVATE_SITE_FILE_BUCKET_MIME_TYPES = [
       "application/pdf",
@@ -851,14 +882,14 @@ function rotateNormalizedPoint(point, rotation) {
   const x = point.x;
   const y = point.y;
   switch (rotation) {
+    case 0:
+      return { x, y };
     case 90:
       return { x: 1 - y, y: x };
     case 180:
       return { x: 1 - x, y: 1 - y };
     case 270:
       return { x: y, y: 1 - x };
-    default:
-      return { x, y };
   }
 }
 var init_rotation = __esm({
@@ -1143,6 +1174,14 @@ var init_repeaterGrid = __esm({
     DEFAULT_REPEATER_GRID_COLUMN_FIELD_ID = "gridColumn";
   }
 });
+
+// ../blocks/src/system/icons/presets.ts
+var ICON_PICKER_PRESETS;
+var init_presets = __esm({
+  "../blocks/src/system/icons/presets.ts"() {
+    ICON_PICKER_PRESETS = ["cta", "feature"];
+  }
+});
 function isDisplayMediaKind(kind) {
   return DISPLAY_MEDIA_KINDS.includes(kind);
 }
@@ -1230,6 +1269,7 @@ var init_schema2 = __esm({
     init_src2();
     init_node();
     init_repeaterGrid();
+    init_presets();
     visibilityLevels = ["admin", "designer", "author"];
     MEDIA_KINDS = [
       "image",
@@ -1301,6 +1341,8 @@ var init_schema2 = __esm({
       mediaPickerAutoOpen: z.boolean().optional(),
       showMediaPreview: z.boolean().optional(),
       showMediaOverlayActions: z.boolean().optional(),
+      mediaPreviewMaxWidth: z.enum(["xs", "sm", "md", "none"]).optional(),
+      preventMediaPreviewUpscale: z.boolean().optional(),
       mediaDelivery: mediaDeliverySchema.optional(),
       mediaDeliveryByVariant: z.record(z.string(), mediaDeliverySchema).optional(),
       // Optional input hints for validators/widgets
@@ -1379,7 +1421,7 @@ var init_schema2 = __esm({
       layoutGridColumnField: z.string().optional(),
       layoutGridMaxRows: z.number().int().positive().optional(),
       // Icon picker configuration (used when ui.widget === 'iconPicker')
-      iconPickerPreset: z.enum(["cta"]).optional(),
+      iconPickerPreset: z.enum(ICON_PICKER_PRESETS).optional(),
       // Entry picker configuration
       contentTypeField: z.string().optional(),
       fixedContentType: z.string().optional(),
@@ -1550,6 +1592,9 @@ var init_schema2 = __esm({
       type: z.literal("repeater"),
       itemLabel: z.string().default("Item"),
       itemLabelSource: z.string().optional(),
+      showSummary: z.boolean().optional(),
+      summaryFields: z.string().array().optional(),
+      summaryMaxChars: z.number().int().positive().optional(),
       minItems: z.number().int().min(0).default(0),
       maxItems: z.number().int().positive().optional(),
       // Monomorphic mode
@@ -3046,7 +3091,7 @@ function parseThemeColorToken(value) {
   if (!isThemeColorToken(value)) return null;
   return value.trim();
 }
-var PALETTE_TOKEN_NAMES, paletteTokenNameSchema, themeColorBaseTokenNames, themeColorBaseTokenSet, SHADE_STEPS, shadeStepSet, themeColorTokenSchema;
+var PALETTE_TOKEN_NAMES, paletteTokenNameSchema, themeColorBaseTokenNames, themeColorBaseTokenSet, themeColorShadeSteps, shadeStepSet, themeColorTokenSchema;
 var init_themeColorTokens = __esm({
   "../theme-core/src/tokens/themeColorTokens.ts"() {
     init_blockColorTokens();
@@ -3080,7 +3125,7 @@ var init_themeColorTokens = __esm({
       "accentForeground"
     ];
     themeColorBaseTokenSet = new Set(themeColorBaseTokenNames);
-    SHADE_STEPS = [
+    themeColorShadeSteps = [
       "50",
       "100",
       "200",
@@ -3093,7 +3138,7 @@ var init_themeColorTokens = __esm({
       "900",
       "950"
     ];
-    shadeStepSet = new Set(SHADE_STEPS);
+    shadeStepSet = new Set(themeColorShadeSteps);
     themeColorTokenSchema = z.string().min(1).refine((value) => Boolean(isThemeColorToken(value)), "Expected a known Theme V2 color token");
   }
 });
@@ -4262,7 +4307,7 @@ var init_generateButtonCss = __esm({
 });
 
 // ../theme-core/src/buttons/presets.ts
-var init_presets = __esm({
+var init_presets2 = __esm({
   "../theme-core/src/buttons/presets.ts"() {
   }
 });
@@ -4287,7 +4332,7 @@ var init_buttons = __esm({
     init_generateButtonCss();
     init_generateDefaultButtonSystem();
     init_constants();
-    init_presets();
+    init_presets2();
     init_personalities();
     init_types5();
     init_registry();
@@ -7452,6 +7497,7 @@ var init_curatedSiteStyles = __esm({
       "site-style:personal-retreat-journal",
       "site-style:tactile-workshop",
       "site-style:modern-wellness",
+      "site-style:clarity-zen-blue",
       SOFT_EARTH_SITE_STYLE_ID_VALUE,
       "site-style:bold-launch",
       "site-style:south-west-twerk-school"
@@ -7804,6 +7850,114 @@ var init_curatedSiteStyles = __esm({
           paletteChoice("warm-neutral-clay")
         ]
       }),
+      defineCuratedSiteStyle({
+        id: "site-style:clarity-zen-blue",
+        name: "Clarity Zen",
+        description: "Calm, editorial, and reassuring for therapy, counselling, and wellbeing support practices.",
+        generationBrief: "Use a calm, soft palette, editorial serif headings, warm grounded copy, rounded cards, calm proof sections, and clear booking routes. Keep the tone compassionate and straightforward, with professional trust rather than hard-sell wellness language.",
+        siteCreatorSelection: {
+          kind: "site_creator_keyword_heuristic",
+          priority: 25
+        },
+        selectionKeywordRules: [
+          { kind: "substring", value: "psychotherap" },
+          { kind: "phrase", value: "mental health" },
+          { kind: "phrase", value: "talk therapy" },
+          { kind: "phrase", value: "therapy and wellbeing" }
+        ],
+        tokenRecipes: {
+          palette: "brand-led",
+          contrast: "standard",
+          radius: "rounded",
+          shadow: "subtle",
+          typography: "serif-editorial",
+          spacing: "airy",
+          motion: "subtle"
+        },
+        compositionBudget: balancedBudget,
+        themeOverrides: {
+          typography: {
+            body: {
+              family: "Inter, system-ui, sans-serif",
+              size: "md",
+              weight: "regular",
+              lineHeight: "relaxed",
+              letterSpacing: "normal"
+            },
+            headings: {
+              default: {
+                family: '"Cormorant Garamond", Georgia, serif',
+                weight: "regular",
+                lineHeight: "normal",
+                letterSpacing: "normal",
+                colorToken: "text",
+                italic: null,
+                case: null
+              },
+              h1: {
+                size: "xl",
+                weight: "regular",
+                lineHeight: "normal",
+                letterSpacing: "normal",
+                italic: null
+              },
+              h2: {
+                size: "lg",
+                weight: "regular",
+                lineHeight: "normal",
+                letterSpacing: "normal",
+                italic: null
+              },
+              h3: {
+                size: "md",
+                weight: "regular",
+                lineHeight: "normal",
+                letterSpacing: "normal",
+                italic: null
+              }
+            },
+            scale: "majorThird"
+          },
+          bodyText: {
+            intro: {
+              paragraphSize: "default",
+              headingSize: "editorial"
+            }
+          }
+        },
+        defaultBlockVariants: {
+          "block.faq": "split-heading-columns"
+        },
+        recommendedAppearancePresetIds: [
+          "hero-split-editorial",
+          "intro-organic-statement",
+          "feature-cards-raised-rule",
+          "media-text-quiet-story",
+          "testimonials-brand-background-quotes",
+          "faq-contained-help",
+          "contact-form-panel"
+        ],
+        recommendedHeaderLookIds: [
+          "centered-calm",
+          "serif-line",
+          "minimal-transparent"
+        ],
+        recommendedFooterLookIds: [
+          "footer-muted-grounding",
+          "site-footer-brand-two-band"
+        ],
+        buttonPersonalityChoices: [
+          buttonChoice("soft-pill"),
+          buttonChoice("pebble"),
+          buttonChoice("editorial-link")
+        ],
+        paletteVariantChoices: [
+          paletteChoice("brand-led-cool"),
+          paletteChoice("soft-natural-watercolor"),
+          paletteChoice("soft-natural-stone"),
+          paletteChoice("warm-neutral-cream")
+        ]
+      }),
       defineCuratedSiteStyle({
         id: "site-style:personal-retreat-journal",
         name: "Personal Retreat Journal",
@@ -11279,47 +11433,48 @@ function validateFieldDefinitions(fields3, fragmentId) {
 function prefixFieldId(field, scope) {
   const cloned = cloneFieldDefinition2(field);
   cloned.id = `${scope}.${field.id}`;
-  cloned.defaultValue = cloneUnknown(cloned.defaultValue);
+  const defaultValue = cloned.defaultValue;
+  cloned.defaultValue = cloneUnknown(defaultValue);
   cloned.visibleRoles = cloned.visibleRoles ? [...cloned.visibleRoles] : void 0;
   cloned.ui = cloneUnknown(cloned.ui);
   return cloned;
 }
 function cloneFieldDefinition2(field) {
-  switch (field.type) {
-    case "repeater":
-      if (field.polymorphic && field.itemTypes) {
-        return {
-          ...field,
-          polymorphic: true,
-          itemTypes: Object.fromEntries(
-            Object.entries(field.itemTypes).map(([key, itemType]) => [
-              key,
-              {
-                ...itemType,
-                fields: itemType.fields.map(cloneFieldDefinition2)
-              }
-            ])
-          )
-        };
-      } else if (field.schema) {
-        return {
-          ...field,
-          schema: {
-            fields: field.schema.fields.map(cloneFieldDefinition2)
-          }
-        };
-      }
-      return { ...field };
-    case "group":
+  if (field.type === "repeater") {
+    if (field.polymorphic && field.itemTypes) {
+      return {
+        ...field,
+        polymorphic: true,
+        itemTypes: Object.fromEntries(
+          Object.entries(field.itemTypes).map(([key, itemType]) => [
+            key,
+            {
+              ...itemType,
+              fields: itemType.fields.map(cloneFieldDefinition2)
+            }
+          ])
+        )
+      };
+    }
+    if (field.schema) {
       return {
         ...field,
         schema: {
           fields: field.schema.fields.map(cloneFieldDefinition2)
         }
       };
-    default:
-      return { ...field };
+    }
+    return { ...field };
+  }
+  if (field.type === "group") {
+    return {
+      ...field,
+      schema: {
+        fields: field.schema.fields.map(cloneFieldDefinition2)
+      }
+    };
   }
+  return { ...field };
 }
 function cloneUnknown(value) {
   if (value == null || typeof value !== "object") {
@@ -12190,36 +12345,46 @@ function buildCarouselLayout() {
     [buildTestimonialCard(repeat("data.entries", "testimonial"))]
   );
 }
+function buildResponsiveGridCards() {
+  return [
+    // 2 columns
+    grid(
+      { gap: "lg", cols: { base: 1, sm: 2 } },
+      [buildTestimonialCard(repeat("data.entries", "testimonial"))],
+      when("gridColumns", { equals: "2" })
+    ),
+    // 3 columns (default when unset)
+    grid(
+      { gap: "lg", cols: { base: 1, sm: 2, lg: 3 } },
+      [buildTestimonialCard(repeat("data.entries", "testimonial"))],
+      when("gridColumns", { equals: "3" })
+    ),
+    // 4 columns
+    grid(
+      { gap: "lg", cols: { base: 1, sm: 2, lg: 3, xl: 4 } },
+      [buildTestimonialCard(repeat("data.entries", "testimonial"))],
+      when("gridColumns", { equals: "4" })
+    ),
+    // Fallback to 3 columns when gridColumns is not set
+    grid(
+      { gap: "lg", cols: { base: 1, sm: 2, lg: 3 } },
+      [buildTestimonialCard(repeat("data.entries", "testimonial"))],
+      when("gridColumns", { not: true })
+    )
+  ];
+}
 function buildGridLayout() {
   return el(
     "div",
     { className: "rb-mt-12 rb-testimonials-carousel" },
-    [
-      // 2 columns
-      grid(
-        { gap: "lg", cols: { base: 1, sm: 2 } },
-        [buildTestimonialCard(repeat("data.entries", "testimonial"))],
-        when("gridColumns", { equals: "2" })
-      ),
-      // 3 columns (default when unset)
-      grid(
-        { gap: "lg", cols: { base: 1, sm: 2, lg: 3 } },
-        [buildTestimonialCard(repeat("data.entries", "testimonial"))],
-        when("gridColumns", { equals: "3" })
-      ),
-      // 4 columns
-      grid(
-        { gap: "lg", cols: { base: 1, sm: 2, lg: 3, xl: 4 } },
-        [buildTestimonialCard(repeat("data.entries", "testimonial"))],
-        when("gridColumns", { equals: "4" })
-      ),
-      // Fallback to 3 columns when gridColumns is not set
-      grid(
-        { gap: "lg", cols: { base: 1, sm: 2, lg: 3 } },
-        [buildTestimonialCard(repeat("data.entries", "testimonial"))],
-        when("gridColumns", { not: true })
-      )
-    ]
+    buildResponsiveGridCards()
+  );
+}
+function buildGridCardsLayout(className) {
+  return el(
+    "div",
+    { className },
+    buildResponsiveGridCards()
   );
 }
 var grid, testimonialsCarouselFragment;
@@ -14247,7 +14412,8 @@ function createBlockManifestWithContentShape(config2, _contentShape) {
   return createBlockManifest(config2);
 }
 function normalizeBlockLayout(layout) {
-  return Array.isArray(layout) ? [...layout] : layout;
+  const rawLayout = layout;
+  return Array.isArray(rawLayout) ? rawLayout : rawLayout;
 }
 function deriveComponentName(id) {
   const base = id.replace(/^block\./, "");
@@ -14454,7 +14620,7 @@ var init_form_interactive = __esm({
 });
 
 // ../blocks/src/lib/typeGuards.ts
-function isRecord2(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var init_typeGuards = __esm({
@@ -14974,10 +15140,10 @@ function normalizeEventCategoryIds(value) {
   if (Array.isArray(value)) {
     return normalizeIdList(
       value.filter((entry) => typeof entry === "string")
-    ).map(asEventCategoryId);
+    ).map(unsafeAsEventCategoryId);
   }
   if (typeof value === "string") {
-    return normalizeIdList(value.split(",")).map(asEventCategoryId);
+    return normalizeIdList(value.split(",")).map(unsafeAsEventCategoryId);
   }
   return [];
 }
@@ -14990,7 +15156,7 @@ function normalizeEventVenueId(value) {
     return null;
   }
   const trimmed = value.trim();
-  return trimmed ? asVenueId(trimmed) : null;
+  return trimmed ? unsafeAsVenueId(trimmed) : null;
 }
 function normalizeEventStaffMemberId(value) {
   if (typeof value !== "string") {
@@ -14999,7 +15165,7 @@ function normalizeEventStaffMemberId(value) {
   const trimmed = value.trim();
   return trimmed ? trimmed : null;
 }
-var eventBlockKindValues, eventSurfacePresetValues, eventSurfaceScopeValues, eventScheduleScopeValues, asEventCategoryId, asVenueId;
+var eventBlockKindValues, eventSurfacePresetValues, eventSurfaceScopeValues, eventScheduleScopeValues, unsafeAsEventCategoryId, unsafeAsVenueId;
 var init_filtering = __esm({
   "../blocks/src/system/blocks/events/shared/filtering.ts"() {
     init_normalizeIds();
@@ -15017,8 +15183,8 @@ var init_filtering = __esm({
       "custom"
     ];
     eventScheduleScopeValues = ["any", "recurring", "oneOff"];
-    asEventCategoryId = (value) => value;
-    asVenueId = (value) => value;
+    unsafeAsEventCategoryId = (value) => value;
+    unsafeAsVenueId = (value) => value;
   }
 });
 
@@ -18949,7 +19115,16 @@ var ENDPOINT_DEFINITIONS = {
     revalidate: 60,
     tags: ["site-{siteId}", "content-{siteId}-{type}"],
     auth: "user",
-    responseKind: "json"
+    responseKind: "json",
+    errors: ["validation:invalid_input", "resource:not_found", "resource:conflict", "server:internal_error"]
+  },
+  reorderContentEntries: {
+    path: "/sites/{siteId}/content/{type}/order",
+    method: "POST",
+    tags: ["site-{siteId}", "content-{siteId}-{type}"],
+    auth: "user",
+    responseKind: "json",
+    errors: ["validation:invalid_input", "resource:not_found", "resource:conflict", "server:internal_error"]
   },
   getContentTemplate: {
     path: "/sites/{siteId}/content/types/{type}/template",
@@ -19341,6 +19516,46 @@ var ENDPOINT_DEFINITIONS = {
     auth: "user",
     responseKind: "json"
   },
+  getSiteIconStyleGuide: {
+    path: "/sites/{siteId}/settings/icon-style-guide",
+    method: "GET",
+    revalidate: 120,
+    tags: [TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings],
+    auth: "user",
+    responseKind: "json",
+    errors: []
+  },
+  updateSiteIconStyleGuide: {
+    path: "/sites/{siteId}/settings/icon-style-guide",
+    method: "POST",
+    tags: [TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings],
+    auth: "user",
+    responseKind: "json",
+    errors: []
+  },
+  regenerateSiteIconStyleGuide: {
+    path: "/sites/{siteId}/settings/icon-style-guide/regenerate",
+    method: "POST",
+    tags: [TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings],
+    auth: "user",
+    responseKind: "json",
+    errors: []
+  },
+  generateGeneratedIconSet: {
+    path: "/sites/{siteId}/ai/generated-icons/generate",
+    method: "POST",
+    auth: "user",
+    responseKind: "json",
+    errors: []
+  },
+  applyGeneratedIconSet: {
+    path: "/sites/{siteId}/ai/generated-icons/apply",
+    method: "POST",
+    tags: [TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings],
+    auth: "user",
+    responseKind: "json",
+    errors: []
+  },
   getSiteAiProfile: {
     path: "/sites/{siteId}/settings/ai-site-profile",
     method: "GET",
@@ -21116,6 +21331,14 @@ var ENDPOINT_DEFINITIONS = {
     auth: "public",
     responseKind: "json"
   },
+  getGeneratedIconRenderAssets: {
+    path: "/public/sites/{siteId}/generated-icon-assets",
+    method: "POST",
+    tags: [TAG_TEMPLATES.siteRoutableContent],
+    auth: "public",
+    responseKind: "json",
+    errors: []
+  },
   // Resolve entry subroute by kind and URL segment
   resolveEntrySubroute: {
     path: "/public/sites/{siteId}/routing/subroutes/resolve",
@@ -22820,6 +23043,13 @@ var ENDPOINT_DEFINITIONS = {
     auth: "service",
     responseKind: "json"
   },
+  sdkDeleteNavigationMenu: {
+    path: "/sdk/{siteId}/navigation/{menuId}",
+    method: "DELETE",
+    auth: "service",
+    responseKind: "json",
+    errors: ["resource:not_found", "server:internal_error"]
+  },
   sdkUpsertTheme: {
     path: "/sdk/{siteId}/theme",
     method: "POST",
@@ -23587,6 +23817,370 @@ var linkSchema = z.union([
 
 // ../blocks/src/system/manifest/fieldValidation/index.ts
 init_schema2();
+
+// ../blocks/src/system/icons/ids.ts
+var GENERATED_ICON_SET_ID_PATTERN = /^generated-icon-set:[a-z0-9][a-z0-9:_-]{0,107}$/u;
+var GENERATED_ICON_ASSET_ID_PATTERN = /^generated-icon-asset:[a-z0-9][a-z0-9:_-]{0,105}$/u;
+var SITE_ICON_STYLE_GUIDE_VERSION_ID_PATTERN = /^site-icon-style-guide:[a-f0-9]{16}$/u;
+function normalizeString(value) {
+  if (typeof value !== "string") return null;
+  const normalized = value.trim();
+  return normalized.length > 0 ? normalized : null;
+}
+function unsafeAsGeneratedIconSetId(value) {
+  return value;
+}
+function unsafeAsGeneratedIconAssetId(value) {
+  return value;
+}
+function unsafeAsSiteIconStyleGuideVersionId(value) {
+  return value;
+}
+function parseGeneratedIconSetId(value) {
+  const normalized = normalizeString(value);
+  return normalized !== null && GENERATED_ICON_SET_ID_PATTERN.test(normalized) ? unsafeAsGeneratedIconSetId(normalized) : null;
+}
+function parseGeneratedIconAssetId(value) {
+  const normalized = normalizeString(value);
+  return normalized !== null && GENERATED_ICON_ASSET_ID_PATTERN.test(normalized) ? unsafeAsGeneratedIconAssetId(normalized) : null;
+}
+function parseSiteIconStyleGuideVersionId(value) {
+  if (typeof value !== "string") return null;
+  const normalized = value.trim();
+  return SITE_ICON_STYLE_GUIDE_VERSION_ID_PATTERN.test(normalized) ? unsafeAsSiteIconStyleGuideVersionId(normalized) : null;
+}
+
+// ../blocks/src/system/icons/semantic.ts
+var SEMANTIC_ICON_IDS = [
+  "protection-trust",
+  "confidentiality",
+  "care-support",
+  "partnership",
+  "warmth",
+  "community",
+  "personal-guidance",
+  "conversation",
+  "friendly-welcome",
+  "insight-learning",
+  "natural-wellbeing",
+  "growth",
+  "gentle-care",
+  "special-touch",
+  "ideas",
+  "direction",
+  "focus",
+  "quality",
+  "highlight",
+  "verified-quality",
+  "learning",
+  "training",
+  "programmes-dates",
+  "place",
+  "products",
+  "packages",
+  "time",
+  "practical-service",
+  "at-home",
+  "worldwide",
+  "professional-service"
+];
+var featurePreset = ["feature"];
+var SEMANTIC_ICON_DEFINITIONS = [
+  {
+    id: "protection-trust",
+    label: "Protection and trust",
+    tags: ["safe", "safety", "security", "trust", "privacy", "confidence"],
+    domains: ["wellbeing", "services", "technology"],
+    tone: ["trustworthy", "practical"],
+    presets: featurePreset
+  },
+  {
+    id: "confidentiality",
+    label: "Confidentiality",
+    tags: ["confidential", "privacy", "secure", "protected", "private"],
+    domains: ["wellbeing", "coaching", "services", "technology"],
+    tone: ["trustworthy", "calm"],
+    presets: featurePreset
+  },
+  {
+    id: "care-support",
+    label: "Care and support",
+    tags: ["care", "support", "therapy", "kindness", "help", "compassion"],
+    domains: ["wellbeing", "coaching", "community"],
+    tone: ["warm", "human"],
+    presets: featurePreset
+  },
+  {
+    id: "partnership",
+    label: "Partnership",
+    tags: ["partnership", "together", "support", "relationship", "collaboration"],
+    domains: ["coaching", "community", "services"],
+    tone: ["warm", "human", "trustworthy"],
+    presets: featurePreset
+  },
+  {
+    id: "warmth",
+    label: "Warmth",
+    tags: ["heart", "warmth", "care", "love", "wellbeing", "personal"],
+    domains: ["wellbeing", "community", "hospitality"],
+    tone: ["warm", "human"],
+    presets: featurePreset
+  },
+  {
+    id: "community",
+    label: "Community",
+    tags: ["community", "group", "people", "team", "members", "belonging"],
+    domains: ["community", "education", "events"],
+    tone: ["human", "warm"],
+    presets: featurePreset
+  },
+  {
+    id: "personal-guidance",
+    label: "Personal guidance",
+    tags: ["guidance", "personal", "coach", "expert", "one to one", "trusted"],
+    domains: ["coaching", "services", "education"],
+    tone: ["trustworthy", "human"],
+    presets: featurePreset
+  },
+  {
+    id: "conversation",
+    label: "Conversation",
+    tags: ["conversation", "talk", "chat", "communication", "support"],
+    domains: ["coaching", "community", "services"],
+    tone: ["human", "warm"],
+    presets: featurePreset
+  },
+  {
+    id: "friendly-welcome",
+    label: "Friendly welcome",
+    tags: ["friendly", "welcome", "positive", "happy", "approachable"],
+    domains: ["hospitality", "community", "services"],
+    tone: ["warm", "playful", "human"],
+    presets: featurePreset
+  },
+  {
+    id: "insight-learning",
+    label: "Insight and learning",
+    tags: ["mind", "insight", "learning", "clarity", "thinking", "therapy"],
+    domains: ["wellbeing", "coaching", "education"],
+    tone: ["calm", "practical"],
+    presets: featurePreset
+  },
+  {
+    id: "natural-wellbeing",
+    label: "Natural wellbeing",
+    tags: ["natural", "wellbeing", "growth", "eco", "calm", "organic"],
+    domains: ["wellbeing", "hospitality", "creative"],
+    tone: ["calm", "warm"],
+    presets: featurePreset
+  },
+  {
+    id: "growth",
+    label: "Growth",
+    tags: ["growth", "new", "progress", "development", "nurture"],
+    domains: ["wellbeing", "coaching", "education", "community"],
+    tone: ["warm", "calm"],
+    presets: featurePreset
+  },
+  {
+    id: "gentle-care",
+    label: "Gentle care",
+    tags: ["gentle", "soft", "care", "wellbeing", "beauty", "calm"],
+    domains: ["wellbeing", "creative", "hospitality"],
+    tone: ["warm", "calm", "premium"],
+    presets: featurePreset
+  },
+  {
+    id: "special-touch",
+    label: "Special touch",
+    tags: ["special", "sparkle", "magic", "polish", "delight", "creative"],
+    domains: ["creative", "commerce", "hospitality"],
+    tone: ["playful", "premium"],
+    presets: featurePreset
+  },
+  {
+    id: "ideas",
+    label: "Ideas",
+    tags: ["idea", "innovation", "clarity", "creative", "strategy"],
+    domains: ["coaching", "education", "creative", "technology"],
+    tone: ["practical", "playful"],
+    presets: featurePreset
+  },
+  {
+    id: "direction",
+    label: "Direction",
+    tags: ["direction", "navigation", "path", "journey", "guidance"],
+    domains: ["coaching", "education", "services"],
+    tone: ["trustworthy", "practical"],
+    presets: featurePreset
+  },
+  {
+    id: "focus",
+    label: "Focus",
+    tags: ["focus", "goal", "outcome", "aim", "strategy"],
+    domains: ["coaching", "services", "technology"],
+    tone: ["practical"],
+    presets: featurePreset
+  },
+  {
+    id: "quality",
+    label: "Quality",
+    tags: ["quality", "award", "standard", "achievement", "premium"],
+    domains: ["services", "education", "commerce"],
+    tone: ["premium", "trustworthy"],
+    presets: featurePreset
+  },
+  {
+    id: "highlight",
+    label: "Highlight",
+    tags: ["highlight", "featured", "favorite", "quality", "special"],
+    domains: ["creative", "commerce", "services"],
+    tone: ["playful", "premium"],
+    presets: featurePreset
+  },
+  {
+    id: "verified-quality",
+    label: "Verified quality",
+    tags: ["verified", "quality", "approved", "trusted", "check"],
+    domains: ["services", "commerce", "education"],
+    tone: ["trustworthy", "practical"],
+    presets: featurePreset
+  },
+  {
+    id: "learning",
+    label: "Learning",
+    tags: ["learning", "book", "course", "knowledge", "education"],
+    domains: ["education", "coaching", "community"],
+    tone: ["calm", "practical"],
+    presets: featurePreset
+  },
+  {
+    id: "training",
+    label: "Training",
+    tags: ["training", "course", "qualification", "school", "education"],
+    domains: ["education", "coaching"],
+    tone: ["trustworthy", "practical"],
+    presets: featurePreset
+  },
+  {
+    id: "programmes-dates",
+    label: "Programmes and dates",
+    tags: ["calendar", "dates", "schedule", "events", "programme", "classes"],
+    domains: ["events", "education", "community"],
+    tone: ["practical"],
+    presets: featurePreset
+  },
+  {
+    id: "place",
+    label: "Place",
+    tags: ["place", "location", "local", "venue", "destination"],
+    domains: ["events", "hospitality", "services"],
+    tone: ["practical"],
+    presets: featurePreset
+  },
+  {
+    id: "products",
+    label: "Products",
+    tags: ["products", "shop", "store", "retail", "commerce"],
+    domains: ["commerce"],
+    tone: ["practical", "premium"],
+    presets: featurePreset
+  },
+  {
+    id: "packages",
+    label: "Packages",
+    tags: ["package", "bundle", "delivery", "offer", "product"],
+    domains: ["commerce", "services"],
+    tone: ["practical"],
+    presets: featurePreset
+  },
+  {
+    id: "time",
+    label: "Time",
+    tags: ["time", "duration", "schedule", "availability", "appointment"],
+    domains: ["events", "services", "wellbeing"],
+    tone: ["practical", "calm"],
+    presets: featurePreset
+  },
+  {
+    id: "practical-service",
+    label: "Practical service",
+    tags: ["service", "repair", "setup", "practical", "tools", "support"],
+    domains: ["services", "technology"],
+    tone: ["practical"],
+    presets: featurePreset
+  },
+  {
+    id: "at-home",
+    label: "At home",
+    tags: ["home", "domestic", "comfort", "local", "space"],
+    domains: ["hospitality", "services", "community"],
+    tone: ["warm", "calm"],
+    presets: featurePreset
+  },
+  {
+    id: "worldwide",
+    label: "Worldwide",
+    tags: ["global", "online", "worldwide", "remote", "international"],
+    domains: ["technology", "education", "services"],
+    tone: ["practical"],
+    presets: featurePreset
+  },
+  {
+    id: "professional-service",
+    label: "Professional service",
+    tags: ["business", "professional", "consulting", "service", "work"],
+    domains: ["services", "technology", "coaching"],
+    tone: ["practical", "trustworthy"],
+    presets: featurePreset
+  }
+];
+SEMANTIC_ICON_DEFINITIONS.map(({ id, label }) => ({
+  id,
+  label
+}));
+function isSemanticIconId(value) {
+  return typeof value === "string" && SEMANTIC_ICON_IDS.includes(value);
+}
+
+// ../blocks/src/system/icons/value.ts
+var NO_BLOCK_ICON_VALUE = { kind: "none" };
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function parseBlockIconValue(value) {
+  if (isSemanticIconId(value)) {
+    return { kind: "semantic", iconId: value };
+  }
+  if (!isRecord(value)) {
+    return NO_BLOCK_ICON_VALUE;
+  }
+  switch (value.kind) {
+    case "none":
+      return NO_BLOCK_ICON_VALUE;
+    case "semantic":
+      return isSemanticIconId(value.iconId) ? { kind: "semantic", iconId: value.iconId } : NO_BLOCK_ICON_VALUE;
+    case "generated": {
+      const setId = parseGeneratedIconSetId(value.setId);
+      const assetId = parseGeneratedIconAssetId(value.assetId);
+      const styleGuideVersionId = parseSiteIconStyleGuideVersionId(value.styleGuideVersionId);
+      if (setId !== null && assetId !== null && isSemanticIconId(value.semanticFallbackIconId) && styleGuideVersionId !== null) {
+        return {
+          kind: "generated",
+          setId,
+          assetId,
+          semanticFallbackIconId: value.semanticFallbackIconId,
+          styleGuideVersionId
+        };
+      }
+      return NO_BLOCK_ICON_VALUE;
+    }
+    default:
+      return NO_BLOCK_ICON_VALUE;
+  }
+}
+
+// ../blocks/src/system/manifest/fieldValidation/index.ts
 var TEL_RE = /^[+()0-9\s-]{3,}$/;
 var SLUG_PATTERN = /^(?:[a-z0-9]+(?:-[a-z0-9]+)*)(?:\/(?:[a-z0-9]+(?:-[a-z0-9]+)*))*$/;
 var ALLOWED_URL_PROTOCOLS = ["http:", "https:"];
@@ -23675,7 +24269,7 @@ function deriveFieldValidationPlan(field, path24 = [field.id]) {
         return makePlan("number", "number", field, path24, required, constraints2);
       }
       const constraints = commonConstraints(required, {
-        kind: "textType"
+        kind: field.ui?.widget === "iconPicker" ? "blockIconValue" : "textType"
       });
       if (inputType === "email") constraints.push({ kind: "emailFormat" });
       if (inputType === "tel") constraints.push({ kind: "phoneFormat" });
@@ -23895,7 +24489,7 @@ function normalizeStoredObjectChildren(children, value, ctx) {
   return normalized;
 }
 function normalizeStoredRepeaterItems(plan, value, ctx) {
-  if (!Array.isArray(value)) {
+  if (!isUnknownArray(value)) {
     return value;
   }
   return value.map((item) => {
@@ -23942,7 +24536,7 @@ function normalizeObjectChildren(children, value, ctx) {
   return normalized;
 }
 function normalizeRepeaterItems(plan, value, ctx) {
-  if (!Array.isArray(value)) return value;
+  if (!isUnknownArray(value)) return value;
   return value.map((item) => {
     if (!item || typeof item !== "object" || Array.isArray(item)) return item;
     const itemRecord = item;
@@ -24008,39 +24602,52 @@ function isMissingForPlan(plan, value) {
   return false;
 }
 function validateStringPlan(plan, value) {
+  if (plan.constraints.some((constraint) => constraint.kind === "blockIconValue")) {
+    return plan.constraints.flatMap((constraint) => validateStringConstraint(plan, constraint, value));
+  }
   if (typeof value !== "string") return [issue(plan, "wrongType", { expected: "text" })];
   return plan.constraints.flatMap((constraint) => validateStringConstraint(plan, constraint, value));
 }
 function validateStringConstraint(plan, constraint, value) {
   switch (constraint.kind) {
     case "required":
+      return [];
     case "textType":
     case "referenceText":
-      return [];
+      return typeof value === "string" ? [] : [issue(plan, "wrongType", { expected: "text" })];
+    case "blockIconValue":
+      return isValidIconPickerValue(value) ? [] : [issue(plan, "wrongType", { expected: "text or icon" })];
     case "maxLength":
-      return value.length > constraint.maximum ? [issue(plan, "tooLong", { maximum: constraint.maximum })] : [];
+      return typeof value === "string" && value.length > constraint.maximum ? [issue(plan, "tooLong", { maximum: constraint.maximum })] : [];
     case "emailFormat":
-      return isCanonicalEmailValue(value) ? [] : [issue(plan, "invalidEmail")];
+      return typeof value === "string" && isCanonicalEmailValue(value) ? [] : [issue(plan, "invalidEmail")];
     case "phoneFormat":
-      return isCanonicalPhoneValue(value) ? [] : [issue(plan, "invalidPhone")];
+      return typeof value === "string" && isCanonicalPhoneValue(value) ? [] : [issue(plan, "invalidPhone")];
     case "patternFormat": {
+      if (typeof value !== "string") return [issue(plan, "wrongType", { expected: "text" })];
       const re = compilePattern(constraint.pattern);
       return re && !re.test(value) ? [issue(plan, "invalidPattern")] : [];
     }
     case "urlFormat":
-      return isCanonicalUrlValue(value, { allowRelative: constraint.allowRelative }) ? [] : [issue(plan, "invalidUrl")];
+      return typeof value === "string" && isCanonicalUrlValue(value, { allowRelative: constraint.allowRelative }) ? [] : [issue(plan, "invalidUrl")];
     case "dateFormat":
-      return isValidDateString(value) ? [] : [issue(plan, "invalidDate")];
+      return typeof value === "string" && isValidDateString(value) ? [] : [issue(plan, "invalidDate")];
     case "timeFormat":
-      return isValidTimeString(value) ? [] : [issue(plan, "invalidTime")];
+      return typeof value === "string" && isValidTimeString(value) ? [] : [issue(plan, "invalidTime")];
     case "datetimeFormat":
-      return isValidDateTimeInstantString(value) ? [] : [issue(plan, "invalidDateTime")];
+      return typeof value === "string" && isValidDateTimeInstantString(value) ? [] : [issue(plan, "invalidDateTime")];
     case "slugFormat":
-      return SLUG_PATTERN.test(value) ? [] : [issue(plan, "invalidSlug")];
+      return typeof value === "string" && SLUG_PATTERN.test(value) ? [] : [issue(plan, "invalidSlug")];
     default:
       return assertNever2(constraint);
   }
 }
+function isValidIconPickerValue(value) {
+  if (typeof value === "string") return true;
+  if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+  if (value.kind === "none") return true;
+  return parseBlockIconValue(value).kind !== "none";
+}
 function validateNumberPlan(plan, value) {
   if (!isValidNumber(value)) return [issue(plan, "invalidNumber")];
   return plan.constraints.flatMap((constraint) => validateNumberConstraint(plan, constraint, Number(value)));
@@ -24329,6 +24936,9 @@ function isEmptyValue(value) {
 function isPlainObject(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
+function isUnknownArray(value) {
+  return Array.isArray(value);
+}
 function isValidRichTextDoc(value) {
   const doc = richTextDoc(value);
   return Boolean(isPlainObject(doc) && doc.type === "doc");
@@ -25604,6 +26214,24 @@ var questionColumnsLayout = styledSection({
   }),
   baseClass: ""
 });
+var splitHeadingColumnsLayout = styledSection({
+  children: styledContainer({
+    baseClassName: "rb-relative rb-isolate",
+    children: el(
+      "div",
+      {
+        className: "rb-faq-split-heading-columns rb-grid rb-grid-cols-1 rb-gap-8 rb-lg-grid-cols-2 rb-lg-items-start"
+      },
+      [
+        el("div", { className: "rb-faq-split-heading-columns-copy" }, [headingLayout]),
+        el("div", { className: "rb-faq-split-heading-columns-accordion" }, [
+          questionColumnsAccordionLayout
+        ])
+      ]
+    )
+  }),
+  baseClass: ""
+});
 var faqManifest = createBlockManifest({
   id: "block.faq",
   title: "FAQ",
@@ -25624,7 +26252,8 @@ var faqManifest = createBlockManifest({
   variants: {
     default: defaultLayout,
     "two-column": twoColumnLayout,
-    "question-columns": questionColumnsLayout
+    "question-columns": questionColumnsLayout,
+    "split-heading-columns": splitHeadingColumnsLayout
   },
   defaultVariant: "default",
   variantOptions: {
@@ -25639,6 +26268,10 @@ var faqManifest = createBlockManifest({
     "question-columns": {
       label: "Question columns",
       description: "A full-width heading above FAQ items split into two columns."
+    },
+    "split-heading-columns": {
+      label: "Split heading columns",
+      description: "A left heading column with FAQ items split into two columns on the right."
     }
   },
   description: "Accordion of frequently asked questions and answers.",
@@ -25728,16 +26361,20 @@ var marqueeLoopTransform = {
   summary: "Repeat an array to a minimum length, then duplicate it for seamless marquee looping",
   schema: marqueeLoopOptionsSchema,
   run: (value, options) => {
-    if (!Array.isArray(value) || value.length === 0) return [];
+    const items = toUnknownArray(value);
+    if (items.length === 0) return [];
     const minItems = options?.minItems ?? 10;
     const base = [];
     while (base.length < minItems) {
-      base.push(...value);
+      base.push(...items);
       if (base.length > 1e3) break;
     }
     return [...base, ...base];
   }
 };
+function toUnknownArray(value) {
+  return Array.isArray(value) ? value : [];
+}
 var formattingTransforms = [
   uppercaseTransform,
   fallbackTransform,
@@ -26873,16 +27510,16 @@ var interpolateRichTextTokensOptionsSchema = z.object({
 var richTextTokenPattern = /\{\{\s*([a-zA-Z0-9_]+)\s*\}\}/g;
 function getSiteName(context) {
   const viewModel = context.viewModel;
-  if (!isRecord2(viewModel)) return null;
+  if (!isRecord3(viewModel)) return null;
   const site = viewModel.site;
-  if (isRecord2(site) && typeof site.title === "string") {
+  if (isRecord3(site) && typeof site.title === "string") {
     const title = site.title.trim();
     return title.length > 0 ? title : null;
   }
   const root = viewModel.$root;
-  if (isRecord2(root)) {
+  if (isRecord3(root)) {
     const rootSite = root.site;
-    if (isRecord2(rootSite) && typeof rootSite.title === "string") {
+    if (isRecord3(rootSite) && typeof rootSite.title === "string") {
       const title = rootSite.title.trim();
       if (title.length > 0) return title;
     }
@@ -26904,7 +27541,7 @@ function replaceTokenText(input, allowedTokens, tokenValues) {
   });
 }
 function visitRichTextNode(node, allowedTokens, tokenValues) {
-  if (!isRecord2(node)) return node;
+  if (!isRecord3(node)) return node;
   let changed = false;
   const nextNode = { ...node };
   if (nextNode.type === "text" && typeof nextNode.text === "string") {
@@ -26930,13 +27567,13 @@ function visitRichTextNode(node, allowedTokens, tokenValues) {
   return changed ? nextNode : node;
 }
 function interpolateRichTextTokens(value, options, context) {
-  if (!isRecord2(value)) return value;
+  if (!isRecord3(value)) return value;
   const allowedTokens = new Set(options.tokens);
   const tokenValues = {
     year: String((/* @__PURE__ */ new Date()).getFullYear()),
     site_name: getSiteName(context)
   };
-  if (isRecord2(value.doc)) {
+  if (isRecord3(value.doc)) {
     const nextDoc = visitRichTextNode(value.doc, allowedTokens, tokenValues);
     if (nextDoc === value.doc) return value;
     return { ...value, doc: nextDoc };
@@ -27735,6 +28372,8 @@ init_boxStyles();
 init_defineBlock();
 init_builder();
 init_fragments2();
+init_colorStyles();
+var backgroundImageClassName = "rb-absolute rb-inset-0 rb-z-neg-10 rb-h-full rb-w-full rb-object-cover rb-opacity-50";
 var wrapVariant = (variantLayout) => styledSection({
   children: styledContainer({
     children: stack(
@@ -27748,10 +28387,53 @@ var wrapVariant = (variantLayout) => styledSection({
   // styledContainer (rb-container) already provides horizontal padding
   baseClass: "",
   spacing: "comfortable",
-  imageClassName: "rb-absolute rb-inset-0 rb-z-neg-10 rb-h-full rb-w-full rb-object-cover rb-opacity-50"
+  imageClassName: backgroundImageClassName
 });
 var carouselLayout = wrapVariant(buildCarouselLayout());
 var gridLayout2 = wrapVariant(buildGridLayout());
+var splitHeading = stack(
+  { gap: "md", className: "rb-testimonials-split-heading-copy rb-max-w-xl" },
+  [
+    text(
+      { as: "h2" },
+      when("content.heading"),
+      bind("content.heading")
+    ),
+    headingDecoration({
+      family: "short-center-rule",
+      placement: "after-heading"
+    }),
+    text(
+      {
+        as: "p",
+        className: "rb-prose",
+        style: textColorStyle("mutedText")
+      },
+      when("content.subheading"),
+      bind("content.subheading")
+    )
+  ]
+);
+var splitGridLayout = styledSection({
+  children: styledContainer({
+    baseClassName: "rb-relative rb-isolate",
+    children: el(
+      "div",
+      {
+        className: "rb-testimonials-split-grid rb-grid rb-grid-cols-1 rb-gap-8 rb-lg-grid-cols-2 rb-lg-items-start"
+      },
+      [
+        el("div", { className: "rb-testimonials-split-grid-heading" }, [splitHeading]),
+        el("div", { className: "rb-testimonials-split-grid-cards" }, [
+          buildGridCardsLayout("rb-testimonials-split-grid-card-list")
+        ])
+      ]
+    )
+  }),
+  baseClass: "",
+  spacing: "comfortable",
+  imageClassName: backgroundImageClassName
+});
 var additionalFields = parseFieldDefinitions([
   // Heading fields from fragment
   ...testimonialsHeadingFragment.fields,
@@ -27783,7 +28465,7 @@ var additionalFields = parseFieldDefinitions([
     ],
     ui: {
       intent: "display",
-      visibleWhen: { field: "variant", equals: "grid" }
+      visibleWhen: { field: "variant", oneOf: ["grid", "split-grid"] }
     }
   },
   // Carousel-specific fields (from fragment)
@@ -27817,7 +28499,8 @@ var testimonialsManifest = createBlockManifest({
   // Variant system - enables the variant switcher control in the editor
   variants: {
     carousel: carouselLayout,
-    grid: gridLayout2
+    grid: gridLayout2,
+    "split-grid": splitGridLayout
   },
   defaultVariant: "carousel",
   variantOptions: {
@@ -27830,6 +28513,11 @@ var testimonialsManifest = createBlockManifest({
       label: "Grid",
       description: "Responsive grid layout",
       icon: "Grid"
+    },
+    "split-grid": {
+      label: "Split grid",
+      description: "Heading on the left with testimonial cards on the right",
+      icon: "PanelLeft"
     }
   },
   // Fields (variant field is auto-generated by augmentManifest)
@@ -28244,6 +28932,15 @@ init_ctas();
 init_builder();
 init_fragments();
 init_colorStyles();
+
+// ../blocks/src/system/blocks/feature-card-icons.ts
+var FEATURE_CARD_ICON_TREATMENTS = [
+  "plain",
+  "soft-badge",
+  "utility-badge"
+];
+
+// ../blocks/src/system/blocks/feature-cards.ts
 function grid3(props2, children) {
   return el("grid", props2 ?? void 0, children ?? void 0);
 }
@@ -28285,6 +28982,15 @@ var featureCard = styledCard(
       bind("card.media")
     ),
     stack({ gap: "sm", className: "rb-feature-card-content rb-flex-1 rb-p-6" }, [
+      el(
+        "feature-card-icon",
+        {
+          treatment: { $bind: { from: "content._iconTreatment", fallback: "soft-badge" } },
+          generatedAssets: { $bind: { from: "data.generatedIconAssets" } }
+        },
+        null,
+        bind("card.icon")
+      ),
       text(
         {
           as: "h3",
@@ -28406,6 +29112,16 @@ var featureCardsConfig = {
             defaultValue: "4/3",
             visibleWhen: { field: "media", notEquals: null }
           }),
+          {
+            id: "icon",
+            type: "text",
+            label: "Icon",
+            required: false,
+            ui: {
+              widget: "iconPicker",
+              iconPickerPreset: "feature"
+            }
+          },
           {
             id: "title",
             type: "text",
@@ -28441,6 +29157,19 @@ var featureCardsConfig = {
         ]
       }
     },
+    {
+      id: "_iconTreatment",
+      type: "select",
+      label: "Icon style",
+      required: false,
+      defaultValue: "soft-badge",
+      multiple: false,
+      options: FEATURE_CARD_ICON_TREATMENTS.map((value) => ({
+        value,
+        label: value === "plain" ? "Plain" : value === "soft-badge" ? "Soft badge" : "Utility badge"
+      })),
+      ui: { intent: "display" }
+    },
     cardStylesField({
       id: "_cardStyles",
       label: "Card styles"
@@ -33779,7 +34508,8 @@ var systemBlockDefinitionsRaw = [
     layoutProfiles: [
       layoutProfile({ variantKey: "default", family: "stack", weight: "standard" }),
       layoutProfile({ variantKey: "two-column", family: "split", weight: "standard" }),
-      layoutProfile({ variantKey: "question-columns", family: "grid", weight: "standard" })
+      layoutProfile({ variantKey: "question-columns", family: "grid", weight: "standard" }),
+      layoutProfile({ variantKey: "split-heading-columns", family: "split", weight: "standard" })
     ]
   })),
   withDesignCapability("block.site-header", siteHeaderBlockDefinition, declareNoBlockDesignCapability("site-chrome"), defineBlockDesignMetadata({
@@ -33810,6 +34540,12 @@ var systemBlockDefinitionsRaw = [
         family: "grid",
         weight: "standard",
         bias: "soft"
+      }),
+      layoutProfile({
+        variantKey: "split-grid",
+        family: "split",
+        weight: "featured",
+        bias: "soft"
       })
     ]
   })),
@@ -36402,10 +37138,16 @@ var dashboardConfigSchema = z.object({
 }).strip();
 var fieldDefinitionInputSchema = unsafeRetypeZodSchema(fieldSchema);
 var sdkLoaderEndpointSchema = z.enum(SUPPORTED_LOADER_ENDPOINTS);
+var loaderFallbackScalarSchema = z.union([
+  z.string(),
+  z.number(),
+  z.boolean(),
+  z.null()
+]);
 var loaderParamBindingSchema = z.object({
   $bind: z.object({
     from: z.string().min(1, "Binding path is required"),
-    fallback: z.string().optional()
+    fallback: loaderFallbackScalarSchema.optional()
   })
 });
 var loaderParamValueSchema = z.union([
@@ -36551,9 +37293,13 @@ var sdkBlockFieldOptionsMapSchema = z.record(
 var sdkContentTypeTemplateConfigSchema = z.object({
   blocks: z.array(z.unknown())
 }).passthrough();
+var sdkContentTypeOrderingConfigSchema = z.object({
+  mode: z.enum(["default", "manual"]).optional()
+}).optional();
 var sdkContentTypeConfigSchema = z.object({
   key: z.string().min(1),
   fields: z.array(z.unknown()),
+  ordering: sdkContentTypeOrderingConfigSchema,
   template: sdkContentTypeTemplateConfigSchema.nullable().optional()
 }).passthrough();
 var sdkContentConfigSchema = z.object({
@@ -36659,9 +37405,9 @@ z.object({
 
 // ../api/src/sdkContracts.ts
 var ignoredDocumentSyncSectionWarnings = {
-  pages: "content.pages is ignored by push-config; use `riverbankcms push pages` to sync pages.",
-  entries: "content.entries is ignored by push-config; use `riverbankcms push entries` to sync content entries.",
-  navigationMenus: "content.navigationMenus is ignored by push-config; use `riverbankcms push navigation` to sync navigation menus."
+  pages: "content.pages is ignored by push-config; put pages in content/pages/*.json and use `riverbankcms push pages` (or `riverbankcms push`) to sync them.",
+  entries: "content.entries is ignored by push-config; put entries in content/entries/<type>/*.json and use `riverbankcms push entries` (or `riverbankcms push`) to sync them.",
+  navigationMenus: "content.navigationMenus is ignored by push-config; put navigation in content/navigation.json and use `riverbankcms push navigation` (or `riverbankcms push`) to sync it."
 };
 function formatIgnoredDocumentSyncSectionWarning(section2) {
   return ignoredDocumentSyncSectionWarnings[section2];
@@ -36823,18 +37569,21 @@ function buildEndpointURL(baseURL, endpoint) {
 function isFormDataBody(value) {
   return typeof FormData !== "undefined" && value instanceof FormData;
 }
+function isUnknownArray2(value) {
+  return Array.isArray(value);
+}
 function appendQueryParam(queryParams, key, value) {
   if (value === void 0 || value === null) {
     return;
   }
-  if (Array.isArray(value)) {
+  if (isUnknownArray2(value)) {
     const stack2 = [...value].reverse();
     while (stack2.length > 0) {
       const item = stack2.pop();
       if (item === void 0 || item === null) {
         continue;
       }
-      if (Array.isArray(item)) {
+      if (isUnknownArray2(item)) {
         stack2.push(...[...item].reverse());
         continue;
       }
@@ -36844,6 +37593,12 @@ function appendQueryParam(queryParams, key, value) {
   }
   queryParams.append(key, String(value));
 }
+function serializePathParam(endpoint, key, value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  throw new Error(`Invalid path param for endpoint ${String(endpoint)}: ${key} must be a string`);
+}
 function invalidateCacheTags(tags2, params) {
   const resolved = getRevalidateTag();
   if (typeof window !== "undefined" || !resolved || !tags2) return;
@@ -36982,8 +37737,9 @@ function createRawCMSClient(headers = {}, baseUrl) {
         const bracePlaceholder = `{${key}}`;
         const colonPlaceholder = `:${key}`;
         if (originalPath.includes(bracePlaceholder) || originalPath.includes(colonPlaceholder)) {
-          url = url.replace(bracePlaceholder, value);
-          url = url.replace(colonPlaceholder, value);
+          const stringValue = serializePathParam(endpoint, key, value);
+          url = url.replace(bracePlaceholder, stringValue);
+          url = url.replace(colonPlaceholder, stringValue);
         } else {
           unusedParams[key] = value;
         }
@@ -37333,7 +38089,7 @@ function preset(id, verticalId, canonicalBehaviour, label, pluralLabel, descript
 }
 
 // ../api/src/utils/isRecord.ts
-function isRecord3(value) {
+function isRecord4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var APPOINTMENT_SETUP_MAX_MINUTES = 1440;
@@ -37606,7 +38362,7 @@ function sanitizeMarks(marks) {
     if (mark.type === "bold" || mark.type === "strong" || mark.type === "italic" || mark.type === "em") {
       return [{ type: mark.type }];
     }
-    if (mark.type === "link" && isRecord3(mark.attrs) && typeof mark.attrs.href === "string") {
+    if (mark.type === "link" && isRecord4(mark.attrs) && typeof mark.attrs.href === "string") {
       const attrs = { href: mark.attrs.href };
       if (typeof mark.attrs.target === "string" && mark.attrs.target.trim().length > 0) {
         attrs.target = mark.attrs.target;
@@ -37621,10 +38377,10 @@ function sanitizeMarks(marks) {
   return sanitized.length > 0 ? sanitized : void 0;
 }
 function unwrapRichTextValue(value) {
-  if (isRecord3(value) && isRecord3(value.doc)) {
+  if (isRecord4(value) && isRecord4(value.doc)) {
     return unwrapRichTextValue(value.doc);
   }
-  if (isRecord3(value) && value.type === "doc") {
+  if (isRecord4(value) && value.type === "doc") {
     return {
       type: "doc",
       content: Array.isArray(value.content) ? value.content.filter(isTipTapNodeLike).map(coerceTipTapNode) : []
@@ -37633,7 +38389,7 @@ function unwrapRichTextValue(value) {
   return EMPTY_SITE_BANNER_BODY;
 }
 function isTipTapNodeLike(value) {
-  return isRecord3(value) && typeof value.type === "string";
+  return isRecord4(value) && typeof value.type === "string";
 }
 function coerceTipTapNode(value) {
   return {
@@ -37641,9 +38397,9 @@ function coerceTipTapNode(value) {
     ...Array.isArray(value.content) ? { content: value.content.filter(isTipTapNodeLike).map(coerceTipTapNode) } : {},
     ...typeof value.text === "string" ? { text: value.text } : {},
     ...Array.isArray(value.marks) ? {
-      marks: value.marks.filter((mark) => isRecord3(mark) && typeof mark.type === "string").map((mark) => ({
+      marks: value.marks.filter((mark) => isRecord4(mark) && typeof mark.type === "string").map((mark) => ({
         type: mark.type,
-        ...isRecord3(mark.attrs) ? { attrs: mark.attrs } : {}
+        ...isRecord4(mark.attrs) ? { attrs: mark.attrs } : {}
       }))
     } : {}
   };
@@ -37759,7 +38515,7 @@ function collectCartLinkStats(items, depth = 0) {
   return result;
 }
 function isNavigationMenuValidationItem(value) {
-  if (!isRecord3(value)) return false;
+  if (!isRecord4(value)) return false;
   return typeof value.label === "string";
 }
 
@@ -37775,7 +38531,6 @@ var websiteSurfaceIds = [
   "site.footerBlocks",
   "site.navigation",
   "site.media",
-  "site.style",
   "site.performance"
 ];
 new Set(
@@ -37795,6 +38550,104 @@ var hiddenDemoSettingsNavSurfaceIds = [
   "settings.backup"
 ];
 new Set(hiddenDemoSettingsNavSurfaceIds);
+
+// ../api/src/navigation/identity.ts
+init_src();
+function unsafeAsNavigationMenuIdentifier(identifier) {
+  return identifier;
+}
+function unsafeAsNavigationMenuIdentity(identity) {
+  return identity;
+}
+var MAIN_NAVIGATION_MENU_IDENTIFIER = unsafeAsNavigationMenuIdentifier("main");
+function parseNavigationMenuIdentifier(value) {
+  if (typeof value !== "string") {
+    return err({ kind: "not_string" });
+  }
+  const trimmed = value.trim();
+  if (trimmed.length === 0) {
+    return err({ kind: "empty_string" });
+  }
+  return ok(unsafeAsNavigationMenuIdentifier(trimmed));
+}
+function normalizeNavigationMenuIdentifier(identifier) {
+  const parsed = parseNavigationMenuIdentifier(identifier);
+  return parsed.ok ? parsed.value : null;
+}
+function navigationMenuIdentity(input) {
+  return unsafeAsNavigationMenuIdentity(
+    normalizeNavigationMenuIdentifier(input.identifier) ?? input.name
+  );
+}
+function planNavigationMenuMatch(input, menus) {
+  const identifier = normalizeNavigationMenuIdentifier(input.identifier);
+  if (identifier) {
+    const identifierMatches = menus.filter(
+      (menu) => normalizeNavigationMenuIdentifier(menu.identifier) === identifier
+    );
+    const identifierMatch = identifierMatches[0];
+    if (identifierMatches.length === 1 && identifierMatch) {
+      return {
+        type: "update",
+        menuId: identifierMatch.id,
+        identifier
+      };
+    }
+    if (identifierMatches.length > 1) {
+      return {
+        type: "identifier_conflict",
+        identifier,
+        menuIds: identifierMatches.map((menu) => menu.id)
+      };
+    }
+    if (identifier === MAIN_NAVIGATION_MENU_IDENTIFIER) {
+      const legacyPrimaryMatches = menus.filter(
+        (menu) => menu.isPrimary && normalizeNavigationMenuIdentifier(menu.identifier) === null
+      );
+      const legacyPrimaryMatch = legacyPrimaryMatches[0];
+      if (legacyPrimaryMatches.length === 1 && legacyPrimaryMatch) {
+        return {
+          type: "adopt_legacy_primary",
+          menuId: legacyPrimaryMatch.id,
+          identifier
+        };
+      }
+      if (legacyPrimaryMatches.length > 1) {
+        return {
+          type: "ambiguous_legacy_primary",
+          identifier,
+          menuIds: legacyPrimaryMatches.map((menu) => menu.id)
+        };
+      }
+    }
+    return { type: "create", identifier };
+  }
+  const nameMatches = menus.filter((menu) => menu.name === input.name);
+  const nameMatch = nameMatches[0];
+  if (nameMatches.length === 1 && nameMatch) {
+    return { type: "update", menuId: nameMatch.id, identifier: null };
+  }
+  if (nameMatches.length > 1) {
+    return {
+      type: "ambiguous_name",
+      name: input.name,
+      menuIds: nameMatches.map((menu) => menu.id)
+    };
+  }
+  return { type: "create", identifier: null };
+}
+function actionableNavigationMenuMatchPlan(plan) {
+  switch (plan.type) {
+    case "create":
+    case "update":
+    case "adopt_legacy_primary":
+      return ok(plan);
+    case "identifier_conflict":
+    case "ambiguous_legacy_primary":
+    case "ambiguous_name":
+      return err(plan);
+  }
+}
 var Rfc6902PatchOp = z.discriminatedUnion("op", [
   // Standard RFC-6902 operations
   z.object({
@@ -38029,6 +38882,9 @@ var templateConfigSchemaForward = z.object({
     })
   )
 }).optional();
+var contentTypeOrderingSchema = z.object({
+  mode: z.enum(["default", "manual"]).optional()
+}).optional();
 var contentTypeConfigSchema = z.object({
   key: contentTypeKeySchema,
   name: z.string().min(1),
@@ -38038,6 +38894,7 @@ var contentTypeConfigSchema = z.object({
   // Fields are validated as unknown[] here - deep field validation happens in @riverbankcms/blocks
   fields: z.array(z.any()).min(1, "At least one field is required"),
   titleField: z.string().optional(),
+  ordering: contentTypeOrderingSchema,
   isSingleton: z.boolean().optional().default(false),
   template: templateConfigSchemaForward
 }).refine(
@@ -38563,7 +39420,7 @@ var loaderParamBindingSchema2 = z.object({
     // Loader params are ultimately string-normalized for query strings, so fallbacks should
     // stay scalar. Use transforms (e.g. `value.jsonArray`) when you need to serialize
     // more complex values into a string.
-    fallback: z.union([z.string(), z.number(), z.boolean(), z.null()]).optional(),
+    fallback: loaderFallbackScalarSchema.optional(),
     transforms: z.array(loaderTransformStepSchema).default([]),
     pick: z.enum(["value", "collection", "context"]).default("value"),
     coerce: z.enum(["number", "boolean", "string"]).optional()
@@ -38904,20 +39761,20 @@ var ManagementApiError = class extends Error {
 function is404Error(error) {
   return error instanceof ManagementApiError && error.statusCode === 404;
 }
-function isRecord4(value) {
+function isRecord5(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function isFieldError(value) {
-  return isRecord4(value) && typeof value.field === "string" && typeof value.code === "string" && typeof value.message === "string";
+  return isRecord5(value) && typeof value.field === "string" && typeof value.code === "string" && typeof value.message === "string";
 }
 function parseApiResponse(value) {
-  if (!isRecord4(value)) return null;
+  if (!isRecord5(value)) return null;
   if (value.success === true) {
     return { success: true, data: value.data };
   }
   if (value.success === false) {
     const error = value.error;
-    if (!isRecord4(error) || typeof error.code !== "string" || typeof error.message !== "string") {
+    if (!isRecord5(error) || typeof error.code !== "string" || typeof error.message !== "string") {
       return { success: false, error: { code: "sdk:http-error", message: "Request failed", details: error } };
     }
     const fieldErrorsRaw = error.fieldErrors;
@@ -39261,9 +40118,10 @@ function createNavigationOperations(http) {
     async upsert(input) {
       const result = await http.post("/navigation", input);
       return mapPulledNavigationMenu({
-        ...result.menu,
-        identifier: null
-      });
+        ...result.menu});
+    },
+    async delete(menuId) {
+      await http.delete(`/navigation/${encodeURIComponent(menuId)}`);
     }
   };
 }
@@ -39627,6 +40485,7 @@ function createPullOperations(http) {
         meta: {
           pulledAt: (/* @__PURE__ */ new Date()).toISOString(),
           entries: entriesResult?.meta?.entries,
+          settingsUpdatedAt: settingsResult?.meta?.updatedAt,
           truncated: entriesResult?.meta?.truncated,
           truncationMessage: entriesResult?.meta?.truncationMessage
         }
@@ -39807,7 +40666,11 @@ function getEnv(name, fallback) {
 function loadEnvironment(remote) {
   const target = remote ? "remote" : "local";
   const prefix = getEnvPrefix(target);
-  const siteId = asSiteId(requireEnv(`${prefix}_SITE_ID`));
+  const rawSiteId = requireEnv(`${prefix}_SITE_ID`);
+  const siteId = parseSiteId(rawSiteId);
+  if (!siteId.ok) {
+    throw new Error(`Invalid site ID for ${prefix}_SITE_ID. Expected a UUID.`);
+  }
   const dashboardUrl = requireEnv(`${prefix}_DASHBOARD_URL`);
   const managementApiKey = requireEnv(`${prefix}_MGMT_API_KEY`);
   const apiKey = getEnv(`${prefix}_API_KEY`);
@@ -39834,7 +40697,7 @@ function loadEnvironment(remote) {
     }
   }
   return {
-    siteId,
+    siteId: siteId.value,
     dashboardUrl,
     managementApiKey,
     apiKey,
@@ -40136,7 +40999,8 @@ function mapEntryForOutput(entry) {
     data: entry.data,
     status: entry.status,
     hasUnpublishedChanges: entry.hasUnpublishedChanges,
-    title: entry.title
+    title: entry.title,
+    manualOrder: entry.manualOrder
   };
   if (entry.slug !== void 0) {
     result.slug = entry.slug;
@@ -40427,7 +41291,7 @@ function createListCommand(config2) {
 
 // src/cli/push-config.ts
 var DEFAULT_CONFIG_PATH = "./riverbank.config.ts";
-function isRecord5(value) {
+function isRecord6(value) {
   return typeof value === "object" && value !== null;
 }
 function parseErrorDetails(value) {
@@ -40435,10 +41299,10 @@ function parseErrorDetails(value) {
   if (typeof value === "string") {
     return { message: value };
   }
-  if (!isRecord5(value)) return {};
+  if (!isRecord6(value)) return {};
   const message = typeof value.message === "string" ? value.message : void 0;
   const fieldErrorsRaw = value.fieldErrors;
-  const fieldErrors = Array.isArray(fieldErrorsRaw) ? fieldErrorsRaw.filter(isRecord5).map((d) => ({
+  const fieldErrors = Array.isArray(fieldErrorsRaw) ? fieldErrorsRaw.filter(isRecord6).map((d) => ({
     field: typeof d.field === "string" ? d.field : "",
     message: typeof d.message === "string" ? d.message : ""
   })).filter((d) => d.field.length > 0 && d.message.length > 0) : void 0;
@@ -40450,12 +41314,12 @@ function formatFieldErrors(fieldErrors) {
 }
 function getDashboardErrorMessage(responseJson, fallback) {
   if (!responseJson) return fallback;
-  if (isRecord5(responseJson) && responseJson.success === false && "error" in responseJson) {
+  if (isRecord6(responseJson) && responseJson.success === false && "error" in responseJson) {
     const parsed = parseErrorDetails(responseJson.error);
     const msg = parsed.message ?? fallback;
     return msg + formatFieldErrors(parsed.fieldErrors);
   }
-  if (isRecord5(responseJson) && "error" in responseJson) {
+  if (isRecord6(responseJson) && "error" in responseJson) {
     const parsed = parseErrorDetails(responseJson.error);
     const msg = parsed.message ?? fallback;
     return msg + formatFieldErrors(parsed.fieldErrors);
@@ -40813,9 +41677,34 @@ function convertPulledFooterToLocal(remoteFooter) {
   return { bottomText: remoteFooter.bottomText };
 }
 
+// src/cli/navigationIdentity.ts
+init_src();
+var navigationIdentity = navigationMenuIdentity;
+function navigationIdentityMap(menus) {
+  const byIdentity = /* @__PURE__ */ new Map();
+  const menuNamesByIdentity = /* @__PURE__ */ new Map();
+  for (const menu of menus) {
+    const identity = navigationIdentity(menu);
+    const existingNames = menuNamesByIdentity.get(identity);
+    if (existingNames) {
+      return err({
+        code: "duplicate_navigation_identity",
+        identity,
+        menuNames: [...existingNames, menu.name]
+      });
+    }
+    byIdentity.set(identity, menu);
+    menuNamesByIdentity.set(identity, [menu.name]);
+  }
+  return ok(byIdentity);
+}
+function duplicateNavigationIdentityMessage(error) {
+  return `Duplicate navigation menu identity '${error.identity}' for menus: ${error.menuNames.join(", ")}. Use unique navigation identifiers or names before syncing.`;
+}
+
 // src/cli/media/portable.ts
 var ENV_SPECIFIC_MEDIA_KEYS = ["assetId", "storagePath", "storageBucket"];
-var isRecord6 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var isRecord7 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 var isMediaObject = (value) => value.type === "image" || value.type === "video";
 function stripEnvSpecificMediaFieldsInPlace(value) {
   if (value === null || value === void 0) return;
@@ -40825,7 +41714,7 @@ function stripEnvSpecificMediaFieldsInPlace(value) {
     }
     return;
   }
-  if (!isRecord6(value)) return;
+  if (!isRecord7(value)) return;
   if (isMediaObject(value)) {
     const hasCmsRef = typeof value.identifier === "string" || typeof value.assetId === "string" || typeof value.storagePath === "string" || typeof value.storageBucket === "string";
     for (const key of ENV_SPECIFIC_MEDIA_KEYS) {
@@ -40836,7 +41725,7 @@ function stripEnvSpecificMediaFieldsInPlace(value) {
     }
     delete value.mimeType;
   }
-  if (value.type === "image" && isRecord6(value.attrs)) {
+  if (value.type === "image" && isRecord7(value.attrs)) {
     const attrs = value.attrs;
     const hasIdentifier = typeof attrs.identifier === "string" && attrs.identifier.trim().length > 0;
     if (hasIdentifier) {
@@ -41007,6 +41896,15 @@ function entryFilePath(input) {
 }
 
 // src/cli/content/writer.ts
+function isRecord8(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function parseThemeMeta(value) {
+  if (!isRecord8(value) || typeof value.pulledAt !== "string" || !isRecord8(value.themes)) {
+    return null;
+  }
+  return { pulledAt: value.pulledAt, themes: value.themes };
+}
 async function writeEntries(contentDir, pulledEntries, options) {
   const entriesDir = path5.join(contentDir, "entries");
   const metaDir = path5.join(contentDir, ".meta");
@@ -41038,23 +41936,33 @@ async function writeEntries(contentDir, pulledEntries, options) {
   const metaPath = path5.join(metaDir, `${contentType}.json`);
   if (!options?.skipMeta) {
     await ensureDir(metaDir);
+    const nextMeta = {
+      ...meta,
+      manualOrder: entries.slice().sort((left, right) => {
+        const leftOrder = left.manualOrder ?? Number.MAX_SAFE_INTEGER;
+        const rightOrder = right.manualOrder ?? Number.MAX_SAFE_INTEGER;
+        if (leftOrder !== rightOrder) return leftOrder - rightOrder;
+        return left.identifier.localeCompare(right.identifier);
+      }).map((entry) => entry.identifier)
+    };
     if (options?.cleanupMissing === false) {
       try {
         const existing = JSON.parse(await fs5.readFile(metaPath, "utf-8"));
         await writeJsonFile(metaPath, {
           ...existing,
-          pulledAt: meta.pulledAt,
+          pulledAt: nextMeta.pulledAt,
+          manualOrder: nextMeta.manualOrder,
           entries: {
             ...existing.entries,
-            ...meta.entries
+            ...nextMeta.entries
           }
         });
       } catch (error) {
         if (error.code !== "ENOENT") throw error;
-        await writeJsonFile(metaPath, meta);
+        await writeJsonFile(metaPath, nextMeta);
       }
     } else {
-      await writeJsonFile(metaPath, meta);
+      await writeJsonFile(metaPath, nextMeta);
     }
   }
   if (!options?.skipMeta && options?.entryBaseSnapshot) {
@@ -41122,7 +42030,7 @@ async function writeNavigation(contentDir, pulledNavigation, options) {
   await writeJsonFile(filePath, localNavigation);
   const menusMeta = {};
   for (const menu of pulledNavigation.menus) {
-    menusMeta[menu.name] = {
+    menusMeta[navigationIdentity(menu)] = {
       createdAt: menu.createdAt,
       updatedAt: menu.updatedAt
     };
@@ -41137,11 +42045,19 @@ async function writeNavigation(contentDir, pulledNavigation, options) {
   }
   return { filePath, metaPath };
 }
-async function writeSettings(contentDir, pulledSettings) {
+async function writeSettings(contentDir, pulledSettings, options) {
   await ensureDir(contentDir);
   const filePath = path5.join(contentDir, "settings.json");
   stripEnvSpecificMediaFieldsInPlace(pulledSettings.settings);
   await writeJsonFile(filePath, pulledSettings.settings);
+  if (!options?.skipMeta) {
+    const metaDir = path5.join(contentDir, ".meta");
+    await ensureDir(metaDir);
+    await writeJsonFile(path5.join(metaDir, "settings.json"), {
+      pulledAt: pulledSettings.meta.pulledAt,
+      updatedAt: pulledSettings.meta.updatedAt ?? null
+    });
+  }
   return filePath;
 }
 async function writeForms(contentDir, pulledForms, options) {
@@ -41204,7 +42120,7 @@ async function writePulledTheme(contentDir, pulledTheme, themeName = "current",
     };
     try {
       const content = await fs5.readFile(metaPath, "utf-8");
-      existingMeta = JSON.parse(content);
+      existingMeta = parseThemeMeta(JSON.parse(content)) ?? existingMeta;
     } catch {
     }
     existingMeta.pulledAt = pulledTheme.meta.pulledAt;
@@ -41423,7 +42339,7 @@ async function updateMetadataAfterPush(contentDir, remoteContent) {
     const metaPath = path5.join(metaDir, "navigation.json");
     const menusMeta = {};
     for (const menu of remoteContent.navigation) {
-      menusMeta[menu.name] = {
+      menusMeta[navigationIdentity(menu)] = {
         createdAt: menu.createdAt,
         updatedAt: menu.updatedAt
       };
@@ -41433,6 +42349,12 @@ async function updateMetadataAfterPush(contentDir, remoteContent) {
       menus: menusMeta
     });
   }
+  if (remoteContent.settingsUpdatedAt !== void 0) {
+    await writeJsonFile(path5.join(metaDir, "settings.json"), {
+      pulledAt: now,
+      updatedAt: remoteContent.settingsUpdatedAt
+    });
+  }
   if (remoteContent.forms && remoteContent.forms.length > 0) {
     const metaPath = path5.join(metaDir, "forms.json");
     const formsMeta = {};
@@ -41591,6 +42513,7 @@ async function readEntries(contentDir, contentType) {
       for (const item of items) {
         if (item.isDirectory()) {
           const entries = await readEntriesFromDirectory(path5.join(entriesDir, item.name));
+          await applyManualOrderMetadata(contentDir, item.name, entries);
           if (entries.length > 0) {
             result.set(item.name, entries);
           }
@@ -41602,6 +42525,24 @@ async function readEntries(contentDir, contentType) {
   }
   return result;
 }
+async function applyManualOrderMetadata(contentDir, contentType, entries) {
+  const meta = await readEntriesMeta(contentDir, contentType);
+  const order = meta?.manualOrder;
+  if (!order?.length) return;
+  const orderByIdentifier = new Map(order.map((identifier, index) => [identifier, index]));
+  for (const entry of entries) {
+    const manualOrder = orderByIdentifier.get(entry.identifier);
+    if (manualOrder !== void 0) {
+      entry.manualOrder = manualOrder;
+    }
+  }
+  entries.sort((left, right) => {
+    const leftOrder = left.manualOrder ?? Number.MAX_SAFE_INTEGER;
+    const rightOrder = right.manualOrder ?? Number.MAX_SAFE_INTEGER;
+    if (leftOrder !== rightOrder) return leftOrder - rightOrder;
+    return left.identifier.localeCompare(right.identifier);
+  });
+}
 async function readPages(contentDir) {
   const pagesDir = path5.join(contentDir, "pages");
   const pages = [];
@@ -41798,6 +42739,10 @@ async function getContentSummary(contentDir) {
     courseCount: content.courses.length
   };
 }
+var settingsMetadataSchema = z.object({
+  pulledAt: z.string(),
+  updatedAt: z.string().nullable()
+});
 async function readEntriesMeta(contentDir, contentType) {
   const metaPath = path5.join(contentDir, ".meta", `${contentType}.json`);
   try {
@@ -41818,6 +42763,7 @@ async function readAllMeta(contentDir) {
     const skipFiles = [
       "pages.json",
       "navigation.json",
+      "settings.json",
       "forms.json",
       "themes.json",
       "footer.json",
@@ -41838,6 +42784,22 @@ async function readAllMeta(contentDir) {
   }
   return metaMap;
 }
+async function readSettingsMeta(contentDir) {
+  const metaPath = path5.join(contentDir, ".meta", "settings.json");
+  try {
+    const content = await fs5.readFile(metaPath, "utf-8");
+    const parsed = settingsMetadataSchema.safeParse(JSON.parse(content));
+    if (!parsed.success) {
+      throw new Error("Invalid settings metadata in .meta/settings.json");
+    }
+    return parsed.data;
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      return null;
+    }
+    throw error;
+  }
+}
 async function readPagesMeta(contentDir) {
   const metaPath = path5.join(contentDir, ".meta", "pages.json");
   try {
@@ -42324,9 +43286,9 @@ async function localMediaFileExists(filePath) {
 }
 
 // src/cli/media/identifiers.ts
-var isRecord7 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var isRecord9 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 var isMediaValue = (value) => {
-  if (!isRecord7(value)) return false;
+  if (!isRecord9(value)) return false;
   const type = value.type;
   if (type !== "image" && type !== "video" && type !== "audio" && type !== "document" && type !== "spreadsheet" && type !== "archive") return false;
   return typeof value.identifier === "string" || typeof value.assetId === "string" || typeof value.storagePath === "string" || typeof value.src === "string";
@@ -42341,7 +43303,7 @@ var walkMediaValues = (value, location2, handler) => {
     });
     return;
   }
-  if (isRecord7(value)) {
+  if (isRecord9(value)) {
     Object.entries(value).forEach(([key, entry]) => {
       walkMediaValues(entry, location2 ? `${location2}.${key}` : key, handler);
     });
@@ -42449,7 +43411,7 @@ var normalizeMediaValueToIdentifierOnly = (value, identifier, asset) => {
 };
 
 // src/cli/media/rich-text.ts
-var isRecord8 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var isRecord10 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 function collectRichTextImageAttrs(value, out = [], location2 = "") {
   if (Array.isArray(value)) {
     value.forEach(
@@ -42457,8 +43419,8 @@ function collectRichTextImageAttrs(value, out = [], location2 = "") {
     );
     return out;
   }
-  if (!isRecord8(value)) return out;
-  if (value.type === "image" && isRecord8(value.attrs)) {
+  if (!isRecord10(value)) return out;
+  if (value.type === "image" && isRecord10(value.attrs)) {
     out.push({ attrs: value.attrs, location: location2 ? `${location2}.attrs` : "attrs" });
   }
   for (const [key, child] of Object.entries(value)) {
@@ -43311,15 +44273,78 @@ function determineStatusChange(localStatus, remoteStatus) {
   }
   return void 0;
 }
+function findRemoteNavigationMenuForLocal(localMenu, remoteNavigation) {
+  const plan = actionableNavigationMenuMatchPlan(
+    planNavigationMenuMatch(localMenu, remoteNavigationMatchCandidates(remoteNavigation))
+  );
+  const menuId = plan.ok ? matchedNavigationMenuId(plan.value) : void 0;
+  if (!menuId) return void 0;
+  return remoteNavigation.find((menu) => remoteNavigationCandidateId(menu) === menuId);
+}
+function findLocalNavigationMenuForRemote(remoteMenu, localNavigation) {
+  const localMenus = localNavigation?.menus ?? [];
+  const directPlan = actionableNavigationMenuMatchPlan(
+    planNavigationMenuMatch(remoteMenu, localNavigationMatchCandidates(localMenus))
+  );
+  const directMenuId = directPlan.ok ? matchedNavigationMenuId(directPlan.value) : void 0;
+  if (directMenuId) {
+    return localMenus.find((menu) => navigationIdentity(menu) === directMenuId);
+  }
+  if (!remoteMenu.isPrimary || remoteMenu.identifier !== null) return void 0;
+  const legacyMainPlan = actionableNavigationMenuMatchPlan(
+    planNavigationMenuMatch(
+      { identifier: "main", name: remoteMenu.name },
+      localNavigationMatchCandidates(localMenus)
+    )
+  );
+  const legacyMainMenuId = legacyMainPlan.ok ? matchedNavigationMenuId(legacyMainPlan.value) : void 0;
+  if (!legacyMainMenuId) return void 0;
+  return localMenus.find((menu) => navigationIdentity(menu) === legacyMainMenuId);
+}
+function matchedNavigationMenuId(plan) {
+  switch (plan.type) {
+    case "create":
+      return void 0;
+    case "update":
+    case "adopt_legacy_primary":
+      return plan.menuId;
+  }
+}
+function localNavigationMatchCandidates(menus) {
+  return menus.map((menu) => ({
+    id: navigationIdentity(menu),
+    identifier: menu.identifier,
+    name: menu.name,
+    isPrimary: menu.isPrimary ?? false
+  }));
+}
+function remoteNavigationMatchCandidates(menus) {
+  return menus.map((menu) => ({
+    id: remoteNavigationCandidateId(menu),
+    identifier: menu.identifier,
+    name: menu.name,
+    isPrimary: menu.isPrimary
+  }));
+}
+function remoteNavigationCandidateId(menu) {
+  return menu.id ?? navigationIdentity(menu);
+}
 function buildJsonDiff(diff, local, remote, mode) {
   const summary = { creates: 0, updates: 0, deletes: 0, publishes: 0, unpublishes: 0 };
   const changes = [];
+  const warnings = [];
   const localPages = new Map(local.pages.map((page) => [page.identifier, page]));
   const remotePages = new Map(remote.pages.map((page) => [page.identifier, page]));
   const localEntries = local.entries;
   const remoteEntries = remote.entries;
-  const localMenus = new Map((local.navigation?.menus ?? []).map((menu) => [menu.name, menu]));
-  const remoteMenus = new Map(remote.navigation.map((menu) => [menu.name, menu]));
+  const localMenus = navigationIdentityMap(local.navigation?.menus ?? []);
+  const remoteMenus = navigationIdentityMap(remote.navigation);
+  if (!localMenus.ok) {
+    warnings.push(jsonDiffDuplicateNavigationIdentityWarning("local", localMenus.error));
+  }
+  if (!remoteMenus.ok) {
+    warnings.push(jsonDiffDuplicateNavigationIdentityWarning("remote", remoteMenus.error));
+  }
   const localForms = new Map(local.forms.map((form2) => [form2.slug, form2]));
   const remoteForms = new Map(remote.forms.map((form2) => [form2.slug, form2]));
   const addChange = (change) => {
@@ -43404,9 +44429,9 @@ function buildJsonDiff(diff, local, remote, mode) {
   for (const navDiff of diff.navigation) {
     if (navDiff.type === "unchanged") continue;
     if (navDiff.type !== "create" && navDiff.type !== "update") continue;
-    const identifier = navDiff.name;
-    const localMenu = localMenus.get(navDiff.name);
-    const remoteMenu = remoteMenus.get(navDiff.name);
+    const identifier = navigationIdentity(navDiff);
+    const localMenu = localMenus.ok ? localMenus.value.get(identifier) : void 0;
+    const remoteMenu = localMenu ? findRemoteNavigationMenuForLocal(localMenu, remote.navigation) : remoteMenus.ok ? remoteMenus.value.get(identifier) : void 0;
     const change = {
       type: "navigation",
       identifier,
@@ -43450,7 +44475,20 @@ function buildJsonDiff(diff, local, remote, mode) {
     }
     addChange(change);
   }
-  return { summary, changes };
+  return {
+    summary,
+    changes,
+    ...warnings.length > 0 ? { warnings } : {}
+  };
+}
+function jsonDiffDuplicateNavigationIdentityWarning(source, error) {
+  return {
+    type: "duplicate_navigation_identity",
+    source,
+    identity: error.identity,
+    menuNames: error.menuNames,
+    message: duplicateNavigationIdentityMessage(error)
+  };
 }
 function calculateEntryDiffs(localEntries, remoteEntries, options) {
   const diffs = /* @__PURE__ */ new Map();
@@ -43462,7 +44500,8 @@ function calculateEntryDiffs(localEntries, remoteEntries, options) {
     for (const entry of entries) {
       typeMap.set(entry.identifier, {
         data: entry.data,
-        status: entry.status
+        status: entry.status,
+        manualOrder: entry.manualOrder
       });
     }
     remoteLookup.set(contentType, typeMap);
@@ -43501,6 +44540,9 @@ function calculateEntryDiffs(localEntries, remoteEntries, options) {
             remoteEntry.data
           ));
         }
+        if (typeof localEntry.manualOrder === "number" && localEntry.manualOrder !== remoteEntry.manualOrder) {
+          changes.push("manualOrder");
+        }
         const statusChange2 = determineStatusChange(localEntry.status, remoteEntry.status);
         if (changes.length > 0) {
           typeDiffs.push({
@@ -43707,20 +44749,23 @@ function calculateNavigationDiffs(localNavigation, remoteNavigation) {
   if (!localNavigation || !localNavigation.menus) {
     return { diffs, summary };
   }
-  const remoteLookup = /* @__PURE__ */ new Map();
-  for (const menu of remoteNavigation) {
-    remoteLookup.set(menu.name, menu);
-  }
   for (const localMenu of localNavigation.menus) {
-    const remoteMenu = remoteLookup.get(localMenu.name);
+    const remoteMenu = findRemoteNavigationMenuForLocal(
+      localMenu,
+      remoteNavigation
+    );
     if (!remoteMenu) {
       diffs.push({
         type: "create",
+        identifier: localMenu.identifier,
         name: localMenu.name
       });
       summary.create++;
     } else {
       const changes = [];
+      if (localMenu.name !== remoteMenu.name) {
+        changes.push("name");
+      }
       if (!equal(localMenu.items, stripNavigationItemIds(remoteMenu.items))) {
         changes.push("items");
       }
@@ -43733,6 +44778,7 @@ function calculateNavigationDiffs(localNavigation, remoteNavigation) {
       if (changes.length > 0) {
         diffs.push({
           type: "update",
+          identifier: localMenu.identifier,
           name: localMenu.name,
           changes
         });
@@ -43740,6 +44786,7 @@ function calculateNavigationDiffs(localNavigation, remoteNavigation) {
       } else {
         diffs.push({
           type: "unchanged",
+          identifier: localMenu.identifier,
           name: localMenu.name
         });
         summary.unchanged++;
@@ -44124,19 +45171,23 @@ function calculatePullDiff(remote, local) {
   }
   const navDiffs = [];
   const navSummary = { create: 0, update: 0, unchanged: 0 };
-  const localNavLookup = /* @__PURE__ */ new Map();
-  if (local?.navigation?.menus) {
-    for (const menu of local.navigation.menus) {
-      localNavLookup.set(menu.name, menu);
-    }
-  }
   for (const remoteMenu of remote.navigation) {
-    const localMenu = localNavLookup.get(remoteMenu.name);
+    const localMenu = findLocalNavigationMenuForRemote(
+      remoteMenu,
+      local?.navigation ?? null
+    );
     if (!localMenu) {
-      navDiffs.push({ type: "create", name: remoteMenu.name });
+      navDiffs.push({
+        type: "create",
+        identifier: remoteMenu.identifier,
+        name: remoteMenu.name
+      });
       navSummary.create++;
     } else {
       const changes = [];
+      if (localMenu.name !== remoteMenu.name) {
+        changes.push("name");
+      }
       if (!equal(stripNavigationItemIds(remoteMenu.items), localMenu.items)) {
         changes.push("items");
       }
@@ -44147,10 +45198,19 @@ function calculatePullDiff(remote, local) {
         changes.push("isFooter");
       }
       if (changes.length > 0) {
-        navDiffs.push({ type: "update", name: remoteMenu.name, changes });
+        navDiffs.push({
+          type: "update",
+          identifier: remoteMenu.identifier,
+          name: remoteMenu.name,
+          changes
+        });
         navSummary.update++;
       } else {
-        navDiffs.push({ type: "unchanged", name: remoteMenu.name });
+        navDiffs.push({
+          type: "unchanged",
+          identifier: remoteMenu.identifier,
+          name: remoteMenu.name
+        });
         navSummary.unchanged++;
       }
     }
@@ -45032,7 +46092,8 @@ async function fetchAllContentPaginated(client, contentTypes, output, baseConten
     ...baseContent?.courses ? { courses: baseContent.courses } : {},
     meta: {
       pulledAt: (/* @__PURE__ */ new Date()).toISOString(),
-      entries: allMeta
+      entries: allMeta,
+      settingsUpdatedAt: settingsResult.meta.updatedAt
     }
   };
 }
@@ -45087,12 +46148,17 @@ function buildPullJsonDiff(diff, remoteContent, localContent, mode) {
     }
     for (const navDiff of diff.navigation) {
       if (navDiff.type === "unchanged") continue;
-      const remoteMenu = remoteContent.navigation.find((m) => m.name === navDiff.name);
-      const localMenu = localContent?.navigation?.menus.find((m) => m.name === navDiff.name);
+      const navIdentifier = navigationIdentity(navDiff);
+      const remoteMenu = remoteContent.navigation.find(
+        (m) => navigationIdentity(m) === navIdentifier
+      );
+      const localMenu = localContent?.navigation?.menus.find(
+        (m) => navigationIdentity(m) === navIdentifier
+      );
       changes.push({
         type: "navigation",
         operation: navDiff.type,
-        identifier: navDiff.name,
+        identifier: navIdentifier,
         before: localMenu ?? null,
         after: remoteMenu ?? null
       });
@@ -45117,7 +46183,8 @@ function mapManagementEntryToPulledEntry(entry) {
     status: entry.status,
     hasUnpublishedChanges: entry.hasUnpublishedChanges,
     slug: entry.slug,
-    title: entry.title
+    title: entry.title,
+    manualOrder: entry.manualOrder
   };
 }
 async function pullSingleEntry(client, contentType, identifier) {
@@ -45793,7 +46860,7 @@ Media Sync:
           const mediaContent = createScopedPullContent(result.meta, { settings: result.settings });
           await applyMediaIdentifiers(mediaContent);
           await syncMediaIfRequested(mediaContent);
-          const filePath = await writeSettings(contentDir, result);
+          const filePath = await writeSettings(contentDir, result, { skipMeta });
           output.success("Pulled site settings", { file: filePath });
           break;
         }
@@ -45900,7 +46967,17 @@ Media Sync:
           );
           await writePages(contentDir, { pages: result.pages, meta: result.meta }, { skipMeta });
           await writeNavigation(contentDir, { menus: result.navigation, meta: result.meta }, { skipMeta });
-          await writeSettings(contentDir, { settings: result.settings, meta: result.meta });
+          await writeSettings(
+            contentDir,
+            {
+              settings: result.settings,
+              meta: {
+                pulledAt: result.meta.pulledAt,
+                updatedAt: result.meta.settingsUpdatedAt ?? null
+              }
+            },
+            { skipMeta }
+          );
           await writeForms(contentDir, { forms: result.forms, meta: result.meta }, { skipMeta });
           if (result.venues) {
             await writeVenues(contentDir, { venues: result.venues, meta: result.meta }, { skipMeta });
@@ -45981,6 +47058,7 @@ var VALID_PUSH_SCOPES = [
   "pages",
   "navigation",
   "forms",
+  "settings",
   "theme",
   "footer",
   "venues",
@@ -46134,6 +47212,22 @@ function filterLocalContent(localContent, scope, contentType, identifier) {
       }
     };
   }
+  if (scope === "settings") {
+    return {
+      content: {
+        ...localContent,
+        entries: /* @__PURE__ */ new Map(),
+        pages: [],
+        navigation: null,
+        forms: [],
+        footer: null,
+        venues: [],
+        eventCategories: [],
+        events: [],
+        courses: []
+      }
+    };
+  }
   if (scope === "venues") {
     return {
       content: {
@@ -46207,12 +47301,14 @@ function calculateMetadataUpdates(result) {
   const willUpdatePages = result.pages.failed === 0 && result.pages.created + result.pages.updated > 0;
   const willUpdateNavigation = result.navigation.failed === 0 && result.navigation.created + result.navigation.updated > 0;
   const willUpdateForms = result.forms.failed === 0 && result.forms.created + result.forms.updated > 0;
-  const shouldUpdateMetadata = willUpdateEntries || willUpdatePages || willUpdateNavigation || willUpdateForms;
+  const willUpdateSettings = result.settings.failed === 0 && result.settings.updated > 0;
+  const shouldUpdateMetadata = willUpdateEntries || willUpdatePages || willUpdateNavigation || willUpdateForms || willUpdateSettings;
   return {
     willUpdateEntries,
     willUpdatePages,
     willUpdateNavigation,
     willUpdateForms,
+    willUpdateSettings,
     shouldUpdateMetadata
   };
 }
@@ -46236,11 +47332,11 @@ function normalizeLocalContentShape(content) {
 function nullishToNull(value) {
   return value == null ? null : value;
 }
-function isRecord9(value) {
+function isRecord11(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function normalizeVenueAddress(value) {
-  const obj = isRecord9(value) ? value : {};
+  const obj = isRecord11(value) ? value : {};
   return {
     line1: nullishToNull(typeof obj.line1 === "string" ? obj.line1 : void 0),
     line2: nullishToNull(typeof obj.line2 === "string" ? obj.line2 : void 0),
@@ -46257,7 +47353,7 @@ function normalizeVenueAddress(value) {
   };
 }
 function normalizeVenueLocation(value) {
-  if (!isRecord9(value)) return null;
+  if (!isRecord11(value)) return null;
   const obj = value;
   const lat = typeof obj.lat === "number" ? obj.lat : null;
   const lng = typeof obj.lng === "number" ? obj.lng : null;
@@ -46265,7 +47361,7 @@ function normalizeVenueLocation(value) {
   return { lat, lng };
 }
 function normalizeVenueForCompare(venue) {
-  const obj = isRecord9(venue) ? venue : {};
+  const obj = isRecord11(venue) ? venue : {};
   return {
     slug: String(obj.slug),
     title: String(obj.title),
@@ -46278,7 +47374,7 @@ function normalizeVenueForCompare(venue) {
   };
 }
 function normalizeEventCategoryForCompare(category) {
-  const obj = isRecord9(category) ? category : {};
+  const obj = isRecord11(category) ? category : {};
   return {
     identifier: String(obj.identifier),
     name: String(obj.name),
@@ -46288,9 +47384,9 @@ function normalizeEventCategoryForCompare(category) {
   };
 }
 function normalizeRemoteEventForCompare(event) {
-  const obj = isRecord9(event) ? event : {};
-  const schedule = isRecord9(obj.schedule) ? obj.schedule : {};
-  const pricing = isRecord9(obj.pricing) ? obj.pricing : {};
+  const obj = isRecord11(event) ? event : {};
+  const schedule = isRecord11(obj.schedule) ? obj.schedule : {};
+  const pricing = isRecord11(obj.pricing) ? obj.pricing : {};
   return {
     identifier: String(obj.identifier),
     title: String(obj.title),
@@ -46323,14 +47419,14 @@ function normalizeRemoteEventForCompare(event) {
     venueRef: nullishToNull(typeof obj.venueRef === "string" ? obj.venueRef : void 0),
     categoryRef: nullishToNull(typeof obj.categoryRef === "string" ? obj.categoryRef : void 0),
     formRef: nullishToNull(typeof obj.formRef === "string" ? obj.formRef : void 0),
-    content: isRecord9(obj.content) ? obj.content : {},
-    settings: isRecord9(obj.settings) ? obj.settings : {},
-    presentation: isRecord9(obj.presentation) ? obj.presentation : null,
+    content: isRecord11(obj.content) ? obj.content : {},
+    settings: isRecord11(obj.settings) ? obj.settings : {},
+    presentation: isRecord11(obj.presentation) ? obj.presentation : null,
     tags: Array.isArray(obj.tags) ? obj.tags : []
   };
 }
 function normalizeLocalEventAgainstRemoteForCompare(localEvent, remoteEvent) {
-  const local = isRecord9(localEvent) ? localEvent : {};
+  const local = isRecord11(localEvent) ? localEvent : {};
   const base = remoteEvent ? normalizeRemoteEventForCompare(remoteEvent) : normalizeRemoteEventForCompare({
     identifier: local.identifier,
     title: local.title,
@@ -46348,8 +47444,8 @@ function normalizeLocalEventAgainstRemoteForCompare(localEvent, remoteEvent) {
     presentation: local.presentation ?? null,
     tags: local.tags ?? []
   });
-  const schedule = isRecord9(local.schedule) ? local.schedule : {};
-  const pricing = isRecord9(local.pricing) ? local.pricing : {};
+  const schedule = isRecord11(local.schedule) ? local.schedule : {};
+  const pricing = isRecord11(local.pricing) ? local.pricing : {};
   return {
     ...base,
     identifier: String(local.identifier ?? base.identifier),
@@ -46375,9 +47471,9 @@ function normalizeLocalEventAgainstRemoteForCompare(localEvent, remoteEvent) {
     venueRef: local.venueRef === void 0 ? base.venueRef : nullishToNull(typeof local.venueRef === "string" ? local.venueRef : void 0),
     categoryRef: local.categoryRef === void 0 ? base.categoryRef : nullishToNull(typeof local.categoryRef === "string" ? local.categoryRef : void 0),
     formRef: local.formRef === void 0 ? base.formRef : nullishToNull(typeof local.formRef === "string" ? local.formRef : void 0),
-    content: local.content === void 0 ? base.content : isRecord9(local.content) ? local.content : {},
-    settings: local.settings === void 0 ? base.settings : isRecord9(local.settings) ? local.settings : {},
-    presentation: local.presentation === void 0 ? base.presentation : isRecord9(local.presentation) ? local.presentation : null,
+    content: local.content === void 0 ? base.content : isRecord11(local.content) ? local.content : {},
+    settings: local.settings === void 0 ? base.settings : isRecord11(local.settings) ? local.settings : {},
+    presentation: local.presentation === void 0 ? base.presentation : isRecord11(local.presentation) ? local.presentation : null,
     tags: local.tags === void 0 ? base.tags : Array.isArray(local.tags) ? local.tags : []
   };
 }
@@ -46389,7 +47485,7 @@ function toIsoStringOrOriginal(value) {
 function normalizeCourseSessions(value) {
   if (!Array.isArray(value)) return [];
   return value.map((session) => {
-    const obj = isRecord9(session) ? session : {};
+    const obj = isRecord11(session) ? session : {};
     return {
       startsAt: toIsoStringOrOriginal(obj.startsAt),
       endsAt: toIsoStringOrOriginal(obj.endsAt)
@@ -46401,18 +47497,18 @@ function normalizeCourseSessions(value) {
 }
 function normalizeCourseProgram(value) {
   if (value == null) return null;
-  if (!isRecord9(value)) {
+  if (!isRecord11(value)) {
     return { identifier: null, data: {} };
   }
   return {
     identifier: nullishToNull(
       typeof value.identifier === "string" ? value.identifier : void 0
     ),
-    data: isRecord9(value.data) ? value.data : {}
+    data: isRecord11(value.data) ? value.data : {}
   };
 }
 function normalizeRemoteCourseForCompare(course) {
-  const obj = isRecord9(course) ? course : {};
+  const obj = isRecord11(course) ? course : {};
   return {
     identifier: String(obj.identifier),
     title: String(obj.title),
@@ -46435,7 +47531,7 @@ function normalizeRemoteCourseForCompare(course) {
   };
 }
 function normalizeLocalCourseAgainstRemoteForCompare(localCourse, remoteCourse) {
-  const local = isRecord9(localCourse) ? localCourse : {};
+  const local = isRecord11(localCourse) ? localCourse : {};
   const base = remoteCourse ? normalizeRemoteCourseForCompare(remoteCourse) : normalizeRemoteCourseForCompare({
     identifier: local.identifier,
     title: local.title,
@@ -46456,11 +47552,11 @@ function normalizeLocalCourseAgainstRemoteForCompare(localCourse, remoteCourse)
   });
   const status = local.status === void 0 ? base.status : local.status === "active" || local.status === "cancelled" || local.status === "completed" ? local.status : "draft";
   const visibility = local.visibility === void 0 ? base.visibility : local.visibility === "public" || local.visibility === "private" || local.visibility === "unlisted" ? local.visibility : "public";
-  const program2 = local.program === void 0 ? base.program : local.program === null ? null : isRecord9(local.program) ? {
+  const program2 = local.program === void 0 ? base.program : local.program === null ? null : isRecord11(local.program) ? {
     identifier: local.program.identifier === void 0 ? base.program?.identifier ?? null : nullishToNull(
       typeof local.program.identifier === "string" ? local.program.identifier : void 0
     ),
-    data: isRecord9(local.program.data) ? local.program.data : base.program?.data ?? {}
+    data: isRecord11(local.program.data) ? local.program.data : base.program?.data ?? {}
   } : base.program;
   return {
     ...base,
@@ -46630,7 +47726,7 @@ function calculatePushAllExtraChanges(local, remote, options) {
 }
 
 // src/cli/commands/push/stale.ts
-function checkForStaleContent(localContent, localMeta, pagesMeta, navigationMeta, formsMeta, remoteContent) {
+function checkForStaleContent(localContent, localMeta, pagesMeta, navigationMeta, formsMeta, remoteContent, settingsMeta = null) {
   const staleItems = [];
   for (const [contentType, localEntries] of localContent.entries) {
     const meta = localMeta.get(contentType);
@@ -46689,6 +47785,17 @@ function checkForStaleContent(localContent, localMeta, pagesMeta, navigationMeta
       }
     });
   }
+  if (localContent.settings && settingsMeta?.updatedAt && remoteContent.meta.settingsUpdatedAt) {
+    const remoteTime = remoteContent.meta.settingsUpdatedAt;
+    if (new Date(remoteTime) > new Date(settingsMeta.updatedAt)) {
+      staleItems.push({
+        scope: "settings",
+        identifier: "site",
+        remoteUpdatedAt: remoteTime,
+        display: `Settings: site (Remote updated: ${remoteTime})`
+      });
+    }
+  }
   if (formsMeta) {
     localContent.forms.forEach((localForm) => {
       const remoteForm = remoteContent.forms.find((f) => f.slug === localForm.slug);
@@ -47351,6 +48458,7 @@ var upsertNavigationMenuCommandSchema = z.object({
   type: z.literal("upsertNavigationMenu"),
   ref: navigationRefSchema,
   input: z.object({
+    identifier: z.string().min(1).optional(),
     name: z.string().min(1).optional(),
     location: z.enum(navigationLocations).optional(),
     role: z.enum(navigationMenuRoles).optional(),
@@ -47408,6 +48516,7 @@ var upsertContentEntryCommandSchema = z.object({
     contentTypeKey: z.string().min(1),
     slug: z.string().min(1).optional(),
     title: z.string().min(1).optional(),
+    manualOrder: z.number().int().min(0).optional(),
     data: unknownRecordSchema.optional(),
     linkedSubjectRef: contentEntryRefSchema.optional(),
     mediaRefs: z.array(mediaRefSchema).readonly().optional()
@@ -48625,19 +49734,17 @@ function getSiteCommandMetadata(type) {
   return siteCommandMetadata[type];
 }
 function getSiteCommandLifecycleIntent(command) {
-  switch (command.type) {
-    case "ensureTeamMemberProfile":
-      return command.input.publish ? "publish" : "mutation";
-    default:
-      return getSiteCommandMetadata(command.type).lifecycleIntent;
+  if (command.type === "ensureTeamMemberProfile") {
+    return command.input.publish ? "publish" : "mutation";
   }
+  return getSiteCommandMetadata(command.type).lifecycleIntent;
 }
 
 // ../site-commands/src/planner.ts
 init_src();
 
 // ../site-commands/src/guards.ts
-function isRecord10(value) {
+function isRecord12(value) {
   return typeof value === "object" && value !== null;
 }
 
@@ -48902,7 +50009,7 @@ function collectVenueRefsFromIntervals(intervals, path24) {
 }
 function collectNavigationRefs(items, path24) {
   return items.flatMap((item, index) => {
-    if (!isRecord10(item)) return [];
+    if (!isRecord12(item)) return [];
     const itemPath = `${path24}[${index}]`;
     const refs = [];
     if (typeof item.pageRef === "string") {
@@ -48919,7 +50026,7 @@ function collectNavigationRefs(items, path24) {
 }
 function collectBlockRefs(blocks, path24) {
   return blocks.flatMap((block, index) => {
-    if (!isRecord10(block)) return [];
+    if (!isRecord12(block)) return [];
     const blockPath = `${path24}[${index}]`;
     return [
       ...collectNestedRefs(block.props, `${blockPath}.props`),
@@ -48935,22 +50042,16 @@ function collectNestedRefs(value, path24) {
   if (Array.isArray(value)) {
     return value.flatMap((item, index) => collectNestedRefs(item, `${path24}[${index}]`));
   }
-  if (!isRecord10(value)) return [];
+  if (!isRecord12(value)) return [];
   return Object.entries(value).flatMap(([key, child]) => collectNestedRefs(child, `${path24}.${key}`));
 }
 
 // ../site-commands/src/staticExecutionGaps.ts
 function staticExecutionGapsForCommand(command) {
-  switch (command.type) {
-    case "upsertEventSeries":
-      return eventSeriesStaticExecutionGaps(command);
-    case "upsertEventTicketType":
-      return eventTicketTypeStaticExecutionGaps(command);
-    case "upsertCourse":
-      return courseStaticExecutionGaps(command);
-    default:
-      return [];
-  }
+  if (command.type === "upsertEventSeries") return eventSeriesStaticExecutionGaps(command);
+  if (command.type === "upsertEventTicketType") return eventTicketTypeStaticExecutionGaps(command);
+  if (command.type === "upsertCourse") return courseStaticExecutionGaps(command);
+  return [];
 }
 function eventSeriesStaticExecutionGaps(command) {
   return [
@@ -49197,9 +50298,9 @@ function deriveIdempotencyKey(input) {
   ].join("|"));
 }
 function findUnknownCommandTypes(input) {
-  if (!isRecord10(input) || !Array.isArray(input.commands)) return [];
+  if (!isRecord12(input) || !Array.isArray(input.commands)) return [];
   return input.commands.flatMap((command, commandIndex) => {
-    if (!isRecord10(command) || typeof command.type !== "string") return [];
+    if (!isRecord12(command) || typeof command.type !== "string") return [];
     if (commandTypeSet.has(command.type)) return [];
     return [{
       code: "unknown_command_type",
@@ -49225,9 +50326,12 @@ function commandIndexForIssuePath(path24) {
   return path24[0] === "commands" && typeof path24[1] === "number" ? path24[1] : -1;
 }
 function commandTypeForIssue(input, commandIndex) {
-  if (!isRecord10(input) || !Array.isArray(input.commands)) return null;
+  if (!isRecord12(input) || !isUnknownArray3(input.commands)) return null;
   const command = input.commands[commandIndex];
-  return isRecord10(command) && typeof command.type === "string" ? command.type : null;
+  return isRecord12(command) && typeof command.type === "string" ? command.type : null;
+}
+function isUnknownArray3(value) {
+  return Array.isArray(value);
 }
 function formatIssuePath(path24) {
   if (path24.length === 0) return "<root>";
@@ -49409,6 +50513,51 @@ function indexOfferingCommands(batch) {
         mutableTicketsByEventRef.set(command.input.eventRef, tickets);
         break;
       }
+      case "configureSiteIdentity":
+      case "configureBookingSettings":
+      case "applySiteStyleSelection":
+      case "upsertMediaAsset":
+      case "upsertPage":
+      case "upsertBlockTree":
+      case "upsertPageBlock":
+      case "patchPageBlockContent":
+      case "deletePageBlock":
+      case "reorderPageBlocks":
+      case "upsertNavigationMenu":
+      case "upsertForm":
+      case "upsertFooterContent":
+      case "upsertContentEntry":
+      case "publishPage":
+      case "unpublishPage":
+      case "publishContentEntry":
+      case "unpublishContentEntry":
+      case "deleteContentEntry":
+      case "upsertStaffMember":
+      case "ensureTeamMemberProfile":
+      case "upsertVenue":
+      case "deleteVenue":
+      case "upsertEventCategory":
+      case "deleteEventCategory":
+      case "deleteEventSeries":
+      case "upsertCourse":
+      case "deleteCourse":
+      case "upsertBookingPassProduct":
+      case "upsertBookingMembershipProduct":
+      case "seedBookingCustomer":
+      case "grantCustomerPass":
+      case "grantCustomerMembership":
+      case "seedAppointmentBooking":
+      case "seedCourseEnrollment":
+      case "seedEventRegistration":
+      case "seedPassRedemption":
+      case "seedPortalOrder":
+      case "upsertAppointmentService":
+      case "upsertBookableResource":
+      case "assignAppointmentServiceResources":
+      case "configureAppointmentAvailability":
+        break;
+      default:
+        assertNeverCommand(command);
     }
   }
   const ticketsByEventRef = new Map(
@@ -49808,6 +50957,7 @@ function appliedSubjectFromOutcome(outcome) {
     case "failed":
     case "skipped_by_stop_policy":
     case "compile_failed":
+    case "preflight_failed":
       return [];
     default:
       assertNever(outcome);
@@ -49817,6 +50967,7 @@ function failureFromOutcome(outcome) {
   switch (outcome.status) {
     case "failed":
     case "compile_failed":
+    case "preflight_failed":
       return {
         identifier: outcome.identifier,
         message: outcome.message,
@@ -50199,8 +51350,8 @@ function eventContentInput(content) {
   if (!content) return void 0;
   return {
     ...content.summary ? { summary: content.summary } : {},
-    ...typeof content.body === "string" || isRecord11(content.body) ? { body: content.body } : {},
-    ...typeof content.image === "string" || isRecord11(content.image) ? { image: content.image } : {}
+    ...typeof content.body === "string" || isRecord13(content.body) ? { body: content.body } : {},
+    ...typeof content.image === "string" || isRecord13(content.image) ? { image: content.image } : {}
   };
 }
 function courseUpsertInput(command) {
@@ -50372,7 +51523,7 @@ function toUtcIso(date, time) {
   const normalizedTime = time.length === 5 ? `${time}:00` : time;
   return (/* @__PURE__ */ new Date(`${date}T${normalizedTime}Z`)).toISOString();
 }
-function isRecord11(value) {
+function isRecord13(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function unsupported(identifier, message) {
@@ -50393,12 +51544,12 @@ function courseSessionConflictMessage(error) {
 init_src();
 
 // src/cli/site-commands/commandKeys.ts
-var asCliContentTypeKey = (value) => value;
-var asCliEntryIdentifier = (value) => value;
-var asCliPageIdentifier = (value) => value;
-var asCliBlockIdentifier = (value) => value;
-var asCliFormSlug = (value) => value;
-var asCliNavigationMenuName = (value) => value;
+var unsafeAsCliContentTypeKey = (value) => value;
+var unsafeAsCliEntryIdentifier = (value) => value;
+var unsafeAsCliPageIdentifier = (value) => value;
+var unsafeAsCliBlockIdentifier = (value) => value;
+var unsafeAsCliFormSlug = (value) => value;
+var unsafeAsCliNavigationMenuName = (value) => value;
 
 // src/cli/site-commands/commandRuntimeCompat.ts
 init_src();
@@ -50411,6 +51562,7 @@ function commandReportToSyncResult(input) {
         break;
       case "failed":
       case "compile_failed":
+      case "preflight_failed":
         input.recordFailure(
           result,
           outcome.identifier,
@@ -50448,12 +51600,12 @@ function compileEntryPushCommands(input) {
   const commandBindings = [];
   const localEntriesByType = new Map(
     [...input.local.entries.entries()].map(([contentType, entries]) => [
-      asCliContentTypeKey(contentType),
-      new Map(entries.map((entry) => [asCliEntryIdentifier(entry.identifier), entry]))
+      unsafeAsCliContentTypeKey(contentType),
+      new Map(entries.map((entry) => [unsafeAsCliEntryIdentifier(entry.identifier), entry]))
     ])
   );
   for (const [contentType, entryDiffs] of input.diff.entries) {
-    const contentTypeKey = asCliContentTypeKey(contentType);
+    const contentTypeKey = unsafeAsCliContentTypeKey(contentType);
     for (const entryDiff of entryDiffs) {
       const commandResult = entryCommandsForDiff({
         contentType: contentTypeKey,
@@ -50483,7 +51635,8 @@ async function executeEntryCommandPlan(input) {
             identifier,
             contentType: command.input.contentTypeKey,
             data: command.input.data ?? {},
-            slug: command.input.slug
+            slug: command.input.slug,
+            manualOrder: command.input.manualOrder
           });
           return;
         }
@@ -50565,7 +51718,7 @@ function entryCommandsForDiff(input) {
   if (input.entryDiff.type === "unchanged" && !input.entryDiff.statusChange) {
     return ok([]);
   }
-  const entryIdentifier = asCliEntryIdentifier(input.entryDiff.identifier);
+  const entryIdentifier = unsafeAsCliEntryIdentifier(input.entryDiff.identifier);
   const entryRef = createContentEntryRef([input.contentType, entryIdentifier]);
   const commandBindings = [];
   const upsertedInBatch = input.entryDiff.type !== "delete" && input.entryDiff.type !== "unchanged";
@@ -50597,7 +51750,7 @@ function entryCommandsForDiff(input) {
       message: `Missing local entry for ${input.contentType}/${input.entryDiff.identifier}.`
     });
   }
-  const localEntryIdentifier = asCliEntryIdentifier(localEntry.identifier);
+  const localEntryIdentifier = unsafeAsCliEntryIdentifier(localEntry.identifier);
   if (input.entryDiff.type !== "unchanged") {
     const command = {
       type: "upsertContentEntry",
@@ -50606,6 +51759,7 @@ function entryCommandsForDiff(input) {
         identifier: localEntryIdentifier,
         contentTypeKey: input.contentType,
         ...localEntry.slug ? { slug: localEntry.slug } : {},
+        ...typeof localEntry.manualOrder === "number" ? { manualOrder: localEntry.manualOrder } : {},
         ...optionalTitle(localEntry.data),
         data: localEntry.data
       }
@@ -50716,10 +51870,10 @@ var formSiteCommandTypes = [
 function compileFormPushCommands(input) {
   const commandBindings = [];
   const formsBySlug = new Map(
-    input.local.forms.map((form2) => [asCliFormSlug(form2.slug), form2])
+    input.local.forms.map((form2) => [unsafeAsCliFormSlug(form2.slug), form2])
   );
   for (const formDiff of input.diff.forms) {
-    const formSlug = asCliFormSlug(formDiff.slug);
+    const formSlug = unsafeAsCliFormSlug(formDiff.slug);
     const commandResult = formCommandForDiff({
       formDiff,
       slug: formSlug,
@@ -50799,7 +51953,7 @@ function formCommandForDiff(input) {
       message: `Missing local form: ${input.formDiff.slug}.`
     });
   }
-  const localFormSlug = asCliFormSlug(input.localForm.slug);
+  const localFormSlug = unsafeAsCliFormSlug(input.localForm.slug);
   const formRef = createFormRef([input.slug]);
   return ok({
     command: {
@@ -50947,27 +52101,36 @@ var navigationSiteCommandTypes = [
 ];
 function compileNavigationPushCommands(input) {
   const commandBindings = [];
-  const menusByName = new Map(
-    (input.local.navigation?.menus ?? []).map((menu) => [asCliNavigationMenuName(menu.name), menu])
+  const menusByIdentity = navigationIdentityMap(
+    input.local.navigation?.menus ?? []
   );
+  if (!menusByIdentity.ok) {
+    return err({
+      code: menusByIdentity.error.code,
+      identity: menusByIdentity.error.identity,
+      message: duplicateNavigationIdentityMessage(menusByIdentity.error)
+    });
+  }
   for (const navigationDiff of input.diff) {
     if (navigationDiff.type === "unchanged") continue;
-    const menuName = asCliNavigationMenuName(navigationDiff.name);
-    const menu = menusByName.get(menuName);
+    const menuIdentity = navigationIdentity(navigationDiff);
+    const menu = menusByIdentity.value.get(menuIdentity);
     if (!menu) {
+      const menuName = unsafeAsCliNavigationMenuName(navigationDiff.name);
       return err({
         code: "missing_local_navigation_menu",
         name: menuName,
         message: `Missing local navigation menu: ${navigationDiff.name}.`
       });
     }
-    const localMenuName = asCliNavigationMenuName(menu.name);
+    const localMenuName = unsafeAsCliNavigationMenuName(menu.name);
     const commandRef = createNavigationRef([localMenuName]);
     const role = navigationRole(menu);
     const command = {
       type: "upsertNavigationMenu",
       ref: commandRef,
       input: {
+        ...menu.identifier ? { identifier: menu.identifier } : {},
         name: localMenuName,
         ...role ? { role } : {},
         items: menu.items.map(navigationItemForCommand)
@@ -50998,6 +52161,7 @@ async function executeNavigationCommandPlan(input) {
         case "upsertNavigationMenu": {
           const role = navigationCommandRole(command);
           await input.client.navigation.upsert({
+            ...command.input.identifier ? { identifier: command.input.identifier } : {},
             name: navigationCommandMenuName(command),
             items: command.input.items.map(navigationItemInput),
             ...role === "primary" ? { isPrimary: true } : {},
@@ -51024,10 +52188,22 @@ function executeNavigationCommandPlanAsReport(input) {
 }
 function navigationCommandCompileErrorToReport(error) {
   return commandCompileFailureToReport({
-    identifier: error.code === "missing_local_navigation_menu" ? error.name : "command-validation",
+    identifier: navigationCompileErrorIdentifier(error),
     message: error.message
   });
 }
+function navigationCompileErrorIdentifier(error) {
+  switch (error.code) {
+    case "missing_local_navigation_menu":
+      return error.name;
+    case "duplicate_navigation_identity":
+      return error.identity;
+    case "command_validation_failed":
+      return "command-validation";
+    default:
+      return assertNever(error);
+  }
+}
 function navigationCommandExecutionToReport(input) {
   return commandExecutionToReport({
     execution: input.execution,
@@ -51109,6 +52285,9 @@ function recordNavigationFailure(result, identifier, message) {
 
 // src/cli/site-commands/pageCommands.ts
 init_src();
+function assertNeverField(field) {
+  throw new Error(`Unhandled field type while extracting field ids: ${JSON.stringify(field)}`);
+}
 function extractFieldIds(fields3) {
   const ids = /* @__PURE__ */ new Set();
   function processField(field) {
@@ -51116,24 +52295,19 @@ function extractFieldIds(fields3) {
     switch (field.type) {
       case "group":
       case "modal":
-        if (field.schema?.fields) {
-          for (const nestedField of field.schema.fields) {
-            processField(nestedField);
-          }
+        for (const nestedField of field.schema?.fields ?? []) {
+          processField(nestedField);
         }
         break;
       case "repeater":
-        if (field.schema?.fields) {
-          for (const nestedField of field.schema.fields) {
-            processField(nestedField);
-          }
+        for (const nestedField of field.schema?.fields ?? []) {
+          processField(nestedField);
         }
         if ("itemTypes" in field && field.itemTypes) {
           for (const itemType of Object.values(field.itemTypes)) {
-            if (itemType.fields) {
-              for (const nestedField of itemType.fields) {
-                processField(nestedField);
-              }
+            if (!itemType.fields) continue;
+            for (const nestedField of itemType.fields) {
+              processField(nestedField);
             }
           }
         }
@@ -51141,14 +52315,33 @@ function extractFieldIds(fields3) {
       case "tabGroup":
         if ("tabs" in field && field.tabs) {
           for (const tab of field.tabs) {
-            if (tab.fields) {
-              for (const nestedField of tab.fields) {
-                processField(nestedField);
-              }
+            if (!tab.fields) continue;
+            for (const nestedField of tab.fields) {
+              processField(nestedField);
             }
           }
         }
         break;
+      case "text":
+      case "richText":
+      case "media":
+      case "file":
+      case "boolean":
+      case "number":
+      case "date":
+      case "time":
+      case "datetime":
+      case "slug":
+      case "url":
+      case "link":
+      case "select":
+      case "reference":
+      case "presetOrCustom":
+      case "contentTypeSelect":
+      case "entryPicker":
+        break;
+      default:
+        assertNeverField(field);
     }
   }
   for (const field of fields3) {
@@ -51253,10 +52446,10 @@ function compilePagePushCommands(input) {
   const commandBindings = [];
   const warnings = [];
   const pagesByIdentifier = new Map(
-    input.local.pages.map((page) => [asCliPageIdentifier(page.identifier), page])
+    input.local.pages.map((page) => [unsafeAsCliPageIdentifier(page.identifier), page])
   );
   for (const pageDiff of input.diff.pages) {
-    const pageIdentifier = asCliPageIdentifier(pageDiff.identifier);
+    const pageIdentifier = unsafeAsCliPageIdentifier(pageDiff.identifier);
     const commandResult = pageCommandsForDiff({
       pageDiff,
       pageIdentifier,
@@ -51366,6 +52559,76 @@ function pageCommandExecutionToReport(input) {
     includeFailureSubject: true
   });
 }
+function preflightPageCommandPlanAsReport(input) {
+  const outcomes = [];
+  const warnings = [];
+  const subjectByCommandRef = new Map(
+    input.compiledPlan.reportedCommands.map((reportedCommand) => [
+      reportedCommand.plannedCommand.command.ref,
+      reportedCommand.reportSubject
+    ])
+  );
+  for (const plannedCommand of input.compiledPlan.plan.commands) {
+    const command = plannedCommand.command;
+    if (command.type !== "upsertPageBlock") continue;
+    const validation = validateLocalBlock({
+      pageIdentifier: unsafeAsCliPageIdentifier(pageIdentifierForBlockCommand(command)),
+      blockIdentifier: unsafeAsCliBlockIdentifier(blockIdentifierForCommand(command)),
+      kind: command.input.type,
+      data: command.input.props ?? {},
+      blockFieldExtensions: input.blockFieldExtensions,
+      invalidContentAsError: true
+    });
+    if (validation.ok) {
+      warnings.push(...validation.value);
+      continue;
+    }
+    const failure = preflightFailureFromPageCompileError({
+      error: validation.error,
+      subject: subjectByCommandRef.get(command.ref)
+    });
+    outcomes.push(failure.outcome);
+    warnings.push(...failure.warnings);
+  }
+  return reportFromOutcomes({ outcomes, warnings });
+}
+function preflightFailureFromPageCompileError(input) {
+  switch (input.error.code) {
+    case "missing_local_page":
+      return {
+        outcome: {
+          status: "preflight_failed",
+          identifier: input.error.identifier,
+          message: input.error.message,
+          subject: input.subject
+        },
+        warnings: []
+      };
+    case "missing_local_block":
+    case "invalid_page_block":
+      return {
+        outcome: {
+          status: "preflight_failed",
+          identifier: input.error.identifier,
+          message: input.error.message,
+          subject: input.subject
+        },
+        warnings: input.error.code === "invalid_page_block" ? input.error.warnings : []
+      };
+    case "command_validation_failed":
+      return {
+        outcome: {
+          status: "preflight_failed",
+          identifier: "command-validation",
+          message: input.error.message,
+          subject: input.subject
+        },
+        warnings: []
+      };
+    default:
+      assertNever(input.error);
+  }
+}
 function pageCommandReportToSyncResult(report) {
   return commandReportToSyncResult({
     report,
@@ -51395,7 +52658,7 @@ function pageCommandsForDiff(input) {
   const commandBindings = [];
   const warnings = [];
   const upsertedInBatch = input.pageDiff.type !== "unchanged";
-  const localPageIdentifier = asCliPageIdentifier(input.localPage.identifier);
+  const localPageIdentifier = unsafeAsCliPageIdentifier(input.localPage.identifier);
   if (input.pageDiff.type !== "unchanged") {
     const command = {
       type: "upsertPage",
@@ -51474,14 +52737,14 @@ function blockCommandsForDiff(input) {
   if (changedBlockDiffs.length === 0) return ok(emptyPageCommandCompileFragment());
   const localBlocks = input.localPage.blocks ?? [];
   const blockLookup = new Map(
-    localBlocks.map((block) => [asCliBlockIdentifier(block.identifier), block])
+    localBlocks.map((block) => [unsafeAsCliBlockIdentifier(block.identifier), block])
   );
   const commandBindings = [];
   const warnings = [];
   const pageDependency = input.includePageRefDependency ? { pageRef: input.pageRef } : {};
   for (const blockDiff of changedBlockDiffs) {
     if (blockDiff.type === "reorder") continue;
-    const blockIdentifier = asCliBlockIdentifier(blockDiff.identifier);
+    const blockIdentifier = unsafeAsCliBlockIdentifier(blockDiff.identifier);
     const blockRef = createBlockRef([input.pageIdentifier, blockIdentifier]);
     if (blockDiff.type === "delete") {
       const command2 = {
@@ -51512,7 +52775,7 @@ function blockCommandsForDiff(input) {
         message: `Missing local block: ${input.localPage.identifier}/${blockDiff.identifier}.`
       });
     }
-    const localBlockIdentifier = asCliBlockIdentifier(localBlock.identifier);
+    const localBlockIdentifier = unsafeAsCliBlockIdentifier(localBlock.identifier);
     const validation = validateLocalBlock({
       pageIdentifier: input.pageIdentifier,
       blockIdentifier: localBlockIdentifier,
@@ -51520,8 +52783,9 @@ function blockCommandsForDiff(input) {
       data: localBlock.data,
       blockFieldExtensions: input.blockFieldExtensions
     });
-    if (!validation.ok) return validation;
-    warnings.push(...validation.value);
+    if (validation.ok) {
+      warnings.push(...validation.value);
+    }
     const command = {
       type: "upsertPageBlock",
       ref: blockRef,
@@ -51550,8 +52814,8 @@ function blockCommandsForDiff(input) {
         pageIdentifier: input.pageIdentifier,
         ...pageDependency,
         blocks: localBlocks.map((block) => ({
-          blockRef: createBlockRef([input.pageIdentifier, asCliBlockIdentifier(block.identifier)]),
-          identifier: asCliBlockIdentifier(block.identifier)
+          blockRef: createBlockRef([input.pageIdentifier, unsafeAsCliBlockIdentifier(block.identifier)]),
+          identifier: unsafeAsCliBlockIdentifier(block.identifier)
         }))
       }
     };
@@ -51568,21 +52832,39 @@ function blockCommandsForDiff(input) {
 }
 function validateLocalBlock(input) {
   const blockDefinition = getBlockDefinition(input.kind);
-  if (!blockDefinition) return ok([]);
   const customFields = customBlockFields(input.blockFieldExtensions, input.kind);
-  const validation = validateBlockData(input.data, blockDefinition.manifest, customFields);
+  if (!blockDefinition && !customFields) {
+    if (input.kind.startsWith("custom.")) {
+      return err({
+        code: "invalid_page_block",
+        identifier: pageBlockIdentifier(input.pageIdentifier, input.blockIdentifier),
+        warnings: [],
+        message: `Unknown custom block kind: ${input.kind}`
+      });
+    }
+    return ok([]);
+  }
+  const validation = validateBlockData(
+    input.data,
+    blockDefinition?.manifest ?? { fields: customFields ?? [] },
+    blockDefinition ? customFields : void 0
+  );
   const warnings = formatValidationResult(
     input.pageIdentifier,
     input.blockIdentifier,
     input.kind,
     validation
   );
-  if (validation.valid) return ok(warnings);
+  const blockingIssues = [
+    ...validation.errors,
+    ...input.invalidContentAsError ? validation.warnings.filter((warning) => warning.type === "invalid_content") : []
+  ];
+  if (blockingIssues.length === 0) return ok(warnings);
   return err({
     code: "invalid_page_block",
     identifier: pageBlockIdentifier(input.pageIdentifier, input.blockIdentifier),
     warnings,
-    message: validation.errors.map((error) => error.message).join("; ")
+    message: blockingIssues.map((error) => error.message).join("; ")
   });
 }
 function emptyPageCommandCompileFragment() {
@@ -51683,10 +52965,10 @@ function pageBlockIdentifier(pageIdentifier, blockIdentifier) {
   return `${pageIdentifier}/${blockIdentifier}`;
 }
 function pageIdentifierFromPageBlockIdentifier(identifier) {
-  return asCliPageIdentifier(identifier.split("/")[0] ?? identifier);
+  return unsafeAsCliPageIdentifier(identifier.split("/")[0] ?? identifier);
 }
 function blockIdentifierFromPageBlockIdentifier(identifier) {
-  return asCliBlockIdentifier(identifier.split("/")[1] ?? identifier);
+  return unsafeAsCliBlockIdentifier(identifier.split("/")[1] ?? identifier);
 }
 
 // src/cli/site-commands/pushExecution.ts
@@ -51721,6 +53003,23 @@ function compileContentPushExecutionPlan(plan, input, dependencies = {}) {
     steps
   });
 }
+function preflightContentPushExecutionPlan(steps, input, dependencies = {}) {
+  const commandReports = steps.flatMap((step) => {
+    if (step.kind !== "command-surface") return [];
+    const report = (dependencies.preflightCommandSurfaceAsReport ?? preflightCommandSurfaceAsReport)(
+      step.surface,
+      input
+    );
+    return commandSurfaceReportHasFailures(report) ? [report] : [];
+  });
+  return {
+    commandReports,
+    residualSyncResults: []
+  };
+}
+function contentPushExecutionReportHasFailures(report) {
+  return report.commandReports.some(commandSurfaceReportHasFailures) || report.residualSyncResults.some((result) => result.errors.length > 0);
+}
 async function executeCommandSurfaceAsReport(surface, input) {
   switch (surface.surface) {
     case "entry":
@@ -51763,6 +53062,26 @@ async function executeCommandSurfaceAsReport(surface, input) {
       assertNever(surface);
   }
 }
+function preflightCommandSurfaceAsReport(surface, input) {
+  switch (surface.surface) {
+    case "entry":
+      return { surface: "entry", report: reportFromOutcomes({ outcomes: [] }) };
+    case "page":
+      return {
+        surface: "page",
+        report: preflightPageCommandPlanAsReport({
+          compiledPlan: surface.compileValue,
+          blockFieldExtensions: input.blockFieldExtensions
+        })
+      };
+    case "form":
+      return { surface: "form", report: reportFromOutcomes({ outcomes: [] }) };
+    case "navigation":
+      return { surface: "navigation", report: reportFromOutcomes({ outcomes: [] }) };
+    default:
+      assertNever(surface);
+  }
+}
 function skippedRemainingCommandReports(steps) {
   return steps.flatMap((step) => step.kind === "command-surface" ? [skippedCommandSurfaceReport(step.surface)] : []);
 }
@@ -51780,6 +53099,9 @@ function commandSurfaceReportToSyncResult(report) {
       assertNever(report);
   }
 }
+function commandSurfaceReportHasFailures(report) {
+  return commandReportHasFailures(report.report);
+}
 function compileCommandSurface(surface, input) {
   switch (surface) {
     case "entry":
@@ -52047,6 +53369,8 @@ function planContentPushExecution(input) {
       return syncPlanWithSteps([commandSurfaceStep("navigation", "continue")]);
     case "pages":
       return pageCommandRouting(input.diff).kind === "command_backed" ? syncPlanWithSteps([commandSurfaceStep("page", "continue")]) : syncPlanWithResidualOnly(input);
+    case "settings":
+      return syncPlanWithResidualOnly(input);
     case "all":
       return pushAllExecutionPlan(input);
     default:
@@ -52127,14 +53451,29 @@ async function executeContentPushPlan(input) {
   return contentPushExecutionReportToSyncResult(report);
 }
 async function executeContentPushPlanAsCommandReport(input, dependencies = {}) {
+  const preflight = preflightContentPushPlanAsCommandReport(input, dependencies);
+  if (!preflight.ok) return preflight.report;
+  return executePushExecutionSteps(preflight.compiled.steps, input, dependencies);
+}
+function preflightContentPushPlanAsCommandReport(input, dependencies = {}) {
   const executionPlan = planContentPushExecution({
     pushScope: input.pushScope,
     diff: input.diff,
     local: input.local
   });
   const compiled = compileContentPushExecutionPlan(executionPlan, input, dependencies);
-  if (!compiled.ok) return compiled.error;
-  return executePushExecutionSteps(compiled.value.steps, input, dependencies);
+  if (!compiled.ok) {
+    return { ok: false, report: compiled.error };
+  }
+  const preflightReport = preflightContentPushExecutionPlan(
+    compiled.value.steps,
+    input,
+    dependencies
+  );
+  if (contentPushExecutionReportHasFailures(preflightReport)) {
+    return { ok: false, report: preflightReport };
+  }
+  return { ok: true, compiled: compiled.value, report: preflightReport };
 }
 async function executePushExecutionSteps(steps, input, dependencies) {
   const commandReports = [];
@@ -53111,6 +54450,8 @@ function scalarEntryChanges(changes) {
 function setEntryPath(entry, pathParts, value) {
   const [head, ...rest] = pathParts;
   switch (head) {
+    case void 0:
+      throw new Error("Cannot set an empty entry merge path.");
     case "identifier":
       entry.identifier = expectStringValue(head, value);
       return;
@@ -53747,6 +55088,21 @@ async function executeScopedPush(output, isRemote, options, globalOpts, scopeLab
   }
   return { success: true };
 }
+function noContentFoundWarningDetails(contentDir) {
+  return {
+    contentDir,
+    expectedFiles: [
+      "content/pages/*.json",
+      "content/entries/<type>/*.json",
+      "content/navigation.json",
+      "content/settings.json"
+    ],
+    suggestion: "Document content is read from content/**. Add file-based pages, entries, navigation, or settings, then run `riverbankcms push` again. Use `riverbankcms push-config` for schema/config only."
+  };
+}
+function contentSummaryHasPushableContent(summary) {
+  return summary.totalEntries > 0 || summary.pageCount > 0 || summary.hasNavigation || summary.hasSettings || summary.hasForms || summary.hasVenues || summary.hasEventCategories || summary.hasEvents || summary.hasCourses;
+}
 function validateMergeRemoteEntryPushOptions(input) {
   if (input.target !== "remote") {
     return {
@@ -54028,8 +55384,8 @@ ${errors}`
       });
     }
     const summary = await getContentSummary(contentDir);
-    if (summary.totalEntries === 0 && summary.pageCount === 0 && !summary.hasNavigation && !summary.hasForms && !summary.hasVenues && !summary.hasEventCategories && !summary.hasEvents && !summary.hasCourses) {
-      output.warn("No content found to push");
+    if (!contentSummaryHasPushableContent(summary)) {
+      output.warn("No content found to push", noContentFoundWarningDetails(contentDir));
       return { success: true };
     }
     const env = loadEnvironment(isRemote);
@@ -54137,10 +55493,11 @@ ${errors}`
     }
     if (!options.force) {
       output.info("Checking for stale content...");
-      const [localMeta, pagesMeta, navigationMeta, formsMeta] = await Promise.all([
+      const [localMeta, pagesMeta, navigationMeta, settingsMeta, formsMeta] = await Promise.all([
         readAllMeta(contentDir),
         readPagesMeta(contentDir),
         readNavigationMeta(contentDir),
+        readSettingsMeta(contentDir),
         readFormsMeta(contentDir)
       ]);
       const staleItems = checkForStaleContent(
@@ -54149,7 +55506,8 @@ ${errors}`
         pagesMeta,
         navigationMeta,
         formsMeta,
-        remoteContent
+        remoteContent,
+        settingsMeta
       );
       if (staleItems.length > 0) {
         output.warn(
@@ -54275,6 +55633,22 @@ ${errors}`
       humanDiff
     });
     if (dryRun) {
+      const preflight = preflightContentPushPlanAsCommandReport({
+        pushScope,
+        siteId: env.siteId,
+        target,
+        diff,
+        local: filteredLocal,
+        client,
+        blockFieldExtensions: cliConfig.blockFieldExtensions,
+        output
+      });
+      const preflightResult = contentPushExecutionReportToSyncResult(preflight.report);
+      if (preflightResult.errors.length > 0) {
+        reportSyncResults({ output, result: preflightResult, hasErrors: true });
+        process.exitCode = 1;
+        return { success: false };
+      }
       if (pushScope === "all") {
         if (pushAllExtraChanges?.venues.toPush.size) {
           output.info(
@@ -54415,6 +55789,7 @@ ${errors}`
               createdAt: n.createdAt
             })
           ),
+          settingsUpdatedAt: metadataFlags.willUpdateSettings ? freshRemote.meta.settingsUpdatedAt ?? null : void 0,
           forms: mapIfUpdating(metadataFlags.willUpdateForms, freshRemote.forms, (f) => ({
             slug: f.slug,
             updatedAt: f.updatedAt,
@@ -54604,8 +55979,8 @@ Pushing ${label.toLowerCase()}...`);
 // src/cli/commands/push.ts
 var pushCommand = new Command("push").description("Push content to CMS").argument(
   "[scope]",
-  "What to push: entries, pages, navigation, forms, footer, theme, venues, event-categories, events, courses, or all (default)"
-).argument("[type]", "Content type (entries), page identifier (pages), or theme name (theme)").argument("[identifier]", 'Entry identifier (when scope is "entries" and type is set)').option("--content-dir <dir>", "Content directory (overrides config)").option("--dry-run", "Show what would be pushed without making changes").option("--yes", "Skip confirmation prompt (required for --env=remote or --env=both)").option("--force", "Push even if remote content is newer (skip stale check)").option("--force-update-asset", "Replace CMS media when identifiers conflict (local media sync only)").option("--allow-truncated", "Push even if remote content was truncated (may cause incomplete sync)").option("--json-diff [mode]", "Output JSON diff (summary or full)", "summary").option("--with-config", "Also push SDK config after content").option("--with-theme", "Also push theme when pushing all content").option("--sync-media", "Sync media files from local to remote environment").option("--overwrite-media", "When using --sync-media, overwrite target media on checksum mismatch").option(
+  "What to push: entries, pages, navigation, forms, settings, footer, theme, venues, event-categories, events, courses, or all (default)"
+).argument("[type]", "Content type (entries), page identifier (pages), or theme name (theme)").argument("[identifier]", 'Entry identifier (when scope is "entries" and type is set)').option("--content-dir <dir>", "Content directory (overrides config)").option("--dry-run", "Show what would be pushed without making changes").option("--yes", "Skip confirmation prompt (required for --env=remote or --env=both)").option("--force", "Push even if remote content is newer (skip stale check)").option("--force-update-asset", "Replace CMS media when identifiers conflict (local media sync only)").option("--allow-truncated", "Push even if remote content was truncated (may cause incomplete sync)").option("--json-diff [mode]", "Output JSON diff (summary or full)", "summary").option("--with-config", "Also push SDK schema/config after file content").option("--with-theme", "Also push theme when pushing all content").option("--sync-media", "Sync media files from local to remote environment").option("--overwrite-media", "When using --sync-media, overwrite target media on checksum mismatch").option(
   "--delete-missing",
   "[Deprecated: use --delete-orphaned] Delete CMS entries not in local file (single content type only)"
 ).option("--delete-orphaned", "Delete remote items not present in local files (entries, events, courses, venues, event-categories)").option("--auto-pull-stale", "Automatically pull stale content and retry push").option("--merge-remote", "Plan an entries-only three-way merge that preserves remote edits").option("--no-meta", "Skip writing .meta/ and media manifest files (content files still written)").option("--diff", "Show human-readable field-level diff with before/after values (requires --dry-run)").addHelpText(
@@ -54616,7 +55991,7 @@ Examples:
   $ riverbankcms push --env=remote --yes      # Push to production
   $ riverbankcms push --env=both --yes        # Push to both environments
   $ riverbankcms push --dry-run               # Preview changes
-  $ riverbankcms push --with-config           # Push content and config together
+  $ riverbankcms push --with-config           # Push file content and schema/config together
   $ riverbankcms push --with-theme            # Push content and theme together
   $ riverbankcms push entries                 # Push all entries
   $ riverbankcms push entries blog-post       # Push specific content type
@@ -54624,6 +55999,8 @@ Examples:
   $ riverbankcms push pages                   # Push pages with blocks
   $ riverbankcms push pages home              # Push specific page with blocks
   $ riverbankcms push navigation              # Push navigation menus
+  $ riverbankcms push settings                # Push site settings
+  $ riverbankcms push settings --sync-media   # Push site settings and sync referenced branding media
   $ riverbankcms push forms                   # Push forms
   $ riverbankcms push venues                  # Push venues
   $ riverbankcms push event-categories        # Push event categories
@@ -54648,11 +56025,16 @@ Sync Behavior:
   - Status (draft/published) is synced based on local file status
 
 Safety:
+  - Preflight validation: deterministic content issues are checked before mutations
+    and reported together when possible.
   - Stale detection: aborts if remote content is newer than last pull (use --force to override)
   - Truncation: aborts if remote has >100 entries per type (use --allow-truncated to override)
   - Remote environment (--env=remote): defaults to dry-run, requires --yes to execute
   - Remote-aware merge: entries-only v1 for --env=remote; run a dry-run first, then add --yes
   - Theme: not pushed by default (use "push theme" or --with-theme)
+  - Boundaries: media uploads/storage writes and multi-endpoint CMS mutations are
+    not globally transactional; preflight prevents deterministic validation failures
+    before apply, but runtime/network/storage failures can still stop a push mid-run.
 
 Media Sync:
   Local media sync is enabled by default for push.
@@ -55105,6 +56487,7 @@ async function applyOneOffPageCommandReturningBlock(command, client) {
 async function applyOneOffNavigationCommand(command, client) {
   const role = navigationCommandRole2(command);
   return client.navigation.upsert({
+    ...command.input.identifier ? { identifier: command.input.identifier } : {},
     name: navigationCommandMenuName2(command),
     items: command.input.items.map(navigationItemInput2),
     ...role === "primary" ? { isPrimary: true } : {},
@@ -55112,8 +56495,8 @@ async function applyOneOffNavigationCommand(command, client) {
   });
 }
 function oneOffEntryCommandBinding(mutation) {
-  const contentType = asCliContentTypeKey(mutation.contentType);
-  const identifier = asCliEntryIdentifier(mutation.identifier);
+  const contentType = unsafeAsCliContentTypeKey(mutation.contentType);
+  const identifier = unsafeAsCliEntryIdentifier(mutation.identifier);
   switch (mutation.kind) {
     case "upsert": {
       const title = titleFromEntryData(mutation.data);
@@ -55160,7 +56543,7 @@ function oneOffEntryCommandBinding(mutation) {
   }
 }
 function oneOffPageCommandBinding(mutation) {
-  const identifier = asCliPageIdentifier(mutation.identifier);
+  const identifier = unsafeAsCliPageIdentifier(mutation.identifier);
   switch (mutation.kind) {
     case "upsert": {
       const command = {
@@ -55207,10 +56590,10 @@ function oneOffPageCommandBinding(mutation) {
   }
 }
 function oneOffBlockCommandBinding(mutation) {
-  const pageIdentifier = asCliPageIdentifier(mutation.pageIdentifier);
+  const pageIdentifier = unsafeAsCliPageIdentifier(mutation.pageIdentifier);
   switch (mutation.kind) {
     case "upsert": {
-      const identifier = asCliBlockIdentifier(mutation.blockIdentifier);
+      const identifier = unsafeAsCliBlockIdentifier(mutation.blockIdentifier);
       const command = {
         type: "upsertPageBlock",
         ref: createBlockRef([pageIdentifier, identifier]),
@@ -55232,7 +56615,7 @@ function oneOffBlockCommandBinding(mutation) {
       };
     }
     case "reorder": {
-      const identifiers = mutation.blockIdentifiers.map(asCliBlockIdentifier);
+      const identifiers = mutation.blockIdentifiers.map(unsafeAsCliBlockIdentifier);
       const command = {
         type: "reorderPageBlocks",
         ref: createBlocksRef([pageIdentifier]),
@@ -55259,11 +56642,12 @@ function oneOffBlockCommandBinding(mutation) {
   }
 }
 function oneOffNavigationCommandBinding(mutation) {
-  const name = asCliNavigationMenuName(mutation.menuName);
+  const name = unsafeAsCliNavigationMenuName(mutation.menuName);
   const command = {
     type: "upsertNavigationMenu",
     ref: createNavigationRef([name]),
     input: {
+      ...mutation.identifier ? { identifier: mutation.identifier } : {},
       name,
       items: mutation.items.map(navigationItemForCommand2)
     }
@@ -56023,7 +57407,7 @@ function countItems(items) {
   }
   return count;
 }
-var upsertCommand4 = new Command("upsert").description("Create or update a navigation menu").argument("<menu-name>", "Navigation menu name").option("--file <path>", "Path to JSON file with menu items").option("--data <json>", "Menu items as JSON string").action(
+var upsertCommand4 = new Command("upsert").description("Create or update a navigation menu").argument("<menu-name>", "Navigation menu name").option("--identifier <identifier>", "Stable SDK identifier for this menu").option("--file <path>", "Path to JSON file with menu items").option("--data <json>", "Menu items as JSON string").action(
   withCommandContext(async (ctx, menuName, options) => {
     const { output, client, siteId, targetEnv } = ctx;
     const items = await parseJsonArray(options);
@@ -56032,7 +57416,12 @@ var upsertCommand4 = new Command("upsert").description("Create or update a navig
       source: "one_off_navigation",
       siteId,
       targetEnv,
-      mutation: { kind: "upsert", menuName, items }
+      mutation: {
+        kind: "upsert",
+        ...options.identifier ? { identifier: options.identifier } : {},
+        menuName,
+        items
+      }
     });
     if (!compiled.ok) {
       return output.error(compiled.error.message);
@@ -56070,10 +57459,58 @@ var listCommand4 = createListCommand({
   tableHeaders: ["Name", "Items", "Updated"],
   formatRow: formatMenuRow
 });
+function resolveNavigationMenuForDelete(menus, selector) {
+  const idMatch = menus.find((menu) => menu.id === selector);
+  if (idMatch) return idMatch;
+  const nameMatches = menus.filter((menu) => menu.name === selector);
+  const onlyNameMatch = nameMatches[0];
+  if (nameMatches.length === 1 && onlyNameMatch) {
+    return onlyNameMatch;
+  }
+  if (nameMatches.length > 1) {
+    throw new Error(
+      `Multiple navigation menus are named "${selector}". Delete by ID instead: ${nameMatches.map((menu) => menu.id).join(", ")}`
+    );
+  }
+  throw new Error(`Navigation menu not found by ID or exact name: ${selector}`);
+}
+var deleteCommand = new Command("delete").description("Delete a navigation menu by ID or exact unique name").argument("<menu-id-or-name>", "Navigation menu ID, or exact name when unique").option("--yes", "Skip confirmation prompt (required for --env=remote)").action(
+  withCommandContext(async (ctx, selector, options) => {
+    const { client, isRemote, output, targetEnv } = ctx;
+    const menu = resolveNavigationMenuForDelete(await client.navigation.list(), selector);
+    const itemCount = countItems(menu.items);
+    const flags = [
+      menu.isPrimary ? "primary" : null,
+      menu.isFooter ? "footer" : null
+    ].filter((flag) => Boolean(flag));
+    const flagText = flags.length > 0 ? flags.join(", ") : "none";
+    const confirmed = await confirmAction(
+      `Delete navigation menu "${menu.name}" (${menu.id}) from ${targetEnv}? flags: ${flagText}; items: ${itemCount}`,
+      options,
+      isRemote
+    );
+    if (!confirmed) {
+      output.info("Operation cancelled");
+      return;
+    }
+    output.info(`Deleting navigation menu: ${menu.name}`);
+    await client.navigation.delete(menu.id);
+    output.success(`Navigation menu deleted: ${menu.name}`, {
+      id: menu.id,
+      name: menu.name,
+      identifier: menu.identifier,
+      isPrimary: menu.isPrimary,
+      isFooter: menu.isFooter,
+      itemCount,
+      environment: targetEnv
+    });
+  })
+);
 var navigationCommand = new Command("navigation").description("Manage navigation menus").addHelpText("after", `
 Examples:
   $ riverbankcms navigation upsert main --file ./main-nav.json
   $ riverbankcms navigation upsert footer --data '[{"label": "Home", "url": "/"}]'
+  $ riverbankcms navigation delete "Primary navigation" --yes
   $ riverbankcms navigation get main
   $ riverbankcms navigation list
 
@@ -56086,7 +57523,7 @@ JSON file format:
       ]}
     ]
   }
-`).addCommand(upsertCommand4).addCommand(getCommand4).addCommand(listCommand4);
+`).addCommand(upsertCommand4).addCommand(deleteCommand).addCommand(getCommand4).addCommand(listCommand4);
 var deleteEntryCommand = new Command("entry").description("Delete a content entry").argument("<type>", "Content type").argument("<identifier>", "Entry identifier").option("--yes", "Skip confirmation prompt (required for --env=remote)").action(
   withConfirmation(
     (type, identifier) => `Delete entry "${type}/${identifier}"?`,
@@ -56107,7 +57544,7 @@ var deleteBlockCommand = new Command("block").description("Delete a block from a
     }
   )
 );
-var deleteCommand = new Command("delete").description("Delete content from CMS").addHelpText("after", `
+var deleteCommand2 = new Command("delete").description("Delete content from CMS").addHelpText("after", `
 Examples:
   $ riverbankcms delete entry blog-post my-post
   $ riverbankcms delete entry blog-post my-post --yes
@@ -56137,7 +57574,7 @@ var THEME_FIELD_CATEGORY_MAP = {
 };
 
 // src/cli/init-docs/zod-to-markdown.ts
-function isRecord12(value) {
+function isRecord14(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isZodTypeAny(value) {
@@ -56224,6 +57661,8 @@ function unwrapSchema(schema) {
 function zodTypeToString(schema) {
   const typeName = getTypeName(schema);
   switch (typeName) {
+    case void 0:
+      return "unknown";
     case ZodTypeName.ZodString:
       return "string";
     case ZodTypeName.ZodNumber:
@@ -56263,7 +57702,7 @@ function extractLiteralValue(schema) {
   const typeName = getTypeName(schema);
   if (typeName !== ZodTypeName.ZodLiteral) return void 0;
   const def = schema._def;
-  if (!isRecord12(def)) return void 0;
+  if (!isRecord14(def)) return void 0;
   return String(def.value);
 }
 function extractSchemaInfo(schema, skipFields = []) {
@@ -56333,7 +57772,7 @@ function extractFieldInfo(name, schema) {
   }
   if (typeName === ZodTypeName.ZodRecord) {
     const def = inner._def;
-    const valueSchema = isRecord12(def) ? def.valueType : void 0;
+    const valueSchema = isRecord14(def) ? def.valueType : void 0;
     if (!isZodTypeAny(valueSchema)) {
       info.recordValueType = "unknown";
       return info;
@@ -56348,7 +57787,7 @@ function extractFieldInfo(name, schema) {
       }
     } else if (getTypeName(valueInner) === ZodTypeName.ZodRecord) {
       const nestedDef = valueInner._def;
-      const nestedValueSchema = isRecord12(nestedDef) ? nestedDef.valueType : void 0;
+      const nestedValueSchema = isRecord14(nestedDef) ? nestedDef.valueType : void 0;
       if (!isZodTypeAny(nestedValueSchema)) {
         info.recordValueType = "record<string, unknown>";
         return info;
@@ -56359,7 +57798,7 @@ function extractFieldInfo(name, schema) {
   }
   if (typeName === ZodTypeName.ZodUnion || typeName === ZodTypeName.ZodDiscriminatedUnion) {
     const def = inner._def;
-    const optionsValue = isRecord12(def) ? def.options : void 0;
+    const optionsValue = isRecord14(def) ? def.options : void 0;
     const options = Array.isArray(optionsValue) ? optionsValue.filter(isZodTypeAny) : [];
     const optionTypes = options.map((opt) => {
       const { inner: optInner } = unwrapSchema(opt);
@@ -56748,7 +58187,7 @@ function renderConfigGuideSection() {
     "    navigation: {",
     "      siteNav: {",
     "        // mode: 'augment' | 'restrict'",
-    "        // allowIds: ['site.style']",
+    "        // allowIds: ['site.performance']",
     "        // denyIds: ['site.performance', 'site.newsletter']",
     "        roles: {",
     "          editor: { mode: 'restrict', allowIds: ['site.overview', 'site.content', 'site.media', 'site.bookings'] },",
@@ -56769,7 +58208,7 @@ function renderConfigGuideSection() {
     "Navigation IDs:",
     "",
     "- Top nav (`dashboard.navigation.siteNav`):",
-    "  - `site.overview`, `site.content`, `site.media`, `site.bookings`, `site.newsletter`, `site.style`, `site.performance`, `site.settings`",
+    "  - `site.overview`, `site.content`, `site.media`, `site.bookings`, `site.newsletter`, `site.performance`, `site.settings`",
     "- Settings sidebar (`dashboard.navigation.settingsNav`):",
     "  - `settings.general`, `settings.domains`, `settings.fonts`, `settings.navigation`, `settings.redirects`, `settings.emails`",
     "  - `settings.ai.siteProfile`, `settings.ai.brandGuidelines`",
@@ -57071,14 +58510,14 @@ function renderFieldList(fields3, depth, skipPatternCheck = false) {
         );
       }
     }
-    if ("fields" in field && Array.isArray(field.fields)) {
+    if ("fields" in field && isFieldDefinitionArray(field.fields)) {
       lines.push(...renderFieldList(field.fields, depth + 1));
     }
     if ("schema" in field) {
       const schema = field.schema;
       if (schema && typeof schema === "object" && "fields" in schema) {
         const fields4 = schema.fields;
-        if (Array.isArray(fields4)) {
+        if (isFieldDefinitionArray(fields4)) {
           lines.push(...renderFieldList(fields4, depth + 1));
         }
       }
@@ -57101,6 +58540,9 @@ function renderFieldList(fields3, depth, skipPatternCheck = false) {
   }
   return lines;
 }
+function isFieldDefinitionArray(value) {
+  return Array.isArray(value);
+}
 function renderOptionsList(options, depth) {
   const indent = "  ".repeat(depth);
   return options.map((option) => {
@@ -57191,7 +58633,8 @@ async function initDocs(options) {
     { filename: "templates.md", template: "workflow-templates" },
     { filename: "cmsify-page.md", template: "workflow-cmsify-page" },
     { filename: "editor-workflows.md", template: "workflow-editor-workflows" },
-    { filename: "preview-mode.md", template: "workflow-preview-mode" }
+    { filename: "preview-mode.md", template: "workflow-preview-mode" },
+    { filename: "isr-revalidation.md", template: "workflow-isr-revalidation" }
   ];
   await Promise.all(
     coreWorkflows.map(
@@ -57516,7 +58959,7 @@ var SimpleCache = class {
 };
 
 // src/version.ts
-var SDK_VERSION = "0.78.0";
+var SDK_VERSION = "0.79.0";
 
 // src/client/error.ts
 var RiverbankApiError = class _RiverbankApiError extends Error {
@@ -57929,9 +59372,10 @@ var CircuitOpenError = class extends Error {
 var prebuildModule = null;
 function tryRequire(modulePath) {
   try {
-    const req = Function(
+    const getRequire = new Function(
       'return typeof require === "function" ? require : null'
-    )();
+    );
+    const req = getRequire();
     return req ? req(modulePath) : null;
   } catch {
     return null;
@@ -58444,8 +59888,7 @@ function createRiverbankClient(config2) {
       async (sig) => {
         return await apiClient({
           endpoint: "getContentByPath",
-          params: { siteId },
-          body: { path: path24, preview },
+          params: { siteId, path: path24, preview: String(preview) },
           options: { signal: sig }
         });
       },
@@ -58495,6 +59938,8 @@ function createRiverbankClient(config2) {
             orderParam = "published_at.asc";
           } else if (order === "title") {
             orderParam = "title.asc";
+          } else if (order === "manual") {
+            orderParam = "manual.asc";
           }
           const apiParams = {
             siteId,
@@ -61672,11 +63117,14 @@ function collectFieldIds(fields3) {
     for (const field of fieldList) {
       ids.add(field.id);
       if (field.schema && typeof field.schema === "object" && "fields" in field.schema) {
-        collect(field.schema.fields);
+        const nestedFields = field.schema.fields;
+        if (isFieldIdRecordArray(nestedFields)) {
+          collect(nestedFields);
+        }
       }
-      if (field.tabs && Array.isArray(field.tabs)) {
+      if (isRecordArray(field.tabs)) {
         for (const tab of field.tabs) {
-          if (tab.fields && Array.isArray(tab.fields)) {
+          if (isFieldIdRecordArray(tab.fields)) {
             collect(tab.fields);
           }
         }
@@ -61693,6 +63141,12 @@ function collectFieldIds(fields3) {
   collect(fields3);
   return ids;
 }
+function isRecordArray(value) {
+  return Array.isArray(value);
+}
+function isFieldIdRecordArray(value) {
+  return Array.isArray(value) && value.every((item) => typeof item === "object" && item !== null && typeof item.id === "string");
+}
 var CONTENT_NODE_TYPES = ["text", "richText", "media", "button", "link"];
 function collectFieldInfo(fields3) {
   const topLevelFieldIds = /* @__PURE__ */ new Set();
@@ -64097,7 +65551,7 @@ var listCommand6 = createListCommand({
   tableHeaders: ["Identifier", "Status", "Visibility", "Updated"],
   formatRow: formatEventRow
 });
-var deleteCommand2 = new Command("delete").description("Delete an event series").argument("<identifier>", "Event identifier").option("--yes", "Skip confirmation prompt (required for --env=remote)").action(
+var deleteCommand3 = new Command("delete").description("Delete an event series").argument("<identifier>", "Event identifier").option("--yes", "Skip confirmation prompt (required for --env=remote)").action(
   withConfirmation(
     (identifier) => `Delete event "${identifier}"?`,
     async (ctx, identifier) => {
@@ -64144,7 +65598,7 @@ Examples:
   $ riverbankcms event cancel summer-fest
   $ riverbankcms event delete summer-fest --yes
 `
-).addCommand(listCommand6).addCommand(getCommand5).addCommand(upsertCommand5).addCommand(cancelCommand).addCommand(deleteCommand2);
+).addCommand(listCommand6).addCommand(getCommand5).addCommand(upsertCommand5).addCommand(cancelCommand).addCommand(deleteCommand3);
 var courseUpsertInputSchema = z.object({
   identifier: z.string().min(1).optional(),
   title: z.string().min(1, "title is required"),
@@ -64266,7 +65720,7 @@ var listCommand7 = createListCommand({
   tableHeaders: ["Identifier", "Status", "Visibility", "Updated"],
   formatRow: formatCourseRow
 });
-var deleteCommand3 = new Command("delete").description("Delete a course run").argument("<identifier>", "Course identifier").option("--yes", "Skip confirmation prompt (required for --env=remote)").action(
+var deleteCommand4 = new Command("delete").description("Delete a course run").argument("<identifier>", "Course identifier").option("--yes", "Skip confirmation prompt (required for --env=remote)").action(
   withConfirmation(
     (identifier) => `Delete course "${identifier}"?`,
     async (ctx, identifier) => {
@@ -64317,7 +65771,7 @@ Examples:
   $ riverbankcms course cancel beginner-yoga
   $ riverbankcms course delete beginner-yoga --yes
 `
-).addCommand(listCommand7).addCommand(getCommand6).addCommand(upsertCommand6).addCommand(cancelCommand2).addCommand(deleteCommand3);
+).addCommand(listCommand7).addCommand(getCommand6).addCommand(upsertCommand6).addCommand(cancelCommand2).addCommand(deleteCommand4);
 function isPlainObject3(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
@@ -64714,7 +66168,7 @@ program.addCommand(entryCommand);
 program.addCommand(pageCommand);
 program.addCommand(blockCommand);
 program.addCommand(navigationCommand);
-program.addCommand(deleteCommand);
+program.addCommand(deleteCommand2);
 program.addCommand(initDocsCommand);
 program.addCommand(identifiersCommand);
 program.addCommand(deployCommand);