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

package/src/modules/notifications/subscribers/deliver-notification.ts

@@ -11,6 +11,9 @@ import { defaultLocale } from '@open-mercato/shared/lib/i18n/config'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { User } from '../../auth/data/entities'
 import type { TenantDataEncryptionService } from '@open-mercato/shared/lib/encryption/tenantDataEncryptionService'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('notifications').child({ component: 'deliver' })
 
 export const metadata = {
   event: NOTIFICATION_EVENTS.CREATED,
@@ -18,12 +21,8 @@ export const metadata = {
   id: 'notifications:deliver',
 }
 
-const DEBUG = process.env.NOTIFICATIONS_DEBUG === 'true'
-
-function debug(...args: unknown[]): void {
-  if (DEBUG) {
-    console.log('[notifications]', ...args)
-  }
+function debug(message: string, ...details: unknown[]): void {
+  logger.debug(message, details.length ? { details } : undefined)
 }
 
 type NotificationCreatedPayload = {
@@ -173,7 +172,7 @@ export default async function handle(payload: NotificationCreatedPayload, ctx: R
       }
 
       try {
-        debug('sending email', { to: recipient.email, from: deliveryConfig.strategies.email.from, subject })
+        debug('sending email', { recipientUserId: notification.recipientUserId })
         await sendEmail({
           to: recipient.email,
           subject,
@@ -188,7 +187,7 @@ export default async function handle(payload: NotificationCreatedPayload, ctx: R
           }),
         })
       } catch (error) {
-        console.error('[notifications] email delivery failed', error)
+        logger.error('Email delivery failed', { err: error })
       }
     }
 
@@ -216,15 +215,11 @@ export default async function handle(payload: NotificationCreatedPayload, ctx: R
           t,
         })
       } catch (error) {
-        console.error(`[notifications] delivery strategy failed (${strategy.id})`, error)
+        logger.error('Delivery strategy failed', { strategyId: strategy.id, err: error })
       }
     }
   } catch (err) {
-    console.error('[notifications:deliver] Failed to deliver notification:', {
-      notificationId: payload.notificationId,
-      recipientUserId: notification.recipientUserId,
-      error: err instanceof Error ? err.message : String(err),
-    })
+    logger.error('Failed to deliver notification', { notificationId: payload.notificationId, recipientUserId: notification.recipientUserId, err })
     throw err
   }
 

package/src/modules/payment_gateways/api/webhook/[provider]/route.ts

