@riverbankcms/sdk 0.78.0 → 0.78.2

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"() {
@@ -449,15 +465,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 +867,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({
@@ -1301,6 +1317,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
@@ -1550,6 +1568,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
@@ -11279,47 +11300,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") {
@@ -14247,7 +14269,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\./, "");
@@ -14974,10 +14997,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 +15013,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 +15022,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 +15040,8 @@ var init_filtering = __esm({
       "custom"
     ];
     eventScheduleScopeValues = ["any", "recurring", "oneOff"];
-    asEventCategoryId = (value) => value;
-    asVenueId = (value) => value;
+    unsafeAsEventCategoryId = (value) => value;
+    unsafeAsVenueId = (value) => value;
   }
 });
 
@@ -18949,7 +18972,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",
@@ -23895,7 +23927,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 +23974,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;
@@ -24329,6 +24361,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");
@@ -25728,16 +25763,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,
@@ -36402,10 +36441,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 +36596,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 +36708,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 +36872,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 +36896,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 +37040,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;
         }
@@ -38029,6 +38088,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 +38100,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 +38626,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()
@@ -39627,6 +39690,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 +39871,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 +39902,7 @@ function loadEnvironment(remote) {
     }
   }
   return {
-    siteId,
+    siteId: siteId.value,
     dashboardUrl,
     managementApiKey,
     apiKey,
@@ -40136,7 +40204,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;
@@ -41007,6 +41076,15 @@ function entryFilePath(input) {
 }
 
 // src/cli/content/writer.ts
+function isRecord7(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function parseThemeMeta(value) {
+  if (!isRecord7(value) || typeof value.pulledAt !== "string" || !isRecord7(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 +41116,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) {
@@ -41137,11 +41225,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 +41300,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;
@@ -41433,6 +41529,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 +41693,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 +41705,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 +41919,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 +41943,7 @@ async function readAllMeta(contentDir) {
     const skipFiles = [
       "pages.json",
       "navigation.json",
+      "settings.json",
       "forms.json",
       "themes.json",
       "footer.json",
@@ -41838,6 +41964,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 +42466,9 @@ async function localMediaFileExists(filePath) {
 }
 
 // src/cli/media/identifiers.ts
-var isRecord7 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var isRecord8 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 var isMediaValue = (value) => {
-  if (!isRecord7(value)) return false;
+  if (!isRecord8(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 +42483,7 @@ var walkMediaValues = (value, location2, handler) => {
     });
     return;
   }
-  if (isRecord7(value)) {
+  if (isRecord8(value)) {
     Object.entries(value).forEach(([key, entry]) => {
       walkMediaValues(entry, location2 ? `${location2}.${key}` : key, handler);
     });
@@ -42449,7 +42591,7 @@ var normalizeMediaValueToIdentifierOnly = (value, identifier, asset) => {
 };
 
 // src/cli/media/rich-text.ts
-var isRecord8 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var isRecord9 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 function collectRichTextImageAttrs(value, out = [], location2 = "") {
   if (Array.isArray(value)) {
     value.forEach(
@@ -42457,8 +42599,8 @@ function collectRichTextImageAttrs(value, out = [], location2 = "") {
     );
     return out;
   }
-  if (!isRecord8(value)) return out;
-  if (value.type === "image" && isRecord8(value.attrs)) {
+  if (!isRecord9(value)) return out;
+  if (value.type === "image" && isRecord9(value.attrs)) {
     out.push({ attrs: value.attrs, location: location2 ? `${location2}.attrs` : "attrs" });
   }
   for (const [key, child] of Object.entries(value)) {
@@ -43462,7 +43604,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 +43644,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({
@@ -45032,7 +45178,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
     }
   };
 }
@@ -45117,7 +45264,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 +45941,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 +46048,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 +46139,7 @@ var VALID_PUSH_SCOPES = [
   "pages",
   "navigation",
   "forms",
+  "settings",
   "theme",
   "footer",
   "venues",
@@ -46134,6 +46293,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 +46382,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 +46413,11 @@ function normalizeLocalContentShape(content) {
 function nullishToNull(value) {
   return value == null ? null : value;
 }
-function isRecord9(value) {
+function isRecord10(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function normalizeVenueAddress(value) {
-  const obj = isRecord9(value) ? value : {};
+  const obj = isRecord10(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 +46434,7 @@ function normalizeVenueAddress(value) {
   };
 }
 function normalizeVenueLocation(value) {
-  if (!isRecord9(value)) return null;
+  if (!isRecord10(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 +46442,7 @@ function normalizeVenueLocation(value) {
   return { lat, lng };
 }
 function normalizeVenueForCompare(venue) {
-  const obj = isRecord9(venue) ? venue : {};
+  const obj = isRecord10(venue) ? venue : {};
   return {
     slug: String(obj.slug),
     title: String(obj.title),
@@ -46278,7 +46455,7 @@ function normalizeVenueForCompare(venue) {
   };
 }
 function normalizeEventCategoryForCompare(category) {
-  const obj = isRecord9(category) ? category : {};
+  const obj = isRecord10(category) ? category : {};
   return {
     identifier: String(obj.identifier),
     name: String(obj.name),
@@ -46288,9 +46465,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 = isRecord10(event) ? event : {};
+  const schedule = isRecord10(obj.schedule) ? obj.schedule : {};
+  const pricing = isRecord10(obj.pricing) ? obj.pricing : {};
   return {
     identifier: String(obj.identifier),
     title: String(obj.title),
@@ -46323,14 +46500,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: isRecord10(obj.content) ? obj.content : {},
+    settings: isRecord10(obj.settings) ? obj.settings : {},
+    presentation: isRecord10(obj.presentation) ? obj.presentation : null,
     tags: Array.isArray(obj.tags) ? obj.tags : []
   };
 }
 function normalizeLocalEventAgainstRemoteForCompare(localEvent, remoteEvent) {
-  const local = isRecord9(localEvent) ? localEvent : {};
+  const local = isRecord10(localEvent) ? localEvent : {};
   const base = remoteEvent ? normalizeRemoteEventForCompare(remoteEvent) : normalizeRemoteEventForCompare({
     identifier: local.identifier,
     title: local.title,
@@ -46348,8 +46525,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 = isRecord10(local.schedule) ? local.schedule : {};
+  const pricing = isRecord10(local.pricing) ? local.pricing : {};
   return {
     ...base,
     identifier: String(local.identifier ?? base.identifier),
@@ -46375,9 +46552,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 : isRecord10(local.content) ? local.content : {},
+    settings: local.settings === void 0 ? base.settings : isRecord10(local.settings) ? local.settings : {},
+    presentation: local.presentation === void 0 ? base.presentation : isRecord10(local.presentation) ? local.presentation : null,
     tags: local.tags === void 0 ? base.tags : Array.isArray(local.tags) ? local.tags : []
   };
 }
@@ -46389,7 +46566,7 @@ function toIsoStringOrOriginal(value) {
 function normalizeCourseSessions(value) {
   if (!Array.isArray(value)) return [];
   return value.map((session) => {
-    const obj = isRecord9(session) ? session : {};
+    const obj = isRecord10(session) ? session : {};
     return {
       startsAt: toIsoStringOrOriginal(obj.startsAt),
       endsAt: toIsoStringOrOriginal(obj.endsAt)
@@ -46401,18 +46578,18 @@ function normalizeCourseSessions(value) {
 }
 function normalizeCourseProgram(value) {
   if (value == null) return null;
-  if (!isRecord9(value)) {
+  if (!isRecord10(value)) {
     return { identifier: null, data: {} };
   }
   return {
     identifier: nullishToNull(
       typeof value.identifier === "string" ? value.identifier : void 0
     ),
-    data: isRecord9(value.data) ? value.data : {}
+    data: isRecord10(value.data) ? value.data : {}
   };
 }
 function normalizeRemoteCourseForCompare(course) {
-  const obj = isRecord9(course) ? course : {};
+  const obj = isRecord10(course) ? course : {};
   return {
     identifier: String(obj.identifier),
     title: String(obj.title),
@@ -46435,7 +46612,7 @@ function normalizeRemoteCourseForCompare(course) {
   };
 }
 function normalizeLocalCourseAgainstRemoteForCompare(localCourse, remoteCourse) {
-  const local = isRecord9(localCourse) ? localCourse : {};
+  const local = isRecord10(localCourse) ? localCourse : {};
   const base = remoteCourse ? normalizeRemoteCourseForCompare(remoteCourse) : normalizeRemoteCourseForCompare({
     identifier: local.identifier,
     title: local.title,
@@ -46456,11 +46633,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 : isRecord10(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: isRecord10(local.program.data) ? local.program.data : base.program?.data ?? {}
   } : base.program;
   return {
     ...base,
@@ -46630,7 +46807,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 +46866,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);
@@ -47408,6 +47596,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 +48814,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 isRecord11(value) {
   return typeof value === "object" && value !== null;
 }
 
@@ -48902,7 +49089,7 @@ function collectVenueRefsFromIntervals(intervals, path24) {
 }
 function collectNavigationRefs(items, path24) {
   return items.flatMap((item, index) => {
-    if (!isRecord10(item)) return [];
+    if (!isRecord11(item)) return [];
     const itemPath = `${path24}[${index}]`;
     const refs = [];
     if (typeof item.pageRef === "string") {
@@ -48919,7 +49106,7 @@ function collectNavigationRefs(items, path24) {
 }
 function collectBlockRefs(blocks, path24) {
   return blocks.flatMap((block, index) => {
-    if (!isRecord10(block)) return [];
+    if (!isRecord11(block)) return [];
     const blockPath = `${path24}[${index}]`;
     return [
       ...collectNestedRefs(block.props, `${blockPath}.props`),
@@ -48935,22 +49122,16 @@ function collectNestedRefs(value, path24) {
   if (Array.isArray(value)) {
     return value.flatMap((item, index) => collectNestedRefs(item, `${path24}[${index}]`));
   }
-  if (!isRecord10(value)) return [];
+  if (!isRecord11(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 +49378,9 @@ function deriveIdempotencyKey(input) {
   ].join("|"));
 }
 function findUnknownCommandTypes(input) {
-  if (!isRecord10(input) || !Array.isArray(input.commands)) return [];
+  if (!isRecord11(input) || !Array.isArray(input.commands)) return [];
   return input.commands.flatMap((command, commandIndex) => {
-    if (!isRecord10(command) || typeof command.type !== "string") return [];
+    if (!isRecord11(command) || typeof command.type !== "string") return [];
     if (commandTypeSet.has(command.type)) return [];
     return [{
       code: "unknown_command_type",
@@ -49225,9 +49406,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 (!isRecord11(input) || !isUnknownArray3(input.commands)) return null;
   const command = input.commands[commandIndex];
-  return isRecord10(command) && typeof command.type === "string" ? command.type : null;
+  return isRecord11(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 +49593,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 +50037,7 @@ function appliedSubjectFromOutcome(outcome) {
     case "failed":
     case "skipped_by_stop_policy":
     case "compile_failed":
+    case "preflight_failed":
       return [];
     default:
       assertNever(outcome);
@@ -49817,6 +50047,7 @@ function failureFromOutcome(outcome) {
   switch (outcome.status) {
     case "failed":
     case "compile_failed":
+    case "preflight_failed":
       return {
         identifier: outcome.identifier,
         message: outcome.message,
@@ -50199,8 +50430,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" || isRecord12(content.body) ? { body: content.body } : {},
+    ...typeof content.image === "string" || isRecord12(content.image) ? { image: content.image } : {}
   };
 }
 function courseUpsertInput(command) {
@@ -50372,7 +50603,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 isRecord12(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function unsupported(identifier, message) {
@@ -50393,12 +50624,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 +50642,7 @@ function commandReportToSyncResult(input) {
         break;
       case "failed":
       case "compile_failed":
+      case "preflight_failed":
         input.recordFailure(
           result,
           outcome.identifier,
@@ -50448,12 +50680,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 +50715,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 +50798,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 +50830,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 +50839,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 +50950,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 +51033,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: {
@@ -50948,11 +51182,11 @@ var navigationSiteCommandTypes = [
 function compileNavigationPushCommands(input) {
   const commandBindings = [];
   const menusByName = new Map(
-    (input.local.navigation?.menus ?? []).map((menu) => [asCliNavigationMenuName(menu.name), menu])
+    (input.local.navigation?.menus ?? []).map((menu) => [unsafeAsCliNavigationMenuName(menu.name), menu])
   );
   for (const navigationDiff of input.diff) {
     if (navigationDiff.type === "unchanged") continue;
-    const menuName = asCliNavigationMenuName(navigationDiff.name);
+    const menuName = unsafeAsCliNavigationMenuName(navigationDiff.name);
     const menu = menusByName.get(menuName);
     if (!menu) {
       return err({
@@ -50961,7 +51195,7 @@ function compileNavigationPushCommands(input) {
         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 = {
@@ -51109,6 +51343,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 +51353,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 +51373,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 +51504,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 +51617,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 +51716,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 +51795,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 +51833,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 +51841,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 +51872,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 +51890,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 +52023,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 +52061,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 +52120,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 +52157,9 @@ function commandSurfaceReportToSyncResult(report) {
       assertNever(report);
   }
 }
+function commandSurfaceReportHasFailures(report) {
+  return commandReportHasFailures(report.report);
+}
 function compileCommandSurface(surface, input) {
   switch (surface) {
     case "entry":
@@ -52047,6 +52427,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 +52509,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 +53508,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 +54146,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 +54442,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 +54551,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 +54564,8 @@ ${errors}`
         pagesMeta,
         navigationMeta,
         formsMeta,
-        remoteContent
+        remoteContent,
+        settingsMeta
       );
       if (staleItems.length > 0) {
         output.warn(
@@ -54275,6 +54691,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 +54847,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 +55037,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 +55049,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 +55057,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 +55083,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.
@@ -55112,8 +55552,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 +55600,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 +55647,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 +55672,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,7 +55699,7 @@ function oneOffBlockCommandBinding(mutation) {
   }
 }
 function oneOffNavigationCommandBinding(mutation) {
-  const name = asCliNavigationMenuName(mutation.menuName);
+  const name = unsafeAsCliNavigationMenuName(mutation.menuName);
   const command = {
     type: "upsertNavigationMenu",
     ref: createNavigationRef([name]),
@@ -56137,7 +56577,7 @@ var THEME_FIELD_CATEGORY_MAP = {
 };
 
 // src/cli/init-docs/zod-to-markdown.ts
-function isRecord12(value) {
+function isRecord13(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isZodTypeAny(value) {
@@ -56224,6 +56664,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 +56705,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 (!isRecord13(def)) return void 0;
   return String(def.value);
 }
 function extractSchemaInfo(schema, skipFields = []) {
@@ -56333,7 +56775,7 @@ function extractFieldInfo(name, schema) {
   }
   if (typeName === ZodTypeName.ZodRecord) {
     const def = inner._def;
-    const valueSchema = isRecord12(def) ? def.valueType : void 0;
+    const valueSchema = isRecord13(def) ? def.valueType : void 0;
     if (!isZodTypeAny(valueSchema)) {
       info.recordValueType = "unknown";
       return info;
@@ -56348,7 +56790,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 = isRecord13(nestedDef) ? nestedDef.valueType : void 0;
       if (!isZodTypeAny(nestedValueSchema)) {
         info.recordValueType = "record<string, unknown>";
         return info;
@@ -56359,7 +56801,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 = isRecord13(def) ? def.options : void 0;
     const options = Array.isArray(optionsValue) ? optionsValue.filter(isZodTypeAny) : [];
     const optionTypes = options.map((opt) => {
       const { inner: optInner } = unwrapSchema(opt);
@@ -57071,14 +57513,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 +57543,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) => {
@@ -57516,7 +57961,7 @@ var SimpleCache = class {
 };
 
 // src/version.ts
-var SDK_VERSION = "0.78.0";
+var SDK_VERSION = "0.78.2";
 
 // src/client/error.ts
 var RiverbankApiError = class _RiverbankApiError extends Error {
@@ -57929,9 +58374,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 +58890,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 +58940,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 +62119,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 +62143,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();