@odla-ai/chapter 0.52.1 → 0.54.0

package/dist/worker/index.js

@@ -497,30 +497,30 @@ async function checkBillingTerms(secretKey, input, resume, now, createMissing) {
   const terms2 = subscriptionBillingTerms(input.billingTerms);
   if (!resume && terms2.initialTermEndsAt !== void 0 && (terms2.initialTermEndsAt <= now || terms2.initialTermEndsAt - now > 730 * 864e5)) fail();
   if (!terms2.discount) return;
-  const { couponId: couponId2, percentOffBps, duration, policyVersionId } = terms2.discount;
+  const { couponId, percentOffBps, duration, policyVersionId } = terms2.discount;
   const productId = input.discountProductId;
   if (productId !== void 0 && !/^prod_[A-Za-z0-9_]+$/.test(productId)) fail();
   const metadata = { ...stripePartitionMetadata(input), discountPolicyVersionId: policyVersionId };
   const expansion = { "expand[0]": "applies_to" };
-  let result = await stripeRequest({ secretKey }, "GET", `/v1/coupons/${encodeURIComponent(couponId2)}`, expansion);
+  let result = await stripeRequest({ secretKey }, "GET", `/v1/coupons/${encodeURIComponent(couponId)}`, expansion);
   if (createMissing && result.status === 404 && result.body?.error?.code === "resource_missing") {
     result = await stripeRequest(
       { secretKey },
       "POST",
       "/v1/coupons",
       {
-        id: couponId2,
+        id: couponId,
         percent_off: percentOffBps / 100,
         duration,
         metadata,
         ...expansion,
         ...productId ? { "applies_to[products][0]": productId } : {}
       },
-      { idempotencyKey: `chapter-policy-coupon:${couponId2}` }
+      { idempotencyKey: `chapter-policy-coupon:${couponId}` }
     );
   }
   const coupon = result.body;
-  if (!result.ok || !coupon || coupon.id !== couponId2 || !resume && coupon.valid !== true || coupon.livemode !== (input.environment === "prod") || coupon.percent_off !== percentOffBps / 100 || coupon.duration !== duration || coupon.amount_off != null || (productId ? !Array.isArray(coupon.applies_to?.products) || coupon.applies_to.products.length !== 1 || coupon.applies_to.products[0] !== productId : coupon.applies_to != null) || !Object.entries(metadata).every(([key3, value]) => coupon.metadata?.[key3] === value)) fail();
+  if (!result.ok || !coupon || coupon.id !== couponId || !resume && coupon.valid !== true || coupon.livemode !== (input.environment === "prod") || coupon.percent_off !== percentOffBps / 100 || coupon.duration !== duration || coupon.amount_off != null || (productId ? !Array.isArray(coupon.applies_to?.products) || coupon.applies_to.products.length !== 1 || coupon.applies_to.products[0] !== productId : coupon.applies_to != null) || !Object.entries(metadata).every(([key3, value]) => coupon.metadata?.[key3] === value)) fail();
 }
 function subscriptionBillingParams(input, productId) {
   if (!input.billingTerms) return {};
@@ -1760,8 +1760,8 @@ var object = (value) => {
 var id = (value) => typeof value === "string" && /^[A-Za-z0-9][A-Za-z0-9_.:-]{2,159}$/.test(value) ? value : fail2("id");
 var integer2 = (value, min, max) => typeof value === "number" && Number.isSafeInteger(value) && value >= min && value <= max ? value : fail2("integer");
 var time = (value) => {
-  const at = typeof value === "number" ? value : typeof value === "string" ? Date.parse(value) : NaN;
-  return integer2(at, 0, 864e13);
+  const at2 = typeof value === "number" ? value : typeof value === "string" ? Date.parse(value) : NaN;
+  return integer2(at2, 0, 864e13);
 };
 var ids = (value, allowEmpty = false) => {
   if (!Array.isArray(value) || value.length > 100 || !allowEmpty && value.length === 0) return fail2("ids");
@@ -1805,7 +1805,7 @@ function membershipOfferingVersion(value) {
     term: normalizedTerm,
     autoRenew: true,
     paymentGraceDays: integer2(input.paymentGraceDays, 0, 60),
-    seatPriceCents: integer2(input.seatPriceCents, 1, Number.MAX_SAFE_INTEGER),
+    seatPriceCents: integer2(input.seatPriceCents, 0, Number.MAX_SAFE_INTEGER),
     ...input.seatPurchaseWindowCalendarMonths === void 0 || input.seatPurchaseWindowCalendarMonths === null ? {} : { seatPurchaseWindowCalendarMonths: integer2(input.seatPurchaseWindowCalendarMonths, 1, 120) },
     requiredDisclosures: ids(input.requiredDisclosures)
   };
@@ -1890,7 +1890,7 @@ async function hash(value) {
   const bytes = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(JSON.stringify(value)));
   return [...new Uint8Array(bytes)].map((byte) => byte.toString(16).padStart(2, "0")).join("");
 }
-async function couponId(input, policyId) {
+async function membershipDiscountCouponId(input, policyId) {
   return policyId ? `odla_m_${await hash([input.appId, input.chapterId, input.environment, input.runtime, input.skuId, policyId])}` : void 0;
 }
 async function load(db, ns, id6) {
@@ -1916,7 +1916,7 @@ async function restore(row2, input) {
     discountPolicy: contract.discountPolicy,
     approvedFoundingCount: Number(row2.approvedFoundingCount),
     now: Number(row2.issuedAt),
-    couponId: await couponId(input, contract.discountPolicy?.id)
+    couponId: await membershipDiscountCouponId(input, contract.discountPolicy?.id)
   });
   if (expected.offering.chapterId !== input.chapterId || expected.offering.baseSkuId !== input.skuId) reject("invalid_offer_snapshot");
   const result = {
@@ -1947,7 +1947,7 @@ async function previewMembershipCommercialOffer(db, input) {
     discountPolicy: policy,
     approvedFoundingCount: Number(approvedFoundingCount),
     now: input.now,
-    couponId: await couponId(input, policy?.id)
+    couponId: await membershipDiscountCouponId(input, policy?.id)
   });
   const discount = contract.billingTerms.discount;
   return {
@@ -1997,7 +1997,7 @@ async function issueMembershipCommercialOffer(db, input) {
     discountPolicy: policy,
     approvedFoundingCount: Number(approvedFoundingCount),
     now: input.now,
-    couponId: await couponId(input, policy?.id)
+    couponId: await membershipDiscountCouponId(input, policy?.id)
   });
   const value = {
     id: input.offerId,
@@ -2893,7 +2893,7 @@ async function checkoutVariables(db, group, app) {
   const frozen = await frozenCheckoutVariables(db, app);
   return frozen.tierName ? frozen : { ...frozen, tierName: await catalogTierName(db, group, app) };
 }
-function formatInstant(at, timeZone) {
+function formatInstant(at2, timeZone) {
   return new Intl.DateTimeFormat("en-US", {
     weekday: "long",
     month: "long",
@@ -2903,7 +2903,7 @@ function formatInstant(at, timeZone) {
     minute: "2-digit",
     timeZoneName: "short",
     timeZone
-  }).format(new Date(at));
+  }).format(new Date(at2));
 }
 var adminUrlFor = (origin) => `${origin}/admin/`;
 var membersUrlFor = (origin) => `${origin}/members/`;
@@ -3851,6 +3851,181 @@ async function refundNamedSeatStripePayment(secretKey, seat) {
   return { refundedCents, refundIds };
 }
 
+// src/membership-seat-reservation.ts
+async function recipientKey(input, email) {
+  const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(JSON.stringify([input.appId, input.chapterId, input.environment, input.runtime, email])));
+  return `seat-recipient:${[...new Uint8Array(digest)].map((byte) => byte.toString(16).padStart(2, "0")).join("")}`;
+}
+async function reserveNamedMembershipSeat(db, input, now) {
+  membershipClock(now);
+  const name = typeof input.recipientName === "string" ? input.recipientName.trim().replace(/\s+/g, " ") : "";
+  const email = normalizeChapterEmail(typeof input.recipientEmail === "string" ? input.recipientEmail : "");
+  const purchaser = normalizeChapterEmail(typeof input.purchaserEmail === "string" ? input.purchaserEmail : "");
+  if (name.length < 2 || name.length > 160 || /[\u0000-\u001f\u007f]/.test(input.recipientName) || email.length > 254 || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email) || !purchaser || email === purchaser || !/^price_[A-Za-z0-9_]+$/.test(input.priceId) || !/^user_[A-Za-z0-9_]+$/.test(input.purchaserUserId)) membershipFail("invalid_named_seat_recipient");
+  const state = await loadMembershipAuthorityState(db, input);
+  const memberId = await networkMembershipId(input), member = await membershipLoad(db, "networkMembership", memberId);
+  requireMembershipScope(member, input);
+  if (!Number.isSafeInteger(member.revision) || !/^price_[A-Za-z0-9_]+$/.test(String(member.providerPriceId)) || member.providerPriceId === input.priceId) membershipFail("named_seat_purchase_unavailable");
+  const id6 = (await membershipOfferIdForRequest({ ...input, requestId: "named_seat" })).replace(/^offer_/, "seat_");
+  let seat = await membershipLoad(db, "networkSeat", id6);
+  if (!seat) {
+    const offering = membershipOfferingVersion(member.offeringSnapshot), claimId = await recipientKey(input, email);
+    const purchaseEndsAt = seatPurchaseDeadline(offering, member);
+    if (!["paid_pending_approval", "active", "cancel_at_term_end"].includes(String(member.status)) || Number(member.refundedCents) !== 0 || now < Number(member.initialTermStartedAt) || now >= Number(member.termEndsAt) || now > purchaseEndsAt || !Number.isSafeInteger(purchaseEndsAt) || member.namedSeatId !== void 0) {
+      membershipFail("named_seat_purchase_unavailable");
+    }
+    const attrs = {
+      id: id6,
+      ...membershipScope(input),
+      primaryMembershipId: memberId,
+      recipientName: name,
+      recipientEmailNormalized: email,
+      purchaserUserId: input.purchaserUserId,
+      recipientClaimId: claimId,
+      priceId: input.priceId,
+      primaryPriceId: member.providerPriceId,
+      amountCents: offering.seatPriceCents,
+      currency: offering.currency,
+      interval: offering.interval,
+      providerCustomerId: member.providerCustomerId,
+      providerSubscriptionId: member.providerSubscriptionId,
+      status: "payment_pending",
+      preparedAt: now,
+      termEndsAt: member.termEndsAt,
+      seatPurchaseEndsAt: purchaseEndsAt,
+      offeringSnapshot: offering,
+      revision: 1,
+      createdAt: now,
+      updatedAt: now
+    };
+    try {
+      await db.transact([
+        membershipUpdate("networkSeat", id6, attrs),
+        membershipUpdate("networkSeatRecipient", claimId, {
+          id: claimId,
+          appId: input.appId,
+          chapterId: input.chapterId,
+          environment: input.environment,
+          runtime: input.runtime,
+          seatId: id6,
+          recipientEmailNormalized: email,
+          createdAt: now
+        }),
+        membershipUpdate("networkMembership", memberId, { namedSeatId: id6, revision: Number(member.revision) + 1, updatedAt: now })
+      ], { mutationId: `named-seat-reserve:${id6}`, guards: [
+        { ns: "networkSeat", id: id6, exists: false },
+        { ns: "networkSeatRecipient", id: claimId, exists: false },
+        { ns: "networkMembership", id: memberId, exists: true, equals: { revision: member.revision }, absent: ["namedSeatId"] },
+        { ns: "membershipAuthorityState", id: String(state.id), exists: true, equals: { mode: "authoritative", revision: state.revision } }
+      ] });
+    } catch (error) {
+      if (error.code !== "transact_guard_failed") throw error;
+    }
+    seat = await membershipLoad(db, "networkSeat", id6);
+    if (!seat && await membershipLoad(db, "networkSeatRecipient", claimId)) membershipFail("named_seat_recipient_unavailable");
+  }
+  requireMembershipScope(seat, input);
+  if (seat.primaryMembershipId !== memberId || seat.recipientName !== name || seat.recipientEmailNormalized !== email || seat.priceId !== input.priceId || seat.purchaserUserId !== input.purchaserUserId) membershipFail("named_seat_purchase_conflict");
+  return seat;
+}
+
+// src/membership-seat-included.ts
+var namedSeatIncluded = (seat) => Number(seat.amountCents) === 0;
+var namedSeatSettled = (seat) => namedSeatIncluded(seat) ? seat.purchasedAt !== void 0 : Boolean(seat.providerPaymentIntentId && seat.providerSubscriptionItemId);
+function namedSeatRecipientState(seat) {
+  switch (String(seat.status)) {
+    case "renewal_pending":
+    case "pending_acceptance":
+      return "invited";
+    case "pending_approval":
+    case "pending_primary":
+      return "accepted";
+    case "active":
+      return "joined";
+    case "refund_pending":
+    case "refunded":
+      return seat.refundReason === "declined" ? "declined" : "refunded";
+    case "canceled":
+      return "canceled";
+    default:
+      return "payment_pending";
+  }
+}
+var OPEN = ["pending_acceptance", "pending_approval", "pending_primary", "active"];
+async function grantIncludedNamedSeat(db, input, now) {
+  membershipClock(now);
+  const seat = await reserveNamedMembershipSeat(db, input, now);
+  if (!namedSeatIncluded(seat)) membershipFail("named_seat_not_included");
+  const state = await loadMembershipAuthorityState(db, input);
+  const member = await membershipLoad(db, "networkMembership", seat.primaryMembershipId);
+  requireMembershipScope(member, input);
+  if (!["paid_pending_approval", "active", "cancel_at_term_end"].includes(String(member.status)) || Number(member.refundedCents) !== 0 || member.namedSeatId !== seat.id || now >= Number(member.termEndsAt)) {
+    membershipFail("named_seat_purchase_unavailable");
+  }
+  if (seat.status === "payment_pending") {
+    const entitlementId = `${seat.id}:entitlement`, inviteId = `${seat.id}:invite`, source = `included:${seat.id}`;
+    try {
+      await db.transact([
+        membershipUpdate("networkSeat", seat.id, {
+          status: "pending_acceptance",
+          purchasedAt: now,
+          termStartedAt: now,
+          termEndsAt: member.termEndsAt,
+          acceptanceEndsAt: Number(member.termEndsAt),
+          entitlementId,
+          revision: Number(seat.revision) + 1,
+          updatedAt: now
+        }),
+        membershipUpdate("networkEntitlement", entitlementId, {
+          id: entitlementId,
+          ...membershipScope(input),
+          membershipId: member.id,
+          seatId: seat.id,
+          kind: "named_seat",
+          status: "pending_acceptance",
+          termStartedAt: now,
+          termEndsAt: member.termEndsAt,
+          offeringSnapshot: member.offeringSnapshot,
+          sourceEventId: source,
+          revision: 1,
+          createdAt: now,
+          updatedAt: now
+        }),
+        membershipUpdate("membershipEffect", inviteId, {
+          id: inviteId,
+          chapterId: input.chapterId,
+          environment: input.environment,
+          runtime: input.runtime,
+          membershipId: member.id,
+          seatId: seat.id,
+          kind: "invite_named_recipient",
+          status: "pending",
+          attempts: 0,
+          createdAt: now,
+          updatedAt: now
+        })
+      ], { mutationId: `named-seat-included:${seat.id}`, guards: [
+        {
+          ns: "networkSeat",
+          id: seat.id,
+          exists: true,
+          equals: { status: "payment_pending", revision: seat.revision, amountCents: 0 },
+          absent: ["purchasedAt", "providerPaymentIntentId"]
+        },
+        { ns: "networkEntitlement", id: entitlementId, exists: false },
+        { ns: "networkMembership", id: String(member.id), exists: true, equals: { revision: member.revision, namedSeatId: seat.id } },
+        { ns: "membershipAuthorityState", id: String(state.id), exists: true, equals: { mode: "authoritative", revision: state.revision } }
+      ] });
+    } catch (error) {
+      if (error.code !== "transact_guard_failed") throw error;
+    }
+  }
+  const current = await membershipLoad(db, "networkSeat", seat.id);
+  requireMembershipScope(current, input);
+  if (!namedSeatIncluded(current) || current.purchasedAt === void 0 || !OPEN.includes(String(current.status))) membershipFail("named_seat_purchase_unavailable");
+  return { seatId: seat.id, amountCents: 0, currency: seat.currency, termEndsAt: Number(current.termEndsAt), status: String(current.status), included: true };
+}
+
 // src/membership-seat-refund.ts
 async function requestNamedSeatRefund(db, input, now) {
   membershipClock(now);
@@ -3860,7 +4035,7 @@ async function requestNamedSeatRefund(db, input, now) {
   const member = await membershipLoad(db, "networkMembership", String(seat.primaryMembershipId));
   requireMembershipScope(member, input);
   if (seat.status === "refunded" || seat.status === "refund_pending") return;
-  if (!seat.purchasedAt || !seat.providerPaymentIntentId || input.reason === "declined" && seat.journeyApprovedAt !== void 0 || input.reason === "primary_closed" && !["refunded", "declined"].includes(String(member.status))) membershipFail("named_seat_refund_not_eligible");
+  if (!seat.purchasedAt || !seat.providerPaymentIntentId && !namedSeatIncluded(seat) || input.reason === "declined" && seat.journeyApprovedAt !== void 0 || input.reason === "primary_closed" && !["refunded", "declined"].includes(String(member.status))) membershipFail("named_seat_refund_not_eligible");
   const entitlement = seat.entitlementId ? await membershipLoad(db, "networkEntitlement", String(seat.entitlementId)) : void 0;
   await db.transact([
     membershipUpdate("networkSeat", input.seatId, { status: "refund_pending", refundReason: input.reason, revision: Number(seat.revision) + 1, updatedAt: now }),
@@ -3905,7 +4080,7 @@ async function completeNamedSeatRefund(db, seatId, secretKey, now) {
   await loadMembershipAuthorityState(db, seat);
   if (seat.status === "refunded") return;
   if (seat.status !== "refund_pending") membershipFail("named_seat_refund_not_ready");
-  const result = await refundNamedSeatStripePayment(secretKey, seat);
+  const result = namedSeatIncluded(seat) ? { refundedCents: 0, refundIds: [] } : await refundNamedSeatStripePayment(secretKey, seat);
   await db.transact([
     membershipUpdate("networkSeat", seatId, {
       status: "refunded",
@@ -3927,7 +4102,7 @@ async function refundNamedSeatByOperator(db, input, stripeSecretKey, now) {
   await requestNamedSeatRefund(db, { ...input, reason: "operator" }, now);
   await completeNamedSeatRefund(db, input.seatId, stripeSecretKey, now);
   const refunded = await membershipLoad(db, "networkSeat", input.seatId);
-  if (refunded?.status !== "refunded" || !Number.isSafeInteger(refunded.refundedCents) || Number(refunded.refundedCents) <= 0) {
+  if (refunded?.status !== "refunded" || !Number.isSafeInteger(refunded.refundedCents) || Number(refunded.refundedCents) !== Number(seat.amountCents)) {
     throw new Error("named seat refund unconfirmed");
   }
   return { seatId: String(seat.id), status: "refunded", refundedCents: Number(refunded.refundedCents), subscriptionCanceled: false };
@@ -3959,9 +4134,56 @@ async function liftSeatPurchaseWindow(db, scope2, now, limit = 100) {
   return { lifted, more: rows5.length > limit };
 }
 
+// src/membership-seat-reprice.ts
+async function lowerSeatPrice(db, scope2, now, limit = 100) {
+  membershipClock(now);
+  if (!Number.isSafeInteger(limit) || limit < 1 || limit > 200) throw new TypeError("invalid reprice limit");
+  const state = await loadMembershipAuthorityState(db, scope2);
+  const versions = (await db.query({ membershipOfferingVersion: { $: { where: { chapterId: scope2.chapterId }, limit: 200 } } })).membershipOfferingVersion ?? [];
+  if (versions.length >= 200) throw Object.assign(new Error("policy_history_incomplete"), { code: "policy_history_incomplete" });
+  const current = versions.map((row2) => membershipOfferingVersion(row2.snapshot)).filter((offer) => offer.baseSkuId === scope2.skuId && offer.status === "published" && now >= offer.effectiveFrom && (offer.effectiveUntil === void 0 || now < offer.effectiveUntil)).sort((a, b) => b.version - a.version)[0];
+  if (!current) throw Object.assign(new Error("ambiguous_membership_policy"), { code: "ambiguous_membership_policy" });
+  const target = current.seatPriceCents;
+  const rows5 = (await db.query({ networkMembership: { $: { where: { ...scope2 }, order: { updatedAt: "asc" }, limit: limit + 1 } } })).networkMembership ?? [];
+  const receipt = { seatPriceCents: target, repriced: 0, skipped: [], more: rows5.length > limit };
+  for (const member of rows5.slice(0, limit)) {
+    if (Object.entries(scope2).some(([key3, value]) => member[key3] !== value)) throw new Error("membership reprice scope mismatch");
+    const id6 = String(member.id), skip = (reason) => {
+      receipt.skipped.push({ membershipId: id6, reason });
+    };
+    const offering = membershipOfferingVersion(member.offeringSnapshot);
+    if (offering.seatPriceCents <= target) {
+      skip("seat price already at or below the current offering");
+      continue;
+    }
+    if (!["paid_pending_approval", "active", "cancel_at_term_end", "payment_grace"].includes(String(member.status))) {
+      skip(`membership is ${String(member.status)}`);
+      continue;
+    }
+    const seat = member.namedSeatId ? await membershipLoad(db, "networkSeat", String(member.namedSeatId)) : void 0;
+    if (seat && (seat.status !== "payment_pending" || seat.providerPaymentIntentId !== void 0)) {
+      skip(`seat is ${String(seat.status)}`);
+      continue;
+    }
+    const ops = [membershipUpdate("networkMembership", id6, { offeringSnapshot: { ...offering, seatPriceCents: target }, revision: Number(member.revision) + 1, updatedAt: now })];
+    const guards = [
+      { ns: "networkMembership", id: id6, exists: true, equals: { revision: member.revision } },
+      { ns: "membershipAuthorityState", id: String(state.id), exists: true, equals: { mode: "authoritative" } }
+    ];
+    if (seat) {
+      ops.push(membershipUpdate("networkSeat", String(seat.id), { amountCents: target, offeringSnapshot: { ...offering, seatPriceCents: target }, revision: Number(seat.revision) + 1, updatedAt: now }));
+      guards.push({ ns: "networkSeat", id: String(seat.id), exists: true, equals: { revision: seat.revision, status: "payment_pending" } });
+    }
+    await db.transact(ops, { mutationId: `seat-reprice:${id6}:${member.revision}`, guards });
+    receipt.repriced++;
+  }
+  return receipt;
+}
+
 // src/worker-routes-admin-membership-seats.ts
 var LIST = "/api/admin/membership-seats";
 var LIFT = "/api/admin/membership-seats/lift-purchase-window";
+var REPRICE = "/api/admin/membership-seats/reprice";
 var ONE = /^\/api\/admin\/membership-seats\/([A-Za-z0-9][A-Za-z0-9_.:-]{2,159})\/refund$/;
 var SCOPE = /^[a-z0-9][a-z0-9-]{1,62}$/;
 var PUBLIC = [
@@ -3988,11 +4210,11 @@ var PUBLIC = [
 ];
 var project = (row2) => Object.fromEntries(PUBLIC.filter((key3) => row2[key3] !== void 0).map((key3) => [key3, row2[key3]]));
 var handleAdminMembershipSeats = async (req, url, env, ctx) => {
-  const one = url.pathname.match(ONE), lift = url.pathname === LIFT;
-  if (url.pathname !== LIST && !one && !lift) return null;
+  const one = url.pathname.match(ONE), lift = url.pathname === LIFT, reprice = url.pathname === REPRICE;
+  if (url.pathname !== LIST && !one && !lift && !reprice) return null;
   const operator = ctx.membershipAuthorityOperator;
   if (!operator) return json({ error: "not found" }, 404);
-  if (req.method !== (one || lift ? "POST" : "GET")) return json({ error: "method not allowed" }, 405);
+  if (req.method !== (one || lift || reprice ? "POST" : "GET")) return json({ error: "method not allowed" }, 405);
   const raw2 = ctx.makeDb(env), user = await ctx.verifyUser(req, env);
   if (!user) return json({ error: "unauthorized" }, 401);
   if (!await ctx.isSuperAdminEmail(raw2, user.email, user.userId)) return json({ error: "super-admin required", code: "super_admin_required" }, 403);
@@ -4002,7 +4224,7 @@ var handleAdminMembershipSeats = async (req, url, env, ctx) => {
   } catch {
     return json({ error: "the membership authority is not hosted by this deployment" }, 404);
   }
-  if (lift) {
+  if (lift || reprice) {
     let body;
     try {
       body = await req.json();
@@ -4010,14 +4232,16 @@ var handleAdminMembershipSeats = async (req, url, env, ctx) => {
       return json({ error: "chapterId and runtime are required" }, 400);
     }
     const appId = body.appId ?? body.chapterId;
-    if (typeof body.chapterId !== "string" || !SCOPE.test(body.chapterId) || typeof appId !== "string" || !SCOPE.test(appId) || typeof body.runtime !== "string" || !/^[a-z0-9]{2,12}$/.test(body.runtime)) {
-      return json({ error: "chapterId and runtime are required" }, 400);
+    if (typeof body.chapterId !== "string" || !SCOPE.test(body.chapterId) || typeof appId !== "string" || !SCOPE.test(appId) || typeof body.runtime !== "string" || !/^[a-z0-9]{2,12}$/.test(body.runtime) || reprice && (typeof body.skuId !== "string" || !/^[A-Za-z0-9][A-Za-z0-9_.:-]{2,159}$/.test(body.skuId))) {
+      return json({ error: reprice ? "chapterId, runtime and skuId are required" : "chapterId and runtime are required" }, 400);
     }
+    const scope2 = { appId, chapterId: body.chapterId, environment: env.ODLA_ENV, runtime: body.runtime };
     try {
-      return json({ ok: true, ...await liftSeatPurchaseWindow(db, { appId, chapterId: body.chapterId, environment: env.ODLA_ENV, runtime: body.runtime }, Date.now()) });
+      if (reprice) return json({ ok: true, ...await lowerSeatPrice(db, { ...scope2, skuId: String(body.skuId) }, Date.now()) });
+      return json({ ok: true, ...await liftSeatPurchaseWindow(db, scope2, Date.now()) });
     } catch (error) {
       const code = error.code;
-      return json({ error: "purchase window lift is pending; retry to confirm", ...code ? { code } : {} }, code ? 409 : 503);
+      return json({ error: `${reprice ? "seat reprice" : "purchase window lift"} is pending; retry to confirm`, ...code ? { code } : {} }, code ? 409 : 503);
     }
   }
   if (!one) {
@@ -4053,8 +4277,8 @@ var handleAdminMembershipSeats = async (req, url, env, ctx) => {
 var LIMIT = 200;
 var text2 = (value) => typeof value === "string" && value.length > 0 && value.length <= 200 ? value : void 0;
 var instant = (value) => {
-  const at = typeof value === "number" ? value : typeof value === "string" ? Date.parse(value) : NaN;
-  return Number.isSafeInteger(at) && at >= 0 ? at : void 0;
+  const at2 = typeof value === "number" ? value : typeof value === "string" ? Date.parse(value) : NaN;
+  return Number.isSafeInteger(at2) && at2 >= 0 ? at2 : void 0;
 };
 function provenance(row2) {
   const source = text2(row2.source), actor = text2(row2.actor ?? row2.$createdBy), recordedAt = instant(row2.recordedAt ?? row2.createdAt ?? row2.$createdAt);
@@ -4150,6 +4374,239 @@ var handleAdminMembershipPolicyVersions = async (req, url, env, ctx) => {
   return json(await listMembershipPolicyVersions(db, { chapterId, now: Date.now() }));
 };
 
+// src/membership-discount-reterm.ts
+import { stripeRequest as stripeRequest6 } from "@odla-ai/stripe";
+
+// src/subscription-provider-contract.ts
+import { stripeRequest as stripeRequest5 } from "@odla-ai/stripe";
+function subscriptionContractMismatch() {
+  throw Object.assign(new Error("Stripe subscription does not match the checkout contract"), { code: "stripe_contract_mismatch" });
+}
+async function verifySubscriptionPrice(secretKey, input, resume = false) {
+  if (!/^price_[A-Za-z0-9]+$/.test(input.priceId) || !Number.isSafeInteger(input.priceCents) || input.priceCents <= 0 || !/^[a-z]{3}$/.test(input.currency) || !["month", "year"].includes(input.interval)) subscriptionContractMismatch();
+  const result = await stripeRequest5({ secretKey }, "GET", `/v1/prices/${encodeURIComponent(input.priceId)}`);
+  const price = result.body;
+  if (!result.ok || !price || price.id !== input.priceId || !resume && price.active !== true || price.unit_amount !== input.priceCents || price.currency !== input.currency || price.type !== "recurring" || price.billing_scheme !== "per_unit" || price.custom_unit_amount || price.transform_quantity || price.recurring?.interval !== input.interval || price.recurring?.interval_count !== 1 || price.recurring?.usage_type !== "licensed" || price.livemode !== (input.environment === "prod")) subscriptionContractMismatch();
+  return typeof price.product === "string" ? price.product : void 0;
+}
+function verifySubscriptionResult(sub, input, customerId, metadata) {
+  const items = sub?.items;
+  if (!sub || !/^sub_[A-Za-z0-9]+$/.test(sub.id) || sub.customer !== customerId || input.existingSubscriptionId && sub.id !== input.existingSubscriptionId || !(input.billingTerms?.initialTermEndsAt ? ["incomplete", "active", "trialing"] : ["incomplete", "active"]).includes(sub.status) || sub.livemode !== (input.environment === "prod") || !Object.entries(metadata).every(([key3, value]) => sub.metadata?.[key3] === value) || !Array.isArray(items?.data) || items.has_more !== false || items.data.length !== 1 || items.data[0]?.price?.id !== input.priceId || items.data[0]?.quantity !== 1) subscriptionContractMismatch();
+  const invoice = sub.latest_invoice;
+  if (!invoice || typeof invoice !== "object" || invoice.customer !== customerId || invoice.currency !== input.currency || invoice.total !== subscriptionAmountDue(input) || invoice.billing_reason !== "subscription_create") subscriptionContractMismatch();
+  verifySubscriptionBillingResult(sub, input);
+}
+
+// src/membership-discount-reterm.ts
+var SAFE = /^[A-Za-z0-9][A-Za-z0-9_.:-]{2,159}$/;
+var RETERMABLE = /* @__PURE__ */ new Set(["active", "paid_pending_approval", "cancel_at_term_end", "payment_grace"]);
+var PROVIDER_LIVE = /* @__PURE__ */ new Set(["active", "trialing", "past_due"]);
+var couponOf = (discount) => {
+  const ref = discount?.source?.coupon ?? discount?.coupon;
+  return typeof ref === "string" ? ref : typeof ref?.id === "string" ? ref.id : void 0;
+};
+async function retermPolicy(db, scope2, id6) {
+  const row2 = await membershipLoad(db, "discountPolicyVersion", id6);
+  if (!row2) membershipFail("membership_reterm_policy_unknown");
+  let policy;
+  try {
+    policy = membershipDiscountPolicyVersion(row2.snapshot);
+  } catch {
+    return membershipFail("membership_reterm_policy_ineligible");
+  }
+  if (policy.id !== id6 || policy.chapterId !== scope2.chapterId || policy.status !== "published" || policy.benefitDuration.kind !== "while_active" || policy.percentOffBps <= 0 || policy.discountEligibleSkuIds.length === 0) membershipFail("membership_reterm_policy_ineligible");
+  return policy;
+}
+async function attachProviderDiscount(sk, scope2, member, policy, couponId, productId) {
+  const subId = String(member.providerSubscriptionId), path = `/v1/subscriptions/${encodeURIComponent(subId)}`;
+  const read2 = await stripeRequest6({ secretKey: sk }, "GET", path, { "expand[0]": "discounts" });
+  const sub = read2.body, items = sub?.items?.data;
+  const metadata = { ...stripePartitionMetadata(scope2), applicationId: String(member.applicationId) };
+  if (!read2.ok || sub.id !== subId || sub.customer !== member.providerCustomerId || sub.livemode !== (scope2.environment === "prod") || !PROVIDER_LIVE.has(sub.status) || !Object.entries(metadata).every(([key3, value]) => sub.metadata?.[key3] === value) || sub.items?.has_more !== false || !Array.isArray(items) || items.length < 1 || items.length > 2 || items.filter((item) => item.price?.id === member.providerPriceId && item.quantity === 1 && item.price?.product === productId).length !== 1) {
+    throw Object.assign(new Error("provider subscription does not match the frozen membership"), { code: "provider_mismatch" });
+  }
+  const discounts = sub.discounts ?? (sub.discount ? [sub.discount] : []);
+  if (!Array.isArray(discounts)) throw Object.assign(new Error("provider discounts unreadable"), { code: "provider_mismatch" });
+  const present = discounts.map(couponOf);
+  if (present.length === 1 && present[0] === couponId) return false;
+  if (present.length > 0) throw Object.assign(new Error("provider subscription carries an unrelated discount"), { code: "provider_mismatch" });
+  const written = await stripeRequest6({ secretKey: sk }, "POST", path, {
+    "discounts[0][coupon]": couponId,
+    "expand[0]": "discounts",
+    "metadata[discountPolicyVersionId]": policy.id
+  }, { idempotencyKey: `membership-reterm:${String(member.id)}:${policy.id}` });
+  const after = written.body?.discounts;
+  if (!written.ok || written.body?.id !== subId || !Array.isArray(after) || after.length !== 1 || couponOf(after[0]) !== couponId) {
+    membershipFail("membership_reterm_provider_unconfirmed");
+  }
+  return true;
+}
+async function retermMembershipDiscount(db, stripeSecretKey, scope2, input, now) {
+  membershipClock(now);
+  const limit = input.limit ?? 100;
+  if (!Number.isSafeInteger(limit) || limit < 1 || limit > 200) throw new TypeError("invalid reterm limit");
+  if (typeof input.policyVersionId !== "string" || !SAFE.test(input.policyVersionId)) throw new TypeError("invalid policy version id");
+  if (input.membershipIds !== void 0 && (!Array.isArray(input.membershipIds) || input.membershipIds.length === 0 || input.membershipIds.length > limit || input.membershipIds.some((id6) => typeof id6 !== "string" || !SAFE.test(id6)))) throw new TypeError("invalid membership ids");
+  const state = await loadMembershipAuthorityState(db, scope2);
+  const policy = await retermPolicy(db, scope2, input.policyVersionId);
+  const receipt = { policyVersionId: policy.id, retermed: [], unchanged: [], skipped: [], more: false };
+  const skip = (membershipId, reason) => {
+    receipt.skipped.push({ membershipId, reason });
+  };
+  let rows5;
+  if (input.membershipIds) {
+    rows5 = [];
+    for (const id6 of input.membershipIds) {
+      const member = await membershipLoad(db, "networkMembership", id6);
+      if (!member) skip(id6, "not_found");
+      else if (Object.entries(scope2).some(([key3, value]) => member[key3] !== value)) skip(id6, "scope_mismatch");
+      else rows5.push(member);
+    }
+  } else {
+    const found = (await db.query({ networkMembership: { $: { where: { ...scope2 }, order: { updatedAt: "asc" }, limit: limit + 1 } } })).networkMembership ?? [];
+    if (found.some((member) => Object.entries(scope2).some(([key3, value]) => member[key3] !== value))) throw new Error("membership reterm scope mismatch");
+    receipt.more = found.length > limit;
+    rows5 = found.slice(0, limit);
+  }
+  for (const member of rows5) {
+    const id6 = String(member.id);
+    if (member.discountPolicyVersionId === policy.id) {
+      receipt.unchanged.push(id6);
+      continue;
+    }
+    if (!RETERMABLE.has(String(member.status))) {
+      skip(id6, "status");
+      continue;
+    }
+    if (member.founding !== true) {
+      skip(id6, "not_founding");
+      continue;
+    }
+    if (member.cohort !== policy.cohortLabel) {
+      skip(id6, "cohort_mismatch");
+      continue;
+    }
+    const skuId = String(member.baseSkuId);
+    if (!policy.discountEligibleSkuIds.includes(skuId)) {
+      skip(id6, "sku_not_discounted");
+      continue;
+    }
+    const base = Number(member.baseAmountCents), current = Number(member.renewalAmountCents);
+    const renewal = Math.round(base * (1e4 - policy.percentOffBps) / 1e4);
+    if (!Number.isSafeInteger(base) || base <= 0 || !Number.isSafeInteger(current) || renewal > current) {
+      skip(id6, "would_not_widen");
+      continue;
+    }
+    const couponId = await membershipDiscountCouponId({ ...scope2, skuId }, policy.id);
+    let providerUpdated;
+    try {
+      const productId = await verifySubscriptionPrice(stripeSecretKey, {
+        priceId: String(member.providerPriceId),
+        priceCents: base,
+        currency: String(member.currency),
+        interval: member.interval === "month" ? "month" : "year",
+        environment: scope2.environment
+      }, true);
+      if (!productId) throw Object.assign(new Error("price has no product"), { code: "provider_mismatch" });
+      await prepareSubscriptionBillingTerms(stripeSecretKey, {
+        ...scope2,
+        priceCents: base,
+        currency: String(member.currency),
+        discountProductId: productId,
+        billingTerms: {
+          offeringVersionId: String(member.offeringVersionId),
+          discount: { policyVersionId: policy.id, couponId, percentOffBps: policy.percentOffBps, duration: "forever" }
+        }
+      }, false);
+      providerUpdated = await attachProviderDiscount(stripeSecretKey, scope2, member, policy, couponId, productId);
+    } catch (error) {
+      const code = error.code;
+      if (code === "provider_mismatch" || code === "stripe_contract_mismatch") {
+        skip(id6, "provider_mismatch");
+        continue;
+      }
+      throw error;
+    }
+    try {
+      await db.transact([membershipUpdate("networkMembership", id6, {
+        discountPolicyVersionId: policy.id,
+        discountSnapshot: policy,
+        renewalAmountCents: renewal,
+        revision: Number(member.revision) + 1,
+        updatedAt: now
+      })], {
+        mutationId: `membership-reterm:${id6}:${policy.id}:${member.revision}`,
+        guards: [
+          { ns: "networkMembership", id: id6, exists: true, equals: { revision: member.revision, status: member.status } },
+          { ns: "membershipAuthorityState", id: String(state.id), exists: true, equals: { mode: "authoritative" } },
+          { ns: "discountPolicyVersion", id: policy.id, exists: true }
+        ]
+      });
+    } catch (error) {
+      if (error.code !== "transact_guard_failed") throw error;
+      return membershipFail("membership_reterm_retry_required");
+    }
+    receipt.retermed.push({
+      membershipId: id6,
+      ...typeof member.discountPolicyVersionId === "string" ? { previousPolicyVersionId: member.discountPolicyVersionId } : {},
+      previousRenewalAmountCents: current,
+      renewalAmountCents: renewal,
+      providerUpdated
+    });
+  }
+  return receipt;
+}
+
+// src/worker-routes-admin-membership-reterm.ts
+var PATH4 = "/api/admin/membership-discount/reterm";
+var SCOPE3 = /^[a-z0-9][a-z0-9-]{1,62}$/;
+var ID = /^[A-Za-z0-9][A-Za-z0-9_.:-]{2,159}$/;
+var BAD = "chapterId and policyVersionId are required; runtime, appId, membershipIds and limit are optional";
+var handleAdminMembershipReterm = async (req, url, env, ctx) => {
+  if (url.pathname !== PATH4) return null;
+  const operator = ctx.membershipAuthorityOperator;
+  if (!operator) return json({ error: "not found" }, 404);
+  if (req.method !== "POST") return json({ error: "method not allowed" }, 405);
+  const raw2 = ctx.makeDb(env), user = await ctx.verifyUser(req, env);
+  if (!user) return json({ error: "unauthorized" }, 401);
+  if (!await ctx.isSuperAdminEmail(raw2, user.email, user.userId)) return json({ error: "super-admin required", code: "super_admin_required" }, 403);
+  let db;
+  try {
+    db = operator.makeDb(env);
+  } catch {
+    return json({ error: "the membership authority is not hosted by this deployment" }, 404);
+  }
+  let body;
+  try {
+    body = await req.json();
+  } catch {
+    return json({ error: BAD }, 400);
+  }
+  const appId = body.appId ?? body.chapterId, runtime = body.runtime ?? env.ODLA_RUNTIME;
+  if (typeof body.chapterId !== "string" || !SCOPE3.test(body.chapterId) || typeof appId !== "string" || !SCOPE3.test(appId) || typeof runtime !== "string" || !/^[a-z0-9]{2,12}$/.test(runtime) || typeof body.policyVersionId !== "string" || !ID.test(body.policyVersionId) || body.membershipIds !== void 0 && (!Array.isArray(body.membershipIds) || body.membershipIds.length === 0 || body.membershipIds.length > 200 || body.membershipIds.some((id6) => typeof id6 !== "string" || !ID.test(id6))) || body.limit !== void 0 && (!Number.isSafeInteger(body.limit) || Number(body.limit) < 1 || Number(body.limit) > 200)) {
+    return json({ error: BAD }, 400);
+  }
+  const secret = await getVaultSecret(db, operator.stripeSecretName ?? "stripe_secret_key");
+  if (!secret) return json({ error: "network payment provider unavailable" }, 503);
+  try {
+    const receipt = await retermMembershipDiscount(
+      db,
+      secret,
+      { appId, chapterId: body.chapterId, environment: env.ODLA_ENV, runtime },
+      {
+        policyVersionId: body.policyVersionId,
+        ...body.membershipIds ? { membershipIds: body.membershipIds } : {},
+        ...body.limit !== void 0 ? { limit: Number(body.limit) } : {}
+      },
+      Date.now()
+    );
+    return json({ ok: true, ...receipt });
+  } catch (error) {
+    const code = error.code;
+    return json({ error: "re-term is pending; retry to confirm", ...code ? { code } : {} }, code ? 409 : 503);
+  }
+};
+
 // src/worker-routes-membership-cancel.ts
 var handleMembershipCancellation = async (req, url, env, ctx) => {
   const match = url.pathname.match(/^\/api\/admin\/applications\/([0-9a-f-]+)\/cancel-renewal$/);
@@ -4810,7 +5267,7 @@ async function readAdmissionRows(db, namespace, where, maximum) {
 }
 
 // src/admission-grants.ts
-var ID = /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,127}$/;
+var ID2 = /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,127}$/;
 var MAX_GRANTS = 2e3;
 var MAX_NOTE = 2e3;
 var EMAIL_RE2 = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
@@ -4832,10 +5289,10 @@ function validateAdmissionGrantDocument(input) {
   const sourceActor = typeof source.actor === "string" ? source.actor.trim() : "";
   const chapterId = typeof target.chapterId === "string" ? target.chapterId : "";
   const environment = typeof target.environment === "string" ? target.environment : "";
-  if (!ID.test(sourceId)) errors.push("document.source.appId must be an identifier");
+  if (!ID2.test(sourceId)) errors.push("document.source.appId must be an identifier");
   if (!sourceActor || sourceActor.length > 256) errors.push("document.source.actor must be 1-256 characters");
-  if (!ID.test(chapterId)) errors.push("document.target.chapterId must be an identifier");
-  if (!ID.test(environment)) errors.push("document.target.environment must be an identifier");
+  if (!ID2.test(chapterId)) errors.push("document.target.chapterId must be an identifier");
+  if (!ID2.test(environment)) errors.push("document.target.environment must be an identifier");
   if (!Array.isArray(root.grants)) errors.push("document.grants must be an array");
   const rawGrants = Array.isArray(root.grants) ? root.grants : [];
   if (rawGrants.length > MAX_GRANTS) errors.push(`document.grants supports at most ${MAX_GRANTS} entries`);
@@ -4850,7 +5307,7 @@ function validateAdmissionGrantDocument(input) {
     const decision = grant.decision;
     const note = typeof grant.note === "string" ? grant.note.trim() : void 0;
     const expiresAt = grant.expiresAt === void 0 ? void 0 : Number(grant.expiresAt);
-    if (!ID.test(id6)) errors.push(`document.grants[${index2}].id must be an identifier`);
+    if (!ID2.test(id6)) errors.push(`document.grants[${index2}].id must be an identifier`);
     if (seenIds.has(id6)) errors.push(`document.grants repeats id "${id6}"`);
     if (!isAdmissionEmail(normalized)) errors.push(`document.grants[${index2}].email must be valid`);
     if (seenEmails.has(normalized)) errors.push(`document.grants repeats email "${normalized}"`);
@@ -5066,7 +5523,7 @@ function chapterFlowFieldContract(chapter, flow, application = chapter.applicati
 // src/gift-offers.ts
 var GIFT_OFFER_CATALOG_VERSION = 1;
 var MAX_GIFT_OFFERS = 20;
-var ID2 = /^[a-z][a-z0-9-]{1,79}$/;
+var ID3 = /^[a-z][a-z0-9-]{1,79}$/;
 var PRICE = /^price_[A-Za-z0-9]{12,}$/;
 var CURRENCY = /^[a-z]{3}$/;
 var record = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : null;
@@ -5099,7 +5556,7 @@ function validateGiftOfferCatalog(input, tierIds) {
     const allowed2 = /* @__PURE__ */ new Set(["id", "target", "billingMode", "stripePriceId", "priceCents", "currency", "redemptionLifetimeHours", "activeFrom", "activeUntil", "title", "description", "ctaLabel"]);
     for (const key3 of Object.keys(item)) if (!allowed2.has(key3)) errors.push(`${path}.${key3} is not supported`);
     const id6 = text3(item.id, `${path}.id`, errors, 80);
-    if (id6 && !ID2.test(id6)) errors.push(`${path}.id must be a lowercase kebab-case id`);
+    if (id6 && !ID3.test(id6)) errors.push(`${path}.id must be a lowercase kebab-case id`);
     if (ids2.has(id6)) errors.push(`${path}.id duplicates "${id6}"`);
     ids2.add(id6);
     const targetRaw = record(item.target);
@@ -5110,7 +5567,7 @@ function validateGiftOfferCatalog(input, tierIds) {
       target = { type: "tier", tierId };
     } else if (targetRaw?.type === "entitlement") {
       const entitlementKey = text3(targetRaw.entitlementKey, `${path}.target.entitlementKey`, errors, 80);
-      if (entitlementKey && !ID2.test(entitlementKey)) errors.push(`${path}.target.entitlementKey must be a lowercase kebab-case id`);
+      if (entitlementKey && !ID3.test(entitlementKey)) errors.push(`${path}.target.entitlementKey must be a lowercase kebab-case id`);
       target = { type: "entitlement", entitlementKey };
     } else errors.push(`${path}.target.type must be tier or entitlement`);
     if (item.billingMode !== "one_time" && item.billingMode !== "subscription") errors.push(`${path}.billingMode must be one_time or subscription`);
@@ -6194,7 +6651,7 @@ var handleMe = async (req, url, env, ctx) => {
     } catch {
     }
   }
-  return json({ ...base, memberAccess, membershipRestart, application: member?.application ?? null, namedSeatsEnabled: Boolean(memberAccess && ctx.membershipAuthority?.namedSeats && member?.source.stripeSubscriptionId && member.source.status !== "submitted") });
+  return json({ ...base, memberAccess, membershipRestart, application: member?.application ?? null, namedSeatsEnabled: Boolean(ctx.membershipAuthority?.namedSeats && member?.application.paid && member.source.status !== "submitted") });
 };
 var handleCrm = async (req, url, env, ctx) => {
   const crmBase = ctx.crmBase;
@@ -6896,7 +7353,7 @@ async function memberContentDigest(document) {
 }
 
 // src/member-content-validation-helpers.ts
-var ID3 = /^[a-z][a-z0-9-]{0,79}$/;
+var ID4 = /^[a-z][a-z0-9-]{0,79}$/;
 var SLUG2 = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 var ROOT_KEYS3 = /* @__PURE__ */ new Set(["schemaVersion", "revision", "generatedAt", "source", "target", "pages", "upsellOverrides"]);
 var SOURCE_KEYS = /* @__PURE__ */ new Set(["type", "appId"]);
@@ -6936,7 +7393,7 @@ function offerValue(value, path, errors, tiers, audience) {
   }
   unknownKeys2(raw2, OFFER_KEYS, path, errors);
   const tierId = textValue(raw2.tierId, `${path}.tierId`, errors, 80, true) ?? "";
-  if (tierId && !ID3.test(tierId)) errors.push(`${path}.tierId must be a lowercase kebab-case id`);
+  if (tierId && !ID4.test(tierId)) errors.push(`${path}.tierId must be a lowercase kebab-case id`);
   if (tiers.size && !tiers.has(tierId)) errors.push(`${path}.tierId must reference a declared tier`);
   if (audience?.kind === "tiers" && tierId && !audience.tierIds.includes(tierId)) {
     errors.push(`${path}.tierId must grant access to this page`);
@@ -6969,7 +7426,7 @@ function validateMemberContentDocument(input, options = {}) {
     const type = sourceRaw.type;
     const appId = textValue(sourceRaw.appId, "document.source.appId", errors, 63, true) ?? "";
     if (type !== "parent" && type !== "chapter") errors.push("document.source.type must be parent or chapter");
-    if (appId && !ID3.test(appId)) errors.push("document.source.appId must be a lowercase app slug");
+    if (appId && !ID4.test(appId)) errors.push("document.source.appId must be a lowercase app slug");
     if (options.sourceType && type !== options.sourceType) errors.push(`document.source.type must be ${options.sourceType}`);
     if (options.sourceAppId && appId !== options.sourceAppId) errors.push(`document.source.appId must be ${options.sourceAppId}`);
     if (type === "parent" || type === "chapter") source = { type, appId };
@@ -7006,7 +7463,7 @@ function validateMemberContentDocument(input, options = {}) {
     const id6 = textValue(raw2.id, `${path}.id`, errors, 80, true) ?? "";
     const slug = textValue(raw2.slug, `${path}.slug`, errors, 120, true) ?? "";
     const title = textValue(raw2.title, `${path}.title`, errors, MAX_TEXT, true) ?? "";
-    if (id6 && !ID3.test(id6)) errors.push(`${path}.id must be a lowercase kebab-case id`);
+    if (id6 && !ID4.test(id6)) errors.push(`${path}.id must be a lowercase kebab-case id`);
     if (slug && !SLUG2.test(slug)) errors.push(`${path}.slug must be a lowercase URL slug`);
     if (ids2.has(id6) || knownParentIds.has(id6)) errors.push(`${path}.id duplicates page "${id6}"`);
     if (slugs.has(slug) || (options.parentPages ?? []).some((page) => page.slug === slug)) errors.push(`${path}.slug duplicates "${slug}"`);
@@ -7933,7 +8390,7 @@ async function deliverAdmissionGrants(options) {
 }
 
 // src/worker-routes-network-admission.ts
-var PATH4 = "/api/admin/network/admissions";
+var PATH5 = "/api/admin/network/admissions";
 var RETRY_PATH = "/api/admin/network/admissions/retry";
 var REVOKE_PATH = "/api/admin/network/admissions/revoke";
 var MUTATION_ID2 = /^[A-Za-z0-9_-]{16,128}$/;
@@ -8013,11 +8470,11 @@ async function parseBody(req) {
   }
 }
 var handleAdminNetworkAdmissions = async (req, url, env, ctx) => {
-  if (![PATH4, RETRY_PATH, REVOKE_PATH].includes(url.pathname)) return null;
+  if (![PATH5, RETRY_PATH, REVOKE_PATH].includes(url.pathname)) return null;
   const auth = await gate2(req, env, ctx);
   if ("response" in auth) return auth.response;
   const db = auth.db;
-  if (url.pathname === PATH4 && req.method === "GET") {
+  if (url.pathname === PATH5 && req.method === "GET") {
     const targetId2 = url.searchParams.get("targetId") ?? "";
     const target2 = targetFor(ctx, targetId2);
     if (!target2) return reject6(404, "unknown_target", "admission target is not configured");
@@ -8291,10 +8748,10 @@ var handleSchedule = async (req, url, env, ctx) => {
 };
 
 // src/payments-stripe.ts
-import { stripeRequest as stripeRequest8, verifyStripeSignature as verifyStripeSignature2 } from "@odla-ai/stripe";
+import { stripeRequest as stripeRequest9, verifyStripeSignature as verifyStripeSignature2 } from "@odla-ai/stripe";
 
 // src/payments-refund.ts
-import { stripeRequest as stripeRequest5 } from "@odla-ai/stripe";
+import { stripeRequest as stripeRequest7 } from "@odla-ai/stripe";
 var row = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : {};
 var id2 = (value) => typeof value === "string" ? value : String(row(value).id ?? "");
 var providerId2 = (value, prefix) => new RegExp(`^${prefix}_[A-Za-z0-9]+$`).test(value);
@@ -8304,7 +8761,7 @@ function fail6(code = "refund_target_mismatch") {
 async function refundSubscriptionPayment(secretKey, input) {
   if (!providerId2(input.customerId, "cus") || !providerId2(input.subscriptionId, "sub")) fail6();
   const call = async (method, path, params, key3) => {
-    const result = await stripeRequest5({ secretKey }, method, path, params, key3 ? { idempotencyKey: key3 } : {});
+    const result = await stripeRequest7({ secretKey }, method, path, params, key3 ? { idempotencyKey: key3 } : {});
     if (!result.ok) fail6("stripe_error");
     if (!result.body || typeof result.body !== "object" || Array.isArray(result.body)) fail6("stripe_invalid_response");
     return result.body;
@@ -8378,35 +8835,13 @@ async function refundSubscriptionPayment(secretKey, input) {
 }
 
 // src/subscription-payment-identity.ts
-import { stripeRequest as stripeRequest7 } from "@odla-ai/stripe";
-
-// src/subscription-provider-contract.ts
-import { stripeRequest as stripeRequest6 } from "@odla-ai/stripe";
-function subscriptionContractMismatch() {
-  throw Object.assign(new Error("Stripe subscription does not match the checkout contract"), { code: "stripe_contract_mismatch" });
-}
-async function verifySubscriptionPrice(secretKey, input, resume = false) {
-  if (!/^price_[A-Za-z0-9]+$/.test(input.priceId) || !Number.isSafeInteger(input.priceCents) || input.priceCents <= 0 || !/^[a-z]{3}$/.test(input.currency) || !["month", "year"].includes(input.interval)) subscriptionContractMismatch();
-  const result = await stripeRequest6({ secretKey }, "GET", `/v1/prices/${encodeURIComponent(input.priceId)}`);
-  const price = result.body;
-  if (!result.ok || !price || price.id !== input.priceId || !resume && price.active !== true || price.unit_amount !== input.priceCents || price.currency !== input.currency || price.type !== "recurring" || price.billing_scheme !== "per_unit" || price.custom_unit_amount || price.transform_quantity || price.recurring?.interval !== input.interval || price.recurring?.interval_count !== 1 || price.recurring?.usage_type !== "licensed" || price.livemode !== (input.environment === "prod")) subscriptionContractMismatch();
-  return typeof price.product === "string" ? price.product : void 0;
-}
-function verifySubscriptionResult(sub, input, customerId, metadata) {
-  const items = sub?.items;
-  if (!sub || !/^sub_[A-Za-z0-9]+$/.test(sub.id) || sub.customer !== customerId || input.existingSubscriptionId && sub.id !== input.existingSubscriptionId || !(input.billingTerms?.initialTermEndsAt ? ["incomplete", "active", "trialing"] : ["incomplete", "active"]).includes(sub.status) || sub.livemode !== (input.environment === "prod") || !Object.entries(metadata).every(([key3, value]) => sub.metadata?.[key3] === value) || !Array.isArray(items?.data) || items.has_more !== false || items.data.length !== 1 || items.data[0]?.price?.id !== input.priceId || items.data[0]?.quantity !== 1) subscriptionContractMismatch();
-  const invoice = sub.latest_invoice;
-  if (!invoice || typeof invoice !== "object" || invoice.customer !== customerId || invoice.currency !== input.currency || invoice.total !== subscriptionAmountDue(input) || invoice.billing_reason !== "subscription_create") subscriptionContractMismatch();
-  verifySubscriptionBillingResult(sub, input);
-}
-
-// src/subscription-payment-identity.ts
+import { stripeRequest as stripeRequest8 } from "@odla-ai/stripe";
 var id3 = (value) => typeof value === "string" ? value : String(value?.id ?? "");
 async function tagSubscriptionPayment(secretKey, invoice, customerId, metadata, clientSecret2, applicationId) {
   let paymentId = id3(invoice.payment_intent);
   if (!paymentId) {
     if (!/^in_[A-Za-z0-9]+$/.test(id3(invoice))) subscriptionContractMismatch();
-    const result2 = await stripeRequest7({ secretKey }, "GET", "/v1/invoice_payments", { invoice: id3(invoice), limit: 100 });
+    const result2 = await stripeRequest8({ secretKey }, "GET", "/v1/invoice_payments", { invoice: id3(invoice), limit: 100 });
     const list = result2.body;
     if (!result2.ok || list?.has_more !== false || !Array.isArray(list.data) || list.data.length !== 1) subscriptionContractMismatch();
     const link = list.data[0];
@@ -8415,11 +8850,11 @@ async function tagSubscriptionPayment(secretKey, invoice, customerId, metadata,
   }
   if (!/^pi_[A-Za-z0-9]+$/.test(paymentId)) subscriptionContractMismatch();
   const path = `/v1/payment_intents/${paymentId}`;
-  const result = await stripeRequest7({ secretKey }, "GET", path);
+  const result = await stripeRequest8({ secretKey }, "GET", path);
   const payment = result.body;
   if (!result.ok || payment?.id !== paymentId || id3(payment.customer) !== customerId || payment.amount !== invoice.total || payment.currency !== invoice.currency || payment.client_secret !== clientSecret2 || payment.livemode !== (metadata.odlaEnvironment === "prod") || !Object.entries(metadata).every(([key3, value]) => payment.metadata?.[key3] === void 0 || payment.metadata[key3] === value)) subscriptionContractMismatch();
   if (Object.entries(metadata).every(([key3, value]) => payment.metadata?.[key3] === value)) return;
-  const tagged = await stripeRequest7(
+  const tagged = await stripeRequest8(
     { secretKey },
     "POST",
     path,
@@ -8431,7 +8866,7 @@ async function tagSubscriptionPayment(secretKey, invoice, customerId, metadata,
 
 // src/payments-stripe.ts
 async function stripeCall(sk, method, path, params, idempotencyKey) {
-  return stripeRequest8(
+  return stripeRequest9(
     { secretKey: sk },
     method,
     path,
@@ -9214,6 +9649,7 @@ async function namedSeatOfferDigest(offer) {
   ])));
   return [...new Uint8Array(bytes)].map((byte) => byte.toString(16).padStart(2, "0")).join("");
 }
+var at = (value) => Number.isSafeInteger(value) ? Number(value) : void 0;
 async function readNamedSeatOffer(db, input, now) {
   membershipClock(now);
   await loadMembershipAuthorityState(db, input);
@@ -9236,10 +9672,19 @@ async function readNamedSeatOffer(db, input, now) {
       seatId: String(seat.id),
       status: String(seat.status),
       recipientName: String(seat.recipientName),
-      recipientEmail: String(seat.recipientEmailNormalized)
+      recipientEmail: String(seat.recipientEmailNormalized),
+      recipientState: namedSeatRecipientState(seat),
+      ...at(seat.purchasedAt) !== void 0 ? { purchasedAt: at(seat.purchasedAt) } : {},
+      ...at(seat.acceptedAt) !== void 0 ? { acceptedAt: at(seat.acceptedAt) } : {},
+      ...seat.status === "active" && at(seat.journeyApprovedAt) !== void 0 ? { joinedAt: at(seat.journeyApprovedAt) } : {}
     } } : {}
   };
-  return { ...offer, digest: await namedSeatOfferDigest(offer), purchaseWindowed: offering.seatPurchaseWindowCalendarMonths !== void 0 };
+  return {
+    ...offer,
+    digest: await namedSeatOfferDigest(offer),
+    included: offering.seatPriceCents === 0,
+    purchaseWindowed: offering.seatPurchaseWindowCalendarMonths !== void 0
+  };
 }
 
 // src/named-seat-request.ts
@@ -9315,8 +9760,9 @@ var handleNamedSeat = async (req, url, env, ctx) => {
     if (recipientName.length < 2 || /[\u0000-\u001f\u007f]/.test(body.recipientName) || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(recipientEmail) || recipientEmail === normalizeChapterEmail(user.email)) {
       return json({ error: "a valid name and email for someone other than the purchaser are required" }, 400);
     }
-    if (!offer.eligible || body.quoteDigest !== offer.digest) return json({ error: "seat offer changed or is unavailable; refresh before paying" }, 409);
-    if (!group?.stripePublishableKey || !group.refundPolicyText || !group.merchantDisclosureText) return json({ error: "seat checkout disclosures unavailable" }, 503);
+    const granted = offer.included && offer.seat !== void 0 && offer.seat.recipientEmail === recipientEmail && offer.seat.recipientName === recipientName && ["pending_acceptance", "pending_approval", "pending_primary", "active"].includes(offer.seat.status);
+    if (!offer.eligible && !granted || body.quoteDigest !== offer.digest) return json({ error: "seat offer changed or is unavailable; refresh before paying" }, 409);
+    if (!group?.refundPolicyText || !group.merchantDisclosureText || !offer.included && !group.stripePublishableKey) return json({ error: "seat checkout disclosures unavailable" }, 503);
     const consentId = `${offer.membershipId}:named-seat-consent`;
     const prior = await membershipLoad(db, "namedSeatConsents", consentId);
     const attrs = {
@@ -9355,7 +9801,7 @@ var handleNamedSeat = async (req, url, env, ctx) => {
     }
     return json({
       ...receipt,
-      publishableKey: String(group.stripePublishableKey),
+      ...group.stripePublishableKey ? { publishableKey: String(group.stripePublishableKey) } : {},
       lineItems: { standardCents: offer.amountCents, discountCents: 0, dueTodayCents: offer.amountCents }
     });
   } catch {
@@ -10218,6 +10664,7 @@ function dashboardMetricData(points, now) {
 }
 
 // src/chapter-billing-amount.ts
+var hasProviderDiscount = (sub, items) => Boolean(sub?.discount || Array.isArray(sub?.discounts) && sub.discounts.length || items.some((it) => it.discounts?.length));
 function chapterBillingAmount(sub, intent, env) {
   const unknown = { amountCents: null, listAmountCents: null, interval: "year", annualCents: null };
   const items = sub?.items?.data;
@@ -10234,10 +10681,11 @@ function chapterBillingAmount(sub, intent, env) {
       const primary = items.filter((it) => it.price?.id === intent.priceId);
       if (primary.length !== 1 || primary[0].quantity !== 1 || primary[0].price.unit_amount !== intent.priceCents || intent.interval !== interval || intent.currency !== "usd") return { ...unknown, listAmountCents, interval };
       if (terms2?.discount?.duration === "forever") amountCents = listAmountCents - intent.priceCents + Math.round(intent.priceCents * (1e4 - terms2.discount.percentOffBps) / 1e4);
+      else if (hasProviderDiscount(sub, items)) amountCents = null;
     } catch {
       amountCents = null;
     }
-  } else if (sub?.discount || Array.isArray(sub?.discounts) && sub.discounts.length || items.some((it) => it.discounts?.length)) amountCents = null;
+  } else if (hasProviderDiscount(sub, items)) amountCents = null;
   return { amountCents, listAmountCents, interval, annualCents: amountCents === null ? null : amountCents * (interval === "month" ? 12 : 1) };
 }
 function chapterBillingActive(sub, app) {
@@ -11155,7 +11603,7 @@ async function networkApplicationAction(opts) {
     if (app.status !== input.expectedStage || !applicationActionStages(app, env, ctx).includes(input.stage)) {
       return json({ error: "application action is no longer available; reload", code: "invalid_application_action" }, 409);
     }
-    const at = Date.now();
+    const at2 = Date.now();
     const meta = { [ACTION_META]: {
       version: 1,
       state: "pending",
@@ -11175,7 +11623,7 @@ async function networkApplicationAction(opts) {
         recordId: record4.id,
         kind: "note",
         authorId: `network:${sourceId}`,
-        createdAt: at,
+        createdAt: at2,
         body: `Requested ${input.expectedStage} \u2192 ${input.stage} from ${sourceId}`,
         meta
       } },
@@ -11184,7 +11632,7 @@ async function networkApplicationAction(opts) {
         recordId: record4.id,
         kind: "note",
         authorId: `network:${sourceId}`,
-        createdAt: at,
+        createdAt: at2,
         body: "Application operation reconciliation",
         meta: { state: "pending", activityId }
       } }
@@ -12035,9 +12483,9 @@ function normalizeNetworkIdentity(kind, value) {
   return trimmed;
 }
 function emailLooksReal(value) {
-  const at = value.lastIndexOf("@");
-  if (at <= 0 || at === value.length - 1) return false;
-  const domain = value.slice(at + 1).toLowerCase();
+  const at2 = value.lastIndexOf("@");
+  if (at2 <= 0 || at2 === value.length - 1) return false;
+  const domain = value.slice(at2 + 1).toLowerCase();
   return !domain.endsWith(".invalid") && domain !== "example.com" && domain !== "example.test";
 }
 function validateNetworkPersonImport(input, allowedChapterIds) {
@@ -12825,7 +13273,7 @@ async function revealNetworkPersonRegistryRecord(db, input, mutationId, actor, n
 }
 
 // src/worker-routes-network-person-registry.ts
-var PATH5 = "/api/admin/network-person-registry";
+var PATH6 = "/api/admin/network-person-registry";
 var MAX_BODY2 = 8 * 1024 * 1024;
 var MUTATION_ID4 = /^[A-Za-z0-9_-]{16,128}$/;
 var positiveRevision = (value) => {
@@ -12850,7 +13298,7 @@ function registryError(error) {
   return null;
 }
 var handleAdminNetworkPersonRegistry = async (req, url, env, ctx) => {
-  if (url.pathname !== PATH5) return null;
+  if (url.pathname !== PATH6) return null;
   if (!ctx.chapter.networkPersonRegistry) return json({ error: "not found" }, 404);
   if (req.method !== "GET" && req.method !== "POST") return json({ error: "method not allowed" }, 405);
   if (req.method === "POST" && Number(req.headers.get("content-length") ?? 0) > MAX_BODY2) {
@@ -13596,7 +14044,7 @@ var handleFormation = async (req, url, env, ctx) => {
 import { verifyFederatedRequest as verifyFederatedRequest9 } from "@odla-ai/db";
 
 // src/builder-library-validation.ts
-var ID4 = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
+var ID5 = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 var APP_ID = /^[a-z0-9][a-z0-9-]{1,62}$/;
 var MAX_RESOURCES = 200;
 var MAX_MARKDOWN3 = 65536;
@@ -13657,7 +14105,7 @@ function resourceValue(value, path, errors) {
   }
   unknownKeys3(raw2, RESOURCE_KEYS, path, errors);
   const id6 = text7(raw2.id, `${path}.id`, errors, 80) ?? "";
-  if (id6 && !ID4.test(id6)) errors.push(`${path}.id must be lowercase kebab-case`);
+  if (id6 && !ID5.test(id6)) errors.push(`${path}.id must be lowercase kebab-case`);
   const kind = text7(raw2.kind, `${path}.kind`, errors) ?? "";
   if (!KINDS.has(kind)) errors.push(`${path}.kind is unsupported`);
   const title = text7(raw2.title, `${path}.title`, errors, 240) ?? "";
@@ -14079,7 +14527,7 @@ var handleAdminBuilderLibrary = async (req, url, env, ctx) => {
 };
 
 // src/membership-cancel-authority.ts
-import { stripeRequest as stripeRequest9 } from "@odla-ai/stripe";
+import { stripeRequest as stripeRequest10 } from "@odla-ai/stripe";
 async function cancelMembershipAtTermEnd(db, target, now, stripeSecret) {
   membershipClock(now);
   const id6 = await networkMembershipId(target);
@@ -14090,14 +14538,14 @@ async function cancelMembershipAtTermEnd(db, target, now, stripeSecret) {
     membershipFail("membership_cancellation_unavailable");
   }
   const path = `/v1/subscriptions/${encodeURIComponent(String(member.providerSubscriptionId))}`;
-  const read2 = await stripeRequest9({ secretKey: stripeSecret }, "GET", path);
+  const read2 = await stripeRequest10({ secretKey: stripeSecret }, "GET", path);
   const sub = read2.body;
   if (!read2.ok || sub.id !== member.providerSubscriptionId || sub.customer !== member.providerCustomerId || sub.livemode !== (target.environment === "prod") || !Object.entries({
     ...stripePartitionMetadata(target),
     applicationId: target.applicationId
   }).every(([key3, value]) => sub.metadata?.[key3] === value)) membershipFail("membership_cancellation_provider_mismatch");
   if (sub.status !== "canceled" && sub.cancel_at_period_end !== true) {
-    const write = await stripeRequest9(
+    const write = await stripeRequest10(
       { secretKey: stripeSecret },
       "POST",
       path,
@@ -14319,7 +14767,7 @@ async function refundNetworkMembership(db, input, secretKey, now) {
 }
 
 // src/membership-provider-lifecycle.ts
-import { stripeRequest as stripeRequest10 } from "@odla-ai/stripe";
+import { stripeRequest as stripeRequest11 } from "@odla-ai/stripe";
 
 // src/membership-renewal-authority.ts
 async function reconcileMembershipRenewal(db, input, now) {
@@ -14356,7 +14804,9 @@ async function reconcileMembershipRenewal(db, input, now) {
     if (start !== member.termEndsAt || start > now + 3e4) membershipFail("membership_renewal_period_gap");
     const seat = member.namedSeatId ? await membershipLoad(db, "networkSeat", String(member.namedSeatId)) : void 0;
     if (seat) requireMembershipScope(seat, input);
-    const billedSeat = seat && seat.providerSubscriptionId === member.providerSubscriptionId && seat.providerSubscriptionItemId && !["refunded", "refund_pending"].includes(String(seat.status)) ? seat : void 0;
+    const openSeat = seat && !["refunded", "refund_pending", "canceled"].includes(String(seat.status)) ? seat : void 0;
+    const billedSeat = openSeat && openSeat.providerSubscriptionId === member.providerSubscriptionId && openSeat.providerSubscriptionItemId ? openSeat : void 0;
+    const carriedSeat = billedSeat ?? (openSeat && namedSeatIncluded(openSeat) && openSeat.purchasedAt !== void 0 ? openSeat : void 0);
     const prices = [String(member.providerPriceId), ...billedSeat ? [String(billedSeat.priceId)] : []].sort();
     const amount = Number(member.renewalAmountCents) + Number(billedSeat?.amountCents ?? 0);
     if (!Number.isSafeInteger(amount) || amount <= 0 || fact.invoiceTotalCents !== amount || JSON.stringify(lines.map((line) => line.priceId).sort()) !== JSON.stringify(prices)) membershipFail("membership_renewal_amount_mismatch");
@@ -14396,19 +14846,19 @@ async function reconcileMembershipRenewal(db, input, now) {
       evidenceGuard
     ];
     if (seat) guards.push({ ns: "networkSeat", id: String(seat.id), exists: true, equals: { revision: seat.revision } });
-    if (billedSeat?.entitlementId) {
-      const seatEntitlement = await membershipLoad(db, "networkEntitlement", String(billedSeat.entitlementId));
+    if (carriedSeat?.entitlementId) {
+      const seatEntitlement = await membershipLoad(db, "networkEntitlement", String(carriedSeat.entitlementId));
       requireMembershipScope(seatEntitlement, input);
       guards.push({ ns: "networkEntitlement", id: String(seatEntitlement.id), exists: true, equals: { revision: seatEntitlement.revision } });
       ops.push(
-        membershipUpdate("networkSeat", String(billedSeat.id), {
+        membershipUpdate("networkSeat", String(carriedSeat.id), {
           ...paid ? { termStartedAt: start, termEndsAt: end } : {},
-          revision: Number(billedSeat.revision) + 1,
+          revision: Number(carriedSeat.revision) + 1,
           updatedAt: now
         }),
         membershipUpdate("networkEntitlement", String(seatEntitlement.id), {
           ...paid ? { termStartedAt: start, termEndsAt: end } : {},
-          status: billedSeat.journeyApprovedAt ? entitlementStatus : seatEntitlement.status,
+          status: carriedSeat.journeyApprovedAt ? entitlementStatus : seatEntitlement.status,
           revision: Number(seatEntitlement.revision) + 1,
           updatedAt: now
         })
@@ -14481,7 +14931,7 @@ async function reconcileMembershipBilling(db, input, now, stripeSecretName = "st
     }
     if (fact.subscriptionId !== member.providerSubscriptionId || fact.objectKind !== "subscription") membershipFail("membership_billing_scope_mismatch");
     if (["refund_pending", "refunded", "declined", "canceled", "restarting"].includes(String(member.status))) return receipt();
-    const result = await stripeRequest10({ secretKey: sk }, "GET", `/v1/subscriptions/${encodeURIComponent(String(member.providerSubscriptionId))}`);
+    const result = await stripeRequest11({ secretKey: sk }, "GET", `/v1/subscriptions/${encodeURIComponent(String(member.providerSubscriptionId))}`);
     const sub = result.body;
     if (!result.ok || sub.id !== member.providerSubscriptionId || sub.customer !== member.providerCustomerId || sub.livemode !== (input.environment === "prod") || typeof sub.cancel_at_period_end !== "boolean" || !["active", "trialing", "past_due", "unpaid", "canceled"].includes(sub.status) || !Object.entries({ ...stripePartitionMetadata(input), applicationId: input.applicationId }).every(([key3, value]) => sub.metadata?.[key3] === value)) {
       membershipFail("membership_billing_provider_mismatch");
@@ -14518,86 +14968,8 @@ async function reconcileMembershipBilling(db, input, now, stripeSecretName = "st
   return membershipFail("membership_billing_retry_required");
 }
 
-// src/membership-seat-reservation.ts
-async function recipientKey(input, email) {
-  const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(JSON.stringify([input.appId, input.chapterId, input.environment, input.runtime, email])));
-  return `seat-recipient:${[...new Uint8Array(digest)].map((byte) => byte.toString(16).padStart(2, "0")).join("")}`;
-}
-async function reserveNamedMembershipSeat(db, input, now) {
-  membershipClock(now);
-  const name = typeof input.recipientName === "string" ? input.recipientName.trim().replace(/\s+/g, " ") : "";
-  const email = normalizeChapterEmail(typeof input.recipientEmail === "string" ? input.recipientEmail : "");
-  const purchaser = normalizeChapterEmail(typeof input.purchaserEmail === "string" ? input.purchaserEmail : "");
-  if (name.length < 2 || name.length > 160 || /[\u0000-\u001f\u007f]/.test(input.recipientName) || email.length > 254 || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email) || !purchaser || email === purchaser || !/^price_[A-Za-z0-9_]+$/.test(input.priceId) || !/^user_[A-Za-z0-9_]+$/.test(input.purchaserUserId)) membershipFail("invalid_named_seat_recipient");
-  const state = await loadMembershipAuthorityState(db, input);
-  const memberId = await networkMembershipId(input), member = await membershipLoad(db, "networkMembership", memberId);
-  requireMembershipScope(member, input);
-  if (!Number.isSafeInteger(member.revision) || !/^price_[A-Za-z0-9_]+$/.test(String(member.providerPriceId)) || member.providerPriceId === input.priceId) membershipFail("named_seat_purchase_unavailable");
-  const id6 = (await membershipOfferIdForRequest({ ...input, requestId: "named_seat" })).replace(/^offer_/, "seat_");
-  let seat = await membershipLoad(db, "networkSeat", id6);
-  if (!seat) {
-    const offering = membershipOfferingVersion(member.offeringSnapshot), claimId = await recipientKey(input, email);
-    const purchaseEndsAt = seatPurchaseDeadline(offering, member);
-    if (!["paid_pending_approval", "active", "cancel_at_term_end"].includes(String(member.status)) || Number(member.refundedCents) !== 0 || now < Number(member.initialTermStartedAt) || now >= Number(member.termEndsAt) || now > purchaseEndsAt || !Number.isSafeInteger(purchaseEndsAt) || member.namedSeatId !== void 0) {
-      membershipFail("named_seat_purchase_unavailable");
-    }
-    const attrs = {
-      id: id6,
-      ...membershipScope(input),
-      primaryMembershipId: memberId,
-      recipientName: name,
-      recipientEmailNormalized: email,
-      purchaserUserId: input.purchaserUserId,
-      recipientClaimId: claimId,
-      priceId: input.priceId,
-      primaryPriceId: member.providerPriceId,
-      amountCents: offering.seatPriceCents,
-      currency: offering.currency,
-      interval: offering.interval,
-      providerCustomerId: member.providerCustomerId,
-      providerSubscriptionId: member.providerSubscriptionId,
-      status: "payment_pending",
-      preparedAt: now,
-      termEndsAt: member.termEndsAt,
-      seatPurchaseEndsAt: purchaseEndsAt,
-      offeringSnapshot: offering,
-      revision: 1,
-      createdAt: now,
-      updatedAt: now
-    };
-    try {
-      await db.transact([
-        membershipUpdate("networkSeat", id6, attrs),
-        membershipUpdate("networkSeatRecipient", claimId, {
-          id: claimId,
-          appId: input.appId,
-          chapterId: input.chapterId,
-          environment: input.environment,
-          runtime: input.runtime,
-          seatId: id6,
-          recipientEmailNormalized: email,
-          createdAt: now
-        }),
-        membershipUpdate("networkMembership", memberId, { namedSeatId: id6, revision: Number(member.revision) + 1, updatedAt: now })
-      ], { mutationId: `named-seat-reserve:${id6}`, guards: [
-        { ns: "networkSeat", id: id6, exists: false },
-        { ns: "networkSeatRecipient", id: claimId, exists: false },
-        { ns: "networkMembership", id: memberId, exists: true, equals: { revision: member.revision }, absent: ["namedSeatId"] },
-        { ns: "membershipAuthorityState", id: String(state.id), exists: true, equals: { mode: "authoritative", revision: state.revision } }
-      ] });
-    } catch (error) {
-      if (error.code !== "transact_guard_failed") throw error;
-    }
-    seat = await membershipLoad(db, "networkSeat", id6);
-    if (!seat && await membershipLoad(db, "networkSeatRecipient", claimId)) membershipFail("named_seat_recipient_unavailable");
-  }
-  requireMembershipScope(seat, input);
-  if (seat.primaryMembershipId !== memberId || seat.recipientName !== name || seat.recipientEmailNormalized !== email || seat.priceId !== input.priceId || seat.purchaserUserId !== input.purchaserUserId) membershipFail("named_seat_purchase_conflict");
-  return seat;
-}
-
 // src/membership-seat-stripe.ts
-import { stripeRequest as stripeRequest11 } from "@odla-ai/stripe";
+import { stripeRequest as stripeRequest12 } from "@odla-ai/stripe";
 var reject7 = () => {
   throw Object.assign(new Error("named seat provider contract mismatch"), { code: "named_seat_provider_mismatch" });
 };
@@ -14609,7 +14981,7 @@ var metadataFor = (seat) => ({
 });
 var matches = (value, expected) => value && Object.entries(expected).every(([key3, item]) => value[key3] === item);
 async function read(sk, path, params) {
-  const response = await stripeRequest11({ secretKey: sk }, "GET", path, params);
+  const response = await stripeRequest12({ secretKey: sk }, "GET", path, params);
   if (!response.ok) return reject7();
   return response.body;
 }
@@ -14632,9 +15004,9 @@ async function subscriptionForSeat(sk, seat) {
   if (!Array.isArray(discounts) || discounts.length > 5) reject7();
   for (const discount of discounts) {
     const couponRef = discount.source?.coupon ?? discount.coupon;
-    const couponId2 = typeof couponRef === "string" ? couponRef : couponRef?.id;
-    if (!couponId2 || typeof couponId2 !== "string") reject7();
-    const coupon = await read(sk, `/v1/coupons/${encodeURIComponent(couponId2)}`, { "expand[0]": "applies_to" });
+    const couponId = typeof couponRef === "string" ? couponRef : couponRef?.id;
+    if (!couponId || typeof couponId !== "string") reject7();
+    const coupon = await read(sk, `/v1/coupons/${encodeURIComponent(couponId)}`, { "expand[0]": "applies_to" });
     if (coupon.livemode !== (seat.environment === "prod") || !Array.isArray(coupon.applies_to?.products) || coupon.applies_to.products.length !== 1 || coupon.applies_to.products[0] !== primary.price.product) reject7();
   }
   return sub;
@@ -14646,11 +15018,11 @@ async function createNamedSeatStripePayment(sk, seat, now) {
   }
   await subscriptionForSeat(sk, seat);
   const metadata = metadataFor(seat);
-  const result = seat.providerPaymentIntentId ? await stripeRequest11(
+  const result = seat.providerPaymentIntentId ? await stripeRequest12(
     { secretKey: sk },
     "GET",
     `/v1/payment_intents/${encodeURIComponent(seat.providerPaymentIntentId)}`
-  ) : await stripeRequest11({ secretKey: sk }, "POST", "/v1/payment_intents", {
+  ) : await stripeRequest12({ secretKey: sk }, "POST", "/v1/payment_intents", {
     amount: seat.amountCents,
     currency: seat.currency,
     customer: seat.providerCustomerId,
@@ -14668,7 +15040,7 @@ async function attachNamedSeatStripeRenewal(sk, seat) {
   const sub = await subscriptionForSeat(sk, seat);
   const existing = sub.items.data.find((item2) => item2.metadata?.seatId === seat.id);
   if (existing) return String(existing.id);
-  const result = await stripeRequest11({ secretKey: sk }, "POST", "/v1/subscription_items", {
+  const result = await stripeRequest12({ secretKey: sk }, "POST", "/v1/subscription_items", {
     subscription: seat.providerSubscriptionId,
     price: seat.priceId,
     quantity: 1,
@@ -14683,6 +15055,7 @@ async function attachNamedSeatStripeRenewal(sk, seat) {
 // src/membership-seat-checkout.ts
 async function prepareNamedMembershipSeatPayment(db, input, secretKey, now) {
   let seat = await reserveNamedMembershipSeat(db, input, now);
+  if (namedSeatIncluded(seat)) membershipFail("named_seat_included");
   const state = await loadMembershipAuthorityState(db, input);
   const member = await membershipLoad(db, "networkMembership", seat.primaryMembershipId);
   requireMembershipScope(member, input);
@@ -14889,7 +15262,7 @@ async function recordRecipient(db, input, now, approve) {
     requireMembershipScope(member, input);
     const entitlement = await membershipLoad(db, "networkEntitlement", String(seat.entitlementId));
     requireMembershipScope(entitlement, input);
-    if (!["pending_acceptance", "pending_approval", "pending_primary", "active"].includes(String(seat.status)) || !["paid_pending_approval", "active", "cancel_at_term_end"].includes(String(member.status)) || Number(member.refundedCents) !== 0 || now >= Number(member.termEndsAt) || !seat.providerPaymentIntentId || !seat.providerSubscriptionItemId) membershipFail("named_seat_acceptance_unavailable");
+    if (!["pending_acceptance", "pending_approval", "pending_primary", "active"].includes(String(seat.status)) || !["paid_pending_approval", "active", "cancel_at_term_end"].includes(String(member.status)) || Number(member.refundedCents) !== 0 || now >= Number(member.termEndsAt) || !namedSeatSettled(seat)) membershipFail("named_seat_acceptance_unavailable");
     if (seat.acceptedAt === void 0) {
       if (approve || normalizeChapterEmail(input.verifiedRecipientEmail) !== seat.recipientEmailNormalized) {
         membershipFail("named_seat_recipient_verification_required");
@@ -15076,6 +15449,15 @@ async function handleMembershipSeatAction(action, db, peer, input, now, stripeSe
   };
   if (action === "seat-accept") return acceptNamedSeatRecipient(db, recipientInput, now);
   if (action === "seat-approve") return approveNamedSeatRecipient(db, recipientInput, now);
+  const checkout = {
+    ...target,
+    priceId: peer.seatPriceId,
+    recipientName: String(input.recipientName),
+    recipientEmail: String(input.recipientEmail),
+    purchaserEmail: String(input.purchaserEmail),
+    purchaserUserId: String(input.purchaserUserId)
+  };
+  if (action === "seat-checkouts" && namedSeatIncluded(await reserveNamedMembershipSeat(db, checkout, now))) return grantIncludedNamedSeat(db, checkout, now);
   const secret = await getVaultSecret(db, stripeSecretName);
   if (!secret) throw new Error("network Stripe provider is unavailable");
   if (action === "seat-decline") {
@@ -15091,14 +15473,7 @@ async function handleMembershipSeatAction(action, db, peer, input, now, stripeSe
     return { seatId: seat.id, status: "refunded", refundedCents: refunded.refundedCents, subscriptionCanceled: false };
   }
   if (action === "seat-operator-refund") return refundNamedSeatByOperator(db, { ...target, seatId: String(input.seatId) }, secret, now);
-  if (action === "seat-checkouts") return prepareNamedMembershipSeatPayment(db, {
-    ...target,
-    priceId: peer.seatPriceId,
-    recipientName: String(input.recipientName),
-    recipientEmail: String(input.recipientEmail),
-    purchaserEmail: String(input.purchaserEmail),
-    purchaserUserId: String(input.purchaserUserId)
-  }, secret, now);
+  if (action === "seat-checkouts") return prepareNamedMembershipSeatPayment(db, checkout, secret, now);
   const evidence = { ...target, seatId: String(input.seatId), eventId: String(input.eventId) };
   if (action === "seat-payments") {
     const receipt = await confirmNamedMembershipSeatPayment(db, evidence, now);
@@ -15120,7 +15495,7 @@ var respond = (body, status2 = 200) => new Response(JSON.stringify(body), {
   status: status2,
   headers: { "content-type": "application/json", "cache-control": "no-store" }
 });
-var SAFE = /^[A-Za-z0-9][A-Za-z0-9_.:-]{2,159}$/;
+var SAFE2 = /^[A-Za-z0-9][A-Za-z0-9_.:-]{2,159}$/;
 var SAFE_ERROR = /* @__PURE__ */ new Set([
   "offer_identity_conflict",
   "membership_authority_unavailable",
@@ -15168,7 +15543,7 @@ function createMembershipAuthorityHandler(options) {
   if (options.stripeSecretName !== void 0 && !/^[A-Za-z][A-Za-z0-9_-]{1,127}$/.test(options.stripeSecretName)) throw new TypeError("invalid Stripe secret slot");
   const identities = /* @__PURE__ */ new Set();
   for (const peer of peers) {
-    if (!/^[a-z0-9][a-z0-9-]{1,62}$/.test(peer.appId) || !SAFE.test(peer.chapterId) || !/^[a-z0-9][a-z0-9-]{1,31}$/.test(peer.environment) || !/^[a-z0-9]{2,12}$/.test(peer.runtime) || !/^[A-Za-z][A-Za-z0-9_-]{1,127}$/.test(peer.secretName)) throw new TypeError("invalid authority peer");
+    if (!/^[a-z0-9][a-z0-9-]{1,62}$/.test(peer.appId) || !SAFE2.test(peer.chapterId) || !/^[a-z0-9][a-z0-9-]{1,31}$/.test(peer.environment) || !/^[a-z0-9]{2,12}$/.test(peer.runtime) || !/^[A-Za-z][A-Za-z0-9_-]{1,127}$/.test(peer.secretName)) throw new TypeError("invalid authority peer");
     const identity = `${peer.appId}:${peer.runtime}`;
     if (identities.has(identity)) throw new TypeError("ambiguous authority peer");
     identities.add(identity);
@@ -15202,7 +15577,7 @@ function createMembershipAuthorityHandler(options) {
       try {
         input = JSON.parse(verified.body);
         const fields = action === "seat-invitation" ? MEMBERSHIP_SEAT_ACTION_FIELDS[action] : action === "offer-preview" ? ["skuId"] : ["applicationId", "skuId", ...action === "offers" ? ["requestId"] : action === "checkouts" ? ["offerId", "offerDigest", "quoteDigest", "priceId"] : action === "payments" ? ["eventId", "providerSubscriptionId", "providerCustomerId"] : action === "renewals" ? ["eventId"] : action === "restarts" ? ["previousSubscriptionId"] : MEMBERSHIP_SEAT_ACTION_FIELDS[action] ?? []];
-        if (!input || typeof input !== "object" || Array.isArray(input) || Object.keys(input).some((key3) => !fields.includes(key3)) || !fields.every((key3) => typeof input[key3] === "string" && (["recipientName", "recipientEmail", "purchaserEmail", "verifiedRecipientEmail"].includes(key3) ? input[key3].length > 0 && input[key3].length <= 254 && !/[\u0000-\u001f\u007f]/.test(input[key3]) : SAFE.test(input[key3])))) {
+        if (!input || typeof input !== "object" || Array.isArray(input) || Object.keys(input).some((key3) => !fields.includes(key3)) || !fields.every((key3) => typeof input[key3] === "string" && (["recipientName", "recipientEmail", "purchaserEmail", "verifiedRecipientEmail"].includes(key3) ? input[key3].length > 0 && input[key3].length <= 254 && !/[\u0000-\u001f\u007f]/.test(input[key3]) : SAFE2.test(input[key3])))) {
           throw new TypeError("invalid request");
         }
       } catch {
@@ -15539,7 +15914,7 @@ function createMembershipAuthorityStorage(db, secretNames) {
 }
 
 // src/membership-seat-cancel.ts
-import { initStripe as initStripe3, stripeRequest as stripeRequest12 } from "@odla-ai/stripe";
+import { initStripe as initStripe3, stripeRequest as stripeRequest13 } from "@odla-ai/stripe";
 async function cancelUnpaidNamedSeat(db, target, secretKey, now) {
   membershipClock(now);
   const state = await loadMembershipAuthorityState(db, target);
@@ -15567,7 +15942,7 @@ async function cancelUnpaidNamedSeat(db, target, secretKey, now) {
   }
   const metadata = { ...stripePartitionMetadata(target), applicationId: target.applicationId, membershipId: seat.primaryMembershipId, seatId: seat.id };
   const request = async (method, path, params) => {
-    const result = await stripeRequest12(
+    const result = await stripeRequest13(
       { secretKey },
       method,
       path,
@@ -15954,13 +16329,13 @@ async function requestNamedSeatDecline(options) {
     verifiedRecipientEmail: options.verifiedRecipientEmail
   });
   const seat = result.seat;
-  if (!seat || seat.seatId !== options.seatId || seat.status !== "refunded" || seat.subscriptionCanceled !== false || !Number.isSafeInteger(seat.refundedCents) || seat.refundedCents <= 0) throw new Error("invalid named seat refund receipt");
+  if (!seat || seat.seatId !== options.seatId || seat.status !== "refunded" || seat.subscriptionCanceled !== false || !Number.isSafeInteger(seat.refundedCents) || seat.refundedCents < 0) throw new Error("invalid named seat refund receipt");
   return seat;
 }
 async function requestNamedSeatOperatorRefund(options) {
   const result = await requestAuthority(options, "seat-operator-refund", { applicationId: options.applicationId, skuId: options.skuId, seatId: options.seatId });
   const seat = result.seat;
-  if (!seat || seat.seatId !== options.seatId || seat.status !== "refunded" || seat.subscriptionCanceled !== false || !Number.isSafeInteger(seat.refundedCents) || seat.refundedCents <= 0) throw new Error("invalid named seat refund receipt");
+  if (!seat || seat.seatId !== options.seatId || seat.status !== "refunded" || seat.subscriptionCanceled !== false || !Number.isSafeInteger(seat.refundedCents) || seat.refundedCents < 0) throw new Error("invalid named seat refund receipt");
   return seat;
 }
 async function requestNamedSeatReservation(options) {
@@ -15974,13 +16349,13 @@ async function requestNamedSeatReservation(options) {
   });
   const seat = result.seat;
   const expected = (await membershipOfferIdForRequest({ ...options, requestId: "named_seat" })).replace(/^offer_/, "seat_");
-  if (!seat || seat.seatId !== expected || !Number.isSafeInteger(seat.amountCents) || seat.amountCents <= 0 || !/^[a-z]{3}$/.test(seat.currency) || !Number.isSafeInteger(seat.termEndsAt)) throw new Error("invalid seat reservation receipt");
+  if (!seat || seat.seatId !== expected || !Number.isSafeInteger(seat.amountCents) || seat.amountCents < 0 || !/^[a-z]{3}$/.test(seat.currency) || !Number.isSafeInteger(seat.termEndsAt)) throw new Error("invalid seat reservation receipt");
   return { seatId: seat.seatId, amountCents: seat.amountCents, currency: seat.currency, termEndsAt: seat.termEndsAt };
 }
 async function requestNamedSeatOffer(options) {
   const result = await requestAuthority(options, "seat-offer", { applicationId: options.applicationId, skuId: options.skuId });
   const offer = result.seat;
-  if (!offer || offer.membershipId !== await networkMembershipId(options) || !Number.isSafeInteger(offer.amountCents) || offer.amountCents <= 0 || !/^[a-z]{3}$/.test(offer.currency) || !["month", "year"].includes(offer.interval) || typeof offer.eligible !== "boolean" || typeof offer.autoRenew !== "boolean" || !Number.isSafeInteger(offer.termEndsAt) || !Number.isSafeInteger(offer.purchaseEndsAt) || offer.purchaseWindowed !== void 0 && typeof offer.purchaseWindowed !== "boolean" || offer.digest !== await namedSeatOfferDigest(offer)) throw new Error("invalid named seat offer");
+  if (!offer || offer.membershipId !== await networkMembershipId(options) || !Number.isSafeInteger(offer.amountCents) || offer.amountCents < 0 || offer.included !== (offer.amountCents === 0) || !/^[a-z]{3}$/.test(offer.currency) || !["month", "year"].includes(offer.interval) || typeof offer.eligible !== "boolean" || typeof offer.autoRenew !== "boolean" || !Number.isSafeInteger(offer.termEndsAt) || !Number.isSafeInteger(offer.purchaseEndsAt) || offer.purchaseWindowed !== void 0 && typeof offer.purchaseWindowed !== "boolean" || offer.digest !== await namedSeatOfferDigest(offer)) throw new Error("invalid named seat offer");
   return offer;
 }
 async function requestNamedSeatInvitation(options) {
@@ -16016,7 +16391,8 @@ async function requestNamedSeatCheckout(options) {
   });
   const seat = result.seat;
   const expected = (await membershipOfferIdForRequest({ ...options, requestId: "named_seat" })).replace(/^offer_/, "seat_");
-  if (!seat || seat.seatId !== expected || !/^pi_[A-Za-z0-9_]+$/.test(seat.paymentIntentId) || typeof seat.clientSecret !== "string" || !Number.isSafeInteger(seat.amountCents) || seat.amountCents <= 0 || !/^[a-z]{3}$/.test(seat.currency) || !Number.isSafeInteger(seat.termEndsAt) || !["payment_processing", "renewal_pending", "pending_acceptance", "pending_approval", "active"].includes(seat.status)) {
+  const included = seat?.amountCents === 0;
+  if (!seat || seat.seatId !== expected || !Number.isSafeInteger(seat.amountCents) || seat.amountCents < 0 || !/^[a-z]{3}$/.test(seat.currency) || !Number.isSafeInteger(seat.termEndsAt) || (included ? seat.included !== true || seat.paymentIntentId !== void 0 || seat.clientSecret !== void 0 || !["pending_acceptance", "pending_approval", "pending_primary", "active"].includes(seat.status) : seat.included !== void 0 || !/^pi_[A-Za-z0-9_]+$/.test(String(seat.paymentIntentId)) || typeof seat.clientSecret !== "string" || !["payment_processing", "renewal_pending", "pending_acceptance", "pending_approval", "active"].includes(seat.status))) {
     throw new Error("invalid named seat checkout receipt");
   }
   return seat;
@@ -16426,6 +16802,7 @@ var BUILTIN_ROUTES = [
   handleAdminNamedSeat,
   handleAdminMembershipSeats,
   handleAdminMembershipPolicyVersions,
+  handleAdminMembershipReterm,
   handleAdminMeetings,
   handleAdminScheduling,
   // Roster + identity
@@ -16506,9 +16883,15 @@ export {
   deliverMembershipChapterEffect,
   deliverSignupControl,
   drainMembershipEffects,
+  grantIncludedNamedSeat,
+  lowerSeatPrice,
+  namedSeatIncluded,
+  namedSeatRecipientState,
+  readNamedSeatOffer,
   refundNamedSeatByOperator,
   renderActiveSignupControlHtml,
   resolveNetworkTargetTransport,
+  retermMembershipDiscount,
   retryChapterApprovalEffects,
   retryLeaderAdmissionDeliveries,
   withActiveSignupControlTheme