@solvapay/react 2.0.0 → 2.0.1-preview-7d806cc7af767dec26b099517bc6ededc85adf9a

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @solvapay/react changelog
 
+## 2.0.1-preview-7d806cc7af767dec26b099517bc6ededc85adf9a
+
+### Patch Changes
+
+- a47adff: Free plans with an included allowance now count usage and label the meter correctly.
+
+  `@solvapay/core` adds `countsUsage` (per-unit charge, tier, or limit) and `meterName`
+  (per-unit charge's meter, else the first limit's meter). A free tier with a bare
+  limit is not priced per unit, but it still needs a usage counter and a meter noun —
+  `isMetered` on the wire was the wrong question for both.
+
+  `planMeterName` uses the new reader, so a recurring allowance no longer renders the
+  literal "units". `useAutoActivateFreePlan` no longer requires deprecated `freeUnits`
+  on the plan row. Usage surfaces (`useUsage`, `getUsageCore`, plan cards) derive
+  from `options[]` instead of trusting `planSnapshot.isMetered` alone.
+
+- Updated dependencies [a47adff]
+  - @solvapay/core@1.5.0-preview-7d806cc7af767dec26b099517bc6ededc85adf9a
+  - @solvapay/mcp-core@0.3.2-preview-7d806cc7af767dec26b099517bc6ededc85adf9a
+
 ## 2.0.0
 
 ### Major Changes

package/dist/{chunk-PKZJIV3G.js → chunk-J4VSGFAF.js}

@@ -40,7 +40,7 @@ import {
   useTopupAmountSelector,
   withPaymentElementDefaults,
   writeAutoRechargeCache
-} from "./chunk-6ABOJOEV.js";
+} from "./chunk-JN5BJ5MI.js";
 
 // src/TopupForm.tsx
 import { jsx, jsxs } from "react/jsx-runtime";

package/dist/{chunk-6ABOJOEV.js → chunk-JN5BJ5MI.js}

@@ -303,10 +303,10 @@ function createHttpTransport(config) {
       onErrorContext: "getUsage",
       errorPrefix: "Failed to load usage"
     }),
