@riverbankcms/sdk 0.139.0 → 0.141.0

package/dist/client/bookings.mjs

@@ -6878,8 +6878,14 @@ const headerInteractionPillPaletteValues = [
 	"accent"
 ];
 /**
-* "No pill": the nav link keeps whatever hover treatment its recipe compiled,
-* and the palette step writes nothing at all (#1318 Phase 4c decision 2).
+* "No pill": a colour change on hover rather than a filled background.
+*
+* The palette step writes nothing (#1318 Phase 4c decision 2), but on a
+* foreground-adaptive style that is not the end of the story: the hover colour
+* is derived from the resolved opening foreground at render time, paired with
+* the resting colour, so `quiet` resolves to a definite colour rather than to
+* whatever brand token the recipe happened to name. See
+* `applyOpeningForeground`.
 *
 * It exists because "a colour change on hover, no filled background" was not
 * expressible in the vocabulary, and it is what
@@ -7861,6 +7867,28 @@ const bookingRequirementConsentFieldSchema = z.object({
 z.union([blockBookingConsentSchema, bookingRequirementConsentFieldSchema]);
 //#endregion
 //#region ../blocks/src/system/blocks/events/shared/schemas.ts
+const publicEventLoaderQuerySchemaShape = {
+	limit: z.string().optional(),
+	from: z.string().optional(),
+	to: z.string().optional(),
+	afterStartsAt: z.string().optional(),
+	afterId: z.string().optional(),
+	categoryIds: z.string().optional(),
+	venueId: z.string().optional(),
+	staffMemberId: z.string().optional(),
+	eventSurface: z.string().optional(),
+	eventPresets: z.string().optional(),
+	scheduleScope: z.string().optional(),
+	seriesId: z.string().optional(),
+	seriesIds: z.string().optional(),
+	runSeriesId: z.string().optional(),
+	seriesSlug: z.string().optional(),
+	includeOccurrenceId: z.string().optional(),
+	readIntent: z.string().optional(),
+	detailLevel: z.string().optional(),
+	readProfile: z.string().optional()
+};
+z.object(publicEventLoaderQuerySchemaShape);
 const eventPresetSchema = z.enum([
 	"event",
 	"class",
@@ -8168,6 +8196,7 @@ z.object({
 	eventSurface: z.enum(eventSurfaceScopeValues).optional(),
 	eventPresets: z.string().optional(),
 	scheduleScope: z.enum(eventScheduleScopeValues).optional(),
+	seriesIds: z.string().optional(),
 	categoryIds: z.string().optional(),
 	venueId: z.string().transform(normalizeCalendarFilterId).optional(),
 	staffMemberId: z.string().transform(normalizeCalendarFilterId).optional()
@@ -8727,6 +8756,9 @@ function isApiSuccessResponse(json) {
 * });
 * ```
 */
