@open-mercato/core 0.10.1-develop.7761.1.9dfaf470ed → 0.10.1-develop.7762.1.657bb7236b

package/src/modules/customers/backend/customers/deals/pipeline/components/QuickDealDialog.tsx

@@ -2,6 +2,7 @@
 
 import * as React from 'react'
 import { z } from 'zod'
+import { E } from '#generated/entities.ids.generated'
 import {
   Dialog,
   DialogContent,
@@ -14,6 +15,7 @@ import { CrudForm, type CrudField, type CrudFormGroup } from '@open-mercato/ui/b
 import { ComboboxInput } from '@open-mercato/ui/backend/inputs/ComboboxInput'
 import { createCrud } from '@open-mercato/ui/backend/utils/crud'
 import { createCrudFormError } from '@open-mercato/ui/backend/utils/serverErrors'
+import { extensionPoints } from '../../../../../extension-points'
 import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -124,14 +126,8 @@ export function QuickDealDialog({
     if (open) setFormInstanceKey((current) => current + 1)
   }, [open])
 
-  const { runMutation, retryLastMutation } = useGuardedMutation<{
-    formId: string
-    resourceKind: string
-    retryLastMutation: () => Promise<boolean>
-  }>({
-    contextId: QUICK_DEAL_CONTEXT_ID,
-    blockedMessage: translateWithFallback(t, 'ui.forms.flash.saveBlocked', 'Save blocked by validation'),
-  })
+
+  const { runMutation, retryLastMutation } = useGuardedMutation({ contextId: QUICK_DEAL_CONTEXT_ID, blockedMessage: translateWithFallback(t, 'ui.forms.flash.saveBlocked', 'Save blocked by validation') })
 
   const titleRequiredMessage = translateWithFallback(
     t,
@@ -355,33 +351,28 @@ export function QuickDealDialog({
       if (values.description && values.description.trim().length) {
         payload.description = values.description
       }
-      const operation = () =>
-        createCrud('customers/deals', payload, {
+      const { result } = await runMutation({
+        operation: () => createCrud<{ id?: string; entityId?: string }>('customers/deals', payload, {
           errorMessage: translateWithFallback(t, 'customers.deals.create.error', 'Failed to create deal.'),
-        })
-      await runMutation({
-        operation,
-        context: {
-          formId: QUICK_DEAL_CONTEXT_ID,
-          resourceKind: 'customers.deal',
-          retryLastMutation,
-        },
+        }),
+        context: { formId: QUICK_DEAL_CONTEXT_ID, resourceKind: 'customers.deal', retryLastMutation },
+        mutationPayload: payload,
       })
       flash(
-        translateWithFallback(
-          t,
-          'customers.deals.kanban.quickDeal.success',
-          'Deal added to {stage}.',
-          { stage: context.pipelineStageLabel },
-        ),
+        translateWithFallback(t, 'customers.deals.kanban.quickDeal.success', 'Deal added to {stage}.', { stage: context.pipelineStageLabel }),
         'success',
       )
-      onCreated()
-      onClose()
+      return { resourceId: result?.id ?? result?.entityId }
     },
-    [context, currentUserId, onClose, onCreated, retryLastMutation, runMutation, t, titleRequiredMessage],
+    [context, currentUserId, t, titleRequiredMessage, runMutation, retryLastMutation],
   )
 
+  const handleSubmitSuccess = React.useCallback(() => {
+    if (!context) return
+    onCreated()
+    onClose()
+  }, [context, onCreated, onClose])
+
   if (!context) return null
 
   return (
@@ -409,6 +400,12 @@ export function QuickDealDialog({
         <CrudForm<QuickDealFormValues>
           key={`${context.pipelineStageId}:${formInstanceKey}`}
           embedded
+          formId={QUICK_DEAL_CONTEXT_ID}
+          entityId="customers.deal"
+          entityIds={[E.customers.customer_deal]}
+          resourceKind="customers.deal"
+          injectionSpotId={extensionPoints.hosts.dealForm.spotId}
+          injectionGroupAliases={{ details: 'basic' }}
           fields={fields}
           groups={groups}
           // The "More details" group starts collapsed; users can expand to set
@@ -419,6 +416,7 @@ export function QuickDealDialog({
           schema={formSchema}
           submitLabel={translateWithFallback(t, 'customers.deals.kanban.quickDeal.submit', 'Add deal')}
           onSubmit={handleSubmit}
+          onSubmitSuccess={handleSubmitSuccess}
         />
       </DialogContent>
     </Dialog>

package/src/modules/customers/backend/customers/people/create/page.tsx

@@ -10,6 +10,7 @@ import { E } from '#generated/entities.ids.generated'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useOrganizationScopeDetail } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
+import { extensionPoints } from '../../../../extension-points'
 import {
   buildPersonPayload,
   createPersonFormFields,
@@ -52,6 +53,10 @@ export default function CreatePersonPage() {
           fields={fields}
           groups={groups}
           initialValues={initialValues}
+          injectionSpotId={extensionPoints.hosts.personForm.spotId}
+          legacyInjectionSpotId="crud-form:customers.customer_entity"
+          entityId="customers.person"
+          resourceKind="customers.person"
           entityIds={[E.customers.customer_entity, E.customers.customer_person_profile]}
           submitLabel={t('customers.people.form.submit')}
           cancelHref={returnTo ?? '/backend/customers/people'}
@@ -127,6 +132,10 @@ export default function CreatePersonPage() {
             }
 
             flash(t('customers.people.form.success'), 'success')
+            return newId ? { resourceId: newId } : undefined
+          }}
+          onSubmitSuccess={async (_values, result) => {
+            const newId = result?.resourceId
             if (returnTo) router.push(returnTo)
             else if (newId) router.push(`/backend/customers/people-v2/${newId}`)
             else router.push('/backend/customers/people')

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

@@ -23,7 +23,9 @@ import { useOrganizationScopeDetail } from '@open-mercato/shared/lib/frontend/us
 import { Button } from '@open-mercato/ui/primitives/button'
 import { AttachmentsSection, ErrorMessage, LoadingMessage, RecordNotFoundState, type SectionAction } from '@open-mercato/ui/backend/detail'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
-import { InjectionSpot, useInjectionWidgets } from '@open-mercato/ui/backend/injection/InjectionSpot'
+import { InjectionSpot } from '@open-mercato/ui/backend/injection/InjectionSpot'
+import { useCustomerInjectedTabs } from '../../../../components/detail/useCustomerInjectedTabs'
+import { CustomerDetailSidebar } from '../../../../components/detail/CustomerDetailSidebar'
 import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { buildRecordInjectionContext, useSetCurrentRecordInjectionContext } from '@open-mercato/ui/backend/injection/recordContext'
 import { createTranslatorWithFallback } from '@open-mercato/shared/lib/i18n/translate'
@@ -38,7 +40,7 @@ import type { TagSummary } from '../../../../components/detail/types'
 import { ScheduleActivityDialog, type ScheduleActivityEditData } from '../../../../components/detail/ScheduleActivityDialog'
 import { PersonDetailHeader } from '../../../../components/detail/PersonDetailHeader'
 import { ChangelogTab } from '../../../../components/detail/ChangelogTab'
-import { PersonDetailTabs, resolveLegacyTab, type PersonTabId } from '../../../../components/detail/PersonDetailTabs'
+import { PersonDetailTabs, PERSON_DETAIL_TAB_IDS, resolveLegacyTab, type PersonTabId } from '../../../../components/detail/PersonDetailTabs'
 import { AddressesSection } from '../../../../components/detail/AddressesSection'
 import { PersonCompaniesSection } from '../../../../components/detail/PersonCompaniesSection'
 import { MobilePersonDetail } from '../../../../components/detail/MobilePersonDetail'
@@ -207,9 +209,11 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
       resourceKind: 'customers.person',
       resourceId: currentPersonId ?? (id ?? undefined),
       data,
+      isDirty,
+      isSaving,
       retryLastMutation,
     }),
-    [currentPersonId, data, id, mutationContextId, retryLastMutation],
+    [currentPersonId, data, isDirty, isSaving, id, mutationContextId, retryLastMutation],
   )
   const runMutationWithContext = React.useCallback(
     async <T,>(operation: () => Promise<T>, mutationPayload?: Record<string, unknown>): Promise<T> => {
@@ -298,37 +302,14 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
     setScheduleDialogOpen(true)
   }, [])
 
-  // Injected tabs from UMES
-  const { widgets: injectedTabWidgets } = useInjectionWidgets('detail:customers.person:tabs', {
+  const { injectedTabs, injectedTabMap, loading: injectedTabsLoading } = useCustomerInjectedTabs({
+    spotId: extensionPoints.hosts.personTabs.spotId,
     context: injectionContext,
-    triggerOnLoad: true,
+    data,
+    onDataChange: setData,
+    nativeTabIds: PERSON_DETAIL_TAB_IDS,
   })
 
-  const injectedTabs = React.useMemo(
-    () =>
-      (injectedTabWidgets ?? [])
-        .filter((widget) => (widget.placement?.kind ?? 'tab') === 'tab')
-        .map((widget) => {
-          const tabId = widget.placement?.groupId ?? widget.widgetId
-          const label = widget.placement?.groupLabel
-            ? t(widget.placement.groupLabel, widget.placement.groupLabel)
-            : widget.module.metadata.title ?? tabId
-          const priority = typeof widget.placement?.priority === 'number' ? widget.placement.priority : 0
-          const render = () => (
-            <widget.module.Widget
-              context={injectionContext}
-              data={data}
-              onDataChange={(next: unknown) => setData(next as PersonOverview)}
-            />
-          )
-          return { id: tabId, label, priority, render }
-        })
-        .sort((a, b) => b.priority - a.priority),
-    [data, injectedTabWidgets, injectionContext, t],
-  )
-
-  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),
@@ -530,6 +511,7 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
 
           {/* Persistent person header */}
           <PersonDetailHeader
+            actions={<InjectionSpot spotId={extensionPoints.hosts.personHeaderActions.spotId} context={injectionContext} data={data} disabled={isSaving} />}
             data={data}
             onTagsChange={handleTagsChange}
             tagsSectionControllerRef={tagsSectionControllerRef}
@@ -554,6 +536,7 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
           />
 
           {/* Zone content shared between desktop (CollapsibleZoneLayout) and mobile (MobilePersonDetail). */}
+          <CustomerDetailSidebar spotId={extensionPoints.hosts.personSidebar.spotId} context={injectionContext} data={data} onDataChange={setData} disabled={isSaving}>
           {(() => {
             const zone1Content = (
               <div ref={formWrapperRef}>
@@ -561,6 +544,10 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
                   embedded
                   trackDirtyWhenEmbedded
                   injectionSpotId={extensionPoints.hosts.personForm.spotId}
+                  entityId="customers.person"
+                  resourceKind="customers.person"
+                  resourceId={personId}
+                  injectionGroupAliases={{ details: 'personalData' }}
                   entityIds={[E.customers.customer_entity, E.customers.customer_person_profile]}
                   schema={formSchema}
                   fields={fields}
@@ -580,6 +567,7 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
               <PersonDetailTabs
                 activeTab={activeTab}
                 onTabChange={handleTabChange}
+                isLoadingInjectedTabs={injectedTabsLoading}
                 injectedTabs={injectedTabs.map((tab) => ({ id: tab.id, label: tab.label }))}
                 activitiesCount={interactionCount}
                 dealsCount={dealCount}
@@ -591,8 +579,6 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
                 <div className="min-w-0">
                 {(() => {
                   // Injected tab content
-                  const injected = injectedTabMap.get(activeTab)
-                  if (injected) return injected()
 
                   if (activeTab === 'activities') {
                     return (
@@ -719,6 +705,7 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
 
                   return null
                 })()}
+                {injectedTabMap.get(activeTab)?.()}
                 </div>
               </PersonDetailTabs>
             )
@@ -740,6 +727,7 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
               />
             )
           })()}
+          </CustomerDetailSidebar>
 
           {/* UMES footer injection */}
           <InjectionSpot spotId={extensionPoints.hosts.personFooter.spotId} context={injectionContext} data={data} />

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

@@ -29,6 +29,7 @@ type CompanyDetailHeaderProps = {
   onDelete: () => Promise<void>
   isDirty: boolean
   isSaving: boolean
+  actions?: React.ReactNode
   onFocusField?: (fieldName: string) => void
   onDataReload?: () => void
 }
@@ -57,6 +58,7 @@ export function CompanyDetailHeader({
   onDelete,
   isDirty,
   isSaving,
+  actions,
   onFocusField,
   onDataReload,
 }: CompanyDetailHeaderProps) {
@@ -199,6 +201,7 @@ export function CompanyDetailHeader({
         {/* Right side: actions */}
         <div className="flex w-full shrink-0 flex-col items-start gap-3 sm:w-auto sm:items-end">
           <div className="flex w-full flex-wrap items-center justify-start gap-2 sm:w-auto sm:justify-end">
+            {actions}
             <SendObjectMessageDialog
               object={{
                 entityModule: 'customers',

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

@@ -17,6 +17,8 @@ import { registerComponent } from '@open-mercato/shared/modules/widgets/componen
 import { useRegisteredComponent } from '@open-mercato/ui/backend/injection/useRegisteredComponent'
 import { useDealsAccess } from './useDealsAccess'
 
+export const COMPANY_DETAIL_TAB_IDS = ['people', 'deals', 'activity-log', 'changelog', 'files'] as const
+
 export type CompanyTabId =
   | 'people'
   | 'deals'
@@ -38,6 +40,7 @@ export type CompanyDetailTabsProps = {
   activeTab: CompanyTabId
   onTabChange: (tab: CompanyTabId) => void
   injectedTabs?: Array<{ id: string; label: string; priority?: number }>
+  isLoadingInjectedTabs?: boolean
   hiddenTabIds?: string[]
   peopleCount?: number
   dealsCount?: number
@@ -57,10 +60,11 @@ const LEGACY_TAB_MAP: Record<string, CompanyTabId> = {
   analysis: 'people',
 }
 
-export function resolveLegacyTab(tab: string | null | undefined): CompanyTabId {
+export function resolveLegacyTab(tab: string | null | undefined, knownTabIds?: Iterable<string>): CompanyTabId {
   if (!tab) return 'people'
   if (LEGACY_TAB_MAP[tab]) return LEGACY_TAB_MAP[tab]
-  return tab as CompanyTabId
+  if ((COMPANY_DETAIL_TAB_IDS as readonly string[]).includes(tab) || (knownTabIds && new Set(knownTabIds).has(tab))) return tab
+  return 'people'
 }
 
 function formatTabCount(count: number): string | number | undefined {
@@ -72,6 +76,7 @@ function DefaultCompanyDetailTabs({
   activeTab,
   onTabChange,
   injectedTabs = [],
+  isLoadingInjectedTabs = false,
   hiddenTabIds = [],
   peopleCount = 0,
   dealsCount = 0,
@@ -81,7 +86,7 @@ function DefaultCompanyDetailTabs({
   children,
 }: CompanyDetailTabsProps) {
   const t = useT()
-  const { canViewDeals } = useDealsAccess()
+  const { canViewDeals, isReady: isDealsAccessReady } = useDealsAccess()
 
   const builtInTabs: TabDef[] = React.useMemo(
     () => [
@@ -127,13 +132,19 @@ function DefaultCompanyDetailTabs({
     const hidden = new Set(hiddenTabIds)
     return [
       ...builtInTabs,
-      ...injectedTabs.map((tab) => ({
+      ...injectedTabs.filter((tab, index) => !builtInTabs.some((native) => native.id === tab.id) && injectedTabs.findIndex((candidate) => candidate.id === tab.id) === index).map((tab) => ({
         id: tab.id as CompanyTabId,
         label: tab.label,
       })),
     ].filter((tab) => !hidden.has(tab.id))
   }, [builtInTabs, hiddenTabIds, injectedTabs])
 
+  React.useEffect(() => {
+    if (isLoadingInjectedTabs || !isDealsAccessReady || allTabs.some((tab) => tab.id === activeTab)) return
+    const fallback = allTabs[0]?.id
+    if (fallback) onTabChange(fallback)
+  }, [activeTab, allTabs, isLoadingInjectedTabs, onTabChange, isDealsAccessReady])
+
   return (
     <div>
       {/* Tab navigation */}

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

@@ -4,7 +4,7 @@ import * as React from 'react'
 import { Building2 } from 'lucide-react'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useOrganizationScopeDetail } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
-import { CrudForm, type CrudField } from '@open-mercato/ui/backend/CrudForm'
+import { CrudForm, type CrudField, type CrudFormSubmitResult } from '@open-mercato/ui/backend/CrudForm'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { createCrud } from '@open-mercato/ui/backend/utils/crud'
 import { createCrudFormError } from '@open-mercato/ui/backend/utils/serverErrors'
@@ -12,6 +12,7 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { Badge } from '@open-mercato/ui/primitives/badge'
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@open-mercato/ui/primitives/dialog'
 import { E } from '#generated/entities.ids.generated'
+import { extensionPoints } from '../../extension-points'
 import {
   buildPersonPayload,
   createPersonFormFields,
@@ -134,22 +135,27 @@ export function CreatePersonDialog({
       ? await runGuardedMutation(operation, payload)
       : await operation()
 
+    const newId = response?.result?.id ?? response?.result?.entityId ?? ''
     flash(
       companyId
         ? t('customers.people.createDialog.success', 'Person created and linked to company')
         : t('customers.people.createDialog.successPlain', 'Person created'),
       'success',
     )
-    const newId = response?.result?.id ?? response?.result?.entityId ?? ''
+    return newId ? { resourceId: newId } : undefined
+  }, [companyId, organizationId, runGuardedMutation, t])
+
+  const handleSubmitSuccess = React.useCallback(async (values: PersonFormValues, result: CrudFormSubmitResult | void) => {
+    const payload = buildPersonPayload(values, organizationId)
     const displayNameFromPayload = typeof payload.displayName === 'string' ? payload.displayName : ''
     onPersonCreated?.({
-      id: newId,
+      id: result?.resourceId ?? '',
       displayName: displayNameFromPayload,
       companyId: companyId ?? null,
       companyName: companyName ?? null,
     })
     onClose()
-  }, [companyId, companyName, onClose, onPersonCreated, organizationId, runGuardedMutation, t])
+  }, [companyId, companyName, onClose, onPersonCreated, organizationId])
 
   const handleKeyDown = React.useCallback((event: React.KeyboardEvent<HTMLDivElement>) => {
     if ((event.metaKey || event.ctrlKey) && event.key === 'Enter') {
@@ -179,6 +185,10 @@ export function CreatePersonDialog({
         <CrudForm<PersonFormValues>
           key={`${companyId ?? 'no-company'}:${formInstanceKey}`}
           embedded
+          injectionSpotId={extensionPoints.hosts.personForm.spotId}
+          legacyInjectionSpotId="crud-form:customers.customer_entity"
+          entityId="customers.person"
+          resourceKind="customers.person"
           entityIds={[E.customers.customer_entity, E.customers.customer_person_profile]}
           fields={fields}
           groups={groups}
@@ -186,6 +196,7 @@ export function CreatePersonDialog({
           submitLabel={t('customers.people.createDialog.submit', 'Create person')}
           schema={formSchema}
           onSubmit={handleSubmit}
+          onSubmitSuccess={handleSubmitSuccess}
           extraActions={(
             <Button type="button" variant="outline" onClick={onClose}>
               {t('customers.people.createDialog.cancel', 'Cancel')}

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

@@ -0,0 +1,41 @@
+"use client"
+
+import * as React from 'react'
+import { InjectionSpot, useInjectionWidgets } from '@open-mercato/ui/backend/injection/InjectionSpot'
+
+export function CustomerDetailSidebar<TData>({ spotId, context, data, onDataChange, disabled, children }: {
+  spotId: string
+  context: unknown
+  data: TData
+  onDataChange?: (data: TData) => void
+  disabled?: boolean
+  children: React.ReactNode
+}) {
+  const { widgets } = useInjectionWidgets(spotId, { context, triggerOnLoad: true })
+  const sidebarRef = React.useRef<HTMLElement>(null)
+  const [hasContent, setHasContent] = React.useState(false)
+  React.useLayoutEffect(() => {
+    const sidebar = sidebarRef.current
+    if (!sidebar) {
+      setHasContent(false)
+      return
+    }
+    const update = () => setHasContent(Array.from(sidebar.childNodes).some((node) => (
+      node.nodeType === Node.ELEMENT_NODE || (node.nodeType === Node.TEXT_NODE && Boolean(node.textContent?.trim()))
+    )))
+    update()
+    const observer = new MutationObserver(update)
+    observer.observe(sidebar, { childList: true, subtree: true, characterData: true })
+    return () => observer.disconnect()
+  }, [widgets, data])
+  return (
+    <div className="flex min-w-0 flex-col gap-4 lg:flex-row" data-customer-detail-layout>
+      <div className="min-w-0 flex-1">{children}</div>
+      {widgets.length ? (
+        <aside ref={sidebarRef} className={hasContent ? 'w-full space-y-4 lg:w-80 lg:shrink-0' : 'hidden'} data-customer-detail-sidebar={spotId}>
+          <InjectionSpot spotId={spotId} context={context} data={data} onDataChange={onDataChange} disabled={disabled} widgetsOverride={widgets} />
+        </aside>
+      ) : null}
+    </div>
+  )
+}

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

@@ -45,6 +45,7 @@ type DealDetailHeaderProps = {
   onDelete: () => Promise<void> | void
   isDirty: boolean
   isSaving: boolean
+  actions?: React.ReactNode
 }
 
 function formatCurrency(amount: string | null, currency: string | null): string | null {
@@ -196,6 +197,7 @@ export function DealDetailHeader({
   onDelete,
   isDirty,
   isSaving,
+  actions,
 }: DealDetailHeaderProps) {
   const t = useT()
   const amountLabel = React.useMemo(
@@ -304,7 +306,8 @@ export function DealDetailHeader({
         </div>
       </div>
 
-      <div className="flex items-center gap-2 xl:justify-end">
+      <div className="flex flex-wrap items-center gap-2 xl:justify-end">
+        {actions}
         {canMoveStage ? (
           <StageActionButton
             stageOptions={stageOptions}

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

@@ -7,6 +7,8 @@ import { registerComponent } from '@open-mercato/shared/modules/widgets/componen
 import { useRegisteredComponent } from '@open-mercato/ui/backend/injection/useRegisteredComponent'
 import { Tabs, TabsList, TabsTrigger } from '@open-mercato/ui/primitives/tabs'
 
+export const DEAL_DETAIL_TAB_IDS = ['activities', 'people', 'companies', 'notes', 'files', 'changelog'] as const
+
 export type DealTabId =
   | 'activities'
   | 'people'
@@ -29,6 +31,7 @@ export type DealDetailTabsProps = {
   activeTab: DealTabId
   onTabChange: (tab: DealTabId) => void
   injectedTabs?: Array<{ id: string; label: string }>
+  isLoadingInjectedTabs?: boolean
   hiddenTabIds?: string[]
   peopleCount?: number
   companiesCount?: number
@@ -53,6 +56,7 @@ function DefaultDealDetailTabs({
   activeTab,
   onTabChange,
   injectedTabs = [],
+  isLoadingInjectedTabs = false,
   hiddenTabIds = [],
   peopleCount = 0,
   companiesCount = 0,
@@ -103,13 +107,19 @@ function DefaultDealDetailTabs({
     const hidden = new Set(hiddenTabIds)
     return [
       ...builtInTabs,
-      ...injectedTabs.map((tab) => ({
+      ...injectedTabs.filter((tab, index) => !builtInTabs.some((native) => native.id === tab.id) && injectedTabs.findIndex((candidate) => candidate.id === tab.id) === index).map((tab) => ({
         id: tab.id as DealTabId,
         label: tab.label,
       })),
     ].filter((tab) => !hidden.has(tab.id))
   }, [builtInTabs, hiddenTabIds, injectedTabs])
 
+  React.useEffect(() => {
+    if (isLoadingInjectedTabs || allTabs.some((tab) => tab.id === activeTab)) return
+    const fallback = allTabs[0]?.id
+    if (fallback) onTabChange(fallback)
+  }, [activeTab, allTabs, isLoadingInjectedTabs, onTabChange])
+
   return (
     <div>
       <Tabs

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

@@ -1,5 +1,6 @@
 "use client"
 
+import { extractResponseEnricherNamespaces } from '@open-mercato/shared/lib/crud/response-enricher-namespaces'
 import * as React from 'react'
 import { z } from 'zod'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -1226,6 +1227,7 @@ export function DealForm({
     }
 
     return {
+      ...extractResponseEnricherNamespaces(initialValues ?? {}),
       id: typeof initialValues?.id === 'string' ? initialValues.id : undefined,
       title: initialValues?.title ?? '',
       status: initialValues?.status ?? '',
@@ -1326,6 +1328,9 @@ export function DealForm({
       schema={schema}
       fields={baseFields}
       groups={groups}
+      entityId="customers.deal"
+      resourceKind="customers.deal"
+      resourceId={typeof initialValues?.id === 'string' ? initialValues.id : undefined}
       entityIds={DEAL_ENTITY_IDS}
       initialValues={embeddedInitialValues}
       onSubmit={handleSubmit}

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

@@ -31,6 +31,7 @@ type PersonDetailHeaderProps = {
   onDelete: () => Promise<void>
   isDirty: boolean
   isSaving: boolean
+  actions?: React.ReactNode
   /** Callback to focus a specific field in the Zone 1 CrudForm by field name. */
   onFocusField?: (fieldName: string) => void
   /**
@@ -86,6 +87,7 @@ export function PersonDetailHeader({
   onDelete,
   isDirty,
   isSaving,
+  actions,
   onFocusField,
   onOpenCompaniesTab,
   onDataReload,
@@ -246,6 +248,7 @@ export function PersonDetailHeader({
 
         {/* Right side: actions */}
         <div className="flex w-full shrink-0 items-center justify-start gap-2 sm:w-auto sm:justify-end">
+          {actions}
           <SendObjectMessageDialog
             object={{
               entityModule: 'customers',

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

@@ -19,6 +19,8 @@ import type { SectionAction } from '@open-mercato/ui/backend/detail'
 import { registerComponent } from '@open-mercato/shared/modules/widgets/component-registry'
 import { useRegisteredComponent } from '@open-mercato/ui/backend/injection/useRegisteredComponent'
 
+export const PERSON_DETAIL_TAB_IDS = ['activities', 'emails', 'deals', 'companies', 'addresses', 'tasks', 'changelog', 'files'] as const
+
 export type PersonTabId =
   | 'activities'
   | 'emails'
@@ -43,6 +45,7 @@ export type PersonDetailTabsProps = {
   activeTab: PersonTabId
   onTabChange: (tab: PersonTabId) => void
   injectedTabs?: Array<{ id: string; label: string }>
+  isLoadingInjectedTabs?: boolean
   hiddenTabIds?: string[]
   activitiesCount?: number
   dealsCount?: number
@@ -72,6 +75,7 @@ function DefaultPersonDetailTabs({
   activeTab,
   onTabChange,
   injectedTabs = [],
+  isLoadingInjectedTabs = false,
   hiddenTabIds = [],
   activitiesCount = 0,
   dealsCount = 0,
@@ -141,13 +145,19 @@ function DefaultPersonDetailTabs({
     const hidden = new Set(hiddenTabIds)
     return [
       ...builtInTabs,
-      ...injectedTabs.map((tab) => ({
+      ...injectedTabs.filter((tab, index) => !builtInTabs.some((native) => native.id === tab.id) && injectedTabs.findIndex((candidate) => candidate.id === tab.id) === index).map((tab) => ({
         id: tab.id as PersonTabId,
         label: tab.label,
       })),
     ].filter((tab) => !hidden.has(tab.id))
   }, [builtInTabs, hiddenTabIds, injectedTabs])
 
+  React.useEffect(() => {
+    if (isLoadingInjectedTabs || allTabs.some((tab) => tab.id === activeTab)) return
+    const fallback = allTabs[0]?.id
+    if (fallback) onTabChange(fallback)
+  }, [activeTab, allTabs, isLoadingInjectedTabs, onTabChange])
+
   return (
     <div>
       {/* Tab navigation — full width above both zones */}