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

package/src/modules/inbox_ops/api/emails/route.ts

@@ -4,6 +4,9 @@ import { findAndCountWithDecryption } from '@open-mercato/shared/lib/encryption/
 import { InboxEmail } from '../../data/entities'
 import { emailListQuerySchema } from '../../data/validators'
 import { resolveRequestContext, UnauthorizedError } from '../routeHelpers'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('inbox_ops').child({ component: 'emails' })
 
 export const metadata = {
   GET: { requireAuth: true, requireFeatures: ['inbox_ops.log.view'] },
@@ -55,7 +58,7 @@ export async function GET(req: Request) {
     if (err instanceof UnauthorizedError) {
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
     }
-    console.error('[inbox_ops:emails] Error:', err)
+    logger.error('Failed to list emails', { err })
     return NextResponse.json({ error: 'Failed to list emails' }, { status: 500 })
   }
 }

package/src/modules/inbox_ops/api/extract/route.ts

@@ -4,6 +4,9 @@ import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { InboxEmail } from '../../data/entities'
 import { emitInboxOpsEvent } from '../../events'
 import { resolveRequestContext, handleRouteError } from '../routeHelpers'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('inbox_ops').child({ component: 'extract' })
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['inbox_ops.proposals.manage'] },
@@ -69,7 +72,7 @@ export async function POST(req: Request) {
         subject: title || 'Text extraction',
       })
     } catch (eventError) {
-      console.error('[inbox_ops:extract] Failed to emit email.received event:', eventError)
+      logger.error('Failed to emit email.received event', { err: eventError })
     }
 
     return NextResponse.json({ ok: true, emailId: email.id })

package/src/modules/inbox_ops/api/proposals/[id]/actions/[actionId]/route.ts

@@ -14,6 +14,9 @@ import {
   handleRouteError,
   isErrorResponse,
 } from '../../../../routeHelpers'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('inbox_ops').child({ component: 'action-edit' })
 
 export const metadata = {
   PATCH: { requireAuth: true, requireFeatures: ['inbox_ops.proposals.manage'] },
@@ -87,7 +90,7 @@ export async function PATCH(req: Request) {
         organizationId: ctx.organizationId,
       })
     } catch (eventError) {
-      console.error('[inbox_ops:action:edit] Failed to emit event:', eventError)
+      logger.error('Failed to emit event', { err: eventError })
     }
 
     return NextResponse.json({ ok: true, action })

package/src/modules/inbox_ops/api/proposals/[id]/replies/[replyId]/send/route.ts

@@ -16,6 +16,9 @@ import {
   handleRouteError,
   isErrorResponse,
 } from '../../../../../routeHelpers'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('inbox_ops').child({ component: 'reply-send' })
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['inbox_ops.replies.send'] },
@@ -159,7 +162,7 @@ export async function POST(req: Request) {
           { metadata: raw(`"metadata" - 'replySendClaimedAt'`) },
         )
       } catch (releaseError) {
-        console.error('[inbox_ops:reply:send] Failed to release send claim:', releaseError)
+        logger.error('Failed to release send claim', { err: releaseError })
       }
     }
 
@@ -211,7 +214,7 @@ export async function POST(req: Request) {
         messageRecordId: messagesResult?.messageId ?? null,
       })
     } catch (eventError) {
-      console.error('[inbox_ops:reply:send] Failed to emit event:', eventError)
+      logger.error('Failed to emit event', { err: eventError })
     }
 
     return NextResponse.json({

package/src/modules/inbox_ops/api/proposals/counts/route.ts

@@ -11,6 +11,9 @@ import {
   createCountsCacheTag,
   COUNTS_CACHE_TTL_MS,
 } from '../../../lib/cache'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('inbox_ops').child({ component: 'proposals-counts' })
 
 export const metadata = {
   GET: { requireAuth: true, requireFeatures: ['inbox_ops.proposals.view'] },
@@ -78,7 +81,7 @@ export async function GET(req: Request) {
           cache.set(cacheKey, responseBody, { ttl: COUNTS_CACHE_TTL_MS, tags: [tag] }),
         )
       } catch (err) {
-        console.warn('[inbox_ops:proposals:counts] Failed to set cache', err)
+        logger.warn('Failed to set cache', { err })
       }
     }
 
@@ -87,7 +90,7 @@ export async function GET(req: Request) {
     if (err instanceof UnauthorizedError) {
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
     }
-    console.error('[inbox_ops:proposals:counts] Error:', err)
+    logger.error('Failed to get counts', { err })
     return NextResponse.json({ error: 'Failed to get counts' }, { status: 500 })
   }
 }

