npm - @open-mercato/core - Versions diffs - 0.6.8-develop.6925.1.cefa200fa4 → 0.6.8-develop.6930.1.1e5976efc3 - Mend

@open-mercato/core 0.6.8-develop.6925.1.cefa200fa4 → 0.6.8-develop.6930.1.1e5976efc3

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.

Files changed (402) hide show

package/dist/modules/notifications/lib/notificationService.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/notifications/lib/notificationService.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { type Kysely, sql } from 'kysely'\nimport { CrudHttpError, conflict } from '@open-mercato/shared/lib/crud/errors'\nimport { invalidateCrudCache } from '@open-mercato/shared/lib/crud/cache'\nimport { Notification, type NotificationStatus } from '../data/entities'\nimport type { CreateNotificationInput, CreateBatchNotificationInput, CreateRoleNotificationInput, CreateFeatureNotificationInput, ExecuteActionInput } from '../data/validators'\nimport type { NotificationPollData } from '@open-mercato/shared/modules/notifications/types'\nimport { NOTIFICATION_EVENTS, NOTIFICATION_SSE_EVENTS } from './events'\nimport { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport {\n  buildNotificationEntity,\n  emitNotificationCreated,\n  emitNotificationCreatedBatch,\n  type NotificationContentInput,\n  type NotificationTenantContext,\n} from './notificationFactory'\nimport { toNotificationDto } from './notificationMapper'\nimport { buildNotificationReadScopeWhere } from './notificationScope'\nimport {\n  getRecipientUserIdsForFeature,\n  getRecipientUserIdsForRole,\n  getScopedNotificationRecipientUserIds,\n} from './notificationRecipients'\nimport { assertSafeNotificationHref, sanitizeNotificationActions } from './safeHref'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('notifications').child({ component: 'service' })\n\nfunction debug(message: string, ...details: unknown[]): void {\n  logger.debug(message, details.length ? { details } : undefined)\n}\n\nfunction getDb(em: EntityManager): Kysely<any> {\n  return em.getKysely<any>()\n}\n\nconst UNIQUE_NOTIFICATION_ACTIVE_STATUSES: NotificationStatus[] = ['unread', 'read', 'actioned']\nconst NOTIFICATION_RESOURCE_KIND = 'notifications.notification'\n\nfunction normalizeOrgScope(organizationId: string | null | undefined): string | null {\n  return organizationId ?? null\n}\n\nasync function invalidateNotificationCache(\n  container: NotificationServiceDeps['container'],\n  ctx: Pick<NotificationServiceContext, 'tenantId' | 'organizationId'>,\n  reason: string,\n  notificationId?: string,\n): Promise<void> {\n  if (!container) return\n  await invalidateCrudCache(\n    container as Parameters<typeof invalidateCrudCache>[0],\n    NOTIFICATION_RESOURCE_KIND,\n    {\n      id: notificationId,\n      tenantId: ctx.tenantId,\n      organizationId: normalizeOrgScope(ctx.organizationId),\n    },\n    ctx.tenantId,\n    reason,\n  )\n}\n\nasync function assertNotificationRecipientsInScope(\n  em: EntityManager,\n  recipientUserIds: string[],\n  ctx: NotificationServiceContext,\n): Promise<void> {\n  const scopedRecipientUserIds = await getScopedNotificationRecipientUserIds(\n    getDb(em),\n    ctx.tenantId,\n    normalizeOrgScope(ctx.organizationId),\n    recipientUserIds,\n  )\n\n  if (scopedRecipientUserIds.length !== recipientUserIds.length) {\n    throw new CrudHttpError(404, { error: 'Notification recipient not found' })\n  }\n}\n\nfunction applyNotificationContent(\n  notification: Notification,\n  input: NotificationContentInput,\n  recipientUserId: string,\n  ctx: NotificationTenantContext,\n) {\n  const actions = sanitizeNotificationActions(input.actions)\n  const linkHref = assertSafeNotificationHref(input.linkHref)\n\n  notification.recipientUserId = recipientUserId\n  notification.type = input.type\n  notification.titleKey = input.titleKey\n  notification.bodyKey = input.bodyKey\n  notification.titleVariables = input.titleVariables\n  notification.bodyVariables = input.bodyVariables\n  notification.title = input.title || input.titleKey || ''\n  notification.body = input.body\n  notification.icon = input.icon\n  notification.severity = input.severity ?? 'info'\n  notification.actionData = actions\n    ? {\n        actions,\n        primaryActionId: input.primaryActionId,\n      }\n    : null\n  notification.sourceModule = input.sourceModule\n  notification.sourceEntityType = input.sourceEntityType\n  notification.sourceEntityId = input.sourceEntityId\n  notification.linkHref = linkHref\n  notification.groupKey = input.groupKey\n  notification.expiresAt = input.expiresAt ? new Date(input.expiresAt) : null\n  notification.tenantId = ctx.tenantId\n  notification.organizationId = normalizeOrgScope(ctx.organizationId)\n  notification.status = 'unread'\n  notification.readAt = null\n  notification.actionedAt = null\n  notification.dismissedAt = null\n  notification.actionTaken = null\n  notification.actionResult = null\n  notification.createdAt = new Date()\n}\n\nasync function findScopedNotificationOrThrow(\n  em: EntityManager,\n  notificationId: string,\n  ctx: NotificationServiceContext,\n): Promise<Notification> {\n  const notification = await findOneWithDecryption(\n    em,\n    Notification,\n    {\n      id: notificationId,\n      recipientUserId: ctx.userId,\n      tenantId: ctx.tenantId,\n    },\n    undefined,\n    {\n      tenantId: ctx.tenantId,\n      organizationId: ctx.organizationId ?? null,\n    },\n  )\n  if (!notification) {\n    throw new CrudHttpError(404, { error: 'Notification not found' })\n  }\n  return notification\n}\n\nasync function emitNotificationSseEvents(\n  eventBus: { emit: (event: string, payload: unknown) => Promise<void> },\n  notifications: Notification[],\n  ctx: NotificationServiceContext,\n  recipientUserIds: string[],\n): Promise<void> {\n  await eventBus.emit(NOTIFICATION_SSE_EVENTS.BATCH_CREATED, {\n    tenantId: ctx.tenantId,\n    organizationId: normalizeOrgScope(ctx.organizationId),\n    recipientUserIds,\n    count: notifications.length,\n  })\n\n  for (const notification of notifications) {\n    await eventBus.emit(NOTIFICATION_SSE_EVENTS.CREATED, {\n      tenantId: notification.tenantId,\n      organizationId: notification.organizationId ?? null,\n      recipientUserId: notification.recipientUserId,\n      notification: toNotificationDto(notification),\n    })\n  }\n}\n\nasync function createOrRefreshNotification(\n  em: EntityManager,\n  input: NotificationContentInput,\n  recipientUserId: string,\n  ctx: NotificationTenantContext,\n): Promise<Notification> {\n  if (input.groupKey && input.groupKey.trim().length > 0) {\n    const orgScope = normalizeOrgScope(ctx.organizationId) ?? 'global'\n    const lockKey = `notifications:${ctx.tenantId}:${orgScope}:${recipientUserId}:${input.type}:${input.groupKey}`\n    try {\n      const db = getDb(em)\n      await sql`select pg_advisory_xact_lock(hashtext(${lockKey}))`.execute(db)\n    } catch {\n      // If advisory locks are unavailable, continue with best-effort dedupe.\n    }\n\n    const existing = await em.findOne(Notification, {\n      recipientUserId,\n      tenantId: ctx.tenantId,\n      organizationId: normalizeOrgScope(ctx.organizationId),\n      type: input.type,\n      groupKey: input.groupKey,\n      status: { $in: UNIQUE_NOTIFICATION_ACTIVE_STATUSES },\n    }, {\n      orderBy: { createdAt: 'desc' },\n    })\n\n    if (existing) {\n      applyNotificationContent(existing, input, recipientUserId, ctx)\n      return existing\n    }\n  }\n\n  return buildNotificationEntity(em, input, recipientUserId, ctx)\n}\n\nexport interface NotificationServiceContext {\n  tenantId: string\n  organizationId?: string | null\n  organizationIds?: string[] | null\n  userId?: string | null\n}\n\nexport interface NotificationService {\n  create(input: CreateNotificationInput, ctx: NotificationServiceContext): Promise<Notification>\n  createBatch(input: CreateBatchNotificationInput, ctx: NotificationServiceContext): Promise<Notification[]>\n  createForRole(input: CreateRoleNotificationInput, ctx: NotificationServiceContext): Promise<Notification[]>\n  createForFeature(input: CreateFeatureNotificationInput, ctx: NotificationServiceContext): Promise<Notification[]>\n  markAsRead(notificationId: string, ctx: NotificationServiceContext): Promise<Notification>\n  markAllAsRead(ctx: NotificationServiceContext): Promise<number>\n  dismiss(notificationId: string, ctx: NotificationServiceContext): Promise<Notification>\n  restoreDismissed(\n    notificationId: string,\n    status: 'read' | 'unread' | undefined,\n    ctx: NotificationServiceContext\n  ): Promise<Notification>\n  executeAction(\n    notificationId: string,\n    input: ExecuteActionInput,\n    ctx: NotificationServiceContext\n  ): Promise<{ notification: Notification; result: unknown }>\n  getUnreadCount(ctx: NotificationServiceContext): Promise<number>\n  getPollData(ctx: NotificationServiceContext, since?: string): Promise<NotificationPollData>\n  cleanupExpired(): Promise<number>\n  deleteBySource(\n    sourceEntityType: string,\n    sourceEntityId: string,\n    ctx: NotificationServiceContext\n  ): Promise<number>\n}\n\nexport interface NotificationServiceDeps {\n  em: EntityManager\n  eventBus: { emit: (event: string, payload: unknown) => Promise<void> }\n  commandBus?: {\n    execute: (\n      commandId: string,\n      options: { input: unknown; ctx: unknown; metadata?: unknown }\n    ) => Promise<{ result: unknown }>\n  }\n  container?: { resolve: (name: string) => unknown }\n}\n\nexport function createNotificationService(deps: NotificationServiceDeps): NotificationService {\n  const { em: rootEm, eventBus, commandBus, container } = deps\n\n  return {\n    async create(input, ctx) {\n      const { recipientUserId, ...content } = input\n      const writeEm = rootEm.fork()\n      const notification = await writeEm.transactional(async (tx) => {\n        await assertNotificationRecipientsInScope(tx, [recipientUserId], ctx)\n        const entity = await createOrRefreshNotification(tx, content, recipientUserId, ctx)\n        await tx.flush()\n        return entity\n      })\n\n      await invalidateNotificationCache(container, ctx, 'created')\n      await emitNotificationCreated(eventBus, notification, ctx)\n      await eventBus.emit(NOTIFICATION_SSE_EVENTS.CREATED, {\n        tenantId: notification.tenantId,\n        organizationId: notification.organizationId ?? null,\n        recipientUserId: notification.recipientUserId,\n        notification: toNotificationDto(notification),\n      })\n\n      return notification\n    },\n\n    async createBatch(input, ctx) {\n      const recipientUserIds = Array.from(new Set(input.recipientUserIds))\n      const { recipientUserIds: _recipientUserIds, ...content } = input\n      const notifications: Notification[] = []\n      const writeEm = rootEm.fork()\n\n      await writeEm.transactional(async (tx) => {\n        await assertNotificationRecipientsInScope(tx, recipientUserIds, ctx)\n        for (const recipientUserId of recipientUserIds) {\n          const notification = await createOrRefreshNotification(tx, content, recipientUserId, ctx)\n          notifications.push(notification)\n        }\n        await tx.flush()\n      })\n\n      await invalidateNotificationCache(container, ctx, 'created')\n      await emitNotificationCreatedBatch(eventBus, notifications, ctx)\n      await emitNotificationSseEvents(eventBus, notifications, ctx, recipientUserIds)\n\n      return notifications\n    },\n\n    async createForRole(input, ctx) {\n      const em = rootEm.fork()\n\n      const db = getDb(em)\n      const recipientUserIds = await getRecipientUserIdsForRole(db, ctx.tenantId, input.roleId)\n      if (recipientUserIds.length === 0) {\n        return []\n      }\n\n      const { roleId: _roleId, ...content } = input\n      const notifications: Notification[] = []\n      const uniqueRecipientUserIds = Array.from(new Set(recipientUserIds))\n      const writeEm = rootEm.fork()\n\n      await writeEm.transactional(async (tx) => {\n        for (const recipientUserId of uniqueRecipientUserIds) {\n          const notification = await createOrRefreshNotification(tx, content, recipientUserId, ctx)\n          notifications.push(notification)\n        }\n        await tx.flush()\n      })\n\n      await invalidateNotificationCache(container, ctx, 'created')\n      await emitNotificationCreatedBatch(eventBus, notifications, ctx)\n      await emitNotificationSseEvents(eventBus, notifications, ctx, uniqueRecipientUserIds)\n\n      return notifications\n    },\n\n    async createForFeature(input, ctx) {\n      const em = rootEm.fork()\n      const db = getDb(em)\n      const recipientUserIds = await getRecipientUserIdsForFeature(db, ctx.tenantId, input.requiredFeature)\n\n      if (recipientUserIds.length === 0) {\n        debug('No users found with feature:', input.requiredFeature, 'in tenant:', ctx.tenantId)\n        return []\n      }\n\n      debug('Creating notifications for', recipientUserIds.length, 'user(s) with feature:', input.requiredFeature)\n\n      const { requiredFeature: _requiredFeature, ...content } = input\n      const notifications: Notification[] = []\n      const uniqueRecipientUserIds = Array.from(new Set(recipientUserIds))\n      const writeEm = rootEm.fork()\n\n      await writeEm.transactional(async (tx) => {\n        for (const recipientUserId of uniqueRecipientUserIds) {\n          const notification = await createOrRefreshNotification(tx, content, recipientUserId, ctx)\n          notifications.push(notification)\n        }\n        await tx.flush()\n      })\n\n      await invalidateNotificationCache(container, ctx, 'created')\n      await emitNotificationCreatedBatch(eventBus, notifications, ctx)\n      await emitNotificationSseEvents(eventBus, notifications, ctx, uniqueRecipientUserIds)\n\n      return notifications\n    },\n\n    async markAsRead(notificationId, ctx) {\n      const em = rootEm.fork()\n      const notification = await findScopedNotificationOrThrow(em, notificationId, ctx)\n\n      if (notification.status === 'unread') {\n        notification.status = 'read'\n        notification.readAt = new Date()\n        await em.flush()\n\n        await invalidateNotificationCache(container, ctx, 'updated', notification.id)\n        await eventBus.emit(NOTIFICATION_EVENTS.READ, {\n          notificationId: notification.id,\n          userId: ctx.userId,\n          tenantId: ctx.tenantId,\n        })\n      }\n\n      return notification\n    },\n\n    async markAllAsRead(ctx) {\n      const em = rootEm.fork()\n      const db = getDb(em)\n      const applyScope = <QB extends { where: (...args: any[]) => QB }>(q: QB): QB => {\n        let chain = q\n          .where('recipient_user_id' as any, '=', ctx.userId as any)\n          .where('tenant_id' as any, '=', ctx.tenantId)\n          .where('status' as any, '=', 'unread')\n        if (ctx.organizationId) {\n          chain = chain.where('organization_id' as any, '=', ctx.organizationId)\n        }\n        return chain\n      }\n\n      const targetRows = await applyScope(\n        db\n          .selectFrom('notifications' as any)\n          .select([\n            'id' as any,\n            'organization_id' as any,\n            'recipient_user_id' as any,\n          ]),\n      ).execute() as Array<{ id: string }>\n\n      if (!targetRows.length) {\n        return 0\n      }\n\n      const updateResult = await applyScope(\n        db.updateTable('notifications' as any).set({\n          status: 'read',\n          read_at: sql`now()`,\n        } as any) as any,\n      ).executeTakeFirst() as { numUpdatedRows?: bigint | number } | undefined\n      const result = Number(updateResult?.numUpdatedRows ?? targetRows.length)\n\n      await invalidateNotificationCache(container, ctx, 'updated')\n\n      const notifications = await findWithDecryption(em, Notification, {\n        id: { $in: targetRows.map((row) => row.id) },\n      }, undefined, {\n        tenantId: ctx.tenantId,\n        organizationId: ctx.organizationId ?? null,\n      })\n\n      for (const notification of notifications) {\n        await eventBus.emit(NOTIFICATION_EVENTS.READ, {\n          notificationId: notification.id,\n          userId: ctx.userId,\n          tenantId: ctx.tenantId,\n        })\n\n        await eventBus.emit(NOTIFICATION_SSE_EVENTS.CREATED, {\n          tenantId: notification.tenantId,\n          organizationId: notification.organizationId ?? null,\n          recipientUserId: notification.recipientUserId,\n          notification: toNotificationDto(notification),\n        })\n      }\n\n      return result\n    },\n\n    async dismiss(notificationId, ctx) {\n      const em = rootEm.fork()\n      const notification = await findScopedNotificationOrThrow(em, notificationId, ctx)\n\n      notification.status = 'dismissed'\n      notification.dismissedAt = new Date()\n      await em.flush()\n\n      await invalidateNotificationCache(container, ctx, 'updated', notification.id)\n      await eventBus.emit(NOTIFICATION_EVENTS.DISMISSED, {\n        notificationId: notification.id,\n        userId: ctx.userId,\n        tenantId: ctx.tenantId,\n      })\n\n      return notification\n    },\n\n    async restoreDismissed(notificationId, status, ctx) {\n      const em = rootEm.fork()\n      const notification = await findScopedNotificationOrThrow(em, notificationId, ctx)\n\n      if (notification.status !== 'dismissed') {\n        return notification\n      }\n\n      const targetStatus = status ?? 'read'\n      notification.status = targetStatus\n      notification.dismissedAt = null\n\n      if (targetStatus === 'unread') {\n        notification.readAt = null\n      } else if (!notification.readAt) {\n        notification.readAt = new Date()\n      }\n\n      await em.flush()\n\n      await invalidateNotificationCache(container, ctx, 'updated', notification.id)\n      await eventBus.emit(NOTIFICATION_EVENTS.RESTORED, {\n        notificationId: notification.id,\n        userId: ctx.userId,\n        tenantId: ctx.tenantId,\n        status: targetStatus,\n      })\n\n      return notification\n    },\n\n    async executeAction(notificationId, input, ctx) {\n      const em = rootEm.fork()\n      const notification = await findScopedNotificationOrThrow(em, notificationId, ctx)\n\n      const actionData = notification.actionData\n      const action = actionData?.actions?.find((a) => a.id === input.actionId)\n\n      if (!action) {\n        throw new Error('Action not found')\n      }\n\n      // Reject an already-actioned notification before dispatching the command,\n      // so a retry or double-click cannot re-run the side effect.\n      if (notification.status === 'actioned') {\n        throw conflict('Notification action already executed')\n      }\n\n      const actionedAt = new Date()\n      const previousStatus = notification.status\n      const previousActionedAt = notification.actionedAt ?? null\n      const previousActionTaken = notification.actionTaken ?? null\n\n      // Atomically claim the notification so only one concurrent request can run\n      // the side-effecting command. The conditional UPDATE matches only while the\n      // notification has not been actioned yet; a losing request updates 0 rows.\n      const claimResult = (await getDb(em)\n        .updateTable('notifications' as any)\n        .set({\n          status: 'actioned',\n          actioned_at: actionedAt,\n          action_taken: input.actionId,\n        } as any)\n        .where('id' as any, '=', notification.id)\n        .where('recipient_user_id' as any, '=', ctx.userId as any)\n        .where('tenant_id' as any, '=', ctx.tenantId)\n        .where('status' as any, '!=', 'actioned')\n        .executeTakeFirst()) as { numUpdatedRows?: bigint | number } | undefined\n\n      if (Number(claimResult?.numUpdatedRows ?? 0) === 0) {\n        throw conflict('Notification action already executed')\n      }\n\n      // The claim is provisional: if the side-effecting command fails, the action\n      // never actually completed, so release the claim to its prior state. This\n      // lets the user retry the action instead of the notification being locked as\n      // `actioned` forever. Only release while we still own the claim\n      // (status = 'actioned'), so a concurrent winner's state is never clobbered.\n      const releaseClaim = async () => {\n        await getDb(em)\n          .updateTable('notifications' as any)\n          .set({\n            status: previousStatus,\n            actioned_at: previousActionedAt,\n            action_taken: previousActionTaken,\n          } as any)\n          .where('id' as any, '=', notification.id)\n          .where('recipient_user_id' as any, '=', ctx.userId as any)\n          .where('tenant_id' as any, '=', ctx.tenantId)\n          .where('status' as any, '=', 'actioned')\n          .executeTakeFirst()\n      }\n\n      let result: unknown = null\n\n      if (action.commandId && commandBus && container) {\n        const commandInput = {\n          id: notification.sourceEntityId,\n          ...input.payload,\n        }\n\n        // Build a CommandRuntimeContext from the notification service context\n        const commandCtx = {\n          container,\n          auth: {\n            sub: ctx.userId,\n            tenantId: ctx.tenantId,\n            orgId: ctx.organizationId,\n          },\n          organizationScope: null,\n          selectedOrganizationId: ctx.organizationId ?? null,\n          organizationIds: ctx.organizationId ? [ctx.organizationId] : null,\n        }\n\n        let commandResult: { result: unknown }\n        try {\n          commandResult = await commandBus.execute(action.commandId, {\n            input: commandInput,\n            ctx: commandCtx,\n            metadata: {\n              tenantId: ctx.tenantId,\n              organizationId: ctx.organizationId,\n              resourceKind: 'notifications',\n            },\n          })\n        } catch (err) {\n          // Never let a rollback failure mask the original command error \u2014 the\n          // caller needs the real failure to decide whether to retry.\n          try {\n            await releaseClaim()\n          } catch (releaseErr) {\n            debug('failed to release notification action claim', releaseErr)\n          }\n          throw err\n        }\n\n        result = commandResult.result\n      }\n\n      notification.status = 'actioned'\n      notification.actionedAt = actionedAt\n      notification.actionTaken = input.actionId\n      notification.actionResult = result as Record<string, unknown>\n\n      if (!notification.readAt) {\n        notification.readAt = new Date()\n      }\n\n      await em.flush()\n\n      await invalidateNotificationCache(container, ctx, 'updated', notification.id)\n      await eventBus.emit(NOTIFICATION_EVENTS.ACTIONED, {\n        notificationId: notification.id,\n        actionId: input.actionId,\n        userId: ctx.userId,\n        tenantId: ctx.tenantId,\n      })\n\n      return { notification, result }\n    },\n\n    async getUnreadCount(ctx) {\n      const em = rootEm.fork()\n      return em.count(Notification, {\n        recipientUserId: ctx.userId,\n        tenantId: ctx.tenantId,\n        status: 'unread',\n        ...buildNotificationReadScopeWhere(ctx),\n      })\n    },\n\n    async getPollData(ctx, since) {\n      const em = rootEm.fork()\n      const filters: Record<string, unknown> = {\n        recipientUserId: ctx.userId,\n        tenantId: ctx.tenantId,\n        ...buildNotificationReadScopeWhere(ctx),\n      }\n\n      if (since) {\n        filters.createdAt = { $gt: new Date(since) }\n      }\n\n      const [notifications, unreadCount] = await Promise.all([\n        em.find(Notification, filters, {\n          orderBy: { createdAt: 'desc' },\n          limit: 50,\n        }),\n        em.count(Notification, {\n          recipientUserId: ctx.userId,\n          tenantId: ctx.tenantId,\n          status: 'unread',\n          ...buildNotificationReadScopeWhere(ctx),\n        }),\n      ])\n\n      const recent = notifications.map(toNotificationDto)\n      const hasNew = since ? recent.length > 0 : false\n\n      return {\n        unreadCount,\n        recent,\n        hasNew,\n        lastId: recent[0]?.id,\n      }\n    },\n\n    async cleanupExpired() {\n      const em = rootEm.fork()\n      const db = getDb(em)\n\n      const affectedScopes = await db\n        .selectFrom('notifications' as any)\n        .select([\n          'tenant_id' as any,\n          'organization_id' as any,\n        ])\n        .where('expires_at' as any, '<', sql`now()`)\n        .where('status' as any, 'not in', ['actioned', 'dismissed'])\n        .distinct()\n        .execute() as Array<{ tenant_id: string; organization_id: string | null }>\n\n      if (!affectedScopes.length) return 0\n\n      const updateResult = await db\n        .updateTable('notifications' as any)\n        .set({\n          status: 'dismissed',\n          dismissed_at: sql`now()`,\n        } as any)\n        .where('expires_at' as any, '<', sql`now()`)\n        .where('status' as any, 'not in', ['actioned', 'dismissed'])\n        .executeTakeFirst() as { numUpdatedRows?: bigint | number } | undefined\n\n      for (const scope of affectedScopes) {\n        await invalidateNotificationCache(container, {\n          tenantId: scope.tenant_id,\n          organizationId: scope.organization_id,\n        }, 'updated')\n      }\n\n      return Number(updateResult?.numUpdatedRows ?? 0)\n    },\n\n    async deleteBySource(sourceEntityType, sourceEntityId, ctx) {\n      const em = rootEm.fork()\n      const db = getDb(em)\n\n      const deleteResult = await db\n        .deleteFrom('notifications' as any)\n        .where('source_entity_type' as any, '=', sourceEntityType)\n        .where('source_entity_id' as any, '=', sourceEntityId)\n        .where('tenant_id' as any, '=', ctx.tenantId)\n        .executeTakeFirst() as { numDeletedRows?: bigint | number } | undefined\n\n      const deletedCount = Number(deleteResult?.numDeletedRows ?? 0)\n      if (deletedCount > 0) {\n        await invalidateNotificationCache(container, ctx, 'deleted')\n      }\n\n      return deletedCount\n    },\n  }\n}\n\n/**\n * Helper to create notification service from a DI container.\n * Use this in API routes and commands to avoid DI resolution issues.\n */\nexport function resolveNotificationService(container: {\n  resolve: (name: string) => unknown\n}): NotificationService {\n  const em = container.resolve('em') as EntityManager\n  const eventBus = container.resolve('eventBus') as { emit: (event: string, payload: unknown) => Promise<void> }\n\n  // commandBus may not be registered in all contexts, so resolve it safely\n  let commandBus: NotificationServiceDeps['commandBus']\n  try {\n    commandBus = container.resolve('commandBus') as typeof commandBus\n  } catch {\n    // commandBus not available - actions with commandId won't work\n    commandBus = undefined\n  }\n\n  return createNotificationService({ em, eventBus, commandBus, container })\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { type Kysely, sql } from 'kysely'\nimport { CrudHttpError, conflict } from '@open-mercato/shared/lib/crud/errors'\nimport { invalidateCrudCache } from '@open-mercato/shared/lib/crud/cache'\nimport { Notification, type NotificationStatus } from '../data/entities'\nimport type { CreateNotificationInput, CreateBatchNotificationInput, CreateRoleNotificationInput, CreateFeatureNotificationInput, ExecuteActionInput } from '../data/validators'\nimport type { NotificationPollData } from '@open-mercato/shared/modules/notifications/types'\nimport { NOTIFICATION_EVENTS, NOTIFICATION_SSE_EVENTS } from './events'\nimport { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport {\n  buildNotificationEntity,\n  emitNotificationCreated,\n  emitNotificationCreatedBatch,\n  type NotificationContentInput,\n  type NotificationTenantContext,\n} from './notificationFactory'\nimport { toNotificationDto } from './notificationMapper'\nimport { buildNotificationReadScopeWhere } from './notificationScope'\nimport {\n  getRecipientUserIdsForFeature,\n  getRecipientUserIdsForRole,\n  getScopedNotificationRecipientUserIds,\n} from './notificationRecipients'\nimport { assertSafeNotificationHref, sanitizeNotificationActions } from './safeHref'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('notifications').child({ component: 'service' })\n\nfunction debug(message: string, ...details: unknown[]): void {\n  logger.debug(message, details.length ? { details } : undefined)\n}\n\nfunction getDb(em: EntityManager): Kysely<any> {\n  return em.getKysely<any>()\n}\n\nconst UNIQUE_NOTIFICATION_ACTIVE_STATUSES: NotificationStatus[] = ['unread', 'read', 'actioned']\nconst NOTIFICATION_RESOURCE_KIND = 'notifications.notification'\n\nfunction normalizeOrgScope(organizationId: string | null | undefined): string | null {\n  return organizationId ?? null\n}\n\nasync function invalidateNotificationCache(\n  container: NotificationServiceDeps['container'],\n  ctx: Pick<NotificationServiceContext, 'tenantId' | 'organizationId'>,\n  reason: string,\n  notificationId?: string,\n): Promise<void> {\n  if (!container) return\n  await invalidateCrudCache(\n    container as Parameters<typeof invalidateCrudCache>[0],\n    NOTIFICATION_RESOURCE_KIND,\n    {\n      id: notificationId,\n      tenantId: ctx.tenantId,\n      organizationId: normalizeOrgScope(ctx.organizationId),\n    },\n    ctx.tenantId,\n    reason,\n  )\n}\n\nasync function assertNotificationRecipientsInScope(\n  em: EntityManager,\n  recipientUserIds: string[],\n  ctx: NotificationServiceContext,\n): Promise<void> {\n  const scopedRecipientUserIds = await getScopedNotificationRecipientUserIds(\n    getDb(em),\n    ctx.tenantId,\n    normalizeOrgScope(ctx.organizationId),\n    recipientUserIds,\n  )\n\n  if (scopedRecipientUserIds.length !== recipientUserIds.length) {\n    throw new CrudHttpError(404, { error: 'Notification recipient not found' })\n  }\n}\n\nfunction applyNotificationContent(\n  notification: Notification,\n  input: NotificationContentInput,\n  recipientUserId: string,\n  ctx: NotificationTenantContext,\n) {\n  const actions = sanitizeNotificationActions(input.actions)\n  const linkHref = assertSafeNotificationHref(input.linkHref)\n\n  notification.recipientUserId = recipientUserId\n  notification.type = input.type\n  notification.titleKey = input.titleKey\n  notification.bodyKey = input.bodyKey\n  notification.titleVariables = input.titleVariables\n  notification.bodyVariables = input.bodyVariables\n  notification.title = input.title || input.titleKey || ''\n  notification.body = input.body\n  notification.icon = input.icon\n  notification.severity = input.severity ?? 'info'\n  notification.actionData = actions\n    ? {\n        actions,\n        primaryActionId: input.primaryActionId,\n      }\n    : null\n  notification.sourceModule = input.sourceModule\n  notification.sourceEntityType = input.sourceEntityType\n  notification.sourceEntityId = input.sourceEntityId\n  notification.linkHref = linkHref\n  notification.groupKey = input.groupKey\n  notification.expiresAt = input.expiresAt ? new Date(input.expiresAt) : null\n  notification.tenantId = ctx.tenantId\n  notification.organizationId = normalizeOrgScope(ctx.organizationId)\n  notification.status = 'unread'\n  notification.readAt = null\n  notification.actionedAt = null\n  notification.dismissedAt = null\n  notification.actionTaken = null\n  notification.actionResult = null\n  notification.createdAt = new Date()\n}\n\nasync function findScopedNotificationOrThrow(\n  em: EntityManager,\n  notificationId: string,\n  ctx: NotificationServiceContext,\n): Promise<Notification> {\n  const notification = await findOneWithDecryption(\n    em,\n    Notification,\n    {\n      id: notificationId,\n      recipientUserId: ctx.userId,\n      tenantId: ctx.tenantId,\n    },\n    undefined,\n    {\n      tenantId: ctx.tenantId,\n      organizationId: ctx.organizationId ?? null,\n    },\n  )\n  if (!notification) {\n    throw new CrudHttpError(404, { error: 'Notification not found' })\n  }\n  return notification\n}\n\nasync function emitNotificationSseEvents(\n  eventBus: { emit: (event: string, payload: unknown) => Promise<void> },\n  notifications: Notification[],\n  ctx: NotificationServiceContext,\n  recipientUserIds: string[],\n): Promise<void> {\n  await eventBus.emit(NOTIFICATION_SSE_EVENTS.BATCH_CREATED, {\n    tenantId: ctx.tenantId,\n    organizationId: normalizeOrgScope(ctx.organizationId),\n    recipientUserIds,\n    count: notifications.length,\n  })\n\n  for (const notification of notifications) {\n    await eventBus.emit(NOTIFICATION_SSE_EVENTS.CREATED, {\n      tenantId: notification.tenantId,\n      organizationId: notification.organizationId ?? null,\n      recipientUserId: notification.recipientUserId,\n      notification: toNotificationDto(notification),\n    })\n  }\n}\n\nasync function createOrRefreshNotification(\n  em: EntityManager,\n  input: NotificationContentInput,\n  recipientUserId: string,\n  ctx: NotificationTenantContext,\n): Promise<Notification> {\n  if (input.groupKey && input.groupKey.trim().length > 0) {\n    const orgScope = normalizeOrgScope(ctx.organizationId) ?? 'global'\n    const lockKey = `notifications:${ctx.tenantId}:${orgScope}:${recipientUserId}:${input.type}:${input.groupKey}`\n    try {\n      const db = getDb(em)\n      await sql`select pg_advisory_xact_lock(hashtext(${lockKey}))`.execute(db)\n    } catch {\n      // If advisory locks are unavailable, continue with best-effort dedupe.\n    }\n\n    const existing = await em.findOne(Notification, {\n      recipientUserId,\n      tenantId: ctx.tenantId,\n      organizationId: normalizeOrgScope(ctx.organizationId),\n      type: input.type,\n      groupKey: input.groupKey,\n      status: { $in: UNIQUE_NOTIFICATION_ACTIVE_STATUSES },\n    }, {\n      orderBy: { createdAt: 'desc' },\n    })\n\n    if (existing) {\n      applyNotificationContent(existing, input, recipientUserId, ctx)\n      return existing\n    }\n  }\n\n  return buildNotificationEntity(em, input, recipientUserId, ctx)\n}\n\nexport interface NotificationServiceContext {\n  tenantId: string\n  organizationId?: string | null\n  organizationIds?: string[] | null\n  userId?: string | null\n}\n\nexport type CreateFeatureNotificationServiceInput = CreateFeatureNotificationInput & {\n  restrictRecipientsToOrganization?: boolean\n}\n\nexport interface NotificationService {\n  create(input: CreateNotificationInput, ctx: NotificationServiceContext): Promise<Notification>\n  createBatch(input: CreateBatchNotificationInput, ctx: NotificationServiceContext): Promise<Notification[]>\n  createForRole(input: CreateRoleNotificationInput, ctx: NotificationServiceContext): Promise<Notification[]>\n  createForFeature(input: CreateFeatureNotificationServiceInput, ctx: NotificationServiceContext): Promise<Notification[]>\n  markAsRead(notificationId: string, ctx: NotificationServiceContext): Promise<Notification>\n  markAllAsRead(ctx: NotificationServiceContext): Promise<number>\n  dismiss(notificationId: string, ctx: NotificationServiceContext): Promise<Notification>\n  restoreDismissed(\n    notificationId: string,\n    status: 'read' | 'unread' | undefined,\n    ctx: NotificationServiceContext\n  ): Promise<Notification>\n  executeAction(\n    notificationId: string,\n    input: ExecuteActionInput,\n    ctx: NotificationServiceContext\n  ): Promise<{ notification: Notification; result: unknown }>\n  getUnreadCount(ctx: NotificationServiceContext): Promise<number>\n  getPollData(ctx: NotificationServiceContext, since?: string): Promise<NotificationPollData>\n  cleanupExpired(): Promise<number>\n  deleteBySource(\n    sourceEntityType: string,\n    sourceEntityId: string,\n    ctx: NotificationServiceContext\n  ): Promise<number>\n}\n\nexport interface NotificationServiceDeps {\n  em: EntityManager\n  eventBus: { emit: (event: string, payload: unknown) => Promise<void> }\n  commandBus?: {\n    execute: (\n      commandId: string,\n      options: { input: unknown; ctx: unknown; metadata?: unknown }\n    ) => Promise<{ result: unknown }>\n  }\n  container?: { resolve: (name: string) => unknown }\n}\n\nexport function createNotificationService(deps: NotificationServiceDeps): NotificationService {\n  const { em: rootEm, eventBus, commandBus, container } = deps\n\n  return {\n    async create(input, ctx) {\n      const { recipientUserId, ...content } = input\n      const writeEm = rootEm.fork()\n      const notification = await writeEm.transactional(async (tx) => {\n        await assertNotificationRecipientsInScope(tx, [recipientUserId], ctx)\n        const entity = await createOrRefreshNotification(tx, content, recipientUserId, ctx)\n        await tx.flush()\n        return entity\n      })\n\n      await invalidateNotificationCache(container, ctx, 'created')\n      await emitNotificationCreated(eventBus, notification, ctx)\n      await eventBus.emit(NOTIFICATION_SSE_EVENTS.CREATED, {\n        tenantId: notification.tenantId,\n        organizationId: notification.organizationId ?? null,\n        recipientUserId: notification.recipientUserId,\n        notification: toNotificationDto(notification),\n      })\n\n      return notification\n    },\n\n    async createBatch(input, ctx) {\n      const recipientUserIds = Array.from(new Set(input.recipientUserIds))\n      const { recipientUserIds: _recipientUserIds, ...content } = input\n      const notifications: Notification[] = []\n      const writeEm = rootEm.fork()\n\n      await writeEm.transactional(async (tx) => {\n        await assertNotificationRecipientsInScope(tx, recipientUserIds, ctx)\n        for (const recipientUserId of recipientUserIds) {\n          const notification = await createOrRefreshNotification(tx, content, recipientUserId, ctx)\n          notifications.push(notification)\n        }\n        await tx.flush()\n      })\n\n      await invalidateNotificationCache(container, ctx, 'created')\n      await emitNotificationCreatedBatch(eventBus, notifications, ctx)\n      await emitNotificationSseEvents(eventBus, notifications, ctx, recipientUserIds)\n\n      return notifications\n    },\n\n    async createForRole(input, ctx) {\n      const em = rootEm.fork()\n\n      const db = getDb(em)\n      const recipientUserIds = await getRecipientUserIdsForRole(db, ctx.tenantId, input.roleId)\n      if (recipientUserIds.length === 0) {\n        return []\n      }\n\n      const { roleId: _roleId, ...content } = input\n      const notifications: Notification[] = []\n      const uniqueRecipientUserIds = Array.from(new Set(recipientUserIds))\n      const writeEm = rootEm.fork()\n\n      await writeEm.transactional(async (tx) => {\n        for (const recipientUserId of uniqueRecipientUserIds) {\n          const notification = await createOrRefreshNotification(tx, content, recipientUserId, ctx)\n          notifications.push(notification)\n        }\n        await tx.flush()\n      })\n\n      await invalidateNotificationCache(container, ctx, 'created')\n      await emitNotificationCreatedBatch(eventBus, notifications, ctx)\n      await emitNotificationSseEvents(eventBus, notifications, ctx, uniqueRecipientUserIds)\n\n      return notifications\n    },\n\n    async createForFeature(input, ctx) {\n      const em = rootEm.fork()\n      const db = getDb(em)\n      const recipientUserIds = await getRecipientUserIdsForFeature(db, ctx.tenantId, input.requiredFeature)\n\n      if (recipientUserIds.length === 0) {\n        debug('No users found with feature:', input.requiredFeature, 'in tenant:', ctx.tenantId)\n        return []\n      }\n\n      let authorizedRecipientUserIds = recipientUserIds\n      if (input.restrictRecipientsToOrganization) {\n        const uniqueCandidateUserIds = Array.from(new Set(recipientUserIds))\n        if (!ctx.organizationId) {\n          logger.warn('Organization-restricted feature fan-out skipped because organization scope is missing', {\n            tenantId: ctx.tenantId,\n            requiredFeature: input.requiredFeature,\n          })\n          return []\n        }\n\n        if (uniqueCandidateUserIds.length > 200) {\n          logger.warn('Organization-restricted feature fan-out skipped because the candidate cap was exceeded', {\n            tenantId: ctx.tenantId,\n            organizationId: ctx.organizationId,\n            requiredFeature: input.requiredFeature,\n            candidateCount: uniqueCandidateUserIds.length,\n            candidateCap: 200,\n          })\n          return []\n        }\n\n        if (!container) {\n          logger.warn('Organization-restricted feature fan-out skipped because the DI container is unavailable', {\n            tenantId: ctx.tenantId,\n            organizationId: ctx.organizationId,\n            requiredFeature: input.requiredFeature,\n          })\n          return []\n        }\n\n        try {\n          const rbacService = container.resolve('rbacService') as {\n            userHasAllFeatures: (\n              userId: string,\n              features: string[],\n              scope: { tenantId: string | null; organizationId: string | null },\n            ) => Promise<boolean>\n          }\n          const allowedRecipientUserIds: string[] = []\n          for (let offset = 0; offset < uniqueCandidateUserIds.length; offset += 10) {\n            const candidates = uniqueCandidateUserIds.slice(offset, offset + 10)\n            const results = await Promise.all(candidates.map(async (recipientUserId) => ({\n              recipientUserId,\n              allowed: await rbacService.userHasAllFeatures(\n                recipientUserId,\n                [input.requiredFeature],\n                { tenantId: ctx.tenantId, organizationId: ctx.organizationId ?? null },\n              ),\n            })))\n            for (const result of results) {\n              if (result.allowed) allowedRecipientUserIds.push(result.recipientUserId)\n            }\n          }\n          authorizedRecipientUserIds = allowedRecipientUserIds\n        } catch (err) {\n          logger.warn('Organization-restricted feature fan-out skipped because RBAC filtering failed', {\n            tenantId: ctx.tenantId,\n            organizationId: ctx.organizationId,\n            requiredFeature: input.requiredFeature,\n            err,\n          })\n          return []\n        }\n\n        if (authorizedRecipientUserIds.length === 0) {\n          debug('No users found with feature in organization:', input.requiredFeature, ctx.organizationId)\n          return []\n        }\n      }\n\n      debug('Creating notifications for', authorizedRecipientUserIds.length, 'user(s) with feature:', input.requiredFeature)\n\n      const {\n        requiredFeature: _requiredFeature,\n        restrictRecipientsToOrganization: _restrictRecipientsToOrganization,\n        ...content\n      } = input\n      const notifications: Notification[] = []\n      const uniqueRecipientUserIds = Array.from(new Set(authorizedRecipientUserIds))\n      const writeEm = rootEm.fork()\n\n      await writeEm.transactional(async (tx) => {\n        for (const recipientUserId of uniqueRecipientUserIds) {\n          const notification = await createOrRefreshNotification(tx, content, recipientUserId, ctx)\n          notifications.push(notification)\n        }\n        await tx.flush()\n      })\n\n      await invalidateNotificationCache(container, ctx, 'created')\n      await emitNotificationCreatedBatch(eventBus, notifications, ctx)\n      await emitNotificationSseEvents(eventBus, notifications, ctx, uniqueRecipientUserIds)\n\n      return notifications\n    },\n\n    async markAsRead(notificationId, ctx) {\n      const em = rootEm.fork()\n      const notification = await findScopedNotificationOrThrow(em, notificationId, ctx)\n\n      if (notification.status === 'unread') {\n        notification.status = 'read'\n        notification.readAt = new Date()\n        await em.flush()\n\n        await invalidateNotificationCache(container, ctx, 'updated', notification.id)\n        await eventBus.emit(NOTIFICATION_EVENTS.READ, {\n          notificationId: notification.id,\n          userId: ctx.userId,\n          tenantId: ctx.tenantId,\n        })\n      }\n\n      return notification\n    },\n\n    async markAllAsRead(ctx) {\n      const em = rootEm.fork()\n      const db = getDb(em)\n      const applyScope = <QB extends { where: (...args: any[]) => QB }>(q: QB): QB => {\n        let chain = q\n          .where('recipient_user_id' as any, '=', ctx.userId as any)\n          .where('tenant_id' as any, '=', ctx.tenantId)\n          .where('status' as any, '=', 'unread')\n        if (ctx.organizationId) {\n          chain = chain.where('organization_id' as any, '=', ctx.organizationId)\n        }\n        return chain\n      }\n\n      const targetRows = await applyScope(\n        db\n          .selectFrom('notifications' as any)\n          .select([\n            'id' as any,\n            'organization_id' as any,\n            'recipient_user_id' as any,\n          ]),\n      ).execute() as Array<{ id: string }>\n\n      if (!targetRows.length) {\n        return 0\n      }\n\n      const updateResult = await applyScope(\n        db.updateTable('notifications' as any).set({\n          status: 'read',\n          read_at: sql`now()`,\n        } as any) as any,\n      ).executeTakeFirst() as { numUpdatedRows?: bigint | number } | undefined\n      const result = Number(updateResult?.numUpdatedRows ?? targetRows.length)\n\n      await invalidateNotificationCache(container, ctx, 'updated')\n\n      const notifications = await findWithDecryption(em, Notification, {\n        id: { $in: targetRows.map((row) => row.id) },\n      }, undefined, {\n        tenantId: ctx.tenantId,\n        organizationId: ctx.organizationId ?? null,\n      })\n\n      for (const notification of notifications) {\n        await eventBus.emit(NOTIFICATION_EVENTS.READ, {\n          notificationId: notification.id,\n          userId: ctx.userId,\n          tenantId: ctx.tenantId,\n        })\n\n        await eventBus.emit(NOTIFICATION_SSE_EVENTS.CREATED, {\n          tenantId: notification.tenantId,\n          organizationId: notification.organizationId ?? null,\n          recipientUserId: notification.recipientUserId,\n          notification: toNotificationDto(notification),\n        })\n      }\n\n      return result\n    },\n\n    async dismiss(notificationId, ctx) {\n      const em = rootEm.fork()\n      const notification = await findScopedNotificationOrThrow(em, notificationId, ctx)\n\n      notification.status = 'dismissed'\n      notification.dismissedAt = new Date()\n      await em.flush()\n\n      await invalidateNotificationCache(container, ctx, 'updated', notification.id)\n      await eventBus.emit(NOTIFICATION_EVENTS.DISMISSED, {\n        notificationId: notification.id,\n        userId: ctx.userId,\n        tenantId: ctx.tenantId,\n      })\n\n      return notification\n    },\n\n    async restoreDismissed(notificationId, status, ctx) {\n      const em = rootEm.fork()\n      const notification = await findScopedNotificationOrThrow(em, notificationId, ctx)\n\n      if (notification.status !== 'dismissed') {\n        return notification\n      }\n\n      const targetStatus = status ?? 'read'\n      notification.status = targetStatus\n      notification.dismissedAt = null\n\n      if (targetStatus === 'unread') {\n        notification.readAt = null\n      } else if (!notification.readAt) {\n        notification.readAt = new Date()\n      }\n\n      await em.flush()\n\n      await invalidateNotificationCache(container, ctx, 'updated', notification.id)\n      await eventBus.emit(NOTIFICATION_EVENTS.RESTORED, {\n        notificationId: notification.id,\n        userId: ctx.userId,\n        tenantId: ctx.tenantId,\n        status: targetStatus,\n      })\n\n      return notification\n    },\n\n    async executeAction(notificationId, input, ctx) {\n      const em = rootEm.fork()\n      const notification = await findScopedNotificationOrThrow(em, notificationId, ctx)\n\n      const actionData = notification.actionData\n      const action = actionData?.actions?.find((a) => a.id === input.actionId)\n\n      if (!action) {\n        throw new Error('Action not found')\n      }\n\n      // Reject an already-actioned notification before dispatching the command,\n      // so a retry or double-click cannot re-run the side effect.\n      if (notification.status === 'actioned') {\n        throw conflict('Notification action already executed')\n      }\n\n      const actionedAt = new Date()\n      const previousStatus = notification.status\n      const previousActionedAt = notification.actionedAt ?? null\n      const previousActionTaken = notification.actionTaken ?? null\n\n      // Atomically claim the notification so only one concurrent request can run\n      // the side-effecting command. The conditional UPDATE matches only while the\n      // notification has not been actioned yet; a losing request updates 0 rows.\n      const claimResult = (await getDb(em)\n        .updateTable('notifications' as any)\n        .set({\n          status: 'actioned',\n          actioned_at: actionedAt,\n          action_taken: input.actionId,\n        } as any)\n        .where('id' as any, '=', notification.id)\n        .where('recipient_user_id' as any, '=', ctx.userId as any)\n        .where('tenant_id' as any, '=', ctx.tenantId)\n        .where('status' as any, '!=', 'actioned')\n        .executeTakeFirst()) as { numUpdatedRows?: bigint | number } | undefined\n\n      if (Number(claimResult?.numUpdatedRows ?? 0) === 0) {\n        throw conflict('Notification action already executed')\n      }\n\n      // The claim is provisional: if the side-effecting command fails, the action\n      // never actually completed, so release the claim to its prior state. This\n      // lets the user retry the action instead of the notification being locked as\n      // `actioned` forever. Only release while we still own the claim\n      // (status = 'actioned'), so a concurrent winner's state is never clobbered.\n      const releaseClaim = async () => {\n        await getDb(em)\n          .updateTable('notifications' as any)\n          .set({\n            status: previousStatus,\n            actioned_at: previousActionedAt,\n            action_taken: previousActionTaken,\n          } as any)\n          .where('id' as any, '=', notification.id)\n          .where('recipient_user_id' as any, '=', ctx.userId as any)\n          .where('tenant_id' as any, '=', ctx.tenantId)\n          .where('status' as any, '=', 'actioned')\n          .executeTakeFirst()\n      }\n\n      let result: unknown = null\n\n      if (action.commandId && commandBus && container) {\n        const commandInput = {\n          id: notification.sourceEntityId,\n          ...input.payload,\n        }\n\n        // Build a CommandRuntimeContext from the notification service context\n        const commandCtx = {\n          container,\n          auth: {\n            sub: ctx.userId,\n            tenantId: ctx.tenantId,\n            orgId: ctx.organizationId,\n          },\n          organizationScope: null,\n          selectedOrganizationId: ctx.organizationId ?? null,\n          organizationIds: ctx.organizationId ? [ctx.organizationId] : null,\n        }\n\n        let commandResult: { result: unknown }\n        try {\n          commandResult = await commandBus.execute(action.commandId, {\n            input: commandInput,\n            ctx: commandCtx,\n            metadata: {\n              tenantId: ctx.tenantId,\n              organizationId: ctx.organizationId,\n              resourceKind: 'notifications',\n            },\n          })\n        } catch (err) {\n          // Never let a rollback failure mask the original command error \u2014 the\n          // caller needs the real failure to decide whether to retry.\n          try {\n            await releaseClaim()\n          } catch (releaseErr) {\n            debug('failed to release notification action claim', releaseErr)\n          }\n          throw err\n        }\n\n        result = commandResult.result\n      }\n\n      notification.status = 'actioned'\n      notification.actionedAt = actionedAt\n      notification.actionTaken = input.actionId\n      notification.actionResult = result as Record<string, unknown>\n\n      if (!notification.readAt) {\n        notification.readAt = new Date()\n      }\n\n      await em.flush()\n\n      await invalidateNotificationCache(container, ctx, 'updated', notification.id)\n      await eventBus.emit(NOTIFICATION_EVENTS.ACTIONED, {\n        notificationId: notification.id,\n        actionId: input.actionId,\n        userId: ctx.userId,\n        tenantId: ctx.tenantId,\n      })\n\n      return { notification, result }\n    },\n\n    async getUnreadCount(ctx) {\n      const em = rootEm.fork()\n      return em.count(Notification, {\n        recipientUserId: ctx.userId,\n        tenantId: ctx.tenantId,\n        status: 'unread',\n        ...buildNotificationReadScopeWhere(ctx),\n      })\n    },\n\n    async getPollData(ctx, since) {\n      const em = rootEm.fork()\n      const filters: Record<string, unknown> = {\n        recipientUserId: ctx.userId,\n        tenantId: ctx.tenantId,\n        ...buildNotificationReadScopeWhere(ctx),\n      }\n\n      if (since) {\n        filters.createdAt = { $gt: new Date(since) }\n      }\n\n      const [notifications, unreadCount] = await Promise.all([\n        em.find(Notification, filters, {\n          orderBy: { createdAt: 'desc' },\n          limit: 50,\n        }),\n        em.count(Notification, {\n          recipientUserId: ctx.userId,\n          tenantId: ctx.tenantId,\n          status: 'unread',\n          ...buildNotificationReadScopeWhere(ctx),\n        }),\n      ])\n\n      const recent = notifications.map(toNotificationDto)\n      const hasNew = since ? recent.length > 0 : false\n\n      return {\n        unreadCount,\n        recent,\n        hasNew,\n        lastId: recent[0]?.id,\n      }\n    },\n\n    async cleanupExpired() {\n      const em = rootEm.fork()\n      const db = getDb(em)\n\n      const affectedScopes = await db\n        .selectFrom('notifications' as any)\n        .select([\n          'tenant_id' as any,\n          'organization_id' as any,\n        ])\n        .where('expires_at' as any, '<', sql`now()`)\n        .where('status' as any, 'not in', ['actioned', 'dismissed'])\n        .distinct()\n        .execute() as Array<{ tenant_id: string; organization_id: string | null }>\n\n      if (!affectedScopes.length) return 0\n\n      const updateResult = await db\n        .updateTable('notifications' as any)\n        .set({\n          status: 'dismissed',\n          dismissed_at: sql`now()`,\n        } as any)\n        .where('expires_at' as any, '<', sql`now()`)\n        .where('status' as any, 'not in', ['actioned', 'dismissed'])\n        .executeTakeFirst() as { numUpdatedRows?: bigint | number } | undefined\n\n      for (const scope of affectedScopes) {\n        await invalidateNotificationCache(container, {\n          tenantId: scope.tenant_id,\n          organizationId: scope.organization_id,\n        }, 'updated')\n      }\n\n      return Number(updateResult?.numUpdatedRows ?? 0)\n    },\n\n    async deleteBySource(sourceEntityType, sourceEntityId, ctx) {\n      const em = rootEm.fork()\n      const db = getDb(em)\n\n      const deleteResult = await db\n        .deleteFrom('notifications' as any)\n        .where('source_entity_type' as any, '=', sourceEntityType)\n        .where('source_entity_id' as any, '=', sourceEntityId)\n        .where('tenant_id' as any, '=', ctx.tenantId)\n        .executeTakeFirst() as { numDeletedRows?: bigint | number } | undefined\n\n      const deletedCount = Number(deleteResult?.numDeletedRows ?? 0)\n      if (deletedCount > 0) {\n        await invalidateNotificationCache(container, ctx, 'deleted')\n      }\n\n      return deletedCount\n    },\n  }\n}\n\n/**\n * Helper to create notification service from a DI container.\n * Use this in API routes and commands to avoid DI resolution issues.\n */\nexport function resolveNotificationService(container: {\n  resolve: (name: string) => unknown\n}): NotificationService {\n  const em = container.resolve('em') as EntityManager\n  const eventBus = container.resolve('eventBus') as { emit: (event: string, payload: unknown) => Promise<void> }\n\n  // commandBus may not be registered in all contexts, so resolve it safely\n  let commandBus: NotificationServiceDeps['commandBus']\n  try {\n    commandBus = container.resolve('commandBus') as typeof commandBus\n  } catch {\n    // commandBus not available - actions with commandId won't work\n    commandBus = undefined\n  }\n\n  return createNotificationService({ em, eventBus, commandBus, container })\n}\n"],
+  "mappings": "AACA,SAAsB,WAAW;AACjC,SAAS,eAAe,gBAAgB;AACxC,SAAS,2BAA2B;AACpC,SAAS,oBAA6C;AAGtD,SAAS,qBAAqB,+BAA+B;AAC7D,SAAS,uBAAuB,0BAA0B;AAC1D;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OAGK;AACP,SAAS,yBAAyB;AAClC,SAAS,uCAAuC;AAChD;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,4BAA4B,mCAAmC;AACxE,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,eAAe,EAAE,MAAM,EAAE,WAAW,UAAU,CAAC;AAE3E,SAAS,MAAM,YAAoB,SAA0B;AAC3D,SAAO,MAAM,SAAS,QAAQ,SAAS,EAAE,QAAQ,IAAI,MAAS;AAChE;AAEA,SAAS,MAAM,IAAgC;AAC7C,SAAO,GAAG,UAAe;AAC3B;AAEA,MAAM,sCAA4D,CAAC,UAAU,QAAQ,UAAU;AAC/F,MAAM,6BAA6B;AAEnC,SAAS,kBAAkB,gBAA0D;AACnF,SAAO,kBAAkB;AAC3B;AAEA,eAAe,4BACb,WACA,KACA,QACA,gBACe;AACf,MAAI,CAAC,UAAW;AAChB,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,MACE,IAAI;AAAA,MACJ,UAAU,IAAI;AAAA,MACd,gBAAgB,kBAAkB,IAAI,cAAc;AAAA,IACtD;AAAA,IACA,IAAI;AAAA,IACJ;AAAA,EACF;AACF;AAEA,eAAe,oCACb,IACA,kBACA,KACe;AACf,QAAM,yBAAyB,MAAM;AAAA,IACnC,MAAM,EAAE;AAAA,IACR,IAAI;AAAA,IACJ,kBAAkB,IAAI,cAAc;AAAA,IACpC;AAAA,EACF;AAEA,MAAI,uBAAuB,WAAW,iBAAiB,QAAQ;AAC7D,UAAM,IAAI,cAAc,KAAK,EAAE,OAAO,mCAAmC,CAAC;AAAA,EAC5E;AACF;AAEA,SAAS,yBACP,cACA,OACA,iBACA,KACA;AACA,QAAM,UAAU,4BAA4B,MAAM,OAAO;AACzD,QAAM,WAAW,2BAA2B,MAAM,QAAQ;AAE1D,eAAa,kBAAkB;AAC/B,eAAa,OAAO,MAAM;AAC1B,eAAa,WAAW,MAAM;AAC9B,eAAa,UAAU,MAAM;AAC7B,eAAa,iBAAiB,MAAM;AACpC,eAAa,gBAAgB,MAAM;AACnC,eAAa,QAAQ,MAAM,SAAS,MAAM,YAAY;AACtD,eAAa,OAAO,MAAM;AAC1B,eAAa,OAAO,MAAM;AAC1B,eAAa,WAAW,MAAM,YAAY;AAC1C,eAAa,aAAa,UACtB;AAAA,IACE;AAAA,IACA,iBAAiB,MAAM;AAAA,EACzB,IACA;AACJ,eAAa,eAAe,MAAM;AAClC,eAAa,mBAAmB,MAAM;AACtC,eAAa,iBAAiB,MAAM;AACpC,eAAa,WAAW;AACxB,eAAa,WAAW,MAAM;AAC9B,eAAa,YAAY,MAAM,YAAY,IAAI,KAAK,MAAM,SAAS,IAAI;AACvE,eAAa,WAAW,IAAI;AAC5B,eAAa,iBAAiB,kBAAkB,IAAI,cAAc;AAClE,eAAa,SAAS;AACtB,eAAa,SAAS;AACtB,eAAa,aAAa;AAC1B,eAAa,cAAc;AAC3B,eAAa,cAAc;AAC3B,eAAa,eAAe;AAC5B,eAAa,YAAY,oBAAI,KAAK;AACpC;AAEA,eAAe,8BACb,IACA,gBACA,KACuB;AACvB,QAAM,eAAe,MAAM;AAAA,IACzB;AAAA,IACA;AAAA,IACA;AAAA,MACE,IAAI;AAAA,MACJ,iBAAiB,IAAI;AAAA,MACrB,UAAU,IAAI;AAAA,IAChB;AAAA,IACA;AAAA,IACA;AAAA,MACE,UAAU,IAAI;AAAA,MACd,gBAAgB,IAAI,kBAAkB;AAAA,IACxC;AAAA,EACF;AACA,MAAI,CAAC,cAAc;AACjB,UAAM,IAAI,cAAc,KAAK,EAAE,OAAO,yBAAyB,CAAC;AAAA,EAClE;AACA,SAAO;AACT;AAEA,eAAe,0BACb,UACA,eACA,KACA,kBACe;AACf,QAAM,SAAS,KAAK,wBAAwB,eAAe;AAAA,IACzD,UAAU,IAAI;AAAA,IACd,gBAAgB,kBAAkB,IAAI,cAAc;AAAA,IACpD;AAAA,IACA,OAAO,cAAc;AAAA,EACvB,CAAC;AAED,aAAW,gBAAgB,eAAe;AACxC,UAAM,SAAS,KAAK,wBAAwB,SAAS;AAAA,MACnD,UAAU,aAAa;AAAA,MACvB,gBAAgB,aAAa,kBAAkB;AAAA,MAC/C,iBAAiB,aAAa;AAAA,MAC9B,cAAc,kBAAkB,YAAY;AAAA,IAC9C,CAAC;AAAA,EACH;AACF;AAEA,eAAe,4BACb,IACA,OACA,iBACA,KACuB;AACvB,MAAI,MAAM,YAAY,MAAM,SAAS,KAAK,EAAE,SAAS,GAAG;AACtD,UAAM,WAAW,kBAAkB,IAAI,cAAc,KAAK;AAC1D,UAAM,UAAU,iBAAiB,IAAI,QAAQ,IAAI,QAAQ,IAAI,eAAe,IAAI,MAAM,IAAI,IAAI,MAAM,QAAQ;AAC5G,QAAI;AACF,YAAM,KAAK,MAAM,EAAE;AACnB,YAAM,4CAA4C,OAAO,KAAK,QAAQ,EAAE;AAAA,IAC1E,QAAQ;AAAA,IAER;AAEA,UAAM,WAAW,MAAM,GAAG,QAAQ,cAAc;AAAA,MAC9C;AAAA,MACA,UAAU,IAAI;AAAA,MACd,gBAAgB,kBAAkB,IAAI,cAAc;AAAA,MACpD,MAAM,MAAM;AAAA,MACZ,UAAU,MAAM;AAAA,MAChB,QAAQ,EAAE,KAAK,oCAAoC;AAAA,IACrD,GAAG;AAAA,MACD,SAAS,EAAE,WAAW,OAAO;AAAA,IAC/B,CAAC;AAED,QAAI,UAAU;AACZ,+BAAyB,UAAU,OAAO,iBAAiB,GAAG;AAC9D,aAAO;AAAA,IACT;AAAA,EACF;AAEA,SAAO,wBAAwB,IAAI,OAAO,iBAAiB,GAAG;AAChE;AAqDO,SAAS,0BAA0B,MAAoD;AAC5F,QAAM,EAAE,IAAI,QAAQ,UAAU,YAAY,UAAU,IAAI;AAExD,SAAO;AAAA,IACL,MAAM,OAAO,OAAO,KAAK;AACvB,YAAM,EAAE,iBAAiB,GAAG,QAAQ,IAAI;AACxC,YAAM,UAAU,OAAO,KAAK;AAC5B,YAAM,eAAe,MAAM,QAAQ,cAAc,OAAO,OAAO;AAC7D,cAAM,oCAAoC,IAAI,CAAC,eAAe,GAAG,GAAG;AACpE,cAAM,SAAS,MAAM,4BAA4B,IAAI,SAAS,iBAAiB,GAAG;AAClF,cAAM,GAAG,MAAM;AACf,eAAO;AAAA,MACT,CAAC;AAED,YAAM,4BAA4B,WAAW,KAAK,SAAS;AAC3D,YAAM,wBAAwB,UAAU,cAAc,GAAG;AACzD,YAAM,SAAS,KAAK,wBAAwB,SAAS;AAAA,QACnD,UAAU,aAAa;AAAA,QACvB,gBAAgB,aAAa,kBAAkB;AAAA,QAC/C,iBAAiB,aAAa;AAAA,QAC9B,cAAc,kBAAkB,YAAY;AAAA,MAC9C,CAAC;AAED,aAAO;AAAA,IACT;AAAA,IAEA,MAAM,YAAY,OAAO,KAAK;AAC5B,YAAM,mBAAmB,MAAM,KAAK,IAAI,IAAI,MAAM,gBAAgB,CAAC;AACnE,YAAM,EAAE,kBAAkB,mBAAmB,GAAG,QAAQ,IAAI;AAC5D,YAAM,gBAAgC,CAAC;AACvC,YAAM,UAAU,OAAO,KAAK;AAE5B,YAAM,QAAQ,cAAc,OAAO,OAAO;AACxC,cAAM,oCAAoC,IAAI,kBAAkB,GAAG;AACnE,mBAAW,mBAAmB,kBAAkB;AAC9C,gBAAM,eAAe,MAAM,4BAA4B,IAAI,SAAS,iBAAiB,GAAG;AACxF,wBAAc,KAAK,YAAY;AAAA,QACjC;AACA,cAAM,GAAG,MAAM;AAAA,MACjB,CAAC;AAED,YAAM,4BAA4B,WAAW,KAAK,SAAS;AAC3D,YAAM,6BAA6B,UAAU,eAAe,GAAG;AAC/D,YAAM,0BAA0B,UAAU,eAAe,KAAK,gBAAgB;AAE9E,aAAO;AAAA,IACT;AAAA,IAEA,MAAM,cAAc,OAAO,KAAK;AAC9B,YAAM,KAAK,OAAO,KAAK;AAEvB,YAAM,KAAK,MAAM,EAAE;AACnB,YAAM,mBAAmB,MAAM,2BAA2B,IAAI,IAAI,UAAU,MAAM,MAAM;AACxF,UAAI,iBAAiB,WAAW,GAAG;AACjC,eAAO,CAAC;AAAA,MACV;AAEA,YAAM,EAAE,QAAQ,SAAS,GAAG,QAAQ,IAAI;AACxC,YAAM,gBAAgC,CAAC;AACvC,YAAM,yBAAyB,MAAM,KAAK,IAAI,IAAI,gBAAgB,CAAC;AACnE,YAAM,UAAU,OAAO,KAAK;AAE5B,YAAM,QAAQ,cAAc,OAAO,OAAO;AACxC,mBAAW,mBAAmB,wBAAwB;AACpD,gBAAM,eAAe,MAAM,4BAA4B,IAAI,SAAS,iBAAiB,GAAG;AACxF,wBAAc,KAAK,YAAY;AAAA,QACjC;AACA,cAAM,GAAG,MAAM;AAAA,MACjB,CAAC;AAED,YAAM,4BAA4B,WAAW,KAAK,SAAS;AAC3D,YAAM,6BAA6B,UAAU,eAAe,GAAG;AAC/D,YAAM,0BAA0B,UAAU,eAAe,KAAK,sBAAsB;AAEpF,aAAO;AAAA,IACT;AAAA,IAEA,MAAM,iBAAiB,OAAO,KAAK;AACjC,YAAM,KAAK,OAAO,KAAK;AACvB,YAAM,KAAK,MAAM,EAAE;AACnB,YAAM,mBAAmB,MAAM,8BAA8B,IAAI,IAAI,UAAU,MAAM,eAAe;AAEpG,UAAI,iBAAiB,WAAW,GAAG;AACjC,cAAM,gCAAgC,MAAM,iBAAiB,cAAc,IAAI,QAAQ;AACvF,eAAO,CAAC;AAAA,MACV;AAEA,UAAI,6BAA6B;AACjC,UAAI,MAAM,kCAAkC;AAC1C,cAAM,yBAAyB,MAAM,KAAK,IAAI,IAAI,gBAAgB,CAAC;AACnE,YAAI,CAAC,IAAI,gBAAgB;AACvB,iBAAO,KAAK,yFAAyF;AAAA,YACnG,UAAU,IAAI;AAAA,YACd,iBAAiB,MAAM;AAAA,UACzB,CAAC;AACD,iBAAO,CAAC;AAAA,QACV;AAEA,YAAI,uBAAuB,SAAS,KAAK;AACvC,iBAAO,KAAK,0FAA0F;AAAA,YACpG,UAAU,IAAI;AAAA,YACd,gBAAgB,IAAI;AAAA,YACpB,iBAAiB,MAAM;AAAA,YACvB,gBAAgB,uBAAuB;AAAA,YACvC,cAAc;AAAA,UAChB,CAAC;AACD,iBAAO,CAAC;AAAA,QACV;AAEA,YAAI,CAAC,WAAW;AACd,iBAAO,KAAK,2FAA2F;AAAA,YACrG,UAAU,IAAI;AAAA,YACd,gBAAgB,IAAI;AAAA,YACpB,iBAAiB,MAAM;AAAA,UACzB,CAAC;AACD,iBAAO,CAAC;AAAA,QACV;AAEA,YAAI;AACF,gBAAM,cAAc,UAAU,QAAQ,aAAa;AAOnD,gBAAM,0BAAoC,CAAC;AAC3C,mBAAS,SAAS,GAAG,SAAS,uBAAuB,QAAQ,UAAU,IAAI;AACzE,kBAAM,aAAa,uBAAuB,MAAM,QAAQ,SAAS,EAAE;AACnE,kBAAM,UAAU,MAAM,QAAQ,IAAI,WAAW,IAAI,OAAO,qBAAqB;AAAA,cAC3E;AAAA,cACA,SAAS,MAAM,YAAY;AAAA,gBACzB;AAAA,gBACA,CAAC,MAAM,eAAe;AAAA,gBACtB,EAAE,UAAU,IAAI,UAAU,gBAAgB,IAAI,kBAAkB,KAAK;AAAA,cACvE;AAAA,YACF,EAAE,CAAC;AACH,uBAAW,UAAU,SAAS;AAC5B,kBAAI,OAAO,QAAS,yBAAwB,KAAK,OAAO,eAAe;AAAA,YACzE;AAAA,UACF;AACA,uCAA6B;AAAA,QAC/B,SAAS,KAAK;AACZ,iBAAO,KAAK,iFAAiF;AAAA,YAC3F,UAAU,IAAI;AAAA,YACd,gBAAgB,IAAI;AAAA,YACpB,iBAAiB,MAAM;AAAA,YACvB;AAAA,UACF,CAAC;AACD,iBAAO,CAAC;AAAA,QACV;AAEA,YAAI,2BAA2B,WAAW,GAAG;AAC3C,gBAAM,gDAAgD,MAAM,iBAAiB,IAAI,cAAc;AAC/F,iBAAO,CAAC;AAAA,QACV;AAAA,MACF;AAEA,YAAM,8BAA8B,2BAA2B,QAAQ,yBAAyB,MAAM,eAAe;AAErH,YAAM;AAAA,QACJ,iBAAiB;AAAA,QACjB,kCAAkC;AAAA,QAClC,GAAG;AAAA,MACL,IAAI;AACJ,YAAM,gBAAgC,CAAC;AACvC,YAAM,yBAAyB,MAAM,KAAK,IAAI,IAAI,0BAA0B,CAAC;AAC7E,YAAM,UAAU,OAAO,KAAK;AAE5B,YAAM,QAAQ,cAAc,OAAO,OAAO;AACxC,mBAAW,mBAAmB,wBAAwB;AACpD,gBAAM,eAAe,MAAM,4BAA4B,IAAI,SAAS,iBAAiB,GAAG;AACxF,wBAAc,KAAK,YAAY;AAAA,QACjC;AACA,cAAM,GAAG,MAAM;AAAA,MACjB,CAAC;AAED,YAAM,4BAA4B,WAAW,KAAK,SAAS;AAC3D,YAAM,6BAA6B,UAAU,eAAe,GAAG;AAC/D,YAAM,0BAA0B,UAAU,eAAe,KAAK,sBAAsB;AAEpF,aAAO;AAAA,IACT;AAAA,IAEA,MAAM,WAAW,gBAAgB,KAAK;AACpC,YAAM,KAAK,OAAO,KAAK;AACvB,YAAM,eAAe,MAAM,8BAA8B,IAAI,gBAAgB,GAAG;AAEhF,UAAI,aAAa,WAAW,UAAU;AACpC,qBAAa,SAAS;AACtB,qBAAa,SAAS,oBAAI,KAAK;AAC/B,cAAM,GAAG,MAAM;AAEf,cAAM,4BAA4B,WAAW,KAAK,WAAW,aAAa,EAAE;AAC5E,cAAM,SAAS,KAAK,oBAAoB,MAAM;AAAA,UAC5C,gBAAgB,aAAa;AAAA,UAC7B,QAAQ,IAAI;AAAA,UACZ,UAAU,IAAI;AAAA,QAChB,CAAC;AAAA,MACH;AAEA,aAAO;AAAA,IACT;AAAA,IAEA,MAAM,cAAc,KAAK;AACvB,YAAM,KAAK,OAAO,KAAK;AACvB,YAAM,KAAK,MAAM,EAAE;AACnB,YAAM,aAAa,CAA+C,MAAc;AAC9E,YAAI,QAAQ,EACT,MAAM,qBAA4B,KAAK,IAAI,MAAa,EACxD,MAAM,aAAoB,KAAK,IAAI,QAAQ,EAC3C,MAAM,UAAiB,KAAK,QAAQ;AACvC,YAAI,IAAI,gBAAgB;AACtB,kBAAQ,MAAM,MAAM,mBAA0B,KAAK,IAAI,cAAc;AAAA,QACvE;AACA,eAAO;AAAA,MACT;AAEA,YAAM,aAAa,MAAM;AAAA,QACvB,GACG,WAAW,eAAsB,EACjC,OAAO;AAAA,UACN;AAAA,UACA;AAAA,UACA;AAAA,QACF,CAAC;AAAA,MACL,EAAE,QAAQ;AAEV,UAAI,CAAC,WAAW,QAAQ;AACtB,eAAO;AAAA,MACT;AAEA,YAAM,eAAe,MAAM;AAAA,QACzB,GAAG,YAAY,eAAsB,EAAE,IAAI;AAAA,UACzC,QAAQ;AAAA,UACR,SAAS;AAAA,QACX,CAAQ;AAAA,MACV,EAAE,iBAAiB;AACnB,YAAM,SAAS,OAAO,cAAc,kBAAkB,WAAW,MAAM;AAEvE,YAAM,4BAA4B,WAAW,KAAK,SAAS;AAE3D,YAAM,gBAAgB,MAAM,mBAAmB,IAAI,cAAc;AAAA,QAC/D,IAAI,EAAE,KAAK,WAAW,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE;AAAA,MAC7C,GAAG,QAAW;AAAA,QACZ,UAAU,IAAI;AAAA,QACd,gBAAgB,IAAI,kBAAkB;AAAA,MACxC,CAAC;AAED,iBAAW,gBAAgB,eAAe;AACxC,cAAM,SAAS,KAAK,oBAAoB,MAAM;AAAA,UAC5C,gBAAgB,aAAa;AAAA,UAC7B,QAAQ,IAAI;AAAA,UACZ,UAAU,IAAI;AAAA,QAChB,CAAC;AAED,cAAM,SAAS,KAAK,wBAAwB,SAAS;AAAA,UACnD,UAAU,aAAa;AAAA,UACvB,gBAAgB,aAAa,kBAAkB;AAAA,UAC/C,iBAAiB,aAAa;AAAA,UAC9B,cAAc,kBAAkB,YAAY;AAAA,QAC9C,CAAC;AAAA,MACH;AAEA,aAAO;AAAA,IACT;AAAA,IAEA,MAAM,QAAQ,gBAAgB,KAAK;AACjC,YAAM,KAAK,OAAO,KAAK;AACvB,YAAM,eAAe,MAAM,8BAA8B,IAAI,gBAAgB,GAAG;AAEhF,mBAAa,SAAS;AACtB,mBAAa,cAAc,oBAAI,KAAK;AACpC,YAAM,GAAG,MAAM;AAEf,YAAM,4BAA4B,WAAW,KAAK,WAAW,aAAa,EAAE;AAC5E,YAAM,SAAS,KAAK,oBAAoB,WAAW;AAAA,QACjD,gBAAgB,aAAa;AAAA,QAC7B,QAAQ,IAAI;AAAA,QACZ,UAAU,IAAI;AAAA,MAChB,CAAC;AAED,aAAO;AAAA,IACT;AAAA,IAEA,MAAM,iBAAiB,gBAAgB,QAAQ,KAAK;AAClD,YAAM,KAAK,OAAO,KAAK;AACvB,YAAM,eAAe,MAAM,8BAA8B,IAAI,gBAAgB,GAAG;AAEhF,UAAI,aAAa,WAAW,aAAa;AACvC,eAAO;AAAA,MACT;AAEA,YAAM,eAAe,UAAU;AAC/B,mBAAa,SAAS;AACtB,mBAAa,cAAc;AAE3B,UAAI,iBAAiB,UAAU;AAC7B,qBAAa,SAAS;AAAA,MACxB,WAAW,CAAC,aAAa,QAAQ;AAC/B,qBAAa,SAAS,oBAAI,KAAK;AAAA,MACjC;AAEA,YAAM,GAAG,MAAM;AAEf,YAAM,4BAA4B,WAAW,KAAK,WAAW,aAAa,EAAE;AAC5E,YAAM,SAAS,KAAK,oBAAoB,UAAU;AAAA,QAChD,gBAAgB,aAAa;AAAA,QAC7B,QAAQ,IAAI;AAAA,QACZ,UAAU,IAAI;AAAA,QACd,QAAQ;AAAA,MACV,CAAC;AAED,aAAO;AAAA,IACT;AAAA,IAEA,MAAM,cAAc,gBAAgB,OAAO,KAAK;AAC9C,YAAM,KAAK,OAAO,KAAK;AACvB,YAAM,eAAe,MAAM,8BAA8B,IAAI,gBAAgB,GAAG;AAEhF,YAAM,aAAa,aAAa;AAChC,YAAM,SAAS,YAAY,SAAS,KAAK,CAAC,MAAM,EAAE,OAAO,MAAM,QAAQ;AAEvE,UAAI,CAAC,QAAQ;AACX,cAAM,IAAI,MAAM,kBAAkB;AAAA,MACpC;AAIA,UAAI,aAAa,WAAW,YAAY;AACtC,cAAM,SAAS,sCAAsC;AAAA,MACvD;AAEA,YAAM,aAAa,oBAAI,KAAK;AAC5B,YAAM,iBAAiB,aAAa;AACpC,YAAM,qBAAqB,aAAa,cAAc;AACtD,YAAM,sBAAsB,aAAa,eAAe;AAKxD,YAAM,cAAe,MAAM,MAAM,EAAE,EAChC,YAAY,eAAsB,EAClC,IAAI;AAAA,QACH,QAAQ;AAAA,QACR,aAAa;AAAA,QACb,cAAc,MAAM;AAAA,MACtB,CAAQ,EACP,MAAM,MAAa,KAAK,aAAa,EAAE,EACvC,MAAM,qBAA4B,KAAK,IAAI,MAAa,EACxD,MAAM,aAAoB,KAAK,IAAI,QAAQ,EAC3C,MAAM,UAAiB,MAAM,UAAU,EACvC,iBAAiB;AAEpB,UAAI,OAAO,aAAa,kBAAkB,CAAC,MAAM,GAAG;AAClD,cAAM,SAAS,sCAAsC;AAAA,MACvD;AAOA,YAAM,eAAe,YAAY;AAC/B,cAAM,MAAM,EAAE,EACX,YAAY,eAAsB,EAClC,IAAI;AAAA,UACH,QAAQ;AAAA,UACR,aAAa;AAAA,UACb,cAAc;AAAA,QAChB,CAAQ,EACP,MAAM,MAAa,KAAK,aAAa,EAAE,EACvC,MAAM,qBAA4B,KAAK,IAAI,MAAa,EACxD,MAAM,aAAoB,KAAK,IAAI,QAAQ,EAC3C,MAAM,UAAiB,KAAK,UAAU,EACtC,iBAAiB;AAAA,MACtB;AAEA,UAAI,SAAkB;AAEtB,UAAI,OAAO,aAAa,cAAc,WAAW;AAC/C,cAAM,eAAe;AAAA,UACnB,IAAI,aAAa;AAAA,UACjB,GAAG,MAAM;AAAA,QACX;AAGA,cAAM,aAAa;AAAA,UACjB;AAAA,UACA,MAAM;AAAA,YACJ,KAAK,IAAI;AAAA,YACT,UAAU,IAAI;AAAA,YACd,OAAO,IAAI;AAAA,UACb;AAAA,UACA,mBAAmB;AAAA,UACnB,wBAAwB,IAAI,kBAAkB;AAAA,UAC9C,iBAAiB,IAAI,iBAAiB,CAAC,IAAI,cAAc,IAAI;AAAA,QAC/D;AAEA,YAAI;AACJ,YAAI;AACF,0BAAgB,MAAM,WAAW,QAAQ,OAAO,WAAW;AAAA,YACzD,OAAO;AAAA,YACP,KAAK;AAAA,YACL,UAAU;AAAA,cACR,UAAU,IAAI;AAAA,cACd,gBAAgB,IAAI;AAAA,cACpB,cAAc;AAAA,YAChB;AAAA,UACF,CAAC;AAAA,QACH,SAAS,KAAK;AAGZ,cAAI;AACF,kBAAM,aAAa;AAAA,UACrB,SAAS,YAAY;AACnB,kBAAM,+CAA+C,UAAU;AAAA,UACjE;AACA,gBAAM;AAAA,QACR;AAEA,iBAAS,cAAc;AAAA,MACzB;AAEA,mBAAa,SAAS;AACtB,mBAAa,aAAa;AAC1B,mBAAa,cAAc,MAAM;AACjC,mBAAa,eAAe;AAE5B,UAAI,CAAC,aAAa,QAAQ;AACxB,qBAAa,SAAS,oBAAI,KAAK;AAAA,MACjC;AAEA,YAAM,GAAG,MAAM;AAEf,YAAM,4BAA4B,WAAW,KAAK,WAAW,aAAa,EAAE;AAC5E,YAAM,SAAS,KAAK,oBAAoB,UAAU;AAAA,QAChD,gBAAgB,aAAa;AAAA,QAC7B,UAAU,MAAM;AAAA,QAChB,QAAQ,IAAI;AAAA,QACZ,UAAU,IAAI;AAAA,MAChB,CAAC;AAED,aAAO,EAAE,cAAc,OAAO;AAAA,IAChC;AAAA,IAEA,MAAM,eAAe,KAAK;AACxB,YAAM,KAAK,OAAO,KAAK;AACvB,aAAO,GAAG,MAAM,cAAc;AAAA,QAC5B,iBAAiB,IAAI;AAAA,QACrB,UAAU,IAAI;AAAA,QACd,QAAQ;AAAA,QACR,GAAG,gCAAgC,GAAG;AAAA,MACxC,CAAC;AAAA,IACH;AAAA,IAEA,MAAM,YAAY,KAAK,OAAO;AAC5B,YAAM,KAAK,OAAO,KAAK;AACvB,YAAM,UAAmC;AAAA,QACvC,iBAAiB,IAAI;AAAA,QACrB,UAAU,IAAI;AAAA,QACd,GAAG,gCAAgC,GAAG;AAAA,MACxC;AAEA,UAAI,OAAO;AACT,gBAAQ,YAAY,EAAE,KAAK,IAAI,KAAK,KAAK,EAAE;AAAA,MAC7C;AAEA,YAAM,CAAC,eAAe,WAAW,IAAI,MAAM,QAAQ,IAAI;AAAA,QACrD,GAAG,KAAK,cAAc,SAAS;AAAA,UAC7B,SAAS,EAAE,WAAW,OAAO;AAAA,UAC7B,OAAO;AAAA,QACT,CAAC;AAAA,QACD,GAAG,MAAM,cAAc;AAAA,UACrB,iBAAiB,IAAI;AAAA,UACrB,UAAU,IAAI;AAAA,UACd,QAAQ;AAAA,UACR,GAAG,gCAAgC,GAAG;AAAA,QACxC,CAAC;AAAA,MACH,CAAC;AAED,YAAM,SAAS,cAAc,IAAI,iBAAiB;AAClD,YAAM,SAAS,QAAQ,OAAO,SAAS,IAAI;AAE3C,aAAO;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,QACA,QAAQ,OAAO,CAAC,GAAG;AAAA,MACrB;AAAA,IACF;AAAA,IAEA,MAAM,iBAAiB;AACrB,YAAM,KAAK,OAAO,KAAK;AACvB,YAAM,KAAK,MAAM,EAAE;AAEnB,YAAM,iBAAiB,MAAM,GAC1B,WAAW,eAAsB,EACjC,OAAO;AAAA,QACN;AAAA,QACA;AAAA,MACF,CAAC,EACA,MAAM,cAAqB,KAAK,UAAU,EAC1C,MAAM,UAAiB,UAAU,CAAC,YAAY,WAAW,CAAC,EAC1D,SAAS,EACT,QAAQ;AAEX,UAAI,CAAC,eAAe,OAAQ,QAAO;AAEnC,YAAM,eAAe,MAAM,GACxB,YAAY,eAAsB,EAClC,IAAI;AAAA,QACH,QAAQ;AAAA,QACR,cAAc;AAAA,MAChB,CAAQ,EACP,MAAM,cAAqB,KAAK,UAAU,EAC1C,MAAM,UAAiB,UAAU,CAAC,YAAY,WAAW,CAAC,EAC1D,iBAAiB;AAEpB,iBAAW,SAAS,gBAAgB;AAClC,cAAM,4BAA4B,WAAW;AAAA,UAC3C,UAAU,MAAM;AAAA,UAChB,gBAAgB,MAAM;AAAA,QACxB,GAAG,SAAS;AAAA,MACd;AAEA,aAAO,OAAO,cAAc,kBAAkB,CAAC;AAAA,IACjD;AAAA,IAEA,MAAM,eAAe,kBAAkB,gBAAgB,KAAK;AAC1D,YAAM,KAAK,OAAO,KAAK;AACvB,YAAM,KAAK,MAAM,EAAE;AAEnB,YAAM,eAAe,MAAM,GACxB,WAAW,eAAsB,EACjC,MAAM,sBAA6B,KAAK,gBAAgB,EACxD,MAAM,oBAA2B,KAAK,cAAc,EACpD,MAAM,aAAoB,KAAK,IAAI,QAAQ,EAC3C,iBAAiB;AAEpB,YAAM,eAAe,OAAO,cAAc,kBAAkB,CAAC;AAC7D,UAAI,eAAe,GAAG;AACpB,cAAM,4BAA4B,WAAW,KAAK,SAAS;AAAA,MAC7D;AAEA,aAAO;AAAA,IACT;AAAA,EACF;AACF;AAMO,SAAS,2BAA2B,WAEnB;AACtB,QAAM,KAAK,UAAU,QAAQ,IAAI;AACjC,QAAM,WAAW,UAAU,QAAQ,UAAU;AAG7C,MAAI;AACJ,MAAI;AACF,iBAAa,UAAU,QAAQ,YAAY;AAAA,EAC7C,QAAQ;AAEN,iBAAa;AAAA,EACf;AAEA,SAAO,0BAA0B,EAAE,IAAI,UAAU,YAAY,UAAU,CAAC;AAC1E;",
   "names": []
 }

package/dist/modules/query_index/lib/engine.js CHANGED Viewed

@@ -26,6 +26,19 @@ import { mapWithConcurrency } from "@open-mercato/shared/lib/query/bounded-decry
 import { createLogger } from "@open-mercato/shared/lib/logger";
 import { parseNumberWithDefault } from "@open-mercato/shared/lib/number";
 const logger = createLogger("query_index").child({ component: "engine" });
+const CF_FILTER_SUPPORTED_OPS = /* @__PURE__ */ new Set([
+  "eq",
+  "ne",
+  "in",
+  "nin",
+  "like",
+  "ilike",
+  "exists",
+  "gt",
+  "gte",
+  "lt",
+  "lte"
+]);
 const DECRYPT_CONCURRENCY = 8;
 const AUTO_REINDEX_DEBOUNCE_DEFAULT_MS = 3e4;
 const AUTO_REINDEX_DEBOUNCE_MAX_SCOPES = 1e4;
@@ -577,9 +590,11 @@ class HybridQueryEngine {
         }
         return next;
       };
+      const regularCfFilters = cfFilters.filter((filter) => !filter.orGroup);
+      const orGroupCfFilters = cfFilters.filter((filter) => filter.orGroup);
       const applyCfFilters = (q) => {
         let next = q;
-        for (const filter of cfFilters) {
+        for (const filter of regularCfFilters) {
           next = this.applyCfFilterAcrossSources(
             next,
             filter.field,
@@ -622,24 +637,49 @@ class HybridQueryEngine {
         return next;
       };
       const applyOrGroupedBaseFilters = (q) => {
-        if (orGroupFilters.length === 0) return q;
+        if (orGroupFilters.length === 0 && orGroupCfFilters.length === 0) return q;
         const groups = /* @__PURE__ */ new Map();
+        const bucketFor = (orGroup) => {
+          const existing = groups.get(orGroup) ?? { base: [], cf: [] };
+          groups.set(orGroup, existing);
+          return existing;
+        };
         for (const filter of orGroupFilters) {
           if (!filter.orGroup) continue;
-          const existing = groups.get(filter.orGroup) ?? [];
-          existing.push(filter);
-          groups.set(filter.orGroup, existing);
+          bucketFor(filter.orGroup).base.push(filter);
         }
-        const groupList = Array.from(groups.values()).filter((g) => g.length > 0);
-        if (groupList.length === 0) return q;
-        return q.where((eb) => eb.or(
-          groupList.map((groupFilters) => {
-            const parts = groupFilters.map(
-              (filter) => this.buildBaseFilterExpression(eb, filter, resolveBaseColumn, qualify, entity, searchRuntime)
-            );
+        for (const filter of orGroupCfFilters) {
+          if (!filter.orGroup) continue;
+          bucketFor(filter.orGroup).cf.push(filter);
+        }
+        const applicableGroups = Array.from(groups.values()).map((group) => ({
+          base: group.base,
+          cf: group.cf.filter(
+            (filter) => this.cfFilterHasPredicate(filter.op, filter.value, indexSources, searchRuntime)
+          )
+        })).filter((group) => group.base.length > 0 || group.cf.length > 0);
+        if (applicableGroups.length === 0) return q;
+        return q.where((eb) => {
+          const disjuncts = applicableGroups.map((groupFilters) => {
+            const parts = [
+              ...groupFilters.base.map(
+                (filter) => this.buildBaseFilterExpression(eb, filter, resolveBaseColumn, qualify, entity, searchRuntime)
+              ),
+              ...groupFilters.cf.map(
+                (filter) => this.buildCfFilterExpression(
+                  eb,
+                  filter.field,
+                  filter.op,
+                  filter.value,
+                  indexSources,
+                  searchRuntime
+                )
+              )
+            ];
             return parts.length === 1 ? parts[0] : eb.and(parts);
-          })
-        ));
+          });
+          return disjuncts.length === 1 ? disjuncts[0] : eb.or(disjuncts);
+        });
       };
       const applyAliasScopes = async (target, aliasName) => {
         let next = target;
@@ -1108,78 +1148,112 @@ class HybridQueryEngine {
     if (parts.length === 1) return parts[0];
     return sql`coalesce(${sql.join(parts, sql`, `)})`;
   }
-  applyCfFilterAcrossSources(builder, key, op, value, sources, search) {
-    if (!sources.length) return builder;
+  /**
+   * Build a custom-field predicate as a standalone expression.
+   *
+   * Returning an expression rather than mutating a builder is what lets OR-grouped
+   * cf leaves be combined with the base-column ones inside a single `WHERE`
+   * (#5039). `null` means "no predicate" — an empty search-token set or an
+   * unsupported operator — and callers must treat that as the leaf being absent.
+   */
+  buildCfFilterExpression(eb, key, op, value, sources, search) {
+    if (!sources.length) return null;
     if ((op === "like" || op === "ilike") && search?.enabled && typeof value === "string") {
       const tokens = tokenizeText(String(value), search.config);
       const hashes = tokens.hashes;
-      if (hashes.length) {
-        const applied = this.applyMultiSourceSearchExists(builder, sources, key, hashes, search);
-        this.logSearchDebug("search:cf-filter-across", {
-          entity: sources.map((src) => src.entityId),
-          field: key,
-          tokens: tokens.tokens,
-          hashes,
-          applied,
-          tenantId: search.tenantId ?? null,
-          organizationScope: search.organizationScope
-        });
-        if (applied.builder !== builder) return applied.builder;
-      } else {
+      if (!hashes.length) {
         this.logSearchDebug("search:cf-skip-empty-hashes", {
           entity: sources.map((src) => src.entityId),
           field: key,
           value
         });
+        return null;
       }
-      return builder;
+      const expression = this.buildMultiSourceSearchExists(eb, sources, key, hashes, search);
+      this.logSearchDebug("search:cf-filter-across", {
+        entity: sources.map((src) => src.entityId),
+        field: key,
+        tokens: tokens.tokens,
+        hashes,
+        applied: expression !== null,
+        tenantId: search.tenantId ?? null,
+        organizationScope: search.organizationScope
+      });
+      return expression;
     }
     const textExpr = this.buildCfTextExprSql(key, sources);
     const jsonExpr = this.buildCfJsonExprSql(key, sources);
-    if (!textExpr || !jsonExpr) return builder;
+    if (!textExpr || !jsonExpr) return null;
     const arrContains = (val) => sql`${jsonExpr} @> ${JSON.stringify([val])}::jsonb`;
     switch (op) {
       case "eq":
-        return value === null ? builder.where(sql`${textExpr} is null`) : builder.where((eb) => eb.or([
+        return value === null ? sql`${textExpr} is null` : eb.or([
           sql`${textExpr} = ${value}`,
           arrContains(value)
-        ]));
+        ]);
       case "ne":
-        return value === null ? builder.where(sql`${textExpr} is not null`) : builder.where(sql`${textExpr} <> ${value}`);
+        return value === null ? sql`${textExpr} is not null` : sql`${textExpr} <> ${value}`;
       case "in": {
         const values = this.toArray(value);
-        return builder.where((eb) => eb.or(
+        return eb.or(
           values.flatMap((val) => [
             sql`${textExpr} = ${val}`,
             arrContains(val)
           ])
-        ));
+        );
       }
       case "nin": {
         const values = this.toArray(value);
-        return builder.where(sql`${textExpr} not in (${sql.join(values.map((v) => sql`${v}`), sql`, `)})`);
+        return sql`${textExpr} not in (${sql.join(values.map((v) => sql`${v}`), sql`, `)})`;
       }
       case "like":
-        return builder.where(sql`${textExpr} like ${value}`);
+        return sql`${textExpr} like ${value}`;
       case "ilike":
-        return builder.where(sql`${textExpr} ilike ${value}`);
+        return sql`${textExpr} ilike ${value}`;
       case "exists":
-        return value ? builder.where(sql`${textExpr} is not null`) : builder.where(sql`${textExpr} is null`);
+        return value ? sql`${textExpr} is not null` : sql`${textExpr} is null`;
       case "gt":
       case "gte":
       case "lt":
       case "lte": {
         const operator = sql.raw(op === "gt" ? ">" : op === "gte" ? ">=" : op === "lt" ? "<" : "<=");
-        return builder.where(sql`${textExpr} ${operator} ${value}`);
+        return sql`${textExpr} ${operator} ${value}`;
       }
       default:
-        return builder;
+        return null;
     }
   }
-  /** Apply a search-token EXISTS subquery across multiple sources (OR-joined). */
-  applyMultiSourceSearchExists(builder, sources, key, hashes, search) {
-    if (!sources.length || !hashes.length) return { builder, applied: false };
-    const next = builder.where((eb) => eb.or(
+  /**
+   * Whether `buildCfFilterExpression` will produce a predicate for this leaf.
+   *
+   * Decidable without an ExpressionBuilder, which lets callers skip the `.where()`
+   * entirely (rather than emitting a tautology) and lets the OR-group builder drop
+   * leaves before it has to decide whether a disjunct survives.
+   */
+  cfFilterHasPredicate(op, value, sources, search) {
+    if (!sources.length) return false;
+    if ((op === "like" || op === "ilike") && search?.enabled && typeof value === "string") {
+      return tokenizeText(String(value), search.config).hashes.length > 0;
+    }
+    return CF_FILTER_SUPPORTED_OPS.has(op);
+  }
+  applyCfFilterAcrossSources(builder, key, op, value, sources, search) {
+    if (!this.cfFilterHasPredicate(op, value, sources, search)) {
+      if (sources.length && (op === "like" || op === "ilike") && search?.enabled && typeof value === "string") {
+        this.logSearchDebug("search:cf-skip-empty-hashes", {
+          entity: sources.map((src) => src.entityId),
+          field: key,
+          value
+        });
+      }
+      return builder;
+    }
+    return builder.where((eb) => this.buildCfFilterExpression(eb, key, op, value, sources, search));
+  }
+  /** Build a search-token EXISTS predicate across multiple sources (OR-joined). */
+  buildMultiSourceSearchExists(eb, sources, key, hashes, search) {
+    if (!sources.length || !hashes.length) return null;
+    return eb.or(
       sources.map(
         (source) => eb.exists(this.buildSearchTokensSub(eb, {
           entity: String(source.entityId),
@@ -1191,8 +1265,7 @@ class HybridQueryEngine {
           mintAlias: search.mintAlias
         }))
       )
-    ));
-    return { builder: next, applied: true };
+    );
   }
   /** Construct a search-token EXISTS subquery using the given ExpressionBuilder. */
   buildSearchTokensSub(eb, opts) {