@better-auth/stripe 1.5.0-beta.8 → 1.5.0

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { t as STRIPE_ERROR_CODES } from "./error-codes-Clj-xYDP.mjs";
+import { t as STRIPE_ERROR_CODES } from "./error-codes-CCosYkXx.mjs";
 import { APIError, HIDE_METADATA } from "better-auth";
 import { defu } from "defu";
 import { createAuthEndpoint, createAuthMiddleware } from "@better-auth/core/api";
@@ -7,14 +7,54 @@ import { getSessionFromCtx, originCheck, sessionMiddleware } from "better-auth/a
 import * as z from "zod/v4";
 import { mergeSchema } from "better-auth/db";
 
+//#region src/metadata.ts
+/**
+* Customer metadata - set internal fields and extract typed fields.
+*/
+const customerMetadata = {
+	keys: {
+		userId: "userId",
+		organizationId: "organizationId",
+		customerType: "customerType"
+	},
+	set(internalFields, ...userMetadata) {
+		return defu(internalFields, ...userMetadata.filter(Boolean));
+	},
+	get(metadata) {
+		return {
+			userId: metadata?.userId,
+			organizationId: metadata?.organizationId,
+			customerType: metadata?.customerType
+		};
+	}
+};
+/**
+* Subscription/Checkout metadata - set internal fields and extract typed fields.
+*/
+const subscriptionMetadata = {
+	keys: {
+		userId: "userId",
+		subscriptionId: "subscriptionId",
+		referenceId: "referenceId"
+	},
+	set(internalFields, ...userMetadata) {
+		return defu(internalFields, ...userMetadata.filter(Boolean));
+	},
+	get(metadata) {
+		return {
+			userId: metadata?.userId,
+			subscriptionId: metadata?.subscriptionId,
+			referenceId: metadata?.referenceId
+		};
+	}
+};
+
+//#endregion
 //#region src/utils.ts
 async function getPlans(subscriptionOptions) {
 	if (subscriptionOptions?.enabled) return typeof subscriptionOptions.plans === "function" ? await subscriptionOptions.plans() : subscriptionOptions.plans;
 	throw new Error("Subscriptions are not enabled in the Stripe options.");
 }
-async function getPlanByPriceInfo(options, priceId, priceLookupKey) {
-	return await getPlans(options.subscription).then((res) => res?.find((plan) => plan.priceId === priceId || plan.annualDiscountPriceId === priceId || priceLookupKey && (plan.lookupKey === priceLookupKey || plan.annualDiscountLookupKey === priceLookupKey)));
-}
 async function getPlanByName(options, name) {
 	return await getPlans(options.subscription).then((res) => res?.find((plan) => plan.name.toLowerCase() === name.toLowerCase()));
 }
@@ -46,6 +86,40 @@ function isStripePendingCancel(stripeSub) {
 function escapeStripeSearchValue(value) {
 	return value.replace(/"/g, "\\\"");
 }
+/**
+* Resolve the quantity for a subscription by checking the seat item first,
+* then falling back to the plan item's quantity.
+*/
+function resolveQuantity(items, planItem, seatPriceId) {
+	if (seatPriceId) {
+		const seatItem = items.find((item) => item.price.id === seatPriceId);
+		if (seatItem) return seatItem.quantity ?? 1;
+	}
+	return planItem.quantity ?? 1;
+}
+/**
+* Resolve the plan-matching subscription item and its plan config
+* from a (possibly multi-item) Stripe subscription.
+*
+* - Iterates items to find one whose price matches a configured plan.
+* - For single-item subscriptions, returns the item even without a plan match.
+*/
+async function resolvePlanItem(options, items) {
+	const first = items[0];
+	if (!first) return void 0;
+	const plans = await getPlans(options.subscription);
+	for (const item of items) {
+		const plan = plans?.find((p) => p.priceId === item.price.id || p.annualDiscountPriceId === item.price.id || item.price.lookup_key && (p.lookupKey === item.price.lookup_key || p.annualDiscountLookupKey === item.price.lookup_key));
+		if (plan) return {
+			item,
+			plan
+		};
+	}
+	return items.length === 1 ? {
+		item: first,
+		plan: void 0
+	} : void 0;
+}
 
 //#endregion
 //#region src/hooks.ts
@@ -67,16 +141,16 @@ async function findReferenceByStripeCustomerId(ctx, options, stripeCustomerId) {
 			referenceId: org.id
 		};
 	}
