@open-mercato/core 0.6.8-develop.7063.1.664341cf65 → 0.6.8-develop.7065.1.b7b351a126

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

@@ -114,7 +114,7 @@ type InteractionSnapshot = {
     allDay: boolean | null
     recurrenceRule: string | null
     recurrenceEnd: Date | null
-    participants: Array<{ userId: string; name?: string; email?: string; status?: string }> | null
+    participants: Array<{ userId?: string; name?: string; email?: string; status?: string }> | null
     reminderMinutes: number | null
     visibility: string | null
     linkedEntities: Array<{ id: string; type: string; label: string }> | null

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) => (
-              <Avatar key={participant.userId} size="xs" label={participantLabel(participant)} />
+            {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.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) ids.push(participant.userId)
+      if (participant.isCustomer && participant.userId) 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.name && !participantNames.has(participant.userId)) {
+        if (participant.userId && participant.name && !participantNames.has(participant.userId)) {
           participantNames.set(participant.userId, participant.name)
         }
       }

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) => (
-                  <Avatar key={participant.userId} size="xs" label={participantLabel(participant)} />
+                {visibleParticipants.map((participant, index) => (
+                  <Avatar key={participant.userId ?? participant.email ?? index} size="xs" label={participantLabel(participant)} />
                 ))}
               </AvatarStack>
               {overflowCount > 0 ? (

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

@@ -1,6 +1,7 @@
 "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'
@@ -11,6 +12,15 @@ 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,
@@ -63,12 +73,38 @@ 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}
@@ -84,12 +120,12 @@ export function PeopleField({
           CONTROL_BORDER,
         )}
       >
-        {value.map((participant) => (
+        {value.map((participant, index) => (
           <PersonChip
-            key={participant.userId}
+            key={participant.userId ?? participant.email ?? index}
             name={participant.name}
-            badge={participant.isCustomer ? customerBadge : undefined}
-            onRemove={() => onChange(value.filter((entry) => entry.userId !== participant.userId))}
+            badge={participant.isCustomer ? customerBadge : participant.userId ? undefined : guestBadge}
+            onRemove={() => onChange(value.filter((_, entryIndex) => entryIndex !== index))}
             removeLabel={t('customers.calendar.editor.removePerson', 'Remove {name}', { name: participant.name })}
           />
         ))}
@@ -113,11 +149,31 @@ export function PeopleField({
               {t('customers.calendar.editor.searching', 'Searching…')}
             </p>
           ) : null}
-          {!loading && visibleOptions.length === 0 ? (
+          {!loading && visibleOptions.length === 0 && !guestEmail ? (
             <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,6 +8,7 @@ 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'
@@ -72,7 +73,12 @@ export function useConflictProbe(
 ): string | null {
   const t = useT()
   const [conflict, setConflict] = React.useState<string | null>(null)
-  const participantsKey = form.participants.map((participant) => participant.userId).join(',')
+  // 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(',')
   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(),
+    userId: z.string().optional(),
     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/schedule/ParticipantsField.tsx

@@ -173,7 +173,7 @@ interface ParticipantsFieldProps {
   activityType: ActivityType
   participants: Participant[]
   setParticipants: React.Dispatch<React.SetStateAction<Participant[]>>
-  removeParticipant: (userId: string) => void
+  removeParticipant: (index: number) => void
   guestPermissions: { canInviteOthers: boolean; canModify: boolean; canSeeList: boolean }
   setGuestPermissions: React.Dispatch<React.SetStateAction<{ canInviteOthers: boolean; canModify: boolean; canSeeList: boolean }>>
 }
@@ -205,19 +205,19 @@ export function ParticipantsField({
         {sectionLabel}
       </label>
       <div className="mt-2.5 flex flex-wrap content-center items-center gap-2 rounded-lg border border-border bg-background px-3 py-2.5">
-        {participants.map((p) => (
-          <div key={p.userId} className="inline-flex items-center gap-1.5 rounded-full border border-border bg-muted px-2.5 py-1.5">
+        {participants.map((p, index) => (
+          <div key={p.userId ?? p.email ?? index} className="inline-flex items-center gap-1.5 rounded-full border border-border bg-muted px-2.5 py-1.5">
             <span className={cn('inline-flex size-5 items-center justify-center rounded-full text-xs font-bold text-white', p.color ?? 'bg-primary')}>
               {p.name.charAt(0).toUpperCase()}
             </span>
             <span className="text-xs text-foreground">{p.name}</span>
-            <IconButton type="button" variant="ghost" size="sm" onClick={() => removeParticipant(p.userId)} className="h-auto text-muted-foreground hover:text-foreground p-0" aria-label={t('customers.schedule.removeParticipant', 'Remove participant')}>
+            <IconButton type="button" variant="ghost" size="sm" onClick={() => removeParticipant(index)} className="h-auto text-muted-foreground hover:text-foreground p-0" aria-label={t('customers.schedule.removeParticipant', 'Remove participant')}>
               <X className="size-3" />
             </IconButton>
           </div>
         ))}
         <ParticipantSearchPopover
-          existingIds={new Set(participants.map((p) => p.userId))}
+          existingIds={new Set(participants.map((p) => p.userId).filter((userId): userId is string => Boolean(userId)))}
           onAdd={(p) => setParticipants((prev) => [...prev, { ...p, status: 'pending' as RsvpStatus }])}
           onAddMany={(nextParticipants) => {
             setParticipants((prev) => [

package/src/modules/customers/components/detail/schedule/useScheduleFormState.ts

@@ -4,7 +4,7 @@ import type { ActivityType } from './fieldConfig'
 export type RsvpStatus = 'pending' | 'accepted' | 'declined' | 'tentative'
 
 export type Participant = {
-  userId: string
+  userId?: string
   name: string
   email?: string
   color?: string
@@ -36,7 +36,7 @@ export type ScheduleActivityEditData = {
   allDay?: boolean | null
   recurrenceRule?: string | null
   recurrenceEnd?: string | null
-  participants?: Array<{ userId: string; name?: string; email?: string; status?: string }> | null
+  participants?: Array<{ userId?: string; name?: string; email?: string; status?: string }> | null
   reminderMinutes?: number | null
   visibility?: string | null
   linkedEntities?: Array<{ id: string; type: string; label: string }> | null
@@ -136,7 +136,7 @@ export function useScheduleFormState({ open, editData }: UseScheduleFormStatePar
           Array.isArray(editData.participants)
             ? editData.participants.map((p, i) => ({
                 userId: p.userId,
-                name: p.name ?? p.userId,
+                name: p.name ?? p.email ?? p.userId ?? '',
                 email: p.email,
                 color: PARTICIPANT_COLORS[i % PARTICIPANT_COLORS.length],
                 status: (p.status ?? 'pending') as RsvpStatus,
@@ -219,8 +219,8 @@ export function useScheduleFormState({ open, editData }: UseScheduleFormStatePar
     setReminderMinutes(DEFAULT_REMINDER_MINUTES[activityType])
   }, [activityType, editData, open])
 
-  const removeParticipant = React.useCallback((userId: string) => {
-    setParticipants((prev) => prev.filter((p) => p.userId !== userId))
+  const removeParticipant = React.useCallback((index: number) => {
+    setParticipants((prev) => prev.filter((_, i) => i !== index))
   }, [])
 
   const toggleRecurrenceDay = React.useCallback((index: number) => {

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

@@ -144,7 +144,7 @@ export type InteractionSummary = {
   authorEmail?: string | null
   dealTitle?: string | null
   customValues?: Record<string, unknown> | null
-  participants?: Array<{ userId: string; name?: string; email?: string; status?: string }> | null
+  participants?: Array<{ userId?: string; name?: string; email?: string; status?: string }> | null
   reminderMinutes?: number | null
   visibility?: string | null
   linkedEntities?: Array<{ id: string; type: string; label: string }> | null

package/src/modules/customers/data/entities.ts

@@ -650,7 +650,7 @@ export class CustomerInteraction {
   recurrenceEnd?: Date | null
 
   @Property({ name: 'participants', type: 'jsonb', nullable: true })
-  participants?: Array<{ userId: string; name?: string; email?: string; status?: string }> | null
+  participants?: Array<{ userId?: string; name?: string; email?: string; status?: string }> | null
 
   @Property({ name: 'reminder_minutes', type: 'int', nullable: true })
   reminderMinutes?: number | null

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

@@ -10,6 +10,8 @@ export const ACTIVITY_DATE_REQUIRED_MESSAGE_KEY = 'customers.activities.errors.d
 export const ACTIVITY_TIME_REQUIRED_MESSAGE_KEY = 'customers.activities.errors.timeRequired'
 export const ACTIVITY_PHONE_REQUIRED_MESSAGE_KEY = 'customers.activities.errors.phoneRequired'
 export const ACTIVITY_PHONE_INVALID_MESSAGE_KEY = 'customers.activities.errors.phoneInvalid'
+export const INTERACTION_PARTICIPANT_IDENTITY_REQUIRED_MESSAGE_KEY = 'customers.activities.errors.participantIdentityRequired'
+export const INTERACTION_PARTICIPANT_EMAIL_INVALID_MESSAGE_KEY = 'customers.activities.errors.participantEmailInvalid'
 
 // customer_deals.description is an unbounded `text` column; this cap only exists to keep
 // request bodies, fulltext search documents and query-index documents from growing without limit.
@@ -424,12 +426,36 @@ export const interactionStatusValues = ['planned', 'done', 'canceled'] as const
 /** @deprecated See {@link interactionStatusValues}. */
 export type InteractionStatus = typeof interactionStatusValues[number]
 
-const interactionParticipantSchema = z.object({
-  userId: z.string().uuid(),
-  name: z.string().trim().max(200).optional(),
-  email: z.string().trim().max(320).optional(),
-  status: z.string().trim().max(50).optional(),
-})
+// A participant is either a real record (`userId`) or an external guest carrying
+// no id at all. A guest is only addressable through its email, so that email is
+// required and must actually be routable — an unparseable string would persist
+// and only fail later, at invitation or calendar-sync time. Participants that DO
+// have a userId keep an unvalidated auxiliary email, as before.
+const interactionParticipantSchema = z
+  .object({
+    userId: z.string().uuid().optional(),
+    name: z.string().trim().max(200).optional(),
+    email: z.string().trim().max(320).optional(),
+    status: z.string().trim().max(50).optional(),
+  })
+  .superRefine((participant, ctx) => {
+    if (participant.userId) return
+    if (!participant.email) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        path: ['email'],
+        message: INTERACTION_PARTICIPANT_IDENTITY_REQUIRED_MESSAGE_KEY,
+      })
+      return
+    }
+    if (!z.string().email().safeParse(participant.email).success) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        path: ['email'],
+        message: INTERACTION_PARTICIPANT_EMAIL_INVALID_MESSAGE_KEY,
+      })
+    }
+  })
 
 const interactionLinkedEntitySchema = z.object({
   id: z.string().uuid(),

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

@@ -28,6 +28,8 @@
   "customers.activities.card.overdue": "{count} überfällig",
   "customers.activities.card.title": "Aktivitäten",
   "customers.activities.errors.dateRequired": "Datum ist erforderlich",
+  "customers.activities.errors.participantEmailInvalid": "Geben Sie eine gültige E-Mail-Adresse für einen Gastteilnehmer ein (z. B. gast@example.org)",
+  "customers.activities.errors.participantIdentityRequired": "Ein Teilnehmer benötigt entweder einen Benutzerdatensatz oder eine E-Mail-Adresse",
   "customers.activities.errors.phoneInvalid": "Geben Sie eine gültige Telefonnummer mit Ländervorwahl ein (z. B. +49 30 1234567)",
   "customers.activities.errors.phoneRequired": "Telefonnummer ist für Anrufaktivitäten erforderlich",
   "customers.activities.errors.timeRequired": "Uhrzeit ist erforderlich",
@@ -222,6 +224,7 @@
   "customers.calendar.day.thu": "DO",
   "customers.calendar.day.tue": "DI",
   "customers.calendar.day.wed": "MI",
+  "customers.calendar.editor.addGuest": "{email} als Gast einladen",
   "customers.calendar.editor.addPeoplePlaceholder": "Mitarbeiter oder Kunden hinzufügen…",
   "customers.calendar.editor.addRecipientPlaceholder": "Empfänger hinzufügen…",
   "customers.calendar.editor.allDay": "Ganztägig",
@@ -247,6 +250,7 @@
   "customers.calendar.editor.description": "Beschreibung",
   "customers.calendar.editor.descriptionPlaceholder": "Details hinzufügen…",
   "customers.calendar.editor.error": "Termin konnte nicht gespeichert werden",
+  "customers.calendar.editor.guestBadge": "Gast",
   "customers.calendar.editor.location": "Ort",
   "customers.calendar.editor.locationPlaceholder": "Ort oder Link hinzufügen…",
   "customers.calendar.editor.multiDayHint": "Mehrtägiger Termin · {count} Tage",

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

@@ -28,6 +28,8 @@
   "customers.activities.card.overdue": "{count} overdue",
   "customers.activities.card.title": "Activities",
   "customers.activities.errors.dateRequired": "Date is required",
+  "customers.activities.errors.participantEmailInvalid": "Enter a valid email address for a guest participant (e.g. guest@example.org)",
+  "customers.activities.errors.participantIdentityRequired": "A participant needs either a user record or an email address",
   "customers.activities.errors.phoneInvalid": "Enter a valid phone number with country code (e.g. +1 212 555 1234)",
   "customers.activities.errors.phoneRequired": "Phone number is required for Call activities",
   "customers.activities.errors.timeRequired": "Time is required",
@@ -222,6 +224,7 @@
   "customers.calendar.day.thu": "THU",
   "customers.calendar.day.tue": "TUE",
   "customers.calendar.day.wed": "WED",
+  "customers.calendar.editor.addGuest": "Invite {email} as a guest",
   "customers.calendar.editor.addPeoplePlaceholder": "Add staff or customer…",
   "customers.calendar.editor.addRecipientPlaceholder": "Add recipient…",
   "customers.calendar.editor.allDay": "All day",
@@ -247,6 +250,7 @@
   "customers.calendar.editor.description": "Description",
   "customers.calendar.editor.descriptionPlaceholder": "Add details…",
   "customers.calendar.editor.error": "Failed to save event",
+  "customers.calendar.editor.guestBadge": "Guest",
   "customers.calendar.editor.location": "Location",
   "customers.calendar.editor.locationPlaceholder": "Add a location or link…",
   "customers.calendar.editor.multiDayHint": "Multi-day event · {count} days",

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

@@ -28,6 +28,8 @@
   "customers.activities.card.overdue": "{count} vencidas",
   "customers.activities.card.title": "Actividades",
   "customers.activities.errors.dateRequired": "La fecha es obligatoria",
+  "customers.activities.errors.participantEmailInvalid": "Introduce una dirección de correo electrónico válida para un invitado (p. ej., invitado@example.org)",
+  "customers.activities.errors.participantIdentityRequired": "Un participante necesita un registro de usuario o una dirección de correo electrónico",
   "customers.activities.errors.phoneInvalid": "Introduce un número de teléfono válido con prefijo internacional (p. ej., +34 912 345 678)",
   "customers.activities.errors.phoneRequired": "El número de teléfono es obligatorio para actividades de llamada",
   "customers.activities.errors.timeRequired": "La hora es obligatoria",
@@ -222,6 +224,7 @@
   "customers.calendar.day.thu": "JUE",
   "customers.calendar.day.tue": "MAR",
   "customers.calendar.day.wed": "MIÉ",
+  "customers.calendar.editor.addGuest": "Invitar a {email} como invitado",
   "customers.calendar.editor.addPeoplePlaceholder": "Añadir personal o cliente…",
   "customers.calendar.editor.addRecipientPlaceholder": "Añadir destinatario…",
   "customers.calendar.editor.allDay": "Todo el día",
@@ -247,6 +250,7 @@
   "customers.calendar.editor.description": "Descripción",
   "customers.calendar.editor.descriptionPlaceholder": "Añadir detalles…",
   "customers.calendar.editor.error": "No se pudo guardar el evento",
+  "customers.calendar.editor.guestBadge": "Invitado",
   "customers.calendar.editor.location": "Ubicación",
   "customers.calendar.editor.locationPlaceholder": "Añadir una ubicación o enlace…",
   "customers.calendar.editor.multiDayHint": "Evento de varios días · {count} días",

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

@@ -28,6 +28,8 @@
   "customers.activities.card.overdue": "{count}건 기한 초과",
   "customers.activities.card.title": "활동",
   "customers.activities.errors.dateRequired": "날짜는 필수입니다",
+  "customers.activities.errors.participantEmailInvalid": "게스트 참가자의 유효한 이메일 주소를 입력하세요(예: guest@example.org)",
+  "customers.activities.errors.participantIdentityRequired": "참가자에게는 사용자 레코드 또는 이메일 주소가 필요합니다",
   "customers.activities.errors.phoneInvalid": "국가 코드를 포함한 유효한 전화번호를 입력하세요(예: +1 212 555 1234)",
   "customers.activities.errors.phoneRequired": "통화 활동에는 전화번호가 필요합니다",
   "customers.activities.errors.timeRequired": "시간은 필수입니다",
@@ -222,6 +224,7 @@
   "customers.calendar.day.thu": "목",
   "customers.calendar.day.tue": "화",
   "customers.calendar.day.wed": "수",
+  "customers.calendar.editor.addGuest": "{email}을(를) 게스트로 초대",
   "customers.calendar.editor.addPeoplePlaceholder": "직원 또는 고객 추가…",
   "customers.calendar.editor.addRecipientPlaceholder": "받는 사람 추가…",
   "customers.calendar.editor.allDay": "종일",
@@ -247,6 +250,7 @@
   "customers.calendar.editor.description": "설명",
   "customers.calendar.editor.descriptionPlaceholder": "세부 정보 추가…",
   "customers.calendar.editor.error": "이벤트를 저장하지 못했습니다",
+  "customers.calendar.editor.guestBadge": "게스트",
   "customers.calendar.editor.location": "장소",
   "customers.calendar.editor.locationPlaceholder": "장소 또는 링크 추가…",
   "customers.calendar.editor.multiDayHint": "여러 날 이벤트 · {count}일",

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

@@ -28,6 +28,8 @@
   "customers.activities.card.overdue": "{count} zaległych",
   "customers.activities.card.title": "Aktywności",
   "customers.activities.errors.dateRequired": "Data jest wymagana",
+  "customers.activities.errors.participantEmailInvalid": "Wprowadź prawidłowy adres e-mail uczestnika zewnętrznego (np. gosc@example.org)",
+  "customers.activities.errors.participantIdentityRequired": "Uczestnik wymaga rekordu użytkownika lub adresu e-mail",
   "customers.activities.errors.phoneInvalid": "Wprowadź prawidłowy numer telefonu z numerem kierunkowym kraju (np. +48 123 456 789)",
   "customers.activities.errors.phoneRequired": "Numer telefonu jest wymagany dla aktywności typu Połączenie",
   "customers.activities.errors.timeRequired": "Godzina jest wymagana",
@@ -222,6 +224,7 @@
   "customers.calendar.day.thu": "CZ",
   "customers.calendar.day.tue": "WT",
   "customers.calendar.day.wed": "ŚR",
+  "customers.calendar.editor.addGuest": "Zaproś {email} jako gościa",
   "customers.calendar.editor.addPeoplePlaceholder": "Dodaj pracownika lub klienta…",
   "customers.calendar.editor.addRecipientPlaceholder": "Dodaj odbiorcę…",
   "customers.calendar.editor.allDay": "Cały dzień",
@@ -247,6 +250,7 @@
   "customers.calendar.editor.description": "Opis",
   "customers.calendar.editor.descriptionPlaceholder": "Dodaj szczegóły…",
   "customers.calendar.editor.error": "Nie udało się zapisać wydarzenia",
+  "customers.calendar.editor.guestBadge": "Gość",
   "customers.calendar.editor.location": "Lokalizacja",
   "customers.calendar.editor.locationPlaceholder": "Dodaj lokalizację lub link…",
   "customers.calendar.editor.multiDayHint": "Wydarzenie wielodniowe · {count} dni",

package/src/modules/customers/lib/calendar/conflicts.ts

@@ -1,4 +1,5 @@
 import type { CalendarItem, CalendarItemStatus, CalendarParticipant } from '../../components/calendar/types'
+import { participantActorKey } from './participantIdentity'
 import type { ConflictScope } from './preferences'
 
 export const EDITOR_DRAFT_CONFLICT_ID = '__draft__'
@@ -14,8 +15,15 @@ export type FindConflictsOptions = {
 function sharesActor(first: CalendarItem, second: CalendarItem): boolean {
   if (first.ownerUserId && second.ownerUserId && first.ownerUserId === second.ownerUserId) return true
   if (first.participants.length === 0 || second.participants.length === 0) return false
-  const firstParticipantIds = new Set(first.participants.map((participant) => participant.userId))
-  return second.participants.some((participant) => firstParticipantIds.has(participant.userId))
+  const firstActorKeys = new Set(
+    first.participants
+      .map(participantActorKey)
+      .filter((actorKey): actorKey is string => actorKey !== null),
+  )
+  return second.participants.some((participant) => {
+    const actorKey = participantActorKey(participant)
+    return actorKey !== null && firstActorKeys.has(actorKey)
+  })
 }
 
 function isActor(item: CalendarItem, userId: string): boolean {

package/src/modules/customers/lib/calendar/editorPayload.ts

@@ -112,7 +112,7 @@ export type EditorRelatedTo = {
 }
 
 export type EditorParticipant = {
-  userId: string
+  userId?: string
   name: string
   email?: string
   isCustomer: boolean
@@ -405,13 +405,14 @@ function parseParticipants(item: CalendarItem): EditorParticipant[] {
   const rawParticipants = Array.isArray(item.raw.participants) ? item.raw.participants : []
   const statusByUserId = new Map<string, string | null>()
   for (const raw of rawParticipants) {
+    if (!raw.userId) continue
     statusByUserId.set(raw.userId, readUnknownString((raw as Record<string, unknown>).status))
   }
   return item.participants.map((participant) => ({
     userId: participant.userId,
-    name: participant.name ?? participant.email ?? participant.userId,
+    name: participant.name ?? participant.email ?? participant.userId ?? '',
     email: participant.email,
-    isCustomer: statusByUserId.get(participant.userId) === 'customer',
+    isCustomer: participant.userId ? statusByUserId.get(participant.userId) === 'customer' : false,
   }))
 }
 

package/src/modules/customers/lib/calendar/mapItem.ts

@@ -10,6 +10,7 @@ import type {
   CalendarPlatform,
 } from '../../components/calendar/types'
 import { categoryOf } from './categories'
+import { participantActorKey } from './participantIdentity'
 
 const DEFAULT_DURATION_MINUTES = 30
 
@@ -43,9 +44,13 @@ function mapParticipants(payload: CalendarInteractionPayload): CalendarParticipa
   const seen = new Set<string>()
   const mapped: CalendarParticipant[] = []
   for (const participant of participants) {
-    if (seen.has(participant.userId)) continue
-    seen.add(participant.userId)
-    const entry: CalendarParticipant = { userId: participant.userId }
+    const dedupeKey = participantActorKey(participant)
+    if (dedupeKey) {
+      if (seen.has(dedupeKey)) continue
+      seen.add(dedupeKey)
+    }
+    const entry: CalendarParticipant = {}
+    if (typeof participant.userId === 'string') entry.userId = participant.userId
     if (typeof participant.name === 'string') entry.name = participant.name
     if (typeof participant.email === 'string') entry.email = participant.email
     mapped.push(entry)

package/src/modules/customers/lib/calendar/participantIdentity.ts

@@ -0,0 +1,17 @@
+/**
+ * The one canonical actor key for a calendar participant.
+ *
+ * A staff/customer attendee is identified by `userId`. An external guest has no
+ * record in the system, so the normalized email is the only stable identity it
+ * carries. Mapping, dedupe, conflict detection and the editor's conflict-probe
+ * dependency key all derive their key from here, so a guest is treated as the
+ * same actor across events instead of dropping out of actor comparisons.
+ *
+ * Returns `null` for a participant with neither — such a participant cannot be
+ * compared to any other and must never collide with one that can.
+ */
+export function participantActorKey(participant: { userId?: string; email?: string }): string | null {
+  if (participant.userId) return `user:${participant.userId}`
+  const email = participant.email?.trim().toLowerCase()
+  return email ? `email:${email}` : null
+}