@open-mercato/core 0.6.8-develop.7099.1.7ba2771d06 → 0.7.0

package/src/modules/messages/api/[id]/route.ts

@@ -2,7 +2,6 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import type { CommandBus } from '@open-mercato/shared/lib/commands/command-bus'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi/types'
 import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
-import { applyResponseEnricherToRecord } from '@open-mercato/shared/lib/crud/enricher-runner'
 import { enforceCommandOptimisticLock } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
 import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { User } from '../../../auth/data/entities'
@@ -39,36 +38,6 @@ type MessageObjectPreviewPayload = {
   metadata?: Record<string, string>
 } | null
 
-type RbacServiceLike = {
-  getGrantedFeatures?: (
-    userId: string,
-    scope: { tenantId: string | null; organizationId: string | null },
-  ) => Promise<string[]>
-}
-
-/**
- * Feature list for the enricher ACL gate, resolved from RBAC.
- *
- * Mirrors `customers/api/interactions/route.ts`. Returning `undefined` on
- * failure is deliberate — the runner then treats every feature-gated enricher
- * as denied, which is the safe direction.
- */
-async function resolveGrantedFeatures(
-  container: { resolve: (name: string) => unknown },
-  scope: { tenantId: string; organizationId: string | null; userId: string },
-): Promise<string[] | undefined> {
-  try {
-    const rbac = container.resolve('rbacService') as RbacServiceLike | undefined
-    if (!rbac?.getGrantedFeatures) return undefined
-    return await rbac.getGrantedFeatures(scope.userId, {
-      tenantId: scope.tenantId,
-      organizationId: scope.organizationId,
-    })
-  } catch {
-    return undefined
-  }
-}
-
 export async function GET(req: Request, { params }: { params: { id: string } }) {
   const { ctx, scope } = await resolveMessageContext(req)
   const em = ctx.container.resolve('em') as EntityManager
@@ -221,7 +190,7 @@ export async function GET(req: Request, { params }: { params: { id: string } })
     })
   }
 
