@cosmicdrift/kumiko-bundled-features 0.387.0 → 0.388.0

package/dist/billing-foundation/web/billing-plans-panel.js

@@ -7,21 +7,10 @@ import { BillingContactPlan } from "./billing-contact-plan.js";
 import { CancelContractDialog } from "./cancel-contract-dialog.js";
 import { CheckoutConsentDialog } from "./checkout-consent-dialog.js";
 import { BillingPlanActions, SubscriptionFoundationHandlers, SubscriptionFoundationQueries, SubscriptionStatuses, } from "./constants.js";
+import { resolveConsentLocale } from "./consumer-protection/consent-locale.js";
 import { localizedParams } from "./localized-params.js";
-function intervalKey(price) {
-    if (price === null || price.interval === null)
-        return undefined;
-    return price.intervalCount !== null && price.intervalCount > 1
-        ? `billing-foundation.plans.everyInterval.${price.interval}`
-        : `billing-foundation.plans.perInterval.${price.interval}`;
-}
-function renewalKey(price) {
-    if (price === null || price.interval === null)
-        return undefined;
-    return price.intervalCount !== null && price.intervalCount > 1
-        ? `billing-foundation.consent.renewsEvery.${price.interval}`
-        : `billing-foundation.consent.renews.${price.interval}`;
-}
+import { cheapestPrice, intervalKey, pricesDiffer, renewalKey, tierPrices } from "./plan-price.js";
+import { PlanSwitchConfirmDialog } from "./plan-switch-confirm-dialog.js";
 /** Which action the plan "would" offer if it weren't blocked — mirrors
  *  plan-catalog.ts's own decision tree, since `unavailable` collapses both
  *  "would checkout" and "would switch" into one action and the disabled CTA
@@ -86,8 +75,20 @@ export function BillingPlansPanel(_props) {
     const [redirecting, setRedirecting] = useState(false);
     const [consentTier, setConsentTier] = useState(null);
     const [cancelOpen, setCancelOpen] = useState(false);
+    const [chosenProvider, setChosenProvider] = useState(null);
+    const [switchTier, setSwitchTier] = useState(null);
+    const [switchRequested, setSwitchRequested] = useState(false);
+    // Only present when the tenant can choose (several offered providers) or
+    // the single offered provider has a note; absent means the server decides.
+    const providers = query.data?.providers;
+    const activeProvider = providers?.find((p) => p.name === chosenProvider) ?? providers?.[0];
+    const providerArg = activeProvider ? { providerName: activeProvider.name } : {};
     async function orderWithConsent(tier, consent) {
-        const result = await checkoutMutation.mutate({ tier, consent });
+        const result = await checkoutMutation.mutate({
+            tier,
+            ...(consent !== undefined && { consent }),
+            ...providerArg,
+        });
         if (result.isSuccess) {
             setRedirecting(true);
             window.location.assign(result.data.url);
@@ -95,13 +96,20 @@ export function BillingPlansPanel(_props) {
         return result;
     }
     async function handleAction(tier, kind) {
-        if (kind === "checkout" && query.data?.consumerProtection !== undefined) {
+        if (kind === "checkout" &&
+            (query.data?.consumerProtection !== undefined || (providers?.length ?? 0) > 1)) {
+            setChosenProvider(null);
             setConsentTier(tier);
             return;
         }
+        if (kind === "switch" && query.data?.inAppPlanSwitch) {
+            setSwitchTier(tier);
+            return;
+        }
         setRedirecting(true);
-        const mutation = kind === "checkout" ? checkoutMutation : switchMutation;
-        const result = await mutation.mutate({ tier });
+        const result = kind === "checkout"
+            ? await checkoutMutation.mutate({ tier, ...providerArg })
+            : await switchMutation.mutate({ tier });
         if (result.isSuccess) {
             window.location.assign(result.data.url);
         }
@@ -128,13 +136,19 @@ export function BillingPlansPanel(_props) {
     if (!query.data)
         return null;
     const result = query.data;
+    // Cards show the first provider's price; the dialog then follows the chosen one.
+    const shownPlans = providers?.[0]?.plans ?? result.plans;
+    const dialogPlans = activeProvider?.plans ?? result.plans;
     // The consent dialog shows the checkout error itself.
     const mutationError = (consentTier === null ? checkoutMutation.error : null) ??
         switchMutation.error ??
         portalMutation.error;
     const canManage = result.subscription !== null && !result.subscription.terminal && result.canPurchase;
     function toCardProps(plan) {
-        const key = intervalKey(plan.price);
+        const comparable = providers !== undefined && providers.length > 1 ? tierPrices(providers, plan.tier) : [];
+        const fromPrice = pricesDiffer(comparable) ? cheapestPrice(comparable) : undefined;
+        const shownPrice = fromPrice ?? plan.price;
+        const key = intervalKey(shownPrice);
         return {
             title: t(plan.labelKey),
             description: plan.action === BillingPlanActions.paymentPending
@@ -147,13 +161,14 @@ export function BillingPlansPanel(_props) {
             // provider lookup failure.
             price: !result.enabled && plan.isCurrent
                 ? undefined
-                : plan.price === null
+                : shownPrice === null
                     ? null
                     : {
-                        amount: formatMoney(plan.price.unitAmount, plan.price.currency, locale),
+                        amount: formatMoney(shownPrice.unitAmount, shownPrice.currency, locale),
+                        ...(fromPrice !== undefined && { prefix: t("billing-foundation.plans.priceFrom") }),
                         ...(key !== undefined && {
                             period: t(key, {
-                                count: new Intl.NumberFormat(locale).format(plan.price.intervalCount ?? 1),
+                                count: new Intl.NumberFormat(locale).format(shownPrice.intervalCount ?? 1),
                             }),
                         }),
                     },
@@ -168,26 +183,57 @@ export function BillingPlansPanel(_props) {
     // (a legacy/free/pilot tier outside `catalog.plans`) — when none of the
     // rendered plans is the current one, a synthetic current-tier card (no
     // price, no cta) keeps it visible regardless of enabled/disabled.
-    const consentPlan = consentTier !== null ? result.plans.find((plan) => plan.tier === consentTier) : undefined;
+    const consentPlan = consentTier !== null ? dialogPlans.find((plan) => plan.tier === consentTier) : undefined;
+    const switchPlan = switchTier !== null ? shownPlans.find((plan) => plan.tier === switchTier) : undefined;
     const consumerProtection = result.consumerProtection;
-    const currentTierInPlans = result.plans.some((plan) => plan.isCurrent);
-    const visiblePlans = result.enabled
-        ? result.plans
-        : result.plans.filter((plan) => plan.isCurrent);
-    return (_jsxs("div", { className: "flex flex-col gap-4", "data-testid": "billing-plans-panel", children: [!result.enabled && (_jsx(Banner, { variant: "info", testId: "billing-plans-panel-disabled", children: t("billing-foundation.plans.billingDisabled") })), !result.canPurchase && (_jsx(Banner, { variant: "warning", testId: "billing-plans-panel-readonly", children: t("billing-foundation.plans.purchaseNotAllowed") })), mutationError !== null && (_jsx(Banner, { variant: "error", testId: "billing-plans-panel-mutation-error", children: t(mutationError.i18nKey, mutationError.i18nParams) })), result.subscription?.status === SubscriptionStatuses.pastDue && (_jsx(Banner, { variant: "warning", testId: "billing-plans-panel-past-due", children: t("billing-foundation.plans.pastDue") })), result.subscription !== null &&
+    const noteLocale = resolveConsentLocale(locale);
+    const noteOf = (provider) => provider.note?.[noteLocale] ?? provider.note?.["en"];
+    const singleProviderNote = providers !== undefined && providers.length === 1 && providers[0] !== undefined
+        ? noteOf(providers[0])
+        : undefined;
+    function providerChoiceFor(tier) {
+        if (providers === undefined || providers.length < 2 || activeProvider === undefined) {
+            return undefined;
+        }
+        const prices = tierPrices(providers, tier);
+        const showPrices = pricesDiffer(prices);
+        return {
+            value: activeProvider.name,
+            onChange: setChosenProvider,
+            options: providers.map((provider) => {
+                const price = provider.plans.find((plan) => plan.tier === tier)?.price;
+                const note = noteOf(provider);
+                return {
+                    value: provider.name,
+                    title: provider.displayName,
+                    ...(note !== undefined && { description: note }),
+                    ...(showPrices &&
+                        price && { aside: formatMoney(price.unitAmount, price.currency, locale) }),
+                };
+            }),
+        };
+    }
+    const currentTierInPlans = shownPlans.some((plan) => plan.isCurrent);
+    const visiblePlans = result.enabled ? shownPlans : shownPlans.filter((plan) => plan.isCurrent);
+    return (_jsxs("div", { className: "flex flex-col gap-4", "data-testid": "billing-plans-panel", children: [!result.enabled && (_jsx(Banner, { variant: "info", testId: "billing-plans-panel-disabled", children: t("billing-foundation.plans.billingDisabled") })), !result.canPurchase && (_jsx(Banner, { variant: "warning", testId: "billing-plans-panel-readonly", children: t("billing-foundation.plans.purchaseNotAllowed") })), switchRequested && (_jsx(Banner, { variant: "info", testId: "billing-plans-panel-switch-requested", children: t("billing-foundation.plans.planSwitchRequested") })), mutationError !== null && (_jsx(Banner, { variant: "error", testId: "billing-plans-panel-mutation-error", children: t(mutationError.i18nKey, mutationError.i18nParams) })), result.subscription?.status === SubscriptionStatuses.pastDue && (_jsx(Banner, { variant: "warning", testId: "billing-plans-panel-past-due", children: t("billing-foundation.plans.pastDue") })), result.subscription !== null &&
                 !result.subscription.terminal &&
                 result.subscription.cancelAt != null && (_jsxs(Banner, { variant: "info", testId: "billing-plans-panel-cancel-scheduled", children: [t("billing-foundation.plans.cancelScheduled", {
                         date: toInstant(result.subscription.cancelAt).toLocaleString(locale, {
                             dateStyle: "medium",
                         }),
-                    }), " ", t("billing-foundation.plans.switchRequiresReactivation")] })), consumerProtection !== undefined && canManage && result.subscription?.cancelAt == null && (_jsx("div", { children: _jsx(Button, { variant: "secondary", onClick: () => setCancelOpen(true), testId: "billing-plans-cancel-contract", children: t("billing-foundation.cancel.open") }) })), _jsxs(PlanGrid, { testId: "billing-plans-grid", children: [!currentTierInPlans && (_jsx(PlanCard, { title: t(result.currentTier.labelKey), current: true, testId: "billing-plan-card-current", features: result.currentTier.benefits.map((benefit) => t(benefit.labelKey, localizedParams(benefit.params, locale))), secondaryAction: manageOrReactivateAction(canManage, result.subscription, t, handleManage, redirecting) })), visiblePlans.map((plan) => (_jsx(PlanCard, { testId: `billing-plan-card-${plan.tier}`, ...toCardProps(plan) }, plan.tier))), result.contact !== undefined && _jsx(BillingContactPlan, { contact: result.contact })] }), consumerProtection !== undefined &&
-                consentPlan !== undefined &&
-                consentPlan.price !== null && (_jsx(CheckoutConsentDialog, { open: true, onOpenChange: (open) => {
+                    }), " ", t("billing-foundation.plans.switchRequiresReactivation")] })), consumerProtection !== undefined && canManage && result.subscription?.cancelAt == null && (_jsx("div", { children: _jsx(Button, { variant: "secondary", onClick: () => setCancelOpen(true), testId: "billing-plans-cancel-contract", children: t("billing-foundation.cancel.open") }) })), _jsxs(PlanGrid, { testId: "billing-plans-grid", children: [!currentTierInPlans && (_jsx(PlanCard, { title: t(result.currentTier.labelKey), current: true, testId: "billing-plan-card-current", features: result.currentTier.benefits.map((benefit) => t(benefit.labelKey, localizedParams(benefit.params, locale))), secondaryAction: manageOrReactivateAction(canManage, result.subscription, t, handleManage, redirecting) })), visiblePlans.map((plan) => (_jsx(PlanCard, { testId: `billing-plan-card-${plan.tier}`, ...toCardProps(plan) }, plan.tier))), result.contact !== undefined && _jsx(BillingContactPlan, { contact: result.contact })] }), consentPlan !== undefined && consentPlan.price !== null && (_jsx(CheckoutConsentDialog, { open: true, onOpenChange: (open) => {
                     if (!open)
                         setConsentTier(null);
                 }, planName: t(consentPlan.labelKey), price: {
                     amount: formatMoney(consentPlan.price.unitAmount, consentPlan.price.currency, locale),
                     renewalKey: renewalKey(consentPlan.price),
                     count: new Intl.NumberFormat(locale).format(consentPlan.price.intervalCount ?? 1),
-                }, consumerProtection: consumerProtection, onOrder: (consent) => orderWithConsent(consentPlan.tier, consent), onConsentTextOutdated: () => void query.refetch() })), consumerProtection !== undefined && canManage && (_jsx(CancelContractDialog, { open: cancelOpen, onOpenChange: setCancelOpen, onTerminated: () => void query.refetch() }))] }));
+                }, consumerProtection: consumerProtection, providerChoice: providerChoiceFor(consentPlan.tier), note: singleProviderNote, onOrder: (consent) => orderWithConsent(consentPlan.tier, consent), onConsentTextOutdated: () => void query.refetch() })), switchPlan !== undefined && (_jsx(PlanSwitchConfirmDialog, { open: true, onOpenChange: (open) => {
+                    if (!open)
+                        setSwitchTier(null);
+                }, tier: switchPlan.tier, fromPlanName: t(result.currentTier.labelKey), toPlanName: t(switchPlan.labelKey), consumerProtection: consumerProtection, onApplied: () => {
+                    setSwitchTier(null);
+                    setSwitchRequested(true);
+                    void query.refetch();
+                }, onConsentTextOutdated: () => void query.refetch() })), consumerProtection !== undefined && canManage && (_jsx(CancelContractDialog, { open: cancelOpen, onOpenChange: setCancelOpen, onTerminated: () => void query.refetch() }))] }));
 }

package/dist/billing-foundation/web/checkout-consent-dialog.d.ts

@@ -18,11 +18,25 @@ export type CheckoutConsentDialogProps = {
         readonly renewalKey?: string;
         readonly count?: string;
     };
-    readonly consumerProtection: ConsumerProtectionView;
-    readonly onOrder: (consent: CheckoutConsentPayload) => Promise<WriteResult<{
+    /** Without it the dialog shows no legal links and no consent checkboxes and orders without a consent. */
+    readonly consumerProtection?: ConsumerProtectionView;
+    /** Several providers to pick from; the parent follows `value` for price and order. */
+    readonly providerChoice?: {
+        readonly options: readonly {
+            readonly value: string;
+            readonly title: string;
+            readonly description?: string;
+            readonly aside?: string;
+        }[];
+        readonly value: string;
+        readonly onChange: (value: string) => void;
+    };
+    /** Provider note under the price line when there is no provider choice. */
+    readonly note?: string;
+    readonly onOrder: (consent: CheckoutConsentPayload | undefined) => Promise<WriteResult<{
         url: string;
     }>>;
     readonly onConsentTextOutdated: () => void;
 };
