@odla-ai/chapter 0.50.0 → 0.51.0

package/dist/ui/index.js

@@ -26,7 +26,7 @@ import {
   timeLabel,
   tzShort,
   useTierSelection
-} from "../chunk-OS46ZE46.js";
+} from "../chunk-UAXWA5BL.js";
 import {
   APPLICATION_STAGES,
   AdminNote,

package/dist/ui/member/index.js

@@ -26,7 +26,7 @@ import {
   timeLabel,
   tzShort,
   useTierSelection
-} from "../../chunk-OS46ZE46.js";
+} from "../../chunk-UAXWA5BL.js";
 import {
   BrandStyle,
   ChapterCopyProvider,

package/dist/worker/index.cjs

@@ -1702,6 +1702,11 @@ function canApprove(status2, p) {
 }
 
 // src/membership-policy.ts
+function seatPurchaseDeadline(offering, member) {
+  if (offering.seatPurchaseWindowCalendarMonths === void 0) return Number(member.termEndsAt);
+  if (Number.isSafeInteger(member.seatPurchaseEndsAt)) return Number(member.seatPurchaseEndsAt);
+  return addMembershipCalendarMonths(Number(member.initialTermStartedAt ?? member.termStartedAt), offering.seatPurchaseWindowCalendarMonths);
+}
 var fail2 = (field) => {
   throw new TypeError(`invalid membership policy: ${field}`);
 };
@@ -1758,7 +1763,7 @@ function membershipOfferingVersion(value) {
     autoRenew: true,
     paymentGraceDays: integer2(input.paymentGraceDays, 0, 60),
     seatPriceCents: integer2(input.seatPriceCents, 1, Number.MAX_SAFE_INTEGER),
-    seatPurchaseWindowCalendarMonths: integer2(input.seatPurchaseWindowCalendarMonths, 1, 120),
+    ...input.seatPurchaseWindowCalendarMonths === void 0 || input.seatPurchaseWindowCalendarMonths === null ? {} : { seatPurchaseWindowCalendarMonths: integer2(input.seatPurchaseWindowCalendarMonths, 1, 120) },
     requiredDisclosures: ids(input.requiredDisclosures)
   };
 }