package/src/modules/inbox_ops/api/proposals/route.ts

@@ -7,6 +7,9 @@ import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern
 import { InboxProposal, InboxEmail, InboxProposalAction, InboxDiscrepancy, type InboxProposalCategory } from '../../data/entities'
 import { proposalListQuerySchema } from '../../data/validators'
 import { resolveRequestContext, UnauthorizedError } from '../routeHelpers'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('inbox_ops').child({ component: 'proposals' })
 
 export const metadata = {
   GET: { requireAuth: true, requireFeatures: ['inbox_ops.proposals.view'] },
@@ -109,7 +112,7 @@ export async function GET(req: Request) {
     if (err instanceof UnauthorizedError) {
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
     }
-    console.error('[inbox_ops:proposals] Error listing proposals:', err)
+    logger.error('Failed to list proposals', { err })
     return NextResponse.json({ error: 'Failed to list proposals' }, { status: 500 })
   }
 }

package/src/modules/inbox_ops/api/routeHelpers.ts

@@ -9,6 +9,9 @@ import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { InboxProposal, InboxProposalAction } from '../data/entities'
 import type { CrossModuleEntities } from '../lib/executionEngine'
 import { resolveOptionalEventBus } from '../lib/eventBus'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('inbox_ops')
 
 export interface RequestContext {
   auth: AuthContext
@@ -154,7 +157,7 @@ export function handleRouteError(err: unknown, label: string): NextResponse {
   if (err instanceof UnauthorizedError) {
     return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
   }
-  console.error(`[inbox_ops:${label}] Error:`, err)
+  logger.error('Request failed', { label, err })
   return NextResponse.json({ error: `Failed to ${label}` }, { status: 500 })
 }
 

package/src/modules/inbox_ops/api/settings/route.ts

@@ -14,6 +14,9 @@ import {
   invalidateSettingsCache,
   SETTINGS_CACHE_TTL_MS,
 } from '../../lib/cache'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('inbox_ops').child({ component: 'settings' })
 
 export const metadata = {
   GET: { requireAuth: true, requireFeatures: ['inbox_ops.settings.manage'] },
@@ -65,7 +68,7 @@ export async function GET(req: Request) {
           cache.set(cacheKey, responseBody, { ttl: SETTINGS_CACHE_TTL_MS, tags: [tag] }),
         )
       } catch (err) {
-        console.warn('[inbox_ops:settings] Failed to set cache', err)
+        logger.warn('Failed to set cache', { err })
       }
     }
 

package/src/modules/inbox_ops/api/webhook/inbound.ts

@@ -12,6 +12,9 @@ import { InboxSettings, InboxEmail } from '../../data/entities'
 import { parseInboundEmail } from '../../lib/emailParser'
 import { checkRateLimit } from '../../lib/rateLimiter'
 import { emitInboxOpsEvent } from '../../events'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('inbox_ops').child({ component: 'webhook' })
 
 export const metadata = {
   POST: { requireAuth: false },
@@ -145,7 +148,7 @@ async function verifyAndParse(req: Request, rawBody: string): Promise<
   if (customSig) {
     const webhookSecret = process.env.INBOX_OPS_WEBHOOK_SECRET
     if (!webhookSecret) {
-      console.error('[inbox_ops:webhook] INBOX_OPS_WEBHOOK_SECRET not configured')
+      logger.error('INBOX_OPS_WEBHOOK_SECRET not configured')
       return { ok: false, response: NextResponse.json({ error: 'Service unavailable' }, { status: 503 }) }
     }
     const timestamp = req.headers.get('x-webhook-timestamp') || ''
@@ -168,7 +171,7 @@ async function verifyAndParse(req: Request, rawBody: string): Promise<
   if (svixId) {
     const signingSecret = process.env.RESEND_WEBHOOK_SIGNING_SECRET
     if (!signingSecret) {
-      console.error('[inbox_ops:webhook] RESEND_WEBHOOK_SIGNING_SECRET not configured')
+      logger.error('RESEND_WEBHOOK_SIGNING_SECRET not configured')
       return { ok: false, response: NextResponse.json({ error: 'Service unavailable' }, { status: 503 }) }
     }
     const headers: Record<string, string> = {
@@ -204,7 +207,7 @@ export async function POST(req: Request) {
   const hasCustomSecret = Boolean(process.env.INBOX_OPS_WEBHOOK_SECRET)
   const hasResendSecret = Boolean(process.env.RESEND_WEBHOOK_SIGNING_SECRET)
   if (!hasCustomSecret && !hasResendSecret) {
-    console.error('[inbox_ops:webhook] Neither INBOX_OPS_WEBHOOK_SECRET nor RESEND_WEBHOOK_SIGNING_SECRET is configured')
+    logger.error('Neither INBOX_OPS_WEBHOOK_SECRET nor RESEND_WEBHOOK_SIGNING_SECRET is configured')
     return NextResponse.json({ error: 'Service unavailable' }, { status: 503 })
   }
 
@@ -351,7 +354,7 @@ export async function POST(req: Request) {
         toAddress,
       })
     } catch (eventError) {
-      console.error('[inbox_ops:webhook] Failed to emit deduplicated event:', eventError)
+      logger.error('Failed to emit deduplicated event', { err: eventError })
     }
     return NextResponse.json({ ok: true })
   }
@@ -393,7 +396,7 @@ export async function POST(req: Request) {
       subject: parsed.subject,
     })
   } catch (eventError) {
-    console.error('[inbox_ops:webhook] Failed to emit email.received event:', eventError)
+    logger.error('Failed to emit email.received event', { err: eventError })
   }
 
   return NextResponse.json({ ok: true })

