@open-mercato/core 0.6.7 → 0.6.8-develop.6874.1.982d6097d8

package/src/modules/query_index/lib/search-tokens.ts

@@ -1,5 +1,10 @@
-import { type Kysely, sql } from 'kysely'
-import { resolveSearchConfig, type SearchConfig } from '@open-mercato/shared/lib/search/config'
+import { type Kysely, type Transaction, sql } from 'kysely'
+import {
+  isSearchFieldBlocklisted,
+  resolveSearchConfig,
+  resolveSearchTokenLimits,
+  type SearchConfig,
+} from '@open-mercato/shared/lib/search/config'
 import { tokenizeText } from '@open-mercato/shared/lib/search/tokenize'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
 import { createLogger } from '@open-mercato/shared/lib/logger'
@@ -36,6 +41,7 @@ type BuildTokenOptions = {
 
 const DEFAULT_SCOPE = { organizationId: null, tenantId: null }
 type EntityFieldPair = [string, string]
+type SearchTokenExecutor = Kysely<any> | Transaction<any>
 
 export const isSearchDebugEnabled = (): boolean => {
   return parseBooleanToken(process.env.OM_SEARCH_DEBUG ?? '') === true
@@ -62,16 +68,19 @@ function collectTextValues(value: unknown): string[] {
   return []
 }
 
-function shouldIndexField(field: string, value: unknown, config: SearchConfig): boolean {
+function shouldIndexField(
+  field: string,
+  value: unknown,
+  config: SearchConfig,
+  entityType: string | null,
+): boolean {
   if (typeof value !== 'string' && !Array.isArray(value)) return false
   const lower = field.toLowerCase()
   if (lower === 'id' || lower.endsWith('_id') || lower.endsWith('.id')) return false
   if (lower.endsWith('_at')) return false
   if (['created_at', 'updated_at', 'deleted_at', 'tenant_id', 'organization_id'].includes(lower)) return false
-  if (config.blocklistedFields.some((blocked) => lower.includes(blocked))) return false
-  const values = collectTextValues(value)
-  if (!values.length) return false
-  return values.some((text) => tokenizeText(text, config).tokens.length > 0)
+  if (isSearchFieldBlocklisted(field, entityType, config)) return false
+  return collectTextValues(value).some((text) => text.length > 0)
 }
 
 export function buildSearchTokenRows(params: BuildTokenOptions): SearchTokenRow[] {
@@ -85,19 +94,32 @@ export function buildSearchTokenRows(params: BuildTokenOptions): SearchTokenRow[
     organizationId: params.organizationId ?? DEFAULT_SCOPE.organizationId,
     tenantId: params.tenantId ?? DEFAULT_SCOPE.tenantId,
   }
+  const limits = resolveSearchTokenLimits(config)
+  const recordLimit = limits.maxTokensPerRecord > 0 ? limits.maxTokensPerRecord : Number.POSITIVE_INFINITY
+  const fieldLimit = limits.maxTokensPerField > 0 ? limits.maxTokensPerField : Number.POSITIVE_INFINITY
 
   for (const [field, rawValue] of Object.entries(params.doc)) {
-    if (!shouldIndexField(field, rawValue, config)) continue
+    if (tokens.length >= recordLimit) break
+    if (!shouldIndexField(field, rawValue, config, params.entityType)) continue
     const values = collectTextValues(rawValue)
     const seen = new Set<string>()
+    let fieldTokenCount = 0
     for (const text of values) {
-      const { tokens: textTokens, hashes } = tokenizeText(text, config)
+      if (tokens.length >= recordLimit || fieldTokenCount >= fieldLimit) break
+      const remainingLimit = Math.min(recordLimit - tokens.length, fieldLimit - fieldTokenCount)
+      const candidateLimit = fieldTokenCount + remainingLimit
+      const tokenConfig = Number.isFinite(candidateLimit)
+        ? { ...config, maxTokensPerField: candidateLimit }
+        : config
+      const { tokens: textTokens, hashes } = tokenizeText(text, tokenConfig)
       for (let i = 0; i < textTokens.length; i += 1) {
+        if (tokens.length >= recordLimit || fieldTokenCount >= fieldLimit) break
         const token = textTokens[i]
         const hash = hashes[i]
         const dedupeKey = `${field}|${hash}`
         if (seen.has(dedupeKey)) continue
         seen.add(dedupeKey)
+        fieldTokenCount += 1
         debug('token.generated', { entityType: params.entityType, recordId: params.recordId, field, hash })
         tokens.push({
           entity_type: params.entityType,
@@ -142,7 +164,8 @@ function buildFieldPairs(recordId: string, doc?: Record<string, unknown> | null)
 
 export async function replaceSearchTokensForRecord(
   db: Kysely<any>,
-  params: BuildTokenOptions
+  params: BuildTokenOptions,
+  options?: { trx?: SearchTokenExecutor },
 ): Promise<void> {
   const rows = buildSearchTokenRows(params)
   const config = params.config ?? resolveSearchConfig()
@@ -151,8 +174,8 @@ export async function replaceSearchTokensForRecord(
   const tenantId = params.tenantId ?? null
   const fieldPairs = buildFieldPairs(String(params.recordId), params.doc)
 
-  await db.transaction().execute(async (trx) => {
-    let deleteQuery = trx
+  const writeTokens = async (executor: SearchTokenExecutor): Promise<void> => {
+    let deleteQuery = executor
       .deleteFrom('search_tokens' as any)
       .where('entity_type' as any, '=', params.entityType)
       .where(sql<boolean>`organization_id is not distinct from ${organizationId}`)
@@ -171,18 +194,27 @@ export async function replaceSearchTokensForRecord(
     if (!rows.length) return
     const payloads = rows.map((row) => ({ ...row, created_at: sql`now()` }))
     for (const batch of chunk(payloads, INSERT_BATCH_SIZE)) {
-      await trx.insertInto('search_tokens' as any).values(batch as any).execute()
+      await executor.insertInto('search_tokens' as any).values(batch as any).execute()
     }
-  })
+  }
+
+  if (options?.trx) {
+    await writeTokens(options.trx)
+    return
+  }
+
+  await db.transaction().execute(writeTokens)
 }
 
 export async function deleteSearchTokensForRecord(
   db: Kysely<any>,
-  params: { entityType: string; recordId: string; organizationId?: string | null; tenantId?: string | null }
+  params: { entityType: string; recordId: string; organizationId?: string | null; tenantId?: string | null },
+  options?: { trx?: SearchTokenExecutor },
 ): Promise<void> {
   const organizationId = params.organizationId ?? null
   const tenantId = params.tenantId ?? null
-  await db
+  const executor = options?.trx ?? db
+  await executor
     .deleteFrom('search_tokens' as any)
     .where('entity_type' as any, '=', params.entityType)
     .where('entity_id' as any, '=', String(params.recordId))

package/src/modules/query_index/lib/subscriber-scope.ts

@@ -1,6 +1,7 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { getEntityIds } from '@open-mercato/shared/lib/encryption/entityIds'
 import { resolveRegisteredEntityTableName } from '@open-mercato/shared/lib/query/engine'
+import { listEntityMetadata } from '@open-mercato/shared/lib/db/entityMetadata'
 
 export type QueryIndexScope = {
   tenantId: string | null
@@ -58,13 +59,7 @@ export function resolveQueryIndexSourceMetadata(
     throw new QueryIndexScopeError(`Query index entity type has no registered ORM table: ${entityType}`)
   }
 
-  const registry = em.getMetadata?.()
-  const allMetadataRaw = typeof registry?.getAll === 'function' ? registry.getAll() : null
-  const allMetadata: QueryIndexEntityMetadata[] = Array.isArray(allMetadataRaw)
-    ? allMetadataRaw as QueryIndexEntityMetadata[]
-    : allMetadataRaw instanceof Map
-      ? Array.from(allMetadataRaw.values()) as QueryIndexEntityMetadata[]
-      : Object.values(allMetadataRaw ?? {}) as QueryIndexEntityMetadata[]
+  const allMetadata = listEntityMetadata(em) as unknown as QueryIndexEntityMetadata[]
   const metadata = allMetadata.find((candidate) => String(candidate.tableName ?? '') === table)
   if (!metadata) {
     throw new QueryIndexScopeError(`Query index entity metadata was not found for table: ${table}`)

package/src/modules/query_index/migrations/.snapshot-open-mercato.json

@@ -1365,6 +1365,18 @@
           "primary": false,
           "unique": false
         },
+        {
+          "columnNames": [
+            "entity_type",
+            "tenant_id",
+            "organization_id"
+          ],
+          "composite": true,
+          "constraint": false,
+          "keyName": "search_tokens_presence_idx",
+          "primary": false,
+          "unique": false
+        },
         {
           "columnNames": [
             "id"

package/src/modules/query_index/migrations/Migration20260731105052_query_index.ts

@@ -0,0 +1,35 @@
+import { Migration } from '@mikro-orm/migrations';
+
+// Availability-probe index (.ai/specs/2026-07-31-search-token-probe-index.md).
+// The query engines gate like/ilike routing on "does (entity_type, tenant, org)
+// have any search tokens?". Neither existing index serves that probe as an
+// access path — lookup_idx buries tenant_id behind field/token_hash — so on a
+// large search_tokens the planner degraded the probe to a seq scan and the MISS
+// answer had to exhaust every entry for the entity type (p95 12.5 s in
+// production, #4723). With this (entity_type, tenant_id, organization_id)
+// prefix and the index-usable `= / IS NULL` predicates the availability
+// resolver emits, both the hit AND the miss become a B-tree prefix seek.
+//
+// search_tokens is high-churn, so the index is built CONCURRENTLY to avoid
+// blocking writes during the build. CREATE INDEX CONCURRENTLY cannot run
+// inside a transaction, hence isTransactional() => false; the migration runner
+// applies migrations one-by-one, so this opt-out is safe (same pattern as
+// Migration20260611103000_query_index). Drop first so retrying a failed
+// concurrent build removes PostgreSQL's invalid index stub instead of letting
+// IF NOT EXISTS silently accept it.
+export class Migration20260731105052_query_index extends Migration {
+
+  override isTransactional(): boolean {
+    return false;
+  }
+
+  override up(): void | Promise<void> {
+    this.addSql(`drop index concurrently if exists "search_tokens_presence_idx";`);
+    this.addSql(`create index concurrently "search_tokens_presence_idx" on "search_tokens" ("entity_type", "tenant_id", "organization_id");`);
+  }
+
+  override down(): void | Promise<void> {
+    this.addSql(`drop index concurrently if exists "search_tokens_presence_idx";`);
+  }
+
+}

package/src/modules/query_index/subscribers/coverage_refresh.ts

@@ -1,5 +1,6 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
+import { isReadProjectionAlwaysConsistent } from '@open-mercato/shared/lib/data/consistency'
 import { refreshCoverageSnapshot } from '../lib/coverage'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
@@ -70,6 +71,9 @@ export default async function handle(payload: Payload, ctx: { resolve: <T = any>
           payload,
         },
       )
+      if (isReadProjectionAlwaysConsistent()) {
+        throw err
+      }
     }
   }
 

package/src/modules/query_index/subscribers/delete_one.ts

@@ -1,4 +1,5 @@
 import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
+import { isReadProjectionAlwaysConsistent } from '@open-mercato/shared/lib/data/consistency'
 import { sql } from 'kysely'
 import { markDeleted } from '../lib/indexer'
 import { applyCoverageAdjustments, createCoverageAdjustments } from '../lib/coverage'
@@ -39,7 +40,9 @@ export default async function handle(payload: any, ctx: { resolve: <T=any>(name:
   if (!entityType || !recordId) return
   let organizationId: string | null = payload?.organizationId ?? null
   let tenantId: string | null = payload?.tenantId ?? null
+  const suppressCoverage = payload?.suppressCoverage === true
   const coverageDelayMs = typeof payload?.coverageDelayMs === 'number' ? payload.coverageDelayMs : undefined
+  const alwaysConsistent = isReadProjectionAlwaysConsistent()
   try {
     const hasPayloadOrganizationId = Object.prototype.hasOwnProperty.call(payload ?? {}, 'organizationId')
     const hasPayloadTenantId = Object.prototype.hasOwnProperty.call(payload ?? {}, 'tenantId')
@@ -55,6 +58,68 @@ export default async function handle(payload: any, ctx: { resolve: <T=any>(name:
     organizationId = resolvedScope.organizationId
     tenantId = resolvedScope.tenantId
 
+    if (alwaysConsistent) {
+      const db = (em as any).getKysely()
+      await db.transaction().execute(async (trx: any) => {
+        const { wasActive } = await markDeleted(em, { entityType, recordId, organizationId, tenantId, trx })
+
+        let baseQuery = trx
+          .selectFrom(source.table as any)
+          .select(['deleted_at' as any])
+          .where('id' as any, '=', recordId)
+        if (source.organizationColumn) {
+          baseQuery = baseQuery.where(
+            source.organizationColumn as any,
+            organizationId === null ? 'is' : '=',
+            organizationId as any,
+          )
+        }
+        if (source.tenantColumn) {
+          baseQuery = baseQuery.where(sql`${sql.ref(source.tenantColumn)} is not distinct from ${tenantId}`)
+        }
+        const row = await baseQuery.executeTakeFirst() as { deleted_at: Date | null } | undefined
+        const baseDelta = !row || row.deleted_at != null ? -1 : 0
+
+        const baseDeltaOverride =
+          typeof payload?.coverageBaseDelta === 'number' ? payload.coverageBaseDelta : undefined
+        const indexDeltaOverride =
+          typeof payload?.coverageIndexDelta === 'number' ? payload.coverageIndexDelta : undefined
+        let effectiveBaseDelta = baseDeltaOverride ?? baseDelta
+        let effectiveIndexDelta = indexDeltaOverride ?? (wasActive ? -1 : 0)
+
+        if (!Number.isFinite(effectiveBaseDelta)) effectiveBaseDelta = 0
+        if (!Number.isFinite(effectiveIndexDelta)) effectiveIndexDelta = 0
+
+        if (effectiveBaseDelta !== 0 || effectiveIndexDelta !== 0) {
+          const adjustments = createCoverageAdjustments({
+            entityType,
+            tenantId: tenantId ?? null,
+            organizationId: organizationId ?? null,
+            baseDelta: effectiveBaseDelta,
+            indexDelta: effectiveIndexDelta,
+          })
+          if (adjustments.length) {
+            await applyCoverageAdjustments(em, adjustments, { trx })
+          }
+        }
+      })
+
+      const bus = ctx.resolve<any>('eventBus')
+      const shouldRefreshCoverage =
+        !suppressCoverage && (coverageDelayMs === undefined || coverageDelayMs >= 0)
+      const coverageRefreshDelay = coverageDelayMs ?? 0
+      if (shouldRefreshCoverage) {
+        await bus.emitEvent('query_index.coverage.refresh', {
+          entityType,
+          tenantId: tenantId ?? null,
+          organizationId: organizationId ?? null,
+          delayMs: coverageRefreshDelay,
+        }, { rethrowHandlerErrors: true })
+      }
+      await bus.emitEvent('search.delete_record', { entityId: entityType, recordId, organizationId, tenantId }, { rethrowHandlerErrors: true })
+      return
+    }
+
     const { wasActive } = await markDeleted(em, { entityType, recordId, organizationId, tenantId })
 
     let baseDelta = 0
@@ -110,7 +175,6 @@ export default async function handle(payload: any, ctx: { resolve: <T=any>(name:
     // awaits this subscriber) so list reads are consistent immediately. The coverage
     // recompute (a COUNT, run inline when delayMs is 0) and the fulltext delete are
     // secondary, so defer them fire-and-forget to keep write/bulk-delete latency bounded.
-    const suppressCoverage = payload?.suppressCoverage === true
     const explicitDelayRequested = typeof payload?.coverageDelayMs === 'number'
     const shouldRefreshCoverage =
       !suppressCoverage &&

package/src/modules/query_index/subscribers/upsert_one.ts

@@ -1,5 +1,6 @@
 import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
-import { upsertIndexRow, reindexSearchTokensForRecord } from '../lib/indexer'
+import { isReadProjectionAlwaysConsistent } from '@open-mercato/shared/lib/data/consistency'
+import { upsertIndexRow, reindexSearchTokensForRecord, type UpsertIndexResult } from '../lib/indexer'
 import { applyCoverageAdjustments, createCoverageAdjustments } from '../lib/coverage'
 import {
   loadQueryIndexRowScope,
@@ -26,6 +27,7 @@ export default async function handle(payload: any, ctx: { resolve: <T=any>(name:
   let tenantId: string | null = payload?.tenantId ?? null
   const suppressCoverage = payload?.suppressCoverage === true
   const coverageDelayMs = typeof payload?.coverageDelayMs === 'number' ? payload.coverageDelayMs : undefined
+  const alwaysConsistent = isReadProjectionAlwaysConsistent()
   try {
     const hasPayloadOrganizationId = Object.prototype.hasOwnProperty.call(payload ?? {}, 'organizationId')
     const hasPayloadTenantId = Object.prototype.hasOwnProperty.call(payload ?? {}, 'tenantId')
@@ -44,6 +46,71 @@ export default async function handle(payload: any, ctx: { resolve: <T=any>(name:
     const searchTokenDoc = typeof payload?.searchTokenDoc === 'object' && payload.searchTokenDoc && !Array.isArray(payload.searchTokenDoc)
       ? (payload.searchTokenDoc as Record<string, unknown>)
       : null
+    if (alwaysConsistent) {
+      const db = (em as any).getKysely()
+      let result: UpsertIndexResult | null = null
+      await db.transaction().execute(async (trx: any) => {
+        result = await upsertIndexRow(em, {
+          entityType,
+          recordId,
+          organizationId,
+          tenantId,
+          searchTokenDoc,
+          deferSearchTokens: false,
+          trx,
+        })
+        if (!suppressCoverage) {
+          const doc = result.doc
+          const isActive = !!doc && (doc.deleted_at == null || doc.deleted_at === null)
+          let baseDelta: number | undefined =
+            typeof payload?.coverageBaseDelta === 'number' ? payload.coverageBaseDelta : undefined
+          let indexDelta: number | undefined =
+            typeof payload?.coverageIndexDelta === 'number' ? payload.coverageIndexDelta : undefined
+          const crudAction = typeof payload?.crudAction === 'string' ? payload.crudAction : undefined
+
+          if (baseDelta === undefined) {
+            if (result.revived) baseDelta = 1
+            else if (crudAction === 'created') baseDelta = 1
+            else baseDelta = 0
+          }
+
+          if (indexDelta === undefined) {
+            if (isActive && (result.created || result.revived)) indexDelta = 1
+            else indexDelta = 0
+          }
+
+          if (!isActive && baseDelta > 0) baseDelta = 0
+          if (!isActive && indexDelta > 0) indexDelta = 0
+          if (!Number.isFinite(baseDelta)) baseDelta = 0
+          if (!Number.isFinite(indexDelta)) indexDelta = 0
+
+          const adjustments = createCoverageAdjustments({
+            entityType,
+            tenantId: tenantId ?? null,
+            organizationId: organizationId ?? null,
+            baseDelta,
+            indexDelta,
+          })
+          if (adjustments.length) {
+            await applyCoverageAdjustments(em, adjustments, { trx })
+          }
+        }
+      })
+
+      const bus = ctx.resolve<any>('eventBus')
+      const eventScope = { entityType, recordId, organizationId, tenantId }
+      await bus.emitEvent('query_index.vectorize_one', eventScope, { rethrowHandlerErrors: true })
+      await bus.emitEvent('search.index_record', { entityId: entityType, recordId, organizationId, tenantId }, { rethrowHandlerErrors: true })
+      if (!suppressCoverage && coverageDelayMs !== undefined && coverageDelayMs >= 0) {
+        await bus.emitEvent('query_index.coverage.refresh', {
+          entityType,
+          tenantId: tenantId ?? null,
+          organizationId: organizationId ?? null,
+          delayMs: coverageDelayMs,
+        }, { rethrowHandlerErrors: true })
+      }
+      return
+    }
     // Update the projection row synchronously so list reads (`customValues`) are
     // consistent the moment the write returns; defer the heavy search-token rebuild.
     const result = await upsertIndexRow(em, {

package/src/modules/resources/api/resources.ts

@@ -86,6 +86,7 @@ const crud = makeCrudRoute({
       'appearance_color',
       F.is_active,
       'availability_rule_set_id',
+      'custom_fieldset_code',
       F.created_at,
       F.updated_at,
     ],
@@ -242,6 +243,7 @@ const resourceListItemSchema = z.object({
   appearance_color: z.string().nullable().optional(),
   is_active: z.boolean().nullable().optional(),
   availability_rule_set_id: z.string().uuid().nullable().optional(),
+  custom_fieldset_code: z.string().nullable().optional(),
   created_at: z.string().nullable().optional(),
   updated_at: z.string().nullable().optional(),
   tags: z.array(resourceTagListItemSchema).optional(),

package/src/modules/resources/backend/resources/resource-types/page.tsx

@@ -1,6 +1,7 @@
 "use client"
 
 import * as React from 'react'
+import { extensionPoints } from '@open-mercato/core/modules/resources/extension-points'
 import { useRouter } from 'next/navigation'
 import Link from 'next/link'
 import type { ColumnDef, SortingState } from '@tanstack/react-table'
@@ -318,7 +319,7 @@ export default function ResourcesResourceTypesPage() {
             />
           )}
           onRowClick={(row) => router.push(`/backend/resources/resource-types/${row.id}/edit`)}
-          perspective={{ tableId: 'resources.resource-types.list' }}
+          perspective={{ tableId: extensionPoints.hosts.resourceTypesTable.tableId }}
         />
       </PageBody>
       {ConfirmDialogElement}

package/src/modules/resources/backend/resources/resources/[id]/page.tsx

@@ -59,6 +59,8 @@ type ResourceRecord = {
   is_active?: boolean
   availabilityRuleSetId?: string | null
   availability_rule_set_id?: string | null
+  customFieldsetCode?: string | null
+  custom_fieldset_code?: string | null
 } & Record<string, unknown>
 
 type ResourceResponse = {
@@ -85,6 +87,7 @@ function normalizeResourceRecord(record: ResourceRecord): ResourceRecord {
     appearanceIcon: record.appearanceIcon ?? record.appearance_icon ?? null,
     appearanceColor: record.appearanceColor ?? record.appearance_color ?? null,
     isActive: record.isActive ?? record.is_active ?? true,
+    customFieldsetCode: record.customFieldsetCode ?? record.custom_fieldset_code ?? null,
   }
 }
 
@@ -547,9 +550,12 @@ export default function ResourcesResourceDetailPage({ params }: { params?: { id?
                 : typeof resource.updated_at === 'string'
                   ? resource.updated_at
                   : null,
-            customFieldsetCode: resource.resourceTypeId
-              ? resolveFieldsetCode(resource.resourceTypeId)
-              : RESOURCES_RESOURCE_FIELDSET_DEFAULT,
+            customFieldsetCode:
+              typeof resource.customFieldsetCode === 'string' && resource.customFieldsetCode.trim().length
+                ? resource.customFieldsetCode.trim()
+                : resource.resourceTypeId
+                  ? resolveFieldsetCode(resource.resourceTypeId)
+                  : RESOURCES_RESOURCE_FIELDSET_DEFAULT,
             ...customValues,
           })
         }

package/src/modules/resources/backend/resources/resources/page.tsx

@@ -1,6 +1,7 @@
 "use client"
 
 import * as React from 'react'
+import { extensionPoints } from '@open-mercato/core/modules/resources/extension-points'
 import Link from 'next/link'
 import { usePathname, useRouter, useSearchParams } from 'next/navigation'
 import type { ColumnDef } from '@tanstack/react-table'
@@ -524,7 +525,7 @@ export default function ResourcesResourcesPage() {
           filterValues={filterValues}
           onFiltersApply={handleFiltersApply}
           onFiltersClear={handleFiltersClear}
-          perspective={{ tableId: 'resources.resources.list' }}
+          perspective={{ tableId: extensionPoints.hosts.resourcesTable.tableId }}
           rowActions={(row) => {
             if (!canManage || row.rowKind !== 'resource') return null
             return (

package/src/modules/resources/commands/resources.ts

@@ -50,6 +50,7 @@ type ResourceSnapshot = {
   appearanceColor: string | null
   isActive: boolean
   availabilityRuleSetId: string | null
+  customFieldsetCode: string | null
   tags: string[]
   deletedAt: string | null
   customFields?: CustomFieldSnapshot | null
@@ -154,6 +155,7 @@ async function loadResourceSnapshot(em: EntityManager, id: string): Promise<Reso
     appearanceColor: resource.appearanceColor ?? null,
     isActive: resource.isActive,
     availabilityRuleSetId: resource.availabilityRuleSetId ?? null,
+    customFieldsetCode: resource.customFieldsetCode ?? null,
     tags,
     deletedAt: resource.deletedAt ? resource.deletedAt.toISOString() : null,
   }
@@ -235,6 +237,7 @@ const createResourceCommand: CommandHandler<ResourcesResourceCreateInput, { reso
       appearanceColor: parsed.appearanceColor ?? null,
       isActive: parsed.isActive ?? true,
       availabilityRuleSetId: parsed.availabilityRuleSetId ?? null,
+      customFieldsetCode: parsed.customFieldsetCode ?? null,
       createdAt: now,
       updatedAt: now,
     })
@@ -358,6 +361,7 @@ const createResourceCommand: CommandHandler<ResourcesResourceCreateInput, { reso
             appearanceColor: after.appearanceColor ?? null,
             isActive: after.isActive,
             availabilityRuleSetId: after.availabilityRuleSetId ?? null,
+            customFieldsetCode: after.customFieldsetCode ?? null,
             deletedAt: null,
             createdAt: new Date(),
             updatedAt: new Date(),
@@ -376,6 +380,7 @@ const createResourceCommand: CommandHandler<ResourcesResourceCreateInput, { reso
           record.appearanceColor = after.appearanceColor ?? null
           record.isActive = after.isActive
           record.availabilityRuleSetId = after.availabilityRuleSetId ?? null
+          record.customFieldsetCode = after.customFieldsetCode ?? null
           record.deletedAt = null
           record.updatedAt = new Date()
         }
@@ -471,6 +476,7 @@ const updateResourceCommand: CommandHandler<ResourcesResourceUpdateInput, { reso
         if (parsed.appearanceIcon !== undefined) record.appearanceIcon = parsed.appearanceIcon ?? null
         if (parsed.appearanceColor !== undefined) record.appearanceColor = parsed.appearanceColor ?? null
         if (parsed.availabilityRuleSetId !== undefined) record.availabilityRuleSetId = parsed.availabilityRuleSetId ?? null
+        if (parsed.customFieldsetCode !== undefined) record.customFieldsetCode = parsed.customFieldsetCode ?? null
         record.updatedAt = new Date()
         if (parsed.isActive !== undefined) record.isActive = parsed.isActive
       },
@@ -531,6 +537,7 @@ const updateResourceCommand: CommandHandler<ResourcesResourceUpdateInput, { reso
       'appearanceColor',
       'isActive',
       'availabilityRuleSetId',
+      'customFieldsetCode',
       'deletedAt',
     ])
     if (before.tags.join(',') !== after.tags.join(',')) {
@@ -583,6 +590,7 @@ const updateResourceCommand: CommandHandler<ResourcesResourceUpdateInput, { reso
         record.appearanceColor = before.appearanceColor ?? null
         record.isActive = before.isActive
         record.availabilityRuleSetId = before.availabilityRuleSetId ?? null
+        record.customFieldsetCode = before.customFieldsetCode ?? null
         record.deletedAt = before.deletedAt ? new Date(before.deletedAt) : null
         record.updatedAt = new Date()
       },
@@ -716,6 +724,7 @@ const deleteResourceCommand: CommandHandler<{ id?: string }, { resourceId: strin
             appearanceColor: before.appearanceColor ?? null,
             isActive: before.isActive,
             availabilityRuleSetId: before.availabilityRuleSetId ?? null,
+            customFieldsetCode: before.customFieldsetCode ?? null,
             deletedAt: null,
             createdAt: new Date(),
             updatedAt: new Date(),
@@ -734,6 +743,7 @@ const deleteResourceCommand: CommandHandler<{ id?: string }, { resourceId: strin
           record.appearanceColor = before.appearanceColor ?? null
           record.isActive = before.isActive
           record.availabilityRuleSetId = before.availabilityRuleSetId ?? null
+          record.customFieldsetCode = before.customFieldsetCode ?? null
           record.deletedAt = null
           record.updatedAt = new Date()
         }

package/src/modules/resources/components/detail/dictionaries.ts

@@ -1,6 +1,7 @@
 "use client"
 
 import { apiCall, apiCallOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { fetchAllDictionaryEntries } from '@open-mercato/core/modules/dictionaries/lib/fetchAllEntries'
 
 export type DictionaryEntryOption = {
   value: string
@@ -52,10 +53,9 @@ export async function loadResourceDictionary(
   const name = 'Resource activity types'
   const dictionary = await ensureDictionary(key, name)
   if (!dictionary) return { dictionary: null, entries: [] }
-  const entriesCall = await apiCall<{ items?: Record<string, unknown>[] }>(`/api/dictionaries/${dictionary.id}/entries`)
+  const entriesCall = await fetchAllDictionaryEntries(dictionary.id)
   if (!entriesCall.ok) return { dictionary, entries: [] }
-  const items = Array.isArray(entriesCall.result?.items) ? entriesCall.result?.items ?? [] : []
-  const entries = items
+  const entries = entriesCall.items
     .map((entry) => {
       if (!entry || typeof entry !== 'object') return null
       const record = entry as Record<string, unknown>

package/src/modules/resources/data/entities.ts

@@ -83,6 +83,9 @@ export class ResourcesResource {
   @Property({ name: 'availability_rule_set_id', type: 'uuid', nullable: true })
   availabilityRuleSetId?: string | null
 
+  @Property({ name: 'custom_fieldset_code', type: 'text', nullable: true })
+  customFieldsetCode?: string | null
+
   @Property({ name: 'created_at', type: Date, onCreate: () => new Date() })
   createdAt: Date = new Date()
 

package/src/modules/resources/data/validators.ts

@@ -1,4 +1,7 @@
 import { z } from 'zod'
+import { fieldsetCodeRegex } from '@open-mercato/shared/modules/entities/validators'
+
+const customFieldsetCodeSchema = z.string().trim().regex(fieldsetCodeRegex).max(100)
 
 const scopedCreateFields = {
   tenantId: z.string().uuid(),
@@ -52,6 +55,7 @@ export const resourcesResourceCreateSchema = z.object({
     .nullable(),
   isActive: z.boolean().optional(),
   availabilityRuleSetId: z.string().uuid().optional().nullable(),
+  customFieldsetCode: customFieldsetCodeSchema.optional().nullable(),
 })
 
 export const resourcesResourceUpdateSchema = z.object({
@@ -71,6 +75,7 @@ export const resourcesResourceUpdateSchema = z.object({
     .nullable(),
   isActive: z.boolean().optional(),
   availabilityRuleSetId: z.string().uuid().optional().nullable(),
+  customFieldsetCode: customFieldsetCodeSchema.optional().nullable(),
 })
 
 export const resourcesResourceTagCreateSchema = z.object({

package/src/modules/resources/extension-points.ts

@@ -0,0 +1,11 @@
+import { dataTableExtensionHost, defineModuleExtensionPoints } from '@open-mercato/shared/modules/widgets/extension-points'
+
+export const extensionPoints = defineModuleExtensionPoints({
+  moduleId: 'resources',
+  hosts: {
+    resourcesTable: dataTableExtensionHost({ tableId: 'resources.resources.list', source: 'backend/resources/resources/page.tsx' }),
+    resourceTypesTable: dataTableExtensionHost({ tableId: 'resources.resource-types.list', source: 'backend/resources/resource-types/page.tsx' }),
+  },
+})
+
+export default extensionPoints