@open-mercato/core 0.6.7-develop.6862.1.c11a64ce0a → 0.6.7

package/src/modules/entities/components/SystemEntitiesTable.tsx

@@ -1,6 +1,5 @@
 "use client"
 import * as React from 'react'
-import { extensionPoints } from '@open-mercato/core/modules/entities/extension-points'
 import { useQuery } from '@tanstack/react-query'
 import type { ColumnDef, SortingState } from '@tanstack/react-table'
 import { DataTable } from '@open-mercato/ui/backend/DataTable'
@@ -74,7 +73,7 @@ export default function SystemEntitiesTable() {
       sortable
       sorting={sorting}
       onSortingChange={setSorting}
-      perspective={{ tableId: extensionPoints.hosts.systemEntitiesTable.tableId }}
+      perspective={{ tableId: 'entities.system.list' }}
       rowActions={(row) => (
         <RowActions
           items={[

package/src/modules/entities/components/UserEntitiesTable.tsx

@@ -1,7 +1,6 @@
 
 "use client"
 import * as React from 'react'
-import { extensionPoints } from '@open-mercato/core/modules/entities/extension-points'
 import Link from 'next/link'
 import { useQuery } from '@tanstack/react-query'
 import type { ColumnDef, SortingState } from '@tanstack/react-table'
@@ -97,7 +96,7 @@ export default function UserEntitiesTable() {
       sortable
       sorting={sorting}
       onSortingChange={setSorting}
-      perspective={{ tableId: extensionPoints.hosts.userEntitiesTable.tableId }}
+      perspective={{ tableId: 'entities.user.list' }}
       emptyState={(
         <ListEmptyState
           entityName={t('entities.user.table.title', 'User Entities')}

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

@@ -196,14 +196,6 @@
   "entities.nav.systemEntities": "Systementitäten",
   "entities.nav.userEntities": "Benutzerentitäten",
   "entities.nav.userEntities.create": "Entität erstellen",
-  "entities.settings.description": "Globale Konfigurationen für benutzerdefinierte Entitäten verwalten.",
-  "entities.settings.errors.conflict": "Die Einstellungen wurden von einem anderen Benutzer geändert. Bitte neu laden.",
-  "entities.settings.errors.loadFailed": "Laden der Einstellungen fehlgeschlagen",
-  "entities.settings.errors.saveFailed": "Speichern der Einstellungen fehlgeschlagen",
-  "entities.settings.flash.saved": "Einstellungen gespeichert",
-  "entities.settings.newEntitiesRestrictedByDefault.description": "Für Datensätze neu erstellter benutzerdefinierter Entitäten standardmäßig explizite Berechtigungen pro Entität erfordern.",
-  "entities.settings.newEntitiesRestrictedByDefault.label": "Datensatzzugriff standardmäßig einschränken",
-  "entities.settings.title": "Benutzerdefinierte Entitäten",
   "entities.userEntities.edit.errors.deleteEntityFailed": "Entität konnte nicht gelöscht werden",
   "entities.userEntities.edit.errors.invalidEntityDescription": "Die angeforderte Entitäts-ID fehlt oder ist ungültig.",
   "entities.userEntities.edit.errors.invalidEntityId": "Ungültige Entitäts-ID",
@@ -229,7 +221,6 @@
   "entities.userEntities.errors.entityIdExists": "Entitäts-ID ist bereits vorhanden",
   "entities.userEntities.errors.entityIdRequired": "Entitäts-ID ist erforderlich",
   "entities.userEntities.errors.loadFailed": "Entitäten konnten nicht geladen werden",
-  "entities.userEntities.errors.settingsLoadFailed": "Standardeinschränkungsrichtlinie konnte nicht geladen werden; Standardwert wird verwendet",
   "entities.userEntities.flash.created": "Entität erstellt",
   "entities.userEntities.form.accessRestricted.help": "Erfordert eine explizite entitätsspezifische Berechtigung zum Anzeigen oder Verwalten der Datensätze dieser Entität. Deaktiviert lassen, um allen Benutzern mit der allgemeinen Datensatzberechtigung Zugriff zu gewähren.",
   "entities.userEntities.form.accessRestricted.label": "Datensatzzugriff einschränken",

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

@@ -196,14 +196,6 @@
   "entities.nav.systemEntities": "System Entities",
   "entities.nav.userEntities": "User Entities",
   "entities.nav.userEntities.create": "Create Entity",
-  "entities.settings.description": "Manage global custom entity configurations.",
-  "entities.settings.errors.conflict": "Settings were modified by another user. Please reload.",
-  "entities.settings.errors.loadFailed": "Failed to load settings",
-  "entities.settings.errors.saveFailed": "Failed to save settings",
-  "entities.settings.flash.saved": "Settings saved",
-  "entities.settings.newEntitiesRestrictedByDefault.description": "Require explicit per-entity permissions for records of newly created custom entities by default.",
-  "entities.settings.newEntitiesRestrictedByDefault.label": "Restrict record access by default",
-  "entities.settings.title": "Custom Entities",
   "entities.userEntities.edit.errors.deleteEntityFailed": "Failed to delete entity",
   "entities.userEntities.edit.errors.invalidEntityDescription": "The requested entity ID is missing or invalid.",
   "entities.userEntities.edit.errors.invalidEntityId": "Invalid entity ID",
@@ -229,7 +221,6 @@
   "entities.userEntities.errors.entityIdExists": "Entity ID already exists",
   "entities.userEntities.errors.entityIdRequired": "Entity ID is required",
   "entities.userEntities.errors.loadFailed": "Failed to load entities",
-  "entities.userEntities.errors.settingsLoadFailed": "Could not load default restriction policy; using default",
   "entities.userEntities.flash.created": "Entity created",
   "entities.userEntities.form.accessRestricted.help": "Require an explicit per-entity permission to view or manage this entity’s records. Leave off to allow anyone with the general records permission.",
   "entities.userEntities.form.accessRestricted.label": "Restrict record access",

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

@@ -196,14 +196,6 @@
   "entities.nav.systemEntities": "Entidades del sistema",
   "entities.nav.userEntities": "Entidades de usuario",
   "entities.nav.userEntities.create": "Crear entidad",
-  "entities.settings.description": "Administrar configuraciones globales de entidades personalizadas.",
-  "entities.settings.errors.conflict": "La configuración fue modificada por otro usuario. Por favor recarga.",
-  "entities.settings.errors.loadFailed": "Error al cargar la configuración",
-  "entities.settings.errors.saveFailed": "Error al guardar la configuración",
-  "entities.settings.flash.saved": "Configuración guardada",
-  "entities.settings.newEntitiesRestrictedByDefault.description": "Requerir permisos explícitos por entidad para registros de nuevas entidades creadas por defecto.",
-  "entities.settings.newEntitiesRestrictedByDefault.label": "Restringir acceso a registros por defecto",
-  "entities.settings.title": "Entidades personalizadas",
   "entities.userEntities.edit.errors.deleteEntityFailed": "No se pudo eliminar la entidad",
   "entities.userEntities.edit.errors.invalidEntityDescription": "Falta el ID de la entidad solicitada o no es válido.",
   "entities.userEntities.edit.errors.invalidEntityId": "ID de entidad no válido",
@@ -229,7 +221,6 @@
   "entities.userEntities.errors.entityIdExists": "El ID de la entidad ya existe",
   "entities.userEntities.errors.entityIdRequired": "El ID de la entidad es obligatorio",
   "entities.userEntities.errors.loadFailed": "No se pudieron cargar las entidades",
-  "entities.userEntities.errors.settingsLoadFailed": "No se pudo cargar la política de restricción por defecto; usando valor predeterminado",
   "entities.userEntities.flash.created": "Entidad creada",
   "entities.userEntities.form.accessRestricted.help": "Requiere un permiso explícito por entidad para ver o gestionar los registros de esta entidad. Déjalo desactivado para permitir el acceso a cualquiera con el permiso general de registros.",
   "entities.userEntities.form.accessRestricted.label": "Restringir acceso a registros",

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

@@ -196,14 +196,6 @@
   "entities.nav.systemEntities": "Encje systemowe",
   "entities.nav.userEntities": "Encje użytkownika",
   "entities.nav.userEntities.create": "Utwórz encję",
-  "entities.settings.description": "Zarządzaj globalnymi ustawieniami niestandardowych encji.",
-  "entities.settings.errors.conflict": "Ustawienia zostały zmodyfikowane przez innego użytkownika. Proszę przeładować.",
-  "entities.settings.errors.loadFailed": "Nie udało się załadować ustawień",
-  "entities.settings.errors.saveFailed": "Nie udało się zapisać ustawień",
-  "entities.settings.flash.saved": "Ustawienia zostały zapisane",
-  "entities.settings.newEntitiesRestrictedByDefault.description": "Domyślnie wymagaj jawnych uprawnień dla poszczególnych encji do rekordów nowo tworzonych niestandardowych encji.",
-  "entities.settings.newEntitiesRestrictedByDefault.label": "Domyślnie ograniczaj dostęp do rekordów",
-  "entities.settings.title": "Niestandardowe encje",
   "entities.userEntities.edit.errors.deleteEntityFailed": "Nie udało się usunąć encji",
   "entities.userEntities.edit.errors.invalidEntityDescription": "Brakuje identyfikatora encji albo jest on nieprawidłowy.",
   "entities.userEntities.edit.errors.invalidEntityId": "Nieprawidłowy identyfikator encji",
@@ -229,7 +221,6 @@
   "entities.userEntities.errors.entityIdExists": "Identyfikator encji już istnieje",
   "entities.userEntities.errors.entityIdRequired": "Identyfikator encji jest wymagany",
   "entities.userEntities.errors.loadFailed": "Nie udało się wczytać encji",
-  "entities.userEntities.errors.settingsLoadFailed": "Nie udało się załadować domyślnej polityki ograniczeń; używanie wartości domyślnej",
   "entities.userEntities.flash.created": "Encja została utworzona",
   "entities.userEntities.form.accessRestricted.help": "Wymaga jawnego uprawnienia dla tej encji, aby przeglądać lub zarządzać jej rekordami. Pozostaw wyłączone, aby zezwolić na dostęp każdemu z ogólnym uprawnieniem do rekordów.",
   "entities.userEntities.form.accessRestricted.label": "Ogranicz dostęp do rekordów",

package/src/modules/entities/lib/entityAcl.ts

@@ -1,7 +1,6 @@
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { hasAllFeatures } from '@open-mercato/shared/security/features'
 import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
-import { getModules } from '@open-mercato/shared/lib/i18n/server'
-import { authorizeFeatures } from '@open-mercato/shared/security/featurePolicy'
 import { deriveCustomEntityRecordFeature } from './recordFeatures'
 
 export type EntityAclRequirement = {
@@ -66,79 +65,10 @@ const ENTITY_ACL_REQUIREMENTS: Record<string, EntityAclRequirement> = {
   },
 }
 
-let declaredCustomEntityRestrictions: Map<string, boolean> | null = null
-
-function loadDeclaredCustomEntityRestrictions(): Map<string, boolean> {
-  if (declaredCustomEntityRestrictions === null) {
-    try {
-      const modules = getModules() as Array<{
-        customEntities?: Array<{ id?: string; accessRestricted?: boolean }>
-      }>
-      const restrictions = new Map<string, boolean>()
-      for (const moduleEntry of modules ?? []) {
-        for (const spec of moduleEntry.customEntities ?? []) {
-          if (spec.id) restrictions.set(spec.id, spec.accessRestricted === true)
-        }
-      }
-      declaredCustomEntityRestrictions = restrictions
-    } catch {}
-  }
-  return declaredCustomEntityRestrictions ?? new Map<string, boolean>()
-}
-
-export function getDeclaredCustomEntityRestriction(entityId: string): boolean | undefined {
-  return loadDeclaredCustomEntityRestrictions().get(entityId)
-}
-
-export function isDeclaredCustomEntity(entityId: string): boolean {
-  return loadDeclaredCustomEntityRestrictions().has(entityId)
-}
-
 export function resolveEntityAclRequirement(entityId: string): EntityAclRequirement | null {
   return ENTITY_ACL_REQUIREMENTS[entityId] ?? null
 }
 
-export function canReadAllEntityMetadata(acl: {
-  isSuperAdmin?: boolean
-  features?: readonly string[]
-}): boolean {
-  return authorizeFeatures(['entities.definitions.view'], {
-    grantedFeatures: acl.features ?? [],
-    unrestricted: Boolean(acl.isSuperAdmin),
-  })
-}
-
-export function canReadEntityMetadata(args: {
-  entityId: string
-  isCustomEntity: boolean
-  isRestricted?: boolean
-  acl: { isSuperAdmin?: boolean; features?: readonly string[] }
-}): boolean {
-  const requirement = resolveEntityAclRequirement(args.entityId)
-  if (requirement?.platformOnly) {
-    return Boolean(args.acl.isSuperAdmin) && authorizeFeatures(requirement.view, {
-      grantedFeatures: args.acl.features ?? [],
-      unrestricted: true,
-    })
-  }
-  if (canReadAllEntityMetadata(args.acl)) return true
-  if (args.isCustomEntity) {
-    const requiredFeatures = ['entities.records.view']
-    if (args.isRestricted) {
-      requiredFeatures.push(deriveCustomEntityRecordFeature(args.entityId, 'view'))
-    }
-    return authorizeFeatures(requiredFeatures, {
-      grantedFeatures: args.acl.features ?? [],
-      unrestricted: Boolean(args.acl.isSuperAdmin),
-    })
-  }
-  if (!requirement) return Boolean(args.acl.isSuperAdmin)
-  return authorizeFeatures(requirement.view, {
-    grantedFeatures: args.acl.features ?? [],
-    unrestricted: Boolean(args.acl.isSuperAdmin),
-  })
-}
-
 type EntityAclActor = {
   sub?: string | null
   tenantId?: string | null
@@ -175,16 +105,11 @@ export async function assertEntityAclForRequest(args: AssertEntityAclArgs): Prom
     // entities.records.view/.manage route guard is the whole authorization.
     if (!args.isRestricted) return
 
+    const acl = await loadActorAcl(args)
+    if (acl?.isSuperAdmin) return
+
     const required = deriveCustomEntityRecordFeature(args.entityId, args.action)
-    const allowed = await args.rbac.userHasAllFeatures(
-      args.auth.sub ?? '',
-      [required],
-      {
-        tenantId: args.auth.tenantId ?? null,
-        organizationId: args.auth.orgId ?? null,
-      },
-    )
-    if (!allowed) {
+    if (!hasAllFeatures(acl?.features, [required])) {
       throw forbiddenEntityAccess()
     }
     return
@@ -192,26 +117,14 @@ export async function assertEntityAclForRequest(args: AssertEntityAclArgs): Prom
 
   const requirement = resolveEntityAclRequirement(args.entityId)
 
-  if (!requirement) {
-    const acl = await loadActorAcl(args)
-    if (!acl.isSuperAdmin) throw forbiddenEntityAccess()
-    return
-  }
+  const acl = await loadActorAcl(args)
 
-  if (requirement.platformOnly) {
-    const acl = await loadActorAcl(args)
-    if (!acl.isSuperAdmin) throw forbiddenEntityAccess()
-  }
+  if (acl?.isSuperAdmin) return
+
+  if (!requirement) throw forbiddenEntityAccess()
+  if (requirement.platformOnly) throw forbiddenEntityAccess()
 
-  const allowed = await args.rbac.userHasAllFeatures(
-    args.auth.sub ?? '',
-    requirement[args.action],
-    {
-      tenantId: args.auth.tenantId ?? null,
-      organizationId: args.auth.orgId ?? null,
-    },
-  )
-  if (!allowed) {
+  if (!hasAllFeatures(acl?.features, requirement[args.action])) {
     throw forbiddenEntityAccess()
   }
 }

package/src/modules/feature_toggles/components/FeatureGuard.tsx

@@ -8,30 +8,23 @@ export type FeatureGuardProps = {
   children: React.ReactNode
   fallback?: React.ReactNode
   loadingFallback?: React.ReactNode
-  defaultValue?: boolean
 }
 
 /**
  * FeatureGuard component that conditionally renders children based on feature toggle state.
- *
+ * 
  * @param id - The feature toggle identifier
  * @param children - Content to render when the feature is enabled
  * @param fallback - Optional content to render when the feature is disabled
  * @param loadingFallback - Optional content to render while loading the feature state
- * @param defaultValue - Toggle value assumed when the check cannot be resolved
- *   (undefined toggle, type mismatch, network or permission failure). Defaults
- *   to `false`; pass `true` to keep guarded UI visible when the check fails.
- *   Distinct from `fallback`, which is what gets rendered once the feature is
- *   known to be disabled.
  */
 export function FeatureGuard({
   id,
   children,
   fallback = null,
   loadingFallback = null,
-  defaultValue = false,
 }: FeatureGuardProps) {
-  const { enabled, isLoading } = useFeatureFlagBoolean({ id, defaultValue })
+  const { enabled, isLoading } = useFeatureFlagBoolean({ id })
 
   if (isLoading) {
     return <>{loadingFallback}</>

package/src/modules/feature_toggles/components/hooks/useFeatureFlagBoolean.ts

@@ -2,19 +2,9 @@
 
 import { useQuery } from '@tanstack/react-query'
 import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
-import { FEATURE_FLAG_STALE_TIME_MS } from './staleTime'
 
 export type UseFeatureFlagOptions = {
   id: string
-  /**
-   * Value used while the check is in flight and whenever the toggle cannot be
-   * resolved (undefined toggle, type mismatch, network or permission failure).
-   *
-   * Defaults to `false` so an unresolved toggle keeps a feature switched off.
-   * Pass `true` for toggles that hide existing UI — there a failed check must
-   * not make the feature disappear.
-   */
-  defaultValue?: boolean
 }
 
 export type UseFeatureFlagResult = {
@@ -31,7 +21,6 @@ type Result<T> = {
 }
 
 export function useFeatureFlagBoolean(options: UseFeatureFlagOptions): UseFeatureFlagResult {
-  const defaultValue = options.defaultValue ?? false
   const query = useQuery({
     queryKey: ['featureToggles', 'check', options?.id],
     queryFn: async () => {
@@ -48,10 +37,9 @@ export function useFeatureFlagBoolean(options: UseFeatureFlagOptions): UseFeatur
       return result
     },
     enabled: !!options.id,
-    staleTime: FEATURE_FLAG_STALE_TIME_MS,
   })
 
-  const enabled = query.data?.ok ? query.data.value : defaultValue
+  const enabled = query.data?.ok ? query.data.value : false
   const isLoading = query.isLoading
 
   return {

package/src/modules/feature_toggles/components/hooks/useFeatureFlagJson.ts

@@ -2,16 +2,9 @@
 
 import { useQuery } from '@tanstack/react-query'
 import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
-import { FEATURE_FLAG_STALE_TIME_MS } from './staleTime'
 
-export type UseFeatureFlagJsonOptions<T = unknown> = {
+export type UseFeatureFlagJsonOptions = {
     id: string
-    /**
-     * Value used while the check is in flight and whenever the toggle cannot be
-     * resolved (undefined toggle, type mismatch, network or permission failure).
-     * Defaults to `null`.
-     */
-    defaultValue?: T | null
 }
 
 export type UseFeatureFlagJsonResult<T = unknown> = {
@@ -27,8 +20,7 @@ type Result<T> = {
     error: unknown
 }
 
-export function useFeatureFlagJson<T = unknown>(options: UseFeatureFlagJsonOptions<T>): UseFeatureFlagJsonResult<T> {
-    const defaultValue = options.defaultValue ?? null
+export function useFeatureFlagJson<T = unknown>(options: UseFeatureFlagJsonOptions): UseFeatureFlagJsonResult<T> {
     const query = useQuery({
         queryKey: ['featureToggles', 'check', 'json', options?.id],
         queryFn: async () => {
@@ -45,10 +37,9 @@ export function useFeatureFlagJson<T = unknown>(options: UseFeatureFlagJsonOptio
             return result
         },
         enabled: !!options.id,
-        staleTime: FEATURE_FLAG_STALE_TIME_MS,
     })
 
-    const value = query.data?.ok ? query.data.value : defaultValue
+    const value = query.data?.ok ? query.data.value : null
     const isLoading = query.isLoading
 
     return {

package/src/modules/feature_toggles/components/hooks/useFeatureFlagNumber.ts

@@ -2,16 +2,9 @@
 
 import { useQuery } from '@tanstack/react-query'
 import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
-import { FEATURE_FLAG_STALE_TIME_MS } from './staleTime'
 
 export type UseFeatureFlagNumberOptions = {
     id: string
-    /**
-     * Value used while the check is in flight and whenever the toggle cannot be
-     * resolved (undefined toggle, type mismatch, network or permission failure).
-     * Defaults to `null`.
-     */
-    defaultValue?: number | null
 }
 
 export type UseFeatureFlagNumberResult = {
@@ -28,7 +21,6 @@ type Result<T> = {
 }
 
 export function useFeatureFlagNumber(options: UseFeatureFlagNumberOptions): UseFeatureFlagNumberResult {
-    const defaultValue = options.defaultValue ?? null
     const query = useQuery({
         queryKey: ['featureToggles', 'check', 'number', options?.id],
         queryFn: async () => {
@@ -45,10 +37,9 @@ export function useFeatureFlagNumber(options: UseFeatureFlagNumberOptions): UseF
             return result
         },
         enabled: !!options.id,
-        staleTime: FEATURE_FLAG_STALE_TIME_MS,
     })
 
-    const value = query.data?.ok ? query.data.value : defaultValue
+    const value = query.data?.ok ? query.data.value : null
     const isLoading = query.isLoading
 
     return {

package/src/modules/feature_toggles/components/hooks/useFeatureFlagString.ts

@@ -2,16 +2,9 @@
 
 import { useQuery } from '@tanstack/react-query'
 import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
-import { FEATURE_FLAG_STALE_TIME_MS } from './staleTime'
 
 export type UseFeatureFlagStringOptions = {
     id: string
-    /**
-     * Value used while the check is in flight and whenever the toggle cannot be
-     * resolved (undefined toggle, type mismatch, network or permission failure).
-     * Defaults to `null`.
-     */
-    defaultValue?: string | null
 }
 
 export type UseFeatureFlagStringResult = {
@@ -28,7 +21,6 @@ type Result<T> = {
 }
 
 export function useFeatureFlagString(options: UseFeatureFlagStringOptions): UseFeatureFlagStringResult {
-    const defaultValue = options.defaultValue ?? null
     const query = useQuery({
         queryKey: ['featureToggles', 'check', 'string', options?.id],
         queryFn: async () => {
@@ -45,10 +37,9 @@ export function useFeatureFlagString(options: UseFeatureFlagStringOptions): UseF
             return result
         },
         enabled: !!options.id,
-        staleTime: FEATURE_FLAG_STALE_TIME_MS,
     })
 
-    const value = query.data?.ok ? query.data.value : defaultValue
+    const value = query.data?.ok ? query.data.value : null
     const isLoading = query.isLoading
 
     return {

package/src/modules/inbox_ops/ai-tools.ts

@@ -3,7 +3,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import type { AwilixContainer } from 'awilix'
 import { runWithCacheTenant } from '@open-mercato/cache'
 import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
-import { authorizeFeatures } from '@open-mercato/shared/security/featurePolicy'
+import { hasFeature } from '@open-mercato/shared/security/features'
 import { InboxProposal, InboxProposalAction, InboxDiscrepancy } from './data/entities'
 import { inboxProposalCategoryEnum } from './data/validators'
 import { executeAction } from './lib/executionEngine'
@@ -311,10 +311,8 @@ Returns on error: error message with appropriate detail.`,
 
     // Check target module permission
     if (action.requiredFeature) {
-      const featureGranted = authorizeFeatures([action.requiredFeature], {
-        grantedFeatures: ctx.userFeatures,
-        unrestricted: ctx.isSuperAdmin,
-      })
+      const featureGranted =
+        ctx.isSuperAdmin || hasFeature(ctx.userFeatures, action.requiredFeature)
       if (!featureGranted) {
         return {
           error: 'Insufficient permissions',

package/src/modules/inbox_ops/api/proposals/[id]/actions/[actionId]/route.ts

@@ -1,8 +1,6 @@
 import { NextResponse } from 'next/server'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { runWithCacheTenant } from '@open-mercato/cache'
-import { enforceCommandOptimisticLockWithGuards } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
-import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import {
   runCrudMutationGuardAfterSuccess,
   validateCrudMutationGuard,
@@ -42,20 +40,6 @@ export async function PATCH(req: Request) {
       return NextResponse.json({ error: 'Action already processed' }, { status: 409 })
     }
 
-    // Optimistic lock: refuse a stale overwrite when two tabs edit the same action
-    // payload. Strictly additive — a no-op without the expected-version header.
-    try {
-      await enforceCommandOptimisticLockWithGuards(ctx.container, {
-        resourceKind: 'inbox_ops.action',
-        resourceId: action.id,
-        current: action.updatedAt ?? null,
-        request: req,
-      })
-    } catch (err) {
-      if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
-      throw err
-    }
-
     const mergedPayload = { ...action.payload as Record<string, unknown>, ...parsed.data.payload }
     const payloadValidation = validateActionPayloadForType(action.actionType, mergedPayload)
     if (!payloadValidation.success) {
@@ -124,7 +108,7 @@ export const openApi: OpenApiRouteDoc = {
       responses: [
         { status: 200, description: 'Action updated' },
         { status: 404, description: 'Action not found' },
-        { status: 409, description: 'Action already processed or stale (optimistic-lock conflict)' },
+        { status: 409, description: 'Action already processed' },
       ],
     },
   },

package/src/modules/inbox_ops/api/proposals/route.ts

@@ -4,8 +4,6 @@ import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import type { FilterQuery } from '@mikro-orm/postgresql'
 import { findAndCountWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
-import { findEntityIdsBySearchTokens, type SearchTokenDatabase } from '@open-mercato/shared/lib/search/tokenLookup'
-import { E } from '#generated/entities.ids.generated'
 import { InboxProposal, InboxEmail, InboxProposalAction, InboxDiscrepancy, type InboxProposalCategory } from '../../data/entities'
 import { proposalListQuerySchema } from '../../data/validators'
 import { resolveRequestContext, UnauthorizedError } from '../routeHelpers'
@@ -49,24 +47,7 @@ export async function GET(req: Request) {
       }
     }
     if (query.search) {
-      // `summary` is covered by the inbox_ops encryption map, so an ILIKE alone
-      // compares the pattern against ciphertext and matches nothing once
-      // encryption is on. Union it with the token index, which stores hashes of
-      // the plaintext. Issue #2990.
-      const searchOr: FilterQuery<InboxProposal>[] = [
-        { summary: { $ilike: `%${escapeLikePattern(query.search)}%` } },
-      ]
-      const tokenMatch = await findEntityIdsBySearchTokens({
-        db: ctx.em.getKysely<SearchTokenDatabase>(),
-        entityType: E.inbox_ops.inbox_proposal,
-        query: query.search,
-        fields: ['summary'],
-        scope: { tenantId: ctx.tenantId, organizationId: ctx.organizationId },
-      })
-      if (tokenMatch.matched && tokenMatch.ids.length) {
-        searchOr.push({ id: { $in: tokenMatch.ids } })
-      }
-      where.$or = searchOr
+      where.summary = { $ilike: `%${escapeLikePattern(query.search)}%` }
     }
 
     const offset = (query.page - 1) * query.pageSize

package/src/modules/inbox_ops/api/webhook/inbound.ts

@@ -13,11 +13,6 @@ import { parseInboundEmail } from '../../lib/emailParser'
 import { checkRateLimit } from '../../lib/rateLimiter'
 import { emitInboxOpsEvent } from '../../events'
 import { createLogger } from '@open-mercato/shared/lib/logger'
-import {
-  readBoundedRequestBody,
-  resolveWebhookBodyLimitBytes,
-  WebhookBodyTooLargeError,
-} from '@open-mercato/shared/lib/webhooks'
 
 const logger = createLogger('inbox_ops').child({ component: 'webhook' })
 
@@ -25,10 +20,7 @@ export const metadata = {
   POST: { requireAuth: false },
 }
 
-const MAX_PAYLOAD_SIZE = resolveWebhookBodyLimitBytes(
-  process.env.INBOX_OPS_WEBHOOK_MAX_BODY_BYTES ?? process.env.OM_WEBHOOK_MAX_BODY_BYTES,
-  2 * 1024 * 1024,
-)
+const MAX_PAYLOAD_SIZE = 2 * 1024 * 1024 // 2MB
 const REPLAY_WINDOW_MS = 5 * 60 * 1000 // 5 minutes
 
 function isTimestampFresh(timestamp: string): boolean {
@@ -219,16 +211,22 @@ export async function POST(req: Request) {
     return NextResponse.json({ error: 'Service unavailable' }, { status: 503 })
   }
 
+  const contentLength = parseInt(req.headers.get('content-length') || '0', 10)
+  if (contentLength > MAX_PAYLOAD_SIZE) {
+    return NextResponse.json({ error: 'Payload too large' }, { status: 413 })
+  }
+
   let rawBody: string
   try {
-    rawBody = await readBoundedRequestBody(req, { maxBytes: MAX_PAYLOAD_SIZE })
-  } catch (error) {
-    if (error instanceof WebhookBodyTooLargeError) {
-      return NextResponse.json({ error: 'Payload too large' }, { status: 413 })
-    }
+    rawBody = await req.text()
+  } catch {
     return NextResponse.json({ error: 'Bad request' }, { status: 400 })
   }
 
+  if (rawBody.length > MAX_PAYLOAD_SIZE) {
+    return NextResponse.json({ error: 'Payload too large' }, { status: 413 })
+  }
+
   const verified = await verifyAndParse(req, rawBody)
   if (!verified.ok) {
     return verified.response

package/src/modules/inbox_ops/backend/inbox-ops/log/page.tsx

@@ -31,11 +31,11 @@ type EmailListResponse = {
 }
 
 const STATUS_COLORS: Record<string, string> = {
-  received: 'bg-status-info-bg text-status-info-text',
-  processing: 'bg-status-neutral-bg text-status-neutral-text',
-  processed: 'bg-status-success-bg text-status-success-text',
-  needs_review: 'bg-status-warning-bg text-status-warning-text',
-  failed: 'bg-status-error-bg text-status-error-text',
+  received: 'bg-blue-100 text-blue-800',
+  processing: 'bg-purple-100 text-purple-800',
+  processed: 'bg-green-100 text-green-800',
+  needs_review: 'bg-amber-100 text-amber-800',
+  failed: 'bg-red-100 text-red-800',
 }
 
 export default function ProcessingLogPage() {
@@ -141,7 +141,7 @@ export default function ProcessingLogPage() {
       accessorKey: 'processingError',
       header: t('inbox_ops.extraction_failed', 'Error'),
       cell: ({ row }) => (
-        <span className="text-xs text-status-error-text truncate max-w-[280px] block">
+        <span className="text-xs text-red-600 truncate max-w-[280px] block">
           {row.original.processingError || '-'}
         </span>
       ),