@open-mercato/core 0.6.8-develop.7100.1.fbf66fca35 → 0.7.0

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) => (

package/src/modules/payment_gateways/lib/webhook-processor.ts

@@ -1,13 +1,9 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { getGatewayAdapter, type WebhookEvent } from '@open-mercato/shared/modules/payment_gateways/types'
-import { isTrustedWebhookDispatch } from '@open-mercato/shared/lib/queue/dispatchOrigin'
-import { createLogger } from '@open-mercato/shared/lib/logger'
 import type { IntegrationLogService } from '../../integrations/lib/log-service'
 import type { PaymentGatewayService } from './gateway-service'
 import { claimWebhookProcessing, releaseWebhookClaim } from './webhook-utils'
 
-const logger = createLogger('payment_gateways').child({ component: 'webhook-processor' })
-
 export type PaymentGatewayWebhookJobPayload = {
   providerKey: string
   event: WebhookEvent
@@ -57,13 +53,6 @@ export async function processPaymentGatewayWebhookJob(
 ): Promise<void> {
   const { em, paymentGatewayService, integrationLogService } = deps
   const { providerKey, event } = payload
-  // Fail closed on untrusted dispatch origins (#5213): only jobs enqueued by the
-  // inbound webhook route (signature verified) may drive payment state. Jobs that
-  // arrive through any other path — e.g. a scheduled queue target — are dropped.
-  if (!isTrustedWebhookDispatch(payload)) {
-    logger.error('Dropping webhook job with missing or untrusted dispatch origin', { providerKey, eventType: event?.eventType ?? null })
-    return
-  }
   // Scope MUST come from the trusted route layer (derived from a verified GatewayTransaction).
   // Never fall back to attacker-controlled metadata on `event.data.metadata` — that was the
   // vector that allowed forged mock webhooks to mutate another tenant's payment state.

package/src/modules/planner/backend/planner/availability-rulesets/page.tsx

@@ -39,7 +39,6 @@ type RuleSetResponse = {
   items?: Array<Record<string, unknown>>
   total?: number
   totalPages?: number
-  totalIsCapped?: boolean
 }
 
 export default function PlannerAvailabilityRuleSetsPage() {
@@ -68,7 +67,6 @@ export default function PlannerAvailabilityRuleSetsPage() {
   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 [sorting, setSorting] = React.useState<SortingState>([{ id: 'name', desc: false }])
   const [search, setSearch] = React.useState('')
   const [isLoading, setIsLoading] = React.useState(true)
@@ -122,7 +120,6 @@ export default function PlannerAvailabilityRuleSetsPage() {
       setRows(items.map(mapRuleSet))
       setTotal(typeof payload.total === 'number' ? payload.total : items.length)
       setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : Math.max(1, Math.ceil(items.length / PAGE_SIZE)))
-      setTotalIsCapped(payload?.totalIsCapped === true)
     } catch (error) {
       logger.error('Failed to list availability rule sets', { err: error })
       flash(labels.errors.load, 'error')
@@ -232,7 +229,6 @@ export default function PlannerAvailabilityRuleSetsPage() {
             pageSize: PAGE_SIZE,
             total,
             totalPages,
-            totalIsCapped,
             onPageChange: setPage,
           }}
           rowActions={(row) => (

package/src/modules/push_notifications/backend/push_notifications/page.tsx

@@ -32,7 +32,6 @@ type ResponsePayload = {
   page?: number
   pageSize?: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 const statusVariant: StatusMap<PushDeliveryStatus> = {
@@ -60,7 +59,6 @@ export default function PushDeliveriesListPage() {
   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 [isLoading, setIsLoading] = React.useState(true)
   const scopeVersion = useOrganizationScopeVersion()
   const t = useT()
@@ -158,7 +156,6 @@ export default function PushDeliveriesListPage() {
           setRows(Array.isArray(payload.items) ? payload.items : [])
           setTotal(payload.total || 0)
           setTotalPages(payload.totalPages || 1)
-          setTotalIsCapped(payload?.totalIsCapped === true)
         }
       } catch (error) {
         if (!cancelled) {
@@ -232,7 +229,7 @@ export default function PushDeliveriesListPage() {
           onFiltersClear={() => { setFilterValues({}); setPage(1) }}
           perspective={{ tableId: 'push_notifications.deliveries' }}
           onRowClick={(row) => { window.location.href = `/backend/push_notifications/${row.id}` }}
-          pagination={{ page, pageSize: 50, total, totalPages, totalIsCapped, onPageChange: setPage }}
+          pagination={{ page, pageSize: 50, total, totalPages, onPageChange: setPage }}
           isLoading={isLoading}
           emptyState={t('push_notifications.deliveries.empty')}
         />

package/src/modules/push_notifications/backend/push_notifications/send/page.tsx

@@ -70,7 +70,7 @@ function DeviceField({ value, setValue, setFormValue, values, onState }: CrudCus
     let cancelled = false
     setLoading(true)
     const params = new URLSearchParams({ userId, pageSize: '50' })
-    apiCall<{ items?: Array<{ id: string; deviceId: string; platform: string; pushProvider?: string | null }> }>(
+    apiCall<{ items?: Array<{ id: string; device_id: string; platform: string; push_provider?: string | null }> }>(
       `/api/devices/admin/devices?${params.toString()}`,
       { headers: { 'x-om-forbidden-redirect': '0' } },
       { fallback: null },
@@ -80,9 +80,9 @@ function DeviceField({ value, setValue, setFormValue, values, onState }: CrudCus
         if (cancelled) return
         const items = (call && call.ok ? call.result?.items : []) ?? []
         const opts = items
-          .filter((d): d is { id: string; deviceId: string; platform: string; pushProvider?: string | null } =>
-            !!d && typeof d.id === 'string' && !!d.pushProvider)
-          .map((d) => ({ id: d.id, label: `${d.deviceId} · ${d.platform}${d.pushProvider ? ` · ${d.pushProvider}` : ''}`, platform: d.platform }))
+          .filter((d): d is { id: string; device_id: string; platform: string; push_provider?: string | null } =>
+            !!d && typeof d.id === 'string' && !!d.push_provider)
+          .map((d) => ({ id: d.id, label: `${d.device_id} · ${d.platform}${d.push_provider ? ` · ${d.push_provider}` : ''}`, platform: d.platform }))
         setDevices(opts)
         if (selected && !opts.some((o) => o.id === selected)) setValue('')
       })