package/src/modules/inbox_ops/lib/cache.ts

@@ -1,4 +1,7 @@
 import type { CacheStrategy } from '@open-mercato/cache'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('inbox_ops').child({ component: 'cache' })
 
 const COUNTS_CACHE_PREFIX = 'inbox_ops:counts'
 const SETTINGS_CACHE_PREFIX = 'inbox_ops:settings'
@@ -34,7 +37,7 @@ export async function invalidateCountsCache(
   try {
     await cache.deleteByTags([tag])
   } catch (err) {
-    console.warn('[inbox_ops:cache] Failed to invalidate counts cache', err)
+    logger.warn('Failed to invalidate counts cache', { err })
   }
 }
 
@@ -47,7 +50,7 @@ export async function invalidateSettingsCache(
   try {
     await cache.deleteByTags([tag])
   } catch (err) {
-    console.warn('[inbox_ops:cache] Failed to invalidate settings cache', err)
+    logger.warn('Failed to invalidate settings cache', { err })
   }
 }
 

package/src/modules/inbox_ops/lib/catalogLookup.ts

@@ -1,6 +1,9 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import type { EntityClass } from '@mikro-orm/core'
 import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('inbox_ops').child({ component: 'catalog-lookup' })
 
 interface CatalogProductForExtraction {
   id: string
@@ -92,7 +95,7 @@ export async function fetchCatalogProductsForExtraction(
       price: priceByProduct.get(product.id),
     }))
   } catch (err) {
-    console.error('[inbox_ops:catalogLookup] Failed to fetch catalog products:', err)
+    logger.error('Failed to fetch catalog products', { err })
     return []
   }
 }

package/src/modules/inbox_ops/lib/eventBus.ts

@@ -1,14 +1,14 @@
 import type { AwilixContainer } from 'awilix'
 import type { EventBus } from '@open-mercato/events/types'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('inbox_ops')
 
 export function resolveOptionalEventBus(container: AwilixContainer): EventBus | null {
   try {
     return container.resolve('eventBus') as EventBus
   } catch (error) {
-    console.warn(
-      '[inbox_ops] Event bus unavailable:',
-      error instanceof Error ? error.message : String(error),
-    )
+    logger.warn('Event bus unavailable', { err: error })
     return null
   }
 }

package/src/modules/inbox_ops/lib/messagesIntegration.ts

@@ -2,6 +2,9 @@ import type { AwilixContainer } from 'awilix'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import type { CommandBus } from '@open-mercato/shared/lib/commands'
 import { getRecipientUserIdsForFeature } from '../../notifications/lib/notificationRecipients'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('inbox_ops').child({ component: 'messages' })
 
 interface ResolverLike {
   resolve: <T = unknown>(name: string) => T
@@ -157,10 +160,7 @@ export async function createMessageRecordForEmail(
     const messageId = (result as { id: string })?.id ?? null
     return messageId
   } catch (err) {
-    console.error(
-      '[inbox_ops:messages] Failed to create message record for email:',
-      err instanceof Error ? err.message : String(err),
-    )
+    logger.error('Failed to create message record for email', { err })
     return null
   }
 }
