@open-mercato/core 0.10.1-develop.7771.1.615a6c9ba9 → 0.10.1-develop.7773.1.a41b0f6c03

package/src/modules/customers/lib/link-channel-message-handler.ts

@@ -95,17 +95,6 @@ export default async function handler(
   const metaJson = (link.channelMetadata ?? null) as Record<string, unknown> | null
   const payloadJson = (link.channelPayload ?? null) as Record<string, unknown> | null
 
-  // ── (1b) Resolve when the email actually happened ─────────────────────
-  //
-  // `link.createdAt` is when the hub ingested the message, which for a history
-  // import is the import minute, not the day the mail arrived (#6095). The hub
-  // carries the provider's own timestamp on the event payload, so take it from
-  // there: reading the communication_channels ExternalMessage row here would
-  // cross the storage boundary (Cross-Module Coupling in AGENTS.md) and add a
-  // peer-table query per event. Resolved once and threaded through every branch
-  // below so the address-match and threading-inheritance paths agree.
-  const occurredAt = resolveOccurredAt(payload, link)
-
   // ── (2) Resolve the channel to get its owner userId ───────────────────
   //
   // The channel.userId is needed for two purposes:
@@ -130,6 +119,8 @@ export default async function handler(
     channelUserId = channel?.userId ?? null
   }
 
+  const occurredAt = await resolveEmailOccurredAt(em, link, tenantId, organizationId, payload)
+
   // ── (3) Collect recipient addresses ───────────────────────────────────
   //
   // The channel metadata shape differs by provider and direction:
@@ -281,7 +272,7 @@ async function handleThreadingInheritance(
   channelId: string | null,
   metaJson: Record<string, unknown> | null,
   payloadJson: Record<string, unknown> | null,
-  occurredAt: Date,
+  occurredAt: Date | null,
 ): Promise<void> {
   // ── Primary: inherit Person(s) from the hub's authoritative thread ──────
   //
@@ -474,35 +465,33 @@ async function handleThreadingInheritance(
   )
 }
 
-// ── Helpers ───────────────────────────────────────────────────────────────
-
-/**
- * When the linked email happened, for `CustomerInteraction.occurredAt` (#6095).
- *
- * Preference order:
- *   1. `payload.providerTimestamp` — the provider's own receive/send time, put
- *      on the hub event by ingest / delivery;
- *   2. `MessageChannelLink.createdAt` — the ingest time, the only date this
- *      handler knew before #6095, and the compatibility path for events that
- *      were enqueued before the field existed;
- *   3. now, for a link row with no usable `createdAt` (test stubs).
- */
-function resolveOccurredAt(
-  payload: LinkChannelMessagePayload,
+async function resolveEmailOccurredAt(
+  em: EntityManager,
   link: Record<string, unknown>,
-): Date {
-  const ingestedAt = link.createdAt instanceof Date ? link.createdAt : new Date()
+  tenantId: string,
+  organizationId: string | null,
+  payload: LinkChannelMessagePayload,
+): Promise<Date | null> {
+  const message = typeof link.messageId === 'string'
+    ? await findOneWithDecryption(
+        em,
+        'Message' as never,
+        { id: link.messageId, tenantId, organizationId, deletedAt: null } as never,
+        undefined,
+        { tenantId, organizationId },
+      ) as { sentAt?: Date | null } | null
+    : null
+
+  if (message) return message.sentAt ?? null
   const carried = payload.providerTimestamp
-  if (carried instanceof Date) {
-    return Number.isNaN(carried.getTime()) ? ingestedAt : carried
-  }
-  if (typeof carried === 'string' && carried) {
-    const parsed = new Date(carried)
-    if (!Number.isNaN(parsed.getTime())) return parsed
-  }
-  return ingestedAt
+  const providerTimestamp = carried instanceof Date
+    ? carried
+    : typeof carried === 'string' && carried ? new Date(carried) : null
+  return providerTimestamp && !Number.isNaN(providerTimestamp.getTime()) ? providerTimestamp : null
 }
 
+// ── Helpers ───────────────────────────────────────────────────────────────
+
 interface InteractionData {
   linkId: string
   tenantId: string
@@ -511,7 +500,7 @@ interface InteractionData {
   title: string | null
   body: string | null
   authorUserId: string | null
-  occurredAt: Date
+  occurredAt: Date | null
   visibility: 'private' | 'shared'
   channelProviderKey: string | null
   /**

package/src/modules/customers/lib/personEmailThreads.ts

@@ -3,6 +3,7 @@ import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { CustomerInteraction } from '../data/entities'
 import { resolveUserNames } from './userNames'
 import { buildEmailVisibilityMikroFilter } from './visibilityFilter'
+import { buildInteractionOccurredAtOrderBy } from './interactionOrderBy'
 import type { ConversationShareGrant } from './conversationShares'
 
 /**
@@ -45,7 +46,7 @@ export type PersonEmailMessage = {
   cc: string[]
   subject: string | null
   bodyText: string | null
-  sentAt: string
+  sentAt: string | null
   providerKey: string | null
 }
 
@@ -54,7 +55,7 @@ export type PersonEmailThread = {
   subject: string | null
   preview: string | null
   participants: string[]
-  lastMessageAt: string
+  lastMessageAt: string | null
   messageCount: number
   providerKey: string | null
   lastDirection: EmailThreadDirection
@@ -195,17 +196,20 @@ export async function buildPersonEmailThreads(
     em,
     CustomerInteraction,
     interactionWhere as never,
-    { orderBy: { occurredAt: 'desc', createdAt: 'desc' }, limit: maxThreads * 20 },
+    {
+      orderBy: buildInteractionOccurredAtOrderBy('desc'),
+      limit: maxThreads * 20,
+    },
     dscope,
   )) as CustomerInteraction[]
 
-  const linkIdByInteraction = new Map<string, { occurredAt: Date; authorUserId: string | null }>()
+  const linkIdByInteraction = new Map<string, { occurredAt: Date | null; authorUserId: string | null }>()
   const linkIds: string[] = []
   for (const interaction of interactions) {
     const linkId = interaction.externalMessageId
     if (!linkId || linkIdByInteraction.has(linkId)) continue
     linkIdByInteraction.set(linkId, {
-      occurredAt: interaction.occurredAt ?? interaction.createdAt,
+      occurredAt: interaction.occurredAt ?? null,
       authorUserId: interaction.authorUserId ?? null,
     })
     linkIds.push(linkId)
@@ -301,14 +305,12 @@ export async function buildPersonEmailThreads(
       typeof message?.body === 'string' ? message.body : null,
     )
 
-    const sentAtRaw =
-      (typeof message?.sentAt === 'string' || message?.sentAt instanceof Date
-        ? message.sentAt
-        : null) ??
-      (link.createdAt instanceof Date || typeof link.createdAt === 'string' ? link.createdAt : null) ??
-      linkIdByInteraction.get(linkId)?.occurredAt ??
-      new Date()
-    const sentAt = (sentAtRaw instanceof Date ? sentAtRaw : new Date(sentAtRaw)).toISOString()
+    const messageSentAt = message?.sentAt instanceof Date || typeof message?.sentAt === 'string'
+      ? new Date(message.sentAt)
+      : null
+    const sentAt = messageSentAt && !Number.isNaN(messageSentAt.getTime())
+      ? messageSentAt.toISOString()
+      : null
 
     const threadKey =
       (typeof message?.threadId === 'string' && message.threadId ? message.threadId : null) ??
@@ -353,11 +355,27 @@ export async function buildPersonEmailThreads(
   // ── (5) Finalize thread summaries ───────────────────────────────────────
   const threads: PersonEmailThread[] = []
   for (const thread of threadsByKey.values()) {
-    thread.messages.sort((a, b) => a.sentAt.localeCompare(b.sentAt))
+    thread.messages.sort((left, right) => compareNullableIsochronological(
+      left.sentAt,
+      right.sentAt,
+      left.id,
+      right.id,
+    ))
+    const datedMessages = thread.messages.filter((message) => message.sentAt !== null)
+    const undatedMessages = thread.messages.filter((message) => message.sentAt === null)
     if (thread.messages.length > maxMessagesPerThread) {
-      thread.messages = thread.messages.slice(thread.messages.length - maxMessagesPerThread)
+      const retainedDatedMessages = maxMessagesPerThread > 0
+        ? datedMessages.slice(-maxMessagesPerThread)
+        : []
+      const remainingSlots = Math.max(0, maxMessagesPerThread - retainedDatedMessages.length)
+      const retainedUndatedMessages = remainingSlots > 0
+        ? undatedMessages.slice(-remainingSlots)
+        : []
+      thread.messages = [...retainedDatedMessages, ...retainedUndatedMessages]
     }
-    const last = thread.messages[thread.messages.length - 1]
+    const retainedDatedMessages = thread.messages.filter((message) => message.sentAt !== null)
+    const latestDatedMessage = retainedDatedMessages[retainedDatedMessages.length - 1]
+    const summaryMessage = latestDatedMessage ?? thread.messages[thread.messages.length - 1]
     const firstWithSubject = thread.messages.find((m) => m.subject)
     const participantSet = new Set<string>()
     for (const message of thread.messages) {
@@ -366,19 +384,43 @@ export async function buildPersonEmailThreads(
       if (message.direction === 'outbound') message.to.forEach((email) => participantSet.add(email))
     }
     thread.subject = firstWithSubject?.subject ?? thread.subject
-    thread.preview = truncate(last?.bodyText ?? null)
+    thread.preview = truncate(summaryMessage?.bodyText ?? null)
     thread.participants = Array.from(participantSet)
-    thread.lastMessageAt = last?.sentAt ?? thread.lastMessageAt
-    thread.lastDirection = last?.direction ?? thread.lastDirection
-    thread.providerKey = last?.providerKey ?? thread.providerKey
+    thread.lastMessageAt = latestDatedMessage?.sentAt ?? null
+    thread.lastDirection = summaryMessage?.direction ?? thread.lastDirection
+    thread.providerKey = summaryMessage?.providerKey ?? thread.providerKey
     thread.messageCount = thread.messages.length
     threads.push(thread)
   }
 
-  threads.sort((a, b) => b.lastMessageAt.localeCompare(a.lastMessageAt))
+  threads.sort((left, right) => compareNullableIsochronological(
+    left.lastMessageAt,
+    right.lastMessageAt,
+    left.threadKey,
+    right.threadKey,
+    'desc',
+  ))
   return threads.slice(0, maxThreads)
 }
 
+function compareNullableIsochronological(
+  leftValue: string | null,
+  rightValue: string | null,
+  leftTieBreaker: string,
+  rightTieBreaker: string,
+  direction: 'asc' | 'desc' = 'asc',
+): number {
+  if (leftValue === rightValue) {
+    const tie = leftTieBreaker.localeCompare(rightTieBreaker)
+    return direction === 'asc' ? tie : -tie
+  }
+  if (leftValue === null) return 1
+  if (rightValue === null) return -1
+  return direction === 'asc'
+    ? leftValue.localeCompare(rightValue)
+    : rightValue.localeCompare(leftValue)
+}
+
 export type PersonEmailMessageAccessOptions = Pick<
   BuildPersonEmailThreadsOptions,
   'personId' | 'tenantId' | 'organizationId' | 'viewerUserId' | 'userFeatures' | 'sharedConversations' | 'sharedChannelIds'

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

@@ -321,7 +321,8 @@ export async function GET(req: Request) {
       'r.status as recipient_status',
       'r.read_at',
     ])
-    .orderBy('m.sent_at', 'desc')
+    .orderBy(sql`${sql.ref('m.sent_at')} desc nulls last`)
+    .orderBy('m.id', 'desc')
     .offset(offset)
     .limit(input.pageSize)
     .execute()
@@ -428,6 +429,7 @@ export async function GET(req: Request) {
           senderUserId: message.senderUserId,
           priority: message.priority,
           status: row.recipient_status ?? (row.is_draft ? 'draft' : 'sent'),
+          isDraft: row.is_draft,
           hasObjects: (objectsByMessage[message.id] || []).length > 0,
           objectCount: (objectsByMessage[message.id] || []).length,
           hasAttachments: (attachmentCountByMessage[message.id] || 0) > 0,

package/src/modules/messages/commands/messages.ts

@@ -329,6 +329,7 @@ const composeMessageCommand: CommandHandler<unknown, { id: string; threadId: str
       // here echoed every inbound email back to its sender through the tenant
       // system email channel and made send-as-user deliver twice.
       const sendViaEmail = input.sendViaEmail
+      const sentAt = input.sentAt === undefined ? new Date() : input.sentAt
       const message = trx.create(Message, {
         type: input.type,
         visibility: input.visibility ?? null,
@@ -347,7 +348,7 @@ const composeMessageCommand: CommandHandler<unknown, { id: string; threadId: str
         isDraft: input.isDraft ?? false,
         // #6095: channel ingest passes the provider's timestamp so an imported
         // mailbox sorts by when the mail was received, not when it was imported.
-        sentAt: input.isDraft ? null : input.sentAt ?? new Date(),
+        sentAt: input.isDraft ? null : sentAt,
         actionData: input.actionData as MessageActionData | undefined,
         sendViaEmail,
         idempotencyKey: input.idempotencyKey ?? null,

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

@@ -45,6 +45,7 @@ type MessageListItem = {
   sourceEntityType?: string | null
   priority: string
   status: string
+  isDraft: boolean
   hasObjects: boolean
   objectCount: number
   hasAttachments: boolean
@@ -304,6 +305,7 @@ export function MessagesInboxPageClient() {
               bodyFormat: 'text' as const,
               priority: (item.priority as 'low' | 'normal' | 'high' | 'urgent') ?? 'normal',
               sentAt: item.sentAt ? new Date(item.sentAt) : null,
+              isDraft: item.isDraft,
               senderName: getMessageListParticipantLabel(item, folder, t),
               hasObjects: item.hasObjects,
               objectCount: item.objectCount,

package/src/modules/messages/components/defaults/DefaultMessageListItem.tsx

@@ -5,15 +5,15 @@ import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { cn } from '@open-mercato/shared/lib/utils'
 import { CheckCircle2, FileText, Paperclip, Zap } from 'lucide-react'
 
-function formatDateTime(value: Date | null): string {
-  if (!value) return '—'
-  if (Number.isNaN(value.getTime())) return '—'
+function formatDateTime(value: Date | null, unknownDate: string): string {
+  if (!value) return unknownDate
+  if (Number.isNaN(value.getTime())) return unknownDate
   return value.toLocaleString()
 }
 
-function formatSentTime(value: Date | null): string {
-  if (!value) return '—'
-  if (Number.isNaN(value.getTime())) return '—'
+function formatSentTime(value: Date | null, unknownDate: string): string {
+  if (!value) return unknownDate
+  if (Number.isNaN(value.getTime())) return unknownDate
 
   const now = new Date()
   const isSameDay = now.toDateString() === value.toDateString()
@@ -41,8 +41,10 @@ export function DefaultMessageListItem({ message, onClick }: MessageListItemProp
   const t = useT()
   const senderLabel = message.senderName?.trim() || t('messages.list.noRecipient', '(No recipient)')
   const subject = message.subject.trim() || t('messages.list.noSubject', '(No subject)')
-  const absoluteSentAt = formatDateTime(message.sentAt)
-  const sentAtLabel = formatSentTime(message.sentAt)
+  const unknownDate = t('messages.unknownDate', 'Unknown date')
+  const notSentYet = '—'
+  const absoluteSentAt = message.isDraft ? notSentYet : formatDateTime(message.sentAt, unknownDate)
+  const sentAtLabel = message.isDraft ? notSentYet : formatSentTime(message.sentAt, unknownDate)
   const bodyPreview = truncateWords(message.body || '', 16)
 
   return (

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

@@ -124,7 +124,9 @@ export function MessageHeader(props: MessageHeaderProps) {
           mode="detail"
           title={showSubject ? props.detail.subject : undefined}
           subtitle={`${t('messages.detail.from', 'From')}: ${senderLabel}`}
-          statusBadge={<p className="text-xs text-muted-foreground">{formatDateTime(props.detail.sentAt)}</p>}
+          statusBadge={<p className="text-xs text-muted-foreground">{props.detail.isDraft
+            ? '—'
+            : formatDateTime(props.detail.sentAt, t('messages.unknownDate', 'Unknown date'))}</p>}
           utilityActions={canReply ? (
             <IconButton
               type="button"

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

@@ -4,8 +4,8 @@ import type { MessageListItemProps } from '@open-mercato/shared/modules/messages
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { cn } from '@open-mercato/shared/lib/utils'
 
-function formatSentTime(value: Date | null): string {
-  if (!value || Number.isNaN(value.getTime())) return '—'
+function formatSentTime(value: Date | null, unknownDate: string): string {
+  if (!value || Number.isNaN(value.getTime())) return unknownDate
 
   const now = new Date()
   if (now.toDateString() === value.toDateString()) {
@@ -24,7 +24,9 @@ export function MessageListComponent({ message, onClick }: MessageListItemProps)
   const t = useT()
   const senderLabel = message.senderName || '—'
   const body = normalizeBody(message.body)
-  const sentAtLabel = formatSentTime(message.sentAt)
+  const sentAtLabel = message.isDraft
+    ? '—'
+    : formatSentTime(message.sentAt, t('messages.unknownDate', 'Unknown date'))
 
   return (
     <div

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

@@ -21,7 +21,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)}
+              {getMessageParticipantLabel(threadItem)} • {formatDateTime(threadItem.sentAt, t('messages.unknownDate', 'Unknown date'))}
             </p>
             <div className="mt-2 max-h-[60vh] overflow-y-auto pr-1">
               <MarkdownContent

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

@@ -24,10 +24,10 @@ export function toErrorMessage(payload: unknown): string | null {
   return null
 }
 
-export function formatDateTime(value: string | null | undefined): string {
-  if (!value) return '—'
+export function formatDateTime(value: string | null | undefined, unknownDate = '—'): string {
+  if (!value) return unknownDate
   const date = new Date(value)
-  if (Number.isNaN(date.getTime())) return '—'
+  if (Number.isNaN(date.getTime())) return unknownDate
   return date.toLocaleString()
 }
 

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

@@ -151,15 +151,16 @@ const composeMessageBaseSchema = z.object({
    * (#6095). Channel ingest sets it to the provider's timestamp so an imported
    * mailbox keeps its real chronology instead of collapsing onto the import
    * minute. Server-only: the HTTP route strips any client-sent value, so a
-   * browser caller cannot backdate a message. Ignored for drafts.
+   * browser caller cannot backdate a message. Explicit null preserves unknown
+   * external occurrence time; omission uses the send time. Ignored for drafts.
    */
-  sentAt: z.coerce.date().optional(),
+  sentAt: z.coerce.date().nullable().optional(),
 })
 
 type ComposeMessageRefinementValue = Omit<
   z.infer<typeof composeMessageBaseSchema>,
   'sourceChannelType' | 'sentAt'
-> & { sourceChannelType?: string; sentAt?: Date }
+> & { sourceChannelType?: string; sentAt?: Date | null }
 
 function refineComposeMessage(value: ComposeMessageRefinementValue, ctx: z.RefinementCtx): void {
   const isDraft = value.isDraft ?? false

package/src/modules/messages/frontend/messages/view/[token]/page.tsx

@@ -94,10 +94,10 @@ function toErrorMessage(payload: unknown): string | null {
   return null
 }
 
-function formatDateTime(value: string | null | undefined): string {
-  if (!value) return '—'
+function formatDateTime(value: string | null | undefined, unknownDate: string): string {
+  if (!value) return unknownDate
   const date = new Date(value)
-  if (Number.isNaN(date.getTime())) return '—'
+  if (Number.isNaN(date.getTime())) return unknownDate
   return date.toLocaleString()
 }
 
@@ -308,7 +308,8 @@ export default function MessageTokenPage({ params }: { params: { token: string }
       <header className="space-y-1">
         <h1 className="text-2xl font-semibold">{data.subject}</h1>
         <p className="text-sm text-muted-foreground">
-          {t('messages.token.sentAt', 'Sent')}: {formatDateTime(data.sentAt)}
+          {t('messages.token.sentAt', 'Sent')}:{' '}
+          {formatDateTime(data.sentAt, t('messages.unknownDate', 'Unknown date'))}
         </p>
       </header>
 

package/src/modules/messages/i18n/de.json

@@ -266,6 +266,7 @@
   "messages.types.default": "Nachricht",
   "messages.types.defaultWithObjects": "Objektnachricht",
   "messages.types.system": "Systembenachrichtigung",
+  "messages.unknownDate": "Datum unbekannt",
   "messages.visibility": "Sichtbarkeit",
   "messages.visibilityInternal": "Intern",
   "messages.visibilityInternalHint": "Interne Nachrichten werden an ausgewählte Systemnutzer gesendet.",

package/src/modules/messages/i18n/en.json

@@ -266,6 +266,7 @@
   "messages.types.default": "Message",
   "messages.types.defaultWithObjects": "Object message",
   "messages.types.system": "System notification",
+  "messages.unknownDate": "Unknown date",
   "messages.visibility": "Visibility",
   "messages.visibilityInternal": "Internal",
   "messages.visibilityInternalHint": "Internal messages are sent to selected system users.",

package/src/modules/messages/i18n/es.json

@@ -266,6 +266,7 @@
   "messages.types.default": "Mensaje",
   "messages.types.defaultWithObjects": "Mensaje con objeto",
   "messages.types.system": "Notificación del sistema",
+  "messages.unknownDate": "Fecha desconocida",
   "messages.visibility": "Visibilidad",
   "messages.visibilityInternal": "Interna",
   "messages.visibilityInternalHint": "Los mensajes internos se envían a los usuarios del sistema seleccionados.",

package/src/modules/messages/i18n/ko.json

@@ -266,6 +266,7 @@
   "messages.types.default": "메시지",
   "messages.types.defaultWithObjects": "객체 메시지",
   "messages.types.system": "시스템 알림",
+  "messages.unknownDate": "날짜를 알 수 없음",
   "messages.visibility": "공개 범위",
   "messages.visibilityInternal": "내부",
   "messages.visibilityInternalHint": "내부 메시지는 선택한 시스템 사용자에게 전송됩니다.",

package/src/modules/messages/i18n/pl.json

@@ -266,10 +266,11 @@
   "messages.types.default": "Wiadomość",
   "messages.types.defaultWithObjects": "Wiadomość z obiektem",
   "messages.types.system": "Powiadomienie systemowe",
+  "messages.unknownDate": "Data nieznana",
   "messages.visibility": "Widoczność",
   "messages.visibilityInternal": "Wewnętrzna",
   "messages.visibilityInternalHint": "Wiadomości wewnętrzne są wysyłane do wybranych użytkowników systemu.",
   "messages.visibilityPublic": "Publiczna",
   "messages.visibilityPublicHint": "Wiadomości publiczne są wysyłane wyłącznie na zewnętrzny e-mail.",
-  "notifications.categories.messages": "Wiadomo\u015bci"
+  "notifications.categories.messages": "Wiadomości"
 }

package/src/modules/messages/lib/forwarding.ts

@@ -133,6 +133,8 @@ export async function buildForwardThreadSlice(
   }
 
   const orderedThreadMessages = Array.from(messagesById.values()).sort((a, b) => {
+    if (a.sentAt && !b.sentAt) return -1
+    if (!a.sentAt && b.sentAt) return 1
     const aTime = a.sentAt?.getTime() ?? 0
     const bTime = b.sentAt?.getTime() ?? 0
     if (aTime !== bTime) return aTime - bTime
@@ -230,7 +232,7 @@ export async function buildForwardPreviewFromThreadSlice(
     return [
       FORWARD_MARKER,
       `From: ${formatUserLabel(sender, item.senderUserId)}`,
-      `Date: ${formatDateLabel(item.sentAt ?? item.createdAt)}`,
+      `Date: ${formatDateLabel(item.sentAt)}`,
       `Subject: ${normalizeSubject(item.subject)}`,
       `To: ${toLabel}`,
       '',