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

package/dist/mcp/index.cjs

@@ -967,10 +967,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",
@@ -2447,6 +2447,9 @@ var import_mcp_core3 = require("@solvapay/mcp-core");
 // src/mcp/McpAppShell.tsx
 var import_react51 = require("react");
 
+// src/components/CurrentPlanCard.tsx
+var import_core5 = require("@solvapay/core");
+
 // src/hooks/usePurchase.ts
 function usePurchase() {
   const { purchase, refetchPurchase } = useSolvaPay();
@@ -2983,12 +2986,13 @@ var BalanceBadge = (0, import_react17.forwardRef)(function BalanceBadge2({ asChi
 });
 
 // src/primitives/CancelPlanButton.tsx
+var import_core3 = require("@solvapay/core");
 var import_react18 = require("react");
 var import_jsx_runtime8 = 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_core3.countsUsage)(purchase?.planSnapshot) || purchase?.planSnapshot?.isMetered === true) && purchase?.isRecurring !== true;
   if (isUsageBased) return defaults.usageBased;
   return defaults.recurring;
 }
@@ -3291,6 +3295,7 @@ var UpdatePaymentMethodButton = (0, import_react22.forwardRef)(function UpdatePa
 var import_react25 = require("react");
 
 // src/hooks/useUsage.ts
+var import_core4 = require("@solvapay/core");
 var import_react24 = require("react");
 
 // src/hooks/useLimits.ts
@@ -3311,19 +3316,19 @@ function useCustomer() {
 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_react23.useState)(() => {
     if (!currentKey) return null;
     const cached = limitsCache.get(currentKey);
@@ -3378,7 +3383,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) {
@@ -3391,7 +3396,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) {
@@ -3400,7 +3405,7 @@ function useLimits(options) {
         limitsCache.delete(key);
       }
     },
-    [transport, customerRef, productRef, meterName, enabled, attachToFetch]
+    [transport, customerRef, productRef, meterName2, enabled, attachToFetch]
   );
   (0, import_react23.useEffect)(() => {
     fetchLimits(false);
@@ -3418,7 +3423,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;
@@ -3445,7 +3450,7 @@ function useLimits(options) {
         });
       }, OPTIMISTIC_GRACE_MS);
     },
