@open-mercato/core 0.4.5-develop-0f0e676c72 → 0.4.5-develop-e694581d9f

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

@@ -11,11 +11,6 @@ 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 { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
-import {
-  customerDictionaryQueryOptions,
-  type CustomerDictionaryQueryData,
-} from '../../../../components/detail/hooks/useCustomerDictionary'
-import { renderDictionaryColor, renderDictionaryIcon } from '../../../../lib/dictionaries'
 
 type DealAssociation = { id: string; label: string }
 
@@ -24,6 +19,8 @@ type DealRecord = {
   title: string
   status: string | null
   pipelineStage: string | null
+  pipelineId: string | null
+  pipelineStageId: string | null
   valueAmount: number | null
   valueCurrency: string | null
   probability: number | null
@@ -51,10 +48,13 @@ type StageDefinition = {
 
 type SortOption = 'probability' | 'createdAt' | 'expectedCloseAt'
 
+type PipelineRecord = { id: string; name: string; isDefault: boolean }
+type PipelineStageRecord = { id: string; label: string; order: number; pipelineId: string }
+
 const DEALS_QUERY_LIMIT = 100
 
-const dealsQueryKey = (scopeVersion: number) =>
-  ['customers', 'deals', 'pipeline', `scope:${scopeVersion}`] as const
+const dealsQueryKey = (scopeVersion: number, pipelineId: string | null) =>
+  ['customers', 'deals', 'pipeline', `scope:${scopeVersion}`, `pipeline:${pipelineId ?? 'none'}`] as const
 
 const sortOptions: SortOption[] = ['probability', 'createdAt', 'expectedCloseAt']
 
@@ -84,45 +84,24 @@ function normalizeTimestamp(value: unknown): { iso: string | null; ts: number |
   return { iso: date.toISOString(), ts: date.getTime() }
 }
 
-function buildStageDefinitions(
-  dictionary: CustomerDictionaryQueryData | undefined,
+function buildStageDefinitionsFromPipelineStages(
+  pipelineStages: PipelineStageRecord[],
   deals: DealRecord[],
   t: ReturnType<typeof useT>,
 ): StageDefinition[] {
-  const result: StageDefinition[] = []
-  const seen = new Set<string>()
-  const dictionaryEntries =
-    dictionary?.fullEntries ?? dictionary?.entries?.map((entry) => ({ ...entry, id: entry.value })) ?? []
-
-  dictionaryEntries.forEach((entry, index) => {
-    if (!entry || typeof entry.value !== 'string') return
-    const label = typeof entry.label === 'string' && entry.label.trim().length ? entry.label.trim() : entry.value
-    result.push({
-      id: `stage:${entry.value}:${index}`,
-      value: entry.value,
-      label,
-      color: typeof entry.color === 'string' ? entry.color : null,
-      icon: typeof entry.icon === 'string' ? entry.icon : null,
-    })
-    seen.add(entry.value)
-  })
-
-  const unknownStages = new Map<string, StageDefinition>()
-  deals.forEach((deal) => {
-    if (!deal.pipelineStage || seen.has(deal.pipelineStage)) return
-    if (unknownStages.has(deal.pipelineStage)) return
-    unknownStages.set(deal.pipelineStage, {
-      id: `stage:${deal.pipelineStage}`,
-      value: deal.pipelineStage,
-      label: deal.pipelineStage,
+  const result: StageDefinition[] = pipelineStages
+    .slice()
+    .sort((a, b) => a.order - b.order)
+    .map((stage) => ({
+      id: stage.id,
+      value: stage.id,
+      label: stage.label,
       color: null,
       icon: null,
-    })
-  })
-
-  unknownStages.forEach((entry) => result.push(entry))
+    }))
 
-  const hasUnassigned = deals.some((deal) => !deal.pipelineStage)
+  const knownIds = new Set(pipelineStages.map((s) => s.id))
+  const hasUnassigned = deals.some((deal) => !deal.pipelineStageId || !knownIds.has(deal.pipelineStageId))
   if (hasUnassigned) {
     result.push({
       id: 'stage:__unassigned',
@@ -140,10 +119,10 @@ function createDealMap(deals: DealRecord[]): Map<string, DealRecord> {
   return deals.reduce<Map<string, DealRecord>>((acc, deal) => acc.set(deal.id, deal), new Map())
 }
 
-function groupDealsByStage(deals: DealRecord[]): Map<string | null, DealRecord[]> {
+function groupDealsByStageId(deals: DealRecord[]): Map<string | null, DealRecord[]> {
   const byStage = new Map<string | null, DealRecord[]>()
   deals.forEach((deal) => {
-    const stageKey = deal.pipelineStage ?? null
+    const stageKey = deal.pipelineStageId ?? null
     const bucket = byStage.get(stageKey) ?? []
     bucket.push(deal)
     byStage.set(stageKey, bucket)
@@ -219,12 +198,48 @@ export default function SalesPipelinePage(): React.ReactElement {
   const queryClient = useQueryClient()
   const [sortBy, setSortBy] = React.useState<SortOption>('probability')
   const [pendingDealId, setPendingDealId] = React.useState<string | null>(null)
-  const dealsKey = React.useMemo(() => dealsQueryKey(scopeVersion), [scopeVersion])
+  const [selectedPipelineId, setSelectedPipelineId] = React.useState<string | null>(null)
 
-  const { data: dictionaryData } = useQuery(customerDictionaryQueryOptions('pipeline-stages', scopeVersion))
+  const pipelinesQuery = useQuery<PipelineRecord[]>({
+    queryKey: ['customers', 'pipelines', `scope:${scopeVersion}`],
+    staleTime: 60_000,
+    queryFn: async () => {
+      const payload = await readApiResultOrThrow<{ items: PipelineRecord[] }>(
+        '/api/customers/pipelines',
+        undefined,
+        { errorMessage: translate('customers.deals.pipeline.loadError', 'Failed to load pipelines.') },
+      )
+      return payload?.items ?? []
+    },
+  })
+
+  React.useEffect(() => {
+    if (selectedPipelineId) return
+    const pipelines = pipelinesQuery.data
+    if (!pipelines || !pipelines.length) return
+    const defaultPipeline = pipelines.find((p) => p.isDefault) ?? pipelines[0]
+    if (defaultPipeline) setSelectedPipelineId(defaultPipeline.id)
+  }, [pipelinesQuery.data, selectedPipelineId])
+
+  const stagesQuery = useQuery<PipelineStageRecord[]>({
+    queryKey: ['customers', 'pipeline-stages', `scope:${scopeVersion}`, `pipeline:${selectedPipelineId}`],
+    enabled: !!selectedPipelineId,
+    staleTime: 30_000,
+    queryFn: async () => {
+      const payload = await readApiResultOrThrow<{ items: PipelineStageRecord[] }>(
+        `/api/customers/pipeline-stages?pipelineId=${encodeURIComponent(selectedPipelineId!)}`,
+        undefined,
+        { errorMessage: translate('customers.deals.pipeline.loadError', 'Failed to load stages.') },
+      )
+      return payload?.items ?? []
+    },
+  })
+
+  const dealsKey = React.useMemo(() => dealsQueryKey(scopeVersion, selectedPipelineId), [scopeVersion, selectedPipelineId])
 
   const dealsQuery = useQuery<DealsQueryData>({
     queryKey: dealsKey,
+    enabled: !!selectedPipelineId,
     staleTime: 30_000,
     queryFn: async () => {
       const search = new URLSearchParams()
@@ -232,6 +247,7 @@ export default function SalesPipelinePage(): React.ReactElement {
       search.set('pageSize', String(DEALS_QUERY_LIMIT))
       search.set('sortField', 'createdAt')
       search.set('sortDir', 'desc')
+      if (selectedPipelineId) search.set('pipelineId', selectedPipelineId)
       const payload = await readApiResultOrThrow<Record<string, unknown>>(
         `/api/customers/deals?${search.toString()}`,
         undefined,
@@ -296,6 +312,8 @@ export default function SalesPipelinePage(): React.ReactElement {
           title,
           status,
           pipelineStage: stage,
+          pipelineId: typeof data.pipeline_id === 'string' ? data.pipeline_id : null,
+          pipelineStageId: typeof data.pipeline_stage_id === 'string' ? data.pipeline_stage_id : null,
           valueAmount: amount,
           valueCurrency: currency,
           probability,
@@ -317,10 +335,10 @@ export default function SalesPipelinePage(): React.ReactElement {
   const deals = dealsQuery.data?.deals ?? []
   const total = dealsQuery.data?.total ?? deals.length
   const dealMap = React.useMemo(() => createDealMap(deals), [deals])
-  const groupedDeals = React.useMemo(() => groupDealsByStage(deals), [deals])
+  const groupedDeals = React.useMemo(() => groupDealsByStageId(deals), [deals])
   const stages = React.useMemo(
-    () => buildStageDefinitions(dictionaryData, deals, t),
-    [dictionaryData, deals, t],
+    () => buildStageDefinitionsFromPipelineStages(stagesQuery.data ?? [], deals, t),
+    [stagesQuery.data, deals, t],
   )
 
   const dateFormatter = React.useMemo(
@@ -332,25 +350,25 @@ export default function SalesPipelinePage(): React.ReactElement {
   )
 
   const updateStageMutation = useMutation({
-    mutationFn: async ({ id, pipelineStage }: { id: string; pipelineStage: string }) => {
+    mutationFn: async ({ id, pipelineStageId }: { id: string; pipelineStageId: string }) => {
       await apiCallOrThrow(
         '/api/customers/deals',
         {
           method: 'PUT',
           headers: { 'content-type': 'application/json' },
-          body: JSON.stringify({ id, pipelineStage }),
+          body: JSON.stringify({ id, pipelineStageId }),
         },
         { errorMessage: translate('customers.deals.pipeline.moveError', 'Failed to update deal stage.') },
       )
-      return { id, pipelineStage }
+      return { id, pipelineStageId }
     },
-    onMutate: async ({ id, pipelineStage }) => {
+    onMutate: async ({ id, pipelineStageId }) => {
       setPendingDealId(id)
       await queryClient.cancelQueries({ queryKey: dealsKey })
       const previous = queryClient.getQueryData<DealsQueryData>(dealsKey)
       if (previous) {
         const nextDeals = previous.deals.map((deal) =>
-          deal.id === id ? { ...deal, pipelineStage } : deal,
+          deal.id === id ? { ...deal, pipelineStageId } : deal,
         )
         queryClient.setQueryData<DealsQueryData>(dealsKey, { ...previous, deals: nextDeals })
       }
@@ -410,10 +428,10 @@ export default function SalesPipelinePage(): React.ReactElement {
         )
         return
       }
-      if (deal.pipelineStage === stage.value) return
-      updateStageMutation.mutate({ id: dealId, pipelineStage: stage.value })
+      if (deal.pipelineStageId === stage.value) return
+      updateStageMutation.mutate({ id: dealId, pipelineStageId: stage.value })
     },
-    [dealMap, draggingId, t, updateStageMutation],
+    [dealMap, draggingId, translate, updateStageMutation],
   )
 
   const handleDragOver = React.useCallback(
@@ -429,11 +447,6 @@ export default function SalesPipelinePage(): React.ReactElement {
     return (
       <div className="flex items-center justify-between gap-3 border-b border-border px-4 py-3">
         <div className="flex items-center gap-2">
-          {stage.icon ? (
-            <span className="inline-flex h-7 w-7 items-center justify-center rounded border border-border bg-muted">
-              {renderDictionaryIcon(stage.icon, 'h-4 w-4 text-muted-foreground')}
-            </span>
-          ) : null}
           <div className="flex flex-col">
             <span className="text-sm font-medium">{stage.label}</span>
             <span className="text-xs text-muted-foreground">
@@ -441,7 +454,6 @@ export default function SalesPipelinePage(): React.ReactElement {
             </span>
           </div>
         </div>
-        {stage.color ? renderDictionaryColor(stage.color, 'h-3 w-3 rounded-full') : null}
       </div>
     )
   }
@@ -462,27 +474,55 @@ export default function SalesPipelinePage(): React.ReactElement {
                 )}
               </p>
             </div>
-            <label className="flex items-center gap-2 text-sm font-medium text-muted-foreground">
-              <span>{translate('customers.deals.pipeline.sort.label', 'Sort by')}</span>
-              <select
-                className="h-9 rounded-md border border-border bg-background px-3 text-sm text-foreground shadow-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/40"
-                value={sortBy}
-                onChange={handleSortChange}
+            <div className="flex items-center gap-4">
+              {pipelinesQuery.data && pipelinesQuery.data.length > 0 ? (
+                <label className="flex items-center gap-2 text-sm font-medium text-muted-foreground">
+                  <span>{translate('customers.deals.pipeline.switch.label', 'Pipeline')}</span>
+                  <select
+                    className="h-9 rounded-md border border-border bg-background px-3 text-sm text-foreground shadow-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/40"
+                    value={selectedPipelineId ?? ''}
+                    onChange={(e) => setSelectedPipelineId(e.target.value || null)}
+                  >
+                    {pipelinesQuery.data.map((p) => (
+                      <option key={p.id} value={p.id}>{p.name}</option>
+                    ))}
+                  </select>
+                </label>
+              ) : null}
+              <Link
+                href="/backend/config/customers/pipeline-stages"
+                className="text-sm font-medium text-primary hover:underline"
               >
-                <option value="probability">
-                  {translate('customers.deals.pipeline.sort.probability', 'Probability (high to low)')}
-                </option>
-                <option value="createdAt">
-                  {translate('customers.deals.pipeline.sort.createdAt', 'Created (newest first)')}
-                </option>
-                <option value="expectedCloseAt">
-                  {translate('customers.deals.pipeline.sort.expectedCloseAt', 'Expected close (soonest first)')}
-                </option>
-              </select>
-            </label>
+                {translate('customers.deals.pipeline.manageStages', 'Manage stages')}
+              </Link>
+              <label className="flex items-center gap-2 text-sm font-medium text-muted-foreground">
+                <span>{translate('customers.deals.pipeline.sort.label', 'Sort by')}</span>
+                <select
+                  className="h-9 rounded-md border border-border bg-background px-3 text-sm text-foreground shadow-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/40"
+                  value={sortBy}
+                  onChange={handleSortChange}
+                >
+                  <option value="probability">
+                    {translate('customers.deals.pipeline.sort.probability', 'Probability (high to low)')}
+                  </option>
+                  <option value="createdAt">
+                    {translate('customers.deals.pipeline.sort.createdAt', 'Created (newest first)')}
+                  </option>
+                  <option value="expectedCloseAt">
+                    {translate('customers.deals.pipeline.sort.expectedCloseAt', 'Expected close (soonest first)')}
+                  </option>
+                </select>
+              </label>
+            </div>
           </div>
 
-          {dealsQuery.isLoading ? (
+          {!selectedPipelineId ? (
+            <div className="flex h-[50vh] items-center justify-center">
+              <span className="text-sm text-muted-foreground">
+                {translate('customers.deals.pipeline.noPipeline', 'No pipeline selected. Create a pipeline in settings.')}
+              </span>
+            </div>
+          ) : dealsQuery.isLoading ? (
             <div className="flex h-[50vh] items-center justify-center">
               <Spinner />
             </div>

package/src/modules/customers/cli.ts

@@ -22,6 +22,8 @@ import {
   CustomerActivity,
   CustomerAddress,
   CustomerComment,
+  CustomerPipeline,
+  CustomerPipelineStage,
 } from './data/entities'
 import { ensureDictionaryEntry } from './commands/shared'
 
@@ -2793,7 +2795,33 @@ const seedStressTest: ModuleCli = {
   },
 }
 
-export { seedCustomerDictionaries, seedCustomerExamples, seedCustomerStressTest, seedCurrencyDictionary }
+async function seedDefaultPipeline(em: EntityManager, { tenantId, organizationId }: SeedArgs): Promise<void> {
+  const existing = await em.findOne(CustomerPipeline, { tenantId, organizationId, isDefault: true })
+  if (existing) return
+
+  const pipeline = em.create(CustomerPipeline, {
+    tenantId,
+    organizationId,
+    name: 'Default Pipeline',
+    isDefault: true,
+  })
+  em.persist(pipeline)
+  await em.flush()
+
+  for (let i = 0; i < PIPELINE_STAGE_DEFAULTS.length; i++) {
+    const entry = PIPELINE_STAGE_DEFAULTS[i]
+    em.persist(em.create(CustomerPipelineStage, {
+      tenantId,
+      organizationId,
+      pipelineId: pipeline.id,
+      label: entry.label,
+      order: i,
+    }))
+  }
+  await em.flush()
+}
+
+export { seedCustomerDictionaries, seedCustomerExamples, seedCustomerStressTest, seedCurrencyDictionary, seedDefaultPipeline }
 export type { SeedArgs as CustomerSeedArgs }
 
 const customersCliCommands = [seedDictionaries, seedExamples, seedStressTest]

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

@@ -9,7 +9,7 @@ import {
 } from '@open-mercato/shared/lib/commands/helpers'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
 import type { EntityManager } from '@mikro-orm/postgresql'
-import { CustomerDeal, CustomerDealPersonLink, CustomerDealCompanyLink } from '../data/entities'
+import { CustomerDeal, CustomerDealPersonLink, CustomerDealCompanyLink, CustomerPipelineStage } from '../data/entities'
 import {
   dealCreateSchema,
   dealUpdateSchema,
@@ -22,6 +22,7 @@ import {
   requireCustomerEntity,
   ensureSameScope,
   extractUndoPayload,
+  ensureDictionaryEntry,
 } from './shared'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import {
@@ -53,6 +54,23 @@ const dealCrudEvents: CrudEventsConfig = {
   }),
 }
 
+async function resolvePipelineStageValue(
+  em: EntityManager,
+  pipelineStageId: string,
+  tenantId: string,
+  organizationId: string,
+): Promise<string | null> {
+  const stage = await em.findOne(CustomerPipelineStage, { id: pipelineStageId })
+  if (!stage) return null
+  const entry = await ensureDictionaryEntry(em, {
+    tenantId,
+    organizationId,
+    kind: 'pipeline_stage',
+    value: stage.label,
+  })
+  return entry?.value ?? stage.label
+}
+
 type DealSnapshot = {
   deal: {
     id: string
@@ -62,6 +80,8 @@ type DealSnapshot = {
     description: string | null
     status: string
     pipelineStage: string | null
+    pipelineId: string | null
+    pipelineStageId: string | null
     valueAmount: string | null
     valueCurrency: string | null
     probability: number | null
@@ -116,6 +136,8 @@ async function loadDealSnapshot(em: EntityManager, id: string): Promise<DealSnap
       description: deal.description ?? null,
       status: deal.status,
       pipelineStage: deal.pipelineStage ?? null,
+      pipelineId: deal.pipelineId ?? null,
+      pipelineStageId: deal.pipelineStageId ?? null,
       valueAmount: deal.valueAmount ?? null,
       valueCurrency: deal.valueCurrency ?? null,
       probability: deal.probability ?? null,
@@ -193,6 +215,8 @@ const createDealCommand: CommandHandler<DealCreateInput, { dealId: string }> = {
       description: parsed.description ?? null,
       status: parsed.status ?? 'open',
       pipelineStage: parsed.pipelineStage ?? null,
+      pipelineId: parsed.pipelineId ?? null,
+      pipelineStageId: parsed.pipelineStageId ?? null,
       valueAmount: toNumericString(parsed.valueAmount),
       valueCurrency: parsed.valueCurrency ?? null,
       probability: parsed.probability ?? null,
@@ -201,6 +225,12 @@ const createDealCommand: CommandHandler<DealCreateInput, { dealId: string }> = {
       source: parsed.source ?? null,
     })
     em.persist(deal)
+
+    if (deal.pipelineStageId && !deal.pipelineStage) {
+      const resolved = await resolvePipelineStageValue(em, deal.pipelineStageId, parsed.tenantId, parsed.organizationId)
+      if (resolved) deal.pipelineStage = resolved
+    }
+
     await em.flush()
 
     await syncDealPeople(em, deal, parsed.personIds ?? [])
@@ -290,6 +320,13 @@ const updateDealCommand: CommandHandler<DealUpdateInput, { dealId: string }> = {
     if (parsed.description !== undefined) record.description = parsed.description ?? null
     if (parsed.status !== undefined) record.status = parsed.status ?? record.status
     if (parsed.pipelineStage !== undefined) record.pipelineStage = parsed.pipelineStage ?? null
+    if (parsed.pipelineId !== undefined) record.pipelineId = parsed.pipelineId ?? null
+    if (parsed.pipelineStageId !== undefined) record.pipelineStageId = parsed.pipelineStageId ?? null
+
+    if (record.pipelineStageId && (parsed.pipelineStageId !== undefined || !record.pipelineStage)) {
+      const resolved = await resolvePipelineStageValue(em, record.pipelineStageId, record.tenantId, record.organizationId)
+      if (resolved) record.pipelineStage = resolved
+    }
     if (parsed.valueAmount !== undefined) record.valueAmount = toNumericString(parsed.valueAmount)
     if (parsed.valueCurrency !== undefined) record.valueCurrency = parsed.valueCurrency ?? null
     if (parsed.probability !== undefined) record.probability = parsed.probability ?? null
@@ -401,6 +438,8 @@ const updateDealCommand: CommandHandler<DealUpdateInput, { dealId: string }> = {
         description: before.deal.description,
         status: before.deal.status,
         pipelineStage: before.deal.pipelineStage,
+        pipelineId: before.deal.pipelineId,
+        pipelineStageId: before.deal.pipelineStageId,
         valueAmount: before.deal.valueAmount,
         valueCurrency: before.deal.valueCurrency,
         probability: before.deal.probability,
@@ -414,6 +453,8 @@ const updateDealCommand: CommandHandler<DealUpdateInput, { dealId: string }> = {
       deal.description = before.deal.description
       deal.status = before.deal.status
       deal.pipelineStage = before.deal.pipelineStage
+      deal.pipelineId = before.deal.pipelineId
+      deal.pipelineStageId = before.deal.pipelineStageId
       deal.valueAmount = before.deal.valueAmount
       deal.valueCurrency = before.deal.valueCurrency
       deal.probability = before.deal.probability
@@ -525,6 +566,8 @@ const deleteDealCommand: CommandHandler<{ body?: Record<string, unknown>; query?
           description: before.deal.description,
           status: before.deal.status,
           pipelineStage: before.deal.pipelineStage,
+          pipelineId: before.deal.pipelineId,
+          pipelineStageId: before.deal.pipelineStageId,
           valueAmount: before.deal.valueAmount,
           valueCurrency: before.deal.valueCurrency,
           probability: before.deal.probability,

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

@@ -8,3 +8,5 @@ import './tags'
 import './todos'
 import './settings'
 import './dictionaries'
+import './pipelines'
+import './pipeline-stages'

package/src/modules/customers/commands/pipeline-stages.ts

@@ -0,0 +1,156 @@
+import { registerCommand } from '@open-mercato/shared/lib/commands'
+import type { CommandHandler } from '@open-mercato/shared/lib/commands'
+import type { EntityManager } from '@mikro-orm/postgresql'
+import { CustomerPipelineStage, CustomerDeal } from '../data/entities'
+import {
+  pipelineStageCreateSchema,
+  pipelineStageUpdateSchema,
+  pipelineStageDeleteSchema,
+  pipelineStageReorderSchema,
+  type PipelineStageCreateInput,
+  type PipelineStageUpdateInput,
+  type PipelineStageDeleteInput,
+  type PipelineStageReorderInput,
+} from '../data/validators'
+import { ensureOrganizationScope, ensureTenantScope, ensureDictionaryEntry } from './shared'
+import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+
+const createPipelineStageCommand: CommandHandler<PipelineStageCreateInput, { stageId: string }> = {
+  id: 'customers.pipeline-stages.create',
+  async execute(rawInput, ctx) {
+    const parsed = pipelineStageCreateSchema.parse(rawInput)
+    ensureTenantScope(ctx, parsed.tenantId)
+    ensureOrganizationScope(ctx, parsed.organizationId)
+
+    const em = (ctx.container.resolve('em') as EntityManager).fork()
+
+    const existingCount = await em.count(CustomerPipelineStage, {
+      organizationId: parsed.organizationId,
+      tenantId: parsed.tenantId,
+      pipelineId: parsed.pipelineId,
+    })
+
+    const stage = em.create(CustomerPipelineStage, {
+      organizationId: parsed.organizationId,
+      tenantId: parsed.tenantId,
+      pipelineId: parsed.pipelineId,
+      label: parsed.label,
+      order: parsed.order ?? existingCount,
+      createdAt: new Date(),
+      updatedAt: new Date(),
+    })
+    em.persist(stage)
+    await em.flush()
+
+    await ensureDictionaryEntry(em, {
+      tenantId: parsed.tenantId,
+      organizationId: parsed.organizationId,
+      kind: 'pipeline_stage',
+      value: stage.label,
+      color: parsed.color,
+      icon: parsed.icon,
+    })
+    await em.flush()
+
+    return { stageId: stage.id }
+  },
+}
+
+const updatePipelineStageCommand: CommandHandler<PipelineStageUpdateInput, void> = {
+  id: 'customers.pipeline-stages.update',
+  async execute(rawInput, ctx) {
+    const parsed = pipelineStageUpdateSchema.parse(rawInput)
+
+    const em = (ctx.container.resolve('em') as EntityManager).fork()
+    const stage = await em.findOne(CustomerPipelineStage, { id: parsed.id })
+    if (!stage) throw new CrudHttpError(404, { error: 'Pipeline stage not found' })
+
+    ensureTenantScope(ctx, stage.tenantId)
+    ensureOrganizationScope(ctx, stage.organizationId)
+
+    if (parsed.label !== undefined) stage.label = parsed.label
+    if (parsed.order !== undefined) stage.order = parsed.order
+    stage.updatedAt = new Date()
+
+    await em.flush()
+
+    if (parsed.label !== undefined || parsed.color !== undefined || parsed.icon !== undefined) {
+      await ensureDictionaryEntry(em, {
+        tenantId: stage.tenantId,
+        organizationId: stage.organizationId,
+        kind: 'pipeline_stage',
+        value: stage.label,
+        color: parsed.color,
+        icon: parsed.icon,
+      })
+      await em.flush()
+    }
+  },
+}
+
+const deletePipelineStageCommand: CommandHandler<PipelineStageDeleteInput, void> = {
+  id: 'customers.pipeline-stages.delete',
+  async execute(rawInput, ctx) {
+    const parsed = pipelineStageDeleteSchema.parse(rawInput)
+
+    const em = (ctx.container.resolve('em') as EntityManager).fork()
+    const stage = await em.findOne(CustomerPipelineStage, { id: parsed.id })
+    if (!stage) throw new CrudHttpError(404, { error: 'Pipeline stage not found' })
+
+    ensureTenantScope(ctx, stage.tenantId)
+    ensureOrganizationScope(ctx, stage.organizationId)
+
+    const activeDealsCount = await em.count(CustomerDeal, {
+      pipelineStageId: parsed.id,
+      deletedAt: null,
+    })
+    if (activeDealsCount > 0) {
+      throw new CrudHttpError(409, { error: 'Cannot delete pipeline stage with active deals' })
+    }
+
+    em.remove(stage)
+    await em.flush()
+  },
+}
+
+const reorderPipelineStagesCommand: CommandHandler<PipelineStageReorderInput, void> = {
+  id: 'customers.pipeline-stages.reorder',
+  async execute(rawInput, ctx) {
+    const parsed = pipelineStageReorderSchema.parse(rawInput)
+    ensureTenantScope(ctx, parsed.tenantId)
+    ensureOrganizationScope(ctx, parsed.organizationId)
+
+    const em = (ctx.container.resolve('em') as EntityManager).fork()
+
+    const ids = parsed.stages.map((s) => s.id)
+    const stages = await em.find(CustomerPipelineStage, {
+      id: { $in: ids },
+      organizationId: parsed.organizationId,
+      tenantId: parsed.tenantId,
+    })
+
+    const stageMap = new Map<string, CustomerPipelineStage>()
+    stages.forEach((stage) => stageMap.set(stage.id, stage))
+
+    for (const { id, order } of parsed.stages) {
+      const stage = stageMap.get(id)
+      if (!stage) continue
+      stage.order = order
+      stage.updatedAt = new Date()
+    }
+
+    await em.flush()
+  },
+}
+
+registerCommand(createPipelineStageCommand)
+registerCommand(updatePipelineStageCommand)
+registerCommand(deletePipelineStageCommand)
+registerCommand(reorderPipelineStagesCommand)
+
+export {
+  createPipelineStageCommand,
+  updatePipelineStageCommand,
+  deletePipelineStageCommand,
+  reorderPipelineStagesCommand,
+}