@open-mercato/core 0.6.7-develop.6863.1.61001cf9a8 → 0.6.7

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

@@ -18,6 +18,7 @@
   "query_index.table.columns.entity": "Entity",
   "query_index.table.columns.fulltext": "Full-text",
   "query_index.table.columns.indexed": "Indexed",
+  "query_index.table.columns.label": "Label",
   "query_index.table.columns.records": "Records",
   "query_index.table.columns.status": "Status",
   "query_index.table.columns.vector": "Vector",
@@ -34,10 +35,6 @@
   "query_index.table.errors.subtitle": "Last 100 errors recorded for query index and vector index jobs in this scope.",
   "query_index.table.errors.title": "Recent indexer errors",
   "query_index.table.errors.viewDetails": "View technical details",
-  "query_index.table.filters.backend": "Backend",
-  "query_index.table.filters.backendOptions.customFields": "Custom fields",
-  "query_index.table.filters.backendOptions.fulltext": "Full-text search",
-  "query_index.table.filters.backendOptions.vector": "Vector search",
   "query_index.table.logs.columns.message": "Message",
   "query_index.table.logs.columns.source": "Source",
   "query_index.table.logs.columns.timestamp": "Timestamp",
@@ -51,7 +48,6 @@
   "query_index.table.searchPlaceholder": "Filter by entity",
   "query_index.table.status.failed": "Failed",
   "query_index.table.status.in_sync": "In sync",
-  "query_index.table.status.not_measured": "Not measured yet",
   "query_index.table.status.out_of_sync": "Out of sync",
   "query_index.table.status.partitionLabel": "Partition {{index}}",
   "query_index.table.status.progress": "{{processed}}/{{total}}",
@@ -65,5 +61,7 @@
   "query_index.table.status.scope.stalled": "Stalled",
   "query_index.table.status.scopeLabel": "Scope",
   "query_index.table.status.stalled": "Stalled",
+  "query_index.table.status.vectorLabel": "Vector",
+  "query_index.table.status.vectorValue": "{{count}} / {{total}}",
   "query_index.table.status.withProgress": "{{status}} ({{progress}})"
 }

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

@@ -18,6 +18,7 @@
   "query_index.table.columns.entity": "Entidad",
   "query_index.table.columns.fulltext": "Texto completo",
   "query_index.table.columns.indexed": "Indexados",
+  "query_index.table.columns.label": "Etiqueta",
   "query_index.table.columns.records": "Registros",
   "query_index.table.columns.status": "Estado",
   "query_index.table.columns.vector": "Vectorial",
@@ -34,10 +35,6 @@
   "query_index.table.errors.subtitle": "Últimos 100 errores registrados para los trabajos del índice de consultas y vector en este ámbito.",
   "query_index.table.errors.title": "Errores recientes del indexador",
   "query_index.table.errors.viewDetails": "Ver detalles técnicos",
-  "query_index.table.filters.backend": "Backend",
-  "query_index.table.filters.backendOptions.customFields": "Campos personalizados",
-  "query_index.table.filters.backendOptions.fulltext": "Búsqueda de texto completo",
-  "query_index.table.filters.backendOptions.vector": "Búsqueda vectorial",
   "query_index.table.logs.columns.message": "Mensaje",
   "query_index.table.logs.columns.source": "Origen",
   "query_index.table.logs.columns.timestamp": "Marca de tiempo",
@@ -51,7 +48,6 @@
   "query_index.table.searchPlaceholder": "Filtrar por entidad",
   "query_index.table.status.failed": "Con errores",
   "query_index.table.status.in_sync": "Sincronizado",
-  "query_index.table.status.not_measured": "Aún no medido",
   "query_index.table.status.out_of_sync": "Fuera de sincronización",
   "query_index.table.status.partitionLabel": "Partición {{index}}",
   "query_index.table.status.progress": "{{processed}}/{{total}}",
@@ -65,5 +61,7 @@
   "query_index.table.status.scope.stalled": "Detenido",
   "query_index.table.status.scopeLabel": "Ámbito",
   "query_index.table.status.stalled": "Detenido",
+  "query_index.table.status.vectorLabel": "Vectorial",
+  "query_index.table.status.vectorValue": "{{count}} / {{total}}",
   "query_index.table.status.withProgress": "{{status}} ({{progress}})"
 }

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