-    [customerRef, productRef, meterName, enabled, fetchLimits]
+    [customerRef, productRef, meterName2, enabled, fetchLimits]
   );
   return {
     remaining: data?.remaining ?? null,
@@ -3464,7 +3469,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_core4.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;
@@ -3487,18 +3494,18 @@ function useUsage() {
   const [override, setOverride] = (0, import_react24.useState)(null);
   const [error, setError] = (0, import_react24.useState)(null);
   const [transportLoading, setTransportLoading] = (0, import_react24.useState)(false);
-  const isMetered = activePurchase?.planSnapshot?.isMetered === true;
+  const usageCounted = (0, import_core4.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_react24.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_react24.useEffect)(() => {
@@ -3755,7 +3762,7 @@ function PlanTypeLine({
   className
 }) {
   const copy = useCopy();
-  const isMetered = purchase.planSnapshot?.isMetered === true;
+  const isMetered = (0, import_core5.countsUsage)(purchase.planSnapshot) || purchase.planSnapshot?.isMetered === true;
   if (purchase.isRecurring) {
     const date2 = formatDate(purchase.nextBillingDate);
     if (!date2) return null;
@@ -3815,7 +3822,7 @@ var CurrentPlanCard = ({
   const { formatDate, shouldShowCancelledNotice } = usePurchaseStatus();
   const { paymentMethod } = usePaymentMethod();
   if (!activePurchase) return null;
-  const isUsageBased = activePurchase.planSnapshot?.isMetered === true;
+  const isUsageBased = (0, import_core5.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";
@@ -3954,7 +3961,7 @@ var CurrentPlanCard = ({
 };
 
 // src/mcp/views/detail-cards.tsx
-var import_core3 = require("@solvapay/core");
+var import_core6 = require("@solvapay/core");
 
 // src/mcp/views/types.ts
 var DEFAULT_MCP_CLASS_NAMES = {
@@ -4036,7 +4043,7 @@ function McpCustomerDetailsCard({
   }
   const displayName = name?.trim() || "Customer";
   const showBalance = !hideBalance && typeof credits === "number" && credits > 0;
-  const displayMinor = showBalance && typeof creditsPerMinorUnit === "number" && creditsPerMinorUnit > 0 && displayCurrency ? (0, import_core3.creditsToDisplayMinorUnits)({
+  const displayMinor = showBalance && typeof creditsPerMinorUnit === "number" && creditsPerMinorUnit > 0 && displayCurrency ? (0, import_core6.creditsToDisplayMinorUnits)({
     credits: credits ?? 0,
     creditsPerMinorUnit,
     displayExchangeRate: displayExchangeRate ?? 1,
@@ -4099,7 +4106,7 @@ function McpSellerDetailsCard({
   }
   const supportEmail = merchant.supportEmail;
   const supportUrl = merchant.supportUrl;
-  const sellerIdentity = (0, import_core3.resolveSellerIdentityDisplay)({
+  const sellerIdentity = (0, import_core6.resolveSellerIdentityDisplay)({
     country: merchant.country,
     vatNumber: merchant.vatNumber,
     taxId: merchant.taxId,
@@ -4252,13 +4259,13 @@ function isPaygPlan(plan) {
 }
 
 // src/utils/planPricing.ts
-var import_core4 = require("@solvapay/core");
+var import_core7 = require("@solvapay/core");
 function getPlanPricingOptions(plan) {
   if (plan.pricingOptions && plan.pricingOptions.length > 0) {
     return plan.pricingOptions;
   }
   const defaultCurrency = (plan.currency ?? "USD").toUpperCase();
-  const charges2 = (0, import_core4.headlineCharges)(plan);
+  const charges2 = (0, import_core7.headlineCharges)(plan);
   if (charges2.length > 0) {
     return charges2.map((charge) => ({
       currency: charge.currency,
@@ -4687,7 +4694,7 @@ function usePlanSelector() {
 var import_react28 = require("react");
 
 // src/primitives/checkout/shared.ts
-var import_core5 = require("@solvapay/core");
+var import_core8 = require("@solvapay/core");
 function isPayg(plan) {
   return isPaygPlan(plan ?? null);
 }
@@ -4718,25 +4725,25 @@ function formatContinueLabel(plan, locale, pricingOption) {
   return `Continue with ${plan.name ?? "Plan"} \u2014 ${priceLabel}${cycle}`;
 }
 function planBillingInterval(plan) {
-  return (0, import_core5.billingCycle)(plan)?.interval ?? null;
+  return (0, import_core8.billingCycle)(plan)?.interval ?? null;
 }
 function formatPaygRate(plan, locale, balance) {
-  const credits = (0, import_core5.creditsPerUnitFromBalance)(plan, balance);
+  const credits = (0, import_core8.creditsPerUnitFromBalance)(plan, balance);
   if (credits != null) {
     return `${credits.toLocaleString(locale)} ${credits === 1 ? "credit" : "credits"} / call`;
   }
-  const charge = (0, import_core5.perUnitCharge)(plan);
+  const charge = (0, import_core8.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_core5.includedUnits)(plan);
+  const cap = (0, import_core8.includedUnits)(plan);
   return cap != null && cap > 0 ? cap : null;
 }
 function planMeterName(plan) {
-  return (0, import_core5.perUnitCharge)(plan)?.meter ?? null;
+  return (0, import_core8.meterName)(plan);
 }
 function shortCycle(cycle) {
   if (!cycle) return "mo";
@@ -5988,14 +5995,14 @@ var Spinner = ({ className, size = "md" }) => {
 
 // src/hooks/useBusinessDetailsAttach.ts
 var import_react38 = require("react");
-var import_core7 = require("@solvapay/core");
+var import_core10 = require("@solvapay/core");
 
 // src/components/businessCheckoutParts.tsx
 var import_react37 = require("react");
-var import_core6 = require("@solvapay/core");
+var import_core9 = require("@solvapay/core");
 var import_jsx_runtime25 = require("react/jsx-runtime");
 function mapBusinessFieldErrors(input) {
-  const result = (0, import_core6.validateBusinessDetails)(input);
+  const result = (0, import_core9.validateBusinessDetails)(input);
   if (result.success) return {};
   const errors = {};
   for (const issue of result.error.issues) {
@@ -6012,25 +6019,25 @@ function isBusinessDetailsKey(key) {
 function attr(prefix, suffix) {
   return `data-solvapay-${prefix}-${suffix}`;
 }
-var SUPPORTED_BUSINESS_COUNTRIES_SET = new Set(import_core6.SUPPORTED_BUSINESS_COUNTRIES);
+var SUPPORTED_BUSINESS_COUNTRIES_SET = new Set(import_core9.SUPPORTED_BUSINESS_COUNTRIES);
 function isSupportedBusinessCountry(value) {
   return SUPPORTED_BUSINESS_COUNTRIES_SET.has(value);
 }
 function resolveTaxIdLabel(country) {
   if (country && isSupportedBusinessCountry(country)) {
-    return (0, import_core6.getTaxIdFieldLabel)(country);
+    return (0, import_core9.getTaxIdFieldLabel)(country);
   }
   return "Tax ID";
 }
 function resolveTaxIdPlaceholder(country) {
   if (country && isSupportedBusinessCountry(country)) {
-    return (0, import_core6.getTaxIdExample)(country);
+    return (0, import_core9.getTaxIdExample)(country);
   }
   return "Enter tax ID";
 }
 function resolveTaxIdHelperText(country) {
   if (country && isSupportedBusinessCountry(country)) {
-    return (0, import_core6.getTaxIdHelperText)(country);
+    return (0, import_core9.getTaxIdHelperText)(country);
   }
   return "";
 }
@@ -6105,7 +6112,7 @@ function createBusinessDetailsParts(useCtx, prefix) {
     };
     const defaultOptions = /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(import_jsx_runtime25.Fragment, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("option", { value: "", children: "Select country" }),
-      import_core6.BUSINESS_COUNTRY_OPTIONS.map(({ value, label }) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("option", { value, children: label }, value))
+      import_core9.BUSINESS_COUNTRY_OPTIONS.map(({ value, label }) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("option", { value, children: label }, value))
     ] });
     if (asChild) {
       return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Slot, { ref: forwardedRef, ...commonProps, children: children ?? defaultOptions });
@@ -6310,7 +6317,7 @@ function useBusinessDetailsAttach(options) {
       if (!processorPaymentId || !attachBusinessDetails) {
         return !attachBusinessDetails;
       }
-      const validation = (0, import_core7.validateBusinessDetails)(input);
+      const validation = (0, import_core10.validateBusinessDetails)(input);
       if (!validation.success) {
         setFieldErrors(mapBusinessFieldErrors(input));
         return false;
@@ -6349,7 +6356,7 @@ function useBusinessDetailsAttach(options) {
   );
   (0, import_react38.useEffect)(() => {
     if (!processorPaymentId || !attachBusinessDetails) return;
-    const validation = (0, import_core7.validateBusinessDetails)(businessDetails);
+    const validation = (0, import_core10.validateBusinessDetails)(businessDetails);
     if (!validation.success) {
       setFieldErrors(mapBusinessFieldErrors(businessDetails));
       setBusinessDetailsAttached(false);
@@ -7555,7 +7562,8 @@ function normalizeOneTimePurchase(input) {
     planSnapshot: {
       price: input.amount,
       currency: input.currency,
-      isMetered: false
+      isMetered: false,
+      options: []
     }
   };
 }
@@ -8463,7 +8471,7 @@ var RecurringPaymentStep = (0, import_react46.memo)(function RecurringPaymentSte
   const amountMinor = pricingOption.price ?? 0;
   const cycle = planBillingInterval(plan) ?? "month";
   const included = inferIncludedUnits(plan);
-  const meterName = planMeterName(plan) ?? "units";
+  const meterName2 = planMeterName(plan) ?? "units";
   const planName = plan.name ?? "Plan";
   return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(import_jsx_runtime32.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(BackLink, { label: "Change plan", onClick: onBack }),
@@ -8480,7 +8488,7 @@ var RecurringPaymentStep = (0, import_react46.memo)(function RecurringPaymentSte
       included != null ? /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: "solvapay-mcp-checkout-order-summary-row", children: /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("span", { className: cx.muted, children: [
         included.toLocaleString(locale),
         " ",
-        meterName,
+        meterName2,
         " included"
       ] }) }) : null
     ] }),
@@ -9898,22 +9906,21 @@ function McpApp({
 }
 
 // src/mcp/plan-actions.ts
-var import_core8 = require("@solvapay/core");
+var import_core11 = require("@solvapay/core");
 function isPaidPlan(plan) {
   if (plan.requiresPayment === false) return false;
-  if ((0, import_core8.charges)(plan).some((charge) => charge.amountMinor > 0)) return true;
+  if ((0, import_core11.charges)(plan).some((charge) => charge.amountMinor > 0)) return true;
   return (plan.price ?? 0) > 0;
 }
 function isMeteredPlan(plan) {
-  if (plan.isMetered === true) return true;
-  return (0, import_core8.perUnitCharge)(plan) != null || (0, import_core8.includedUnits)(plan) != null;
+  return (0, import_core11.countsUsage)(plan);
 }
 function resolvePlanShape(plan) {
   if (!plan) return null;
-  if (((0, import_core8.trialDays)(plan) ?? 0) > 0) return "trial";
+  if (((0, import_core11.trialDays)(plan) ?? 0) > 0) return "trial";
   if (!isPaidPlan(plan)) return "free";
   const metered = isMeteredPlan(plan);
-  if ((0, import_core8.billingCycle)(plan)) return metered ? "recurring-metered" : "recurring-unlimited";
+  if ((0, import_core11.billingCycle)(plan)) return metered ? "recurring-metered" : "recurring-unlimited";
   return metered ? "usage-based" : "recurring-unlimited";
 }
 function resolveActivationStrategy(plan) {

package/dist/mcp/index.d.cts

@@ -897,17 +897,14 @@ type PlanShape = 'free' | 'trial' | 'usage-based' | 'recurring-unlimited' | 'rec
 type ActivationStrategy = 'activate' | 'topup-first' | 'paid-checkout';
 /**
  * The subset of a plan — or of the plan snapshot frozen onto a purchase
- * — that the shape derivation reads. The two differ: a plan carries
- * `requiresPayment`, a snapshot carries `isMetered`, and neither
- * carries both. Everything else comes out of `options[]`.
+ * — that the shape derivation reads. A plan carries `requiresPayment`;
+ * a snapshot may not. Usage-counting and the rest come out of `options[]`.
  */
 interface PlanLike {
     /** Composable pricing options: charges, billing cycle, limit, trial. */
     options?: PricingOptionLike[] | null;
     /** `false` marks a free plan. Only present on a plan, not a snapshot. */
     requiresPayment?: boolean | null;
-    /** Set on a frozen purchase snapshot when the plan meters usage. */
-    isMetered?: boolean | null;
     /** Derived headline amount; only a fallback for snapshots frozen before `options[]`. */
     price?: number | null;
     currency?: string | null;

package/dist/mcp/index.d.ts

@@ -897,17 +897,14 @@ type PlanShape = 'free' | 'trial' | 'usage-based' | 'recurring-unlimited' | 'rec
 type ActivationStrategy = 'activate' | 'topup-first' | 'paid-checkout';
 /**
  * The subset of a plan — or of the plan snapshot frozen onto a purchase
- * — that the shape derivation reads. The two differ: a plan carries
- * `requiresPayment`, a snapshot carries `isMetered`, and neither
- * carries both. Everything else comes out of `options[]`.
+ * — that the shape derivation reads. A plan carries `requiresPayment`;
+ * a snapshot may not. Usage-counting and the rest come out of `options[]`.
  */
 interface PlanLike {
     /** Composable pricing options: charges, billing cycle, limit, trial. */
     options?: PricingOptionLike[] | null;
     /** `false` marks a free plan. Only present on a plan, not a snapshot. */
     requiresPayment?: boolean | null;
-    /** Set on a frozen purchase snapshot when the plan meters usage. */
-    isMetered?: boolean | null;
     /** Derived headline amount; only a fallback for snapshots frozen before `options[]`. */
     price?: number | null;
     currency?: string | null;

package/dist/mcp/index.js

@@ -3,7 +3,7 @@ import {
   ExternalLinkGlyph,
   LaunchCustomerPortalButton,
   paymentMethodCache
-} from "../chunk-D6TOFFNL.js";
+} from "../chunk-VUGPLAS4.js";
 import {
   AmountPicker,
   BalanceBadge,
@@ -41,7 +41,7 @@ import {
   usePurchaseStatus,
   useTopupAmountSelector,
   useTransport
-} from "../chunk-6ABOJOEV.js";
+} from "../chunk-JN5BJ5MI.js";
 import "../chunk-UMXOAUW7.js";
 import "../chunk-MLKGABMK.js";
 
@@ -2568,8 +2568,7 @@ function McpApp({
 import {
   billingCycle,
   charges,
-  includedUnits,
-  perUnitCharge,
+  countsUsage,
   trialDays
 } from "@solvapay/core";
 function isPaidPlan(plan) {
@@ -2578,8 +2577,7 @@ function isPaidPlan(plan) {
   return (plan.price ?? 0) > 0;
 }
 function isMeteredPlan(plan) {
-  if (plan.isMetered === true) return true;
-  return perUnitCharge(plan) != null || includedUnits(plan) != null;
+  return countsUsage(plan);
 }
 function resolvePlanShape(plan) {
   if (!plan) return null;

package/dist/primitives/index.cjs

@@ -665,10 +665,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",
@@ -2998,7 +2998,8 @@ function normalizeOneTimePurchase(input) {
     planSnapshot: {
       price: input.amount,
       currency: input.currency,
-      isMetered: false
+      isMetered: false,
+      options: []
     }
   };
 }
@@ -4929,6 +4930,7 @@ var BalanceBadge = (0, import_react24.forwardRef)(function BalanceBadge2({ asChi
 });
 
 // src/primitives/CancelPlanButton.tsx
+var import_core5 = require("@solvapay/core");
 var import_react26 = require("react");
 
 // src/hooks/usePurchaseActions.ts
@@ -4986,7 +4988,7 @@ var import_jsx_runtime17 = 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_core5.countsUsage)(purchase?.planSnapshot) || purchase?.planSnapshot?.isMetered === true) && purchase?.isRecurring !== true;
   if (isUsageBased) return defaults.usageBased;
   return defaults.recurring;
 }
@@ -6319,7 +6321,7 @@ function stripSetupIntentParams() {
 }
 
 // src/utils/credit-estimation.ts
-var import_core5 = require("@solvapay/core");
+var import_core6 = require("@solvapay/core");
 function estimateCredits(resolvedAmountMajor, currency, creditsPerMinorUnit, displayExchangeRate) {
   if (resolvedAmountMajor == null || resolvedAmountMajor <= 0) return null;
   if (creditsPerMinorUnit == null || creditsPerMinorUnit <= 0) return null;
@@ -6331,7 +6333,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_core5.creditsToDisplayMinorUnits)({
+  const displayMinor = (0, import_core6.creditsToDisplayMinorUnits)({
     credits,
     creditsPerMinorUnit,
     displayExchangeRate: rate,
@@ -7882,7 +7884,7 @@ function useTransport() {
 }
 
 // src/primitives/checkout/shared.ts
-var import_core6 = require("@solvapay/core");
+var import_core7 = require("@solvapay/core");
 function isPayg(plan) {
   return isPaygPlan(plan ?? null);
 }
@@ -7923,25 +7925,25 @@ function formatContinueLabel(plan, locale, pricingOption) {
   return `Continue with ${plan.name ?? "Plan"} \u2014 ${priceLabel}${cycle}`;
 }
 function planBillingInterval(plan) {
-  return (0, import_core6.billingCycle)(plan)?.interval ?? null;
+  return (0, import_core7.billingCycle)(plan)?.interval ?? null;
 }
 function formatPaygRate(plan, locale, balance) {
-  const credits = (0, import_core6.creditsPerUnitFromBalance)(plan, balance);
+  const credits = (0, import_core7.creditsPerUnitFromBalance)(plan, balance);
   if (credits != null) {
     return `${credits.toLocaleString(locale)} ${credits === 1 ? "credit" : "credits"} / call`;
   }
-  const charge = (0, import_core6.perUnitCharge)(plan);
+  const charge = (0, import_core7.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_core6.includedUnits)(plan);
+  const cap = (0, import_core7.includedUnits)(plan);
   return cap != null && cap > 0 ? cap : null;
 }
 function planMeterName(plan) {
-  return (0, import_core6.perUnitCharge)(plan)?.meter ?? null;
+  return (0, import_core7.meterName)(plan);
 }
 function shortCycle(cycle) {
   if (!cycle) return "mo";
@@ -9116,6 +9118,7 @@ function usePaywallNoticeOptional() {
 var import_react43 = require("react");
 
 // src/hooks/useUsage.ts
+var import_core8 = require("@solvapay/core");
 var import_react42 = require("react");
 
 // src/hooks/useLimits.ts
@@ -9123,19 +9126,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);
@@ -9190,7 +9193,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) {
@@ -9203,7 +9206,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) {
@@ -9212,7 +9215,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);
@@ -9230,7 +9233,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;
@@ -9257,7 +9260,7 @@ function useLimits(options) {
         });
       }, OPTIMISTIC_GRACE_MS);
     },
-    [customerRef, productRef, meterName, enabled, fetchLimits]
+    [customerRef, productRef, meterName2, enabled, fetchLimits]
   );
   return {
     remaining: data?.remaining ?? null,
@@ -9276,7 +9279,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_core8.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;
@@ -9299,18 +9304,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_core8.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)(() => {