-    getLimits: async ({ productRef, meterName }) => {
+    getLimits: async ({ productRef, meterName: meterName2 }) => {
       const base = routeFor(config, "getLimits");
       const params = new URLSearchParams({ productRef });
-      if (meterName) params.set("meterName", meterName);
+      if (meterName2) params.set("meterName", meterName2);
       const url = `${base}?${params.toString()}`;
       const data = await request(config, url, {
         method: "GET",
@@ -3010,7 +3010,8 @@ function normalizeOneTimePurchase(input) {
     planSnapshot: {
       price: input.amount,
       currency: input.currency,
-      isMetered: false
+      isMetered: false,
+      options: []
     }
   };
 }
@@ -5796,12 +5797,13 @@ function usePurchaseActions() {
 }
 
 // src/primitives/CancelPlanButton.tsx
+import { countsUsage } from "@solvapay/core";
 import { forwardRef as forwardRef10, useCallback as useCallback16, useContext as useContext13 } from "react";
 import { Fragment as Fragment9, jsx as jsx17 } from "react/jsx-runtime";
 function resolveConfirmText(confirm, purchase, defaults) {
   if (confirm === false) return null;
   if (typeof confirm === "string") return confirm;
-  const isUsageBased = purchase?.planSnapshot?.isMetered === true && purchase.isRecurring !== true;
+  const isUsageBased = (countsUsage(purchase?.planSnapshot) || purchase?.planSnapshot?.isMetered === true) && purchase?.isRecurring !== true;
   if (isUsageBased) return defaults.usageBased;
   return defaults.recurring;
 }
@@ -6098,19 +6100,19 @@ import { useCallback as useCallback19, useEffect as useEffect12, useRef as useRe
 var CACHE_TTL_MS = 1e4;
 var OPTIMISTIC_GRACE_MS = 8e3;
 var limitsCache = /* @__PURE__ */ new Map();
-function cacheKey(customerRef, productRef, meterName) {
-  return `${customerRef ?? "anonymous"}:${productRef}:${meterName}`;
+function cacheKey(customerRef, productRef, meterName2) {
+  return `${customerRef ?? "anonymous"}:${productRef}:${meterName2}`;
 }
 function isUnlimited(remaining) {
   return remaining < 0;
 }
 function useLimits(options) {
   const { productRef, meterName: rawMeterName, enabled = true } = options;
-  const meterName = rawMeterName || "requests";
+  const meterName2 = rawMeterName || "requests";
   const transport = useTransport();
   const { customerRef } = useCustomer();
   const { purchase } = useSolvaPay();
-  const currentKey = !productRef || !enabled ? null : cacheKey(customerRef, productRef, meterName);
+  const currentKey = !productRef || !enabled ? null : cacheKey(customerRef, productRef, meterName2);
   const [data, setData] = useState15(() => {
     if (!currentKey) return null;
     const cached = limitsCache.get(currentKey);
@@ -6165,7 +6167,7 @@ function useLimits(options) {
         setLoading(false);
         return;
       }
-      const key = cacheKey(customerRef, productRef, meterName);
+      const key = cacheKey(customerRef, productRef, meterName2);
       const cached = limitsCache.get(key);
       const now = Date.now();
       if (cached?.promise) {
@@ -6178,7 +6180,7 @@ function useLimits(options) {
         setError(null);
         return;
       }
-      const promise = transport.getLimits({ productRef, meterName });
+      const promise = transport.getLimits({ productRef, meterName: meterName2 });
       limitsCache.set(key, { data: cached?.data ?? null, timestamp: now, promise });
       const fresh = await attachToFetch(promise);
       if (fresh !== null) {
@@ -6187,7 +6189,7 @@ function useLimits(options) {
         limitsCache.delete(key);
       }
     },
-    [transport, customerRef, productRef, meterName, enabled, attachToFetch]
+    [transport, customerRef, productRef, meterName2, enabled, attachToFetch]
   );
   useEffect12(() => {
     fetchLimits(false);
@@ -6205,7 +6207,7 @@ function useLimits(options) {
     (delta) => {
       if (!productRef || !enabled) return;
       if (unlimitedRef.current) return;
-      const key = cacheKey(customerRef, productRef, meterName);
+      const key = cacheKey(customerRef, productRef, meterName2);
       setData((prev) => {
         const cached = limitsCache.get(key);
         const baseline = prev ?? cached?.data ?? null;
@@ -6232,7 +6234,7 @@ function useLimits(options) {
         });
       }, OPTIMISTIC_GRACE_MS);
     },
-    [customerRef, productRef, meterName, enabled, fetchLimits]
+    [customerRef, productRef, meterName2, enabled, fetchLimits]
   );
   return {
     remaining: data?.remaining ?? null,
@@ -6248,11 +6250,14 @@ function useLimits(options) {
 }
 
 // src/hooks/useUsage.ts
+import { countsUsage as countsUsage2 } from "@solvapay/core";
 import { useCallback as useCallback20, useEffect as useEffect13, useMemo as useMemo14, useState as useState16 } from "react";
 function deriveUsage(purchase, limits) {
   if (!purchase) return null;
   const usage = purchase.usage;
-  if (purchase.planSnapshot?.isMetered !== true && !usage) return null;
+  if (!countsUsage2(purchase.planSnapshot) && purchase.planSnapshot?.isMetered !== true && !usage) {
+    return null;
+  }
   const used = typeof usage?.used === "number" ? usage.used : 0;
   const hasFiniteCap = limits.unlimited === false && limits.remaining !== null;
   const remaining = hasFiniteCap ? limits.remaining : null;
@@ -6275,18 +6280,18 @@ function useUsage() {
   const [override, setOverride] = useState16(null);
   const [error, setError] = useState16(null);
   const [transportLoading, setTransportLoading] = useState16(false);
-  const isMetered = activePurchase?.planSnapshot?.isMetered === true;
+  const usageCounted = countsUsage2(activePurchase?.planSnapshot) || activePurchase?.planSnapshot?.isMetered === true;
   const {
     remaining: limitRemaining,
     unlimited,
-    meterName
+    meterName: meterName2
   } = useLimits({
     productRef: activePurchase?.productRef,
-    enabled: isMetered
+    enabled: usageCounted
   });
   const derived = useMemo14(
-    () => deriveUsage(activePurchase ?? null, { remaining: limitRemaining, unlimited, meterName }),
-    [activePurchase, limitRemaining, unlimited, meterName]
+    () => deriveUsage(activePurchase ?? null, { remaining: limitRemaining, unlimited, meterName: meterName2 }),
+    [activePurchase, limitRemaining, unlimited, meterName2]
   );
   const activePurchaseRef = activePurchase?.reference ?? null;
   useEffect13(() => {
@@ -6547,6 +6552,7 @@ import {
   billingCycle as readBillingCycle,
   creditsPerUnitFromBalance,
   includedUnits,
+  meterName,
   perUnitCharge
 } from "@solvapay/core";
 function isPayg(plan) {
@@ -6607,7 +6613,7 @@ function inferIncludedUnits(plan) {
   return cap != null && cap > 0 ? cap : null;
 }
 function planMeterName(plan) {
-  return perUnitCharge(plan)?.meter ?? null;
+  return meterName(plan);
 }
 function shortCycle(cycle) {
   if (!cycle) return "mo";

package/dist/{chunk-D6TOFFNL.js → chunk-VUGPLAS4.js}

@@ -14,7 +14,7 @@ import {
   usePurchaseStatus,
   useSolvaPay,
   useTransport
-} from "./chunk-6ABOJOEV.js";
+} from "./chunk-JN5BJ5MI.js";
 
 // src/components/CancelledPlanNotice.tsx
 import { jsx, jsxs } from "react/jsx-runtime";
@@ -362,6 +362,7 @@ var UpdatePaymentMethodButton = forwardRef2(function UpdatePaymentMethodButton2(
 });
 
 // src/components/CurrentPlanCard.tsx
+import { countsUsage } from "@solvapay/core";
 import { jsx as jsx5, jsxs as jsxs4 } from "react/jsx-runtime";
 function PlanTypeLine({
   purchase,
@@ -369,7 +370,7 @@ function PlanTypeLine({
   className
 }) {
   const copy = useCopy();
-  const isMetered = purchase.planSnapshot?.isMetered === true;
+  const isMetered = countsUsage(purchase.planSnapshot) || purchase.planSnapshot?.isMetered === true;
   if (purchase.isRecurring) {
     const date2 = formatDate(purchase.nextBillingDate);
     if (!date2) return null;
@@ -429,7 +430,7 @@ var CurrentPlanCard = ({
   const { formatDate, shouldShowCancelledNotice } = usePurchaseStatus();
   const { paymentMethod } = usePaymentMethod();
   if (!activePurchase) return null;
-  const isUsageBased = activePurchase.planSnapshot?.isMetered === true;
+  const isUsageBased = countsUsage(activePurchase.planSnapshot) || activePurchase.planSnapshot?.isMetered === true;
   const planType = activePurchase.isRecurring ? "recurring" : isUsageBased ? "usage-based" : "one-time";
   const amount = activePurchase.originalAmount ?? activePurchase.amount ?? 0;
   const currency = activePurchase.currency ?? "usd";

package/dist/{index-D6KKDguz.d.cts → index-BuVbt1j1.d.cts}

@@ -527,15 +527,6 @@ declare const ActivationFlow: {
 };
 declare function useActivationFlow(): ActivationFlowContextValue;
 
-/**
- * CancelPlanButton leaf primitive.
- *
- * Cancels the active (or specified) purchase via `usePurchaseActions`.
- * Emits `data-state=idle|cancelling` and auto-derives the confirm dialog
- * copy from the plan type (`recurring` vs. `usage-based`) unless overridden
- * via the `confirm` prop (`false` to skip, string to replace).
- */
-
 declare const CancelPlanButton: React.ForwardRefExoticComponent<React.ButtonHTMLAttributes<HTMLButtonElement> & {
     asChild?: boolean;
     /** Defaults to the active purchase from `usePurchase()`. */

package/dist/{index-DomaahLG.d.ts → index-DHK9Op-i.d.ts}

@@ -527,15 +527,6 @@ declare const ActivationFlow: {
 };
 declare function useActivationFlow(): ActivationFlowContextValue;
 
-/**
- * CancelPlanButton leaf primitive.
- *
- * Cancels the active (or specified) purchase via `usePurchaseActions`.
- * Emits `data-state=idle|cancelling` and auto-derives the confirm dialog
- * copy from the plan type (`recurring` vs. `usage-based`) unless overridden
- * via the `confirm` prop (`false` to skip, string to replace).
- */
-
 declare const CancelPlanButton: React.ForwardRefExoticComponent<React.ButtonHTMLAttributes<HTMLButtonElement> & {
     asChild?: boolean;
     /** Defaults to the active purchase from `usePurchase()`. */

package/dist/index.cjs

@@ -544,10 +544,10 @@ function createHttpTransport(config) {
       onErrorContext: "getUsage",
       errorPrefix: "Failed to load usage"
     }),
-    getLimits: async ({ productRef, meterName }) => {
+    getLimits: async ({ productRef, meterName: meterName2 }) => {
       const base = routeFor(config, "getLimits");
       const params = new URLSearchParams({ productRef });
-      if (meterName) params.set("meterName", meterName);
+      if (meterName2) params.set("meterName", meterName2);
       const url = `${base}?${params.toString()}`;
       const data = await request(config, url, {
         method: "GET",
@@ -3128,7 +3128,8 @@ function normalizeOneTimePurchase(input) {
     planSnapshot: {
       price: input.amount,
       currency: input.currency,
-      isMetered: false
+      isMetered: false,
+      options: []
     }
   };
 }
@@ -6812,6 +6813,7 @@ var DefaultTree3 = ({ showCreditEstimate }) => {
 };
 
 // src/primitives/CancelPlanButton.tsx
+var import_core6 = require("@solvapay/core");
 var import_react32 = require("react");
 
 // src/hooks/usePurchaseActions.ts
@@ -6869,7 +6871,7 @@ var import_jsx_runtime27 = require("react/jsx-runtime");
 function resolveConfirmText(confirm, purchase, defaults) {
   if (confirm === false) return null;
   if (typeof confirm === "string") return confirm;
-  const isUsageBased = purchase?.planSnapshot?.isMetered === true && purchase.isRecurring !== true;
+  const isUsageBased = ((0, import_core6.countsUsage)(purchase?.planSnapshot) || purchase?.planSnapshot?.isMetered === true) && purchase?.isRecurring !== true;
   if (isUsageBased) return defaults.usageBased;
   return defaults.recurring;
 }
@@ -7320,6 +7322,9 @@ var CreditGate2 = ({
   );
 };
 
+// src/components/CurrentPlanCard.tsx
+var import_core8 = require("@solvapay/core");
+
 // src/hooks/usePaymentMethod.ts
 var import_react36 = require("react");
 var paymentMethodCache = /* @__PURE__ */ new Map();
@@ -7649,6 +7654,7 @@ var UpdatePaymentMethodButton = (0, import_react40.forwardRef)(function UpdatePa
 var import_react43 = require("react");
 
 // src/hooks/useUsage.ts
+var import_core7 = require("@solvapay/core");
 var import_react42 = require("react");
 
 // src/hooks/useLimits.ts
@@ -7656,19 +7662,19 @@ var import_react41 = require("react");
 var CACHE_TTL_MS = 1e4;
 var OPTIMISTIC_GRACE_MS = 8e3;
 var limitsCache = /* @__PURE__ */ new Map();
-function cacheKey(customerRef, productRef, meterName) {
-  return `${customerRef ?? "anonymous"}:${productRef}:${meterName}`;
+function cacheKey(customerRef, productRef, meterName2) {
+  return `${customerRef ?? "anonymous"}:${productRef}:${meterName2}`;
 }
 function isUnlimited(remaining) {
   return remaining < 0;
 }
 function useLimits(options) {
   const { productRef, meterName: rawMeterName, enabled = true } = options;
-  const meterName = rawMeterName || "requests";
+  const meterName2 = rawMeterName || "requests";
   const transport = useTransport();
   const { customerRef } = useCustomer();
   const { purchase } = useSolvaPay();
-  const currentKey = !productRef || !enabled ? null : cacheKey(customerRef, productRef, meterName);
+  const currentKey = !productRef || !enabled ? null : cacheKey(customerRef, productRef, meterName2);
   const [data, setData] = (0, import_react41.useState)(() => {
     if (!currentKey) return null;
     const cached = limitsCache.get(currentKey);
@@ -7723,7 +7729,7 @@ function useLimits(options) {
         setLoading(false);
         return;
       }
-      const key = cacheKey(customerRef, productRef, meterName);
+      const key = cacheKey(customerRef, productRef, meterName2);
       const cached = limitsCache.get(key);
       const now = Date.now();
       if (cached?.promise) {
@@ -7736,7 +7742,7 @@ function useLimits(options) {
         setError(null);
         return;
       }
-      const promise = transport.getLimits({ productRef, meterName });
+      const promise = transport.getLimits({ productRef, meterName: meterName2 });
       limitsCache.set(key, { data: cached?.data ?? null, timestamp: now, promise });
       const fresh = await attachToFetch(promise);
       if (fresh !== null) {
@@ -7745,7 +7751,7 @@ function useLimits(options) {
         limitsCache.delete(key);
       }
     },
-    [transport, customerRef, productRef, meterName, enabled, attachToFetch]
+    [transport, customerRef, productRef, meterName2, enabled, attachToFetch]
   );
   (0, import_react41.useEffect)(() => {
     fetchLimits(false);
@@ -7763,7 +7769,7 @@ function useLimits(options) {
     (delta) => {
       if (!productRef || !enabled) return;
       if (unlimitedRef.current) return;
-      const key = cacheKey(customerRef, productRef, meterName);
+      const key = cacheKey(customerRef, productRef, meterName2);
       setData((prev) => {
         const cached = limitsCache.get(key);
         const baseline = prev ?? cached?.data ?? null;
@@ -7790,7 +7796,7 @@ function useLimits(options) {
         });
       }, OPTIMISTIC_GRACE_MS);
     },
-    [customerRef, productRef, meterName, enabled, fetchLimits]
+    [customerRef, productRef, meterName2, enabled, fetchLimits]
   );
   return {
     remaining: data?.remaining ?? null,
@@ -7809,7 +7815,9 @@ function useLimits(options) {
 function deriveUsage(purchase, limits) {
   if (!purchase) return null;
   const usage = purchase.usage;
-  if (purchase.planSnapshot?.isMetered !== true && !usage) return null;
+  if (!(0, import_core7.countsUsage)(purchase.planSnapshot) && purchase.planSnapshot?.isMetered !== true && !usage) {
+    return null;
+  }
   const used = typeof usage?.used === "number" ? usage.used : 0;
   const hasFiniteCap = limits.unlimited === false && limits.remaining !== null;
   const remaining = hasFiniteCap ? limits.remaining : null;
@@ -7832,18 +7840,18 @@ function useUsage() {
   const [override, setOverride] = (0, import_react42.useState)(null);
   const [error, setError] = (0, import_react42.useState)(null);
   const [transportLoading, setTransportLoading] = (0, import_react42.useState)(false);
-  const isMetered = activePurchase?.planSnapshot?.isMetered === true;
+  const usageCounted = (0, import_core7.countsUsage)(activePurchase?.planSnapshot) || activePurchase?.planSnapshot?.isMetered === true;
   const {
     remaining: limitRemaining,
     unlimited,
-    meterName
+    meterName: meterName2
   } = useLimits({
     productRef: activePurchase?.productRef,
-    enabled: isMetered
+    enabled: usageCounted
   });
   const derived = (0, import_react42.useMemo)(
-    () => deriveUsage(activePurchase ?? null, { remaining: limitRemaining, unlimited, meterName }),
-    [activePurchase, limitRemaining, unlimited, meterName]
+    () => deriveUsage(activePurchase ?? null, { remaining: limitRemaining, unlimited, meterName: meterName2 }),
+    [activePurchase, limitRemaining, unlimited, meterName2]
   );
   const activePurchaseRef = activePurchase?.reference ?? null;
   (0, import_react42.useEffect)(() => {
@@ -8100,7 +8108,7 @@ function PlanTypeLine({
   className
 }) {
   const copy = useCopy();
-  const isMetered = purchase.planSnapshot?.isMetered === true;
+  const isMetered = (0, import_core8.countsUsage)(purchase.planSnapshot) || purchase.planSnapshot?.isMetered === true;
   if (purchase.isRecurring) {
     const date2 = formatDate(purchase.nextBillingDate);
     if (!date2) return null;
@@ -8160,7 +8168,7 @@ var CurrentPlanCard = ({
   const { formatDate, shouldShowCancelledNotice } = usePurchaseStatus();
   const { paymentMethod } = usePaymentMethod();
   if (!activePurchase) return null;
-  const isUsageBased = activePurchase.planSnapshot?.isMetered === true;
+  const isUsageBased = (0, import_core8.countsUsage)(activePurchase.planSnapshot) || activePurchase.planSnapshot?.isMetered === true;
   const planType = activePurchase.isRecurring ? "recurring" : isUsageBased ? "usage-based" : "one-time";
   const amount = activePurchase.originalAmount ?? activePurchase.amount ?? 0;
   const currency = activePurchase.currency ?? "usd";
@@ -8519,7 +8527,7 @@ function stripSetupIntentParams() {
 }
 
 // src/utils/credit-estimation.ts
-var import_core6 = require("@solvapay/core");
+var import_core9 = require("@solvapay/core");
 function estimateCredits(resolvedAmountMajor, currency, creditsPerMinorUnit, displayExchangeRate) {
   if (resolvedAmountMajor == null || resolvedAmountMajor <= 0) return null;
   if (creditsPerMinorUnit == null || creditsPerMinorUnit <= 0) return null;
@@ -8531,7 +8539,7 @@ function estimateCurrencyMajorFromCredits(credits, currency, creditsPerMinorUnit
   if (credits == null || credits <= 0) return null;
   if (creditsPerMinorUnit == null || creditsPerMinorUnit <= 0) return null;
   const rate = displayExchangeRate ?? 1;
-  const displayMinor = (0, import_core6.creditsToDisplayMinorUnits)({
+  const displayMinor = (0, import_core9.creditsToDisplayMinorUnits)({
     credits,
     creditsPerMinorUnit,
     displayExchangeRate: rate,
@@ -10087,10 +10095,12 @@ function useAutoActivateFreePlan(options) {
   });
   const { plans } = usePlans({ productRef });
   const { activate, error: activationError } = useActivation();
-  const freePlan = (0, import_react46.useMemo)(
-    () => plans.find((p) => p.requiresPayment === false && (p.freeUnits ?? 0) > 0),
-    [plans]
-  );
+  const freePlan = (0, import_react46.useMemo)(() => {
+    const free = plans.filter((p) => p.requiresPayment === false);
+    if (free.length === 0) return void 0;
+    if (free.length === 1) return free[0];
+    return free.find((p) => p.options?.some((option) => option.kind === "autoAssigned")) ?? free.find((p) => p.default === true) ?? free[0];
+  }, [plans]);
   const attemptedKeyRef = (0, import_react46.useRef)(null);
   const [activated, setActivated] = (0, import_react46.useState)(false);
   const onActivatedRef = (0, import_react46.useRef)(onActivated);
@@ -10164,7 +10174,7 @@ function usePaywallResolver(content) {
 var import_react48 = require("react");
 
 // src/primitives/checkout/shared.ts
-var import_core7 = require("@solvapay/core");
+var import_core10 = require("@solvapay/core");
 function isPayg(plan) {
   return isPaygPlan(plan ?? null);
 }
@@ -10205,25 +10215,25 @@ function formatContinueLabel(plan, locale, pricingOption) {
   return `Continue with ${plan.name ?? "Plan"} \u2014 ${priceLabel}${cycle}`;
 }
 function planBillingInterval(plan) {
-  return (0, import_core7.billingCycle)(plan)?.interval ?? null;
+  return (0, import_core10.billingCycle)(plan)?.interval ?? null;
 }
 function formatPaygRate(plan, locale, balance) {
-  const credits = (0, import_core7.creditsPerUnitFromBalance)(plan, balance);
+  const credits = (0, import_core10.creditsPerUnitFromBalance)(plan, balance);
   if (credits != null) {
     return `${credits.toLocaleString(locale)} ${credits === 1 ? "credit" : "credits"} / call`;
   }
-  const charge = (0, import_core7.perUnitCharge)(plan);
+  const charge = (0, import_core10.perUnitCharge)(plan);
   if (charge && charge.amountMinor > 0) {
     return `${formatPrice(charge.amountMinor, charge.currency.toUpperCase(), { locale })} / call`;
   }
   return null;
 }
 function inferIncludedUnits(plan) {
-  const cap = (0, import_core7.includedUnits)(plan);
+  const cap = (0, import_core10.includedUnits)(plan);
   return cap != null && cap > 0 ? cap : null;
 }
 function planMeterName(plan) {
-  return (0, import_core7.perUnitCharge)(plan)?.meter ?? null;
+  return (0, import_core10.meterName)(plan);
 }
 function shortCycle(cycle) {
   if (!cycle) return "mo";

package/dist/index.d.cts

@@ -1,8 +1,8 @@
 import React from 'react';
 import { S as SolvaPayProviderProps, P as PaymentFormProps, a as PrefillCustomer, T as TopupFormProps, C as CheckoutResult, b as Plan, A as ActivationResult, c as SaveAutoRechargeResponse, d as PurchaseStatus, e as SolvaPayContextValue, U as UsePlansOptions, f as UsePlansReturn, g as UsePlanOptions, h as UsePlanReturn, i as UseProductReturn, j as UseMerchantReturn, k as SolvaPayCopy, l as PurchaseStatusReturn, m as CancelResult, R as ReactivateResult, n as ActivatePlanResult, o as UseTopupOptions, p as UseTopupReturn, B as BalanceStatus, q as UseTopupAmountSelectorOptions, r as UseTopupAmountSelectorReturn, s as UsePaymentMethodReturn, t as AutoRechargeConfig, u as SaveAutoRechargeInput, v as SolvaPayTransport, w as PartialSolvaPayCopy, x as PurchaseInfo, y as Product, z as SolvaPayConfig } from './shared-A_Sg-fJE.cjs';
 export { D as BootstrapPlanLike, E as CheckoutStep, F as CustomerPurchaseData, M as MandateContext, G as MandateTemplate, H as Merchant, I as PaymentError, J as PaymentIntentResult, K as PaymentMethodInfo, L as PaymentResult, N as PurchaseStatusValue, O as SuccessMeta, Q as TopupPaymentResult, V as TransportBalanceResult, W as TransportCheckoutSessionResult, X as TransportCustomerSessionResult, Y as TransportLimitsResult, Z as UnsupportedTransportMethodError } from './shared-A_Sg-fJE.cjs';
-import { P as PaymentFormSummary, a as PaymentFormCustomerFields, b as PaymentFormPaymentElement, c as PaymentFormCardElement, d as PaymentFormMandateText, e as PaymentFormTermsCheckbox, f as PaymentFormSubmitButton, g as PaymentFormLoading, h as PaymentFormError, i as PaymentFormLegalFooter, j as PaymentFormBusinessDetails, k as PaymentFormTaxSummary, A as AutoRechargeInputPayload, l as PaywallStructuredContent, C as CheckoutVariant } from './index-D6KKDguz.cjs';
-export { m as ActivationFlowStep, B as BalanceBadge, n as CancelPlanButton, o as CheckoutErrorPhase, p as CheckoutStatus, q as CheckoutSteps, r as CheckoutSummary, s as CheckoutSummaryProps, M as MandateText, t as MandateTextProps, u as PlanBadge, v as ProductBadge, w as PurchaseGate, U as UsageSnapshot, x as UseCheckoutFlowOptions, y as UseCheckoutFlowReturn, z as UseUsageReturn, D as configToAutoRechargeInput, E as deriveVariant, F as useCheckoutFlow, G as useCheckoutStepsContext, H as useUsage } from './index-D6KKDguz.cjs';
+import { P as PaymentFormSummary, a as PaymentFormCustomerFields, b as PaymentFormPaymentElement, c as PaymentFormCardElement, d as PaymentFormMandateText, e as PaymentFormTermsCheckbox, f as PaymentFormSubmitButton, g as PaymentFormLoading, h as PaymentFormError, i as PaymentFormLegalFooter, j as PaymentFormBusinessDetails, k as PaymentFormTaxSummary, A as AutoRechargeInputPayload, l as PaywallStructuredContent, C as CheckoutVariant } from './index-BuVbt1j1.cjs';
+export { m as ActivationFlowStep, B as BalanceBadge, n as CancelPlanButton, o as CheckoutErrorPhase, p as CheckoutStatus, q as CheckoutSteps, r as CheckoutSummary, s as CheckoutSummaryProps, M as MandateText, t as MandateTextProps, u as PlanBadge, v as ProductBadge, w as PurchaseGate, U as UsageSnapshot, x as UseCheckoutFlowOptions, y as UseCheckoutFlowReturn, z as UseUsageReturn, D as configToAutoRechargeInput, E as deriveVariant, F as useCheckoutFlow, G as useCheckoutStepsContext, H as useUsage } from './index-BuVbt1j1.cjs';
 import { PaymentIntent, Stripe, StripeElements } from '@stripe/stripe-js';
 import { BusinessDetailsInput, TaxBreakdown } from '@solvapay/core';
 export { AuthAdapter, createAnonymousAuthAdapter, defaultAuthAdapter, getOrCreateAnonymousCustomerRef, resetAnonymousCustomerRef } from './adapters/auth.cjs';
@@ -290,26 +290,6 @@ interface CreditGateProps {
 }
 declare const CreditGate: React.FC<CreditGateProps>;
 
-/**
- * `<CurrentPlanCard>` — summary card for the customer's active purchase.
- *
- * Pure projection of existing provider state (`usePurchase`,
- * `usePurchaseStatus`, `useBalance`, `usePaymentMethod`) plus Phase 1
- * action components (`<CancelPlanButton>`, Phase 2's
- * `<UpdatePaymentMethodButton>`). No Stripe Elements dependency, so the
- * default tree renders identically inside an MCP host sandbox and a
- * standalone HTTP app.
- *
- * Returns `null` when `usePurchase()` reports no active purchase, so
- * integrators can drop it into account pages without wrapping in
- * `{hasPaidPurchase && ...}`.
- *
- * Plan-type-aware lines:
- * - `recurring` — "Next billing: {date}"
- * - `one-time`  — "Expires {date}" or "Valid indefinitely"
- * - `usage-based` — `<BalanceBadge>` line; no date
- */
-
 interface CurrentPlanCardClassNames {
     root?: string;
     heading?: string;

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import { S as SolvaPayProviderProps, P as PaymentFormProps, a as PrefillCustomer, T as TopupFormProps, C as CheckoutResult, b as Plan, A as ActivationResult, c as SaveAutoRechargeResponse, d as PurchaseStatus, e as SolvaPayContextValue, U as UsePlansOptions, f as UsePlansReturn, g as UsePlanOptions, h as UsePlanReturn, i as UseProductReturn, j as UseMerchantReturn, k as SolvaPayCopy, l as PurchaseStatusReturn, m as CancelResult, R as ReactivateResult, n as ActivatePlanResult, o as UseTopupOptions, p as UseTopupReturn, B as BalanceStatus, q as UseTopupAmountSelectorOptions, r as UseTopupAmountSelectorReturn, s as UsePaymentMethodReturn, t as AutoRechargeConfig, u as SaveAutoRechargeInput, v as SolvaPayTransport, w as PartialSolvaPayCopy, x as PurchaseInfo, y as Product, z as SolvaPayConfig } from './shared-CAxz5wWs.js';
 export { D as BootstrapPlanLike, E as CheckoutStep, F as CustomerPurchaseData, M as MandateContext, G as MandateTemplate, H as Merchant, I as PaymentError, J as PaymentIntentResult, K as PaymentMethodInfo, L as PaymentResult, N as PurchaseStatusValue, O as SuccessMeta, Q as TopupPaymentResult, V as TransportBalanceResult, W as TransportCheckoutSessionResult, X as TransportCustomerSessionResult, Y as TransportLimitsResult, Z as UnsupportedTransportMethodError } from './shared-CAxz5wWs.js';
-import { P as PaymentFormSummary, a as PaymentFormCustomerFields, b as PaymentFormPaymentElement, c as PaymentFormCardElement, d as PaymentFormMandateText, e as PaymentFormTermsCheckbox, f as PaymentFormSubmitButton, g as PaymentFormLoading, h as PaymentFormError, i as PaymentFormLegalFooter, j as PaymentFormBusinessDetails, k as PaymentFormTaxSummary, A as AutoRechargeInputPayload, l as PaywallStructuredContent, C as CheckoutVariant } from './index-DomaahLG.js';
-export { m as ActivationFlowStep, B as BalanceBadge, n as CancelPlanButton, o as CheckoutErrorPhase, p as CheckoutStatus, q as CheckoutSteps, r as CheckoutSummary, s as CheckoutSummaryProps, M as MandateText, t as MandateTextProps, u as PlanBadge, v as ProductBadge, w as PurchaseGate, U as UsageSnapshot, x as UseCheckoutFlowOptions, y as UseCheckoutFlowReturn, z as UseUsageReturn, D as configToAutoRechargeInput, E as deriveVariant, F as useCheckoutFlow, G as useCheckoutStepsContext, H as useUsage } from './index-DomaahLG.js';
+import { P as PaymentFormSummary, a as PaymentFormCustomerFields, b as PaymentFormPaymentElement, c as PaymentFormCardElement, d as PaymentFormMandateText, e as PaymentFormTermsCheckbox, f as PaymentFormSubmitButton, g as PaymentFormLoading, h as PaymentFormError, i as PaymentFormLegalFooter, j as PaymentFormBusinessDetails, k as PaymentFormTaxSummary, A as AutoRechargeInputPayload, l as PaywallStructuredContent, C as CheckoutVariant } from './index-DHK9Op-i.js';
+export { m as ActivationFlowStep, B as BalanceBadge, n as CancelPlanButton, o as CheckoutErrorPhase, p as CheckoutStatus, q as CheckoutSteps, r as CheckoutSummary, s as CheckoutSummaryProps, M as MandateText, t as MandateTextProps, u as PlanBadge, v as ProductBadge, w as PurchaseGate, U as UsageSnapshot, x as UseCheckoutFlowOptions, y as UseCheckoutFlowReturn, z as UseUsageReturn, D as configToAutoRechargeInput, E as deriveVariant, F as useCheckoutFlow, G as useCheckoutStepsContext, H as useUsage } from './index-DHK9Op-i.js';
 import { PaymentIntent, Stripe, StripeElements } from '@stripe/stripe-js';
 import { BusinessDetailsInput, TaxBreakdown } from '@solvapay/core';
 export { AuthAdapter, createAnonymousAuthAdapter, defaultAuthAdapter, getOrCreateAnonymousCustomerRef, resetAnonymousCustomerRef } from './adapters/auth.js';
@@ -290,26 +290,6 @@ interface CreditGateProps {
 }
 declare const CreditGate: React.FC<CreditGateProps>;
 
-/**
- * `<CurrentPlanCard>` — summary card for the customer's active purchase.
- *
- * Pure projection of existing provider state (`usePurchase`,
- * `usePurchaseStatus`, `useBalance`, `usePaymentMethod`) plus Phase 1
- * action components (`<CancelPlanButton>`, Phase 2's
- * `<UpdatePaymentMethodButton>`). No Stripe Elements dependency, so the
- * default tree renders identically inside an MCP host sandbox and a
- * standalone HTTP app.
- *
- * Returns `null` when `usePurchase()` reports no active purchase, so
- * integrators can drop it into account pages without wrapping in
- * `{hasPaidPurchase && ...}`.
- *
- * Plan-type-aware lines:
- * - `recurring` — "Next billing: {date}"
- * - `one-time`  — "Expires {date}" or "Valid indefinitely"
- * - `usage-based` — `<BalanceBadge>` line; no date
- */
-
 interface CurrentPlanCardClassNames {
     root?: string;
     heading?: string;

package/dist/index.js

@@ -7,7 +7,7 @@ import {
   LaunchCustomerPortalButton,
   UpdatePaymentMethodButton,
   usePaymentMethod
-} from "./chunk-D6TOFFNL.js";
+} from "./chunk-VUGPLAS4.js";
 import {
   ActivationFlow,
   AutoRecharge,
@@ -23,7 +23,7 @@ import {
   useCheckoutSteps,
   useCreditGate,
   usePaywallResolver
-} from "./chunk-PKZJIV3G.js";
+} from "./chunk-J4VSGFAF.js";
 import {
   AmountPicker,
   BalanceBadge,
@@ -97,7 +97,7 @@ import {
   useTopupAmountSelector,
   useTransport,
   useUsage
-} from "./chunk-6ABOJOEV.js";
+} from "./chunk-JN5BJ5MI.js";
 import {
   createAnonymousAuthAdapter,
   defaultAuthAdapter,
@@ -809,10 +809,12 @@ function useAutoActivateFreePlan(options) {
   });
   const { plans } = usePlans({ productRef });
   const { activate, error: activationError } = useActivation();
-  const freePlan = useMemo2(
-    () => plans.find((p) => p.requiresPayment === false && (p.freeUnits ?? 0) > 0),
-    [plans]
-  );
+  const freePlan = useMemo2(() => {
+    const free = plans.filter((p) => p.requiresPayment === false);
+    if (free.length === 0) return void 0;
+    if (free.length === 1) return free[0];
+    return free.find((p) => p.options?.some((option) => option.kind === "autoAssigned")) ?? free.find((p) => p.default === true) ?? free[0];
+  }, [plans]);
   const attemptedKeyRef = useRef2(null);
   const [activated, setActivated] = useState3(false);
   const onActivatedRef = useRef2(onActivated);