@open-mercato/core 0.6.7-develop.6775.1.c2313bb8a3 → 0.6.7-develop.6785.1.1dd7cfac55

package/dist/modules/query_index/lib/indexer.js

@@ -1,6 +1,11 @@
 import { resolveEntityTableName } from "@open-mercato/shared/lib/query/engine";
 import { resolveTenantEncryptionService } from "@open-mercato/shared/lib/encryption/customFieldValues";
 import { decryptIndexDocForSearch, encryptIndexDocForStorage } from "@open-mercato/shared/lib/encryption/indexDoc";
+import {
+  buildCustomFieldDefinitionIndexFromRows,
+  normalizeDefinitionKey,
+  selectDefinitionForRecord
+} from "@open-mercato/shared/lib/crud/custom-field-definition-index";
 import { sql } from "kysely";
 import { createLogger } from "@open-mercato/shared/lib/logger";
 import { replaceSearchTokensForRecord, deleteSearchTokensForRecord } from "./search-tokens.js";
@@ -62,8 +67,61 @@ async function buildIndexDoc(em, params) {
     if (!cfMap[cfKey]) cfMap[cfKey] = [];
     cfMap[cfKey].push(val);
   }
+  const multiKeys = /* @__PURE__ */ new Set();
+  const fieldKeys = Object.keys(cfMap).map((key) => key.slice(3));
+  if (fieldKeys.length > 0) {
+    let defQuery = db.selectFrom("custom_field_defs").select([
+      "key",
+      "kind",
+      "config_json",
+      "organization_id",
+      "tenant_id",
+      "deleted_at",
+      "updated_at"
+    ]).where("entity_id", "=", params.entityType).where("key", "in", fieldKeys).where("is_active", "=", true).where("deleted_at", "is", null);
+    if (params.organizationId != null) {
+      defQuery = defQuery.where((eb) => eb.or([
+        eb("organization_id", "=", params.organizationId),
+        eb("organization_id", "is", null)
+      ]));
+    } else {
+      defQuery = defQuery.where("organization_id", "is", null);
+    }
+    if (params.tenantId != null) {
+      defQuery = defQuery.where((eb) => eb.or([
+        eb("tenant_id", "=", params.tenantId),
+        eb("tenant_id", "is", null)
+      ]));
+    } else {
+      defQuery = defQuery.where("tenant_id", "is", null);
+    }
+    const defRows = await defQuery.execute();
+    const definitionIndex = buildCustomFieldDefinitionIndexFromRows(
+      defRows.map((row) => ({
+        key: String(row.key ?? ""),
+        entityId: params.entityType,
+        kind: typeof row.kind === "string" ? row.kind : null,
+        configJson: row.config_json,
+        organizationId: row.organization_id ?? null,
+        tenantId: row.tenant_id ?? null,
+        deletedAt: row.deleted_at ?? null,
+        updatedAt: row.updated_at ?? null
+      })),
+      { organizationIds: params.organizationId ? [params.organizationId] : [] }
+    );
+    for (const key of fieldKeys) {
+      const definitions = definitionIndex.get(normalizeDefinitionKey(key)) ?? [];
+      const definition = selectDefinitionForRecord(
+        definitions,
+        params.organizationId ?? null,
+        params.tenantId ?? null
+      );
+      if (definition?.multi) multiKeys.add(key);
+    }
+  }
   for (const [key, arr] of Object.entries(cfMap)) {
-    doc[key] = arr.length <= 1 ? arr[0] : arr;
+    const fieldKey = key.slice(3);
+    doc[key] = multiKeys.has(fieldKey) || arr.length > 1 ? arr : arr[0];
   }
   try {
     const translationRow = await db.selectFrom("entity_translations").select(["translations"]).where("entity_type", "=", params.entityType).where("entity_id", "=", String(params.recordId)).where(sql`tenant_id is not distinct from ${params.tenantId ?? null}`).where(sql`organization_id is not distinct from ${params.organizationId ?? null}`).executeTakeFirst();
@@ -109,8 +167,9 @@ function scopeEntityIndexes(q, args) {
 }
 async function upsertIndexRow(em, args) {
   const db = em.getKysely();
+  const executor = args.trx ?? db;
   const existing = await scopeEntityIndexes(
-    db.selectFrom("entity_indexes").select(["id", "deleted_at"]),
+    executor.selectFrom("entity_indexes").select(["id", "deleted_at"]),
     args
   ).executeTakeFirst();
   const existed = !!existing;
@@ -124,14 +183,16 @@ async function upsertIndexRow(em, args) {
           recordId: args.recordId,
           organizationId: args.organizationId ?? null,
           tenantId: args.tenantId ?? null,
-          doc: null
+          doc: null,
+          trx: args.trx
         });
-      } catch {
+      } catch (error) {
+        if (args.trx) throw error;
       }
     }
     if (existed) {
       await scopeEntityIndexes(
-        db.deleteFrom("entity_indexes"),
+        executor.deleteFrom("entity_indexes"),
         args
       ).execute();
     }
@@ -148,7 +209,7 @@ async function upsertIndexRow(em, args) {
     deleted_at: null
   };
   try {
-    await db.insertInto("entity_indexes").values({ ...payload, created_at: sql`now()` }).onConflict((oc) => oc.columns(["entity_type", "entity_id", "organization_id_coalesced"]).doUpdateSet({
+    await executor.insertInto("entity_indexes").values({ ...payload, created_at: sql`now()` }).onConflict((oc) => oc.columns(["entity_type", "entity_id", "organization_id_coalesced"]).doUpdateSet({
       tenant_id: args.tenantId ?? null,
       doc: sql`${JSON.stringify(doc)}::jsonb`,
       index_version: 1,
@@ -157,13 +218,14 @@ async function upsertIndexRow(em, args) {
     })).execute();
   } catch {
     const updated = await scopeEntityIndexes(
-      db.updateTable("entity_indexes").set(payload),
+      executor.updateTable("entity_indexes").set(payload),
       args
     ).executeTakeFirst();
     if (!updated || Number(updated.numUpdatedRows ?? 0) === 0) {
       try {
-        await db.insertInto("entity_indexes").values({ ...payload, created_at: sql`now()` }).execute();
-      } catch {
+        await executor.insertInto("entity_indexes").values({ ...payload, created_at: sql`now()` }).execute();
+      } catch (error) {
+        if (args.trx) throw error;
       }
     }
   }
@@ -177,9 +239,11 @@ async function upsertIndexRow(em, args) {
         organizationId: args.organizationId ?? null,
         tenantId: args.tenantId ?? null,
         doc,
-        searchTokenDoc: args.searchTokenDoc ?? null
+        searchTokenDoc: args.searchTokenDoc ?? null,
+        trx: args.trx
       });
-    } catch {
+    } catch (error) {
+      if (args.trx) throw error;
     }
   }
   return { doc, existed, wasDeleted, created, revived };
@@ -192,7 +256,7 @@ async function reindexSearchTokensForRecord(em, args) {
       recordId: args.recordId,
       organizationId: args.organizationId ?? null,
       tenantId: args.tenantId ?? null
-    });
+    }, { trx: args.trx });
     return;
   }
   const tokenDoc = args.searchTokenDoc ?? (() => {
@@ -212,12 +276,13 @@ async function reindexSearchTokensForRecord(em, args) {
     organizationId: args.organizationId ?? null,
     tenantId: args.tenantId ?? null,
     doc: await tokenDoc
-  });
+  }, { trx: args.trx });
 }
 async function markDeleted(em, args) {
   const db = em.getKysely();
+  const executor = args.trx ?? db;
   const existing = await scopeEntityIndexes(
-    db.selectFrom("entity_indexes").select(["deleted_at"]),
+    executor.selectFrom("entity_indexes").select(["deleted_at"]),
     args
   ).executeTakeFirst();
   const wasActive = !!existing && existing.deleted_at == null;
@@ -228,11 +293,12 @@ async function markDeleted(em, args) {
         recordId: args.recordId,
         organizationId: args.organizationId ?? null,
         tenantId: args.tenantId ?? null
-      });
-    } catch {
+      }, { trx: args.trx });
+    } catch (error) {
+      if (args.trx) throw error;
     }
     await scopeEntityIndexes(
-      db.deleteFrom("entity_indexes"),
+      executor.deleteFrom("entity_indexes"),
       args
     ).execute();
   }