@@ -13,6 +13,9 @@ import { GatewayTransaction } from '../../../data/entities'
 import { getPaymentGatewayQueue } from '../../../lib/queue'
 import { processPaymentGatewayWebhookJob } from '../../../lib/webhook-processor'
 import { paymentGatewaysTag } from '../../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('payment_gateways').child({ component: 'webhook' })
 
 export const metadata = {
   path: '/payment_gateways/webhook/[provider]',
@@ -122,7 +125,7 @@ export async function POST(req: Request, { params }: { params: Promise<{ provide
 
     return NextResponse.json({ received: true, queued: true }, { status: 202 })
   } catch (err: unknown) {
-    console.warn(`[payment_gateways] Webhook verification failed for provider "${providerKey}"`, err)
+    logger.warn('Webhook verification failed', { providerKey, err })
     return NextResponse.json({ error: WEBHOOK_VERIFICATION_FAILED }, { status: 401 })
   }
 }

package/src/modules/perspectives/services/perspectiveService.ts

@@ -12,6 +12,9 @@ import type {
   PerspectiveSaveInput,
   RolePerspectiveSaveInput,
 } from '../data/validators'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('perspectives').child({ component: 'perspective-service' })
 
 export type PerspectiveScope = {
   userId: string
@@ -165,9 +168,7 @@ export function maybeMigrateLegacyFilterValues(settings: PerspectiveSettings): P
   const record = filters as Record<string, unknown>
   if ('v' in record && record.v === 2) return settings
   if ('root' in record) return settings
-  if (typeof console !== 'undefined') {
-    console.warn('[perspectives] Dropping legacy filterValues shape; please re-create the perspective with the new filter UI.')
-  }
+  logger.warn('Dropping legacy filterValues shape; please re-create the perspective with the new filter UI.')
   return { ...settings, filters: undefined }
 }
 

package/src/modules/planner/api/access.ts

@@ -1,6 +1,9 @@
 import type { AwilixContainer } from 'awilix'
 import type { AuthContext } from '@open-mercato/shared/lib/auth/server'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('planner').child({ component: 'access' })
 
 type TranslateFn = (key: string, fallback?: string) => string
 
@@ -46,9 +49,7 @@ export async function resolveAvailabilityWriteAccess(
     { allowUnregistered: true },
   )
   if (!resolver) {
-    console.warn(
-      '[planner] staff_module_not_loaded — availabilityAccessResolver unregistered; denying availability write access',
-    )
+    logger.warn('Staff module not loaded — availabilityAccessResolver unregistered; denying availability write access')
     return {
       canManageAll: false,
       canManageSelf: false,

package/src/modules/planner/api/availability-date-specific.ts

@@ -18,6 +18,9 @@ import {
 import { PlannerAvailabilityRule } from '../data/entities'
 import { parseAvailabilityRuleWindow } from '../lib/availabilitySchedule'
 import { assertAvailabilityWriteAccess, resolveAvailabilityActorId } from './access'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('planner').child({ component: 'availability' })
 
 export const metadata = {
   POST: { requireAuth: true },
@@ -137,7 +140,7 @@ export async function POST(req: Request) {
       return NextResponse.json(err.body, { status: err.status })
     }
     const { translate } = await resolveTranslations()
-    console.error('planner.availability.date-specific.replace failed', err)
+    logger.error('Date-specific availability replace failed', { err })
     return NextResponse.json(
       { error: translate('planner.availability.errors.updateDateSpecific', 'Failed to save date-specific availability.') },
       { status: 400 },

package/src/modules/planner/api/availability-weekly.ts

@@ -14,6 +14,9 @@ import {
   validateCrudMutationGuard,
 } from '@open-mercato/shared/lib/crud/mutation-guard'
 import { assertAvailabilityWriteAccess, resolveAvailabilityActorId } from './access'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('planner').child({ component: 'availability' })
 
 export const metadata = {
   POST: { requireAuth: true },
@@ -99,7 +102,7 @@ export async function POST(req: Request) {
       return NextResponse.json(err.body, { status: err.status })
     }
     const { translate } = await resolveTranslations()
-    console.error('planner.availability.weekly.replace failed', err)
+    logger.error('Weekly availability replace failed', { err })
     return NextResponse.json(
       { error: translate('planner.availability.errors.updateWeekly', 'Failed to save weekly availability.') },
       { status: 400 },

package/src/modules/planner/backend/planner/availability-rulesets/page.tsx

@@ -19,6 +19,9 @@ import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/u
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { formatDateTime } from '@open-mercato/shared/lib/time'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('planner').child({ component: 'availability-rulesets-page' })
 
 const PAGE_SIZE = 50
 const SUBTEXT_CLASSNAME = 'line-clamp-2 text-xs text-muted-foreground'
@@ -117,7 +120,7 @@ export default function PlannerAvailabilityRuleSetsPage() {
       setTotal(typeof payload.total === 'number' ? payload.total : items.length)
       setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : Math.max(1, Math.ceil(items.length / PAGE_SIZE)))
     } catch (error) {
-      console.error('planner.availability-rule-sets.list', error)
+      logger.error('Failed to list availability rule sets', { err: error })
       flash(labels.errors.load, 'error')
     } finally {
       setIsLoading(false)
@@ -155,7 +158,7 @@ export default function PlannerAvailabilityRuleSetsPage() {
       flash(labels.messages.deleted, 'success')
       handleRefresh()
     } catch (error) {
-      console.error('planner.availability-rule-sets.delete', error)
+      logger.error('Failed to delete availability rule set', { err: error })
       const normalized = normalizeCrudServerError(error)
       flash(normalized.message ?? labels.errors.delete, 'error')
     }

package/src/modules/planner/components/AvailabilityRulesEditor.tsx

@@ -40,6 +40,9 @@ import {
   requiresResetConfirmation,
   selectCustomRuleIdsToDelete,
 } from './availabilityRulesEditorState'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('planner').child({ component: 'AvailabilityRulesEditor' })
 
 type AvailabilityRepeat = 'once' | 'daily' | 'weekly'
 type AvailabilitySubjectType = 'member' | 'resource' | 'ruleset'
@@ -1189,7 +1192,7 @@ export function AvailabilityRulesEditor({
       onSuccess: () => flash(listLabels.ruleSetDeleteSuccess, 'success'),
       onError: (error) => {
         if (surfaceRecordConflict(error, t, { onRefresh: refreshAfterRuleSetConflict })) return
-        console.error('planner.availability-rule-sets.delete', error)
+        logger.error('Failed to delete availability rule set', { err: error })
         const normalized = normalizeCrudServerError(error)
         flash(normalized.message ?? listLabels.ruleSetDeleteError, 'error')
       },

package/src/modules/progress/api/jobs/route.ts

@@ -11,6 +11,9 @@ import {
   createProgressCrudOpenApi,
   createPagedListResponseSchema,
 } from '../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('progress').child({ component: 'jobs' })
 
 const routeMetadata = {
   GET: { requireAuth: true },
@@ -163,7 +166,7 @@ export async function POST(req: Request) {
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error)
     const stack = error instanceof Error ? error.stack : undefined
-    console.error('[progress.jobs.create] unhandled error', { message, stack })
+    logger.error('Unhandled error creating progress job', { message, stack })
     return NextResponse.json(
       { error: 'Failed to create progress job.' },
       { status: 500 },

package/src/modules/query_index/components/QueryIndexesTable.tsx

@@ -12,6 +12,9 @@ import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { StatusBadge, type StatusBadgeVariant } from '@open-mercato/ui/primitives/status-badge'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('query_index').child({ component: 'indexes-table' })
 
 const MUTATION_CONTEXT_ID = 'query_index.status.list:actions'
 
@@ -291,7 +294,7 @@ export default function QueryIndexesTable() {
         // configured) — surface a flash toast, not an alert or an error-level
         // stack dump that reads like an unhandled exception.
         const message = err instanceof Error && err.message ? err.message : errorMessage
-        console.warn('[query_index] index action failed', message)
+        logger.warn('Index action failed', { message })
         flash(message, 'error')
       }
       qc.invalidateQueries({ queryKey: ['query-index-status'] })
@@ -334,7 +337,7 @@ export default function QueryIndexesTable() {
         })
       } catch (err) {
         const message = err instanceof Error && err.message ? err.message : errorMessage
-        console.warn('[query_index] vector action failed', message)
+        logger.warn('Vector action failed', { message })
         flash(message, 'error')
       }
       qc.invalidateQueries({ queryKey: ['query-index-status'] })
@@ -377,7 +380,7 @@ export default function QueryIndexesTable() {
         })
       } catch (err) {
         const message = err instanceof Error && err.message ? err.message : errorMessage
-        console.warn('[query_index] fulltext action failed', message)
+        logger.warn('Fulltext action failed', { message })
         flash(message, 'error')
       }
       qc.invalidateQueries({ queryKey: ['query-index-status'] })

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

@@ -2,6 +2,9 @@ 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'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('query_index').child({ component: 'reindex-batch' })
 
 export type AnyRow = Record<string, any> & { id: string | number }
 
@@ -199,7 +202,7 @@ export async function upsertIndexBatch(
         brand_name: (tokenDoc as any).brand_name,
         legal_name: (tokenDoc as any).legal_name,
       }
-      console.info('[reindex:batch:doc]', {
+      logger.debug('Reindex batch document', {
         entityType,
         recordId,
         organizationId: scopeOrg ?? null,
@@ -254,7 +257,7 @@ export async function upsertIndexBatch(
       ).catch(() => undefined)
     }
     if (debugEnabled) {
-      console.info('[reindex:batch:tokens]', {
+      logger.debug('Reindex batch tokens', {
         entityType,
         records: basePayloads.length,
         scopeOrg: scope.orgId ?? null,

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

@@ -1,6 +1,9 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 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' })
 
 export type CoverageScope = {
   entityType: string
@@ -423,7 +426,7 @@ export async function refreshCoverageSnapshot(
       const vectorRow = await vectorQuery.executeTakeFirst() as { count: unknown } | undefined
       return toCount(vectorRow?.count)
     } catch (err) {
-      console.warn('[query_index] Failed to resolve vector count for coverage snapshot', {
+      logger.warn('Failed to resolve vector count for coverage snapshot', {
         entityType,
         tenantId,
         organizationId,

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

@@ -24,6 +24,9 @@ import { tokenizeText } from '@open-mercato/shared/lib/search/tokenize'
 import { runBeforeQueryPipeline, runAfterQueryPipeline, type QueryExtensionContext } from '@open-mercato/shared/lib/query/query-extension-runner'
 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'
+
+const logger = createLogger('query_index').child({ component: 'engine' })
 
 const DECRYPT_CONCURRENCY = 8
 
@@ -317,10 +320,10 @@ export class HybridQueryEngine implements QueryEngine {
             const force = this.isForcePartialIndexEnabled()
             if (!force) {
               if (gap.stats) {
-                console.warn('[HybridQueryEngine] Partial index coverage detected; falling back to basic engine:', { entity, baseCount: gap.stats.baseCount, indexedCount: gap.stats.indexedCount, scope: gap.scope })
+                logger.warn('Partial index coverage detected; falling back to basic engine', { entity, baseCount: gap.stats.baseCount, indexedCount: gap.stats.indexedCount, scope: gap.scope })
                 if (debugEnabled) this.debug('query:fallback:partial-coverage', { entity, baseCount: gap.stats.baseCount, indexedCount: gap.stats.indexedCount, scope: gap.scope })
               } else {
-                console.warn('[HybridQueryEngine] Partial index coverage detected; falling back to basic engine:', { entity })
+                logger.warn('Partial index coverage detected; falling back to basic engine', { entity })
                 if (debugEnabled) this.debug('query:fallback:partial-coverage', { entity })
               }
               const fallbackResult = await this.fallback.query(entity, opts)
@@ -347,10 +350,10 @@ export class HybridQueryEngine implements QueryEngine {
               return await applyAfterExtensions(resultWithWarning)
             }
             if (gap.stats) {
-              console.warn('[HybridQueryEngine] Partial index coverage detected; forcing query index usage due to FORCE_QUERY_INDEX_ON_PARTIAL_INDEXES:', { entity, baseCount: gap.stats.baseCount, indexedCount: gap.stats.indexedCount, scope: gap.scope })
+              logger.warn('Partial index coverage detected; forcing query index usage due to FORCE_QUERY_INDEX_ON_PARTIAL_INDEXES', { entity, baseCount: gap.stats.baseCount, indexedCount: gap.stats.indexedCount, scope: gap.scope })
               if (debugEnabled) this.debug('query:partial-coverage:forced', { entity, baseCount: gap.stats.baseCount, indexedCount: gap.stats.indexedCount, scope: gap.scope })
             } else {
-              console.warn('[HybridQueryEngine] Partial index coverage detected; forcing query index usage due to FORCE_QUERY_INDEX_ON_PARTIAL_INDEXES:', { entity })
+              logger.warn('Partial index coverage detected; forcing query index usage due to FORCE_QUERY_INDEX_ON_PARTIAL_INDEXES', { entity })
               if (debugEnabled) this.debug('query:partial-coverage:forced', { entity })
             }
             partialIndexWarning = {
@@ -510,7 +513,7 @@ export class HybridQueryEngine implements QueryEngine {
             const globalIndexed = globalStats.indexedCount
             const globalGap = (globalBase > 0 && globalIndexed < globalBase) || globalIndexed > globalBase
             if (globalGap) {
-              console.warn('[HybridQueryEngine] Partial index coverage detected at global scope; forcing query index usage due to FORCE_QUERY_INDEX_ON_PARTIAL_INDEXES:', { entity, baseCount: globalBase, indexedCount: globalIndexed, scope: 'global' })
+              logger.warn('Partial index coverage detected at global scope; forcing query index usage due to FORCE_QUERY_INDEX_ON_PARTIAL_INDEXES', { entity, baseCount: globalBase, indexedCount: globalIndexed, scope: 'global' })
               if (debugEnabled) this.debug('query:partial-coverage:forced', { entity, baseCount: globalBase, indexedCount: globalIndexed, scope: 'global' })
               partialIndexWarning = {
                 entity, entityLabel: this.resolveEntityLabel(entity),
@@ -792,7 +795,7 @@ export class HybridQueryEngine implements QueryEngine {
           resolvedKeys.forEach((key) => selectFieldSet.add(`cf:${key}`))
           if (this.isDebugVerbosity()) this.debug('query:cf:resolved-keys', { entity, keys: resolvedKeys })
         } catch (err) {
-          console.warn('[HybridQueryEngine] Failed to resolve custom field keys for', entity, err)
+          logger.warn('Failed to resolve custom field keys', { entity, err })
         }
       } else if (Array.isArray(opts.includeCustomFields)) {
         opts.includeCustomFields.map((key) => String(key)).forEach((key) => selectFieldSet.add(`cf:${key}`))
@@ -909,7 +912,7 @@ export class HybridQueryEngine implements QueryEngine {
             )
             next = { ...next, ...decrypted }
           } catch (err) {
-            console.error('Error decrypting entity payload', err)
+            logger.error('Error decrypting entity payload', { err })
           }
         }
         if (encSvc) {
@@ -1973,9 +1976,7 @@ export class HybridQueryEngine implements QueryEngine {
         await bus.emitEvent('query_index.reindex', payload, { persistent: true })
         if (this.isDebugVerbosity()) this.debug('query:auto-reindex:scheduled', context)
       } catch (err) {
-        console.warn('[HybridQueryEngine] Failed to schedule auto reindex:', {
-          ...context, error: err instanceof Error ? err.message : err,
-        })
+        logger.warn('Failed to schedule auto reindex', { ...context, err })
       }
     })
   }
@@ -2184,11 +2185,7 @@ export class HybridQueryEngine implements QueryEngine {
 
   private logSearchDebug(event: string, payload: Record<string, unknown>) {
     if (!this.isDebugVerbosity()) return
-    try {
-      console.info('[query-index:search]', event, JSON.stringify(payload))
-    } catch {
-      console.info('[query-index:search]', event, payload)
-    }
+    logger.debug('Search debug event', { event, payload })
   }
 
   private applyColumnFilter(
@@ -2348,7 +2345,7 @@ export class HybridQueryEngine implements QueryEngine {
   private debug(message: string, context?: Record<string, unknown>): void {
     if (!this.isDebugVerbosity()) return
     if (!this.isSqlDebugEnabled()) return
-    if (context) console.debug('[HybridQueryEngine]', message, context)
-    else console.debug('[HybridQueryEngine]', message)
+    if (context) logger.debug(message, context)
+    else logger.debug(message)
   }
 }

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

@@ -9,6 +9,9 @@ import { prepareJob, updateJobProgress, finalizeJob, type JobScope } from './job
 import { purgeOrphans } from './stale'
 import type { VectorIndexService } from '@open-mercato/search/vector'
 import { isSearchDebugEnabled } from './search-tokens'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('query_index').child({ component: 'reindexer' })
 
 export type ReindexJobOptions = {
   entityType: string
@@ -153,7 +156,7 @@ export async function reindexEntity(
   const table = resolveRegisteredEntityTableName(em, entityType)
   if (!table || entityType === 'query_index:search_token' || table === 'search_tokens') {
     if (!table) {
-      console.warn('[HybridQueryEngine] Refusing to reindex unregistered entity type', {
+      logger.warn('Refusing to reindex unregistered entity type', {
         entityType,
       })
     }
@@ -319,7 +322,7 @@ export async function reindexEntity(
         }
         await purgeQuery.execute()
       } catch (error) {
-        console.warn('[HybridQueryEngine] Failed to purge index rows before force reindex', {
+        logger.warn('Failed to purge index rows before force reindex', {
           entityType,
           tenantId: tenantId ?? null,
           organizationId: organizationId ?? null,
@@ -337,7 +340,7 @@ export async function reindexEntity(
           try {
             await eventBus.emitEvent('query_index.vectorize_purge', payload)
           } catch (err) {
-            console.warn('[HybridQueryEngine] Failed to queue vector purge before force reindex', {
+            logger.warn('Failed to queue vector purge before force reindex', {
               entityType,
               tenantId: tenantId ?? null,
               organizationId: organizationId ?? null,
@@ -345,7 +348,7 @@ export async function reindexEntity(
             })
           }
         } else {
-          console.warn('[HybridQueryEngine] Skipping vector purge for force reindex without tenant scope', {
+          logger.warn('Skipping vector purge for force reindex without tenant scope', {
             entityType,
           })
         }
@@ -414,7 +417,7 @@ export async function reindexEntity(
           dekKeyCache,
         )
         if (isSearchDebugEnabled()) {
-          console.info('[reindex:decrypt]', buildReindexDecryptDebugPayload(targetEntity, result as Record<string, unknown>, scope))
+          logger.debug('Reindex decrypt', buildReindexDecryptDebugPayload(targetEntity, result as Record<string, unknown>, scope))
         }
         return result
       }
@@ -499,7 +502,7 @@ export async function reindexEntity(
           olderThan: jobStartedAt,
         })
       } catch (error) {
-        console.warn('[HybridQueryEngine] Failed to prune vector orphans after reindex', {
+        logger.warn('Failed to prune vector orphans after reindex', {
           entityType,
           tenantId: tenantId ?? null,
           organizationId: organizationId ?? null,

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

@@ -2,6 +2,9 @@ import { type Kysely, sql } from 'kysely'
 import { resolveSearchConfig, type SearchConfig } from '@open-mercato/shared/lib/search/config'
 import { tokenizeText } from '@open-mercato/shared/lib/search/tokenize'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('query_index').child({ component: 'search-tokens' })
 
 const INSERT_BATCH_SIZE = 500
 
@@ -41,8 +44,7 @@ export const isSearchDebugEnabled = (): boolean => {
 const debug = (event: string, payload: Record<string, unknown>) => {
   if (!isSearchDebugEnabled()) return
   try {
-    // eslint-disable-next-line no-console
-    console.debug(`[search-tokens] ${event}`, payload)
+    logger.debug('Search token event', { event, payload })
   } catch {
     // ignore
   }

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

@@ -1,6 +1,9 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
 import { refreshCoverageSnapshot } from '../lib/coverage'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('query_index').child({ component: 'coverage-refresh' })
 
 export const metadata = { event: 'query_index.coverage.refresh', persistent: false }
 
@@ -48,7 +51,7 @@ export default async function handle(payload: Payload, ctx: { resolve: <T = any>
     try {
       await refreshCoverageSnapshot(em, { entityType, tenantId, organizationId, withDeleted })
     } catch (err) {
-      console.warn('[query_index] Failed to refresh coverage snapshot', {
+      logger.warn('Failed to refresh coverage snapshot', {
         entityType,
         tenantId,
         organizationId,

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

@@ -12,6 +12,9 @@ import {
 import { User } from '@open-mercato/core/modules/auth/data/entities'
 import { E } from '#generated/entities.ids.generated'
 import { createResourcesCrudOpenApi, createPagedListResponseSchema, defaultOkResponseSchema } from './openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('resources').child({ component: 'comments' })
 
 const rawBodySchema = z.object({}).passthrough()
 
@@ -159,7 +162,7 @@ const crud = makeCrudRoute({
           if (!('author_email' in record)) record.author_email = meta.email
         })
       } catch (err) {
-        console.warn('[resources.comments] failed to enrich author metadata', err)
+        logger.warn('Failed to enrich author metadata', { err })
       }
     },
   },

package/src/modules/resources/api/resources/tags/assign/route.ts

@@ -17,6 +17,9 @@ import {
   resourcesResourceTagAssignmentSchema,
   type ResourcesResourceTagAssignmentInput,
 } from '../../../../data/validators'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('resources').child({ component: 'tags' })
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['resources.manage_resources'] },
@@ -110,7 +113,7 @@ export async function POST(req: Request) {
       return NextResponse.json(err.body, { status: err.status })
     }
     const { translate } = await resolveTranslations()
-    console.error('resources.resourceTags.assign failed', err)
+    logger.error('Tag assign failed', { err })
     return NextResponse.json({ error: translate('resources.resources.tags.updateError', 'Failed to update tags.') }, { status: 400 })
   }
 }

package/src/modules/resources/api/resources/tags/unassign/route.ts

@@ -17,6 +17,9 @@ import {
   resourcesResourceTagAssignmentSchema,
   type ResourcesResourceTagAssignmentInput,
 } from '../../../../data/validators'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('resources').child({ component: 'tags' })
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['resources.manage_resources'] },
@@ -110,7 +113,7 @@ export async function POST(req: Request) {
       return NextResponse.json(err.body, { status: err.status })
     }
     const { translate } = await resolveTranslations()
-    console.error('resources.resourceTags.unassign failed', err)
+    logger.error('Tag unassign failed', { err })
     return NextResponse.json({ error: translate('resources.resources.tags.updateError', 'Failed to update tags.') }, { status: 400 })
   }
 }

package/src/modules/resources/backend/resources/resource-types/[id]/edit/page.tsx

@@ -11,6 +11,9 @@ import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { extractCustomFieldValues } from '@open-mercato/core/modules/sales/components/documents/customFieldHelpers'
 import { buildResourceTypePayload, ResourceTypeCrudForm, type ResourceTypeFormValues } from '@open-mercato/core/modules/resources/components/ResourceTypeCrudForm'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('resources').child({ component: 'resource-types-edit-page' })
 
 type ResourceTypesResponse = {
   items?: Array<Record<string, unknown>>
@@ -77,7 +80,7 @@ export default function ResourcesResourceTypeEditPage({ params }: { params?: { i
               : 0)
         }
       } catch (err) {
-        console.error('resources.resource-types.load', err)
+        logger.error('Failed to load resource types', { err })
         if (!cancelled) setError(t('resources.resourceTypes.errors.load', 'Failed to load resource types.'))
       } finally {
         if (!cancelled) setLoading(false)

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

@@ -20,6 +20,9 @@ import { Package } from 'lucide-react'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { formatDateTime } from '@open-mercato/shared/lib/time'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('resources').child({ component: 'resource-types-page' })
 
 const PAGE_SIZE = 50
 const DESCRIPTION_CLASSNAME = 'line-clamp-3 whitespace-pre-line text-sm text-foreground'
@@ -228,7 +231,7 @@ export default function ResourcesResourceTypesPage() {
       setTotal(typeof payload.total === 'number' ? payload.total : items.length)
       setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : Math.max(1, Math.ceil(items.length / PAGE_SIZE)))
     } catch (error) {
-      console.error('resources.resource-types.list', error)
+      logger.error('Failed to list resource types', { err: error })
       flash(translations.errors.load, 'error')
     } finally {
       setIsLoading(false)
@@ -271,7 +274,7 @@ export default function ResourcesResourceTypesPage() {
       flash(translations.messages.deleted, 'success')
       handleRefresh()
     } catch (error) {
-      console.error('resources.resource-types.delete', error)
+      logger.error('Failed to delete resource type', { err: error })
       flash(translations.errors.delete, 'error')
     }
   }, [confirm, handleRefresh, runResourceTypeMutation, translations.actions.deleteConfirm, translations.errors.delete, translations.errors.deleteAssigned, translations.messages.deleted])