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

package/src/modules/auth/services/rbacService.ts

@@ -4,14 +4,12 @@ import { getCurrentCacheTenant, runWithCacheTenant } from '@open-mercato/cache'
 import { UserAcl, RoleAcl, User, UserRole } from '@open-mercato/core/modules/auth/data/entities'
 import { ApiKey } from '@open-mercato/core/modules/api_keys/data/entities'
 import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
-import type { OrganizationHierarchyService } from '@open-mercato/shared/lib/auth/principal-service'
 import { buildOrgScopeUserCacheTag, buildOrgScopeTenantCacheTag } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import {
   authorizeFeatures,
   resolveEffectiveFeatures,
 } from '@open-mercato/shared/security/featurePolicy'
 import { filterGrantsByEnabledModules } from '@open-mercato/shared/security/enabledModulesRegistry'
-import { resolveRoleOrganizationScope, roleAclAllowsOrganization } from './roleOrganizationScope'
 
 interface AclData {
   isSuperAdmin: boolean
@@ -31,22 +29,12 @@ function isAclData(value: unknown): value is AclData {
   return true
 }
 
-function isRestrictedRoleAcl(acl: Pick<RoleAcl, 'organizationsJson'>): boolean {
-  return Array.isArray(acl.organizationsJson)
-    && acl.organizationsJson.length > 0
-    && !acl.organizationsJson.includes('__all__')
-}
-
 export class RbacService {
   private cacheTtlMs: number = 5 * 60 * 1000 // 5 minutes default
   private cache: CacheStrategy | null = null
   private globalSuperAdminCache = new Map<string, boolean>()
 
-  constructor(
-    private em: EntityManager,
-    cache?: CacheStrategy,
-    private readonly organizationHierarchyService?: OrganizationHierarchyService,
-  ) {
+  constructor(private em: EntityManager, cache?: CacheStrategy) {
     this.cache = cache || null
   }
 
@@ -63,6 +51,13 @@ export class RbacService {
     return authorizeFeatures(required, { grantedFeatures: granted })
   }
 
+  private roleAclAllowsOrganization(acl: RoleAcl, organizationId: string | null | undefined): boolean {
+    if (!organizationId) return true
+    const organizations = Array.isArray(acl.organizationsJson) ? acl.organizationsJson : null
+    if (!organizations || !organizations.length || organizations.includes('__all__')) return true
+    return organizations.includes(organizationId)
+  }
+
   private getCacheKey(userId: string, scope: { tenantId: string | null; organizationId: string | null }): string {
     return `rbac:${userId}:${scope.tenantId || 'null'}:${scope.organizationId || 'null'}`
   }
@@ -96,10 +91,6 @@ export class RbacService {
 
     if (scope.tenantId) {
       tags.push(this.getTenantTag(scope.tenantId))
-      // Scoped role projections depend on the selected organization's ancestor
-      // chain, so Directory hierarchy changes must evict them as well as the
-      // separately cached OrganizationScope entries.
-      tags.push(buildOrgScopeTenantCacheTag(scope.tenantId))
     }
 
     if (scope.organizationId) {
@@ -212,10 +203,8 @@ export class RbacService {
       this.globalSuperAdminCache.set(userId, false)
       return false
     }
-    const roleSupers = await em.find(RoleAcl, { isSuperAdmin: true, role: { $in: roleIds as any } } as any)
-    const result = roleSupers.some((roleAcl) => (
-      !!roleAcl.isSuperAdmin && !isRestrictedRoleAcl(roleAcl)
-    ))
+    const roleSuper = await em.findOne(RoleAcl, { isSuperAdmin: true, role: { $in: roleIds as any } } as any)
+    const result = !!(roleSuper && (roleSuper as any).isSuperAdmin)
     this.globalSuperAdminCache.set(userId, result)
     return result
   }
@@ -250,10 +239,6 @@ export class RbacService {
     const cached = await this.getFromCache(cacheKey)
     if (cached) return cached
 
-    // Direct user-level super-admin grants and unrestricted role-level
-    // super-admin grants are global. Organization-restricted role grants are
-    // deliberately excluded by isGlobalSuperAdmin and continue through the
-    // scoped ACL projection below.
     if (!userId.startsWith('api_key:')) {
       if (await this.isGlobalSuperAdmin(userId)) {
         const result = { isSuperAdmin: true, features: ['*'], organizations: null }
@@ -273,71 +258,28 @@ export class RbacService {
       }
       const tenantId = scope.tenantId || key.tenantId || null
       const roleIds = Array.isArray(key.rolesJson) ? key.rolesJson.filter(Boolean) : []
-      const keyOrganizationId = typeof key.organizationId === 'string' && key.organizationId.trim().length > 0
-        ? key.organizationId.trim()
-        : null
-      const evaluatedOrganizationId = scope.organizationId || keyOrganizationId
       let isSuper = false
       const features: string[] = []
-      let roleOrganizations: string[] | null = []
-      let hasApplicableRestrictedRole = false
+      let organizations: string[] | null = key.organizationId ? [key.organizationId] : null
       if (tenantId && roleIds.length) {
-        const roleOrganizationScope = await resolveRoleOrganizationScope(
-          this.organizationHierarchyService,
-          tenantId,
-          evaluatedOrganizationId,
-        )
         const racls = await em.find(RoleAcl, { tenantId, role: { $in: roleIds as any } } as any)
         for (const acl of racls) {
-          if (roleAclAllowsOrganization(acl, roleOrganizationScope)) {
-            isSuper = isSuper || !!acl.isSuperAdmin
-            if (Array.isArray(acl.featuresJson)) {
-              for (const f of acl.featuresJson) if (!features.includes(f)) features.push(f)
-            }
-            if (isRestrictedRoleAcl(acl)) hasApplicableRestrictedRole = true
+          isSuper = isSuper || !!acl.isSuperAdmin
+          if (Array.isArray(acl.featuresJson)) {
+            for (const f of acl.featuresJson) if (!features.includes(f)) features.push(f)
           }
-          if (roleOrganizations !== null) {
-            if (acl.organizationsJson == null || (Array.isArray(acl.organizationsJson) && acl.organizationsJson.length === 0)) {
-              roleOrganizations = null
+          if (organizations !== null) {
+            if (acl.organizationsJson == null) {
+              organizations = null
             } else if (Array.isArray(acl.organizationsJson) && acl.organizationsJson.includes('__all__')) {
-              roleOrganizations = null
+              organizations = null
             } else {
-              roleOrganizations = Array.from(new Set([
-                ...roleOrganizations,
-                ...(Array.isArray(acl.organizationsJson) ? acl.organizationsJson : []),
-              ]))
+              organizations = Array.from(new Set([...(organizations || []), ...acl.organizationsJson]))
             }
           }
         }
-        if (
-          roleOrganizations !== null
-          && evaluatedOrganizationId
-          && roleOrganizationScope !== null
-          && roleOrganizationScope.size > 0
-          && hasApplicableRestrictedRole
-          && !roleOrganizations.includes(evaluatedOrganizationId)
-        ) {
-          roleOrganizations.push(evaluatedOrganizationId)
-        }
-      }
-      let organizations = roleOrganizations
-      if (keyOrganizationId) {
-        const keyOrganizationScope = await resolveRoleOrganizationScope(
-          this.organizationHierarchyService,
-          tenantId,
-          keyOrganizationId,
-        )
-        organizations = roleOrganizations === null
-          || roleOrganizations.some((organizationId) => keyOrganizationScope?.has(organizationId))
-          ? [keyOrganizationId]
-          : []
       }
-      // A role-level super-admin grant still respects the API key's effective
-      // organization allowlist. Represent it as a wildcard feature whenever
-      // the key is restricted so downstream super-admin shortcuts cannot
-      // bypass the key or role organization bounds.
-      if (isSuper && organizations !== null && !features.includes('*')) features.push('*')
-      const result = { isSuperAdmin: isSuper && organizations === null, features, organizations }
+      const result = { isSuperAdmin: isSuper, features, organizations }
       await this.setCache(cacheKey, result, userId, scope)
       return result
     }
@@ -384,42 +326,18 @@ export class RbacService {
     let isSuper = false
     const features: string[] = []
     let organizations: string[] | null = []
-    let hasApplicableRestrictedRole = false
     if (roleIds.length) {
-      const roleOrganizationScope = await resolveRoleOrganizationScope(
-        this.organizationHierarchyService,
-        tenantId,
-        scope.organizationId,
-      )
       const racls = await em.find(RoleAcl, { tenantId, role: { $in: roleIds as any } } as any, {})
       const roleAcls = Array.isArray(racls) ? racls : []
       for (const r of roleAcls) {
-        if (roleAclAllowsOrganization(r, roleOrganizationScope)) {
-          isSuper = isSuper || !!r.isSuperAdmin
-          if (Array.isArray(r.featuresJson)) for (const f of r.featuresJson) if (!features.includes(f)) features.push(f)
-          if (isRestrictedRoleAcl(r)) hasApplicableRestrictedRole = true
-        }
+        isSuper = isSuper || !!r.isSuperAdmin
+        if (Array.isArray(r.featuresJson)) for (const f of r.featuresJson) if (!features.includes(f)) features.push(f)
         if (organizations !== null) {
-          // For a user principal an empty allowlist is a deny-all scope (#4033), not
-          // "unrestricted": it must merge to an empty set so scoped reads and deletes
-          // fail closed. Only an absent allowlist or an explicit '__all__' widens to
-          // every organization. (The API-key branch above deliberately differs — an
-          // empty role list there means the key inherits the key's own scope.)
           if (r.organizationsJson == null) organizations = null
           else if (Array.isArray(r.organizationsJson) && r.organizationsJson.includes('__all__')) organizations = null
           else organizations = Array.from(new Set([...(organizations || []), ...r.organizationsJson]))
         }
       }
-      if (
-        organizations !== null
-        && scope.organizationId
-        && roleOrganizationScope !== null
-        && roleOrganizationScope.size > 0
-        && hasApplicableRestrictedRole
-        && !organizations.includes(scope.organizationId)
-      ) {
-        organizations.push(scope.organizationId)
-      }
     }
     if (organizations && orgId && !organizations.includes(orgId) && !organizations.includes('__all__')) {
       // Out-of-scope org; caller will enforce
@@ -443,16 +361,12 @@ export class RbacService {
     if (!tenantId || !feature) return false
 
     const em = this.em.fork()
-    const roleOrganizationScope = await resolveRoleOrganizationScope(
-      this.organizationHierarchyService,
-      tenantId,
-      opts?.organizationId,
-    )
     const roleAcls = await em.find(RoleAcl, { tenantId, deletedAt: null } as any, {})
     const list = Array.isArray(roleAcls) ? roleAcls : []
+    const organizationId = opts?.organizationId ?? null
 
     for (const acl of list) {
-      if (!roleAclAllowsOrganization(acl, roleOrganizationScope)) continue
+      if (!this.roleAclAllowsOrganization(acl, organizationId)) continue
       const grants = Array.isArray(acl.featuresJson) ? acl.featuresJson : []
       if (authorizeFeatures([feature], {
         grantedFeatures: grants,

package/src/modules/business_rules/backend/logs/page.tsx

@@ -38,7 +38,6 @@ type LogsResponse = {
   items: RuleExecutionLog[]
   total: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 export default function ExecutionLogsPage() {
@@ -46,7 +45,6 @@ export default function ExecutionLogsPage() {
   const [pageSize] = React.useState(50)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const t = useT()
   const [filterValues, setFilterValues] = React.useState<FilterValues>({})
 
@@ -78,7 +76,6 @@ export default function ExecutionLogsPage() {
       if (response) {
         setTotal(response.total || 0)
         setTotalPages(response.totalPages || 1)
-        setTotalIsCapped(response?.totalIsCapped === true)
       }
 
       return response?.items || []
@@ -249,7 +246,7 @@ export default function ExecutionLogsPage() {
           onFiltersClear={handleFiltersClear}
           isLoading={isLoading}
           error={error ? t('business_rules.logs.messages.loadFailed') : undefined}
-          pagination={{ page, pageSize, total, totalPages, totalIsCapped, onPageChange: setPage }}
+          pagination={{ page, pageSize, total, totalPages, onPageChange: setPage }}
         />
       </PageBody>
     </Page>

package/src/modules/business_rules/backend/rules/[id]/page.meta.ts

@@ -1,5 +1,10 @@
 export const metadata = {
   pageTitle: 'Edit Business Rule',
+  pageTitleKey: 'business_rules.rules.edit.title',
   requireAuth: true,
   requireFeatures: ['business_rules.manage'],
+  breadcrumb: [
+    { label: 'Business Rules', labelKey: 'rules.nav.rules' },
+    { label: 'Edit Business Rule', labelKey: 'business_rules.rules.edit.title' },
+  ],
 }

package/src/modules/business_rules/backend/rules/create/page.meta.ts

@@ -2,7 +2,11 @@ export const metadata = {
   requireAuth: true,
   requireFeatures: ['business_rules.manage'],
   pageTitle: 'Create Business Rule',
+  pageTitleKey: 'business_rules.rules.create.title',
   pageGroup: 'Business Rules',
   pageGroupKey: 'rules.nav.group',
-  breadcrumb: [{ label: 'Business Rules', labelKey: 'rules.nav.rules' }, { label: 'Create Business Rule' }],
+  breadcrumb: [
+    { label: 'Business Rules', labelKey: 'rules.nav.rules' },
+    { label: 'Create Business Rule', labelKey: 'business_rules.rules.create.title' },
+  ],
 }

package/src/modules/business_rules/backend/rules/page.tsx

@@ -42,7 +42,6 @@ type RulesResponse = {
   items: Rule[]
   total: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 export default function RulesListPage() {
@@ -50,7 +49,6 @@ export default function RulesListPage() {
   const [pageSize] = React.useState(20)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const t = useT()
   const router = useRouter()
   const queryClient = useQueryClient()
@@ -84,7 +82,6 @@ export default function RulesListPage() {
       if (response) {
         setTotal(response.total || 0)
         setTotalPages(response.totalPages || 1)
-        setTotalIsCapped(response?.totalIsCapped === true)
       }
 
       return response?.items || []
@@ -355,7 +352,7 @@ export default function RulesListPage() {
               createLabel={t('business_rules.actions.create')}
             />
           )}
-          pagination={{ page, pageSize, total, totalPages, totalIsCapped, onPageChange: setPage }}
+          pagination={{ page, pageSize, total, totalPages, onPageChange: setPage }}
         />
       </PageBody>
       {ConfirmDialogElement}

package/src/modules/business_rules/backend/sets/[id]/page.meta.ts

@@ -1,5 +1,10 @@
 export const metadata = {
   pageTitle: 'Edit Rule Set',
+  pageTitleKey: 'business_rules.sets.edit.title',
   requireAuth: true,
   requireFeatures: ['business_rules.manage_sets'],
+  breadcrumb: [
+    { label: 'Rule Sets', labelKey: 'rules.nav.sets' },
+    { label: 'Edit Rule Set', labelKey: 'business_rules.sets.edit.title' },
+  ],
 }

package/src/modules/business_rules/backend/sets/create/page.meta.ts

@@ -2,7 +2,11 @@ export const metadata = {
   requireAuth: true,
   requireFeatures: ['business_rules.manage_sets'],
   pageTitle: 'Create Rule Set',
+  pageTitleKey: 'business_rules.sets.create.title',
   pageGroup: 'Business Rules',
   pageGroupKey: 'rules.nav.group',
-  breadcrumb: [{ label: 'Rule Sets', labelKey: 'rules.nav.sets' }, { label: 'Create Rule Set' }],
+  breadcrumb: [
+    { label: 'Rule Sets', labelKey: 'rules.nav.sets' },
+    { label: 'Create Rule Set', labelKey: 'business_rules.sets.create.title' },
+  ],
 }

package/src/modules/business_rules/backend/sets/page.tsx

@@ -35,7 +35,6 @@ type RuleSetsResponse = {
   items: RuleSet[]
   total: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 export default function RuleSetsListPage() {
@@ -43,7 +42,6 @@ export default function RuleSetsListPage() {
   const [pageSize] = React.useState(20)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const t = useT()
   const router = useRouter()
   const queryClient = useQueryClient()
@@ -74,7 +72,6 @@ export default function RuleSetsListPage() {
       if (response) {
         setTotal(response.total || 0)
         setTotalPages(response.totalPages || 1)
-        setTotalIsCapped(response?.totalIsCapped === true)
       }
 
       return response?.items || []
@@ -261,7 +258,7 @@ export default function RuleSetsListPage() {
               createLabel={t('business_rules.sets.actions.create')}
             />
           )}
-          pagination={{ page, pageSize, total, totalPages, totalIsCapped, onPageChange: setPage }}
+          pagination={{ page, pageSize, total, totalPages, onPageChange: setPage }}
         />
       </PageBody>
       {ConfirmDialogElement}

package/src/modules/business_rules/lib/expression-evaluator.ts

@@ -1,7 +1,7 @@
 import type { ComparisonOperator, LogicalOperator } from '../data/validators'
 import { testLinearRegex } from '@open-mercato/shared/lib/regex/linear'
 import { getNestedValue, resolveSpecialValue } from './value-resolver'
-import { createLogger, isLevelEnabled } from '@open-mercato/shared/lib/logger'
+import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('business_rules').child({ component: 'expression-evaluator' })
 
@@ -86,14 +86,14 @@ function evaluateSimpleCondition(
 
   const result = applyOperator(leftValue, condition.operator, rightValue)
 
-  if (isLevelEnabled('debug')) {
-    logger.debug('Simple condition evaluated', {
-      field: condition.field,
-      operator: condition.operator,
-      actualValueType: typeof leftValue,
-      passed: result,
-    })
-  }
+  logger.debug('Simple condition evaluated', {
+    field: condition.field,
+    operator: condition.operator,
+    expectedValue: rightValue,
+    actualValue: leftValue,
+    actualValueType: typeof leftValue,
+    passed: result,
+  })
 
   return result
 }

package/src/modules/business_rules/lib/rule-evaluator.ts

@@ -1,6 +1,6 @@
 import type { BusinessRule } from '../data/entities'
 import { evaluateExpression, type EvaluationContext, type ConditionExpression } from './expression-evaluator'
-import { createLogger, isLevelEnabled } from '@open-mercato/shared/lib/logger'
+import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('business_rules').child({ component: 'rule-evaluator' })
 
@@ -105,15 +105,14 @@ export async function evaluateSingleRule(
 ): Promise<SingleRuleResult> {
   const startTime = Date.now()
 
-  if (isLevelEnabled('debug')) {
-    logger.debug('Evaluating rule', {
-      ruleId: rule.ruleId,
-      ruleName: rule.ruleName,
-      ruleType: rule.ruleType,
-      entityType: rule.entityType,
-      eventType: rule.eventType,
-    })
-  }
+  logger.debug('Evaluating rule', {
+    ruleId: rule.ruleId,
+    ruleName: rule.ruleName,
+    ruleType: rule.ruleType,
+    entityType: rule.entityType,
+    eventType: rule.eventType,
+    conditions: rule.conditionExpression,
+  })
 
   try {
     // Check if rule is enabled

package/src/modules/catalog/ai-agents.ts

@@ -407,7 +407,7 @@ const MERCHANDISING_PROMPT_SECTIONS: PromptSection[] = [
       '- Selection-first: if `pageContext.recordId` contains a non-empty comma-separated UUID list (or `pageContext.extra.selectedCount > 0`), the operator has selected rows in the grid and EXPECTS you to act on those first. Call catalog.list_selected_products with those IDs, present what you found, and THEN ask whether to expand to the full catalog or to a broader search. Do NOT silently fall back to catalog.search_products when a selection is present.',
       '- "list products" with no selection → call catalog.search_products with NO parameters (returns all active products, paginated; default limit=50, max=100).',
       '- User mentions a product name → call catalog.search_products with q=that name.',
-      '- If catalog.search_products fills the page (as many items as `limit`), more may follow: say so and offer to fetch the next page; do NOT raise `limit` above 100. When `totalIsCapped` is true, `total` is a floor — phrase it as "at least N", never as an exact count.',
+      '- If catalog.search_products returns more rows than the page (i.e. `total` > `limit + offset`), say so and offer to fetch the next page; do NOT raise `limit` above 100.',
       'Present results first, then offer refinement options. The user does NOT want to answer questions before seeing data.',
     ].join('\n'),
   },

package/src/modules/catalog/ai-tools/merchandising-pack.ts

@@ -97,7 +97,7 @@ function resolveSearchService(ctx: CatalogToolContext): SearchServiceLike | null
 const searchProductsInput = z
   .object({
     q: z.string().trim().optional().describe('Optional fulltext query (title / subtitle / sku / handle). Omit or leave empty (or do NOT pass it at all) to list all products. NEVER use "*", "**", or "%" — they are not wildcards and will be discarded.'),
-    limit: z.number().int().min(1).max(100).optional().describe('Page size. Default 50, hard maximum 100. Results are paginated: keep calling with the next `offset` until a page returns fewer than `limit` items, instead of asking for more than 100 rows. Do not treat `offset >= total` as the end — `total` is a floor when `totalIsCapped` is true.'),
+    limit: z.number().int().min(1).max(100).optional().describe('Page size. Default 50, hard maximum 100. Results are paginated: when `total` exceeds `limit + offset`, call again with the next `offset` instead of asking for more than 100 rows.'),
     offset: z.number().int().min(0).optional().describe('Rows to skip for pagination (default 0). Combine with `limit` to fetch subsequent pages — for example offset=100, limit=100 fetches rows 101..200.'),
     categoryId: z.string().optional().describe('Restrict to products assigned to this catalog category UUID. Only use a category ID returned by a previous tool call — do NOT guess. Empty string is treated the same as omitting the field.'),
     priceMin: z.number().optional().describe('Lower-bound (inclusive) on the gross unit price. OMIT this field when you do not want a lower bound — do NOT pass 0 as "no minimum", because 0 is a real bound that combined with priceMax=0 will return only free products.'),
@@ -266,7 +266,7 @@ const searchProductsTool: CatalogAiToolDefinition = {
   displayName: 'Search products',
   description:
     'Hybrid search + filter across tenant products. When `q` is non-empty, routes through the search service (tenant + organization scoped) then hydrates tenant-scoped product summaries; when `q` is empty or omitted, runs the catalog query engine with the supplied filters and returns ALL products. ' +
-    'Pagination: response shape is `{ items, total, totalIsCapped, limit, offset, source }`. Hard cap is 100 rows per call (`limit` max=100, default=50); keep calling with the next `offset` until a page returns fewer than `limit` items, rather than asking for >100. When `totalIsCapped` is true, `total` is a floor — render it as "at least N" and never treat `offset >= total` as exhaustion. ' +
+    'Pagination: response shape is `{ items, total, limit, offset, source }`. Hard cap is 100 rows per call (`limit` max=100, default=50); if `total` exceeds `limit + offset`, call again with the next `offset` rather than asking for >100. ' +
     'Empty / sentinel inputs: pass an empty `q` (or omit it) to list all products. NEVER pass `0` for `priceMin`/`priceMax` to mean "no bound" — `0` is a real numeric bound (priceMin=0 + priceMax=0 returns only free products). To remove a bound, OMIT the field. Empty string `categoryId` and empty `tags` arrays are ignored. ' +
     '`source` in the output indicates which path executed (`search_service` vs `query_engine`).',
   inputSchema: searchProductsInput,

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

@@ -73,8 +73,6 @@ export interface MerchandisingPageContext {
   extra: {
     filter: MerchandisingPageContextFilter
     totalMatching: number
-    /** `totalMatching` is a floor, not an exact count (server-capped list count). */
-    totalMatchingIsCapped?: boolean
     selectedCount: number
   }
 }
@@ -183,7 +181,7 @@ function useContextItems(pageContext: MerchandisingPageContext): AiChatContextIt
   const t = useT()
   return React.useMemo(() => {
     const items: AiChatContextItem[] = []
-    const { selectedCount, totalMatching, totalMatchingIsCapped, filter } = pageContext.extra
+    const { selectedCount, totalMatching, filter } = pageContext.extra
     if (selectedCount > 0) {
       items.push({
         label: t(
@@ -193,15 +191,10 @@ function useContextItems(pageContext: MerchandisingPageContext): AiChatContextIt
       })
     } else if (totalMatching > 0) {
       items.push({
-        label: totalMatchingIsCapped
-          ? t(
-              'catalog.merchandising_assistant.context.matchingProductsCapped',
-              '{count}+ products in view',
-            ).replace('{count}', String(totalMatching))
-          : t(
-              'catalog.merchandising_assistant.context.matchingProducts',
-              '{count} products in view',
-            ).replace('{count}', String(totalMatching)),
+        label: t(
+          'catalog.merchandising_assistant.context.matchingProducts',
+          '{count} products in view',
+        ).replace('{count}', String(totalMatching)),
       })
     }
     if (filter.categoryId) {

package/src/modules/catalog/components/categories/CategoriesDataTable.tsx

@@ -39,7 +39,6 @@ type CategoriesResponse = {
   page: number
   pageSize: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 const PAGE_SIZE = 50
@@ -115,7 +114,6 @@ export default function CategoriesDataTable() {
   const rows = data?.items ?? []
   const total = data?.total ?? 0
   const totalPages = data?.totalPages ?? 0
-  const totalIsCapped = data?.totalIsCapped === true
 
   const columns = React.useMemo<ColumnDef<CategoryRow>[]>(() => [
     {
@@ -251,7 +249,6 @@ export default function CategoriesDataTable() {
           pageSize: PAGE_SIZE,
           total,
           totalPages,
-          totalIsCapped,
           onPageChange: setPage,
         }}
         isLoading={isLoading}

package/src/modules/catalog/components/products/ProductsDataTable.tsx

@@ -86,7 +86,6 @@ type ProductsResponse = {
   items?: ProductRow[]
   total?: number
   totalPages?: number
-  totalIsCapped?: boolean
 }
 
 const PAGE_SIZE = 25
@@ -178,7 +177,6 @@ export default function ProductsDataTable({
   const [page, setPage] = React.useState(1)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [cacheStatus, setCacheStatus] = React.useState<'hit' | 'miss' | null>(null)
   const [sorting, setSorting] = React.useState<SortingState>([{ id: 'title', desc: false }])
   const [search, setSearch] = React.useState('')
@@ -600,7 +598,6 @@ export default function ProductsDataTable({
         setRows(normalized)
         setTotal(typeof payload.total === 'number' ? payload.total : normalized.length)
         setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : 1)
-        setTotalIsCapped(payload.totalIsCapped === true)
       } catch (error) {
         if (!cancelled) {
           setCacheStatus(null)
@@ -715,16 +712,12 @@ export default function ProductsDataTable({
           // dependency on the host page.
           total,
           totalMatching: total,
-          // `total` is a floor when the server capped the count, so the
-          // merchandising widget must not present it as an exact match count.
-          totalIsCapped,
         }}
         pagination={{
           page,
           pageSize: PAGE_SIZE,
           total,
           totalPages,
-          totalIsCapped,
           onPageChange: setPage,
           cacheStatus,
         }}

package/src/modules/catalog/i18n/de.json

@@ -90,7 +90,6 @@
   "catalog.merchandising_assistant.agents.merchandising.label": "Merchandising-Assistent",
   "catalog.merchandising_assistant.context.filteredByCategory": "Filtered by category",
   "catalog.merchandising_assistant.context.matchingProducts": "{count} Produkte in der Ansicht",
-  "catalog.merchandising_assistant.context.matchingProductsCapped": "{count}+ Produkte in der Ansicht",
   "catalog.merchandising_assistant.context.selectedProducts": "{count} Produkte ausgewählt",
   "catalog.merchandising_assistant.context.tags": "{count} tags",
   "catalog.merchandising_assistant.dock.subtitle": "Catalog",

package/src/modules/catalog/i18n/en.json

@@ -90,7 +90,6 @@
   "catalog.merchandising_assistant.agents.merchandising.label": "Merchandising Assistant",
   "catalog.merchandising_assistant.context.filteredByCategory": "Filtered by category",
   "catalog.merchandising_assistant.context.matchingProducts": "{count} products in view",
-  "catalog.merchandising_assistant.context.matchingProductsCapped": "{count}+ products in view",
   "catalog.merchandising_assistant.context.selectedProducts": "{count} products selected",
   "catalog.merchandising_assistant.context.tags": "{count} tags",
   "catalog.merchandising_assistant.dock.subtitle": "Catalog",

package/src/modules/catalog/i18n/es.json

@@ -90,7 +90,6 @@
   "catalog.merchandising_assistant.agents.merchandising.label": "Asistente de Merchandising",
   "catalog.merchandising_assistant.context.filteredByCategory": "Filtered by category",
   "catalog.merchandising_assistant.context.matchingProducts": "{count} productos en la vista",
-  "catalog.merchandising_assistant.context.matchingProductsCapped": "{count}+ productos en la vista",
   "catalog.merchandising_assistant.context.selectedProducts": "{count} productos seleccionados",
   "catalog.merchandising_assistant.context.tags": "{count} tags",
   "catalog.merchandising_assistant.dock.subtitle": "Catalog",

package/src/modules/catalog/i18n/ko.json

@@ -90,7 +90,6 @@
   "catalog.merchandising_assistant.agents.merchandising.label": "머천다이징 어시스턴트",
   "catalog.merchandising_assistant.context.filteredByCategory": "카테고리로 필터링됨",
   "catalog.merchandising_assistant.context.matchingProducts": "{count} 제품 보기",
-  "catalog.merchandising_assistant.context.matchingProductsCapped": "조회 중 {count}+개 제품",
   "catalog.merchandising_assistant.context.selectedProducts": "{count} 제품 선택됨",
   "catalog.merchandising_assistant.context.tags": "태그 {count}개",
   "catalog.merchandising_assistant.dock.subtitle": "카탈로그",

package/src/modules/catalog/i18n/pl.json

@@ -90,7 +90,6 @@
   "catalog.merchandising_assistant.agents.merchandising.label": "Asystent merchandisingu",
   "catalog.merchandising_assistant.context.filteredByCategory": "Filtrowane po kategorii",
   "catalog.merchandising_assistant.context.matchingProducts": "{count} produktów w widoku",
-  "catalog.merchandising_assistant.context.matchingProductsCapped": "{count}+ produktów w widoku",
   "catalog.merchandising_assistant.context.selectedProducts": "Wybrano {count} produktów",
   "catalog.merchandising_assistant.context.tags": "Tagi: {count}",
   "catalog.merchandising_assistant.dock.subtitle": "Katalog",