@open-mercato/core 0.9.0 → 0.9.1-develop.7459.1.99e3accd30

package/dist/modules/customers/migrations/Migration20260928175058_customers.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/customers/migrations/Migration20260928175058_customers.ts"],
+  "sourcesContent": ["import { Migration } from '@mikro-orm/migrations';\n\nexport class Migration20260928175058_customers extends Migration {\n\n  override name = 'Migration20260928175058_customers';\n\n  override up(): void | Promise<void> {\n    this.addSql(`alter table \"customer_dictionary_entries\" add \"activity_type_behavior\" jsonb null;`);\n  }\n\n  override down(): void | Promise<void> {\n    this.addSql(`alter table \"customer_dictionary_entries\" drop column \"activity_type_behavior\";`);\n  }\n\n}\n"],
+  "mappings": "AAAA,SAAS,iBAAiB;AAEnB,MAAM,0CAA0C,UAAU;AAAA,EAA1D;AAAA;AAEL,SAAS,OAAO;AAAA;AAAA,EAEP,KAA2B;AAClC,SAAK,OAAO,oFAAoF;AAAA,EAClG;AAAA,EAES,OAA6B;AACpC,SAAK,OAAO,iFAAiF;AAAA,EAC/F;AAEF;",
+  "names": []
+}

package/dist/modules/customers/migrations/Migration20260930110235_customers.js

@@ -0,0 +1,17 @@
+import { Migration } from "@mikro-orm/migrations";
+class Migration20260930110235_customers extends Migration {
+  constructor() {
+    super(...arguments);
+    this.name = "Migration20260930110235_customers";
+  }
+  up() {
+    this.addSql(`alter table "customer_interactions" add "timezone" text null;`);
+  }
+  down() {
+    this.addSql(`alter table "customer_interactions" drop column "timezone";`);
+  }
+}
+export {
+  Migration20260930110235_customers
+};
+//# sourceMappingURL=Migration20260930110235_customers.js.map

package/dist/modules/customers/migrations/Migration20260930110235_customers.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/customers/migrations/Migration20260930110235_customers.ts"],
+  "sourcesContent": ["import { Migration } from '@mikro-orm/migrations';\n\nexport class Migration20260930110235_customers extends Migration {\n\n  override name = 'Migration20260930110235_customers';\n\n  override up(): void | Promise<void> {\n    this.addSql(`alter table \"customer_interactions\" add \"timezone\" text null;`);\n  }\n\n  override down(): void | Promise<void> {\n    this.addSql(`alter table \"customer_interactions\" drop column \"timezone\";`);\n  }\n\n}\n"],
+  "mappings": "AAAA,SAAS,iBAAiB;AAEnB,MAAM,0CAA0C,UAAU;AAAA,EAA1D;AAAA;AAEL,SAAS,OAAO;AAAA;AAAA,EAEP,KAA2B;AAClC,SAAK,OAAO,+DAA+D;AAAA,EAC7E;AAAA,EAES,OAA6B;AACpC,SAAK,OAAO,6DAA6D;AAAA,EAC3E;AAEF;",
+  "names": []
+}

package/dist/modules/dictionaries/components/DictionaryTable.js

