@open-mercato/core 0.6.8-develop.6983.1.e4f794099e → 0.6.8-develop.6985.1.fb93574faa

package/dist/modules/notifications/lib/notification-type-registry.js

@@ -0,0 +1,87 @@
+import { sql } from "kysely";
+import { deriveCategory } from "./derive-category.js";
+const registry = /* @__PURE__ */ new Map();
+let synced = false;
+function registerNotificationTypes(types, options = {}) {
+  if (options.replace) {
+    registry.clear();
+    synced = false;
+  }
+  for (const type of types) {
+    registry.set(type.type, type);
+  }
+}
+function getNotificationType(type) {
+  return registry.get(type);
+}
+function getNotificationTypes() {
+  return Array.from(registry.values());
+}
+async function syncNotificationTypes(em, opts = {}) {
+  const definitions = getNotificationTypes();
+  if (synced && !opts.force) {
+    return { created: 0, updated: 0, deleted: 0, total: definitions.length };
+  }
+  const db = em.getKysely();
+  const existing = await db.selectFrom("notification_types").select(["id", "label_key", "description_key", "category", "silent", "non_opt_out"]).where("tenant_id", "is", null).execute();
+  const byId = new Map(existing.map((row) => [row.id, row]));
+  const labelKeyFor = (def) => def.labelKey ?? def.titleKey;
+  const descKeyFor = (def) => def.descriptionKey ?? null;
+  const categoryFor = (def) => def.category ?? deriveCategory(def.type);
+  const silentFor = (def) => def.silent === true;
+  const nonOptOutFor = (def) => def.nonOptOut === true;
+  const visibleDefinitions = definitions.filter((def) => def.hiddenFromSettings !== true);
+  const toCreate = visibleDefinitions.filter((def) => !byId.has(def.type));
+  const toUpdate = visibleDefinitions.filter((def) => {
+    const row = byId.get(def.type);
+    if (!row) return false;
+    return row.label_key !== labelKeyFor(def) || (row.description_key ?? null) !== descKeyFor(def) || (row.category ?? null) !== categoryFor(def) || row.silent !== silentFor(def) || row.non_opt_out !== nonOptOutFor(def);
+  });
+  let created = 0;
+  let updated = 0;
+  let deleted = 0;
+  if (toCreate.length) {
+    await db.insertInto("notification_types").values(
+      toCreate.map((def) => ({
+        id: def.type,
+        tenant_id: null,
+        label_key: labelKeyFor(def),
+        description_key: descKeyFor(def),
+        category: categoryFor(def),
+        silent: silentFor(def),
+        non_opt_out: nonOptOutFor(def),
+        created_at: sql`now()`,
+        updated_at: sql`now()`
+      }))
+    ).onConflict((oc) => oc.column("id").doNothing()).execute();
+    created = toCreate.length;
+  }
+  for (const def of toUpdate) {
+    await db.updateTable("notification_types").set({
+      label_key: labelKeyFor(def),
+      description_key: descKeyFor(def),
+      category: categoryFor(def),
+      silent: silentFor(def),
+      non_opt_out: nonOptOutFor(def),
+      updated_at: sql`now()`
+    }).where("id", "=", def.type).where("tenant_id", "is", null).execute();
+    updated += 1;
+  }
+  if (definitions.length > 0) {
+    const validIds = new Set(visibleDefinitions.map((def) => def.type));
+    const staleIds = existing.filter((row) => !validIds.has(row.id)).map((row) => row.id);
+    if (staleIds.length) {
+      await db.deleteFrom("notification_types").where("tenant_id", "is", null).where("id", "in", staleIds).execute();
+      deleted = staleIds.length;
+    }
+  }
+  synced = true;
+  return { created, updated, deleted, total: definitions.length };
+}
+export {
+  getNotificationType,
+  getNotificationTypes,
+  registerNotificationTypes,
+  syncNotificationTypes
+};
+//# sourceMappingURL=notification-type-registry.js.map

