@open-mercato/core 0.5.1-develop.2802.9223828f7f → 0.5.1-develop.2855.9b058b7483

package/dist/modules/customers/lib/interactionReadModel.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/customers/lib/interactionReadModel.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { applyResponseEnrichers } from '@open-mercato/shared/lib/crud/enricher-runner'\nimport { loadCustomFieldValues } from '@open-mercato/shared/lib/crud/custom-fields'\nimport { normalizeCustomFieldResponse } from '@open-mercato/shared/lib/custom-fields/normalize'\nimport type { EnricherContext } from '@open-mercato/shared/lib/crud/response-enricher'\nimport { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { CustomerDeal, CustomerEntity, CustomerInteraction } from '../data/entities'\nimport { User } from '@open-mercato/core/modules/auth/data/entities'\nimport {\n  CUSTOMER_INTERACTION_ENTITY_ID,\n  type InteractionRecord,\n} from './interactionCompatibility'\n\ntype ContainerLike = {\n  resolve: (name: string) => unknown\n}\n\ntype AuthLike = {\n  tenantId: string | null\n  orgId: string | null\n  sub?: string | null\n  userId?: string | null\n  keyId?: string | null\n}\n\ntype RbacServiceLike = {\n  getGrantedFeatures?: (\n    userId: string,\n    input: { tenantId: string | null; organizationId: string | null },\n  ) => Promise<string[]>\n}\n\ntype HydrateCanonicalInteractionsInput = {\n  em: EntityManager\n  container: ContainerLike\n  auth: AuthLike\n  selectedOrganizationId: string | null\n  interactions: CustomerInteraction[]\n  enrich?: boolean\n}\n\ntype CustomerSummary = {\n  id: string\n  displayName: string | null\n  kind: string | null\n}\n\nfunction resolveActorId(auth: AuthLike): string {\n  if (typeof auth.sub === 'string' && auth.sub.trim().length > 0) return auth.sub\n  if (typeof auth.userId === 'string' && auth.userId.trim().length > 0) return auth.userId\n  if (typeof auth.keyId === 'string' && auth.keyId.trim().length > 0) return auth.keyId\n  return 'system'\n}\n\nfunction mergeAdditiveRecord<T extends Record<string, unknown>>(base: T, candidate: T | undefined): T {\n  if (!candidate) return base\n  const additions = Object.fromEntries(\n    Object.entries(candidate).filter(([key]) => !(key in base)),\n  ) as Partial<T>\n  return {\n    ...base,\n    ...additions,\n  }\n}\n\n// `loadCustomFieldValues` returns keys prefixed with `cf_` (the CRUD-factory projection shape).\n// The canonical `InteractionRecord.customValues` contract is unprefixed (e.g. `severity`,\n// `priority`, `description`) and every downstream consumer \u2014 the UI hooks, the todo/interaction\n// compatibility helpers, and the example-customers-sync outbound worker \u2014 reads the unprefixed\n// form. Normalize at the read-model boundary so the two shapes can't drift again.\nfunction normalizeInteractionCustomValues(values: Record<string, unknown> | null | undefined): Record<string, unknown> | null {\n  const normalized = normalizeCustomFieldResponse(values)\n  return normalized ?? null\n}\n\nasync function resolveUserFeatures(\n  container: ContainerLike,\n  userId: string,\n  tenantId: string | null,\n  organizationId: string | null,\n): Promise<string[] | undefined> {\n  try {\n    const rbac = container.resolve('rbacService') as RbacServiceLike | undefined\n    if (!rbac?.getGrantedFeatures) return undefined\n    return await rbac.getGrantedFeatures(userId, { tenantId, organizationId })\n  } catch {\n    return undefined\n  }\n}\n\nexport async function buildCustomersInteractionEnricherContext(\n  container: ContainerLike,\n  auth: AuthLike,\n  organizationId: string | null,\n): Promise<EnricherContext> {\n  const userId = resolveActorId(auth)\n  return {\n    organizationId: organizationId ?? '',\n    tenantId: auth.tenantId ?? '',\n    userId,\n    em: container.resolve('em'),\n    container,\n    userFeatures: await resolveUserFeatures(container, userId, auth.tenantId, organizationId),\n  }\n}\n\nexport async function loadCustomerSummaries(\n  em: EntityManager,\n  entityIds: string[],\n  tenantId?: string | null,\n  organizationId?: string | null,\n): Promise<Map<string, CustomerSummary>> {\n  if (!entityIds.length) return new Map()\n  const entities = await findWithDecryption(em, CustomerEntity, { id: { $in: entityIds } }, undefined, { tenantId, organizationId })\n  return new Map(\n    entities.map((entity) => [\n      entity.id,\n      {\n        id: entity.id,\n        displayName: entity.displayName ?? null,\n        kind: entity.kind ?? null,\n      },\n    ]),\n  )\n}\n\nexport async function hydrateCanonicalInteractions({\n  em,\n  container,\n  auth,\n  selectedOrganizationId,\n  interactions,\n  enrich = false,\n}: HydrateCanonicalInteractionsInput): Promise<InteractionRecord[]> {\n  if (interactions.length === 0) return []\n\n  const authorIds = Array.from(\n    new Set(\n      interactions\n        .map((interaction) =>\n          typeof interaction.authorUserId === 'string' ? interaction.authorUserId : null)\n        .filter((value): value is string => !!value),\n    ),\n  )\n  const dealIds = Array.from(\n    new Set(\n      interactions\n        .map((interaction) => (typeof interaction.dealId === 'string' ? interaction.dealId : null))\n        .filter((value): value is string => !!value),\n    ),\n  )\n\n  const tenantId = auth.tenantId ?? null\n  const organizationId = selectedOrganizationId ?? null\n  const [users, deals, customFieldValues] = await Promise.all([\n    authorIds.length > 0 ? findWithDecryption(em, User, { id: { $in: authorIds } }, undefined, { tenantId, organizationId }) : Promise.resolve([]),\n    dealIds.length > 0 ? findWithDecryption(em, CustomerDeal, { id: { $in: dealIds } }, undefined, { tenantId, organizationId }) : Promise.resolve([]),\n    loadCustomFieldValues({\n      em,\n      entityId: CUSTOMER_INTERACTION_ENTITY_ID,\n      recordIds: interactions.map((interaction) => interaction.id),\n      tenantIdByRecord: Object.fromEntries(interactions.map((interaction) => [interaction.id, interaction.tenantId])),\n      organizationIdByRecord: Object.fromEntries(interactions.map((interaction) => [interaction.id, interaction.organizationId])),\n      tenantFallbacks: [auth.tenantId].filter((value): value is string => !!value),\n    }),\n  ])\n\n  const userMap = new Map(\n    users.map((user) => [\n      user.id,\n      {\n        name: user.name ?? null,\n        email: user.email ?? null,\n      },\n    ]),\n  )\n  const dealMap = new Map(deals.map((deal) => [deal.id, deal.title]))\n\n  const baseItems: InteractionRecord[] = interactions.map((interaction) => {\n    const entityId = typeof interaction.entity === 'string' ? interaction.entity : interaction.entity.id\n    return {\n      id: interaction.id,\n      entityId,\n      dealId: interaction.dealId ?? null,\n      interactionType: interaction.interactionType,\n      title: interaction.title ?? null,\n      body: interaction.body ?? null,\n      status: interaction.status,\n      scheduledAt: interaction.scheduledAt ? interaction.scheduledAt.toISOString() : null,\n      occurredAt: interaction.occurredAt ? interaction.occurredAt.toISOString() : null,\n      priority: interaction.priority ?? null,\n      authorUserId: interaction.authorUserId ?? null,\n      ownerUserId: interaction.ownerUserId ?? null,\n      appearanceIcon: interaction.appearanceIcon ?? null,\n      appearanceColor: interaction.appearanceColor ?? null,\n      source: interaction.source ?? null,\n      duration: interaction.durationMinutes ?? null,\n      location: interaction.location ?? null,\n      allDay: interaction.allDay ?? null,\n      recurrenceRule: interaction.recurrenceRule ?? null,\n      recurrenceEnd: interaction.recurrenceEnd ? interaction.recurrenceEnd.toISOString() : null,\n      participants: interaction.participants ?? null,\n      reminderMinutes: interaction.reminderMinutes ?? null,\n      visibility: interaction.visibility ?? null,\n      linkedEntities: interaction.linkedEntities ?? null,\n      guestPermissions: interaction.guestPermissions ?? null,\n      organizationId: interaction.organizationId,\n      tenantId: interaction.tenantId,\n      createdAt: interaction.createdAt.toISOString(),\n      updatedAt: interaction.updatedAt.toISOString(),\n      authorName: interaction.authorUserId ? userMap.get(interaction.authorUserId)?.name ?? null : null,\n      authorEmail: interaction.authorUserId ? userMap.get(interaction.authorUserId)?.email ?? null : null,\n      dealTitle: interaction.dealId ? dealMap.get(interaction.dealId) ?? null : null,\n      customValues: normalizeInteractionCustomValues(customFieldValues[interaction.id]),\n    }\n  })\n\n  if (!enrich) return baseItems\n\n  const enricherContext = await buildCustomersInteractionEnricherContext(\n    container,\n    auth,\n    selectedOrganizationId,\n  )\n  const enriched = await applyResponseEnrichers(baseItems, 'customers.interaction', enricherContext)\n  return baseItems.map((item, index) => mergeAdditiveRecord(item, enriched.items[index]))\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { applyResponseEnrichers } from '@open-mercato/shared/lib/crud/enricher-runner'\nimport { loadCustomFieldValues } from '@open-mercato/shared/lib/crud/custom-fields'\nimport { normalizeCustomFieldResponse } from '@open-mercato/shared/lib/custom-fields/normalize'\nimport type { EnricherContext } from '@open-mercato/shared/lib/crud/response-enricher'\nimport { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { CustomerDeal, CustomerEntity, CustomerInteraction } from '../data/entities'\nimport { User } from '@open-mercato/core/modules/auth/data/entities'\nimport {\n  CUSTOMER_INTERACTION_ENTITY_ID,\n  type InteractionRecord,\n} from './interactionCompatibility'\n\ntype ContainerLike = {\n  resolve: (name: string) => unknown\n}\n\ntype AuthLike = {\n  tenantId: string | null\n  orgId: string | null\n  sub?: string | null\n  userId?: string | null\n  keyId?: string | null\n}\n\ntype RbacServiceLike = {\n  getGrantedFeatures?: (\n    userId: string,\n    input: { tenantId: string | null; organizationId: string | null },\n  ) => Promise<string[]>\n}\n\ntype HydrateCanonicalInteractionsInput = {\n  em: EntityManager\n  container: ContainerLike\n  auth: AuthLike\n  selectedOrganizationId: string | null\n  interactions: CustomerInteraction[]\n  enrich?: boolean\n}\n\ntype CustomerSummary = {\n  id: string\n  displayName: string | null\n  kind: string | null\n}\n\nfunction resolveActorId(auth: AuthLike): string {\n  if (typeof auth.sub === 'string' && auth.sub.trim().length > 0) return auth.sub\n  if (typeof auth.userId === 'string' && auth.userId.trim().length > 0) return auth.userId\n  if (typeof auth.keyId === 'string' && auth.keyId.trim().length > 0) return auth.keyId\n  return 'system'\n}\n\nfunction mergeAdditiveRecord<T extends Record<string, unknown>>(base: T, candidate: T | undefined): T {\n  if (!candidate) return base\n  const additions = Object.fromEntries(\n    Object.entries(candidate).filter(([key]) => !(key in base)),\n  ) as Partial<T>\n  return {\n    ...base,\n    ...additions,\n  }\n}\n\nfunction normalizeInteractionCustomValues(values: Record<string, unknown> | null | undefined): Record<string, unknown> | null {\n  return normalizeCustomFieldResponse(values) ?? null\n}\n\nasync function resolveUserFeatures(\n  container: ContainerLike,\n  userId: string,\n  tenantId: string | null,\n  organizationId: string | null,\n): Promise<string[] | undefined> {\n  try {\n    const rbac = container.resolve('rbacService') as RbacServiceLike | undefined\n    if (!rbac?.getGrantedFeatures) return undefined\n    return await rbac.getGrantedFeatures(userId, { tenantId, organizationId })\n  } catch {\n    return undefined\n  }\n}\n\nexport async function buildCustomersInteractionEnricherContext(\n  container: ContainerLike,\n  auth: AuthLike,\n  organizationId: string | null,\n): Promise<EnricherContext> {\n  const userId = resolveActorId(auth)\n  return {\n    organizationId: organizationId ?? '',\n    tenantId: auth.tenantId ?? '',\n    userId,\n    em: container.resolve('em'),\n    container,\n    userFeatures: await resolveUserFeatures(container, userId, auth.tenantId, organizationId),\n  }\n}\n\nexport async function loadCustomerSummaries(\n  em: EntityManager,\n  entityIds: string[],\n  tenantId?: string | null,\n  organizationId?: string | null,\n): Promise<Map<string, CustomerSummary>> {\n  if (!entityIds.length) return new Map()\n  const entities = await findWithDecryption(em, CustomerEntity, { id: { $in: entityIds } }, undefined, { tenantId, organizationId })\n  return new Map(\n    entities.map((entity) => [\n      entity.id,\n      {\n        id: entity.id,\n        displayName: entity.displayName ?? null,\n        kind: entity.kind ?? null,\n      },\n    ]),\n  )\n}\n\nexport async function hydrateCanonicalInteractions({\n  em,\n  container,\n  auth,\n  selectedOrganizationId,\n  interactions,\n  enrich = false,\n}: HydrateCanonicalInteractionsInput): Promise<InteractionRecord[]> {\n  if (interactions.length === 0) return []\n\n  const authorIds = Array.from(\n    new Set(\n      interactions\n        .map((interaction) =>\n          typeof interaction.authorUserId === 'string' ? interaction.authorUserId : null)\n        .filter((value): value is string => !!value),\n    ),\n  )\n  const dealIds = Array.from(\n    new Set(\n      interactions\n        .map((interaction) => (typeof interaction.dealId === 'string' ? interaction.dealId : null))\n        .filter((value): value is string => !!value),\n    ),\n  )\n\n  const tenantId = auth.tenantId ?? null\n  const organizationId = selectedOrganizationId ?? null\n  const [users, deals, customFieldValues] = await Promise.all([\n    authorIds.length > 0 ? findWithDecryption(em, User, { id: { $in: authorIds } }, undefined, { tenantId, organizationId }) : Promise.resolve([]),\n    dealIds.length > 0 ? findWithDecryption(em, CustomerDeal, { id: { $in: dealIds } }, undefined, { tenantId, organizationId }) : Promise.resolve([]),\n    loadCustomFieldValues({\n      em,\n      entityId: CUSTOMER_INTERACTION_ENTITY_ID,\n      recordIds: interactions.map((interaction) => interaction.id),\n      tenantIdByRecord: Object.fromEntries(interactions.map((interaction) => [interaction.id, interaction.tenantId])),\n      organizationIdByRecord: Object.fromEntries(interactions.map((interaction) => [interaction.id, interaction.organizationId])),\n      tenantFallbacks: [auth.tenantId].filter((value): value is string => !!value),\n    }),\n  ])\n\n  const userMap = new Map(\n    users.map((user) => [\n      user.id,\n      {\n        name: user.name ?? null,\n        email: user.email ?? null,\n      },\n    ]),\n  )\n  const dealMap = new Map(deals.map((deal) => [deal.id, deal.title]))\n\n  const baseItems: InteractionRecord[] = interactions.map((interaction) => {\n    const entityId = typeof interaction.entity === 'string' ? interaction.entity : interaction.entity.id\n    return {\n      id: interaction.id,\n      entityId,\n      dealId: interaction.dealId ?? null,\n      interactionType: interaction.interactionType,\n      title: interaction.title ?? null,\n      body: interaction.body ?? null,\n      status: interaction.status,\n      scheduledAt: interaction.scheduledAt ? interaction.scheduledAt.toISOString() : null,\n      occurredAt: interaction.occurredAt ? interaction.occurredAt.toISOString() : null,\n      priority: interaction.priority ?? null,\n      authorUserId: interaction.authorUserId ?? null,\n      ownerUserId: interaction.ownerUserId ?? null,\n      appearanceIcon: interaction.appearanceIcon ?? null,\n      appearanceColor: interaction.appearanceColor ?? null,\n      source: interaction.source ?? null,\n      duration: interaction.durationMinutes ?? null,\n      location: interaction.location ?? null,\n      allDay: interaction.allDay ?? null,\n      recurrenceRule: interaction.recurrenceRule ?? null,\n      recurrenceEnd: interaction.recurrenceEnd ? interaction.recurrenceEnd.toISOString() : null,\n      participants: interaction.participants ?? null,\n      reminderMinutes: interaction.reminderMinutes ?? null,\n      visibility: interaction.visibility ?? null,\n      linkedEntities: interaction.linkedEntities ?? null,\n      guestPermissions: interaction.guestPermissions ?? null,\n      organizationId: interaction.organizationId,\n      tenantId: interaction.tenantId,\n      createdAt: interaction.createdAt.toISOString(),\n      updatedAt: interaction.updatedAt.toISOString(),\n      authorName: interaction.authorUserId ? userMap.get(interaction.authorUserId)?.name ?? null : null,\n      authorEmail: interaction.authorUserId ? userMap.get(interaction.authorUserId)?.email ?? null : null,\n      dealTitle: interaction.dealId ? dealMap.get(interaction.dealId) ?? null : null,\n      customValues: normalizeInteractionCustomValues(customFieldValues[interaction.id]),\n    }\n  })\n\n  if (!enrich) return baseItems\n\n  const enricherContext = await buildCustomersInteractionEnricherContext(\n    container,\n    auth,\n    selectedOrganizationId,\n  )\n  const enriched = await applyResponseEnrichers(baseItems, 'customers.interaction', enricherContext)\n  return baseItems.map((item, index) => mergeAdditiveRecord(item, enriched.items[index]))\n}\n"],
+  "mappings": "AACA,SAAS,8BAA8B;AACvC,SAAS,6BAA6B;AACtC,SAAS,oCAAoC;AAE7C,SAAS,0BAA0B;AACnC,SAAS,cAAc,sBAA2C;AAClE,SAAS,YAAY;AACrB;AAAA,EACE;AAAA,OAEK;AAoCP,SAAS,eAAe,MAAwB;AAC9C,MAAI,OAAO,KAAK,QAAQ,YAAY,KAAK,IAAI,KAAK,EAAE,SAAS,EAAG,QAAO,KAAK;AAC5E,MAAI,OAAO,KAAK,WAAW,YAAY,KAAK,OAAO,KAAK,EAAE,SAAS,EAAG,QAAO,KAAK;AAClF,MAAI,OAAO,KAAK,UAAU,YAAY,KAAK,MAAM,KAAK,EAAE,SAAS,EAAG,QAAO,KAAK;AAChF,SAAO;AACT;AAEA,SAAS,oBAAuD,MAAS,WAA6B;AACpG,MAAI,CAAC,UAAW,QAAO;AACvB,QAAM,YAAY,OAAO;AAAA,IACvB,OAAO,QAAQ,SAAS,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,KAAK;AAAA,EAC5D;AACA,SAAO;AAAA,IACL,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF;AAEA,SAAS,iCAAiC,QAAoF;AAC5H,SAAO,6BAA6B,MAAM,KAAK;AACjD;AAEA,eAAe,oBACb,WACA,QACA,UACA,gBAC+B;AAC/B,MAAI;AACF,UAAM,OAAO,UAAU,QAAQ,aAAa;AAC5C,QAAI,CAAC,MAAM,mBAAoB,QAAO;AACtC,WAAO,MAAM,KAAK,mBAAmB,QAAQ,EAAE,UAAU,eAAe,CAAC;AAAA,EAC3E,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEA,eAAsB,yCACpB,WACA,MACA,gBAC0B;AAC1B,QAAM,SAAS,eAAe,IAAI;AAClC,SAAO;AAAA,IACL,gBAAgB,kBAAkB;AAAA,IAClC,UAAU,KAAK,YAAY;AAAA,IAC3B;AAAA,IACA,IAAI,UAAU,QAAQ,IAAI;AAAA,IAC1B;AAAA,IACA,cAAc,MAAM,oBAAoB,WAAW,QAAQ,KAAK,UAAU,cAAc;AAAA,EAC1F;AACF;AAEA,eAAsB,sBACpB,IACA,WACA,UACA,gBACuC;AACvC,MAAI,CAAC,UAAU,OAAQ,QAAO,oBAAI,IAAI;AACtC,QAAM,WAAW,MAAM,mBAAmB,IAAI,gBAAgB,EAAE,IAAI,EAAE,KAAK,UAAU,EAAE,GAAG,QAAW,EAAE,UAAU,eAAe,CAAC;AACjI,SAAO,IAAI;AAAA,IACT,SAAS,IAAI,CAAC,WAAW;AAAA,MACvB,OAAO;AAAA,MACP;AAAA,QACE,IAAI,OAAO;AAAA,QACX,aAAa,OAAO,eAAe;AAAA,QACnC,MAAM,OAAO,QAAQ;AAAA,MACvB;AAAA,IACF,CAAC;AAAA,EACH;AACF;AAEA,eAAsB,6BAA6B;AAAA,EACjD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,SAAS;AACX,GAAoE;AAClE,MAAI,aAAa,WAAW,EAAG,QAAO,CAAC;AAEvC,QAAM,YAAY,MAAM;AAAA,IACtB,IAAI;AAAA,MACF,aACG,IAAI,CAAC,gBACJ,OAAO,YAAY,iBAAiB,WAAW,YAAY,eAAe,IAAI,EAC/E,OAAO,CAAC,UAA2B,CAAC,CAAC,KAAK;AAAA,IAC/C;AAAA,EACF;AACA,QAAM,UAAU,MAAM;AAAA,IACpB,IAAI;AAAA,MACF,aACG,IAAI,CAAC,gBAAiB,OAAO,YAAY,WAAW,WAAW,YAAY,SAAS,IAAK,EACzF,OAAO,CAAC,UAA2B,CAAC,CAAC,KAAK;AAAA,IAC/C;AAAA,EACF;AAEA,QAAM,WAAW,KAAK,YAAY;AAClC,QAAM,iBAAiB,0BAA0B;AACjD,QAAM,CAAC,OAAO,OAAO,iBAAiB,IAAI,MAAM,QAAQ,IAAI;AAAA,IAC1D,UAAU,SAAS,IAAI,mBAAmB,IAAI,MAAM,EAAE,IAAI,EAAE,KAAK,UAAU,EAAE,GAAG,QAAW,EAAE,UAAU,eAAe,CAAC,IAAI,QAAQ,QAAQ,CAAC,CAAC;AAAA,IAC7I,QAAQ,SAAS,IAAI,mBAAmB,IAAI,cAAc,EAAE,IAAI,EAAE,KAAK,QAAQ,EAAE,GAAG,QAAW,EAAE,UAAU,eAAe,CAAC,IAAI,QAAQ,QAAQ,CAAC,CAAC;AAAA,IACjJ,sBAAsB;AAAA,MACpB;AAAA,MACA,UAAU;AAAA,MACV,WAAW,aAAa,IAAI,CAAC,gBAAgB,YAAY,EAAE;AAAA,MAC3D,kBAAkB,OAAO,YAAY,aAAa,IAAI,CAAC,gBAAgB,CAAC,YAAY,IAAI,YAAY,QAAQ,CAAC,CAAC;AAAA,MAC9G,wBAAwB,OAAO,YAAY,aAAa,IAAI,CAAC,gBAAgB,CAAC,YAAY,IAAI,YAAY,cAAc,CAAC,CAAC;AAAA,MAC1H,iBAAiB,CAAC,KAAK,QAAQ,EAAE,OAAO,CAAC,UAA2B,CAAC,CAAC,KAAK;AAAA,IAC7E,CAAC;AAAA,EACH,CAAC;AAED,QAAM,UAAU,IAAI;AAAA,IAClB,MAAM,IAAI,CAAC,SAAS;AAAA,MAClB,KAAK;AAAA,MACL;AAAA,QACE,MAAM,KAAK,QAAQ;AAAA,QACnB,OAAO,KAAK,SAAS;AAAA,MACvB;AAAA,IACF,CAAC;AAAA,EACH;AACA,QAAM,UAAU,IAAI,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,KAAK,KAAK,CAAC,CAAC;AAElE,QAAM,YAAiC,aAAa,IAAI,CAAC,gBAAgB;AACvE,UAAM,WAAW,OAAO,YAAY,WAAW,WAAW,YAAY,SAAS,YAAY,OAAO;AAClG,WAAO;AAAA,MACL,IAAI,YAAY;AAAA,MAChB;AAAA,MACA,QAAQ,YAAY,UAAU;AAAA,MAC9B,iBAAiB,YAAY;AAAA,MAC7B,OAAO,YAAY,SAAS;AAAA,MAC5B,MAAM,YAAY,QAAQ;AAAA,MAC1B,QAAQ,YAAY;AAAA,MACpB,aAAa,YAAY,cAAc,YAAY,YAAY,YAAY,IAAI;AAAA,MAC/E,YAAY,YAAY,aAAa,YAAY,WAAW,YAAY,IAAI;AAAA,MAC5E,UAAU,YAAY,YAAY;AAAA,MAClC,cAAc,YAAY,gBAAgB;AAAA,MAC1C,aAAa,YAAY,eAAe;AAAA,MACxC,gBAAgB,YAAY,kBAAkB;AAAA,MAC9C,iBAAiB,YAAY,mBAAmB;AAAA,MAChD,QAAQ,YAAY,UAAU;AAAA,MAC9B,UAAU,YAAY,mBAAmB;AAAA,MACzC,UAAU,YAAY,YAAY;AAAA,MAClC,QAAQ,YAAY,UAAU;AAAA,MAC9B,gBAAgB,YAAY,kBAAkB;AAAA,MAC9C,eAAe,YAAY,gBAAgB,YAAY,cAAc,YAAY,IAAI;AAAA,MACrF,cAAc,YAAY,gBAAgB;AAAA,MAC1C,iBAAiB,YAAY,mBAAmB;AAAA,MAChD,YAAY,YAAY,cAAc;AAAA,MACtC,gBAAgB,YAAY,kBAAkB;AAAA,MAC9C,kBAAkB,YAAY,oBAAoB;AAAA,MAClD,gBAAgB,YAAY;AAAA,MAC5B,UAAU,YAAY;AAAA,MACtB,WAAW,YAAY,UAAU,YAAY;AAAA,MAC7C,WAAW,YAAY,UAAU,YAAY;AAAA,MAC7C,YAAY,YAAY,eAAe,QAAQ,IAAI,YAAY,YAAY,GAAG,QAAQ,OAAO;AAAA,MAC7F,aAAa,YAAY,eAAe,QAAQ,IAAI,YAAY,YAAY,GAAG,SAAS,OAAO;AAAA,MAC/F,WAAW,YAAY,SAAS,QAAQ,IAAI,YAAY,MAAM,KAAK,OAAO;AAAA,MAC1E,cAAc,iCAAiC,kBAAkB,YAAY,EAAE,CAAC;AAAA,IAClF;AAAA,EACF,CAAC;AAED,MAAI,CAAC,OAAQ,QAAO;AAEpB,QAAM,kBAAkB,MAAM;AAAA,IAC5B;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,QAAM,WAAW,MAAM,uBAAuB,WAAW,yBAAyB,eAAe;AACjG,SAAO,UAAU,IAAI,CAAC,MAAM,UAAU,oBAAoB,MAAM,SAAS,MAAM,KAAK,CAAC,CAAC;AACxF;",
   "names": []
 }