-  const detail: Record<string, unknown> = {
+  return Response.json({
     id: message.id,
     updatedAt: message.updatedAt ?? null,
     type: message.type,
@@ -288,9 +257,6 @@ export async function GET(req: Request, { params }: { params: { id: string } })
         senderUserId: threadMessage.senderUserId,
         senderName: threadSenderName,
         senderEmail: sender?.email ?? null,
-        externalName: threadMessage.externalName ?? null,
-        externalEmail: threadMessage.externalEmail ?? null,
-        sourceEntityType: threadMessage.sourceEntityType ?? null,
         body: threadMessage.body,
         bodyFormat: threadMessage.bodyFormat,
         sentAt: threadMessage.sentAt,
@@ -299,27 +265,7 @@ export async function GET(req: Request, { params }: { params: { id: string } })
     isRead: recipient ? (autoMarkRead || recipient.status !== 'unread') : true,
     conversationArchived,
     conversationAllUnread,
-  }
-
-  // Mirrors `enrichSingleRecord` in `shared/lib/crud/factory.ts`, which every
-  // `makeCrudRoute` host gets for free: same `_meta` envelope, and no blanket
-  // catch so a `critical: true` enricher still surfaces as an HTTP error.
-  // Non-critical failures never escape the runner — it merges `fallback` and
-  // records the id in `_meta.enricherErrors`.
-  const enriched = await applyResponseEnricherToRecord(detail, 'messages.message', {
-    organizationId: scope.organizationId ?? '',
-    tenantId: scope.tenantId,
-    userId: scope.userId,
-    em,
-    container: ctx.container,
-    userFeatures: await resolveGrantedFeatures(ctx.container, scope),
   })
-
-  if (enriched._meta.enrichedBy.length > 0 || enriched._meta.enricherErrors?.length) {
-    return Response.json({ ...enriched.record, _meta: enriched._meta })
-  }
-
-  return Response.json(enriched.record)
 }
 
 export async function PATCH(req: Request, { params }: { params: { id: string } }) {

package/src/modules/messages/api/openapi.ts

@@ -1,7 +1,6 @@
 import { z } from 'zod'
 import {
   attachmentIdsPayloadSchema,
-  composeMessageRequestSchema,
   composeMessageSchema,
   executeActionSchema,
   forwardMessageSchema,
@@ -51,19 +50,11 @@ export const messageListItemSchema = z.object({
   threadId: z.string().uuid().nullable().optional(),
 })
 
-export const enrichmentMetaSchema = z.object({
-  enrichedBy: z.array(z.string()),
-  enricherErrors: z.array(z.string()).optional(),
-})
-
 export const messageThreadItemSchema = z.object({
   id: z.string().uuid(),
   senderUserId: z.string().uuid(),
   senderName: z.string().nullable().optional(),
   senderEmail: z.string().nullable().optional(),
-  externalName: z.string().nullable().optional(),
-  externalEmail: z.string().nullable().optional(),
-  sourceEntityType: z.string().nullable().optional(),
   body: z.string(),
   bodyFormat: z.enum(['text', 'markdown']).optional(),
   sentAt: z.string().nullable().optional(),
@@ -135,17 +126,7 @@ export const messageDetailResponseSchema = z.object({
   isRead: z.boolean(),
   conversationArchived: z.boolean(),
   conversationAllUnread: z.boolean(),
-  _channel: z.record(z.string(), z.unknown()).nullable().optional(),
-  _channelPayload: z.record(z.string(), z.unknown()).nullable().optional(),
-  _channelContact: z.record(z.string(), z.unknown()).nullable().optional(),
-  _reactions: z.array(z.record(z.string(), z.unknown())).optional(),
-  _meta: enrichmentMetaSchema.optional(),
 })
-  // The detail route runs response enrichers for `messages.message`, so any
-  // module registering one may contribute further `_`-prefixed keys. Without
-  // this the generator emits `additionalProperties: false` and the published
-  // spec forbids the very fields the route returns.
-  .passthrough()
 
 export const messageTokenDetailResponseSchema = z.object({
   id: z.string().uuid(),
@@ -284,7 +265,6 @@ export {
   messageObjectSchema,
   messageRecipientSchema,
   composeMessageSchema,
-  composeMessageRequestSchema,
   listMessagesSchema,
   forwardMessageSchema,
   replyMessageSchema,

package/src/modules/messages/api/route.ts

@@ -17,11 +17,6 @@ import { lookupHashCandidates } from '@open-mercato/shared/lib/encryption/aes'
 import { User } from '../../auth/data/entities'
 import { Message, MessageObject } from '../data/entities'
 import { composeMessageSchema, listMessagesSchema, type ListMessagesInput } from '../data/validators'
-import {
-  composeRequiresChannelTypeResolution,
-  composeSourceHintSchema,
-  resolveComposeSourceChannelType,
-} from '../lib/composeSourceChannelType'
 import { MESSAGE_ATTACHMENT_ENTITY_ID } from '../lib/constants'
 import { getMessageType } from '../lib/message-types-registry'
 import { validateMessageObjectsForType } from '../lib/object-validation'
@@ -32,7 +27,7 @@ import { resolveUserFeatures, runMessageMutationGuardAfterSuccess, runMessageMut
 import { findMessageIdsBySearchTokens } from '../lib/searchLookup'
 import { MessageCommandExecuteResult } from '../commands/shared'
 import {
-  composeMessageRequestSchema as composeSchema,
+  composeMessageSchema as composeSchema,
   composeResponseSchema,
   listMessagesSchema as listSchema,
   messageListItemSchema,
@@ -450,31 +445,7 @@ export async function POST(req: Request) {
   const { ctx, scope } = await resolveMessageContext(req)
   const commandBus = ctx.container.resolve('commandBus') as CommandBus
   const body = await req.json().catch(() => ({}))
-
-  // #4975: whether `externalEmail` is required depends on the channel this
-  // message originates from, so the channel type has to be established BEFORE
-  // validation. It is resolved server-side from the referenced conversation or
-  // parent message and any client-sent `sourceChannelType` is dropped —
-  // otherwise a caller could waive the requirement by asserting its own type.
-  // An unresolvable source stays `undefined`, which the validator fails closed on.
-  // Only the "public, non-draft, no address" branch of the validator reads the
-  // answer, so every other compose skips the lookup instead of discarding it.
-  const sourceHint = composeRequiresChannelTypeResolution(body)
-    ? composeSourceHintSchema.safeParse(body)
-    : null
-  const sourceChannelType = sourceHint?.success
-    ? await resolveComposeSourceChannelType(
-        ctx.container,
-        { tenantId: scope.tenantId, organizationId: scope.organizationId ?? null },
-        sourceHint.data,
-      )
-    : undefined
-  const { sourceChannelType: _clientSuppliedChannelType, ...clientBody } =
-    (body ?? {}) as Record<string, unknown>
-  const input = composeMessageSchema.parse({
-    ...clientBody,
-    ...(sourceChannelType ? { sourceChannelType } : {}),
-  })
+  const input = composeMessageSchema.parse(body)
 
   const isPublicVisibility = input.visibility === 'public'
   const sendViaEmail = isPublicVisibility ? true : input.sendViaEmail

package/src/modules/messages/components/MessagesInboxPageClient.tsx

@@ -24,7 +24,6 @@ import { useMessagesInboxBulkActions, type MessageFolder } from './useMessagesIn
 import {
   buildMessagesInboxFilters,
   buildMessagesListParams,
-  buildSenderOptionsFromMessages,
   type SenderOption,
 } from './inboxFilters'
 import { createLogger } from '@open-mercato/shared/lib/logger'
@@ -39,9 +38,6 @@ type MessageListItem = {
   senderUserId: string
   senderName?: string | null
   senderEmail?: string | null
-  externalName?: string | null
-  externalEmail?: string | null
-  sourceEntityType?: string | null
   priority: string
   status: string
   hasObjects: boolean
@@ -62,7 +58,6 @@ type MessageListResponse = {
   page?: number
   pageSize?: number
   totalPages?: number
-  totalIsCapped?: boolean
 }
 
 type MessageTypeItem = {
@@ -143,7 +138,6 @@ export function MessagesInboxPageClient() {
         page: Number(call.result?.page ?? page),
         pageSize: Number(call.result?.pageSize ?? pageSize),
         totalPages: Number(call.result?.totalPages ?? 0),
-        totalIsCapped: call.result?.totalIsCapped === true,
       }
     },
   })
@@ -242,7 +236,22 @@ export function MessagesInboxPageClient() {
 
   React.useEffect(() => {
     const items = listQuery.data?.items ?? []
-    mergeSenderOptions(buildSenderOptionsFromMessages(items))
+    const next = items.flatMap((item): SenderOption[] => {
+      if (typeof item.senderUserId !== 'string' || item.senderUserId.trim().length === 0) return []
+      const name = typeof item.senderName === 'string' && item.senderName.trim().length > 0
+        ? item.senderName.trim()
+        : null
+      const email = typeof item.senderEmail === 'string' && item.senderEmail.trim().length > 0
+        ? item.senderEmail.trim()
+        : null
+      const label = name ?? email ?? item.senderUserId
+      return [{
+        value: item.senderUserId,
+        label,
+        description: email && email !== label ? email : null,
+      }]
+    })
+    mergeSenderOptions(next)
   }, [listQuery.data?.items, mergeSenderOptions])
 
   React.useEffect(() => {
@@ -352,7 +361,6 @@ export function MessagesInboxPageClient() {
 
   const rows = listQuery.data?.items ?? []
   const total = listQuery.data?.total ?? 0
-  const totalIsCapped = listQuery.data?.totalIsCapped === true
   const totalPages = listQuery.data?.totalPages ?? 0
 
   return (
@@ -390,7 +398,6 @@ export function MessagesInboxPageClient() {
           pageSize,
           total,
           totalPages,
-          totalIsCapped,
           onPageChange: setPage,
         }}
         actions={

package/src/modules/messages/components/inboxFilters.ts

@@ -8,42 +8,6 @@ export type SenderOption = {
   description?: string | null
 }
 
-type SenderOptionSource = {
-  senderUserId?: string | null
-  senderName?: string | null
-  senderEmail?: string | null
-}
-
-/**
- * Sender-filter options derived from the rows currently in the list.
- *
- * The filter narrows by `senderUserId`, so a row only yields an honest option
- * when it also carries the platform identity behind that id. Ingested external
- * mail does not: every such message in a tenant is composed under one
- * system-user id, so labelling that id with one external sender's name would
- * collapse every external sender into a single option that quietly returns all
- * of their mail. Those rows are skipped, and the directory-loaded options —
- * which are real platform users — stand alone.
- */
-export function buildSenderOptionsFromMessages(items: SenderOptionSource[]): SenderOption[] {
-  return items.flatMap((item): SenderOption[] => {
-    if (typeof item.senderUserId !== 'string' || item.senderUserId.trim().length === 0) return []
-    const name = typeof item.senderName === 'string' && item.senderName.trim().length > 0
-      ? item.senderName.trim()
-      : null
-    const email = typeof item.senderEmail === 'string' && item.senderEmail.trim().length > 0
-      ? item.senderEmail.trim()
-      : null
-    const label = name ?? email
-    if (!label) return []
-    return [{
-      value: item.senderUserId,
-      label,
-      description: email && email !== label ? email : null,
-    }]
-  })
-}
-
 export type MessagesInboxFilterContext = {
   t: Translator
   typeOptions: { value: string; label: string }[]

package/src/modules/messages/components/message-detail/hooks/useMessageDetailsConversation.ts

@@ -4,16 +4,12 @@ import * as React from 'react'
 import type { TranslateFn } from '@open-mercato/shared/lib/i18n/context'
 import type { MessageListItemProps } from '@open-mercato/shared/modules/messages/types'
 import type { MessageDetail } from '../types'
-import { getMessageParticipantLabel } from '../../messageListLabels'
 
 export type ConversationItem = {
   id: string
   senderUserId: string
   senderName?: string | null
   senderEmail?: string | null
-  externalName?: string | null
-  externalEmail?: string | null
-  sourceEntityType?: string | null
   body: string
   bodyFormat?: 'text' | 'markdown'
   sentAt?: string | null
@@ -37,9 +33,6 @@ export function useMessageDetailsConversation({
         senderUserId: detail.senderUserId,
         senderName: detail.senderName,
         senderEmail: detail.senderEmail,
-        externalName: detail.externalName,
-        externalEmail: detail.externalEmail,
-        sourceEntityType: detail.sourceEntityType,
         body: detail.body,
         bodyFormat: detail.bodyFormat,
         sentAt: detail.sentAt,
@@ -53,9 +46,6 @@ export function useMessageDetailsConversation({
         senderUserId: item.senderUserId,
         senderName: item.senderName,
         senderEmail: item.senderEmail,
-        externalName: item.externalName,
-        externalEmail: item.externalEmail,
-        sourceEntityType: item.sourceEntityType,
         body: item.body,
         bodyFormat: item.bodyFormat,
         sentAt: item.sentAt,
@@ -68,9 +58,6 @@ export function useMessageDetailsConversation({
         senderUserId: detail.senderUserId,
         senderName: detail.senderName,
         senderEmail: detail.senderEmail,
-        externalName: detail.externalName,
-        externalEmail: detail.externalEmail,
-        sourceEntityType: detail.sourceEntityType,
         body: detail.body,
         bodyFormat: detail.bodyFormat,
         sentAt: detail.sentAt,
@@ -127,7 +114,7 @@ export function useMessageDetailsConversation({
     bodyFormat: item.bodyFormat ?? 'text',
     priority: 'normal',
     sentAt: item.sentAt ? new Date(item.sentAt) : null,
-    senderName: getMessageParticipantLabel(item),
+    senderName: item.senderName || item.senderEmail || item.senderUserId,
     hasObjects: (item.objects ?? []).length > 0,
     objectCount: (item.objects ?? []).length,
     hasAttachments: false,

package/src/modules/messages/components/message-detail/panels/MessageHeader.tsx

@@ -18,7 +18,6 @@ import {
 } from 'lucide-react'
 import type { MessageDetail } from '../types'
 import { formatDateTime } from '../utils'
-import { getMessageParticipantLabel } from '../../messageListLabels'
 
 type MessageHeaderProps = {
   detail: MessageDetail
@@ -41,7 +40,6 @@ export function MessageHeader(props: MessageHeaderProps) {
   const t = useT()
   const showSubject = props.showSubject !== false
   const canReply = !props.detail.isDraft && props.detail.typeDefinition.allowReply
-  const senderLabel = getMessageParticipantLabel(props.detail)
   const actionItems = React.useMemo(() => {
     const items: ActionItem[] = []
 
@@ -123,7 +121,7 @@ export function MessageHeader(props: MessageHeaderProps) {
         <FormHeader
           mode="detail"
           title={showSubject ? props.detail.subject : undefined}
-          subtitle={`${t('messages.detail.from', 'From')}: ${senderLabel}`}
+          subtitle={`${t('messages.detail.from', 'From')}: ${props.detail.senderName || props.detail.senderEmail || props.detail.senderUserId}`}
           statusBadge={<p className="text-xs text-muted-foreground">{formatDateTime(props.detail.sentAt)}</p>}
           utilityActions={canReply ? (
             <IconButton

package/src/modules/messages/components/message-detail/panels/thread-panel.tsx

@@ -6,7 +6,6 @@ import { getMessageUiComponentRegistry } from '../../utils/typeUiRegistry'
 import { getMessageObjectType } from '../../../lib/message-objects-registry'
 import type { MessageDetail, MessageDetailObject } from '../types'
 import { formatDateTime } from '../utils'
-import { getMessageParticipantLabel } from '../../messageListLabels'
 
 export function MessageDetailThreadSection({ detail }: { detail: MessageDetail }) {
   const t = useT()
@@ -21,7 +20,7 @@ export function MessageDetailThreadSection({ detail }: { detail: MessageDetail }
         {(detail.thread ?? []).map((threadItem) => (
           <article key={threadItem.id} className="rounded border p-3">
             <p className="text-xs text-muted-foreground">
-              {getMessageParticipantLabel(threadItem)} • {formatDateTime(threadItem.sentAt)}
+              {(threadItem.senderName || threadItem.senderEmail || threadItem.senderUserId)} • {formatDateTime(threadItem.sentAt)}
             </p>
             <div className="mt-2 max-h-[60vh] overflow-y-auto pr-1">
               <MarkdownContent

package/src/modules/messages/components/message-detail/types.ts

@@ -94,9 +94,6 @@ export type MessageDetail = {
     senderUserId: string
     senderName?: string | null
     senderEmail?: string | null
-    externalName?: string | null
-    externalEmail?: string | null
-    sourceEntityType?: string | null
     body: string
     bodyFormat?: 'text' | 'markdown'
     sentAt?: string | null

package/src/modules/messages/components/messageListLabels.ts

@@ -2,29 +2,9 @@ import type { MessageFolder } from './useMessagesInboxBulkActions'
 
 type Translate = (key: string, fallback: string, params?: Record<string, string | number>) => string
 
-/**
- * `Message.sourceEntityType` written by `communication_channels`'
- * `ingest-inbound-message` command, and by nothing else — the outbound bridge
- * treats it as the marker that a message arrived from outside the platform
- * rather than being sent from it. It is the only reliable inbound
- * discriminator: `type` is `channel.<provider>` on the outbound
- * `send-as-user` path too, where `externalName` carries the recipient side.
- */
-const INBOUND_EXTERNAL_SOURCE_ENTITY_TYPE = 'communication_channels.external_conversation'
-
 type MessageParticipantSource = {
   senderName?: string | null
   senderEmail?: string | null
-  /**
-   * The external counterparty on a message that crosses the platform boundary —
-   * the sender for an inbound email/chat ingested by `communication_channels`,
-   * the recipient for an outbound reply sent through `inbox_ops`. Which side it
-   * represents is decided by `sourceEntityType`, not by whether a platform
-   * sender happens to be present.
-   */
-  externalName?: string | null
-  externalEmail?: string | null
-  sourceEntityType?: string | null
   senderUserId: string
   recipientCount?: number | null
 }
@@ -34,37 +14,6 @@ function normalizeLabel(value: string | null | undefined): string | null {
   return normalized ? normalized : null
 }
 
-function isInboundExternalMessage(item: MessageParticipantSource): boolean {
-  return item.sourceEntityType === INBOUND_EXTERNAL_SOURCE_ENTITY_TYPE
-}
-
-/**
- * Human-readable label for a message's author.
- *
- * An ingested inbound message is authored by the external counterparty, even
- * though it is composed under a platform user id: that id is the
- * `communication_channels` system user, or — once an operator assigns the
- * conversation — the assigned agent, who resolves to a real name in the user
- * directory and would otherwise be printed as the author of the customer's own
- * email. So on the inbound side the external identity wins, and the platform
- * identity is only the fallback. Everywhere else the platform sender is the
- * author and the external identity describes the recipient, so the order is
- * reversed. The raw user id remains the last resort in both directions.
- *
- * The single source of truth for every place the messages module prints a
- * participant — the inbox list, the detail header and the conversation rows —
- * so an ingested email renders as "Jane Doe" / "jane@example.com" rather than
- * the `communication_channels` system user id or the agent handling it.
- */
-export function getMessageParticipantLabel(item: MessageParticipantSource): string {
-  const platformIdentity = normalizeLabel(item.senderName) ?? normalizeLabel(item.senderEmail)
-  const externalIdentity = normalizeLabel(item.externalName) ?? normalizeLabel(item.externalEmail)
-  const preferred = isInboundExternalMessage(item) ? externalIdentity : platformIdentity
-  const fallback = isInboundExternalMessage(item) ? platformIdentity : externalIdentity
-
-  return preferred ?? fallback ?? item.senderUserId
-}
-
 export function getMessageListParticipantLabel(
   item: MessageParticipantSource,
   folder: MessageFolder,
@@ -74,5 +23,7 @@ export function getMessageListParticipantLabel(
     return t('messages.list.noRecipient', '(No recipient)')
   }
 
-  return getMessageParticipantLabel(item)
+  return normalizeLabel(item.senderName)
+    ?? normalizeLabel(item.senderEmail)
+    ?? item.senderUserId
 }

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

@@ -1,7 +1,6 @@
 import { z } from 'zod'
 import { parseBooleanFlag } from '@open-mercato/shared/lib/boolean'
 import { sanitizeRichTextHref } from '@open-mercato/shared/lib/html/sanitizeRichText'
-import { channelTypeRequiresExternalEmail } from '../lib/channel-sender-identity'
 
 function collectDuplicateRecipientIds(
   recipients: Array<{ userId: string }>,
@@ -100,22 +99,13 @@ export const messageActionDataSchema = z.object({
   expiresAt: z.string().datetime().optional(),
 })
 
-const composeMessageBaseSchema = z.object({
+export const composeMessageSchema = z.object({
   type: z.string().optional().default('default'),
   visibility: z.enum(['public', 'internal']).nullable().optional(),
   sourceEntityType: z.string().min(1).optional(),
   sourceEntityId: z.string().uuid().optional(),
   externalEmail: z.string().email().optional(),
   externalName: z.string().min(1).max(255).optional(),
-  /**
-   * Channel type the message originates from, when the caller knows it (#4975).
-   * Non-email channels (Discord, Slack, SMS…) have senders with no address, so
-   * `externalEmail` is not required for them. Resolved server-side — the HTTP
-   * route strips any client-sent value and derives it from the referenced
-   * conversation or parent message, so a caller cannot waive the requirement by
-   * asserting its own channel type.
-   */
-  sourceChannelType: z.string().min(1).max(64).optional(),
   recipients: z.array(messageRecipientSchema).max(100).optional().default([]),
   subject: z.string().max(500).optional().default(''),
   body: z.string().max(50000).optional().default(''),
@@ -128,14 +118,7 @@ const composeMessageBaseSchema = z.object({
   sendViaEmail: z.boolean().optional().default(false),
   parentMessageId: z.string().uuid().optional(),
   isDraft: z.boolean().optional().default(false),
-})
-
-type ComposeMessageRefinementValue = Omit<
-  z.infer<typeof composeMessageBaseSchema>,
-  'sourceChannelType'
-> & { sourceChannelType?: string }
-
-function refineComposeMessage(value: ComposeMessageRefinementValue, ctx: z.RefinementCtx): void {
+}).superRefine((value, ctx) => {
   const isDraft = value.isDraft ?? false
   const visibility = value.visibility ?? 'internal'
   const recipientCount = value.recipients.length
@@ -145,10 +128,7 @@ function refineComposeMessage(value: ComposeMessageRefinementValue, ctx: z.Refin
 
   if (!isDraft) {
     if (visibility === 'public') {
-      // #4975: an external correspondent is only guaranteed to have an address
-      // on an email-typed channel. `channelTypeRequiresExternalEmail` fails
-      // closed, so an unknown or absent channel type keeps the original rule.
-      if (!hasExternalEmail && channelTypeRequiresExternalEmail(value.sourceChannelType)) {
+      if (!hasExternalEmail) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
           path: ['externalEmail'],
@@ -196,26 +176,7 @@ function refineComposeMessage(value: ComposeMessageRefinementValue, ctx: z.Refin
   }
 
   validateDefaultWithObjectsPayload(value, ctx)
-}
-
-/**
- * Full compose contract, including the server-resolved `sourceChannelType`.
- * Used by the `messages.messages.compose` command and by the HTTP route AFTER
- * it has resolved the channel type itself.
- */
-export const composeMessageSchema = composeMessageBaseSchema.superRefine(refineComposeMessage)
-
-/**
- * Client-facing compose contract — the same rules minus `sourceChannelType`,
- * which is never accepted from a request body (#4975). Published in OpenAPI so
- * the documented request shape matches what `POST /api/messages` actually reads:
- * the route discards any client-sent channel type, resolves the real one from
- * the referenced conversation or parent message, and only then validates against
- * {@link composeMessageSchema}.
- */
-export const composeMessageRequestSchema = composeMessageBaseSchema
-  .omit({ sourceChannelType: true })
-  .superRefine(refineComposeMessage)
+})
 
 export const updateDraftSchema = z.object({
   type: z.string().optional(),

package/src/modules/payment_gateways/api/webhook/[provider]/route.ts

@@ -6,7 +6,6 @@ import { checkRateLimit, getClientIp, RATE_LIMIT_ERROR_FALLBACK } from '@open-me
 import type { RateLimiterService } from '@open-mercato/shared/lib/ratelimit/service'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { getWebhookHandler } from '@open-mercato/shared/modules/payment_gateways/types'
-import { markQueueJobOrigin } from '@open-mercato/shared/lib/queue/dispatchOrigin'
 import type { IntegrationLogService } from '../../../../integrations/lib/log-service'
 import type { PaymentGatewayService } from '../../../lib/gateway-service'
 import type { CredentialsService } from '../../../../integrations/lib/credentials-service'
@@ -112,15 +111,18 @@ export async function POST(req: Request, { params }: { params: Promise<{ provide
 
     const scope = matchedScope
 
-    const jobPayload = markQueueJobOrigin({
+    const jobPayload = {
       providerKey,
       event,
       transactionId: transaction.id,
       scope,
-    }, 'inbound-webhook')
+    }
 
     if (process.env.QUEUE_STRATEGY === 'async') {
-      await queue.enqueue(jobPayload)
+      await queue.enqueue({
+        name: 'payment-gateway-webhook',
+        payload: jobPayload,
+      })
     } else {
       await processPaymentGatewayWebhookJob(
         {

package/src/modules/payment_gateways/backend/payment-gateways/page.tsx

@@ -89,7 +89,6 @@ type TransactionsResponse = {
   page: number
   pageSize: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 const STATUS_STYLES: Record<string, string> = {
@@ -184,7 +183,6 @@ export default function PaymentTransactionsPage() {
   const [page, setPage] = React.useState(1)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [search, setSearch] = React.useState('')
   const [filterValues, setFilterValues] = React.useState<FilterValues>({})
   const [isLoading, setIsLoading] = React.useState(true)
@@ -231,7 +229,6 @@ export default function PaymentTransactionsPage() {
       setRows(Array.isArray(call.result.items) ? call.result.items : [])
       setTotal(call.result.total ?? 0)
       setTotalPages(call.result.totalPages ?? 1)
-      setTotalIsCapped(call.result?.totalIsCapped === true)
     } else {
       flash(t('payment_gateways.transactions.error.load', 'Failed to load payment transactions'), 'error')
       setRows([])
@@ -477,7 +474,7 @@ export default function PaymentTransactionsPage() {
           onSearchChange={(value) => { setSearch(value); setPage(1) }}
           searchPlaceholder={t('payment_gateways.transactions.searchPlaceholder', 'Search by payment, transaction, session, or gateway id')}
           perspective={{ tableId: extensionPoints.hosts.transactionsTable.tableId }}
-          pagination={{ page, pageSize: 20, total, totalPages, totalIsCapped, onPageChange: setPage }}
+          pagination={{ page, pageSize: 20, total, totalPages, onPageChange: setPage }}
           isLoading={isLoading}
           onRowClick={(row) => setSelectedId((current) => current === row.id ? null : row.id)}
           rowActions={(row) => (