@open-mercato/core 0.6.6-develop.6176.1.4507b99c2f → 0.6.6-develop.6198.1.0822f97cc6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.6.6-develop.6176.1.4507b99c2f",
+  "version": "0.6.6-develop.6198.1.0822f97cc6",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -246,16 +246,16 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.6.6-develop.6176.1.4507b99c2f",
-    "@open-mercato/shared": "0.6.6-develop.6176.1.4507b99c2f",
-    "@open-mercato/ui": "0.6.6-develop.6176.1.4507b99c2f",
+    "@open-mercato/ai-assistant": "0.6.6-develop.6198.1.0822f97cc6",
+    "@open-mercato/shared": "0.6.6-develop.6198.1.0822f97cc6",
+    "@open-mercato/ui": "0.6.6-develop.6198.1.0822f97cc6",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.6.6-develop.6176.1.4507b99c2f",
-    "@open-mercato/shared": "0.6.6-develop.6176.1.4507b99c2f",
-    "@open-mercato/ui": "0.6.6-develop.6176.1.4507b99c2f",
+    "@open-mercato/ai-assistant": "0.6.6-develop.6198.1.0822f97cc6",
+    "@open-mercato/shared": "0.6.6-develop.6198.1.0822f97cc6",
+    "@open-mercato/ui": "0.6.6-develop.6198.1.0822f97cc6",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/modules/auth/frontend/login.tsx

@@ -383,15 +383,15 @@ export default function LoginPage() {
                 </div>
               ) : null}
               {showTenantInvalid ? (
-                <div className="rounded-md border border-red-200 bg-red-50 px-3 py-2 text-center text-xs text-red-700">
+                <div className="rounded-md border border-status-error-border bg-status-error-bg px-3 py-2 text-center text-xs text-status-error-text">
                   <div className="font-medium">{translate('auth.login.errors.tenantInvalid', 'Tenant not found. Clear the tenant selection and try again.')}</div>
-                  <Button type="button" variant="outline" size="sm" className="mt-2 border-red-300 text-red-700" onClick={handleClearTenant}>
+                  <Button type="button" variant="outline" size="sm" className="mt-2 border-status-error-border text-status-error-text hover:text-status-error-text" onClick={handleClearTenant}>
                     <X className="mr-2 size-4" aria-hidden="true" />
                     {translate('auth.login.tenantClear', 'Clear')}
                   </Button>
                 </div>
               ) : tenantId ? (
-                <div className="rounded-md border border-emerald-200 bg-emerald-50 px-3 py-2 text-center text-xs text-emerald-900">
+                <div className="rounded-md border border-status-success-border bg-status-success-bg px-3 py-2 text-center text-xs text-status-success-text">
                   <div className="font-medium">
                     {tenantLoading
                       ? translate('auth.login.tenantLoading', 'Loading tenant details...')
@@ -399,14 +399,14 @@ export default function LoginPage() {
                           tenant: tenantName || tenantId,
                         })}
                   </div>
-                  <Button type="button" variant="outline" size="sm" className="mt-2 border-emerald-300 text-emerald-900" onClick={handleClearTenant}>
+                  <Button type="button" variant="outline" size="sm" className="mt-2 border-status-success-border text-status-success-text hover:text-status-success-text" onClick={handleClearTenant}>
                     <X className="mr-2 size-4" aria-hidden="true" />
                     {translate('auth.login.tenantClear', 'Clear')}
                   </Button>
                 </div>
               ) : null}
               {error && !showTenantInvalid && (
-                <div className="rounded-md border border-red-200 bg-red-50 px-3 py-2 text-center text-sm text-red-700" role="alert" aria-live="polite">
+                <div className="rounded-md border border-status-error-border bg-status-error-bg px-3 py-2 text-center text-sm text-status-error-text" role="alert" aria-live="polite">
                   {error}
                 </div>
               )}

package/src/modules/catalog/backend/catalog/products/MerchandisingAssistantSheet.tsx

