@odla-ai/chapter 0.41.0 → 0.42.0

package/dist/ui/admin/index.d.ts

@@ -1,8 +1,8 @@
 import * as preact from 'preact';
 import { ComponentChildren, JSX } from 'preact';
 import { CrmClient, Crm, CrmRecord } from '@odla-ai/crm';
-import { a as Chapter, b as ChapterCopy, M as MemberContentDocument, E as EffectiveMemberContent, c as MemberContentTierAuthority } from '../../copy-context-B14OOiYq.js';
-export { C as ChapterCopyProvider, u as useChapterCopy } from '../../copy-context-B14OOiYq.js';
+import { a as Chapter, b as ChapterCopy, M as MemberContentDocument, E as EffectiveMemberContent, c as MemberContentTierAuthority } from '../../copy-context-DuJkH4U9.js';
+export { C as ChapterCopyProvider, u as useChapterCopy } from '../../copy-context-DuJkH4U9.js';
 import { CrmLifecycleAdapter, CrmWorkspaceMasterContext, CrmWorkspaceRecordContext, RecordPanelTab } from '@odla-ai/crm/ui';
 
 /** Normalized public auth configuration consumed by the Clerk gate. */

package/dist/ui/admin/index.js

@@ -33,11 +33,11 @@ import {
   networkRecordsWorkspace,
   peopleSection,
   useAdminResource
-} from "../../chunk-O22RRPBT.js";
+} from "../../chunk-MMDWXTJU.js";
 import {
   ChapterCopyProvider,
   useChapterCopy
-} from "../../chunk-IAWBE5PX.js";
+} from "../../chunk-JXFYOUDL.js";
 export {
   AdminNote,
   AdminPage,

package/dist/ui/index.d.ts

@@ -1,6 +1,6 @@
 export { AdminAccountMenuProps, AdminBuilderLibraryData, AdminChrome, AdminMemberContentData, AdminNote, AdminPage, AdminResource, AdminRouteState, AdminRouteTarget, AdminRouting, AdminSection, AdminSectionContext, AdminWorkspace, AdminWorkspaceNavProps, AdmissionGrantsWorkspace, AvailabilitySectionOptions, BillingSectionOptions, BuilderLibraryAdmin, ChapterAdmin, ChapterAdminAuthAdapter, ChapterAdminAuthConfig, ChapterAdminAuthLoadContext, ChapterAdminProps, ChapterAdminUser, CollectionSectionOptions, DashboardSectionOptions, EmailSectionOptions, LeaderNetworkOverview, MeetingsSectionOptions, MemberContentAdmin, NetworkRecordsWorkspace, NetworkShareActions, NetworkShareActionsProps, Panel, PeopleSectionOptions, RecordActions, RecordActionsProps, ThemeWarning, adminFetch, adminRouteFromUrl, adminRouteHref, adminSectionFromUrl, adminSectionHref, admissionGrantsWorkspace, applicationLifecycleAdapter, availabilitySection, billingSection, builderLibrarySection, collectionSection, dashboardSection, defaultAdminSections, defaultAdminWorkspaces, emailSection, loadChapterAdminConfig, loadChapterAdminUser, meetingsSection, memberContentSection, networkRecordsWorkspace, peopleSection, useAdminResource } from './admin/index.js';
-export { C as ChapterCopyProvider, u as useChapterCopy } from '../copy-context-B14OOiYq.js';
-export { ApiFn, BrandStyle, BrandStyleProps, GiftCodeRedeemer, GiftCodeRedeemerCopy, GiftCodeRedeemerProps, GiftOfferCards, GiftOfferCardsMode, GiftOfferCardsProps, JoinBookingSimulation, JoinConfig, JoinFlowState, JoinIsland, JoinIslandProps, JoinSimulation, JoinStepRenderContext, JoinSubmitRenderContext, JoinTier, JoinTierRenderContext, MEMBERSHIP_CARD_TOKEN_DEFAULTS, MemberContentArea, MemberContentAreaProps, MemberGifts, MemberProvisionalRenderContext, MembersArea, MembersAreaProps, MembershipCardTokenName, MembershipCards, MembershipCardsMode, MembershipCardsProps, PaymentPriceLines, PaymentStep, PaymentStepProps, PaymentStepSimulation, RescheduleProps, Rescheduler, Slot, SlotPicker, SlotPickerClasses, SlotPickerProps, SubResponse, TierPlaceholder, dayKey, dayLabel, fmtDate, fmtMoney, fullLabel, groupSlotsByDay, loadJoinResume, membershipApplicationHref, tierNeedsPayment, timeLabel, tzShort, useTierSelection } from './member/index.js';
+export { C as ChapterCopyProvider, u as useChapterCopy } from '../copy-context-DuJkH4U9.js';
+export { ApiFn, BrandStyle, BrandStyleProps, GiftCodeRedeemResult, GiftCodeRedeemer, GiftCodeRedeemerCopy, GiftCodeRedeemerProps, GiftOfferCards, GiftOfferCardsMode, GiftOfferCardsProps, GiftPurchases, GiftPurchasesProps, JoinBookingSimulation, JoinConfig, JoinFlowState, JoinIsland, JoinIslandProps, JoinSimulation, JoinStepRenderContext, JoinSubmitRenderContext, JoinTier, JoinTierRenderContext, MEMBERSHIP_CARD_TOKEN_DEFAULTS, MemberContentArea, MemberContentAreaProps, MemberGifts, MemberProvisionalRenderContext, MembersArea, MembersAreaProps, MembershipCardTokenName, MembershipCards, MembershipCardsMode, MembershipCardsProps, PaymentPriceLines, PaymentStep, PaymentStepProps, PaymentStepSimulation, RescheduleProps, Rescheduler, Slot, SlotPicker, SlotPickerClasses, SlotPickerProps, SubResponse, TierPlaceholder, dayKey, dayLabel, fmtDate, fmtMoney, fullLabel, groupSlotsByDay, loadJoinResume, membershipApplicationHref, tierNeedsPayment, timeLabel, tzShort, useTierSelection } from './member/index.js';
 import 'preact';
 import '@odla-ai/crm';
 import '@odla-ai/crm/ui';

package/dist/ui/index.js

@@ -1,6 +1,7 @@
 import {
   GiftCodeRedeemer,
   GiftOfferCards,
+  GiftPurchases,
   JoinIsland,
   MEMBERSHIP_CARD_TOKEN_DEFAULTS,
   MemberContentArea,
@@ -23,7 +24,7 @@ import {
   timeLabel,
   tzShort,
   useTierSelection
-} from "../chunk-JLLRZO7B.js";
+} from "../chunk-S7CND3R5.js";
 import {
   AdminNote,
   AdminPage,
@@ -59,12 +60,12 @@ import {
   networkRecordsWorkspace,
   peopleSection,
   useAdminResource
-} from "../chunk-O22RRPBT.js";
+} from "../chunk-MMDWXTJU.js";
 import {
   BrandStyle,
   ChapterCopyProvider,
   useChapterCopy
-} from "../chunk-IAWBE5PX.js";
+} from "../chunk-JXFYOUDL.js";
 import "../chunk-IVXVECKR.js";
 export {
   AdminNote,
@@ -76,6 +77,7 @@ export {
   ChapterCopyProvider,
   GiftCodeRedeemer,
   GiftOfferCards,
+  GiftPurchases,
   JoinIsland,
   LeaderNetworkOverview,
   MEMBERSHIP_CARD_TOKEN_DEFAULTS,

package/dist/ui/member/index.d.ts

@@ -1,7 +1,7 @@
 import * as preact from 'preact';
 import { ComponentChildren, JSX } from 'preact';
-import { d as MemberContentProjection, e as MemberContentPageProjection, b as ChapterCopy, f as ChapterBrand } from '../../copy-context-B14OOiYq.js';
-export { C as ChapterCopyProvider, u as useChapterCopy } from '../../copy-context-B14OOiYq.js';
+import { d as MemberContentProjection, e as MemberContentPageProjection, b as ChapterCopy, f as ChapterBrand } from '../../copy-context-DuJkH4U9.js';
+export { C as ChapterCopyProvider, u as useChapterCopy } from '../../copy-context-DuJkH4U9.js';
 import { FieldType, FieldConditions } from '@odla-ai/crm';
 
 /** A bookable slot: a start instant in epoch milliseconds. */
@@ -16,7 +16,7 @@ declare function tzShort(tz: string): string;
 declare function dayKey(ms: number, tz: string): string;
 /** Short day label for a day chip, e.g. "Mon, Jun 3". */
 declare function dayLabel(ms: number, tz: string): string;
-/** Time-of-day label for a slot button, e.g. "2:30 PM". */
+/** Time-of-day label for a slot button, e.g. "2:30 PM PST". */
 declare function timeLabel(ms: number, tz: string): string;
 /** Full, human confirmation label, e.g. "Monday, June 3, 2:30 PM PST". */
 declare function fullLabel(ms: number, tz: string): string;
@@ -359,6 +359,7 @@ type JoinFlowState = {
 } | {
     step: "payment";
     applicationId: string;
+    giftPurchase?: boolean;
 } | {
     step: "paymentPending";
     applicationId: string;
@@ -443,6 +444,11 @@ interface JoinIslandProps {
         }) => ComponentChildren;
         children?: ComponentChildren;
     };
+    /**
+     * Authenticated API adapter used to claim a received gift against the current
+     * application. When absent, JoinIsland cannot offer recipient claiming.
+     */
+    giftClaimApi?: ApiFn;
     /** Run the canonical journey without network, Stripe, or calendar writes. */
     simulation?: JoinSimulation;
 }
