@open-mercato/core 0.6.1-develop.3219.1.ae5c8a5935 → 0.6.1-develop.3246.1.dbef9d7392

package/src/modules/auth/cli.ts

@@ -5,7 +5,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import { User, Role, UserRole } from '@open-mercato/core/modules/auth/data/entities'
 import { Tenant, Organization } from '@open-mercato/core/modules/directory/data/entities'
 import { rebuildHierarchyForTenant } from '@open-mercato/core/modules/directory/lib/hierarchy'
-import { ensureRoles, setupInitialTenant, ensureDefaultRoleAcls, ensureCustomRoleAcls } from './lib/setup-app'
+import { ensureRoles, setupInitialTenant, ensureDefaultRoleAcls, ensureCustomRoleAcls, OrgSlugExistsError } from './lib/setup-app'
 import { normalizeTenantId } from './lib/tenantAccess'
 import { computeEmailHash } from './lib/emailHash'
 import { findWithDecryption, findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
@@ -403,6 +403,8 @@ const addOrganization: ModuleCli = {
   },
 }
 
+const SETUP_USAGE = 'Usage: mercato auth setup --orgName <name> --email <email> --password <password> [--orgSlug <slug>] [--roles superadmin,admin,employee] [--skip-password-policy] [--with-examples] [--json]'
+
 const setupApp: ModuleCli = {
   command: 'setup',
   async run(rest) {
@@ -414,6 +416,17 @@ const setupApp: ModuleCli = {
         : undefined
     const email = typeof args.email === 'string' ? args.email : undefined
     const password = typeof args.password === 'string' ? args.password : undefined
+    const orgSlugRaw = typeof args.orgSlug === 'string'
+      ? args.orgSlug
+      : typeof args.slug === 'string'
+        ? args.slug
+        : undefined
+    const orgSlug = orgSlugRaw && orgSlugRaw.trim().length ? orgSlugRaw.trim() : undefined
+    if (orgSlug !== undefined && !ORG_SLUG_PATTERN.test(orgSlug)) {
+      process.stderr.write(`Invalid --orgSlug: must match ${ORG_SLUG_PATTERN.source} (lowercase, digits, dashes; 1-63 chars; cannot start or end with a dash)\n`)
+      process.exitCode = 2
+      return
+    }
     const rolesCsv = typeof args.roles === 'string'
       ? args.roles.trim()
       : 'superadmin,admin,employee'
@@ -425,29 +438,98 @@ const setupApp: ModuleCli = {
     const skipPasswordPolicy = typeof skipPasswordPolicyRaw === 'boolean'
       ? skipPasswordPolicyRaw
       : parseBooleanToken(typeof skipPasswordPolicyRaw === 'string' ? skipPasswordPolicyRaw : null) ?? false
+    const withExamplesRaw = args['with-examples'] ?? args.withExamples
+    const withExamples = typeof withExamplesRaw === 'boolean'
+      ? withExamplesRaw
+      : parseBooleanToken(typeof withExamplesRaw === 'string' ? withExamplesRaw : null) ?? false
+    const jsonModeRaw = args.json
+    const jsonMode = typeof jsonModeRaw === 'boolean'
+      ? jsonModeRaw
+      : parseBooleanToken(typeof jsonModeRaw === 'string' ? jsonModeRaw : null) ?? false
     if (!orgName || !email || !password) {
-      console.error('Usage: mercato auth setup --orgName <name> --email <email> --password <password> [--roles superadmin,admin,employee] [--skip-password-policy]')
+      process.stderr.write(`${SETUP_USAGE}\n`)
+      process.exitCode = 2
+      return
+    }
+    if (!skipPasswordPolicy && !ensurePasswordPolicy(password)) {
+      process.exitCode = 2
       return
     }
-    if (!skipPasswordPolicy && !ensurePasswordPolicy(password)) return
-    if (skipPasswordPolicy) {
+    if (skipPasswordPolicy && !jsonMode) {
       console.warn('⚠️  Password policy validation skipped for setup.')
     }
-    const { resolve } = await createRequestContainer()
-    const em = resolve<EntityManager>('em')
+    let restoreConsole: (() => void) | null = null
+    if (jsonMode) {
+      // Force quiet mode so module bootstrap / lifecycle hooks cannot pollute
+      // stdout. The JSON contract relies on a single line, so any console.log
+      // from setupInitialTenant or seedExamples would otherwise break the
+      // consumer's `jq` pipe. We additionally rebind console.log/info to a
+      // no-op for the duration of the call because OM_CLI_QUIET is honored
+      // unevenly across module setup hooks. Rebind AFTER early-return
+      // validation so the missing-args and password-policy paths can't
+      // leak the rebinding into a long-lived process (e.g. test runner).
+      process.env.OM_CLI_QUIET = process.env.OM_CLI_QUIET ?? '1'
+      const originalLog = console.log
+      const originalInfo = console.info
+      console.log = () => undefined
+      console.info = () => undefined
+      restoreConsole = () => {
+        console.log = originalLog
+        console.info = originalInfo
+      }
+    }
+    const container = await createRequestContainer()
+    const em = container.resolve<EntityManager>('em')
     const roleNames = rolesCsv
       ? rolesCsv.split(',').map((s) => s.trim()).filter(Boolean)
       : undefined
 
     try {
+      const modules = getCliModules()
       const result = await setupInitialTenant(em, {
         orgName,
+        orgSlug,
         roleNames,
         primaryUser: { email, password, confirm: true },
         includeDerivedUsers: true,
-        modules: getCliModules(),
+        // When the caller passes an explicit slug, treat it as a "fresh tenant"
+        // signal — silent reuse of an existing user's tenant defeats the point
+        // of slugging the new tenant for downstream tooling.
+        failIfUserExists: orgSlug !== undefined,
+        modules,
       })
 
+      if (withExamples) {
+        const seedCtx = {
+          em,
+          tenantId: result.tenantId,
+          organizationId: result.organizationId,
+          container,
+        }
+        for (const mod of modules) {
+          if (mod.setup?.seedExamples) {
+            await mod.setup.seedExamples(seedCtx as any)
+          }
+        }
+      }
+
+      if (jsonMode) {
+        const adminSnapshot = pickAdminSnapshot(result.users, email)
+        const adminUserId = adminSnapshot && adminSnapshot.user.id != null
+          ? String(adminSnapshot.user.id)
+          : null
+        const payload = {
+          tenantId: result.tenantId,
+          organizationId: result.organizationId,
+          adminUserId,
+          adminEmail: email,
+          reusedExistingUser: result.reusedExistingUser,
+        }
+        if (restoreConsole) restoreConsole()
+        process.stdout.write(`${JSON.stringify(payload)}\n`)
+        return
+      }
+
       if (result.reusedExistingUser) {
         console.log('⚠️  Existing initial user detected during setup.')
         console.log(`⚠️  Email: ${email}`)
@@ -470,15 +552,42 @@ const setupApp: ModuleCli = {
 
       if (env.NODE_ENV !== 'test') console.log('✅ Setup complete:', { tenantId: result.tenantId, organizationId: result.organizationId })
     } catch (err) {
+      if (restoreConsole) restoreConsole()
+      if (err instanceof OrgSlugExistsError) {
+        process.stderr.write(`${err.message}\n`)
+        process.exitCode = 1
+        return
+      }
       if (err instanceof Error && err.message === 'USER_EXISTS') {
-        console.error('Setup aborted: user already exists with the provided email.')
+        process.stderr.write('Setup aborted: user already exists with the provided email.\n')
+        process.exitCode = 1
         return
       }
       throw err
+    } finally {
+      if (restoreConsole) restoreConsole()
     }
   },
 }
 
+const ORG_SLUG_PATTERN = /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/
+
+function pickAdminSnapshot(
+  users: Array<{ user: { id: string; email: string }; roles: string[]; created: boolean }>,
+  adminEmail: string,
+): { user: { id: string; email: string } } | undefined {
+  const normalizedEmail = adminEmail.toLowerCase()
+  const exact = users.find(
+    (snapshot) =>
+      snapshot.created &&
+      snapshot.roles.includes('superadmin') &&
+      typeof snapshot.user.email === 'string' &&
+      snapshot.user.email.toLowerCase() === normalizedEmail,
+  )
+  if (exact) return exact
+  return users.find((snapshot) => snapshot.roles.includes('superadmin'))
+}
+
 const listOrganizations: ModuleCli = {
   command: 'list-orgs',
   async run() {

package/src/modules/auth/lib/setup-app.ts

@@ -90,6 +90,20 @@ export type SetupInitialTenantOptions = {
   includeSuperadminRole?: boolean
   /** Optional list of enabled modules. When provided, module setup hooks are called. */
   modules?: Module[]
+  /**
+   * Optional global slug to persist on the new Organization. When set, a
+   * pre-flight uniqueness check across all tenants throws OrgSlugExistsError
+   * on collision so scriptable callers can fail loudly instead of silently
+   * reusing or clobbering an existing organization.
+   */
+  orgSlug?: string
+}
+
+export class OrgSlugExistsError extends Error {
+  constructor(public readonly slug: string) {
+    super(`ORG_SLUG_EXISTS: an organization with slug "${slug}" already exists`)
+    this.name = 'OrgSlugExistsError'
+  }
 }
 
 export type SetupInitialTenantResult = {
@@ -131,6 +145,19 @@ export async function setupInitialTenant(
     throw new Error('USER_EXISTS')
   }
 
+  if (options.orgSlug) {
+    const slugConflict = await findOneWithDecryption(
+      em,
+      Organization,
+      { slug: options.orgSlug },
+      {},
+      { tenantId: null, organizationId: null },
+    )
+    if (slugConflict) {
+      throw new OrgSlugExistsError(options.orgSlug)
+    }
+  }
+
   let tenantId: string | undefined
   let organizationId: string | undefined
   let reusedExistingUser = false
@@ -206,6 +233,7 @@ export async function setupInitialTenant(
 
       const organization = tem.create(Organization, {
         name: options.orgName,
+        slug: options.orgSlug ?? null,
         tenant,
         isActive: true,
         depth: 0,

package/src/modules/customers/api/companies/route.ts

@@ -528,5 +528,15 @@ export const openApi = createCustomersCrudOpenApi({
     schema: z.object({ id: z.string().uuid() }),
     responseSchema: defaultOkResponseSchema,
     description: 'Deletes a company by id. The identifier can be provided via body or query.',
+    errors: [
+      {
+        status: 422,
+        description: 'Company has dependent records (people, deals, or direct staff); unlink or reassign before delete.',
+        schema: z.object({
+          error: z.string(),
+          code: z.literal('COMPANY_HAS_DEPENDENTS'),
+        }),
+      },
+    ],
   },
 })

package/src/modules/customers/api/people/route.ts

@@ -559,5 +559,15 @@ export const openApi = createCustomersCrudOpenApi({
     schema: z.object({ id: z.string().uuid() }),
     responseSchema: defaultOkResponseSchema,
     description: 'Deletes a person by id. Request body or query may provide the identifier.',
+    errors: [
+      {
+        status: 422,
+        description: 'Person has dependent records (e.g. linked deals); unlink or reassign before delete.',
+        schema: z.object({
+          error: z.string(),
+          code: z.literal('PERSON_HAS_DEPENDENTS'),
+        }),
+      },
+    ],
   },
 })

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

@@ -10,6 +10,9 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { apiCall, apiCallOrThrow, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { buildCrudExportUrl } from '@open-mercato/ui/backend/utils/crud'
+import { groupBulkDeleteFailures, runBulkDelete } from '@open-mercato/ui/backend/utils/bulkDelete'
+import { coalesceLastOperations } from '@open-mercato/ui/backend/operations/store'
+import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { E } from '#generated/entities.ids.generated'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
@@ -161,6 +164,26 @@ export default function CustomersCompaniesPage() {
     setPageSize(newSize)
     setPage(1)
   }, [])
+
+  const bulkMutationContextId = 'customers-companies-list:bulk-delete'
+  const { runMutation: runBulkMutation, retryLastMutation: retryBulkMutation } = useGuardedMutation<{
+    formId: string
+    resourceKind: string
+    retryLastMutation: () => Promise<boolean>
+  }>({
+    contextId: bulkMutationContextId,
+    blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),
+  })
+  const singleMutationContextId = 'customers-companies-list:single-delete'
+  const { runMutation: runSingleMutation, retryLastMutation: retrySingleMutation } = useGuardedMutation<{
+    formId: string
+    resourceKind: string
+    resourceId: string
+    retryLastMutation: () => Promise<boolean>
+  }>({
+    contextId: singleMutationContextId,
+    blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),
+  })
   const fetchDictionaryEntries = React.useCallback(async (kind: DictionaryKindKey) => {
     try {
       const data = await ensureCustomerDictionary(queryClient, kind, scopeVersion)
@@ -460,14 +483,24 @@ export default function CustomersCompaniesPage() {
     })
     if (!confirmed) return
     try {
-      await apiCallOrThrow(
-        `/api/customers/companies?id=${encodeURIComponent(company.id)}`,
-        {
-          method: 'DELETE',
-          headers: { 'content-type': 'application/json' },
+      await runSingleMutation({
+        operation: async () => {
+          await apiCallOrThrow(
+            `/api/customers/companies?id=${encodeURIComponent(company.id)}`,
+            {
+              method: 'DELETE',
+              headers: { 'content-type': 'application/json' },
+            },
+            { errorMessage: t('customers.companies.list.deleteError') },
+          )
         },
-        { errorMessage: t('customers.companies.list.deleteError') },
-      )
+        context: {
+          formId: singleMutationContextId,
+          resourceKind: 'customers.company',
+          resourceId: company.id,
+          retryLastMutation: retrySingleMutation,
+        },
+      })
       setRows((prev) => prev.filter((row) => row.id !== company.id))
       setTotal((prev) => Math.max(prev - 1, 0))
       handleRefresh()
@@ -476,7 +509,7 @@ export default function CustomersCompaniesPage() {
       const message = err instanceof Error ? err.message : t('customers.companies.list.deleteError')
       flash(message, 'error')
     }
-  }, [confirm, handleRefresh, t])
+  }, [confirm, handleRefresh, retrySingleMutation, runSingleMutation, singleMutationContextId, t])
 
   const handleBulkDelete = React.useCallback(async (selectedRows: CompanyRow[]) => {
     const confirmed = await confirm({
@@ -485,44 +518,71 @@ export default function CustomersCompaniesPage() {
       variant: 'destructive',
     })
     if (!confirmed) return false
-    let deletedCount = 0
-    const failedIds: string[] = []
-    for (const row of selectedRows) {
-      try {
-        await apiCallOrThrow(`/api/customers/companies?id=${encodeURIComponent(row.id)}`, {
-          method: 'DELETE',
-          headers: { 'content-type': 'application/json' },
+
+    const { succeeded, failures } = await runBulkMutation({
+      operation: async () =>
+        runBulkDelete(
+          selectedRows,
+          async (row) => {
+            await apiCallOrThrow(`/api/customers/companies?id=${encodeURIComponent(row.id)}`, {
+              method: 'DELETE',
+              headers: { 'content-type': 'application/json' },
+            })
+          },
+          {
+            fallbackErrorMessage: t('customers.companies.list.deleteError', 'Failed to delete company.'),
+            logTag: 'customers.companies.list',
+          },
+        ),
+      context: {
+        formId: bulkMutationContextId,
+        resourceKind: 'customers.company',
+        retryLastMutation: retryBulkMutation,
+      },
+    })
+
+    if (succeeded.length > 0) {
+      const succeededIds = new Set(succeeded.map((r) => r.id))
+      setRows((prev) => prev.filter((r) => !succeededIds.has(r.id)))
+      setTotal((prev) => Math.max(0, prev - succeeded.length))
+      setReloadToken((prev) => prev + 1)
+      if (succeeded.length > 1) {
+        coalesceLastOperations(succeeded.length, {
+          commandId: 'customers.companies.delete',
+          actionLabel: t('customers.companies.list.bulkDelete.operationLabel', 'Delete {count} companies', { count: succeeded.length }),
+          resourceKind: 'customers.company',
         })
-        deletedCount++
-      } catch (err) {
-        failedIds.push(row.id)
-        console.warn('[customers.companies.list] bulk delete failed', row.id, err)
       }
-    }
-    if (deletedCount > 0) {
-      setRows((prev) => {
-        const succeeded = new Set(selectedRows.map((r) => r.id).filter((id) => !failedIds.includes(id)))
-        return prev.filter((r) => !succeeded.has(r.id))
-      })
-      setTotal((prev) => Math.max(0, prev - deletedCount))
-      if (failedIds.length === 0) {
-        flash(t('customers.companies.list.bulkDelete.success', '{count} companies deleted', { count: deletedCount }), 'success')
+      if (failures.length === 0) {
+        flash(
+          t('customers.companies.list.bulkDelete.success', '{count} companies deleted', { count: succeeded.length }),
+          'success',
+        )
       } else {
         flash(
           t('customers.companies.list.bulkDelete.partial', '{deleted} of {total} companies deleted; {failed} failed', {
-            deleted: deletedCount,
+            deleted: succeeded.length,
             total: selectedRows.length,
-            failed: failedIds.length,
+            failed: failures.length,
           }),
           'warning',
         )
       }
-      setReloadToken((prev) => prev + 1)
-    } else if (failedIds.length > 0) {
-      flash(t('customers.companies.list.bulkDelete.failed', 'Failed to delete {count} companies', { count: failedIds.length }), 'error')
     }
-    return deletedCount > 0
-  }, [confirm, t])
+
+    for (const group of groupBulkDeleteFailures(failures)) {
+      const message = group.count === 1
+        ? group.sampleMessage
+        : t(
+            'customers.companies.list.bulkDelete.failedGroup',
+            '{count} companies could not be deleted: {message}',
+            { count: group.count, message: group.sampleMessage },
+          )
+      flash(message, 'error')
+    }
+
+    return succeeded.length > 0
+  }, [bulkMutationContextId, confirm, retryBulkMutation, runBulkMutation, t])
 
   const handleFiltersApply = React.useCallback((values: FilterValues) => {
     const next: FilterValues = {}

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

@@ -12,6 +12,9 @@ import type { AdvancedFilterState } from '@open-mercato/shared/lib/query/advance
 import { deserializeAdvancedFilter, serializeAdvancedFilter } from '@open-mercato/shared/lib/query/advanced-filter'
 import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
 import { buildCrudExportUrl, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
+import { groupBulkDeleteFailures, runBulkDelete } from '@open-mercato/ui/backend/utils/bulkDelete'
+import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
+import { coalesceLastOperations } from '@open-mercato/ui/backend/operations/store'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { Button } from '@open-mercato/ui/primitives/button'
@@ -719,6 +722,26 @@ export default function CustomersDealsPage() {
     setReloadToken((token) => token + 1)
   }, [queryClient])
 
+  const bulkMutationContextId = 'customers-deals-list:bulk-delete'
+  const { runMutation: runBulkMutation, retryLastMutation: retryBulkMutation } = useGuardedMutation<{
+    formId: string
+    resourceKind: string
+    retryLastMutation: () => Promise<boolean>
+  }>({
+    contextId: bulkMutationContextId,
+    blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),
+  })
+  const singleMutationContextId = 'customers-deals-list:single-delete'
+  const { runMutation: runSingleMutation, retryLastMutation: retrySingleMutation } = useGuardedMutation<{
+    formId: string
+    resourceKind: string
+    resourceId: string
+    retryLastMutation: () => Promise<boolean>
+  }>({
+    contextId: singleMutationContextId,
+    blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),
+  })
+
   const handleDeleteDeal = React.useCallback(
     async (dealId: string) => {
       if (pendingDeleteId) return
@@ -732,9 +755,19 @@ export default function CustomersDealsPage() {
       if (!confirmed) return
       setPendingDeleteId(dealId)
       try {
-        await deleteCrud('customers/deals', {
-          body: { id: dealId },
-          errorMessage: t('customers.deals.list.deleteError', 'Failed to delete deal.'),
+        await runSingleMutation({
+          operation: async () => {
+            await deleteCrud('customers/deals', {
+              body: { id: dealId },
+              errorMessage: t('customers.deals.list.deleteError', 'Failed to delete deal.'),
+            })
+          },
+          context: {
+            formId: singleMutationContextId,
+            resourceKind: 'customers.deal',
+            resourceId: dealId,
+            retryLastMutation: retrySingleMutation,
+          },
         })
         flash(t('customers.deals.list.deleteSuccess', 'Deal deleted.'), 'success')
         setRows((prev) => prev.filter((row) => row.id !== dealId))
@@ -750,7 +783,7 @@ export default function CustomersDealsPage() {
         setPendingDeleteId(null)
       }
     },
-    [confirm, handleRefresh, pendingDeleteId, t],
+    [confirm, handleRefresh, pendingDeleteId, retrySingleMutation, runSingleMutation, singleMutationContextId, t],
   )
 
   const handlePageSizeChange = React.useCallback((newSize: number) => {
@@ -765,43 +798,71 @@ export default function CustomersDealsPage() {
       variant: 'destructive',
     })
     if (!confirmed) return false
-    let deletedCount = 0
-    const failedIds: string[] = []
-    for (const row of selectedRows) {
-      try {
-        await deleteCrud('customers/deals', {
-          body: { id: row.id },
-          errorMessage: t('customers.deals.list.deleteError', 'Failed to delete deal.'),
+
+    const { succeeded, failures } = await runBulkMutation({
+      operation: async () =>
+        runBulkDelete(
+          selectedRows,
+          async (row) => {
+            await deleteCrud('customers/deals', {
+              body: { id: row.id },
+              errorMessage: t('customers.deals.list.deleteError', 'Failed to delete deal.'),
+            })
+          },
+          {
+            fallbackErrorMessage: t('customers.deals.list.deleteError', 'Failed to delete deal.'),
+            logTag: 'customers.deals.list',
+          },
+        ),
+      context: {
+        formId: bulkMutationContextId,
+        resourceKind: 'customers.deal',
+        retryLastMutation: retryBulkMutation,
+      },
+    })
+
+    if (succeeded.length > 0) {
+      const succeededIds = new Set(succeeded.map((r) => r.id))
+      setRows((prev) => prev.filter((r) => !succeededIds.has(r.id)))
+      setTotal((prev) => Math.max(0, prev - succeeded.length))
+      setReloadToken((prev) => prev + 1)
+      if (succeeded.length > 1) {
+        coalesceLastOperations(succeeded.length, {
+          commandId: 'customers.deals.delete',
+          actionLabel: t('customers.deals.list.bulkDelete.operationLabel', 'Delete {count} deals', { count: succeeded.length }),
+          resourceKind: 'customers.deal',
         })
-        deletedCount++
-      } catch (err) {
-        failedIds.push(row.id)
-        console.warn('[customers.deals.list] bulk delete failed', row.id, err)
       }
-    }
-    if (deletedCount > 0) {
-      setRows((prev) => {
-        const succeeded = new Set(selectedRows.map((r) => r.id).filter((id) => !failedIds.includes(id)))
-        return prev.filter((r) => !succeeded.has(r.id))
-      })
-      setTotal((prev) => Math.max(0, prev - deletedCount))
-      if (failedIds.length === 0) {
-        flash(t('customers.deals.list.bulkDelete.success', '{count} deals deleted', { count: deletedCount }), 'success')
+      if (failures.length === 0) {
+        flash(
+          t('customers.deals.list.bulkDelete.success', '{count} deals deleted', { count: succeeded.length }),
+          'success',
+        )
       } else {
         flash(
           t('customers.deals.list.bulkDelete.partial', '{deleted} of {total} deals deleted; {failed} failed', {
-            deleted: deletedCount,
+            deleted: succeeded.length,
             total: selectedRows.length,
-            failed: failedIds.length,
+            failed: failures.length,
           }),
           'warning',
         )
       }
-    } else if (failedIds.length > 0) {
-      flash(t('customers.deals.list.bulkDelete.failed', 'Failed to delete {count} deals', { count: failedIds.length }), 'error')
     }
-    return deletedCount > 0
-  }, [confirm, t])
+
+    for (const group of groupBulkDeleteFailures(failures)) {
+      const message = group.count === 1
+        ? group.sampleMessage
+        : t(
+            'customers.deals.list.bulkDelete.failedGroup',
+            '{count} deals could not be deleted: {message}',
+            { count: group.count, message: group.sampleMessage },
+          )
+      flash(message, 'error')
+    }
+
+    return succeeded.length > 0
+  }, [bulkMutationContextId, confirm, retryBulkMutation, runBulkMutation, t])
 
   const personOptions = peopleState.options
   const companyOptions = companiesState.options