@@ -223,10 +223,7 @@ export async function createMessageRecordForReply(
     if (!messageId) return null
     return { messageId }
   } catch (err) {
-    console.error(
-      '[inbox_ops:messages] Failed to create reply message record:',
-      err instanceof Error ? err.message : String(err),
-    )
+    logger.error('Failed to create reply message record', { err })
     return null
   }
 }

package/src/modules/inbox_ops/subscribers/executionAuditor.ts

@@ -1,3 +1,7 @@
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('inbox_ops').child({ component: 'execution-auditor' })
+
 export const metadata = {
   event: 'inbox_ops.action.executed',
   persistent: true,
@@ -51,7 +55,7 @@ export default async function handle(payload: ActionExecutedPayload, ctx: Resolv
       },
     })
   } catch (err) {
-    console.error('[inbox_ops:execution-auditor] Failed to write audit log:', err)
+    logger.error('Failed to write audit log', { err })
     throw err
   }
 }

package/src/modules/inbox_ops/subscribers/extractionWorker.ts

@@ -19,6 +19,9 @@ import { runWithCacheTenant } from '@open-mercato/cache'
 import { emitInboxOpsEvent } from '../events'
 import { createMessageRecordForEmail } from '../lib/messagesIntegration'
 import { resolveCache, invalidateCountsCache } from '../lib/cache'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('inbox_ops').child({ component: 'extraction-worker' })
 
 const SYSTEM_USER_ID = '00000000-0000-0000-0000-000000000000'
 
@@ -62,7 +65,7 @@ function tryResolve<T>(ctx: ResolverContext, name: string): T | undefined {
   try {
     return ctx.resolve<T>(name)
   } catch {
-    console.debug(`[inbox_ops:extraction] optional dependency "${name}" not available`)
+    logger.debug('Optional dependency not available', { name })
     return undefined
   }
 }
@@ -122,7 +125,7 @@ export default async function handle(payload: EmailReceivedPayload, ctx: Resolve
     { tenantId: payload.tenantId, organizationId: payload.organizationId },
   )
   if (!email) {
-    console.error(`[inbox_ops:extraction-worker] Email not found: ${payload.emailId}`)
+    logger.error('Email not found', { emailId: payload.emailId })
     return
   }
 
@@ -197,7 +200,7 @@ export default async function handle(payload: EmailReceivedPayload, ctx: Resolve
           error: email.processingError,
         })
       } catch (eventError) {
-        console.error('[inbox_ops:extraction-worker] Failed to emit email.failed event:', eventError)
+        logger.error('Failed to emit email.failed event', { err: eventError })
       }
 
       return
@@ -540,7 +543,7 @@ export default async function handle(payload: EmailReceivedPayload, ctx: Resolve
       const cache = resolveCache(ctx)
       await runWithCacheTenant(email.tenantId, () => invalidateCountsCache(cache, email.tenantId))
     } catch (cacheErr) {
-      console.warn('[inbox_ops:extraction-worker] Cache invalidation failed (non-fatal):', cacheErr)
+      logger.warn('Cache invalidation failed (non-fatal)', { err: cacheErr })
     }
 
     // Step 8c: Register email as a message record (graceful degradation)
@@ -565,7 +568,7 @@ export default async function handle(payload: EmailReceivedPayload, ctx: Resolve
         },
       )
     } catch (msgErr) {
-      console.error('[inbox_ops:extraction-worker] Messages integration failed (non-fatal):', msgErr)
+      logger.error('Messages integration failed (non-fatal)', { err: msgErr })
     }
 
     // Step 9: Emit events
@@ -587,7 +590,7 @@ export default async function handle(payload: EmailReceivedPayload, ctx: Resolve
         summary: proposal.summary,
       })
     } catch (eventError) {
-      console.error('[inbox_ops:extraction-worker] Failed to emit events:', eventError)
+      logger.error('Failed to emit events', { err: eventError })
     }
   } catch (err) {
     email.status = 'failed'
@@ -602,10 +605,10 @@ export default async function handle(payload: EmailReceivedPayload, ctx: Resolve
         error: email.processingError,
       })
     } catch (eventError) {
-      console.error('[inbox_ops:extraction-worker] Failed to emit email.failed event:', eventError)
+      logger.error('Failed to emit email.failed event', { err: eventError })
     }
 