@@ -72,59 +72,68 @@ function DictionaryTable({
     onEdit(entry);
   } : void 0;
   return /* @__PURE__ */ jsx(
-    DataTable,
+    "div",
     {
-      title: translations.title,
-      titleHeadingLevel: 2,
-      actions,
-      columns,
-      data: paginated,
-      embedded: true,
-      sortable: true,
-      sorting,
-      onSortingChange: setSorting,
-      searchValue: search,
-      onSearchChange: (value) => {
-        setSearch(value);
-        setPage(1);
-      },
-      searchPlaceholder: translations.searchPlaceholder,
-      isLoading: loading,
-      emptyState: /* @__PURE__ */ jsx("p", { className: "py-10 text-center text-sm text-muted-foreground", children: translations.emptyLabel }),
-      pagination: {
-        page,
-        pageSize,
-        total: filtered.length,
-        totalPages,
-        onPageChange: setPage
-      },
-      refreshButton: onRefresh ? {
-        label: translations.refreshLabel,
-        onRefresh,
-        isRefreshing: loading
-      } : void 0,
-      onRowClick: handleRowClick,
-      rowActions: canManage ? (entry) => {
-        if (!entry) return null;
-        if (entry.isInherited) return null;
-        const items = [];
-        if (onEdit) {
-          items.push({
-            id: "edit",
-            label: translations.editLabel,
-            onSelect: () => onEdit(entry)
-          });
+      role: "region",
+      "aria-label": translations.title,
+      tabIndex: 0,
+      className: "w-full min-w-0 max-w-full overflow-x-auto focus-visible:outline-none focus-visible:shadow-focus",
+      children: /* @__PURE__ */ jsx(
+        DataTable,
+        {
+          title: translations.title,
+          titleHeadingLevel: 2,
+          actions,
+          columns,
+          data: paginated,
+          embedded: true,
+          sortable: true,
+          sorting,
+          onSortingChange: setSorting,
+          searchValue: search,
+          onSearchChange: (value) => {
+            setSearch(value);
+            setPage(1);
+          },
+          searchPlaceholder: translations.searchPlaceholder,
+          isLoading: loading,
+          emptyState: /* @__PURE__ */ jsx("p", { className: "py-10 text-center text-sm text-muted-foreground", children: translations.emptyLabel }),
+          pagination: {
+            page,
+            pageSize,
+            total: filtered.length,
+            totalPages,
+            onPageChange: setPage
+          },
+          refreshButton: onRefresh ? {
+            label: translations.refreshLabel,
+            onRefresh,
+            isRefreshing: loading
+          } : void 0,
+          onRowClick: handleRowClick,
+          rowActions: canManage ? (entry) => {
+            if (!entry) return null;
+            if (entry.isInherited) return null;
+            const items = [];
+            if (onEdit) {
+              items.push({
+                id: "edit",
+                label: translations.editLabel,
+                onSelect: () => onEdit(entry)
+              });
+            }
+            if (onDelete) {
+              items.push({
+                id: "delete",
+                label: translations.deleteLabel,
+                onSelect: () => onDelete(entry),
+                destructive: true
+              });
+            }
+            return items.length ? /* @__PURE__ */ jsx(RowActions, { items }) : null;
+          } : void 0
         }
-        if (onDelete) {
-          items.push({
-            id: "delete",
-            label: translations.deleteLabel,
-            onSelect: () => onDelete(entry),
-            destructive: true
-          });
-        }
-        return items.length ? /* @__PURE__ */ jsx(RowActions, { items }) : null;
-      } : void 0
+      )
     }
   );
 }

package/dist/modules/dictionaries/components/DictionaryTable.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/dictionaries/components/DictionaryTable.tsx"],
-  "sourcesContent": ["import * as React from 'react'\nimport type { LegacyColumnDef as ColumnDef } from '@tanstack/react-table/legacy'\nimport type { SortingState } from '@tanstack/react-table'\nimport { DataTable } from '@open-mercato/ui/backend/DataTable'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { RowActions, type RowActionItem } from '@open-mercato/ui/backend/RowActions'\nimport { renderDictionaryColor, renderDictionaryIcon } from './dictionaryAppearance'\n\nexport type DictionaryTableEntry = {\n  id: string\n  value: string\n  label: string\n  color: string | null\n  icon: string | null\n  usageCount?: number\n  organizationId?: string | null\n  tenantId?: string | null\n  isInherited?: boolean\n  createdAt?: string | null\n  updatedAt?: string | null\n}\n\nexport type DictionaryTableTranslations = {\n  title: string\n  valueColumn: string\n  labelColumn: string\n  appearanceColumn: string\n  addLabel: string\n  editLabel: string\n  deleteLabel: string\n  refreshLabel: string\n  inheritedLabel: string\n  inheritedTooltip: string\n  emptyLabel: string\n  usageCountLabel?: string\n  searchPlaceholder?: string\n}\n\ntype DictionaryTableProps = {\n  entries: DictionaryTableEntry[]\n  loading?: boolean\n  canManage?: boolean\n  onCreate?: () => void\n  onEdit?: (entry: DictionaryTableEntry) => void\n  onDelete?: (entry: DictionaryTableEntry) => void\n  onRefresh?: () => void\n  translations: DictionaryTableTranslations\n}\n\nexport function DictionaryTable({\n  entries,\n  loading = false,\n  canManage = false,\n  onCreate,\n  onEdit,\n  onDelete,\n  onRefresh,\n  translations,\n}: DictionaryTableProps) {\n  const [search, setSearch] = React.useState('')\n  const [sorting, setSorting] = React.useState<SortingState>([{ id: 'value', desc: false }])\n  const [page, setPage] = React.useState(1)\n  const pageSize = 50\n\n  const filtered = React.useMemo(() => {\n    if (!search.trim()) return entries\n    const term = search.trim().toLowerCase()\n    return entries.filter((entry) => {\n      return (\n        entry.value.toLowerCase().includes(term) ||\n        (entry.label ?? '').toLowerCase().includes(term)\n      )\n    })\n  }, [entries, search])\n\n  const paginated = React.useMemo(() => {\n    const start = (page - 1) * pageSize\n    return filtered.slice(start, start + pageSize)\n  }, [filtered, page])\n\n  const totalPages = Math.max(1, Math.ceil(filtered.length / pageSize))\n\n  const columns = React.useMemo<ColumnDef<DictionaryTableEntry>[]>(() => [\n    {\n      accessorKey: 'value',\n      header: translations.valueColumn,\n      meta: { priority: 1 },\n      cell: ({ getValue, row }) => (\n        <div className=\"space-y-1\">\n          <div className=\"flex items-center gap-2\">\n            <span className=\"font-medium\">{String(getValue())}</span>\n            {row.original.isInherited ? (\n              <span className=\"rounded bg-muted px-2 py-0.5 text-xs text-muted-foreground\" title={translations.inheritedTooltip}>\n                {translations.inheritedLabel}\n              </span>\n            ) : null}\n          </div>\n          {typeof row.original.usageCount === 'number' && row.original.usageCount > 0 && translations.usageCountLabel ? (\n            <div className=\"text-xs text-muted-foreground\">\n              {translations.usageCountLabel.replace('{{count}}', String(row.original.usageCount))}\n            </div>\n          ) : null}\n        </div>\n      ),\n    },\n    {\n      accessorKey: 'label',\n      header: translations.labelColumn,\n      meta: { priority: 2 },\n      cell: ({ getValue }) => <span>{String(getValue() ?? '')}</span>,\n    },\n    {\n      id: 'appearance',\n      header: translations.appearanceColumn,\n      meta: { priority: 3 },\n      cell: ({ row }) => {\n        const { color, icon } = row.original\n        if (!color && !icon) return <span className=\"text-muted-foreground\">\u2014</span>\n        return (\n          <div className=\"flex items-center gap-2\">\n            {color ? renderDictionaryColor(color, 'h-4 w-4 rounded-full border border-border') : null}\n            {icon ? renderDictionaryIcon(icon, 'h-4 w-4') : null}\n          </div>\n        )\n      },\n    },\n  ], [translations.appearanceColumn, translations.inheritedLabel, translations.inheritedTooltip, translations.labelColumn, translations.valueColumn])\n\n  const actions = React.useMemo(() => {\n    if (!canManage || !onCreate) return null\n    return (\n      <Button size=\"sm\" onClick={onCreate}>\n        {translations.addLabel}\n      </Button>\n    )\n  }, [canManage, onCreate, translations.addLabel])\n\n  const handleRowClick = canManage && onEdit\n    ? (entry: DictionaryTableEntry) => {\n        if (entry.isInherited) return\n        onEdit(entry)\n      }\n    : undefined\n\n  return (\n    <DataTable<DictionaryTableEntry>\n      title={translations.title}\n      titleHeadingLevel={2}\n      actions={actions}\n      columns={columns}\n      data={paginated}\n      embedded\n      sortable\n      sorting={sorting}\n      onSortingChange={setSorting}\n      searchValue={search}\n      onSearchChange={(value) => {\n        setSearch(value)\n        setPage(1)\n      }}\n      searchPlaceholder={translations.searchPlaceholder}\n      isLoading={loading}\n      emptyState={<p className=\"py-10 text-center text-sm text-muted-foreground\">{translations.emptyLabel}</p>}\n      pagination={{\n        page,\n        pageSize,\n        total: filtered.length,\n        totalPages,\n        onPageChange: setPage,\n      }}\n      refreshButton={onRefresh ? {\n        label: translations.refreshLabel,\n        onRefresh,\n        isRefreshing: loading,\n      } : undefined}\n      onRowClick={handleRowClick}\n      rowActions={\n        canManage\n          ? (entry) => {\n              if (!entry) return null\n              if (entry.isInherited) return null\n              const items: RowActionItem[] = []\n              if (onEdit) {\n                items.push({\n                  id: 'edit',\n                  label: translations.editLabel,\n                  onSelect: () => onEdit(entry),\n                })\n              }\n              if (onDelete) {\n                items.push({\n                  id: 'delete',\n                  label: translations.deleteLabel,\n                  onSelect: () => onDelete(entry),\n                  destructive: true,\n                })\n              }\n              return items.length ? <RowActions items={items} /> : null\n            }\n          : undefined\n      }\n    />\n  )\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import * as React from 'react'\nimport type { LegacyColumnDef as ColumnDef } from '@tanstack/react-table/legacy'\nimport type { SortingState } from '@tanstack/react-table'\nimport { DataTable } from '@open-mercato/ui/backend/DataTable'\nimport { Button } from '@open-mercato/ui/primitives/button'\nimport { RowActions, type RowActionItem } from '@open-mercato/ui/backend/RowActions'\nimport { renderDictionaryColor, renderDictionaryIcon } from './dictionaryAppearance'\n\nexport type DictionaryTableEntry = {\n  id: string\n  value: string\n  label: string\n  color: string | null\n  icon: string | null\n  usageCount?: number\n  organizationId?: string | null\n  tenantId?: string | null\n  isInherited?: boolean\n  createdAt?: string | null\n  updatedAt?: string | null\n}\n\nexport type DictionaryTableTranslations = {\n  title: string\n  valueColumn: string\n  labelColumn: string\n  appearanceColumn: string\n  addLabel: string\n  editLabel: string\n  deleteLabel: string\n  refreshLabel: string\n  inheritedLabel: string\n  inheritedTooltip: string\n  emptyLabel: string\n  usageCountLabel?: string\n  searchPlaceholder?: string\n}\n\ntype DictionaryTableProps = {\n  entries: DictionaryTableEntry[]\n  loading?: boolean\n  canManage?: boolean\n  onCreate?: () => void\n  onEdit?: (entry: DictionaryTableEntry) => void\n  onDelete?: (entry: DictionaryTableEntry) => void\n  onRefresh?: () => void\n  translations: DictionaryTableTranslations\n}\n\nexport function DictionaryTable({\n  entries,\n  loading = false,\n  canManage = false,\n  onCreate,\n  onEdit,\n  onDelete,\n  onRefresh,\n  translations,\n}: DictionaryTableProps) {\n  const [search, setSearch] = React.useState('')\n  const [sorting, setSorting] = React.useState<SortingState>([{ id: 'value', desc: false }])\n  const [page, setPage] = React.useState(1)\n  const pageSize = 50\n\n  const filtered = React.useMemo(() => {\n    if (!search.trim()) return entries\n    const term = search.trim().toLowerCase()\n    return entries.filter((entry) => {\n      return (\n        entry.value.toLowerCase().includes(term) ||\n        (entry.label ?? '').toLowerCase().includes(term)\n      )\n    })\n  }, [entries, search])\n\n  const paginated = React.useMemo(() => {\n    const start = (page - 1) * pageSize\n    return filtered.slice(start, start + pageSize)\n  }, [filtered, page])\n\n  const totalPages = Math.max(1, Math.ceil(filtered.length / pageSize))\n\n  const columns = React.useMemo<ColumnDef<DictionaryTableEntry>[]>(() => [\n    {\n      accessorKey: 'value',\n      header: translations.valueColumn,\n      meta: { priority: 1 },\n      cell: ({ getValue, row }) => (\n        <div className=\"space-y-1\">\n          <div className=\"flex items-center gap-2\">\n            <span className=\"font-medium\">{String(getValue())}</span>\n            {row.original.isInherited ? (\n              <span className=\"rounded bg-muted px-2 py-0.5 text-xs text-muted-foreground\" title={translations.inheritedTooltip}>\n                {translations.inheritedLabel}\n              </span>\n            ) : null}\n          </div>\n          {typeof row.original.usageCount === 'number' && row.original.usageCount > 0 && translations.usageCountLabel ? (\n            <div className=\"text-xs text-muted-foreground\">\n              {translations.usageCountLabel.replace('{{count}}', String(row.original.usageCount))}\n            </div>\n          ) : null}\n        </div>\n      ),\n    },\n    {\n      accessorKey: 'label',\n      header: translations.labelColumn,\n      meta: { priority: 2 },\n      cell: ({ getValue }) => <span>{String(getValue() ?? '')}</span>,\n    },\n    {\n      id: 'appearance',\n      header: translations.appearanceColumn,\n      meta: { priority: 3 },\n      cell: ({ row }) => {\n        const { color, icon } = row.original\n        if (!color && !icon) return <span className=\"text-muted-foreground\">\u2014</span>\n        return (\n          <div className=\"flex items-center gap-2\">\n            {color ? renderDictionaryColor(color, 'h-4 w-4 rounded-full border border-border') : null}\n            {icon ? renderDictionaryIcon(icon, 'h-4 w-4') : null}\n          </div>\n        )\n      },\n    },\n  ], [translations.appearanceColumn, translations.inheritedLabel, translations.inheritedTooltip, translations.labelColumn, translations.valueColumn])\n\n  const actions = React.useMemo(() => {\n    if (!canManage || !onCreate) return null\n    return (\n      <Button size=\"sm\" onClick={onCreate}>\n        {translations.addLabel}\n      </Button>\n    )\n  }, [canManage, onCreate, translations.addLabel])\n\n  const handleRowClick = canManage && onEdit\n    ? (entry: DictionaryTableEntry) => {\n        if (entry.isInherited) return\n        onEdit(entry)\n      }\n    : undefined\n\n  return (\n    <div\n      role=\"region\"\n      aria-label={translations.title}\n      tabIndex={0}\n      className=\"w-full min-w-0 max-w-full overflow-x-auto focus-visible:outline-none focus-visible:shadow-focus\"\n    >\n      <DataTable<DictionaryTableEntry>\n        title={translations.title}\n        titleHeadingLevel={2}\n        actions={actions}\n        columns={columns}\n        data={paginated}\n        embedded\n        sortable\n        sorting={sorting}\n        onSortingChange={setSorting}\n        searchValue={search}\n        onSearchChange={(value) => {\n          setSearch(value)\n          setPage(1)\n        }}\n        searchPlaceholder={translations.searchPlaceholder}\n        isLoading={loading}\n        emptyState={<p className=\"py-10 text-center text-sm text-muted-foreground\">{translations.emptyLabel}</p>}\n        pagination={{\n          page,\n          pageSize,\n          total: filtered.length,\n          totalPages,\n          onPageChange: setPage,\n        }}\n        refreshButton={onRefresh ? {\n          label: translations.refreshLabel,\n          onRefresh,\n          isRefreshing: loading,\n        } : undefined}\n        onRowClick={handleRowClick}\n        rowActions={\n          canManage\n            ? (entry) => {\n                if (!entry) return null\n                if (entry.isInherited) return null\n                const items: RowActionItem[] = []\n                if (onEdit) {\n                  items.push({\n                    id: 'edit',\n                    label: translations.editLabel,\n                    onSelect: () => onEdit(entry),\n                  })\n                }\n                if (onDelete) {\n                  items.push({\n                    id: 'delete',\n                    label: translations.deleteLabel,\n                    onSelect: () => onDelete(entry),\n                    destructive: true,\n                  })\n                }\n                return items.length ? <RowActions items={items} /> : null\n              }\n            : undefined\n        }\n      />\n    </div>\n  )\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/messages/subscribers/message-notification.js

@@ -8,6 +8,7 @@ import {
 import { User } from "../../auth/data/entities.js";
 import { Message } from "../data/entities.js";
 import { notificationTypes } from "../notifications.js";
+import { resolveMessageChannelThreadAccess } from "../lib/channelThreadAccess.js";
 import {
   EXTERNAL_CONVERSATION_SOURCE_ENTITY_TYPE,
   SEND_AS_USER_SOURCE_ENTITY_TYPE
@@ -84,7 +85,18 @@ async function isChannelRoutedMessage(payload, ctx) {
       }
     );
     if (!message) return false;
-    return message.sourceEntityType === SEND_AS_USER_SOURCE_ENTITY_TYPE || message.sourceEntityType === EXTERNAL_CONVERSATION_SOURCE_ENTITY_TYPE;
+    if (message.sourceEntityType === SEND_AS_USER_SOURCE_ENTITY_TYPE) return true;
+    if (message.sourceEntityType !== EXTERNAL_CONVERSATION_SOURCE_ENTITY_TYPE) return false;
+    const channelThreadAccess = await resolveMessageChannelThreadAccess(
+      ctx,
+      {
+        tenantId: payload.tenantId,
+        organizationId: payload.organizationId ?? null
+      },
+      { messageThreadId: message.threadId },
+      { userId: null, features: [] }
+    );
+    return channelThreadAccess !== null;
   } catch {
     return false;
   }

package/dist/modules/messages/subscribers/message-notification.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/messages/subscribers/message-notification.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { createQueue } from '@open-mercato/queue'\nimport { buildBatchNotificationFromType } from '../../notifications/lib/notificationBuilder'\nimport { resolveNotificationService } from '../../notifications/lib/notificationService'\nimport {\n  MESSAGES_EMAIL_QUEUE_NAME,\n  type SendMessageEmailJob,\n} from '../workers/send-email.worker'\nimport { User } from '../../auth/data/entities'\nimport { Message } from '../data/entities'\nimport { notificationTypes } from '../notifications'\nimport {\n  EXTERNAL_CONVERSATION_SOURCE_ENTITY_TYPE,\n  SEND_AS_USER_SOURCE_ENTITY_TYPE,\n} from '../lib/messageSourceEntityTypes'\n\nexport const metadata = {\n  event: 'messages.message.sent',\n  persistent: true,\n  id: 'messages:queue-email-delivery',\n}\n\ntype MessageSentPayload = {\n  messageId: string\n  senderUserId: string\n  recipientUserIds: string[]\n  sendViaEmail: boolean\n  /** Set by compose for channel-ingested messages (#6093); see `resolveNotificationVariables`. */\n  inboundFromChannel?: boolean\n  externalEmail?: string | null\n  forwardedFrom?: string\n  replyTo?: string\n  tenantId: string\n  organizationId?: string | null\n}\n\ntype ResolverContext = {\n  resolve: <T = unknown>(name: string) => T\n}\n\nasync function resolveNotificationVariables(payload: MessageSentPayload, ctx: ResolverContext): Promise<{ title: string; from: string }> {\n  try {\n    const em = ctx.resolve<EntityManager>('em')?.fork()\n    if (!em) return { title: '', from: '' }\n\n    const scope = {\n      tenantId: payload.tenantId,\n      organizationId: payload.organizationId ?? null,\n    }\n    const whereUser: { id: string; tenantId: string; deletedAt: null; organizationId?: string | null } = {\n      id: payload.senderUserId,\n      tenantId: payload.tenantId,\n      deletedAt: null,\n    }\n    if (payload.organizationId !== undefined) {\n      whereUser.organizationId = payload.organizationId\n    }\n\n    const [message, sender] = await Promise.all([\n      findOneWithDecryption(\n        em,\n        Message,\n        {\n          id: payload.messageId,\n          tenantId: payload.tenantId,\n          deletedAt: null,\n        },\n        undefined,\n        scope,\n      ),\n      findOneWithDecryption(\n        em,\n        User,\n        whereUser,\n        undefined,\n        scope,\n      ),\n    ])\n\n    // #6093: a channel-ingested message is composed on behalf of the channel's\n    // system user (or, without one, the assignee), so `senderUserId` is not who\n    // wrote it. The correspondent is on the message itself.\n    const externalFrom = payload.inboundFromChannel\n      ? [message?.externalName, message?.externalEmail].find(\n          (value): value is string => typeof value === 'string' && value.trim().length > 0,\n        )\n      : undefined\n\n    return {\n      title: typeof message?.subject === 'string' ? message.subject : '',\n      from: externalFrom\n        ?? (typeof sender?.name === 'string' && sender.name.trim().length > 0\n          ? sender.name\n          : typeof sender?.email === 'string'\n            ? sender.email\n            : ''),\n    }\n  } catch {\n    return { title: '', from: '' }\n  }\n}\n\n\n/**\n * Whether this Message is already being delivered through a connected\n * channel (`sendAsUser`, or the platform copy of an inbound channel message),\n * so the external-email job below would duplicate \u2014 or, for the inbound\n * case, misdirect \u2014 the send. Mirrors `outbound-bridge.ts`'s re-fetch: the\n * `messages.message.sent` payload doesn't carry `sourceEntityType` and never\n * should, to keep this subscriber decoupled from `communication_channels`.\n *\n * Fails open (`false`, i.e. today's behavior) when the Message can't be\n * found \u2014 we can only skip the external send when we can affirmatively show\n * it is channel-routed.\n */\nasync function isChannelRoutedMessage(payload: MessageSentPayload, ctx: ResolverContext): Promise<boolean> {\n  try {\n    const em = ctx.resolve<EntityManager>('em')?.fork()\n    if (!em) return false\n\n    const message = await findOneWithDecryption(\n      em,\n      Message,\n      {\n        id: payload.messageId,\n        tenantId: payload.tenantId,\n        organizationId: payload.organizationId ?? null,\n        deletedAt: null,\n      },\n      undefined,\n      {\n        tenantId: payload.tenantId,\n        organizationId: payload.organizationId ?? null,\n      },\n    )\n    if (!message) return false\n    return (\n      message.sourceEntityType === SEND_AS_USER_SOURCE_ENTITY_TYPE ||\n      message.sourceEntityType === EXTERNAL_CONVERSATION_SOURCE_ENTITY_TYPE\n    )\n  } catch {\n    return false\n  }\n}\n\nexport default async function handle(payload: MessageSentPayload, ctx: ResolverContext): Promise<void> {\n  const uniqueRecipientUserIds = Array.from(new Set(payload.recipientUserIds))\n\n  const typeDef = notificationTypes.find((type) => type.type === 'messages.new')\n  if (typeDef && uniqueRecipientUserIds.length > 0) {\n    const variables = await resolveNotificationVariables(payload, ctx)\n    const notificationService = resolveNotificationService(ctx)\n    const notificationInput = buildBatchNotificationFromType(typeDef, {\n      recipientUserIds: uniqueRecipientUserIds,\n      titleVariables: variables,\n      bodyVariables: variables,\n      sourceEntityType: 'message',\n      sourceEntityId: payload.messageId,\n      linkHref: `/backend/messages/${payload.messageId}`,\n    })\n    await notificationService.createBatch(notificationInput, {\n      tenantId: payload.tenantId,\n      organizationId: payload.organizationId ?? null,\n    })\n  }\n\n  if (!payload.sendViaEmail) {\n    return\n  }\n\n  const strategy = process.env.QUEUE_STRATEGY === 'async' ? 'async' : 'local'\n\n  const emailQueue = createQueue<SendMessageEmailJob>(MESSAGES_EMAIL_QUEUE_NAME, strategy)\n\n  for (const recipientUserId of uniqueRecipientUserIds) {\n    await emailQueue.enqueue({\n      type: 'recipient',\n      messageId: payload.messageId,\n      recipientUserId,\n      tenantId: payload.tenantId,\n      organizationId: payload.organizationId ?? null,\n    })\n  }\n\n  const externalEmail = payload.externalEmail?.trim()\n  if (externalEmail && !(await isChannelRoutedMessage(payload, ctx))) {\n    await emailQueue.enqueue({\n      type: 'external',\n      messageId: payload.messageId,\n      email: externalEmail,\n      tenantId: payload.tenantId,\n      organizationId: payload.organizationId ?? null,\n    })\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { createQueue } from '@open-mercato/queue'\nimport { buildBatchNotificationFromType } from '../../notifications/lib/notificationBuilder'\nimport { resolveNotificationService } from '../../notifications/lib/notificationService'\nimport {\n  MESSAGES_EMAIL_QUEUE_NAME,\n  type SendMessageEmailJob,\n} from '../workers/send-email.worker'\nimport { User } from '../../auth/data/entities'\nimport { Message } from '../data/entities'\nimport { notificationTypes } from '../notifications'\nimport { resolveMessageChannelThreadAccess } from '../lib/channelThreadAccess'\nimport {\n  EXTERNAL_CONVERSATION_SOURCE_ENTITY_TYPE,\n  SEND_AS_USER_SOURCE_ENTITY_TYPE,\n} from '../lib/messageSourceEntityTypes'\n\nexport const metadata = {\n  event: 'messages.message.sent',\n  persistent: true,\n  id: 'messages:queue-email-delivery',\n}\n\ntype MessageSentPayload = {\n  messageId: string\n  senderUserId: string\n  recipientUserIds: string[]\n  sendViaEmail: boolean\n  /** Set by compose for channel-ingested messages (#6093); see `resolveNotificationVariables`. */\n  inboundFromChannel?: boolean\n  externalEmail?: string | null\n  forwardedFrom?: string\n  replyTo?: string\n  tenantId: string\n  organizationId?: string | null\n}\n\ntype ResolverContext = {\n  resolve: <T = unknown>(name: string) => T\n}\n\nasync function resolveNotificationVariables(payload: MessageSentPayload, ctx: ResolverContext): Promise<{ title: string; from: string }> {\n  try {\n    const em = ctx.resolve<EntityManager>('em')?.fork()\n    if (!em) return { title: '', from: '' }\n\n    const scope = {\n      tenantId: payload.tenantId,\n      organizationId: payload.organizationId ?? null,\n    }\n    const whereUser: { id: string; tenantId: string; deletedAt: null; organizationId?: string | null } = {\n      id: payload.senderUserId,\n      tenantId: payload.tenantId,\n      deletedAt: null,\n    }\n    if (payload.organizationId !== undefined) {\n      whereUser.organizationId = payload.organizationId\n    }\n\n    const [message, sender] = await Promise.all([\n      findOneWithDecryption(\n        em,\n        Message,\n        {\n          id: payload.messageId,\n          tenantId: payload.tenantId,\n          deletedAt: null,\n        },\n        undefined,\n        scope,\n      ),\n      findOneWithDecryption(\n        em,\n        User,\n        whereUser,\n        undefined,\n        scope,\n      ),\n    ])\n\n    // #6093: a channel-ingested message is composed on behalf of the channel's\n    // system user (or, without one, the assignee), so `senderUserId` is not who\n    // wrote it. The correspondent is on the message itself.\n    const externalFrom = payload.inboundFromChannel\n      ? [message?.externalName, message?.externalEmail].find(\n          (value): value is string => typeof value === 'string' && value.trim().length > 0,\n        )\n      : undefined\n\n    return {\n      title: typeof message?.subject === 'string' ? message.subject : '',\n      from: externalFrom\n        ?? (typeof sender?.name === 'string' && sender.name.trim().length > 0\n          ? sender.name\n          : typeof sender?.email === 'string'\n            ? sender.email\n            : ''),\n    }\n  } catch {\n    return { title: '', from: '' }\n  }\n}\n\n\n/**\n * Whether this Message is already being delivered through a connected\n * channel (`sendAsUser`, or the platform copy of an inbound channel message),\n * so the external-email job below would duplicate \u2014 or, for the inbound\n * case, misdirect \u2014 the send. Mirrors `outbound-bridge.ts`'s re-fetch: the\n * `messages.message.sent` payload doesn't carry `sourceEntityType` and never\n * should, to keep this subscriber decoupled from `communication_channels`.\n *\n * Fails open (`false`, i.e. today's behavior) when the Message can't be\n * found \u2014 we can only skip the external send when we can affirmatively show\n * it is channel-routed.\n */\nasync function isChannelRoutedMessage(payload: MessageSentPayload, ctx: ResolverContext): Promise<boolean> {\n  try {\n    const em = ctx.resolve<EntityManager>('em')?.fork()\n    if (!em) return false\n\n    const message = await findOneWithDecryption(\n      em,\n      Message,\n      {\n        id: payload.messageId,\n        tenantId: payload.tenantId,\n        organizationId: payload.organizationId ?? null,\n        deletedAt: null,\n      },\n      undefined,\n      {\n        tenantId: payload.tenantId,\n        organizationId: payload.organizationId ?? null,\n      },\n    )\n    if (!message) return false\n    if (message.sourceEntityType === SEND_AS_USER_SOURCE_ENTITY_TYPE) return true\n    if (message.sourceEntityType !== EXTERNAL_CONVERSATION_SOURCE_ENTITY_TYPE) return false\n\n    const channelThreadAccess = await resolveMessageChannelThreadAccess(\n      ctx,\n      {\n        tenantId: payload.tenantId,\n        organizationId: payload.organizationId ?? null,\n      },\n      { messageThreadId: message.threadId },\n      { userId: null, features: [] },\n    )\n    return channelThreadAccess !== null\n  } catch {\n    return false\n  }\n}\n\nexport default async function handle(payload: MessageSentPayload, ctx: ResolverContext): Promise<void> {\n  const uniqueRecipientUserIds = Array.from(new Set(payload.recipientUserIds))\n\n  const typeDef = notificationTypes.find((type) => type.type === 'messages.new')\n  if (typeDef && uniqueRecipientUserIds.length > 0) {\n    const variables = await resolveNotificationVariables(payload, ctx)\n    const notificationService = resolveNotificationService(ctx)\n    const notificationInput = buildBatchNotificationFromType(typeDef, {\n      recipientUserIds: uniqueRecipientUserIds,\n      titleVariables: variables,\n      bodyVariables: variables,\n      sourceEntityType: 'message',\n      sourceEntityId: payload.messageId,\n      linkHref: `/backend/messages/${payload.messageId}`,\n    })\n    await notificationService.createBatch(notificationInput, {\n      tenantId: payload.tenantId,\n      organizationId: payload.organizationId ?? null,\n    })\n  }\n\n  if (!payload.sendViaEmail) {\n    return\n  }\n\n  const strategy = process.env.QUEUE_STRATEGY === 'async' ? 'async' : 'local'\n\n  const emailQueue = createQueue<SendMessageEmailJob>(MESSAGES_EMAIL_QUEUE_NAME, strategy)\n\n  for (const recipientUserId of uniqueRecipientUserIds) {\n    await emailQueue.enqueue({\n      type: 'recipient',\n      messageId: payload.messageId,\n      recipientUserId,\n      tenantId: payload.tenantId,\n      organizationId: payload.organizationId ?? null,\n    })\n  }\n\n  const externalEmail = payload.externalEmail?.trim()\n  if (externalEmail && !(await isChannelRoutedMessage(payload, ctx))) {\n    await emailQueue.enqueue({\n      type: 'external',\n      messageId: payload.messageId,\n      email: externalEmail,\n      tenantId: payload.tenantId,\n      organizationId: payload.organizationId ?? null,\n    })\n  }\n}\n"],
+  "mappings": "AACA,SAAS,6BAA6B;AACtC,SAAS,mBAAmB;AAC5B,SAAS,sCAAsC;AAC/C,SAAS,kCAAkC;AAC3C;AAAA,EACE;AAAA,OAEK;AACP,SAAS,YAAY;AACrB,SAAS,eAAe;AACxB,SAAS,yBAAyB;AAClC,SAAS,yCAAyC;AAClD;AAAA,EACE;AAAA,EACA;AAAA,OACK;AAEA,MAAM,WAAW;AAAA,EACtB,OAAO;AAAA,EACP,YAAY;AAAA,EACZ,IAAI;AACN;AAoBA,eAAe,6BAA6B,SAA6B,KAAgE;AACvI,MAAI;AACF,UAAM,KAAK,IAAI,QAAuB,IAAI,GAAG,KAAK;AAClD,QAAI,CAAC,GAAI,QAAO,EAAE,OAAO,IAAI,MAAM,GAAG;AAEtC,UAAM,QAAQ;AAAA,MACZ,UAAU,QAAQ;AAAA,MAClB,gBAAgB,QAAQ,kBAAkB;AAAA,IAC5C;AACA,UAAM,YAA+F;AAAA,MACnG,IAAI,QAAQ;AAAA,MACZ,UAAU,QAAQ;AAAA,MAClB,WAAW;AAAA,IACb;AACA,QAAI,QAAQ,mBAAmB,QAAW;AACxC,gBAAU,iBAAiB,QAAQ;AAAA,IACrC;AAEA,UAAM,CAAC,SAAS,MAAM,IAAI,MAAM,QAAQ,IAAI;AAAA,MAC1C;AAAA,QACE;AAAA,QACA;AAAA,QACA;AAAA,UACE,IAAI,QAAQ;AAAA,UACZ,UAAU,QAAQ;AAAA,UAClB,WAAW;AAAA,QACb;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,MACA;AAAA,QACE;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,IACF,CAAC;AAKD,UAAM,eAAe,QAAQ,qBACzB,CAAC,SAAS,cAAc,SAAS,aAAa,EAAE;AAAA,MAC9C,CAAC,UAA2B,OAAO,UAAU,YAAY,MAAM,KAAK,EAAE,SAAS;AAAA,IACjF,IACA;AAEJ,WAAO;AAAA,MACL,OAAO,OAAO,SAAS,YAAY,WAAW,QAAQ,UAAU;AAAA,MAChE,MAAM,iBACA,OAAO,QAAQ,SAAS,YAAY,OAAO,KAAK,KAAK,EAAE,SAAS,IAChE,OAAO,OACP,OAAO,QAAQ,UAAU,WACvB,OAAO,QACP;AAAA,IACV;AAAA,EACF,QAAQ;AACN,WAAO,EAAE,OAAO,IAAI,MAAM,GAAG;AAAA,EAC/B;AACF;AAeA,eAAe,uBAAuB,SAA6B,KAAwC;AACzG,MAAI;AACF,UAAM,KAAK,IAAI,QAAuB,IAAI,GAAG,KAAK;AAClD,QAAI,CAAC,GAAI,QAAO;AAEhB,UAAM,UAAU,MAAM;AAAA,MACpB;AAAA,MACA;AAAA,MACA;AAAA,QACE,IAAI,QAAQ;AAAA,QACZ,UAAU,QAAQ;AAAA,QAClB,gBAAgB,QAAQ,kBAAkB;AAAA,QAC1C,WAAW;AAAA,MACb;AAAA,MACA;AAAA,MACA;AAAA,QACE,UAAU,QAAQ;AAAA,QAClB,gBAAgB,QAAQ,kBAAkB;AAAA,MAC5C;AAAA,IACF;AACA,QAAI,CAAC,QAAS,QAAO;AACrB,QAAI,QAAQ,qBAAqB,gCAAiC,QAAO;AACzE,QAAI,QAAQ,qBAAqB,yCAA0C,QAAO;AAElF,UAAM,sBAAsB,MAAM;AAAA,MAChC;AAAA,MACA;AAAA,QACE,UAAU,QAAQ;AAAA,QAClB,gBAAgB,QAAQ,kBAAkB;AAAA,MAC5C;AAAA,MACA,EAAE,iBAAiB,QAAQ,SAAS;AAAA,MACpC,EAAE,QAAQ,MAAM,UAAU,CAAC,EAAE;AAAA,IAC/B;AACA,WAAO,wBAAwB;AAAA,EACjC,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEA,eAAO,OAA8B,SAA6B,KAAqC;AACrG,QAAM,yBAAyB,MAAM,KAAK,IAAI,IAAI,QAAQ,gBAAgB,CAAC;AAE3E,QAAM,UAAU,kBAAkB,KAAK,CAAC,SAAS,KAAK,SAAS,cAAc;AAC7E,MAAI,WAAW,uBAAuB,SAAS,GAAG;AAChD,UAAM,YAAY,MAAM,6BAA6B,SAAS,GAAG;AACjE,UAAM,sBAAsB,2BAA2B,GAAG;AAC1D,UAAM,oBAAoB,+BAA+B,SAAS;AAAA,MAChE,kBAAkB;AAAA,MAClB,gBAAgB;AAAA,MAChB,eAAe;AAAA,MACf,kBAAkB;AAAA,MAClB,gBAAgB,QAAQ;AAAA,MACxB,UAAU,qBAAqB,QAAQ,SAAS;AAAA,IAClD,CAAC;AACD,UAAM,oBAAoB,YAAY,mBAAmB;AAAA,MACvD,UAAU,QAAQ;AAAA,MAClB,gBAAgB,QAAQ,kBAAkB;AAAA,IAC5C,CAAC;AAAA,EACH;AAEA,MAAI,CAAC,QAAQ,cAAc;AACzB;AAAA,EACF;AAEA,QAAM,WAAW,QAAQ,IAAI,mBAAmB,UAAU,UAAU;AAEpE,QAAM,aAAa,YAAiC,2BAA2B,QAAQ;AAEvF,aAAW,mBAAmB,wBAAwB;AACpD,UAAM,WAAW,QAAQ;AAAA,MACvB,MAAM;AAAA,MACN,WAAW,QAAQ;AAAA,MACnB;AAAA,MACA,UAAU,QAAQ;AAAA,MAClB,gBAAgB,QAAQ,kBAAkB;AAAA,IAC5C,CAAC;AAAA,EACH;AAEA,QAAM,gBAAgB,QAAQ,eAAe,KAAK;AAClD,MAAI,iBAAiB,CAAE,MAAM,uBAAuB,SAAS,GAAG,GAAI;AAClE,UAAM,WAAW,QAAQ;AAAA,MACvB,MAAM;AAAA,MACN,WAAW,QAAQ;AAAA,MACnB,OAAO;AAAA,MACP,UAAU,QAAQ;AAAA,MAClB,gBAAgB,QAAQ,kBAAkB;AAAA,IAC5C,CAAC;AAAA,EACH;AACF;",
   "names": []
 }

package/dist/modules/payment_gateways/api/webhook/[provider]/route.js

@@ -1,22 +1,33 @@
 import { NextResponse } from "next/server";
+import { z } from "zod";
 import { createRequestContainer } from "@open-mercato/shared/lib/di/container";
 import { findWithDecryption } from "@open-mercato/shared/lib/encryption/find";
 import { readJsonSafe } from "@open-mercato/shared/lib/http/readJsonSafe";
 import { checkRateLimit, getClientIp, RATE_LIMIT_ERROR_FALLBACK } from "@open-mercato/shared/lib/ratelimit/helpers";
-import { getWebhookHandler } from "@open-mercato/shared/modules/payment_gateways/types";
+import {
+  getWebhookHandler,
+  WebhookVerificationUnavailableError
+} from "@open-mercato/shared/modules/payment_gateways/types";
 import { markQueueJobOrigin } from "@open-mercato/shared/lib/queue/dispatchOrigin";
 import { GatewayTransaction } from "../../../data/entities.js";
 import { getPaymentGatewayQueue } from "../../../lib/queue.js";
 import { processPaymentGatewayWebhookJob } from "../../../lib/webhook-processor.js";
 import { paymentGatewaysTag } from "../../openapi.js";
 import { createLogger } from "@open-mercato/shared/lib/logger";
-import { readBoundedRequestBody, WebhookBodyTooLargeError } from "@open-mercato/shared/lib/webhooks";
+import { readBoundedRequestBody, readBoundedRequestBytes, WebhookBodyTooLargeError } from "@open-mercato/shared/lib/webhooks";
+import { getTelemetryRuntime } from "@open-mercato/shared/lib/telemetry/runtime";
 const logger = createLogger("payment_gateways").child({ component: "webhook" });
 const metadata = {
   path: "/payment_gateways/webhook/[provider]",
   POST: { requireAuth: false }
 };
 const WEBHOOK_VERIFICATION_FAILED = "Webhook verification failed";
+const WEBHOOK_PAYLOAD_TOO_LARGE = "Webhook payload too large";
+const INTERNAL_SERVER_ERROR = "Internal server error";
+const DEFAULT_TEXT_CONTENT_TYPE = "text/plain; charset=utf-8";
+const CONTROL_CHARACTERS = /[\u0000-\u001F\u007F]/;
+const JSON_CONTENT_TYPE = /^application\/([\w.+-]+\+)?json(\s*;|$)/;
+const paymentIdHintSchema = z.guid();
 const paymentGatewayWebhookRateLimitConfig = {
   points: 60,
   duration: 60,
@@ -31,14 +42,27 @@ async function POST(req, { params }) {
     return NextResponse.json({ error: `No webhook handler for provider: ${providerKey}` }, { status: 404 });
   }
   const rateLimitResponse = await checkProviderWebhookRateLimit(container, req, providerKey);
-  if (rateLimitResponse) return rateLimitResponse;
+  const outcome = rateLimitResponse ? "rate_limited" : await receiveWebhook(req, providerKey, registration, container);
+  const response = respond(registration, outcome, rateLimitResponse);
+  const logFields = { providerKey, outcome, status: response.status };
+  if (outcome === "accepted") logger.info("Webhook handled", logFields);
+  else logger.warn("Webhook handled", logFields);
+  return response;
+}
+async function receiveWebhook(req, providerKey, registration, container) {
   let rawBody;
+  let bodyText;
   try {
-    rawBody = registration.maxBodyBytes === void 0 ? await req.text() : await readBoundedRequestBody(req, { maxBytes: registration.maxBodyBytes });
-  } catch (error) {
-    if (error instanceof WebhookBodyTooLargeError) {
-      return NextResponse.json({ error: "Webhook payload too large" }, { status: 413 });
+    if (registration.rawBody === "bytes") {
+      const bytes = registration.maxBodyBytes === void 0 ? new Uint8Array(await req.arrayBuffer()) : await readBoundedRequestBytes(req, { maxBytes: registration.maxBodyBytes });
+      rawBody = Buffer.from(bytes);
+      bodyText = new TextDecoder().decode(rawBody);
+    } else {
+      bodyText = registration.maxBodyBytes === void 0 ? await req.text() : await readBoundedRequestBody(req, { maxBytes: registration.maxBodyBytes });
+      rawBody = bodyText;
     }
+  } catch (error) {
+    if (error instanceof WebhookBodyTooLargeError) return "payload_too_large";
     throw error;
   }
   const headers = {};
@@ -49,62 +73,181 @@ async function POST(req, { params }) {
   const em = container.resolve("em");
   const integrationCredentialsService = container.resolve("integrationCredentialsService");
   const queue = getPaymentGatewayQueue(registration.queue ?? "payment-gateways-webhook");
-  const payload = await readJsonSafe(rawBody);
-  const sessionIdHint = registration.readSessionIdHint?.(payload) ?? null;
+  const payload = await readJsonSafe(bodyText);
+  const locatorContext = { rawBody, headers };
+  let sessionIdHint;
+  let paymentIdHint;
   try {
-    const candidates = sessionIdHint ? await findWithDecryption(
-      em,
-      GatewayTransaction,
-      {
-        providerKey,
-        providerSessionId: sessionIdHint,
-        deletedAt: null
-      },
-      { limit: 10, orderBy: { createdAt: "desc" } }
-    ) : [];
-    let transaction = null;
-    let matchedScope = null;
-    let event = null;
-    let lastVerificationError = null;
+    sessionIdHint = normalizeSessionIdHint(registration.readSessionIdHint?.(payload, locatorContext));
+    paymentIdHint = normalizePaymentIdHint(registration.readPaymentIdHint?.(payload, locatorContext));
+  } catch (error) {
+    reportWebhookError(error, "payment_gateways.webhook_locator_failed");
+    return "no_candidate";
+  }
+  try {
+    let candidates;
+    try {
+      candidates = sessionIdHint || paymentIdHint ? await findWithDecryption(
+        em,
+        GatewayTransaction,
+        {
+          providerKey,
+          ...sessionIdHint ? { providerSessionId: sessionIdHint } : {},
+          ...paymentIdHint ? { paymentId: paymentIdHint } : {},
+          deletedAt: null
+        },
+        { limit: 10, orderBy: { createdAt: "desc" } }
+      ) : [];
+    } catch (error) {
+      reportWebhookError(error, "payment_gateways.webhook_lookup_failed");
+      return "processing_failed";
+    }
+    if (candidates.length === 0) return "no_candidate";
+    const verifiedMatches = [];
+    let verificationUnavailable = false;
     for (const candidate of candidates) {
       const candidateScope = { organizationId: candidate.organizationId, tenantId: candidate.tenantId };
-      const credentials = await integrationCredentialsService.resolve(`gateway_${providerKey}`, candidateScope) ?? {};
+      let credentials;
       try {
-        event = await registration.handler({ rawBody, headers, credentials });
-        transaction = candidate;
-        matchedScope = candidateScope;
-        break;
+        credentials = await integrationCredentialsService.resolve(`gateway_${providerKey}`, candidateScope) ?? {};
       } catch (error) {
-        lastVerificationError = error;
+        reportWebhookError(error, "payment_gateways.webhook_credentials_failed");
+        verificationUnavailable = true;
+        continue;
       }
+      try {
+        const candidateEvent = await registration.handler({
+          rawBody,
+          headers,
+          credentials,
+          candidate: {
+            transactionId: candidate.id,
+            paymentId: candidate.paymentId,
+            providerSessionId: candidate.providerSessionId ?? null,
+            amount: candidate.amount,
+            currencyCode: candidate.currencyCode
+          }
+        });
+        verifiedMatches.push({ transaction: candidate, scope: candidateScope, event: candidateEvent });
+      } catch (error) {
+        if (error instanceof WebhookVerificationUnavailableError) verificationUnavailable = true;
+      }
+    }
+    if (verifiedMatches.length > 1) {
+      logger.error("Webhook matched multiple verified candidates", {
+        providerKey,
+        candidateCount: verifiedMatches.length
+      });
+      getTelemetryRuntime()?.reportError(
+        new Error("[internal] Webhook matched multiple verified candidates"),
+        { module: "payment_gateways", code: "payment_gateways.webhook_ambiguous_candidates" }
+      );
+      return "verification_failed";
     }
-    if (!event || !transaction || !matchedScope) {
-      throw lastVerificationError ?? new Error("Webhook verification failed: no matching transaction");
+    if (verificationUnavailable && verifiedMatches.length === 1) {
+      logger.warn("Webhook candidate left unverified; ambiguity cannot be ruled out", {
+        providerKey,
+        candidateCount: candidates.length
+      });
+      return "verification_unavailable";
     }
-    const scope = matchedScope;
+    const [match] = verifiedMatches;
+    if (!match) return verificationUnavailable ? "verification_unavailable" : "verification_failed";
     const jobPayload = markQueueJobOrigin({
       providerKey,
-      event,
-      transactionId: transaction.id,
-      scope
+      event: match.event,
+      transactionId: match.transaction.id,
+      scope: match.scope
     }, "inbound-webhook");
-    if (process.env.QUEUE_STRATEGY === "async") {
-      await queue.enqueue(jobPayload);
-    } else {
-      await processPaymentGatewayWebhookJob(
-        {
-          em: container.resolve("em"),
-          paymentGatewayService: service,
-          integrationLogService: container.resolve("integrationLogService")
-        },
-        jobPayload
-      );
+    try {
+      if (process.env.QUEUE_STRATEGY === "async") {
+        await queue.enqueue(jobPayload);
+      } else {
+        await processPaymentGatewayWebhookJob(
+          {
+            em: container.resolve("em"),
+            paymentGatewayService: service,
+            integrationLogService: container.resolve("integrationLogService")
+          },
+          jobPayload
+        );
+      }
+    } catch (error) {
+      getTelemetryRuntime()?.reportError(error, {
+        module: "payment_gateways",
+        code: "payment_gateways.webhook_processing_failed"
+      });
+      return "processing_failed";
+    }
+    return "accepted";
+  } catch (error) {
+    reportWebhookError(error, "payment_gateways.webhook_unexpected_failure");
+    return "verification_failed";
+  }
+}
+function respond(registration, outcome, rateLimitResponse) {
+  if (!registration.formatResponse) return legacyResponse(outcome, rateLimitResponse);
+  try {
+    const response = toValidatedResponse(registration.formatResponse(outcome));
+    if (outcome === "rate_limited" && rateLimitResponse) {
+      rateLimitResponse.headers.forEach((value, key) => {
+        if (key !== "content-type" && key !== "content-length") response.headers.set(key, value);
+      });
+    }
+    return response;
+  } catch (error) {
+    getTelemetryRuntime()?.reportError(error, {
+      module: "payment_gateways",
+      code: "payment_gateways.webhook_formatter_invalid"
+    });
+    return NextResponse.json({ error: INTERNAL_SERVER_ERROR }, { status: 500 });
+  }
+}
+function legacyResponse(outcome, rateLimitResponse) {
+  if (outcome === "rate_limited" && rateLimitResponse) return rateLimitResponse;
+  if (outcome === "accepted") return NextResponse.json({ received: true, queued: true }, { status: 202 });
+  if (outcome === "payload_too_large") return NextResponse.json({ error: WEBHOOK_PAYLOAD_TOO_LARGE }, { status: 413 });
+  return NextResponse.json({ error: WEBHOOK_VERIFICATION_FAILED }, { status: 401 });
+}
+function toValidatedResponse(formatted) {
+  const { status, body, contentType } = formatted;
+  if (!Number.isInteger(status) || status < 200 || status > 599) {
+    throw new Error("[internal] Webhook formatter returned an invalid status");
+  }
+  if (contentType !== void 0 && (typeof contentType !== "string" || CONTROL_CHARACTERS.test(contentType))) {
+    throw new Error("[internal] Webhook formatter returned an invalid content type");
+  }
+  const normalizedContentType = contentType?.toLowerCase();
+  if (typeof body === "string") {
+    if (normalizedContentType !== void 0 && !normalizedContentType.startsWith("text/")) {
+      throw new Error("[internal] Webhook formatter returned a non-text content type for a text body");
     }
-    return NextResponse.json({ received: true, queued: true }, { status: 202 });
-  } catch (err) {
-    logger.warn("Webhook verification failed", { providerKey, err });
-    return NextResponse.json({ error: WEBHOOK_VERIFICATION_FAILED }, { status: 401 });
+    return new NextResponse(body, { status, headers: { "content-type": contentType ?? DEFAULT_TEXT_CONTENT_TYPE } });
+  }
+  if (!isPlainObject(body)) {
+    throw new Error("[internal] Webhook formatter returned an invalid body");
   }
+  if (normalizedContentType !== void 0 && !JSON_CONTENT_TYPE.test(normalizedContentType)) {
+    throw new Error("[internal] Webhook formatter returned a non-JSON content type for an object body");
+  }
+  const response = NextResponse.json(body, { status });
+  if (contentType !== void 0) response.headers.set("content-type", contentType);
+  return response;
+}
+function isPlainObject(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
+  const prototype = Object.getPrototypeOf(value);
+  return prototype === Object.prototype || prototype === null;
+}
+function reportWebhookError(error, code) {
+  getTelemetryRuntime()?.reportError(error, { module: "payment_gateways", code });
+}
+function normalizeSessionIdHint(value) {
+  return typeof value === "string" && value.length > 0 ? value : null;
+}
+function normalizePaymentIdHint(value) {
+  const parsed = paymentIdHintSchema.safeParse(value);
+  return parsed.success ? parsed.data : null;
 }
 async function checkProviderWebhookRateLimit(container, req, providerKey) {
   const rateLimiterService = tryResolve(container, "rateLimiterService");
@@ -131,10 +274,15 @@ const openApi = {
       summary: "Process inbound webhook from payment provider",
       tags: [paymentGatewaysTag],
       responses: [
-        { status: 202, description: "Webhook accepted for async processing" },
-        { status: 401, description: "Signature verification failed" },
+        { status: 200, description: "Webhook accepted (provider-defined acknowledgement may apply)" },
+        { status: 202, description: "Webhook accepted for processing (default acknowledgement)" },
+        { status: 400, description: "Webhook rejected (provider-defined response may apply)" },
+        { status: 401, description: "Webhook could not be verified or processed (default failure response)" },
+        { status: 404, description: "Unknown provider" },
         { status: 413, description: "Webhook payload too large" },
-        { status: 404, description: "Unknown provider" }
+        { status: 429, description: "Too many webhook requests" },
+        { status: 500, description: "Internal server error (provider-defined response may apply)" },
+        { status: 503, description: "Webhook temporarily unavailable (provider-defined response may apply)" }
       ]
     }
   }