@open-mercato/search 0.6.6-develop.6465.1.019f0fb26f → 0.6.6-develop.6471.1.9ab5bdd79a

package/AGENTS.md

@@ -538,7 +538,7 @@ curl "https://your-app.com/api/search?q=john%20doe&limit=20" \
 | `OM_SEARCH_ENABLED` | When you need to disable the search module entirely | Default: `true`; set to `false` to disable |
 | `OM_SEARCH_DEBUG` | When debugging search behavior | Enables verbose debug logging |
 | `SEARCH_EXCLUDE_ENCRYPTED_FIELDS` | When you need to keep encrypted fields out of fulltext | Set to `true` to exclude encrypted fields from fulltext index |
-| `DEBUG_SEARCH_ENRICHER` | When debugging presenter enrichment | Enables presenter enricher debug logs |
+| `OM_LOG_LEVEL` | When debugging presenter enrichment | Set to `debug` to surface presenter enricher diagnostics (replaces the former `DEBUG_SEARCH_ENRICHER` flag) |
 
 ## Run Queue Workers
 
@@ -716,7 +716,7 @@ buildSource: async (ctx) => {
 - [ ] Run `yarn mercato search test-meilisearch` if fulltext is not returning results
 - [ ] Check `OM_SEARCH_ENABLED` is not set to `false`
 - [ ] Enable `OM_SEARCH_DEBUG=true` for verbose logging
-- [ ] Enable `DEBUG_SEARCH_ENRICHER=true` if presenters are missing or wrong
+- [ ] Set `OM_LOG_LEVEL=debug` if presenters are missing or wrong (surfaces presenter enricher diagnostics)
 - [ ] Verify the entity has `enabled: true` (or omitted, since default is `true`)
 - [ ] Verify the CRUD route has `indexer: { entityType }` for auto-indexing
 - [ ] Check queue workers are running if using `QUEUE_STRATEGY=async`

package/dist/lib/debug.js

@@ -1,36 +1,30 @@
+import { createLogger } from "@open-mercato/shared/lib/logger";
+import { parseBooleanWithDefault } from "@open-mercato/shared/lib/boolean";
+const packageLogger = createLogger("search");
+const componentLoggers = /* @__PURE__ */ new Map();
+function componentLogger(prefix) {
+  const existing = componentLoggers.get(prefix);
+  if (existing) return existing;
+  const scoped = packageLogger.child({ component: prefix });
+  componentLoggers.set(prefix, scoped);
+  return scoped;
+}
 function isSearchDebugEnabled() {
-  const raw = (process.env.OM_SEARCH_DEBUG ?? "").toLowerCase();
-  return raw === "1" || raw === "true" || raw === "yes" || raw === "on";
+  return parseBooleanWithDefault(process.env.OM_SEARCH_DEBUG, false);
 }
 function searchDebug(prefix, message, data) {
   if (!isSearchDebugEnabled()) return;
-  if (data) {
-    console.log(`[${prefix}] ${message}`, data);
-  } else {
-    console.log(`[${prefix}] ${message}`);
-  }
+  componentLogger(prefix).debug(message, data);
 }
 function searchDebugWarn(prefix, message, data) {
   if (!isSearchDebugEnabled()) return;
-  if (data) {
-    console.warn(`[${prefix}] ${message}`, data);
-  } else {
-    console.warn(`[${prefix}] ${message}`);
-  }
+  componentLogger(prefix).warn(message, data);
 }
 function searchWarn(prefix, message, data) {
-  if (data) {
-    console.warn(`[${prefix}] ${message}`, data);
-  } else {
-    console.warn(`[${prefix}] ${message}`);
-  }
+  componentLogger(prefix).warn(message, data);
 }
 function searchError(prefix, message, data) {
-  if (data) {
-    console.error(`[${prefix}] ${message}`, data);
-  } else {
-    console.error(`[${prefix}] ${message}`);
-  }
+  componentLogger(prefix).error(message, data);
 }
 export {
   isSearchDebugEnabled,

package/dist/lib/debug.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/debug.ts"],
-  "sourcesContent": ["/**\n * Debug utilities for search module.\n *\n * Set OM_SEARCH_DEBUG=true to enable debug logging.\n */\n\nexport function isSearchDebugEnabled(): boolean {\n  const raw = (process.env.OM_SEARCH_DEBUG ?? '').toLowerCase()\n  return raw === '1' || raw === 'true' || raw === 'yes' || raw === 'on'\n}\n\n/**\n * Log a debug message if OM_SEARCH_DEBUG is enabled.\n */\nexport function searchDebug(prefix: string, message: string, data?: Record<string, unknown>): void {\n  if (!isSearchDebugEnabled()) return\n  if (data) {\n    console.log(`[${prefix}] ${message}`, data)\n  } else {\n    console.log(`[${prefix}] ${message}`)\n  }\n}\n\n/**\n * Log a warning message if OM_SEARCH_DEBUG is enabled.\n */\nexport function searchDebugWarn(prefix: string, message: string, data?: Record<string, unknown>): void {\n  if (!isSearchDebugEnabled()) return\n  if (data) {\n    console.warn(`[${prefix}] ${message}`, data)\n  } else {\n    console.warn(`[${prefix}] ${message}`)\n  }\n}\n\n/**\n * Log a warning message (always logs, not gated by debug flag).\n * Use for operational warnings that must stay visible without OM_SEARCH_DEBUG,\n * such as skipping a vector-index run because the provider is unreachable or\n * the configured embedding dimension no longer matches the vector table.\n */\nexport function searchWarn(prefix: string, message: string, data?: Record<string, unknown>): void {\n  if (data) {\n    console.warn(`[${prefix}] ${message}`, data)\n  } else {\n    console.warn(`[${prefix}] ${message}`)\n  }\n}\n\n/**\n * Log an error message (always logs, not gated by debug flag).\n * Errors should always be visible for troubleshooting.\n */\nexport function searchError(prefix: string, message: string, data?: Record<string, unknown>): void {\n  if (data) {\n    console.error(`[${prefix}] ${message}`, data)\n  } else {\n    console.error(`[${prefix}] ${message}`)\n  }\n}\n"],
-  "mappings": "AAMO,SAAS,uBAAgC;AAC9C,QAAM,OAAO,QAAQ,IAAI,mBAAmB,IAAI,YAAY;AAC5D,SAAO,QAAQ,OAAO,QAAQ,UAAU,QAAQ,SAAS,QAAQ;AACnE;AAKO,SAAS,YAAY,QAAgB,SAAiB,MAAsC;AACjG,MAAI,CAAC,qBAAqB,EAAG;AAC7B,MAAI,MAAM;AACR,YAAQ,IAAI,IAAI,MAAM,KAAK,OAAO,IAAI,IAAI;AAAA,EAC5C,OAAO;AACL,YAAQ,IAAI,IAAI,MAAM,KAAK,OAAO,EAAE;AAAA,EACtC;AACF;AAKO,SAAS,gBAAgB,QAAgB,SAAiB,MAAsC;AACrG,MAAI,CAAC,qBAAqB,EAAG;AAC7B,MAAI,MAAM;AACR,YAAQ,KAAK,IAAI,MAAM,KAAK,OAAO,IAAI,IAAI;AAAA,EAC7C,OAAO;AACL,YAAQ,KAAK,IAAI,MAAM,KAAK,OAAO,EAAE;AAAA,EACvC;AACF;AAQO,SAAS,WAAW,QAAgB,SAAiB,MAAsC;AAChG,MAAI,MAAM;AACR,YAAQ,KAAK,IAAI,MAAM,KAAK,OAAO,IAAI,IAAI;AAAA,EAC7C,OAAO;AACL,YAAQ,KAAK,IAAI,MAAM,KAAK,OAAO,EAAE;AAAA,EACvC;AACF;AAMO,SAAS,YAAY,QAAgB,SAAiB,MAAsC;AACjG,MAAI,MAAM;AACR,YAAQ,MAAM,IAAI,MAAM,KAAK,OAAO,IAAI,IAAI;AAAA,EAC9C,OAAO;AACL,YAAQ,MAAM,IAAI,MAAM,KAAK,OAAO,EAAE;AAAA,EACxC;AACF;",
+  "sourcesContent": ["/**\n * Debug utilities for search module, backed by the shared structured\n * logging facade (`@open-mercato/shared/lib/logger`).\n *\n * Set OM_SEARCH_DEBUG=true to opt into the verbose diagnostic helpers\n * (`searchDebug`/`searchDebugWarn`). Emission also flows through the\n * global `OM_LOG_LEVEL` gate, so when using OM_SEARCH_DEBUG in\n * production set OM_LOG_LEVEL=debug as well.\n */\n\nimport { createLogger, type Logger } from '@open-mercato/shared/lib/logger'\nimport { parseBooleanWithDefault } from '@open-mercato/shared/lib/boolean'\n\nconst packageLogger = createLogger('search')\nconst componentLoggers = new Map<string, Logger>()\n\nfunction componentLogger(prefix: string): Logger {\n  const existing = componentLoggers.get(prefix)\n  if (existing) return existing\n  const scoped = packageLogger.child({ component: prefix })\n  componentLoggers.set(prefix, scoped)\n  return scoped\n}\n\nexport function isSearchDebugEnabled(): boolean {\n  return parseBooleanWithDefault(process.env.OM_SEARCH_DEBUG, false)\n}\n\n/**\n * Log a debug message if OM_SEARCH_DEBUG is enabled.\n */\nexport function searchDebug(prefix: string, message: string, data?: Record<string, unknown>): void {\n  if (!isSearchDebugEnabled()) return\n  componentLogger(prefix).debug(message, data)\n}\n\n/**\n * Log a warning message if OM_SEARCH_DEBUG is enabled.\n */\nexport function searchDebugWarn(prefix: string, message: string, data?: Record<string, unknown>): void {\n  if (!isSearchDebugEnabled()) return\n  componentLogger(prefix).warn(message, data)\n}\n\n/**\n * Log a warning message (always logs, not gated by debug flag).\n * Use for operational warnings that must stay visible without OM_SEARCH_DEBUG,\n * such as skipping a vector-index run because the provider is unreachable or\n * the configured embedding dimension no longer matches the vector table.\n */\nexport function searchWarn(prefix: string, message: string, data?: Record<string, unknown>): void {\n  componentLogger(prefix).warn(message, data)\n}\n\n/**\n * Log an error message (always logs, not gated by debug flag).\n * Errors should always be visible for troubleshooting.\n */\nexport function searchError(prefix: string, message: string, data?: Record<string, unknown>): void {\n  componentLogger(prefix).error(message, data)\n}\n"],
+  "mappings": "AAUA,SAAS,oBAAiC;AAC1C,SAAS,+BAA+B;AAExC,MAAM,gBAAgB,aAAa,QAAQ;AAC3C,MAAM,mBAAmB,oBAAI,IAAoB;AAEjD,SAAS,gBAAgB,QAAwB;AAC/C,QAAM,WAAW,iBAAiB,IAAI,MAAM;AAC5C,MAAI,SAAU,QAAO;AACrB,QAAM,SAAS,cAAc,MAAM,EAAE,WAAW,OAAO,CAAC;AACxD,mBAAiB,IAAI,QAAQ,MAAM;AACnC,SAAO;AACT;AAEO,SAAS,uBAAgC;AAC9C,SAAO,wBAAwB,QAAQ,IAAI,iBAAiB,KAAK;AACnE;AAKO,SAAS,YAAY,QAAgB,SAAiB,MAAsC;AACjG,MAAI,CAAC,qBAAqB,EAAG;AAC7B,kBAAgB,MAAM,EAAE,MAAM,SAAS,IAAI;AAC7C;AAKO,SAAS,gBAAgB,QAAgB,SAAiB,MAAsC;AACrG,MAAI,CAAC,qBAAqB,EAAG;AAC7B,kBAAgB,MAAM,EAAE,KAAK,SAAS,IAAI;AAC5C;AAQO,SAAS,WAAW,QAAgB,SAAiB,MAAsC;AAChG,kBAAgB,MAAM,EAAE,KAAK,SAAS,IAAI;AAC5C;AAMO,SAAS,YAAY,QAAgB,SAAiB,MAAsC;AACjG,kBAAgB,MAAM,EAAE,MAAM,SAAS,IAAI;AAC7C;",
   "names": []
 }

package/dist/lib/presenter-enricher.js

@@ -1,11 +1,11 @@
 import { decryptIndexDocForSearch } from "@open-mercato/shared/lib/encryption/indexDoc";
+import { createLogger } from "@open-mercato/shared/lib/logger";
 import { extractFallbackPresenter } from "./fallback-presenter.js";
 import { needsSearchResultEnrichment } from "./search-result-enrichment.js";
 const BATCH_SIZE = 500;
+const enricherLogger = createLogger("search").child({ component: "presenter-enricher" });
 const logWarning = (message, context) => {
-  if (process.env.NODE_ENV === "development" || process.env.DEBUG_SEARCH_ENRICHER) {
-    console.warn(`[search:presenter-enricher] ${message}`, context ?? "");
-  }
+  enricherLogger.debug(message, context);
 };
 function chunk(array, size) {
   const chunks = [];
@@ -72,14 +72,14 @@ async function computePresenterAndLinks(doc, entityId, recordId, config, tenantI
         if (source?.presenter) presenter = source.presenter;
         if (source?.links) links = source.links;
       } catch (err) {
-        logWarning(`buildSource failed for ${entityId}:${recordId}`, { error: String(err) });
+        logWarning("buildSource failed", { entityId, recordId, err });
       }
     }
     if (!presenter && config.formatResult) {
       try {
         presenter = await config.formatResult(buildContext) ?? null;
       } catch (err) {
-        logWarning(`formatResult failed for ${entityId}:${recordId}`, { error: String(err) });
+        logWarning("formatResult failed", { entityId, recordId, err });
       }
     }
   }
