@open-mercato/core 0.6.6-develop.6413.1.ae875fb682 → 0.6.6-develop.6416.1.888fffc007

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

@@ -1,4 +1,5 @@
 import { sql } from "kysely";
+import { recordIndexerError } from "@open-mercato/shared/lib/indexers/error-log";
 import { buildIndexDocument } from "./document.js";
 import { replaceSearchTokensForBatch, isSearchDebugEnabled } from "./search-tokens.js";
 function normalizeId(value) {
@@ -151,7 +152,11 @@ async function upsertIndexBatch(db, entityType, rows, scope, options = {}) {
     })).execute();
     try {
       await replaceSearchTokensForBatch(db, tokenPayloads);
-    } catch {
+    } catch (searchTokenError) {
+      await recordIndexerError(
+        { db },
+        { source: "fulltext", handler: "query_index:reindex-batch", error: searchTokenError, entityType, tenantId: scope.tenantId ?? null, organizationId: scope.orgId ?? null }
+      ).catch(() => void 0);
     }
     if (debugEnabled) {
       console.info("[reindex:batch:tokens]", {
@@ -195,7 +200,11 @@ async function upsertIndexBatch(db, entityType, rows, scope, options = {}) {
   }
   try {
     await replaceSearchTokensForBatch(db, tokenPayloads);
-  } catch {
+  } catch (searchTokenError) {
+    await recordIndexerError(
+      { db },
+      { source: "fulltext", handler: "query_index:reindex-batch", error: searchTokenError, entityType, tenantId: scope.tenantId ?? null, organizationId: scope.orgId ?? null }
+    ).catch(() => void 0);
   }
 }
 export {

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/query_index/lib/batch.ts"],
-  "sourcesContent": ["import { type Kysely, sql } from 'kysely'\nimport { buildIndexDocument, type IndexCustomFieldValue } from './document'\nimport { replaceSearchTokensForBatch, isSearchDebugEnabled } from './search-tokens'\n\nexport type AnyRow = Record<string, any> & { id: string | number }\n\nexport type ScopeOverrides = {\n  orgId?: string\n  tenantId?: string\n}\n\ntype CustomFieldRow = {\n  record_id: string\n  field_key: string\n  value_text: string | null\n  value_multiline: string | null\n  value_int: number | null\n  value_float: number | null\n  value_bool: boolean | null\n  organization_id: string | null\n  tenant_id: string | null\n}\n\nexport type IndexBatchOptions = {\n  deriveOrganizationId?: (row: AnyRow) => string | null | undefined\n  encryptDoc?: (\n    entityType: string,\n    doc: Record<string, unknown>,\n    scope: { organizationId: string | null; tenantId: string | null },\n  ) => Promise<Record<string, unknown> | null | undefined>\n  decryptDoc?: (\n    entityType: string,\n    doc: Record<string, unknown>,\n    scope: { organizationId: string | null; tenantId: string | null },\n  ) => Promise<Record<string, unknown> | null | undefined>\n}\n\nfunction normalizeId(value: unknown): string {\n  return String(value)\n}\n\nfunction normalizeScopedValue(value: unknown): string | null {\n  if (value === undefined || value === null || value === '') return null\n  return String(value)\n}\n\nexport async function upsertIndexBatch(\n  db: Kysely<any>,\n  entityType: string,\n  rows: AnyRow[],\n  scope: ScopeOverrides,\n  options: IndexBatchOptions = {},\n): Promise<void> {\n  if (!rows.length) return\n  const recordIds = rows.map((row) => normalizeId(row.id))\n\n  const shouldMergeCustomerEntity =\n    entityType === 'customers:customer_person_profile' || entityType === 'customers:customer_company_profile'\n\n  let customerEntitiesById: Map<string, AnyRow> | null = null\n  if (shouldMergeCustomerEntity) {\n    const entityIds = Array.from(\n      new Set(\n        rows\n          .map((row) => (row as AnyRow).entity_id || (row as AnyRow).entityId)\n          .filter((value): value is string | number => value !== undefined && value !== null && `${value}` !== '')\n          .map((value) => normalizeId(value)),\n      ),\n    )\n    if (entityIds.length) {\n      const entityRows = await db\n        .selectFrom('customer_entities' as any)\n        .selectAll()\n        .where('id' as any, 'in', entityIds)\n        .execute() as AnyRow[]\n      customerEntitiesById = new Map(entityRows.map((row) => [normalizeId(row.id), row]))\n    }\n  }\n\n  const customFieldRows = await db\n    .selectFrom('custom_field_values' as any)\n    .select([\n      'record_id' as any,\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      'organization_id' as any,\n      'tenant_id' as any,\n    ])\n    .where('entity_id' as any, '=', entityType)\n    .where('record_id' as any, 'in', recordIds)\n    .execute() as CustomFieldRow[]\n\n  const customFieldMap = new Map<string, CustomFieldRow[]>()\n  for (const fieldRow of customFieldRows) {\n    const key = normalizeId(fieldRow.record_id)\n    const bucket = customFieldMap.get(key)\n    if (bucket) bucket.push(fieldRow)\n    else customFieldMap.set(key, [fieldRow])\n  }\n\n  const basePayloads: Array<{\n    entity_type: string\n    entity_id: string\n    organization_id: string | null\n    tenant_id: string | null\n    doc: Record<string, unknown>\n    tokenDoc: Record<string, unknown>\n    index_version: number\n  }> = []\n\n  const debugEnabled = isSearchDebugEnabled()\n\n  for (const row of rows) {\n    const recordId = normalizeId(row.id)\n    const baseOrg = normalizeScopedValue((row as AnyRow).organization_id)\n    const baseTenant = normalizeScopedValue((row as AnyRow).tenant_id)\n    const derivedOrg = options?.deriveOrganizationId\n      ? normalizeScopedValue(options.deriveOrganizationId(row))\n      : undefined\n    const scopeOrg =\n      scope.orgId !== undefined\n        ? scope.orgId\n        : derivedOrg !== undefined\n          ? derivedOrg\n          : baseOrg\n    const scopeTenant = scope.tenantId !== undefined ? scope.tenantId : baseTenant\n    const inputRows = customFieldMap.get(recordId) ?? []\n    const values: IndexCustomFieldValue[] = inputRows.map((fieldRow) => ({\n      key: fieldRow.field_key,\n      value:\n        fieldRow.value_bool ??\n        fieldRow.value_int ??\n        fieldRow.value_float ??\n        fieldRow.value_text ??\n        fieldRow.value_multiline ??\n        null,\n      organizationId: normalizeScopedValue(fieldRow.organization_id),\n      tenantId: normalizeScopedValue(fieldRow.tenant_id),\n    }))\n    const mergedRow = (() => {\n      if (!shouldMergeCustomerEntity || !customerEntitiesById) return row\n      const entityId = (row as AnyRow).entity_id || (row as AnyRow).entityId\n      if (!entityId) return row\n      const entityRow = customerEntitiesById.get(normalizeId(entityId))\n      if (!entityRow) return row\n      return { ...entityRow, ...row }\n    })()\n    let doc = buildIndexDocument(mergedRow, values, {\n      organizationId: scopeOrg ?? null,\n      tenantId: scopeTenant ?? null,\n    })\n    let tokenDoc: Record<string, unknown> = doc\n    if (typeof options.encryptDoc === 'function') {\n      try {\n        const encrypted = await options.encryptDoc(entityType, doc, {\n          organizationId: scopeOrg ?? null,\n          tenantId: scopeTenant ?? null,\n        })\n        if (encrypted && typeof encrypted === 'object') {\n          doc = encrypted\n          tokenDoc = encrypted\n        }\n      } catch {\n        // best-effort; ignore encrypt errors during indexing\n      }\n    }\n    if (typeof options.decryptDoc === 'function') {\n      try {\n        const decrypted = await options.decryptDoc(entityType, doc, {\n          organizationId: scopeOrg ?? null,\n          tenantId: scopeTenant ?? null,\n        })\n        if (decrypted && typeof decrypted === 'object') {\n          tokenDoc = decrypted\n        }\n      } catch {\n        // best-effort; ignore decrypt errors during indexing\n      }\n    }\n    basePayloads.push({\n      entity_type: entityType,\n      entity_id: recordId,\n      organization_id: scopeOrg ?? null,\n      tenant_id: scopeTenant ?? null,\n      doc,\n      tokenDoc,\n      index_version: 1,\n    })\n    if (debugEnabled) {\n      const sample = {\n        display_name: (tokenDoc as any).display_name,\n        first_name: (tokenDoc as any).first_name,\n        last_name: (tokenDoc as any).last_name,\n        brand_name: (tokenDoc as any).brand_name,\n        legal_name: (tokenDoc as any).legal_name,\n      }\n      console.info('[reindex:batch:doc]', {\n        entityType,\n        recordId,\n        organizationId: scopeOrg ?? null,\n        tenantId: scopeTenant ?? null,\n        sample,\n      })\n    }\n  }\n\n  const insertRows = basePayloads.map((payload) => ({\n    entity_type: payload.entity_type,\n    entity_id: payload.entity_id,\n    organization_id: payload.organization_id,\n    tenant_id: payload.tenant_id,\n    doc: sql`${JSON.stringify(payload.doc)}::jsonb`,\n    index_version: payload.index_version,\n    created_at: sql`now()`,\n    updated_at: sql`now()`,\n    deleted_at: null,\n  }))\n\n  const tokenPayloads = basePayloads.map((payload) => ({\n    entityType: payload.entity_type,\n    recordId: payload.entity_id,\n    organizationId: payload.organization_id,\n    tenantId: payload.tenant_id,\n    doc: payload.tokenDoc,\n  }))\n\n  try {\n    await db\n      .insertInto('entity_indexes' as any)\n      .values(insertRows as any)\n      .onConflict((oc: any) => oc\n        .columns(['entity_type', 'entity_id', 'organization_id_coalesced'])\n        .doUpdateSet({\n          doc: sql`excluded.doc`,\n          index_version: sql`excluded.index_version`,\n          organization_id: sql`excluded.organization_id`,\n          tenant_id: sql`excluded.tenant_id`,\n          deleted_at: sql`excluded.deleted_at`,\n          updated_at: sql`now()`,\n        } as any))\n      .execute()\n    try {\n      await replaceSearchTokensForBatch(db, tokenPayloads)\n    } catch {}\n    if (debugEnabled) {\n      console.info('[reindex:batch:tokens]', {\n        entityType,\n        records: basePayloads.length,\n        scopeOrg: scope.orgId ?? null,\n        scopeTenant: scope.tenantId ?? null,\n      })\n    }\n    return\n  } catch {\n    await db.transaction().execute(async (trx) => {\n      for (const payload of basePayloads) {\n        let updateQuery = trx\n          .updateTable('entity_indexes' as any)\n          .set({\n            doc: sql`${JSON.stringify(payload.doc)}::jsonb`,\n            index_version: payload.index_version,\n            organization_id: payload.organization_id ?? null,\n            tenant_id: payload.tenant_id ?? null,\n            updated_at: sql`now()`,\n            deleted_at: null,\n          } as any)\n          .where('entity_type' as any, '=', payload.entity_type)\n          .where('entity_id' as any, '=', payload.entity_id)\n        updateQuery = payload.organization_id == null\n          ? updateQuery.where('organization_id' as any, 'is', null as any)\n          : updateQuery.where('organization_id' as any, '=', payload.organization_id)\n        const result = await updateQuery.executeTakeFirst() as { numUpdatedRows?: bigint | number } | undefined\n        if (result && Number(result.numUpdatedRows ?? 0) > 0) continue\n        try {\n          await trx\n            .insertInto('entity_indexes' as any)\n            .values({\n              entity_type: payload.entity_type,\n              entity_id: payload.entity_id,\n              organization_id: payload.organization_id,\n              tenant_id: payload.tenant_id,\n              doc: sql`${JSON.stringify(payload.doc)}::jsonb`,\n              index_version: payload.index_version,\n              created_at: sql`now()`,\n              updated_at: sql`now()`,\n              deleted_at: null,\n            } as any)\n            .execute()\n        } catch {\n          // ignore duplicate insert race; another concurrent worker updated the row\n        }\n      }\n    })\n  }\n  try {\n    await replaceSearchTokensForBatch(db, tokenPayloads)\n  } catch {}\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { type Kysely, sql } from 'kysely'\nimport { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'\nimport { buildIndexDocument, type IndexCustomFieldValue } from './document'\nimport { replaceSearchTokensForBatch, isSearchDebugEnabled } from './search-tokens'\n\nexport type AnyRow = Record<string, any> & { id: string | number }\n\nexport type ScopeOverrides = {\n  orgId?: string\n  tenantId?: string\n}\n\ntype CustomFieldRow = {\n  record_id: string\n  field_key: string\n  value_text: string | null\n  value_multiline: string | null\n  value_int: number | null\n  value_float: number | null\n  value_bool: boolean | null\n  organization_id: string | null\n  tenant_id: string | null\n}\n\nexport type IndexBatchOptions = {\n  deriveOrganizationId?: (row: AnyRow) => string | null | undefined\n  encryptDoc?: (\n    entityType: string,\n    doc: Record<string, unknown>,\n    scope: { organizationId: string | null; tenantId: string | null },\n  ) => Promise<Record<string, unknown> | null | undefined>\n  decryptDoc?: (\n    entityType: string,\n    doc: Record<string, unknown>,\n    scope: { organizationId: string | null; tenantId: string | null },\n  ) => Promise<Record<string, unknown> | null | undefined>\n}\n\nfunction normalizeId(value: unknown): string {\n  return String(value)\n}\n\nfunction normalizeScopedValue(value: unknown): string | null {\n  if (value === undefined || value === null || value === '') return null\n  return String(value)\n}\n\nexport async function upsertIndexBatch(\n  db: Kysely<any>,\n  entityType: string,\n  rows: AnyRow[],\n  scope: ScopeOverrides,\n  options: IndexBatchOptions = {},\n): Promise<void> {\n  if (!rows.length) return\n  const recordIds = rows.map((row) => normalizeId(row.id))\n\n  const shouldMergeCustomerEntity =\n    entityType === 'customers:customer_person_profile' || entityType === 'customers:customer_company_profile'\n\n  let customerEntitiesById: Map<string, AnyRow> | null = null\n  if (shouldMergeCustomerEntity) {\n    const entityIds = Array.from(\n      new Set(\n        rows\n          .map((row) => (row as AnyRow).entity_id || (row as AnyRow).entityId)\n          .filter((value): value is string | number => value !== undefined && value !== null && `${value}` !== '')\n          .map((value) => normalizeId(value)),\n      ),\n    )\n    if (entityIds.length) {\n      const entityRows = await db\n        .selectFrom('customer_entities' as any)\n        .selectAll()\n        .where('id' as any, 'in', entityIds)\n        .execute() as AnyRow[]\n      customerEntitiesById = new Map(entityRows.map((row) => [normalizeId(row.id), row]))\n    }\n  }\n\n  const customFieldRows = await db\n    .selectFrom('custom_field_values' as any)\n    .select([\n      'record_id' as any,\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      'organization_id' as any,\n      'tenant_id' as any,\n    ])\n    .where('entity_id' as any, '=', entityType)\n    .where('record_id' as any, 'in', recordIds)\n    .execute() as CustomFieldRow[]\n\n  const customFieldMap = new Map<string, CustomFieldRow[]>()\n  for (const fieldRow of customFieldRows) {\n    const key = normalizeId(fieldRow.record_id)\n    const bucket = customFieldMap.get(key)\n    if (bucket) bucket.push(fieldRow)\n    else customFieldMap.set(key, [fieldRow])\n  }\n\n  const basePayloads: Array<{\n    entity_type: string\n    entity_id: string\n    organization_id: string | null\n    tenant_id: string | null\n    doc: Record<string, unknown>\n    tokenDoc: Record<string, unknown>\n    index_version: number\n  }> = []\n\n  const debugEnabled = isSearchDebugEnabled()\n\n  for (const row of rows) {\n    const recordId = normalizeId(row.id)\n    const baseOrg = normalizeScopedValue((row as AnyRow).organization_id)\n    const baseTenant = normalizeScopedValue((row as AnyRow).tenant_id)\n    const derivedOrg = options?.deriveOrganizationId\n      ? normalizeScopedValue(options.deriveOrganizationId(row))\n      : undefined\n    const scopeOrg =\n      scope.orgId !== undefined\n        ? scope.orgId\n        : derivedOrg !== undefined\n          ? derivedOrg\n          : baseOrg\n    const scopeTenant = scope.tenantId !== undefined ? scope.tenantId : baseTenant\n    const inputRows = customFieldMap.get(recordId) ?? []\n    const values: IndexCustomFieldValue[] = inputRows.map((fieldRow) => ({\n      key: fieldRow.field_key,\n      value:\n        fieldRow.value_bool ??\n        fieldRow.value_int ??\n        fieldRow.value_float ??\n        fieldRow.value_text ??\n        fieldRow.value_multiline ??\n        null,\n      organizationId: normalizeScopedValue(fieldRow.organization_id),\n      tenantId: normalizeScopedValue(fieldRow.tenant_id),\n    }))\n    const mergedRow = (() => {\n      if (!shouldMergeCustomerEntity || !customerEntitiesById) return row\n      const entityId = (row as AnyRow).entity_id || (row as AnyRow).entityId\n      if (!entityId) return row\n      const entityRow = customerEntitiesById.get(normalizeId(entityId))\n      if (!entityRow) return row\n      return { ...entityRow, ...row }\n    })()\n    let doc = buildIndexDocument(mergedRow, values, {\n      organizationId: scopeOrg ?? null,\n      tenantId: scopeTenant ?? null,\n    })\n    let tokenDoc: Record<string, unknown> = doc\n    if (typeof options.encryptDoc === 'function') {\n      try {\n        const encrypted = await options.encryptDoc(entityType, doc, {\n          organizationId: scopeOrg ?? null,\n          tenantId: scopeTenant ?? null,\n        })\n        if (encrypted && typeof encrypted === 'object') {\n          doc = encrypted\n          tokenDoc = encrypted\n        }\n      } catch {\n        // best-effort; ignore encrypt errors during indexing\n      }\n    }\n    if (typeof options.decryptDoc === 'function') {\n      try {\n        const decrypted = await options.decryptDoc(entityType, doc, {\n          organizationId: scopeOrg ?? null,\n          tenantId: scopeTenant ?? null,\n        })\n        if (decrypted && typeof decrypted === 'object') {\n          tokenDoc = decrypted\n        }\n      } catch {\n        // best-effort; ignore decrypt errors during indexing\n      }\n    }\n    basePayloads.push({\n      entity_type: entityType,\n      entity_id: recordId,\n      organization_id: scopeOrg ?? null,\n      tenant_id: scopeTenant ?? null,\n      doc,\n      tokenDoc,\n      index_version: 1,\n    })\n    if (debugEnabled) {\n      const sample = {\n        display_name: (tokenDoc as any).display_name,\n        first_name: (tokenDoc as any).first_name,\n        last_name: (tokenDoc as any).last_name,\n        brand_name: (tokenDoc as any).brand_name,\n        legal_name: (tokenDoc as any).legal_name,\n      }\n      console.info('[reindex:batch:doc]', {\n        entityType,\n        recordId,\n        organizationId: scopeOrg ?? null,\n        tenantId: scopeTenant ?? null,\n        sample,\n      })\n    }\n  }\n\n  const insertRows = basePayloads.map((payload) => ({\n    entity_type: payload.entity_type,\n    entity_id: payload.entity_id,\n    organization_id: payload.organization_id,\n    tenant_id: payload.tenant_id,\n    doc: sql`${JSON.stringify(payload.doc)}::jsonb`,\n    index_version: payload.index_version,\n    created_at: sql`now()`,\n    updated_at: sql`now()`,\n    deleted_at: null,\n  }))\n\n  const tokenPayloads = basePayloads.map((payload) => ({\n    entityType: payload.entity_type,\n    recordId: payload.entity_id,\n    organizationId: payload.organization_id,\n    tenantId: payload.tenant_id,\n    doc: payload.tokenDoc,\n  }))\n\n  try {\n    await db\n      .insertInto('entity_indexes' as any)\n      .values(insertRows as any)\n      .onConflict((oc: any) => oc\n        .columns(['entity_type', 'entity_id', 'organization_id_coalesced'])\n        .doUpdateSet({\n          doc: sql`excluded.doc`,\n          index_version: sql`excluded.index_version`,\n          organization_id: sql`excluded.organization_id`,\n          tenant_id: sql`excluded.tenant_id`,\n          deleted_at: sql`excluded.deleted_at`,\n          updated_at: sql`now()`,\n        } as any))\n      .execute()\n    try {\n      await replaceSearchTokensForBatch(db, tokenPayloads)\n    } catch (searchTokenError) {\n      // Record instead of swallowing: a failed token write leaves fulltext search stale.\n      await recordIndexerError(\n        { db },\n        { source: 'fulltext', handler: 'query_index:reindex-batch', error: searchTokenError, entityType, tenantId: scope.tenantId ?? null, organizationId: scope.orgId ?? null },\n      ).catch(() => undefined)\n    }\n    if (debugEnabled) {\n      console.info('[reindex:batch:tokens]', {\n        entityType,\n        records: basePayloads.length,\n        scopeOrg: scope.orgId ?? null,\n        scopeTenant: scope.tenantId ?? null,\n      })\n    }\n    return\n  } catch {\n    await db.transaction().execute(async (trx) => {\n      for (const payload of basePayloads) {\n        let updateQuery = trx\n          .updateTable('entity_indexes' as any)\n          .set({\n            doc: sql`${JSON.stringify(payload.doc)}::jsonb`,\n            index_version: payload.index_version,\n            organization_id: payload.organization_id ?? null,\n            tenant_id: payload.tenant_id ?? null,\n            updated_at: sql`now()`,\n            deleted_at: null,\n          } as any)\n          .where('entity_type' as any, '=', payload.entity_type)\n          .where('entity_id' as any, '=', payload.entity_id)\n        updateQuery = payload.organization_id == null\n          ? updateQuery.where('organization_id' as any, 'is', null as any)\n          : updateQuery.where('organization_id' as any, '=', payload.organization_id)\n        const result = await updateQuery.executeTakeFirst() as { numUpdatedRows?: bigint | number } | undefined\n        if (result && Number(result.numUpdatedRows ?? 0) > 0) continue\n        try {\n          await trx\n            .insertInto('entity_indexes' as any)\n            .values({\n              entity_type: payload.entity_type,\n              entity_id: payload.entity_id,\n              organization_id: payload.organization_id,\n              tenant_id: payload.tenant_id,\n              doc: sql`${JSON.stringify(payload.doc)}::jsonb`,\n              index_version: payload.index_version,\n              created_at: sql`now()`,\n              updated_at: sql`now()`,\n              deleted_at: null,\n            } as any)\n            .execute()\n        } catch {\n          // ignore duplicate insert race; another concurrent worker updated the row\n        }\n      }\n    })\n  }\n  try {\n    await replaceSearchTokensForBatch(db, tokenPayloads)\n  } catch (searchTokenError) {\n    // Record instead of swallowing: a failed token write leaves fulltext search stale.\n    await recordIndexerError(\n      { db },\n      { source: 'fulltext', handler: 'query_index:reindex-batch', error: searchTokenError, entityType, tenantId: scope.tenantId ?? null, organizationId: scope.orgId ?? null },\n    ).catch(() => undefined)\n  }\n}\n"],
+  "mappings": "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",
   "names": []
 }

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

@@ -150,8 +150,6 @@ async function replaceSearchTokensForBatch(db, payloads) {
   }
   const scopeKey = (org, tenant) => `${org ?? "__null__"}|${tenant ?? "__null__"}`;
   const scopeBuckets = /* @__PURE__ */ new Map();
-  const fieldPairsByScope = /* @__PURE__ */ new Map();
-  const seenPairsByScope = /* @__PURE__ */ new Map();
   for (const payload of payloads) {
     const org = payload.organizationId ?? null;
     const tenant = payload.tenantId ?? null;
@@ -160,36 +158,9 @@ async function replaceSearchTokensForBatch(db, payloads) {
     bucket.ids.add(String(payload.recordId));
     scopeBuckets.set(key, bucket);
   }
-  for (const payload of payloads) {
-    const org = payload.organizationId ?? null;
-    const tenant = payload.tenantId ?? null;
-    const key = scopeKey(org, tenant);
-    const pairs = fieldPairsByScope.get(key) ?? [];
-    const seen = seenPairsByScope.get(key) ?? /* @__PURE__ */ new Set();
-    const fieldPairs = buildFieldPairs(String(payload.recordId), payload.doc);
-    for (const pair of fieldPairs) {
-      const dedupeKey = `${pair[0]}|${pair[1]}`;
-      if (seen.has(dedupeKey)) continue;
-      seen.add(dedupeKey);
-      pairs.push(pair);
-    }
-    fieldPairsByScope.set(key, pairs);
-    seenPairsByScope.set(key, seen);
-  }
   await db.transaction().execute(async (trx) => {
-    for (const [key, bucket] of scopeBuckets.entries()) {
-      const pairs = fieldPairsByScope.get(key) ?? [];
-      let deleteQuery = trx.deleteFrom("search_tokens").where("entity_type", "=", payloads[0].entityType).where(sql`organization_id is not distinct from ${bucket.organizationId}`).where(sql`tenant_id is not distinct from ${bucket.tenantId}`);
-      if (pairs.length) {
-        deleteQuery = deleteQuery.where((eb) => eb.or(
-          pairs.map(([rid, field]) => eb.and([
-            eb("entity_id", "=", rid),
-            eb("field", "=", field)
-          ]))
-        ));
-      } else {
-        deleteQuery = deleteQuery.where("entity_id", "in", Array.from(bucket.ids));
-      }
+    for (const [, bucket] of scopeBuckets.entries()) {
+      const deleteQuery = trx.deleteFrom("search_tokens").where("entity_type", "=", payloads[0].entityType).where(sql`organization_id is not distinct from ${bucket.organizationId}`).where(sql`tenant_id is not distinct from ${bucket.tenantId}`).where("entity_id", "in", Array.from(bucket.ids));
       await deleteQuery.execute();
     }
     const payloadWithTimestamps = rows.map((row) => ({ ...row, created_at: sql`now()` }));

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 { resolveSearchConfig, type SearchConfig } from '@open-mercato/shared/lib/search/config'\nimport { tokenizeText } from '@open-mercato/shared/lib/search/tokenize'\nimport { parseBooleanToken } from '@open-mercato/shared/lib/boolean'\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    // eslint-disable-next-line no-console\n    console.debug(`[search-tokens] ${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(field: string, value: unknown, config: SearchConfig): 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 (config.blocklistedFields.some((blocked) => lower.includes(blocked))) 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)) 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  const fieldPairsByScope = new Map<string, EntityFieldPair[]>()\n  const seenPairsByScope = new Map<string, 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  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 pairs = fieldPairsByScope.get(key) ?? []\n    const seen = seenPairsByScope.get(key) ?? new Set<string>()\n    const fieldPairs = buildFieldPairs(String(payload.recordId), payload.doc)\n    for (const pair of fieldPairs) {\n      const dedupeKey = `${pair[0]}|${pair[1]}`\n      if (seen.has(dedupeKey)) continue\n      seen.add(dedupeKey)\n      pairs.push(pair)\n    }\n    fieldPairsByScope.set(key, pairs)\n    seenPairsByScope.set(key, seen)\n  }\n\n  await db.transaction().execute(async (trx) => {\n    for (const [key, bucket] of scopeBuckets.entries()) {\n      const pairs = fieldPairsByScope.get(key) ?? []\n      let 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      if (pairs.length) {\n        deleteQuery = deleteQuery.where((eb: any) => eb.or(\n          pairs.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, 'in', Array.from(bucket.ids))\n      }\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, sql } from 'kysely'\nimport { resolveSearchConfig, type SearchConfig } from '@open-mercato/shared/lib/search/config'\nimport { tokenizeText } from '@open-mercato/shared/lib/search/tokenize'\nimport { parseBooleanToken } from '@open-mercato/shared/lib/boolean'\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    // eslint-disable-next-line no-console\n    console.debug(`[search-tokens] ${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(field: string, value: unknown, config: SearchConfig): 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 (config.blocklistedFields.some((blocked) => lower.includes(blocked))) 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)) 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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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.6.6-develop.6413.1.ae875fb682",
+  "version": "0.6.6-develop.6416.1.888fffc007",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -253,16 +253,16 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.6.6-develop.6413.1.ae875fb682",
-    "@open-mercato/shared": "0.6.6-develop.6413.1.ae875fb682",
-    "@open-mercato/ui": "0.6.6-develop.6413.1.ae875fb682",
+    "@open-mercato/ai-assistant": "0.6.6-develop.6416.1.888fffc007",
+    "@open-mercato/shared": "0.6.6-develop.6416.1.888fffc007",
+    "@open-mercato/ui": "0.6.6-develop.6416.1.888fffc007",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.6.6-develop.6413.1.ae875fb682",
-    "@open-mercato/shared": "0.6.6-develop.6413.1.ae875fb682",
-    "@open-mercato/ui": "0.6.6-develop.6413.1.ae875fb682",
+    "@open-mercato/ai-assistant": "0.6.6-develop.6416.1.888fffc007",
+    "@open-mercato/shared": "0.6.6-develop.6416.1.888fffc007",
+    "@open-mercato/ui": "0.6.6-develop.6416.1.888fffc007",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/modules/query_index/lib/batch.ts

@@ -1,4 +1,5 @@
 import { type Kysely, sql } from 'kysely'
+import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
 import { buildIndexDocument, type IndexCustomFieldValue } from './document'
 import { replaceSearchTokensForBatch, isSearchDebugEnabled } from './search-tokens'
 
@@ -245,7 +246,13 @@ export async function upsertIndexBatch(
       .execute()
     try {
       await replaceSearchTokensForBatch(db, tokenPayloads)
-    } catch {}
+    } catch (searchTokenError) {
+      // Record instead of swallowing: a failed token write leaves fulltext search stale.
+      await recordIndexerError(
+        { db },
+        { source: 'fulltext', handler: 'query_index:reindex-batch', error: searchTokenError, entityType, tenantId: scope.tenantId ?? null, organizationId: scope.orgId ?? null },
+      ).catch(() => undefined)
+    }
     if (debugEnabled) {
       console.info('[reindex:batch:tokens]', {
         entityType,
@@ -298,5 +305,11 @@ export async function upsertIndexBatch(
   }
   try {
     await replaceSearchTokensForBatch(db, tokenPayloads)
-  } catch {}
+  } catch (searchTokenError) {
+    // Record instead of swallowing: a failed token write leaves fulltext search stale.
+    await recordIndexerError(
+      { db },
+      { source: 'fulltext', handler: 'query_index:reindex-batch', error: searchTokenError, entityType, tenantId: scope.tenantId ?? null, organizationId: scope.orgId ?? null },
+    ).catch(() => undefined)
+  }
 }

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

@@ -212,8 +212,6 @@ export async function replaceSearchTokensForBatch(
 
   const scopeKey = (org: string | null, tenant: string | null) => `${org ?? '__null__'}|${tenant ?? '__null__'}`
   const scopeBuckets = new Map<string, { organizationId: string | null; tenantId: string | null; ids: Set<string> }>()
-  const fieldPairsByScope = new Map<string, EntityFieldPair[]>()
-  const seenPairsByScope = new Map<string, Set<string>>()
 
   for (const payload of payloads) {
     const org = payload.organizationId ?? null
@@ -224,41 +222,16 @@ export async function replaceSearchTokensForBatch(
     scopeBuckets.set(key, bucket)
   }
 
-  for (const payload of payloads) {
-    const org = payload.organizationId ?? null
-    const tenant = payload.tenantId ?? null
-    const key = scopeKey(org, tenant)
-    const pairs = fieldPairsByScope.get(key) ?? []
-    const seen = seenPairsByScope.get(key) ?? new Set<string>()
-    const fieldPairs = buildFieldPairs(String(payload.recordId), payload.doc)
-    for (const pair of fieldPairs) {
-      const dedupeKey = `${pair[0]}|${pair[1]}`
-      if (seen.has(dedupeKey)) continue
-      seen.add(dedupeKey)
-      pairs.push(pair)
-    }
-    fieldPairsByScope.set(key, pairs)
-    seenPairsByScope.set(key, seen)
-  }
-
   await db.transaction().execute(async (trx) => {
-    for (const [key, bucket] of scopeBuckets.entries()) {
-      const pairs = fieldPairsByScope.get(key) ?? []
-      let deleteQuery = trx
+    for (const [, bucket] of scopeBuckets.entries()) {
+      // Delete by entity_id: a batch replaces all of a record's tokens, and a per-field OR over the
+      // whole batch overflows the query compiler's call stack on large batches.
+      const deleteQuery = trx
         .deleteFrom('search_tokens' as any)
         .where('entity_type' as any, '=', payloads[0].entityType)
         .where(sql<boolean>`organization_id is not distinct from ${bucket.organizationId}`)
         .where(sql<boolean>`tenant_id is not distinct from ${bucket.tenantId}`)
-      if (pairs.length) {
-        deleteQuery = deleteQuery.where((eb: any) => eb.or(
-          pairs.map(([rid, field]) => eb.and([
-            eb('entity_id' as any, '=', rid),
-            eb('field' as any, '=', field),
-          ])),
-        ))
-      } else {
-        deleteQuery = deleteQuery.where('entity_id' as any, 'in', Array.from(bucket.ids))
-      }
+        .where('entity_id' as any, 'in', Array.from(bucket.ids))
       await deleteQuery.execute()
     }
     const payloadWithTimestamps = rows.map((row) => ({ ...row, created_at: sql`now()` }))