@@ -428,12 +428,13 @@ export function MerchandisingAssistantSheet({
               </div>
               <div className="flex flex-col gap-0.5">
                 {agents.map((agent) => (
-                  <button
+                  <Button
                     key={agent.id}
                     type="button"
+                    variant="ghost"
                     onClick={() => handleSelectAgent(agent.id)}
                     data-ai-merchandising-agent-option={agent.id}
-                    className="flex items-start gap-2 rounded-sm px-2 py-2 text-left text-sm hover:bg-accent hover:text-accent-foreground focus-visible:bg-accent focus-visible:text-accent-foreground focus-visible:outline-none"
+                    className="h-auto w-full items-start justify-start gap-2 whitespace-normal rounded-sm px-2 py-2 text-left text-sm font-normal"
                   >
                     <span className="mt-0.5 inline-flex size-6 items-center justify-center rounded-full bg-secondary text-secondary-foreground">
                       {agent.icon}
@@ -444,7 +445,7 @@ export function MerchandisingAssistantSheet({
                         {agent.description}
                       </span>
                     </span>
-                  </button>
+                  </Button>
                 ))}
               </div>
             </PopoverContent>

package/src/modules/catalog/widgets/injection/product-seo/widget.client.tsx

@@ -3,6 +3,8 @@ import * as React from 'react'
 import type { InjectionWidgetComponentProps } from '@open-mercato/shared/modules/widgets/injection'
 import { subscribeProductSeoValidation } from './state'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { StatusBadge, type StatusBadgeVariant } from '@open-mercato/ui/primitives/status-badge'
+import { Alert } from '@open-mercato/ui/primitives/alert'
 
 type SeoData = {
   title?: string | null
@@ -14,6 +16,8 @@ type ValidationState = { ok: boolean; issues: string[]; message?: string }
 
 type IssueKey = 'addTitle' | 'titleTooShort' | 'titleTooLong' | 'addDescription' | 'descriptionTooShort'
 
+type SeoScore = { text: string; variant: StatusBadgeVariant }
+
 function computeIssueKeys(title: string, description: string): IssueKey[] {
   const issues: IssueKey[] = []
   if (!title) {
@@ -51,27 +55,27 @@ export default function ProductSeoWidget({ data }: InjectionWidgetComponentProps
     })
   }, [])
 
-  const titleScore = React.useMemo(() => {
-    if (!title) return { text: t('catalog.products.create.seoWidget.missing', 'Missing'), color: 'text-red-600', bg: 'bg-red-50', border: 'border-red-200' }
-    if (title.length < 10) return { text: t('catalog.products.create.seoWidget.tooShort', 'Too short'), color: 'text-amber-600', bg: 'bg-amber-50', border: 'border-amber-200' }
-    if (title.length > 60) return { text: t('catalog.products.create.seoWidget.tooLong', 'Too long'), color: 'text-amber-600', bg: 'bg-amber-50', border: 'border-amber-200' }
-    return { text: t('catalog.products.create.seoWidget.good', 'Good'), color: 'text-green-600', bg: 'bg-green-50', border: 'border-green-200' }
+  const titleScore = React.useMemo<SeoScore>(() => {
+    if (!title) return { text: t('catalog.products.create.seoWidget.missing', 'Missing'), variant: 'error' }
+    if (title.length < 10) return { text: t('catalog.products.create.seoWidget.tooShort', 'Too short'), variant: 'warning' }
+    if (title.length > 60) return { text: t('catalog.products.create.seoWidget.tooLong', 'Too long'), variant: 'warning' }
+    return { text: t('catalog.products.create.seoWidget.good', 'Good'), variant: 'success' }
   }, [title, t])
 
-  const descScore = React.useMemo(() => {
-    if (!description) return { text: t('catalog.products.create.seoWidget.missing', 'Missing'), color: 'text-red-600', bg: 'bg-red-50', border: 'border-red-200' }
-    if (description.length < 50) return { text: t('catalog.products.create.seoWidget.tooShort', 'Too short'), color: 'text-amber-600', bg: 'bg-amber-50', border: 'border-amber-200' }
-    return { text: t('catalog.products.create.seoWidget.good', 'Good'), color: 'text-green-600', bg: 'bg-green-50', border: 'border-green-200' }
+  const descScore = React.useMemo<SeoScore>(() => {
+    if (!description) return { text: t('catalog.products.create.seoWidget.missing', 'Missing'), variant: 'error' }
+    if (description.length < 50) return { text: t('catalog.products.create.seoWidget.tooShort', 'Too short'), variant: 'warning' }
+    return { text: t('catalog.products.create.seoWidget.good', 'Good'), variant: 'success' }
   }, [description, t])
 
   const statusBadge = validation.ok ? (
-    <span className="rounded-full bg-emerald-50 px-2 py-0.5 text-xs font-medium text-emerald-700 border border-emerald-200">
+    <StatusBadge variant="success">
       {t('catalog.products.create.seoWidget.ready', 'Ready')}
-    </span>
+    </StatusBadge>
   ) : (
-    <span className="rounded-full bg-amber-50 px-2 py-0.5 text-xs font-medium text-amber-700 border border-amber-200">
+    <StatusBadge variant="warning">
       {t('catalog.products.create.seoWidget.needsAttention', 'Needs attention')}
-    </span>
+    </StatusBadge>
   )
 
   const translateIssue = (issueKey: string): string => {
@@ -89,7 +93,13 @@ export default function ProductSeoWidget({ data }: InjectionWidgetComponentProps
       </div>
 
       {validation.message || validation.issues.length ? (
-        <div className={`rounded-md border p-3 text-xs ${validation.ok ? 'border-emerald-200 bg-emerald-50 text-emerald-800' : 'border-amber-200 bg-amber-50 text-amber-900'}`}>
+        <Alert
+          status={validation.ok ? 'success' : 'warning'}
+          style="lighter"
+          size="sm"
+          showIcon={false}
+          className="text-xs"
+        >
           {validation.message ? <div className="font-medium">{validation.message}</div> : null}
           {validation.issues.length ? (
             <ul className="ml-4 list-disc space-y-1 pt-1">
@@ -98,17 +108,17 @@ export default function ProductSeoWidget({ data }: InjectionWidgetComponentProps
               ))}
             </ul>
           ) : null}
-        </div>
+        </Alert>
       ) : null}
 
       <div className="rounded border bg-muted/30 p-3 text-sm">
         <div className="flex items-center justify-between">
           <span className="text-muted-foreground">{t('catalog.products.create.seoWidget.titleLabel', 'Title ({{count}} chars)', { count: title.length })}</span>
-          <span className={`font-medium ${titleScore.color}`}>{titleScore.text}</span>
+          <StatusBadge variant={titleScore.variant}>{titleScore.text}</StatusBadge>
         </div>
         <div className="mt-2 flex items-center justify-between">
           <span className="text-muted-foreground">{t('catalog.products.create.seoWidget.descriptionLabel', 'Description ({{count}} chars)', { count: description.length })}</span>
-          <span className={`font-medium ${descScore.color}`}>{descScore.text}</span>
+          <StatusBadge variant={descScore.variant}>{descScore.text}</StatusBadge>
         </div>
       </div>
 

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

@@ -386,103 +386,119 @@ export async function GET(request: Request, context: { params?: Record<string, u
     tenantId: deal.tenantId ?? auth.tenantId ?? null,
     organizationId: deal.organizationId ?? auth.orgId ?? null,
   }
-  let linkedPersonIds: string[] = []
-  let linkedCompanyIds: string[] = []
-  let people: DealAssociation[] = []
-  let companies: DealAssociation[] = []
-
-  if (liteView) {
-    const personLinkRows = await findWithDecryption(
-      em,
-      CustomerDealPersonLink,
-      { deal: deal.id },
-      { orderBy: { createdAt: 'ASC' } },
-      decryptionScope,
-    )
-    const companyLinkRows = await findWithDecryption(
-      em,
-      CustomerDealCompanyLink,
-      { deal: deal.id },
-      { orderBy: { createdAt: 'ASC' } },
-      decryptionScope,
-    )
-
-    linkedPersonIds = Array.from(
-      new Set(
-        personLinkRows
-          .map((link) => {
-            const personRef = link.person
-            if (!personRef) return null
-            if (typeof personRef === 'string') return personRef
-            const personIdValue = personRef.id
-            return typeof personIdValue === 'string' ? personIdValue : null
-          })
-          .filter((value): value is string => typeof value === 'string' && value.trim().length > 0),
-      ),
-    )
-    linkedCompanyIds = Array.from(
-      new Set(
-        companyLinkRows
-          .map((link) => {
-            const companyRef = link.company
-            if (!companyRef) return null
-            if (typeof companyRef === 'string') return companyRef
-            const companyIdValue = companyRef.id
-            return typeof companyIdValue === 'string' ? companyIdValue : null
-          })
-          .filter((value): value is string => typeof value === 'string' && value.trim().length > 0),
-      ),
-    )
-
-    const previewPeople = linkedPersonIds.length
-      ? await findWithDecryption(
+  // Issue #3175: the reads below only depend on the already-resolved deal +
+  // organization scope + decryption scope, so they are grouped into Promise.all
+  // batches instead of being awaited one after another. True dependencies stay
+  // ordered: preview/decrypt run after their link rows, pipeline reads after the
+  // effective stage is known, and the appearance map / audit fallback after the
+  // pipeline stages load. This mirrors the parallel-read pattern already used
+  // across the customers list/interactions/activities routes.
+  const resolveAssociations = async (): Promise<{
+    people: DealAssociation[]
+    companies: DealAssociation[]
+    linkedPersonIds: string[]
+    linkedCompanyIds: string[]
+  }> => {
+    if (liteView) {
+      const [personLinkRows, companyLinkRows] = await Promise.all([
+        findWithDecryption(
           em,
-          CustomerEntity,
-          { id: { $in: linkedPersonIds.slice(0, 3) } },
-          { populate: ['personProfile'] },
+          CustomerDealPersonLink,
+          { deal: deal.id },
+          { orderBy: { createdAt: 'ASC' } },
           decryptionScope,
-        )
-      : []
-    const previewCompanies = linkedCompanyIds.length
-      ? await findWithDecryption(
+        ),
+        findWithDecryption(
           em,
-          CustomerEntity,
-          { id: { $in: linkedCompanyIds.slice(0, 3) } },
-          { populate: ['companyProfile'] },
+          CustomerDealCompanyLink,
+          { deal: deal.id },
+          { orderBy: { createdAt: 'ASC' } },
           decryptionScope,
-        )
-      : []
-    const previewPeopleMap = new Map(previewPeople.map((entity) => [entity.id, entity]))
-    const previewCompaniesMap = new Map(previewCompanies.map((entity) => [entity.id, entity]))
-    people = linkedPersonIds.slice(0, 3).reduce<DealAssociation[]>((acc, personId) => {
-      const entity = previewPeopleMap.get(personId) ?? null
-      if (!entity || entity.deletedAt) return acc
-      const { label, subtitle } = normalizePersonAssociation(entity)
-      acc.push({ id: entity.id, label, subtitle, kind: 'person' })
-      return acc
-    }, [])
-    companies = linkedCompanyIds.slice(0, 3).reduce<DealAssociation[]>((acc, companyId) => {
-      const entity = previewCompaniesMap.get(companyId) ?? null
-      if (!entity || entity.deletedAt) return acc
-      const { label, subtitle } = normalizeCompanyAssociation(entity)
-      acc.push({ id: entity.id, label, subtitle, kind: 'company' })
-      return acc
-    }, [])
-  } else {
-    const personLinks = await findWithDecryption(
-      em,
-      CustomerDealPersonLink,
-      { deal: deal.id },
-      { populate: ['person', 'person.personProfile'] },
-      decryptionScope,
-    )
-    const companyLinks = await findWithDecryption(
-      em,
-      CustomerDealCompanyLink,
-      { deal: deal.id },
-      { populate: ['company', 'company.companyProfile'] },
-      decryptionScope,
-    )
+        ),
+      ])
+
+      const linkedPersonIds = Array.from(
+        new Set(
+          personLinkRows
+            .map((link) => {
+              const personRef = link.person
+              if (!personRef) return null
+              if (typeof personRef === 'string') return personRef
+              const personIdValue = personRef.id
+              return typeof personIdValue === 'string' ? personIdValue : null
+            })
+            .filter((value): value is string => typeof value === 'string' && value.trim().length > 0),
+        ),
+      )
+      const linkedCompanyIds = Array.from(
+        new Set(
+          companyLinkRows
+            .map((link) => {
+              const companyRef = link.company
+              if (!companyRef) return null
+              if (typeof companyRef === 'string') return companyRef
+              const companyIdValue = companyRef.id
+              return typeof companyIdValue === 'string' ? companyIdValue : null
+            })
+            .filter((value): value is string => typeof value === 'string' && value.trim().length > 0),
+        ),
+      )
+
+      const [previewPeople, previewCompanies] = await Promise.all([
+        linkedPersonIds.length
+          ? findWithDecryption(
+              em,
+              CustomerEntity,
+              { id: { $in: linkedPersonIds.slice(0, 3) } },
+              { populate: ['personProfile'] },
+              decryptionScope,
+            )
+          : [],
+        linkedCompanyIds.length
+          ? findWithDecryption(
+              em,
+              CustomerEntity,
+              { id: { $in: linkedCompanyIds.slice(0, 3) } },
+              { populate: ['companyProfile'] },
+              decryptionScope,
+            )
+          : [],
+      ])
+      const previewPeopleMap = new Map(previewPeople.map((entity) => [entity.id, entity]))
+      const previewCompaniesMap = new Map(previewCompanies.map((entity) => [entity.id, entity]))
+      const people = linkedPersonIds.slice(0, 3).reduce<DealAssociation[]>((acc, personId) => {
+        const entity = previewPeopleMap.get(personId) ?? null
+        if (!entity || entity.deletedAt) return acc
+        const { label, subtitle } = normalizePersonAssociation(entity)
+        acc.push({ id: entity.id, label, subtitle, kind: 'person' })
+        return acc
+      }, [])
+      const companies = linkedCompanyIds.slice(0, 3).reduce<DealAssociation[]>((acc, companyId) => {
+        const entity = previewCompaniesMap.get(companyId) ?? null
+        if (!entity || entity.deletedAt) return acc
+        const { label, subtitle } = normalizeCompanyAssociation(entity)
+        acc.push({ id: entity.id, label, subtitle, kind: 'company' })
+        return acc
+      }, [])
+      return { people, companies, linkedPersonIds, linkedCompanyIds }
+    }
+
+    const [personLinks, companyLinks] = await Promise.all([
+      findWithDecryption(
+        em,
+        CustomerDealPersonLink,
+        { deal: deal.id },
+        { populate: ['person', 'person.personProfile'] },
+        decryptionScope,
+      ),
+      findWithDecryption(
+        em,
+        CustomerDealCompanyLink,
+        { deal: deal.id },
+        { populate: ['company', 'company.companyProfile'] },
+        decryptionScope,
+      ),
+    ])
     const fallbackTenantId = deal.tenantId ?? auth.tenantId ?? null
     const fallbackOrgId = deal.organizationId ?? auth.orgId ?? null
     await decryptEntitiesWithFallbackScope(personLinks, {
@@ -496,7 +512,7 @@ export async function GET(request: Request, context: { params?: Record<string, u
       organizationId: fallbackOrgId,
     })
 
-    people = personLinks.reduce<DealAssociation[]>((acc, link) => {
+    const people = personLinks.reduce<DealAssociation[]>((acc, link) => {
       const entity = link.person as CustomerEntity | null
       if (!entity || entity.deletedAt) return acc
       const { label, subtitle } = normalizePersonAssociation(entity)
@@ -504,55 +520,89 @@ export async function GET(request: Request, context: { params?: Record<string, u
       return acc
     }, [])
 
-    companies = companyLinks.reduce<DealAssociation[]>((acc, link) => {
+    const companies = companyLinks.reduce<DealAssociation[]>((acc, link) => {
       const entity = link.company as CustomerEntity | null
       if (!entity || entity.deletedAt) return acc
       const { label, subtitle } = normalizeCompanyAssociation(entity)
       acc.push({ id: entity.id, label, subtitle, kind: 'company' })
       return acc
     }, [])
-    linkedPersonIds = people.map((entry) => entry.id)
-    linkedCompanyIds = companies.map((entry) => entry.id)
+    return {
+      people,
+      companies,
+      linkedPersonIds: people.map((entry) => entry.id),
+      linkedCompanyIds: companies.map((entry) => entry.id),
+    }
   }
 
-  const customFieldValues = await loadCustomFieldValues({
-    em,
-    entityId: E.customers.customer_deal,
-    recordIds: [deal.id],
-    tenantIdByRecord: { [deal.id]: deal.tenantId ?? null },
-    organizationIdByRecord: { [deal.id]: deal.organizationId ?? null },
-    tenantFallbacks: [deal.tenantId ?? auth.tenantId ?? null].filter((value): value is string => !!value),
-  })
-  const customFields = normalizeCustomFieldResponse(customFieldValues[deal.id]) ?? {}
-
   const viewerUserId = auth.isApiKey ? null : auth.sub ?? null
-  let viewerName: string | null = null
-  let viewerEmail: string | null = auth.email ?? null
-  if (viewerUserId) {
-    const viewerScope = {
-      tenantId: auth.tenantId ?? null,
-      organizationId: auth.orgId ?? null,
+  const resolveViewer = async (): Promise<{ name: string | null; email: string | null }> => {
+    if (!viewerUserId) {
+      return { name: null, email: auth.email ?? null }
     }
     const viewer = await findOneWithDecryption(
       em,
       User,
       { id: viewerUserId, tenantId: auth.tenantId ?? null },
       {},
-      viewerScope,
+      { tenantId: auth.tenantId ?? null, organizationId: auth.orgId ?? null },
     )
-    viewerName = viewer?.name ?? null
-    viewerEmail = viewer?.email ?? viewerEmail ?? null
+    return {
+      name: viewer?.name ?? null,
+      email: viewer?.email ?? auth.email ?? null,
+    }
   }
 
-  const owner = deal.ownerUserId
-    ? await findOneWithDecryption(
+  const resolveOwner = async () =>
+    deal.ownerUserId
+      ? await findOneWithDecryption(
+        em,
+        User,
+        { id: deal.ownerUserId, tenantId: deal.tenantId ?? auth.tenantId ?? null },
+        {},
+        decryptionScope,
+      )
+      : null
+
+  const resolveStageTransitions = async (): Promise<CustomerDealStageTransition[]> => {
+    if (!includeStages) return []
+    try {
+      return await findWithDecryption(
+        em,
+        CustomerDealStageTransition,
+        { deal: deal.id, deletedAt: null },
+        { orderBy: { stageOrder: 'ASC', transitionedAt: 'ASC' } },
+        decryptionScope,
+      )
+    } catch (error) {
+      if (!isMissingDealStageTransitionTable(error)) {
+        throw error
+      }
+      warnMissingDealStageTransitionTable('customers.api.deals.detail.GET')
+      return []
+    }
+  }
+
+  const [associations, customFieldValues, viewerInfo, owner, effectiveStage, stageTransitions] = await Promise.all([
+    resolveAssociations(),
+    loadCustomFieldValues({
       em,
-      User,
-      { id: deal.ownerUserId, tenantId: deal.tenantId ?? auth.tenantId ?? null },
-      {},
-      decryptionScope,
-    )
-    : null
+      entityId: E.customers.customer_deal,
+      recordIds: [deal.id],
+      tenantIdByRecord: { [deal.id]: deal.tenantId ?? null },
+      organizationIdByRecord: { [deal.id]: deal.organizationId ?? null },
+      tenantFallbacks: [deal.tenantId ?? auth.tenantId ?? null].filter((value): value is string => !!value),
+    }),
+    resolveViewer(),
+    resolveOwner(),
+    includeStages ? resolveEffectivePipelineStage(em, deal, decryptionScope) : Promise.resolve(null),
+    resolveStageTransitions(),
+  ])
+
+  const { people, companies, linkedPersonIds, linkedCompanyIds } = associations
+  const customFields = normalizeCustomFieldResponse(customFieldValues[deal.id]) ?? {}
+  const viewerName = viewerInfo.name
+  const viewerEmail = viewerInfo.email
   const ownerPayload = owner
     ? {
       id: owner.id,
@@ -561,69 +611,53 @@ export async function GET(request: Request, context: { params?: Record<string, u
     }
     : null
 
-  const effectiveStage = includeStages
-    ? await resolveEffectivePipelineStage(em, deal, decryptionScope)
-    : null
   const effectivePipelineId = deal.pipelineId ?? effectiveStage?.pipelineId ?? null
   const effectivePipelineStageId = deal.pipelineStageId ?? effectiveStage?.id ?? null
   const effectivePipelineStageLabel = deal.pipelineStage ?? effectiveStage?.label ?? null
 
-  const pipelineStages = includeStages && effectivePipelineId
-    ? await findWithDecryption(
-      em,
-      CustomerPipelineStage,
-      {
-        pipelineId: effectivePipelineId,
-        organizationId: deal.organizationId,
-        tenantId: deal.tenantId,
-      },
-      { orderBy: { order: 'ASC' } },
-      decryptionScope,
-    )
-    : []
-  const pipeline = effectivePipelineId
-    ? await findOneWithDecryption(
-      em,
-      CustomerPipeline,
-      {
-        id: effectivePipelineId,
-        organizationId: deal.organizationId,
-        tenantId: deal.tenantId,
-      },
-      {},
-      decryptionScope,
-    )
-    : null
-  const pipelineStageAppearanceMap = pipelineStages.length
-    ? await loadPipelineStageAppearanceMap(em, pipelineStages, deal.organizationId, deal.tenantId)
-    : new Map<string, CustomerDictionaryEntry>()
-  let stageTransitions: CustomerDealStageTransition[] = []
-  if (includeStages) {
-    try {
-      stageTransitions = await findWithDecryption(
+  const [pipelineStages, pipeline] = await Promise.all([
+    includeStages && effectivePipelineId
+      ? findWithDecryption(
         em,
-        CustomerDealStageTransition,
-        { deal: deal.id, deletedAt: null },
-        { orderBy: { stageOrder: 'ASC', transitionedAt: 'ASC' } },
+        CustomerPipelineStage,
+        {
+          pipelineId: effectivePipelineId,
+          organizationId: deal.organizationId,
+          tenantId: deal.tenantId,
+        },
+        { orderBy: { order: 'ASC' } },
         decryptionScope,
       )
-    } catch (error) {
-      if (!isMissingDealStageTransitionTable(error)) {
-        throw error
-      }
-      warnMissingDealStageTransitionTable('customers.api.deals.detail.GET')
-      stageTransitions = []
-    }
-  }
+      : [],
+    effectivePipelineId
+      ? findOneWithDecryption(
+        em,
+        CustomerPipeline,
+        {
+          id: effectivePipelineId,
+          organizationId: deal.organizationId,
+          tenantId: deal.tenantId,
+        },
+        {},
+        decryptionScope,
+      )
+      : null,
+  ])
+
   const persistedStageTransitions = stageTransitions.map((transition) => ({
     stageId: transition.stageId,
     stageLabel: transition.stageLabel,
     stageOrder: transition.stageOrder,
     transitionedAt: transition.transitionedAt.toISOString(),
   }))
-  const recoveredStageTransitions = includeStages && persistedStageTransitions.length === 0
-    ? await loadAuditStageTransitionsFallback({ container, deal, pipelineStages })
-    : []
+  const [pipelineStageAppearanceMap, recoveredStageTransitions] = await Promise.all([
+    pipelineStages.length
+      ? loadPipelineStageAppearanceMap(em, pipelineStages, deal.organizationId, deal.tenantId)
+      : new Map<string, CustomerDictionaryEntry>(),
+    includeStages && persistedStageTransitions.length === 0
+      ? loadAuditStageTransitionsFallback({ container, deal, pipelineStages })
+      : [],
+  ])
   const effectiveCurrentStage = (() => {
     if (!effectivePipelineStageId) return null
     const matchingStage = pipelineStages.find((stage) => stage.id === effectivePipelineStageId)