+function publicEventsQuery(params) {
+	return { ...params ?? {} };
+}
 function createBlockApi(config) {
 	const { baseUrl, auth, authOverrides, siteId, isPreview } = config;
 	const dedup = createDeduplicationCache({ ttl: 100 });
@@ -8879,23 +8911,7 @@ function createBlockApi(config) {
 			const path = buildPath(EVENTS.list.path, { siteId: sid });
 			return request(EVENTS.list, {
 				path,
-				query: {
-					from: params?.from,
-					to: params?.to,
-					afterStartsAt: params?.afterStartsAt,
-					afterId: params?.afterId,
-					limit: params?.limit,
-					stage: params?.stage,
-					eventSurface: params?.eventSurface,
-					eventPresets: params?.eventPresets,
-					scheduleScope: params?.scheduleScope,
-					categoryIds: params?.categoryIds,
-					venueId: params?.venueId,
-					staffMemberId: params?.staffMemberId,
-					seriesId: params?.seriesId,
-					includeOccurrenceId: params?.includeOccurrenceId,
-					detailLevel: params?.detailLevel
-				}
+				query: publicEventsQuery(params)
 			});
 		},
 		async getEventFilters(params) {
@@ -8959,7 +8975,7 @@ function createBlockApi(config) {
 			const path = buildPath(WHOLE_SERIES.waitlistClaimResolve.path, { siteId: sid });
 			return request(WHOLE_SERIES.waitlistClaimResolve, {
 				path,
-				body: { claimToken: data.claimToken }
+				body: data
 			});
 		},
 		async getDiscountsAvailable(data) {
@@ -10610,10 +10626,14 @@ function buildDiscountAvailabilityRequestPlan(options) {
 		}
 	};
 }
-function discountAvailabilityStateFromResponse(response) {
-	if (!discountAvailabilityHasDiscounts(response)) return { tag: "unavailable" };
+function discountAvailabilityStateFromResponse(requestKey, response) {
+	if (!discountAvailabilityHasDiscounts(response)) return {
+		tag: "unavailable",
+		requestKey
+	};
 	return {
 		tag: "available",
+		requestKey,
 		manualCodeEntryAllowed: discountAvailabilityAllowsManualEntry(response),
 		autoAppliedDiscount: getAutoAppliedDiscountPreview(response)
 	};
@@ -10623,10 +10643,13 @@ function discountCodeUiReducer(state, event) {
 		case "availability-disabled": return initialDiscountCodeUiState;
 		case "availability-loading": return {
 			...state,
-			availability: { tag: "loading" }
+			availability: {
+				tag: "loading",
+				previous: state.availability.tag === "available" || state.availability.tag === "unavailable" ? state.availability : state.availability.tag === "loading" ? state.availability.previous : null
+			}
 		};
 		case "availability-loaded": {
-			const availability = discountAvailabilityStateFromResponse(event.response);
+			const availability = discountAvailabilityStateFromResponse(event.requestKey, event.response);
 			if (availability.tag !== "available" || !availability.manualCodeEntryAllowed) return {
 				...state,
 				discountUiOpen: false,
@@ -10642,7 +10665,10 @@ function discountCodeUiReducer(state, event) {
 			...state,
 			discountUiOpen: false,
 			discountCode: "",
-			availability: { tag: "error" }
+			availability: {
+				tag: "error",
+				requestKey: event.requestKey
+			}
 		};
 		case "discount-code-changed": return {
 			...state,
@@ -10678,11 +10704,15 @@ function useDiscountCodeUi(options) {
 				if (cancelled) return;
 				dispatch({
 					type: "availability-loaded",
+					requestKey: requestPlan.key,
 					response: res
 				});
 			} catch {
 				if (cancelled) return;
-				dispatch({ type: "availability-failed" });
+				dispatch({
+					type: "availability-failed",
+					requestKey: requestPlan.key
+				});
 			}
 		}
 		checkDiscountAvailability();
@@ -10691,8 +10721,9 @@ function useDiscountCodeUi(options) {
 		};
 	}, [options.api, requestPlan]);
 	const availability = state.availability;
-	const isAvailable = availability.tag === "available";
-	const manualCodeEntryAllowed = isAvailable ? availability.manualCodeEntryAllowed : false;
+	const settledAvailability = availability.tag === "loading" ? availability.previous : availability.tag === "available" || availability.tag === "unavailable" ? availability : null;
+	const isAvailable = settledAvailability?.tag === "available";
+	const manualCodeEntryAllowed = isAvailable ? settledAvailability.manualCodeEntryAllowed : false;
 	return {
 		discountUiOpen: state.discountUiOpen,
 		setDiscountUiOpen: (isOpen) => dispatch({
@@ -10706,8 +10737,10 @@ function useDiscountCodeUi(options) {
 		}),
 		discountsAvailable: isAvailable,
 		manualCodeEntryAllowed,
-		autoAppliedDiscount: isAvailable ? availability.autoAppliedDiscount : null,
-		discountsAvailableLoading: availability.tag === "loading"
+		autoAppliedDiscount: isAvailable ? settledAvailability.autoAppliedDiscount : null,
+		discountsAvailableLoading: availability.tag === "loading",
+		discountAvailabilityRequestKey: requestPlan.key,
+		settledDiscountAvailabilityRequestKey: availability.tag === "error" ? availability.requestKey : settledAvailability?.requestKey ?? null
 	};
 }
 //#endregion
@@ -14867,61 +14900,6 @@ const BookingFormClient$1 = ({ siteId: siteIdProp, render }) => {
 	});
 };
 //#endregion
-//#region ../blocks/src/system/runtime/nodes/event-registration/registrationErrorRecovery.ts
-function resolveRegistrationRecoveryAction(step, action) {
-	if (step === "payment-failed") return "payment-options";
-	if (step === "verifying-payment" || step === "verifying-timeout" || step === "redirecting") return "payment-status";
-	return action;
-}
-function canRecoverToWaitlist(eligibility) {
-	return Boolean(eligibility?.isFull && eligibility.canJoinWaitlist);
-}
-function shouldRefreshAfterRegistrationError(step, action, enabled) {
-	return enabled || step === "error" && action === "places";
-}
-function resetRegistrationAfterExpiry(input) {
-	input.dispatchFlow({
-		type: "reset",
-		hasPreSelectedContext: input.hasPreSelectedContext
-	});
-	input.setSelectedTicketLines([]);
-	input.setSelectedSlidingAmountInput("");
-	const mode = input.preSelectedEvent?.deliveryMode;
-	input.setSelectedAttendanceMode(mode === "online" || mode === "in_person" ? mode : null);
-	input.setErrorMessage("");
-	input.setPendingRegistrationReference(null);
-}
-/** Recovery never starts another payment. Unknown payment outcomes go to the portal. */
-function recoverRegistrationError(action, handlers) {
-	switch (action) {
-		case "none": return;
-		case "portal":
-		case "payment-status":
-			window.location.assign("/portal");
-			return;
-		case "event":
-			window.location.assign(window.location.pathname);
-			return;
-		case "retry":
-			window.location.reload();
-			return;
-		case "details":
-			handlers.clearError();
-			handlers.setStep("enter-details");
-			return;
-		case "payment-options":
-		case "places":
-			handlers.refreshOptions();
-			handlers.clearError();
-			handlers.setStep(action === "places" ? handlers.canJoinWaitlist ? "enter-details" : "select-tickets" : "select-payment");
-			return;
-		case "start":
-			handlers.refreshOptions();
-			handlers.reset();
-			return;
-	}
-}
-//#endregion
 //#region ../blocks/src/system/runtime/nodes/events/domain/capacity.ts
 /**
 * Compute remaining spots for an event from `availableSpots` with a fallback
@@ -14991,6 +14969,166 @@ function resolveRuntimeEventDestination(event) {
 	};
 }
 //#endregion
+//#region ../blocks/src/system/runtime/nodes/event-registration/checkoutRecovery.ts
+/** Recovery may select held places; checkout still owns admission and payment validation. */
+function checkoutRecoveryOptionAvailability(availability) {
+	if (availability.kind === "available" || availability.reason === "sold_out" || availability.reason === "overallCapacityUnavailable") return {
+		kind: "available",
+		remainingPlaces: null
+	};
+	return availability;
+}
+/**
+* A form-only projection for the explicit existing-checkout path. It permits
+* collecting the original selection without claiming a new place is available.
+* The public checkout service identifies the customer and remains the admission
+* authority; no reservation/customer data is exposed through this projection.
+*/
+function getCheckoutRecoveryFormEligibility(eligibility) {
+	if (!eligibility || eligibility.registration.kind !== "none" && eligibility.registration.kind !== "pending_payment" || eligibility.availability.kind === "unavailable" && eligibility.availability.reason !== "full" && eligibility.availability.reason !== "selectionRequired") return eligibility;
+	const amountCents = eligibility.price ?? 0;
+	if (amountCents <= 0 || !eligibility.currency || eligibility.availability.kind === "unavailable" && eligibility.availability.reason === "selectionRequired") return eligibility.registration.kind === "pending_payment" ? {
+		...eligibility,
+		registration: { kind: "none" },
+		ticketTypes: eligibility.ticketTypes.map((option) => ({
+			...option,
+			availability: checkoutRecoveryOptionAvailability(option.availability)
+		}))
+	} : eligibility;
+	const currency = eligibility.currency;
+	const paymentOptions = eligibility.paymentTerms.allowedOptions.map((option) => {
+		switch (option.kind) {
+			case "upfront": return {
+				kind: "payInFull",
+				amountCents,
+				currency
+			};
+			case "deferred_manual": return {
+				kind: "deferredManual",
+				amountCents,
+				currency
+			};
+			case "instalment_plan": return {
+				kind: "instalmentPlan",
+				amountCents,
+				currency
+			};
+			case "flexible_balance": return {
+				kind: "flexibleBalance",
+				amountCents,
+				currency
+			};
+		}
+	});
+	return {
+		...eligibility,
+		registration: { kind: "none" },
+		availability: {
+			kind: "available",
+			remainingPlaces: null,
+			waitlistEnabled: eligibility.waitlistEnabled
+		},
+		eligible: paymentOptions.length > 0,
+		isFull: false,
+		canJoinWaitlist: false,
+		isFree: false,
+		requiresPayment: true,
+		canPayDirectly: paymentOptions.length > 0,
+		paymentOptions,
+		eligiblePasses: [],
+		eligibleMemberships: [],
+		ticketTypes: eligibility.ticketTypes.map((option) => ({
+			...option,
+			availability: checkoutRecoveryOptionAvailability(option.availability)
+		}))
+	};
+}
+function canJoinWaitlistOutsideRecovery(event, attendanceMode, checkoutRecovery) {
+	return !checkoutRecovery && event !== null && canJoinEventWaitlist(event, { attendanceMode });
+}
+//#endregion
+//#region ../blocks/src/system/runtime/nodes/event-registration/useCheckoutRecovery.ts
+/** Recovery belongs to the selected booking subject; changing events resets its scope. */
+function useCheckoutRecovery(event, setStep) {
+	const [recoveryEventId, setRecoveryEventId] = useState(null);
+	return {
+		checkoutRecovery: event !== null && recoveryEventId === event.selectionId,
+		startCheckoutRecovery: useCallback(() => {
+			if (!event) return;
+			setRecoveryEventId(event.selectionId);
+			setStep("select-tickets");
+		}, [event, setStep])
+	};
+}
+/** Authenticated pending bookings enter the same form-only recovery path as guests. */
+function useCheckoutRecoveryEligibility(eligibility, step, checkoutRecovery, startCheckoutRecovery) {
+	const registrationKind = eligibility?.registration.kind;
+	useEffect(() => {
+		if ((step === "select-event" || step === "select-tickets" || step === "enter-details" || step === "select-payment") && registrationKind === "pending_payment" && !checkoutRecovery) startCheckoutRecovery();
+	}, [
+		registrationKind,
+		step,
+		checkoutRecovery,
+		startCheckoutRecovery
+	]);
+	return useMemo(() => checkoutRecovery ? getCheckoutRecoveryFormEligibility(eligibility) : eligibility, [checkoutRecovery, eligibility]);
+}
+//#endregion
+//#region ../blocks/src/system/runtime/nodes/event-registration/registrationErrorRecovery.ts
+function resolveRegistrationRecoveryAction(step, action) {
+	if (step === "payment-failed") return "payment-options";
+	if (step === "verifying-payment" || step === "verifying-timeout" || step === "redirecting") return "payment-status";
+	return action;
+}
+function canRecoverToWaitlist(eligibility) {
+	return Boolean(eligibility?.isFull && eligibility.canJoinWaitlist);
+}
+function shouldRefreshAfterRegistrationError(step, action, enabled) {
+	return enabled || step === "error" && action === "places";
+}
+function resetRegistrationAfterExpiry(input) {
+	input.dispatchFlow({
+		type: "reset",
+		hasPreSelectedContext: input.hasPreSelectedContext
+	});
+	input.setSelectedTicketLines([]);
+	input.setSelectedSlidingAmountInput("");
+	const mode = input.preSelectedEvent?.deliveryMode;
+	input.setSelectedAttendanceMode(mode === "online" || mode === "in_person" ? mode : null);
+	input.setErrorMessage("");
+	input.setPendingRegistrationReference(null);
+}
+/** Recovery never starts another payment. Unknown payment outcomes go to the portal. */
+function recoverRegistrationError(action, handlers) {
+	switch (action) {
+		case "none": return;
+		case "portal":
+		case "payment-status":
+			window.location.assign("/portal");
+			return;
+		case "event":
+			window.location.assign(window.location.pathname);
+			return;
+		case "retry":
+			window.location.reload();
+			return;
+		case "details":
+			handlers.clearError();
+			handlers.setStep("enter-details");
+			return;
+		case "payment-options":
+		case "places":
+			handlers.refreshOptions();
+			handlers.clearError();
+			handlers.setStep(action === "places" ? handlers.canJoinWaitlist ? "enter-details" : "select-tickets" : "select-payment");
+			return;
+		case "start":
+			handlers.refreshOptions();
+			handlers.reset();
+			return;
+	}
+}
+//#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/validation.ts
 function createInitialRegistrationFormData() {
 	return {
@@ -15129,6 +15267,7 @@ function hasValidPricingOptionSelection(input) {
 const initialEligibilityLookupState = {
 	tag: "idle",
 	eligibility: null,
+	settledRequestKey: null,
 	error: null
 };
 function eligibilityLookupReducer(state, action) {
@@ -15137,16 +15276,19 @@ function eligibilityLookupReducer(state, action) {
 		case "loading-started": return {
 			tag: "loading",
 			eligibility: state.eligibility,
+			settledRequestKey: state.settledRequestKey,
 			error: null
 		};
 		case "resolved": return {
 			tag: "resolved",
 			eligibility: action.eligibility,
+			settledRequestKey: action.requestKey,
 			error: null
 		};
 		case "failed": return {
 			tag: "failed",
 			eligibility: null,
+			settledRequestKey: null,
 			error: action.message
 		};
 		default: return assertNever(action);
@@ -15252,9 +15394,23 @@ function toRegistrationOptionsSubject(subject, attendanceMode) {
 function useEligibility(params) {
 	return useEligibilityWithDeps(params, eventRegistrationHooksDeps);
 }
+function eligibilityRequestKey(params) {
+	return JSON.stringify({
+		enabled: params.enabled,
+		refreshKey: params.refreshKey ?? 0,
+		subject: params.subject,
+		attendanceMode: params.attendanceMode ?? null,
+		ticketSelections: params.ticketSelectionsKey,
+		selectedSlidingAmount: params.selectedSlidingAmount ?? null
+	});
+}
 function useEligibilityWithDeps(params, deps) {
 	const api = deps.useBlockApi();
 	const ticketSelectionsKey = JSON.stringify(normalizeTicketSelectionLines(params.ticketSelections));
+	const requestKey = eligibilityRequestKey({
+		...params,
+		ticketSelectionsKey
+	});
 	const [state, dispatch] = useReducer(eligibilityLookupReducer, initialEligibilityLookupState);
 	const requestIdRef = useRef(0);
 	useEffect(() => {
@@ -15287,7 +15443,8 @@ function useEligibilityWithDeps(params, deps) {
 				if (cancelled || requestIdRef.current !== requestId) return;
 				dispatch({
 					type: "resolved",
-					eligibility: transformRegistrationOptionsResponse(result)
+					eligibility: transformRegistrationOptionsResponse(result),
+					requestKey
 				});
 			} catch {
 				if (cancelled || requestIdRef.current !== requestId) return;
@@ -15316,6 +15473,8 @@ function useEligibilityWithDeps(params, deps) {
 	return {
 		state,
 		eligibility: state.eligibility,
+		settledRequestKey: state.settledRequestKey,
+		requestKey,
 		isLoading: state.tag === "loading",
 		error: state.error,
 		creditState
@@ -15514,6 +15673,10 @@ const eventRegistrationErrors = {
 		message: "We’re checking your booking and payment. Please don’t try to book again yet. If you’ve already paid, you don’t need to pay again.",
 		action: "payment-status"
 	},
+	paymentProviderUnavailable: {
+		message: "We couldn’t reach the payment provider. Please try again in a minute.",
+		action: "retry"
+	},
 	paymentPageUnavailable: {
 		message: "We couldn’t open the payment page. Please refresh this page and try again. If this keeps happening, contact the organiser for help.",
 		action: "retry"
@@ -15636,11 +15799,6 @@ function ensureWaitlistClaimLocationTracking() {
 	} catch {}
 	window.addEventListener("popstate", emitWaitlistClaimLocationChange);
 }
-function getWaitlistClaimTokenFromUrl() {
-	if (typeof window === "undefined") return null;
-	const token = new URLSearchParams(window.location.search).get("waitlist_claim")?.trim() ?? "";
-	return token.length > 0 ? token : null;
-}
 const useWaitlistClaimDeps = { useBlockApi };
 function subscribeToWaitlistClaimToken(callback) {
 	if (typeof window === "undefined") return () => {};
@@ -15650,28 +15808,42 @@ function subscribeToWaitlistClaimToken(callback) {
 		window.removeEventListener(WAITLIST_CLAIM_LOCATION_EVENT, callback);
 	};
 }
-function getWaitlistClaimTokenSnapshot() {
-	return getWaitlistClaimTokenFromUrl();
+function getWaitlistClaimLocationSnapshot() {
+	return typeof window === "undefined" ? "" : window.location.search;
+}
+function parseWaitlistClaimCredential(search) {
+	const params = new URLSearchParams(search);
+	const token = params.get("waitlist_claim")?.trim();
+	if (token) return {
+		kind: "emailedToken",
+		token
+	};
+	const entryId = params.get("waitlistEntry")?.trim();
+	return entryId ? {
+		kind: "portalOwnedEntry",
+		entryId
+	} : null;
 }
 function useWaitlistClaim() {
 	return useWaitlistClaimWithDeps(useWaitlistClaimDeps);
 }
 function useWaitlistClaimWithDeps(deps) {
-	return useResolvedWaitlistClaim(deps, useSyncExternalStore(subscribeToWaitlistClaimToken, getWaitlistClaimTokenSnapshot, () => null));
+	const locationSearch = useSyncExternalStore(subscribeToWaitlistClaimToken, getWaitlistClaimLocationSnapshot, () => "");
+	return useResolvedWaitlistClaim(deps, useMemo(() => parseWaitlistClaimCredential(locationSearch), [locationSearch]));
 }
-function useResolvedWaitlistClaim(deps, token) {
+function useResolvedWaitlistClaim(deps, credential) {
 	const api = deps.useBlockApi();
-	const [state, dispatch] = useReducer(waitlistClaimReducer, Boolean(token), createInitialWaitlistClaimState);
+	const [state, dispatch] = useReducer(waitlistClaimReducer, Boolean(credential), createInitialWaitlistClaimState);
 	useEffect(() => {
 		let cancelled = false;
 		async function resolveClaim() {
-			if (!token) {
+			if (!credential) {
 				dispatch({ type: "cleared" });
 				return;
 			}
 			dispatch({ type: "started" });
 			try {
-				const result = await api.resolveWaitlistClaim({ claimToken: token });
+				const result = credential.kind === "portalOwnedEntry" ? await api.resolveWaitlistClaim({ waitlistEntryId: credential.entryId }) : await api.resolveWaitlistClaim({ claimToken: credential.token });
 				if (cancelled) return;
 				dispatch({
 					type: "resolved",
@@ -15689,9 +15861,10 @@ function useResolvedWaitlistClaim(deps, token) {
 		return () => {
 			cancelled = true;
 		};
-	}, [api, token]);
+	}, [api, credential]);
 	return {
-		token,
+		token: credential?.kind === "emailedToken" ? credential.token : null,
+		entryId: credential?.kind === "portalOwnedEntry" ? credential.entryId : null,
 		claim: getWaitlistClaim(state),
 		error: getWaitlistClaimError(state),
 		loginMessage: getWaitlistClaimLoginMessage(state),
@@ -16173,15 +16346,12 @@ function useEventRegistrationSubmitWithDeps(options, deps) {
 	* landed — a success, or a hand-off to checkout — because until then nobody
 	* knows whether the first one committed.
 	*
-	* Reusing it after a failure is safe even if the customer edits their
-	* details. The server consults the command record before it re-checks
-	* anything, so a submission that already booked is answered with the booking
-	* that exists — not refused for spending a credit or a claim that this very
-	* command already spent, and not treated as a second booking because a name
-	* or a note changed in between.
+	* Identical retries retain the command after a lost response. Changed form
+	* details get a new command so the server applies the new booking intent.
 	*/
-	const commandIdRef = useRef(null);
-	return async (method, passId, membershipId, selection, submitOptions) => {
+	const commandRef = useRef(null);
+	const inFlightRef = useRef(null);
+	const submit = async (method, passId, membershipId, selection, submitOptions) => {
 		const target = options.registrationTarget;
 		if (!target) return {
 			ok: false,
@@ -16189,44 +16359,34 @@ function useEventRegistrationSubmitWithDeps(options, deps) {
 			message: "Select an event to continue."
 		};
 		options.setStep("submitting");
-		const registrationCommandId = commandIdRef.current ?? deps.createClientCommandId();
-		commandIdRef.current = registrationCommandId;
+		const registrationCommandId = commandRef.current?.id ?? deps.createClientCommandId();
 		try {
-			const prepared = prepareSubmitContext(options, registrationCommandId, target, method, passId, membershipId, selection);
+			let prepared = prepareSubmitContext(options, registrationCommandId, target, method, passId, membershipId, selection);
 			if (prepared.subject.kind === "wholeSeries" && method === "stripe") {
-				commandIdRef.current = null;
+				commandRef.current = null;
 				return await submitWholeSeriesCheckout(options, deps, {
 					...prepared,
 					subject: prepared.subject
 				}, submitOptions);
 			}
+			const request = buildOccurrenceRegistrationRequest(options, prepared, method, passId, membershipId);
+			const intentKey = registrationRequestIntentKey(request);
+			if (commandRef.current !== null && commandRef.current.intentKey !== intentKey) prepared = {
+				...prepared,
+				registrationCommandId: deps.createClientCommandId()
+			};
+			commandRef.current = {
+				id: prepared.registrationCommandId,
+				intentKey
+			};
 			const result = await options.api.registerForEvent({
-				registrationCommandId: prepared.registrationCommandId,
-				subject: prepared.subject,
-				ticketSelections: toTicketSelectionRequests(prepared.ticketSelections),
-				selectedSlidingAmount: options.selectedSlidingAmount ?? void 0,
-				email: options.formData.email.trim().toLowerCase(),
-				name: options.formData.name.trim(),
-				phone: options.formData.phone.trim() || void 0,
-				notes: options.formData.notes.trim() || void 0,
-				consentAccepted: options.formData.consentAccepted,
-				altchaSolution: options.altchaSolution,
-				paymentMethod: method,
-				customerPassId: method === "pass" ? passId : void 0,
-				customerMembershipId: method === "membership" ? membershipId : void 0,
-				bundleProductId: prepared.bundleProductId,
-				claimToken: options.claimToken ?? void 0,
-				guests: prepared.guestsPayload
+				...request,
+				registrationCommandId: prepared.registrationCommandId
 			});
-			commandIdRef.current = null;
-			if (needsOccurrenceCheckout(result, method)) return await submitOccurrenceCheckout(options, deps, prepared, result, method, submitOptions);
-			options.setRegistrationResult(toRegistrationResult(result));
-			options.setStep("success");
-			return {
-				ok: true,
-				outcome: { kind: "completed" }
-			};
+			commandRef.current = null;
+			return await completeRegistrationSubmission(options, deps, prepared, result, method, submitOptions);
 		} catch (error) {
+			if (error instanceof BlockApiError && error.tag === "registrationPreparationChanged") commandRef.current = null;
 			const { message, action } = registrationErrorPresentation(error);
 			options.setErrorAction?.(action);
 			options.setErrorMessage(message);
@@ -16238,6 +16398,24 @@ function useEventRegistrationSubmitWithDeps(options, deps) {
 			};
 		}
 	};
+	return (...args) => {
+		if (inFlightRef.current) return inFlightRef.current;
+		const pending = Promise.resolve().then(() => submit(...args));
+		inFlightRef.current = pending;
+		pending.finally(() => {
+			if (inFlightRef.current === pending) inFlightRef.current = null;
+		});
+		return pending;
+	};
+}
+async function completeRegistrationSubmission(options, deps, prepared, result, method, submitOptions) {
+	if (needsOccurrenceCheckout(result, method)) return await submitOccurrenceCheckout(options, deps, prepared, result, method, submitOptions);
+	options.setRegistrationResult(toRegistrationResult(result));
+	options.setStep("success");
+	return {
+		ok: true,
+		outcome: { kind: "completed" }
+	};
 }
 function toTicketSelectionRequests(lines) {
 	return lines.map((line) => ({
@@ -16312,6 +16490,7 @@ async function submitWholeSeriesCheckout(options, deps, prepared, submitOptions)
 		altchaSolution: options.altchaSolution,
 		guests: prepared.guestsPayload,
 		claimToken: options.claimToken ?? void 0,
+		waitlistEntryId: options.waitlistEntryId ?? void 0,
 		discountCode: options.discountCode.trim() || void 0,
 		collectionOptionKind: prepared.selectionSnapshot.collectionOptionKind,
 		checkoutAttemptId,
@@ -16333,14 +16512,14 @@ async function submitWholeSeriesCheckout(options, deps, prepared, submitOptions)
 	}
 	if (result.bypassed) return completeBypassedCheckout(options);
 	if (!result.checkoutUrl) throw new Error("Checkout URL missing");
-	savePendingCheckout(options, deps, prepared, checkoutAttemptId, {
+	savePendingCheckout(options, deps, prepared, result.checkoutAttemptId, {
 		scope: "wholeSeries",
 		registrationId: result.registrationId
 	});
 	return redirectToCheckout(result.checkoutUrl, submitOptions);
 }
 function needsOccurrenceCheckout(result, method) {
-	return result.scope === "occurrence" && !result.alreadyRegistered && result.status === "confirmed" && result.pendingPayment && [
+	return result.scope === "occurrence" && result.status === "confirmed" && result.pendingPayment && [
 		"stripe",
 		"pass_bundle",
 		"membership_bundle"
@@ -16360,6 +16539,7 @@ async function submitOccurrenceCheckout(options, deps, prepared, registration, m
 			kind: "occurrence",
 			attendeeId: registration.attendeeId
 		},
+		registrationCommandId: prepared.registrationCommandId,
 		checkoutType: method === "pass_bundle" ? "pass_bundle" : method === "membership_bundle" ? "membership_bundle" : "event",
 		productId: prepared.bundleProductId,
 		discountCode: options.discountCode.trim() || void 0,
@@ -16402,6 +16582,151 @@ function redirectToCheckout(checkoutUrl, submitOptions) {
 		}
 	};
 }
+function registrationRequestIntentKey(request) {
+	const { registrationCommandId: _command, altchaSolution: _proof, ...intent } = request;
+	return JSON.stringify(intent);
+}
+function buildOccurrenceRegistrationRequest(options, prepared, method, passId, membershipId) {
+	return {
+		registrationCommandId: prepared.registrationCommandId,
+		subject: prepared.subject,
+		ticketSelections: toTicketSelectionRequests(prepared.ticketSelections),
+		selectedSlidingAmount: options.selectedSlidingAmount ?? void 0,
+		email: options.formData.email.trim().toLowerCase(),
+		name: options.formData.name.trim(),
+		phone: options.formData.phone.trim() || void 0,
+		notes: options.formData.notes.trim() || void 0,
+		consentAccepted: options.formData.consentAccepted,
+		altchaSolution: options.altchaSolution,
+		paymentMethod: method,
+		customerPassId: method === "pass" ? passId : void 0,
+		customerMembershipId: method === "membership" ? membershipId : void 0,
+		bundleProductId: prepared.bundleProductId,
+		claimToken: options.claimToken ?? void 0,
+		waitlistEntryId: options.waitlistEntryId ?? void 0,
+		guests: prepared.guestsPayload
+	};
+}
+//#endregion
+//#region ../blocks/src/system/runtime/nodes/event-registration/registrationDerivations.ts
+function eventMatchesOccurrenceId(event, occurrenceId) {
+	return event.registrationSubject.kind === "occurrence" && (event.registrationSubject.occurrenceId === occurrenceId || event.selectionId === occurrenceId);
+}
+function findEventByOccurrenceId(events, occurrenceId) {
+	return events.find((event) => eventMatchesOccurrenceId(event, occurrenceId)) ?? null;
+}
+function findPreSelectedEvent(input) {
+	const occurrenceContext = input.occurrenceContext;
+	if (!occurrenceContext) return input.scopedEvents.length === 1 ? input.scopedEvents[0] ?? null : null;
+	const contextDate = getBookingLocalDateKey(toScheduledBookingDateTime({
+		startsAt: occurrenceContext.startsAt,
+		timeZone: occurrenceContext.timeZone
+	}));
+	return input.scopedEvents.find((event) => eventMatchesOccurrenceId(event, occurrenceContext.id) || getBookingLocalDateKey(toScheduledBookingDateTime({
+		startsAt: event.startsAt,
+		timeZone: event.timeZone
+	})) === contextDate) ?? null;
+}
+function resolveRegistrationTarget(input) {
+	const subject = input.occurrenceContext ? {
+		kind: "occurrence",
+		occurrenceId: input.occurrenceContext.id
+	} : input.selectedEvent?.registrationSubject ?? null;
+	if (!subject) return null;
+	return {
+		subject,
+		selectedEventId: input.selectedEvent?.selectionId ?? null
+	};
+}
+function resolveEventRequiresPayment(input) {
+	if (input.eligibility) return input.eligibility.requiresPayment;
+	if (input.selectedTicketType) return input.selectedTicketType.priceAmount > 0;
+	if (!input.event) return false;
+	return publicEventPricingType(input.event.pricing) === "paid";
+}
+function resolveDiscountContext(input) {
+	const selection = input.paymentSelection.method ? input.paymentSelection : null;
+	if (!input.event) return null;
+	if (selection?.method === "pass_bundle" && selection.bundlePassId) return {
+		type: "pass",
+		passId: selection.bundlePassId
+	};
+	if (selection?.method === "membership_bundle" && selection.bundleMembershipId) return {
+		type: "membership",
+		membershipId: selection.bundleMembershipId
+	};
+	if (!input.eventRequiresPayment) return null;
+	if (input.ticketsCount <= 0) return null;
+	if (selection?.method && selection.method !== "stripe") return null;
+	return {
+		type: "event",
+		eventSeriesId: input.event.seriesId,
+		eventCategoryId: input.event.eventCategory?.id ?? null,
+		ticketsCount: input.ticketsCount
+	};
+}
+//#endregion
+//#region ../blocks/src/system/runtime/nodes/event-registration/useSettledCommerceView.ts
+function buildCandidate(input) {
+	if (!input.eligibilityIsSettled || !input.eligibility || !input.currentEvent) return null;
+	return {
+		eventSelectionId: input.currentEvent.selectionId,
+		discountContext: resolveDiscountContext({
+			paymentSelection: input.paymentSelection,
+			event: input.currentEvent,
+			eventRequiresPayment: input.eventRequiresPayment,
+			ticketsCount: input.ticketsCount
+		}),
+		subtotalCents: input.eligibility.price,
+		summaryLines: input.eligibility.ticketLines.map((line) => ({
+			pricingOptionId: line.pricingOptionId,
+			label: line.label,
+			quantity: line.quantity,
+			unitPriceCents: line.unitPriceCents,
+			subtotalCents: line.subtotalCents
+		}))
+	};
+}
+function eligibilityIsSettled(result) {
+	return result.settledRequestKey === result.requestKey;
+}
+function viewIsStale(view, currentEvent, eligibilityState) {
+	return view.eventSelectionId !== currentEvent?.selectionId || eligibilityState?.tag === "failed" || eligibilityState?.tag === "idle";
+}
+function requestIsSettled(discountUi) {
+	return discountUi.discountAvailabilityRequestKey === "disabled" || discountUi.settledDiscountAvailabilityRequestKey === discountUi.discountAvailabilityRequestKey;
+}
+function discountRequest(view) {
+	const discountContext = view?.discountContext ?? null;
+	return {
+		discountContext,
+		subtotalCents: discountContext?.type === "event" && view?.subtotalCents !== null ? view?.subtotalCents : void 0
+	};
+}
+function useSettledCommerceView(input) {
+	const candidate = buildCandidate({
+		eligibilityIsSettled: eligibilityIsSettled(input.eligibilityResult),
+		eligibility: input.eligibility,
+		currentEvent: input.currentEvent,
+		paymentSelection: input.paymentSelection,
+		eventRequiresPayment: input.eventRequiresPayment,
+		ticketsCount: input.ticketsCount
+	});
+	const settledRef = useRef(candidate);
+	if (settledRef.current && viewIsStale(settledRef.current, input.currentEvent, input.eligibilityResult.state)) settledRef.current = null;
+	const requestView = candidate ?? settledRef.current;
+	const discountUi = input.useDiscountCodeUi({
+		api: input.api,
+		...discountRequest(requestView)
+	});
+	if (candidate && requestIsSettled(discountUi)) settledRef.current = candidate;
+	return {
+		discountUi,
+		discountContext: settledRef.current?.discountContext ?? null,
+		ticketSelectionSubtotalCents: settledRef.current?.subtotalCents ?? null,
+		ticketSelectionSummaryLines: settledRef.current?.summaryLines ?? []
+	};
+}
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/eventPaymentOptions.ts
 function getApprovedDirectPaymentCollectionOptionKinds(paymentOptions) {
@@ -17044,64 +17369,6 @@ function getStepLabel(step) {
 	}
 }
 //#endregion
-//#region ../blocks/src/system/runtime/nodes/event-registration/registrationDerivations.ts
-function eventMatchesOccurrenceId(event, occurrenceId) {
-	return event.registrationSubject.kind === "occurrence" && (event.registrationSubject.occurrenceId === occurrenceId || event.selectionId === occurrenceId);
-}
-function findEventByOccurrenceId(events, occurrenceId) {
-	return events.find((event) => eventMatchesOccurrenceId(event, occurrenceId)) ?? null;
-}
-function findPreSelectedEvent(input) {
-	const occurrenceContext = input.occurrenceContext;
-	if (!occurrenceContext) return input.scopedEvents.length === 1 ? input.scopedEvents[0] ?? null : null;
-	const contextDate = getBookingLocalDateKey(toScheduledBookingDateTime({
-		startsAt: occurrenceContext.startsAt,
-		timeZone: occurrenceContext.timeZone
-	}));
-	return input.scopedEvents.find((event) => eventMatchesOccurrenceId(event, occurrenceContext.id) || getBookingLocalDateKey(toScheduledBookingDateTime({
-		startsAt: event.startsAt,
-		timeZone: event.timeZone
-	})) === contextDate) ?? null;
-}
-function resolveRegistrationTarget(input) {
-	const subject = input.occurrenceContext ? {
-		kind: "occurrence",
-		occurrenceId: input.occurrenceContext.id
-	} : input.selectedEvent?.registrationSubject ?? null;
-	if (!subject) return null;
-	return {
-		subject,
-		selectedEventId: input.selectedEvent?.selectionId ?? null
-	};
-}
-function resolveEventRequiresPayment(input) {
-	if (input.eligibility) return input.eligibility.requiresPayment;
-	if (input.selectedTicketType) return input.selectedTicketType.priceAmount > 0;
-	if (!input.event) return false;
-	return publicEventPricingType(input.event.pricing) === "paid";
-}
-function resolveDiscountContext(input) {
-	const selection = input.paymentSelection.method ? input.paymentSelection : null;
-	if (!input.event) return null;
-	if (selection?.method === "pass_bundle" && selection.bundlePassId) return {
-		type: "pass",
-		passId: selection.bundlePassId
-	};
-	if (selection?.method === "membership_bundle" && selection.bundleMembershipId) return {
-		type: "membership",
-		membershipId: selection.bundleMembershipId
-	};
-	if (!input.eventRequiresPayment) return null;
-	if (input.ticketsCount <= 0) return null;
-	if (selection?.method && selection.method !== "stripe") return null;
-	return {
-		type: "event",
-		eventSeriesId: input.event.seriesId,
-		eventCategoryId: input.event.eventCategory?.id ?? null,
-		ticketsCount: input.ticketsCount
-	};
-}
-//#endregion
 //#region ../blocks/src/system/blocks/events/shared/runGrouping.ts
 function isWholeSeriesPublicEvent(event) {
 	return event.bookingScope === "whole_series";
@@ -17340,10 +17607,6 @@ function isSoldOutWithoutWaitlist(input) {
 }
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/useEventRegistrationWizard.ts
-function resolveDiscountSubtotalCents(context, subtotalCents) {
-	if (context?.type !== "event" || subtotalCents === null) return void 0;
-	return subtotalCents;
-}
 function usesTieredPricing(event) {
 	return event !== null && event !== void 0 ? publicEventPricingStrategy(event.pricing) === "tiered" : false;
 }
@@ -17424,14 +17687,28 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 	}), [options.occurrenceContext, selectedEvent]);
 	const registrationOccurrenceId = getRegistrationOccurrenceId(registrationTarget);
 	const currentEvent = selectedEvent ?? preSelectedEvent;
+	const setStep = useCallback((nextStep) => {
+		dispatchFlow({
+			type: "set-step",
+			step: nextStep
+		});
+	}, []);
+	const { checkoutRecovery, startCheckoutRecovery } = useCheckoutRecovery(currentEvent, setStep);
 	const currentEventUsesTicketTypes = usesTieredPricing(currentEvent);
-	const currentCanJoinWaitlist = currentEvent ? canJoinEventWaitlist(currentEvent, { attendanceMode: selectedAttendanceMode }) : false;
+	const currentCanJoinWaitlist = canJoinWaitlistOutsideRecovery(currentEvent, selectedAttendanceMode, checkoutRecovery);
 	const usesTicketTypeSelections = currentEventUsesTicketTypes && !currentCanJoinWaitlist;
 	const eventTicketTypesForSelection = useMemo(() => getVisibleTicketTypes({
 		event: currentEvent,
 		eligibility: null,
 		selectedAttendanceMode
-	}), [currentEvent, selectedAttendanceMode]);
+	}).map((option) => checkoutRecovery ? {
+		...option,
+		availability: checkoutRecoveryOptionAvailability(option.availability)
+	} : option), [
+		currentEvent,
+		selectedAttendanceMode,
+		checkoutRecovery
+	]);
 	const normalizedSelectedTicketLines = useMemo(() => normalizeTicketSelectionLines(selectedTicketLines), [selectedTicketLines]);
 	const ticketTypeSelectionTotal = useMemo(() => getTicketSelectionTotal(normalizedSelectedTicketLines), [normalizedSelectedTicketLines]);
 	const ticketsCount = usesTicketTypeSelections ? ticketTypeSelectionTotal : flowState.ticketsCount;
@@ -17469,17 +17746,11 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		isAuthenticated: portalAuthState === "authenticated",
 		occurrenceId: registrationOccurrenceId
 	});
-	const eligibility = eligibilityResult.eligibility;
+	const eligibility = useCheckoutRecoveryEligibility(eligibilityResult.eligibility, step, checkoutRecovery, startCheckoutRecovery);
 	const eligibilityLoading = eligibilityResult.isLoading;
 	const eligibilityError = eligibilityResult.error;
 	const portalCreditState = eligibilityResult.creditState;
 	const registrationState = eligibility?.registration ?? { kind: "none" };
-	const setStep = useCallback((nextStep) => {
-		dispatchFlow({
-			type: "set-step",
-			step: nextStep
-		});
-	}, []);
 	const setTicketsCount = useCallback((nextTicketsCount) => {
 		dispatchFlow({
 			type: "set-tickets-count",
@@ -17587,10 +17858,14 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		event: currentEvent,
 		eligibility,
 		selectedAttendanceMode
-	}), [
+	}).map((option) => checkoutRecovery ? {
+		...option,
+		availability: checkoutRecoveryOptionAvailability(option.availability)
+	} : option), [
 		currentEvent,
 		selectedAttendanceMode,
-		eligibility
+		eligibility,
+		checkoutRecovery
 	]);
 	const singleSelectedPricingOptionId = getSingleSelectedPricingOptionId(normalizedSelectedTicketLines);
 	const selectedTicketType = useMemo(() => findSelectedTicketType({
@@ -17614,8 +17889,12 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		const event = currentEvent;
 		if (!usesTieredPricing(event)) return false;
 		if ((event.deliveryMode ?? "in_person") === "hybrid" && !selectedAttendanceMode) return false;
-		return !canJoinEventWaitlist(event, { attendanceMode: selectedAttendanceMode });
-	}, [currentEvent, selectedAttendanceMode]);
+		return checkoutRecovery || !canJoinEventWaitlist(event, { attendanceMode: selectedAttendanceMode });
+	}, [
+		currentEvent,
+		selectedAttendanceMode,
+		checkoutRecovery
+	]);
 	const hasValidTicketSelection = hasValidPricingOptionSelection({
 		selectionRequired: ticketTypeSelectionRequired,
 		lines: normalizedSelectedTicketLines,
@@ -17779,30 +18058,15 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		}
 		setStep("select-tickets");
 	};
-	const discountContext = useMemo(() => resolveDiscountContext({
-		paymentSelection,
-		event: currentEvent,
-		eventRequiresPayment,
-		ticketsCount
-	}), [
+	const { discountUi, discountContext, ticketSelectionSubtotalCents, ticketSelectionSummaryLines } = useSettledCommerceView({
+		api,
+		useDiscountCodeUi: deps.useDiscountCodeUi,
+		eligibilityResult,
+		eligibility,
 		currentEvent,
 		eventRequiresPayment,
 		paymentSelection,
 		ticketsCount
-	]);
-	const ticketSelectionSubtotalCents = eligibility?.price ?? null;
-	const ticketSelectionSummaryLines = useMemo(() => eligibility?.ticketLines.map((line) => ({
-		pricingOptionId: line.pricingOptionId,
-		label: line.label,
-		quantity: line.quantity,
-		unitPriceCents: line.unitPriceCents,
-		subtotalCents: line.subtotalCents
-	})) ?? [], [eligibility]);
-	const discountSubtotalCents = resolveDiscountSubtotalCents(discountContext, ticketSelectionSubtotalCents);
-	const discountUi = deps.useDiscountCodeUi({
-		api,
-		discountContext,
-		subtotalCents: discountSubtotalCents
 	});
 	const selectionMethod = paymentSelection.method;
 	const shouldShowDiscountToggle = discountContext !== null && discountUi.manualCodeEntryAllowed && (selectionMethod === "stripe" || selectionMethod === "pass_bundle" || selectionMethod === "membership_bundle");
@@ -17819,6 +18083,7 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		guests,
 		discountCode: discountUi.discountCode,
 		claimToken: waitlistClaim.token,
+		waitlistEntryId: waitlistClaim.entryId,
 		setPendingRegistrationReference,
 		setStep,
 		setRegistrationResult: (result) => setRegistrationResult(result),
@@ -17881,6 +18146,8 @@ function useEventRegistrationWizardWithDeps(options, deps) {
 		scopedEvents,
 		preSelectedEvent,
 		hasPreSelectedContext,
+		checkoutRecovery,
+		startCheckoutRecovery,
 		step,
 		setStep,
 		selectedEvent,