package/dist/modules/customers/lib/operationMetadata.js

@@ -0,0 +1,21 @@
+import { serializeOperationMetadata } from "@open-mercato/shared/lib/commands/operationMetadata";
+function withOperationMetadata(response, logEntry, fallback) {
+  if (!logEntry?.undoToken || !logEntry.id || !logEntry.commandId) return response;
+  response.headers.set(
+    "x-om-operation",
+    serializeOperationMetadata({
+      id: logEntry.id,
+      undoToken: logEntry.undoToken,
+      commandId: logEntry.commandId,
+      actionLabel: logEntry.actionLabel ?? null,
+      resourceKind: logEntry.resourceKind ?? fallback.resourceKind,
+      resourceId: logEntry.resourceId ?? fallback.resourceId,
+      executedAt: logEntry.createdAt instanceof Date ? logEntry.createdAt.toISOString() : (/* @__PURE__ */ new Date()).toISOString()
+    })
+  );
+  return response;
+}
+export {
+  withOperationMetadata
+};
+//# sourceMappingURL=operationMetadata.js.map

package/dist/modules/customers/lib/operationMetadata.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/customers/lib/operationMetadata.ts"],
+  "sourcesContent": ["import type { NextResponse } from 'next/server'\nimport { serializeOperationMetadata } from '@open-mercato/shared/lib/commands/operationMetadata'\n\nexport type OperationLogEntry = {\n  undoToken?: string | null\n  id?: string | null\n  commandId?: string | null\n  actionLabel?: string | null\n  resourceKind?: string | null\n  resourceId?: string | null\n  createdAt?: Date | null\n}\n\nexport type OperationMetadataFallback = {\n  resourceKind: string\n  resourceId: string | null\n}\n\nexport function withOperationMetadata(\n  response: NextResponse,\n  logEntry: OperationLogEntry | null | undefined,\n  fallback: OperationMetadataFallback,\n): NextResponse {\n  if (!logEntry?.undoToken || !logEntry.id || !logEntry.commandId) return response\n  response.headers.set(\n    'x-om-operation',\n    serializeOperationMetadata({\n      id: logEntry.id,\n      undoToken: logEntry.undoToken,\n      commandId: logEntry.commandId,\n      actionLabel: logEntry.actionLabel ?? null,\n      resourceKind: logEntry.resourceKind ?? fallback.resourceKind,\n      resourceId: logEntry.resourceId ?? fallback.resourceId,\n      executedAt: logEntry.createdAt instanceof Date ? logEntry.createdAt.toISOString() : new Date().toISOString(),\n    }),\n  )\n  return response\n}\n"],
+  "mappings": "AACA,SAAS,kCAAkC;AAiBpC,SAAS,sBACd,UACA,UACA,UACc;AACd,MAAI,CAAC,UAAU,aAAa,CAAC,SAAS,MAAM,CAAC,SAAS,UAAW,QAAO;AACxE,WAAS,QAAQ;AAAA,IACf;AAAA,IACA,2BAA2B;AAAA,MACzB,IAAI,SAAS;AAAA,MACb,WAAW,SAAS;AAAA,MACpB,WAAW,SAAS;AAAA,MACpB,aAAa,SAAS,eAAe;AAAA,MACrC,cAAc,SAAS,gBAAgB,SAAS;AAAA,MAChD,YAAY,SAAS,cAAc,SAAS;AAAA,MAC5C,YAAY,SAAS,qBAAqB,OAAO,SAAS,UAAU,YAAY,KAAI,oBAAI,KAAK,GAAE,YAAY;AAAA,IAC7G,CAAC;AAAA,EACH;AACA,SAAO;AACT;",
+  "names": []
+}

