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

package/src/modules/customers/commands/personCompanyLinks.ts

@@ -1,5 +1,5 @@
 import { registerCommand } from '@open-mercato/shared/lib/commands'
-import type { CommandHandler, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
+import type { CommandHandler } from '@open-mercato/shared/lib/commands'
 import type { CrudEventsConfig } from '@open-mercato/shared/lib/crud/types'
 import { emitCrudSideEffects, emitCrudUndoSideEffects } from '@open-mercato/shared/lib/commands/helpers'
 import { CrudHttpError, notFound } from '@open-mercato/shared/lib/crud/errors'
@@ -24,27 +24,14 @@ import {
   findDeletedPersonCompanyLink,
   loadPersonCompanyLinks,
   promoteFallbackPrimaryLink,
-  removePersonCompanyLink,
 } from '../lib/personCompanies'
 import {
-  emitQueryIndexUpsertEvents,
   ensureOrganizationScope,
   ensureTenantScope,
   extractUndoPayload,
-  type QueryIndexEventEntry,
 } from './shared'
-import type { CustomersEventId } from '../events'
-import { E } from '#generated/entities.ids.generated'
-import type { EventBus } from '@open-mercato/events'
 import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
 import { resolveRedoSnapshot } from '@open-mercato/shared/lib/commands/redo'
-import { createLogger } from '@open-mercato/shared/lib/logger'
-
-const logger = createLogger('customers').child({ component: 'personCompanyLinks' })
-
-// Typed against the module's declared event ids so removing or renaming the declaration in
-// `events.ts` fails the build here rather than emitting an undeclared event at runtime.
-const PROFILE_ONLY_DETACHED_EVENT: CustomersEventId = 'customers.person.company_assignment.detached'
 
 type PersonCompanyLinkSnapshot = {
   id: string
@@ -61,65 +48,6 @@ type PersonCompanyLinkUndoPayload = {
   after?: PersonCompanyLinkSnapshot | null
 }
 
-/**
- * Snapshot of a legacy profile-only company assignment — `customer_person_profiles.company_id`
- * set with no backing link row (#5114). It carries no link id because none exists; `kind`
- * discriminates it from `PersonCompanyLinkSnapshot` in the delete command's undo payload.
- */
-type PersonCompanyProfileAssignmentSnapshot = {
-  kind: 'profile-only'
-  personEntityId: string
-  companyEntityId: string
-  tenantId: string
-  organizationId: string
-}
-
-type PersonCompanyLinkDeleteSnapshot = PersonCompanyLinkSnapshot | PersonCompanyProfileAssignmentSnapshot
-
-type PersonCompanyLinkDeleteUndoPayload = {
-  before?: PersonCompanyLinkDeleteSnapshot | null
-}
-
-type PersonCompanyLinkDeleteResult = {
-  linkId: string | null
-  personEntityId: string | null
-  companyEntityId: string | null
-}
-
-function isProfileAssignmentSnapshot(
-  snapshot: PersonCompanyLinkDeleteSnapshot | null | undefined,
-): snapshot is PersonCompanyProfileAssignmentSnapshot {
-  return Boolean(snapshot) && (snapshot as PersonCompanyProfileAssignmentSnapshot).kind === 'profile-only'
-}
-
-function resolveProfileOnlyTarget(
-  parsed: PersonCompanyLinkDeleteInput,
-): { personEntityId: string; companyEntityId: string } | null {
-  if (parsed.linkId) return null
-  if (!parsed.personEntityId || !parsed.companyEntityId) return null
-  return { personEntityId: parsed.personEntityId, companyEntityId: parsed.companyEntityId }
-}
-
-function personQueryIndexEntries(
-  person: CustomerEntity,
-  profile: CustomerPersonProfile,
-): QueryIndexEventEntry[] {
-  return [
-    {
-      entityType: E.customers.customer_entity,
-      recordId: person.id,
-      tenantId: person.tenantId,
-      organizationId: person.organizationId,
-    },
-    {
-      entityType: E.customers.customer_person_profile,
-      recordId: profile.id,
-      tenantId: profile.tenantId,
-      organizationId: profile.organizationId,
-    },
-  ]
-}
-
 const personCompanyLinkCrudEvents: CrudEventsConfig = {
   module: 'customers',
   entity: 'person_company_link',
@@ -648,144 +576,12 @@ const updatePersonCompanyLinkCommand: CommandHandler<PersonCompanyLinkUpdateInpu
   },
 }
 
-/**
- * Detach a legacy profile-only company assignment: `customer_person_profiles.company_id`
- * points at the company but no `customer_person_company_links` row was ever created, so
- * there is no link row for the id-based branch to soft-delete (#5114). Running it as part
- * of the same command keeps the audit entry, the undo token and the CRUD cache
- * invalidation identical to a link-backed detach.
- */
-async function detachProfileOnlyCompany(
-  em: EntityManager,
-  ctx: CommandRuntimeContext,
-  parsed: PersonCompanyLinkDeleteInput,
-  target: { personEntityId: string; companyEntityId: string },
-): Promise<PersonCompanyLinkDeleteResult> {
-  const person = await requirePersonEntity(em, target.personEntityId, parsed.tenantId, parsed.organizationId)
-  const profile = await requirePersonProfile(em, person)
-  const assignedCompany = profile.company
-  const assignedCompanyId = typeof assignedCompany === 'string' ? assignedCompany : assignedCompany?.id ?? null
-  if (assignedCompanyId !== target.companyEntityId) {
-    throw notFound('Company link not found')
-  }
-
-  await withAtomicFlush(em, [
-    () => removePersonCompanyLink(em, person, profile, target.companyEntityId),
-  ], { transaction: true })
-
-  // There is no link entity to hand to `emitCrudSideEffects`; what changed is the
-  // person's own company assignment, so reindex the person and its profile instead.
-  await emitQueryIndexUpsertEvents(ctx, personQueryIndexEntries(person, profile))
-  await emitProfileOnlyDetachedEvent(ctx, person, target.companyEntityId)
-
-  return { linkId: null, personEntityId: person.id, companyEntityId: target.companyEntityId }
-}
-
-/**
- * Live-refresh signal for the company People tab and the person Companies tab, which the
- * link-backed branch gets from `customers.person_company_link.deleted` via `emitCrudSideEffects`.
- * The profile-only branch has no link row to emit that for, so it publishes the sibling
- * `clientBroadcast` event instead (#5114). `tenantId` must travel in the payload: the event bus
- * only forwards a broadcast event cross-process when the payload carries a tenant scope. The
- * write is already committed, so a failed refresh signal must never fail the detach.
- */
-async function emitProfileOnlyDetachedEvent(
-  ctx: CommandRuntimeContext,
-  person: CustomerEntity,
-  companyEntityId: string,
-): Promise<void> {
-  try {
-    const bus = ctx.container.resolve<EventBus>('eventBus')
-    await bus.emitEvent(
-      PROFILE_ONLY_DETACHED_EVENT,
-      {
-        linkId: null,
-        personEntityId: person.id,
-        companyEntityId,
-        tenantId: person.tenantId,
-        organizationId: person.organizationId,
-      },
-      { tenantId: person.tenantId, organizationId: person.organizationId },
-    )
-  } catch (err) {
-    logger.warn('Profile-only company detach broadcast failed', {
-      command: 'customers.personCompanyLinks.delete',
-      personEntityId: person.id,
-      companyEntityId,
-      err,
-    })
-  }
-}
-
-/**
- * Undo counterpart of `detachProfileOnlyCompany`: re-point the person's legacy
- * `profile.company` at the company it was detached from. The lookups run in the first
- * flush phase and the assignment in the second so the encryption subscriber's
- * re-baseline on find cannot drop the pending change (#2507).
- */
-async function restoreProfileOnlyCompany(
-  ctx: CommandRuntimeContext,
-  before: PersonCompanyProfileAssignmentSnapshot,
-): Promise<void> {
-  const em = (ctx.container.resolve('em') as EntityManager).fork()
-  let person: CustomerEntity | null = null
-  let profile: CustomerPersonProfile | null = null
-  let company: CustomerEntity | null = null
-
-  await withAtomicFlush(em, [
-    async () => {
-      person = await findOneWithDecryption(
-        em,
-        CustomerEntity,
-        { id: before.personEntityId, kind: 'person', tenantId: before.tenantId, organizationId: before.organizationId, deletedAt: null },
-        undefined,
-        { tenantId: before.tenantId, organizationId: before.organizationId },
-      )
-      if (!person) return
-      profile = await findOneWithDecryption(
-        em,
-        CustomerPersonProfile,
-        { entity: person },
-        { populate: ['company'] },
-        { tenantId: before.tenantId, organizationId: before.organizationId },
-      )
-      if (!profile) return
-      company = await findOneWithDecryption(
-        em,
-        CustomerEntity,
-        { id: before.companyEntityId, kind: 'company', tenantId: before.tenantId, organizationId: before.organizationId, deletedAt: null },
-        undefined,
-        { tenantId: before.tenantId, organizationId: before.organizationId },
-      )
-    },
-    () => {
-      if (profile && company) profile.company = company
-    },
-  ], { transaction: true })
-
-  if (person && profile) {
-    await emitQueryIndexUpsertEvents(ctx, personQueryIndexEntries(person, profile))
-  }
-}
-
-const deletePersonCompanyLinkCommand: CommandHandler<PersonCompanyLinkDeleteInput, PersonCompanyLinkDeleteResult> = {
+const deletePersonCompanyLinkCommand: CommandHandler<PersonCompanyLinkDeleteInput, { linkId: string }> = {
   id: 'customers.personCompanyLinks.delete',
   async prepare(rawInput, ctx) {
     const parsed = personCompanyLinkDeleteSchema.parse(rawInput)
-    const profileOnlyTarget = resolveProfileOnlyTarget(parsed)
-    if (profileOnlyTarget) {
-      return {
-        before: {
-          kind: 'profile-only',
-          personEntityId: profileOnlyTarget.personEntityId,
-          companyEntityId: profileOnlyTarget.companyEntityId,
-          tenantId: parsed.tenantId,
-          organizationId: parsed.organizationId,
-        } satisfies PersonCompanyProfileAssignmentSnapshot,
-      }
-    }
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const snapshot = await loadPersonCompanyLinkSnapshot(em, parsed.linkId as string, {
+    const snapshot = await loadPersonCompanyLinkSnapshot(em, parsed.linkId, {
       tenantId: ctx.auth?.tenantId ?? null,
       organizationId: ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null,
     })
@@ -797,16 +593,11 @@ const deletePersonCompanyLinkCommand: CommandHandler<PersonCompanyLinkDeleteInpu
     ensureOrganizationScope(ctx, parsed.organizationId)
 
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const profileOnlyTarget = resolveProfileOnlyTarget(parsed)
-    if (profileOnlyTarget) {
-      return await detachProfileOnlyCompany(em, ctx, parsed, profileOnlyTarget)
-    }
-
     const link = await findOneWithDecryption(
       em,
       CustomerPersonCompanyLink,
       {
-        id: parsed.linkId as string,
+        id: parsed.linkId,
         tenantId: parsed.tenantId,
         organizationId: parsed.organizationId,
         deletedAt: null,
@@ -856,15 +647,13 @@ const deletePersonCompanyLinkCommand: CommandHandler<PersonCompanyLinkDeleteInpu
       indexer: { entityType: 'customers:customer_person_company_link' },
     })
 
-    return { linkId: link.id, personEntityId: personId, companyEntityId: companyId }
+    return { linkId: link.id }
   },
   buildLog: async ({ result, snapshots }) => {
     const { translate } = await resolveTranslations()
-    const before = snapshots.before as PersonCompanyLinkDeleteSnapshot | undefined
+    const before = snapshots.before as PersonCompanyLinkSnapshot | undefined
     return {
       actionLabel: translate('customers.audit.personCompanyLinks.delete', 'Remove company link'),
-      // Kept as `customers.personCompanyLink` for the profile-only shape too: the company
-      // detail cache tags this resource kind, so both detach shapes must invalidate it.
       resourceKind: 'customers.personCompanyLink',
       resourceId: result.linkId,
       parentResourceKind: 'customers.person',
@@ -875,20 +664,15 @@ const deletePersonCompanyLinkCommand: CommandHandler<PersonCompanyLinkDeleteInpu
       payload: {
         undo: {
           before: before ?? null,
-        } satisfies PersonCompanyLinkDeleteUndoPayload,
+        } satisfies PersonCompanyLinkUndoPayload,
       },
     }
   },
   undo: async ({ logEntry, ctx }) => {
-    const payload = extractUndoPayload<PersonCompanyLinkDeleteUndoPayload>(logEntry)
+    const payload = extractUndoPayload<PersonCompanyLinkUndoPayload>(logEntry)
     const before = payload?.before
     if (!before) return
 
-    if (isProfileAssignmentSnapshot(before)) {
-      await restoreProfileOnlyCompany(ctx, before)
-      return
-    }
-
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const link = await findOneWithDecryption(
       em,

package/src/modules/customers/components/CustomerTodosTable.tsx

@@ -47,7 +47,6 @@ type CustomerTodosResponse = {
   page: number
   pageSize: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 const TASKS_TAB_QUERY = 'tab=tasks'
@@ -280,7 +279,6 @@ export function CustomerTodosTable(): React.JSX.Element {
         pageSize,
         total: data?.total ?? 0,
         totalPages: data?.totalPages ?? 0,
-        totalIsCapped: data?.totalIsCapped === true,
         onPageChange: setPage,
       }}
       isLoading={isLoading}

package/src/modules/customers/components/DealsKpiStrip.tsx

@@ -63,12 +63,13 @@ export type DealsKpiStripProps = {
   onNeedsAttentionClick?: () => void
 }
 
-function createCompactFormatter(locale: string): (value: number) => string {
-  const formatter = new Intl.NumberFormat(locale, {
-    notation: 'compact',
-    maximumFractionDigits: 1,
-  })
-  return (value: number) => formatter.format(value)
+const compactNumberFormatter = new Intl.NumberFormat(undefined, {
+  notation: 'compact',
+  maximumFractionDigits: 1,
+})
+
+function formatCompact(value: number): string {
+  return compactNumberFormatter.format(value)
 }
 
 function buildCurrencySuffix(code: string | null, convertedAll: boolean): string {
@@ -135,7 +136,6 @@ export function DealsKpiStrip({
 }: DealsKpiStripProps) {
   const t = useT()
   const locale = useLocale()
-  const formatCompact = React.useMemo(() => createCompactFormatter(locale), [locale])
   const pluralCat = React.useCallback((count: number): string => {
     try {
       return new Intl.PluralRules(locale).select(count)

package/src/modules/customers/components/calendar/AgendaList.tsx

@@ -56,7 +56,7 @@ function deriveTypeLabel(interactionType: string): string {
 }
 
 function participantLabel(participant: CalendarItem['participants'][number]): string {
-  return participant.name ?? participant.email ?? participant.userId ?? ''
+  return participant.name ?? participant.email ?? participant.userId
 }
 
 function buildDayGroups(anchor: Date, horizonDays: number, items: CalendarItem[]): AgendaDayGroup[] {
@@ -171,8 +171,8 @@ function AgendaRow({
       <div className="flex shrink-0 items-center gap-2">
         {item.participants.length > 0 ? (
           <span className="hidden items-center gap-0.5 sm:flex">
-            {item.participants.slice(0, MAX_AVATARS_PER_ROW).map((participant, index) => (
-              <Avatar key={participant.userId ?? participant.email ?? index} size="xs" label={participantLabel(participant)} />
+            {item.participants.slice(0, MAX_AVATARS_PER_ROW).map((participant) => (
+              <Avatar key={participant.userId} size="xs" label={participantLabel(participant)} />
             ))}
             {item.participants.length > MAX_AVATARS_PER_ROW ? (
               <span className="ps-0.5 text-xs font-medium text-muted-foreground">

package/src/modules/customers/components/calendar/CalendarEventEditor.tsx

@@ -170,7 +170,7 @@ function EditorBody({
     const ids: string[] = []
     if (form.relatedTo && form.relatedTo.kind !== 'company') ids.push(form.relatedTo.id)
     for (const participant of form.participants) {
-      if (participant.isCustomer && participant.userId) ids.push(participant.userId)
+      if (participant.isCustomer) ids.push(participant.userId)
     }
     return Array.from(new Set(ids))
   }, [form.relatedTo, form.participants])

package/src/modules/customers/components/calendar/CalendarScreen.tsx

@@ -238,7 +238,7 @@ export function CalendarScreen({ resourcesEnabled = false, staffEnabled = true }
     const participantNames = new Map<string, string>()
     for (const item of visibleItems) {
       for (const participant of item.participants) {
-        if (participant.userId && participant.name && !participantNames.has(participant.userId)) {
+        if (participant.name && !participantNames.has(participant.userId)) {
           participantNames.set(participant.userId, participant.name)
         }
       }

package/src/modules/customers/components/calendar/CalendarSettingsModal.tsx

@@ -72,7 +72,7 @@ export function CalendarSettingsModal({
 
   const toggleRows: Array<{ key: ToggleKey; label: string }> = [
     { key: 'showCrmActivities', label: t('customers.calendar.settings.showCrmActivities', 'Show CRM activities on calendar') },
-    { key: 'aiSummaries', label: t('customers.calendar.settings.aiSummaries', 'AI summaries') },
+    { key: 'aiSummaries', label: t('customers.calendar.settings.aiSummaries', 'AI summaries & quick actions') },
     { key: 'conflictWarnings', label: t('customers.calendar.settings.conflictWarnings', 'Conflict warnings') },
     { key: 'showWeekends', label: t('customers.calendar.settings.showWeekends', 'Show weekends') },
   ]

package/src/modules/customers/components/calendar/EventBlock.tsx

@@ -180,8 +180,8 @@ export const EventBlock = React.forwardRef<HTMLButtonElement, EventBlockProps>(f
           {visibleParticipants.length > 0 ? (
             <>
               <AvatarStack size="xs" max={MAX_VISIBLE_AVATARS} className="shrink-0 gap-px [&>*:not(:first-child)]:-ml-1">
-                {visibleParticipants.map((participant, index) => (
-                  <Avatar key={participant.userId ?? participant.email ?? index} size="xs" label={participantLabel(participant)} />
+                {visibleParticipants.map((participant) => (
+                  <Avatar key={participant.userId} size="xs" label={participantLabel(participant)} />
                 ))}
               </AvatarStack>
               {overflowCount > 0 ? (

package/src/modules/customers/components/calendar/EventPeekPopover.tsx

@@ -22,7 +22,6 @@ export type EventPeekPopoverProps = {
   joinUrl: string | null
   aiSummaries: boolean
   canManage?: boolean
-  side?: React.ComponentProps<typeof PopoverContent>['side']
   onOpenChange(open: boolean): void
   onJoin(item: CalendarItem): void
   onEdit(item: CalendarItem): void
@@ -35,7 +34,6 @@ export function EventPeekPopover({
   joinUrl,
   aiSummaries,
   canManage = true,
-  side = 'right',
   onOpenChange,
   onJoin,
   onEdit,
@@ -65,12 +63,12 @@ export function EventPeekPopover({
     (part): part is string => Boolean(part),
   )
   const showSummary = aiSummaries && metaParts.length > 0
-  const showJoin = Boolean(joinUrl)
+  const showJoin = aiSummaries && Boolean(joinUrl)
 
   return (
     <Popover open={open} onOpenChange={onOpenChange}>
       <PopoverTrigger asChild>{children}</PopoverTrigger>
-      <PopoverContent align="start" side={side} sideOffset={8} className="w-56 p-3">
+      <PopoverContent align="start" side="right" sideOffset={8} className="w-56 p-3">
         <div className="flex flex-col gap-2">
           <p className="text-sm font-semibold leading-5 text-foreground">{title}</p>
           <p className="text-xs leading-4 text-muted-foreground">{`${dateLabel} · ${timeRange}`}</p>

package/src/modules/customers/components/calendar/editor/PeopleField.tsx

@@ -1,7 +1,6 @@
 "use client"
 
 import * as React from 'react'
-import { z } from 'zod'
 import { cn } from '@open-mercato/shared/lib/utils'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { Avatar } from '@open-mercato/ui/primitives/avatar'
@@ -12,15 +11,6 @@ import { composeAccessibleName } from '../../../lib/calendar/labels'
 import { searchPeopleOptions, type PersonOption } from './lookups'
 import { CONTROL_BORDER, DROPDOWN_PANEL_CLASS, PersonChip, UppercaseBadge, useDropdownDismiss } from './inputs'
 
-// Mirrors the server-side guest rule in `interactionParticipantSchema`: a
-// participant with no user record is addressable only by a routable email.
-const guestEmailSchema = z.string().email().max(320)
-
-function normalizeEmail(email: string | null | undefined): string | null {
-  const normalized = email?.trim().toLowerCase()
-  return normalized ? normalized : null
-}
-
 export function PeopleField({
   mode,
   placeholder,
@@ -73,38 +63,12 @@ export function PeopleField({
   const selectedIds = new Set(value.map((participant) => participant.userId))
   const visibleOptions = options.filter((option) => !selectedIds.has(option.userId))
 
-  // An external guest has no record to search for, so a typed address that
-  // matches nothing is the only way to invite one (#5115). Multi mode only —
-  // the single-mode field is the task assignee, which becomes `ownerUserId` and
-  // must resolve to a real staff user.
-  const typedEmail = normalizeEmail(query)
-  const selectedEmails = new Set(
-    value.map((participant) => normalizeEmail(participant.email)).filter((email): email is string => email !== null),
-  )
-  const guestEmail =
-    mode === 'multi' &&
-    typedEmail !== null &&
-    guestEmailSchema.safeParse(typedEmail).success &&
-    !selectedEmails.has(typedEmail) &&
-    !options.some((option) => normalizeEmail(option.email) === typedEmail)
-      ? typedEmail
-      : null
-  const guestLabel = guestEmail
-    ? t('customers.calendar.editor.addGuest', 'Invite {email} as a guest', { email: guestEmail })
-    : ''
-
   const customerBadge = (
     <UppercaseBadge className="bg-status-info-bg text-status-info-text">
       {t('customers.calendar.editor.customerBadge', 'Customer')}
     </UppercaseBadge>
   )
 
-  const guestBadge = (
-    <UppercaseBadge className="bg-muted text-muted-foreground">
-      {t('customers.calendar.editor.guestBadge', 'Guest')}
-    </UppercaseBadge>
-  )
-
   return (
     <div
       ref={rootRef}
@@ -120,12 +84,12 @@ export function PeopleField({
           CONTROL_BORDER,
         )}
       >
-        {value.map((participant, index) => (
+        {value.map((participant) => (
           <PersonChip
-            key={participant.userId ?? participant.email ?? index}
+            key={participant.userId}
             name={participant.name}
-            badge={participant.isCustomer ? customerBadge : participant.userId ? undefined : guestBadge}
-            onRemove={() => onChange(value.filter((_, entryIndex) => entryIndex !== index))}
+            badge={participant.isCustomer ? customerBadge : undefined}
+            onRemove={() => onChange(value.filter((entry) => entry.userId !== participant.userId))}
             removeLabel={t('customers.calendar.editor.removePerson', 'Remove {name}', { name: participant.name })}
           />
         ))}
@@ -149,31 +113,11 @@ export function PeopleField({
               {t('customers.calendar.editor.searching', 'Searching…')}
             </p>
           ) : null}
-          {!loading && visibleOptions.length === 0 && !guestEmail ? (
+          {!loading && visibleOptions.length === 0 ? (
             <p className="px-2 py-3 text-center text-xs text-muted-foreground">
               {t('customers.calendar.editor.noResults', 'No results')}
             </p>
           ) : null}
-          {!loading && guestEmail ? (
-            <Button
-              type="button"
-              variant="ghost"
-              role="option"
-              aria-selected={false}
-              aria-label={guestLabel}
-              title={guestLabel}
-              onClick={() => {
-                const participant: EditorParticipant = { name: guestEmail, email: guestEmail, isCustomer: false }
-                onChange([...value, participant])
-                setQuery('')
-              }}
-              className="h-auto w-full justify-start gap-2 whitespace-normal px-2 py-1.5 text-left text-sm font-normal text-foreground"
-            >
-              <Avatar size="xs" label={guestEmail} />
-              <span className="min-w-0 flex-1 truncate">{guestLabel}</span>
-              {guestBadge}
-            </Button>
-          ) : null}
           {!loading
             ? visibleOptions.map((option) => (
                 <Button

package/src/modules/customers/components/calendar/editor/hooks.ts

@@ -8,7 +8,6 @@ import { computeDurationMinutes, type EditorFormState, type EditorKindConfig } f
 import { findEditorConflictItems } from '../../../lib/calendar/conflicts'
 import type { ConflictScope } from '../../../lib/calendar/preferences'
 import { mapInteractionToCalendarItem } from '../../../lib/calendar/mapItem'
-import { participantActorKey } from '../../../lib/calendar/participantIdentity'
 import { expandOccurrences } from '../../../lib/calendar/recurrence'
 import { getFetchWindow } from '../../../lib/calendar/range'
 import type { CalendarItem } from '../types'
@@ -73,12 +72,7 @@ export function useConflictProbe(
 ): string | null {
   const t = useT()
   const [conflict, setConflict] = React.useState<string | null>(null)
-  // Keys on the canonical actor key, not the raw userId — an external guest has
-  // no userId, so a userId-only key never changes when guests are added or
-  // removed and the probe would keep reporting the previous attendee set.
-  const participantsKey = form.participants
-    .map((participant) => participantActorKey(participant) ?? '')
-    .join(',')
+  const participantsKey = form.participants.map((participant) => participant.userId).join(',')
   React.useEffect(() => {
     if (!open || !form.date) {
       setConflict(null)

package/src/modules/customers/components/calendar/types.ts

@@ -18,7 +18,7 @@ export type CalendarRange = { from: Date; to: Date }
 
 const calendarParticipantSchema = z
   .object({
-    userId: z.string().optional(),
+    userId: z.string(),
     name: z.string().optional(),
     email: z.string().optional(),
   })
@@ -49,7 +49,7 @@ export const calendarInteractionPayloadSchema = z
 
 export type CalendarInteractionPayload = z.infer<typeof calendarInteractionPayloadSchema>
 
-export type CalendarParticipant = { userId?: string; name?: string; email?: string }
+export type CalendarParticipant = { userId: string; name?: string; email?: string }
 
 export interface CalendarItem {
   id: string

package/src/modules/customers/components/detail/AssignRoleDialog.tsx

@@ -640,13 +640,18 @@ export function AssignRoleDialog({
           </div>
         </div>
 
-        <DialogFooter className="shrink-0 border-t border-border/70 px-6 py-4 sm:justify-between">
-          <p className="text-xs text-muted-foreground">
-            {t(
-              'customers.roles.dialog.footerNote',
-              'One person per role · can be changed at any time',
-            )}
-          </p>
+        <DialogFooter
+          bordered={false}
+          className="shrink-0 border-t border-border/70 px-6 py-4"
+          leading={
+            <p className="text-xs text-muted-foreground sm:max-w-2xs">
+              {t(
+                'customers.roles.dialog.footerNote',
+                'One person per role · can be changed at any time',
+              )}
+            </p>
+          }
+        >
           <div className="flex items-center gap-2">
             <Button type="button" variant="outline" onClick={onClose}>
               {t('customers.roles.cancelAdd', 'Cancel')}

package/src/modules/customers/components/detail/CompanyKpiBar.tsx

@@ -2,7 +2,7 @@
 
 import * as React from 'react'
 import { EyeOff } from 'lucide-react'
-import { useT, useLocale } from '@open-mercato/shared/lib/i18n/context'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { KpiCard, type KpiTrend } from '@open-mercato/ui/backend/charts/KpiCard'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { IconButton } from '@open-mercato/ui/primitives/icon-button'
@@ -67,7 +67,6 @@ type CompanyKpiBarProps = {
 
 export function CompanyKpiBar({ data }: CompanyKpiBarProps) {
   const t = useT()
-  const locale = useLocale()
 
   const activeDeals = React.useMemo(() => getActiveDeals(data.deals), [data.deals])
   const activeDealsValue = React.useMemo(
@@ -127,7 +126,7 @@ export function CompanyKpiBar({ data }: CompanyKpiBarProps) {
       title: t('customers.companies.dashboard.kpi.activeDeals', 'ACTIVE DEALS'),
       value: activeDealsValue,
       trend: dealTrend,
-      formatValue: (v: number) => formatCurrency(v, dealCurrency, locale),
+      formatValue: (v: number) => formatCurrency(v, dealCurrency),
       comparisonLabel: `${data.kpis?.activeDealsCount ?? activeDeals.length} ${(data.kpis?.activeDealsCount ?? activeDeals.length) === 1 ? 'pipeline' : 'pipelines'}`,
     },
     {
@@ -141,7 +140,7 @@ export function CompanyKpiBar({ data }: CompanyKpiBarProps) {
       id: 'ltv',
       title: t('customers.companies.dashboard.kpi.ltv', 'CUSTOMER VALUE (LTV)'),
       value: ltvValue,
-      formatValue: ltvValue !== null ? (v: number) => formatCurrency(v, dealCurrency, locale) : undefined,
+      formatValue: ltvValue !== null ? (v: number) => formatCurrency(v, dealCurrency) : undefined,
       comparisonLabel: ltvValue !== null
         ? t('customers.companies.dashboard.kpi.wonDeals', 'won deals total')
         : t('customers.companies.dashboard.kpi.noWonDeals', 'No won deals'),
@@ -159,7 +158,7 @@ export function CompanyKpiBar({ data }: CompanyKpiBarProps) {
         ? `${data.kpis?.completedDealsCount ?? data.deals.filter((d) => isWonDealStatus(d.status)).length} ${t('customers.companies.dashboard.kpi.completedDeals', 'completed deals')}`
         : t('customers.companies.dashboard.kpi.noInteractions', 'No interactions yet'),
     },
-  ], [t, locale, activeDealsValue, dealTrend, dealCurrency, activeDeals.length, activityTrend, ltvValue, clientTenureYears, data.deals, data.interactions.length, data.kpis])
+  ], [t, activeDealsValue, dealTrend, dealCurrency, activeDeals.length, activityTrend, ltvValue, clientTenureYears, data.deals, data.interactions.length, data.kpis])
 
   const visibleTiles = kpiTiles.filter((tile) => !hiddenTiles.has(tile.id))