@solvapay/react 2.2.1 → 2.2.2-preview-09731417a0a7b4fd3afb4783fdf20b5ad293f63d

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @solvapay/react changelog
 
+## 2.2.2-preview-09731417a0a7b4fd3afb4783fdf20b5ad293f63d
+
+### Patch Changes
+
+- 567db3e: The customer's active plan is no longer selectable in the plan picker. The active PAYG plan is no longer auto-selected — topping up happens from the account surface, not by re-activating the current plan from the list.
+- Updated dependencies [c67e78e]
+- Updated dependencies [dbd0108]
+- Updated dependencies [c67e78e]
+- Updated dependencies [c67e78e]
+- Updated dependencies [c67e78e]
+  - @solvapay/mcp-core@0.4.2-preview-09731417a0a7b4fd3afb4783fdf20b5ad293f63d
+
 ## 2.2.1
 
 ### Patch Changes

package/dist/{UsageMeter-CkJ_nowq.d.ts → UsageMeter-BZWfC5KX.d.ts}

@@ -1,5 +1,5 @@
 import React from 'react';
-import { _ as UsageSnapshot } from './useUsage-CfM9dQwB.js';
+import { _ as UsageSnapshot } from './useUsage-DSPWQ37m.js';
 
 /**
  * `<UsageMeter>` compound primitive — renders the authenticated customer's

package/dist/{UsageMeter-ClENA677.d.cts → UsageMeter-BiujMmVR.d.cts}

@@ -1,5 +1,5 @@
 import React from 'react';
-import { _ as UsageSnapshot } from './useUsage-x6DQG7xe.cjs';
+import { _ as UsageSnapshot } from './useUsage-CRd_E6J3.cjs';
 
 /**
  * `<UsageMeter>` compound primitive — renders the authenticated customer's

package/dist/{chunk-QZLY6SIU.js → chunk-4UFQDYG5.js}

@@ -8,7 +8,7 @@ import {
   useOpenExternal,
   useSolvaPay,
   useTransport
-} from "./chunk-LCBCOFXZ.js";
+} from "./chunk-GPP4MY3I.js";
 
 // src/hooks/usePaymentMethod.ts
 import { useCallback, useEffect, useState } from "react";

package/dist/{chunk-LCBCOFXZ.js → chunk-GPP4MY3I.js}

@@ -1880,15 +1880,14 @@ function processPlans(raw, filter, sortBy) {
   if (filter) result = result.filter(filter);
   return result;
 }
-function computeInitialIndex(plans, initialPlanRef, autoSelectFirstPaid) {
+function computeInitialIndex(plans, initialPlanRef, autoSelectFirstPaid, excludePlanRef) {
   if (plans.length === 0) return 0;
   if (initialPlanRef) {
     const idx = plans.findIndex((p) => p.reference === initialPlanRef);
     if (idx >= 0) return idx;
   }
   if (autoSelectFirstPaid) {
-    const idx = plans.findIndex((p) => p.requiresPayment !== false);
-    return idx >= 0 ? idx : 0;
+    return plans.findIndex((p) => p.requiresPayment !== false && p.reference !== excludePlanRef);
   }
   return -1;
 }
@@ -1900,6 +1899,7 @@ function usePlans(options) {
     sortBy,
     autoSelectFirstPaid = false,
     initialPlanRef,
+    excludePlanRef,
     selectionReady = true
   } = options;
   const solvaContext = useContext5(SolvaPayContext);
@@ -1913,6 +1913,7 @@ function usePlans(options) {
   const sortByRef = useRef3(sortBy);
   const autoSelectFirstPaidRef = useRef3(autoSelectFirstPaid);
   const initialPlanRefRef = useRef3(initialPlanRef);
+  const excludePlanRefRef = useRef3(excludePlanRef);
   const selectionReadyRef = useRef3(selectionReady);
   const hasAppliedInitialRef = useRef3(false);
   const userHasSelectedRef = useRef3(false);
@@ -1924,7 +1925,7 @@ function usePlans(options) {
     }
     const processed = processPlans(cached.plans, filter, sortBy);
     if (processed.length === 0) return 0;
-    const idx = computeInitialIndex(processed, initialPlanRef, autoSelectFirstPaid);
+    const idx = computeInitialIndex(processed, initialPlanRef, autoSelectFirstPaid, excludePlanRef);
     hasAppliedInitialRef.current = true;
     return idx;
   });
@@ -1953,6 +1954,9 @@ function usePlans(options) {
   useEffect2(() => {
     initialPlanRefRef.current = initialPlanRef;
   }, [initialPlanRef]);
+  useEffect2(() => {
+    excludePlanRefRef.current = excludePlanRef;
+  }, [excludePlanRef]);
   useEffect2(() => {
     selectionReadyRef.current = selectionReady;
   }, [selectionReady]);
@@ -1967,7 +1971,8 @@ function usePlans(options) {
     const idx = computeInitialIndex(
       processedPlans,
       initialPlanRefRef.current,
-      autoSelectFirstPaidRef.current
+      autoSelectFirstPaidRef.current,
+      excludePlanRefRef.current
     );
     setSelectedPlanIndexState(idx);
   }, []);
@@ -1984,11 +1989,7 @@ function usePlans(options) {
         try {
           setLoading(true);
           const fetchedPlans = await cached.promise;
-          const processedPlans = processPlans(
-            fetchedPlans,
-            filterRef.current,
-            sortByRef.current
-          );
+          const processedPlans = processPlans(fetchedPlans, filterRef.current, sortByRef.current);
           setPlans(processedPlans);
           setError(null);
           applyInitialSelection(processedPlans);
@@ -2000,11 +2001,7 @@ function usePlans(options) {
         return;
       }
       if (!force && cached && cached.plans.length > 0 && now - cached.timestamp < CACHE_DURATION3) {
-        const processedPlans = processPlans(
-          cached.plans,
-          filterRef.current,
-          sortByRef.current
-        );
+        const processedPlans = processPlans(cached.plans, filterRef.current, sortByRef.current);
         setPlans(processedPlans);
         setLoading(false);
         setError(null);
@@ -2018,11 +2015,7 @@ function usePlans(options) {
         plansCache.set(productRef, { plans: [], timestamp: now, promise: fetchPromise });
         const fetchedPlans = await fetchPromise;
         plansCache.set(productRef, { plans: fetchedPlans, timestamp: now, promise: null });
-        const processedPlans = processPlans(
-          fetchedPlans,
-          filterRef.current,
-          sortByRef.current
-        );
+        const processedPlans = processPlans(fetchedPlans, filterRef.current, sortByRef.current);
         setPlans(processedPlans);
         applyInitialSelection(processedPlans);
       } catch (err) {
@@ -5851,21 +5844,7 @@ var BalanceBadge = forwardRef8(function BalanceBadge2({ asChild, numberOnly, low
 });
 
 // src/primitives/PlanSelector.tsx
-import {
-  createContext as createContext9,
-  forwardRef as forwardRef9,
-  useCallback as useCallback15,
-  useContext as useContext13,
-  useEffect as useEffect12,
-  useMemo as useMemo11,
-  useRef as useRef8,
-  useState as useState14
-} from "react";
-
-// src/utils/isPayg.ts
-function isPaygPlan(plan) {
-  return plan?.type === "usage-based" || plan?.type === "hybrid";
-}
+import { createContext as createContext9, forwardRef as forwardRef9, useCallback as useCallback15, useContext as useContext13, useMemo as useMemo11, useState as useState14 } from "react";
 
 // src/utils/planPricing.ts
 import { headlineCharges } from "@solvapay/core";
@@ -5940,19 +5919,20 @@ var Root5 = forwardRef9(function PlanSelectorRoot(props, forwardedRef) {
     () => fetcher ?? ((ref) => defaultListPlans(ref, _config)),
     [fetcher, _config]
   );
+  const autoCurrentPlanRef = useMemo11(() => {
+    const active = purchases.filter((p) => p.status === "active").sort((a, b) => new Date(b.startDate).getTime() - new Date(a.startDate).getTime())[0];
+    return active?.planSnapshot?.reference ?? null;
+  }, [purchases]);
+  const resolvedCurrentPlanRef = currentPlanRef === null ? null : currentPlanRef ?? autoCurrentPlanRef;
   const { plans, selectedPlan, selectPlan, setSelectedPlanIndex, loading, error } = usePlans({
     productRef,
     fetcher: effectiveFetcher,
     filter,
     sortBy,
     autoSelectFirstPaid,
-    initialPlanRef
+    initialPlanRef,
+    excludePlanRef: resolvedCurrentPlanRef
   });
-  const autoCurrentPlanRef = useMemo11(() => {
-    const active = purchases.filter((p) => p.status === "active").sort((a, b) => new Date(b.startDate).getTime() - new Date(a.startDate).getTime())[0];
-    return active?.planSnapshot?.reference ?? null;
-  }, [purchases]);
-  const resolvedCurrentPlanRef = currentPlanRef === null ? null : currentPlanRef ?? autoCurrentPlanRef;
   const isCurrent = useCallback15(
     (ref) => resolvedCurrentPlanRef === ref,
     [resolvedCurrentPlanRef]
@@ -5961,19 +5941,17 @@ var Root5 = forwardRef9(function PlanSelectorRoot(props, forwardedRef) {
     (ref) => plans.find((p) => p.reference === ref)?.requiresPayment === false,
     [plans]
   );
-  const isPopular = useCallback15(
-    (ref) => popularPlanRef === ref,
-    [popularPlanRef]
-  );
+  const isPopular = useCallback15((ref) => popularPlanRef === ref, [popularPlanRef]);
   const select = useCallback15(
     (ref) => {
       const plan = plans.find((p) => p.reference === ref);
       if (!plan) return;
       if (plan.requiresPayment === false) return;
+      if (isCurrent(ref)) return;
       selectPlan(ref);
       onSelect?.(ref, plan);
     },
-    [plans, selectPlan, onSelect]
+    [plans, selectPlan, onSelect, isCurrent]
   );
   const clearSelection = useCallback15(() => {
     setSelectedPlanIndex(-1);
@@ -5996,22 +5974,6 @@ var Root5 = forwardRef9(function PlanSelectorRoot(props, forwardedRef) {
     setSelectedCurrencies((current) => ({ ...current, [planRef]: currency }));
   }, []);
   const selectedCurrency = selectedPlan ? getSelectedOption(selectedPlan).currency : null;
-  const autoCurrentAppliedKeyRef = useRef8(null);
-  useEffect12(() => {
-    if (autoCurrentAppliedKeyRef.current === productRef) return;
-    if (selectedPlanRef) {
-      autoCurrentAppliedKeyRef.current = productRef;
-      return;
-    }
-    if (!resolvedCurrentPlanRef || plans.length === 0) return;
-    const currentPlan = plans.find((p) => p.reference === resolvedCurrentPlanRef);
-    if (!currentPlan || !isPaygPlan(currentPlan)) {
-      autoCurrentAppliedKeyRef.current = productRef;
-      return;
-    }
-    autoCurrentAppliedKeyRef.current = productRef;
-    select(resolvedCurrentPlanRef);
-  }, [productRef, plans, resolvedCurrentPlanRef, selectedPlanRef, select]);
   const ctx = useMemo11(
     () => ({
       plans,
@@ -6088,9 +6050,8 @@ var Grid = forwardRef9(function PlanSelectorGrid({ children, ...rest }, forwarde
     const isFree = ctx.isFree(plan.reference);
     const isPopular = ctx.isPopular(plan.reference);
     const selected = ctx.selectedPlanRef === plan.reference;
-    const isPaygCurrent = isCurrent && isPaygPlan(plan);
-    const disabled = isFree || isCurrent && !isPaygCurrent;
-    const state = isCurrent && !isPaygCurrent ? "current" : selected ? "selected" : isCurrent ? "current" : isFree ? "disabled" : "idle";
+    const disabled = isFree || isCurrent;
+    const state = isCurrent ? "current" : selected ? "selected" : isFree ? "disabled" : "idle";
     const pricingOptions = getPlanPricingOptions(plan);
     const selectedOption = ctx.getSelectedOption(plan);
     const cardCtx = {
@@ -6588,7 +6549,7 @@ function useTransport() {
 }
 
 // src/hooks/useLimits.ts
-import { useCallback as useCallback19, useEffect as useEffect13, useRef as useRef9, useState as useState16 } from "react";
+import { useCallback as useCallback19, useEffect as useEffect12, useRef as useRef8, useState as useState16 } from "react";
 var CACHE_TTL_MS = 1e4;
 var OPTIMISTIC_GRACE_MS = 8e3;
 var limitsCache = /* @__PURE__ */ new Map();