package/dist/modules/query_index/lib/indexer.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/query_index/lib/indexer.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { resolveEntityTableName } from '@open-mercato/shared/lib/query/engine'\nimport { resolveTenantEncryptionService } from '@open-mercato/shared/lib/encryption/customFieldValues'\nimport { decryptIndexDocForSearch, encryptIndexDocForStorage } from '@open-mercato/shared/lib/encryption/indexDoc'\nimport { sql } from 'kysely'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\nimport { replaceSearchTokensForRecord, deleteSearchTokensForRecord } from './search-tokens'\nimport { attachAggregateSearchField } from './document'\n\nconst logger = createLogger('query_index').child({ component: 'indexer' })\n\ntype BuildDocParams = {\n  entityType: string // '<module>:<entity>'\n  recordId: string\n  organizationId?: string | null\n  tenantId?: string | null\n}\n\nexport async function buildIndexDoc(em: EntityManager, params: BuildDocParams): Promise<Record<string, any> | null> {\n  const db = (em as any).getKysely()\n  const baseTable = resolveEntityTableName(em, params.entityType)\n\n  // Fetch base row\n  const baseRow = await db\n    .selectFrom(baseTable as any)\n    .selectAll()\n    .where('id' as any, '=', params.recordId)\n    .executeTakeFirst() as Record<string, any> | undefined\n  if (!baseRow) return null\n  const docSources: Array<Record<string, any>> = []\n\n  // Attach the core customer entity when indexing customer profiles so search tokens see the combined row\n  let parentEntityRow: Record<string, any> | null = null\n  if (params.entityType === 'customers:customer_person_profile' || params.entityType === 'customers:customer_company_profile') {\n    const entityId = (baseRow as any).entity_id ?? (baseRow as any).entityId\n    if (entityId) {\n      const entityRow = await db\n        .selectFrom('customer_entities' as any)\n        .selectAll()\n        .where('id' as any, '=', entityId)\n        .executeTakeFirst() as Record<string, any> | undefined\n      if (entityRow) {\n        docSources.push(entityRow)\n        parentEntityRow = entityRow\n      }\n    }\n  }\n  void parentEntityRow\n\n  // Build base document (snake_case keys as in DB)\n  let doc: Record<string, any> = {}\n  docSources.push(baseRow)\n  for (const source of docSources) {\n    for (const [k, v] of Object.entries(source)) doc[k] = v\n  }\n\n  // Attach custom fields under flat keys 'cf:<key>'\n  let cfQuery = db\n    .selectFrom('custom_field_values' as any)\n    .select([\n      'field_key' as any,\n      'value_text' as any,\n      'value_multiline' as any,\n      'value_int' as any,\n      'value_float' as any,\n      'value_bool' as any,\n    ])\n    .where('entity_id' as any, '=', params.entityType)\n    .where('record_id' as any, '=', String(params.recordId))\n\n  if (params.organizationId != null) {\n    cfQuery = cfQuery.where((eb: any) => eb.or([\n      eb('organization_id' as any, '=', params.organizationId),\n      eb('organization_id' as any, 'is', null),\n    ]))\n  } else {\n    cfQuery = cfQuery.where('organization_id' as any, 'is', null)\n  }\n\n  if (params.tenantId != null) {\n    cfQuery = cfQuery.where((eb: any) => eb.or([\n      eb('tenant_id' as any, '=', params.tenantId),\n      eb('tenant_id' as any, 'is', null),\n    ]))\n  } else {\n    cfQuery = cfQuery.where('tenant_id' as any, 'is', null)\n  }\n\n  const cfRows = await cfQuery.execute() as Array<Record<string, any>>\n\n  const cfMap: Record<string, any[]> = {}\n  for (const r of cfRows) {\n    const key = String(r.field_key)\n    const cfKey = `cf:${key}`\n    const val = r.value_bool ?? r.value_int ?? r.value_float ?? r.value_text ?? r.value_multiline ?? null\n    if (!cfMap[cfKey]) cfMap[cfKey] = []\n    cfMap[cfKey].push(val)\n  }\n  for (const [key, arr] of Object.entries(cfMap)) {\n    // Store singletons as simple value; multis as array\n    doc[key] = arr.length <= 1 ? arr[0] : arr\n  }\n\n  // Attach translations under flat keys 'l10n:{locale}:{field}'\n  try {\n    const translationRow = await db\n      .selectFrom('entity_translations' as any)\n      .select(['translations' as any])\n      .where('entity_type' as any, '=', params.entityType)\n      .where('entity_id' as any, '=', String(params.recordId))\n      .where(sql`tenant_id is not distinct from ${params.tenantId ?? null}`)\n      .where(sql`organization_id is not distinct from ${params.organizationId ?? null}`)\n      .executeTakeFirst() as { translations: Record<string, Record<string, unknown>> | null } | undefined\n\n    if (translationRow?.translations && typeof translationRow.translations === 'object') {\n      for (const [locale, fields] of Object.entries(translationRow.translations)) {\n        if (!fields || typeof fields !== 'object') continue\n        for (const [field, value] of Object.entries(fields as Record<string, unknown>)) {\n          if (typeof value === 'string' && value.length > 0) {\n            doc[`l10n:${locale}:${field}`] = value\n          }\n        }\n      }\n    }\n  } catch {}\n\n  // Kept outside the guard below: a failure while building the aggregate search field is a\n  // bug in the aggregation or its configuration, and must surface instead of being mistaken\n  // for an encryption failure and silently skipping encryption.\n  doc = attachAggregateSearchField(doc, { entityType: params.entityType })\n\n  try {\n    const encryption = resolveTenantEncryptionService(em as any)\n    doc = await encryptIndexDocForStorage(\n      params.entityType,\n      doc,\n      { tenantId: params.tenantId ?? null, organizationId: params.organizationId ?? null },\n      encryption,\n    )\n  } catch (error) {\n    // `encryptIndexDocForStorage` already returns the document untouched when encryption is\n    // absent or disabled, so a throw here is always a genuine encryption failure. Returning\n    // `doc` would hand the caller the plaintext document to write into `entity_indexes`,\n    // which must stay encrypted at rest; returning `null` would mean \"record gone\" and make\n    // `upsertIndexRow` delete a healthy index row. Fail loudly instead: the projection keeps\n    // its previous, correctly encrypted contents and the `query_index.upsert_one` subscriber\n    // persists the error via `recordIndexerError`.\n    logger.error('Index document encryption failed; refusing to return an unencrypted document', {\n      entityType: params.entityType,\n      recordId: params.recordId,\n      tenantId: params.tenantId ?? null,\n      organizationId: params.organizationId ?? null,\n      err: error,\n    })\n    throw error\n  }\n\n  return doc\n}\n\nexport type UpsertIndexResult = {\n  doc: Record<string, any> | null\n  existed: boolean\n  wasDeleted: boolean\n  created: boolean\n  revived: boolean\n}\n\nfunction scopeEntityIndexes<QB extends { where: (...args: any[]) => QB }>(\n  q: QB,\n  args: { entityType: string; recordId: string; organizationId?: string | null; tenantId?: string | null },\n): QB {\n  let chain = q.where('entity_type' as any, '=', args.entityType)\n  chain = chain.where('entity_id' as any, '=', String(args.recordId))\n  chain = args.organizationId == null\n    ? chain.where('organization_id' as any, 'is', null as any)\n    : chain.where('organization_id' as any, '=', args.organizationId)\n  chain = chain.where(sql`tenant_id is not distinct from ${args.tenantId ?? null}`)\n  return chain\n}\n\nexport async function upsertIndexRow(\n  em: EntityManager,\n  args: { entityType: string; recordId: string; organizationId?: string | null; tenantId?: string | null; searchTokenDoc?: Record<string, unknown> | null; deferSearchTokens?: boolean }\n): Promise<UpsertIndexResult> {\n  const db = (em as any).getKysely()\n\n  const existing = await scopeEntityIndexes(\n    db.selectFrom('entity_indexes' as any).select(['id' as any, 'deleted_at' as any]),\n    args,\n  ).executeTakeFirst() as { id: string; deleted_at: Date | null } | undefined\n\n  const existed = !!existing\n  const wasDeleted = !!existing && existing.deleted_at != null\n\n  const doc = await buildIndexDoc(em, args)\n  if (!doc) {\n    // When the caller defers token work it owns the matching token cleanup; the\n    // projection-row removal below stays synchronous so list reads converge immediately.\n    if (!args.deferSearchTokens) {\n      try {\n        await reindexSearchTokensForRecord(em, {\n          entityType: args.entityType,\n          recordId: args.recordId,\n          organizationId: args.organizationId ?? null,\n          tenantId: args.tenantId ?? null,\n          doc: null,\n        })\n      } catch {}\n    }\n    if (existed) {\n      await scopeEntityIndexes(\n        db.deleteFrom('entity_indexes' as any) as any,\n        args,\n      ).execute()\n    }\n    return { doc: null, existed, wasDeleted, created: false, revived: false }\n  }\n\n  const payload = {\n    entity_type: args.entityType,\n    entity_id: String(args.recordId),\n    organization_id: args.organizationId ?? null,\n    tenant_id: args.tenantId ?? null,\n    doc: sql`${JSON.stringify(doc)}::jsonb`,\n    index_version: 1,\n    updated_at: sql`now()`,\n    deleted_at: null,\n  }\n\n  // Prefer modern upsert keyed by coalesced org id when available; fallback to update-then-insert\n  try {\n    await db\n      .insertInto('entity_indexes' as any)\n      .values({ ...payload, created_at: sql`now()` } as any)\n      .onConflict((oc: any) => oc\n        .columns(['entity_type', 'entity_id', 'organization_id_coalesced'])\n        .doUpdateSet({\n          tenant_id: args.tenantId ?? null,\n          doc: sql`${JSON.stringify(doc)}::jsonb`,\n          index_version: 1,\n          updated_at: sql`now()`,\n          deleted_at: null,\n        } as any))\n      .execute()\n  } catch {\n    // Fallback for schemas without organization_id_coalesced column/index\n    const updated = await scopeEntityIndexes(\n      db.updateTable('entity_indexes' as any).set(payload as any) as any,\n      args,\n    ).executeTakeFirst() as { numUpdatedRows?: bigint | number } | undefined\n    if (!updated || Number(updated.numUpdatedRows ?? 0) === 0) {\n      try {\n        await db\n          .insertInto('entity_indexes' as any)\n          .values({ ...payload, created_at: sql`now()` } as any)\n          .execute()\n      } catch {}\n    }\n  }\n\n  const created = !existed\n  const revived = existed && wasDeleted\n  // The search-token rebuild (DELETE + chunked INSERT) is the heavy tail of indexing.\n  // Callers that defer it (the upsert subscriber) run `reindexSearchTokensForRecord`\n  // asynchronously after this projection update so write latency stays bounded.\n  if (!args.deferSearchTokens) {\n    try {\n      await reindexSearchTokensForRecord(em, {\n        entityType: args.entityType,\n        recordId: args.recordId,\n        organizationId: args.organizationId ?? null,\n        tenantId: args.tenantId ?? null,\n        doc,\n        searchTokenDoc: args.searchTokenDoc ?? null,\n      })\n    } catch {}\n  }\n  return { doc, existed, wasDeleted, created, revived }\n}\n\n/**\n * Rebuilds (or clears, when `doc` is null) the search-token rows for a single record.\n * This is the asynchronous-friendly tail of `upsertIndexRow`: it does not touch the\n * `entity_indexes` projection that list endpoints read, so it can run out-of-band\n * without making query-index reads inconsistent.\n */\nexport async function reindexSearchTokensForRecord(\n  em: EntityManager,\n  args: {\n    entityType: string\n    recordId: string\n    organizationId?: string | null\n    tenantId?: string | null\n    doc: Record<string, any> | null\n    searchTokenDoc?: Record<string, unknown> | null\n  },\n): Promise<void> {\n  const db = (em as any).getKysely()\n  if (!args.doc) {\n    await deleteSearchTokensForRecord(db, {\n      entityType: args.entityType,\n      recordId: args.recordId,\n      organizationId: args.organizationId ?? null,\n      tenantId: args.tenantId ?? null,\n    })\n    return\n  }\n  const tokenDoc = args.searchTokenDoc ?? (() => {\n    const encryption = resolveTenantEncryptionService(em as any)\n    const dekKeyCache = new Map<string | null, string | null>()\n    return decryptIndexDocForSearch(\n      args.entityType,\n      args.doc,\n      { tenantId: args.tenantId ?? null, organizationId: args.organizationId ?? null },\n      encryption,\n      dekKeyCache,\n    )\n  })()\n  await replaceSearchTokensForRecord(db, {\n    entityType: args.entityType,\n    recordId: args.recordId,\n    organizationId: args.organizationId ?? null,\n    tenantId: args.tenantId ?? null,\n    doc: await tokenDoc,\n  })\n}\n\nexport async function markDeleted(\n  em: EntityManager,\n  args: { entityType: string; recordId: string; organizationId?: string | null; tenantId?: string | null }\n): Promise<{ wasActive: boolean }> {\n  const db = (em as any).getKysely()\n  const existing = await scopeEntityIndexes(\n    db.selectFrom('entity_indexes' as any).select(['deleted_at' as any]),\n    args,\n  ).executeTakeFirst() as { deleted_at: Date | null } | undefined\n\n  const wasActive = !!existing && existing.deleted_at == null\n\n  if (existing) {\n    try {\n      await deleteSearchTokensForRecord(db, {\n        entityType: args.entityType,\n        recordId: args.recordId,\n        organizationId: args.organizationId ?? null,\n        tenantId: args.tenantId ?? null,\n      })\n    } catch {}\n    await scopeEntityIndexes(\n      db.deleteFrom('entity_indexes' as any) as any,\n      args,\n    ).execute()\n  }\n\n  return { wasActive }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { resolveEntityTableName } from '@open-mercato/shared/lib/query/engine'\nimport { resolveTenantEncryptionService } from '@open-mercato/shared/lib/encryption/customFieldValues'\nimport { decryptIndexDocForSearch, encryptIndexDocForStorage } from '@open-mercato/shared/lib/encryption/indexDoc'\nimport {\n  buildCustomFieldDefinitionIndexFromRows,\n  normalizeDefinitionKey,\n  selectDefinitionForRecord,\n  type CustomFieldDefinitionRow,\n} from '@open-mercato/shared/lib/crud/custom-field-definition-index'\nimport { type Kysely, type Transaction, sql } from 'kysely'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\nimport { replaceSearchTokensForRecord, deleteSearchTokensForRecord } from './search-tokens'\nimport { attachAggregateSearchField } from './document'\n\nconst logger = createLogger('query_index').child({ component: 'indexer' })\n\ntype QueryIndexExecutor = Kysely<any> | Transaction<any>\n\ntype BuildDocParams = {\n  entityType: string // '<module>:<entity>'\n  recordId: string\n  organizationId?: string | null\n  tenantId?: string | null\n}\n\nexport async function buildIndexDoc(em: EntityManager, params: BuildDocParams): Promise<Record<string, any> | null> {\n  const db = (em as any).getKysely()\n  const baseTable = resolveEntityTableName(em, params.entityType)\n\n  // Fetch base row\n  const baseRow = await db\n    .selectFrom(baseTable as any)\n    .selectAll()\n    .where('id' as any, '=', params.recordId)\n    .executeTakeFirst() as Record<string, any> | undefined\n  if (!baseRow) return null\n  const docSources: Array<Record<string, any>> = []\n\n  // Attach the core customer entity when indexing customer profiles so search tokens see the combined row\n  let parentEntityRow: Record<string, any> | null = null\n  if (params.entityType === 'customers:customer_person_profile' || params.entityType === 'customers:customer_company_profile') {\n    const entityId = (baseRow as any).entity_id ?? (baseRow as any).entityId\n    if (entityId) {\n      const entityRow = await db\n        .selectFrom('customer_entities' as any)\n        .selectAll()\n        .where('id' as any, '=', entityId)\n        .executeTakeFirst() as Record<string, any> | undefined\n      if (entityRow) {\n        docSources.push(entityRow)\n        parentEntityRow = entityRow\n      }\n    }\n  }\n  void parentEntityRow\n\n  // Build base document (snake_case keys as in DB)\n  let doc: Record<string, any> = {}\n  docSources.push(baseRow)\n  for (const source of docSources) {\n    for (const [k, v] of Object.entries(source)) doc[k] = v\n  }\n\n  // Attach custom fields under flat keys 'cf:<key>'\n  let cfQuery = db\n    .selectFrom('custom_field_values' as any)\n    .select([\n      'field_key' as any,\n      'value_text' as any,\n      'value_multiline' as any,\n      'value_int' as any,\n      'value_float' as any,\n      'value_bool' as any,\n    ])\n    .where('entity_id' as any, '=', params.entityType)\n    .where('record_id' as any, '=', String(params.recordId))\n\n  if (params.organizationId != null) {\n    cfQuery = cfQuery.where((eb: any) => eb.or([\n      eb('organization_id' as any, '=', params.organizationId),\n      eb('organization_id' as any, 'is', null),\n    ]))\n  } else {\n    cfQuery = cfQuery.where('organization_id' as any, 'is', null)\n  }\n\n  if (params.tenantId != null) {\n    cfQuery = cfQuery.where((eb: any) => eb.or([\n      eb('tenant_id' as any, '=', params.tenantId),\n      eb('tenant_id' as any, 'is', null),\n    ]))\n  } else {\n    cfQuery = cfQuery.where('tenant_id' as any, 'is', null)\n  }\n\n  const cfRows = await cfQuery.execute() as Array<Record<string, any>>\n\n  const cfMap: Record<string, any[]> = {}\n  for (const r of cfRows) {\n    const key = String(r.field_key)\n    const cfKey = `cf:${key}`\n    const val = r.value_bool ?? r.value_int ?? r.value_float ?? r.value_text ?? r.value_multiline ?? null\n    if (!cfMap[cfKey]) cfMap[cfKey] = []\n    cfMap[cfKey].push(val)\n  }\n\n  const multiKeys = new Set<string>()\n  const fieldKeys = Object.keys(cfMap).map((key) => key.slice(3))\n  if (fieldKeys.length > 0) {\n    let defQuery = db\n      .selectFrom('custom_field_defs' as any)\n      .select([\n        'key' as any,\n        'kind' as any,\n        'config_json' as any,\n        'organization_id' as any,\n        'tenant_id' as any,\n        'deleted_at' as any,\n        'updated_at' as any,\n      ])\n      .where('entity_id' as any, '=', params.entityType)\n      .where('key' as any, 'in', fieldKeys)\n      .where('is_active' as any, '=', true)\n      .where('deleted_at' as any, 'is', null)\n\n    if (params.organizationId != null) {\n      defQuery = defQuery.where((eb: any) => eb.or([\n        eb('organization_id' as any, '=', params.organizationId),\n        eb('organization_id' as any, 'is', null),\n      ]))\n    } else {\n      defQuery = defQuery.where('organization_id' as any, 'is', null)\n    }\n\n    if (params.tenantId != null) {\n      defQuery = defQuery.where((eb: any) => eb.or([\n        eb('tenant_id' as any, '=', params.tenantId),\n        eb('tenant_id' as any, 'is', null),\n      ]))\n    } else {\n      defQuery = defQuery.where('tenant_id' as any, 'is', null)\n    }\n\n    const defRows = await defQuery.execute() as Array<Record<string, any>>\n    const definitionIndex = buildCustomFieldDefinitionIndexFromRows(\n      defRows.map((row): CustomFieldDefinitionRow => ({\n        key: String(row.key ?? ''),\n        entityId: params.entityType,\n        kind: typeof row.kind === 'string' ? row.kind : null,\n        configJson: row.config_json,\n        organizationId: row.organization_id ?? null,\n        tenantId: row.tenant_id ?? null,\n        deletedAt: row.deleted_at ?? null,\n        updatedAt: row.updated_at ?? null,\n      })),\n      { organizationIds: params.organizationId ? [params.organizationId] : [] },\n    )\n    for (const key of fieldKeys) {\n      const definitions = definitionIndex.get(normalizeDefinitionKey(key)) ?? []\n      const definition = selectDefinitionForRecord(\n        definitions,\n        params.organizationId ?? null,\n        params.tenantId ?? null,\n      )\n      if (definition?.multi) multiKeys.add(key)\n    }\n  }\n\n  for (const [key, arr] of Object.entries(cfMap)) {\n    // Cardinality belongs to the field definition, not the current row count:\n    // a multi field containing one value must still hydrate as an array.\n    const fieldKey = key.slice(3)\n    doc[key] = multiKeys.has(fieldKey) || arr.length > 1 ? arr : arr[0]\n  }\n\n  // Attach translations under flat keys 'l10n:{locale}:{field}'\n  try {\n    const translationRow = await db\n      .selectFrom('entity_translations' as any)\n      .select(['translations' as any])\n      .where('entity_type' as any, '=', params.entityType)\n      .where('entity_id' as any, '=', String(params.recordId))\n      .where(sql`tenant_id is not distinct from ${params.tenantId ?? null}`)\n      .where(sql`organization_id is not distinct from ${params.organizationId ?? null}`)\n      .executeTakeFirst() as { translations: Record<string, Record<string, unknown>> | null } | undefined\n\n    if (translationRow?.translations && typeof translationRow.translations === 'object') {\n      for (const [locale, fields] of Object.entries(translationRow.translations)) {\n        if (!fields || typeof fields !== 'object') continue\n        for (const [field, value] of Object.entries(fields as Record<string, unknown>)) {\n          if (typeof value === 'string' && value.length > 0) {\n            doc[`l10n:${locale}:${field}`] = value\n          }\n        }\n      }\n    }\n  } catch {}\n\n  // Kept outside the guard below: a failure while building the aggregate search field is a\n  // bug in the aggregation or its configuration, and must surface instead of being mistaken\n  // for an encryption failure and silently skipping encryption.\n  doc = attachAggregateSearchField(doc, { entityType: params.entityType })\n\n  try {\n    const encryption = resolveTenantEncryptionService(em as any)\n    doc = await encryptIndexDocForStorage(\n      params.entityType,\n      doc,\n      { tenantId: params.tenantId ?? null, organizationId: params.organizationId ?? null },\n      encryption,\n    )\n  } catch (error) {\n    // `encryptIndexDocForStorage` already returns the document untouched when encryption is\n    // absent or disabled, so a throw here is always a genuine encryption failure. Returning\n    // `doc` would hand the caller the plaintext document to write into `entity_indexes`,\n    // which must stay encrypted at rest; returning `null` would mean \"record gone\" and make\n    // `upsertIndexRow` delete a healthy index row. Fail loudly instead: the projection keeps\n    // its previous, correctly encrypted contents and the `query_index.upsert_one` subscriber\n    // persists the error via `recordIndexerError`.\n    logger.error('Index document encryption failed; refusing to return an unencrypted document', {\n      entityType: params.entityType,\n      recordId: params.recordId,\n      tenantId: params.tenantId ?? null,\n      organizationId: params.organizationId ?? null,\n      err: error,\n    })\n    throw error\n  }\n\n  return doc\n}\n\nexport type UpsertIndexResult = {\n  doc: Record<string, any> | null\n  existed: boolean\n  wasDeleted: boolean\n  created: boolean\n  revived: boolean\n}\n\nfunction scopeEntityIndexes<QB extends { where: (...args: any[]) => QB }>(\n  q: QB,\n  args: { entityType: string; recordId: string; organizationId?: string | null; tenantId?: string | null },\n): QB {\n  let chain = q.where('entity_type' as any, '=', args.entityType)\n  chain = chain.where('entity_id' as any, '=', String(args.recordId))\n  chain = args.organizationId == null\n    ? chain.where('organization_id' as any, 'is', null as any)\n    : chain.where('organization_id' as any, '=', args.organizationId)\n  chain = chain.where(sql`tenant_id is not distinct from ${args.tenantId ?? null}`)\n  return chain\n}\n\nexport async function upsertIndexRow(\n  em: EntityManager,\n  args: { entityType: string; recordId: string; organizationId?: string | null; tenantId?: string | null; searchTokenDoc?: Record<string, unknown> | null; deferSearchTokens?: boolean; trx?: QueryIndexExecutor }\n): Promise<UpsertIndexResult> {\n  const db = (em as any).getKysely()\n  const executor = args.trx ?? db\n\n  const existing = await scopeEntityIndexes(\n    executor.selectFrom('entity_indexes' as any).select(['id' as any, 'deleted_at' as any]),\n    args,\n  ).executeTakeFirst() as { id: string; deleted_at: Date | null } | undefined\n\n  const existed = !!existing\n  const wasDeleted = !!existing && existing.deleted_at != null\n\n  const doc = await buildIndexDoc(em, args)\n  if (!doc) {\n    // When the caller defers token work it owns the matching token cleanup; the\n    // projection-row removal below stays synchronous so list reads converge immediately.\n    if (!args.deferSearchTokens) {\n      try {\n        await reindexSearchTokensForRecord(em, {\n          entityType: args.entityType,\n          recordId: args.recordId,\n          organizationId: args.organizationId ?? null,\n          tenantId: args.tenantId ?? null,\n          doc: null,\n          trx: args.trx,\n        })\n      } catch (error) {\n        if (args.trx) throw error\n      }\n    }\n    if (existed) {\n      await scopeEntityIndexes(\n        executor.deleteFrom('entity_indexes' as any) as any,\n        args,\n      ).execute()\n    }\n    return { doc: null, existed, wasDeleted, created: false, revived: false }\n  }\n\n  const payload = {\n    entity_type: args.entityType,\n    entity_id: String(args.recordId),\n    organization_id: args.organizationId ?? null,\n    tenant_id: args.tenantId ?? null,\n    doc: sql`${JSON.stringify(doc)}::jsonb`,\n    index_version: 1,\n    updated_at: sql`now()`,\n    deleted_at: null,\n  }\n\n  // Prefer modern upsert keyed by coalesced org id when available; fallback to update-then-insert\n  try {\n    await executor\n      .insertInto('entity_indexes' as any)\n      .values({ ...payload, created_at: sql`now()` } as any)\n      .onConflict((oc: any) => oc\n        .columns(['entity_type', 'entity_id', 'organization_id_coalesced'])\n        .doUpdateSet({\n          tenant_id: args.tenantId ?? null,\n          doc: sql`${JSON.stringify(doc)}::jsonb`,\n          index_version: 1,\n          updated_at: sql`now()`,\n          deleted_at: null,\n        } as any))\n      .execute()\n  } catch {\n    // Fallback for schemas without organization_id_coalesced column/index\n    const updated = await scopeEntityIndexes(\n      executor.updateTable('entity_indexes' as any).set(payload as any) as any,\n      args,\n    ).executeTakeFirst() as { numUpdatedRows?: bigint | number } | undefined\n    if (!updated || Number(updated.numUpdatedRows ?? 0) === 0) {\n      try {\n        await executor\n          .insertInto('entity_indexes' as any)\n          .values({ ...payload, created_at: sql`now()` } as any)\n          .execute()\n      } catch (error) {\n        if (args.trx) throw error\n      }\n    }\n  }\n\n  const created = !existed\n  const revived = existed && wasDeleted\n  // The search-token rebuild (DELETE + chunked INSERT) is the heavy tail of indexing.\n  // Callers that defer it (the upsert subscriber) run `reindexSearchTokensForRecord`\n  // asynchronously after this projection update so write latency stays bounded.\n  if (!args.deferSearchTokens) {\n    try {\n      await reindexSearchTokensForRecord(em, {\n        entityType: args.entityType,\n        recordId: args.recordId,\n        organizationId: args.organizationId ?? null,\n        tenantId: args.tenantId ?? null,\n        doc,\n        searchTokenDoc: args.searchTokenDoc ?? null,\n        trx: args.trx,\n      })\n    } catch (error) {\n      if (args.trx) throw error\n    }\n  }\n  return { doc, existed, wasDeleted, created, revived }\n}\n\n/**\n * Rebuilds (or clears, when `doc` is null) the search-token rows for a single record.\n * This is the asynchronous-friendly tail of `upsertIndexRow`: it does not touch the\n * `entity_indexes` projection that list endpoints read, so it can run out-of-band\n * without making query-index reads inconsistent.\n */\nexport async function reindexSearchTokensForRecord(\n  em: EntityManager,\n  args: {\n    entityType: string\n    recordId: string\n    organizationId?: string | null\n    tenantId?: string | null\n    doc: Record<string, any> | null\n    searchTokenDoc?: Record<string, unknown> | null\n    trx?: QueryIndexExecutor\n  },\n): Promise<void> {\n  const db = (em as any).getKysely()\n  if (!args.doc) {\n    await deleteSearchTokensForRecord(db, {\n      entityType: args.entityType,\n      recordId: args.recordId,\n      organizationId: args.organizationId ?? null,\n      tenantId: args.tenantId ?? null,\n    }, { trx: args.trx })\n    return\n  }\n  const tokenDoc = args.searchTokenDoc ?? (() => {\n    const encryption = resolveTenantEncryptionService(em as any)\n    const dekKeyCache = new Map<string | null, string | null>()\n    return decryptIndexDocForSearch(\n      args.entityType,\n      args.doc,\n      { tenantId: args.tenantId ?? null, organizationId: args.organizationId ?? null },\n      encryption,\n      dekKeyCache,\n    )\n  })()\n  await replaceSearchTokensForRecord(db, {\n    entityType: args.entityType,\n    recordId: args.recordId,\n    organizationId: args.organizationId ?? null,\n    tenantId: args.tenantId ?? null,\n    doc: await tokenDoc,\n  }, { trx: args.trx })\n}\n\nexport async function markDeleted(\n  em: EntityManager,\n  args: { entityType: string; recordId: string; organizationId?: string | null; tenantId?: string | null; trx?: QueryIndexExecutor }\n): Promise<{ wasActive: boolean }> {\n  const db = (em as any).getKysely()\n  const executor = args.trx ?? db\n  const existing = await scopeEntityIndexes(\n    executor.selectFrom('entity_indexes' as any).select(['deleted_at' as any]),\n    args,\n  ).executeTakeFirst() as { deleted_at: Date | null } | undefined\n\n  const wasActive = !!existing && existing.deleted_at == null\n\n  if (existing) {\n    try {\n      await deleteSearchTokensForRecord(db, {\n        entityType: args.entityType,\n        recordId: args.recordId,\n        organizationId: args.organizationId ?? null,\n        tenantId: args.tenantId ?? null,\n      }, { trx: args.trx })\n    } catch (error) {\n      if (args.trx) throw error\n    }\n    await scopeEntityIndexes(\n      executor.deleteFrom('entity_indexes' as any) as any,\n      args,\n    ).execute()\n  }\n\n  return { wasActive }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/query_index/lib/search-tokens.js

@@ -109,15 +109,15 @@ function buildFieldPairs(recordId, doc) {
   }
   return pairs;
 }
