@open-mercato/core 0.6.7-develop.6795.1.8a3f27921c → 0.6.7-develop.6814.1.0627c7e9f1

package/src/modules/customer_accounts/services/customerInvitationService.ts

@@ -13,6 +13,18 @@ import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/
 const BCRYPT_COST = 10
 const INVITATION_TTL_MS = 72 * 60 * 60 * 1000 // 72 hours
 
+export type CustomerInvitationRollbackState = {
+  email: string
+  token: string
+  customerEntityId: string | null
+  personEntityId: string | null
+  roleIdsJson: string[]
+  invitedByUserId: string | null
+  invitedByCustomerUserId: string | null
+  displayName: string | null
+  expiresAt: Date
+}
+
 export class CustomerInvitationService {
   constructor(private em: EntityManager) {}
 
@@ -21,12 +33,18 @@ export class CustomerInvitationService {
     scope: { tenantId: string; organizationId: string },
     options: {
       customerEntityId?: string | null
+      personEntityId?: string | null
       roleIds: string[]
       invitedByUserId?: string | null
       invitedByCustomerUserId?: string | null
       displayName?: string | null
     },
-  ): Promise<{ invitation: CustomerUserInvitation; rawToken: string }> {
+  ): Promise<{
+    invitation: CustomerUserInvitation
+    rawToken: string
+    reused: boolean
+    rollbackState: CustomerInvitationRollbackState | null
+  }> {
     const token = generateSecureToken()
     const emailHash = hashForLookup(email)
     const normalizedEmail = email.toLowerCase().trim()
@@ -53,16 +71,28 @@ export class CustomerInvitationService {
     )
 
     if (existing) {
+      const rollbackState: CustomerInvitationRollbackState = {
+        email: existing.email,
+        token: existing.token,
+        customerEntityId: existing.customerEntityId ?? null,
+        personEntityId: existing.personEntityId ?? null,
+        roleIdsJson: [...(existing.roleIdsJson ?? [])],
+        invitedByUserId: existing.invitedByUserId ?? null,
+        invitedByCustomerUserId: existing.invitedByCustomerUserId ?? null,
+        displayName: existing.displayName ?? null,
+        expiresAt: new Date(existing.expiresAt),
+      }
       existing.email = normalizedEmail
       existing.token = tokenHashed
       existing.customerEntityId = options.customerEntityId || null
+      existing.personEntityId = options.personEntityId || null
       existing.roleIdsJson = options.roleIds
       existing.invitedByUserId = options.invitedByUserId || null
       existing.invitedByCustomerUserId = options.invitedByCustomerUserId || null
       existing.displayName = options.displayName || null
       existing.expiresAt = expiresAt
       await this.em.flush()
-      return { invitation: existing, rawToken: token }
+      return { invitation: existing, rawToken: token, reused: true, rollbackState }
     }
 
     const invitation = this.em.create(CustomerUserInvitation, {
@@ -72,6 +102,7 @@ export class CustomerInvitationService {
       emailHash,
       token: tokenHashed,
       customerEntityId: options.customerEntityId || null,
+      personEntityId: options.personEntityId || null,
       roleIdsJson: options.roleIds,
       invitedByUserId: options.invitedByUserId || null,
       invitedByCustomerUserId: options.invitedByCustomerUserId || null,
@@ -80,7 +111,28 @@ export class CustomerInvitationService {
       createdAt: new Date(),
     } as any) as CustomerUserInvitation
     await this.em.persist(invitation).flush()
-    return { invitation, rawToken: token }
+    return { invitation, rawToken: token, reused: false, rollbackState: null }
+  }
+
+  async rollbackInvitation(
+    invitation: CustomerUserInvitation,
+    rollbackState: CustomerInvitationRollbackState | null,
+  ): Promise<void> {
+    if (!rollbackState) {
+      await this.em.remove(invitation).flush()
+      return
+    }
+
+    invitation.email = rollbackState.email
+    invitation.token = rollbackState.token
+    invitation.customerEntityId = rollbackState.customerEntityId
+    invitation.personEntityId = rollbackState.personEntityId
+    invitation.roleIdsJson = [...rollbackState.roleIdsJson]
+    invitation.invitedByUserId = rollbackState.invitedByUserId
+    invitation.invitedByCustomerUserId = rollbackState.invitedByCustomerUserId
+    invitation.displayName = rollbackState.displayName
+    invitation.expiresAt = new Date(rollbackState.expiresAt)
+    await this.em.flush()
   }
 
   async findByToken(token: string): Promise<CustomerUserInvitation | null> {
@@ -117,6 +169,7 @@ export class CustomerInvitationService {
       tenantId: invitation.tenantId,
       organizationId: invitation.organizationId,
       customerEntityId: invitation.customerEntityId || null,
+      personEntityId: invitation.personEntityId || null,
       isActive: true,
       emailVerifiedAt: new Date(), // Invitation implicitly verifies email
       failedLoginAttempts: 0,

package/src/modules/customer_accounts/subscribers/autoLinkCrm.ts

@@ -1,6 +1,7 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { CustomerUser } from '@open-mercato/core/modules/customer_accounts/data/entities'
 import { findWithDecryption, findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { resolveOwnedCompanyForPerson } from '@open-mercato/core/modules/customer_accounts/lib/customerEntityOwnership'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('customer_accounts').child({ component: 'auto-link-crm' })
@@ -26,17 +27,81 @@ export default async function handle(
   try {
     const user = await findOneWithDecryption(em, CustomerUser, { id: userId, tenantId, deletedAt: null }, undefined, { tenantId, organizationId })
     if (!user) return
-    if (user.personEntityId) return
+
+    const { CustomerEntity } = await import('@open-mercato/core/modules/customers/data/entities')
+
+    // Every lookup and write below normalizes against the user's OWN org, not just
+    // the tenant: customerEntityId is the portal's company scope key (portal user
+    // and invite routes filter on it), so adopting an entity from another org would
+    // widen the user's portal access instead of repairing it.
+    const ownScope = { tenantId, organizationId: user.organizationId }
+
+    // Defensive normalization for NEW users only — this subscriber runs on
+    // `customer_accounts.user.created`, which is never re-emitted for an existing
+    // row. customerEntityId is the CRM company FK, and earlier invite flows (#4362)
+    // could poison it with a person entity id, which then breaks every later user
+    // edit ("Company not found"). If the linked entity is a person (not a company)
+    // or sits outside the user's org, drop it — or recover the person's real company
+    // from their profile. Correct company links are left untouched. Rows created
+    // before this change keep their bad FK; see #4473 for the backfill.
+    if (user.customerEntityId) {
+      const linked = await findOneWithDecryption(
+        em,
+        CustomerEntity,
+        { id: user.customerEntityId, tenantId, organizationId: user.organizationId, deletedAt: null } as any,
+        undefined,
+        { tenantId, organizationId },
+      ) as any
+      if (!linked) {
+        // Not resolvable inside the user's own org — a cross-org (or deleted)
+        // entity. Clear it rather than leave it: this FK is the portal scope key.
+        await em.nativeUpdate(
+          CustomerUser,
+          { id: userId, tenantId, organizationId: user.organizationId },
+          { customerEntityId: null },
+        )
+        user.customerEntityId = null
+      } else if (linked.kind === 'person') {
+        // Only adopt a recovered company that is itself in the user's org.
+        const replacement = await resolveOwnedCompanyForPerson(em, user.customerEntityId, ownScope)
+        await em.nativeUpdate(
+          CustomerUser,
+          { id: userId, tenantId, organizationId: user.organizationId },
+          { customerEntityId: replacement },
+        )
+        user.customerEntityId = replacement
+      }
+    }
+
+    // A user invited from a CRM person card arrives with personEntityId already
+    // set, so the email-matching path below never runs for it. Derive the company
+    // FK from that person's own profile instead of leaving it null forever — the
+    // portal Users page, portal invitations, and the company detail "Portal users"
+    // group all key off customerEntityId (#4362).
+    if (user.personEntityId) {
+      if (user.customerEntityId) return
+      const recovered = await resolveOwnedCompanyForPerson(em, user.personEntityId, ownScope)
+      if (recovered) {
+        await em.nativeUpdate(
+          CustomerUser,
+          { id: userId, tenantId, organizationId: user.organizationId },
+          { customerEntityId: recovered },
+        )
+      }
+      return
+    }
 
     const email = (data?.email ? (data.email as string) : user.email)?.toLowerCase().trim()
     if (!email) return
 
-    const { CustomerEntity } = await import('@open-mercato/core/modules/customers/data/entities')
-
+    // Scope the candidate lookup to the user's own org. The fifth argument is a
+    // decryption scope, not a filter, so without organizationId in the `where`
+    // this matches people across every org in the tenant and writes a cross-org
+    // link that the normalization block above just cleared.
     const personEntities = await findWithDecryption(
       em,
       CustomerEntity,
-      { tenantId, kind: 'person', deletedAt: null } as any,
+      { tenantId, organizationId: user.organizationId, kind: 'person', deletedAt: null } as any,
       { limit: 500 } as any,
       { tenantId, organizationId },
     )
@@ -47,16 +112,18 @@ export default async function handle(
 
     if (!matchingEntity) return
 
-    const { CustomerPersonProfile } = await import('@open-mercato/core/modules/customers/data/entities')
-    const profile = await em.findOne(CustomerPersonProfile as any, { entity: matchingEntity.id } as any) as any
-    const companyEntityId = profile?.companyEntityId as string | undefined
+    const companyEntityId = await resolveOwnedCompanyForPerson(em, matchingEntity.id, ownScope)
 
     const updates: Record<string, unknown> = { personEntityId: matchingEntity.id }
     if (companyEntityId) {
       updates.customerEntityId = companyEntityId
     }
 
-    await em.nativeUpdate(CustomerUser, { id: userId }, updates)
+    await em.nativeUpdate(
+      CustomerUser,
+      { id: userId, tenantId, organizationId: user.organizationId },
+      updates,
+    )
   } catch (err) {
     logger.error('Failed to link customer user to CRM person', { err })
   }

package/src/modules/customer_accounts/widgets/injection/account-status/widget.client.tsx

@@ -130,7 +130,7 @@ function InviteForm({ personEntityId, onSuccess }: { personEntityId: string; onS
     try {
       await runMutation({
         context: { entityType: 'customer_accounts:user' },
-        mutationPayload: { customerEntityId: personEntityId, roleIds: selectedRoleIds },
+        mutationPayload: { personEntityId, roleIds: selectedRoleIds },
         operation: async () => {
           // optimistic-lock-exempt: creates a new portal invitation, not a concurrent record edit
           const call = await apiCall<{ ok: boolean; error?: string }>(
@@ -142,7 +142,7 @@ function InviteForm({ personEntityId, onSuccess }: { personEntityId: string; onS
                 email: trimmedEmail,
                 roleIds: selectedRoleIds,
                 displayName: displayName.trim() || undefined,
-                customerEntityId: personEntityId,
+                personEntityId,
               }),
             },
           )

package/src/modules/customer_accounts/widgets/injection-table.ts

@@ -8,10 +8,13 @@ const accountStatusWidget = {
   priority: 200,
 } as const
 
+// Column 1 on purpose (#4400): any column-2 group makes CrudForm switch the
+// company detail page to the narrow 7fr/3fr two-column layout, compressing the
+// left-side groups. Portal users belongs in the left stack as a full-width row.
 const companyUsersWidget = {
   widgetId: 'customer_accounts.injection.company-users',
   kind: 'group',
-  column: 2,
+  column: 1,
   groupLabel: 'customer_accounts.widgets.portalUsers',
   priority: 200,
 } as const

package/src/modules/customers/api/deals/[id]/people/route.ts

@@ -39,6 +39,7 @@ type DealPersonItem = {
   subtitle: string | null
   kind: 'person'
   linkedAt: string
+  isPrimary: boolean
 }
 
 function matchesSearch(item: DealPersonItem, query: string): boolean {
@@ -124,6 +125,7 @@ export async function GET(req: Request, ctx: { params?: { id?: string } }) {
           subtitle: person.primaryEmail ?? person.primaryPhone ?? null,
           kind: 'person',
           linkedAt: link.createdAt.toISOString(),
+          isPrimary: link.isPrimary === true,
         } satisfies DealPersonItem
       })
       .filter((item): item is DealPersonItem => item !== null)
@@ -169,6 +171,7 @@ export const openApi: OpenApiRouteDoc = {
                 subtitle: z.string().nullable(),
                 kind: z.literal('person'),
                 linkedAt: z.string(),
+                isPrimary: z.boolean(),
               }),
             ),
             total: z.number().int().nonnegative(),

package/src/modules/customers/api/deals/[id]/route.ts

@@ -56,6 +56,7 @@ type DealAssociation = {
   label: string
   subtitle: string | null
   kind: 'person' | 'company'
+  isPrimary?: boolean
 }
 
 function normalizePersonAssociation(entity: CustomerEntity): { label: string; subtitle: string | null } {
@@ -602,13 +603,19 @@ export async function GET(request: Request, context: { params?: Record<string, u
             )
           : [],
       ])
+      const primaryPersonIds = new Set(
+        personLinkRows
+          .filter((link) => link.isPrimary === true)
+          .map((link) => (typeof link.person === 'string' ? link.person : link.person?.id))
+          .filter((value): value is string => typeof value === 'string'),
+      )
       const previewPeopleMap = new Map(previewPeople.map((entity) => [entity.id, entity]))
       const previewCompaniesMap = new Map(previewCompanies.map((entity) => [entity.id, entity]))
       const people = linkedPersonIds.slice(0, 3).reduce<DealAssociation[]>((acc, personId) => {
         const entity = previewPeopleMap.get(personId) ?? null
         if (!entity || entity.deletedAt) return acc
         const { label, subtitle } = normalizePersonAssociation(entity)
-        acc.push({ id: entity.id, label, subtitle, kind: 'person' })
+        acc.push({ id: entity.id, label, subtitle, kind: 'person', isPrimary: primaryPersonIds.has(entity.id) })
         return acc
       }, [])
       const companies = linkedCompanyIds.slice(0, 3).reduce<DealAssociation[]>((acc, companyId) => {
@@ -654,7 +661,7 @@ export async function GET(request: Request, context: { params?: Record<string, u
       const entity = link.person as CustomerEntity | null
       if (!entity || entity.deletedAt) return acc
       const { label, subtitle } = normalizePersonAssociation(entity)
-      acc.push({ id: entity.id, label, subtitle, kind: 'person' })
+      acc.push({ id: entity.id, label, subtitle, kind: 'person', isPrimary: link.isPrimary === true })
       return acc
     }, [])
 
@@ -927,6 +934,7 @@ const dealDetailResponseSchema = z.object({
       label: z.string(),
       subtitle: z.string().nullable().optional(),
       kind: z.literal('person'),
+      isPrimary: z.boolean().optional(),
     }),
   ),
   companies: z.array(

package/src/modules/customers/backend/customers/companies-v2/[id]/page.tsx

@@ -70,6 +70,17 @@ export default function CompanyDetailV2Page({ params }: { params?: { id?: string
     return resolveLegacyTab(searchParams?.get('tab'))
   }, [searchParams])
   const [activeTab, setActiveTab] = React.useState<CompanyTabId>(initialTab)
+
+  const handleTabChange = React.useCallback(
+    (tab: CompanyTabId) => {
+      setActiveTab(tab)
+      if (!pathname) return
+      const nextParams = new URLSearchParams(searchParams?.toString() ?? '')
+      nextParams.set('tab', tab)
+      router.replace(`${pathname}?${nextParams.toString()}`, { scroll: false })
+    },
+    [pathname, router, searchParams],
+  )
   const [sectionAction, setSectionAction] = React.useState<SectionAction | null>(null)
   const { canViewDeals, isReady: isDealsAccessReady } = useDealsAccess()
 
@@ -520,7 +531,7 @@ export default function CompanyDetailV2Page({ params }: { params?: { id?: string
             zone2={
               <CompanyDetailTabs
                 activeTab={activeTab}
-                onTabChange={setActiveTab}
+                onTabChange={handleTabChange}
                 injectedTabs={injectedTabs.map((tab) => ({ id: tab.id, label: tab.label }))}
                 peopleCount={data.counts?.people ?? 0}
                 dealsCount={dealCount}

package/src/modules/customers/backend/customers/deals/[id]/hooks/types.ts

@@ -3,6 +3,7 @@ export type DealAssociation = {
   label: string
   subtitle: string | null
   kind: 'person' | 'company'
+  isPrimary?: boolean
 }
 
 export type PersonAssociationApiRecord = {

package/src/modules/customers/backend/customers/deals/[id]/page.tsx

@@ -69,13 +69,6 @@ export default function DealDetailPage({ params }: { params?: { id?: string } })
   } = useScheduleDialog()
   const formWrapperRef = React.useRef<HTMLDivElement>(null)
 
-  const initialTab = React.useMemo(() => resolveLegacyTab(searchParams?.get('tab')), [searchParams])
-  const [activeTab, setActiveTab] = React.useState<DealTabId>(initialTab)
-
-  React.useEffect(() => {
-    setActiveTab(initialTab)
-  }, [initialTab])
-
   const currentDealId = data?.deal.id ?? id
   const { injectionContext, runMutationWithContext } = useDealMutationContext({
     currentDealId,
@@ -108,6 +101,17 @@ export default function DealDetailPage({ params }: { params?: { id?: string } })
     setData,
   })
 
+  const injectedTabIds = React.useMemo(() => injectedTabs.map((tab) => tab.id), [injectedTabs])
+  const initialTab = React.useMemo(
+    () => resolveLegacyTab(searchParams?.get('tab'), injectedTabIds),
+    [injectedTabIds, searchParams],
+  )
+  const [activeTab, setActiveTab] = React.useState<DealTabId>(initialTab)
+
+  React.useEffect(() => {
+    setActiveTab(initialTab)
+  }, [initialTab])
+
   const { searchPeoplePage, fetchPeopleByIds, searchCompaniesPage, fetchCompaniesByIds } = useDealAssociationLookups({
     excludeLinkedDealId: data?.deal.id ?? null,
   })
@@ -131,6 +135,7 @@ export default function DealDetailPage({ params }: { params?: { id?: string } })
           id: entry.id,
           label: entry.subtitle ? `${entry.label} · ${entry.subtitle}` : entry.label,
           kind: entry.kind,
+          isPrimary: entry.isPrimary === true,
         }))
       : []),
     [data],
@@ -141,7 +146,8 @@ export default function DealDetailPage({ params }: { params?: { id?: string } })
     setSelectedActivityEntityId((current) => {
       if (activityEntities.length === 1) return activityEntities[0].id
       if (current && activityEntities.some((entry) => entry.id === current)) return current
-      return null
+      const primary = activityEntities.find((entry) => entry.isPrimary)
+      return (primary ?? activityEntities[0])?.id ?? null
     })
   }, [activityEntities])
 
@@ -629,7 +635,7 @@ export default function DealDetailPage({ params }: { params?: { id?: string } })
             isSaving={isSaving}
           />
 
-          <InjectionSpot spotId={extensionPoints.hosts.dealStatusBadges.spotId} context={injectionContext} data={data} />
+          <InjectionSpot spotId={extensionPoints.hosts.dealStatusBadges.spotId} context={injectionContext} data={data} onDataChange={setData} />
 
           <PipelineStepper
             stages={data.pipelineStages}

package/src/modules/customers/backend/customers/people-v2/[id]/page.tsx

@@ -92,10 +92,6 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
   const [isSaving, setIsSaving] = React.useState(false)
   const formWrapperRef = React.useRef<HTMLDivElement>(null)
 
-  const initialTab = React.useMemo(() => {
-    return resolveLegacyTab(searchParams?.get('tab'))
-  }, [searchParams])
-  const [activeTab, setActiveTab] = React.useState<PersonTabId>(initialTab)
   const [sectionAction, setSectionAction] = React.useState<SectionAction | null>(null)
   const [scheduleDialogOpen, setScheduleDialogOpen] = React.useState(false)
   const [scheduleEditData, setScheduleEditData] = React.useState<ScheduleActivityEditData | null>(null)
@@ -329,6 +325,28 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
 
   const injectedTabMap = React.useMemo(() => new Map(injectedTabs.map((tab) => [tab.id, tab.render])), [injectedTabs])
 
+  const injectedTabIds = React.useMemo(() => injectedTabs.map((tab) => tab.id), [injectedTabs])
+  const initialTab = React.useMemo(
+    () => resolveLegacyTab(searchParams?.get('tab'), injectedTabIds),
+    [injectedTabIds, searchParams],
+  )
+  const [activeTab, setActiveTab] = React.useState<PersonTabId>(initialTab)
+
+  React.useEffect(() => {
+    setActiveTab(initialTab)
+  }, [initialTab])
+
+  const handleTabChange = React.useCallback(
+    (tab: PersonTabId) => {
+      setActiveTab(tab)
+      if (!pathname) return
+      const nextParams = new URLSearchParams(searchParams?.toString() ?? '')
+      nextParams.set('tab', tab)
+      router.replace(`${pathname}?${nextParams.toString()}`, { scroll: false })
+    },
+    [pathname, router, searchParams],
+  )
+
   // Tags
   const handleTagsChange = React.useCallback((nextTags: TagSummary[]) => {
     setData((prev) => (prev ? { ...prev, tags: nextTags } : prev))
@@ -515,7 +533,7 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
             onDelete={handleFormDelete}
             isDirty={isDirty}
             isSaving={isSaving}
-            onOpenCompaniesTab={() => setActiveTab('companies')}
+            onOpenCompaniesTab={() => handleTabChange('companies')}
             onDataReload={() => { loadData().catch((err) => logger.warn('onDataReload failed', { component: 'people-v2', err })) }}
             onFocusField={(fieldName) => {
               const selectorMap: Record<string, string> = {
@@ -557,7 +575,7 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
             const zone2Content = (
               <PersonDetailTabs
                 activeTab={activeTab}
-                onTabChange={setActiveTab}
+                onTabChange={handleTabChange}
                 injectedTabs={injectedTabs.map((tab) => ({ id: tab.id, label: tab.label }))}
                 activitiesCount={interactionCount}
                 dealsCount={dealCount}

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

@@ -273,6 +273,7 @@ type DealSnapshot = {
     lossNotes: string | null
   }
   people: string[]
+  primaryPersonEntityId?: string | null
   companies: string[]
   transitions: DealStageTransitionSnapshot[]
   custom?: Record<string, unknown>
@@ -324,6 +325,7 @@ async function loadDealSnapshot(em: EntityManager, id: string): Promise<DealSnap
     tenantId: deal.tenantId,
     organizationId: deal.organizationId,
   })
+  const primaryPerson = peopleLinks.find((link) => link.isPrimary)?.person
   return {
     deal: {
       id: deal.id,
@@ -348,6 +350,8 @@ async function loadDealSnapshot(em: EntityManager, id: string): Promise<DealSnap
     people: peopleLinks.map((link) =>
       typeof link.person === 'string' ? link.person : link.person.id
     ),
+    primaryPersonEntityId:
+      typeof primaryPerson === 'string' ? primaryPerson : primaryPerson?.id ?? null,
     companies: companyLinks.map((link) =>
       typeof link.company === 'string' ? link.company : link.company.id
     ),
@@ -372,18 +376,55 @@ function toNumericString(value: number | null | undefined): string | null {
 async function syncDealPeople(
   em: EntityManager,
   deal: CustomerDeal,
-  personIds: string[] | undefined | null
+  personIds: string[] | undefined | null,
+  primaryPersonEntityId?: string | null
 ): Promise<void> {
-  if (personIds === undefined) return
+  if (personIds === undefined) {
+    if (primaryPersonEntityId === undefined) return
+    const links = await em.find(CustomerDealPersonLink, { deal })
+    if (primaryPersonEntityId !== null && !links.some((link) => link.person.id === primaryPersonEntityId)) {
+      const { translate } = await resolveTranslations()
+      throw new CrudHttpError(400, {
+        error: translate(
+          'customers.errors.primaryPersonMustBeLinked',
+          'Primary person must be linked to the deal',
+        ),
+      })
+    }
+    for (const link of links) {
+      link.isPrimary = false
+    }
+    await em.flush()
+    if (primaryPersonEntityId !== null) {
+      const primaryLink = links.find((link) => link.person.id === primaryPersonEntityId)
+      if (primaryLink) primaryLink.isPrimary = true
+    }
+    return
+  }
+  const unique = Array.from(new Set(personIds ?? []))
+  if (primaryPersonEntityId !== undefined && primaryPersonEntityId !== null && !unique.includes(primaryPersonEntityId)) {
+    const { translate } = await resolveTranslations()
+    throw new CrudHttpError(400, {
+      error: translate(
+        'customers.errors.primaryPersonMustBeLinked',
+        'Primary person must be linked to the deal',
+      ),
+    })
+  }
+  let effectivePrimaryId = primaryPersonEntityId
+  if (effectivePrimaryId === undefined) {
+    const existingPrimary = await em.findOne(CustomerDealPersonLink, { deal, isPrimary: true })
+    effectivePrimaryId = existingPrimary?.person?.id ?? null
+  }
   await em.nativeDelete(CustomerDealPersonLink, { deal })
-  if (!personIds || !personIds.length) return
-  const unique = Array.from(new Set(personIds))
+  if (!unique.length) return
   for (const personId of unique) {
     const person = await requireCustomerEntity(em, personId, { tenantId: deal.tenantId, organizationId: deal.organizationId }, 'person', 'Person not found')
     ensureSameScope(person, deal.organizationId, deal.tenantId)
     const link = em.create(CustomerDealPersonLink, {
       deal,
       person,
+      isPrimary: personId === effectivePrimaryId,
     })
     em.persist(link)
   }
@@ -479,7 +520,7 @@ const createDealCommand: CommandHandler<DealCreateInput, { dealId: string }> = {
           transitionedByUserId: normalizedTransitionAuthorUserId,
         })
       },
-      () => syncDealPeople(em, deal, parsed.personIds ?? []),
+      () => syncDealPeople(em, deal, parsed.personIds ?? [], parsed.primaryPersonEntityId),
       () => syncDealCompanies(em, deal, parsed.companyIds ?? []),
     ], { transaction: true })
 
@@ -575,7 +616,7 @@ const createDealCommand: CommandHandler<DealCreateInput, { dealId: string }> = {
     }
     const restoredDeal = deal
     await withAtomicFlush(em, [
-      () => syncDealPeople(em, restoredDeal, after.people),
+      () => syncDealPeople(em, restoredDeal, after.people, after.primaryPersonEntityId),
       () => syncDealCompanies(em, restoredDeal, after.companies),
       () => deleteDealStageTransitions(em, restoredDeal),
       () => restoreDealStageTransitions(em, restoredDeal, after.transitions),
@@ -746,7 +787,7 @@ const updateDealCommand: CommandHandler<DealUpdateInput, { dealId: string }> = {
             transitionedByUserId: normalizedTransitionAuthorUserId,
           })
         },
-        () => syncDealPeople(em, record, parsed.personIds),
+        () => syncDealPeople(em, record, parsed.personIds, parsed.primaryPersonEntityId),
         () => syncDealCompanies(em, record, parsed.companyIds),
       ],
     })
@@ -889,7 +930,7 @@ const updateDealCommand: CommandHandler<DealUpdateInput, { dealId: string }> = {
           transitionedByUserId: normalizedTransitionAuthorUserId,
         })
       },
-      () => syncDealPeople(em, deal, before.people),
+      () => syncDealPeople(em, deal, before.people, before.primaryPersonEntityId),
       () => syncDealCompanies(em, deal, before.companies),
     ], { transaction: true })
 
@@ -1008,7 +1049,7 @@ const deleteDealCommand: CommandHandler<{ body?: Record<string, unknown>; query?
         em.persist(deal)
       }
       await withAtomicFlush(em, [
-        () => syncDealPeople(em, deal, before.people),
+        () => syncDealPeople(em, deal, before.people, before.primaryPersonEntityId),
         () => syncDealCompanies(em, deal, before.companies),
         () => deleteDealStageTransitions(em, deal),
         () => restoreDealStageTransitions(em, deal, before.transitions),

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

@@ -181,6 +181,7 @@ type PersonSnapshot = {
     id: string
     dealId: string
     participantRole: string | null
+    isPrimary?: boolean
     createdAt: Date
   }>
   activities: PersonActivitySnapshot[]
@@ -345,6 +346,7 @@ function serializePersonSnapshot(
         id: link.id,
         dealId: link.deal.id,
         participantRole: link.participantRole ?? null,
+        isPrimary: link.isPrimary === true,
         createdAt: link.createdAt,
       })),
     activities: activities.map((activity) => ({
@@ -1522,6 +1524,7 @@ const deletePersonCommand: CommandHandler<{ body?: Record<string, unknown>; quer
           deal,
           person: entity,
           participantRole: link.participantRole,
+          isPrimary: link.isPrimary === true,
           createdAt: link.createdAt,
         })
         em.persist(restoredLink)