-    console.error('[inbox_ops:extraction-worker] Extraction failed:', err)
+    logger.error('Extraction failed', { err })
   }
 }
 

package/src/modules/inbox_ops/subscribers/proposalNotifier.ts

@@ -1,6 +1,9 @@
 import { resolveNotificationService } from '../../notifications/lib/notificationService'
 import { buildFeatureNotificationFromType } from '../../notifications/lib/notificationBuilder'
 import { notificationTypes } from '../notifications'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('inbox_ops').child({ component: 'proposal-notifier' })
 
 export const metadata = {
   event: 'inbox_ops.proposal.created',
@@ -44,7 +47,7 @@ export default async function handle(payload: ProposalCreatedPayload, ctx: Resol
       organizationId: payload.organizationId ?? null,
     })
   } catch (err) {
-    console.error('[inbox_ops:proposal-notifier] Failed to create notification:', err)
+    logger.error('Failed to create notification', { err })
     throw err
   }
 }

package/src/modules/messages/api/[id]/route.ts

@@ -20,6 +20,9 @@ import {
   okResponseSchema,
   updateDraftSchema as updateDraftOpenApiSchema,
 } from '../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('messages').child({ component: 'api' })
 
 export const metadata = {
   GET: { requireAuth: true },
@@ -89,10 +92,7 @@ export async function GET(req: Request, { params }: { params: { id: string } })
           organizationId: scope.organizationId,
         })
       } catch (error) {
-        console.error(
-          `[messages] Failed to load preview for ${item.entityModule}:${item.entityType}:${item.entityId}`,
-          error,
-        )
+        logger.error('Failed to load preview', { entityModule: item.entityModule, entityType: item.entityType, entityId: item.entityId, err: error })
         return null
       }
     }),

package/src/modules/messages/commands/actions.ts