@@ -2149,7 +2154,7 @@ async function confirmMembershipPayment(db, input, now) {
       initialTermEndsAt: endsAt,
       termStartedAt: paidAt,
       termEndsAt: endsAt,
-      seatPurchaseEndsAt: addMembershipCalendarMonths(Number(paidAt), offering.seatPurchaseWindowCalendarMonths),
+      seatPurchaseEndsAt: seatPurchaseDeadline(offering, { initialTermStartedAt: paidAt, termEndsAt: endsAt }),
       autoRenew: true,
       refundedCents: 0,
       revision: 1,
@@ -3684,9 +3689,37 @@ async function refundNamedSeatByOperator(db, input, stripeSecretKey, now) {
   return { seatId: String(seat.id), status: "refunded", refundedCents: Number(refunded.refundedCents), subscriptionCanceled: false };
 }
 
+// src/membership-seat-window.ts
+async function liftSeatPurchaseWindow(db, scope2, now, limit = 100) {
+  membershipClock(now);
+  if (!Number.isSafeInteger(limit) || limit < 1 || limit > 200) throw new TypeError("invalid lift limit");
+  const state = await loadMembershipAuthorityState(db, scope2);
+  const rows5 = (await db.query({ networkMembership: { $: { where: { ...scope2 }, order: { updatedAt: "asc" }, limit: limit + 1 } } })).networkMembership ?? [];
+  let lifted = 0;
+  for (const member of rows5.slice(0, limit)) {
+    if (Object.entries(scope2).some(([key3, value]) => member[key3] !== value)) throw new Error("membership lift scope mismatch");
+    const offering = membershipOfferingVersion(member.offeringSnapshot);
+    if (offering.seatPurchaseWindowCalendarMonths === void 0) continue;
+    const { seatPurchaseWindowCalendarMonths: _window, ...windowless } = offering;
+    await db.transact([membershipUpdate("networkMembership", String(member.id), {
+      offeringSnapshot: windowless,
+      seatPurchaseEndsAt: Number(member.termEndsAt),
+      revision: Number(member.revision) + 1,
+      updatedAt: now
+    })], { mutationId: `seat-window-lift:${member.id}:${member.revision}`, guards: [
+      { ns: "networkMembership", id: String(member.id), exists: true, equals: { revision: member.revision } },
+      { ns: "membershipAuthorityState", id: String(state.id), exists: true, equals: { mode: "authoritative" } }
+    ] });
+    lifted++;
+  }
+  return { lifted, more: rows5.length > limit };
+}
+
 // src/worker-routes-admin-membership-seats.ts
 var LIST = "/api/admin/membership-seats";
+var LIFT = "/api/admin/membership-seats/lift-purchase-window";
 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 = [
   "id",
   "appId",
@@ -3711,11 +3744,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);
-  if (url.pathname !== LIST && !one) return null;
+  const one = url.pathname.match(ONE), lift = url.pathname === LIFT;
+  if (url.pathname !== LIST && !one && !lift) return null;
   const operator = ctx.membershipAuthorityOperator;
   if (!operator) return json({ error: "not found" }, 404);
-  if (req.method !== (one ? "POST" : "GET")) return json({ error: "method not allowed" }, 405);
+  if (req.method !== (one || lift ? "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);
@@ -3725,6 +3758,24 @@ var handleAdminMembershipSeats = async (req, url, env, ctx) => {
   } catch {
     return json({ error: "the membership authority is not hosted by this deployment" }, 404);
   }
+  if (lift) {
+    let body;
+    try {
+      body = await req.json();
+    } catch {
+      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);
+    }
+    try {
+      return json({ ok: true, ...await liftSeatPurchaseWindow(db, { appId, chapterId: body.chapterId, environment: env.ODLA_ENV, runtime: body.runtime }, Date.now()) });
+    } catch (error) {
+      const code = error.code;
+      return json({ error: "purchase window lift is pending; retry to confirm", ...code ? { code } : {} }, code ? 409 : 503);
+    }
+  }
   if (!one) {
     const rows5 = (await db.query({ networkSeat: { $: { where: { environment: env.ODLA_ENV }, order: { updatedAt: "desc" }, limit: 201 } } })).networkSeat ?? [];
     return json({ seats: rows5.slice(0, 200).map(project), truncated: rows5.length > 200 });
@@ -8772,15 +8823,16 @@ async function readNamedSeatOffer(db, input, now) {
   const offering = membershipOfferingVersion(member.offeringSnapshot);
   const seat = member.namedSeatId ? await membershipLoad(db, "networkSeat", String(member.namedSeatId)) : void 0;
   if (seat) requireMembershipScope(seat, input);
+  const purchaseEndsAt = seatPurchaseDeadline(offering, member);
   const offer = {
     membershipId: id6,
     amountCents: offering.seatPriceCents,
     currency: offering.currency,
     interval: offering.interval,
     termEndsAt: Number(member.termEndsAt),
-    purchaseEndsAt: Number(member.seatPurchaseEndsAt),
+    purchaseEndsAt,
     autoRenew: member.autoRenew === true,
-    eligible: ["paid_pending_approval", "active", "cancel_at_term_end"].includes(String(member.status)) && member.refundedCents === 0 && now >= Number(member.initialTermStartedAt) && now < Number(member.termEndsAt) && now <= Number(member.seatPurchaseEndsAt) && (!seat || ["payment_pending", "payment_processing"].includes(String(seat.status))),
+    eligible: ["paid_pending_approval", "active", "cancel_at_term_end"].includes(String(member.status)) && member.refundedCents === 0 && now >= Number(member.initialTermStartedAt) && now < Number(member.termEndsAt) && now <= purchaseEndsAt && (!seat || ["payment_pending", "payment_processing"].includes(String(seat.status))),
     ...seat ? { seat: {
       seatId: String(seat.id),
       status: String(seat.status),
@@ -8788,7 +8840,7 @@ async function readNamedSeatOffer(db, input, now) {
       recipientEmail: String(seat.recipientEmailNormalized)
     } } : {}
   };
-  return { ...offer, digest: await namedSeatOfferDigest(offer) };
+  return { ...offer, digest: await namedSeatOfferDigest(offer), purchaseWindowed: offering.seatPurchaseWindowCalendarMonths !== void 0 };
 }
 
 // src/named-seat-request.ts
@@ -13796,7 +13848,11 @@ async function reconcileMembershipRenewal(db, input, now) {
       membershipUpdate("networkMembership", id6, {
         status: status2,
         graceEndsAt,
-        ...paid ? { termStartedAt: start, termEndsAt: end } : {},
+        ...paid ? {
+          termStartedAt: start,
+          termEndsAt: end,
+          ...membershipOfferingVersion(member.offeringSnapshot).seatPurchaseWindowCalendarMonths === void 0 ? { seatPurchaseEndsAt: end } : {}
+        } : {},
         revision: Number(member.revision) + 1,
         updatedAt: now
       }),
@@ -13956,10 +14012,11 @@ async function reserveNamedMembershipSeat(db, input, now) {
   const id6 = (await membershipOfferIdForRequest({ ...input, requestId: "named_seat" })).replace(/^offer_/, "seat_");
   let seat = await membershipLoad(db, "networkSeat", id6);
   if (!seat) {
-    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 > Number(member.seatPurchaseEndsAt) || !Number.isSafeInteger(member.seatPurchaseEndsAt) || member.namedSeatId !== void 0) {
+    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 offering = membershipOfferingVersion(member.offeringSnapshot), claimId = await recipientKey(input, email);
     const attrs = {
       id: id6,
       ...membershipScope(input),
@@ -13978,7 +14035,7 @@ async function reserveNamedMembershipSeat(db, input, now) {
       status: "payment_pending",
       preparedAt: now,
       termEndsAt: member.termEndsAt,
-      seatPurchaseEndsAt: member.seatPurchaseEndsAt,
+      seatPurchaseEndsAt: purchaseEndsAt,
       offeringSnapshot: offering,
       revision: 1,
       createdAt: now,
@@ -14180,7 +14237,7 @@ async function confirmNamedMembershipSeatPayment(db, input, now) {
   }
   if (seat.purchasedAt === void 0) {
     if (!["payment_processing", "payment_canceling"].includes(String(seat.status))) membershipFail("named_seat_payment_not_expected");
-    const eligible = seat.status !== "payment_canceling" && ["paid_pending_approval", "active", "cancel_at_term_end"].includes(String(member.status)) && Number(member.refundedCents) === 0 && paidAt <= Number(member.seatPurchaseEndsAt) && now < Number(member.termEndsAt);
+    const eligible = seat.status !== "payment_canceling" && ["paid_pending_approval", "active", "cancel_at_term_end"].includes(String(member.status)) && Number(member.refundedCents) === 0 && paidAt <= seatPurchaseDeadline(membershipOfferingVersion(member.offeringSnapshot), member) && now < Number(member.termEndsAt);
     const status2 = eligible ? "renewal_pending" : "refund_pending", effectId = `${seat.id}:${eligible ? "attach-renewal" : "refund"}`;
     try {
       await db.transact([
@@ -15399,7 +15456,7 @@ async function requestNamedSeatReservation(options) {
 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.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 || !/^[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) {