@open-mercato/core 0.6.7-develop.6862.1.c11a64ce0a → 0.6.7

package/src/modules/customers/api/deals/summary/route.ts

@@ -1,14 +1,14 @@
 import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import type { EntityManager as CoreEntityManager } from '@mikro-orm/core'
+import type { EntityManager as PgEntityManager } from '@mikro-orm/postgresql'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import type { ExchangeRateService, RateResult } from '@open-mercato/core/modules/currencies/services/exchangeRateService'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
+import { fetchStuckDealIds } from '../../../lib/stuckDeals'
 import { resolveDealsOrganizationIds } from '../../../lib/dealsOrganizationScope'
-import { resolveOptionalBaseCurrencyCode } from '../../../lib/optionalBaseCurrency'
-import { loadDealsSummaryQueryRows } from '../../../lib/dealsSummaryQueries'
 import {
   computeDelta,
   convertSumsToBase,
@@ -26,6 +26,7 @@ export const metadata = {
   GET: { requireAuth: true, requireFeatures: ['customers.deals.view'] },
 }
 
+const OPEN_STATUSES = ['open', 'in_progress'] as const
 const TRAILING_MONTHS = 6
 const TOP_OWNERS = 5
 
@@ -106,6 +107,40 @@ export const openApi: OpenApiRouteDoc = {
   },
 }
 