@@ -17,6 +17,9 @@ import {
 } from '../lib/actions'
 import { getMessageType } from '../lib/message-types-registry'
 import { assertOrganizationAccess, type MessageScopeInput } from './shared'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('messages').child({ component: 'actions' })
 
 const actionStateSnapshotSchema = z.object({
   actionTaken: z.string().nullable(),
@@ -371,7 +374,7 @@ const executeActionCommand: CommandHandler<
         result = (commandResult.result as Record<string, unknown>) ?? {}
         operationLogEntry = commandResult.logEntry ?? null
       } catch (err) {
-        console.error('[messages] executeActionCommand sub-command failed', err)
+        logger.error('executeActionCommand sub-command failed', { err })
         // The target command never completed — release the reservation so the
         // action stays retryable, matching the pre-claim failure semantics.
         await releaseTerminalClaim()

package/src/modules/messages/components/MessagesInboxPageClient.tsx

@@ -25,6 +25,9 @@ import {
   buildMessagesListParams,
   type SenderOption,
 } from './inboxFilters'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('messages').child({ component: 'MessagesInboxPageClient' })
 
 type MessageListItem = {
   id: string
@@ -254,7 +257,7 @@ export function MessagesInboxPageClient() {
     senderOptionsScopeRef.current = scopeVersion
     setSenderOptions([])
     loadSenderOptions().catch((error: unknown) => {
-      console.warn('[messages] Failed to load sender filter options', error)
+      logger.warn('Failed to load sender filter options', { err: error })
     })
   }, [loadSenderOptions, scopeVersion])
 

package/src/modules/messages/lib/email-sender.ts

@@ -12,9 +12,11 @@ import MessageEmail from '../emails/MessageEmail'
 import { resolveAttachmentAbsolutePath } from '../../attachments/lib/storage'
 import { generateAuthToken, hashAuthToken } from '../../auth/lib/tokenHash'
 import type { MessageEmailAttachment } from './attachments'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('messages').child({ component: 'email-sender' })
 
 const ACCESS_TOKEN_EXPIRY_HOURS = 24 * 7
-const DEBUG = process.env.MESSAGES_EMAIL_DEBUG === 'true'
 const MAX_EMAIL_ATTACHMENTS = 10
 const MAX_TOTAL_ATTACHMENT_BYTES = 20 * 1024 * 1024
 
@@ -24,12 +26,7 @@ export type SenderIdentity = {
 }
 
 function logDebug(message: string, details?: Record<string, unknown>) {
-  if (!DEBUG) return
-  if (details) {
-    console.log(`[messages:email-sender] ${message}`, details)
-    return
-  }
-  console.log(`[messages:email-sender] ${message}`)
+  logger.debug(message, details)
 }
 
 function resolveAppUrl(): string | null {

package/src/modules/messages/lib/message-objects-registry.ts

@@ -1,5 +1,8 @@
 import type { MessageObjectTypeDefinition } from '@open-mercato/shared/modules/messages/types'
 import defaultTypes from '../message-objects'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('messages')
 
 const registry = new Map<string, MessageObjectTypeDefinition>()
 
@@ -26,7 +29,7 @@ export function registerMessageObjectTypes(
   for (const type of types) {
     const key = getKey(type.module, type.entityType)
     if (registry.has(key)) {
-      console.warn(`[messages] Message object type "${key}" is already registered, overwriting`)
+      logger.warn('Message object type already registered, overwriting', { key })
     }
     registry.set(key, type)
   }

package/src/modules/messages/lib/message-types-registry.ts

@@ -1,5 +1,8 @@
 import type { MessageTypeDefinition } from '@open-mercato/shared/modules/messages/types'
 import defaultTypes from '../message-types'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('messages')
 
 const registry = new Map<string, MessageTypeDefinition>()
 
@@ -21,7 +24,7 @@ export function registerMessageTypes(
   }
   for (const type of types) {
     if (registry.has(type.type)) {
-      console.warn(`[messages] Message type "${type.type}" is already registered, overwriting`)
+      logger.warn('Message type already registered, overwriting', { type: type.type })
     }
     registry.set(type.type, type)
   }

package/src/modules/messages/workers/send-email.worker.ts

@@ -9,6 +9,9 @@ import {
   sendMessageEmailToExternal,
   sendMessageEmailToRecipient,
 } from '../lib/email-sender'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('messages').child({ component: 'send-email' })
 
 export const MESSAGES_EMAIL_QUEUE_NAME = 'messages-email'
 
@@ -191,7 +194,7 @@ export default async function handle(
 
   const message = await resolveMessageScope(em, payload)
   if (!message) {
-    console.error('[messages:send-email] Message not found', payload.messageId)
+    logger.error('Message not found', { messageId: payload.messageId })
     return
   }
 
@@ -243,7 +246,7 @@ export default async function handle(
         tenantId: message.tenantId,
         organizationId: message.organizationId ?? null,
       })
-      console.error('[messages:send-email] External email send failed', error)
+      logger.error('External email send failed', { err: error })
     }
     return
   }
@@ -253,7 +256,7 @@ export default async function handle(
     recipientUserId: payload.recipientUserId,
   })
   if (!recipientRecord) {
-    console.error('[messages:send-email] Recipient row not found', payload)
+    logger.error('Recipient row not found', { messageId: payload.messageId, recipientUserId: payload.recipientUserId })
     return
   }
 
@@ -324,6 +327,6 @@ export default async function handle(
       tenantId: message.tenantId,
       organizationId: message.organizationId ?? null,
     })
-    console.error('[messages:send-email] Recipient email send failed', error)
+    logger.error('Recipient email send failed', { err: error })
   }
 }

package/src/modules/notifications/lib/notificationMapper.ts

@@ -1,15 +1,15 @@
 import type { NotificationDto } from '@open-mercato/shared/modules/notifications/types'
 import { Notification } from '../data/entities'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('notifications').child({ component: 'mapper' })
 
 export function toNotificationDto(notification: Notification): NotificationDto {
   const createdAt = notification.createdAt instanceof Date
     ? notification.createdAt
     : (() => {
       if (process.env.NODE_ENV !== 'test') {
-        console.warn(
-          '[notifications] Invalid createdAt on notification entity, falling back to current time',
-          { id: notification.id, createdAt: notification.createdAt },
-        )
+        logger.warn('Invalid createdAt on notification entity, falling back to current time', { id: notification.id, createdAt: notification.createdAt })
       }
       return new Date()
     })()

package/src/modules/notifications/lib/notificationService.ts

@@ -16,13 +16,12 @@ import {
 import { toNotificationDto } from './notificationMapper'
 import { getRecipientUserIdsForFeature, getRecipientUserIdsForRole } from './notificationRecipients'
 import { assertSafeNotificationHref, sanitizeNotificationActions } from './safeHref'
+import { createLogger } from '@open-mercato/shared/lib/logger'
 
-const DEBUG = process.env.NOTIFICATIONS_DEBUG === 'true'
+const logger = createLogger('notifications').child({ component: 'service' })
 
-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)
 }
 
 function getDb(em: EntityManager): Kysely<any> {