-async function replaceSearchTokensForRecord(db, params) {
+async function replaceSearchTokensForRecord(db, params, options) {
   const rows = buildSearchTokenRows(params);
   const config = params.config ?? resolveSearchConfig();
   if (!config.enabled) return;
   const organizationId = params.organizationId ?? null;
   const tenantId = params.tenantId ?? null;
   const fieldPairs = buildFieldPairs(String(params.recordId), params.doc);
-  await db.transaction().execute(async (trx) => {
-    let deleteQuery = trx.deleteFrom("search_tokens").where("entity_type", "=", params.entityType).where(sql`organization_id is not distinct from ${organizationId}`).where(sql`tenant_id is not distinct from ${tenantId}`);
+  const writeTokens = async (executor) => {
+    let deleteQuery = executor.deleteFrom("search_tokens").where("entity_type", "=", params.entityType).where(sql`organization_id is not distinct from ${organizationId}`).where(sql`tenant_id is not distinct from ${tenantId}`);
     if (fieldPairs.length) {
       deleteQuery = deleteQuery.where((eb) => eb.or(
         fieldPairs.map(([rid, field]) => eb.and([
@@ -132,14 +132,20 @@ async function replaceSearchTokensForRecord(db, params) {
     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").values(batch).execute();
+      await executor.insertInto("search_tokens").values(batch).execute();
     }
-  });
+  };
+  if (options?.trx) {
+    await writeTokens(options.trx);
+    return;
+  }
+  await db.transaction().execute(writeTokens);
 }
-async function deleteSearchTokensForRecord(db, params) {
+async function deleteSearchTokensForRecord(db, params, options) {
   const organizationId = params.organizationId ?? null;
   const tenantId = params.tenantId ?? null;
-  await db.deleteFrom("search_tokens").where("entity_type", "=", params.entityType).where("entity_id", "=", String(params.recordId)).where(sql`organization_id is not distinct from ${organizationId}`).where(sql`tenant_id is not distinct from ${tenantId}`).execute();
+  const executor = options?.trx ?? db;
+  await executor.deleteFrom("search_tokens").where("entity_type", "=", params.entityType).where("entity_id", "=", String(params.recordId)).where(sql`organization_id is not distinct from ${organizationId}`).where(sql`tenant_id is not distinct from ${tenantId}`).execute();
 }
 async function replaceSearchTokensForBatch(db, payloads) {
   if (!payloads.length) return;

package/dist/modules/query_index/lib/search-tokens.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/query_index/lib/search-tokens.ts"],
-  "sourcesContent": ["import { type Kysely, sql } from 'kysely'\nimport {\n  isSearchFieldBlocklisted,\n  resolveSearchConfig,\n  type SearchConfig,\n} from '@open-mercato/shared/lib/search/config'\nimport { tokenizeText } from '@open-mercato/shared/lib/search/tokenize'\nimport { parseBooleanToken } from '@open-mercato/shared/lib/boolean'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('query_index').child({ component: 'search-tokens' })\n\nconst INSERT_BATCH_SIZE = 500\n\nfunction chunk<T>(items: T[], size: number): T[][] {\n  if (size <= 0) return [items]\n  const out: T[][] = []\n  for (let i = 0; i < items.length; i += size) out.push(items.slice(i, i + size))\n  return out\n}\n\nexport type SearchTokenRow = {\n  entity_type: string\n  entity_id: string\n  organization_id: string | null\n  tenant_id: string | null\n  field: string\n  token_hash: string\n  token?: string | null\n}\n\ntype BuildTokenOptions = {\n  entityType: string\n  recordId: string\n  organizationId?: string | null\n  tenantId?: string | null\n  doc?: Record<string, unknown> | null\n  config?: SearchConfig\n}\n\nconst DEFAULT_SCOPE = { organizationId: null, tenantId: null }\ntype EntityFieldPair = [string, string]\n\nexport const isSearchDebugEnabled = (): boolean => {\n  return parseBooleanToken(process.env.OM_SEARCH_DEBUG ?? '') === true\n}\n\nconst debug = (event: string, payload: Record<string, unknown>) => {\n  if (!isSearchDebugEnabled()) return\n  try {\n    logger.debug('Search token event', { event, payload })\n  } catch {\n    // ignore\n  }\n}\n\nfunction collectTextValues(value: unknown): string[] {\n  if (typeof value === 'string') return [value]\n  if (Array.isArray(value)) {\n    const out: string[] = []\n    for (const entry of value) {\n      if (typeof entry === 'string') out.push(entry)\n    }\n    return out\n  }\n  return []\n}\n\nfunction shouldIndexField(\n  field: string,\n  value: unknown,\n  config: SearchConfig,\n  entityType: string | null,\n): boolean {\n  if (typeof value !== 'string' && !Array.isArray(value)) return false\n  const lower = field.toLowerCase()\n  if (lower === 'id' || lower.endsWith('_id') || lower.endsWith('.id')) return false\n  if (lower.endsWith('_at')) return false\n  if (['created_at', 'updated_at', 'deleted_at', 'tenant_id', 'organization_id'].includes(lower)) return false\n  if (isSearchFieldBlocklisted(field, entityType, config)) return false\n  const values = collectTextValues(value)\n  if (!values.length) return false\n  return values.some((text) => tokenizeText(text, config).tokens.length > 0)\n}\n\nexport function buildSearchTokenRows(params: BuildTokenOptions): SearchTokenRow[] {\n  const config = params.config ?? resolveSearchConfig()\n  if (!config.enabled) return []\n  if (!params.doc) return []\n  const tokens: SearchTokenRow[] = []\n  const capturePairs = isSearchDebugEnabled() && params.entityType === 'customers:customer_deal'\n  const debugPairs: Array<{ field: string; hash: string }> = []\n  const scope = {\n    organizationId: params.organizationId ?? DEFAULT_SCOPE.organizationId,\n    tenantId: params.tenantId ?? DEFAULT_SCOPE.tenantId,\n  }\n\n  for (const [field, rawValue] of Object.entries(params.doc)) {\n    if (!shouldIndexField(field, rawValue, config, params.entityType)) continue\n    const values = collectTextValues(rawValue)\n    const seen = new Set<string>()\n    for (const text of values) {\n      const { tokens: textTokens, hashes } = tokenizeText(text, config)\n      for (let i = 0; i < textTokens.length; i += 1) {\n        const token = textTokens[i]\n        const hash = hashes[i]\n        const dedupeKey = `${field}|${hash}`\n        if (seen.has(dedupeKey)) continue\n        seen.add(dedupeKey)\n        debug('token.generated', { entityType: params.entityType, recordId: params.recordId, field, hash })\n        tokens.push({\n          entity_type: params.entityType,\n          entity_id: String(params.recordId),\n          organization_id: scope.organizationId,\n          tenant_id: scope.tenantId,\n          field,\n          token_hash: hash,\n          token: config.storeRawTokens ? token : null,\n        })\n        if (capturePairs) {\n          debugPairs.push({ field, hash })\n        }\n      }\n    }\n  }\n  if (capturePairs) {\n    debug('deal.tokens', {\n      entityType: params.entityType,\n      recordId: params.recordId,\n      tokenCount: debugPairs.length,\n      tokens: debugPairs,\n    })\n  }\n  debug('doc.completed', { entityType: params.entityType, recordId: params.recordId, tokenCount: tokens.length })\n\n  return tokens\n}\n\nfunction buildFieldPairs(recordId: string, doc?: Record<string, unknown> | null): EntityFieldPair[] {\n  if (!doc) return []\n  const pairs: EntityFieldPair[] = []\n  const dedupe = new Set<string>()\n  for (const field of Object.keys(doc)) {\n    const key = `${recordId}|${field}`\n    if (dedupe.has(key)) continue\n    dedupe.add(key)\n    pairs.push([recordId, field])\n  }\n  return pairs\n}\n\nexport async function replaceSearchTokensForRecord(\n  db: Kysely<any>,\n  params: BuildTokenOptions\n): Promise<void> {\n  const rows = buildSearchTokenRows(params)\n  const config = params.config ?? resolveSearchConfig()\n  if (!config.enabled) return\n  const organizationId = params.organizationId ?? null\n  const tenantId = params.tenantId ?? null\n  const fieldPairs = buildFieldPairs(String(params.recordId), params.doc)\n\n  await db.transaction().execute(async (trx) => {\n    let deleteQuery = trx\n      .deleteFrom('search_tokens' as any)\n      .where('entity_type' as any, '=', params.entityType)\n      .where(sql<boolean>`organization_id is not distinct from ${organizationId}`)\n      .where(sql<boolean>`tenant_id is not distinct from ${tenantId}`)\n    if (fieldPairs.length) {\n      deleteQuery = deleteQuery.where((eb: any) => eb.or(\n        fieldPairs.map(([rid, field]) => eb.and([\n          eb('entity_id' as any, '=', rid),\n          eb('field' as any, '=', field),\n        ])),\n      ))\n    } else {\n      deleteQuery = deleteQuery.where('entity_id' as any, '=', String(params.recordId))\n    }\n    await deleteQuery.execute()\n    if (!rows.length) return\n    const payloads = rows.map((row) => ({ ...row, created_at: sql`now()` }))\n    for (const batch of chunk(payloads, INSERT_BATCH_SIZE)) {\n      await trx.insertInto('search_tokens' as any).values(batch as any).execute()\n    }\n  })\n}\n\nexport async function deleteSearchTokensForRecord(\n  db: Kysely<any>,\n  params: { entityType: string; recordId: string; organizationId?: string | null; tenantId?: string | null }\n): Promise<void> {\n  const organizationId = params.organizationId ?? null\n  const tenantId = params.tenantId ?? null\n  await db\n    .deleteFrom('search_tokens' as any)\n    .where('entity_type' as any, '=', params.entityType)\n    .where('entity_id' as any, '=', String(params.recordId))\n    .where(sql<boolean>`organization_id is not distinct from ${organizationId}`)\n    .where(sql<boolean>`tenant_id is not distinct from ${tenantId}`)\n    .execute()\n}\n\nexport async function replaceSearchTokensForBatch(\n  db: Kysely<any>,\n  payloads: Array<BuildTokenOptions & { doc: Record<string, unknown> }>\n): Promise<void> {\n  if (!payloads.length) return\n  const config = resolveSearchConfig()\n  if (!config.enabled) return\n\n  const rows = payloads.flatMap((payload) => buildSearchTokenRows({ ...payload, config }))\n  if (!rows.length) {\n    const entityType = payloads[0]?.entityType\n    if (!entityType) return\n    const ids = payloads.map((p) => String(p.recordId))\n    await db\n      .deleteFrom('search_tokens' as any)\n      .where('entity_type' as any, '=', entityType)\n      .where('entity_id' as any, 'in', ids)\n      .execute()\n    return\n  }\n\n  const scopeKey = (org: string | null, tenant: string | null) => `${org ?? '__null__'}|${tenant ?? '__null__'}`\n  const scopeBuckets = new Map<string, { organizationId: string | null; tenantId: string | null; ids: Set<string> }>()\n\n  for (const payload of payloads) {\n    const org = payload.organizationId ?? null\n    const tenant = payload.tenantId ?? null\n    const key = scopeKey(org, tenant)\n    const bucket = scopeBuckets.get(key) ?? { organizationId: org, tenantId: tenant, ids: new Set<string>() }\n    bucket.ids.add(String(payload.recordId))\n    scopeBuckets.set(key, bucket)\n  }\n\n  await db.transaction().execute(async (trx) => {\n    for (const [, bucket] of scopeBuckets.entries()) {\n      // Delete by entity_id: a batch replaces all of a record's tokens, and a per-field OR over the\n      // whole batch overflows the query compiler's call stack on large batches.\n      const deleteQuery = trx\n        .deleteFrom('search_tokens' as any)\n        .where('entity_type' as any, '=', payloads[0].entityType)\n        .where(sql<boolean>`organization_id is not distinct from ${bucket.organizationId}`)\n        .where(sql<boolean>`tenant_id is not distinct from ${bucket.tenantId}`)\n        .where('entity_id' as any, 'in', Array.from(bucket.ids))\n      await deleteQuery.execute()\n    }\n    const payloadWithTimestamps = rows.map((row) => ({ ...row, created_at: sql`now()` }))\n    for (const batch of chunk(payloadWithTimestamps, INSERT_BATCH_SIZE)) {\n      await trx.insertInto('search_tokens' as any).values(batch as any).execute()\n    }\n  })\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { type Kysely, type Transaction, sql } from 'kysely'\nimport {\n  isSearchFieldBlocklisted,\n  resolveSearchConfig,\n  type SearchConfig,\n} from '@open-mercato/shared/lib/search/config'\nimport { tokenizeText } from '@open-mercato/shared/lib/search/tokenize'\nimport { parseBooleanToken } from '@open-mercato/shared/lib/boolean'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('query_index').child({ component: 'search-tokens' })\n\nconst INSERT_BATCH_SIZE = 500\n\nfunction chunk<T>(items: T[], size: number): T[][] {\n  if (size <= 0) return [items]\n  const out: T[][] = []\n  for (let i = 0; i < items.length; i += size) out.push(items.slice(i, i + size))\n  return out\n}\n\nexport type SearchTokenRow = {\n  entity_type: string\n  entity_id: string\n  organization_id: string | null\n  tenant_id: string | null\n  field: string\n  token_hash: string\n  token?: string | null\n}\n\ntype BuildTokenOptions = {\n  entityType: string\n  recordId: string\n  organizationId?: string | null\n  tenantId?: string | null\n  doc?: Record<string, unknown> | null\n  config?: SearchConfig\n}\n\nconst DEFAULT_SCOPE = { organizationId: null, tenantId: null }\ntype EntityFieldPair = [string, string]\ntype SearchTokenExecutor = Kysely<any> | Transaction<any>\n\nexport const isSearchDebugEnabled = (): boolean => {\n  return parseBooleanToken(process.env.OM_SEARCH_DEBUG ?? '') === true\n}\n\nconst debug = (event: string, payload: Record<string, unknown>) => {\n  if (!isSearchDebugEnabled()) return\n  try {\n    logger.debug('Search token event', { event, payload })\n  } catch {\n    // ignore\n  }\n}\n\nfunction collectTextValues(value: unknown): string[] {\n  if (typeof value === 'string') return [value]\n  if (Array.isArray(value)) {\n    const out: string[] = []\n    for (const entry of value) {\n      if (typeof entry === 'string') out.push(entry)\n    }\n    return out\n  }\n  return []\n}\n\nfunction shouldIndexField(\n  field: string,\n  value: unknown,\n  config: SearchConfig,\n  entityType: string | null,\n): boolean {\n  if (typeof value !== 'string' && !Array.isArray(value)) return false\n  const lower = field.toLowerCase()\n  if (lower === 'id' || lower.endsWith('_id') || lower.endsWith('.id')) return false\n  if (lower.endsWith('_at')) return false\n  if (['created_at', 'updated_at', 'deleted_at', 'tenant_id', 'organization_id'].includes(lower)) return false\n  if (isSearchFieldBlocklisted(field, entityType, config)) return false\n  const values = collectTextValues(value)\n  if (!values.length) return false\n  return values.some((text) => tokenizeText(text, config).tokens.length > 0)\n}\n\nexport function buildSearchTokenRows(params: BuildTokenOptions): SearchTokenRow[] {\n  const config = params.config ?? resolveSearchConfig()\n  if (!config.enabled) return []\n  if (!params.doc) return []\n  const tokens: SearchTokenRow[] = []\n  const capturePairs = isSearchDebugEnabled() && params.entityType === 'customers:customer_deal'\n  const debugPairs: Array<{ field: string; hash: string }> = []\n  const scope = {\n    organizationId: params.organizationId ?? DEFAULT_SCOPE.organizationId,\n    tenantId: params.tenantId ?? DEFAULT_SCOPE.tenantId,\n  }\n\n  for (const [field, rawValue] of Object.entries(params.doc)) {\n    if (!shouldIndexField(field, rawValue, config, params.entityType)) continue\n    const values = collectTextValues(rawValue)\n    const seen = new Set<string>()\n    for (const text of values) {\n      const { tokens: textTokens, hashes } = tokenizeText(text, config)\n      for (let i = 0; i < textTokens.length; i += 1) {\n        const token = textTokens[i]\n        const hash = hashes[i]\n        const dedupeKey = `${field}|${hash}`\n        if (seen.has(dedupeKey)) continue\n        seen.add(dedupeKey)\n        debug('token.generated', { entityType: params.entityType, recordId: params.recordId, field, hash })\n        tokens.push({\n          entity_type: params.entityType,\n          entity_id: String(params.recordId),\n          organization_id: scope.organizationId,\n          tenant_id: scope.tenantId,\n          field,\n          token_hash: hash,\n          token: config.storeRawTokens ? token : null,\n        })\n        if (capturePairs) {\n          debugPairs.push({ field, hash })\n        }\n      }\n    }\n  }\n  if (capturePairs) {\n    debug('deal.tokens', {\n      entityType: params.entityType,\n      recordId: params.recordId,\n      tokenCount: debugPairs.length,\n      tokens: debugPairs,\n    })\n  }\n  debug('doc.completed', { entityType: params.entityType, recordId: params.recordId, tokenCount: tokens.length })\n\n  return tokens\n}\n\nfunction buildFieldPairs(recordId: string, doc?: Record<string, unknown> | null): EntityFieldPair[] {\n  if (!doc) return []\n  const pairs: EntityFieldPair[] = []\n  const dedupe = new Set<string>()\n  for (const field of Object.keys(doc)) {\n    const key = `${recordId}|${field}`\n    if (dedupe.has(key)) continue\n    dedupe.add(key)\n    pairs.push([recordId, field])\n  }\n  return pairs\n}\n\nexport async function replaceSearchTokensForRecord(\n  db: Kysely<any>,\n  params: BuildTokenOptions,\n  options?: { trx?: SearchTokenExecutor },\n): Promise<void> {\n  const rows = buildSearchTokenRows(params)\n  const config = params.config ?? resolveSearchConfig()\n  if (!config.enabled) return\n  const organizationId = params.organizationId ?? null\n  const tenantId = params.tenantId ?? null\n  const fieldPairs = buildFieldPairs(String(params.recordId), params.doc)\n\n  const writeTokens = async (executor: SearchTokenExecutor): Promise<void> => {\n    let deleteQuery = executor\n      .deleteFrom('search_tokens' as any)\n      .where('entity_type' as any, '=', params.entityType)\n      .where(sql<boolean>`organization_id is not distinct from ${organizationId}`)\n      .where(sql<boolean>`tenant_id is not distinct from ${tenantId}`)\n    if (fieldPairs.length) {\n      deleteQuery = deleteQuery.where((eb: any) => eb.or(\n        fieldPairs.map(([rid, field]) => eb.and([\n          eb('entity_id' as any, '=', rid),\n          eb('field' as any, '=', field),\n        ])),\n      ))\n    } else {\n      deleteQuery = deleteQuery.where('entity_id' as any, '=', String(params.recordId))\n    }\n    await deleteQuery.execute()\n    if (!rows.length) return\n    const payloads = rows.map((row) => ({ ...row, created_at: sql`now()` }))\n    for (const batch of chunk(payloads, INSERT_BATCH_SIZE)) {\n      await executor.insertInto('search_tokens' as any).values(batch as any).execute()\n    }\n  }\n\n  if (options?.trx) {\n    await writeTokens(options.trx)\n    return\n  }\n\n  await db.transaction().execute(writeTokens)\n}\n\nexport async function deleteSearchTokensForRecord(\n  db: Kysely<any>,\n  params: { entityType: string; recordId: string; organizationId?: string | null; tenantId?: string | null },\n  options?: { trx?: SearchTokenExecutor },\n): Promise<void> {\n  const organizationId = params.organizationId ?? null\n  const tenantId = params.tenantId ?? null\n  const executor = options?.trx ?? db\n  await executor\n    .deleteFrom('search_tokens' as any)\n    .where('entity_type' as any, '=', params.entityType)\n    .where('entity_id' as any, '=', String(params.recordId))\n    .where(sql<boolean>`organization_id is not distinct from ${organizationId}`)\n    .where(sql<boolean>`tenant_id is not distinct from ${tenantId}`)\n    .execute()\n}\n\nexport async function replaceSearchTokensForBatch(\n  db: Kysely<any>,\n  payloads: Array<BuildTokenOptions & { doc: Record<string, unknown> }>\n): Promise<void> {\n  if (!payloads.length) return\n  const config = resolveSearchConfig()\n  if (!config.enabled) return\n\n  const rows = payloads.flatMap((payload) => buildSearchTokenRows({ ...payload, config }))\n  if (!rows.length) {\n    const entityType = payloads[0]?.entityType\n    if (!entityType) return\n    const ids = payloads.map((p) => String(p.recordId))\n    await db\n      .deleteFrom('search_tokens' as any)\n      .where('entity_type' as any, '=', entityType)\n      .where('entity_id' as any, 'in', ids)\n      .execute()\n    return\n  }\n\n  const scopeKey = (org: string | null, tenant: string | null) => `${org ?? '__null__'}|${tenant ?? '__null__'}`\n  const scopeBuckets = new Map<string, { organizationId: string | null; tenantId: string | null; ids: Set<string> }>()\n\n  for (const payload of payloads) {\n    const org = payload.organizationId ?? null\n    const tenant = payload.tenantId ?? null\n    const key = scopeKey(org, tenant)\n    const bucket = scopeBuckets.get(key) ?? { organizationId: org, tenantId: tenant, ids: new Set<string>() }\n    bucket.ids.add(String(payload.recordId))\n    scopeBuckets.set(key, bucket)\n  }\n\n  await db.transaction().execute(async (trx) => {\n    for (const [, bucket] of scopeBuckets.entries()) {\n      // Delete by entity_id: a batch replaces all of a record's tokens, and a per-field OR over the\n      // whole batch overflows the query compiler's call stack on large batches.\n      const deleteQuery = trx\n        .deleteFrom('search_tokens' as any)\n        .where('entity_type' as any, '=', payloads[0].entityType)\n        .where(sql<boolean>`organization_id is not distinct from ${bucket.organizationId}`)\n        .where(sql<boolean>`tenant_id is not distinct from ${bucket.tenantId}`)\n        .where('entity_id' as any, 'in', Array.from(bucket.ids))\n      await deleteQuery.execute()\n    }\n    const payloadWithTimestamps = rows.map((row) => ({ ...row, created_at: sql`now()` }))\n    for (const batch of chunk(payloadWithTimestamps, INSERT_BATCH_SIZE)) {\n      await trx.insertInto('search_tokens' as any).values(batch as any).execute()\n    }\n  })\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/query_index/subscribers/coverage_refresh.js

@@ -1,4 +1,5 @@
 import { recordIndexerError } from "@open-mercato/shared/lib/indexers/error-log";
+import { isReadProjectionAlwaysConsistent } from "@open-mercato/shared/lib/data/consistency";
 import { refreshCoverageSnapshot } from "../lib/coverage.js";
 import { createLogger } from "@open-mercato/shared/lib/logger";
 const logger = createLogger("query_index").child({ component: "coverage-refresh" });
@@ -51,6 +52,9 @@ async function handle(payload, ctx) {
           payload
         }
       );
+      if (isReadProjectionAlwaysConsistent()) {
+        throw err;
+      }
     }
   };
   if (delayMs === 0) {

package/dist/modules/query_index/subscribers/coverage_refresh.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/query_index/subscribers/coverage_refresh.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'\nimport { refreshCoverageSnapshot } from '../lib/coverage'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('query_index').child({ component: 'coverage-refresh' })\n\nexport const metadata = { event: 'query_index.coverage.refresh', persistent: false }\n\ntype Payload = {\n  entityType?: string\n  tenantId?: string | null\n  organizationId?: string | null\n  withDeleted?: boolean\n  delayMs?: number\n}\n\nconst DEFAULT_DELAY_MS = 0\nconst pending = new Map<string, NodeJS.Timeout>()\n\nfunction forkRefreshEntityManager(em: EntityManager): EntityManager {\n  const fork = (em as unknown as { fork?: (options?: Record<string, unknown>) => EntityManager }).fork\n  if (typeof fork !== 'function') return em\n  return fork.call(em, { clear: true, freshEventManager: true, useContext: false })\n}\n\nfunction scopeKey(input: Payload): string {\n  const entity = String(input.entityType || '')\n  const tenant = input.tenantId ?? '__null__'\n  const org = input.organizationId ?? '__null__'\n  const deleted = input.withDeleted ? '1' : '0'\n\n  return `${entity}|${tenant}|${org}|${deleted}`\n}\n\nexport default async function handle(payload: Payload, ctx: { resolve: <T = any>(name: string) => T }) {\n  const entityType = String(payload?.entityType || '')\n  if (!entityType) {\n    return\n  }\n\n  const tenantId = payload?.tenantId ?? null\n  const organizationId = payload?.organizationId ?? null\n  const withDeleted = payload?.withDeleted === true\n  const delayMs = typeof payload?.delayMs === 'number' && payload.delayMs >= 0 ? payload.delayMs : DEFAULT_DELAY_MS\n\n  const key = scopeKey({ entityType, tenantId, organizationId, withDeleted })\n\n  const handleRefresh = async () => {\n    const em = forkRefreshEntityManager(ctx.resolve<EntityManager>('em'))\n    try {\n      await refreshCoverageSnapshot(em, { entityType, tenantId, organizationId, withDeleted })\n    } catch (err) {\n      logger.warn('Failed to refresh coverage snapshot', {\n        entityType,\n        tenantId,\n        organizationId,\n        withDeleted,\n        error: err instanceof Error ? err.message : err,\n      })\n      await recordIndexerError(\n        { em },\n        {\n          source: 'query_index',\n          handler: 'event:query_index.coverage.refresh',\n          error: err,\n          entityType,\n          tenantId,\n          organizationId,\n          payload,\n        },\n      )\n    }\n  }\n\n  if (delayMs === 0) {\n    await handleRefresh()\n    return\n  }\n\n  const existing = pending.get(key)\n  if (existing) {\n    clearTimeout(existing)\n  }\n\n  const timer = setTimeout(() => {\n    pending.delete(key)\n    void handleRefresh()\n  }, delayMs)\n  if (typeof timer.unref === 'function') {\n    timer.unref()\n  }\n  pending.set(key, timer)\n}\n"],
-  "mappings": "AACA,SAAS,0BAA0B;AACnC,SAAS,+BAA+B;AACxC,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,aAAa,EAAE,MAAM,EAAE,WAAW,mBAAmB,CAAC;AAE3E,MAAM,WAAW,EAAE,OAAO,gCAAgC,YAAY,MAAM;AAUnF,MAAM,mBAAmB;AACzB,MAAM,UAAU,oBAAI,IAA4B;AAEhD,SAAS,yBAAyB,IAAkC;AAClE,QAAM,OAAQ,GAAkF;AAChG,MAAI,OAAO,SAAS,WAAY,QAAO;AACvC,SAAO,KAAK,KAAK,IAAI,EAAE,OAAO,MAAM,mBAAmB,MAAM,YAAY,MAAM,CAAC;AAClF;AAEA,SAAS,SAAS,OAAwB;AACxC,QAAM,SAAS,OAAO,MAAM,cAAc,EAAE;AAC5C,QAAM,SAAS,MAAM,YAAY;AACjC,QAAM,MAAM,MAAM,kBAAkB;AACpC,QAAM,UAAU,MAAM,cAAc,MAAM;AAE1C,SAAO,GAAG,MAAM,IAAI,MAAM,IAAI,GAAG,IAAI,OAAO;AAC9C;AAEA,eAAO,OAA8B,SAAkB,KAAgD;AACrG,QAAM,aAAa,OAAO,SAAS,cAAc,EAAE;AACnD,MAAI,CAAC,YAAY;AACf;AAAA,EACF;AAEA,QAAM,WAAW,SAAS,YAAY;AACtC,QAAM,iBAAiB,SAAS,kBAAkB;AAClD,QAAM,cAAc,SAAS,gBAAgB;AAC7C,QAAM,UAAU,OAAO,SAAS,YAAY,YAAY,QAAQ,WAAW,IAAI,QAAQ,UAAU;AAEjG,QAAM,MAAM,SAAS,EAAE,YAAY,UAAU,gBAAgB,YAAY,CAAC;AAE1E,QAAM,gBAAgB,YAAY;AAChC,UAAM,KAAK,yBAAyB,IAAI,QAAuB,IAAI,CAAC;AACpE,QAAI;AACF,YAAM,wBAAwB,IAAI,EAAE,YAAY,UAAU,gBAAgB,YAAY,CAAC;AAAA,IACzF,SAAS,KAAK;AACZ,aAAO,KAAK,uCAAuC;AAAA,QACjD;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,OAAO,eAAe,QAAQ,IAAI,UAAU;AAAA,MAC9C,CAAC;AACD,YAAM;AAAA,QACJ,EAAE,GAAG;AAAA,QACL;AAAA,UACE,QAAQ;AAAA,UACR,SAAS;AAAA,UACT,OAAO;AAAA,UACP;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,MAAI,YAAY,GAAG;AACjB,UAAM,cAAc;AACpB;AAAA,EACF;AAEA,QAAM,WAAW,QAAQ,IAAI,GAAG;AAChC,MAAI,UAAU;AACZ,iBAAa,QAAQ;AAAA,EACvB;AAEA,QAAM,QAAQ,WAAW,MAAM;AAC7B,YAAQ,OAAO,GAAG;AAClB,SAAK,cAAc;AAAA,EACrB,GAAG,OAAO;AACV,MAAI,OAAO,MAAM,UAAU,YAAY;AACrC,UAAM,MAAM;AAAA,EACd;AACA,UAAQ,IAAI,KAAK,KAAK;AACxB;",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'\nimport { isReadProjectionAlwaysConsistent } from '@open-mercato/shared/lib/data/consistency'\nimport { refreshCoverageSnapshot } from '../lib/coverage'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('query_index').child({ component: 'coverage-refresh' })\n\nexport const metadata = { event: 'query_index.coverage.refresh', persistent: false }\n\ntype Payload = {\n  entityType?: string\n  tenantId?: string | null\n  organizationId?: string | null\n  withDeleted?: boolean\n  delayMs?: number\n}\n\nconst DEFAULT_DELAY_MS = 0\nconst pending = new Map<string, NodeJS.Timeout>()\n\nfunction forkRefreshEntityManager(em: EntityManager): EntityManager {\n  const fork = (em as unknown as { fork?: (options?: Record<string, unknown>) => EntityManager }).fork\n  if (typeof fork !== 'function') return em\n  return fork.call(em, { clear: true, freshEventManager: true, useContext: false })\n}\n\nfunction scopeKey(input: Payload): string {\n  const entity = String(input.entityType || '')\n  const tenant = input.tenantId ?? '__null__'\n  const org = input.organizationId ?? '__null__'\n  const deleted = input.withDeleted ? '1' : '0'\n\n  return `${entity}|${tenant}|${org}|${deleted}`\n}\n\nexport default async function handle(payload: Payload, ctx: { resolve: <T = any>(name: string) => T }) {\n  const entityType = String(payload?.entityType || '')\n  if (!entityType) {\n    return\n  }\n\n  const tenantId = payload?.tenantId ?? null\n  const organizationId = payload?.organizationId ?? null\n  const withDeleted = payload?.withDeleted === true\n  const delayMs = typeof payload?.delayMs === 'number' && payload.delayMs >= 0 ? payload.delayMs : DEFAULT_DELAY_MS\n\n  const key = scopeKey({ entityType, tenantId, organizationId, withDeleted })\n\n  const handleRefresh = async () => {\n    const em = forkRefreshEntityManager(ctx.resolve<EntityManager>('em'))\n    try {\n      await refreshCoverageSnapshot(em, { entityType, tenantId, organizationId, withDeleted })\n    } catch (err) {\n      logger.warn('Failed to refresh coverage snapshot', {\n        entityType,\n        tenantId,\n        organizationId,\n        withDeleted,\n        error: err instanceof Error ? err.message : err,\n      })\n      await recordIndexerError(\n        { em },\n        {\n          source: 'query_index',\n          handler: 'event:query_index.coverage.refresh',\n          error: err,\n          entityType,\n          tenantId,\n          organizationId,\n          payload,\n        },\n      )\n      if (isReadProjectionAlwaysConsistent()) {\n        throw err\n      }\n    }\n  }\n\n  if (delayMs === 0) {\n    await handleRefresh()\n    return\n  }\n\n  const existing = pending.get(key)\n  if (existing) {\n    clearTimeout(existing)\n  }\n\n  const timer = setTimeout(() => {\n    pending.delete(key)\n    void handleRefresh()\n  }, delayMs)\n  if (typeof timer.unref === 'function') {\n    timer.unref()\n  }\n  pending.set(key, timer)\n}\n"],
+  "mappings": "AACA,SAAS,0BAA0B;AACnC,SAAS,wCAAwC;AACjD,SAAS,+BAA+B;AACxC,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,aAAa,EAAE,MAAM,EAAE,WAAW,mBAAmB,CAAC;AAE3E,MAAM,WAAW,EAAE,OAAO,gCAAgC,YAAY,MAAM;AAUnF,MAAM,mBAAmB;AACzB,MAAM,UAAU,oBAAI,IAA4B;AAEhD,SAAS,yBAAyB,IAAkC;AAClE,QAAM,OAAQ,GAAkF;AAChG,MAAI,OAAO,SAAS,WAAY,QAAO;AACvC,SAAO,KAAK,KAAK,IAAI,EAAE,OAAO,MAAM,mBAAmB,MAAM,YAAY,MAAM,CAAC;AAClF;AAEA,SAAS,SAAS,OAAwB;AACxC,QAAM,SAAS,OAAO,MAAM,cAAc,EAAE;AAC5C,QAAM,SAAS,MAAM,YAAY;AACjC,QAAM,MAAM,MAAM,kBAAkB;AACpC,QAAM,UAAU,MAAM,cAAc,MAAM;AAE1C,SAAO,GAAG,MAAM,IAAI,MAAM,IAAI,GAAG,IAAI,OAAO;AAC9C;AAEA,eAAO,OAA8B,SAAkB,KAAgD;AACrG,QAAM,aAAa,OAAO,SAAS,cAAc,EAAE;AACnD,MAAI,CAAC,YAAY;AACf;AAAA,EACF;AAEA,QAAM,WAAW,SAAS,YAAY;AACtC,QAAM,iBAAiB,SAAS,kBAAkB;AAClD,QAAM,cAAc,SAAS,gBAAgB;AAC7C,QAAM,UAAU,OAAO,SAAS,YAAY,YAAY,QAAQ,WAAW,IAAI,QAAQ,UAAU;AAEjG,QAAM,MAAM,SAAS,EAAE,YAAY,UAAU,gBAAgB,YAAY,CAAC;AAE1E,QAAM,gBAAgB,YAAY;AAChC,UAAM,KAAK,yBAAyB,IAAI,QAAuB,IAAI,CAAC;AACpE,QAAI;AACF,YAAM,wBAAwB,IAAI,EAAE,YAAY,UAAU,gBAAgB,YAAY,CAAC;AAAA,IACzF,SAAS,KAAK;AACZ,aAAO,KAAK,uCAAuC;AAAA,QACjD;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,OAAO,eAAe,QAAQ,IAAI,UAAU;AAAA,MAC9C,CAAC;AACD,YAAM;AAAA,QACJ,EAAE,GAAG;AAAA,QACL;AAAA,UACE,QAAQ;AAAA,UACR,SAAS;AAAA,UACT,OAAO;AAAA,UACP;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QACF;AAAA,MACF;AACA,UAAI,iCAAiC,GAAG;AACtC,cAAM;AAAA,MACR;AAAA,IACF;AAAA,EACF;AAEA,MAAI,YAAY,GAAG;AACjB,UAAM,cAAc;AACpB;AAAA,EACF;AAEA,QAAM,WAAW,QAAQ,IAAI,GAAG;AAChC,MAAI,UAAU;AACZ,iBAAa,QAAQ;AAAA,EACvB;AAEA,QAAM,QAAQ,WAAW,MAAM;AAC7B,YAAQ,OAAO,GAAG;AAClB,SAAK,cAAc;AAAA,EACrB,GAAG,OAAO;AACV,MAAI,OAAO,MAAM,UAAU,YAAY;AACrC,UAAM,MAAM;AAAA,EACd;AACA,UAAQ,IAAI,KAAK,KAAK;AACxB;",
   "names": []
 }

package/dist/modules/query_index/subscribers/delete_one.js

@@ -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.js";
 import { applyCoverageAdjustments, createCoverageAdjustments } from "../lib/coverage.js";
@@ -27,7 +28,9 @@ async function handle(payload, ctx) {
   if (!entityType || !recordId) return;
   let organizationId = payload?.organizationId ?? null;
   let tenantId = payload?.tenantId ?? null;
+  const suppressCoverage = payload?.suppressCoverage === true;
   const coverageDelayMs = typeof payload?.coverageDelayMs === "number" ? payload.coverageDelayMs : void 0;
+  const alwaysConsistent = isReadProjectionAlwaysConsistent();
   try {
     const hasPayloadOrganizationId = Object.prototype.hasOwnProperty.call(payload ?? {}, "organizationId");
     const hasPayloadTenantId = Object.prototype.hasOwnProperty.call(payload ?? {}, "tenantId");
@@ -42,6 +45,56 @@ async function handle(payload, ctx) {
     });
     organizationId = resolvedScope.organizationId;
     tenantId = resolvedScope.tenantId;
+    if (alwaysConsistent) {
+      const db = em.getKysely();
+      await db.transaction().execute(async (trx) => {
+        const { wasActive: wasActive2 } = await markDeleted(em, { entityType, recordId, organizationId, tenantId, trx });
+        let baseQuery = trx.selectFrom(source.table).select(["deleted_at"]).where("id", "=", recordId);
+        if (source.organizationColumn) {
+          baseQuery = baseQuery.where(
+            source.organizationColumn,
+            organizationId === null ? "is" : "=",
+            organizationId
+          );
+        }
+        if (source.tenantColumn) {
+          baseQuery = baseQuery.where(sql`${sql.ref(source.tenantColumn)} is not distinct from ${tenantId}`);
+        }
+        const row = await baseQuery.executeTakeFirst();
+        const baseDelta2 = !row || row.deleted_at != null ? -1 : 0;
+        const baseDeltaOverride2 = typeof payload?.coverageBaseDelta === "number" ? payload.coverageBaseDelta : void 0;
+        const indexDeltaOverride2 = typeof payload?.coverageIndexDelta === "number" ? payload.coverageIndexDelta : void 0;
+        let effectiveBaseDelta2 = baseDeltaOverride2 ?? baseDelta2;
+        let effectiveIndexDelta2 = indexDeltaOverride2 ?? (wasActive2 ? -1 : 0);
+        if (!Number.isFinite(effectiveBaseDelta2)) effectiveBaseDelta2 = 0;
+        if (!Number.isFinite(effectiveIndexDelta2)) effectiveIndexDelta2 = 0;
+        if (effectiveBaseDelta2 !== 0 || effectiveIndexDelta2 !== 0) {
+          const adjustments = createCoverageAdjustments({
+            entityType,
+            tenantId: tenantId ?? null,
+            organizationId: organizationId ?? null,
+            baseDelta: effectiveBaseDelta2,
+            indexDelta: effectiveIndexDelta2
+          });
+          if (adjustments.length) {
+            await applyCoverageAdjustments(em, adjustments, { trx });
+          }
+        }
+      });
+      const bus = ctx.resolve("eventBus");
+      const shouldRefreshCoverage2 = !suppressCoverage && (coverageDelayMs === void 0 || coverageDelayMs >= 0);
+      const coverageRefreshDelay2 = coverageDelayMs ?? 0;
+      if (shouldRefreshCoverage2) {
+        await bus.emitEvent("query_index.coverage.refresh", {
+          entityType,
+          tenantId: tenantId ?? null,
+          organizationId: organizationId ?? null,
+          delayMs: coverageRefreshDelay2
+        }, { 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;
     let baseCheckSucceeded = false;
@@ -84,7 +137,6 @@ async function handle(payload, ctx) {
         await applyCoverageAdjustments(em, adjustments);
       }
     }
-    const suppressCoverage = payload?.suppressCoverage === true;
     const explicitDelayRequested = typeof payload?.coverageDelayMs === "number";
     const shouldRefreshCoverage = !suppressCoverage && (coverageDelayMs === void 0 || coverageDelayMs >= 0) && (explicitDelayRequested || shouldAllowDeleteCoverageRefresh(entityType, tenantId));
     const coverageRefreshDelay = coverageDelayMs ?? 0;