+type OpenPipelineRow = {
+  stage: string | null
+  currency: string | null
+  total: string | number | null
+  count: string | number
+  owner_user_id: string | null
+}
+
+type WindowSumRow = {
+  currency: string | null
+  current_total: string | number | null
+  current_count: string | number
+  previous_total: string | number | null
+  previous_count: string | number
+}
+
+type WinLossRow = {
+  current_won: string | number
+  current_lost: string | number
+  previous_won: string | number
+  previous_lost: string | number
+}
+
+type WinRateMonthRow = {
+  period: string
+  won: string | number
+  lost: string | number
+}
+
+type OwnerCountRow = {
+  owner_user_id: string | null
+  count: string | number
+}
+
 function toNumber(value: string | number | null | undefined): number {
   const parsed = Number(value ?? 0)
   return Number.isFinite(parsed) ? parsed : 0
@@ -149,21 +184,133 @@ export async function GET(req: Request) {
   const trailingMonths = getTrailingMonths(today, TRAILING_MONTHS)
   const seriesStart = trailingMonths[0]?.start ?? currentQuarter.start
 
-  const baseCurrencyCode = await resolveOptionalBaseCurrencyCode(
-    container,
-    effectiveTenantId,
-    orgFilterIds[0],
+  const connection = em.getConnection()
+
+  const baseCurrency: Array<{ code: string }> = await connection.execute<Array<{ code: string }>>(
+    `SELECT code FROM currencies WHERE tenant_id = ? AND organization_id = ? AND is_base = true AND deleted_at IS NULL LIMIT 1`,
+    [effectiveTenantId, orgFilterIds[0]],
+  )
+  const baseCurrencyCode = baseCurrency[0]?.code ?? null
+
+  const orgPlaceholders = orgFilterIds.map(() => '?').join(',')
+  const scopeWhere = `tenant_id = ? AND organization_id IN (${orgPlaceholders}) AND deleted_at IS NULL`
+  const scopeValues: Array<string | number | null> = [effectiveTenantId, ...orgFilterIds]
+  const openPlaceholders = OPEN_STATUSES.map(() => '?').join(',')
+
+  // 1) Open pipeline: per (stage, currency) sums + open-deal owner per row, so we can
+  //    derive pipeline value (per stage + converted total) and the open owner set in one pass.
+  const openRows: OpenPipelineRow[] = await connection.execute<OpenPipelineRow[]>(
+    `SELECT
+        pipeline_stage AS stage,
+        UPPER(COALESCE(value_currency, '')) AS currency,
+        COALESCE(SUM(value_amount), 0) AS total,
+        COUNT(*) AS count,
+        owner_user_id
+      FROM customer_deals
+      WHERE ${scopeWhere} AND status IN (${openPlaceholders})
+      GROUP BY pipeline_stage, UPPER(COALESCE(value_currency, '')), owner_user_id`,
+    [...scopeValues, ...OPEN_STATUSES],
   )
 
-  const { openRows, inflowRows, wonRows, winLossRows, seriesRows, overdueRows, openStuckIds } =
-    await loadDealsSummaryQueryRows({
-      em,
-      tenantId: effectiveTenantId,
-      organizationIds: orgFilterIds,
-      currentQuarter,
-      previousQuarter,
-      seriesStart,
-    })
+  // 2) Open-deal value created in the current vs previous quarter (pipeline inflow delta).
+  const inflowRows: WindowSumRow[] = await connection.execute<WindowSumRow[]>(
+    `SELECT
+        UPPER(COALESCE(value_currency, '')) AS currency,
+        COALESCE(SUM(value_amount) FILTER (WHERE created_at >= ? AND created_at < ?), 0) AS current_total,
+        COUNT(*) FILTER (WHERE created_at >= ? AND created_at < ?) AS current_count,
+        COALESCE(SUM(value_amount) FILTER (WHERE created_at >= ? AND created_at < ?), 0) AS previous_total,
+        COUNT(*) FILTER (WHERE created_at >= ? AND created_at < ?) AS previous_count
+      FROM customer_deals
+      WHERE ${scopeWhere} AND status IN (${openPlaceholders})
+      GROUP BY UPPER(COALESCE(value_currency, ''))`,
+    [
+      currentQuarter.start.toISOString(), currentQuarter.end.toISOString(),
+      currentQuarter.start.toISOString(), currentQuarter.end.toISOString(),
+      previousQuarter.start.toISOString(), previousQuarter.end.toISOString(),
+      previousQuarter.start.toISOString(), previousQuarter.end.toISOString(),
+      ...scopeValues, ...OPEN_STATUSES,
+    ],
+  )
+
+  // 3) Won value per currency for the current vs previous quarter (updated_at in window).
+  const wonRows: WindowSumRow[] = await connection.execute<WindowSumRow[]>(
+    `SELECT
+        UPPER(COALESCE(value_currency, '')) AS currency,
+        COALESCE(SUM(value_amount) FILTER (WHERE updated_at >= ? AND updated_at < ?), 0) AS current_total,
+        COUNT(*) FILTER (WHERE updated_at >= ? AND updated_at < ?) AS current_count,
+        COALESCE(SUM(value_amount) FILTER (WHERE updated_at >= ? AND updated_at < ?), 0) AS previous_total,
+        COUNT(*) FILTER (WHERE updated_at >= ? AND updated_at < ?) AS previous_count
+      FROM customer_deals
+      WHERE ${scopeWhere} AND (status = 'win' OR closure_outcome = 'won')
+      GROUP BY UPPER(COALESCE(value_currency, ''))`,
+    [
+      currentQuarter.start.toISOString(), currentQuarter.end.toISOString(),
+      currentQuarter.start.toISOString(), currentQuarter.end.toISOString(),
+      previousQuarter.start.toISOString(), previousQuarter.end.toISOString(),
+      previousQuarter.start.toISOString(), previousQuarter.end.toISOString(),
+      ...scopeValues,
+    ],
+  )
+
+  // 4) Win/lost counts for the current vs previous quarter (win rate + delta-pp).
+  const winLossRows: WinLossRow[] = await connection.execute<WinLossRow[]>(
+    `SELECT
+        COUNT(*) FILTER (WHERE (status = 'win' OR closure_outcome = 'won') AND updated_at >= ? AND updated_at < ?) AS current_won,
+        COUNT(*) FILTER (WHERE (status = 'loose' OR closure_outcome = 'lost') AND updated_at >= ? AND updated_at < ?) AS current_lost,
+        COUNT(*) FILTER (WHERE (status = 'win' OR closure_outcome = 'won') AND updated_at >= ? AND updated_at < ?) AS previous_won,
+        COUNT(*) FILTER (WHERE (status = 'loose' OR closure_outcome = 'lost') AND updated_at >= ? AND updated_at < ?) AS previous_lost
+      FROM customer_deals
+      WHERE ${scopeWhere}`,
+    [
+      currentQuarter.start.toISOString(), currentQuarter.end.toISOString(),
+      currentQuarter.start.toISOString(), currentQuarter.end.toISOString(),
+      previousQuarter.start.toISOString(), previousQuarter.end.toISOString(),
+      previousQuarter.start.toISOString(), previousQuarter.end.toISOString(),
+      ...scopeValues,
+    ],
+  )
+
+  // 5) Win-rate series over the trailing months (won/lost grouped by updated_at month).
+  const seriesRows: WinRateMonthRow[] = await connection.execute<WinRateMonthRow[]>(
+    `SELECT
+        to_char(date_trunc('month', updated_at AT TIME ZONE 'UTC'), 'YYYY-MM') AS period,
+        COUNT(*) FILTER (WHERE status = 'win' OR closure_outcome = 'won') AS won,
+        COUNT(*) FILTER (WHERE status = 'loose' OR closure_outcome = 'lost') AS lost
+      FROM customer_deals
+      WHERE ${scopeWhere} AND updated_at >= ?
+      GROUP BY 1`,
+    [...scopeValues, seriesStart.toISOString()],
+  )
+
+  // Overdue open deals (id set) + stuck deals (id set) → union count for "need attention".
+  const overdueRows: Array<{ id: string }> = await connection.execute<Array<{ id: string }>>(
+    `SELECT id FROM customer_deals
+      WHERE ${scopeWhere} AND status = 'open' AND expected_close_at IS NOT NULL AND expected_close_at < CURRENT_DATE`,
+    [...scopeValues],
+  )
+  // `fetchStuckDealIds` is single-org; run it for every org in scope so multi-org callers don't
+  // undercount stuck deals (the aggregates above already span every org in `orgFilterIds`).
+  const stuckIdLists = await Promise.all(
+    orgFilterIds.map((orgId) =>
+      fetchStuckDealIds(em as unknown as PgEntityManager, orgId, effectiveTenantId)),
+  )
+  const stuckIdSet = new Set<string>()
+  for (const list of stuckIdLists) for (const id of list) stuckIdSet.add(id)
+
+  // The stuck-deal query does not filter status, so a stuck id can be a won/lost/closed deal.
+  // "Need attention" is an active-deal metric — intersect with the open (OPEN_STATUSES) set so
+  // terminal deals never inflate the count.
+  let openStuckIds: string[] = []
+  if (stuckIdSet.size > 0) {
+    const stuckIdValues = Array.from(stuckIdSet)
+    const stuckPlaceholders = stuckIdValues.map(() => '?').join(',')
+    const openStuckRows: Array<{ id: string }> = await connection.execute<Array<{ id: string }>>(
+      `SELECT id FROM customer_deals
+        WHERE ${scopeWhere} AND status IN (${openPlaceholders}) AND id IN (${stuckPlaceholders})`,
+      [...scopeValues, ...OPEN_STATUSES, ...stuckIdValues],
+    )
+    openStuckIds = openStuckRows.map((row) => row.id)
+  }
 
   const attentionIds = new Set<string>()
   for (const row of overdueRows) attentionIds.add(row.id)

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

@@ -25,7 +25,6 @@ import {
   filterActivePersonCompanyLinks,
   withActiveCustomerPersonCompanyLinkFilter,
 } from '../../../../../lib/personCompanyLinkTable'
-import { isOpenDealStatus, isWonDealStatus } from '../../../../../lib/dealStatus'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('customers')
@@ -281,13 +280,13 @@ export async function GET(req: Request, ctx: { params?: { id?: string } }) {
 
       const activeDeals = companyDealLinks
         .map((dcl) => dcl.deal as CustomerDeal)
-        .filter((deal) => isOpenDealStatus(deal.status) && !deal.deletedAt)
+        .filter((deal) => deal.status !== 'win' && deal.status !== 'loose' && !deal.deletedAt)
         .sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime())
       const activeDeal = activeDeals.length > 0 ? activeDeals[0] : null
 
       const wonDeals = companyDealLinks
         .map((dcl) => dcl.deal as CustomerDeal)
-        .filter((deal) => isWonDealStatus(deal.status) && !deal.deletedAt)
+        .filter((deal) => deal.status === 'win' && !deal.deletedAt)
       let clv: { amount: number; currency: string } | null = null
       if (wonDeals.length > 0) {
         const currencies = new Map<string, number>()

package/src/modules/customers/api/utils.ts

@@ -4,7 +4,8 @@ import { sql } from 'kysely'
 import type { CrudCtx } from '@open-mercato/shared/lib/crud/factory'
 import type { EntityId } from '@open-mercato/shared/modules/entities'
 import type { QueryCustomFieldSource, QueryJoinEdge, QueryEngine } from '@open-mercato/shared/lib/query/types'
-import { findEntityIdsBySearchTokensCompat, type SearchTokenDatabase } from '@open-mercato/shared/lib/search/tokenLookup'
+import { resolveSearchConfig } from '@open-mercato/shared/lib/search/config'
+import { tokenizeText } from '@open-mercato/shared/lib/search/tokenize'
 import { SortDir } from '@open-mercato/shared/lib/query/types'
 
 const { withScopedPayload, parseScopedCommandInput } = createScopedApiHelpers({
@@ -105,18 +106,36 @@ async function findSearchTokenEntityIds({
   fields,
   query,
 }: SearchTokenMatchInput): Promise<string[] | null> {
+  const trimmed = query.trim()
+  if (!trimmed) return null
+
+  const tokens = tokenizeText(trimmed, resolveSearchConfig())
+  if (!tokens.hashes.length) return []
+
   const em = ctx.container.resolve('em') as EntityManager
-  return findEntityIdsBySearchTokensCompat({
-    db: em.getKysely<SearchTokenDatabase>(),
-    entityType,
-    query,
-    fields,
-    scope: {
-      tenantId: ctx.auth?.tenantId !== undefined ? ctx.auth?.tenantId ?? null : undefined,
-      organizationId: ctx.selectedOrganizationId ?? undefined,
-      organizationIds: ctx.organizationIds,
-    },
-  })
+  const db = em.getKysely<any>() as any
+  let searchQuery = db
+    .selectFrom('search_tokens')
+    .select('entity_id')
+    .where('entity_type', '=', entityType)
+    .where('field', 'in', fields)
+    .where('token_hash', 'in', tokens.hashes)
+    .groupBy('entity_id')
+    .having(sql<boolean>`count(distinct token_hash) >= ${tokens.hashes.length}`)
+
+  if (ctx.auth?.tenantId !== undefined) {
+    searchQuery = searchQuery.where(sql<boolean>`tenant_id is not distinct from ${ctx.auth?.tenantId ?? null}`)
+  }
+  if (ctx.selectedOrganizationId) {
+    searchQuery = searchQuery.where('organization_id', '=', ctx.selectedOrganizationId)
+  } else if (Array.isArray(ctx.organizationIds) && ctx.organizationIds.length > 0) {
+    searchQuery = searchQuery.where('organization_id', 'in', ctx.organizationIds)
+  }
+
+  const rows = await searchQuery.execute() as Array<{ entity_id?: unknown }>
+  return rows
+    .map((row) => (typeof row.entity_id === 'string' ? row.entity_id : null))
+    .filter((id): id is string => typeof id === 'string' && id.length > 0)
 }
 
 async function mapScopedEntityIds({

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

@@ -1,7 +1,6 @@
 "use client"
 
 import * as React from 'react'
-import { extensionPoints } from '@open-mercato/core/modules/customers/extension-points'
 import Link from 'next/link'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
@@ -968,7 +967,7 @@ export default function CustomerCompanyDetailPage({ params }: { params?: { id?:
               <h2 className="text-sm font-semibold">{t('customers.companies.detail.sections.details', 'Company details')}</h2>
               <DetailFieldsSection fields={detailFields} />
               <InjectionSpot
-                spotId={extensionPoints.hosts.companyLegacyDetails.spotId}
+                spotId="customers.company.detail:details"
                 context={injectionContext}
                 data={data}
                 onDataChange={(next) => setData(next as CompanyOverview)}

package/src/modules/customers/backend/customers/companies/page.tsx

@@ -1,7 +1,6 @@
 "use client"
 
 import * as React from 'react'
-import { extensionPoints } from '@open-mercato/core/modules/customers/extension-points'
 import Link from 'next/link'
 import { usePathname, useRouter, useSearchParams } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
@@ -889,7 +888,7 @@ export default function CustomersCompaniesPage() {
           searchPlaceholder={t('customers.companies.list.searchPlaceholder')}
           entityIds={[E.customers.customer_entity, E.customers.customer_company_profile]}
           onRowClick={(row) => router.push(`/backend/customers/companies-v2/${row.id}`)}
-          perspective={{ tableId: extensionPoints.hosts.companiesTable.tableId }}
+          perspective={{ tableId: 'customers.companies.list' }}
           sortable
           manualSorting
           sorting={sorting}

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

@@ -1,7 +1,6 @@
 "use client"
 
 import * as React from 'react'
-import { extensionPoints } from '@open-mercato/core/modules/customers/extension-points'
 import Link from 'next/link'
 import { useRouter, useSearchParams, usePathname } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
@@ -70,17 +69,6 @@ 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()
 
@@ -483,8 +471,8 @@ export default function CompanyDetailV2Page({ params }: { params?: { id?: string
       <PageBody>
         <div className="space-y-4">
           {/* UMES header injection */}
-          <InjectionSpot spotId={extensionPoints.hosts.companyHeader.spotId} context={injectionContext} data={data} />
-          <InjectionSpot spotId={extensionPoints.hosts.companyStatusBadges.spotId} context={injectionContext} data={data} />
+          <InjectionSpot spotId="detail:customers.company:header" context={injectionContext} data={data} />
+          <InjectionSpot spotId="detail:customers.company:status-badges" context={injectionContext} data={data} />
 
           {/* Persistent company header */}
           <CompanyDetailHeader
@@ -512,7 +500,7 @@ export default function CompanyDetailV2Page({ params }: { params?: { id?: string
                 <CrudForm<CompanyEditFormValues>
                   embedded
                   trackDirtyWhenEmbedded
-                  injectionSpotId={extensionPoints.hosts.companyForm.spotId}
+                  injectionSpotId="crud-form:customers.company"
                   entityIds={[E.customers.customer_entity, E.customers.customer_company_profile]}
                   schema={formSchema}
                   fields={formFields}
@@ -531,7 +519,7 @@ export default function CompanyDetailV2Page({ params }: { params?: { id?: string
             zone2={
               <CompanyDetailTabs
                 activeTab={activeTab}
-                onTabChange={handleTabChange}
+                onTabChange={setActiveTab}
                 injectedTabs={injectedTabs.map((tab) => ({ id: tab.id, label: tab.label }))}
                 peopleCount={data.counts?.people ?? 0}
                 dealsCount={dealCount}
@@ -618,7 +606,7 @@ export default function CompanyDetailV2Page({ params }: { params?: { id?: string
           />
 
           {/* UMES footer injection */}
-          <InjectionSpot spotId={extensionPoints.hosts.companyFooter.spotId} context={injectionContext} data={data} />
+          <InjectionSpot spotId="detail:customers.company:footer" context={injectionContext} data={data} />
 
           {/* Schedule Activity Dialog */}
           <ScheduleActivityDialog

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

@@ -3,7 +3,6 @@ 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

@@ -1,7 +1,6 @@
 "use client"
 
 import * as React from 'react'
-import { extensionPoints } from '@open-mercato/core/modules/customers/extension-points'
 import Link from 'next/link'
 import { Building2, UserSearch, Users } from 'lucide-react'
 import { EmptyState } from '@open-mercato/ui/primitives/empty-state'
@@ -69,6 +68,13 @@ 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,
@@ -101,17 +107,6 @@ 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,
   })
@@ -135,7 +130,6 @@ 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],
@@ -146,8 +140,7 @@ 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
-      const primary = activityEntities.find((entry) => entry.isPrimary)
-      return (primary ?? activityEntities[0])?.id ?? null
+      return null
     })
   }, [activityEntities])
 
@@ -390,7 +383,7 @@ export default function DealDetailPage({ params }: { params?: { id?: string } })
         showAssociationsGroup={false}
         showVersionHistory={false}
         showCancelAction={false}
-        injectionSpotId={extensionPoints.hosts.dealForm.spotId}
+        injectionSpotId="crud-form:customers.deal"
         optimisticLockUpdatedAt={data.deal.updatedAt}
         onDirtyChange={setIsDirty}
         initialPipelineOptions={formPipelineOptions}
@@ -617,7 +610,7 @@ export default function DealDetailPage({ params }: { params?: { id?: string } })
     <Page>
       <PageBody>
         <div className="space-y-6">
-          <InjectionSpot spotId={extensionPoints.hosts.dealHeader.spotId} context={injectionContext} data={data} />
+          <InjectionSpot spotId="detail:customers.deal:header" context={injectionContext} data={data} />
 
           <DealDetailHeader
             deal={data.deal}
@@ -635,7 +628,7 @@ export default function DealDetailPage({ params }: { params?: { id?: string } })
             isSaving={isSaving}
           />
 
-          <InjectionSpot spotId={extensionPoints.hosts.dealStatusBadges.spotId} context={injectionContext} data={data} onDataChange={setData} />
+          <InjectionSpot spotId="detail:customers.deal:status-badges" context={injectionContext} data={data} />
 
           <PipelineStepper
             stages={data.pipelineStages}
@@ -670,7 +663,7 @@ export default function DealDetailPage({ params }: { params?: { id?: string } })
             />
           </DealDetailTabs>
 
-          <InjectionSpot spotId={extensionPoints.hosts.dealFooter.spotId} context={injectionContext} data={data} />
+          <InjectionSpot spotId="detail:customers.deal:footer" context={injectionContext} data={data} />
         </div>
 
         {ConfirmDialogElement}

package/src/modules/customers/backend/customers/deals/page.tsx

@@ -1,7 +1,6 @@
 "use client"
 
 import * as React from 'react'
-import { extensionPoints } from '@open-mercato/core/modules/customers/extension-points'
 import Link from 'next/link'
 import { usePathname, useRouter, useSearchParams } from 'next/navigation'
 import { useQueryClient } from '@tanstack/react-query'
@@ -1147,7 +1146,7 @@ export default function CustomersDealsPage() {
           }}
           exporter={exportConfig}
           entityId={E.customers.customer_deal}
-          perspective={{ tableId: extensionPoints.hosts.dealsTable.tableId }}
+          perspective={{ tableId: 'customers.deals.list' }}
           advancedFilter={{
             auto: true,
             value: filterPanel.tree,

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

@@ -18,7 +18,6 @@ import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuarde
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { translateWithFallback } from '@open-mercato/shared/lib/i18n/translate'
-import { registerComponent } from '@open-mercato/shared/modules/widgets/component-registry'
 
 // Deal status values written by the kanban flow. These intentionally do NOT include 'closed'
 // because the rest of the app only persists 'loose' for lost deals (see StatusFilterPopover
@@ -57,18 +56,7 @@ export type QuickDealCompanyOption = {
   label: string
 }
 
-/**
- * Registered component id for the kanban quick-add dialog. Downstream apps can
- * target it from `widgets/components.ts` to replace/wrap the dialog or to
- * transform its props — e.g. `defaultProbability: null` so quick-create stops
- * seeding a probability that overrides pipeline automation (#4329).
- */
-export const QUICK_DEAL_DIALOG_COMPONENT_ID = 'dialog:customers.deals.quickDeal'
-
-/** Probability seeded into the quick-add form when the host passes no override. */
-export const DEFAULT_QUICK_DEAL_PROBABILITY = 25
-
-export type QuickDealDialogProps = {
+type QuickDealDialogProps = {
   open: boolean
   context: QuickDealContext | null
   onClose: () => void
@@ -76,13 +64,6 @@ export type QuickDealDialogProps = {
   currentUserId?: string
   currentUserLabel?: string
   companies?: QuickDealCompanyOption[]
-  /**
-   * Probability pre-filled in the collapsed "More details" group. `null` leaves
-   * the field empty, so quick-create sends no `probability` at all and whatever
-   * the pipeline/automation derives for the target stage stands. Defaults to
-   * `DEFAULT_QUICK_DEAL_PROBABILITY` to preserve the historic behavior.
-   */
-  defaultProbability?: number | null
   /**
    * Tenant currency list. When omitted (e.g. dictionary not yet loaded), we render a
    * conservative fallback so the dialog still works end-to-end. The default selection is
@@ -113,7 +94,6 @@ export function QuickDealDialog({
   currentUserLabel,
   companies = [],
   currencies,
-  defaultProbability = DEFAULT_QUICK_DEAL_PROBABILITY,
 }: QuickDealDialogProps): React.ReactElement | null {
   const t = useT()
   // Re-mount CrudForm whenever the dialog opens so cleared state is consistently fresh.
@@ -177,11 +157,11 @@ export function QuickDealDialog({
       valueCurrency: defaultCurrencyCode,
       companyId: '',
       status: 'open',
-      probability: defaultProbability,
+      probability: 25,
       expectedCloseAt: '',
       description: '',
     }),
-    [defaultCurrencyCode, defaultProbability],
+    [defaultCurrencyCode],
   )
 
   const fields = React.useMemo<CrudField[]>(
@@ -425,16 +405,4 @@ export function QuickDealDialog({
   )
 }
 
-// Register so downstream apps can reach the dialog from `widgets/components.ts`
-// (replace / wrap / propsTransform) instead of forking the whole kanban page
-// just to change a default (#4329).
-registerComponent<QuickDealDialogProps>({
-  id: QUICK_DEAL_DIALOG_COMPONENT_ID,
-  component: QuickDealDialog,
-  metadata: {
-    module: 'customers',
-    description: 'Kanban quick-add deal dialog (pipeline board "+ deal").',
-  },
-})
-
 export default QuickDealDialog

package/src/modules/customers/backend/customers/deals/pipeline/page.tsx

@@ -64,11 +64,9 @@ import { CurrencyFilterPopover } from './components/CurrencyFilterPopover'
 import { AddStageLane } from './components/AddStageLane'
 import type { DealCardData } from './components/DealCard'
 import {
-  QuickDealDialog as DefaultQuickDealDialog,
-  QUICK_DEAL_DIALOG_COMPONENT_ID,
+  QuickDealDialog,
   type QuickDealContext,
   type QuickDealCompanyOption,
-  type QuickDealDialogProps,
 } from './components/QuickDealDialog'
 import { AddStageDialog, type AddStageContext } from './components/AddStageDialog'
 import { StatusFilterPopover } from './components/StatusFilterPopover'
@@ -82,7 +80,6 @@ import {
   type ActivityComposerContext,
 } from './components/ActivityComposerDialog'
 import { BulkActionsBar } from './components/BulkActionsBar'
-import { useRegisteredComponent } from '@open-mercato/ui/backend/injection/useRegisteredComponent'
 import { ChangeStageDialog } from './components/ChangeStageDialog'
 import { ChangeOwnerDialog } from './components/ChangeOwnerDialog'
 import { buildCrudExportUrl, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
@@ -413,12 +410,6 @@ function sortDeals(deals: DealCardData[], option: SortOption): DealCardData[] {
 
 export default function DealsKanbanPage(): React.ReactElement {
   const t = useT()
-  // Resolved through the component registry so downstream apps can replace,
-  // wrap, or props-transform the quick-add dialog without forking this page.
-  const QuickDealDialog = useRegisteredComponent<QuickDealDialogProps>(
-    QUICK_DEAL_DIALOG_COMPONENT_ID,
-    DefaultQuickDealDialog,
-  )
   const router = useRouter()
   const scopeVersion = useOrganizationScopeVersion()
   const queryClient = useQueryClient()

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

@@ -1,7 +1,6 @@
 "use client"
 
 import * as React from 'react'
-import { extensionPoints } from '@open-mercato/core/modules/customers/extension-points'
 import Link from 'next/link'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
@@ -923,7 +922,7 @@ export default function CustomerPersonDetailPage({ params }: { params?: { id?: s
               <h2 className="text-sm font-semibold">{t('customers.people.detail.sections.details')}</h2>
               <DetailFieldsSection fields={detailFields} />
               <InjectionSpot
-                spotId={extensionPoints.hosts.personLegacyDetails.spotId}
+                spotId="customers.person.detail:details"
                 context={injectionContext}
                 data={data}
                 onDataChange={(next) => setData(next as PersonOverview)}