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

package/src/modules/integrations/backend/integrations/bundle/[id]/page.tsx

@@ -8,7 +8,6 @@ import { Badge } from '@open-mercato/ui/primitives/badge'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Switch } from '@open-mercato/ui/primitives/switch'
 import { Input } from '@open-mercato/ui/primitives/input'
-import { PasswordInput } from '@open-mercato/ui/primitives/password-input'
 import {
   Select,
   SelectContent,
@@ -24,11 +23,6 @@ import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import type { CredentialFieldType, IntegrationCredentialField } from '@open-mercato/shared/modules/integrations/types'
 import { LoadingMessage, ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
-import {
-  buildCredentialEditValues,
-  buildCredentialSavePayload,
-  type SecretFieldsConfigured,
-} from '../../credential-secret-fields'
 
 type CredentialField = IntegrationCredentialField
 
@@ -94,7 +88,6 @@ export default function BundleConfigPage({ params }: BundleConfigPageProps) {
   const [error, setError] = React.useState<string | null>(null)
   const [isNotFound, setIsNotFound] = React.useState(false)
   const [credValues, setCredValues] = React.useState<Record<string, unknown>>({})
-  const [secretFieldsConfigured, setSecretFieldsConfigured] = React.useState<SecretFieldsConfigured>({})
   const [credentialsUpdatedAt, setCredentialsUpdatedAt] = React.useState<string | null>(null)
   const [isSavingCreds, setIsSavingCreds] = React.useState(false)
   const [togglingIds, setTogglingIds] = React.useState<Set<string>>(new Set())
@@ -141,18 +134,13 @@ export default function BundleConfigPage({ params }: BundleConfigPageProps) {
     }
     setDetail(call.result)
 
-    const credCall = await apiCall<{
-      credentials: Record<string, unknown>
-      secretFieldsConfigured?: SecretFieldsConfigured
-      updatedAt?: string | null
-    }>(
+    const credCall = await apiCall<{ credentials: Record<string, unknown>; updatedAt?: string | null }>(
       `/api/integrations/${encodeURIComponent(currentBundleId)}/credentials`,
       undefined,
       { fallback: null },
     )
     if (credCall.ok && credCall.result) {
       setCredentialsUpdatedAt(credCall.result.updatedAt ?? null)
-      setSecretFieldsConfigured(credCall.result.secretFieldsConfigured ?? {})
     }
     if (credCall.ok && credCall.result?.credentials) {
       const next = { ...credCall.result.credentials }
@@ -163,10 +151,7 @@ export default function BundleConfigPage({ params }: BundleConfigPageProps) {
           next.authMode = hasKeys ? 'access_keys' : 'ambient'
         }
       }
-      setCredValues(buildCredentialEditValues(
-        next,
-        credCall.result.secretFieldsConfigured ?? {},
-      ))
+      setCredValues(next)
     }
     setIsLoading(false)
   }, [resolveCurrentBundleId, t])
@@ -178,13 +163,8 @@ export default function BundleConfigPage({ params }: BundleConfigPageProps) {
     if (!currentBundleId) return
     setIsSavingCreds(true)
     try {
-      const savePayload = buildCredentialSavePayload(
-        credValues,
-        detail?.bundle?.credentials?.fields ?? [],
-        secretFieldsConfigured,
-      )
       const call = await runMutation({
-        mutationPayload: { bundleId: currentBundleId, ...savePayload },
+        mutationPayload: { bundleId: currentBundleId, credentials: credValues },
         context: {
           formId: mutationContextId,
           operation: 'update',
@@ -199,7 +179,7 @@ export default function BundleConfigPage({ params }: BundleConfigPageProps) {
           () => apiCall(`/api/integrations/${encodeURIComponent(currentBundleId)}/credentials`, {
             method: 'PUT',
             headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(savePayload),
+            body: JSON.stringify({ credentials: credValues }),
           }, { fallback: null }),
         ),
       })
@@ -214,7 +194,7 @@ export default function BundleConfigPage({ params }: BundleConfigPageProps) {
     } finally {
       setIsSavingCreds(false)
     }
-  }, [resolveCurrentBundleId, runMutation, mutationContextId, retryLastMutation, credValues, credentialsUpdatedAt, detail?.bundle?.credentials?.fields, load, secretFieldsConfigured, t])
+  }, [resolveCurrentBundleId, runMutation, mutationContextId, retryLastMutation, credValues, credentialsUpdatedAt, load, t])
 
   const handleToggle = React.useCallback(async (integrationId: string, enabled: boolean, updatedAt?: string | null) => {
     setTogglingIds((prev) => new Set(prev).add(integrationId))
@@ -315,15 +295,15 @@ export default function BundleConfigPage({ params }: BundleConfigPageProps) {
             <CardContent className="space-y-4">
               {credFields.filter(isFieldVisible).map((field) => (
                 <div key={field.key} className="space-y-1.5">
-                  <label htmlFor={`bundle-credential-${field.key}`} className="text-sm font-medium">
-                    {field.label}{field.required && <span className="ml-0.5 text-destructive">*</span>}
+                  <label className="text-sm font-medium">
+                    {field.label}{field.required && <span className="text-red-500 ml-0.5">*</span>}
                   </label>
                   {field.type === 'select' && field.options ? (
                     <Select
                       value={(credValues[field.key] as string) || undefined}
                       onValueChange={(value) => setCredValues((prev) => ({ ...prev, [field.key]: value ?? '' }))}
                     >
-                      <SelectTrigger id={`bundle-credential-${field.key}`}>
+                      <SelectTrigger>
                         <SelectValue placeholder="—" />
                       </SelectTrigger>
                       <SelectContent>
@@ -334,32 +314,17 @@ export default function BundleConfigPage({ params }: BundleConfigPageProps) {
                     </Select>
                   ) : field.type === 'boolean' ? (
                     <Switch
-                      id={`bundle-credential-${field.key}`}
                       checked={Boolean(credValues[field.key])}
                       onCheckedChange={(checked) => setCredValues((prev) => ({ ...prev, [field.key]: checked }))}
                     />
-                  ) : field.type === 'secret' ? (
-                    <PasswordInput
-                      id={`bundle-credential-${field.key}`}
-                      placeholder={field.placeholder}
-                      value={(credValues[field.key] as string) ?? ''}
-                      onChange={(event) => setCredValues((prev) => ({ ...prev, [field.key]: event.target.value }))}
-                      autoComplete="new-password"
-                    />
                   ) : (
                     <Input
-                      id={`bundle-credential-${field.key}`}
-                      type="text"
+                      type={field.type === 'secret' ? 'password' : 'text'}
                       placeholder={field.placeholder}
                       value={(credValues[field.key] as string) ?? ''}
                       onChange={(e) => setCredValues((prev) => ({ ...prev, [field.key]: e.target.value }))}
                     />
                   )}
-                  {field.type === 'secret' && secretFieldsConfigured[field.key] ? (
-                    <p className="text-xs text-muted-foreground">
-                      {t('integrations.detail.credentials.secretConfigured')}
-                    </p>
-                  ) : null}
                 </div>
               ))}
               <Button type="button" onClick={() => void handleSaveCredentials()} disabled={isSavingCreds}>

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

@@ -1,23 +1,13 @@
 import { z } from 'zod'
 
-const credentialFieldKeySchema = z.string().min(1).max(128)
-
 export const saveCredentialsSchema = z.object({
   credentials: z.record(
-    credentialFieldKeySchema,
+    z.string().min(1).max(128),
     z.union([z.string().max(20_000), z.number(), z.boolean(), z.null()]),
   ),
-  unchangedSecretFields: z.array(credentialFieldKeySchema).max(200).optional(),
 }).refine((value) => Object.keys(value.credentials).length <= 200, {
   message: 'At most 200 credential fields are allowed',
-}).refine(
-  (value) => !value.unchangedSecretFields
-    || new Set(value.unchangedSecretFields).size === value.unchangedSecretFields.length,
-  {
-    message: 'Unchanged secret field names must be unique',
-    path: ['unchangedSecretFields'],
-  },
-)
+})
 
 export type SaveCredentialsInput = z.infer<typeof saveCredentialsSchema>
 

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

@@ -15,7 +15,6 @@
   "integrations.detail.credentials.save": "Zugangsdaten speichern",
   "integrations.detail.credentials.saveError": "Zugangsdaten konnten nicht gespeichert werden",
   "integrations.detail.credentials.saved": "Zugangsdaten gespeichert",
-  "integrations.detail.credentials.secretConfigured": "Konfiguriert. Geben Sie einen neuen Wert ein, um ihn zu ersetzen.",
   "integrations.detail.credentials.validation.boolean": "Select a valid value.",
   "integrations.detail.credentials.validation.option": "Select one of the available options.",
   "integrations.detail.credentials.validation.required": "{field} is required.",

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

@@ -15,7 +15,6 @@
   "integrations.detail.credentials.save": "Save Credentials",
   "integrations.detail.credentials.saveError": "Failed to save credentials",
   "integrations.detail.credentials.saved": "Credentials saved",
-  "integrations.detail.credentials.secretConfigured": "Configured. Enter a new value to replace it.",
   "integrations.detail.credentials.validation.boolean": "Select a valid value.",
   "integrations.detail.credentials.validation.option": "Select one of the available options.",
   "integrations.detail.credentials.validation.required": "{field} is required.",

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

@@ -15,7 +15,6 @@
   "integrations.detail.credentials.save": "Guardar credenciales",
   "integrations.detail.credentials.saveError": "No se pudieron guardar las credenciales",
   "integrations.detail.credentials.saved": "Credenciales guardadas",
-  "integrations.detail.credentials.secretConfigured": "Configurado. Introduce un valor nuevo para reemplazarlo.",
   "integrations.detail.credentials.validation.boolean": "Select a valid value.",
   "integrations.detail.credentials.validation.option": "Select one of the available options.",
   "integrations.detail.credentials.validation.required": "{field} is required.",

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

@@ -15,7 +15,6 @@
   "integrations.detail.credentials.save": "자격 증명 저장",
   "integrations.detail.credentials.saveError": "자격 증명 저장에 실패했습니다",
   "integrations.detail.credentials.saved": "자격 증명이 저장되었습니다",
-  "integrations.detail.credentials.secretConfigured": "구성됨. 바꾸려면 새 값을 입력하세요.",
   "integrations.detail.credentials.validation.boolean": "유효한 값을 선택하세요.",
   "integrations.detail.credentials.validation.option": "사용 가능한 옵션 중 하나를 선택하세요.",
   "integrations.detail.credentials.validation.required": "{field}은(는) 필수입니다.",

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

@@ -15,7 +15,6 @@
   "integrations.detail.credentials.save": "Zapisz dane",
   "integrations.detail.credentials.saveError": "Nie udało się zapisać danych",
   "integrations.detail.credentials.saved": "Dane zapisane",
-  "integrations.detail.credentials.secretConfigured": "Skonfigurowano. Wpisz nową wartość, aby ją zastąpić.",
   "integrations.detail.credentials.validation.boolean": "Select a valid value.",
   "integrations.detail.credentials.validation.option": "Select one of the available options.",
   "integrations.detail.credentials.validation.required": "{field} is required.",

package/src/modules/integrations/lib/credentials-masking.ts

@@ -84,26 +84,22 @@ export function maskSecretCredentials(
 }
 
 /**
- * Reverse of {@link maskSecretCredentials} for the save path. The exact mask
- * sentinel and explicitly listed omitted secret fields mean "leave unchanged".
- * Explicit values win over the list, including an empty string used to clear a
- * secret, while plain omission retains the full-replacement contract.
+ * Reverse of {@link maskSecretCredentials} for the save path. When the client
+ * submits the mask sentinel for a secret field it means "leave it unchanged":
+ * restore the existing stored secret, or drop the field entirely when nothing
+ * was previously stored (so the literal sentinel is never persisted). Any other
+ * value (including an empty string, which clears the secret) is written as-is.
  */
 export function mergeMaskedSecretCredentials(
   schema: IntegrationCredentialsSchema | undefined,
   incoming: Record<string, unknown>,
   existing: Record<string, unknown>,
-  unchangedSecretFields: readonly string[] = [],
 ): Record<string, unknown> {
   const merged: Record<string, unknown> = { ...incoming }
-  const unchangedSecretFieldSet = new Set(unchangedSecretFields)
 
   for (const field of schema?.fields ?? []) {
     if (!isSecretField(field.type)) continue
-    const hasIncomingValue = Object.prototype.hasOwnProperty.call(merged, field.key)
-    const submittedMask = merged[field.key] === MASKED_SECRET_VALUE
-    const explicitlyUnchanged = !hasIncomingValue && unchangedSecretFieldSet.has(field.key)
-    if (!submittedMask && !explicitlyUnchanged) continue
+    if (merged[field.key] !== MASKED_SECRET_VALUE) continue
 
     if (hasPresentValue(existing[field.key])) {
       merged[field.key] = existing[field.key]

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