@riverbankcms/sdk 0.89.1 → 0.90.0

package/dist/cli/index.mjs

@@ -1545,12 +1545,17 @@ var init_schema2 = __esm({
       minItems: z.number().int().nonnegative().optional(),
       maxItems: z.number().int().nonnegative().optional()
     });
-    visibleWhenSchema = z.union([
-      visibleWhenPredicateSchema,
-      z.object({
-        allOf: z.array(visibleWhenPredicateSchema).min(1)
-      })
-    ]);
+    visibleWhenSchema = z.lazy(
+      () => z.union([
+        visibleWhenPredicateSchema,
+        z.object({
+          allOf: z.array(visibleWhenSchema).min(1)
+        }),
+        z.object({
+          anyOf: z.array(visibleWhenSchema).min(1)
+        })
+      ])
+    );
     uiSchema = z.object({
       widget: z.string().optional(),
       // Container/widget presets (used by Group/Repeater widgets themselves, not for widget selection)
@@ -13388,11 +13393,11 @@ function bind(from, options) {
     }
   });
 }
-function when(path27, options) {
+function when(path28, options) {
   return (node) => ({
     ...node,
     $when: {
-      when: { from: path27 },
+      when: { from: path28 },
       ...options?.equals !== void 0 ? { equals: options.equals } : {},
       ...options?.not ? { not: true } : {}
     }
@@ -13499,7 +13504,7 @@ var init_builder2 = __esm({
 });
 
 // ../blocks/src/system/node/fragments/backgroundLayer.ts
-function backgroundLayer(path27, options = {}) {
+function backgroundLayer(path28, options = {}) {
   const {
     styleClassName = "background-style rb-absolute rb-inset-0 rb-z-neg-10 rb-h-full rb-w-full rb-pointer-events-none",
     imageClassName,
@@ -13513,7 +13518,7 @@ function backgroundLayer(path27, options = {}) {
     className: styleClassName,
     style: {
       $bind: {
-        from: path27,
+        from: path28,
         transforms: [
           {
             id: "background.resolveStyle",
@@ -13523,20 +13528,20 @@ function backgroundLayer(path27, options = {}) {
       }
     }
   });
-  const imageLayer = createBackgroundImageNode(path27, imageClassName, {
+  const imageLayer = createBackgroundImageNode(path28, imageClassName, {
     loading: imageLoading,
     fetchPriority: imageFetchPriority
   });
-  const overlayLayer = createBackgroundOverlayNode(path27, overlayClassName);
+  const overlayLayer = createBackgroundOverlayNode(path28, overlayClassName);
   return omitImageLayer ? [styleLayer, overlayLayer] : [styleLayer, imageLayer, overlayLayer];
 }
-function createBackgroundImageNode(path27, baseClassName = "rb-absolute rb-z-neg-10", options = {}) {
-  const imagePath = `${path27}.image`;
+function createBackgroundImageNode(path28, baseClassName = "rb-absolute rb-z-neg-10", options = {}) {
+  const imagePath = `${path28}.image`;
   return media(
     {
       className: {
         $bind: {
-          from: path27,
+          from: path28,
           transforms: [
             {
               id: "background.resolveImageClassName",
@@ -13547,7 +13552,7 @@ function createBackgroundImageNode(path27, baseClassName = "rb-absolute rb-z-neg
       },
       style: {
         $bind: {
-          from: path27,
+          from: path28,
           transforms: [{ id: "background.resolveImageStyle" }]
         }
       },
@@ -13559,8 +13564,8 @@ function createBackgroundImageNode(path27, baseClassName = "rb-absolute rb-z-neg
     bind(imagePath)
   );
 }
-function createBackgroundOverlayNode(path27, className = "background-overlay rb-absolute rb-inset-0 rb-z-neg-10 rb-h-full rb-w-full rb-pointer-events-none") {
-  const overlayPath = `${path27}.overlay`;
+function createBackgroundOverlayNode(path28, className = "background-overlay rb-absolute rb-inset-0 rb-z-neg-10 rb-h-full rb-w-full rb-pointer-events-none") {
+  const overlayPath = `${path28}.overlay`;
   return el("div", {
     className,
     style: {
@@ -14400,10 +14405,10 @@ var init_sectionForegroundStyles = __esm({
 });
 
 // ../blocks/src/system/transforms/registry/boxStyles.ts
-function readPath(source, path27) {
-  if (!source || !path27) return void 0;
-  if (!path27.includes(".")) return source[path27];
-  return path27.split(".").reduce((acc, segment) => {
+function readPath(source, path28) {
+  if (!source || !path28) return void 0;
+  if (!path28.includes(".")) return source[path28];
+  return path28.split(".").reduce((acc, segment) => {
     if (acc && typeof acc === "object" && segment in acc) {
       return acc[segment];
     }
@@ -15395,27 +15400,27 @@ function scopePropValue(value, scope) {
   }
   return value;
 }
-function scopeContentPath(path27, scope) {
+function scopeContentPath(path28, scope) {
   if (!scope || scope.length === 0) {
-    return path27;
+    return path28;
   }
-  if (path27 === "content") {
+  if (path28 === "content") {
     return `content.${scope}`;
   }
-  if (path27.startsWith("content.")) {
-    const remainder = path27.slice("content.".length);
+  if (path28.startsWith("content.")) {
+    const remainder = path28.slice("content.".length);
     return remainder.length > 0 ? `content.${scope}.${remainder}` : `content.${scope}`;
   }
-  if (path27.startsWith("content[")) {
-    return path27.replace(/^content/, `content.${scope}`);
+  if (path28.startsWith("content[")) {
+    return path28.replace(/^content/, `content.${scope}`);
   }
-  if (path27.startsWith("$root.")) {
-    return path27;
+  if (path28.startsWith("$root.")) {
+    return path28;
   }
-  if (path27.includes(".")) {
-    return path27;
+  if (path28.includes(".")) {
+    return path28;
   }
-  return `content.${scope}.${path27}`;
+  return `content.${scope}.${path28}`;
 }
 var FRAGMENT_ID_PATTERN, FIELD_ID_PATTERN, dataLoaderSchema, fragmentDataSchema, fragmentConfigSchema, FragmentConfigError;
 var init_types14 = __esm({
@@ -15700,9 +15705,6 @@ var init_heroCopy = __esm({
           maxLength: 600
         }
       ],
-      // Layout order is [eyebrow, headline, subheadline]. The hero block's
-      // `splitEditorial` variant reads these nodes by index; keep the order stable
-      // (it fails fast at import if the count changes).
       layout: [
         text(
           {
@@ -18334,8 +18336,8 @@ function decodeSuccess(value) {
 function decodeFailure(issues) {
   return { ok: false, issues };
 }
-function zodIssuePath(path27) {
-  return path27.flatMap((segment) => {
+function zodIssuePath(path28) {
+  return path28.flatMap((segment) => {
     if (typeof segment === "string" || typeof segment === "number") {
       return [segment];
     }
@@ -19232,6 +19234,40 @@ var init_shared2 = __esm({
     init_filtering();
   }
 });
+var publicPassProductSchema, publicPassProductCollectionSchema, publicMembershipProductSchema, publicMembershipProductCollectionSchema;
+var init_shop_shared = __esm({
+  "../blocks/src/system/blocks/shop.shared.ts"() {
+    publicPassProductSchema = z.object({
+      id: z.string(),
+      productUseCase: z.enum(["event_pass", "appointment_package"]).default("event_pass"),
+      name: z.string(),
+      description: z.string().nullable(),
+      price: z.number(),
+      currency: z.string(),
+      creditsTotal: z.number(),
+      pricePerCredit: z.number(),
+      validDays: z.number().nullable(),
+      eligibleCategoryIds: z.array(z.string()),
+      eligibleCategoryNames: z.array(z.string())
+    });
+    publicPassProductCollectionSchema = z.object({
+      passes: z.array(publicPassProductSchema)
+    });
+    publicMembershipProductSchema = z.object({
+      id: z.string(),
+      name: z.string(),
+      description: z.string().nullable(),
+      price: z.number(),
+      currency: z.string(),
+      billingInterval: z.enum(["month", "year"]),
+      eligibleCategoryIds: z.array(z.string()),
+      eligibleCategoryNames: z.array(z.string())
+    });
+    publicMembershipProductCollectionSchema = z.object({
+      memberships: z.array(publicMembershipProductSchema)
+    });
+  }
+});
 var occurrenceContextSchema;
 var init_event_registration_shared = __esm({
   "../blocks/src/system/blocks/event-registration.shared.ts"() {
@@ -19251,6 +19287,9 @@ var init_event_registration_shared = __esm({
 function isEventCalendarDisplayMode(value) {
   return typeof value === "string" && eventCalendarDisplayModeValues.includes(value);
 }
+function isEventCalendarDefaultView(value) {
+  return typeof value === "string" && eventCalendarDefaultViewValues.includes(value);
+}
 function isEventCalendarListLayout(value) {
   return typeof value === "string" && eventCalendarListLayoutValues.includes(value);
 }
@@ -19258,11 +19297,12 @@ function isEventContentType(slug) {
   if (!slug) return false;
   return EVENT_CONTENT_TYPE_SLUGS.includes(slug);
 }
-var EVENT_CONTENT_TYPE_SLUGS, eventCalendarDisplayModeValues, eventCalendarListLayoutValues, eventCalendarListLayoutOptions;
+var EVENT_CONTENT_TYPE_SLUGS, eventCalendarDisplayModeValues, eventCalendarDefaultViewValues, eventCalendarListLayoutValues, eventCalendarListLayoutOptions;
 var init_events = __esm({
   "../blocks/src/system/constants/events.ts"() {
     EVENT_CONTENT_TYPE_SLUGS = ["event", "events"];
-    eventCalendarDisplayModeValues = ["combined", "month", "week", "list", "timetable"];
+    eventCalendarDisplayModeValues = ["combined", "calendar", "list", "timetable"];
+    eventCalendarDefaultViewValues = ["month", "week"];
     eventCalendarListLayoutValues = ["stack", "grid", "compact"];
     eventCalendarListLayoutOptions = [
       { id: "stack", label: "Stack" },
@@ -19407,7 +19447,7 @@ var init_pricing = __esm({
     DEFAULT_EVENT_CURRENCY = "USD";
   }
 });
-var previewStageSchema, registrationButtonVariantSchema, eventButtonVariantSchema, eventLayoutSchema, eventCalendarDisplayModeSchema, columnOptionSchema, weekStartSchema, filterAutoShowSchema, calendarTabViewsSchema;
+var previewStageSchema, registrationButtonVariantSchema, eventButtonVariantSchema, eventLayoutSchema, eventCalendarDisplayModeSchema, eventCalendarDefaultViewSchema, columnOptionSchema, weekStartSchema, filterAutoShowSchema, calendarTabViewsSchema;
 var init_contract_schemas = __esm({
   "../blocks/src/system/runtime/nodes/shared/contract-schemas.ts"() {
     init_events();
@@ -19416,6 +19456,7 @@ var init_contract_schemas = __esm({
     eventButtonVariantSchema = z.enum(["primary", "secondary", "outline", "link"]);
     eventLayoutSchema = z.enum(eventCalendarListLayoutValues);
     eventCalendarDisplayModeSchema = z.enum(eventCalendarDisplayModeValues);
+    eventCalendarDefaultViewSchema = z.enum(eventCalendarDefaultViewValues);
     columnOptionSchema = z.enum(["2", "3", "4"]);
     weekStartSchema = z.enum(["sunday", "monday"]);
     filterAutoShowSchema = z.enum(["auto", "always", "never"]);
@@ -19443,7 +19484,7 @@ function eventMatchesOccurrenceId(event, occurrenceId) {
 function findPreSelectedEvent(input) {
   const occurrenceContext = input.occurrenceContext;
   if (!occurrenceContext) {
-    return null;
+    return input.scopedEvents.length === 1 ? input.scopedEvents[0] ?? null : null;
   }
   const contextDate = getBookingLocalDateKey(toScheduledBookingDateTime({
     startsAt: occurrenceContext.startsAt,
@@ -19580,6 +19621,7 @@ var EVENT_REGISTRATION_GENERIC_SHELL_STEP_LABELS, EVENT_REGISTRATION_SHELL_STEP_
 var init_event_registration_interactive = __esm({
   "../blocks/src/system/runtime/nodes/event-registration.interactive.ts"() {
     init_schemas2();
+    init_shop_shared();
     init_event_registration_shared();
     init_events();
     init_pricing();
@@ -19619,7 +19661,9 @@ var init_event_registration_interactive = __esm({
       overlayEnabled: z.boolean().optional(),
       spamProtectionEnabled: z.boolean().optional(),
       stage: previewStageSchema.optional(),
-      supportEmail: z.string().optional()
+      supportEmail: z.string().optional(),
+      sitePasses: publicPassProductCollectionSchema.nullable().optional(),
+      siteMemberships: publicMembershipProductCollectionSchema.nullable().optional()
     });
     eventRegistrationDisplaySchema = z.object({
       kind: z.literal("event-registration"),
@@ -19642,7 +19686,9 @@ var init_event_registration_interactive = __esm({
       buttonVariant: registrationButtonVariantSchema.optional(),
       overlayEnabled: z.boolean().optional(),
       spamProtectionEnabled: z.boolean().optional(),
-      supportEmail: z.string().optional()
+      supportEmail: z.string().optional(),
+      sitePasses: publicPassProductCollectionSchema.nullable().optional(),
+      siteMemberships: publicMembershipProductCollectionSchema.nullable().optional()
     });
     eventRegistrationRenderSchema = z.object({
       display: eventRegistrationDisplaySchema,
@@ -19675,7 +19721,9 @@ var init_event_registration_interactive = __esm({
           buttonVariant: source.buttonVariant,
           overlayEnabled: source.overlayEnabled,
           spamProtectionEnabled: source.spamProtectionEnabled,
-          supportEmail: source.supportEmail
+          supportEmail: source.supportEmail,
+          sitePasses: source.sitePasses ?? null,
+          siteMemberships: source.siteMemberships ?? null
         }
       })
     });
@@ -19811,34 +19859,6 @@ var init_course_registration_interactive = __esm({
     });
   }
 });
-var publicPassProductSchema, publicMembershipProductSchema;
-var init_shop_shared = __esm({
-  "../blocks/src/system/blocks/shop.shared.ts"() {
-    publicPassProductSchema = z.object({
-      id: z.string(),
-      productUseCase: z.enum(["event_pass", "appointment_package"]).default("event_pass"),
-      name: z.string(),
-      description: z.string().nullable(),
-      price: z.number(),
-      currency: z.string(),
-      creditsTotal: z.number(),
-      pricePerCredit: z.number(),
-      validDays: z.number().nullable(),
-      eligibleCategoryIds: z.array(z.string()),
-      eligibleCategoryNames: z.array(z.string())
-    });
-    publicMembershipProductSchema = z.object({
-      id: z.string(),
-      name: z.string(),
-      description: z.string().nullable(),
-      price: z.number(),
-      currency: z.string(),
-      billingInterval: z.enum(["month", "year"]),
-      eligibleCategoryIds: z.array(z.string()),
-      eligibleCategoryNames: z.array(z.string())
-    });
-  }
-});
 var eventDetailsManifest, occurrenceContextSchema2, eventAutoApplyDiscountPreviewBaseSchema, eventAutoApplyDiscountPreviewSchema, eventDetailsBlockDefinition;
 var init_event_details = __esm({
   "../blocks/src/system/blocks/event-details.ts"() {
@@ -20012,8 +20032,8 @@ var init_event_details = __esm({
       dataSchemas: {
         eventDetailsData: z.object({
           events: publicEventsArraySchema,
-          sitePasses: z.object({ passes: z.array(publicPassProductSchema) }),
-          siteMemberships: z.object({ memberships: z.array(publicMembershipProductSchema) }),
+          sitePasses: publicPassProductCollectionSchema,
+          siteMemberships: publicMembershipProductCollectionSchema,
           autoApplyDiscount: eventAutoApplyDiscountPreviewSchema.nullable().optional().default(null)
         }).optional(),
         occurrenceContext: occurrenceContextSchema2.optional()
@@ -20385,6 +20405,7 @@ function buildEventCalendarDisplay(source) {
     }),
     startOfWeek: source.startOfWeek ?? "monday",
     calendarTabViews: source.calendarTabViews ?? "both",
+    defaultCalendarView: source.defaultCalendarView ?? "month",
     showFilters: source.showFilters ?? true,
     showCategoryFilter: source.showCategoryFilter ?? "auto",
     showVenueFilter: source.showVenueFilter ?? false,
@@ -20436,6 +20457,7 @@ var init_EventCalendar_interactive = __esm({
         loadMoreText: z.string().optional(),
         startOfWeek: weekStartSchema.optional(),
         calendarTabViews: calendarTabViewsSchema.optional(),
+        defaultCalendarView: eventCalendarDefaultViewSchema.optional(),
         showFilters: z.boolean().nullable().optional(),
         showCategoryFilter: filterAutoShowSchema.optional(),
         showVenueFilter: z.boolean().nullable().optional(),
@@ -20467,6 +20489,7 @@ var init_EventCalendar_interactive = __esm({
       paginationAction: eventListPaginationActionSchema,
       startOfWeek: weekStartSchema,
       calendarTabViews: calendarTabViewsSchema,
+      defaultCalendarView: eventCalendarDefaultViewSchema,
       showFilters: z.boolean(),
       showCategoryFilter: filterAutoShowSchema,
       showVenueFilter: z.boolean(),
@@ -28937,11 +28960,11 @@ function validationContext(options = {}) {
     allowIncomplete: isDraft || (options.allowIncomplete ?? false)
   };
 }
-function formatFieldPath(path27) {
-  return path27.map((segment) => String(segment)).join(".");
+function formatFieldPath(path28) {
+  return path28.map((segment) => String(segment)).join(".");
 }
-function toZodIssuePath(path27) {
-  return [...path27];
+function toZodIssuePath(path28) {
+  return [...path28];
 }
 function fieldIssueToMessage(issue5) {
   switch (issue5.kind) {
@@ -28995,7 +29018,7 @@ function pluralize(label, count) {
   if (count === 1) return label;
   return label.endsWith("s") ? label : `${label}s`;
 }
-function deriveFieldValidationPlan(field, path27 = [field.id]) {
+function deriveFieldValidationPlan(field, path28 = [field.id]) {
   const required = Boolean(field.required);
   switch (field.type) {
     case "text": {
@@ -29006,7 +29029,7 @@ function deriveFieldValidationPlan(field, path27 = [field.id]) {
         });
         if (typeof field.ui?.min === "number") constraints2.push({ kind: "numberMin", minimum: field.ui.min });
         if (typeof field.ui?.max === "number") constraints2.push({ kind: "numberMax", maximum: field.ui.max });
-        return makePlan("number", "number", field, path27, required, constraints2);
+        return makePlan("number", "number", field, path28, required, constraints2);
       }
       const constraints = commonConstraints(required, {
         kind: field.ui?.widget === "iconPicker" ? "blockIconValue" : "textType"
@@ -29015,7 +29038,7 @@ function deriveFieldValidationPlan(field, path27 = [field.id]) {
       if (inputType === "tel") constraints.push({ kind: "phoneFormat" });
       if (field.ui?.pattern) constraints.push({ kind: "patternFormat", pattern: field.ui.pattern });
       if (typeof field.maxLength === "number") constraints.push({ kind: "maxLength", maximum: field.maxLength });
-      return makePlan("string", "string", field, path27, required, constraints);
+      return makePlan("string", "string", field, path28, required, constraints);
     }
     case "number": {
       const constraints = commonConstraints(required, {
@@ -29023,34 +29046,34 @@ function deriveFieldValidationPlan(field, path27 = [field.id]) {
       });
       if (typeof field.min === "number") constraints.push({ kind: "numberMin", minimum: field.min });
       if (typeof field.max === "number") constraints.push({ kind: "numberMax", maximum: field.max });
-      return makePlan("number", "number", field, path27, required, constraints);
+      return makePlan("number", "number", field, path28, required, constraints);
     }
     case "slug": {
       const constraints = commonConstraints(required, { kind: "textType" }, { kind: "slugFormat" });
       if (typeof field.maxLength === "number") constraints.push({ kind: "maxLength", maximum: field.maxLength });
-      return makePlan("string", "string", field, path27, required, constraints);
+      return makePlan("string", "string", field, path28, required, constraints);
     }
     case "url":
       return makePlan(
         "string",
         "string",
         field,
-        path27,
+        path28,
         required,
         commonConstraints(required, { kind: "textType" }, { kind: "urlFormat", allowRelative: Boolean(field.allowRelative) })
       );
     case "reference":
-      return makePlan("string", "string", field, path27, required, commonConstraints(required, { kind: "referenceText" }));
+      return makePlan("string", "string", field, path28, required, commonConstraints(required, { kind: "referenceText" }));
     case "date":
-      return makePlan("string", "string", field, path27, required, commonConstraints(required, { kind: "textType" }, { kind: "dateFormat" }));
+      return makePlan("string", "string", field, path28, required, commonConstraints(required, { kind: "textType" }, { kind: "dateFormat" }));
     case "time":
-      return makePlan("string", "string", field, path27, required, commonConstraints(required, { kind: "textType" }, { kind: "timeFormat" }));
+      return makePlan("string", "string", field, path28, required, commonConstraints(required, { kind: "textType" }, { kind: "timeFormat" }));
     case "datetime":
       return makePlan(
         "string",
         "string",
         field,
-        path27,
+        path28,
         required,
         commonConstraints(required, { kind: "textType" }, { kind: "datetimeFormat" })
       );
@@ -29059,7 +29082,7 @@ function deriveFieldValidationPlan(field, path27 = [field.id]) {
         "select",
         "select",
         field,
-        path27,
+        path28,
         required,
         commonConstraints(required, {
           kind: "selectOption",
@@ -29068,40 +29091,40 @@ function deriveFieldValidationPlan(field, path27 = [field.id]) {
         })
       );
     case "richText":
-      return makePlan("richText", "object", field, path27, required, commonConstraints(required, { kind: "richTextDoc" }));
+      return makePlan("richText", "object", field, path28, required, commonConstraints(required, { kind: "richTextDoc" }));
     case "media":
     case "file":
-      return makePlan("media", "object", field, path27, required, commonConstraints(required, { kind: "mediaObject" }));
+      return makePlan("media", "object", field, path28, required, commonConstraints(required, { kind: "mediaObject" }));
     case "link":
-      return makePlan("link", "object", field, path27, required, commonConstraints(required, { kind: "linkObject" }));
+      return makePlan("link", "object", field, path28, required, commonConstraints(required, { kind: "linkObject" }));
     case "boolean":
-      return makePlan("boolean", "boolean", field, path27, required, requiredConstraints(required));
+      return makePlan("boolean", "boolean", field, path28, required, requiredConstraints(required));
     case "repeater":
       return {
-        ...makePlan("repeater", "array", field, path27, required, commonConstraints(required, { kind: "arrayType" })),
+        ...makePlan("repeater", "array", field, path28, required, commonConstraints(required, { kind: "arrayType" })),
         ...field.polymorphic && field.itemTypes ? {
-          repeatedItemVariants: deriveRepeatedItemVariants(field, [...path27, 0])
+          repeatedItemVariants: deriveRepeatedItemVariants(field, [...path28, 0])
         } : {
-          repeatedItemPlan: deriveNestedFieldPlans(getRepeaterFields(field), [...path27, 0])
+          repeatedItemPlan: deriveNestedFieldPlans(getRepeaterFields(field), [...path28, 0])
         },
         constraints: withRepeaterItemConstraints(field, commonConstraints(required, { kind: "arrayType" }))
       };
     case "group":
     case "modal":
       return {
-        ...makePlan("group", "object", field, path27, required, requiredConstraints(required)),
-        children: deriveNestedFieldPlans(field.schema?.fields ?? [], path27),
+        ...makePlan("group", "object", field, path28, required, requiredConstraints(required)),
+        children: deriveNestedFieldPlans(field.schema?.fields ?? [], path28),
         allowNullChildren: field.type === "group" && field.ui?.widget === "locationPicker"
       };
     case "tabGroup":
       return {
-        ...makePlan("group", "object", field, path27, required, requiredConstraints(required)),
-        children: field.tabs.flatMap((tab) => deriveNestedFieldPlans(tab.fields, path27))
+        ...makePlan("group", "object", field, path28, required, requiredConstraints(required)),
+        children: field.tabs.flatMap((tab) => deriveNestedFieldPlans(tab.fields, path28))
       };
     case "presetOrCustom":
     case "contentTypeSelect":
     case "entryPicker":
-      return makePlan("passthrough", "unknown", field, path27, false, []);
+      return makePlan("passthrough", "unknown", field, path28, false, []);
     default:
       return assertNever2(field);
   }
@@ -29115,14 +29138,14 @@ function commonConstraints(required, ...specific) {
 function requiredConstraints(required) {
   return required ? [{ kind: "required" }] : [];
 }
-function makePlan(kind, valueKind2, field, path27, required, constraints) {
+function makePlan(kind, valueKind2, field, path28, required, constraints) {
   return {
     kind,
     valueKind: valueKind2,
     fieldId: field.id,
     label: field.label,
     fieldType: field.type,
-    path: path27,
+    path: path28,
     required,
     visibility: fieldVisibility(field),
     constraints
@@ -29459,18 +29482,18 @@ function materializeRepeaterItemPlan(plan, parentPath, index) {
   return rebaseFieldPlanPath(plan, [...parentPath, 0], [...parentPath, index]);
 }
 function rebaseFieldPlanPath(plan, fromPrefix, toPrefix) {
-  const path27 = rebaseFieldPath(plan.path, fromPrefix, toPrefix);
+  const path28 = rebaseFieldPath(plan.path, fromPrefix, toPrefix);
   switch (plan.kind) {
     case "group":
       return {
         ...plan,
-        path: path27,
+        path: path28,
         children: plan.children.map((childPlan) => rebaseFieldPlanPath(childPlan, fromPrefix, toPrefix))
       };
     case "repeater":
       return {
         ...plan,
-        path: path27,
+        path: path28,
         ...plan.repeatedItemVariants ? {
           repeatedItemVariants: plan.repeatedItemVariants.map((variant) => ({
             ...variant,
@@ -29491,20 +29514,20 @@ function rebaseFieldPlanPath(plan, fromPrefix, toPrefix) {
     case "passthrough":
       return {
         ...plan,
-        path: path27
+        path: path28
       };
     default:
       return assertNever2(plan);
   }
 }
-function rebaseFieldPath(path27, fromPrefix, toPrefix) {
-  if (!startsWithFieldPath(path27, fromPrefix)) {
-    throw new Error(`Cannot rebase field path ${formatFieldPath(path27)} from ${formatFieldPath(fromPrefix)}`);
+function rebaseFieldPath(path28, fromPrefix, toPrefix) {
+  if (!startsWithFieldPath(path28, fromPrefix)) {
+    throw new Error(`Cannot rebase field path ${formatFieldPath(path28)} from ${formatFieldPath(fromPrefix)}`);
   }
-  return [...toPrefix, ...path27.slice(fromPrefix.length)];
+  return [...toPrefix, ...path28.slice(fromPrefix.length)];
 }
-function startsWithFieldPath(path27, prefix) {
-  return prefix.every((segment, index) => path27[index] === segment);
+function startsWithFieldPath(path28, prefix) {
+  return prefix.every((segment, index) => path28[index] === segment);
 }
 function issue(plan, kind, extra) {
   return {
@@ -29530,8 +29553,8 @@ function fieldPlanToZod(plan, options = {}) {
 }
 function addFieldIssueToZodContext(zodCtx, validationIssue, rootPath) {
   const message = fieldIssueToMessage(validationIssue);
-  const path27 = relativeZodIssuePath(validationIssue.path, rootPath);
-  const issuePath = path27.length > 0 ? { path: toZodIssuePath(path27) } : {};
+  const path28 = relativeZodIssuePath(validationIssue.path, rootPath);
+  const issuePath = path28.length > 0 ? { path: toZodIssuePath(path28) } : {};
   switch (validationIssue.kind) {
     case "required":
       if (validationIssue.emptyOrigin) {
@@ -29584,8 +29607,8 @@ function addFieldIssueToZodContext(zodCtx, validationIssue, rootPath) {
       assertNever2(validationIssue);
   }
 }
-function relativeZodIssuePath(path27, rootPath) {
-  return startsWithFieldPath(path27, rootPath) ? path27.slice(rootPath.length) : path27;
+function relativeZodIssuePath(path28, rootPath) {
+  return startsWithFieldPath(path28, rootPath) ? path28.slice(rootPath.length) : path28;
 }
 function compilePattern(pattern) {
   try {
@@ -29954,32 +29977,6 @@ var splitReverseLayout = splitLayoutWith([
   splitContentColumn,
   splitImageColumn
 ]);
-var heroEyebrowNode = heroCopyFragment.layout[0];
-var heroHeadlineNode = heroCopyFragment.layout[1];
-var heroSubheadlineNode = heroCopyFragment.layout[2];
-var heroCtaRowNode = heroCtaRowFragment.layout[0];
-if (!heroEyebrowNode || !heroHeadlineNode || !heroSubheadlineNode || !heroCtaRowNode) {
-  throw new Error("Hero copy/CTA fragments are missing their expected layout nodes.");
-}
-var heroEditorialBottomRow = inline(
-  {
-    gap: "lg",
-    align: "end",
-    justify: "start",
-    wrap: true,
-    className: "rb-w-full"
-  },
-  [heroSubheadlineNode, heroCtaRowNode]
-);
-var splitEditorialContentColumn = heroContentWrapper(
-  [heroEyebrowNode, heroHeadlineNode, heroEditorialBottomRow],
-  "md",
-  "rb-w-full rb-text-left"
-);
-var splitEditorialLayout = splitLayoutWith([
-  splitEditorialContentColumn,
-  splitImageColumn
-]);
 var heroConfig = {
   id: "block.hero",
   title: "Hero",
@@ -30003,7 +30000,8 @@ var heroConfig = {
       id: "imageShape",
       label: "Image shape",
       defaultValue: "default",
-      uiIntent: "display"
+      uiIntent: "display",
+      visibleWhen: { field: "variant", oneOf: ["split", "splitReverse"] }
     })
   ],
   layout: classicLayout,
@@ -30011,8 +30009,7 @@ var heroConfig = {
     classic: classicLayout,
     micro: microLayout,
     split: splitLayout,
-    splitReverse: splitReverseLayout,
-    splitEditorial: splitEditorialLayout
+    splitReverse: splitReverseLayout
   },
   defaultVariant: "classic",
   description: "Hero section with headline, subtitle, and repeatable CTAs.",
@@ -31659,8 +31656,10 @@ function resolveGeneratedHeroLayoutStyles(content) {
   return isPlainObject2(raw) ? raw : null;
 }
 function readHeroLayoutString(content, generatedKey, fallbackKey = generatedKey) {
+  const explicitValue = readString(content, fallbackKey);
+  if (explicitValue !== void 0) return explicitValue;
   const generated = resolveGeneratedHeroLayoutStyles(content);
-  return generated && typeof generated[generatedKey] === "string" ? generated[generatedKey] : readString(content, fallbackKey);
+  return generated && typeof generated[generatedKey] === "string" ? generated[generatedKey] : void 0;
 }
 function resolveHeroVariant(content) {
   const variant = readString(content, "variant");
@@ -31673,7 +31672,7 @@ function resolveHeroContentAlignment(content) {
   const raw = readHeroLayoutString(content, "contentAlignment");
   if (raw === "left" || raw === "center" || raw === "right") return raw;
   const variant = resolveHeroVariant(content);
-  if (variant === "split" || variant === "splitReverse" || variant === "splitEditorial") return "left";
+  if (variant === "split" || variant === "splitReverse") return "left";
   return "center";
 }
 function resolveHeroVerticalAlignment(content) {
@@ -31683,7 +31682,7 @@ function resolveHeroVerticalAlignment(content) {
   const minHeight = sectionStyles?.minHeight;
   if (minHeight === "banner" || minHeight === "hero" || minHeight === "immersive") return "center";
   const variant = resolveHeroVariant(content);
-  if (variant === "split" || variant === "splitReverse" || variant === "splitEditorial") return "center";
+  if (variant === "split" || variant === "splitReverse") return "center";
   return "top";
 }
 function resolveHeroContentMaxWidth(content) {
@@ -32743,9 +32742,9 @@ function maybeBuildSupabaseTransformUrl(inputUrl, options) {
   const remainder = url.pathname.slice(idx + marker.length);
   const parts = remainder.split("/").filter(Boolean);
   const bucket = parts[0];
-  const path27 = parts.slice(1).join("/");
-  if (!bucket || !path27) return inputUrl;
-  url.pathname = `/storage/v1/render/image/public/${bucket}/${path27}`;
+  const path28 = parts.slice(1).join("/");
+  if (!bucket || !path28) return inputUrl;
+  url.pathname = `/storage/v1/render/image/public/${bucket}/${path28}`;
   url.search = "";
   if (width) url.searchParams.set("width", String(width));
   if (height) url.searchParams.set("height", String(height));
@@ -35304,6 +35303,7 @@ init_styledSection();
 init_fragments();
 init_api_bindings();
 init_shared2();
+init_shop_shared();
 init_defineBlock();
 init_event_registration_shared();
 init_event_registration_interactive();
@@ -35458,6 +35458,8 @@ var eventRegistrationManifest = createBlockManifest({
               },
               // Event data from loader
               events: { $bind: { from: "data.events" } },
+              sitePasses: { $bind: { from: "data.sitePasses" } },
+              siteMemberships: { $bind: { from: "data.siteMemberships" } },
               // Stage for preview mode (allows registering for draft events)
               stage: {
                 $bind: { from: "$root.previewStage", fallback: "published" }
@@ -35476,7 +35478,9 @@ var eventRegistrationBlockDefinition = {
   manifest: eventRegistrationManifest,
   runtime: eventRegistrationBlockRuntime,
   dataSchemas: {
-    events: z.array(publicEventSchema).optional(),
+    events: publicEventsArraySchema.optional(),
+    sitePasses: publicPassProductCollectionSchema.optional(),
+    siteMemberships: publicMembershipProductCollectionSchema.optional(),
     occurrenceContext: occurrenceContextSchema.optional()
   },
   dataLoaders: {
@@ -35495,6 +35499,20 @@ var eventRegistrationBlockDefinition = {
         entryId: { $bind: { from: "$root.contentEntry._entryId", fallback: "" } }
       },
       mode: "server"
+    },
+    sitePasses: {
+      endpoint: "listPublicPasses",
+      params: {
+        siteId: { $bind: { from: "$root.siteId" } }
+      },
+      mode: "server"
+    },
+    siteMemberships: {
+      endpoint: "listPublicMemberships",
+      params: {
+        siteId: { $bind: { from: "$root.siteId" } }
+      },
+      mode: "server"
     }
   }
 };
@@ -36319,6 +36337,9 @@ function normalizeEventCalendarContent(content) {
     ...variant ? { variant } : {},
     displayMode: normalizeEventCalendarDisplayMode(record.displayMode),
     listLayout: normalizeEventCalendarListLayout(record.listLayout),
+    defaultCalendarView: normalizeEventCalendarDefaultView(
+      record.defaultCalendarView
+    ),
     kind,
     eventSurface: normalizeEventSurfaceScope(record.eventSurface),
     filterEventPresets: normalizeEventSurfacePresets(record.filterEventPresets),
@@ -36336,6 +36357,9 @@ function normalizeEventCalendarDisplayMode(value) {
 function normalizeEventCalendarListLayout(value) {
   return isEventCalendarListLayout(value) ? value : void 0;
 }
+function normalizeEventCalendarDefaultView(value) {
+  return isEventCalendarDefaultView(value) ? value : void 0;
+}
 var eventCalendarLayout = [
   styledSection({
     children: sectionContainer(
@@ -36395,6 +36419,9 @@ var eventCalendarLayout = [
             calendarTabViews: {
               $bind: { from: "content.calendarTabViews", fallback: "both" }
             },
+            defaultCalendarView: {
+              $bind: { from: "content.defaultCalendarView", fallback: "month" }
+            },
             // Filtering options
             showFilters: {
               $bind: { from: "content.showFilters", fallback: true }
@@ -36461,8 +36488,7 @@ var eventCalendarAdditionalFields = [
     defaultValue: "combined",
     options: [
       { value: "combined", label: "Combined (List + Calendar tabs)" },
-      { value: "month", label: "Month calendar" },
-      { value: "week", label: "Week agenda" },
+      { value: "calendar", label: "Calendar" },
       { value: "timetable", label: "Timetable" },
       { value: "list", label: "List" }
     ],
@@ -36501,7 +36527,12 @@ var eventCalendarAdditionalFields = [
     ],
     ui: {
       intent: "display",
-      visibleWhen: { field: "listLayout", equals: "grid" }
+      visibleWhen: {
+        allOf: [
+          { field: "variant", oneOf: ["combined", "list"] },
+          { field: "listLayout", equals: "grid" }
+        ]
+      }
     }
   },
   {
@@ -36549,7 +36580,12 @@ var eventCalendarAdditionalFields = [
     required: false,
     ui: {
       intent: "display",
-      visibleWhen: { field: "paginationMode", equals: "seeAllLink" }
+      visibleWhen: {
+        allOf: [
+          { field: "variant", oneOf: ["combined", "list"] },
+          { field: "paginationMode", equals: "seeAllLink" }
+        ]
+      }
     }
   },
   {
@@ -36582,7 +36618,7 @@ var eventCalendarAdditionalFields = [
       intent: "display",
       visibleWhen: {
         field: "variant",
-        oneOf: ["combined", "month", "week"]
+        oneOf: ["combined", "calendar", "timetable"]
       }
     }
   },
@@ -36605,6 +36641,33 @@ var eventCalendarAdditionalFields = [
       visibleWhen: { field: "variant", equals: "combined" }
     }
   },
+  {
+    id: "defaultCalendarView",
+    type: "select",
+    label: "Calendar view",
+    description: "Choose the standalone calendar view, or the first view in combined mode",
+    required: false,
+    multiple: false,
+    defaultValue: "month",
+    options: [
+      { value: "month", label: "Month" },
+      { value: "week", label: "Week" }
+    ],
+    ui: {
+      intent: "display",
+      visibleWhen: {
+        anyOf: [
+          { field: "variant", equals: "calendar" },
+          {
+            allOf: [
+              { field: "variant", equals: "combined" },
+              { field: "calendarTabViews", equals: "both" }
+            ]
+          }
+        ]
+      }
+    }
+  },
   // Filtering options
   {
     id: "kind",
@@ -36632,7 +36695,7 @@ var eventCalendarAdditionalFields = [
       intent: "display",
       visibleWhen: {
         field: "variant",
-        oneOf: ["combined", "list", "timetable"]
+        oneOf: ["combined", "calendar", "list", "timetable"]
       }
     }
   },
@@ -36652,8 +36715,10 @@ var eventCalendarAdditionalFields = [
     ui: {
       intent: "display",
       visibleWhen: {
-        field: "variant",
-        oneOf: ["combined", "list", "timetable"]
+        allOf: [
+          { field: "variant", oneOf: ["combined", "calendar", "list", "timetable"] },
+          { field: "showFilters", equals: true }
+        ]
       }
     }
   },
@@ -36667,8 +36732,10 @@ var eventCalendarAdditionalFields = [
     ui: {
       intent: "display",
       visibleWhen: {
-        field: "variant",
-        oneOf: ["combined", "list", "timetable"]
+        allOf: [
+          { field: "variant", oneOf: ["combined", "calendar", "list", "timetable"] },
+          { field: "showFilters", equals: true }
+        ]
       }
     }
   },
@@ -36682,8 +36749,10 @@ var eventCalendarAdditionalFields = [
     ui: {
       intent: "display",
       visibleWhen: {
-        field: "variant",
-        oneOf: ["combined", "list", "timetable"]
+        allOf: [
+          { field: "variant", oneOf: ["combined", "calendar", "list", "timetable"] },
+          { field: "showFilters", equals: true }
+        ]
       }
     }
   },
@@ -36697,8 +36766,15 @@ var eventCalendarAdditionalFields = [
     ui: {
       intent: "display",
       visibleWhen: {
-        field: "variant",
-        oneOf: ["combined", "list", "week", "timetable"]
+        anyOf: [
+          { field: "variant", oneOf: ["combined", "list", "timetable"] },
+          {
+            allOf: [
+              { field: "variant", equals: "calendar" },
+              { field: "defaultCalendarView", equals: "week" }
+            ]
+          }
+        ]
       }
     }
   },
@@ -36814,8 +36890,7 @@ var eventCalendarAdditionalFields = [
 ];
 var eventCalendarVariants = {
   combined: eventCalendarLayout[0],
-  month: eventCalendarLayout[0],
-  week: eventCalendarLayout[0],
+  calendar: eventCalendarLayout[0],
   timetable: eventCalendarLayout[0],
   list: eventCalendarLayout[0]
 };
@@ -36827,8 +36902,7 @@ var eventCalendarVariants = {
     multiple: false,
     options: [
       { value: "combined" },
-      { value: "month" },
-      { value: "week" },
+      { value: "calendar" },
       { value: "timetable" },
       { value: "list" }
     ]
@@ -36841,6 +36915,13 @@ var eventCalendarVariants = {
     options: eventCalendarListLayoutOptions.map((option) => ({
       value: option.id
     }))
+  },
+  {
+    id: "defaultCalendarView",
+    type: "select",
+    required: false,
+    multiple: false,
+    options: [{ value: "month" }, { value: "week" }]
   }
 ];
 var eventCalendarConfig = {
@@ -36884,8 +36965,7 @@ var eventCalendarConfig = {
   defaultVariant: "combined",
   variantOptions: {
     combined: { label: "Combined" },
-    month: { label: "Month" },
-    week: { label: "Week" },
+    calendar: { label: "Calendar" },
     timetable: { label: "Timetable" },
     list: { label: "List" }
   }
@@ -39084,9 +39164,9 @@ var shopBlockDefinition = {
   runtime: shopBlockRuntime,
   dataSchemas: {
     // listPublicPasses returns { passes: [...] }
-    passes: z.object({ passes: z.array(publicPassProductSchema) }).optional(),
+    passes: publicPassProductCollectionSchema.optional(),
     // listPublicMemberships returns { memberships: [...] }
-    memberships: z.object({ memberships: z.array(publicMembershipProductSchema) }).optional()
+    memberships: publicMembershipProductCollectionSchema.optional()
   },
   dataLoaders: {
     // Load passes for display
@@ -40536,13 +40616,6 @@ var systemBlockDefinitionsRaw = [
         weight: "featured",
         bias: "clear",
         surfaces: heroSectionSurfaces
-      }),
-      layoutProfile({
-        variantKey: "splitEditorial",
-        family: "split",
-        weight: "featured",
-        bias: "clear",
-        surfaces: heroSectionSurfaces
       })
     ]
   })),
@@ -40786,9 +40859,8 @@ var systemBlockDefinitionsRaw = [
     flow: offeringsFlow,
     layoutProfiles: [
       layoutProfile({ variantKey: "combined", family: "grid", weight: "standard" }),
+      layoutProfile({ variantKey: "calendar", family: "stack", weight: "standard" }),
       layoutProfile({ variantKey: "list", family: "stack", weight: "standard" }),
-      layoutProfile({ variantKey: "month", family: "grid", weight: "standard" }),
-      layoutProfile({ variantKey: "week", family: "stack", weight: "standard" }),
       layoutProfile({ variantKey: "timetable", family: "stack", weight: "standard" })
     ]
   })),
@@ -41370,10 +41442,7 @@ function normalizeRenderStage(stage) {
   return stage === "preview" ? "preview" : "published";
 }
 function isRouteVisibleInStage(routeEntry, stageInput) {
-  const stage = normalizeRenderStage(stageInput);
-  if (stage === "preview" || !isRouteRecord(routeEntry)) {
-    return true;
-  }
+  if (normalizeRenderStage(stageInput) === "preview" || !isRouteRecord(routeEntry)) return true;
   const status = routeEntry.status;
   return !(typeof status === "string" && status !== "published");
 }
@@ -41382,52 +41451,45 @@ function extractRouteHref(candidate, stageInput = "published") {
     const trimmed = candidate.trim();
     return trimmed.length > 0 ? trimmed : null;
   }
-  if (!isRouteRecord(candidate)) {
-    return null;
-  }
-  const stage = normalizeRenderStage(stageInput);
-  const fields3 = stage === "preview" ? ["draftPath", "path", "href", "url"] : ["path", "href", "url"];
+  if (!isRouteRecord(candidate)) return null;
+  const fields3 = normalizeRenderStage(stageInput) === "preview" ? [
+    "draftPath",
+    "path",
+    "href",
+    "url"
+  ] : [
+    "path",
+    "href",
+    "url"
+  ];
   for (const field of fields3) {
     const value = candidate[field];
-    if (typeof value === "string" && value.trim().length > 0) {
-      return value.trim();
-    }
+    if (typeof value === "string" && value.trim().length > 0) return value.trim();
   }
   return null;
 }
 function extractRouteUpdatedAt(candidate) {
-  if (!isRouteRecord(candidate)) {
-    return null;
-  }
-  const fields3 = [
+  if (!isRouteRecord(candidate)) return null;
+  for (const field of [
     "updatedAt",
     "updated_at",
     "publishedAt",
     "published_at",
     "modifiedAt",
     "modified_at"
-  ];
-  for (const field of fields3) {
+  ]) {
     const value = candidate[field];
-    if (typeof value === "string" && value.length > 0) {
-      return value;
-    }
+    if (typeof value === "string" && value.length > 0) return value;
   }
   return null;
 }
 function resolveRouteTargetForStage(routeIdValue, routes, stageInput) {
   const routeId = typeof routeIdValue === "string" ? routeIdValue : null;
-  if (!routeId || !routes) {
-    return null;
-  }
+  if (!routeId || !routes) return null;
   const routeEntry = routes[routeId];
-  if (!isRouteVisibleInStage(routeEntry, stageInput)) {
-    return null;
-  }
+  if (!isRouteVisibleInStage(routeEntry, stageInput)) return null;
   const href = extractRouteHref(routeEntry, stageInput);
-  if (!href) {
-    return null;
-  }
+  if (!href) return null;
   return {
     routeId,
     href,
@@ -42582,19 +42644,23 @@ function normalizeDashboardOrigin(input) {
 }
 function deriveCmsApiUrlFromDashboardUrl(input) {
   const origin = normalizeDashboardOrigin(input);
-  return origin ? `${origin}/api` : "";
+  return origin ? normalizeCmsApiBaseUrl(`${origin}/api`) : "";
+}
+function normalizeCmsApiBaseUrl(input) {
+  return input.trim().replace(/\/+$/, "").replace(/(?:\/api)+$/i, "/api");
 }
 function getCmsApiUrl() {
   if (typeof window !== "undefined") {
-    return "/api";
+    return normalizeCmsApiBaseUrl("/api");
   }
   const internalUrl = process.env.CMS_API_URL;
   if (internalUrl) {
-    return internalUrl.replace(/\/$/, "");
+    return normalizeCmsApiBaseUrl(internalUrl);
   }
   const dashboardUrl = process.env.NEXT_PUBLIC_DASHBOARD_URL;
   if (dashboardUrl) {
-    return deriveCmsApiUrlFromDashboardUrl(dashboardUrl);
+    const apiUrl = deriveCmsApiUrlFromDashboardUrl(dashboardUrl);
+    if (apiUrl) return apiUrl;
   }
   throw new Error(
     "CMS_API_URL or NEXT_PUBLIC_DASHBOARD_URL is not configured. Set NEXT_PUBLIC_DASHBOARD_URL to your dashboard URL (e.g., http://localhost:4000)"
@@ -42728,6 +42794,27 @@ function serializeQueryValue(value) {
   if (value instanceof Date) return value.toISOString();
   return null;
 }
+function normalizeHeaders(source) {
+  const normalized = {};
+  if (!source) return normalized;
+  new Headers(source).forEach((value, key) => {
+    normalized[key] = value;
+  });
+  return normalized;
+}
+function buildRequestHeaders(input) {
+  const headers = {
+    ...normalizeHeaders(input.optionsHeaders),
+    ...normalizeHeaders(input.authHeaders)
+  };
+  if (input.sdkVersion) {
+    headers["x-sdk-version"] = input.sdkVersion;
+  }
+  if (input.includeJsonContentType) {
+    headers["Content-Type"] = "application/json";
+  }
+  return headers;
+}
 function serializePathParam(endpoint, key, value) {
   if (typeof value === "string") {
     return value;
@@ -42863,104 +42950,20 @@ function createRawCMSClient(headers = {}, baseUrl) {
     params,
     options = {}
   }) => {
-    const resolvedBaseUrl = baseUrl ?? resolveApiBaseUrl();
-    let url = buildEndpointURL(resolvedBaseUrl, endpoint);
-    const originalPath = API_ENDPOINTS[endpoint].path;
-    const unusedParams = {};
-    if (params) {
-      Object.entries(params).forEach(([key, value]) => {
-        const bracePlaceholder = `{${key}}`;
-        const colonPlaceholder = `:${key}`;
-        if (originalPath.includes(bracePlaceholder) || originalPath.includes(colonPlaceholder)) {
-          const stringValue2 = serializePathParam(endpoint, key, value);
-          url = url.replace(bracePlaceholder, stringValue2);
-          url = url.replace(colonPlaceholder, stringValue2);
-        } else {
-          unusedParams[key] = value;
-        }
-      });
-    }
-    const unresolvedPathParams = [
-      ...url.match(/\{[^}]+\}/g) ?? [],
-      ...url.match(/(^|\/):([A-Za-z][A-Za-z0-9_]*)\b/g) ?? []
-    ];
-    if (unresolvedPathParams.length > 0) {
-      const missingParams = Array.from(
-        new Set(
-          unresolvedPathParams.map((token) => {
-            if (token.startsWith("{") && token.endsWith("}")) {
-              return token.slice(1, -1);
-            }
-            return token.replace(/^\//, "").slice(1);
-          })
-        )
-      );
-      throw new Error(
-        `Missing required path params for endpoint ${String(endpoint)}: ${missingParams.join(", ")}`
-      );
-    }
-    const endpointConfig = API_ENDPOINTS[endpoint];
-    const method = endpointConfig.method;
-    const isGetOrHead = method === "GET" || method === "HEAD";
-    const queryParams = new URLSearchParams();
-    Object.entries(unusedParams).forEach(([key, value]) => {
-      appendQueryParam(queryParams, key, value);
+    const plan = buildApiRequestPlan({
+      endpoint,
+      body,
+      params,
+      options,
+      headers,
+      baseUrl: normalizeCmsApiBaseUrl(baseUrl ?? resolveApiBaseUrl()),
+      sdkVersion
     });
-    if (isGetOrHead && typeof body === "object" && body !== null && !isFormDataBody(body)) {
-      Object.entries(body).forEach(([key, value]) => {
-        appendQueryParam(queryParams, key, value);
-      });
-    }
-    const queryString = queryParams.toString();
-    if (queryString) {
-      url += (url.includes("?") ? "&" : "?") + queryString;
-    }
-    const formDataBody = isFormDataBody(body) ? body : void 0;
-    const optionsNext = options?.next;
-    const nextOptions = { ...optionsNext ?? {} };
-    const cacheIsNoStore = options?.cache === "no-store";
-    if (cacheIsNoStore) {
-      delete nextOptions.revalidate;
-    } else if (isGetOrHead && nextOptions.revalidate === void 0 && "revalidate" in endpointConfig && typeof endpointConfig.revalidate === "number") {
-      nextOptions.revalidate = endpointConfig.revalidate;
-    }
-    if ("tags" in endpointConfig && Array.isArray(endpointConfig.tags)) {
-      const processedTags = endpointConfig.tags.map((tag) => {
-        let processedTag = tag;
-        if (params) {
-          Object.entries(params).forEach(([key, value]) => {
-            processedTag = processedTag.replace(`{${key}}`, String(value));
-          });
-        }
-        return /\{[^}]+\}/.test(processedTag) ? null : processedTag;
-      }).filter((tag) => tag !== null);
-      nextOptions.tags = Array.from(/* @__PURE__ */ new Set([...nextOptions.tags ?? [], ...processedTags]));
-    }
-    const requestInit = {
-      method,
-      ...options,
-      // Include credentials for same-origin requests (sends cookies for auth)
-      credentials: "same-origin",
-      // Don't include body for GET/HEAD requests
-      // FormData is pre-narrowed via isFormDataBody() above
-      body: isGetOrHead || body == null ? void 0 : formDataBody ?? JSON.stringify(body),
-      headers: {
-        ...options.headers,
-        ...headers,
-        // Include SDK version if set
-        ...sdkVersion && { "x-sdk-version": sdkVersion },
-        // Don't set Content-Type for GET/HEAD requests without body
-        ...isGetOrHead ? {} : formDataBody ? {} : { "Content-Type": "application/json" }
-      },
-      // Add Next.js caching options
-      next: Object.keys(nextOptions).length > 0 ? nextOptions : void 0
-    };
-    const fetchPromise = fetch(url, requestInit);
-    if (!isGetOrHead && "tags" in endpointConfig && Array.isArray(endpointConfig.tags)) {
-      const tags2 = endpointConfig.tags.map((tag) => tag);
+    const fetchPromise = fetch(plan.url, plan.init);
+    if (plan.cacheInvalidationTags) {
       return fetchPromise.then((response) => {
         if (response.ok) {
-          invalidateCacheTags(tags2, params);
+          invalidateCacheTags(plan.cacheInvalidationTags, params);
         }
         return response;
       });
@@ -42968,6 +42971,100 @@ function createRawCMSClient(headers = {}, baseUrl) {
     return fetchPromise;
   };
 }
+function buildApiRequestPlan(input) {
+  const { endpoint, body, params, headers = {}, baseUrl } = input;
+  const options = input.options ?? {};
+  let url = buildEndpointURL(baseUrl, endpoint);
+  const originalPath = API_ENDPOINTS[endpoint].path;
+  const unusedParams = {};
+  if (params) {
+    Object.entries(params).forEach(([key, value]) => {
+      const bracePlaceholder = `{${key}}`;
+      const colonPlaceholder = `:${key}`;
+      if (originalPath.includes(bracePlaceholder) || originalPath.includes(colonPlaceholder)) {
+        const stringValue2 = serializePathParam(endpoint, key, value);
+        url = url.replace(bracePlaceholder, stringValue2);
+        url = url.replace(colonPlaceholder, stringValue2);
+      } else {
+        unusedParams[key] = value;
+      }
+    });
+  }
+  const unresolvedPathParams = [
+    ...url.match(/\{[^}]+\}/g) ?? [],
+    ...url.match(/(^|\/):([A-Za-z][A-Za-z0-9_]*)\b/g) ?? []
+  ];
+  if (unresolvedPathParams.length > 0) {
+    const missingParams = Array.from(
+      new Set(
+        unresolvedPathParams.map((token) => {
+          if (token.startsWith("{") && token.endsWith("}")) {
+            return token.slice(1, -1);
+          }
+          return token.replace(/^\//, "").slice(1);
+        })
+      )
+    );
+    throw new Error(
+      `Missing required path params for endpoint ${String(endpoint)}: ${missingParams.join(", ")}`
+    );
+  }
+  const endpointConfig = API_ENDPOINTS[endpoint];
+  const method = endpointConfig.method;
+  const isGetOrHead = method === "GET" || method === "HEAD";
+  const queryParams = new URLSearchParams();
+  Object.entries(unusedParams).forEach(([key, value]) => {
+    appendQueryParam(queryParams, key, value);
+  });
+  if (isGetOrHead && typeof body === "object" && body !== null && !isFormDataBody(body)) {
+    Object.entries(body).forEach(([key, value]) => {
+      appendQueryParam(queryParams, key, value);
+    });
+  }
+  const queryString = queryParams.toString();
+  if (queryString) {
+    url += (url.includes("?") ? "&" : "?") + queryString;
+  }
+  const formDataBody = isFormDataBody(body) ? body : void 0;
+  const optionsNext = options?.next;
+  const nextOptions = { ...optionsNext ?? {} };
+  const cacheIsNoStore = options?.cache === "no-store";
+  if (cacheIsNoStore) {
+    delete nextOptions.revalidate;
+  } else if (isGetOrHead && nextOptions.revalidate === void 0 && "revalidate" in endpointConfig && typeof endpointConfig.revalidate === "number") {
+    nextOptions.revalidate = endpointConfig.revalidate;
+  }
+  if ("tags" in endpointConfig && Array.isArray(endpointConfig.tags)) {
+    const processedTags = endpointConfig.tags.map((tag) => {
+      let processedTag = tag;
+      if (params) {
+        Object.entries(params).forEach(([key, value]) => {
+          processedTag = processedTag.replace(`{${key}}`, String(value));
+        });
+      }
+      return /\{[^}]+\}/.test(processedTag) ? null : processedTag;
+    }).filter((tag) => tag !== null);
+    nextOptions.tags = Array.from(/* @__PURE__ */ new Set([...nextOptions.tags ?? [], ...processedTags]));
+  }
+  const init = {
+    method,
+    ...options,
+    credentials: "same-origin",
+    body: isGetOrHead || body == null ? void 0 : formDataBody ?? JSON.stringify(body),
+    headers: buildRequestHeaders({
+      optionsHeaders: options.headers,
+      authHeaders: headers,
+      sdkVersion: input.sdkVersion,
+      includeJsonContentType: !isGetOrHead && !formDataBody
+    }),
+    ...Object.keys(nextOptions).length > 0 ? { next: nextOptions } : {}
+  };
+  return {
+    url,
+    init,
+    ...!isGetOrHead && "tags" in endpointConfig && Array.isArray(endpointConfig.tags) ? { cacheInvalidationTags: endpointConfig.tags.map((tag) => tag) } : {}
+  };
+}
 function createParsedClient(rawClient) {
   return async (params) => {
     const response = await rawClient(params);
@@ -43909,8 +44006,8 @@ var TEMPLATE_BINDING_META_PATHS = [
   "createdAt",
   "updatedAt"
 ];
-function describeInvalidTemplateBindingMetaPath(path27) {
-  return `Meta path "${path27}" is not valid. Allowed: ${TEMPLATE_BINDING_META_PATHS.join(", ")}`;
+function describeInvalidTemplateBindingMetaPath(path28) {
+  return `Meta path "${path28}" is not valid. Allowed: ${TEMPLATE_BINDING_META_PATHS.join(", ")}`;
 }
 
 // ../content-model/src/routeTemplate.ts
@@ -43989,6 +44086,25 @@ function splitRouteSegments(routePattern) {
 function isUnsupportedDynamicSegment(segment) {
   return segment.startsWith(":") || segment.includes("{") || segment.includes("}");
 }
+var defaultContentSchema = z.record(
+  z.string(),
+  z.unknown()
+);
+function createSdkEntrySlotBlockInputSchema(contentSchema = defaultContentSchema) {
+  return z.object({
+    identifier: z.string().nullable().optional(),
+    kind: z.string().min(1, "Block kind is required"),
+    content: contentSchema
+  });
+}
+function createSdkEntrySlotBlocksInputSchema(contentSchema) {
+  return z.record(
+    z.string(),
+    z.array(createSdkEntrySlotBlockInputSchema(contentSchema))
+  );
+}
+createSdkEntrySlotBlockInputSchema();
+var sdkEntrySlotBlocksInputSchema = createSdkEntrySlotBlocksInputSchema();
 
 // src/contracts/bindings.ts
 var BINDING_TRANSFORMS = {
@@ -44299,7 +44415,7 @@ var contentConfigSchema = contentConfigBaseSchema.superRefine((data, ctx) => {
       });
     }
     const paths = data.pages.map((p) => p.path);
-    const duplicatePaths = paths.filter((path27, i) => paths.indexOf(path27) !== i);
+    const duplicatePaths = paths.filter((path28, i) => paths.indexOf(path28) !== i);
     if (duplicatePaths.length > 0) {
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
@@ -44356,18 +44472,18 @@ function validateLayoutNodeTypes(layout) {
     errors
   };
 }
-function validateNodeTypesRecursive(node, path27, errors) {
+function validateNodeTypesRecursive(node, path28, errors) {
   if (!ALLOWED_NODE_TYPES_SET.has(node.type)) {
     errors.push({
-      path: `${path27}.type`,
+      path: `${path28}.type`,
       type: "invalid_node_type",
       value: node.type,
-      message: `Unknown node type "${node.type}" at ${path27}. Valid types: section, stack, text, etc.`
+      message: `Unknown node type "${node.type}" at ${path28}. Valid types: section, stack, text, etc.`
     });
   }
   if (node.children && Array.isArray(node.children)) {
     node.children.forEach((child, index) => {
-      validateNodeTypesRecursive(child, `${path27}.children[${index}]`, errors);
+      validateNodeTypesRecursive(child, `${path28}.children[${index}]`, errors);
     });
   }
 }
@@ -44379,45 +44495,45 @@ function validateTransformIds(layout) {
     errors
   };
 }
-function validateTransformIdsRecursive(node, path27, errors) {
+function validateTransformIdsRecursive(node, path28, errors) {
   if (node.$bind?.transforms && Array.isArray(node.$bind.transforms)) {
-    validateTransformList(node.$bind.transforms, `${path27}.$bind.transforms`, errors);
+    validateTransformList(node.$bind.transforms, `${path28}.$bind.transforms`, errors);
   }
   if (node.$repeat?.collection?.transforms && Array.isArray(node.$repeat.collection.transforms)) {
-    validateTransformList(node.$repeat.collection.transforms, `${path27}.$repeat.collection.transforms`, errors);
+    validateTransformList(node.$repeat.collection.transforms, `${path28}.$repeat.collection.transforms`, errors);
   }
   if (node.$when?.when?.transforms && Array.isArray(node.$when.when.transforms)) {
-    validateTransformList(node.$when.when.transforms, `${path27}.$when.when.transforms`, errors);
+    validateTransformList(node.$when.when.transforms, `${path28}.$when.when.transforms`, errors);
   }
   if (node.$scopes && Array.isArray(node.$scopes)) {
     node.$scopes.forEach((scope, index) => {
       if (scope.from?.transforms && Array.isArray(scope.from.transforms)) {
-        validateTransformList(scope.from.transforms, `${path27}.$scopes[${index}].from.transforms`, errors);
+        validateTransformList(scope.from.transforms, `${path28}.$scopes[${index}].from.transforms`, errors);
       }
     });
   }
   if (node.props) {
-    validatePropsTransforms(node.props, `${path27}.props`, errors);
+    validatePropsTransforms(node.props, `${path28}.props`, errors);
   }
   if (node.children && Array.isArray(node.children)) {
     node.children.forEach((child, index) => {
-      validateTransformIdsRecursive(child, `${path27}.children[${index}]`, errors);
+      validateTransformIdsRecursive(child, `${path28}.children[${index}]`, errors);
     });
   }
 }
-function validateTransformList(transforms, path27, errors) {
+function validateTransformList(transforms, path28, errors) {
   transforms.forEach((transform, index) => {
     if (!ALLOWED_TRANSFORM_IDS_SET.has(transform.id)) {
       errors.push({
-        path: `${path27}[${index}].id`,
+        path: `${path28}[${index}].id`,
         type: "invalid_transform_id",
         value: transform.id,
-        message: `Unknown transform "${transform.id}" at ${path27}. Valid transforms: string.uppercase, value.fallback, etc.`
+        message: `Unknown transform "${transform.id}" at ${path28}. Valid transforms: string.uppercase, value.fallback, etc.`
       });
     }
   });
 }
-function validatePropsTransforms(props2, path27, errors) {
+function validatePropsTransforms(props2, path28, errors) {
   for (const [key, value] of Object.entries(props2)) {
     if (isBindingObject(value)) {
       const binding = value;
@@ -44425,16 +44541,16 @@ function validatePropsTransforms(props2, path27, errors) {
         binding.$bind.transforms.forEach((transform, index) => {
           if (!ALLOWED_TRANSFORM_IDS_SET.has(transform.id)) {
             errors.push({
-              path: `${path27}.${key}.$bind.transforms[${index}].id`,
+              path: `${path28}.${key}.$bind.transforms[${index}].id`,
               type: "invalid_transform_id",
               value: transform.id,
-              message: `Unknown transform "${transform.id}" at ${path27}.${key}. Valid transforms: string.uppercase, value.fallback, etc.`
+              message: `Unknown transform "${transform.id}" at ${path28}.${key}. Valid transforms: string.uppercase, value.fallback, etc.`
             });
           }
         });
       }
     } else if (value && typeof value === "object" && !Array.isArray(value)) {
-      validatePropsTransforms(value, `${path27}.${key}`, errors);
+      validatePropsTransforms(value, `${path28}.${key}`, errors);
     }
   }
 }
@@ -44964,8 +45080,8 @@ async function readApiResponse(response, requestInfo, options = {}) {
 function createHttpClient(config2) {
   const baseUrl = `${config2.dashboardUrl}/api/sdk/${config2.siteId}`;
   const timeout = config2.timeout ?? 3e4;
-  async function request(method, path27, options) {
-    let url = `${baseUrl}${path27}`;
+  async function request(method, path28, options) {
+    let url = `${baseUrl}${path28}`;
     if (options?.params && Object.keys(options.params).length > 0) {
       const searchParams = new URLSearchParams(options.params);
       url = `${url}?${searchParams.toString()}`;
@@ -44988,7 +45104,7 @@ function createHttpClient(config2) {
     } catch (error) {
       const requestInfo2 = buildRequestInfo({
         method,
-        path: path27,
+        path: path28,
         url,
         baseUrl,
         dashboardUrl: config2.dashboardUrl,
@@ -45013,7 +45129,7 @@ function createHttpClient(config2) {
     }
     const requestInfo = buildRequestInfo({
       method,
-      path: path27,
+      path: path28,
       url,
       baseUrl,
       dashboardUrl: config2.dashboardUrl,
@@ -45043,17 +45159,17 @@ function createHttpClient(config2) {
     return json.data;
   }
   return {
-    async get(path27, params) {
-      return request("GET", path27, { params });
+    async get(path28, params) {
+      return request("GET", path28, { params });
     },
-    async post(path27, body) {
-      return request("POST", path27, { body });
+    async post(path28, body) {
+      return request("POST", path28, { body });
     },
-    async patch(path27, body) {
-      return request("PATCH", path27, { body });
+    async patch(path28, body) {
+      return request("PATCH", path28, { body });
     },
-    async delete(path27, body) {
-      await request("DELETE", path27, { body });
+    async delete(path28, body) {
+      await request("DELETE", path28, { body });
     }
   };
 }
@@ -46498,12 +46614,12 @@ function collectPushConfigSyncWarnings(sync) {
 async function pushToDashboard(output, dashboardUrl, siteId, apiKey, config2, options) {
   const normalizedDashboardUrl = dashboardUrl.replace(/\/+$/, "");
   const baseUrl = `${normalizedDashboardUrl}/api`;
-  const path27 = `/sites/${siteId}/sdk-config`;
-  const pushUrl = `${baseUrl}${path27}`;
+  const path28 = `/sites/${siteId}/sdk-config`;
+  const pushUrl = `${baseUrl}${path28}`;
   output.info(`Pushing config to ${pushUrl}...`);
   const requestInfo = {
     method: "POST",
-    path: path27,
+    path: path28,
     url: pushUrl,
     baseUrl,
     dashboardUrl: normalizedDashboardUrl,
@@ -47307,6 +47423,7 @@ function toWritableLocalEvent(event) {
     identifier: event.identifier,
     title: event.title,
     slug: event.slug,
+    path: event.path,
     status: event.status,
     visibility: event.visibility,
     schedule: event.schedule,
@@ -47319,7 +47436,8 @@ function toWritableLocalEvent(event) {
     formRef: event.formRef,
     settings: event.settings,
     presentation: event.presentation,
-    tags: event.tags
+    tags: event.tags,
+    blocks: event.blocks
   };
 }
 async function writeCourses(contentDir, pulledCourses, options) {
@@ -47708,13 +47826,16 @@ async function readEventCategories(contentDir) {
   return categories;
 }
 async function readEvents(contentDir) {
+  return (await readEventsWithFilePaths(contentDir)).map(({ filePath: _filePath, ...event }) => event);
+}
+async function readEventsWithFilePaths(contentDir) {
   const eventsDir = path5.join(contentDir, "events");
   const events = [];
   const files = await listFiles(eventsDir, ".json");
   for (const filePath of files) {
     try {
       const event = await readJsonFile(filePath);
-      events.push(event);
+      events.push({ ...event, filePath });
     } catch (error) {
       console.warn(`Warning: Could not parse ${filePath}:`, error);
     }
@@ -49377,11 +49498,11 @@ function findChangedFields(local, remote, prefix = "") {
   const changes = [];
   const allKeys = /* @__PURE__ */ new Set([...Object.keys(local), ...Object.keys(remote)]);
   for (const key of allKeys) {
-    const path27 = prefix ? `${prefix}.${key}` : key;
+    const path28 = prefix ? `${prefix}.${key}` : key;
     const localVal = local[key];
     const remoteVal = remote[key];
     if (!equal(localVal, remoteVal)) {
-      changes.push(path27);
+      changes.push(path28);
     }
   }
   return changes;
@@ -50451,11 +50572,11 @@ function findChangedFieldsWithValues(local, remote, prefix = "") {
   const changes = [];
   const allKeys = /* @__PURE__ */ new Set([...Object.keys(local), ...Object.keys(remote)]);
   for (const key of allKeys) {
-    const path27 = prefix ? `${prefix}.${key}` : key;
+    const path28 = prefix ? `${prefix}.${key}` : key;
     const localVal = local[key];
     const remoteVal = remote[key];
     if (!equal(localVal, remoteVal)) {
-      changes.push({ path: path27, before: remoteVal, after: localVal });
+      changes.push({ path: path28, before: remoteVal, after: localVal });
     }
   }
   return changes;
@@ -50872,6 +50993,19 @@ function maskPullDiffForScope(diff, pullScope) {
   }
   return diff;
 }
+
+// src/cli/commands/pull-dated-offering-scope.ts
+function isDatedOfferingPullScope(scope) {
+  return scope === "venues" || scope === "event-categories" || scope === "events" || scope === "courses";
+}
+function filterPullItemsByIdentifier(items, identifier, getIdentifier) {
+  return identifier ? items.filter((item) => getIdentifier(item) === identifier) : [...items];
+}
+function reportMissingScopedPullItem(input) {
+  if (!input.identifier || input.found) return false;
+  input.output.error(`${input.scope} item not found: ${input.identifier}`);
+  return true;
+}
 var CANONICAL_EVENT_ENTRY_TYPE = "event";
 var EVENT_MIGRATION_COMMAND = "riverbankcms migrate events";
 var EVENT_PUSH_COMMAND = "riverbankcms push events";
@@ -51170,7 +51304,8 @@ function mapRemoteEventToLocalComparable(e) {
     formRef: e.formRef,
     settings: e.settings,
     presentation: e.presentation,
-    tags: e.tags
+    tags: e.tags,
+    blocks: e.blocks
   };
 }
 function mapLocalEventToComparable(e) {
@@ -51189,7 +51324,8 @@ function mapLocalEventToComparable(e) {
     formRef: e.formRef,
     settings: e.settings,
     presentation: e.presentation,
-    tags: e.tags
+    tags: e.tags,
+    blocks: e.blocks
   };
 }
 function mapRemoteCourseToLocalComparable(course) {
@@ -51501,7 +51637,7 @@ async function warnForLocalLegacyEventEntries(input) {
     formatLegacyEventEntryWarning(legacyEventEntryFiles)
   );
 }
-var pullCommand = new Command("pull").description("Pull content from CMS").argument("[scope]", "What to pull: entries, pages, navigation, settings, forms, theme, footer, venues, event-categories, events, courses, or all (default)").argument("[type]", "Content type (entries) or page identifier (pages)").argument("[identifier]", 'Entry identifier (when scope is "entries" and type is set)').option("--output <dir>", "Output directory", "./content").option("--force", "Overwrite existing files without prompting").option("--yes", "Skip confirmation prompt (same as --force)").option("--sync-media", "Sync media files from source to target environment").option("--overwrite-media", "When using --sync-media, overwrite target media on checksum mismatch").option("--local-media", "Download media referenced by identifiers to content/media").option("--dry-run", "Show what would be pulled without writing files").option("--json-diff [mode]", "Output diff as JSON (summary or full)", "summary").option("--with-theme", "Also pull theme when pulling all content").option("--name <name>", "Theme name for theme pull / --with-theme (default: current)").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("after", `
+var pullCommand = new Command("pull").description("Pull content from CMS").argument("[scope]", "What to pull: entries, pages, navigation, settings, forms, theme, footer, venues, event-categories, events, courses, or all (default)").argument("[type]", "Content type (entries) or item identifier (pages, venues, event-categories, events, courses)").argument("[identifier]", 'Entry identifier (when scope is "entries" and type is set)').option("--output <dir>", "Output directory", "./content").option("--force", "Overwrite existing files without prompting").option("--yes", "Skip confirmation prompt (same as --force)").option("--sync-media", "Sync media files from source to target environment").option("--overwrite-media", "When using --sync-media, overwrite target media on checksum mismatch").option("--local-media", "Download media referenced by identifiers to content/media").option("--dry-run", "Show what would be pulled without writing files").option("--json-diff [mode]", "Output diff as JSON (summary or full)", "summary").option("--with-theme", "Also pull theme when pulling all content").option("--name <name>", "Theme name for theme pull / --with-theme (default: current)").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("after", `
 Examples:
   $ riverbankcms pull                         # Pull all content
   $ riverbankcms pull --dry-run               # Preview what would be pulled
@@ -51520,7 +51656,9 @@ Examples:
   $ riverbankcms pull venues                  # Pull venues
   $ riverbankcms pull event-categories        # Pull event categories
   $ riverbankcms pull events                  # Pull events
+  $ riverbankcms pull events the-whole-in-your-heart  # Pull a specific event
   $ riverbankcms pull courses                 # Pull courses
+  $ riverbankcms pull courses beginners       # Pull a specific course
   $ riverbankcms pull theme                   # Pull theme to content/themes/current.json
   $ riverbankcms pull theme --name=neon       # Pull theme to content/themes/neon.json
   $ riverbankcms pull --output ./src/content  # Custom output directory
@@ -51588,7 +51726,7 @@ Media Sync:
         const resolvedJsonDiffMode = jsonDiffMode ?? (options.jsonDiff === true ? "summary" : void 0);
         if (identifier && pullScope2 !== "entries") {
           output.error("An item identifier is only supported for entries pulls", {
-            suggestion: 'Use "riverbankcms pull pages <page-identifier>" for a single page.'
+            suggestion: 'Use "riverbankcms pull events <event-identifier>" or "riverbankcms pull pages <page-identifier>" with the identifier as the second argument.'
           });
           return;
         }
@@ -51732,17 +51870,23 @@ Media Sync:
           }
           process.exitCode = 1;
         };
-        if (pullScope2 === "venues" || pullScope2 === "event-categories" || pullScope2 === "events" || pullScope2 === "courses") {
+        if (isDatedOfferingPullScope(pullScope2)) {
           const hasLocal = await contentDirExists(contentDir);
           const label = pullScope2 === "venues" ? "Venues" : pullScope2 === "event-categories" ? "Event Categories" : pullScope2 === "events" ? "Events" : "Courses";
           if (pullScope2 === "venues") {
             const result = await client.pull.venues();
+            if (reportMissingScopedPullItem({
+              output,
+              scope: pullScope2,
+              identifier: type,
+              found: result.venues.some((venue) => venue.slug === type)
+            })) return;
             const local = hasLocal ? await readVenues(contentDir) : [];
             await handleDryRunKeyedArrayScope({
               scope: "venues",
               label,
-              remoteItems: result.venues,
-              localItems: local,
+              remoteItems: filterPullItemsByIdentifier(result.venues, type, (venue) => venue.slug),
+              localItems: filterPullItemsByIdentifier(local, type, (venue) => venue.slug),
               getRemoteId: (v) => v.slug,
               getLocalId: (v) => v.slug,
               remoteToComparable: mapRemoteVenueToLocalComparable,
@@ -51752,12 +51896,18 @@ Media Sync:
           }
           if (pullScope2 === "event-categories") {
             const result = await client.pull.eventCategories();
+            if (reportMissingScopedPullItem({
+              output,
+              scope: pullScope2,
+              identifier: type,
+              found: result.eventCategories.some((category) => category.identifier === type)
+            })) return;
             const local = hasLocal ? await readEventCategories(contentDir) : [];
             await handleDryRunKeyedArrayScope({
               scope: "event-categories",
               label,
-              remoteItems: result.eventCategories,
-              localItems: local,
+              remoteItems: filterPullItemsByIdentifier(result.eventCategories, type, (category) => category.identifier),
+              localItems: filterPullItemsByIdentifier(local, type, (category) => category.identifier),
               getRemoteId: (c) => c.identifier,
               getLocalId: (c) => c.identifier,
               remoteToComparable: mapRemoteEventCategoryToLocalComparable,
@@ -51767,12 +51917,18 @@ Media Sync:
           }
           if (pullScope2 === "courses") {
             const result = await client.pull.courses();
+            if (reportMissingScopedPullItem({
+              output,
+              scope: pullScope2,
+              identifier: type,
+              found: result.courses.some((course) => course.identifier === type)
+            })) return;
             const local = hasLocal ? await readCourses(contentDir) : [];
             await handleDryRunKeyedArrayScope({
               scope: "courses",
               label,
-              remoteItems: result.courses,
-              localItems: local,
+              remoteItems: filterPullItemsByIdentifier(result.courses, type, (course) => course.identifier),
+              localItems: filterPullItemsByIdentifier(local, type, (course) => course.identifier),
               getRemoteId: (course) => course.identifier,
               getLocalId: (course) => course.identifier,
               remoteToComparable: mapRemoteCourseToLocalComparable,
@@ -51782,12 +51938,18 @@ Media Sync:
           }
           {
             const result = await client.pull.events();
+            if (reportMissingScopedPullItem({
+              output,
+              scope: pullScope2,
+              identifier: type,
+              found: result.events.some((event) => event.identifier === type)
+            })) return;
             const local = hasLocal ? await readEvents(contentDir) : [];
             await handleDryRunKeyedArrayScope({
               scope: "events",
               label,
-              remoteItems: result.events,
-              localItems: local,
+              remoteItems: filterPullItemsByIdentifier(result.events, type, (event) => event.identifier),
+              localItems: filterPullItemsByIdentifier(local, type, (event) => event.identifier),
               getRemoteId: (e) => e.identifier,
               getLocalId: (e) => e.identifier,
               remoteToComparable: mapRemoteEventToLocalComparable,
@@ -51956,7 +52118,7 @@ Media Sync:
       const dirExists = await contentDirExists(contentDir);
       if (identifier && pullScope !== "entries") {
         output.error("An item identifier is only supported for entries pulls", {
-          suggestion: 'Use "riverbankcms pull pages <page-identifier>" for a single page.'
+          suggestion: 'Use "riverbankcms pull events <event-identifier>" or "riverbankcms pull pages <page-identifier>" with the identifier as the second argument.'
         });
         return;
       }
@@ -52186,8 +52348,15 @@ Media Sync:
           break;
         }
         case "venues": {
-          output.info("Pulling venues");
+          output.info(`Pulling venues${type ? ` ${type}` : ""}`);
           const result = await client.pull.venues();
+          if (reportMissingScopedPullItem({
+            output,
+            scope: "venues",
+            identifier: type,
+            found: result.venues.some((venue) => venue.slug === type)
+          })) return;
+          result.venues = filterPullItemsByIdentifier(result.venues, type, (venue) => venue.slug);
           const mediaContent = createScopedPullContent(result.meta, { venues: result.venues });
           await applyMediaIdentifiers(mediaContent);
           await syncMediaIfRequested(mediaContent);
@@ -52196,8 +52365,15 @@ Media Sync:
           break;
         }
         case "event-categories": {
-          output.info("Pulling event categories");
+          output.info(`Pulling event categories${type ? ` ${type}` : ""}`);
           const result = await client.pull.eventCategories();
+          if (reportMissingScopedPullItem({
+            output,
+            scope: "event-categories",
+            identifier: type,
+            found: result.eventCategories.some((category) => category.identifier === type)
+          })) return;
+          result.eventCategories = filterPullItemsByIdentifier(result.eventCategories, type, (category) => category.identifier);
           const mediaContent = createScopedPullContent(result.meta, { eventCategories: result.eventCategories });
           await applyMediaIdentifiers(mediaContent);
           await syncMediaIfRequested(mediaContent);
@@ -52206,8 +52382,15 @@ Media Sync:
           break;
         }
         case "events": {
-          output.info("Pulling events");
+          output.info(`Pulling events${type ? ` ${type}` : ""}`);
           const result = await client.pull.events();
+          if (reportMissingScopedPullItem({
+            output,
+            scope: "events",
+            identifier: type,
+            found: result.events.some((event) => event.identifier === type)
+          })) return;
+          result.events = filterPullItemsByIdentifier(result.events, type, (event) => event.identifier);
           const mediaContent = createScopedPullContent(result.meta, { events: result.events });
           await applyMediaIdentifiers(mediaContent);
           await syncMediaIfRequested(mediaContent);
@@ -52217,8 +52400,15 @@ Media Sync:
           break;
         }
         case "courses": {
-          output.info("Pulling courses");
+          output.info(`Pulling courses${type ? ` ${type}` : ""}`);
           const result = await client.pull.courses();
+          if (reportMissingScopedPullItem({
+            output,
+            scope: "courses",
+            identifier: type,
+            found: result.courses.some((course) => course.identifier === type)
+          })) return;
+          result.courses = filterPullItemsByIdentifier(result.courses, type, (course) => course.identifier);
           const mediaContent = createScopedPullContent(result.meta, { courses: result.courses });
           await applyMediaIdentifiers(mediaContent);
           await syncMediaIfRequested(mediaContent);
@@ -52612,8 +52802,8 @@ function normalizeLocalContentShape(content) {
 var identifierRegex = /^[a-z0-9][a-z0-9-]*$/;
 var currencyRegex = /^[A-Z]{3}$/;
 var isoDateTimeRegex = /^\d{4}-\d{2}-\d{2}T.+/;
-function issue2(path27, message) {
-  return { path: path27, message };
+function issue2(path28, message) {
+  return { path: path28, message };
 }
 function isRecord15(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -52630,27 +52820,27 @@ function isWholeMinuteIsoDateTime(value) {
   return Number.isFinite(epochMs) && epochMs % 6e4 === 0;
 }
 function validateTicketType(raw, index, currency) {
-  const path27 = ["ticketTypes", String(index)];
-  if (!isRecord15(raw)) return [issue2(path27, "Ticket type must be an object")];
+  const path28 = ["ticketTypes", String(index)];
+  if (!isRecord15(raw)) return [issue2(path28, "Ticket type must be an object")];
   const issues = [];
   const identifier = raw.identifier;
   if (typeof identifier !== "string" || !identifierRegex.test(identifier)) {
     issues.push(
       issue2(
-        [...path27, "identifier"],
+        [...path28, "identifier"],
         "Ticket identifier must use lowercase letters, numbers, and hyphens"
       )
     );
   }
   const name = raw.name;
   if (typeof name !== "string" || name.trim().length === 0) {
-    issues.push(issue2([...path27, "name"], "Ticket name is required"));
+    issues.push(issue2([...path28, "name"], "Ticket name is required"));
   }
   const priceAmount = raw.priceAmount;
   if (!isWholeNumber(priceAmount) || priceAmount < 0) {
     issues.push(
       issue2(
-        [...path27, "priceAmount"],
+        [...path28, "priceAmount"],
         "Ticket priceAmount must be a non-negative integer"
       )
     );
@@ -52659,7 +52849,7 @@ function validateTicketType(raw, index, currency) {
   if (priceCurrency !== void 0 && priceCurrency !== null && priceCurrency !== currency) {
     issues.push(
       issue2(
-        [...path27, "priceCurrency"],
+        [...path28, "priceCurrency"],
         "Ticket priceCurrency must match pricing.priceCurrency"
       )
     );
@@ -52668,7 +52858,7 @@ function validateTicketType(raw, index, currency) {
   if (sortOrder !== void 0 && (!isWholeNumber(sortOrder) || sortOrder < 0)) {
     issues.push(
       issue2(
-        [...path27, "sortOrder"],
+        [...path28, "sortOrder"],
         "Ticket sortOrder must be a non-negative integer"
       )
     );
@@ -52677,7 +52867,7 @@ function validateTicketType(raw, index, currency) {
   if (capacityLimit2 !== void 0 && capacityLimit2 !== null && (!isWholeNumber(capacityLimit2) || capacityLimit2 < 1)) {
     issues.push(
       issue2(
-        [...path27, "capacityLimit"],
+        [...path28, "capacityLimit"],
         "Ticket capacityLimit must be a positive integer"
       )
     );
@@ -52686,7 +52876,7 @@ function validateTicketType(raw, index, currency) {
   if (attendanceScope !== void 0 && attendanceScope !== "in_person" && attendanceScope !== "online" && attendanceScope !== "both") {
     issues.push(
       issue2(
-        [...path27, "attendanceScope"],
+        [...path28, "attendanceScope"],
         "Ticket attendanceScope must be in_person, online, or both"
       )
     );
@@ -52695,7 +52885,7 @@ function validateTicketType(raw, index, currency) {
   if (saleStartsAt !== void 0 && saleStartsAt !== null && (typeof saleStartsAt !== "string" || !isWholeMinuteIsoDateTime(saleStartsAt))) {
     issues.push(
       issue2(
-        [...path27, "saleStartsAt"],
+        [...path28, "saleStartsAt"],
         "Ticket saleStartsAt must be an ISO datetime aligned to a whole minute"
       )
     );
@@ -52704,7 +52894,7 @@ function validateTicketType(raw, index, currency) {
   if (saleEndsAt !== void 0 && saleEndsAt !== null && (typeof saleEndsAt !== "string" || !isWholeMinuteIsoDateTime(saleEndsAt))) {
     issues.push(
       issue2(
-        [...path27, "saleEndsAt"],
+        [...path28, "saleEndsAt"],
         "Ticket saleEndsAt must be an ISO datetime aligned to a whole minute"
       )
     );
@@ -52712,7 +52902,7 @@ function validateTicketType(raw, index, currency) {
   if (typeof saleStartsAt === "string" && typeof saleEndsAt === "string" && Date.parse(saleEndsAt) <= Date.parse(saleStartsAt)) {
     issues.push(
       issue2(
-        [...path27, "saleEndsAt"],
+        [...path28, "saleEndsAt"],
         "Ticket saleEndsAt must be after saleStartsAt"
       )
     );
@@ -52721,7 +52911,7 @@ function validateTicketType(raw, index, currency) {
   if (cmsTicketTypeId !== void 0 && cmsTicketTypeId !== null && (typeof cmsTicketTypeId !== "string" || cmsTicketTypeId.length === 0)) {
     issues.push(
       issue2(
-        [...path27, "cmsTicketTypeId"],
+        [...path28, "cmsTicketTypeId"],
         "Ticket cmsTicketTypeId must be a non-empty string"
       )
     );
@@ -52905,8 +53095,8 @@ var supportedKinds = /* @__PURE__ */ new Set([
   "deferred_manual",
   "flexible_balance"
 ]);
-function issue3(path27, message) {
-  return { path: path27, message };
+function issue3(path28, message) {
+  return { path: path28, message };
 }
 function isRecord16(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -52923,15 +53113,15 @@ function isDepositRefundability(value) {
 function isSupportedOptionKind(value) {
   return typeof value === "string" && supportedKinds.has(value);
 }
-function validateFlexibleBalanceDueDateRule(raw, path27) {
+function validateFlexibleBalanceDueDateRule(raw, path28) {
   if (!isRecord16(raw)) {
-    return [issue3(path27, "Flexible balance dueDateRule must be an object")];
+    return [issue3(path28, "Flexible balance dueDateRule must be an object")];
   }
   if (raw.kind === "relative_to_start_date") {
     if (!isPositiveWholeNumber(raw.daysBeforeStart)) {
       return [
         issue3(
-          [...path27, "daysBeforeStart"],
+          [...path28, "daysBeforeStart"],
           "Flexible balance daysBeforeStart must be a positive integer"
         )
       ];
@@ -52945,7 +53135,7 @@ function validateFlexibleBalanceDueDateRule(raw, path27) {
     if (typeof raw.dueAt !== "string" || !Number.isFinite(Date.parse(raw.dueAt))) {
       return [
         issue3(
-          [...path27, "dueAt"],
+          [...path28, "dueAt"],
           "Flexible balance fixed dueAt must be an ISO datetime"
         )
       ];
@@ -52957,14 +53147,14 @@ function validateFlexibleBalanceDueDateRule(raw, path27) {
   }
   return [
     issue3(
-      [...path27, "kind"],
+      [...path28, "kind"],
       "Flexible balance dueDateRule kind must be relative_to_start_date or fixed_calendar_date"
     )
   ];
 }
-function validateFlexibleBalanceConfig(raw, path27) {
+function validateFlexibleBalanceConfig(raw, path28) {
   if (!isRecord16(raw)) {
-    return [issue3(path27, "Flexible balance config must be an object")];
+    return [issue3(path28, "Flexible balance config must be an object")];
   }
   const issues = [];
   const upfrontAmountCents = raw.upfrontAmountCents;
@@ -52974,7 +53164,7 @@ function validateFlexibleBalanceConfig(raw, path27) {
   if (!isWholeNumber2(upfrontAmountCents) || upfrontAmountCents < 0) {
     issues.push(
       issue3(
-        [...path27, "upfrontAmountCents"],
+        [...path28, "upfrontAmountCents"],
         "Flexible balance upfrontAmountCents must be a non-negative integer"
       )
     );
@@ -52984,7 +53174,7 @@ function validateFlexibleBalanceConfig(raw, path27) {
   if (!isDepositRefundability(depositRefundability)) {
     issues.push(
       issue3(
-        [...path27, "depositRefundability"],
+        [...path28, "depositRefundability"],
         "Flexible balance depositRefundability must be refundable or non_refundable"
       )
     );
@@ -52993,7 +53183,7 @@ function validateFlexibleBalanceConfig(raw, path27) {
   }
   const dueDateRule = validateFlexibleBalanceDueDateRule(
     raw.dueDateRule,
-    [...path27, "dueDateRule"]
+    [...path28, "dueDateRule"]
   );
   if (Array.isArray(dueDateRule)) {
     issues.push(...dueDateRule);
@@ -53008,14 +53198,14 @@ function validateFlexibleBalanceConfig(raw, path27) {
   };
 }
 function validateCollectionOption(raw, index) {
-  const path27 = ["allowedOptions", String(index)];
+  const path28 = ["allowedOptions", String(index)];
   if (!isRecord16(raw)) {
-    return [issue3(path27, "Payment option must be an object")];
+    return [issue3(path28, "Payment option must be an object")];
   }
   if (raw.kind === "instalment_plan") {
     return [
       issue3(
-        [...path27, "kind"],
+        [...path28, "kind"],
         "Event instalment plans are not supported yet. Use upfront, deferred_manual, or flexible_balance."
       )
     ];
@@ -53023,7 +53213,7 @@ function validateCollectionOption(raw, index) {
   if (!isSupportedOptionKind(raw.kind)) {
     return [
       issue3(
-        [...path27, "kind"],
+        [...path28, "kind"],
         "Payment option kind must be upfront, deferred_manual, or flexible_balance"
       )
     ];
@@ -53034,7 +53224,7 @@ function validateCollectionOption(raw, index) {
       return { kind: raw.kind };
     case "flexible_balance": {
       const config2 = validateFlexibleBalanceConfig(raw.config, [
-        ...path27,
+        ...path28,
         "config"
       ]);
       if (Array.isArray(config2)) {
@@ -54504,6 +54694,7 @@ var upsertEventSeriesCommandSchema = z.object({
   ref: eventSeriesRefSchema,
   input: z.object({
     slug: z.string().min(1),
+    path: z.string().startsWith("/").nullable().optional(),
     title: z.string().min(1),
     archetype: z.enum(offeringArchetypes),
     status: z.enum(["draft", "active", "archived", "cancelled"]).optional(),
@@ -54528,6 +54719,7 @@ var upsertEventSeriesCommandSchema = z.object({
     paymentTerms: z.unknown().optional(),
     presentation: unknownRecordSchema.nullable().optional(),
     tags: z.array(z.string()).readonly().optional(),
+    blocks: entrySlotBlocksSchema.optional(),
     staffRefs: z.array(staffRefSchema).readonly().optional()
   }).strict()
 }).strict();
@@ -55905,13 +56097,13 @@ function collectOfferingRequires(input, intervals, intervalPath) {
 function optionalRef(ref, field) {
   return ref ? [{ ref, field }] : [];
 }
-function collectVenueRefsFromIntervals(intervals, path27) {
-  return intervals.flatMap((interval, index) => optionalRef(interval.venueRef, `${path27}[${index}].venueRef`));
+function collectVenueRefsFromIntervals(intervals, path28) {
+  return intervals.flatMap((interval, index) => optionalRef(interval.venueRef, `${path28}[${index}].venueRef`));
 }
-function collectNavigationRefs(items, path27) {
+function collectNavigationRefs(items, path28) {
   return items.flatMap((item, index) => {
     if (!isRecord18(item)) return [];
-    const itemPath = `${path27}[${index}]`;
+    const itemPath = `${path28}[${index}]`;
     const refs = [];
     if (typeof item.pageRef === "string") {
       refs.push({ ref: item.pageRef, field: `${itemPath}.pageRef` });
@@ -55925,26 +56117,26 @@ function collectNavigationRefs(items, path27) {
     return refs;
   });
 }
-function collectBlockRefs(blocks, path27) {
+function collectBlockRefs(blocks, path28) {
   return blocks.flatMap((block, index) => {
     if (!isRecord18(block)) return [];
-    const blockPath = `${path27}[${index}]`;
+    const blockPath = `${path28}[${index}]`;
     return [
       ...collectNestedRefs(block.props, `${blockPath}.props`),
       ...collectNestedRefs(block.children, `${blockPath}.children`)
     ];
   });
 }
-function collectNestedRefs(value, path27) {
+function collectNestedRefs(value, path28) {
   if (typeof value === "string") {
     const parsed = parseResourceRef(value);
-    return parsed.ok ? [{ ref: value, field: path27 }] : [];
+    return parsed.ok ? [{ ref: value, field: path28 }] : [];
   }
   if (Array.isArray(value)) {
-    return value.flatMap((item, index) => collectNestedRefs(item, `${path27}[${index}]`));
+    return value.flatMap((item, index) => collectNestedRefs(item, `${path28}[${index}]`));
   }
   if (!isRecord18(value)) return [];
-  return Object.entries(value).flatMap(([key, child]) => collectNestedRefs(child, `${path27}.${key}`));
+  return Object.entries(value).flatMap(([key, child]) => collectNestedRefs(child, `${path28}.${key}`));
 }
 
 // ../site-commands/src/staticExecutionGaps.ts
@@ -56223,8 +56415,8 @@ function invalidPayloadError(input, issue5) {
     message: `${field}: ${issue5.message}`
   };
 }
-function commandIndexForIssuePath(path27) {
-  return path27[0] === "commands" && typeof path27[1] === "number" ? path27[1] : -1;
+function commandIndexForIssuePath(path28) {
+  return path28[0] === "commands" && typeof path28[1] === "number" ? path28[1] : -1;
 }
 function commandTypeForIssue(input, commandIndex) {
   if (!isRecord18(input) || !isUnknownArray3(input.commands)) return null;
@@ -56234,9 +56426,9 @@ function commandTypeForIssue(input, commandIndex) {
 function isUnknownArray3(value) {
   return Array.isArray(value);
 }
-function formatIssuePath(path27) {
-  if (path27.length === 0) return "<root>";
-  return path27.reduce((formatted, segment) => {
+function formatIssuePath(path28) {
+  if (path28.length === 0) return "<root>";
+  return path28.reduce((formatted, segment) => {
     if (typeof segment === "number") return `${formatted}[${segment}]`;
     if (formatted.length === 0) return String(segment);
     return `${formatted}.${String(segment)}`;
@@ -56905,8 +57097,8 @@ init_src();
 var timeRegex = /^([01]\d|2[0-3]):([0-5]\d)(:([0-5]\d))?$/;
 var explicitOffsetDateTimeRegex = /^(\d{4})-(\d{2})-(\d{2})T([01]\d|2[0-3]):([0-5]\d)(?::([0-5]\d))?(\.\d{1,3})?(Z|[+-]([01]\d|2[0-3]):[0-5]\d)$/;
 var localDateTimeRegex = /^(\d{4})-(\d{2})-(\d{2})T([01]\d|2[0-3]):([0-5]\d)(?::([0-5]\d))?(\.\d{1,3})?$/;
-function issue4(path27, message) {
-  return { path: path27, message };
+function issue4(path28, message) {
+  return { path: path28, message };
 }
 function isValidDateParts(year, month, day) {
   const date = new Date(Date.UTC(year, month - 1, day));
@@ -57330,6 +57522,7 @@ function eventSeriesCommand(event) {
     ref: createEventSeriesRef([event.identifier]),
     input: {
       slug: event.slug,
+      path: event.path,
       title: event.title,
       archetype: "custom",
       status: event.status === "completed" ? void 0 : event.status,
@@ -57354,7 +57547,8 @@ function eventSeriesCommand(event) {
       settings: event.settings,
       paymentTerms: event.paymentTerms,
       presentation: event.presentation,
-      tags: event.tags
+      tags: event.tags,
+      blocks: event.blocks
     }
   });
 }
@@ -57518,6 +57712,7 @@ function eventSeriesUpsertInput(command) {
     identifier: command.input.slug,
     title: command.input.title,
     slug: command.input.slug,
+    path: command.input.path,
     status: command.input.status,
     visibility: managementVisibility(command.input.visibility),
     schedule: scheduleFromOccurrence(occurrence),
@@ -57532,7 +57727,8 @@ function eventSeriesUpsertInput(command) {
     formRef: command.input.formIdentifier ?? (command.input.formRef ? refSlug(command.input.formRef) : null),
     settings: command.input.settings,
     presentation: command.input.presentation,
-    tags: command.input.tags ? [...command.input.tags] : void 0
+    tags: command.input.tags ? [...command.input.tags] : void 0,
+    blocks: command.input.blocks
   };
 }
 function eventContentInput(content) {
@@ -60407,13 +60603,118 @@ async function pushEventCategoriesScope(ctx, options) {
     })
   });
 }
-
-// src/cli/commands/push/scopes/events.ts
+function findDuplicateLocalEventIdentifiers(events) {
+  const filePathsByIdentifier = /* @__PURE__ */ new Map();
+  for (const event of events) {
+    const filePaths = filePathsByIdentifier.get(event.identifier) ?? [];
+    filePaths.push(event.filePath);
+    filePathsByIdentifier.set(event.identifier, filePaths);
+  }
+  return [...filePathsByIdentifier.entries()].filter(([, filePaths]) => filePaths.length > 1).map(([identifier, filePaths]) => ({ identifier, filePaths }));
+}
+function formatDuplicateEventFilePath(contentDir, filePath) {
+  return path5.relative(contentDir, filePath) || filePath;
+}
+function normalizeLocalPath(value) {
+  const [withoutHash] = value.split("#");
+  const [withoutQuery] = (withoutHash ?? "").split("?");
+  if (!withoutQuery || !withoutQuery.startsWith("/")) return value;
+  return withoutQuery.length > 1 ? withoutQuery.replace(/\/+$/u, "") || "/" : "/";
+}
+function localEventPath(event) {
+  return normalizeLocalPath(event.path?.trim() || `/events/${event.slug}`);
+}
+function collectNavigationPathReferences(navigation) {
+  if (!navigation) return [];
+  const references = [];
+  const visit = (items, menuName) => {
+    for (const item of items) {
+      const link2 = item.link;
+      if (link2 && typeof link2 === "object" && "href" in link2) {
+        const href = link2.href;
+        if (typeof href === "string" && href.startsWith("/")) {
+          references.push({
+            path: normalizeLocalPath(href),
+            menuName,
+            label: item.label
+          });
+        }
+      }
+      if (item.children?.length) {
+        visit(item.children, menuName);
+      }
+    }
+  };
+  for (const menu of navigation.menus) {
+    visit(menu.items, menu.name);
+  }
+  return references;
+}
+function findEventNavigationPathMismatches(events, navigation) {
+  const references = collectNavigationPathReferences(navigation);
+  const mismatches = [];
+  for (const event of events) {
+    const eventPath = localEventPath(event);
+    const slugSuffix = `/${event.slug}`;
+    for (const reference of references) {
+      if (reference.path.endsWith(slugSuffix) && reference.path !== eventPath && !reference.path.startsWith(`${eventPath}/`)) {
+        mismatches.push({
+          eventIdentifier: event.identifier,
+          eventPath,
+          navigationPath: reference.path,
+          menuName: reference.menuName,
+          label: reference.label
+        });
+      }
+    }
+  }
+  return mismatches;
+}
+function warnForEventNavigationPathMismatches(ctx, mismatches) {
+  if (mismatches.length === 0) return;
+  ctx.output.warn("Navigation links may not match canonical event paths", {
+    details: mismatches.map(
+      (mismatch) => `  - ${mismatch.menuName} > ${mismatch.label}: ${mismatch.navigationPath} points at event "${mismatch.eventIdentifier}", but content/events uses ${mismatch.eventPath}`
+    ).join("\n"),
+    suggestion: "Update content/events/*.json path or content/navigation.json so event links resolve to the same route."
+  });
+}
 async function pushEventsScope(ctx, options) {
   const { client } = ctx;
   const only = options?.only;
-  const events = await readEvents(ctx.contentDir);
-  const mediaContent = { ...createEmptyLocalContent(), events };
+  const events = await readEventsWithFilePaths(ctx.contentDir);
+  const duplicateIdentifiers = findDuplicateLocalEventIdentifiers(
+    only ? events.filter((event) => only.has(event.identifier)) : events
+  );
+  if (duplicateIdentifiers.length > 0) {
+    ctx.output.error("Duplicate event identifiers detected", {
+      details: duplicateIdentifiers.map(
+        (duplicate) => `  ${duplicate.identifier}:
+${duplicate.filePaths.map((filePath) => `    - ${formatDuplicateEventFilePath(ctx.contentDir, filePath)}`).join("\n")}`
+      ).join("\n"),
+      suggestion: "Each content/events/*.json file must have a unique identifier. Delete or merge stale duplicate event files before pushing."
+    });
+    return {
+      status: "aborted",
+      scopeCommand: "events",
+      scopeName: "events",
+      created: 0,
+      updated: 0,
+      deleted: 0,
+      failed: duplicateIdentifiers.length,
+      errors: duplicateIdentifiers.map((duplicate) => ({
+        identifier: duplicate.identifier,
+        error: `Duplicate event identifier in ${duplicate.filePaths.map((filePath) => formatDuplicateEventFilePath(ctx.contentDir, filePath)).join(", ")}`
+      }))
+    };
+  }
+  const eventItems = events.map(({ filePath: _filePath, ...event }) => event);
+  const selectedEventItems = only ? eventItems.filter((event) => only.has(event.identifier)) : eventItems;
+  warnForEventNavigationPathMismatches(
+    ctx,
+    findEventNavigationPathMismatches(selectedEventItems, await readNavigation(ctx.contentDir))
+  );
+  const mediaContent = { ...createEmptyLocalContent(), events: eventItems };
   const mediaResult = await syncLocalMediaForScopePush(ctx, mediaContent);
   if (!mediaResult.ok) {
     ctx.output.error("Local media sync failed", {
@@ -60438,7 +60739,7 @@ async function pushEventsScope(ctx, options) {
     getIdentifier: (event) => event.identifier,
     getDisplayLabel: (event) => event.title,
     shouldPushItem: only ? (event) => only.has(event.identifier) : void 0,
-    readLocal: async () => events,
+    readLocal: async () => eventItems,
     readMeta: async (dir) => {
       const meta = await readEventsMeta(dir);
       return meta?.events ?? null;
@@ -60673,7 +60974,7 @@ function firstNestedContainerChange(localChanges, remoteChanges) {
 }
 function firstSameFieldConflictPath(localChanges, remoteChanges) {
   const remotePaths = new Set(remoteChanges.keys());
-  return [...localChanges.keys()].filter((path27) => remotePaths.has(path27)).sort()[0] ?? null;
+  return [...localChanges.keys()].filter((path28) => remotePaths.has(path28)).sort()[0] ?? null;
 }
 function unsupportedNestedMerge(subject, fieldPath) {
   return {
@@ -60755,37 +61056,37 @@ function valueKind(value) {
   if (typeof value === "object") return "object";
   return "scalar";
 }
-function entryChange(path27, value, containerKind) {
+function entryChange(path28, value, containerKind) {
   switch (containerKind) {
     case "array":
-      if (Array.isArray(value)) return { path: path27, value, containerKind };
+      if (Array.isArray(value)) return { path: path28, value, containerKind };
       break;
     case "object":
       if (value && typeof value === "object" && !Array.isArray(value)) {
-        return { path: path27, value, containerKind };
+        return { path: path28, value, containerKind };
       }
       break;
     case "null":
-      if (value === null || value === void 0) return { path: path27, value, containerKind };
+      if (value === null || value === void 0) return { path: path28, value, containerKind };
       break;
     case "scalar":
-      if (isScalarEntryChangeValue(value)) return { path: path27, value, containerKind };
+      if (isScalarEntryChangeValue(value)) return { path: path28, value, containerKind };
       break;
     default:
       assertNever(containerKind);
   }
-  throw new Error(`Invalid entry merge change at ${path27}.`);
+  throw new Error(`Invalid entry merge change at ${path28}.`);
 }
 function isScalarEntryChangeValue(value) {
   return value === void 0 || value === null || ["boolean", "number", "string"].includes(typeof value);
 }
-function expectStringValue(path27, value) {
+function expectStringValue(path28, value) {
   if (typeof value === "string") return value;
-  throw new Error(`Entry merge expected ${path27} to be a string.`);
+  throw new Error(`Entry merge expected ${path28} to be a string.`);
 }
-function expectBooleanValue(path27, value) {
+function expectBooleanValue(path28, value) {
   if (typeof value === "boolean") return value;
-  throw new Error(`Entry merge expected ${path27} to be a boolean.`);
+  throw new Error(`Entry merge expected ${path28} to be a boolean.`);
 }
 function expectStatusValue(value) {
   if (value === "draft" || value === "published") return value;
@@ -61297,7 +61598,7 @@ async function unlinkIfExists(filePath) {
 }
 
 // src/cli/commands/push-execute.ts
-async function executeScopedPush(output, isRemote, options, globalOpts, scopeLabel, pullCommand2, shouldDeleteOrphans, pushFn) {
+async function executeScopedPush(output, isRemote, options, globalOpts, scopeLabel, pullCommand2, shouldDeleteOrphans, pushFn, scopedOptions) {
   const cliConfig = await loadCliConfig();
   const contentDir = path5.resolve(options.contentDir ?? cliConfig.contentDir);
   if (!await contentDirExists(contentDir)) {
@@ -61311,21 +61612,24 @@ async function executeScopedPush(output, isRemote, options, globalOpts, scopeLab
     managementApiKey: env.managementApiKey,
     siteId: env.siteId
   });
-  const result = await pushFn({
-    output,
-    contentDir,
-    siteId: env.siteId,
-    targetEnv: isRemote ? "remote" : "local",
-    client,
-    dryRun: options.dryRun,
-    force: options.force ?? false,
-    isJsonOutput: globalOpts.json ?? false,
-    forceUpdateAsset: options.forceUpdateAsset,
-    deleteOrphaned: shouldDeleteOrphans,
-    autoPullStale: options.autoPullStale ?? false,
-    skipMeta: !(options.meta ?? true),
-    humanDiff: options.diff ?? false
-  });
+  const result = await pushFn(
+    {
+      output,
+      contentDir,
+      siteId: env.siteId,
+      targetEnv: isRemote ? "remote" : "local",
+      client,
+      dryRun: options.dryRun,
+      force: options.force ?? false,
+      isJsonOutput: globalOpts.json ?? false,
+      forceUpdateAsset: options.forceUpdateAsset,
+      deleteOrphaned: shouldDeleteOrphans,
+      autoPullStale: options.autoPullStale ?? false,
+      skipMeta: !(options.meta ?? true),
+      humanDiff: options.diff ?? false
+    },
+    scopedOptions
+  );
   if (result.status === "pushed" && result.failed > 0 || result.status === "failed") {
     process.exitCode = 1;
     output.result(false, `${scopeLabel} push had failures`, result);
@@ -61582,6 +61886,7 @@ ${errors}`
       return { success: true };
     }
     if (pushScope === "venues") {
+      const only = type ? /* @__PURE__ */ new Set([type]) : void 0;
       return executeScopedPush(
         output,
         isRemote,
@@ -61590,10 +61895,12 @@ ${errors}`
         "Venues",
         "venues",
         shouldDeleteOrphans,
-        pushVenuesScope
+        pushVenuesScope,
+        only ? { only } : void 0
       );
     }
     if (pushScope === "event-categories") {
+      const only = type ? /* @__PURE__ */ new Set([type]) : void 0;
       return executeScopedPush(
         output,
         isRemote,
@@ -61602,10 +61909,12 @@ ${errors}`
         "Event categories",
         "event-categories",
         shouldDeleteOrphans,
-        pushEventCategoriesScope
+        pushEventCategoriesScope,
+        only ? { only } : void 0
       );
     }
     if (pushScope === "events") {
+      const only = type ? /* @__PURE__ */ new Set([type]) : void 0;
       return executeScopedPush(
         output,
         isRemote,
@@ -61614,10 +61923,12 @@ ${errors}`
         "Events",
         "events",
         shouldDeleteOrphans,
-        pushEventsScope
+        pushEventsScope,
+        only ? { only } : void 0
       );
     }
     if (pushScope === "courses") {
+      const only = type ? /* @__PURE__ */ new Set([type]) : void 0;
       return executeScopedPush(
         output,
         isRemote,
@@ -61626,7 +61937,8 @@ ${errors}`
         "Courses",
         "courses",
         shouldDeleteOrphans,
-        pushCoursesScope
+        pushCoursesScope,
+        only ? { only } : void 0
       );
     }
     if (pushScope === "footer") {
@@ -65196,7 +65508,7 @@ var SimpleCache = class {
 };
 
 // src/version.ts
-var SDK_VERSION = "0.89.1";
+var SDK_VERSION = "0.90.0";
 
 // src/client/error.ts
 var RiverbankApiError = class _RiverbankApiError extends Error {
@@ -66759,19 +67071,19 @@ function createRiverbankClient(config2) {
     );
   }
   async function getPageWithResilienceInternal(params) {
-    const { siteId, path: path27, preview = false, signal } = params;
+    const { siteId, path: path28, preview = false, signal } = params;
     const publishedRuntimeCache = planPublishedRuntimeCache({
       endpoint: "getContentByPath",
-      params: { siteId, path: path27, preview },
+      params: { siteId, path: path28, preview },
       siteId
     });
-    const cacheKey = publishedRuntimeCache?.cacheKey ?? `page:${siteId}:${path27}:${preview}`;
+    const cacheKey = publishedRuntimeCache?.cacheKey ?? `page:${siteId}:${path28}:${preview}`;
     return resilientFetch(
       cacheKey,
       async (sig) => {
         return await apiClient({
           endpoint: "getContentByPath",
-          params: { siteId, path: path27, preview: String(preview) },
+          params: { siteId, path: path28, preview: String(preview) },
           options: { signal: sig }
         });
       },
@@ -66780,7 +67092,7 @@ function createRiverbankClient(config2) {
         signal,
         publishedRuntimeCache,
         // Prebuild fallback only for published pages (not preview)
-        prebuildFallback: prebuildLoader && !preview ? () => prebuildLoader.loadPage(siteId, path27) : void 0
+        prebuildFallback: prebuildLoader && !preview ? () => prebuildLoader.loadPage(siteId, path28) : void 0
       }
     );
   }
@@ -67240,17 +67552,17 @@ function createRiverbankClient(config2) {
       };
     },
     async checkRedirect(params) {
-      const { siteId, path: path27, signal } = params;
-      if (!siteId || !path27) {
+      const { siteId, path: path28, signal } = params;
+      if (!siteId || !path28) {
         throw new Error("checkRedirect() requires siteId and path");
       }
-      const cacheKey = `redirect:${siteId}:${path27}`;
+      const cacheKey = `redirect:${siteId}:${path28}`;
       return resilientFetchData(
         cacheKey,
         async (sig) => {
           return await apiClient({
             endpoint: "checkRedirect",
-            params: { site: siteId, path: path27 },
+            params: { site: siteId, path: path28 },
             options: { signal: sig }
           });
         },
@@ -67660,7 +67972,7 @@ async function loadDeployConfig() {
 }
 async function checkWorkingDirectoryClean(git, prebuildOutput) {
   const status = await git.status();
-  const dirtyFiles = status.files.map((f) => f.path).filter((path27) => !path27.startsWith(prebuildOutput));
+  const dirtyFiles = status.files.map((f) => f.path).filter((path28) => !path28.startsWith(prebuildOutput));
   return {
     clean: dirtyFiles.length === 0,
     dirtyFiles
@@ -68191,25 +68503,25 @@ function mapMediaGuardDiagnosticsToAuditIssues(diagnostics) {
     }
   }));
 }
-function extractEmbedReferences(data, path27 = []) {
+function extractEmbedReferences(data, path28 = []) {
   const refs = [];
   if (!data || typeof data !== "object") return refs;
   if (Array.isArray(data)) {
     data.forEach((item, index) => {
-      refs.push(...extractEmbedReferences(item, [...path27, String(index)]));
+      refs.push(...extractEmbedReferences(item, [...path28, String(index)]));
     });
     return refs;
   }
   const obj = data;
   if (obj.kind === "embed" && typeof obj.contentType === "string" && typeof obj.identifier === "string") {
     refs.push({
-      path: path27.join("."),
+      path: path28.join("."),
       contentType: obj.contentType,
       identifier: obj.identifier
     });
   }
   for (const [key, value] of Object.entries(obj)) {
-    refs.push(...extractEmbedReferences(value, [...path27, key]));
+    refs.push(...extractEmbedReferences(value, [...path28, key]));
   }
   return refs;
 }
@@ -69143,7 +69455,7 @@ function formatThemeSummaryForPrompt(summary) {
 }
 
 // src/manifest/validation/layout-utils.ts
-function collectLayoutNodeInfos(node, path27 = "layout", out = []) {
+function collectLayoutNodeInfos(node, path28 = "layout", out = []) {
   if (!node || typeof node !== "object") return out;
   const n = node;
   const type = typeof n.type === "string" ? n.type : "unknown";
@@ -69152,10 +69464,10 @@ function collectLayoutNodeInfos(node, path27 = "layout", out = []) {
     const b = n.$bind;
     if (typeof b.from === "string") bindFrom = b.from;
   }
-  out.push({ path: path27, type, bindFrom });
+  out.push({ path: path28, type, bindFrom });
   if (Array.isArray(n.children)) {
     for (let i = 0; i < n.children.length; i++) {
-      collectLayoutNodeInfos(n.children[i], `${path27}.children[${i}]`, out);
+      collectLayoutNodeInfos(n.children[i], `${path28}.children[${i}]`, out);
     }
   }
   return out;
@@ -69577,7 +69889,7 @@ function extractNestedHrefBindFromProps(props2) {
   const bind2 = href.$bind;
   return bind2 && typeof bind2 === "object" ? bind2 : null;
 }
-function findMissingLinkHrefs(node, blockId, fields3, path27 = "layout", repeatStack = []) {
+function findMissingLinkHrefs(node, blockId, fields3, path28 = "layout", repeatStack = []) {
   const errors = [];
   if (!node || typeof node !== "object") return errors;
   const n = node;
@@ -69606,21 +69918,21 @@ function findMissingLinkHrefs(node, blockId, fields3, path27 = "layout", repeatS
     if (isBoundToLinkField) {
       if (!hrefBind || !hrefFrom) {
         errors.push({
-          path: path27,
-          message: `Block "${blockId}": ${nodeType} node at ${path27} is bound to a link field but is missing props.href binding`,
+          path: path28,
+          message: `Block "${blockId}": ${nodeType} node at ${path28} is bound to a link field but is missing props.href binding`,
           suggestion: `Add props.href: { "$bind": { "from": "${bindFrom ?? "content.yourLinkField"}", "fallback": null, "transforms": [{ "id": "links.resolve" }] } }`
         });
       } else if (!bindingHasTransform(hrefBind, "links.resolve")) {
         errors.push({
-          path: path27,
-          message: `Block "${blockId}": ${nodeType} node at ${path27} has props.href binding but is missing transforms: [{id:"links.resolve"}]`,
+          path: path28,
+          message: `Block "${blockId}": ${nodeType} node at ${path28} has props.href binding but is missing transforms: [{id:"links.resolve"}]`,
           suggestion: `Set props.href.$bind.transforms to [{ "id": "links.resolve" }].`
         });
       }
       if (bindFrom && bindFieldType === "link" && !bindingHasTransform(bind2, "links.label")) {
         errors.push({
-          path: path27,
-          message: `Block "${blockId}": ${nodeType} node at ${path27} binds label from a link field but is missing links.label transform`,
+          path: path28,
+          message: `Block "${blockId}": ${nodeType} node at ${path28} binds label from a link field but is missing links.label transform`,
           suggestion: `Set node.$bind.transforms to [{ "id": "links.label" }] so the label renders as text.`
         });
       }
@@ -69633,7 +69945,7 @@ function findMissingLinkHrefs(node, blockId, fields3, path27 = "layout", repeatS
           n.children[i],
           blockId,
           fields3,
-          `${path27}.children[${i}]`,
+          `${path28}.children[${i}]`,
           nextRepeatStack
         )
       );
@@ -69641,7 +69953,7 @@ function findMissingLinkHrefs(node, blockId, fields3, path27 = "layout", repeatS
   }
   return errors;
 }
-function detectRedundantLinkLabels(node, blockId, fields3, path27 = "layout", repeatStack = []) {
+function detectRedundantLinkLabels(node, blockId, fields3, path28 = "layout", repeatStack = []) {
   const errors = [];
   if (!node || typeof node !== "object") return errors;
   const n = node;
@@ -69663,7 +69975,7 @@ function detectRedundantLinkLabels(node, blockId, fields3, path27 = "layout", re
     const redundancies = findRedundantLinkTextSiblings(
       children,
       nextRepeatStack,
-      path27
+      path28
     );
     errors.push(
       ...redundancies.map((r) => ({
@@ -69680,7 +69992,7 @@ function detectRedundantLinkLabels(node, blockId, fields3, path27 = "layout", re
           n.children[i],
           blockId,
           fields3,
-          `${path27}.children[${i}]`,
+          `${path28}.children[${i}]`,
           nextRepeatStack
         )
       );
@@ -69919,19 +70231,19 @@ function extractBlockIdFromSelector(selector) {
   const match = selector.match(/\[data-block=(["'])(custom\.[^"']+)\1\]/);
   return match?.[2] ?? null;
 }
-function validateNodeType(nodeType, path27, ctx) {
+function validateNodeType(nodeType, path28, ctx) {
   if (!ALLOWED_NODE_TYPES.includes(
     nodeType
   )) {
     return {
-      path: `${path27}.type`,
-      message: `Block "${ctx.blockId}": Unknown node type "${nodeType}" at ${path27}`,
+      path: `${path28}.type`,
+      message: `Block "${ctx.blockId}": Unknown node type "${nodeType}" at ${path28}`,
       suggestion: `ALLOWED: ${ALLOWED_NODE_TYPES.slice(0, 10).join(", ")}... FIX: Replace "${nodeType}" with a valid node type.`
     };
   }
   return null;
 }
-function validateTransforms(transforms, path27, ctx) {
+function validateTransforms(transforms, path28, ctx) {
   const errors = [];
   for (let i = 0; i < transforms.length; i++) {
     const transform = transforms[i];
@@ -69940,7 +70252,7 @@ function validateTransforms(transforms, path27, ctx) {
         transform.id
       )) {
         errors.push({
-          path: `${path27}.transforms[${i}].id`,
+          path: `${path28}.transforms[${i}].id`,
           message: `Block "${ctx.blockId}": Unknown transform "${transform.id}"`,
           suggestion: `ALLOWED: ${ALLOWED_TRANSFORM_IDS.slice(0, 8).join(", ")}... FIX: Replace with a valid transform ID or remove.`
         });
@@ -69949,7 +70261,7 @@ function validateTransforms(transforms, path27, ctx) {
   }
   return errors;
 }
-function validateBinding(bind2, path27, ctx) {
+function validateBinding(bind2, path28, ctx) {
   const errors = [];
   if ("from" in bind2 && typeof bind2.from === "string") {
     const bindPath = bind2.from;
@@ -69957,7 +70269,7 @@ function validateBinding(bind2, path27, ctx) {
       const fieldId = bindPath.replace("content.", "").split(".")[0] ?? "";
       if (fieldId && !ctx.fieldIds.has(fieldId)) {
         errors.push({
-          path: `${path27}.from`,
+          path: `${path28}.from`,
           message: `Block "${ctx.blockId}": $bind references unknown field "${fieldId}"`,
           suggestion: `DEFINED FIELDS: ${Array.from(ctx.fieldIds).join(", ")}. FIX: Add field { id: '${fieldId}', type: '...' } or use existing field.`
         });
@@ -69965,31 +70277,31 @@ function validateBinding(bind2, path27, ctx) {
     }
   }
   if ("transforms" in bind2 && Array.isArray(bind2.transforms)) {
-    errors.push(...validateTransforms(bind2.transforms, path27, ctx));
+    errors.push(...validateTransforms(bind2.transforms, path28, ctx));
   }
   return errors;
 }
-function validateLayoutDeep(node, blockId, fields3, path27 = "layout") {
+function validateLayoutDeep(node, blockId, fields3, path28 = "layout") {
   const ctx = {
     blockId,
     fieldIds: collectFieldIds(fields3)
   };
-  return validateLayoutNode(node, path27, ctx);
+  return validateLayoutNode(node, path28, ctx);
 }
-function validateLayoutNode(node, path27, ctx) {
+function validateLayoutNode(node, path28, ctx) {
   const errors = [];
   if (!node || typeof node !== "object") {
     return errors;
   }
   const n = node;
   if ("type" in n && typeof n.type === "string") {
-    const typeError = validateNodeType(n.type, path27, ctx);
+    const typeError = validateNodeType(n.type, path28, ctx);
     if (typeError) errors.push(typeError);
   }
   if ("$bind" in n && n.$bind && typeof n.$bind === "object") {
     const bindErrors = validateBinding(
       n.$bind,
-      `${path27}.$bind`,
+      `${path28}.$bind`,
       ctx
     );
     errors.push(...bindErrors);
@@ -69997,7 +70309,7 @@ function validateLayoutNode(node, path27, ctx) {
   if ("props" in n && n.props && typeof n.props === "object") {
     const propsErrors = validatePropsBindings(
       n.props,
-      `${path27}.props`,
+      `${path28}.props`,
       ctx
     );
     errors.push(...propsErrors);
@@ -70006,7 +70318,7 @@ function validateLayoutNode(node, path27, ctx) {
     for (let i = 0; i < n.children.length; i++) {
       const childErrors = validateLayoutNode(
         n.children[i],
-        `${path27}.children[${i}]`,
+        `${path28}.children[${i}]`,
         ctx
       );
       errors.push(...childErrors);
@@ -70014,17 +70326,17 @@ function validateLayoutNode(node, path27, ctx) {
   }
   return errors;
 }
-function validatePropsBindings(props2, path27, ctx) {
+function validatePropsBindings(props2, path28, ctx) {
   const errors = [];
   for (const [key, value] of Object.entries(props2)) {
     if (value && typeof value === "object" && "$bind" in value) {
       const bind2 = value.$bind;
-      const bindErrors = validateBinding(bind2, `${path27}.${key}.$bind`, ctx);
+      const bindErrors = validateBinding(bind2, `${path28}.${key}.$bind`, ctx);
       errors.push(...bindErrors);
     } else if (value && typeof value === "object" && !Array.isArray(value)) {
       const nestedErrors = validatePropsBindings(
         value,
-        `${path27}.${key}`,
+        `${path28}.${key}`,
         ctx
       );
       errors.push(...nestedErrors);
@@ -70157,7 +70469,7 @@ function collectUsedFieldRefs(node) {
   visit(node, []);
   return { topLevel, nestedByRepeater, itemNameByRepeater };
 }
-function findMissingBindings(node, blockId, path27 = "layout") {
+function findMissingBindings(node, blockId, path28 = "layout") {
   const errors = [];
   if (!node || typeof node !== "object") {
     return errors;
@@ -70167,15 +70479,15 @@ function findMissingBindings(node, blockId, path27 = "layout") {
   if ("$repeat" in n && n.$repeat && typeof n.$repeat === "object") {
     if (nodeType && CONTENT_NODE_TYPES.includes(nodeType)) {
       errors.push({
-        path: path27,
-        message: `Block "${blockId}": ${nodeType} node at ${path27} uses $repeat, but content nodes cannot be repeat containers`,
+        path: path28,
+        message: `Block "${blockId}": ${nodeType} node at ${path28} uses $repeat, but content nodes cannot be repeat containers`,
         suggestion: `Move $repeat to a container node (grid/stack/div) and put a ${nodeType} child inside with $bind.from like "item.field".`
       });
     }
     if (!Array.isArray(n.children) || n.children.length === 0) {
       errors.push({
-        path: path27,
-        message: `Block "${blockId}": node at ${path27} uses $repeat but has no children to repeat`,
+        path: path28,
+        message: `Block "${blockId}": node at ${path28} uses $repeat but has no children to repeat`,
         suggestion: 'Add one or more child nodes under children[] that bind to the repeat item (e.g., $bind.from: "item.text").'
       });
     }
@@ -70184,15 +70496,15 @@ function findMissingBindings(node, blockId, path27 = "layout") {
     const hasBind = "$bind" in n && n.$bind && typeof n.$bind === "object" && "from" in n.$bind;
     if (Array.isArray(n.children) && n.children.length > 0) {
       errors.push({
-        path: path27,
-        message: `Block "${blockId}": ${nodeType} node at ${path27} has children, but content nodes must have children: null`,
+        path: path28,
+        message: `Block "${blockId}": ${nodeType} node at ${path28} has children, but content nodes must have children: null`,
         suggestion: `Replace this ${nodeType} with a container node (div/stack/inline) and put the ${nodeType} nodes inside it.`
       });
     }
     if (!hasBind) {
       errors.push({
-        path: `${path27}`,
-        message: `Block "${blockId}": ${nodeType} node at ${path27} has no $bind - it won't display any content`,
+        path: `${path28}`,
+        message: `Block "${blockId}": ${nodeType} node at ${path28} has no $bind - it won't display any content`,
         suggestion: `Add $bind: { from: "content.fieldName" } to connect this ${nodeType} to a field. Example: { "type": "${nodeType}", "$bind": { "from": "content.headline" } }`
       });
     }
@@ -70202,7 +70514,7 @@ function findMissingBindings(node, blockId, path27 = "layout") {
       const childErrors = findMissingBindings(
         n.children[i],
         blockId,
-        `${path27}.children[${i}]`
+        `${path28}.children[${i}]`
       );
       errors.push(...childErrors);
     }
@@ -70219,13 +70531,13 @@ function getMaxDepth(node, currentDepth = 0) {
   );
 }
 var CONTAINER_NODE_TYPES = ["section", "stack", "grid", "div", "inline"];
-function detectPotentialTruncation(node, maxAllowedDepth, currentDepth = 0, path27 = "layout") {
+function detectPotentialTruncation(node, maxAllowedDepth, currentDepth = 0, path28 = "layout") {
   if (!node || typeof node !== "object") return [];
   const n = node;
   const truncatedPaths = [];
   if (currentDepth === maxAllowedDepth && n.children === null) {
     if (CONTAINER_NODE_TYPES.includes(n.type || "")) {
-      truncatedPaths.push(`${path27} (${n.type ?? "node"} at depth ${currentDepth})`);
+      truncatedPaths.push(`${path28} (${n.type ?? "node"} at depth ${currentDepth})`);
     }
   }
   if (n.children && Array.isArray(n.children)) {
@@ -70235,7 +70547,7 @@ function detectPotentialTruncation(node, maxAllowedDepth, currentDepth = 0, path
           child,
           maxAllowedDepth,
           currentDepth + 1,
-          `${path27}.children[${i}]`
+          `${path28}.children[${i}]`
         )
       );
     });
@@ -70255,8 +70567,8 @@ function formatValidationFeedback(errors, output) {
         `The layout reached the maximum depth of ${MAX_LAYOUT_DEPTH} levels.`
       );
       lines.push("These container nodes at the depth limit have no children:");
-      for (const path27 of truncatedPaths) {
-        lines.push(`  \u26A0\uFE0F ${path27}`);
+      for (const path28 of truncatedPaths) {
+        lines.push(`  \u26A0\uFE0F ${path28}`);
       }
       lines.push("");
       lines.push(
@@ -70719,11 +71031,11 @@ var pass3bOutputSchema = z.object({
   customCssAtRules: z.array(llmMediaAtRuleSchema).nullable(),
   rationale: z.string()
 });
-function getNodeAtPath(layout, path27) {
-  if (path27 === "" || path27 === "root" || path27 === "layout") {
+function getNodeAtPath(layout, path28) {
+  if (path28 === "" || path28 === "root" || path28 === "layout") {
     return layout;
   }
-  let normalizedPath = path27;
+  let normalizedPath = path28;
   if (normalizedPath.startsWith("layout.")) {
     normalizedPath = normalizedPath.slice(7);
   }
@@ -72410,6 +72722,7 @@ var eventUpsertInputSchema = z.object({
   identifier: z.string().min(1).optional(),
   title: z.string().min(1, "title is required"),
   slug: z.string().min(1).optional(),
+  path: z.string().startsWith("/", "path must start with /").nullable().optional(),
   status: z.enum(["draft", "active", "archived", "cancelled", "completed"]).optional(),
   visibility: z.enum(["private", "public", "unlisted"]).optional(),
   schedule: eventScheduleInputSchema,
@@ -72422,7 +72735,8 @@ var eventUpsertInputSchema = z.object({
   formRef: z.string().nullable().optional(),
   settings: z.record(z.string(), z.unknown()).optional(),
   presentation: z.record(z.string(), z.unknown()).nullable().optional(),
-  tags: z.array(z.string()).optional()
+  tags: z.array(z.string()).optional(),
+  blocks: sdkEntrySlotBlocksInputSchema.optional()
 });
 var formatEventRow = (event) => [
   event.identifier,
@@ -73029,9 +73343,6 @@ function mergeLegacyEventIntoCanonical(legacy, event) {
       unmappableFields.push(`data.${key}`);
     }
   }
-  if (legacy.entry.blocks && Object.keys(legacy.entry.blocks).length > 0) {
-    unmappableFields.push("blocks");
-  }
   if (unmappableFields.length > 0) {
     return { tag: "unmappable", fields: unmappableFields.sort() };
   }
@@ -73096,6 +73407,17 @@ function mergeLegacyEventIntoCanonical(legacy, event) {
       conflicts.push(result.field);
     }
   }
+  const blocksResult = mergeBlocks({
+    current: event.blocks,
+    incoming: legacy.entry.blocks,
+    set: (blocks) => ({ ...mergedEvent, blocks })
+  });
+  if (blocksResult.tag === "changed") {
+    mergedEvent = blocksResult.event;
+    mergedFields.push(...blocksResult.fields);
+  } else if (blocksResult.tag === "conflict") {
+    conflicts.push(...blocksResult.fields);
+  }
   if (hasMeaningfulValue(data.presentation)) {
     if (!isRecord21(data.presentation)) {
       return { tag: "unmappable", fields: ["data.presentation"] };
@@ -73127,6 +73449,52 @@ function mergeLegacyEventIntoCanonical(legacy, event) {
     conflicts
   };
 }
+function mergeBlocks(input) {
+  if (!hasMeaningfulValue(input.incoming)) {
+    return { tag: "ignored" };
+  }
+  const incoming = input.incoming;
+  const current = input.current;
+  if (!incoming) {
+    return { tag: "ignored" };
+  }
+  if (!current || !hasMeaningfulValue(current)) {
+    return {
+      tag: "changed",
+      event: input.set(incoming),
+      fields: Object.keys(incoming).sort().map((slotKey) => `blocks.${slotKey}`)
+    };
+  }
+  const nextBlocks = { ...current };
+  const changedFields = [];
+  const conflictFields = [];
+  for (const slotKey of Object.keys(incoming).sort()) {
+    const incomingBlocks = incoming[slotKey] ?? [];
+    const currentBlocks = current[slotKey];
+    if (currentBlocks === void 0) {
+      nextBlocks[slotKey] = incomingBlocks;
+      changedFields.push(`blocks.${slotKey}`);
+      continue;
+    }
+    if (!valuesMatch(currentBlocks, incomingBlocks)) {
+      conflictFields.push(`blocks.${slotKey}`);
+    }
+  }
+  if (conflictFields.length > 0) {
+    return {
+      tag: "conflict",
+      fields: conflictFields
+    };
+  }
+  if (changedFields.length === 0) {
+    return { tag: "unchanged" };
+  }
+  return {
+    tag: "changed",
+    event: input.set(nextBlocks),
+    fields: changedFields
+  };
+}
 async function planEventMigration(contentDir) {
   const legacyReadResults = await readLegacyEventEntries(contentDir);
   const invalidLegacyItems = legacyReadResults.filter((result) => result.tag === "invalid").map((result) => ({