@simplelayer/graniteer-core 0.4.0 → 0.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -151,20 +151,48 @@ export async function handle(req, operator, deps) {
151
151
  const net = Math.max(0, price_cents - dynamic_discount_cents);
152
152
  // Reclaim stale holds overlapping the range (same as create-booking).
153
153
  await reclaimStaleHoldsExceptCompletedTier3(admin, room_id, rangeLiteral);
154
- let creditEligible = false;
155
- if (membership) {
156
- let tier = null;
154
+ // Contract tier lookup: needed both for member-credit eligibility (Tier 3
155
+ // rooms never draw member credit - they always go through the Commons
156
+ // contract/deposit flow) and, new here, for the contract-skip audit trail
157
+ // below. Root cause + rationale: claude/admin-create-booking-agreement-gap-scope.md
158
+ // (this function never runs create-booking.js's tiered agreement gate or
159
+ // the audited admin-skip-commons-contract path - every booking it settles
160
+ // to 'paid' does so with no agreement, previously with no audit trail
161
+ // either).
162
+ let contractTier = null;
163
+ try {
164
+ contractTier = await resolveRoomContractTier(admin, room_id);
165
+ }
166
+ catch (e) {
167
+ console.warn('[admin-create-booking] contract tier lookup failed', String(e));
157
168
  try {
158
- tier = await resolveRoomContractTier(admin, room_id);
159
- }
160
- catch (e) {
161
- console.warn('[admin-create-booking] contract tier lookup failed', String(e));
169
+ await logOps(admin, 'admin_create_booking_tier_lookup_failed', { message: String(e), room_id }, { severity: 'warning' });
162
170
  }
163
- creditEligible = room.booking_mode !== 'quote' && tier !== null && tier !== 3;
171
+ catch { /* ignore */ }
172
+ }
173
+ let creditEligible = false;
174
+ if (membership) {
175
+ creditEligible = room.booking_mode !== 'quote' && contractTier !== null && contractTier !== 3;
164
176
  }
165
177
  const useCredit = !!membership && creditEligible;
166
178
  const nowIso = new Date().toISOString();
167
179
  const isOffline = mode === 'offline';
180
+ // Audit-only contract-skip marking (landed 2026-09-18, see scope doc
181
+ // above): every booking this function settles straight to 'paid' bypasses
182
+ // the tiered agreement gate self-serve bookings go through. This does NOT
183
+ // block or gate the booking - it only makes the skip self-documenting via
184
+ // the same contract_skipped_* columns admin-skip-commons-contract uses for
185
+ // an explicit staff skip. NOTE: private.on_booking_paid_transition() still
186
+ // fires and still inserts its own booking_contract_violations row on this
187
+ // same write -- this stamp is in ADDITION to that row, not a replacement
188
+ // for it; the violations table keeps growing exactly as before.
189
+ const CONTRACT_SKIP_REASON = `admin-create-booking: no agreement flow in this function (tier ${contractTier ?? 'unmapped'}; ` +
190
+ 'known gap, audit-only fix landed 2026-09-18 - see admin-create-booking-agreement-gap-scope.md)';
191
+ const contractSkipFields = {
192
+ contract_skipped_at: nowIso,
193
+ contract_skipped_by_email: callerEmail,
194
+ contract_skip_reason: CONTRACT_SKIP_REASON,
195
+ };
168
196
  const insertRow = {
169
197
  room_id,
170
198
  during: rangeLiteral,
@@ -190,6 +218,7 @@ export async function handle(req, operator, deps) {
190
218
  insertRow.charged_amount_cents = net;
191
219
  insertRow.credit_applied_cents = 0;
192
220
  insertRow.hold_expires_at = null;
221
+ Object.assign(insertRow, contractSkipFields);
193
222
  }
194
223
  else {
195
224
  insertRow.status = 'pending';
@@ -300,6 +329,7 @@ export async function handle(req, operator, deps) {
300
329
  credit_applied_cents: credit_applied,
301
330
  discount_applied_cents: discount_applied,
302
331
  hold_expires_at: null,
332
+ ...contractSkipFields,
303
333
  })
304
334
  .eq('id', booking_id);
305
335
  await runPaidSideEffects();
@@ -1634,7 +1634,26 @@ export function createStripeWebhookHandler(config) {
1634
1634
  break;
1635
1635
  }
1636
1636
  const booking = await findBooking(session);
1637
- if (booking && booking.status !== 'paid' && booking.status !== 'deposit_paid') {
1637
+ // A replayed/out-of-order webhook must never resurrect a booking the
1638
+ // customer or staff already cancelled. booking.status is untyped
1639
+ // (findBooking's select is not run through generated DB types), so
1640
+ // nullish-coalesce before .startsWith: a null/absent status must not
1641
+ // throw here -- that would reach the outer catch, delete the
1642
+ // stripe_events ledger row, and 500 (Stripe retries ~16x, paging
1643
+ // each time, booking never provisions). Preserves the pre-fix
1644
+ // behavior for that case (null !== 'paid' -> proceed) exactly.
1645
+ const bkStatus = booking?.status ?? '';
1646
+ // All three cancelled_* terminal states (see manage-booking.ts's
1647
+ // `b.status.startsWith('cancelled_')` idiom and stripe-db-reconcile.ts's
1648
+ // BOOKING_POST_PAID_OK set) are excluded, not just 'cancelled_credited'.
1649
+ // Hoisted (rather than inlined in the condition below) so the
1650
+ // else-if branch further down -- which handles the actual
1651
+ // cancelled_* case -- can reuse it without recomputing.
1652
+ const bkIsCancelled = bkStatus.startsWith('cancelled_');
1653
+ if (booking &&
1654
+ bkStatus !== 'paid' &&
1655
+ bkStatus !== 'deposit_paid' &&
1656
+ !bkIsCancelled) {
1638
1657
  const paymentIntent = typeof session.payment_intent === 'string'
1639
1658
  ? session.payment_intent
1640
1659
  : session.payment_intent?.id ?? null;
@@ -1653,6 +1672,16 @@ export function createStripeWebhookHandler(config) {
1653
1672
  // status='pending', because this generic path legitimately serves
1654
1673
  // other non-pending recoveries (e.g. a re-paid expired hold).
1655
1674
  .neq('status', 'deposit_paid')
1675
+ // Never resurrect an already-cancelled booking on a replayed/
1676
+ // out-of-order webhook (all 3 terminal cancelled_* states --
1677
+ // see stripe-db-reconcile.ts's BOOKING_POST_PAID_OK). Explicit
1678
+ // .neq() chain to match this file's existing idiom, rather than
1679
+ // a LIKE pattern -- this file elsewhere notes '_' is a live SQL
1680
+ // wildcard, not just a literal underscore, so an unescaped
1681
+ // 'cancelled_%' LIKE could match unintended values.
1682
+ .neq('status', 'cancelled_credited')
1683
+ .neq('status', 'cancelled_forfeited')
1684
+ .neq('status', 'cancelled_refunded')
1656
1685
  .select('id');
1657
1686
  if (!flipErr && flipped && flipped.length > 0) {
1658
1687
  // Post-payment side effects — MUST NOT break the webhook.
@@ -1769,6 +1798,60 @@ export function createStripeWebhookHandler(config) {
1769
1798
  console.error('[stripe-webhook] post-paid side effects error', e);
1770
1799
  }
1771
1800
  }
1801
+ else if (flipErr) {
1802
+ console.error('[stripe-webhook] booking paid-flip update failed', flipErr);
1803
+ const persisted = await logOps(supabase, 'booking_paid_flip_failed', { session_id: session.id, message: flipErr.message }, { severity: 'error', bookingId: booking.id });
1804
+ if (!persisted.ok) {
1805
+ console.error('[stripe-webhook] booking-paid-flip-failed alarm failed to persist', { bookingId: booking.id, sessionId: session.id, error: persisted.error });
1806
+ }
1807
+ }
1808
+ else {
1809
+ // Guard blocked the flip even though the JS-level read saw this
1810
+ // booking as flippable (not paid/deposit_paid/cancelled_*) --
1811
+ // a TOCTOU race: something else (another webhook delivery,
1812
+ // manage-booking, the reconciler) changed the row's status
1813
+ // between our read and this UPDATE's WHERE clause evaluating.
1814
+ // `read_status` below is that STALE pre-UPDATE value, not the
1815
+ // row's current status -- never rename it back to `db_status`,
1816
+ // which would wrongly imply it reflects what's in the DB right
1817
+ // now. Always 'warning' (never conditionally 'info'): whatever
1818
+ // the row's status became, Stripe says this session is paid
1819
+ // and nothing got flipped or provisioned for it here -- that's
1820
+ // never a routine no-op (project invariant: "divergence
1821
+ // alarms, not silence").
1822
+ const raced = await logOps(supabase, 'paid_session_flip_raced', {
1823
+ session_id: session.id,
1824
+ read_status: booking.status,
1825
+ amount_total: session.amount_total ?? null,
1826
+ }, {
1827
+ severity: 'warning',
1828
+ bookingId: booking.id,
1829
+ });
1830
+ if (!raced.ok) {
1831
+ console.error('[stripe-webhook] paid-session-flip-raced alarm failed to persist', { bookingId: booking.id, sessionId: session.id, error: raced.error });
1832
+ }
1833
+ }
1834
+ }
1835
+ else if (booking && bkIsCancelled) {
1836
+ // The actual bug this fix exists to catch: a Stripe payment
1837
+ // landed on a booking that is cancelled_* right now, per the
1838
+ // JS-level read above (not a TOCTOU race -- see the `else`
1839
+ // branch above for that case). Must never be silent (project
1840
+ // invariant: "divergence alarms, not silence"). dedupeKey so a
1841
+ // replayed/retried webhook for the same session doesn't page
1842
+ // Slack a second time for the same collision.
1843
+ const flagged = await logOps(supabase, 'paid_session_for_cancelled_booking', {
1844
+ session_id: session.id,
1845
+ booking_status: bkStatus,
1846
+ amount_total: session.amount_total ?? null,
1847
+ }, {
1848
+ severity: 'error',
1849
+ bookingId: booking.id,
1850
+ dedupeKey: `paid_session_for_cancelled_booking:${booking.id}:${session.id}`,
1851
+ });
1852
+ if (!flagged.ok) {
1853
+ console.error('[stripe-webhook] cancelled-booking paid-session alarm failed to persist', { bookingId: booking.id, sessionId: session.id, error: flagged.error });
1854
+ }
1772
1855
  }
1773
1856
  break;
1774
1857
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@simplelayer/graniteer-core",
3
- "version": "0.4.0",
3
+ "version": "0.4.2",
4
4
  "description": "Shared platform core for Graniteer",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",