@open-mercato/core 0.6.8-develop.7100.1.fbf66fca35 → 0.7.0

package/src/modules/customers/api/interactions/tasks/route.ts

@@ -3,7 +3,6 @@ import { z } from 'zod'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
-import { isUnrestrictedOrganizationScope } from '@open-mercato/shared/lib/auth/organizationAccess'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import type { QueryEngine } from '@open-mercato/shared/lib/query/types'
 import { createCustomersCrudOpenApi, createPagedListResponseSchema } from '../../openapi'
@@ -41,30 +40,11 @@ const MERGED_TASK_FETCH_CAP = 2000
 export async function GET(request: Request): Promise<Response> {
   const { translate } = await resolveTranslations()
   try {
-    const { auth, em, organizationIds, container, selectedOrganizationId, scope } =
+    const { auth, em, organizationIds, container, selectedOrganizationId } =
       await resolveCustomersRequestContext(request)
     const query = querySchema.parse(Object.fromEntries(new URL(request.url).searchParams))
     const flags = await resolveCustomerInteractionFeatureFlags(container, auth.tenantId)
     const exportAll = parseBooleanToken(query.all) === true
-    const isUnrestricted = isUnrestrictedOrganizationScope({
-      isSuperAdmin: auth.isSuperAdmin === true,
-      allowedOrganizationIds: scope?.allowedIds,
-    })
-    if (!isUnrestricted && (!organizationIds || organizationIds.length === 0)) {
-      logger.warn('customers.interactions.tasks.list collapsed organization scope', {
-        tenantId: auth.tenantId,
-        organizationIds,
-        selectedId: scope?.selectedId ?? null,
-        allowedIdsCount: scope?.allowedIds?.length ?? null,
-      })
-      return NextResponse.json({
-        items: [],
-        total: 0,
-        page: exportAll ? 1 : query.page,
-        pageSize: exportAll ? 0 : query.pageSize,
-        totalPages: 1,
-      })
-    }
     const search = normalizeTodoSearch(query.search)
     const queryEngine = container.resolve('queryEngine') as QueryEngine
 
@@ -79,7 +59,6 @@ export async function GET(request: Request): Promise<Response> {
           entityId: query.entityId,
           pagination: exportAll ? null : { page: query.page, pageSize: query.pageSize },
           searchText: search,
-          isUnrestricted,
         },
       )
       const total = canonical.total
@@ -101,7 +80,6 @@ export async function GET(request: Request): Promise<Response> {
     const [legacyRows, canonicalRows] = await Promise.all([
       listLegacyTodoRows(em, queryEngine, auth.tenantId, organizationIds, query.entityId, {
         limit: legacyWindow,
-        isUnrestricted,
       }),
       listCanonicalTodoRows(
         em,
@@ -113,7 +91,6 @@ export async function GET(request: Request): Promise<Response> {
           entityId: query.entityId,
           includeDeleted: true,
           limit: legacyWindow,
-          isUnrestricted,
         },
       ),
     ])

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

@@ -234,7 +234,7 @@ export async function DELETE(req: Request, ctx: { params?: { id?: string; linkId
   const { translate } = await resolveTranslations()
   try {
     const { id, linkId } = paramsSchema.parse({ id: ctx.params?.id, linkId: ctx.params?.linkId })
-    const { container, auth, selectedOrganizationId, person, profile } = await loadPersonContext(req, id)
+    const { container, auth, selectedOrganizationId, person } = await loadPersonContext(req, id)
     if (!selectedOrganizationId) {
       throw new CrudHttpError(400, { error: translate('customers.errors.organization_required', 'Organization context is required') })
     }
@@ -262,26 +262,18 @@ export async function DELETE(req: Request, ctx: { params?: { id?: string; linkId
       auth.tenantId,
       selectedOrganizationId,
     )
-    // No `CustomerPersonCompanyLink` row resolves for the profile-only association case
-    // (`CustomerPersonProfile.company` set without a link row, e.g. from a CRM migration).
-    // The delete command accepts that shape too, so it is dispatched instead of 404ing and
-    // the detach keeps its audit entry, undo token and cache invalidation (#5114).
-    const isProfileOnlyMatch =
-      profile.company && typeof profile.company !== 'string' && profile.company.id === linkId
-    if (!resolvedLinkId && !isProfileOnlyMatch) {
+    if (!resolvedLinkId) {
       throw notFound(translate('customers.errors.person_company_link_not_found', 'Person-company link not found'))
     }
 
     const commandInput = personCompanyLinkDeleteSchema.parse({
-      ...(resolvedLinkId
-        ? { linkId: resolvedLinkId }
-        : { personEntityId: person.id, companyEntityId: linkId }),
+      linkId: resolvedLinkId,
       tenantId: auth.tenantId,
       organizationId: selectedOrganizationId,
     } satisfies PersonCompanyLinkDeleteInput)
 
     const commandBus = container.resolve('commandBus') as CommandBus
-    const { result, logEntry } = await commandBus.execute<PersonCompanyLinkDeleteInput, { linkId: string | null }>(
+    const { result, logEntry } = await commandBus.execute<PersonCompanyLinkDeleteInput, { linkId: string }>(
       'customers.personCompanyLinks.delete',
       {
         input: commandInput,

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

@@ -38,11 +38,8 @@ export async function loadPersonContext(req: Request, personId: string) {
     throw notFound(translate('customers.errors.person_not_found', 'Person not found'))
   }
 
-  // Existence oracle (#5504): deny a cross-org read as not-found — identical to
-  // the parent-not-found above — so it cannot reveal that a person exists in an
-  // organization the caller cannot see.
   if (!isOrganizationReadAccessAllowed({ scope, auth: authenticatedAuth, organizationId: person.organizationId })) {
-    throw notFound(translate('customers.errors.person_not_found', 'Person not found'))
+    throw new CrudHttpError(403, { error: translate('customers.errors.access_denied', 'Access denied') })
   }
 
   const profile = await findOneWithDecryption(

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

@@ -178,11 +178,8 @@ export async function GET(req: Request, ctx: { params?: { id?: string } }) {
       throw notFound(translate('customers.errors.person_not_found', 'Person not found'))
     }
 
-    // Existence oracle (#5504): deny a cross-org read as not-found — identical to
-    // the parent-not-found above — so it cannot reveal that a person exists in an
-    // organization the caller cannot see.
     if (!isOrganizationReadAccessAllowed({ scope, auth, organizationId: person.organizationId })) {
-      throw notFound(translate('customers.errors.person_not_found', 'Person not found'))
+      throw new CrudHttpError(403, { error: translate('customers.errors.access_denied', 'Access denied') })
     }
 
     const entityScope = { tenantId: auth.tenantId, organizationId: person.organizationId }

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

@@ -38,7 +38,7 @@ import type { EntityId } from '@open-mercato/shared/modules/entities'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { findWithDecryption, findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { parseBooleanFromUnknown, parseBooleanToken } from '@open-mercato/shared/lib/boolean'
-import { denyCustomerDetailReadAsNotFound } from '../../../lib/detailReadAccess'
+import { isOrganizationReadAccessAllowed } from '@open-mercato/core/modules/directory/utils/organizationScopeGuard'
 import { loadPersonCompanyLinks, summarizePersonCompanies } from '../../../lib/personCompanies'
 import { normalizeCustomerDetailCustomFields } from '../../detailCustomFields'
 import { buildEmailVisibilityMikroFilter } from '../../../lib/visibilityFilter'
@@ -129,6 +129,10 @@ function parseIncludeParams(request: Request): Set<string> {
   return tokens
 }
 
+function forbidden(message: string) {
+  return NextResponse.json({ error: message }, { status: 403 })
+}
+
 function notFound(message: string) {
   return NextResponse.json({ error: message }, { status: 404 })
 }
@@ -538,19 +542,10 @@ export async function GET(_req: Request, ctx: { params?: { id?: string } }) {
       return notFound('Person not found')
     }
 
-    // Existence oracle (issue #5504): a caller who holds customers.people.view
-    // but whose scope excludes the record's organization must get the SAME
-    // response as for a non-existent id, so 403-when-present / 404-when-absent
-    // collapses to a uniform 404 not-found. The dispatcher already returns a
-    // uniform 403 for callers who lack the feature entirely.
-    const organizationReadDenied = denyCustomerDetailReadAsNotFound(
-      { scope, auth, organizationId: person.organizationId },
-      'Person not found',
-    )
-    if (organizationReadDenied) {
-      statusCode = 404
-      profileMeta = { reason: 'organization_not_in_scope' }
-      return organizationReadDenied
+    if (!isOrganizationReadAccessAllowed({ scope, auth, organizationId: person.organizationId })) {
+      statusCode = 403
+      profileMeta = { reason: 'organization_forbidden' }
+      return forbidden('Access denied')
     }
 
     // Gated get-then-set cache. Key on the resolved person plus the effective
@@ -1342,8 +1337,8 @@ export const openApi: OpenApiRouteDoc = {
       errors: [
         { status: 400, description: 'Invalid identifier', schema: personDetailErrorSchema },
         { status: 401, description: 'Unauthorized', schema: personDetailErrorSchema },
-        { status: 403, description: 'Forbidden — caller lacks the required feature', schema: personDetailErrorSchema },
-        { status: 404, description: 'Person not found, or its organization is not in the caller’s scope', schema: personDetailErrorSchema },
+        { status: 403, description: 'Forbidden for tenant/organization scope', schema: personDetailErrorSchema },
+        { status: 404, description: 'Person not found', schema: personDetailErrorSchema },
       ],
     },
   },

package/src/modules/customers/api/people/check-phone/route.ts

@@ -3,12 +3,9 @@ import { z } from 'zod'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
-import type { EntityManager, FilterQuery } from '@mikro-orm/postgresql'
+import type { EntityManager } from '@mikro-orm/postgresql'
 import { CustomerEntity } from '../../../data/entities'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
-import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
-import { isTenantDataEncryptionEnabled } from '@open-mercato/shared/lib/encryption/toggles'
-import { MATCH_CANDIDATE_LIMIT } from '../../../lib/findPeopleByAddresses'
 
 const querySchema = z.object({
   digits: z
@@ -21,10 +18,6 @@ export const metadata = {
   GET: { requireAuth: true, requireFeatures: ['customers.people.view'] },
 }
 
-function normalizePhoneDigits(value: string | null | undefined): string {
-  return typeof value === 'string' ? value.replace(/\D/g, '') : ''
-}
-
 export async function GET(req: Request) {
   const url = new URL(req.url)
   const rawQuery: Record<string, string | null> = { digits: url.searchParams.get('digits') }
@@ -52,76 +45,18 @@ export async function GET(req: Request) {
     return NextResponse.json({ match: null })
   }
 
-  // SQL fast path, gated on the encryption toggle: it can only match stored
-  // plaintext digits, so running it while tenant data encryption is enabled
-  // (the default) would pay a per-row scan that provably returns nothing.
-  // When encryption is off it serves the pre-encryption single-query behavior,
-  // including legacy plaintext rows. Encrypted rows written before the toggle
-  // was turned off are not resolvable by either path by design; plaintext
-  // legacy rows under an enabled toggle still resolve through the decrypted
-  // scan below, where decryption no-ops on non-ciphertext values.
-  if (!isTenantDataEncryptionEnabled()) {
-    const qb = em.createQueryBuilder(CustomerEntity, 'person')
-    qb.select(['person.id', 'person.displayName'])
-    qb.where({ kind: 'person', deletedAt: null })
-    qb.andWhere('person.primary_phone is not null')
-    qb.andWhere("regexp_replace(person.primary_phone, '\\D', '', 'g') = ?", [parse.data.digits])
-    if (auth.tenantId) {
-      qb.andWhere({ tenantId: auth.tenantId })
-    }
-    qb.andWhere({ organizationId: { $in: Array.from(allowedOrgIds) } })
-    qb.limit(1)
-
-    const fastMatch = await qb.getSingleResult()
-    if (fastMatch) {
-      return NextResponse.json({
-        match: {
-          id: fastMatch.id,
-          displayName: fastMatch.displayName,
-        },
-      })
-    }
-  }
-
-  // Encryption-on path: primary_phone holds random-IV ciphertext, so digit
-  // normalization must run in application code over decrypted rows instead of
-  // SQL against the stored column (issue #3840).
-  // Encryption-on path: primary_phone holds random-IV ciphertext, so digit
-  // normalization must run in application code over decrypted rows instead of
-  // SQL against the stored column (issue #3840). The scan is bounded newest-
-  // first and projected to the columns the route uses plus tenantId/
-  // organizationId, which the decryption path reads per row to resolve each
-  // row's own key (a request-level fallback cannot cover multi-org scans or
-  // null-tenant sessions). A primary_phone blind index is the exact O(1)
-  // follow-up (#5515).
-  const where: FilterQuery<CustomerEntity> = {
-    kind: 'person',
-    deletedAt: null,
-    primaryPhone: { $ne: null },
-    organizationId: { $in: Array.from(allowedOrgIds) },
-  }
+  const qb = em.createQueryBuilder(CustomerEntity, 'person')
+  qb.select(['person.id', 'person.displayName'])
+  qb.where({ kind: 'person', deletedAt: null })
+  qb.andWhere('person.primary_phone is not null')
+  qb.andWhere("regexp_replace(person.primary_phone, '\\D', '', 'g') = ?", [parse.data.digits])
   if (auth.tenantId) {
-    where.tenantId = auth.tenantId
+    qb.andWhere({ tenantId: auth.tenantId })
   }
+  qb.andWhere({ organizationId: { $in: Array.from(allowedOrgIds) } })
+  qb.limit(1)
 
-  const candidates = await findWithDecryption(
-    em,
-    CustomerEntity,
-    where,
-    {
-      limit: MATCH_CANDIDATE_LIMIT,
-      orderBy: { createdAt: 'DESC' },
-      fields: ['id', 'displayName', 'primaryPhone', 'tenantId', 'organizationId'],
-    },
-    {
-      tenantId: auth.tenantId ?? null,
-      organizationId: scope?.selectedId ?? auth.orgId ?? null,
-    },
-  )
-
-  const match = candidates.find(
-    (candidate) => normalizePhoneDigits(candidate.primaryPhone) === parse.data.digits,
-  )
+  const match = await qb.getSingleResult()
   if (!match) {
     return NextResponse.json({ match: null })
   }

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

@@ -9,7 +9,6 @@ import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import type { CommandBus } from '@open-mercato/shared/lib/commands'
 import { isCrudHttpError, notFound } from '@open-mercato/shared/lib/crud/errors'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
-import { isUnrestrictedOrganizationScope } from '@open-mercato/shared/lib/auth/organizationAccess'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import {
   runCrudMutationGuardAfterSuccess,
@@ -234,36 +233,15 @@ async function resolveCanonicalTodoTargetId(
 
 export async function GET(request: Request): Promise<Response> {
   try {
-    const { auth, em, organizationIds, container, selectedOrganizationId, scope } =
+    const { auth, em, organizationIds, container, selectedOrganizationId } =
       await resolveCustomersRequestContext(request)
     const query = querySchema.parse(Object.fromEntries(new URL(request.url).searchParams))
     const flags = await resolveCustomerInteractionFeatureFlags(container, auth.tenantId)
     if (!flags.legacyAdapters) {
       return await legacyAdaptersDisabledResponse()
     }
-    const exportAll = parseBooleanToken(query.all) === true
-    const isUnrestricted = isUnrestrictedOrganizationScope({
-      isSuperAdmin: auth.isSuperAdmin === true,
-      allowedOrganizationIds: scope?.allowedIds,
-    })
-    if (!isUnrestricted && (!organizationIds || organizationIds.length === 0)) {
-      logger.warn('customers.todos.list collapsed organization scope', {
-        tenantId: auth.tenantId,
-        organizationIds,
-        selectedId: scope?.selectedId ?? null,
-        allowedIdsCount: scope?.allowedIds?.length ?? null,
-      })
-      return withAdapterHeaders(
-        NextResponse.json({
-          items: [],
-          total: 0,
-          page: exportAll ? 1 : query.page,
-          pageSize: exportAll ? 0 : query.pageSize,
-          totalPages: 1,
-        }),
-      )
-    }
     const queryEngine = container.resolve('queryEngine') as QueryEngine
+    const exportAll = parseBooleanToken(query.all) === true
     const search = normalizeTodoSearch(query.search)
 
     if (flags.unified) {
@@ -277,7 +255,6 @@ export async function GET(request: Request): Promise<Response> {
           entityId: query.entityId,
           pagination: exportAll ? null : { page: query.page, pageSize: query.pageSize },
           searchText: search,
-          isUnrestricted,
         },
       )
       const total = canonical.total
@@ -298,7 +275,6 @@ export async function GET(request: Request): Promise<Response> {
     const [legacyRows, canonicalRows] = await Promise.all([
       listLegacyTodoRows(em, queryEngine, auth.tenantId, organizationIds, query.entityId, {
         limit: legacyWindow,
-        isUnrestricted,
       }),
       listCanonicalTodoRows(
         em,
@@ -311,7 +287,6 @@ export async function GET(request: Request): Promise<Response> {
           includeDeleted: true,
           source: CUSTOMER_INTERACTION_TODO_ADAPTER_SOURCE,
           limit: legacyWindow,
-          isUnrestricted,
         },
       ),
     ])

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

@@ -118,7 +118,6 @@ type CompaniesResponse = {
   total?: number
   page?: number
   totalPages?: number
-  totalIsCapped?: boolean
 }
 
 type DictionaryKindKey = CustomerDictionaryKind
@@ -199,10 +198,9 @@ export default function CustomersCompaniesPage() {
   const [sorting, setSorting] = React.useState<SortingState>([])
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
+  const [search, setSearch] = React.useState('')
   const pathname = usePathname()
   const searchParams = useSearchParams()
-  const [search, setSearch] = React.useState(() => searchParams?.get('search')?.trim() ?? '')
   // One-shot URL hydration used as the hook's initial value. The hook is the
   // single source of truth from this point on — the page MUST NOT keep a
   // parallel `useState<AdvancedFilterTree>` (see spec "Migration & Backward
@@ -424,7 +422,6 @@ export default function CustomersCompaniesPage() {
         setRows(items.map((item) => mapApiItem(item as Record<string, unknown>)).filter((row): row is CompanyRow => !!row))
         setTotal(typeof payload.total === 'number' ? payload.total : items.length)
         setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : 1)
-        setTotalIsCapped(payload?.totalIsCapped === true)
       } catch (err) {
         if (!cancelled) {
           setCacheStatus(null)
@@ -829,8 +826,8 @@ export default function CustomersCompaniesPage() {
         header: def.label || def.key,
         enableSorting: true,
         meta: {
-          columnChooserGroup: def.group?.title ?? 'Custom Fields',
-          filterGroup: def.group?.title ?? 'Custom Fields',
+          columnChooserGroup: def.group?.title ?? t('ui.columnChooser.customFieldsGroup', 'Custom Fields'),
+          filterGroup: def.group?.title ?? t('ui.columnChooser.customFieldsGroup', 'Custom Fields'),
           filterType: mapCustomFieldKindToFilterType(def.kind),
           filterOptions: normalizeCustomFieldFilterOptions(def.options),
           hidden: def.listVisible === false,
@@ -966,7 +963,7 @@ export default function CustomersCompaniesPage() {
             />
           )}
           virtualized
-          pagination={{ page, pageSize, total, totalPages, totalIsCapped, onPageChange: setPage, pageSizeOptions: [10, 25, 50, 100], onPageSizeChange: handlePageSizeChange, cacheStatus }}
+          pagination={{ page, pageSize, total, totalPages, onPageChange: setPage, pageSizeOptions: [10, 25, 50, 100], onPageSizeChange: handlePageSizeChange, cacheStatus }}
           isLoading={isLoading}
         />
         <AdvancedFilterPanel

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

@@ -3,7 +3,7 @@
 import * as React from 'react'
 import { extensionPoints } from '@open-mercato/core/modules/customers/extension-points'
 import Link from 'next/link'
-import { Building2, FileText, Hash, UserSearch, Users } from 'lucide-react'
+import { Building2, UserSearch, Users } from 'lucide-react'
 import { EmptyState } from '@open-mercato/ui/primitives/empty-state'
 import { useRouter, useSearchParams, usePathname } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
@@ -12,7 +12,7 @@ import { AttachmentsSection, ErrorMessage, LoadingMessage, NotesSection, RecordN
 import { InjectionSpot } from '@open-mercato/ui/backend/injection/InjectionSpot'
 import { buildRecordInjectionContext, useSetCurrentRecordInjectionContext } from '@open-mercato/ui/backend/injection/recordContext'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
-import { CollapsibleZoneLayout, type ZoneSectionDescriptor } from '@open-mercato/ui/backend/crud/CollapsibleZoneLayout'
+import { CollapsibleZoneLayout } from '@open-mercato/ui/backend/crud/CollapsibleZoneLayout'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { createTranslatorWithFallback } from '@open-mercato/shared/lib/i18n/translate'
 import { E } from '#generated/entities.ids.generated'
@@ -57,10 +57,6 @@ export default function DealDetailPage({ params }: { params?: { id?: string } })
   const pathname = usePathname()
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
   const detailTranslator = React.useMemo(() => createTranslatorWithFallback(t), [t])
-  const zoneSections = React.useMemo<ZoneSectionDescriptor[]>(() => [
-    { id: 'details', icon: FileText, label: t('customers.people.detail.deals.form.details', 'Deal details') },
-    { id: 'custom', icon: Hash, label: t('customers.people.detail.deals.form.customFields', 'Custom fields') },
-  ], [t])
 
   const { data, setData, isLoading, error, isNotFound, loadData } = useDealData(id)
   const [isDirty, setIsDirty] = React.useState(false)
@@ -668,7 +664,6 @@ export default function DealDetailPage({ params }: { params?: { id?: string } })
               pageType="deal-detail-v3"
               entityName={dealName}
               isDirty={isDirty}
-              sections={zoneSections}
               zone1DefaultWidth="540px"
               zone1={zone1Content}
               zone2={zone2Content}

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

@@ -125,7 +125,6 @@ type DealsResponse = {
   items?: Array<Record<string, unknown>>
   total?: number
   totalPages?: number
-  totalIsCapped?: boolean
 }
 
 type FilterOption = { value: string; label: string }
@@ -211,7 +210,6 @@ export default function CustomersDealsPage() {
   const [sorting, setSorting] = React.useState<import('@tanstack/react-table').SortingState>([])
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [search, setSearch] = React.useState(() => searchParams?.get('search')?.trim() ?? '')
   const [isLoading, setIsLoading] = React.useState(false)
   const [reloadToken, setReloadToken] = React.useState(0)
@@ -399,7 +397,6 @@ export default function CustomersDealsPage() {
         setRows(mapped)
         setTotal(typeof payload.total === 'number' ? payload.total : mapped.length)
         setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : 1)
-        setTotalIsCapped(payload.totalIsCapped === true)
       } catch (err) {
         if (!cancelled) {
           setCacheStatus(null)
@@ -415,12 +412,10 @@ export default function CustomersDealsPage() {
   }, [queryParams, reloadToken, scopeVersion, t])
 
   React.useEffect(() => {
-    // A capped totalPages is a floor — pages past it hold reachable rows, so
-    // clamping would bounce a deep-linked user off data that exists.
-    if (!totalIsCapped && totalPages > 0 && page > totalPages) {
+    if (totalPages > 0 && page > totalPages) {
       setPage(totalPages)
     }
-  }, [page, totalPages, totalIsCapped])
+  }, [page, totalPages])
 
   const queryRef = React.useRef(searchParams?.toString() ?? '')
   React.useEffect(() => {
@@ -687,8 +682,8 @@ export default function CustomersDealsPage() {
         accessorKey: `cf_${def.key}`,
         header: def.label || def.key,
         meta: {
-          columnChooserGroup: def.group?.title ?? 'Custom Fields',
-          filterGroup: def.group?.title ?? 'Custom Fields',
+          columnChooserGroup: def.group?.title ?? t('ui.columnChooser.customFieldsGroup', 'Custom Fields'),
+          filterGroup: def.group?.title ?? t('ui.columnChooser.customFieldsGroup', 'Custom Fields'),
           filterType: mapCustomFieldKindToFilterType(def.kind),
           filterOptions: normalizeCustomFieldFilterOptions(def.options),
           hidden: def.listVisible === false,
@@ -1141,7 +1136,6 @@ export default function CustomersDealsPage() {
             pageSize,
             total,
             totalPages,
-            totalIsCapped,
             onPageChange: (nextPage) => setPage(nextPage),
             pageSizeOptions: [10, 25, 50, 100],
             onPageSizeChange: handlePageSizeChange,

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

@@ -7,7 +7,6 @@ import type { RowActionItem } from '@open-mercato/ui/backend/RowActions'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { translateWithFallback } from '@open-mercato/shared/lib/i18n/translate'
 import type { FilterOptionTone } from '@open-mercato/shared/lib/query/advanced-filter'
-import { toneToDotClass } from './toneClasses'
 import { DealCard, type DealCardData } from './DealCard'
 import { DashedTileButton } from './DashedTileButton'
 import { LANE_WIDTH_PX } from './constants'
@@ -53,10 +52,15 @@ type LaneProps = {
   onResetWidth?: (stageId: string) => void
 }
 
-// 4px color bar tone — saturated icon tokens shared with the status filter pills
-// (toneClasses.ts) so the lane bar and the filter dots stay in lockstep (#5107 review).
-function getAccentClass(tone: FilterOptionTone | null): string {
-  return toneToDotClass(tone, 'bg-border')
+// 4px color bar tone — uses saturated icon tokens so the bar is visibly colored, not pale
+const ACCENT_TONE_CLASS: Record<FilterOptionTone, string> = {
+  success: 'bg-status-success-icon',
+  error: 'bg-status-error-icon',
+  warning: 'bg-status-warning-icon',
+  info: 'bg-status-info-icon',
+  neutral: 'bg-status-neutral-icon',
+  brand: 'bg-brand-violet',
+  pink: 'bg-status-pink-icon',
 }
 
 // Count pill bg uses very-light status background, text uses status text color
@@ -70,6 +74,11 @@ const COUNT_BADGE_TONE_CLASS: Record<FilterOptionTone, string> = {
   pink: 'bg-status-pink-bg text-status-pink-text',
 }
 
+function getAccentClass(tone: FilterOptionTone | null): string {
+  if (tone && tone in ACCENT_TONE_CLASS) return ACCENT_TONE_CLASS[tone]
+  return 'bg-border'
+}
+
 function getCountBadgeClass(tone: FilterOptionTone | null): string {
   if (tone && tone in COUNT_BADGE_TONE_CLASS) return COUNT_BADGE_TONE_CLASS[tone]
   return 'bg-muted text-muted-foreground'