package/dist/modules/notifications/lib/notification-type-registry.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/notifications/lib/notification-type-registry.ts"],
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { type Kysely, sql } from 'kysely'\nimport type { NotificationTypeDefinition } from '@open-mercato/shared/modules/notifications/types'\nimport { deriveCategory } from './derive-category'\n\nconst registry = new Map<string, NotificationTypeDefinition>()\n\nlet synced = false\n\nexport type RegisterNotificationTypesOptions = {\n  replace?: boolean\n}\n\n/**\n * In-memory mirror of the code-registered notification type catalogue. Fed at\n * app bootstrap from the generated aggregate (`notificationTypes`) \u2014 mirrors the\n * `messages` registry. This stays the source of truth for code; the\n * `notification_types` table is a read-through mirror for remote clients.\n */\nexport function registerNotificationTypes(\n  types: NotificationTypeDefinition[],\n  options: RegisterNotificationTypesOptions = {},\n): void {\n  if (options.replace) {\n    registry.clear()\n    synced = false\n  }\n  for (const type of types) {\n    registry.set(type.type, type)\n  }\n}\n\nexport function getNotificationType(type: string): NotificationTypeDefinition | undefined {\n  return registry.get(type)\n}\n\nexport function getNotificationTypes(): NotificationTypeDefinition[] {\n  return Array.from(registry.values())\n}\n\nexport type SyncNotificationTypesResult = {\n  created: number\n  updated: number\n  deleted: number\n  total: number\n}\n\n/**\n * Reconcile the in-memory catalogue into the `notification_types` table.\n * Code-registered types are system-wide, so rows are written with\n * `tenant_id IS NULL`. Idempotent: updates the mirrored columns\n * (`label_key`/`description_key`/`category`/`silent`/`non_opt_out`) only on\n * drift, and prunes system-wide rows no longer in the catalogue. Guarded by a\n * once-per-process flag on the lazy path; pass `force` to bypass it (used by the\n * explicit `notifications.type_registry.sync` subscriber).\n *\n * Writes go through kysely with `INSERT ... ON CONFLICT DO NOTHING` so a\n * concurrent first-sync (or the seedDefaults subscriber racing a `GET /types`)\n * can never raise a duplicate-PK 500 \u2014 mirrors `query_index/lib/jobs.ts`.\n */\nexport async function syncNotificationTypes(\n  em: EntityManager,\n  opts: { force?: boolean } = {},\n): Promise<SyncNotificationTypesResult> {\n  const definitions = getNotificationTypes()\n  if (synced && !opts.force) {\n    return { created: 0, updated: 0, deleted: 0, total: definitions.length }\n  }\n\n  const db = em.getKysely<any>() as Kysely<any>\n\n  // Read existing system-wide rows via kysely (not the ORM) so they stay out of the identity map and\n  // the route's subsequent em.find reflects exactly what this function just wrote.\n  const existing = (await db\n    .selectFrom('notification_types')\n    .select(['id', 'label_key', 'description_key', 'category', 'silent', 'non_opt_out'])\n    .where('tenant_id', 'is', null)\n    .execute()) as Array<{\n    id: string\n    label_key: string\n    description_key: string | null\n    category: string | null\n    silent: boolean\n    non_opt_out: boolean\n  }>\n  const byId = new Map(existing.map((row) => [row.id, row]))\n\n  const labelKeyFor = (def: NotificationTypeDefinition) => def.labelKey ?? def.titleKey\n  const descKeyFor = (def: NotificationTypeDefinition) => def.descriptionKey ?? null\n  // Resolved once here so every mirrored row carries a grouping key and read paths\n  // (GET /api/notifications/types) never need a fallback branch of their own.\n  const categoryFor = (def: NotificationTypeDefinition) => def.category ?? deriveCategory(def.type)\n  const silentFor = (def: NotificationTypeDefinition) => def.silent === true\n  const nonOptOutFor = (def: NotificationTypeDefinition) => def.nonOptOut === true\n\n  // Internal/admin-only types (`hiddenFromSettings`) are never exposed to the client catalogue: they\n  // are excluded from create/update, and \u2014 because they drop out of `validIds` below \u2014 any stale row\n  // for a type that was flipped to hidden gets pruned. They remain in the in-memory registry for\n  // delivery logic. GET /api/notifications/types therefore never lists them.\n  const visibleDefinitions = definitions.filter((def) => def.hiddenFromSettings !== true)\n\n  const toCreate = visibleDefinitions.filter((def) => !byId.has(def.type))\n  const toUpdate = visibleDefinitions.filter((def) => {\n    const row = byId.get(def.type)\n    if (!row) return false\n    return (\n      row.label_key !== labelKeyFor(def) ||\n      (row.description_key ?? null) !== descKeyFor(def) ||\n      (row.category ?? null) !== categoryFor(def) ||\n      row.silent !== silentFor(def) ||\n      row.non_opt_out !== nonOptOutFor(def)\n    )\n  })\n\n  let created = 0\n  let updated = 0\n  let deleted = 0\n\n  if (toCreate.length) {\n    await db\n      .insertInto('notification_types')\n      .values(\n        toCreate.map((def) => ({\n          id: def.type,\n          tenant_id: null,\n          label_key: labelKeyFor(def),\n          description_key: descKeyFor(def),\n          category: categoryFor(def),\n          silent: silentFor(def),\n          non_opt_out: nonOptOutFor(def),\n          created_at: sql`now()`,\n          updated_at: sql`now()`,\n        })),\n      )\n      .onConflict((oc: any) => oc.column('id').doNothing())\n      .execute()\n    created = toCreate.length\n  }\n\n  // Bump updated_at only on real drift, so repeated syncs don't churn timestamps.\n  for (const def of toUpdate) {\n    await db\n      .updateTable('notification_types')\n      .set({\n        label_key: labelKeyFor(def),\n        description_key: descKeyFor(def),\n        category: categoryFor(def),\n        silent: silentFor(def),\n        non_opt_out: nonOptOutFor(def),\n        updated_at: sql`now()`,\n      })\n      .where('id', '=', def.type)\n      .where('tenant_id', 'is', null)\n      .execute()\n    updated += 1\n  }\n\n  // Prune system-wide rows no longer in the catalogue (a removed/renamed module's type stops showing\n  // in the preferences matrix). Guarded by a non-empty catalogue so a mis-bootstrapped process with an\n  // empty registry can never wipe the table. Known limitation, deliberately not addressed here: the\n  // guard is a count, not a completeness check, so a process holding a PARTIAL catalogue still prunes\n  // the missing modules' rows \u2014 same for multiple apps with different module sets sharing one DB.\n  // Both are bounded: `synced` limits it to one sync per process, the rows come back on the next\n  // full-catalogue sync, and nothing cascades (overrides and preferences reference the type by plain\n  // string id with no FK, so they survive and re-attach). Closing it properly means gating on the\n  // enabled-module set that fed the registry, or moving the prune off this lazy read path entirely.\n  if (definitions.length > 0) {\n    const validIds = new Set(visibleDefinitions.map((def) => def.type))\n    const staleIds = existing.filter((row) => !validIds.has(row.id)).map((row) => row.id)\n    if (staleIds.length) {\n      await db\n        .deleteFrom('notification_types')\n        .where('tenant_id', 'is', null)\n        .where('id', 'in', staleIds)\n        .execute()\n      deleted = staleIds.length\n    }\n  }\n\n  synced = true\n  return { created, updated, deleted, total: definitions.length }\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/modules/notifications/lib/notificationCopy.js

@@ -0,0 +1,14 @@
+import { loadDictionary } from "@open-mercato/shared/lib/i18n/server";
+import { createFallbackTranslator } from "@open-mercato/shared/lib/i18n/translate";
+import { defaultLocale } from "@open-mercato/shared/lib/i18n/config";
+async function resolveNotificationCopy(source, locale = defaultLocale) {
+  const dictionary = await loadDictionary(locale);
+  const t = createFallbackTranslator(dictionary);
+  const title = source.titleKey ? t(source.titleKey, source.title ?? source.titleKey, source.titleVariables ?? void 0) : source.title;
+  const body = source.bodyKey ? t(source.bodyKey, source.body ?? source.bodyKey ?? "", source.bodyVariables ?? void 0) : source.body ?? null;
+  return { title, body, t };
+}
+export {
+  resolveNotificationCopy
+};
+//# sourceMappingURL=notificationCopy.js.map

package/dist/modules/notifications/lib/notificationCopy.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/notifications/lib/notificationCopy.ts"],
+  "sourcesContent": ["import { loadDictionary } from '@open-mercato/shared/lib/i18n/server'\nimport { createFallbackTranslator } from '@open-mercato/shared/lib/i18n/translate'\nimport { defaultLocale, type Locale } from '@open-mercato/shared/lib/i18n/config'\n\n/**\n * Localizable notification copy: i18n keys + variables, with already-resolved (or raw) strings as\n * the fallback when a key is absent or has no translation. Structurally satisfied by a `Notification`\n * row (in-app/email delivery) and built ad hoc by the push fan-out (per-device delivery).\n */\nexport type NotificationCopySource = {\n  titleKey?: string | null\n  bodyKey?: string | null\n  titleVariables?: Record<string, string> | null\n  bodyVariables?: Record<string, string> | null\n  title: string\n  body?: string | null\n}\n\n/**\n * Resolve a notification's title/body in a given locale. Dictionaries are memoized by\n * {@link loadDictionary}, so repeated calls per locale are cheap. Also returns the translator so\n * callers can localize sibling strings (email chrome, action labels) without reloading the dictionary.\n */\nexport async function resolveNotificationCopy(source: NotificationCopySource, locale: Locale = defaultLocale) {\n  const dictionary = await loadDictionary(locale)\n  const t = createFallbackTranslator(dictionary)\n  const title = source.titleKey\n    ? t(source.titleKey, source.title ?? source.titleKey, source.titleVariables ?? undefined)\n    : source.title\n  const body = source.bodyKey\n    ? t(source.bodyKey, source.body ?? source.bodyKey ?? '', source.bodyVariables ?? undefined)\n    : source.body ?? null\n  return { title, body, t }\n}\n"],
+  "mappings": "AAAA,SAAS,sBAAsB;AAC/B,SAAS,gCAAgC;AACzC,SAAS,qBAAkC;AAqB3C,eAAsB,wBAAwB,QAAgC,SAAiB,eAAe;AAC5G,QAAM,aAAa,MAAM,eAAe,MAAM;AAC9C,QAAM,IAAI,yBAAyB,UAAU;AAC7C,QAAM,QAAQ,OAAO,WACjB,EAAE,OAAO,UAAU,OAAO,SAAS,OAAO,UAAU,OAAO,kBAAkB,MAAS,IACtF,OAAO;AACX,QAAM,OAAO,OAAO,UAChB,EAAE,OAAO,SAAS,OAAO,QAAQ,OAAO,WAAW,IAAI,OAAO,iBAAiB,MAAS,IACxF,OAAO,QAAQ;AACnB,SAAO,EAAE,OAAO,MAAM,EAAE;AAC1B;",
+  "names": []
+}

package/dist/modules/notifications/lib/notificationFactory.js

