@open-mercato/core 0.6.5-develop.4384.1.ce2ec6eaaa → 0.6.5-develop.4393.1.de282b5dfd

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

@@ -23,6 +23,7 @@ import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuarde
 import { createTranslatorWithFallback } from '@open-mercato/shared/lib/i18n/translate'
 
 import { ActivitiesSection } from '../../../../components/detail/ActivitiesSection'
+import { PersonEmailThreadsTab } from '../../../../components/detail/PersonEmailThreadsTab'
 import { ActivitiesCard } from '../../../../components/detail/ActivitiesCard'
 import type { ActivityKind } from '../../../../components/detail/ActivitiesAddNewMenu'
 import { DealsSection } from '../../../../components/detail/DealsSection'
@@ -421,7 +422,7 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
     <Page>
       <PageBody>
         <div className="space-y-4">
-          {/* UMES header injection */}
+          {/* UMES header injection (third-party extensions) */}
           <InjectionSpot spotId="detail:customers.person:header" context={injectionContext} data={data} />
           <InjectionSpot spotId="detail:customers.person:status-badges" context={injectionContext} data={data} />
 
@@ -519,6 +520,15 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
                     )
                   }
 
+                  if (activeTab === 'emails') {
+                    return (
+                      <PersonEmailThreadsTab
+                        personId={personId}
+                        defaultRecipient={data.person?.primaryEmail ?? null}
+                      />
+                    )
+                  }
+
                   if (activeTab === 'deals') {
                     return (
                       <DealsSection

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

@@ -110,6 +110,34 @@ async function resolvePipelineStageValue(
   return entry?.value ?? stage.label
 }
 
+function resolvePipelineAssignment(input: {
+  pipelineId?: string | null
+  pipelineStageId?: string | null
+  stageSnapshot: PipelineStageSnapshot | null
+}): { pipelineId: string | null; pipelineStageId: string | null } {
+  const requestedPipelineId = input.pipelineId ?? null
+  const requestedPipelineStageId = input.pipelineStageId ?? null
+
+  if (requestedPipelineStageId && !input.stageSnapshot) {
+    throw new CrudHttpError(400, { error: 'Pipeline stage not found' })
+  }
+
+  if (
+    requestedPipelineId &&
+    input.stageSnapshot &&
+    input.stageSnapshot.pipelineId !== requestedPipelineId
+  ) {
+    throw new CrudHttpError(400, {
+      error: 'Pipeline stage does not belong to the selected pipeline',
+    })
+  }
+
+  return {
+    pipelineId: requestedPipelineId ?? input.stageSnapshot?.pipelineId ?? null,
+    pipelineStageId: requestedPipelineStageId,
+  }
+}
+
 async function upsertDealStageTransition(
   em: EntityManager,
   input: {
@@ -369,12 +397,21 @@ const createDealCommand: CommandHandler<DealCreateInput, { dealId: string }> = {
     const normalizedTransitionAuthorUserId = normalizeAuthorUserId(null, ctx.auth)
     let deal!: CustomerDeal
     let stageSnapshot: PipelineStageSnapshot | null = null
+    let pipelineAssignment: { pipelineId: string | null; pipelineStageId: string | null } = {
+      pipelineId: null,
+      pipelineStageId: null,
+    }
     let resolvedPipelineStageLabel: string | null = null
     await withAtomicFlush(em, [
       async () => {
         stageSnapshot = parsed.pipelineStageId
           ? await loadPipelineStageSnapshot(em, parsed.pipelineStageId, parsed.tenantId, parsed.organizationId)
           : null
+        pipelineAssignment = resolvePipelineAssignment({
+          pipelineId: parsed.pipelineId,
+          pipelineStageId: parsed.pipelineStageId,
+          stageSnapshot,
+        })
         resolvedPipelineStageLabel = stageSnapshot
           ? (await ensureDictionaryEntry(em, {
             tenantId: parsed.tenantId,
@@ -392,8 +429,8 @@ const createDealCommand: CommandHandler<DealCreateInput, { dealId: string }> = {
           description: parsed.description ?? null,
           status: parsed.status ?? 'open',
           pipelineStage: resolvedPipelineStageLabel,
-          pipelineId: parsed.pipelineId ?? null,
-          pipelineStageId: parsed.pipelineStageId ?? null,
+          pipelineId: pipelineAssignment.pipelineId,
+          pipelineStageId: pipelineAssignment.pipelineStageId,
           valueAmount: toNumericString(parsed.valueAmount),
           valueCurrency: parsed.valueCurrency ?? null,
           probability: parsed.probability ?? null,
@@ -507,14 +544,34 @@ const updateDealCommand: CommandHandler<DealUpdateInput, { dealId: string }> = {
     const normalizedTransitionAuthorUserId = normalizeAuthorUserId(null, ctx.auth)
 
     let nextStageSnapshot: PipelineStageSnapshot | null = null
+    let nextPipelineAssignment: { pipelineId: string | null; pipelineStageId: string | null } = {
+      pipelineId: record.pipelineId ?? null,
+      pipelineStageId: record.pipelineStageId ?? null,
+    }
     let nextPipelineStageLabel: string | null = null
     let resolvedCurrentPipelineStageLabel: string | null = null
 
     await withAtomicFlush(em, [
       async () => {
-        nextStageSnapshot = parsed.pipelineStageId
-          ? await loadPipelineStageSnapshot(em, parsed.pipelineStageId, record.tenantId, record.organizationId)
+        const pipelineAssignmentChanged =
+          parsed.pipelineId !== undefined || parsed.pipelineStageId !== undefined
+        const requestedPipelineStageId =
+          parsed.pipelineStageId !== undefined
+            ? parsed.pipelineStageId ?? null
+            : record.pipelineStageId ?? null
+        const requestedPipelineId =
+          parsed.pipelineId !== undefined ? parsed.pipelineId ?? null : record.pipelineId ?? null
+
+        nextStageSnapshot = requestedPipelineStageId && (pipelineAssignmentChanged || !record.pipelineStage)
+          ? await loadPipelineStageSnapshot(em, requestedPipelineStageId, record.tenantId, record.organizationId)
           : null
+        if (pipelineAssignmentChanged) {
+          nextPipelineAssignment = resolvePipelineAssignment({
+            pipelineId: requestedPipelineId,
+            pipelineStageId: requestedPipelineStageId,
+            stageSnapshot: nextStageSnapshot,
+          })
+        }
         nextPipelineStageLabel = nextStageSnapshot
           ? (await ensureDictionaryEntry(em, {
             tenantId: record.tenantId,
@@ -533,8 +590,10 @@ 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 (parsed.pipelineId !== undefined || (parsed.pipelineStageId !== undefined && nextStageSnapshot)) {
+          record.pipelineId = nextPipelineAssignment.pipelineId
+        }
+        if (parsed.pipelineStageId !== undefined) record.pipelineStageId = nextPipelineAssignment.pipelineStageId
 
         if (nextPipelineStageLabel && (parsed.pipelineStageId !== undefined || !record.pipelineStage)) {
           record.pipelineStage = nextPipelineStageLabel

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

@@ -41,6 +41,7 @@ import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import type { CrudIndexerConfig, CrudEventsConfig } from '@open-mercato/shared/lib/crud/types'
 import { recomputeNextInteraction } from '../lib/interactionProjection'
+import { canChangeEmailVisibility } from '../lib/visibilityFilter'
 
 const INTERACTION_ENTITY_ID = 'customers:customer_interaction'
 const interactionCrudIndexer: CrudIndexerConfig<CustomerInteraction> = {
@@ -454,6 +455,35 @@ const updateInteractionCommand: CommandHandler<InteractionUpdateInput, { interac
       ensureTenantScope(ctx, interaction.tenantId)
       ensureOrganizationScope(ctx, interaction.organizationId)
 
+      // Email visibility is an access-controlled field: only the interaction's
+      // author may change a
+      // private email's visibility (mirrors the dedicated PATCH .../visibility
+      // route). Enforce it here — the single persistence path — so the generic
+      // update route (PUT /api/interactions) cannot bypass the gate. Evaluated
+      // against the row's pre-mutation author/type. 404 (not 403) keeps the
+      // existence-masking consistent with the dedicated route.
+      if (
+        parsed.visibility !== undefined &&
+        interaction.interactionType === 'email' &&
+        (parsed.visibility ?? null) !== (interaction.visibility ?? null)
+      ) {
+        const actorUserId = (ctx.auth as { sub?: string | null } | null)?.sub ?? null
+        if (
+          !canChangeEmailVisibility({
+            interactionType: interaction.interactionType,
+            currentVisibility: interaction.visibility,
+            nextVisibility: parsed.visibility,
+            authorUserId: interaction.authorUserId,
+            actorUserId,
+            // v1 strict owner-only: only the author may flip visibility; no admin
+            // bypass (canChangeEmailVisibility ignores caller features in v1).
+            userFeatures: undefined,
+          })
+        ) {
+          throw new CrudHttpError(404, { error: 'Email not found' })
+        }
+      }
+
       if (parsed.dealId !== undefined) {
         if (parsed.dealId) {
           await requireDealInScope(trx, parsed.dealId, interaction.tenantId, interaction.organizationId)

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

@@ -11,6 +11,7 @@ import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { cn } from '@open-mercato/shared/lib/utils'
 import type { InteractionSummary } from './types'
 import { ActivityAiActions } from './ActivityAiActions'
+import { EmailCardActions, type EmailCardWidgetData } from './EmailCardActions'
 
 type GuardedMutationRunner = <T,>(
   operation: () => Promise<T>,
@@ -72,6 +73,42 @@ function resolveTarget(activity: InteractionSummary): string | null {
   return null
 }
 
+/**
+ * Build the `EmailCardWidgetData` for the email-card-actions injection spot.
+ * Email metadata (rfcMessageId, addresses, threading headers, current visibility,
+ * and the author flag) is populated server-side by `interactionEmailCardEnricher`
+ * and surfaced via the `_integrations.email` passthrough; missing values fall
+ * back to null.
+ */
+function buildEmailCardWidgetData(activity: InteractionSummary): EmailCardWidgetData {
+  const integrations = activity._integrations as Record<string, unknown> | undefined
+  const emailMeta = (integrations?.email ?? {}) as Record<string, unknown>
+  return {
+    interactionId: activity.id,
+    // The MessageChannelLink UUID stored on the interaction row.
+    externalMessageId:
+      typeof emailMeta.externalMessageId === 'string' ? emailMeta.externalMessageId : null,
+    // RFC2822 Message-ID (e.g. "<abc@mail.gmail.com>") for In-Reply-To / References headers.
+    rfcMessageId:
+      typeof emailMeta.rfcMessageId === 'string' ? emailMeta.rfcMessageId : null,
+    // entityId is the CustomerEntity id — on a person detail page this IS the personId.
+    personId: activity.entityId ?? null,
+    fromAddress:
+      typeof emailMeta.fromAddress === 'string' ? emailMeta.fromAddress : null,
+    toAddresses: Array.isArray(emailMeta.toAddresses) ? (emailMeta.toAddresses as string[]) : null,
+    ccAddresses: Array.isArray(emailMeta.ccAddresses) ? (emailMeta.ccAddresses as string[]) : null,
+    subject: activity.title ?? null,
+    inReplyTo:
+      typeof emailMeta.inReplyTo === 'string' ? emailMeta.inReplyTo : null,
+    references: Array.isArray(emailMeta.references) ? (emailMeta.references as string[]) : null,
+    currentVisibility:
+      emailMeta.currentVisibility === 'private' || emailMeta.currentVisibility === 'shared'
+        ? emailMeta.currentVisibility
+        : null,
+    isAuthor: typeof emailMeta.isAuthor === 'boolean' ? emailMeta.isAuthor : null,
+  }
+}
+
 export function ActivityCard({ activity, onOpen, onChanged, runMutation }: ActivityCardProps) {
   const t = useT()
   const timestamp = activity.occurredAt ?? activity.scheduledAt ?? activity.createdAt
@@ -194,6 +231,17 @@ export function ActivityCard({ activity, onOpen, onChanged, runMutation }: Activ
           <ActivityAiActions activityType={activity.interactionType} />
         </div>
 
+        {activity.interactionType === 'email' ? (
+          <div
+            className="mt-1"
+            onClick={(event) => event.stopPropagation()}
+            onKeyDown={(event) => event.stopPropagation()}
+            role="presentation"
+          >
+            <EmailCardActions data={buildEmailCardWidgetData(activity)} />
+          </div>
+        ) : null}
+
         {snippet ? (
           <p className="mt-2 text-sm text-muted-foreground">{snippet}</p>
         ) : null}

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

@@ -0,0 +1,329 @@
+'use client'
+
+import * as React from 'react'
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@open-mercato/ui/primitives/dialog'
+import { Button } from '@open-mercato/ui/primitives/button'
+import { Input } from '@open-mercato/ui/primitives/input'
+import { Label } from '@open-mercato/ui/primitives/label'
+import { Textarea } from '@open-mercato/ui/primitives/textarea'
+import { RadioGroup } from '@open-mercato/ui/primitives/radio'
+import { RadioField } from '@open-mercato/ui/primitives/radio-field'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@open-mercato/ui/primitives/select'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
+
+export interface ComposeEmailChannel {
+  id: string
+  displayName: string
+  externalIdentifier?: string | null
+  providerKey: 'gmail' | 'imap' | string
+  isPrimary?: boolean
+}
+
+export interface ComposeEmailValues {
+  userChannelId: string
+  to: string[]
+  cc?: string[]
+  bcc?: string[]
+  subject: string
+  body: string
+  bodyFormat: 'text' | 'html'
+  visibility: 'private' | 'shared'
+  inReplyTo?: string
+  references?: string[]
+  /** When replying, the messages.message id of the parent so the reply joins its thread. */
+  parentMessageId?: string
+}
+
+export interface ComposeEmailDialogProps {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  defaultRecipient?: string | null
+  channels: ComposeEmailChannel[]
+  replyTo?: {
+    inReplyTo?: string
+    references?: string[]
+    to: string[]
+    cc?: string[]
+    subject: string
+    parentMessageId?: string
+  } | null
+  onSend: (values: ComposeEmailValues) => Promise<{ messageId: string | null }>
+}
+
+function parseRecipients(raw: string): string[] {
+  return raw
+    .split(/[,;\s]+/)
+    .map((s) => s.trim())
+    .filter(Boolean)
+}
+
+function defaultChannelId(channels: ComposeEmailChannel[]): string {
+  const primary = channels.find((c) => c.isPrimary)
+  return primary?.id ?? channels[0]?.id ?? ''
+}
+
+/** Single source of truth for the dialog's seeded form values (reply prefill, default recipient, primary channel). */
+function deriveComposeInitialState(
+  replyTo: ComposeEmailDialogProps['replyTo'],
+  defaultRecipient: string | null | undefined,
+  channels: ComposeEmailChannel[],
+): { to: string; cc: string; showCc: boolean; subject: string; channelId: string } {
+  const cc = replyTo?.cc && replyTo.cc.length > 0 ? replyTo.cc.join(', ') : ''
+  return {
+    to: replyTo ? replyTo.to.join(', ') : (defaultRecipient ?? ''),
+    cc,
+    showCc: Boolean(cc),
+    subject: replyTo?.subject ?? '',
+    channelId: defaultChannelId(channels),
+  }
+}
+
+export function ComposeEmailDialog({
+  open,
+  onOpenChange,
+  channels,
+  defaultRecipient,
+  replyTo,
+  onSend,
+}: ComposeEmailDialogProps) {
+  const t = useT()
+
+  const initial = React.useMemo(
+    () => deriveComposeInitialState(replyTo, defaultRecipient, channels),
+    [replyTo, defaultRecipient, channels],
+  )
+
+  const [to, setTo] = React.useState(initial.to)
+  const [showCc, setShowCc] = React.useState(initial.showCc)
+  const [cc, setCc] = React.useState(initial.cc)
+  const [subject, setSubject] = React.useState(initial.subject)
+  const [body, setBody] = React.useState('')
+  const [visibility, setVisibility] = React.useState<'private' | 'shared'>('private')
+  const [channelId, setChannelId] = React.useState(initial.channelId)
+  const [busy, setBusy] = React.useState(false)
+  const [error, setError] = React.useState<string | null>(null)
+
+  // Reset the form whenever the dialog (re)opens or its seed inputs change.
+  React.useEffect(() => {
+    if (!open) return
+    const next = deriveComposeInitialState(replyTo, defaultRecipient, channels)
+    setTo(next.to)
+    setCc(next.cc)
+    setShowCc(next.showCc)
+    setSubject(next.subject)
+    setBody('')
+    setVisibility('private')
+    setChannelId(next.channelId)
+    setError(null)
+    setBusy(false)
+  }, [open, replyTo, defaultRecipient, channels])
+
+  const toList = React.useMemo(() => parseRecipients(to), [to])
+  const isSendDisabled =
+    busy ||
+    toList.length === 0 ||
+    subject.trim().length === 0 ||
+    body.trim().length === 0 ||
+    !channelId
+
+  const handleSend = React.useCallback(async () => {
+    setError(null)
+    setBusy(true)
+    try {
+      const ccList = showCc ? parseRecipients(cc) : undefined
+      const values: ComposeEmailValues = {
+        userChannelId: channelId,
+        to: toList,
+        cc: ccList && ccList.length > 0 ? ccList : undefined,
+        subject: subject.trim(),
+        body: body.trim(),
+        bodyFormat: 'text',
+        visibility,
+        inReplyTo: replyTo?.inReplyTo,
+        references: replyTo?.references,
+        parentMessageId: replyTo?.parentMessageId,
+      }
+      await onSend(values)
+      onOpenChange(false)
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err)
+      setError(message)
+    } finally {
+      setBusy(false)
+    }
+  }, [showCc, cc, channelId, toList, subject, body, visibility, replyTo, onSend, onOpenChange])
+
+  const handleKeyDown = React.useCallback(
+    (event: React.KeyboardEvent) => {
+      if ((event.metaKey || event.ctrlKey) && event.key === 'Enter') {
+        if (!isSendDisabled) {
+          void handleSend()
+        }
+      }
+    },
+    [isSendDisabled, handleSend],
+  )
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="sm:max-w-2xl" onKeyDown={handleKeyDown}>
+        <DialogHeader>
+          <DialogTitle>
+            {replyTo
+              ? t('customers.email.compose.replyTitle', 'Reply')
+              : t('customers.email.compose.title', 'Compose email')}
+          </DialogTitle>
+        </DialogHeader>
+
+        <div className="flex flex-col gap-4">
+          {/* To */}
+          <div className="flex flex-col gap-1.5">
+            <div className="flex items-center justify-between">
+              <Label htmlFor="compose-to">
+                {t('customers.email.compose.to', 'To')}
+              </Label>
+              {!showCc && (
+                <Button
+                  type="button"
+                  variant="link"
+                  size="2xs"
+                  className="text-muted-foreground hover:text-foreground"
+                  onClick={() => setShowCc(true)}
+                  aria-label={t('customers.email.compose.addCc.ariaLabel', 'Add Cc recipients')}
+                >
+                  {t('customers.email.compose.addCc', '+ Cc')}
+                </Button>
+              )}
+            </div>
+            <Input
+              id="compose-to"
+              value={to}
+              onChange={(e) => setTo(e.target.value)}
+              placeholder={t('customers.email.compose.toPlaceholder', 'recipient@example.com')}
+              autoComplete="off"
+            />
+          </div>
+
+          {/* Cc (collapsible) */}
+          {showCc && (
+            <div className="flex flex-col gap-1.5">
+              <Label htmlFor="compose-cc">
+                {t('customers.email.compose.cc', 'Cc')}
+              </Label>
+              <Input
+                id="compose-cc"
+                value={cc}
+                onChange={(e) => setCc(e.target.value)}
+                placeholder={t('customers.email.compose.ccPlaceholder', 'cc@example.com')}
+                autoComplete="off"
+              />
+            </div>
+          )}
+
+          {/* Subject */}
+          <div className="flex flex-col gap-1.5">
+            <Label htmlFor="compose-subject">
+              {t('customers.email.compose.subject', 'Subject')}
+            </Label>
+            <Input
+              id="compose-subject"
+              value={subject}
+              onChange={(e) => setSubject(e.target.value)}
+              placeholder={t('customers.email.compose.subjectPlaceholder', 'Email subject')}
+            />
+          </div>
+
+          {/* Body */}
+          <div className="flex flex-col gap-1.5">
+            <Label htmlFor="compose-body">
+              {t('customers.email.compose.body', 'Body')}
+            </Label>
+            <Textarea
+              id="compose-body"
+              value={body}
+              onChange={(e) => setBody(e.target.value)}
+              placeholder={t('customers.email.compose.bodyPlaceholder', 'Write your message...')}
+              rows={8}
+            />
+          </div>
+
+          {/* Visibility */}
+          <div className="flex flex-col gap-2">
+            <Label>
+              {t('customers.email.compose.visibility', 'Visibility')}
+            </Label>
+            <RadioGroup
+              value={visibility}
+              onValueChange={(val) => setVisibility(val as 'private' | 'shared')}
+              className="flex flex-row gap-4"
+            >
+              <RadioField
+                value="private"
+                label={t('customers.email.compose.visibilityPrivate', 'Private to me')}
+              />
+              <RadioField
+                value="shared"
+                label={t('customers.email.compose.visibilityShared', 'Visible to teammates')}
+              />
+            </RadioGroup>
+          </div>
+
+          {/* Send as (channel selector) */}
+          {channels.length > 0 && (
+            <div className="flex flex-col gap-1.5">
+              <Label htmlFor="compose-channel">
+                {t('customers.email.compose.sendAs', 'Send as')}
+              </Label>
+              <Select value={channelId} onValueChange={setChannelId}>
+                <SelectTrigger id="compose-channel">
+                  <SelectValue placeholder={t('customers.email.compose.selectChannel', 'Select account')} />
+                </SelectTrigger>
+                <SelectContent>
+                  {channels.map((ch) => (
+                    <SelectItem key={ch.id} value={ch.id}>
+                      {ch.displayName}
+                      {ch.externalIdentifier ? ` (${ch.externalIdentifier})` : ''}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+          )}
+
+          {/* Inline error */}
+          {error && (
+            <p className="text-sm text-status-error-text" role="alert">
+              {error}
+            </p>
+          )}
+        </div>
+
+        <DialogFooter>
+          <Button
+            type="button"
+            variant="outline"
+            onClick={() => onOpenChange(false)}
+            disabled={busy}
+          >
+            {t('customers.email.compose.cancel', 'Cancel')}
+          </Button>
+          <Button
+            type="button"
+            onClick={() => void handleSend()}
+            disabled={isSendDisabled}
+          >
+            {busy
+              ? t('customers.email.compose.sending', 'Sending...')
+              : t('customers.email.compose.send', 'Send')}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  )
+}

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

@@ -805,11 +805,12 @@ export function DealForm({
       label: t('customers.people.detail.deals.fields.pipeline', 'Pipeline'),
       type: 'custom',
       layout: 'half',
-      component: ({ value, setValue }) => (
+      component: ({ value, setValue, setFormValue }) => (
         <Select
           value={typeof value === 'string' && value ? value : undefined}
           onValueChange={(next) => {
             setValue(next ?? '')
+            setFormValue?.('pipelineStageId', '')
             loadStagesForPipeline(next ?? '').catch(() => {})
           }}
           disabled={disabled}

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

@@ -226,6 +226,14 @@ function normalizeDeal(deal: Partial<DealSummary> & { id: string; title?: string
     status: typeof deal.status === 'string' ? deal.status : deal.status ?? null,
     pipelineStage:
       typeof deal.pipelineStage === 'string' ? deal.pipelineStage : deal.pipelineStage ?? null,
+    pipelineId:
+      typeof deal.pipelineId === 'string' && deal.pipelineId.trim().length
+        ? deal.pipelineId.trim()
+        : deal.pipelineId ?? null,
+    pipelineStageId:
+      typeof deal.pipelineStageId === 'string' && deal.pipelineStageId.trim().length
+        ? deal.pipelineStageId.trim()
+        : deal.pipelineStageId ?? null,
     valueAmount: toNumber(deal.valueAmount ?? null),
     valueCurrency:
       typeof deal.valueCurrency === 'string' && deal.valueCurrency.trim().length
@@ -413,6 +421,18 @@ export function DealsSection({
             : typeof record.pipeline_stage === 'string' && record.pipeline_stage.trim().length
               ? record.pipeline_stage.trim()
               : null
+        const pipelineId =
+          typeof record.pipelineId === 'string' && record.pipelineId.trim().length
+            ? record.pipelineId.trim()
+            : typeof record.pipeline_id === 'string' && record.pipeline_id.trim().length
+              ? record.pipeline_id.trim()
+              : null
+        const pipelineStageId =
+          typeof record.pipelineStageId === 'string' && record.pipelineStageId.trim().length
+            ? record.pipelineStageId.trim()
+            : typeof record.pipeline_stage_id === 'string' && record.pipeline_stage_id.trim().length
+              ? record.pipeline_stage_id.trim()
+              : null
         const valueAmount = toNumber(record.valueAmount ?? record.value_amount)
         const valueCurrencyRaw = record.valueCurrency ?? record.value_currency ?? null
         const valueCurrency =
@@ -494,6 +514,8 @@ export function DealsSection({
           title,
           status,
           pipelineStage,
+          pipelineId,
+          pipelineStageId,
           valueAmount,
           valueCurrency,
           probability,
@@ -727,6 +749,8 @@ export function DealsSection({
           title: base.title,
           status: base.status ?? undefined,
           pipelineStage: base.pipelineStage ?? undefined,
+          pipelineId: base.pipelineId ?? undefined,
+          pipelineStageId: base.pipelineStageId ?? undefined,
           valueAmount: typeof base.valueAmount === 'number' ? base.valueAmount : undefined,
           valueCurrency: base.valueCurrency ?? undefined,
           probability: typeof base.probability === 'number' ? base.probability : undefined,
@@ -761,6 +785,8 @@ export function DealsSection({
             title: base.title,
             status: base.status ?? null,
             pipelineStage: base.pipelineStage ?? null,
+            pipelineId: base.pipelineId ?? null,
+            pipelineStageId: base.pipelineStageId ?? null,
             valueAmount: base.valueAmount ?? null,
             valueCurrency: base.valueCurrency ?? null,
             probability: base.probability ?? null,