@@ -553,13 +559,28 @@ interface GiftOfferCardsProps {
 declare function GiftOfferCards(props: GiftOfferCardsProps): JSX.Element;
 
 /** Resolved Chapter copy consumed by {@link GiftCodeRedeemer}. */
-type GiftCodeRedeemerCopy = Pick<ChapterCopy["members"]["gifts"], "code" | "redeem" | "redeemed" | "redeemFailed">;
+interface GiftCodeRedeemerCopy {
+    code: string;
+    redeem: string;
+    redeemed: string;
+    redeemFailed: string;
+}
+/** Canonical continuation returned after a recipient claim is committed. */
+interface GiftCodeRedeemResult {
+    ok: true;
+    kind: "application";
+    id: string;
+    applicationId: string;
+    state?: "payment" | "paymentPending" | "booking" | "accepted";
+}
 /** Props for the canonical Chapter member gift-code redemption control. */
 interface GiftCodeRedeemerProps {
     api: ApiFn;
+    /** Exact application whose payment requirement the gift must satisfy. */
+    applicationId: string;
     copy: GiftCodeRedeemerCopy;
     id?: string;
-    onRedeemed?: () => void | Promise<void>;
+    onRedeemed?: (result: GiftCodeRedeemResult) => void | Promise<void>;
 }
 /**
  * Redeems one Chapter gift code through the canonical member API.
@@ -569,14 +590,21 @@ interface GiftCodeRedeemerProps {
  * browser capitalization and spellcheck are disabled, while
  * `autocomplete="one-time-code"` allows platform code suggestions.
  */
-declare function GiftCodeRedeemer({ api, copy, id, onRedeemed }: GiftCodeRedeemerProps): preact.JSX.Element;
+declare function GiftCodeRedeemer({ api, applicationId, copy, id, onRedeemed }: GiftCodeRedeemerProps): preact.JSX.Element;
 
-/** Authenticated buyer ledger, checkout, code rotation, and beneficiary redemption. */
-declare function MemberGifts(props: {
+/** Props for the authenticated gift purchaser ledger and checkout surface. */
+interface GiftPurchasesProps {
     api: ApiFn;
     copy: ChapterCopy["members"]["gifts"];
     paymentCopy: ChapterCopy["join"]["payment"];
-}): preact.JSX.Element | null;
+}
+/** Authenticated buyer offers, purchase history, and code rotation. */
+declare function GiftPurchases(props: GiftPurchasesProps): preact.JSX.Element | null;
+/**
+ * Compatibility name for the authenticated gift purchaser surface.
+ * @deprecated Use {@link GiftPurchases}; recipient claiming belongs in JoinIsland.
+ */
+declare const MemberGifts: typeof GiftPurchases;
 
 /** Props for {@link BrandStyle}. */
 interface BrandStyleProps {
@@ -588,4 +616,4 @@ interface BrandStyleProps {
  *  there is no brand to theme). */
 declare function BrandStyle(props: BrandStyleProps): preact.JSX.Element | null;
 
-export { type ApiFn, BrandStyle, type BrandStyleProps, GiftCodeRedeemer, type GiftCodeRedeemerCopy, type GiftCodeRedeemerProps, GiftOfferCards, type GiftOfferCardsMode, type GiftOfferCardsProps, type JoinBookingSimulation, type JoinConfig, type JoinFlowState, JoinIsland, type JoinIslandProps, type JoinSimulation, type JoinStepRenderContext, type JoinSubmitRenderContext, type JoinTier, type JoinTierRenderContext, MEMBERSHIP_CARD_TOKEN_DEFAULTS, MemberContentArea, type MemberContentAreaProps, MemberGifts, type MemberProvisionalRenderContext, MembersArea, type MembersAreaProps, type MembershipCardTokenName, MembershipCards, type MembershipCardsMode, type MembershipCardsProps, type PaymentPriceLines, PaymentStep, type PaymentStepProps, type PaymentStepSimulation, type RescheduleProps, Rescheduler, type Slot, SlotPicker, type SlotPickerClasses, type SlotPickerProps, type SubResponse, TierPlaceholder, dayKey, dayLabel, fmtDate, fmtMoney, fullLabel, groupSlotsByDay, loadJoinResume, membershipApplicationHref, tierNeedsPayment, timeLabel, tzShort, useTierSelection };
+export { type ApiFn, BrandStyle, type BrandStyleProps, type GiftCodeRedeemResult, GiftCodeRedeemer, type GiftCodeRedeemerCopy, type GiftCodeRedeemerProps, GiftOfferCards, type GiftOfferCardsMode, type GiftOfferCardsProps, GiftPurchases, type GiftPurchasesProps, type JoinBookingSimulation, type JoinConfig, type JoinFlowState, JoinIsland, type JoinIslandProps, type JoinSimulation, type JoinStepRenderContext, type JoinSubmitRenderContext, type JoinTier, type JoinTierRenderContext, MEMBERSHIP_CARD_TOKEN_DEFAULTS, MemberContentArea, type MemberContentAreaProps, MemberGifts, type MemberProvisionalRenderContext, MembersArea, type MembersAreaProps, type MembershipCardTokenName, MembershipCards, type MembershipCardsMode, type MembershipCardsProps, type PaymentPriceLines, PaymentStep, type PaymentStepProps, type PaymentStepSimulation, type RescheduleProps, Rescheduler, type Slot, SlotPicker, type SlotPickerClasses, type SlotPickerProps, type SubResponse, TierPlaceholder, dayKey, dayLabel, fmtDate, fmtMoney, fullLabel, groupSlotsByDay, loadJoinResume, membershipApplicationHref, tierNeedsPayment, timeLabel, tzShort, useTierSelection };

package/dist/ui/member/index.js

@@ -1,6 +1,7 @@
 import {
   GiftCodeRedeemer,
   GiftOfferCards,
+  GiftPurchases,
   JoinIsland,
   MEMBERSHIP_CARD_TOKEN_DEFAULTS,
   MemberContentArea,
@@ -23,18 +24,19 @@ import {
   timeLabel,
   tzShort,
   useTierSelection
-} from "../../chunk-JLLRZO7B.js";
+} from "../../chunk-S7CND3R5.js";
 import {
   BrandStyle,
   ChapterCopyProvider,
   useChapterCopy
-} from "../../chunk-IAWBE5PX.js";
+} from "../../chunk-JXFYOUDL.js";
 import "../../chunk-IVXVECKR.js";
 export {
   BrandStyle,
   ChapterCopyProvider,
   GiftCodeRedeemer,
   GiftOfferCards,
+  GiftPurchases,
   JoinIsland,
   MEMBERSHIP_CARD_TOKEN_DEFAULTS,
   MemberContentArea,

package/dist/worker/index.cjs

@@ -2009,7 +2009,12 @@ var handleMember = async (req, url, env, ctx) => {
     const group = Array.isArray(groups) ? groups[0] : void 0;
     if (!group) return json({ error: "not found" }, 404);
     const state = await continueJoin(db, ctx, env, url.origin, app, group);
-    if (state) return json({ state, applicationId, ...state === "gift" ? { claimId: app.giftClaimId } : {} });
+    if (state) return json({
+      state,
+      applicationId,
+      ...state === "gift" ? { claimId: app.giftClaimId } : {},
+      ...state === "payment" && typeof app.giftOfferId === "string" ? { giftPurchase: true } : {}
+    });
     return json({ error: `application cannot resume from status "${String(app.status ?? "")}"` }, 409);
   }
   if (req.method === "POST" && url.pathname === "/api/applications") {
@@ -2058,6 +2063,7 @@ var handleMember = async (req, url, env, ctx) => {
       duplicate: result.duplicate,
       status: result.status,
       ...state ? { state } : {},
+      ...state === "payment" && requestedGiftId ? { giftPurchase: true } : {},
       // Echoed so a site can see (and assert in an integration test) whether its
       // join page actually posted the ack. Absent consent is otherwise invisible.
       disclaimerAckAt: result.disclaimerAckAt
@@ -3756,9 +3762,15 @@ async function redeemGiftClaim(db, claim, beneficiary, now) {
   const target = claim.target;
   const ops = [];
   let result;
+  let applicationGuard;
   if (target.type === "tier") {
-    const apps = (await db.query({ applications: { $: { where: { emailNormalized }, limit: 20 } } })).applications;
-    const existing = apps?.filter((row) => row.groupId === chapterId).sort((a, b) => Number(b.createdAt ?? 0) - Number(a.createdAt ?? 0))[0];
+    const apps = beneficiary.applicationId ? (await db.query({ applications: { $: { where: { id: beneficiary.applicationId }, limit: 1 } } })).applications : (await db.query({ applications: { $: { where: { emailNormalized }, limit: 20 } } })).applications;
+    const existing = beneficiary.applicationId ? apps?.[0] : apps?.filter((row) => row.groupId === chapterId).sort((a, b) => Number(b.createdAt ?? 0) - Number(a.createdAt ?? 0))[0];
+    if (beneficiary.applicationId && (!existing || String(existing.groupId ?? "") !== chapterId || String(existing.emailNormalized ?? "") !== emailNormalized || String(existing.tierId ?? "") !== target.tierId || String(existing.status ?? "") !== "submitted" || typeof existing.stripeSubscriptionId === "string" || typeof existing.giftClaimId === "string" || typeof existing.clerkUserId === "string" && existing.clerkUserId !== beneficiary.userId)) return null;
+    if (beneficiary.applicationId) applicationGuard = {
+      tierId: target.tierId,
+      ...typeof existing?.clerkUserId === "string" ? { clerkUserId: existing.clerkUserId } : {}
+    };
     const id = existing ? String(existing.id) : `gift-application:${String(claim.id)}`;
     const status = existing && existing.status !== "submitted" ? String(existing.status) : "paid_pending_vetting";
     ops.push({ t: "update", ns: "applications", id, attrs: {
@@ -3775,6 +3787,7 @@ async function redeemGiftClaim(db, claim, beneficiary, now) {
     } });
     result = { kind: "application", id };
   } else {
+    if (beneficiary.applicationId) return null;
     const id = `gift-entitlement:${String(claim.id)}`;
     ops.push({ t: "update", ns: "giftEntitlements", id, attrs: {
       id,
@@ -3798,13 +3811,27 @@ async function redeemGiftClaim(db, claim, beneficiary, now) {
     attemptCount: Number(claim.attemptCount ?? 0) + 1
   } });
   try {
+    const guards = [{ ns: "giftClaims", id: String(claim.id), exists: true, equals: {
+      status: "pending",
+      codeVersion: Number(claim.codeVersion),
+      codeHash: String(claim.codeHash)
+    } }];
+    if (beneficiary.applicationId) guards.push({
+      ns: "applications",
+      id: beneficiary.applicationId,
+      exists: true,
+      equals: {
+        status: "submitted",
+        groupId: chapterId,
+        emailNormalized,
+        tierId: applicationGuard.tierId,
+        ...applicationGuard?.clerkUserId ? { clerkUserId: applicationGuard.clerkUserId } : {}
+      },
+      absent: ["stripeSubscriptionId", "giftClaimId"]
+    });
     await db.transact(ops, {
       mutationId: `gift-redeem:${String(claim.id)}:${beneficiary.userId}`,
-      guards: [{ ns: "giftClaims", id: String(claim.id), exists: true, equals: {
-        status: "pending",
-        codeVersion: Number(claim.codeVersion),
-        codeHash: String(claim.codeHash)
-      } }]
+      guards
     });
     return result;
   } catch {
@@ -4319,15 +4346,35 @@ var handleGifts = async (req, url, env, ctx) => {
       return json({ error: "too many attempts" }, 429);
     }
     let code = "";
+    let applicationId = "";
     try {
-      code = String(JSON.parse(await req.text()).code ?? "").trim();
+      const body = JSON.parse(await req.text());
+      code = String(body.code ?? "").trim();
+      applicationId = typeof body.applicationId === "string" ? body.applicationId : "";
     } catch {
       return invalid();
     }
-    if (!/^gift1_[A-Za-z0-9_-]{43}$/.test(code)) return invalid();
+    if (!/^gift1_[A-Za-z0-9_-]{43}$/.test(code) || !applicationId) return invalid();
+    const app = first3((await db.query({ applications: { $: { where: { id: applicationId }, limit: 1 } } })).applications);
+    const emailNormalized = normalizeChapterEmail(user.email);
+    if (!app || String(app.groupId ?? "") !== ctx.chapter.id || String(app.emailNormalized ?? "") !== emailNormalized || typeof app.clerkUserId === "string" && app.clerkUserId !== user.userId) return invalid();
     const codeHash = await hashGiftCode(ctx.chapter.id, code);
     const claim = first3((await db.query({ giftClaims: { $: { where: { codeHash }, limit: 1 } } })).giftClaims);
     if (!claim || claim.chapterId !== ctx.chapter.id) return invalid();
+    const sameRedemption = (candidate) => candidate.status === "redeemed" && candidate.applicationId === applicationId && candidate.beneficiaryEmailNormalized === emailNormalized && candidate.beneficiaryUserId === user.userId;
+    const success = async () => {
+      const current = first3((await db.query({ applications: { $: { where: { id: applicationId }, limit: 1 } } })).applications);
+      const group2 = first3((await db.query({ groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } } })).groups);
+      const state = current && group2 ? await continueJoin(db, ctx, env, url.origin, current, group2) : null;
+      return json({
+        ok: true,
+        kind: "application",
+        id: applicationId,
+        applicationId,
+        ...state ? { state } : {}
+      });
+    };
+    if (sameRedemption(claim)) return success();
     if (claim.status !== "pending" || Number(claim.codeExpiresAt) <= now) {
       await db.transact([{ t: "update", ns: "giftClaims", id: String(claim.id), attrs: {
         attemptCount: Number(claim.attemptCount ?? 0) + 1,
@@ -4335,8 +4382,18 @@ var handleGifts = async (req, url, env, ctx) => {
       } }]).catch(() => void 0);
       return invalid();
     }
-    const redeemed = await redeemGiftClaim(db, claim, { email: user.email, userId: user.userId }, now);
-    return redeemed ? json({ ok: true, ...redeemed }) : invalid();
+    const target = claim.target;
+    const group = first3((await db.query({ groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } } })).groups);
+    const tier = group ? findTier(await loadTiers(db, group), typeof app.tierId === "string" ? app.tierId : null) : void 0;
+    if (String(app.status ?? "") !== "submitted" || typeof app.stripeSubscriptionId === "string" || typeof app.giftClaimId === "string" || !tier || tierIsFree(tier) || target?.type !== "tier" || target.tierId !== app.tierId) return invalid();
+    const redeemed = await redeemGiftClaim(db, claim, {
+      email: user.email,
+      userId: user.userId,
+      applicationId
+    }, now);
+    if (redeemed) return success();
+    const raced = await loadClaim(db, String(claim.id));
+    return raced && sameRedemption(raced) ? success() : invalid();
   }
   return null;
 };