@@ -1,7 +1,7 @@
 import { Notification } from "../data/entities.js";
 import { NOTIFICATION_EVENTS } from "./events.js";
 import { assertSafeNotificationHref, sanitizeNotificationActions } from "./safeHref.js";
-function buildNotificationEntity(em, input, recipientUserId, ctx) {
+function buildNotificationEntity(em, input, recipientUserId, ctx, channels = null) {
   const actions = sanitizeNotificationActions(input.actions);
   const linkHref = assertSafeNotificationHref(input.linkHref);
   return em.create(Notification, {
@@ -26,6 +26,9 @@ function buildNotificationEntity(em, input, recipientUserId, ctx) {
     sourceEntityId: input.sourceEntityId,
     linkHref,
     groupKey: input.groupKey,
+    data: input.data ?? null,
+    pushOptions: input.pushOptions ?? null,
+    channels,
     expiresAt: input.expiresAt ? new Date(input.expiresAt) : null,
     tenantId: ctx.tenantId,
     organizationId: ctx.organizationId

package/dist/modules/notifications/lib/notificationFactory.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/notifications/lib/notificationFactory.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/core'\nimport { Notification } from '../data/entities'\nimport type { CreateNotificationInput } from '../data/validators'\nimport { NOTIFICATION_EVENTS } from './events'\nimport { assertSafeNotificationHref, sanitizeNotificationActions } from './safeHref'\n\nexport type NotificationContentInput = Omit<CreateNotificationInput, 'recipientUserId'>\n\nexport type NotificationTenantContext = {\n  tenantId: string\n  organizationId?: string | null\n}\n\nexport function buildNotificationEntity(\n  em: EntityManager,\n  input: NotificationContentInput,\n  recipientUserId: string,\n  ctx: NotificationTenantContext\n): Notification {\n  const actions = sanitizeNotificationActions(input.actions)\n  const linkHref = assertSafeNotificationHref(input.linkHref)\n\n  return em.create(Notification, {\n    recipientUserId,\n    type: input.type,\n    // i18n-first: store keys and variables for translation at display time\n    titleKey: input.titleKey,\n    bodyKey: input.bodyKey,\n    titleVariables: input.titleVariables,\n    bodyVariables: input.bodyVariables,\n    // Fallback text (required for backward compatibility)\n    title: input.title || input.titleKey || '',\n    body: input.body,\n    icon: input.icon,\n    severity: input.severity ?? 'info',\n    actionData: actions\n      ? {\n          actions,\n          primaryActionId: input.primaryActionId,\n        }\n      : null,\n    sourceModule: input.sourceModule,\n    sourceEntityType: input.sourceEntityType,\n    sourceEntityId: input.sourceEntityId,\n    linkHref,\n    groupKey: input.groupKey,\n    expiresAt: input.expiresAt ? new Date(input.expiresAt) : null,\n    tenantId: ctx.tenantId,\n    organizationId: ctx.organizationId,\n  })\n}\n\nexport async function emitNotificationCreated(\n  eventBus: { emit: (event: string, payload: unknown) => Promise<void> },\n  notification: Notification,\n  ctx: NotificationTenantContext\n): Promise<void> {\n  await eventBus.emit(NOTIFICATION_EVENTS.CREATED, {\n    notificationId: notification.id,\n    recipientUserId: notification.recipientUserId,\n    type: notification.type,\n    title: notification.title,\n    tenantId: ctx.tenantId,\n    organizationId: ctx.organizationId,\n  })\n}\n\nexport async function emitNotificationCreatedBatch(\n  eventBus: { emit: (event: string, payload: unknown) => Promise<void> },\n  notifications: Notification[],\n  ctx: NotificationTenantContext\n): Promise<void> {\n  for (const notification of notifications) {\n    await emitNotificationCreated(eventBus, notification, ctx)\n  }\n}\n"],
-  "mappings": "AACA,SAAS,oBAAoB;AAE7B,SAAS,2BAA2B;AACpC,SAAS,4BAA4B,mCAAmC;AASjE,SAAS,wBACd,IACA,OACA,iBACA,KACc;AACd,QAAM,UAAU,4BAA4B,MAAM,OAAO;AACzD,QAAM,WAAW,2BAA2B,MAAM,QAAQ;AAE1D,SAAO,GAAG,OAAO,cAAc;AAAA,IAC7B;AAAA,IACA,MAAM,MAAM;AAAA;AAAA,IAEZ,UAAU,MAAM;AAAA,IAChB,SAAS,MAAM;AAAA,IACf,gBAAgB,MAAM;AAAA,IACtB,eAAe,MAAM;AAAA;AAAA,IAErB,OAAO,MAAM,SAAS,MAAM,YAAY;AAAA,IACxC,MAAM,MAAM;AAAA,IACZ,MAAM,MAAM;AAAA,IACZ,UAAU,MAAM,YAAY;AAAA,IAC5B,YAAY,UACR;AAAA,MACE;AAAA,MACA,iBAAiB,MAAM;AAAA,IACzB,IACA;AAAA,IACJ,cAAc,MAAM;AAAA,IACpB,kBAAkB,MAAM;AAAA,IACxB,gBAAgB,MAAM;AAAA,IACtB;AAAA,IACA,UAAU,MAAM;AAAA,IAChB,WAAW,MAAM,YAAY,IAAI,KAAK,MAAM,SAAS,IAAI;AAAA,IACzD,UAAU,IAAI;AAAA,IACd,gBAAgB,IAAI;AAAA,EACtB,CAAC;AACH;AAEA,eAAsB,wBACpB,UACA,cACA,KACe;AACf,QAAM,SAAS,KAAK,oBAAoB,SAAS;AAAA,IAC/C,gBAAgB,aAAa;AAAA,IAC7B,iBAAiB,aAAa;AAAA,IAC9B,MAAM,aAAa;AAAA,IACnB,OAAO,aAAa;AAAA,IACpB,UAAU,IAAI;AAAA,IACd,gBAAgB,IAAI;AAAA,EACtB,CAAC;AACH;AAEA,eAAsB,6BACpB,UACA,eACA,KACe;AACf,aAAW,gBAAgB,eAAe;AACxC,UAAM,wBAAwB,UAAU,cAAc,GAAG;AAAA,EAC3D;AACF;",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/core'\nimport { Notification } from '../data/entities'\nimport type { CreateNotificationInput } from '../data/validators'\nimport { NOTIFICATION_EVENTS } from './events'\nimport { assertSafeNotificationHref, sanitizeNotificationActions } from './safeHref'\n\nexport type NotificationContentInput = Omit<CreateNotificationInput, 'recipientUserId'>\n\nexport type NotificationTenantContext = {\n  tenantId: string\n  organizationId?: string | null\n}\n\nexport function buildNotificationEntity(\n  em: EntityManager,\n  input: NotificationContentInput,\n  recipientUserId: string,\n  ctx: NotificationTenantContext,\n  channels: string[] | null = null\n): Notification {\n  const actions = sanitizeNotificationActions(input.actions)\n  const linkHref = assertSafeNotificationHref(input.linkHref)\n\n  return em.create(Notification, {\n    recipientUserId,\n    type: input.type,\n    // i18n-first: store keys and variables for translation at display time\n    titleKey: input.titleKey,\n    bodyKey: input.bodyKey,\n    titleVariables: input.titleVariables,\n    bodyVariables: input.bodyVariables,\n    // Fallback text (required for backward compatibility)\n    title: input.title || input.titleKey || '',\n    body: input.body,\n    icon: input.icon,\n    severity: input.severity ?? 'info',\n    actionData: actions\n      ? {\n          actions,\n          primaryActionId: input.primaryActionId,\n        }\n      : null,\n    sourceModule: input.sourceModule,\n    sourceEntityType: input.sourceEntityType,\n    sourceEntityId: input.sourceEntityId,\n    linkHref,\n    groupKey: input.groupKey,\n    data: input.data ?? null,\n    pushOptions: input.pushOptions ?? null,\n    channels,\n    expiresAt: input.expiresAt ? new Date(input.expiresAt) : null,\n    tenantId: ctx.tenantId,\n    organizationId: ctx.organizationId,\n  })\n}\n\nexport async function emitNotificationCreated(\n  eventBus: { emit: (event: string, payload: unknown) => Promise<void> },\n  notification: Notification,\n  ctx: NotificationTenantContext\n): Promise<void> {\n  await eventBus.emit(NOTIFICATION_EVENTS.CREATED, {\n    notificationId: notification.id,\n    recipientUserId: notification.recipientUserId,\n    type: notification.type,\n    title: notification.title,\n    tenantId: ctx.tenantId,\n    organizationId: ctx.organizationId,\n  })\n}\n\nexport async function emitNotificationCreatedBatch(\n  eventBus: { emit: (event: string, payload: unknown) => Promise<void> },\n  notifications: Notification[],\n  ctx: NotificationTenantContext\n): Promise<void> {\n  for (const notification of notifications) {\n    await emitNotificationCreated(eventBus, notification, ctx)\n  }\n}\n"],
+  "mappings": "AACA,SAAS,oBAAoB;AAE7B,SAAS,2BAA2B;AACpC,SAAS,4BAA4B,mCAAmC;AASjE,SAAS,wBACd,IACA,OACA,iBACA,KACA,WAA4B,MACd;AACd,QAAM,UAAU,4BAA4B,MAAM,OAAO;AACzD,QAAM,WAAW,2BAA2B,MAAM,QAAQ;AAE1D,SAAO,GAAG,OAAO,cAAc;AAAA,IAC7B;AAAA,IACA,MAAM,MAAM;AAAA;AAAA,IAEZ,UAAU,MAAM;AAAA,IAChB,SAAS,MAAM;AAAA,IACf,gBAAgB,MAAM;AAAA,IACtB,eAAe,MAAM;AAAA;AAAA,IAErB,OAAO,MAAM,SAAS,MAAM,YAAY;AAAA,IACxC,MAAM,MAAM;AAAA,IACZ,MAAM,MAAM;AAAA,IACZ,UAAU,MAAM,YAAY;AAAA,IAC5B,YAAY,UACR;AAAA,MACE;AAAA,MACA,iBAAiB,MAAM;AAAA,IACzB,IACA;AAAA,IACJ,cAAc,MAAM;AAAA,IACpB,kBAAkB,MAAM;AAAA,IACxB,gBAAgB,MAAM;AAAA,IACtB;AAAA,IACA,UAAU,MAAM;AAAA,IAChB,MAAM,MAAM,QAAQ;AAAA,IACpB,aAAa,MAAM,eAAe;AAAA,IAClC;AAAA,IACA,WAAW,MAAM,YAAY,IAAI,KAAK,MAAM,SAAS,IAAI;AAAA,IACzD,UAAU,IAAI;AAAA,IACd,gBAAgB,IAAI;AAAA,EACtB,CAAC;AACH;AAEA,eAAsB,wBACpB,UACA,cACA,KACe;AACf,QAAM,SAAS,KAAK,oBAAoB,SAAS;AAAA,IAC/C,gBAAgB,aAAa;AAAA,IAC7B,iBAAiB,aAAa;AAAA,IAC9B,MAAM,aAAa;AAAA,IACnB,OAAO,aAAa;AAAA,IACpB,UAAU,IAAI;AAAA,IACd,gBAAgB,IAAI;AAAA,EACtB,CAAC;AACH;AAEA,eAAsB,6BACpB,UACA,eACA,KACe;AACf,aAAW,gBAAgB,eAAe;AACxC,UAAM,wBAAwB,UAAU,cAAc,GAAG;AAAA,EAC3D;AACF;",
   "names": []
 }

package/dist/modules/notifications/lib/notificationMapper.js

@@ -31,6 +31,8 @@ function toNotificationDto(notification) {
     sourceEntityType: notification.sourceEntityType,
     sourceEntityId: notification.sourceEntityId,
     linkHref: notification.linkHref,
+    data: notification.data ?? null,
+    channels: notification.channels ?? null,
     createdAt: createdAt.toISOString(),
     readAt: notification.readAt?.toISOString() ?? null,
     actionTaken: notification.actionTaken

package/dist/modules/notifications/lib/notificationMapper.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/notifications/lib/notificationMapper.ts"],
-  "sourcesContent": ["import type { NotificationDto } from '@open-mercato/shared/modules/notifications/types'\nimport { Notification } from '../data/entities'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('notifications').child({ component: 'mapper' })\n\nexport function toNotificationDto(notification: Notification): NotificationDto {\n  const createdAt = notification.createdAt instanceof Date\n    ? notification.createdAt\n    : (() => {\n      if (process.env.NODE_ENV !== 'test') {\n        logger.warn('Invalid createdAt on notification entity, falling back to current time', { id: notification.id, createdAt: notification.createdAt })\n      }\n      return new Date()\n    })()\n  return {\n    id: notification.id,\n    type: notification.type,\n    title: notification.title,\n    body: notification.body,\n    titleKey: notification.titleKey,\n    bodyKey: notification.bodyKey,\n    titleVariables: notification.titleVariables,\n    bodyVariables: notification.bodyVariables,\n    icon: notification.icon,\n    severity: notification.severity,\n    status: notification.status,\n    actions: notification.actionData?.actions?.map((action) => ({\n      id: action.id,\n      label: action.label,\n      labelKey: action.labelKey,\n      variant: action.variant,\n      icon: action.icon,\n    })) ?? [],\n    primaryActionId: notification.actionData?.primaryActionId,\n    sourceModule: notification.sourceModule,\n    sourceEntityType: notification.sourceEntityType,\n    sourceEntityId: notification.sourceEntityId,\n    linkHref: notification.linkHref,\n    createdAt: createdAt.toISOString(),\n    readAt: notification.readAt?.toISOString() ?? null,\n    actionTaken: notification.actionTaken,\n  }\n}\n"],
-  "mappings": "AAEA,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,eAAe,EAAE,MAAM,EAAE,WAAW,SAAS,CAAC;AAEnE,SAAS,kBAAkB,cAA6C;AAC7E,QAAM,YAAY,aAAa,qBAAqB,OAChD,aAAa,aACZ,MAAM;AACP,QAAI,QAAQ,IAAI,aAAa,QAAQ;AACnC,aAAO,KAAK,0EAA0E,EAAE,IAAI,aAAa,IAAI,WAAW,aAAa,UAAU,CAAC;AAAA,IAClJ;AACA,WAAO,oBAAI,KAAK;AAAA,EAClB,GAAG;AACL,SAAO;AAAA,IACL,IAAI,aAAa;AAAA,IACjB,MAAM,aAAa;AAAA,IACnB,OAAO,aAAa;AAAA,IACpB,MAAM,aAAa;AAAA,IACnB,UAAU,aAAa;AAAA,IACvB,SAAS,aAAa;AAAA,IACtB,gBAAgB,aAAa;AAAA,IAC7B,eAAe,aAAa;AAAA,IAC5B,MAAM,aAAa;AAAA,IACnB,UAAU,aAAa;AAAA,IACvB,QAAQ,aAAa;AAAA,IACrB,SAAS,aAAa,YAAY,SAAS,IAAI,CAAC,YAAY;AAAA,MAC1D,IAAI,OAAO;AAAA,MACX,OAAO,OAAO;AAAA,MACd,UAAU,OAAO;AAAA,MACjB,SAAS,OAAO;AAAA,MAChB,MAAM,OAAO;AAAA,IACf,EAAE,KAAK,CAAC;AAAA,IACR,iBAAiB,aAAa,YAAY;AAAA,IAC1C,cAAc,aAAa;AAAA,IAC3B,kBAAkB,aAAa;AAAA,IAC/B,gBAAgB,aAAa;AAAA,IAC7B,UAAU,aAAa;AAAA,IACvB,WAAW,UAAU,YAAY;AAAA,IACjC,QAAQ,aAAa,QAAQ,YAAY,KAAK;AAAA,IAC9C,aAAa,aAAa;AAAA,EAC5B;AACF;",
+  "sourcesContent": ["import type { NotificationDto } from '@open-mercato/shared/modules/notifications/types'\nimport { Notification } from '../data/entities'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('notifications').child({ component: 'mapper' })\n\nexport function toNotificationDto(notification: Notification): NotificationDto {\n  const createdAt = notification.createdAt instanceof Date\n    ? notification.createdAt\n    : (() => {\n      if (process.env.NODE_ENV !== 'test') {\n        logger.warn('Invalid createdAt on notification entity, falling back to current time', { id: notification.id, createdAt: notification.createdAt })\n      }\n      return new Date()\n    })()\n  return {\n    id: notification.id,\n    type: notification.type,\n    title: notification.title,\n    body: notification.body,\n    titleKey: notification.titleKey,\n    bodyKey: notification.bodyKey,\n    titleVariables: notification.titleVariables,\n    bodyVariables: notification.bodyVariables,\n    icon: notification.icon,\n    severity: notification.severity,\n    status: notification.status,\n    actions: notification.actionData?.actions?.map((action) => ({\n      id: action.id,\n      label: action.label,\n      labelKey: action.labelKey,\n      variant: action.variant,\n      icon: action.icon,\n    })) ?? [],\n    primaryActionId: notification.actionData?.primaryActionId,\n    sourceModule: notification.sourceModule,\n    sourceEntityType: notification.sourceEntityType,\n    sourceEntityId: notification.sourceEntityId,\n    linkHref: notification.linkHref,\n    data: notification.data ?? null,\n    channels: notification.channels ?? null,\n    createdAt: createdAt.toISOString(),\n    readAt: notification.readAt?.toISOString() ?? null,\n    actionTaken: notification.actionTaken,\n  }\n}\n"],
+  "mappings": "AAEA,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,eAAe,EAAE,MAAM,EAAE,WAAW,SAAS,CAAC;AAEnE,SAAS,kBAAkB,cAA6C;AAC7E,QAAM,YAAY,aAAa,qBAAqB,OAChD,aAAa,aACZ,MAAM;AACP,QAAI,QAAQ,IAAI,aAAa,QAAQ;AACnC,aAAO,KAAK,0EAA0E,EAAE,IAAI,aAAa,IAAI,WAAW,aAAa,UAAU,CAAC;AAAA,IAClJ;AACA,WAAO,oBAAI,KAAK;AAAA,EAClB,GAAG;AACL,SAAO;AAAA,IACL,IAAI,aAAa;AAAA,IACjB,MAAM,aAAa;AAAA,IACnB,OAAO,aAAa;AAAA,IACpB,MAAM,aAAa;AAAA,IACnB,UAAU,aAAa;AAAA,IACvB,SAAS,aAAa;AAAA,IACtB,gBAAgB,aAAa;AAAA,IAC7B,eAAe,aAAa;AAAA,IAC5B,MAAM,aAAa;AAAA,IACnB,UAAU,aAAa;AAAA,IACvB,QAAQ,aAAa;AAAA,IACrB,SAAS,aAAa,YAAY,SAAS,IAAI,CAAC,YAAY;AAAA,MAC1D,IAAI,OAAO;AAAA,MACX,OAAO,OAAO;AAAA,MACd,UAAU,OAAO;AAAA,MACjB,SAAS,OAAO;AAAA,MAChB,MAAM,OAAO;AAAA,IACf,EAAE,KAAK,CAAC;AAAA,IACR,iBAAiB,aAAa,YAAY;AAAA,IAC1C,cAAc,aAAa;AAAA,IAC3B,kBAAkB,aAAa;AAAA,IAC/B,gBAAgB,aAAa;AAAA,IAC7B,UAAU,aAAa;AAAA,IACvB,MAAM,aAAa,QAAQ;AAAA,IAC3B,UAAU,aAAa,YAAY;AAAA,IACnC,WAAW,UAAU,YAAY;AAAA,IACjC,QAAQ,aAAa,QAAQ,YAAY,KAAK;AAAA,IAC9C,aAAa,aAAa;AAAA,EAC5B;AACF;",
   "names": []
 }

package/dist/modules/notifications/lib/notificationPreferenceService.js

@@ -0,0 +1,83 @@
+import { withAtomicFlush } from "@open-mercato/shared/lib/commands/flush";
+import { NotificationPreference } from "../data/entities.js";
+import { getNotificationType } from "./notification-type-registry.js";
+import { getNotificationTypeOverrides } from "./typeOverrides.js";
+function createNotificationPreferenceService(deps) {
+  const { em: rootEm } = deps;
+  return {
+    async isChannelEnabled(scope, typeId, channel) {
+      const row = await rootEm.findOne(NotificationPreference, {
+        tenantId: scope.tenantId,
+        userId: scope.userId,
+        notificationTypeId: typeId,
+        channel
+      });
+      return row ? row.enabled : true;
+    },
+    async listForUser(scope) {
+      return rootEm.find(
+        NotificationPreference,
+        { tenantId: scope.tenantId, userId: scope.userId },
+        { orderBy: { notificationTypeId: "asc", channel: "asc" } }
+      );
+    },
+    async setPreferences(scope, items) {
+      const storedOverrides = items.length ? await getNotificationTypeOverrides(rootEm.fork(), scope.tenantId, items.map((item) => item.typeId)) : /* @__PURE__ */ new Map();
+      const optOutFiltered = items.filter((item) => {
+        if (item.enabled === true) return true;
+        const nonOptOut = storedOverrides.get(item.typeId)?.nonOptOut ?? getNotificationType(item.typeId)?.nonOptOut;
+        return nonOptOut !== true;
+      });
+      const writable = optOutFiltered.filter((item) => {
+        const eligible = storedOverrides.get(item.typeId)?.channels ?? getNotificationType(item.typeId)?.channels;
+        return !eligible || eligible.includes(item.channel);
+      });
+      if (writable.length === 0) return 0;
+      const em = rootEm.fork();
+      const existing = await em.find(NotificationPreference, {
+        tenantId: scope.tenantId,
+        userId: scope.userId
+      });
+      const byKey = new Map(
+        existing.map((row) => [`${row.notificationTypeId}::${row.channel}`, row])
+      );
+      let changed = 0;
+      await withAtomicFlush(
+        em,
+        [
+          () => {
+            for (const item of writable) {
+              const row = byKey.get(`${item.typeId}::${item.channel}`);
+              if (row) {
+                if (row.enabled === item.enabled) continue;
+                row.enabled = item.enabled;
+                changed += 1;
+                continue;
+              }
+              const next = em.create(NotificationPreference, {
+                tenantId: scope.tenantId,
+                userId: scope.userId,
+                notificationTypeId: item.typeId,
+                channel: item.channel,
+                enabled: item.enabled
+              });
+              em.persist(next);
+              changed += 1;
+            }
+          }
+        ],
+        { transaction: true, label: "notifications.setPreferences" }
+      );
+      return changed;
+    }
+  };
+}
+function resolveNotificationPreferenceService(container) {
+  const em = container.resolve("em");
+  return createNotificationPreferenceService({ em });
+}
+export {
+  createNotificationPreferenceService,
+  resolveNotificationPreferenceService
+};
+//# sourceMappingURL=notificationPreferenceService.js.map

package/dist/modules/notifications/lib/notificationPreferenceService.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/notifications/lib/notificationPreferenceService.ts"],
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'\nimport { NotificationPreference } from '../data/entities'\nimport { getNotificationType } from './notification-type-registry'\nimport { getNotificationTypeOverrides } from './typeOverrides'\n\n/**\n * Tenant + user scope for preference operations. Tenant scoping is mandatory,\n * so it is part of every call (the spec's bare `userId` signatures are widened\n * here to stay tenant-safe).\n */\nexport interface NotificationPreferenceScope {\n  tenantId: string\n  userId: string\n}\n\nexport interface NotificationPreferenceInput {\n  typeId: string\n  channel: string\n  enabled: boolean\n}\n\nexport interface NotificationPreferenceService {\n  /**\n   * Whether a channel is enabled for a user + type. Defaults to `true` when no\n   * row exists (lazy-seed, default-on) \u2014 does not write.\n   */\n  isChannelEnabled(scope: NotificationPreferenceScope, typeId: string, channel: string): Promise<boolean>\n  /**\n   * Bulk find-or-upsert of preference rows for the scoped user. Returns the number of rows actually\n   * changed (created, or whose `enabled` flipped) so callers can skip emitting events on no-op writes.\n   */\n  setPreferences(scope: NotificationPreferenceScope, items: NotificationPreferenceInput[]): Promise<number>\n  /** All stored preference rows for the scoped user (absence \u21D2 enabled). */\n  listForUser(scope: NotificationPreferenceScope): Promise<NotificationPreference[]>\n}\n\nexport interface NotificationPreferenceServiceDeps {\n  em: EntityManager\n}\n\nexport function createNotificationPreferenceService(\n  deps: NotificationPreferenceServiceDeps,\n): NotificationPreferenceService {\n  const { em: rootEm } = deps\n\n  return {\n    async isChannelEnabled(scope, typeId, channel) {\n      const row = await rootEm.findOne(NotificationPreference, {\n        tenantId: scope.tenantId,\n        userId: scope.userId,\n        notificationTypeId: typeId,\n        channel,\n      })\n      return row ? row.enabled : true\n    },\n\n    async listForUser(scope) {\n      return rootEm.find(\n        NotificationPreference,\n        { tenantId: scope.tenantId, userId: scope.userId },\n        { orderBy: { notificationTypeId: 'asc', channel: 'asc' } },\n      )\n    },\n\n    async setPreferences(scope, items) {\n      const storedOverrides = items.length\n        ? await getNotificationTypeOverrides(rootEm.fork(), scope.tenantId, items.map((item) => item.typeId))\n        : new Map()\n      // Effectively-nonOptOut types (operator override ?? code flag) ignore stored preferences at\n      // delivery time; refuse to persist an opt-out row for them so the stored state can never\n      // contradict enforcement. An `enabled: true` write matches the forced-on state and is\n      // allowed through (a preferences UI can still confirm it).\n      const optOutFiltered = items.filter((item) => {\n        if (item.enabled === true) return true\n        const nonOptOut =\n          storedOverrides.get(item.typeId)?.nonOptOut ?? getNotificationType(item.typeId)?.nonOptOut\n        return nonOptOut !== true\n      })\n      // Channels outside the type's effective eligibility (operator override on\n      // `notification_types.channels`, else the code-declared `type.channels`) are locked:\n      // delivery rejects them before preferences and the UI renders the cell off, so a stored\n      // row would only lie. Drop those writes server-side (the UI lock is not a guarantee).\n      const writable = optOutFiltered.filter((item) => {\n        const eligible = storedOverrides.get(item.typeId)?.channels ?? getNotificationType(item.typeId)?.channels\n        return !eligible || eligible.includes(item.channel)\n      })\n      if (writable.length === 0) return 0\n      const em = rootEm.fork()\n      const existing = await em.find(NotificationPreference, {\n        tenantId: scope.tenantId,\n        userId: scope.userId,\n      })\n      const byKey = new Map(\n        existing.map((row) => [`${row.notificationTypeId}::${row.channel}`, row]),\n      )\n\n      let changed = 0\n      await withAtomicFlush(\n        em,\n        [\n          () => {\n            for (const item of writable) {\n              const row = byKey.get(`${item.typeId}::${item.channel}`)\n              if (row) {\n                if (row.enabled === item.enabled) continue\n                row.enabled = item.enabled\n                changed += 1\n                continue\n              }\n              const next = em.create(NotificationPreference, {\n                tenantId: scope.tenantId,\n                userId: scope.userId,\n                notificationTypeId: item.typeId,\n                channel: item.channel,\n                enabled: item.enabled,\n              })\n              em.persist(next)\n              changed += 1\n            }\n          },\n        ],\n        { transaction: true, label: 'notifications.setPreferences' },\n      )\n      return changed\n    },\n  }\n}\n\nexport function resolveNotificationPreferenceService(container: {\n  resolve: (name: string) => unknown\n}): NotificationPreferenceService {\n  // Construct from the request-scoped `em`, mirroring `resolveNotificationService`. (The request\n  // container does not expose the module's scoped service bindings, so resolving `em` directly is the\n  // module convention \u2014 see notificationService.ts.)\n  const em = container.resolve('em') as EntityManager\n  return createNotificationPreferenceService({ em })\n}\n"],
+  "mappings": "AACA,SAAS,uBAAuB;AAChC,SAAS,8BAA8B;AACvC,SAAS,2BAA2B;AACpC,SAAS,oCAAoC;AAqCtC,SAAS,oCACd,MAC+B;AAC/B,QAAM,EAAE,IAAI,OAAO,IAAI;AAEvB,SAAO;AAAA,IACL,MAAM,iBAAiB,OAAO,QAAQ,SAAS;AAC7C,YAAM,MAAM,MAAM,OAAO,QAAQ,wBAAwB;AAAA,QACvD,UAAU,MAAM;AAAA,QAChB,QAAQ,MAAM;AAAA,QACd,oBAAoB;AAAA,QACpB;AAAA,MACF,CAAC;AACD,aAAO,MAAM,IAAI,UAAU;AAAA,IAC7B;AAAA,IAEA,MAAM,YAAY,OAAO;AACvB,aAAO,OAAO;AAAA,QACZ;AAAA,QACA,EAAE,UAAU,MAAM,UAAU,QAAQ,MAAM,OAAO;AAAA,QACjD,EAAE,SAAS,EAAE,oBAAoB,OAAO,SAAS,MAAM,EAAE;AAAA,MAC3D;AAAA,IACF;AAAA,IAEA,MAAM,eAAe,OAAO,OAAO;AACjC,YAAM,kBAAkB,MAAM,SAC1B,MAAM,6BAA6B,OAAO,KAAK,GAAG,MAAM,UAAU,MAAM,IAAI,CAAC,SAAS,KAAK,MAAM,CAAC,IAClG,oBAAI,IAAI;AAKZ,YAAM,iBAAiB,MAAM,OAAO,CAAC,SAAS;AAC5C,YAAI,KAAK,YAAY,KAAM,QAAO;AAClC,cAAM,YACJ,gBAAgB,IAAI,KAAK,MAAM,GAAG,aAAa,oBAAoB,KAAK,MAAM,GAAG;AACnF,eAAO,cAAc;AAAA,MACvB,CAAC;AAKD,YAAM,WAAW,eAAe,OAAO,CAAC,SAAS;AAC/C,cAAM,WAAW,gBAAgB,IAAI,KAAK,MAAM,GAAG,YAAY,oBAAoB,KAAK,MAAM,GAAG;AACjG,eAAO,CAAC,YAAY,SAAS,SAAS,KAAK,OAAO;AAAA,MACpD,CAAC;AACD,UAAI,SAAS,WAAW,EAAG,QAAO;AAClC,YAAM,KAAK,OAAO,KAAK;AACvB,YAAM,WAAW,MAAM,GAAG,KAAK,wBAAwB;AAAA,QACrD,UAAU,MAAM;AAAA,QAChB,QAAQ,MAAM;AAAA,MAChB,CAAC;AACD,YAAM,QAAQ,IAAI;AAAA,QAChB,SAAS,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,kBAAkB,KAAK,IAAI,OAAO,IAAI,GAAG,CAAC;AAAA,MAC1E;AAEA,UAAI,UAAU;AACd,YAAM;AAAA,QACJ;AAAA,QACA;AAAA,UACE,MAAM;AACJ,uBAAW,QAAQ,UAAU;AAC3B,oBAAM,MAAM,MAAM,IAAI,GAAG,KAAK,MAAM,KAAK,KAAK,OAAO,EAAE;AACvD,kBAAI,KAAK;AACP,oBAAI,IAAI,YAAY,KAAK,QAAS;AAClC,oBAAI,UAAU,KAAK;AACnB,2BAAW;AACX;AAAA,cACF;AACA,oBAAM,OAAO,GAAG,OAAO,wBAAwB;AAAA,gBAC7C,UAAU,MAAM;AAAA,gBAChB,QAAQ,MAAM;AAAA,gBACd,oBAAoB,KAAK;AAAA,gBACzB,SAAS,KAAK;AAAA,gBACd,SAAS,KAAK;AAAA,cAChB,CAAC;AACD,iBAAG,QAAQ,IAAI;AACf,yBAAW;AAAA,YACb;AAAA,UACF;AAAA,QACF;AAAA,QACA,EAAE,aAAa,MAAM,OAAO,+BAA+B;AAAA,MAC7D;AACA,aAAO;AAAA,IACT;AAAA,EACF;AACF;AAEO,SAAS,qCAAqC,WAEnB;AAIhC,QAAM,KAAK,UAAU,QAAQ,IAAI;AACjC,SAAO,oCAAoC,EAAE,GAAG,CAAC;AACnD;",
+  "names": []
+}

package/dist/modules/notifications/lib/notificationService.js

@@ -18,6 +18,14 @@ import {
 } from "./notificationRecipients.js";
 import { assertSafeNotificationHref, sanitizeNotificationActions } from "./safeHref.js";
 import { createLogger } from "@open-mercato/shared/lib/logger";
+import { getNotificationType } from "./notification-type-registry.js";
+import { getNotificationTypeOverrides } from "./typeOverrides.js";
+import { getNotificationDeliveryStrategies } from "./deliveryStrategies.js";
+import { resolveEffectiveChannels } from "./shouldDeliver.js";
+import {
+  createNotificationPreferenceService
+} from "./notificationPreferenceService.js";
+import { inAppVisibleFilter, inAppVisibleSql, isInAppVisible } from "./notificationVisibility.js";
 const logger = createLogger("notifications").child({ component: "service" });
 function debug(message, ...details) {
   logger.debug(message, details.length ? { details } : void 0);
@@ -55,7 +63,7 @@ async function assertNotificationRecipientsInScope(em, recipientUserIds, ctx) {
     throw new CrudHttpError(404, { error: "Notification recipient not found" });
   }
 }
-function applyNotificationContent(notification, input, recipientUserId, ctx) {
+function applyNotificationContent(notification, input, recipientUserId, ctx, channels) {
   const actions = sanitizeNotificationActions(input.actions);
   const linkHref = assertSafeNotificationHref(input.linkHref);
   notification.recipientUserId = recipientUserId;
@@ -77,6 +85,7 @@ function applyNotificationContent(notification, input, recipientUserId, ctx) {
   notification.sourceEntityId = input.sourceEntityId;
   notification.linkHref = linkHref;
   notification.groupKey = input.groupKey;
+  notification.channels = channels;
   notification.expiresAt = input.expiresAt ? new Date(input.expiresAt) : null;
   notification.tenantId = ctx.tenantId;
   notification.organizationId = normalizeOrgScope(ctx.organizationId);
@@ -108,14 +117,17 @@ async function findScopedNotificationOrThrow(em, notificationId, ctx) {
   }
   return notification;
 }
-async function emitNotificationSseEvents(eventBus, notifications, ctx, recipientUserIds) {
+async function emitNotificationSseEvents(eventBus, notifications, ctx) {
+  const visible = notifications.filter((notification) => isInAppVisible(notification.channels));
+  if (visible.length === 0) return;
+  const visibleRecipientUserIds = Array.from(new Set(visible.map((n) => n.recipientUserId)));
   await eventBus.emit(NOTIFICATION_SSE_EVENTS.BATCH_CREATED, {
     tenantId: ctx.tenantId,
     organizationId: normalizeOrgScope(ctx.organizationId),
-    recipientUserIds,
-    count: notifications.length
+    recipientUserIds: visibleRecipientUserIds,
+    count: visible.length
   });
-  for (const notification of notifications) {
+  for (const notification of visible) {
     await eventBus.emit(NOTIFICATION_SSE_EVENTS.CREATED, {
       tenantId: notification.tenantId,
       organizationId: notification.organizationId ?? null,
@@ -124,7 +136,7 @@ async function emitNotificationSseEvents(eventBus, notifications, ctx, recipient
     });
   }
 }
-async function createOrRefreshNotification(em, input, recipientUserId, ctx) {
+async function createOrRefreshNotification(em, input, recipientUserId, ctx, channels) {
   if (input.groupKey && input.groupKey.trim().length > 0) {
     const orgScope = normalizeOrgScope(ctx.organizationId) ?? "global";
     const lockKey = `notifications:${ctx.tenantId}:${orgScope}:${recipientUserId}:${input.type}:${input.groupKey}`;
@@ -144,50 +156,82 @@ async function createOrRefreshNotification(em, input, recipientUserId, ctx) {
       orderBy: { createdAt: "desc" }
     });
     if (existing) {
-      applyNotificationContent(existing, input, recipientUserId, ctx);
+      applyNotificationContent(existing, input, recipientUserId, ctx, channels);
       return existing;
     }
   }
-  return buildNotificationEntity(em, input, recipientUserId, ctx);
+  return buildNotificationEntity(em, input, recipientUserId, ctx, channels);
 }
 function createNotificationService(deps) {
   const { em: rootEm, eventBus, commandBus, container } = deps;
+  const resolveChannelsFor = async (content, recipientUserId, scopeCtx, preferences = createNotificationPreferenceService({ em: rootEm.fork() }), typeOverrides) => {
+    const registeredChannels = getNotificationDeliveryStrategies().map((strategy) => strategy.id);
+    if (registeredChannels.length === 0) return null;
+    const targetChannels = content.channels && content.channels.length > 0 ? content.channels : null;
+    const overrides = typeOverrides === void 0 ? (await getNotificationTypeOverrides(rootEm.fork(), scopeCtx.tenantId, [content.type])).get(content.type) ?? null : typeOverrides;
+    return resolveEffectiveChannels({
+      typeId: content.type,
+      type: getNotificationType(content.type),
+      scope: { tenantId: scopeCtx.tenantId, userId: recipientUserId },
+      targetChannels,
+      registeredChannels,
+      preferences,
+      channelsOverride: overrides?.channels ?? null,
+      nonOptOutOverride: overrides?.nonOptOut ?? null
+    });
+  };
+  const resolveChannelsForRecipients = async (content, recipientUserIds, scopeCtx) => {
+    const preferences = createNotificationPreferenceService({ em: rootEm.fork() });
+    const typeOverrides = (await getNotificationTypeOverrides(rootEm.fork(), scopeCtx.tenantId, [content.type])).get(content.type) ?? null;
+    const resolved = [];
+    for (const recipientUserId of recipientUserIds) {
+      resolved.push({
+        recipientUserId,
+        channels: await resolveChannelsFor(content, recipientUserId, scopeCtx, preferences, typeOverrides)
+      });
+    }
+    return resolved;
+  };
   return {
     async create(input, ctx) {
       const { recipientUserId, ...content } = input;
+      const channels = await resolveChannelsFor(content, recipientUserId, ctx);
       const writeEm = rootEm.fork();
       const notification = await writeEm.transactional(async (tx) => {
         await assertNotificationRecipientsInScope(tx, [recipientUserId], ctx);
-        const entity = await createOrRefreshNotification(tx, content, recipientUserId, ctx);
+        const entity = await createOrRefreshNotification(tx, content, recipientUserId, ctx, channels);
         await tx.flush();
         return entity;
       });
       await invalidateNotificationCache(container, ctx, "created");
       await emitNotificationCreated(eventBus, notification, ctx);
-      await eventBus.emit(NOTIFICATION_SSE_EVENTS.CREATED, {
-        tenantId: notification.tenantId,
-        organizationId: notification.organizationId ?? null,
-        recipientUserId: notification.recipientUserId,
-        notification: toNotificationDto(notification)
-      });
+      if (isInAppVisible(notification.channels)) {
+        await eventBus.emit(NOTIFICATION_SSE_EVENTS.CREATED, {
+          tenantId: notification.tenantId,
+          organizationId: notification.organizationId ?? null,
+          recipientUserId: notification.recipientUserId,
+          notification: toNotificationDto(notification)
+        });
+      }
       return notification;
     },
     async createBatch(input, ctx) {
       const recipientUserIds = Array.from(new Set(input.recipientUserIds));
       const { recipientUserIds: _recipientUserIds, ...content } = input;
       const notifications = [];
+      const resolved = await resolveChannelsForRecipients(content, recipientUserIds, ctx);
       const writeEm = rootEm.fork();
       await writeEm.transactional(async (tx) => {
         await assertNotificationRecipientsInScope(tx, recipientUserIds, ctx);
-        for (const recipientUserId of recipientUserIds) {
-          const notification = await createOrRefreshNotification(tx, content, recipientUserId, ctx);
+        for (const { recipientUserId, channels } of resolved) {
+          const notification = await createOrRefreshNotification(tx, content, recipientUserId, ctx, channels);
           notifications.push(notification);
         }
         await tx.flush();
       });
       await invalidateNotificationCache(container, ctx, "created");
       await emitNotificationCreatedBatch(eventBus, notifications, ctx);
-      await emitNotificationSseEvents(eventBus, notifications, ctx, recipientUserIds);
+      await emitNotificationSseEvents(eventBus, notifications, ctx);
       return notifications;
     },
     async createForRole(input, ctx) {
@@ -200,17 +244,18 @@ function createNotificationService(deps) {
       const { roleId: _roleId, ...content } = input;
       const notifications = [];
       const uniqueRecipientUserIds = Array.from(new Set(recipientUserIds));
+      const resolved = await resolveChannelsForRecipients(content, uniqueRecipientUserIds, ctx);
       const writeEm = rootEm.fork();
       await writeEm.transactional(async (tx) => {
-        for (const recipientUserId of uniqueRecipientUserIds) {
-          const notification = await createOrRefreshNotification(tx, content, recipientUserId, ctx);
+        for (const { recipientUserId, channels } of resolved) {
+          const notification = await createOrRefreshNotification(tx, content, recipientUserId, ctx, channels);
           notifications.push(notification);
         }
         await tx.flush();
       });
       await invalidateNotificationCache(container, ctx, "created");
       await emitNotificationCreatedBatch(eventBus, notifications, ctx);
-      await emitNotificationSseEvents(eventBus, notifications, ctx, uniqueRecipientUserIds);
+      await emitNotificationSseEvents(eventBus, notifications, ctx);
       return notifications;
     },
     async createForFeature(input, ctx) {
@@ -289,17 +334,18 @@ function createNotificationService(deps) {
       } = input;
       const notifications = [];
       const uniqueRecipientUserIds = Array.from(new Set(authorizedRecipientUserIds));
+      const resolved = await resolveChannelsForRecipients(content, uniqueRecipientUserIds, ctx);
       const writeEm = rootEm.fork();
       await writeEm.transactional(async (tx) => {
-        for (const recipientUserId of uniqueRecipientUserIds) {
-          const notification = await createOrRefreshNotification(tx, content, recipientUserId, ctx);
+        for (const { recipientUserId, channels } of resolved) {
+          const notification = await createOrRefreshNotification(tx, content, recipientUserId, ctx, channels);
           notifications.push(notification);
         }
         await tx.flush();
       });
       await invalidateNotificationCache(container, ctx, "created");
       await emitNotificationCreatedBatch(eventBus, notifications, ctx);
-      await emitNotificationSseEvents(eventBus, notifications, ctx, uniqueRecipientUserIds);
+      await emitNotificationSseEvents(eventBus, notifications, ctx);
       return notifications;
     },
     async markAsRead(notificationId, ctx) {
@@ -322,7 +368,7 @@ function createNotificationService(deps) {
       const em = rootEm.fork();
       const db = getDb(em);
       const applyScope = (q) => {
-        let chain = q.where("recipient_user_id", "=", ctx.userId).where("tenant_id", "=", ctx.tenantId).where("status", "=", "unread");
+        let chain = q.where("recipient_user_id", "=", ctx.userId).where("tenant_id", "=", ctx.tenantId).where("status", "=", "unread").where(inAppVisibleSql());
         if (ctx.organizationId) {
           chain = chain.where("organization_id", "=", ctx.organizationId);
         }
@@ -496,7 +542,10 @@ function createNotificationService(deps) {
         recipientUserId: ctx.userId,
         tenantId: ctx.tenantId,
         status: "unread",
-        ...buildNotificationReadScopeWhere(ctx)
+        $and: [
+          buildNotificationReadScopeWhere(ctx),
+          inAppVisibleFilter()
+        ]
       });
     },
     async getPollData(ctx, since) {
@@ -504,7 +553,10 @@ function createNotificationService(deps) {
       const filters = {
         recipientUserId: ctx.userId,
         tenantId: ctx.tenantId,
-        ...buildNotificationReadScopeWhere(ctx)
+        $and: [
+          buildNotificationReadScopeWhere(ctx),
+          inAppVisibleFilter()
+        ]
       };
       if (since) {
         filters.createdAt = { $gt: new Date(since) };
@@ -518,7 +570,10 @@ function createNotificationService(deps) {
           recipientUserId: ctx.userId,
           tenantId: ctx.tenantId,
           status: "unread",
-          ...buildNotificationReadScopeWhere(ctx)
+          $and: [
+            buildNotificationReadScopeWhere(ctx),
+            inAppVisibleFilter()
+          ]
         })
       ]);
       const recent = notifications.map(toNotificationDto);