package/generated/entities/action_log/index.ts

@@ -19,6 +19,8 @@ export const changed_fields = "changed_fields";
 export const primary_changed_field = "primary_changed_field";
 export const context_json = "context_json";
 export const source_key = "source_key";
+export const related_resource_kind = "related_resource_kind";
+export const related_resource_id = "related_resource_id";
 export const created_at = "created_at";
 export const updated_at = "updated_at";
 export const deleted_at = "deleted_at";

package/generated/entity-fields-registry.ts

@@ -36,6 +36,8 @@ export const entityFieldsRegistry: Record<string, Record<string, string>> = {
       "primary_changed_field": "primary_changed_field",
       "context_json": "context_json",
       "source_key": "source_key",
+      "related_resource_kind": "related_resource_kind",
+      "related_resource_id": "related_resource_id",
       "created_at": "created_at",
       "updated_at": "updated_at",
       "deleted_at": "deleted_at"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.5.1-develop.2802.9223828f7f",
+  "version": "0.5.1-develop.2855.9b058b7483",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -237,10 +237,10 @@
     "ts-pattern": "^5.0.0"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.5.1-develop.2802.9223828f7f"
+    "@open-mercato/shared": "0.5.1-develop.2855.9b058b7483"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.5.1-develop.2802.9223828f7f",
+    "@open-mercato/shared": "0.5.1-develop.2855.9b058b7483",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/modules/audit_logs/data/entities.ts

@@ -12,6 +12,7 @@ export type ActionLogExecutionState = 'done' | 'undone' | 'failed' | 'redone'
 @Index({ name: 'action_logs_source_key_idx', properties: ['tenantId', 'organizationId', 'sourceKey', 'createdAt'] })
 @Index({ name: 'action_logs_primary_changed_field_idx', properties: ['tenantId', 'organizationId', 'primaryChangedField', 'createdAt'] })
 @Index({ name: 'action_logs_changed_fields_idx', properties: ['changedFields'], type: 'gin' })
+@Index({ name: 'action_logs_related_resource_idx', properties: ['tenantId', 'relatedResourceKind', 'relatedResourceId', 'createdAt'] })
 export class ActionLog {
   @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
   id!: string
@@ -76,6 +77,12 @@ export class ActionLog {
   @Property({ name: 'source_key', type: 'text', nullable: true })
   sourceKey: ActionLogSourceKey | null = null
 
+  @Property({ name: 'related_resource_kind', type: 'text', nullable: true })
+  relatedResourceKind: string | null = null
+
+  @Property({ name: 'related_resource_id', type: 'text', nullable: true })
+  relatedResourceId: string | null = null
+
   @Property({ name: 'created_at', type: Date, onCreate: () => new Date() })
   createdAt: Date = new Date()
 

package/src/modules/audit_logs/data/validators.ts

@@ -26,6 +26,8 @@ export const actionLogCreateSchema = baseScopeSchema.extend({
   commandPayload: z.unknown().optional(),
   snapshotBefore: z.unknown().optional(),
   snapshotAfter: z.unknown().optional(),
+  relatedResourceKind: z.string().min(1).optional().nullable(),
+  relatedResourceId: z.string().min(1).optional().nullable(),
   changes: recordLike,
   context: recordLike,
 })

package/src/modules/audit_logs/migrations/.snapshot-open-mercato.json

@@ -1,10 +1,12 @@
 {
+  "name": "public",
   "namespaces": [
     "public"
   ],
-  "name": "public",
   "tables": [
     {
+      "name": "access_logs",
+      "schema": "public",
       "columns": {
         "id": {
           "name": "id",
@@ -183,8 +185,6 @@
           "mappedType": "datetime"
         }
       },
-      "name": "access_logs",
-      "schema": "public",
       "indexes": [
         {
           "keyName": "access_logs_actor_idx",
@@ -224,6 +224,8 @@
       "nativeEnums": {}
     },
     {
+      "name": "action_logs",
+      "schema": "public",
       "columns": {
         "id": {
           "name": "id",
@@ -561,6 +563,38 @@
           "enumItems": [],
           "mappedType": "text"
         },
+        "related_resource_kind": {
+          "name": "related_resource_kind",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
+          "mappedType": "text"
+        },
+        "related_resource_id": {
+          "name": "related_resource_id",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
+          "mappedType": "text"
+        },
         "created_at": {
           "name": "created_at",
           "type": "timestamptz",
@@ -610,9 +644,20 @@
           "mappedType": "datetime"
         }
       },
-      "name": "action_logs",
-      "schema": "public",
       "indexes": [
+        {
+          "keyName": "action_logs_related_resource_idx",
+          "columnNames": [
+            "tenant_id",
+            "related_resource_kind",
+            "related_resource_id",
+            "created_at"
+          ],
+          "composite": true,
+          "constraint": false,
+          "primary": false,
+          "unique": false
+        },
         {
           "keyName": "action_logs_changed_fields_idx",
           "columnNames": [
@@ -727,5 +772,6 @@
       "nativeEnums": {}
     }
   ],
+  "views": [],
   "nativeEnums": {}
 }

package/src/modules/audit_logs/migrations/Migration20260423202109.ts

@@ -0,0 +1,15 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260423202109 extends Migration {
+
+  override up(): void | Promise<void> {
+    this.addSql(`alter table "action_logs" add "related_resource_kind" text null, add "related_resource_id" text null;`);
+    this.addSql(`create index "action_logs_related_resource_idx" on "action_logs" ("tenant_id", "related_resource_kind", "related_resource_id", "created_at");`);
+  }
+
+  override down(): void | Promise<void> {
+    this.addSql(`drop index "action_logs_related_resource_idx";`);
+    this.addSql(`alter table "action_logs" drop column "related_resource_kind", drop column "related_resource_id";`);
+  }
+
+}

package/src/modules/audit_logs/services/accessLogService.ts

@@ -23,6 +23,7 @@ const CORE_RETENTION_DAYS = toPositiveNumber(process.env.AUDIT_LOGS_CORE_RETENTI
 const NON_CORE_RETENTION_HOURS = toPositiveNumber(process.env.AUDIT_LOGS_NON_CORE_RETENTION_HOURS, 8)
 const CORE_RETENTION_MS = CORE_RETENTION_DAYS * 24 * 60 * 60 * 1000
 const NON_CORE_RETENTION_MS = NON_CORE_RETENTION_HOURS * 60 * 60 * 1000
+const UUID_REGEX = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/
 
 let validationWarningLogged = false
 let runtimeValidationAvailable: boolean | null = null
@@ -140,10 +141,7 @@ export class AccessLogService {
     const UUID_REGEX = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/
     const toNullableUuid = (value: unknown) => {
       if (typeof value !== 'string' || value.length === 0) return null
-      // Extract UUID from "api_key:<uuid>" format (used by workflow authentication)
       const candidate = value.startsWith('api_key:') ? value.slice('api_key:'.length) : value
-      // System actors (sync workers, scheduler, etc.) use non-UUID subjects like
-      // "system:...". Reject those so the uuid column stays valid.
       return UUID_REGEX.test(candidate) ? candidate : null
     }
     const fields = Array.isArray(input.fields)

package/src/modules/audit_logs/services/actionLogService.ts

@@ -27,6 +27,7 @@ const isZodRuntimeMissing = (err: unknown) => err instanceof TypeError && typeof
 const SORT_FIELDS = {
   createdAt: 'action_logs.created_at',
 } as const
+const UUID_REGEX = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/
 
 type ActionLogProjectionBackfillOptions = {
   batchSize?: number
@@ -236,6 +237,8 @@ export class ActionLogService {
       resourceId: data.resourceId ?? null,
       parentResourceKind: data.parentResourceKind ?? null,
       parentResourceId: data.parentResourceId ?? null,
+      relatedResourceKind: toOptionalString(data.relatedResourceKind) ?? null,
+      relatedResourceId: toOptionalString(data.relatedResourceId) ?? null,
       executionState: data.executionState ?? 'done',
       undoToken: data.undoToken ?? null,
       commandPayload: data.commandPayload ?? null,
@@ -261,6 +264,8 @@ export class ActionLogService {
         actionLabel: undefined,
         resourceKind: undefined,
         resourceId: undefined,
+        relatedResourceKind: null,
+        relatedResourceId: null,
         executionState: 'done',
         undoToken: undefined,
         commandPayload: undefined,
@@ -274,13 +279,7 @@ export class ActionLogService {
     const UUID_REGEX = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/
     const toNullableUuid = (value: unknown) => {
       if (typeof value !== 'string' || value.length === 0) return null
-      // Extract UUID from "api_key:<uuid>" format (used by workflow authentication).
       const candidate = value.startsWith('api_key:') ? value.slice('api_key:'.length) : value
-      // System actors (outbound sync workers, scheduler, etc.) carry subjects like
-      // "system:example_customers_sync:outbound" that are not UUIDs. Writing them into
-      // `actor_user_id` (uuid column) trips the Postgres driver with
-      // `invalid input syntax for type uuid`. Reject anything that isn't a UUID so the
-      // action log safely records a null actor for system-originated commands.
       return UUID_REGEX.test(candidate) ? candidate : null
     }
 
@@ -307,6 +306,8 @@ export class ActionLogService {
       resourceId: toOptionalString(input.resourceId) ?? undefined,
       parentResourceKind: toOptionalString(input.parentResourceKind) ?? null,
       parentResourceId: toOptionalString(input.parentResourceId) ?? null,
+      relatedResourceKind: toOptionalString(input.relatedResourceKind) ?? null,
+      relatedResourceId: toOptionalString(input.relatedResourceId) ?? null,
       executionState: input.executionState === 'undone' || input.executionState === 'failed' ? input.executionState : 'done',
       undoToken: toOptionalString(input.undoToken) ?? undefined,
       commandPayload: input.commandPayload,
@@ -408,6 +409,10 @@ export class ActionLogService {
             eb('action_logs.parent_resource_kind', '=', parsed.resourceKind),
             eb('action_logs.parent_resource_id', '=', parsed.resourceId),
           ]),
+          eb.and([
+            eb('action_logs.related_resource_kind', '=', parsed.resourceKind),
+            eb('action_logs.related_resource_id', '=', parsed.resourceId),
+          ]),
         ])
       )
     } else {

package/src/modules/customers/api/entity-roles-factory.ts

@@ -2,7 +2,6 @@ import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import type { CommandBus } from '@open-mercato/shared/lib/commands'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
-import { serializeOperationMetadata } from '@open-mercato/shared/lib/commands/operationMetadata'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { validateCrudMutationGuard, runCrudMutationGuardAfterSuccess } from '@open-mercato/shared/lib/crud/mutation-guard'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
@@ -14,6 +13,8 @@ import { CustomerEntity, CustomerEntityRole } from '../data/entities'
 import { entityRoleCreateSchema, entityRoleUpdateSchema, entityRoleDeleteSchema, type EntityRoleCreateInput, type EntityRoleUpdateInput, type EntityRoleDeleteInput } from '../data/validators'
 import { withScopedPayload } from './utils'
 import { resolveCustomersRequestContext, resolveAuthActorId } from '../lib/interactionRequestContext'
+import { deriveDisplayNameFromEmail } from '../lib/displayName'
+import { withOperationMetadata } from '../lib/operationMetadata'
 
 const paramsSchema = z.object({ id: z.string().uuid() })
 const roleIdQuerySchema = z.object({ roleId: z.string().uuid() })
@@ -60,27 +61,6 @@ function buildValidationErrorResponse(error: z.ZodError, translate: Translator)
   )
 }
 
-function withOperationMetadata(
-  response: NextResponse,
-  logEntry: { undoToken?: string | null; id?: string | null; commandId?: string | null; actionLabel?: string | null; resourceKind?: string | null; resourceId?: string | null; createdAt?: Date | null } | null | undefined,
-  fallback: { resourceKind: string; resourceId: string | null },
-) {
-  if (!logEntry?.undoToken || !logEntry.id || !logEntry.commandId) return response
-  response.headers.set(
-    'x-om-operation',
-    serializeOperationMetadata({
-      id: logEntry.id,
-      undoToken: logEntry.undoToken,
-      commandId: logEntry.commandId,
-      actionLabel: logEntry.actionLabel ?? null,
-      resourceKind: logEntry.resourceKind ?? fallback.resourceKind,
-      resourceId: logEntry.resourceId ?? fallback.resourceId,
-      executedAt: logEntry.createdAt instanceof Date ? logEntry.createdAt.toISOString() : new Date().toISOString(),
-    }),
-  )
-  return response
-}
-
 async function buildContext(request: Request) {
   const context = await resolveCustomersRequestContext(request)
   return {
@@ -314,7 +294,7 @@ export function createEntityRolesHandlers(entityType: EntityType) {
           )
         : []
       const userMap = new Map(users.map((user) => [user.id, {
-        name: user.name ?? null,
+        name: user.name ?? deriveDisplayNameFromEmail(user.email) ?? null,
         email: user.email ?? null,
         phone: null,
       }]))

package/src/modules/customers/api/interactions/cancel/route.ts

@@ -14,6 +14,7 @@ import {
   validateCrudMutationGuard,
 } from '@open-mercato/shared/lib/crud/mutation-guard'
 import { resolveAuthActorId } from '../../../lib/interactionRequestContext'
+import { withOperationMetadata } from '../../../lib/operationMetadata'
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['customers.interactions.manage'] },
@@ -56,7 +57,7 @@ export async function POST(req: Request) {
     }
 
     const commandBus = ctx.container.resolve('commandBus') as CommandBus
-    await commandBus.execute<InteractionCancelInput, { interactionId: string }>(
+    const { logEntry } = await commandBus.execute<InteractionCancelInput, { interactionId: string }>(
       'customers.interactions.cancel',
       { input: parsed, ctx },
     )
@@ -73,7 +74,11 @@ export async function POST(req: Request) {
         metadata: guardResult.metadata ?? null,
       })
     }
-    return NextResponse.json({ ok: true })
+    return withOperationMetadata(
+      NextResponse.json({ ok: true }),
+      logEntry,
+      { resourceKind: 'customers.interaction', resourceId: parsed.id },
+    )
   } catch (err) {
     if (err instanceof CrudHttpError) {
       return NextResponse.json(err.body, { status: err.status })

package/src/modules/customers/api/interactions/complete/route.ts

@@ -14,6 +14,7 @@ import {
   validateCrudMutationGuard,
 } from '@open-mercato/shared/lib/crud/mutation-guard'
 import { resolveAuthActorId } from '../../../lib/interactionRequestContext'
+import { withOperationMetadata } from '../../../lib/operationMetadata'
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['customers.interactions.manage'] },
@@ -56,7 +57,7 @@ export async function POST(req: Request) {
     }
 
     const commandBus = ctx.container.resolve('commandBus') as CommandBus
-    await commandBus.execute<InteractionCompleteInput, { interactionId: string }>(
+    const { logEntry } = await commandBus.execute<InteractionCompleteInput, { interactionId: string }>(
       'customers.interactions.complete',
       { input: parsed, ctx },
     )
@@ -73,7 +74,11 @@ export async function POST(req: Request) {
         metadata: guardResult.metadata ?? null,
       })
     }
-    return NextResponse.json({ ok: true })
+    return withOperationMetadata(
+      NextResponse.json({ ok: true }),
+      logEntry,
+      { resourceKind: 'customers.interaction', resourceId: parsed.id },
+    )
   } catch (err) {
     if (err instanceof CrudHttpError) {
       return NextResponse.json(err.body, { status: err.status })