@@ -18,6 +18,7 @@
   "query_index.table.columns.entity": "Encja",
   "query_index.table.columns.fulltext": "Pełnotekstowy",
   "query_index.table.columns.indexed": "Zindeksowane",
+  "query_index.table.columns.label": "Etykieta",
   "query_index.table.columns.records": "Rekordy",
   "query_index.table.columns.status": "Status",
   "query_index.table.columns.vector": "Wektor",
@@ -34,10 +35,6 @@
   "query_index.table.errors.subtitle": "Ostatnie 100 błędów zapisanych dla zadań indeksu zapytań i wektorowego w tym zakresie.",
   "query_index.table.errors.title": "Ostatnie błędy indeksowania",
   "query_index.table.errors.viewDetails": "Pokaż szczegóły techniczne",
-  "query_index.table.filters.backend": "Backend",
-  "query_index.table.filters.backendOptions.customFields": "Pola niestandardowe",
-  "query_index.table.filters.backendOptions.fulltext": "Wyszukiwanie pełnotekstowe",
-  "query_index.table.filters.backendOptions.vector": "Wyszukiwanie wektorowe",
   "query_index.table.logs.columns.message": "Komunikat",
   "query_index.table.logs.columns.source": "Źródło",
   "query_index.table.logs.columns.timestamp": "Znacznik czasu",
@@ -51,7 +48,6 @@
   "query_index.table.searchPlaceholder": "Filtruj według encji",
   "query_index.table.status.failed": "Niepowodzenie",
   "query_index.table.status.in_sync": "Zsynchronizowany",
-  "query_index.table.status.not_measured": "Jeszcze nie zmierzono",
   "query_index.table.status.out_of_sync": "Poza synchronizacją",
   "query_index.table.status.partitionLabel": "Partycja {{index}}",
   "query_index.table.status.progress": "{{processed}}/{{total}}",
@@ -65,5 +61,7 @@
   "query_index.table.status.scope.stalled": "Zatrzymane",
   "query_index.table.status.scopeLabel": "Zakres",
   "query_index.table.status.stalled": "Zatrzymany",
+  "query_index.table.status.vectorLabel": "Wektor",
+  "query_index.table.status.vectorValue": "{{count}} / {{total}}",
   "query_index.table.status.withProgress": "{{status}} ({{progress}})"
 }

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

@@ -4,7 +4,6 @@ import { isUniqueViolation } from '@open-mercato/shared/lib/db/pg-errors'
 import { buildIndexDocument, type IndexCustomFieldValue } from './document'
 import { replaceSearchTokensForBatch, isSearchDebugEnabled } from './search-tokens'
 import { createLogger } from '@open-mercato/shared/lib/logger'
-import { resolveSearchConfig } from '@open-mercato/shared/lib/search/config'
 
 const logger = createLogger('query_index').child({ component: 'reindex-batch' })
 