-export declare function CheckoutConsentDialog({ open, onOpenChange, planName, price, consumerProtection, onOrder, onConsentTextOutdated, }: CheckoutConsentDialogProps): ReactNode;
+export declare function CheckoutConsentDialog({ open, onOpenChange, planName, price, consumerProtection, providerChoice, note, onOrder, onConsentTextOutdated, }: CheckoutConsentDialogProps): ReactNode;
 export {};

package/dist/billing-foundation/web/checkout-consent-dialog.js

@@ -1,10 +1,11 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useLocale, usePrimitives, useTranslation } from "@cosmicdrift/kumiko-renderer";
+import { ChoiceCards } from "@cosmicdrift/kumiko-renderer/web";
 import { useState } from "react";
 import { resolveConsentLocale } from "./consumer-protection/consent-locale.js";
 export const CONSENT_TEXT_OUTDATED_CODE = "consent_text_outdated";
 // kumiko-lint-ignore no-custom-primitives Uses usePrimitives().Modal internally, name is a billing domain action, not a primitive reimplementation
-export function CheckoutConsentDialog({ open, onOpenChange, planName, price, consumerProtection, onOrder, onConsentTextOutdated, }) {
+export function CheckoutConsentDialog({ open, onOpenChange, planName, price, consumerProtection, providerChoice, note, onOrder, onConsentTextOutdated, }) {
     const t = useTranslation();
     const uiLocale = useLocale().locale();
     const { Modal, Text, Field, Input, Button, Link, Banner } = usePrimitives();
@@ -13,17 +14,20 @@ export function CheckoutConsentDialog({ open, onOpenChange, planName, price, con
     const [submitting, setSubmitting] = useState(false);
     const [errorText, setErrorText] = useState(null);
     const consentLocale = resolveConsentLocale(uiLocale);
-    const texts = consumerProtection.consentTexts[consentLocale];
-    const legalLinks = consumerProtection.legalLinks[consentLocale];
+    const texts = consumerProtection?.consentTexts[consentLocale];
+    const legalLinks = consumerProtection?.legalLinks[consentLocale];
+    const consentGiven = consumerProtection === undefined || (earlyPerformance && withdrawalLoss);
     async function order() {
         setSubmitting(true);
         setErrorText(null);
-        const result = await onOrder({
-            earlyPerformanceRequested: true,
-            withdrawalLossAcknowledged: true,
-            consentTextVersion: texts.consentTextVersion,
-            locale: consentLocale,
-        });
+        const result = await onOrder(texts === undefined
+            ? undefined
+            : {
+                earlyPerformanceRequested: true,
+                withdrawalLossAcknowledged: true,
+                consentTextVersion: texts.consentTextVersion,
+                locale: consentLocale,
+            });
         if (result.isSuccess)
             return;
         setSubmitting(false);
@@ -34,5 +38,5 @@ export function CheckoutConsentDialog({ open, onOpenChange, planName, price, con
             onConsentTextOutdated();
         }
     }
-    return (_jsx(Modal, { open: open, onOpenChange: onOpenChange, title: t("billing-foundation.consent.title"), testId: "checkout-consent-dialog", children: _jsxs("div", { className: "flex flex-col gap-4", children: [_jsxs("div", { className: "flex flex-col gap-1", "data-testid": "checkout-consent-summary", children: [_jsxs(Text, { children: [planName, " \u2014 ", price.amount] }), price.renewalKey !== undefined && (_jsxs(_Fragment, { children: [_jsx(Text, { variant: "muted", children: t(price.renewalKey, price.count !== undefined ? { count: price.count } : undefined) }), _jsx(Text, { variant: "muted", children: t("billing-foundation.consent.cancelAnytime") })] }))] }), _jsxs("div", { className: "flex flex-wrap gap-4", children: [_jsx(Link, { href: legalLinks.terms, target: "_blank", children: t("billing-foundation.consent.link.terms") }), _jsx(Link, { href: legalLinks.withdrawal, target: "_blank", children: t("billing-foundation.consent.link.withdrawal") }), _jsx(Link, { href: legalLinks.privacy, target: "_blank", children: t("billing-foundation.consent.link.privacy") })] }), _jsx(Field, { id: "consent-early-performance", label: texts.earlyPerformance, layout: "inline", children: _jsx(Input, { kind: "boolean", id: "consent-early-performance", name: "consent-early-performance", value: earlyPerformance, onChange: setEarlyPerformance, disabled: submitting }) }), _jsx(Field, { id: "consent-withdrawal-loss", label: texts.withdrawalLoss, layout: "inline", children: _jsx(Input, { kind: "boolean", id: "consent-withdrawal-loss", name: "consent-withdrawal-loss", value: withdrawalLoss, onChange: setWithdrawalLoss, disabled: submitting }) }), errorText !== null && (_jsx(Banner, { variant: "error", testId: "checkout-consent-error", children: errorText })), _jsxs("div", { className: "flex justify-end gap-2", children: [_jsx(Button, { variant: "secondary", disabled: submitting, onClick: () => onOpenChange(false), testId: "checkout-consent-cancel", children: t("billing-foundation.consent.back") }), _jsx(Button, { disabled: !earlyPerformance || !withdrawalLoss || submitting, loading: submitting, onClick: order, testId: "checkout-consent-order", children: t("billing-foundation.consent.order") })] })] }) }));
+    return (_jsx(Modal, { open: open, onOpenChange: onOpenChange, title: t("billing-foundation.consent.title"), testId: "checkout-consent-dialog", children: _jsxs("div", { className: "flex flex-col gap-4", children: [providerChoice !== undefined && (_jsxs("div", { className: "flex flex-col gap-2", children: [_jsx(Text, { variant: "muted", children: t("billing-foundation.consent.chooseProvider") }), _jsx(ChoiceCards, { value: providerChoice.value, options: providerChoice.options, onChange: providerChoice.onChange, ariaLabel: t("billing-foundation.consent.chooseProvider"), testId: "checkout-provider-choice" })] })), _jsxs("div", { className: "flex flex-col gap-1", "data-testid": "checkout-consent-summary", children: [_jsxs(Text, { children: [planName, " \u2014 ", price.amount] }), price.renewalKey !== undefined && (_jsxs(_Fragment, { children: [_jsx(Text, { variant: "muted", children: t(price.renewalKey, price.count !== undefined ? { count: price.count } : undefined) }), _jsx(Text, { variant: "muted", children: t("billing-foundation.consent.cancelAnytime") })] })), note !== undefined && (_jsx(Text, { variant: "muted", testId: "checkout-consent-note", children: note }))] }), legalLinks !== undefined && (_jsxs("div", { className: "flex flex-wrap gap-4", children: [_jsx(Link, { href: legalLinks.terms, target: "_blank", children: t("billing-foundation.consent.link.terms") }), _jsx(Link, { href: legalLinks.withdrawal, target: "_blank", children: t("billing-foundation.consent.link.withdrawal") }), _jsx(Link, { href: legalLinks.privacy, target: "_blank", children: t("billing-foundation.consent.link.privacy") })] })), texts !== undefined && (_jsxs(_Fragment, { children: [_jsx(Field, { id: "consent-early-performance", label: texts.earlyPerformance, layout: "inline", children: _jsx(Input, { kind: "boolean", id: "consent-early-performance", name: "consent-early-performance", value: earlyPerformance, onChange: setEarlyPerformance, disabled: submitting }) }), _jsx(Field, { id: "consent-withdrawal-loss", label: texts.withdrawalLoss, layout: "inline", children: _jsx(Input, { kind: "boolean", id: "consent-withdrawal-loss", name: "consent-withdrawal-loss", value: withdrawalLoss, onChange: setWithdrawalLoss, disabled: submitting }) })] })), errorText !== null && (_jsx(Banner, { variant: "error", testId: "checkout-consent-error", children: errorText })), _jsxs("div", { className: "flex justify-end gap-2", children: [_jsx(Button, { variant: "secondary", disabled: submitting, onClick: () => onOpenChange(false), testId: "checkout-consent-cancel", children: t("billing-foundation.consent.back") }), _jsx(Button, { disabled: !consentGiven || submitting, loading: submitting, onClick: order, testId: "checkout-consent-order", children: t("billing-foundation.consent.order") })] })] }) }));
 }

package/dist/billing-foundation/web/constants.d.ts

@@ -78,6 +78,10 @@ export declare const SubscriptionFoundationQueries: {
      *  current tier and per-plan action. Only registered when a `catalog` is
      *  configured. */
     readonly billingPlans: "billing-foundation:query:billing-plans";
+    /** What switching to a tier would cost right now, for providers that switch
+     *  plans in-app (preview + apply). Only registered when a `catalog` is
+     *  configured. */
+    readonly planSwitchPreview: "billing-foundation:query:plan-switch-preview";
     /** System-only probe: does the caller tenant hold a non-terminal
      *  subscription (consumerProtection only). */
     readonly terminableSubscription: "billing-foundation:query:terminable-subscription";

package/dist/billing-foundation/web/constants.js

@@ -84,6 +84,10 @@ export const SubscriptionFoundationQueries = {
      *  current tier and per-plan action. Only registered when a `catalog` is
      *  configured. */
     billingPlans: "billing-foundation:query:billing-plans",
+    /** What switching to a tier would cost right now, for providers that switch
+     *  plans in-app (preview + apply). Only registered when a `catalog` is
+     *  configured. */
+    planSwitchPreview: "billing-foundation:query:plan-switch-preview",
     /** System-only probe: does the caller tenant hold a non-terminal
      *  subscription (consumerProtection only). */
     terminableSubscription: "billing-foundation:query:terminable-subscription",

package/dist/billing-foundation/web/plan-price.d.ts

@@ -0,0 +1,15 @@
+import type { BillingPlanView } from "../types.ts";
+type Recurrence = {
+    readonly interval: string | null;
+    readonly intervalCount: number | null;
+};
+export declare function intervalKey(price: Recurrence | null): string | undefined;
+export declare function renewalKey(price: Recurrence | null): string | undefined;
+type PlanPrice = NonNullable<BillingPlanView["price"]>;
+export declare function pricesDiffer(prices: readonly PlanPrice[]): boolean;
+/** Price of `tier` at every provider that offers it, in provider order. */
+export declare function tierPrices(providers: readonly {
+    readonly plans: readonly BillingPlanView[];
+}[], tier: string): PlanPrice[];
+export declare function cheapestPrice(prices: readonly PlanPrice[]): PlanPrice | undefined;
+export {};

package/dist/billing-foundation/web/plan-price.js

@@ -0,0 +1,32 @@
+export function intervalKey(price) {
+    if (price === null || price.interval === null)
+        return undefined;
+    return price.intervalCount !== null && price.intervalCount > 1
+        ? `billing-foundation.plans.everyInterval.${price.interval}`
+        : `billing-foundation.plans.perInterval.${price.interval}`;
+}
+export function renewalKey(price) {
+    if (price === null || price.interval === null)
+        return undefined;
+    return price.intervalCount !== null && price.intervalCount > 1
+        ? `billing-foundation.consent.renewsEvery.${price.interval}`
+        : `billing-foundation.consent.renews.${price.interval}`;
+}
+export function pricesDiffer(prices) {
+    const [first, ...rest] = prices;
+    return (first !== undefined &&
+        rest.some((price) => price.unitAmount !== first.unitAmount ||
+            price.currency !== first.currency ||
+            price.interval !== first.interval ||
+            price.intervalCount !== first.intervalCount));
+}
+/** Price of `tier` at every provider that offers it, in provider order. */
+export function tierPrices(providers, tier) {
+    return providers.flatMap((provider) => {
+        const price = provider.plans.find((plan) => plan.tier === tier)?.price;
+        return price ? [price] : [];
+    });
+}
+export function cheapestPrice(prices) {
+    return prices.reduce((lowest, price) => lowest === undefined || price.unitAmount < lowest.unitAmount ? price : lowest, undefined);
+}

package/dist/billing-foundation/web/plan-switch-confirm-dialog.d.ts

@@ -0,0 +1,15 @@
+import { type ReactNode } from "react";
+import type { BillingPlansResult } from "../types.ts";
+type ConsumerProtectionView = NonNullable<BillingPlansResult["consumerProtection"]>;
+export type PlanSwitchConfirmDialogProps = {
+    readonly open: boolean;
+    readonly onOpenChange: (open: boolean) => void;
+    readonly tier: string;
+    readonly fromPlanName: string;
+    readonly toPlanName: string;
+    readonly consumerProtection?: ConsumerProtectionView;
+    readonly onApplied: () => void;
+    readonly onConsentTextOutdated: () => void;
+};
+export declare function PlanSwitchConfirmDialog({ open, onOpenChange, tier, fromPlanName, toPlanName, consumerProtection, onApplied, onConsentTextOutdated, }: PlanSwitchConfirmDialogProps): ReactNode;
+export {};

package/dist/billing-foundation/web/plan-switch-confirm-dialog.js

@@ -0,0 +1,66 @@
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useLocale, useMutation, usePrimitives, useQuery, useTranslation, } from "@cosmicdrift/kumiko-renderer";
+import { formatMoney } from "@cosmicdrift/kumiko-renderer/web";
+import { useState } from "react";
+import { CONSENT_TEXT_OUTDATED_CODE, } from "./checkout-consent-dialog.js";
+import { SubscriptionFoundationHandlers, SubscriptionFoundationQueries } from "./constants.js";
+import { resolveConsentLocale } from "./consumer-protection/consent-locale.js";
+import { intervalKey } from "./plan-price.js";
+// kumiko-lint-ignore no-custom-primitives Uses usePrimitives().Modal internally, name is a billing domain action, not a primitive reimplementation
+export function PlanSwitchConfirmDialog({ open, onOpenChange, tier, fromPlanName, toPlanName, consumerProtection, onApplied, onConsentTextOutdated, }) {
+    const t = useTranslation();
+    const locale = useLocale().locale();
+    const { Modal, Text, Field, Input, Button, Link, Banner } = usePrimitives();
+    const previewQuery = useQuery(SubscriptionFoundationQueries.planSwitchPreview, { tier });
+    const switchMutation = useMutation(SubscriptionFoundationHandlers.switchPlan);
+    const [earlyPerformance, setEarlyPerformance] = useState(false);
+    const [withdrawalLoss, setWithdrawalLoss] = useState(false);
+    const [submitting, setSubmitting] = useState(false);
+    const [errorText, setErrorText] = useState(null);
+    const consentLocale = resolveConsentLocale(locale);
+    const texts = consumerProtection?.consentTexts[consentLocale];
+    const legalLinks = consumerProtection?.legalLinks[consentLocale];
+    const consentGiven = consumerProtection === undefined || (earlyPerformance && withdrawalLoss);
+    async function confirm() {
+        setSubmitting(true);
+        setErrorText(null);
+        const consent = texts === undefined
+            ? undefined
+            : {
+                earlyPerformanceRequested: true,
+                withdrawalLossAcknowledged: true,
+                consentTextVersion: texts.consentTextVersion,
+                locale: consentLocale,
+            };
+        const result = await switchMutation.mutate({ tier, ...(consent && { consent }) });
+        if (result.isSuccess) {
+            onApplied();
+            return;
+        }
+        setSubmitting(false);
+        setErrorText(t(result.error.i18nKey, result.error.i18nParams));
+        if (result.error.code === CONSENT_TEXT_OUTDATED_CODE) {
+            setEarlyPerformance(false);
+            setWithdrawalLoss(false);
+            onConsentTextOutdated();
+        }
+    }
+    const reply = previewQuery.data;
+    const money = (amount, currency) => formatMoney(amount, currency, locale);
+    const recurringKey = reply === null ? undefined : intervalKey(reply.target);
+    const recurringPrice = reply === null
+        ? ""
+        : `${money(reply.target.unitAmount, reply.target.currency)}${recurringKey === undefined
+            ? ""
+            : ` ${t(recurringKey, { count: new Intl.NumberFormat(locale).format(reply.target.intervalCount ?? 1) })}`}`;
+    return (_jsx(Modal, { open: open, onOpenChange: onOpenChange, title: t("billing-foundation.planSwitch.title"), testId: "plan-switch-confirm-dialog", children: _jsxs("div", { className: "flex flex-col gap-4", children: [_jsx(Text, { children: t("billing-foundation.planSwitch.summary", { from: fromPlanName, to: toPlanName }) }), previewQuery.error !== null && (_jsx(Banner, { variant: "error", testId: "plan-switch-preview-error", children: t(previewQuery.error.i18nKey, previewQuery.error.i18nParams) })), previewQuery.loading && reply === null && (_jsx(Banner, { variant: "loading", testId: "plan-switch-preview-loading", children: t("kumiko.widget.loading") })), reply !== null && (_jsxs("div", { className: "flex flex-col gap-1", "data-testid": "plan-switch-summary", children: [_jsxs(Text, { children: [t("billing-foundation.planSwitch.dueNow", {
+                                    amount: money(reply.preview.amountDueNow, reply.preview.currency),
+                                }), reply.preview.tax !== null &&
+                                    ` (${t("billing-foundation.planSwitch.includesTax", {
+                                        tax: money(reply.preview.tax, reply.preview.currency),
+                                    })})`] }), _jsx(Text, { variant: "muted", children: t("billing-foundation.planSwitch.credit", {
+                                amount: money(reply.preview.credit, reply.preview.currency),
+                            }) }), _jsx(Text, { variant: "muted", children: t("billing-foundation.planSwitch.recurring", {
+                                amount: recurringPrice,
+                            }) }), _jsx(Text, { variant: "muted", children: t("billing-foundation.planSwitch.effective") }), _jsx(Text, { variant: "muted", children: t("billing-foundation.planSwitch.pendingNote") })] })), legalLinks !== undefined && (_jsxs("div", { className: "flex flex-wrap gap-4", children: [_jsx(Link, { href: legalLinks.terms, target: "_blank", children: t("billing-foundation.consent.link.terms") }), _jsx(Link, { href: legalLinks.withdrawal, target: "_blank", children: t("billing-foundation.consent.link.withdrawal") }), _jsx(Link, { href: legalLinks.privacy, target: "_blank", children: t("billing-foundation.consent.link.privacy") })] })), texts !== undefined && (_jsxs(_Fragment, { children: [_jsx(Field, { id: "plan-switch-early-performance", label: texts.earlyPerformance, layout: "inline", children: _jsx(Input, { kind: "boolean", id: "plan-switch-early-performance", name: "plan-switch-early-performance", value: earlyPerformance, onChange: setEarlyPerformance, disabled: submitting }) }), _jsx(Field, { id: "plan-switch-withdrawal-loss", label: texts.withdrawalLoss, layout: "inline", children: _jsx(Input, { kind: "boolean", id: "plan-switch-withdrawal-loss", name: "plan-switch-withdrawal-loss", value: withdrawalLoss, onChange: setWithdrawalLoss, disabled: submitting }) })] })), errorText !== null && (_jsx(Banner, { variant: "error", testId: "plan-switch-confirm-error", children: errorText })), _jsxs("div", { className: "flex justify-end gap-2", children: [_jsx(Button, { variant: "secondary", disabled: submitting, onClick: () => onOpenChange(false), testId: "plan-switch-confirm-cancel", children: t("billing-foundation.consent.back") }), _jsx(Button, { disabled: !consentGiven || reply === null || submitting, loading: submitting, onClick: confirm, testId: "plan-switch-confirm-order", children: t("billing-foundation.planSwitch.order") })] })] }) }));
+}

package/dist/cap-counter/cap-reservation.js

@@ -269,7 +269,11 @@ async function consumeClaimedRow(txDb, user, claimed, options) {
         const booked = await bookCalendarDelta(txDb, user, options, options.units);
         if (!booked.isSuccess)
             return booked;
-        await txDb.updateMany(capReservationsTable, { consumedAmount: claimed.consumedAmount + options.units }, ownRow);
+        await txDb.updateMany(capReservationsTable, {
+            consumedAmount: claimed.consumedAmount + options.units,
+            // Keep the tombstone alive past its last consume, else a later consume would start a fresh one and double count.
+            expiresAt: Temporal.Now.instant().add({ minutes: CAP_SETTLED_TOMBSTONE_TTL_MINUTES }),
+        }, ownRow);
         return booked;
     }
     if (options.units > claimed.amount) {

package/dist/cap-counter/enforce-cap.js

@@ -16,8 +16,9 @@ export const CAP_TOLERANCES = {
 };
 export function assertBelowHardCap(valueSeenByLastUnit, cap) {
     const tolerance = CAP_TOLERANCES[cap.profile];
+    // Validated on every call so a misconfigured period fails deterministically, not only at the limit.
+    const resetAt = resolvePeriodEndIso(cap.periodStartIso, cap.periodEndIso);
     if (valueSeenByLastUnit >= cap.limit * tolerance.hard) {
-        const resetAt = resolvePeriodEndIso(cap.periodStartIso, cap.periodEndIso);
         throw new CapExceededError(cap.capName, cap.limit, valueSeenByLastUnit, tolerance, {
             ...(resetAt !== undefined && { resetAt }),
             ...(cap.i18nKey !== undefined && { i18nKey: cap.i18nKey }),

package/dist/cap-counter/stock-cap-guard.js

@@ -7,6 +7,12 @@ import { enforceStockCap } from "./enforce-cap.js";
 // pg_advisory_xact_lock namespace (int4): 'scap' as ASCII, disjoint from the
 // framework's other fixed advisory-lock keys.
 const STOCK_CAP_LOCK_NAMESPACE = 0x73636170;
+// Lock on the counted set, not on `code`: two handlers capping the same rows under
+// different codes must still serialize against each other.
+function countedSetKey(spec) {
+    const where = Object.entries(spec.where ?? {}).sort(([a], [b]) => a.localeCompare(b));
+    return `${spec.table.tableName}:${JSON.stringify(where)}`;
+}
 export function createStockCapGuard(resolveTierCaps) {
     async function checkStockCap(db, spec, context = {}) {
         // Lock-free on its own: a direct call outside withStockCap is not atomic.
@@ -31,7 +37,7 @@ export function createStockCapGuard(resolveTierCaps) {
                 // ctx.db is the handler's transaction, so the xact lock releases with its commit or
                 // rollback. A handler wrapped in several caps must list them in the same order
                 // everywhere; Postgres aborts one side of an inverse order with a deadlock error.
-                await ctx.db.advisoryXactLock(STOCK_CAP_LOCK_NAMESPACE, spec.code);
+                await ctx.db.advisoryXactLock(STOCK_CAP_LOCK_NAMESPACE, countedSetKey(spec));
                 const failure = await checkStockCap(ctx.db, spec, { config: ctx.config });
                 return failure ?? handler.handler(event, ctx);
             },

package/dist/channel-email/feature.js

@@ -6,7 +6,7 @@ import { smtpEnvSchema } from "./env.js";
 export function createChannelEmailFeature(options) {
     const channel = createEmailChannel(options);
     const feature = defineFeature("channel-email", (r) => {
-        r.describe("Wires an `EmailTransport` (typically `mail-transport-smtp` in production, `createInMemoryTransport()` in tests) into the delivery system as the `email` channel. Requires `delivery`; pass an `EmailChannelOptions` with a `transport` and a `resolveEmail` function that maps a user ID to their email address. Mails render from stored templates (`renderer-mail-html`): a notification routed to this channel needs `template` + `meta` on `r.notification`, otherwise its delivery fails. Pass `tenantTransport: tenantMailTransport` (from `mail-foundation`) to send the notifications declared with `tenantTransport: true` through the sending tenant's own configured provider: a broken provider fails the send, a tenant without one uses the app `transport`; every other notification (password reset, sign-in) always goes through the app `transport`. `transport` may be left out when `tenantTransport` is set; a mail that then has no transport fails with `missing_credentials`. Notifications declared with `unsubscribe: true` get a signed `data.unsubscribeUrl` from delivery, which turns into the `List-Unsubscribe` headers.");
+        r.describe("Wires an `EmailTransport` (typically `mail-transport-smtp` in production, `createInMemoryTransport()` in tests) into the delivery system as the `email` channel. Requires `delivery`; pass an `EmailChannelOptions` with a `transport` and a `resolveEmail` function that maps a user ID to their email address. Mails render from stored templates (`renderer-mail-html`): a notification routed to this channel needs `template` + `meta` on `r.notification`, otherwise its delivery fails. Pass `tenantTransport: tenantMailTransport` (from `mail-foundation`) to send the notifications declared with `tenantTransport: true` through the sending tenant's own configured provider: a broken provider fails the send, a tenant without one uses the app `transport`; every other notification (password reset, sign-in) always goes through the app `transport`. `transport` may be left out when `tenantTransport` is set, but then only notifications declared with `tenantTransport: true` are delivered: every other notification (password reset, sign-in, invitations) fails with `missing_credentials`, so an app without an app SMTP server must mark every notification that should go out or keep an app `transport`. Notifications declared with `unsubscribe: true` get a signed `data.unsubscribeUrl` from delivery, which turns into the `List-Unsubscribe` headers.");
         r.uiHints({
             displayLabel: "Email Channel",
             category: "notifications",

package/dist/config/handlers/cascade.query.d.ts

@@ -2,4 +2,9 @@ import { type ConfigCascade } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 export declare const cascadeQuery: import("@cosmicdrift/kumiko-types/define-handler").QueryHandlerDefinition<"cascade", z.ZodObject<{
     keys: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    scope: z.ZodOptional<z.ZodEnum<{
+        system: "system";
+        tenant: "tenant";
+        user: "user";
+    }>>;
 }, z.core.$strip>, Record<string, ConfigCascade>, import("@cosmicdrift/kumiko-types/event-type-map").KumikoEventTypeMap>;

package/dist/config/handlers/cascade.query.js

@@ -1,13 +1,14 @@
-import { defineQueryHandler, isEncryptedAtRest, } from "@cosmicdrift/kumiko-framework/engine";
+import { ConfigScopes, defineQueryHandler, isEncryptedAtRest, } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { requireConfigResolver, requireSystemDb } from "../feature.js";
 import { MASKED, redactInheritedCascade, shouldRedactInherited } from "../read-redaction.js";
-import { hasConfigAccess } from "../write-helpers.js";
+import { hasConfigAccess, keyDefAtScope } from "../write-helpers.js";
 export const cascadeQuery = defineQueryHandler({
     name: "cascade",
     description: "Shows, per config key the caller may read, the value at every cascade level (user, tenant, system, app override, default) and which level won; use it to explain where a setting's current value comes from.",
     schema: z.object({
         keys: z.array(z.string()).optional(),
+        scope: z.enum([ConfigScopes.system, ConfigScopes.tenant, ConfigScopes.user]).optional(),
     }),
     access: {
         openToAll: {
@@ -34,7 +35,7 @@ export const cascadeQuery = defineQueryHandler({
                 continue;
             if (!hasConfigAccess(keyDef.access.read, query.user.roles))
                 continue;
-            keyDefs.set(key, keyDef);
+            keyDefs.set(key, keyDefAtScope(keyDef, query.payload.scope, query.user.roles));
             filteredKeys.push(key);
         }
         const cascades = await resolver.getCascadeBatch(filteredKeys, keyDefs, query.user.tenantId, query.user.id, db, ctx.secrets);

package/dist/config/handlers/values.query.d.ts

@@ -2,6 +2,11 @@ import { type ConfigScope, type ConfigValueSource } from "@cosmicdrift/kumiko-fr
 import * as z from "zod";
 export declare const valuesQuery: import("@cosmicdrift/kumiko-types/define-handler").QueryHandlerDefinition<"values", z.ZodObject<{
     keys: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    scope: z.ZodOptional<z.ZodEnum<{
+        system: "system";
+        tenant: "tenant";
+        user: "user";
+    }>>;
 }, z.core.$strip>, Record<string, {
     value: string | number | boolean | undefined;
     scope: ConfigScope;

package/dist/config/handlers/values.query.js

@@ -1,13 +1,14 @@
-import { defineQueryHandler, isEncryptedAtRest, } from "@cosmicdrift/kumiko-framework/engine";
+import { ConfigScopes, defineQueryHandler, isEncryptedAtRest, } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { requireConfigResolver, requireSystemDb } from "../feature.js";
 import { MASKED, redactInheritedCascade, shouldRedactInherited } from "../read-redaction.js";
-import { hasConfigAccess } from "../write-helpers.js";
+import { hasConfigAccess, keyDefAtScope } from "../write-helpers.js";
 export const valuesQuery = defineQueryHandler({
     name: "values",
     description: "Returns the effective value, scope and winning source for every config key the caller may read (optionally narrowed to `keys`), with encrypted and secret-backed values masked; use it to inspect the current settings.",
     schema: z.object({
         keys: z.array(z.string()).optional(),
+        scope: z.enum([ConfigScopes.system, ConfigScopes.tenant, ConfigScopes.user]).optional(),
     }),
     // Per-key read access enforced via hasConfigAccess inside the handler.
     access: {
@@ -34,7 +35,7 @@ export const valuesQuery = defineQueryHandler({
                 continue;
             if (!hasConfigAccess(keyDef.access.read, query.user.roles))
                 continue;
-            keyDefs.set(qualifiedKey, keyDef);
+            keyDefs.set(qualifiedKey, keyDefAtScope(keyDef, query.payload.scope, query.user.roles));
             filteredKeys.push(qualifiedKey);
         }
         // Resolve through the full cascade (rows → app-override → computed →

package/dist/config/write-helpers.d.ts

@@ -35,6 +35,7 @@ export declare function checkWriteAccess(keyDef: ConfigKeyDefinition, userRoles:
  */
 export declare function checkScopeWriteAccess(scope: ConfigScope, userRoles: readonly string[]): KumikoError | null;
 export declare function validateScope(requestedScope: ConfigScope, definedScope: ConfigScope, key: string): KumikoError | null;
+export declare function keyDefAtScope(keyDef: ConfigKeyDefinition, readScope: ConfigScope | undefined, roles: readonly string[]): ConfigKeyDefinition;
 export declare function resolveScopeIds(scope: ConfigScope, tenantId: TenantId, userId: string): {
     tenantId: TenantId;
     userId: string | null;