@tokenoftrust/storefront-runner 6.1.1 → 6.1.2

package/apps/storefront/migrations-apps/0024_order_contact_erasure_state.sql

@@ -0,0 +1,22 @@
+-- Erasure group bits: identity=1, email=2, phone=4, ship=8, bill=16.
+ALTER TABLE `order_contact_markers`
+  ADD COLUMN `erased_groups` integer NOT NULL DEFAULT 0 CHECK (`erased_groups` BETWEEN 0 AND 31);
+--> statement-breakpoint
+UPDATE `order_contact_markers` AS m SET `erased_groups` = COALESCE((
+  SELECT MAX(CASE WHEN instr(',' || a.groups || ',', ',identity,') > 0 THEN 1 ELSE 0 END)
+       + MAX(CASE WHEN instr(',' || a.groups || ',', ',email,') > 0 THEN 2 ELSE 0 END)
+       + MAX(CASE WHEN instr(',' || a.groups || ',', ',phone,') > 0 THEN 4 ELSE 0 END)
+       + MAX(CASE WHEN instr(',' || a.groups || ',', ',ship,') > 0 THEN 8 ELSE 0 END)
+       + MAX(CASE WHEN instr(',' || a.groups || ',', ',bill,') > 0 THEN 16 ELSE 0 END)
+  FROM `contact_access_audit` AS a
+  WHERE a.tenant_id = m.tenant_id AND a.stage = m.stage AND a.record_id = m.order_id
+    AND a.record_kind = 'order-contact' AND a.action = 'erase' AND a.outcome = 'admitted'
+), 0);
+--> statement-breakpoint
+CREATE TRIGGER `order_contact_markers_erasure_monotonic`
+BEFORE UPDATE ON `order_contact_markers`
+WHEN NEW.tenant_id != OLD.tenant_id OR NEW.stage != OLD.stage OR NEW.order_id != OLD.order_id
+  OR (NEW.erased_groups | OLD.erased_groups) != NEW.erased_groups
+BEGIN
+  SELECT RAISE(ABORT, 'erasure-monotonic');
+END;

package/apps/storefront/src/lib/fulfillment/fulfillmentService.ts

@@ -801,7 +801,11 @@ export class FulfillmentService {
       if (state.shipment.labelPurchaseState === mapped.shipment && state.labelOutcome?.adultSignature === input.adultSignature) {
         return { type: "done", view: state.view };
       }
-      if(input.outcome==="purchased"&&state.sourceHolds.length)return {type:"refuse",code:state.sourceHolds[0]!,holds:state.sourceHolds};
+      if (input.outcome === "purchased") {
+        if (state.sourceHolds.length) return { type: "refuse", code: state.sourceHolds[0]!, holds: state.sourceHolds };
+        const contactHolds = releaseHolds(this.readiness(state)).filter((hold) => hold.startsWith("ship-to-"));
+        if (contactHolds.length) return { type: "refuse", code: contactHolds[0]!, holds: contactHolds };
+      }
       const version = state.order.eventVersion + 1;
       return {
         type: "write",

package/apps/storefront/src/lib/orders/vault/orderContactVault.ts

@@ -71,6 +71,8 @@ const LAYOUT: Readonly<Record<Group, GroupLayout>> = {
   bill: { sealed: ["bill_name_ct", "bill_company_ct", "bill_line1_ct", "bill_line2_ct"], bidx: null, plain: ["bill_city", "bill_postal_code"] },
 };
 
+const ERASURE_BITS: Readonly<Record<Group, number>> = { identity: 1, email: 2, phone: 4, ship: 8, bill: 16 };
+
 function groupColumns(group: Group): string[] {
   const layout = LAYOUT[group];
   return [...layout.sealed, ...(layout.bidx ? [layout.bidx] : []), ...layout.plain];
@@ -624,7 +626,9 @@ function completeGroupSql(group: typeof AVAILABILITY_GROUPS[number]): string {
 
 const AVAILABILITY_SELECT = `SELECT o.order_id, o.placed_at AS order_placed_at,
     o.fulfillment_state AS order_fulfillment_state, (${correlatedTerminalSql("o")}) AS order_terminal_at,
-    v.order_id IS NOT NULL AS vault_present, v.erased_at IS NOT NULL AS erased,
+    v.order_id IS NOT NULL AS vault_present,
+    COALESCE((SELECT m.erased_groups FROM order_contact_markers m
+      WHERE m.tenant_id = o.tenant_id AND m.stage = o.stage AND m.order_id = o.order_id), 0) AS erased_groups,
     EXISTS (SELECT 1 FROM order_contact_markers m
       WHERE m.tenant_id = o.tenant_id AND m.stage = o.stage AND m.order_id = o.order_id) AS marked,
     EXISTS (SELECT 1 FROM contact_vault_data_keys k
@@ -648,13 +652,17 @@ function uniformAvailability(state: OrderContactState): OrderContactAvailability
 function contactAvailability(row: VaultRow, input: {
   tenantId: string; stage: VaultStage; now: Date; policy: RetentionPolicy;
 }): OrderContactAvailability {
-  if (Number(row.vault_present) !== 1) return uniformAvailability(Number(row.marked) === 1 ? "expired" : "absent");
+  const erased = (group: Group): boolean => (Number(row.erased_groups) & ERASURE_BITS[group]) !== 0;
+  if (Number(row.vault_present) !== 1) {
+    const missing = (group: Group): OrderContactState => erased(group) ? "erased" : Number(row.marked) === 1 ? "expired" : "absent";
+    return { identity: missing("identity"), email: missing("email"), shipTo: missing("ship") };
+  }
   const times = orderTimes(row.order_placed_at, row.order_fulfillment_state, row.order_terminal_at);
   if (times === "order-time-unreadable" || !Number.isFinite(input.now.getTime())) return uniformAvailability("unreadable");
   const states = groupStates(row, input.tenantId, input.stage, times, input.now, input.policy);
   const state = (group: typeof AVAILABILITY_GROUPS[number]): OrderContactState => {
     const current = states[group];
-    if (!current.sealed && Number(row.erased) === 1) return "erased";
+    if (!current.sealed && erased(group)) return "erased";
     if (!current.expiresAt) return "unreadable";
     if (!isGroupReadable(input.now, current.expiresAt, text(row, `${group}_ceiling`)) ||
       (input.stage === "preview" && input.now.getTime() >= Date.parse(previewDeleteAt(times.placedAt, input.policy)))) return "expired";
@@ -949,6 +957,10 @@ export async function eraseOrderContact(
   });
   const statements: QueryStatement[] = [
     batchAuditStatement(audit),
+    {
+      sql: `UPDATE order_contact_markers SET erased_groups = erased_groups | ? WHERE ${scope}`,
+      params: [targets.reduce((mask, group) => mask | ERASURE_BITS[group], 0), ...scopeParams],
+    },
     { sql: `UPDATE order_contact_vault SET ${clearSql(targets)}, erased_at = ? WHERE ${scope}`, params: [now.toISOString(), ...scopeParams] },
     ...normalizeStatements(scope, scopeParams),
   ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/storefront-runner",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "license": "SEE LICENSE IN LICENSE",
   "description": "World-shareable storefront runner: multi-tenant renderer on Astro/Cloudflare. No control plane.",
   "packageManager": "pnpm@11.9.0",