@@ -229,7 +228,6 @@ export async function upsertIndexBatch(
   const basePayloads: IndexRowPayload[] = []
 
   const debugEnabled = isSearchDebugEnabled()
-  const searchConfig = resolveSearchConfig()
 
   for (const row of rows) {
     const recordId = normalizeId(row.id)
@@ -266,15 +264,10 @@ export async function upsertIndexBatch(
       if (!entityRow) return row
       return { ...entityRow, ...row }
     })()
-    let doc = buildIndexDocument(
-      mergedRow,
-      values,
-      {
-        organizationId: scopeOrg ?? null,
-        tenantId: scopeTenant ?? null,
-      },
-      { entityType, config: searchConfig },
-    )
+    let doc = buildIndexDocument(mergedRow, values, {
+      organizationId: scopeOrg ?? null,
+      tenantId: scopeTenant ?? null,
+    })
     let tokenDoc: Record<string, unknown> = doc
     if (typeof options.encryptDoc === 'function') {
       try {

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

@@ -1,12 +1,10 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
-import { type Kysely, type Transaction, sql } from 'kysely'
+import { type Kysely, sql } from 'kysely'
 import { resolveEntityTableName } from '@open-mercato/shared/lib/query/engine'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('query_index').child({ component: 'coverage' })
 
-type CoverageExecutor = Kysely<any> | Transaction<any>
-
 export type CoverageScope = {
   entityType: string
   tenantId?: string | null
@@ -97,7 +95,7 @@ function applyOrganizationCondition<QB extends { where: (...args: any[]) => QB }
 }
 
 async function fetchCoverageRow(
-  db: CoverageExecutor,
+  db: Kysely<any>,
   scope: CoverageScope
 ): Promise<(CoverageRow & { organization_id: string | null }) | null> {
   const { entityType, tenantId, organizationId, withDeleted } = scope
@@ -122,7 +120,7 @@ async function fetchCoverageRow(
 }
 
 async function pruneDuplicateCoverageRows(
-  db: CoverageExecutor,
+  db: Kysely<any>,
   scope: CoverageScope,
   keepId: string | null
 ): Promise<void> {
@@ -141,7 +139,7 @@ async function pruneDuplicateCoverageRows(
 }
 
 async function upsertCoverageRow(
-  db: CoverageExecutor,
+  db: Kysely<any>,
   scope: CoverageScope,
   counts: { baseCount: number; indexedCount: number; vectorIndexedCount: number }
 ): Promise<void> {
@@ -262,11 +260,10 @@ export async function readCoverageSnapshots(
 
 export async function applyCoverageAdjustments(
   em: EntityManager,
-  adjustments: CoverageAdjustment[],
-  options?: { trx?: CoverageExecutor },
+  adjustments: CoverageAdjustment[]
 ): Promise<void> {
   if (!adjustments.length) return
-  const db = options?.trx ?? ((em as any).getKysely() as Kysely<any>)
+  const db = (em as any).getKysely() as Kysely<any>
   const aggregated = aggregateAdjustments(adjustments)
   for (const entry of aggregated) {
     const scope = entry.scope
@@ -294,19 +291,6 @@ export async function deleteCoverageForEntity(db: Kysely<any>, entityType: strin
     .execute()
 }
 
-async function deleteCoverageScope(db: Kysely<any>, scope: CoverageScope): Promise<void> {
-  const { entityType, tenantId, organizationId, withDeleted } = scope
-  if (!entityType) return
-  let query = db
-    .deleteFrom('entity_index_coverage' as any)
-    .where('entity_type' as any, '=', entityType)
-    .where('with_deleted' as any, '=', withDeleted === true)
-  query = tenantId == null
-    ? query.where('tenant_id' as any, 'is', null as any)
-    : query.where('tenant_id' as any, '=', tenantId)
-  await applyOrganizationCondition(query as any, 'organization_id', organizationId ?? null).execute()
-}
-
 async function tableHasColumn(db: Kysely<any>, table: string, column: string): Promise<boolean> {
   const key = `${table}.${column}`
   if (COLUMN_CACHE.has(key)) return COLUMN_CACHE.get(key)!
@@ -394,9 +378,9 @@ export async function primeColumnCache(db: Kysely<any>, checks: ColumnCheck[]):
 export async function refreshCoverageSnapshot(
   em: EntityManager,
   scope: CoverageScope,
-): Promise<{ baseCount: number; indexedCount: number } | null> {
+): Promise<void> {
   const entityType = String(scope.entityType || '')
-  if (!entityType) return null
+  if (!entityType) return
   const tenantId = scope.tenantId ?? null
   const organizationId = scope.organizationId ?? null
   const withDeleted = scope.withDeleted === true
@@ -408,37 +392,22 @@ export async function refreshCoverageSnapshot(
   const hasTenant = await tableHasColumn(db, baseTable, 'tenant_id')
   const hasDeleted = await tableHasColumn(db, baseTable, 'deleted_at')
 
-  // A scope the base table cannot express must not narrow the index side either. Index rows
-  // can carry an organization the base table has no column for — `organizations` has no
-  // `organization_id` yet its index rows derive one from the record id. Filtering only the
-  // index side compares two different populations and reports a gap no reindex can close;
-  // returning early instead of recounting left the previous snapshot frozen, which is what
-  // surfaced as a permanent "out of sync" row for `directory:organization`.
-  //
-  // Tenant is different: a base table without `tenant_id` (`user_roles`) cannot be counted
-  // per tenant at all, and writing the cross-tenant total into one tenant's row would leak
-  // another tenant's volume into it. Drop the unusable scoped row instead, leaving only the
-  // global row — which is the one that can be true — rather than freezing a stale count.
-  const scopeOrg = organizationId !== null && hasOrg
-  if (tenantId !== null && !hasTenant) {
-    await deleteCoverageScope(db, { entityType, tenantId, organizationId, withDeleted })
-    return null
-  }
-  const scopeTenant = tenantId !== null && hasTenant
+  if (organizationId !== null && !hasOrg) return
+  if (tenantId !== null && !hasTenant) return
 
   let baseQuery = db
     .selectFrom(`${baseTable} as b` as any)
     .select(sql`count(*)`.as('count'))
-  if (scopeOrg) baseQuery = baseQuery.where('b.organization_id' as any, '=', organizationId)
-  if (scopeTenant) baseQuery = baseQuery.where('b.tenant_id' as any, '=', tenantId)
+  if (organizationId !== null && hasOrg) baseQuery = baseQuery.where('b.organization_id' as any, '=', organizationId)
+  if (tenantId !== null && hasTenant) baseQuery = baseQuery.where('b.tenant_id' as any, '=', tenantId)
   if (!withDeleted && hasDeleted) baseQuery = baseQuery.where('b.deleted_at' as any, 'is', null as any)
 
   let indexQuery = db
     .selectFrom('entity_indexes as ei' as any)
     .select(sql`count(*)`.as('count'))
     .where('ei.entity_type' as any, '=', entityType)
-  if (scopeOrg) indexQuery = indexQuery.where('ei.organization_id' as any, '=', organizationId)
-  if (scopeTenant) indexQuery = indexQuery.where('ei.tenant_id' as any, '=', tenantId)
+  if (organizationId !== null) indexQuery = indexQuery.where('ei.organization_id' as any, '=', organizationId)
+  if (tenantId !== null) indexQuery = indexQuery.where('ei.tenant_id' as any, '=', tenantId)
   if (!withDeleted) indexQuery = indexQuery.where('ei.deleted_at' as any, 'is', null as any)
 
   const vectorCountPromise = (async (): Promise<number | undefined> => {
@@ -481,8 +450,6 @@ export async function refreshCoverageSnapshot(
     indexedCount: indexCount,
     vectorCount,
   })
-
-  return { baseCount, indexedCount: indexCount }
 }
 
 export async function writeCoverageCounts(

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

@@ -1,9 +1,3 @@
-import {
-  isSearchFieldBlocklisted,
-  resolveSearchConfig,
-  type SearchConfig,
-} from '@open-mercato/shared/lib/search/config'
-
 export type IndexDocumentScope = {
   organizationId?: string | null
   tenantId?: string | null
@@ -18,18 +12,6 @@ export type IndexCustomFieldValue = {
 
 export const AGGREGATE_SEARCH_FIELD = 'search_text'
 
-/**
- * Controls which fields may contribute text to the `search_text` aggregate.
- *
- * Both properties are optional so existing callers keep working unchanged: an
- * omitted `config` is resolved from the environment, and an omitted `entityType`
- * means only the global blocklist entries apply.
- */
-export type AggregateSearchOptions = {
-  entityType?: string | null
-  config?: SearchConfig
-}
-
 function normalizeScopeValue(value: string | null | undefined): string | null {
   if (value === undefined || value === null || value === '') return null
   return value
@@ -48,12 +30,7 @@ function normalizeValue(value: unknown): unknown {
   return value
 }
 
-function collectAggregateSearchValues(
-  field: string,
-  value: unknown,
-  entityType: string | null,
-  config: SearchConfig,
-): string[] {
+function collectAggregateSearchValues(field: string, value: unknown): string[] {
   const lower = field.toLowerCase()
   if (
     lower === AGGREGATE_SEARCH_FIELD
@@ -66,8 +43,6 @@ function collectAggregateSearchValues(
     return []
   }
 
-  if (isSearchFieldBlocklisted(field, entityType, config)) return []
-
   if (typeof value === 'string') {
     const trimmed = value.trim()
     return trimmed.length > 0 ? [trimmed] : []
@@ -83,17 +58,12 @@ function collectAggregateSearchValues(
   return []
 }
 
-export function attachAggregateSearchField(
-  doc: Record<string, unknown>,
-  options: AggregateSearchOptions = {},
-): Record<string, unknown> {
-  const config = options.config ?? resolveSearchConfig()
-  const entityType = options.entityType ?? null
+export function attachAggregateSearchField(doc: Record<string, unknown>): Record<string, unknown> {
   const parts: string[] = []
   const seen = new Set<string>()
 
   for (const [field, value] of Object.entries(doc)) {
-    const values = collectAggregateSearchValues(field, value, entityType, config)
+    const values = collectAggregateSearchValues(field, value)
     for (const entry of values) {
       const key = entry.toLowerCase()
       if (seen.has(key)) continue
@@ -113,7 +83,6 @@ export function buildIndexDocument(
   baseRow: Record<string, unknown>,
   customFieldValues: Iterable<IndexCustomFieldValue> = [],
   scope: IndexDocumentScope = {},
-  options: AggregateSearchOptions = {},
 ): Record<string, unknown> {
   const doc: Record<string, unknown> = {}
   for (const [key, value] of Object.entries(baseRow)) {
@@ -154,5 +123,5 @@ export function buildIndexDocument(
     }
   }
 
-  return attachAggregateSearchField(doc, options)
+  return attachAggregateSearchField(doc)
 }

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

@@ -20,60 +20,15 @@ import {
   type ResolvedJoin,
 } from '@open-mercato/shared/lib/query/join-utils'
 import { resolveSearchConfig, type SearchConfig } from '@open-mercato/shared/lib/search/config'
-import {
-  createSearchTokenAvailability,
-  isSearchFilterOp,
-  hasSearchFilter,
-  type SearchTokenAvailability,
-  type SearchTokenProbeDb,
-  type SearchTokenProbeQueryBuilder,
-} from '@open-mercato/shared/lib/search/availability'
 import { tokenizeText } from '@open-mercato/shared/lib/search/tokenize'
 import { runBeforeQueryPipeline, runAfterQueryPipeline, type QueryExtensionContext } from '@open-mercato/shared/lib/query/query-extension-runner'
-import { warnOnCiphertextLikeFallback } from '@open-mercato/shared/lib/query/ciphertext-search-warning'
 import { resolveEncryptedSortFields, resolveEncryptedSortMaxRows, sortRowsInMemory } from '@open-mercato/shared/lib/query/encrypted-sort'
 import { mapWithConcurrency } from '@open-mercato/shared/lib/query/bounded-decrypt'
 import { createLogger } from '@open-mercato/shared/lib/logger'
-import { parseNumberWithDefault } from '@open-mercato/shared/lib/number'
 
 const logger = createLogger('query_index').child({ component: 'engine' })
 
 const DECRYPT_CONCURRENCY = 8
-const AUTO_REINDEX_DEBOUNCE_DEFAULT_MS = 30_000
-const AUTO_REINDEX_DEBOUNCE_MAX_SCOPES = 10_000
-const AUTO_REINDEX_SCHEDULED_AT_KEY = Symbol.for('@open-mercato/query-index/auto-reindex-scheduled-at')
-
-type GlobalWithAutoReindexSchedule = typeof globalThis & {
-  [AUTO_REINDEX_SCHEDULED_AT_KEY]?: Map<string, number>
-}
-
-function getAutoReindexScheduledAt(): Map<string, number> {
-  const globalScope = globalThis as GlobalWithAutoReindexSchedule
-  if (!globalScope[AUTO_REINDEX_SCHEDULED_AT_KEY]) {
-    globalScope[AUTO_REINDEX_SCHEDULED_AT_KEY] = new Map<string, number>()
-  }
-  return globalScope[AUTO_REINDEX_SCHEDULED_AT_KEY]
-}
-
-function markAutoReindexScheduled(key: string, debounceMs: number, now: number): boolean {
-  const autoReindexScheduledAt = getAutoReindexScheduledAt()
-  const previous = autoReindexScheduledAt.get(key)
-  if (previous !== undefined && now - previous < debounceMs) return false
-
-  if (autoReindexScheduledAt.size >= AUTO_REINDEX_DEBOUNCE_MAX_SCOPES) {
-    for (const [scopeKey, scheduledAt] of autoReindexScheduledAt) {
-      if (now - scheduledAt >= debounceMs) autoReindexScheduledAt.delete(scopeKey)
-    }
-    if (autoReindexScheduledAt.size >= AUTO_REINDEX_DEBOUNCE_MAX_SCOPES) {
-      const oldestKey = autoReindexScheduledAt.keys().next().value
-      if (oldestKey !== undefined) autoReindexScheduledAt.delete(oldestKey)
-    }
-  }
-
-  autoReindexScheduledAt.delete(key)
-  autoReindexScheduledAt.set(key, now)
-  return true
-}
 
 function buildFilterableCustomFieldJoins(
   sources: QueryCustomFieldSource[] | undefined,
@@ -188,10 +143,8 @@ export class HybridQueryEngine implements QueryEngine {
   private sqlDebugEnabled: boolean | null = null
   private forcePartialIndexEnabled: boolean | null = null
   private autoReindexEnabled: boolean | null = null
-  private autoReindexDebounceMs: number | null = null
   private coverageOptimizationEnabled: boolean | null = null
   private pendingCoverageRefreshKeys = new Set<string>()
-  private searchAvailabilityInstance: SearchTokenAvailability | null = null
 
   constructor(
     private em: EntityManager,
@@ -220,22 +173,6 @@ export class HybridQueryEngine implements QueryEngine {
     throw new Error('HybridQueryEngine requires an EntityManager exposing getKysely() (MikroORM v7)')
   }
 
-  private searchAvailability(): SearchTokenAvailability {
-    if (!this.searchAvailabilityInstance) {
-      this.searchAvailabilityInstance = createSearchTokenAvailability({
-        getDb: () => this.getDb() as unknown as SearchTokenProbeDb,
-        getConfig: resolveSearchConfig,
-        applyOrganizationScope: (query, column, scope) => this.applyOrganizationScope(
-          query as unknown as AnyBuilder,
-          column,
-          scope,
-        ) as unknown as SearchTokenProbeQueryBuilder,
-        logDebug: (event, payload) => this.logSearchDebug(event, payload),
-      })
-    }
-    return this.searchAvailabilityInstance
-  }
-
   async query<T = unknown>(entity: EntityId, opts: QueryOptions = {}): Promise<QueryResult<T>> {
     const ext: QueryExtensionsConfig | undefined = opts.extensions
     let hybridExtCtx: QueryExtensionContext | null = null
@@ -313,7 +250,7 @@ export class HybridQueryEngine implements QueryEngine {
       profiler.mark('query:base_table_resolved')
       const searchConfig = resolveSearchConfig()
       const orgScope = this.resolveOrganizationScope(opts)
-      const searchEnabled = await this.searchAvailability().staticEnabled()
+      const searchEnabled = searchConfig.enabled && await this.tableExists('search_tokens')
 
       const baseExists = await profiler.measure('base_table_exists', () => this.tableExists(baseTable))
       if (!baseExists) {
@@ -478,19 +415,12 @@ export class HybridQueryEngine implements QueryEngine {
       const searchSources: SearchTokenSource[] = indexSources
         .map((src) => ({ entity: String(src.entityId), recordIdColumn: src.recordIdColumn }))
         .filter((src) => src.recordIdColumn && src.entity)
-      const searchFilters = normalizedFilters.filter((filter) => isSearchFilterOp(filter.op))
-      const sourceSearchFilters = [
-        ...baseFilters,
-        ...normalizedFilters.filter((filter) => String(filter.field).startsWith('cf:')),
-      ].filter((filter) => isSearchFilterOp(filter.op))
-      // Probe `search_tokens` only when this query actually searches (#4723). Every consumer of
-      // `searchRuntime.enabled` already sits behind a like/ilike guard, so on a plain list load the
-      // answer is unused — and the probe is a `LIMIT 1` the planner can resolve as a seq scan over a
-      // large `search_tokens`. The join path below already probes lazily for the same reason.
-      const hasSearchTokens = searchEnabled && searchSources.length && sourceSearchFilters.length
-        ? await this.searchAvailability().anySourceHasTokens(searchSources, opts.tenantId ?? null, orgScope)
+      const hasSearchTokens = searchEnabled && searchSources.length
+        ? await this.searchSourcesHaveTokens(searchSources, opts.tenantId ?? null, orgScope)
         : false
       const searchRuntime: SearchRuntime = { ...searchRuntimeBase, searchSources, enabled: searchEnabled && hasSearchTokens }
+      const joinSearchAvailability = new Map<string, boolean>()
+      const searchFilters = normalizeFilters(opts.filters).filter((filter) => filter.op === 'like' || filter.op === 'ilike')
       if (searchFilters.length) {
         this.logSearchDebug('search:init', {
           entity,
@@ -516,46 +446,6 @@ export class HybridQueryEngine implements QueryEngine {
           organizationScope: orgScope,
           searchSources,
         })
-        const baseSearchFilters = [...baseFilters, ...cfFilters]
-          .filter((filter) => filter.op === 'like' || filter.op === 'ilike')
-        const fallbackFields = baseSearchFilters
-          .filter((filter) => !searchRuntime.enabled || typeof filter.value !== 'string' || tokenizeText(filter.value, searchConfig).hashes.length === 0)
-          .map((filter) => String(filter.field))
-        if (fallbackFields.length) {
-          await warnOnCiphertextLikeFallback({
-            entity: String(entity),
-            fields: fallbackFields,
-            tenantId: opts.tenantId ?? null,
-            // `searchEnabled` also folds in the missing-table case, which is
-            // "no usable tokens" rather than "the operator switched search off".
-            reason: searchRuntime.enabled
-              ? 'no-indexable-tokens'
-              : searchConfig.enabled ? 'no-search-tokens' : 'search-disabled',
-            service: this.getEncryptionService(),
-          })
-        }
-      }
-      for (const [alias, joinedFilters] of joinFilters) {
-        const filters = joinedFilters.filter((entry) => entry.op === 'like' || entry.op === 'ilike')
-        if (!filters.length) continue
-        const join = joinMap.get(alias)
-        if (!join?.entityId) continue
-        const hasJoinedTokens = searchEnabled
-          ? await this.searchAvailability().hasTokens(String(join.entityId), opts.tenantId ?? null, orgScope)
-          : false
-        const fallbackFields = filters
-          .filter((filter) => !hasJoinedTokens || typeof filter.value !== 'string' || tokenizeText(filter.value, searchConfig).hashes.length === 0)
-          .map((filter) => filter.column)
-        if (!fallbackFields.length) continue
-        await warnOnCiphertextLikeFallback({
-          entity: String(join.entityId),
-          fields: fallbackFields,
-          tenantId: opts.tenantId ?? null,
-          reason: hasJoinedTokens
-            ? 'no-indexable-tokens'
-            : searchConfig.enabled ? 'no-search-tokens' : 'search-disabled',
-          service: this.getEncryptionService(),
-        })
       }
       const hasNonBaseSearchSource = searchSources.some(
         (src) => src.entity !== String(entity) || src.recordIdColumn !== 'b.id'
@@ -848,7 +738,11 @@ export class HybridQueryEngine implements QueryEngine {
         if (!['like', 'ilike'].includes(filter.op)) return false
         if (typeof filter.value !== 'string' || filter.value.trim().length === 0) return false
 
-        const searchAvailable = await this.searchAvailability().hasTokens(String(join.entityId), opts.tenantId ?? null, orgScope)
+        let searchAvailable = joinSearchAvailability.get(join.entityId)
+        if (searchAvailable === undefined) {
+          searchAvailable = await this.hasSearchTokens(String(join.entityId), opts.tenantId ?? null, orgScope)
+          joinSearchAvailability.set(join.entityId, searchAvailable)
+        }
         if (!searchAvailable) return false
 
         const tokens = tokenizeText(String(filter.value), searchConfig)
@@ -1742,12 +1636,10 @@ export class HybridQueryEngine implements QueryEngine {
     const orgScope = this.resolveOrganizationScope(opts)
     if (!opts.tenantId) throw new Error('QueryEngine: tenantId is required')
 
-    const normalizedFilters = normalizeFilters(opts.filters)
     const searchConfig = resolveSearchConfig()
-    const searchEnabled = await this.searchAvailability().staticEnabled()
-    // Same gate as `query()` (#4723): without a like/ilike filter the probe's answer is never read.
-    const hasSearchTokens = searchEnabled && hasSearchFilter(normalizedFilters)
-      ? await this.searchAvailability().hasTokens(entity, opts.tenantId ?? null, orgScope)
+    const searchEnabled = searchConfig.enabled && await this.tableExists('search_tokens')
+    const hasSearchTokens = searchEnabled
+      ? await this.hasSearchTokens(entity, opts.tenantId ?? null, orgScope)
       : false
     const searchRuntime: SearchRuntime = {
       enabled: searchEnabled && hasSearchTokens,
@@ -1757,6 +1649,8 @@ export class HybridQueryEngine implements QueryEngine {
       mintAlias: createSearchAliasMinter(),
     }
 
+    const normalizedFilters = normalizeFilters(opts.filters)
+
     const applyScope = (q: AnyBuilder): AnyBuilder => {
       let next = q
         .where(`${alias}.entity_type`, '=', entity)
@@ -1887,6 +1781,50 @@ export class HybridQueryEngine implements QueryEngine {
     return !!exists
   }
 
+  private async hasSearchTokens(
+    entity: string,
+    tenantId: string | null,
+    orgScope?: { ids: string[]; includeNull: boolean } | null
+  ): Promise<boolean> {
+    try {
+      const db = this.getDb() as any
+      let query = db
+        .selectFrom('search_tokens')
+        .select(sql<number>`1`.as('one'))
+        .where('entity_type', '=', entity)
+      if (tenantId !== undefined) {
+        query = query.where(sql<boolean>`tenant_id is not distinct from ${tenantId}`)
+      }
+      if (orgScope) {
+        query = this.applyOrganizationScope(query, 'search_tokens.organization_id', orgScope)
+      }
+      const row = await query.limit(1).executeTakeFirst()
+      return !!row
+    } catch (err) {
+      this.logSearchDebug('search:has-tokens-error', {
+        entity, tenantId, organizationScope: orgScope,
+        error: err instanceof Error ? err.message : String(err),
+      })
+      return false
+    }
+  }
+
+  private async searchSourcesHaveTokens(
+    sources: SearchTokenSource[],
+    tenantId: string | null,
+    orgScope?: { ids: string[]; includeNull: boolean } | null
+  ): Promise<boolean> {
+    for (const source of sources) {
+      const ok = await this.hasSearchTokens(source.entity, tenantId, orgScope)
+      this.logSearchDebug('search:source-has-tokens', {
+        entity: source.entity, recordIdColumn: source.recordIdColumn,
+        tenantId, organizationScope: orgScope, hasTokens: ok,
+      })
+      if (ok) return true
+    }
+    return false
+  }
+
   private async resolveAvailableCustomFieldKeys(entityIds: string[], tenantId: string | null): Promise<string[]> {
     if (!entityIds.length) return []
     const cacheKey = this.customFieldKeysCacheKey(entityIds, tenantId)
@@ -2035,11 +1973,6 @@ export class HybridQueryEngine implements QueryEngine {
       organizationId: organizationIdOverride ?? opts.organizationId ?? null,
       force: false,
     }
-    const debounceMs = this.getAutoReindexDebounceMs()
-    if (debounceMs > 0) {
-      const key = [payload.entityType, payload.tenantId ?? '__tenant__', payload.organizationId ?? '__org__'].join('|')
-      if (!markAutoReindexScheduled(key, debounceMs, Date.now())) return
-    }
     const context = stats
       ? { entity, tenantId: payload.tenantId, organizationId: payload.organizationId, baseCount: stats.baseCount, indexedCount: stats.indexedCount }
       : { entity, tenantId: payload.tenantId, organizationId: payload.organizationId }
@@ -2109,16 +2042,6 @@ export class HybridQueryEngine implements QueryEngine {
     return this.autoReindexEnabled
   }
 
-  private getAutoReindexDebounceMs(): number {
-    if (this.autoReindexDebounceMs != null) return this.autoReindexDebounceMs
-    this.autoReindexDebounceMs = parseNumberWithDefault(
-      process.env.OM_QUERY_INDEX_AUTO_REINDEX_DEBOUNCE_MS,
-      AUTO_REINDEX_DEBOUNCE_DEFAULT_MS,
-      { integer: true, min: 0 },
-    )
-    return this.autoReindexDebounceMs
-  }
-
   private isCoverageOptimizationEnabled(): boolean {
     if (this.coverageOptimizationEnabled != null) return this.coverageOptimizationEnabled
     const raw = (process.env.OPTIMIZE_INDEX_COVERAGE_STATS ?? '').trim().toLowerCase()