@@ -6626,12 +6587,12 @@ function useLimits(options) {
     setData(null);
   }
   const unlimited = data === null ? null : isUnlimited(data.remaining);
-  const optimisticTimerRef = useRef9(null);
-  const unlimitedRef = useRef9(false);
-  useEffect13(() => {
+  const optimisticTimerRef = useRef8(null);
+  const unlimitedRef = useRef8(false);
+  useEffect12(() => {
     unlimitedRef.current = unlimited === true;
   }, [unlimited]);
-  useEffect13(() => {
+  useEffect12(() => {
     return () => {
       if (optimisticTimerRef.current) clearTimeout(optimisticTimerRef.current);
     };
@@ -6694,11 +6655,11 @@ function useLimits(options) {
     },
     [transport, customerRef, productRef, meterName2, enabled, attachToFetch]
   );
-  useEffect13(() => {
+  useEffect12(() => {
     fetchLimits(false);
   }, [fetchLimits]);
-  const prevPurchasesRef = useRef9(null);
-  useEffect13(() => {
+  const prevPurchasesRef = useRef8(null);
+  useEffect12(() => {
     if (prevPurchasesRef.current !== null && prevPurchasesRef.current !== purchase.purchases) {
       fetchLimits(true).catch(() => {
       });
@@ -6764,7 +6725,7 @@ function useLimits(options) {
 
 // src/hooks/useUsage.ts
 import { countsUsage } from "@solvapay/core";
-import { useCallback as useCallback20, useEffect as useEffect14, useMemo as useMemo15, useState as useState17 } from "react";
+import { useCallback as useCallback20, useEffect as useEffect13, useMemo as useMemo15, useState as useState17 } from "react";
 var seededUsage = null;
 var usageSeedGeneration = 0;
 function seedUsageSnapshot(usage) {
@@ -6826,7 +6787,7 @@ function useUsage() {
     [activePurchase, limitRemaining, unlimited, meterName2, limitUsed, limit]
   );
   const activePurchaseRef = activePurchase?.reference ?? null;
-  useEffect14(() => {
+  useEffect13(() => {
     setOverride(seededUsage);
   }, [activePurchaseRef]);
   const usage = override ?? derived;
@@ -7077,7 +7038,7 @@ function useUsageMeter() {
 }
 
 // src/hooks/useAutoRecharge.ts
-import { useCallback as useCallback21, useEffect as useEffect15, useRef as useRef10, useState as useState18 } from "react";
+import { useCallback as useCallback21, useEffect as useEffect14, useRef as useRef9, useState as useState18 } from "react";
 function mergeAutoRechargeConfig(config, display) {
   return display ? { ...config, display } : config;
 }
@@ -7101,7 +7062,7 @@ function useAutoRecharge() {
   const [saving, setSaving] = useState18(false);
   const [disabling, setDisabling] = useState18(false);
   const [error, setError] = useState18(null);
-  const requestSeq = useRef10(0);
+  const requestSeq = useRef9(0);
   const load = useCallback21(
     async (force = false) => {
       const seq = requestSeq.current;
@@ -7161,10 +7122,10 @@ function useAutoRecharge() {
     },
     [_config, key]
   );
-  useEffect15(() => {
+  useEffect14(() => {
     void load();
   }, [load]);
-  useEffect15(() => {
+  useEffect14(() => {
     return subscribeAutoRecharge(key, () => {
       const cached = autoRechargeCache.get(key);
       if (cached) {
@@ -7557,7 +7518,7 @@ function flipUnitValue(anchor, targetUnit, currency, creditsPerMinorUnit, displa
 }
 
 // src/hooks/useCheckoutFlow.ts
-import { useCallback as useCallback22, useMemo as useMemo17, useRef as useRef11, useState as useState19 } from "react";
+import { useCallback as useCallback22, useMemo as useMemo17, useRef as useRef10, useState as useState19 } from "react";
 
 // src/primitives/checkout/shared.ts
 import {
@@ -7568,6 +7529,13 @@ import {
   planPricingShape,
   usageRate
 } from "@solvapay/core";
+
+// src/utils/isPayg.ts
+function isPaygPlan(plan) {
+  return plan?.type === "usage-based" || plan?.type === "hybrid";
+}
+
+// src/primitives/checkout/shared.ts
 function isPayg(plan) {
   return isPaygPlan(plan ?? null);
 }
@@ -7676,10 +7644,10 @@ function resolveInitialCheckoutStep(initialStep) {
 }
 function useCheckoutFlow(opts) {
   const { productRef, initialStep = "plan", initialAmountMinor = null } = opts;
-  const onPlanSelectRef = useRef11(opts.onPlanSelect);
-  const onAmountSelectRef = useRef11(opts.onAmountSelect);
-  const onPurchaseSuccessRef = useRef11(opts.onPurchaseSuccess);
-  const onErrorRef = useRef11(opts.onError);
+  const onPlanSelectRef = useRef10(opts.onPlanSelect);
+  const onAmountSelectRef = useRef10(opts.onAmountSelect);
+  const onPurchaseSuccessRef = useRef10(opts.onPurchaseSuccess);
+  const onErrorRef = useRef10(opts.onError);
   onPlanSelectRef.current = opts.onPlanSelect;
   onAmountSelectRef.current = opts.onAmountSelect;
   onPurchaseSuccessRef.current = opts.onPurchaseSuccess;
@@ -7712,7 +7680,7 @@ function useCheckoutFlow(opts) {
   const [selectedAmountMinor, setSelectedAmountMinor] = useState19(initialAmountMinor);
   const [successMeta, setSuccessMeta] = useState19(null);
   const [error, setError] = useState19(null);
-  const selectedAmountMinorRef = useRef11(initialAmountMinor);
+  const selectedAmountMinorRef = useRef10(initialAmountMinor);
   const selectedPlan = planCtx.selectedPlan;
   const selectedPlanRef = planCtx.selectedPlanRef;
   const selectedPlanShape = toBootstrapPlanLike(selectedPlan);
@@ -8090,7 +8058,6 @@ export {
   TopupForm,
   useTopupForm,
   BalanceBadge,
-  isPaygPlan,
   resolvePlanPricingOption,
   PlanSelectorRoot2 as PlanSelectorRoot,
   PlanSelectorHeading2 as PlanSelectorHeading,
@@ -8133,6 +8100,7 @@ export {
   Empty,
   UsageMeter,
   useUsageMeter,
+  isPaygPlan,
   isPayg,
   planSortByPaygFirstThenAsc,
   buildDefaultCheckoutPlanFilter,

package/dist/{chunk-AW5PCAYK.js → chunk-KUH3SNWZ.js}

@@ -46,7 +46,7 @@ import {
   useTopupAmountSelector,
   validateAutoRechargeForm,
   withPaymentElementDefaults
-} from "./chunk-LCBCOFXZ.js";
+} from "./chunk-GPP4MY3I.js";
 
 // src/TopupForm.tsx
 import { jsx, jsxs } from "react/jsx-runtime";

package/dist/{index-DFtP872_.d.cts → index-B5QUesJE.d.cts}

@@ -1,4 +1,4 @@
-import { a4 as components, b as Plan, P as PaymentFormProps, a as PrefillCustomer, A as ActivationResult, s as UseTopupAmountSelectorReturn, a5 as AutoRechargeInput, u as AutoRechargeConfig, a6 as AutoRechargeDisplayBlock, E as CheckoutStep, O as SuccessMeta } from './useUsage-x6DQG7xe.cjs';
+import { a4 as components, b as Plan, P as PaymentFormProps, a as PrefillCustomer, A as ActivationResult, s as UseTopupAmountSelectorReturn, a5 as AutoRechargeInput, u as AutoRechargeConfig, a6 as AutoRechargeDisplayBlock, E as CheckoutStep, O as SuccessMeta } from './useUsage-CRd_E6J3.cjs';
 import React from 'react';
 import { PaymentElement, CardElement } from '@stripe/react-stripe-js';
 import { TaxBreakdown } from '@solvapay/core';
@@ -76,6 +76,10 @@ type PaywallGateRecoveryFields = {
     shortfallCredits?: number;
     /** How many calls the current allowance or wallet still covers. */
     remainingCalls?: number;
+    /** Credits per minor currency unit, from the limits balance peg. */
+    creditsPerMinorUnit?: number;
+    /** USD → display-currency rate used with `creditsPerMinorUnit`. */
+    displayExchangeRate?: number;
     /** Active purchase reference when the customer already holds a purchase. */
     purchaseRef?: string;
     /** Purchase/plan status when the backend sent one. */

package/dist/{index-D4EhOmYp.d.ts → index-BAYpUp5R.d.ts}

@@ -1,4 +1,4 @@
-import { a4 as components, b as Plan, P as PaymentFormProps, a as PrefillCustomer, A as ActivationResult, s as UseTopupAmountSelectorReturn, a5 as AutoRechargeInput, u as AutoRechargeConfig, a6 as AutoRechargeDisplayBlock, E as CheckoutStep, O as SuccessMeta } from './useUsage-CfM9dQwB.js';
+import { a4 as components, b as Plan, P as PaymentFormProps, a as PrefillCustomer, A as ActivationResult, s as UseTopupAmountSelectorReturn, a5 as AutoRechargeInput, u as AutoRechargeConfig, a6 as AutoRechargeDisplayBlock, E as CheckoutStep, O as SuccessMeta } from './useUsage-DSPWQ37m.js';
 import React from 'react';
 import { PaymentElement, CardElement } from '@stripe/react-stripe-js';
 import { TaxBreakdown } from '@solvapay/core';
@@ -76,6 +76,10 @@ type PaywallGateRecoveryFields = {
     shortfallCredits?: number;
     /** How many calls the current allowance or wallet still covers. */
     remainingCalls?: number;
+    /** Credits per minor currency unit, from the limits balance peg. */
+    creditsPerMinorUnit?: number;
+    /** USD → display-currency rate used with `creditsPerMinorUnit`. */
+    displayExchangeRate?: number;
     /** Active purchase reference when the customer already holds a purchase. */
     purchaseRef?: string;
     /** Purchase/plan status when the backend sent one. */

package/dist/index.cjs

@@ -2330,15 +2330,14 @@ function processPlans(raw, filter, sortBy) {
   if (filter) result = result.filter(filter);
   return result;
 }
-function computeInitialIndex(plans, initialPlanRef, autoSelectFirstPaid) {
+function computeInitialIndex(plans, initialPlanRef, autoSelectFirstPaid, excludePlanRef) {
   if (plans.length === 0) return 0;
   if (initialPlanRef) {
     const idx = plans.findIndex((p) => p.reference === initialPlanRef);
     if (idx >= 0) return idx;
   }
   if (autoSelectFirstPaid) {
-    const idx = plans.findIndex((p) => p.requiresPayment !== false);
-    return idx >= 0 ? idx : 0;
+    return plans.findIndex((p) => p.requiresPayment !== false && p.reference !== excludePlanRef);
   }
   return -1;
 }
@@ -2350,6 +2349,7 @@ function usePlans(options) {
     sortBy,
     autoSelectFirstPaid = false,
     initialPlanRef,
+    excludePlanRef,
     selectionReady = true
   } = options;
   const solvaContext = (0, import_react10.useContext)(SolvaPayContext);
@@ -2363,6 +2363,7 @@ function usePlans(options) {
   const sortByRef = (0, import_react10.useRef)(sortBy);
   const autoSelectFirstPaidRef = (0, import_react10.useRef)(autoSelectFirstPaid);
   const initialPlanRefRef = (0, import_react10.useRef)(initialPlanRef);
+  const excludePlanRefRef = (0, import_react10.useRef)(excludePlanRef);
   const selectionReadyRef = (0, import_react10.useRef)(selectionReady);
   const hasAppliedInitialRef = (0, import_react10.useRef)(false);
   const userHasSelectedRef = (0, import_react10.useRef)(false);
@@ -2374,7 +2375,7 @@ function usePlans(options) {
     }
     const processed = processPlans(cached.plans, filter, sortBy);
     if (processed.length === 0) return 0;
-    const idx = computeInitialIndex(processed, initialPlanRef, autoSelectFirstPaid);
+    const idx = computeInitialIndex(processed, initialPlanRef, autoSelectFirstPaid, excludePlanRef);
     hasAppliedInitialRef.current = true;
     return idx;
   });
@@ -2403,6 +2404,9 @@ function usePlans(options) {
   (0, import_react10.useEffect)(() => {
     initialPlanRefRef.current = initialPlanRef;
   }, [initialPlanRef]);
+  (0, import_react10.useEffect)(() => {
+    excludePlanRefRef.current = excludePlanRef;
+  }, [excludePlanRef]);
   (0, import_react10.useEffect)(() => {
     selectionReadyRef.current = selectionReady;
   }, [selectionReady]);
@@ -2417,7 +2421,8 @@ function usePlans(options) {
     const idx = computeInitialIndex(
       processedPlans,
       initialPlanRefRef.current,
-      autoSelectFirstPaidRef.current
+      autoSelectFirstPaidRef.current,
+      excludePlanRefRef.current
     );
     setSelectedPlanIndexState(idx);
   }, []);
@@ -2434,11 +2439,7 @@ function usePlans(options) {
         try {
           setLoading(true);
           const fetchedPlans = await cached.promise;
-          const processedPlans = processPlans(
-            fetchedPlans,
-            filterRef.current,
-            sortByRef.current
-          );
+          const processedPlans = processPlans(fetchedPlans, filterRef.current, sortByRef.current);
           setPlans(processedPlans);
           setError(null);
           applyInitialSelection(processedPlans);
@@ -2450,11 +2451,7 @@ function usePlans(options) {
         return;
       }
       if (!force && cached && cached.plans.length > 0 && now - cached.timestamp < CACHE_DURATION3) {
-        const processedPlans = processPlans(
-          cached.plans,
-          filterRef.current,
-          sortByRef.current
-        );
+        const processedPlans = processPlans(cached.plans, filterRef.current, sortByRef.current);
         setPlans(processedPlans);
         setLoading(false);
         setError(null);
@@ -2468,11 +2465,7 @@ function usePlans(options) {
         plansCache.set(productRef, { plans: [], timestamp: now, promise: fetchPromise });
         const fetchedPlans = await fetchPromise;
         plansCache.set(productRef, { plans: fetchedPlans, timestamp: now, promise: null });
-        const processedPlans = processPlans(
-          fetchedPlans,
-          filterRef.current,
-          sortByRef.current
-        );
+        const processedPlans = processPlans(fetchedPlans, filterRef.current, sortByRef.current);
         setPlans(processedPlans);
         applyInitialSelection(processedPlans);
       } catch (err) {
@@ -6271,11 +6264,6 @@ var import_react32 = require("react");
 // src/primitives/PlanSelector.tsx
 var import_react30 = require("react");
 
-// src/utils/isPayg.ts
-function isPaygPlan(plan) {
-  return plan?.type === "usage-based" || plan?.type === "hybrid";
-}
-
 // src/utils/planPricing.ts
 var import_core7 = require("@solvapay/core");
 function getPlanPricingOptions(plan) {
@@ -6349,19 +6337,20 @@ var Root6 = (0, import_react30.forwardRef)(function PlanSelectorRoot(props, forw
     () => fetcher ?? ((ref) => defaultListPlans(ref, _config)),
     [fetcher, _config]
   );
+  const autoCurrentPlanRef = (0, import_react30.useMemo)(() => {
+    const active = purchases.filter((p) => p.status === "active").sort((a, b) => new Date(b.startDate).getTime() - new Date(a.startDate).getTime())[0];
+    return active?.planSnapshot?.reference ?? null;
+  }, [purchases]);
+  const resolvedCurrentPlanRef = currentPlanRef === null ? null : currentPlanRef ?? autoCurrentPlanRef;
   const { plans, selectedPlan, selectPlan, setSelectedPlanIndex, loading, error } = usePlans({
     productRef,
     fetcher: effectiveFetcher,
     filter,
     sortBy,
     autoSelectFirstPaid,
-    initialPlanRef
+    initialPlanRef,
+    excludePlanRef: resolvedCurrentPlanRef
   });
-  const autoCurrentPlanRef = (0, import_react30.useMemo)(() => {
-    const active = purchases.filter((p) => p.status === "active").sort((a, b) => new Date(b.startDate).getTime() - new Date(a.startDate).getTime())[0];
-    return active?.planSnapshot?.reference ?? null;
-  }, [purchases]);
-  const resolvedCurrentPlanRef = currentPlanRef === null ? null : currentPlanRef ?? autoCurrentPlanRef;
   const isCurrent = (0, import_react30.useCallback)(
     (ref) => resolvedCurrentPlanRef === ref,
     [resolvedCurrentPlanRef]
@@ -6370,19 +6359,17 @@ var Root6 = (0, import_react30.forwardRef)(function PlanSelectorRoot(props, forw
     (ref) => plans.find((p) => p.reference === ref)?.requiresPayment === false,
     [plans]
   );
-  const isPopular = (0, import_react30.useCallback)(
-    (ref) => popularPlanRef === ref,
-    [popularPlanRef]
-  );
+  const isPopular = (0, import_react30.useCallback)((ref) => popularPlanRef === ref, [popularPlanRef]);
   const select = (0, import_react30.useCallback)(
     (ref) => {
       const plan = plans.find((p) => p.reference === ref);
       if (!plan) return;
       if (plan.requiresPayment === false) return;
+      if (isCurrent(ref)) return;
       selectPlan(ref);
       onSelect?.(ref, plan);
     },
-    [plans, selectPlan, onSelect]
+    [plans, selectPlan, onSelect, isCurrent]
   );
   const clearSelection = (0, import_react30.useCallback)(() => {
     setSelectedPlanIndex(-1);
@@ -6405,22 +6392,6 @@ var Root6 = (0, import_react30.forwardRef)(function PlanSelectorRoot(props, forw
     setSelectedCurrencies((current) => ({ ...current, [planRef]: currency }));
   }, []);
   const selectedCurrency = selectedPlan ? getSelectedOption(selectedPlan).currency : null;
-  const autoCurrentAppliedKeyRef = (0, import_react30.useRef)(null);
-  (0, import_react30.useEffect)(() => {
-    if (autoCurrentAppliedKeyRef.current === productRef) return;
-    if (selectedPlanRef) {
-      autoCurrentAppliedKeyRef.current = productRef;
-      return;
-    }
-    if (!resolvedCurrentPlanRef || plans.length === 0) return;
-    const currentPlan = plans.find((p) => p.reference === resolvedCurrentPlanRef);
-    if (!currentPlan || !isPaygPlan(currentPlan)) {
-      autoCurrentAppliedKeyRef.current = productRef;
-      return;
-    }
-    autoCurrentAppliedKeyRef.current = productRef;
-    select(resolvedCurrentPlanRef);
-  }, [productRef, plans, resolvedCurrentPlanRef, selectedPlanRef, select]);
   const ctx = (0, import_react30.useMemo)(
     () => ({
       plans,
@@ -6497,9 +6468,8 @@ var Grid = (0, import_react30.forwardRef)(function PlanSelectorGrid({ children,
     const isFree = ctx.isFree(plan.reference);
     const isPopular = ctx.isPopular(plan.reference);
     const selected = ctx.selectedPlanRef === plan.reference;
-    const isPaygCurrent = isCurrent && isPaygPlan(plan);
-    const disabled = isFree || isCurrent && !isPaygCurrent;
-    const state = isCurrent && !isPaygCurrent ? "current" : selected ? "selected" : isCurrent ? "current" : isFree ? "disabled" : "idle";
+    const disabled = isFree || isCurrent;
+    const state = isCurrent ? "current" : selected ? "selected" : isFree ? "disabled" : "idle";
     const pricingOptions = getPlanPricingOptions(plan);
     const selectedOption = ctx.getSelectedOption(plan);
     const cardCtx = {
@@ -8703,6 +8673,13 @@ var UsageMeter = Object.assign(Root10, {
 
 // src/primitives/checkout/shared.ts
 var import_core10 = require("@solvapay/core");
+
+// src/utils/isPayg.ts
+function isPaygPlan(plan) {
+  return plan?.type === "usage-based" || plan?.type === "hybrid";
+}
+
+// src/primitives/checkout/shared.ts
 function isPayg(plan) {
   return isPaygPlan(plan ?? null);
 }