@@ -127,7 +127,7 @@ function createPresenterEnricher(db, entityConfigMap, queryEngine, encryptionSer
           );
           return { ...row, doc: decryptedDoc };
         } catch (err) {
-          logWarning(`Failed to decrypt doc for ${row.entity_type}:${row.entity_id}`, { error: String(err) });
+          logWarning("Failed to decrypt doc", { entityId: row.entity_type, recordId: row.entity_id, err });
           return row;
         }
       })
@@ -140,7 +140,7 @@ function createPresenterEnricher(db, entityConfigMap, queryEngine, encryptionSer
       const key = `${result.entityId}:${result.recordId}`;
       const doc = docMap.get(key);
       if (!doc) {
-        logWarning(`Doc not found in entity_indexes`, { entityId: result.entityId, recordId: result.recordId });
+        logWarning("Doc not found in entity_indexes", { entityId: result.entityId, recordId: result.recordId });
         return { key, presenter: null, url: void 0, links: void 0 };
       }
       const config = entityConfigMap.get(result.entityId);

package/dist/lib/presenter-enricher.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/presenter-enricher.ts"],
-  "sourcesContent": ["import type { Kysely } from 'kysely'\nimport type {\n  SearchBuildContext,\n  SearchResult,\n  SearchResultPresenter,\n  SearchResultLink,\n  SearchEntityConfig,\n  PresenterEnricherFn,\n} from '../types'\nimport type { QueryEngine } from '@open-mercato/shared/lib/query/types'\nimport type { EntityId } from '@open-mercato/shared/modules/entities'\nimport type { TenantDataEncryptionService } from '@open-mercato/shared/lib/encryption/tenantDataEncryptionService'\nimport { decryptIndexDocForSearch } from '@open-mercato/shared/lib/encryption/indexDoc'\nimport { extractFallbackPresenter } from './fallback-presenter'\nimport { needsSearchResultEnrichment } from './search-result-enrichment'\n\n/** Maximum number of record IDs per batch query to avoid hitting DB parameter limits */\nconst BATCH_SIZE = 500\n\n/** Logger for debugging - uses console.warn to surface issues without breaking flow */\nconst logWarning = (message: string, context?: Record<string, unknown>) => {\n  if (process.env.NODE_ENV === 'development' || process.env.DEBUG_SEARCH_ENRICHER) {\n    console.warn(`[search:presenter-enricher] ${message}`, context ?? '')\n  }\n}\n\n/**\n * Split an array into chunks of specified size.\n */\nfunction chunk<T>(array: T[], size: number): T[][] {\n  const chunks: T[][] = []\n  for (let i = 0; i < array.length; i += size) {\n    chunks.push(array.slice(i, i + size))\n  }\n  return chunks\n}\n\n/**\n * Build a single batch query for multiple entity types and their record IDs.\n * Uses OR conditions to fetch all needed docs in one round trip.\n */\nasync function fetchDocsBatch(\n  db: Kysely<any>,\n  byEntityType: Map<string, SearchResult[]>,\n  tenantId: string,\n  organizationId?: string | null,\n): Promise<Array<{ entity_type: string; entity_id: string; doc: Record<string, unknown> }>> {\n  const allDocs: Array<{ entity_type: string; entity_id: string; doc: Record<string, unknown> }> = []\n\n  // Collect all entity type + record ID pairs\n  const allPairs: Array<{ entityType: string; recordId: string }> = []\n  for (const [entityType, results] of byEntityType) {\n    for (const result of results) {\n      allPairs.push({ entityType, recordId: result.recordId })\n    }\n  }\n\n  if (allPairs.length === 0) return allDocs\n\n  // Process in chunks to avoid hitting DB parameter limits\n  const chunks = chunk(allPairs, BATCH_SIZE)\n\n  for (const pairChunk of chunks) {\n    // Group by entity type within this chunk for efficient OR query\n    const chunkByType = new Map<string, string[]>()\n    for (const { entityType, recordId } of pairChunk) {\n      const ids = chunkByType.get(entityType) ?? []\n      ids.push(recordId)\n      chunkByType.set(entityType, ids)\n    }\n\n    // Build query with OR conditions per entity type\n    let query = db\n      .selectFrom('entity_indexes' as any)\n      .select(['entity_type' as any, 'entity_id' as any, 'doc' as any])\n      .where('tenant_id' as any, '=', tenantId)\n      .where('deleted_at' as any, 'is', null)\n      .where((eb: any) => eb.or(\n        Array.from(chunkByType.entries()).map(([entityType, recordIds]) => eb.and([\n          eb('entity_type' as any, '=', entityType),\n          eb('entity_id' as any, 'in', recordIds),\n        ])),\n      ))\n\n    // Add organization filter if provided\n    if (organizationId) {\n      query = query.where((eb: any) => eb.or([\n        eb('organization_id' as any, '=', organizationId),\n        eb('organization_id' as any, 'is', null),\n      ]))\n    }\n\n    const rows = await query.execute() as Array<{ entity_type: string; entity_id: string; doc: Record<string, unknown> }>\n    allDocs.push(...rows)\n  }\n\n  return allDocs\n}\n\n/** Result type for presenter and links computation */\ntype EnrichmentResult = {\n  presenter: SearchResultPresenter | null\n  url?: string\n  links?: SearchResultLink[]\n}\n\n/**\n * Compute presenter, URL, and links for a single doc using config or fallback.\n * Returns presenter (null if cannot be computed), and optionally URL/links from config.\n */\nasync function computePresenterAndLinks(\n  doc: Record<string, unknown>,\n  entityId: string,\n  recordId: string,\n  config: SearchEntityConfig | undefined,\n  tenantId: string,\n  organizationId: string | null | undefined,\n  queryEngine: QueryEngine | undefined,\n): Promise<EnrichmentResult> {\n  let presenter: SearchResultPresenter | null = null\n  let url: string | undefined\n  let links: SearchResultLink[] | undefined\n\n  // Build context for config functions\n  const customFields: Record<string, unknown> = {}\n  for (const [key, value] of Object.entries(doc)) {\n    if (key.startsWith('cf:') || key.startsWith('cf_')) {\n      customFields[key.slice(3)] = value\n    }\n  }\n\n  const buildContext: SearchBuildContext = {\n    record: doc,\n    customFields,\n    organizationId,\n    tenantId,\n    queryEngine,\n  }\n\n  // If search.ts config exists, use formatResult/buildSource for presenter\n  if (config?.formatResult || config?.buildSource) {\n    if (config.buildSource) {\n      try {\n        const source = await config.buildSource(buildContext)\n        if (source?.presenter) presenter = source.presenter\n        if (source?.links) links = source.links\n      } catch (err) {\n        logWarning(`buildSource failed for ${entityId}:${recordId}`, { error: String(err) })\n      }\n    }\n\n    if (!presenter && config.formatResult) {\n      try {\n        presenter = (await config.formatResult(buildContext)) ?? null\n      } catch (err) {\n        logWarning(`formatResult failed for ${entityId}:${recordId}`, { error: String(err) })\n      }\n    }\n  }\n\n  // Fallback presenter: extract from doc fields directly\n  if (!presenter) {\n    presenter = extractFallbackPresenter(doc, entityId, recordId)\n  }\n\n  // Resolve URL from config\n  if (config?.resolveUrl) {\n    try {\n      url = (await config.resolveUrl(buildContext)) ?? undefined\n    } catch {\n      // Skip URL resolution errors\n    }\n  }\n\n  // Resolve links from config (if not already set from buildSource)\n  if (!links && config?.resolveLinks) {\n    try {\n      links = (await config.resolveLinks(buildContext)) ?? undefined\n    } catch {\n      // Skip link resolution errors\n    }\n  }\n\n  return { presenter, url, links }\n}\n\n/**\n * Create a presenter enricher that loads data from entity_indexes and computes presenter.\n * Uses formatResult from search.ts configs when available, otherwise falls back to extracting\n * common fields like display_name, name, title from the doc.\n *\n * Optimizations:\n * - Single batch DB query for all entity types (instead of one per type)\n * - Parallel Promise.all for formatResult/buildSource calls\n * - Tenant/organization scoping for security\n * - Chunked queries to avoid DB parameter limits\n * - Automatic decryption of encrypted fields when encryption service is provided\n */\nexport function createPresenterEnricher(\n  db: Kysely<any>,\n  entityConfigMap: Map<EntityId, SearchEntityConfig>,\n  queryEngine?: QueryEngine,\n  encryptionService?: TenantDataEncryptionService | null,\n): PresenterEnricherFn {\n  return async (results, tenantId, organizationId) => {\n    // Find results missing presenter OR with encrypted presenter\n    const missingResults = results.filter(needsSearchResultEnrichment)\n    if (missingResults.length === 0) return results\n\n    // Group by entity type for config lookup\n    const byEntityType = new Map<string, SearchResult[]>()\n    for (const result of missingResults) {\n      const group = byEntityType.get(result.entityId) ?? []\n      group.push(result)\n      byEntityType.set(result.entityId, group)\n    }\n\n    // Single batch query for all docs across all entity types\n    const rawDocs = await fetchDocsBatch(db, byEntityType, tenantId, organizationId)\n\n    // Decrypt docs in parallel using DEK cache for efficiency\n    const dekCache = new Map<string | null, string | null>()\n\n    const decryptedDocs = await Promise.all(\n      rawDocs.map(async (row) => {\n        try {\n          // Use organization_id from the doc itself for proper encryption map lookup\n          // This is critical for global search where organizationId param is null\n          const docData = row.doc as Record<string, unknown>\n          const docOrgId = (docData.organization_id as string | null | undefined) ?? organizationId\n          const scope = { tenantId, organizationId: docOrgId }\n\n          const decryptedDoc = await decryptIndexDocForSearch(\n            row.entity_type,\n            row.doc,\n            scope,\n            encryptionService ?? null,\n            dekCache,\n          )\n          return { ...row, doc: decryptedDoc }\n        } catch (err) {\n          logWarning(`Failed to decrypt doc for ${row.entity_type}:${row.entity_id}`, { error: String(err) })\n          return row // Return original doc if decryption fails\n        }\n      }),\n    )\n\n    // Build doc lookup map for fast access\n    const docMap = new Map<string, Record<string, unknown>>()\n    for (const row of decryptedDocs) {\n      docMap.set(`${row.entity_type}:${row.entity_id}`, row.doc)\n    }\n\n    // Compute presenters and links in parallel\n    const enrichmentPromises = missingResults.map(async (result) => {\n      const key = `${result.entityId}:${result.recordId}`\n      const doc = docMap.get(key)\n\n      if (!doc) {\n        logWarning(`Doc not found in entity_indexes`, { entityId: result.entityId, recordId: result.recordId })\n        return { key, presenter: null, url: undefined, links: undefined }\n      }\n\n      const config = entityConfigMap.get(result.entityId as EntityId)\n      const enrichment = await computePresenterAndLinks(\n        doc,\n        result.entityId,\n        result.recordId,\n        config,\n        tenantId,\n        organizationId,\n        queryEngine,\n      )\n\n      return { key, ...enrichment }\n    })\n\n    const computed = await Promise.all(enrichmentPromises)\n\n    // Build enrichment map from parallel results\n    const enrichmentMap = new Map<string, EnrichmentResult>()\n    for (const { key, presenter, url, links } of computed) {\n      enrichmentMap.set(key, { presenter, url, links })\n    }\n\n    // Enrich results with computed presenter, URL, and links\n    return results.map((result) => {\n      if (!needsSearchResultEnrichment(result)) return result\n      const key = `${result.entityId}:${result.recordId}`\n      const enriched = enrichmentMap.get(key)\n      if (!enriched) return result\n      const hasExistingLinks = Array.isArray(result.links) && result.links.length > 0\n      return {\n        ...result,\n        presenter: enriched.presenter ?? result.presenter,\n        url: result.url ?? enriched.url,\n        links: hasExistingLinks ? result.links : (enriched.links ?? result.links),\n      }\n    })\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { Kysely } from 'kysely'\nimport type {\n  SearchBuildContext,\n  SearchResult,\n  SearchResultPresenter,\n  SearchResultLink,\n  SearchEntityConfig,\n  PresenterEnricherFn,\n} from '../types'\nimport type { QueryEngine } from '@open-mercato/shared/lib/query/types'\nimport type { EntityId } from '@open-mercato/shared/modules/entities'\nimport type { TenantDataEncryptionService } from '@open-mercato/shared/lib/encryption/tenantDataEncryptionService'\nimport { decryptIndexDocForSearch } from '@open-mercato/shared/lib/encryption/indexDoc'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\nimport { extractFallbackPresenter } from './fallback-presenter'\nimport { needsSearchResultEnrichment } from './search-result-enrichment'\n\n/** Maximum number of record IDs per batch query to avoid hitting DB parameter limits */\nconst BATCH_SIZE = 500\n\n/** Diagnostic logger - surfaces issues without breaking flow, gated by OM_LOG_LEVEL=debug */\nconst enricherLogger = createLogger('search').child({ component: 'presenter-enricher' })\nconst logWarning = (message: string, context?: Record<string, unknown>) => {\n  enricherLogger.debug(message, context)\n}\n\n/**\n * Split an array into chunks of specified size.\n */\nfunction chunk<T>(array: T[], size: number): T[][] {\n  const chunks: T[][] = []\n  for (let i = 0; i < array.length; i += size) {\n    chunks.push(array.slice(i, i + size))\n  }\n  return chunks\n}\n\n/**\n * Build a single batch query for multiple entity types and their record IDs.\n * Uses OR conditions to fetch all needed docs in one round trip.\n */\nasync function fetchDocsBatch(\n  db: Kysely<any>,\n  byEntityType: Map<string, SearchResult[]>,\n  tenantId: string,\n  organizationId?: string | null,\n): Promise<Array<{ entity_type: string; entity_id: string; doc: Record<string, unknown> }>> {\n  const allDocs: Array<{ entity_type: string; entity_id: string; doc: Record<string, unknown> }> = []\n\n  // Collect all entity type + record ID pairs\n  const allPairs: Array<{ entityType: string; recordId: string }> = []\n  for (const [entityType, results] of byEntityType) {\n    for (const result of results) {\n      allPairs.push({ entityType, recordId: result.recordId })\n    }\n  }\n\n  if (allPairs.length === 0) return allDocs\n\n  // Process in chunks to avoid hitting DB parameter limits\n  const chunks = chunk(allPairs, BATCH_SIZE)\n\n  for (const pairChunk of chunks) {\n    // Group by entity type within this chunk for efficient OR query\n    const chunkByType = new Map<string, string[]>()\n    for (const { entityType, recordId } of pairChunk) {\n      const ids = chunkByType.get(entityType) ?? []\n      ids.push(recordId)\n      chunkByType.set(entityType, ids)\n    }\n\n    // Build query with OR conditions per entity type\n    let query = db\n      .selectFrom('entity_indexes' as any)\n      .select(['entity_type' as any, 'entity_id' as any, 'doc' as any])\n      .where('tenant_id' as any, '=', tenantId)\n      .where('deleted_at' as any, 'is', null)\n      .where((eb: any) => eb.or(\n        Array.from(chunkByType.entries()).map(([entityType, recordIds]) => eb.and([\n          eb('entity_type' as any, '=', entityType),\n          eb('entity_id' as any, 'in', recordIds),\n        ])),\n      ))\n\n    // Add organization filter if provided\n    if (organizationId) {\n      query = query.where((eb: any) => eb.or([\n        eb('organization_id' as any, '=', organizationId),\n        eb('organization_id' as any, 'is', null),\n      ]))\n    }\n\n    const rows = await query.execute() as Array<{ entity_type: string; entity_id: string; doc: Record<string, unknown> }>\n    allDocs.push(...rows)\n  }\n\n  return allDocs\n}\n\n/** Result type for presenter and links computation */\ntype EnrichmentResult = {\n  presenter: SearchResultPresenter | null\n  url?: string\n  links?: SearchResultLink[]\n}\n\n/**\n * Compute presenter, URL, and links for a single doc using config or fallback.\n * Returns presenter (null if cannot be computed), and optionally URL/links from config.\n */\nasync function computePresenterAndLinks(\n  doc: Record<string, unknown>,\n  entityId: string,\n  recordId: string,\n  config: SearchEntityConfig | undefined,\n  tenantId: string,\n  organizationId: string | null | undefined,\n  queryEngine: QueryEngine | undefined,\n): Promise<EnrichmentResult> {\n  let presenter: SearchResultPresenter | null = null\n  let url: string | undefined\n  let links: SearchResultLink[] | undefined\n\n  // Build context for config functions\n  const customFields: Record<string, unknown> = {}\n  for (const [key, value] of Object.entries(doc)) {\n    if (key.startsWith('cf:') || key.startsWith('cf_')) {\n      customFields[key.slice(3)] = value\n    }\n  }\n\n  const buildContext: SearchBuildContext = {\n    record: doc,\n    customFields,\n    organizationId,\n    tenantId,\n    queryEngine,\n  }\n\n  // If search.ts config exists, use formatResult/buildSource for presenter\n  if (config?.formatResult || config?.buildSource) {\n    if (config.buildSource) {\n      try {\n        const source = await config.buildSource(buildContext)\n        if (source?.presenter) presenter = source.presenter\n        if (source?.links) links = source.links\n      } catch (err) {\n        logWarning('buildSource failed', { entityId, recordId, err })\n      }\n    }\n\n    if (!presenter && config.formatResult) {\n      try {\n        presenter = (await config.formatResult(buildContext)) ?? null\n      } catch (err) {\n        logWarning('formatResult failed', { entityId, recordId, err })\n      }\n    }\n  }\n\n  // Fallback presenter: extract from doc fields directly\n  if (!presenter) {\n    presenter = extractFallbackPresenter(doc, entityId, recordId)\n  }\n\n  // Resolve URL from config\n  if (config?.resolveUrl) {\n    try {\n      url = (await config.resolveUrl(buildContext)) ?? undefined\n    } catch {\n      // Skip URL resolution errors\n    }\n  }\n\n  // Resolve links from config (if not already set from buildSource)\n  if (!links && config?.resolveLinks) {\n    try {\n      links = (await config.resolveLinks(buildContext)) ?? undefined\n    } catch {\n      // Skip link resolution errors\n    }\n  }\n\n  return { presenter, url, links }\n}\n\n/**\n * Create a presenter enricher that loads data from entity_indexes and computes presenter.\n * Uses formatResult from search.ts configs when available, otherwise falls back to extracting\n * common fields like display_name, name, title from the doc.\n *\n * Optimizations:\n * - Single batch DB query for all entity types (instead of one per type)\n * - Parallel Promise.all for formatResult/buildSource calls\n * - Tenant/organization scoping for security\n * - Chunked queries to avoid DB parameter limits\n * - Automatic decryption of encrypted fields when encryption service is provided\n */\nexport function createPresenterEnricher(\n  db: Kysely<any>,\n  entityConfigMap: Map<EntityId, SearchEntityConfig>,\n  queryEngine?: QueryEngine,\n  encryptionService?: TenantDataEncryptionService | null,\n): PresenterEnricherFn {\n  return async (results, tenantId, organizationId) => {\n    // Find results missing presenter OR with encrypted presenter\n    const missingResults = results.filter(needsSearchResultEnrichment)\n    if (missingResults.length === 0) return results\n\n    // Group by entity type for config lookup\n    const byEntityType = new Map<string, SearchResult[]>()\n    for (const result of missingResults) {\n      const group = byEntityType.get(result.entityId) ?? []\n      group.push(result)\n      byEntityType.set(result.entityId, group)\n    }\n\n    // Single batch query for all docs across all entity types\n    const rawDocs = await fetchDocsBatch(db, byEntityType, tenantId, organizationId)\n\n    // Decrypt docs in parallel using DEK cache for efficiency\n    const dekCache = new Map<string | null, string | null>()\n\n    const decryptedDocs = await Promise.all(\n      rawDocs.map(async (row) => {\n        try {\n          // Use organization_id from the doc itself for proper encryption map lookup\n          // This is critical for global search where organizationId param is null\n          const docData = row.doc as Record<string, unknown>\n          const docOrgId = (docData.organization_id as string | null | undefined) ?? organizationId\n          const scope = { tenantId, organizationId: docOrgId }\n\n          const decryptedDoc = await decryptIndexDocForSearch(\n            row.entity_type,\n            row.doc,\n            scope,\n            encryptionService ?? null,\n            dekCache,\n          )\n          return { ...row, doc: decryptedDoc }\n        } catch (err) {\n          logWarning('Failed to decrypt doc', { entityId: row.entity_type, recordId: row.entity_id, err })\n          return row // Return original doc if decryption fails\n        }\n      }),\n    )\n\n    // Build doc lookup map for fast access\n    const docMap = new Map<string, Record<string, unknown>>()\n    for (const row of decryptedDocs) {\n      docMap.set(`${row.entity_type}:${row.entity_id}`, row.doc)\n    }\n\n    // Compute presenters and links in parallel\n    const enrichmentPromises = missingResults.map(async (result) => {\n      const key = `${result.entityId}:${result.recordId}`\n      const doc = docMap.get(key)\n\n      if (!doc) {\n        logWarning('Doc not found in entity_indexes', { entityId: result.entityId, recordId: result.recordId })\n        return { key, presenter: null, url: undefined, links: undefined }\n      }\n\n      const config = entityConfigMap.get(result.entityId as EntityId)\n      const enrichment = await computePresenterAndLinks(\n        doc,\n        result.entityId,\n        result.recordId,\n        config,\n        tenantId,\n        organizationId,\n        queryEngine,\n      )\n\n      return { key, ...enrichment }\n    })\n\n    const computed = await Promise.all(enrichmentPromises)\n\n    // Build enrichment map from parallel results\n    const enrichmentMap = new Map<string, EnrichmentResult>()\n    for (const { key, presenter, url, links } of computed) {\n      enrichmentMap.set(key, { presenter, url, links })\n    }\n\n    // Enrich results with computed presenter, URL, and links\n    return results.map((result) => {\n      if (!needsSearchResultEnrichment(result)) return result\n      const key = `${result.entityId}:${result.recordId}`\n      const enriched = enrichmentMap.get(key)\n      if (!enriched) return result\n      const hasExistingLinks = Array.isArray(result.links) && result.links.length > 0\n      return {\n        ...result,\n        presenter: enriched.presenter ?? result.presenter,\n        url: result.url ?? enriched.url,\n        links: hasExistingLinks ? result.links : (enriched.links ?? result.links),\n      }\n    })\n  }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/search",
-  "version": "0.6.6-develop.6465.1.019f0fb26f",
+  "version": "0.6.6-develop.6471.1.9ab5bdd79a",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -127,9 +127,9 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/core": "0.6.6-develop.6465.1.019f0fb26f",
-    "@open-mercato/queue": "0.6.6-develop.6465.1.019f0fb26f",
-    "@open-mercato/shared": "0.6.6-develop.6465.1.019f0fb26f"
+    "@open-mercato/core": "0.6.6-develop.6471.1.9ab5bdd79a",
+    "@open-mercato/queue": "0.6.6-develop.6471.1.9ab5bdd79a",
+    "@open-mercato/shared": "0.6.6-develop.6471.1.9ab5bdd79a"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",

package/src/__tests__/debug.test.ts

@@ -1,4 +1,22 @@
-import { isSearchDebugEnabled, searchDebug, searchDebugWarn, searchError } from '../lib/debug'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+import { isSearchDebugEnabled, searchDebug, searchDebugWarn, searchWarn, searchError } from '../lib/debug'
+
+jest.mock('@open-mercato/shared/lib/logger', () => {
+  const mocked = {
+    debug: jest.fn(),
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+    child: jest.fn(),
+  }
+  mocked.child.mockImplementation(() => mocked)
+  return { createLogger: jest.fn(() => mocked) }
+})
+
+const searchLoggerDebug = createLogger('search').debug as jest.Mock
+const searchLoggerWarn = createLogger('search').warn as jest.Mock
+const searchLoggerError = createLogger('search').error as jest.Mock
+const searchLoggerChild = createLogger('search').child as jest.Mock
 
 describe('search debug utilities', () => {
   const originalDebugEnv = process.env.OM_SEARCH_DEBUG
@@ -13,12 +31,14 @@ describe('search debug utilities', () => {
 
   beforeEach(() => {
     restoreDebugEnv()
-    jest.restoreAllMocks()
+    searchLoggerDebug.mockClear()
+    searchLoggerWarn.mockClear()
+    searchLoggerError.mockClear()
+    searchLoggerChild.mockClear()
   })
 
   afterAll(() => {
     restoreDebugEnv()
-    jest.restoreAllMocks()
   })
 
   describe('isSearchDebugEnabled', () => {
@@ -42,72 +62,77 @@ describe('search debug utilities', () => {
   describe('searchDebug', () => {
     it('does not log when debug is disabled', () => {
       delete process.env.OM_SEARCH_DEBUG
-      const consoleSpy = jest.spyOn(console, 'log').mockImplementation(() => undefined)
 
       searchDebug('search.test', 'suppressed')
 
-      expect(consoleSpy).not.toHaveBeenCalled()
+      expect(searchLoggerDebug).not.toHaveBeenCalled()
     })
 
     it('logs message and payload when debug is enabled', () => {
       process.env.OM_SEARCH_DEBUG = 'true'
-      const consoleSpy = jest.spyOn(console, 'log').mockImplementation(() => undefined)
       const payload = { entityId: 'customers:person', recordId: 'rec-123' }
 
       searchDebug('search.test', 'indexed', payload)
 
-      expect(consoleSpy).toHaveBeenCalledWith('[search.test] indexed', payload)
+      expect(searchLoggerChild).toHaveBeenCalledWith({ component: 'search.test' })
+      expect(searchLoggerDebug).toHaveBeenCalledWith('indexed', payload)
     })
 
-    it('logs only the formatted message when payload is omitted', () => {
+    it('logs only the message when payload is omitted', () => {
       process.env.OM_SEARCH_DEBUG = 'true'
-      const consoleSpy = jest.spyOn(console, 'log').mockImplementation(() => undefined)
 
       searchDebug('search.test', 'indexed')
 
-      expect(consoleSpy).toHaveBeenCalledWith('[search.test] indexed')
+      expect(searchLoggerDebug).toHaveBeenCalledWith('indexed', undefined)
     })
   })
 
   describe('searchDebugWarn', () => {
     it('does not warn when debug is disabled', () => {
       process.env.OM_SEARCH_DEBUG = 'false'
-      const consoleSpy = jest.spyOn(console, 'warn').mockImplementation(() => undefined)
 
       searchDebugWarn('search.test', 'suppressed')
 
-      expect(consoleSpy).not.toHaveBeenCalled()
+      expect(searchLoggerWarn).not.toHaveBeenCalled()
     })
 
-    it('warns with the formatted message and payload when enabled', () => {
+    it('warns with the message and payload when enabled', () => {
       process.env.OM_SEARCH_DEBUG = 'yes'
-      const consoleSpy = jest.spyOn(console, 'warn').mockImplementation(() => undefined)
       const payload = { queue: 'vector-indexing' }
 
       searchDebugWarn('search.test', 'retrying', payload)
 
-      expect(consoleSpy).toHaveBeenCalledWith('[search.test] retrying', payload)
+      expect(searchLoggerWarn).toHaveBeenCalledWith('retrying', payload)
+    })
+  })
+
+  describe('searchWarn', () => {
+    it('always warns even when debug is disabled', () => {
+      process.env.OM_SEARCH_DEBUG = 'false'
+      const payload = { provider: 'ollama' }
+
+      searchWarn('search.test', 'provider unreachable', payload)
+
+      expect(searchLoggerWarn).toHaveBeenCalledWith('provider unreachable', payload)
     })
   })
 
   describe('searchError', () => {
     it('always logs errors even when debug is disabled', () => {
       process.env.OM_SEARCH_DEBUG = 'false'
-      const consoleSpy = jest.spyOn(console, 'error').mockImplementation(() => undefined)
       const payload = { error: 'boom' }
 
       searchError('search.test', 'failed', payload)
 
-      expect(consoleSpy).toHaveBeenCalledWith('[search.test] failed', payload)
+      expect(searchLoggerError).toHaveBeenCalledWith('failed', payload)
     })
 
-    it('logs only the formatted error message when payload is omitted', () => {
+    it('logs only the error message when payload is omitted', () => {
       delete process.env.OM_SEARCH_DEBUG
-      const consoleSpy = jest.spyOn(console, 'error').mockImplementation(() => undefined)
 
       searchError('search.test', 'failed')
 
-      expect(consoleSpy).toHaveBeenCalledWith('[search.test] failed')
+      expect(searchLoggerError).toHaveBeenCalledWith('failed', undefined)
     })
   })
 })

package/src/__tests__/workers.test.ts

@@ -1,9 +1,25 @@
+import { createLogger } from '@open-mercato/shared/lib/logger'
 import { QueuedJob, JobContext } from '@open-mercato/queue'
 import { VectorIndexJobPayload } from '../queue/vector-indexing'
 import { FulltextIndexJobPayload } from '../queue/fulltext-indexing'
 
 type HandlerContext = { resolve: <T = unknown>(name: string) => T }
 
+jest.mock('@open-mercato/shared/lib/logger', () => {
+  const mocked = {
+    debug: jest.fn(),
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+    child: jest.fn(),
+  }
+  mocked.child.mockImplementation(() => mocked)
+  return { createLogger: jest.fn(() => mocked) }
+})
+
+
+const searchLoggerWarn = createLogger('search').warn as jest.Mock
+
 // Mock dependencies before importing workers
 jest.mock('@open-mercato/shared/lib/indexers/error-log', () => ({
   recordIndexerError: jest.fn().mockResolvedValue(undefined),
@@ -221,7 +237,7 @@ describe('Vector Index Worker', () => {
   it('should skip a batch with one warning when the dimension mismatches (no per-record indexing)', async () => {
     mockTableDimension = 768
     mockEmbeddingService.dimension = 1536
-    const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {})
+    searchLoggerWarn.mockClear()
     const job = createMockJob<VectorIndexJobPayload>({
       jobType: 'batch-index',
       tenantId: 'tenant-123',
@@ -236,9 +252,8 @@ describe('Vector Index Worker', () => {
 
     expect(mockSearchIndexer.indexRecordById).not.toHaveBeenCalled()
     expect(mockEmbeddingService.createEmbedding).not.toHaveBeenCalled()
-    expect(warnSpy).toHaveBeenCalledTimes(1)
-    expect(String(warnSpy.mock.calls[0][0])).toContain('Skipping vector batch')
-    warnSpy.mockRestore()
+    expect(searchLoggerWarn).toHaveBeenCalledTimes(1)
+    expect(String(searchLoggerWarn.mock.calls[0][0])).toContain('Skipping vector batch')
   })
 
   it('should skip a batch with one warning when the provider probe is unreachable', async () => {
@@ -247,7 +262,7 @@ describe('Vector Index Worker', () => {
     mockEmbeddingService.createEmbedding.mockRejectedValueOnce(
       new Error('fetch failed. Check OLLAMA_BASE_URL.'),
     )
-    const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {})
+    searchLoggerWarn.mockClear()
     const job = createMockJob<VectorIndexJobPayload>({
       jobType: 'batch-index',
       tenantId: 'tenant-123',
@@ -259,15 +274,14 @@ describe('Vector Index Worker', () => {
 
     expect(mockSearchIndexer.indexRecordById).not.toHaveBeenCalled()
     expect(mockEmbeddingService.createEmbedding).toHaveBeenCalledTimes(1)
-    expect(warnSpy).toHaveBeenCalledTimes(1)
-    expect(String(warnSpy.mock.calls[0][0])).toContain('Skipping vector batch')
-    warnSpy.mockRestore()
+    expect(searchLoggerWarn).toHaveBeenCalledTimes(1)
+    expect(String(searchLoggerWarn.mock.calls[0][0])).toContain('Skipping vector batch')
   })
 
   it('should still advance reindex progress/lock when a batch is skipped (no stuck run)', async () => {
     mockTableDimension = 768
     mockEmbeddingService.dimension = 1536
-    const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {})
+    searchLoggerWarn.mockClear()
     const mockDb = { kysely: true }
     const containerWithProgress: HandlerContext = {
       resolve: jest.fn((name: string) => {
@@ -298,7 +312,6 @@ describe('Vector Index Worker', () => {
       expect.objectContaining({ type: 'vector', tenantId: 'tenant-123', delta: 2 }),
     )
     expect(clearReindexLock).toHaveBeenCalledWith(mockDb, 'tenant-123', 'vector', 'org-456')
-    warnSpy.mockRestore()
   })
 
   it('counts handled-but-skipped batch records as processed so progress can complete', async () => {
@@ -373,7 +386,7 @@ describe('Vector Index Worker', () => {
   it('should skip a single-record index on dimension mismatch without indexing or embedding', async () => {
     mockTableDimension = 768
     mockEmbeddingService.dimension = 1536
-    const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {})
+    searchLoggerWarn.mockClear()
     const job = createMockJob<VectorIndexJobPayload>({
       jobType: 'index',
       entityType: 'customers:customer_person_profile',
@@ -386,8 +399,7 @@ describe('Vector Index Worker', () => {
 
     expect(mockSearchIndexer.indexRecordById).not.toHaveBeenCalled()
     expect(mockEmbeddingService.createEmbedding).not.toHaveBeenCalled()
-    expect(warnSpy).toHaveBeenCalledTimes(1)
-    warnSpy.mockRestore()
+    expect(searchLoggerWarn).toHaveBeenCalledTimes(1)
   })
 
   it('should still delete a record even when the provider is misconfigured', async () => {

package/src/lib/debug.ts

@@ -1,12 +1,29 @@
 /**
- * Debug utilities for search module.
+ * Debug utilities for search module, backed by the shared structured
+ * logging facade (`@open-mercato/shared/lib/logger`).
  *
- * Set OM_SEARCH_DEBUG=true to enable debug logging.
+ * Set OM_SEARCH_DEBUG=true to opt into the verbose diagnostic helpers
+ * (`searchDebug`/`searchDebugWarn`). Emission also flows through the
+ * global `OM_LOG_LEVEL` gate, so when using OM_SEARCH_DEBUG in
+ * production set OM_LOG_LEVEL=debug as well.
  */
 
+import { createLogger, type Logger } from '@open-mercato/shared/lib/logger'
+import { parseBooleanWithDefault } from '@open-mercato/shared/lib/boolean'
+
+const packageLogger = createLogger('search')
+const componentLoggers = new Map<string, Logger>()
+
+function componentLogger(prefix: string): Logger {
+  const existing = componentLoggers.get(prefix)
+  if (existing) return existing
+  const scoped = packageLogger.child({ component: prefix })
+  componentLoggers.set(prefix, scoped)
+  return scoped
+}
+
 export function isSearchDebugEnabled(): boolean {
-  const raw = (process.env.OM_SEARCH_DEBUG ?? '').toLowerCase()
-  return raw === '1' || raw === 'true' || raw === 'yes' || raw === 'on'
+  return parseBooleanWithDefault(process.env.OM_SEARCH_DEBUG, false)
 }
 
 /**
@@ -14,11 +31,7 @@ export function isSearchDebugEnabled(): boolean {
  */
 export function searchDebug(prefix: string, message: string, data?: Record<string, unknown>): void {
   if (!isSearchDebugEnabled()) return
-  if (data) {
-    console.log(`[${prefix}] ${message}`, data)
-  } else {
-    console.log(`[${prefix}] ${message}`)
-  }
+  componentLogger(prefix).debug(message, data)
 }
 
 /**
@@ -26,11 +39,7 @@ export function searchDebug(prefix: string, message: string, data?: Record<strin
  */
 export function searchDebugWarn(prefix: string, message: string, data?: Record<string, unknown>): void {
   if (!isSearchDebugEnabled()) return
-  if (data) {
-    console.warn(`[${prefix}] ${message}`, data)
-  } else {
-    console.warn(`[${prefix}] ${message}`)
-  }
+  componentLogger(prefix).warn(message, data)
 }
 
 /**
@@ -40,11 +49,7 @@ export function searchDebugWarn(prefix: string, message: string, data?: Record<s
  * the configured embedding dimension no longer matches the vector table.
  */
 export function searchWarn(prefix: string, message: string, data?: Record<string, unknown>): void {
-  if (data) {
-    console.warn(`[${prefix}] ${message}`, data)
-  } else {
-    console.warn(`[${prefix}] ${message}`)
-  }
+  componentLogger(prefix).warn(message, data)
 }
 
 /**
@@ -52,9 +57,5 @@ export function searchWarn(prefix: string, message: string, data?: Record<string
  * Errors should always be visible for troubleshooting.
  */
 export function searchError(prefix: string, message: string, data?: Record<string, unknown>): void {
-  if (data) {
-    console.error(`[${prefix}] ${message}`, data)
-  } else {
-    console.error(`[${prefix}] ${message}`)
-  }
+  componentLogger(prefix).error(message, data)
 }

package/src/lib/presenter-enricher.ts

@@ -11,17 +11,17 @@ import type { QueryEngine } from '@open-mercato/shared/lib/query/types'
 import type { EntityId } from '@open-mercato/shared/modules/entities'
 import type { TenantDataEncryptionService } from '@open-mercato/shared/lib/encryption/tenantDataEncryptionService'
 import { decryptIndexDocForSearch } from '@open-mercato/shared/lib/encryption/indexDoc'
+import { createLogger } from '@open-mercato/shared/lib/logger'
 import { extractFallbackPresenter } from './fallback-presenter'
 import { needsSearchResultEnrichment } from './search-result-enrichment'
 
 /** Maximum number of record IDs per batch query to avoid hitting DB parameter limits */
 const BATCH_SIZE = 500
 
-/** Logger for debugging - uses console.warn to surface issues without breaking flow */
+/** Diagnostic logger - surfaces issues without breaking flow, gated by OM_LOG_LEVEL=debug */
+const enricherLogger = createLogger('search').child({ component: 'presenter-enricher' })
 const logWarning = (message: string, context?: Record<string, unknown>) => {
-  if (process.env.NODE_ENV === 'development' || process.env.DEBUG_SEARCH_ENRICHER) {
-    console.warn(`[search:presenter-enricher] ${message}`, context ?? '')
-  }
+  enricherLogger.debug(message, context)
 }
 
 /**
@@ -145,7 +145,7 @@ async function computePresenterAndLinks(
         if (source?.presenter) presenter = source.presenter
         if (source?.links) links = source.links
       } catch (err) {
-        logWarning(`buildSource failed for ${entityId}:${recordId}`, { error: String(err) })
+        logWarning('buildSource failed', { entityId, recordId, err })
       }
     }
 
@@ -153,7 +153,7 @@ async function computePresenterAndLinks(
       try {
         presenter = (await config.formatResult(buildContext)) ?? null
       } catch (err) {
-        logWarning(`formatResult failed for ${entityId}:${recordId}`, { error: String(err) })
+        logWarning('formatResult failed', { entityId, recordId, err })
       }
     }
   }
@@ -239,7 +239,7 @@ export function createPresenterEnricher(
           )
           return { ...row, doc: decryptedDoc }
         } catch (err) {
-          logWarning(`Failed to decrypt doc for ${row.entity_type}:${row.entity_id}`, { error: String(err) })
+          logWarning('Failed to decrypt doc', { entityId: row.entity_type, recordId: row.entity_id, err })
           return row // Return original doc if decryption fails
         }
       }),
@@ -257,7 +257,7 @@ export function createPresenterEnricher(
       const doc = docMap.get(key)
 
       if (!doc) {
-        logWarning(`Doc not found in entity_indexes`, { entityId: result.entityId, recordId: result.recordId })
+        logWarning('Doc not found in entity_indexes', { entityId: result.entityId, recordId: result.recordId })
         return { key, presenter: null, url: undefined, links: undefined }
       }