-	const user$1 = await ctx.context.adapter.findOne({
+	const user = await ctx.context.adapter.findOne({
 		model: "user",
 		where: [{
 			field: "stripeCustomerId",
 			value: stripeCustomerId
 		}]
 	});
-	if (user$1) return {
+	if (user) return {
 		customerType: "user",
-		referenceId: user$1.id
+		referenceId: user.id
 	};
 	return null;
 }
@@ -86,18 +160,17 @@ async function onCheckoutSessionCompleted(ctx, options, event) {
 		const checkoutSession = event.data.object;
 		if (checkoutSession.mode === "setup" || !options.subscription?.enabled) return;
 		const subscription = await client.subscriptions.retrieve(checkoutSession.subscription);
-		const subscriptionItem = subscription.items.data[0];
-		if (!subscriptionItem) {
-			ctx.context.logger.warn(`Stripe webhook warning: Subscription ${subscription.id} has no items`);
+		const resolved = await resolvePlanItem(options, subscription.items.data);
+		if (!resolved) {
+			ctx.context.logger.warn(`Stripe webhook warning: Subscription ${subscription.id} has no items matching a configured plan`);
 			return;
 		}
-		const priceId = subscriptionItem.price.id;
-		const priceLookupKey = subscriptionItem.price.lookup_key;
-		const plan = await getPlanByPriceInfo(options, priceId, priceLookupKey);
+		const { item: subscriptionItem, plan } = resolved;
 		if (plan) {
-			const referenceId = checkoutSession?.client_reference_id || checkoutSession?.metadata?.referenceId;
-			const subscriptionId = checkoutSession?.metadata?.subscriptionId;
-			const seats = subscriptionItem.quantity;
+			const checkoutMeta = subscriptionMetadata.get(checkoutSession?.metadata);
+			const referenceId = checkoutSession?.client_reference_id || checkoutMeta.referenceId;
+			const { subscriptionId } = checkoutMeta;
+			const seats = resolveQuantity(subscription.items.data, subscriptionItem, plan.seatPriceId);
 			if (referenceId && subscriptionId) {
 				const trial = subscription.trial_start && subscription.trial_end ? {
 					trialStart: /* @__PURE__ */ new Date(subscription.trial_start * 1e3),
@@ -106,6 +179,7 @@ async function onCheckoutSessionCompleted(ctx, options, event) {
 				let dbSubscription = await ctx.context.adapter.update({
 					model: "subscription",
 					update: {
+						...trial,
 						plan: plan.name.toLowerCase(),
 						status: subscription.status,
 						updatedAt: /* @__PURE__ */ new Date(),
@@ -117,7 +191,7 @@ async function onCheckoutSessionCompleted(ctx, options, event) {
 						canceledAt: subscription.canceled_at ? /* @__PURE__ */ new Date(subscription.canceled_at * 1e3) : null,
 						endedAt: subscription.ended_at ? /* @__PURE__ */ new Date(subscription.ended_at * 1e3) : null,
 						seats,
-						...trial
+						billingInterval: subscriptionItem.price.recurring?.interval
 					},
 					where: [{
 						field: "id",
@@ -154,7 +228,7 @@ async function onSubscriptionCreated(ctx, options, event) {
 			ctx.context.logger.warn(`Stripe webhook warning: customer.subscription.created event received without customer ID`);
 			return;
 		}
-		const subscriptionId = subscriptionCreated.metadata?.subscriptionId;
+		const { subscriptionId } = subscriptionMetadata.get(subscriptionCreated.metadata);
 		const existingSubscription = await ctx.context.adapter.findOne({
 			model: "subscription",
 			where: subscriptionId ? [{
@@ -175,18 +249,17 @@ async function onSubscriptionCreated(ctx, options, event) {
 			return;
 		}
 		const { referenceId, customerType } = reference;
-		const subscriptionItem = subscriptionCreated.items.data[0];
-		if (!subscriptionItem) {
-			ctx.context.logger.warn(`Stripe webhook warning: Subscription ${subscriptionCreated.id} has no items`);
+		const resolved = await resolvePlanItem(options, subscriptionCreated.items.data);
+		if (!resolved) {
+			ctx.context.logger.warn(`Stripe webhook warning: Subscription ${subscriptionCreated.id} has no items matching a configured plan`);
 			return;
 		}
-		const priceId = subscriptionItem.price.id;
-		const plan = await getPlanByPriceInfo(options, priceId, subscriptionItem.price.lookup_key || null);
+		const { item: subscriptionItem, plan } = resolved;
 		if (!plan) {
-			ctx.context.logger.warn(`Stripe webhook warning: No matching plan found for priceId: ${priceId}`);
+			ctx.context.logger.warn(`Stripe webhook warning: No matching plan found for priceId: ${subscriptionItem.price.id}`);
 			return;
 		}
-		const seats = subscriptionItem.quantity;
+		const seats = resolveQuantity(subscriptionCreated.items.data, subscriptionItem, plan.seatPriceId);
 		const periodStart = /* @__PURE__ */ new Date(subscriptionItem.current_period_start * 1e3);
 		const periodEnd = /* @__PURE__ */ new Date(subscriptionItem.current_period_end * 1e3);
 		const trial = subscriptionCreated.trial_start && subscriptionCreated.trial_end ? {
@@ -196,6 +269,8 @@ async function onSubscriptionCreated(ctx, options, event) {
 		const newSubscription = await ctx.context.adapter.create({
 			model: "subscription",
 			data: {
+				...trial,
+				...plan.limits ? { limits: plan.limits } : {},
 				referenceId,
 				stripeCustomerId,
 				stripeSubscriptionId: subscriptionCreated.id,
@@ -204,8 +279,7 @@ async function onSubscriptionCreated(ctx, options, event) {
 				periodStart,
 				periodEnd,
 				seats,
-				...plan.limits ? { limits: plan.limits } : {},
-				...trial
+				billingInterval: subscriptionItem.price.recurring?.interval
 			}
 		});
 		ctx.context.logger.info(`Stripe webhook: Created subscription ${subscriptionCreated.id} for ${customerType} ${referenceId} from dashboard`);
@@ -223,15 +297,13 @@ async function onSubscriptionUpdated(ctx, options, event) {
 	try {
 		if (!options.subscription?.enabled) return;
 		const subscriptionUpdated = event.data.object;
-		const subscriptionItem = subscriptionUpdated.items.data[0];
-		if (!subscriptionItem) {
-			ctx.context.logger.warn(`Stripe webhook warning: Subscription ${subscriptionUpdated.id} has no items`);
+		const resolved = await resolvePlanItem(options, subscriptionUpdated.items.data);
+		if (!resolved) {
+			ctx.context.logger.warn(`Stripe webhook warning: Subscription ${subscriptionUpdated.id} has no items matching a configured plan`);
 			return;
 		}
-		const priceId = subscriptionItem.price.id;
-		const priceLookupKey = subscriptionItem.price.lookup_key;
-		const plan = await getPlanByPriceInfo(options, priceId, priceLookupKey);
-		const subscriptionId = subscriptionUpdated.metadata?.subscriptionId;
+		const { item: subscriptionItem, plan } = resolved;
+		const { subscriptionId } = subscriptionMetadata.get(subscriptionUpdated.metadata);
 		const customerId = subscriptionUpdated.customer?.toString();
 		let subscription = await ctx.context.adapter.findOne({
 			model: "subscription",
@@ -260,9 +332,15 @@ async function onSubscriptionUpdated(ctx, options, event) {
 				subscription = activeSub;
 			} else subscription = subs[0];
 		}
+		const seats = plan ? resolveQuantity(subscriptionUpdated.items.data, subscriptionItem, plan.seatPriceId) : subscriptionItem.quantity;
+		const trial = subscriptionUpdated.trial_start && subscriptionUpdated.trial_end ? {
+			trialStart: /* @__PURE__ */ new Date(subscriptionUpdated.trial_start * 1e3),
+			trialEnd: /* @__PURE__ */ new Date(subscriptionUpdated.trial_end * 1e3)
+		} : {};
 		const updatedSubscription = await ctx.context.adapter.update({
 			model: "subscription",
 			update: {
+				...trial,
 				...plan ? {
 					plan: plan.name.toLowerCase(),
 					limits: plan.limits
@@ -275,8 +353,10 @@ async function onSubscriptionUpdated(ctx, options, event) {
 				cancelAt: subscriptionUpdated.cancel_at ? /* @__PURE__ */ new Date(subscriptionUpdated.cancel_at * 1e3) : null,
 				canceledAt: subscriptionUpdated.canceled_at ? /* @__PURE__ */ new Date(subscriptionUpdated.canceled_at * 1e3) : null,
 				endedAt: subscriptionUpdated.ended_at ? /* @__PURE__ */ new Date(subscriptionUpdated.ended_at * 1e3) : null,
-				seats: subscriptionItem.quantity,
-				stripeSubscriptionId: subscriptionUpdated.id
+				seats,
+				stripeSubscriptionId: subscriptionUpdated.id,
+				billingInterval: subscriptionItem.price.recurring?.interval,
+				stripeScheduleId: subscriptionUpdated.schedule ? typeof subscriptionUpdated.schedule === "string" ? subscriptionUpdated.schedule : subscriptionUpdated.schedule.id : null
 			},
 			where: [{
 				field: "id",
@@ -314,6 +394,10 @@ async function onSubscriptionDeleted(ctx, options, event) {
 			}]
 		});
 		if (subscription) {
+			const trial = subscriptionDeleted.trial_start && subscriptionDeleted.trial_end ? {
+				trialStart: /* @__PURE__ */ new Date(subscriptionDeleted.trial_start * 1e3),
+				trialEnd: /* @__PURE__ */ new Date(subscriptionDeleted.trial_end * 1e3)
+			} : {};
 			await ctx.context.adapter.update({
 				model: "subscription",
 				where: [{
@@ -321,12 +405,14 @@ async function onSubscriptionDeleted(ctx, options, event) {
 					value: subscription.id
 				}],
 				update: {
+					...trial,
 					status: "canceled",
 					updatedAt: /* @__PURE__ */ new Date(),
 					cancelAtPeriodEnd: subscriptionDeleted.cancel_at_period_end,
 					cancelAt: subscriptionDeleted.cancel_at ? /* @__PURE__ */ new Date(subscriptionDeleted.cancel_at * 1e3) : null,
 					canceledAt: subscriptionDeleted.canceled_at ? /* @__PURE__ */ new Date(subscriptionDeleted.canceled_at * 1e3) : null,
-					endedAt: subscriptionDeleted.ended_at ? /* @__PURE__ */ new Date(subscriptionDeleted.ended_at * 1e3) : null
+					endedAt: subscriptionDeleted.ended_at ? /* @__PURE__ */ new Date(subscriptionDeleted.ended_at * 1e3) : null,
+					stripeScheduleId: null
 				}
 			});
 			await options.subscription.onSubscriptionDeleted?.({
@@ -353,7 +439,7 @@ const referenceMiddleware = (subscriptionOptions, action) => createAuthMiddlewar
 	if (customerType === "organization") {
 		if (!subscriptionOptions.authorizeReference) {
 			ctx.context.logger.error(`Organization subscriptions require authorizeReference to be defined in your stripe plugin config.`);
-			throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.ORGANIZATION_SUBSCRIPTION_NOT_ENABLED);
+			throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.AUTHORIZE_REFERENCE_REQUIRED);
 		}
 		const referenceId = explicitReferenceId || ctxSession.session.activeOrganizationId;
 		if (!referenceId) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.ORGANIZATION_REFERENCE_ID_REQUIRED);
@@ -408,13 +494,13 @@ async function resolvePriceIdFromLookupKey(stripeClient, lookupKey) {
 * @internal
 */
 function getReferenceId(ctxSession, customerType, options) {
-	const { user: user$1, session } = ctxSession;
+	const { user, session } = ctxSession;
 	if ((customerType || "user") === "organization") {
 		if (!options.organization?.enabled) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.ORGANIZATION_SUBSCRIPTION_NOT_ENABLED);
 		if (!session.activeOrganizationId) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.ORGANIZATION_NOT_FOUND);
 		return session.activeOrganizationId;
 	}
-	return user$1.id;
+	return user.id;
 }
 const upgradeSubscriptionBodySchema = z.object({
 	plan: z.string().meta({ description: "The name of the plan to upgrade to. Eg: \"pro\"" }),
@@ -430,6 +516,7 @@ const upgradeSubscriptionBodySchema = z.object({
 	successUrl: z.string().meta({ description: "Callback URL to redirect back after successful subscription. Eg: \"https://example.com/success\"" }).default("/"),
 	cancelUrl: z.string().meta({ description: "If set, checkout shows a back button and customers will be directed here if they cancel payment. Eg: \"https://example.com/pricing\"" }).default("/"),
 	returnUrl: z.string().meta({ description: "URL to take customers to when they click on the billing portal’s link to return to your website. Eg: \"https://example.com/dashboard\"" }).optional(),
+	scheduleAtPeriodEnd: z.boolean().meta({ description: "Schedule the plan change at the end of the current billing period instead of applying immediately." }).default(false),
 	disableRedirect: z.boolean().meta({ description: "Disable redirect after successful subscription. Eg: true" }).default(false)
 });
 /**
@@ -462,27 +549,21 @@ const upgradeSubscription = (options) => {
 			})
 		]
 	}, async (ctx) => {
-		const { user: user$1, session } = ctx.context.session;
+		const { user, session } = ctx.context.session;
 		const customerType = ctx.body.customerType || "user";
 		const referenceId = ctx.body.referenceId || getReferenceId(ctx.context.session, customerType, options);
-		if (!user$1.emailVerified && subscriptionOptions.requireEmailVerification) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.EMAIL_VERIFICATION_REQUIRED);
+		if (!user.emailVerified && subscriptionOptions.requireEmailVerification) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.EMAIL_VERIFICATION_REQUIRED);
 		const plan = await getPlanByName(options, ctx.body.plan);
 		if (!plan) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_PLAN_NOT_FOUND);
-		let subscriptionToUpdate = ctx.body.subscriptionId ? await ctx.context.adapter.findOne({
+		const subscriptionToUpdate = ctx.body.subscriptionId ? await ctx.context.adapter.findOne({
 			model: "subscription",
 			where: [{
 				field: "stripeSubscriptionId",
 				value: ctx.body.subscriptionId
 			}]
-		}) : referenceId ? await ctx.context.adapter.findOne({
-			model: "subscription",
-			where: [{
-				field: "referenceId",
-				value: referenceId
-			}]
 		}) : null;
-		if (ctx.body.subscriptionId && subscriptionToUpdate && subscriptionToUpdate.referenceId !== referenceId) subscriptionToUpdate = null;
 		if (ctx.body.subscriptionId && !subscriptionToUpdate) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
+		if (ctx.body.subscriptionId && subscriptionToUpdate && subscriptionToUpdate.referenceId !== referenceId) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
 		let customerId;
 		if (customerType === "organization") {
 			customerId = subscriptionToUpdate?.stripeCustomerId;
@@ -497,20 +578,28 @@ const upgradeSubscription = (options) => {
 				if (!org) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.ORGANIZATION_NOT_FOUND);
 				customerId = org.stripeCustomerId;
 				if (!customerId) try {
-					let stripeCustomer = (await client.customers.search({
-						query: `metadata["organizationId"]:"${org.id}"`,
-						limit: 1
-					})).data[0];
+					let stripeCustomer;
+					try {
+						stripeCustomer = (await client.customers.search({
+							query: `metadata["${customerMetadata.keys.organizationId}"]:"${org.id}"`,
+							limit: 1
+						})).data[0];
+					} catch {
+						ctx.context.logger.warn("Stripe customers.search failed, falling back to customers.list");
+						for await (const customer of client.customers.list({ limit: 100 })) if (customer.metadata?.[customerMetadata.keys.organizationId] === org.id) {
+							stripeCustomer = customer;
+							break;
+						}
+					}
 					if (!stripeCustomer) {
 						let extraCreateParams = {};
 						if (options.organization?.getCustomerCreateParams) extraCreateParams = await options.organization.getCustomerCreateParams(org, ctx);
 						const customerParams = defu({
 							name: org.name,
-							metadata: {
-								...ctx.body.metadata,
+							metadata: customerMetadata.set({
 								organizationId: org.id,
 								customerType: "organization"
-							}
+							}, ctx.body.metadata)
 						}, extraCreateParams);
 						stripeCustomer = await client.customers.create(customerParams);
 						await options.organization?.onCustomerCreate?.({
@@ -536,27 +625,38 @@ const upgradeSubscription = (options) => {
 				}
 			}
 		} else {
-			customerId = subscriptionToUpdate?.stripeCustomerId || user$1.stripeCustomerId;
+			customerId = subscriptionToUpdate?.stripeCustomerId || user.stripeCustomerId;
 			if (!customerId) try {
-				let stripeCustomer = (await client.customers.search({
-					query: `email:"${escapeStripeSearchValue(user$1.email)}" AND -metadata["customerType"]:"organization"`,
-					limit: 1
-				})).data[0];
+				let stripeCustomer;
+				try {
+					stripeCustomer = (await client.customers.search({
+						query: `email:"${escapeStripeSearchValue(user.email)}" AND -metadata["${customerMetadata.keys.customerType}"]:"organization"`,
+						limit: 1
+					})).data[0];
+				} catch {
+					ctx.context.logger.warn("Stripe customers.search failed, falling back to customers.list");
+					for await (const customer of client.customers.list({
+						email: user.email,
+						limit: 100
+					})) if (customer.metadata?.[customerMetadata.keys.customerType] !== "organization") {
+						stripeCustomer = customer;
+						break;
+					}
+				}
 				if (!stripeCustomer) stripeCustomer = await client.customers.create({
-					email: user$1.email,
-					name: user$1.name,
-					metadata: {
-						...ctx.body.metadata,
-						userId: user$1.id,
+					email: user.email,
+					name: user.name,
+					metadata: customerMetadata.set({
+						userId: user.id,
 						customerType: "user"
-					}
+					}, ctx.body.metadata)
 				});
 				await ctx.context.adapter.update({
 					model: "user",
 					update: { stripeCustomerId: stripeCustomer.id },
 					where: [{
 						field: "id",
-						value: user$1.id
+						value: user.id
 					}]
 				});
 				customerId = stripeCustomer.id;
@@ -565,21 +665,42 @@ const upgradeSubscription = (options) => {
 				throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.UNABLE_TO_CREATE_CUSTOMER);
 			}
 		}
-		const subscriptions$1 = subscriptionToUpdate ? [subscriptionToUpdate] : await ctx.context.adapter.findMany({
+		const subscriptions = subscriptionToUpdate ? [subscriptionToUpdate] : await ctx.context.adapter.findMany({
 			model: "subscription",
 			where: [{
 				field: "referenceId",
 				value: referenceId
 			}]
 		});
-		const activeOrTrialingSubscription = subscriptions$1.find((sub) => isActiveOrTrialing(sub));
+		const activeOrTrialingSubscription = subscriptions.find((sub) => isActiveOrTrialing(sub));
 		const activeSubscription = (await client.subscriptions.list({ customer: customerId }).then((res) => res.data.filter((sub) => isActiveOrTrialing(sub)))).find((sub) => {
 			if (subscriptionToUpdate?.stripeSubscriptionId || ctx.body.subscriptionId) return sub.id === subscriptionToUpdate?.stripeSubscriptionId || sub.id === ctx.body.subscriptionId;
 			if (activeOrTrialingSubscription?.stripeSubscriptionId) return sub.id === activeOrTrialingSubscription.stripeSubscriptionId;
 			return false;
 		});
-		const incompleteSubscription = subscriptions$1.find((sub) => sub.status === "incomplete");
-		if (activeOrTrialingSubscription && activeOrTrialingSubscription.status === "active" && activeOrTrialingSubscription.plan === ctx.body.plan && activeOrTrialingSubscription.seats === (ctx.body.seats || 1)) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN);
+		const planItem = (activeSubscription ? await resolvePlanItem(options, activeSubscription.items.data) : void 0)?.item;
+		const stripeSubscriptionPriceId = planItem?.price.id;
+		const incompleteSubscription = subscriptions.find((sub) => sub.status === "incomplete");
+		const priceId = ctx.body.annual ? plan.annualDiscountPriceId : plan.priceId;
+		const lookupKey = ctx.body.annual ? plan.annualDiscountLookupKey : plan.lookupKey;
+		const resolvedPriceId = lookupKey ? await resolvePriceIdFromLookupKey(client, lookupKey) : void 0;
+		const priceIdToUse = priceId || resolvedPriceId;
+		if (!priceIdToUse) throw ctx.error("BAD_REQUEST", { message: "Price ID not found for the selected plan" });
+		const isAutoManagedSeats = !!(plan.seatPriceId && customerType === "organization");
+		let memberCount = 0;
+		if (isAutoManagedSeats) memberCount = await ctx.context.adapter.count({
+			model: "member",
+			where: [{
+				field: "organizationId",
+				value: referenceId
+			}]
+		});
+		const isSamePlan = activeOrTrialingSubscription?.plan === ctx.body.plan;
+		const isSameSeats = isAutoManagedSeats ? true : activeOrTrialingSubscription?.seats === (ctx.body.seats || 1);
+		const isSamePriceId = stripeSubscriptionPriceId === priceIdToUse;
+		const isSubscriptionStillValid = !activeOrTrialingSubscription?.periodEnd || activeOrTrialingSubscription.periodEnd > /* @__PURE__ */ new Date();
+		const isSeatOnlyPlan = isAutoManagedSeats && plan.seatPriceId === plan.priceId;
+		if (activeOrTrialingSubscription?.status === "active" && isSamePlan && isSameSeats && isSamePriceId && isSubscriptionStillValid) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.ALREADY_SUBSCRIBED_PLAN);
 		if (activeSubscription && customerId) {
 			let dbSubscription = await ctx.context.adapter.findOne({
 				model: "subscription",
@@ -602,16 +723,173 @@ const upgradeSubscription = (options) => {
 				});
 				dbSubscription = activeOrTrialingSubscription;
 			}
-			let priceIdToUse$1 = void 0;
-			if (ctx.body.annual) {
-				priceIdToUse$1 = plan.annualDiscountPriceId;
-				if (!priceIdToUse$1 && plan.annualDiscountLookupKey) priceIdToUse$1 = await resolvePriceIdFromLookupKey(client, plan.annualDiscountLookupKey);
-			} else {
-				priceIdToUse$1 = plan.priceId;
-				if (!priceIdToUse$1 && plan.lookupKey) priceIdToUse$1 = await resolvePriceIdFromLookupKey(client, plan.lookupKey);
+			if (!planItem) throw APIError$1.from("NOT_FOUND", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
+			if (activeSubscription.schedule) {
+				const { data: existingSchedules } = await client.subscriptionSchedules.list({ customer: customerId });
+				const existingSchedule = existingSchedules.find((s) => (typeof s.subscription === "string" ? s.subscription : s.subscription?.id) === activeSubscription.id && s.status === "active");
+				if (existingSchedule && existingSchedule.metadata?.source === "@better-auth/stripe") {
+					await client.subscriptionSchedules.release(existingSchedule.id);
+					if (dbSubscription) await ctx.context.adapter.update({
+						model: "subscription",
+						update: {
+							stripeScheduleId: null,
+							updatedAt: /* @__PURE__ */ new Date()
+						},
+						where: [{
+							field: "id",
+							value: dbSubscription.id
+						}]
+					});
+				}
+			}
+			const oldPlan = activeOrTrialingSubscription ? await getPlanByName(options, activeOrTrialingSubscription.plan) : void 0;
+			const priceMap = /* @__PURE__ */ new Map();
+			if (isAutoManagedSeats && plan.seatPriceId) {
+				if (oldPlan?.seatPriceId && oldPlan.seatPriceId !== plan.seatPriceId) priceMap.set(oldPlan.seatPriceId, {
+					newPrice: plan.seatPriceId,
+					quantity: memberCount
+				});
 			}
-			if (!priceIdToUse$1) throw ctx.error("BAD_REQUEST", { message: "Price ID not found for the selected plan" });
-			const { url } = await client.billingPortal.sessions.create({
+			const lineItemDelta = /* @__PURE__ */ new Map();
+			for (const li of oldPlan?.lineItems ?? []) if (typeof li.price === "string") lineItemDelta.set(li.price, (lineItemDelta.get(li.price) ?? 0) - 1);
+			for (const li of plan.lineItems ?? []) if (typeof li.price === "string") lineItemDelta.set(li.price, (lineItemDelta.get(li.price) ?? 0) + 1);
+			for (const [price, delta] of lineItemDelta) if (delta === 0) lineItemDelta.delete(price);
+			let upgradeUrl;
+			if (ctx.body.scheduleAtPeriodEnd) {
+				const schedule = await client.subscriptionSchedules.create({ from_subscription: activeSubscription.id }).catch(async (e) => {
+					throw ctx.error("BAD_REQUEST", {
+						message: e.message,
+						code: e.code
+					});
+				});
+				const currentPhase = schedule.phases[0];
+				if (!currentPhase) throw ctx.error("BAD_REQUEST", { message: "Subscription schedule has no phases" });
+				const removeQuota = /* @__PURE__ */ new Map();
+				for (const [p, d] of lineItemDelta) if (d < 0) removeQuota.set(p, -d);
+				const newPhaseItems = [];
+				for (const item of currentPhase.items) {
+					const itemPriceId = typeof item.price === "string" ? item.price : item.price.id;
+					const quota = removeQuota.get(itemPriceId) ?? 0;
+					if (quota > 0) {
+						removeQuota.set(itemPriceId, quota - 1);
+						continue;
+					}
+					const replacement = priceMap.get(itemPriceId);
+					if (replacement) {
+						newPhaseItems.push({
+							price: replacement.newPrice,
+							quantity: replacement.quantity ?? item.quantity
+						});
+						continue;
+					}
+					if (itemPriceId === stripeSubscriptionPriceId) {
+						newPhaseItems.push({
+							price: priceIdToUse,
+							quantity: isAutoManagedSeats ? 1 : ctx.body.seats || 1
+						});
+						continue;
+					}
+					newPhaseItems.push({
+						price: itemPriceId,
+						quantity: item.quantity
+					});
+					const d = lineItemDelta.get(itemPriceId);
+					if (d !== void 0 && d > 0) if (d === 1) lineItemDelta.delete(itemPriceId);
+					else lineItemDelta.set(itemPriceId, d - 1);
+				}
+				for (const [price, delta] of lineItemDelta) for (let i = 0; i < delta; i++) newPhaseItems.push({ price });
+				await client.subscriptionSchedules.update(schedule.id, {
+					metadata: { source: "@better-auth/stripe" },
+					end_behavior: "release",
+					phases: [{
+						items: currentPhase.items.map((item) => ({
+							price: typeof item.price === "string" ? item.price : item.price.id,
+							quantity: item.quantity
+						})),
+						start_date: currentPhase.start_date,
+						end_date: currentPhase.end_date
+					}, {
+						items: newPhaseItems,
+						start_date: currentPhase.end_date,
+						proration_behavior: "none"
+					}]
+				}).catch(async (e) => {
+					throw ctx.error("BAD_REQUEST", {
+						message: e.message,
+						code: e.code
+					});
+				});
+				if (dbSubscription) await ctx.context.adapter.update({
+					model: "subscription",
+					update: {
+						stripeScheduleId: schedule.id,
+						updatedAt: /* @__PURE__ */ new Date()
+					},
+					where: [{
+						field: "id",
+						value: dbSubscription.id
+					}]
+				});
+				upgradeUrl = getUrl(ctx, ctx.body.returnUrl || "/");
+			} else if (priceMap.size > 0 || lineItemDelta.size > 0) {
+				const removeQuota = /* @__PURE__ */ new Map();
+				for (const [p, d] of lineItemDelta) if (d < 0) removeQuota.set(p, -d);
+				const itemUpdates = [];
+				for (const si of activeSubscription.items.data) {
+					const quota = removeQuota.get(si.price.id) ?? 0;
+					if (quota > 0) {
+						removeQuota.set(si.price.id, quota - 1);
+						itemUpdates.push({
+							id: si.id,
+							deleted: true
+						});
+						continue;
+					}
+					const replacement = priceMap.get(si.price.id);
+					if (replacement) {
+						itemUpdates.push({
+							id: si.id,
+							price: replacement.newPrice,
+							quantity: replacement.quantity
+						});
+						continue;
+					}
+					if (si.price.id === stripeSubscriptionPriceId) {
+						itemUpdates.push({
+							id: si.id,
+							price: priceIdToUse,
+							quantity: isAutoManagedSeats ? 1 : ctx.body.seats || 1
+						});
+						continue;
+					}
+					const d = lineItemDelta.get(si.price.id);
+					if (d !== void 0 && d > 0) if (d === 1) lineItemDelta.delete(si.price.id);
+					else lineItemDelta.set(si.price.id, d - 1);
+				}
+				for (const [price, delta] of lineItemDelta) for (let i = 0; i < delta; i++) itemUpdates.push({ price });
+				await client.subscriptions.update(activeSubscription.id, {
+					items: itemUpdates,
+					proration_behavior: "create_prorations"
+				}).catch(async (e) => {
+					throw ctx.error("BAD_REQUEST", {
+						message: e.message,
+						code: e.code
+					});
+				});
+				if (dbSubscription) await ctx.context.adapter.update({
+					model: "subscription",
+					update: {
+						plan: plan.name.toLowerCase(),
+						seats: memberCount,
+						updatedAt: /* @__PURE__ */ new Date()
+					},
+					where: [{
+						field: "id",
+						value: dbSubscription.id
+					}]
+				});
+				upgradeUrl = getUrl(ctx, ctx.body.returnUrl || "/");
+			} else ({url: upgradeUrl} = await client.billingPortal.sessions.create({
 				customer: customerId,
 				return_url: getUrl(ctx, ctx.body.returnUrl || "/"),
 				flow_data: {
@@ -623,9 +901,9 @@ const upgradeSubscription = (options) => {
 					subscription_update_confirm: {
 						subscription: activeSubscription.id,
 						items: [{
-							id: activeSubscription.items.data[0]?.id,
-							quantity: ctx.body.seats || 1,
-							price: priceIdToUse$1
+							id: planItem.id,
+							price: priceIdToUse,
+							...isAutoManagedSeats ? {} : { quantity: ctx.body.seats || 1 }
 						}]
 					}
 				}
@@ -634,9 +912,9 @@ const upgradeSubscription = (options) => {
 					message: e.message,
 					code: e.code
 				});
-			});
+			}));
 			return ctx.json({
-				url,
+				url: upgradeUrl,
 				redirect: !ctx.body.disableRedirect
 			});
 		}
@@ -645,7 +923,7 @@ const upgradeSubscription = (options) => {
 			model: "subscription",
 			update: {
 				plan: plan.name.toLowerCase(),
-				seats: ctx.body.seats || 1,
+				seats: isAutoManagedSeats ? memberCount : ctx.body.seats || 1,
 				updatedAt: /* @__PURE__ */ new Date()
 			},
 			where: [{
@@ -660,7 +938,7 @@ const upgradeSubscription = (options) => {
 				stripeCustomerId: customerId,
 				status: "incomplete",
 				referenceId,
-				seats: ctx.body.seats || 1
+				seats: isAutoManagedSeats ? memberCount : ctx.body.seats || 1
 			}
 		});
 		if (!subscription) {
@@ -668,7 +946,7 @@ const upgradeSubscription = (options) => {
 			throw APIError$1.from("NOT_FOUND", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
 		}
 		const params = await subscriptionOptions.getCheckoutSessionParams?.({
-			user: user$1,
+			user,
 			session,
 			plan,
 			subscription
@@ -682,14 +960,6 @@ const upgradeSubscription = (options) => {
 		})).some((s) => {
 			return !!(s.trialStart || s.trialEnd) || s.status === "trialing";
 		}) && plan.freeTrial ? { trial_period_days: plan.freeTrial.days } : void 0;
-		let priceIdToUse = void 0;
-		if (ctx.body.annual) {
-			priceIdToUse = plan.annualDiscountPriceId;
-			if (!priceIdToUse && plan.annualDiscountLookupKey) priceIdToUse = await resolvePriceIdFromLookupKey(client, plan.annualDiscountLookupKey);
-		} else {
-			priceIdToUse = plan.priceId;
-			if (!priceIdToUse && plan.lookupKey) priceIdToUse = await resolvePriceIdFromLookupKey(client, plan.lookupKey);
-		}
 		const checkoutSession = await client.checkout.sessions.create({
 			...customerId ? {
 				customer: customerId,
@@ -697,34 +967,37 @@ const upgradeSubscription = (options) => {
 					name: "auto",
 					address: "auto"
 				}
-			} : { customer_email: user$1.email },
+			} : { customer_email: user.email },
 			locale: ctx.body.locale,
-			success_url: getUrl(ctx, `${ctx.context.baseURL}/subscription/success?callbackURL=${encodeURIComponent(ctx.body.successUrl)}&subscriptionId=${encodeURIComponent(subscription.id)}`),
+			success_url: getUrl(ctx, `${ctx.context.baseURL}/subscription/success?callbackURL=${encodeURIComponent(ctx.body.successUrl)}&checkoutSessionId={CHECKOUT_SESSION_ID}`),
 			cancel_url: getUrl(ctx, ctx.body.cancelUrl),
-			line_items: [{
-				price: priceIdToUse,
-				quantity: ctx.body.seats || 1
-			}],
+			line_items: [
+				...!isSeatOnlyPlan ? [{
+					price: priceIdToUse,
+					quantity: isAutoManagedSeats ? 1 : ctx.body.seats || 1
+				}] : [],
+				...isAutoManagedSeats ? [{
+					price: plan.seatPriceId,
+					quantity: memberCount
+				}] : [],
+				...plan.lineItems ?? []
+			],
 			subscription_data: {
 				...freeTrial,
-				metadata: {
-					...ctx.body.metadata,
-					...params?.params?.subscription_data?.metadata,
-					userId: user$1.id,
+				metadata: subscriptionMetadata.set({
+					userId: user.id,
 					subscriptionId: subscription.id,
 					referenceId
-				}
+				}, ctx.body.metadata, params?.params?.subscription_data?.metadata)
 			},
 			mode: "subscription",
 			client_reference_id: referenceId,
 			...params?.params,
-			metadata: {
-				...ctx.body.metadata,
-				...params?.params?.metadata,
-				userId: user$1.id,
+			metadata: subscriptionMetadata.set({
+				userId: user.id,
 				subscriptionId: subscription.id,
 				referenceId
-			}
+			}, ctx.body.metadata, params?.params?.metadata)
 		}, params?.options).catch(async (e) => {
 			throw ctx.error("BAD_REQUEST", {
 				message: e.message,
@@ -737,61 +1010,6 @@ const upgradeSubscription = (options) => {
 		});
 	});
 };
-const cancelSubscriptionCallbackQuerySchema = z.record(z.string(), z.any()).optional();
-const cancelSubscriptionCallback = (options) => {
-	const client = options.stripeClient;
-	const subscriptionOptions = options.subscription;
-	return createAuthEndpoint("/subscription/cancel/callback", {
-		method: "GET",
-		query: cancelSubscriptionCallbackQuerySchema,
-		metadata: { openapi: { operationId: "cancelSubscriptionCallback" } },
-		use: [originCheck((ctx) => ctx.query.callbackURL)]
-	}, async (ctx) => {
-		if (!ctx.query || !ctx.query.callbackURL || !ctx.query.subscriptionId) throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
-		const session = await getSessionFromCtx(ctx);
-		if (!session) throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
-		const { user: user$1 } = session;
-		const { callbackURL, subscriptionId } = ctx.query;
-		if (user$1?.stripeCustomerId) try {
-			const subscription = await ctx.context.adapter.findOne({
-				model: "subscription",
-				where: [{
-					field: "id",
-					value: subscriptionId
-				}]
-			});
-			if (!subscription || subscription.status === "canceled" || isPendingCancel(subscription)) throw ctx.redirect(getUrl(ctx, callbackURL));
-			const currentSubscription = (await client.subscriptions.list({
-				customer: user$1.stripeCustomerId,
-				status: "active"
-			})).data.find((sub) => sub.id === subscription.stripeSubscriptionId);
-			if (currentSubscription && isStripePendingCancel(currentSubscription) && !isPendingCancel(subscription)) {
-				await ctx.context.adapter.update({
-					model: "subscription",
-					update: {
-						status: currentSubscription?.status,
-						cancelAtPeriodEnd: currentSubscription?.cancel_at_period_end || false,
-						cancelAt: currentSubscription?.cancel_at ? /* @__PURE__ */ new Date(currentSubscription.cancel_at * 1e3) : null,
-						canceledAt: currentSubscription?.canceled_at ? /* @__PURE__ */ new Date(currentSubscription.canceled_at * 1e3) : null
-					},
-					where: [{
-						field: "id",
-						value: subscription.id
-					}]
-				});
-				await subscriptionOptions.onSubscriptionCancel?.({
-					subscription,
-					cancellationDetails: currentSubscription.cancellation_details,
-					stripeSubscription: currentSubscription,
-					event: void 0
-				});
-			}
-		} catch (error) {
-			ctx.context.logger.error("Error checking subscription status from Stripe", error);
-		}
-		throw ctx.redirect(getUrl(ctx, callbackURL));
-	});
-};
 const cancelSubscriptionBodySchema = z.object({
 	referenceId: z.string().meta({ description: "Reference id of the subscription to cancel. Eg: '123'" }).optional(),
 	subscriptionId: z.string().meta({ description: "The Stripe subscription ID to cancel. Eg: 'sub_1ABC2DEF3GHI4JKL'" }).optional(),
@@ -863,7 +1081,7 @@ const cancelSubscription = (options) => {
 		if (!activeSubscription) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
 		const { url } = await client.billingPortal.sessions.create({
 			customer: subscription.stripeCustomerId,
-			return_url: getUrl(ctx, `${ctx.context.baseURL}/subscription/cancel/callback?callbackURL=${encodeURIComponent(ctx.body?.returnUrl || "/")}&subscriptionId=${encodeURIComponent(subscription.id)}`),
+			return_url: getUrl(ctx, ctx.body?.returnUrl || "/"),
 			flow_data: {
 				type: "subscription_cancel",
 				subscription_cancel: { subscription: activeSubscription.id }
@@ -933,7 +1151,36 @@ const restoreSubscription = (options) => {
 		if (ctx.body.subscriptionId && subscription && subscription.referenceId !== referenceId) subscription = void 0;
 		if (!subscription || !subscription.stripeCustomerId) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
 		if (!isActiveOrTrialing(subscription)) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_ACTIVE);
-		if (!isPendingCancel(subscription)) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_SCHEDULED_FOR_CANCELLATION);
+		const hasPendingCancel = isPendingCancel(subscription);
+		const { stripeScheduleId } = subscription;
+		if (!hasPendingCancel && !stripeScheduleId) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_PENDING_CHANGE);
+		if (stripeScheduleId) {
+			if (!subscription.stripeSubscriptionId) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
+			if ((await client.subscriptionSchedules.retrieve(stripeScheduleId).catch((e) => {
+				throw ctx.error("BAD_REQUEST", {
+					message: e.message,
+					code: e.code
+				});
+			})).status === "active") await client.subscriptionSchedules.release(stripeScheduleId).catch((e) => {
+				throw ctx.error("BAD_REQUEST", {
+					message: e.message,
+					code: e.code
+				});
+			});
+			await ctx.context.adapter.update({
+				model: "subscription",
+				update: {
+					stripeScheduleId: null,
+					updatedAt: /* @__PURE__ */ new Date()
+				},
+				where: [{
+					field: "id",
+					value: subscription.id
+				}]
+			});
+			const releasedSub = await client.subscriptions.retrieve(subscription.stripeSubscriptionId);
+			return ctx.json(releasedSub);
+		}
 		const activeSubscription = await client.subscriptions.list({ customer: subscription.stripeCustomerId }).then((res) => res.data.filter((sub) => isActiveOrTrialing(sub))[0]);
 		if (!activeSubscription) throw APIError$1.from("BAD_REQUEST", STRIPE_ERROR_CODES.SUBSCRIPTION_NOT_FOUND);
 		const updateParams = {};
@@ -990,17 +1237,17 @@ const listActiveSubscriptions = (options) => {
 	}, async (ctx) => {
 		const customerType = ctx.query?.customerType || "user";
 		const referenceId = ctx.query?.referenceId || getReferenceId(ctx.context.session, customerType, options);
-		const subscriptions$1 = await ctx.context.adapter.findMany({
+		const subscriptions = await ctx.context.adapter.findMany({
 			model: "subscription",
 			where: [{
 				field: "referenceId",
 				value: referenceId
 			}]
 		});
-		if (!subscriptions$1.length) return [];
+		if (!subscriptions.length) return [];
 		const plans = await getPlans(options.subscription);
 		if (!plans) return [];
-		const subs = subscriptions$1.map((sub) => {
+		const subs = subscriptions.map((sub) => {
 			const plan = plans.find((p) => p.name.toLowerCase() === sub.plan.toLowerCase());
 			return {
 				...sub,
@@ -1020,10 +1267,20 @@ const subscriptionSuccess = (options) => {
 		metadata: { openapi: { operationId: "handleSubscriptionSuccess" } },
 		use: [originCheck((ctx) => ctx.query.callbackURL)]
 	}, async (ctx) => {
-		if (!ctx.query || !ctx.query.callbackURL || !ctx.query.subscriptionId) throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
-		const { callbackURL, subscriptionId } = ctx.query;
+		const callbackURL = ctx.query?.callbackURL || "/";
 		const session = await getSessionFromCtx(ctx);
-		if (!session) throw ctx.redirect(getUrl(ctx, ctx.query?.callbackURL || "/"));
+		if (!session) throw ctx.redirect(getUrl(ctx, callbackURL));
+		if (!ctx.query?.checkoutSessionId) throw ctx.redirect(getUrl(ctx, callbackURL));
+		const checkoutSession = await client.checkout.sessions.retrieve(ctx.query.checkoutSessionId).catch((error) => {
+			ctx.context.logger.error("Error retrieving checkout session from Stripe", error);
+			return null;
+		});
+		if (!checkoutSession) throw ctx.redirect(getUrl(ctx, callbackURL));
+		const { subscriptionId } = subscriptionMetadata.get(checkoutSession.metadata);
+		if (!subscriptionId) {
+			ctx.context.logger.warn(`No subscriptionId in checkout session metadata: ${checkoutSession.id}`);
+			throw ctx.redirect(getUrl(ctx, callbackURL));
+		}
 		const subscription = await ctx.context.adapter.findOne({
 			model: "subscription",
 			where: [{
@@ -1046,32 +1303,34 @@ const subscriptionSuccess = (options) => {
 			throw ctx.redirect(getUrl(ctx, callbackURL));
 		});
 		if (!stripeSubscription) throw ctx.redirect(getUrl(ctx, callbackURL));
-		const subscriptionItem = stripeSubscription.items.data[0];
-		if (!subscriptionItem) {
+		const resolved = await resolvePlanItem(options, stripeSubscription.items.data);
+		if (!resolved) {
 			ctx.context.logger.warn(`No subscription items found for Stripe subscription ${stripeSubscription.id}`);
 			throw ctx.redirect(getUrl(ctx, callbackURL));
 		}
-		const plan = await getPlanByPriceInfo(options, subscriptionItem.price.id, subscriptionItem.price.lookup_key);
+		const { item: subscriptionItem, plan } = resolved;
 		if (!plan) {
 			ctx.context.logger.warn(`Plan not found for price ${subscriptionItem.price.id}`);
 			throw ctx.redirect(getUrl(ctx, callbackURL));
 		}
+		const seats = resolveQuantity(stripeSubscription.items.data, subscriptionItem, plan.seatPriceId) || 1;
 		await ctx.context.adapter.update({
 			model: "subscription",
 			update: {
+				...stripeSubscription.trial_start && stripeSubscription.trial_end ? {
+					trialStart: /* @__PURE__ */ new Date(stripeSubscription.trial_start * 1e3),
+					trialEnd: /* @__PURE__ */ new Date(stripeSubscription.trial_end * 1e3)
+				} : {},
 				status: stripeSubscription.status,
-				seats: subscriptionItem.quantity || 1,
+				seats,
 				plan: plan.name.toLowerCase(),
+				billingInterval: subscriptionItem.price.recurring?.interval,
 				periodEnd: /* @__PURE__ */ new Date(subscriptionItem.current_period_end * 1e3),
 				periodStart: /* @__PURE__ */ new Date(subscriptionItem.current_period_start * 1e3),
 				stripeSubscriptionId: stripeSubscription.id,
 				cancelAtPeriodEnd: stripeSubscription.cancel_at_period_end,
 				cancelAt: stripeSubscription.cancel_at ? /* @__PURE__ */ new Date(stripeSubscription.cancel_at * 1e3) : null,
-				canceledAt: stripeSubscription.canceled_at ? /* @__PURE__ */ new Date(stripeSubscription.canceled_at * 1e3) : null,
-				...stripeSubscription.trial_start && stripeSubscription.trial_end ? {
-					trialStart: /* @__PURE__ */ new Date(stripeSubscription.trial_start * 1e3),
-					trialEnd: /* @__PURE__ */ new Date(stripeSubscription.trial_end * 1e3)
-				} : {}
+				canceledAt: stripeSubscription.canceled_at ? /* @__PURE__ */ new Date(stripeSubscription.canceled_at * 1e3) : null
 			},
 			where: [{
 				field: "id",
@@ -1103,7 +1362,7 @@ const createBillingPortal = (options) => {
 			originCheck((ctx) => ctx.body.returnUrl)
 		]
 	}, async (ctx) => {
-		const { user: user$1 } = ctx.context.session;
+		const { user } = ctx.context.session;
 		const customerType = ctx.body.customerType || "user";
 		const referenceId = ctx.body.referenceId || getReferenceId(ctx.context.session, customerType, options);
 		let customerId;
@@ -1123,7 +1382,7 @@ const createBillingPortal = (options) => {
 				}]
 			}).then((subs) => subs.find((sub) => isActiveOrTrialing(sub))))?.stripeCustomerId;
 		} else {
-			customerId = user$1.stripeCustomerId;
+			customerId = user.stripeCustomerId;
 			if (!customerId) customerId = (await ctx.context.adapter.findMany({
 				model: "subscription",
 				where: [{
@@ -1264,6 +1523,14 @@ const subscriptions = { subscription: { fields: {
 	seats: {
 		type: "number",
 		required: false
+	},
+	billingInterval: {
+		type: "string",
+		required: false
+	},
+	stripeScheduleId: {
+		type: "string",
+		required: false
 	}
 } } };
 const user = { user: { fields: { stripeCustomerId: {
@@ -1298,7 +1565,6 @@ const stripe = (options) => {
 	const client = options.stripeClient;
 	const subscriptionEndpoints = {
 		upgradeSubscription: upgradeSubscription(options),
-		cancelSubscriptionCallback: cancelSubscriptionCallback(options),
 		cancelSubscription: cancelSubscription(options),
 		restoreSubscription: restoreSubscription(options),
 		listActiveSubscriptions: listActiveSubscriptions(options),
@@ -1312,6 +1578,16 @@ const stripe = (options) => {
 			...options.subscription?.enabled ? subscriptionEndpoints : {}
 		},
 		init(ctx) {
+			if (options.subscription?.enabled && !options.organization?.enabled) {
+				const warnIfSeatPricing = (plans) => {
+					if (plans.some((p) => p.seatPriceId)) ctx.logger.error("seatPriceId is configured on a plan but stripe organization option is not enabled. Seat-based billing requires `organization: { enabled: true }` in stripe plugin options.");
+				};
+				const { plans } = options.subscription;
+				if (typeof plans === "function") Promise.resolve(plans()).then(warnIfSeatPricing).catch((e) => {
+					ctx.logger.error(`Failed to resolve plans for seat pricing validation: ${e.message}`);
+				});
+				else warnIfSeatPricing(plans);
+			}
 			if (options.organization?.enabled) {
 				const orgPlugin = ctx.getPlugin("organization");
 				if (!orgPlugin) {
@@ -1323,17 +1599,17 @@ const stripe = (options) => {
 				* Sync organization name to Stripe customer
 				*/
 				const afterUpdateStripeOrg = async (data) => {
-					const { organization: organization$1 } = data;
-					if (!organization$1?.stripeCustomerId) return;
+					const { organization } = data;
+					if (!organization?.stripeCustomerId) return;
 					try {
-						const stripeCustomer = await client.customers.retrieve(organization$1.stripeCustomerId);
+						const stripeCustomer = await client.customers.retrieve(organization.stripeCustomerId);
 						if (stripeCustomer.deleted) {
-							ctx.logger.warn(`Stripe customer ${organization$1.stripeCustomerId} was deleted`);
+							ctx.logger.warn(`Stripe customer ${organization.stripeCustomerId} was deleted`);
 							return;
 						}
-						if (organization$1.name !== stripeCustomer.name) {
-							await client.customers.update(organization$1.stripeCustomerId, { name: organization$1.name });
-							ctx.logger.info(`Synced organization name to Stripe: "${stripeCustomer.name}" → "${organization$1.name}"`);
+						if (organization.name !== stripeCustomer.name) {
+							await client.customers.update(organization.stripeCustomerId, { name: organization.name });
+							ctx.logger.info(`Synced organization name to Stripe: "${stripeCustomer.name}" → "${organization.name}"`);
 						}
 					} catch (e) {
 						ctx.logger.error(`Failed to sync organization to Stripe: ${e.message}`);
@@ -1343,21 +1619,74 @@ const stripe = (options) => {
 				* Block deletion if organization has active subscriptions
 				*/
 				const beforeDeleteStripeOrg = async (data) => {
-					const { organization: organization$1 } = data;
-					if (!organization$1.stripeCustomerId) return;
+					const { organization } = data;
+					if (!organization.stripeCustomerId) return;
 					try {
-						const subscriptions$1 = await client.subscriptions.list({
-							customer: organization$1.stripeCustomerId,
+						const subscriptions = await client.subscriptions.list({
+							customer: organization.stripeCustomerId,
 							status: "all",
 							limit: 100
 						});
-						for (const sub of subscriptions$1.data) if (sub.status !== "canceled" && sub.status !== "incomplete" && sub.status !== "incomplete_expired") throw APIError.from("BAD_REQUEST", STRIPE_ERROR_CODES.ORGANIZATION_HAS_ACTIVE_SUBSCRIPTION);
+						for (const sub of subscriptions.data) if (sub.status !== "canceled" && sub.status !== "incomplete" && sub.status !== "incomplete_expired") throw APIError.from("BAD_REQUEST", STRIPE_ERROR_CODES.ORGANIZATION_HAS_ACTIVE_SUBSCRIPTION);
 					} catch (error) {
 						if (error instanceof APIError) throw error;
 						ctx.logger.error(`Failed to check organization subscriptions: ${error.message}`);
 						throw error;
 					}
 				};
+				/**
+				* Sync seat quantity to Stripe when organization members change.
+				* quantity = memberCount; Stripe graduated pricing handles free tiers.
+				*/
+				const syncSeatsAfterMemberChange = async (data) => {
+					if (!options.subscription?.enabled || !data.organization?.stripeCustomerId) return;
+					try {
+						const memberCount = await ctx.adapter.count({
+							model: "member",
+							where: [{
+								field: "organizationId",
+								value: data.organization.id
+							}]
+						});
+						const seatPlans = (await getPlans(options.subscription)).filter((p) => p.seatPriceId);
+						if (seatPlans.length === 0) return;
+						const seatPlanNames = new Set(seatPlans.map((p) => p.name.toLowerCase()));
+						const dbSub = await ctx.adapter.findOne({
+							model: "subscription",
+							where: [{
+								field: "referenceId",
+								value: data.organization.id
+							}]
+						});
+						if (!dbSub?.stripeSubscriptionId || !isActiveOrTrialing(dbSub) || !seatPlanNames.has(dbSub.plan)) return;
+						const { seatPriceId } = seatPlans.find((p) => p.name.toLowerCase() === dbSub.plan);
+						const stripeSub = await client.subscriptions.retrieve(dbSub.stripeSubscriptionId);
+						if (!isActiveOrTrialing(stripeSub)) return;
+						const seatItem = stripeSub.items.data.find((item) => item.price.id === seatPriceId);
+						if (seatItem?.quantity === memberCount) return;
+						const items = seatItem ? [{
+							id: seatItem.id,
+							quantity: memberCount
+						}] : [{
+							price: seatPriceId,
+							quantity: memberCount
+						}];
+						await client.subscriptions.update(stripeSub.id, {
+							items,
+							proration_behavior: "create_prorations"
+						});
+						await ctx.adapter.update({
+							model: "subscription",
+							update: { seats: memberCount },
+							where: [{
+								field: "id",
+								value: dbSub.id
+							}]
+						});
+					} catch (e) {
+						ctx.logger.error(`Failed to sync seats to Stripe: ${e.message}`);
+					}
+				};
 				orgPlugin.options.organizationHooks = {
 					...existingHooks,
 					afterUpdateOrganization: existingHooks.afterUpdateOrganization ? async (data) => {
@@ -1367,67 +1696,91 @@ const stripe = (options) => {
 					beforeDeleteOrganization: existingHooks.beforeDeleteOrganization ? async (data) => {
 						await existingHooks.beforeDeleteOrganization(data);
 						await beforeDeleteStripeOrg(data);
-					} : beforeDeleteStripeOrg
+					} : beforeDeleteStripeOrg,
+					afterAddMember: existingHooks.afterAddMember ? async (data) => {
+						await existingHooks.afterAddMember(data);
+						await syncSeatsAfterMemberChange(data);
+					} : syncSeatsAfterMemberChange,
+					afterRemoveMember: existingHooks.afterRemoveMember ? async (data) => {
+						await existingHooks.afterRemoveMember(data);
+						await syncSeatsAfterMemberChange(data);
+					} : syncSeatsAfterMemberChange,
+					afterAcceptInvitation: existingHooks.afterAcceptInvitation ? async (data) => {
+						await existingHooks.afterAcceptInvitation(data);
+						await syncSeatsAfterMemberChange(data);
+					} : syncSeatsAfterMemberChange
 				};
 			}
 			return { options: { databaseHooks: { user: {
-				create: { async after(user$1, ctx$1) {
-					if (!ctx$1 || !options.createCustomerOnSignUp || user$1.stripeCustomerId) return;
+				create: { async after(user, ctx) {
+					if (!ctx || !options.createCustomerOnSignUp || user.stripeCustomerId) return;
 					try {
-						let stripeCustomer = (await client.customers.search({
-							query: `email:"${escapeStripeSearchValue(user$1.email)}" AND -metadata["customerType"]:"organization"`,
-							limit: 1
-						})).data[0];
+						let stripeCustomer;
+						try {
+							stripeCustomer = (await client.customers.search({
+								query: `email:"${escapeStripeSearchValue(user.email)}" AND -metadata["${customerMetadata.keys.customerType}"]:"organization"`,
+								limit: 1
+							})).data[0];
+						} catch {
+							ctx.context.logger.warn("Stripe customers.search failed, falling back to customers.list");
+							for await (const customer of client.customers.list({
+								email: user.email,
+								limit: 100
+							})) if (customer.metadata?.[customerMetadata.keys.customerType] !== "organization") {
+								stripeCustomer = customer;
+								break;
+							}
+						}
 						if (stripeCustomer) {
-							await ctx$1.context.internalAdapter.updateUser(user$1.id, { stripeCustomerId: stripeCustomer.id });
+							await ctx.context.internalAdapter.updateUser(user.id, { stripeCustomerId: stripeCustomer.id });
 							await options.onCustomerCreate?.({
 								stripeCustomer,
 								user: {
-									...user$1,
+									...user,
 									stripeCustomerId: stripeCustomer.id
 								}
-							}, ctx$1);
-							ctx$1.context.logger.info(`Linked existing Stripe customer ${stripeCustomer.id} to user ${user$1.id}`);
+							}, ctx);
+							ctx.context.logger.info(`Linked existing Stripe customer ${stripeCustomer.id} to user ${user.id}`);
 							return;
 						}
 						let extraCreateParams = {};
-						if (options.getCustomerCreateParams) extraCreateParams = await options.getCustomerCreateParams(user$1, ctx$1);
+						if (options.getCustomerCreateParams) extraCreateParams = await options.getCustomerCreateParams(user, ctx);
 						const params = defu({
-							email: user$1.email,
-							name: user$1.name,
-							metadata: {
-								userId: user$1.id,
+							email: user.email,
+							name: user.name,
+							metadata: customerMetadata.set({
+								userId: user.id,
 								customerType: "user"
-							}
+							}, extraCreateParams?.metadata)
 						}, extraCreateParams);
 						stripeCustomer = await client.customers.create(params);
-						await ctx$1.context.internalAdapter.updateUser(user$1.id, { stripeCustomerId: stripeCustomer.id });
+						await ctx.context.internalAdapter.updateUser(user.id, { stripeCustomerId: stripeCustomer.id });
 						await options.onCustomerCreate?.({
 							stripeCustomer,
 							user: {
-								...user$1,
+								...user,
 								stripeCustomerId: stripeCustomer.id
 							}
-						}, ctx$1);
-						ctx$1.context.logger.info(`Created new Stripe customer ${stripeCustomer.id} for user ${user$1.id}`);
+						}, ctx);
+						ctx.context.logger.info(`Created new Stripe customer ${stripeCustomer.id} for user ${user.id}`);
 					} catch (e) {
-						ctx$1.context.logger.error(`Failed to create or link Stripe customer: ${e.message}`, e);
+						ctx.context.logger.error(`Failed to create or link Stripe customer: ${e.message}`, e);
 					}
 				} },
-				update: { async after(user$1, ctx$1) {
-					if (!ctx$1 || !user$1.stripeCustomerId) return;
+				update: { async after(user, ctx) {
+					if (!ctx || !user.stripeCustomerId) return;
 					try {
-						const stripeCustomer = await client.customers.retrieve(user$1.stripeCustomerId);
+						const stripeCustomer = await client.customers.retrieve(user.stripeCustomerId);
 						if (stripeCustomer.deleted) {
-							ctx$1.context.logger.warn(`Stripe customer ${user$1.stripeCustomerId} was deleted, cannot update email`);
+							ctx.context.logger.warn(`Stripe customer ${user.stripeCustomerId} was deleted, cannot update email`);
 							return;
 						}
-						if (stripeCustomer.email !== user$1.email) {
-							await client.customers.update(user$1.stripeCustomerId, { email: user$1.email });
-							ctx$1.context.logger.info(`Updated Stripe customer email from ${stripeCustomer.email} to ${user$1.email}`);
+						if (stripeCustomer.email !== user.email) {
+							await client.customers.update(user.stripeCustomerId, { email: user.email });
+							ctx.context.logger.info(`Updated Stripe customer email from ${stripeCustomer.email} to ${user.email}`);
 						}
 					} catch (e) {
-						ctx$1.context.logger.error(`Failed to sync email to Stripe customer: ${e.message}`, e);
+						ctx.context.logger.error(`Failed to sync email to Stripe customer: ${e.message}`, e);
 					}
 				} }
 			} } } };
@@ -1439,4 +1792,5 @@ const stripe = (options) => {
 };
 
 //#endregion
-export { stripe };
+export { stripe };
+//# sourceMappingURL=index.mjs.map