@open-mercato/core 0.6.6-develop.6460.1.f94c74174c → 0.6.6-develop.6471.1.9ab5bdd79a

package/src/modules/staff/commands/timesheets-projects.ts

@@ -35,6 +35,11 @@ import {
   ensureTenantScope,
   extractUndoPayload,
   scopeForDecryption,
+  scopedStaffSnapshotWhere,
+  staffSnapshotDecryptionScope,
+  staffSnapshotScopeFromContext,
+  staffSnapshotScopeFromSnapshot,
+  type StaffSnapshotScope,
 } from './shared'
 
 function isUniqueViolation(error: unknown): boolean {
@@ -87,8 +92,14 @@ type TimeProjectMemberUndoPayload = {
   after?: TimeProjectMemberSnapshot | null
 }
 
-async function loadTimeProjectSnapshot(em: EntityManager, id: string): Promise<TimeProjectSnapshot | null> {
-  const project = await findOneWithDecryption(em, StaffTimeProject, { id }, undefined, { tenantId: null, organizationId: null })
+async function loadTimeProjectSnapshot(em: EntityManager, id: string, scope?: StaffSnapshotScope | null): Promise<TimeProjectSnapshot | null> {
+  const project = await findOneWithDecryption(
+    em,
+    StaffTimeProject,
+    scopedStaffSnapshotWhere(id, scope),
+    undefined,
+    staffSnapshotDecryptionScope(scope),
+  )
   if (!project) return null
   return {
     id: project.id,
@@ -108,8 +119,14 @@ async function loadTimeProjectSnapshot(em: EntityManager, id: string): Promise<T
   }
 }
 
-async function loadTimeProjectMemberSnapshot(em: EntityManager, id: string): Promise<TimeProjectMemberSnapshot | null> {
-  const member = await findOneWithDecryption(em, StaffTimeProjectMember, { id }, undefined, { tenantId: null, organizationId: null })
+async function loadTimeProjectMemberSnapshot(em: EntityManager, id: string, scope?: StaffSnapshotScope | null): Promise<TimeProjectMemberSnapshot | null> {
+  const member = await findOneWithDecryption(
+    em,
+    StaffTimeProjectMember,
+    scopedStaffSnapshotWhere(id, scope),
+    undefined,
+    staffSnapshotDecryptionScope(scope),
+  )
   if (!member) return null
   return {
     id: member.id,
@@ -223,13 +240,13 @@ const createTimeProjectCommand: CommandHandler<StaffTimeProjectCreateInput, { ti
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const snapshot = await loadTimeProjectSnapshot(em, result.timeProjectId)
+    const snapshot = await loadTimeProjectSnapshot(em, result.timeProjectId, staffSnapshotScopeFromContext(ctx))
     if (!snapshot) return null
     return { snapshot }
   },
   buildLog: async ({ result, ctx }) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const snapshot = await loadTimeProjectSnapshot(em, result.timeProjectId)
+    const snapshot = await loadTimeProjectSnapshot(em, result.timeProjectId, staffSnapshotScopeFromContext(ctx))
     if (!snapshot) return null
     const { translate } = await resolveTranslations()
     return {
@@ -251,7 +268,7 @@ const createTimeProjectCommand: CommandHandler<StaffTimeProjectCreateInput, { ti
     const after = payload?.after
     if (!after) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const project = await em.findOne(StaffTimeProject, { id: after.id })
+    const project = await em.findOne(StaffTimeProject, scopedStaffSnapshotWhere(after.id, staffSnapshotScopeFromSnapshot(after)))
     if (project) {
       project.deletedAt = new Date()
       await em.flush()
@@ -284,7 +301,7 @@ const updateTimeProjectCommand: CommandHandler<StaffTimeProjectUpdateInput, { ti
   async prepare(rawInput, ctx) {
     const parsed = staffTimeProjectUpdateSchema.parse(rawInput)
     const em = (ctx.container.resolve('em') as EntityManager)
-    const snapshot = await loadTimeProjectSnapshot(em, parsed.id)
+    const snapshot = await loadTimeProjectSnapshot(em, parsed.id, staffSnapshotScopeFromContext(ctx))
     if (!snapshot) return {}
     return { before: snapshot }
   },
@@ -346,7 +363,7 @@ const updateTimeProjectCommand: CommandHandler<StaffTimeProjectUpdateInput, { ti
     const before = snapshots.before as TimeProjectSnapshot | undefined
     if (!before) return null
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const after = await loadTimeProjectSnapshot(em, before.id)
+    const after = await loadTimeProjectSnapshot(em, before.id, staffSnapshotScopeFromSnapshot(before))
     if (!after) return null
     const changes = buildChanges(before as unknown as Record<string, unknown>, after as unknown as Record<string, unknown>, [
       'name',
@@ -384,7 +401,7 @@ const updateTimeProjectCommand: CommandHandler<StaffTimeProjectUpdateInput, { ti
     const before = payload?.before
     if (!before) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const project = await em.findOne(StaffTimeProject, { id: before.id })
+    const project = await em.findOne(StaffTimeProject, scopedStaffSnapshotWhere(before.id, staffSnapshotScopeFromSnapshot(before)))
     if (!project) return
     project.name = before.name
     project.customerId = before.customerId ?? null
@@ -421,7 +438,7 @@ const deleteTimeProjectCommand: CommandHandler<{ id?: string }, { timeProjectId:
     const id = input?.id
     if (!id) throw new CrudHttpError(400, { error: 'Time project id is required.' })
     const em = (ctx.container.resolve('em') as EntityManager)
-    const snapshot = await loadTimeProjectSnapshot(em, id)
+    const snapshot = await loadTimeProjectSnapshot(em, id, staffSnapshotScopeFromContext(ctx))
     if (!snapshot) return {}
     return { before: snapshot }
   },
@@ -482,7 +499,7 @@ const deleteTimeProjectCommand: CommandHandler<{ id?: string }, { timeProjectId:
     const before = payload?.before
     if (!before) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    let project = await em.findOne(StaffTimeProject, { id: before.id })
+    let project = await em.findOne(StaffTimeProject, scopedStaffSnapshotWhere(before.id, staffSnapshotScopeFromSnapshot(before)))
     if (!project) {
       project = em.create(StaffTimeProject, {
         id: before.id,
@@ -604,13 +621,13 @@ const assignTimeProjectMemberCommand: CommandHandler<StaffTimeProjectMemberAssig
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const snapshot = await loadTimeProjectMemberSnapshot(em, result.timeProjectMemberId)
+    const snapshot = await loadTimeProjectMemberSnapshot(em, result.timeProjectMemberId, staffSnapshotScopeFromContext(ctx))
     if (!snapshot) return null
     return { snapshot }
   },
   buildLog: async ({ result, ctx }) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const snapshot = await loadTimeProjectMemberSnapshot(em, result.timeProjectMemberId)
+    const snapshot = await loadTimeProjectMemberSnapshot(em, result.timeProjectMemberId, staffSnapshotScopeFromContext(ctx))
     if (!snapshot) return null
     const { translate } = await resolveTranslations()
     return {
@@ -632,7 +649,7 @@ const assignTimeProjectMemberCommand: CommandHandler<StaffTimeProjectMemberAssig
     const after = payload?.after
     if (!after) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const member = await em.findOne(StaffTimeProjectMember, { id: after.id })
+    const member = await em.findOne(StaffTimeProjectMember, scopedStaffSnapshotWhere(after.id, staffSnapshotScopeFromSnapshot(after)))
     if (member) {
       member.deletedAt = new Date()
       await em.flush()
@@ -662,7 +679,7 @@ const unassignTimeProjectMemberCommand: CommandHandler<{ id?: string }, { timePr
     const id = input?.id
     if (!id) throw new CrudHttpError(400, { error: 'Time project member id is required.' })
     const em = (ctx.container.resolve('em') as EntityManager)
-    const snapshot = await loadTimeProjectMemberSnapshot(em, id)
+    const snapshot = await loadTimeProjectMemberSnapshot(em, id, staffSnapshotScopeFromContext(ctx))
     if (!snapshot) return {}
     return { before: snapshot }
   },
@@ -720,7 +737,7 @@ const unassignTimeProjectMemberCommand: CommandHandler<{ id?: string }, { timePr
     const before = payload?.before
     if (!before) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    let member = await em.findOne(StaffTimeProjectMember, { id: before.id })
+    let member = await em.findOne(StaffTimeProjectMember, scopedStaffSnapshotWhere(before.id, staffSnapshotScopeFromSnapshot(before)))
     if (!member) {
       member = em.create(StaffTimeProjectMember, {
         id: before.id,

package/src/modules/staff/widgets/dashboard/timesheets-hours-by-project/widget.client.tsx

@@ -10,6 +10,9 @@ import {
   type DateRangePreset,
 } from '@open-mercato/ui/backend/date-range'
 import { DEFAULT_SETTINGS, hydrateSettings, type HoursByProjectSettings } from './config'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 type WidgetDataItem = { groupKey: string; groupLabel?: string; value: number | null }
 type WidgetDataResponse = {
@@ -69,7 +72,7 @@ const HoursByProjectWidget: React.FC<DashboardWidgetComponentProps<HoursByProjec
       setData(sorted)
       setTotalMinutes(sorted.reduce((sum, item) => sum + (item.value ?? 0), 0))
     } catch (err) {
-      console.error('staff.timesheets.hoursByProject', err)
+      logger.error('staff.timesheets.hoursByProject', { err })
       setError(t('staff.timesheets.widgets.hoursByProject.error', 'Failed to load data'))
     } finally {
       setLoading(false)

package/src/modules/staff/widgets/dashboard/timesheets-time-reporting/widget.client.tsx

@@ -11,6 +11,9 @@ import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuarde
 import { startTimerEntry } from '../../../lib/timesheets-ui/startTimer'
 import { resolveTimerActionError } from '../../../lib/timesheets-ui/timerErrors'
 import { DEFAULT_SETTINGS, hydrateSettings, type TimeReportingSettings } from './config'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 type ProjectOption = { id: string; name: string; code: string | null }
 
@@ -102,7 +105,7 @@ const TimeReportingWidget: React.FC<DashboardWidgetComponentProps<TimeReportingS
       }
 
     } catch (err) {
-      console.error('staff.timesheets.timeReporting.load', err)
+      logger.error('staff.timesheets.timeReporting.load', { err })
       setError(t('staff.timesheets.widgets.timeReporting.error', 'Failed to load timer state'))
     } finally {
       setLoading(false)
@@ -164,7 +167,7 @@ const TimeReportingWidget: React.FC<DashboardWidgetComponentProps<TimeReportingS
       onSettingsChange({ ...hydrated, lastProjectId: selectedProjectId })
       await refreshActiveTimer()
     } catch (err) {
-      console.error('staff.timesheets.timeReporting.start', err)
+      logger.error('staff.timesheets.timeReporting.start', { err })
       setError(resolveTimerActionError(err, t('staff.timesheets.widgets.timeReporting.startError', 'Failed to start timer')))
     } finally {
       setActionLoading(false)
@@ -195,7 +198,7 @@ const TimeReportingWidget: React.FC<DashboardWidgetComponentProps<TimeReportingS
       })
       await refreshActiveTimer()
     } catch (err) {
-      console.error('staff.timesheets.timeReporting.stop', err)
+      logger.error('staff.timesheets.timeReporting.stop', { err })
       setError(resolveTimerActionError(err, t('staff.timesheets.widgets.timeReporting.stopError', 'Failed to stop timer')))
     } finally {
       setActionLoading(false)

package/src/modules/sync_excel/api/import/route.ts

@@ -19,6 +19,9 @@ import {
   syncExcelImportResponseSchema,
 } from '../../data/validators'
 import { resolveSyncExcelConcreteScope } from '../../lib/scope'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('sync_excel').child({ component: 'import' })
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['sync_excel.run'] },
@@ -188,7 +191,7 @@ export async function POST(request: Request) {
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error)
     const stack = error instanceof Error ? error.stack : undefined
-    console.error('[sync_excel.import] unhandled error', { message, stack })
+    logger.error('Unhandled error starting import', { message, stack })
     return NextResponse.json(
       { error: 'Failed to start sync_excel import.' },
       { status: 500 },

package/src/modules/translations/api/[entityType]/[entityId]/route.ts

@@ -12,6 +12,9 @@ import { CommandBus } from '@open-mercato/shared/lib/commands'
 import { serializeOperationMetadata } from '@open-mercato/shared/lib/commands/operationMetadata'
 import { enforceCommandOptimisticLockWithGuards } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
 import type { OpenApiMethodDoc, OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('translations').child({ component: 'entity-translations' })
 
 const TRANSLATION_RESOURCE_KIND = 'translations.translation'
 
@@ -95,7 +98,7 @@ export async function GET(req: Request, ctx: { params?: { entityType?: string; e
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: 'Invalid parameters', details: err.issues }, { status: 400 })
     }
-    console.error('[translations/:entityType/:entityId.GET] Unexpected error', err)
+    logger.error('Failed to load translations', { err })
     return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
   }
 }
@@ -226,7 +229,7 @@ export async function PUT(req: Request, ctx: { params?: { entityType?: string; e
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: 'Validation failed', details: err.issues }, { status: 400 })
     }
-    console.error('[translations/:entityType/:entityId.PUT] Unexpected error', err)
+    logger.error('Failed to save translations', { err })
     return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
   }
 }
@@ -331,7 +334,7 @@ export async function DELETE(req: Request, ctx: { params?: { entityType?: string
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: 'Invalid parameters', details: err.issues }, { status: 400 })
     }
-    console.error('[translations/:entityType/:entityId.DELETE] Unexpected error', err)
+    logger.error('Failed to delete translations', { err })
     return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
   }
 }

package/src/modules/translations/api/get/locales.ts

@@ -5,6 +5,9 @@ import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/er
 import { locales as defaultLocales } from '@open-mercato/shared/lib/i18n/config'
 import type { ModuleConfigService } from '@open-mercato/core/modules/configs/lib/module-config-service'
 import type { OpenApiMethodDoc, OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('translations').child({ component: 'locales' })
 
 export const metadata = {
   path: '/translations/locales',
@@ -26,7 +29,7 @@ async function GET(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
-    console.error('[translations/locales.GET] Unexpected error', err)
+    logger.error('Failed to load locales', { err })
     return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
   }
 }

package/src/modules/translations/api/put/locales.ts

@@ -9,6 +9,9 @@ import {
 import { isValidIso639 } from '@open-mercato/shared/lib/i18n/iso639'
 import type { ModuleConfigService } from '@open-mercato/core/modules/configs/lib/module-config-service'
 import type { OpenApiMethodDoc, OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('translations').child({ component: 'locales' })
 
 const bodySchema = z.object({
   locales: z.array(
@@ -68,7 +71,7 @@ async function PUT(req: Request) {
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: 'Invalid request', details: err.issues }, { status: 400 })
     }
-    console.error('[translations/locales.PUT] Unexpected error', err)
+    logger.error('Failed to update locales', { err })
     return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
   }
 }

package/src/modules/translations/components/TranslationManager.tsx

@@ -22,6 +22,9 @@ import { ISO_639_1, isValidIso639, getIso639Label } from '@open-mercato/shared/l
 import { formatEntityLabel, buildEntityListUrl, getRecordLabel, resolveBaseValue } from '../lib/helpers'
 import { resolveFieldList } from '../lib/resolve-field-list'
 import type { ResolvedField } from '../lib/resolve-field-list'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('translations').child({ component: 'TranslationManager' })
 
 const TRANSLATION_MUTATION_CONTEXT_ID = 'translations.entity-translations'
 const SUPPORTED_LOCALES_MUTATION_CONTEXT_ID = 'translations.supported-locales'
@@ -264,7 +267,7 @@ export function TranslationManager({
         if (hasValues) body[locale] = localeFields
       }
       if (Object.keys(body).length === 0) {
-        console.warn('[translations] Save skipped: payload is empty — no locale contains any non-empty field')
+        logger.warn('Save skipped: payload is empty — no locale contains any non-empty field')
         throw new Error(t('translations.manager.errors.nothingToSave', 'Nothing to save — enter a translation first'))
       }
       return runMutation({

package/src/modules/translations/subscribers/cleanup.ts

@@ -1,4 +1,7 @@
 import { type Kysely, sql } from 'kysely'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('translations').child({ component: 'cleanup' })
 
 export const metadata = { event: 'query_index.delete_one', persistent: false }
 
@@ -24,6 +27,6 @@ export default async function handle(
       .where(sql<boolean>`organization_id is not distinct from ${organizationId}`)
       .execute()
   } catch (err) {
-    console.warn('[translations/cleanup] Failed to delete translations:', err instanceof Error ? err.message : 'unknown')
+    logger.warn('Failed to delete translations', { err })
   }
 }

package/src/modules/workflows/api/definitions/[id]/customize/route.ts

@@ -17,6 +17,9 @@ import { validateCrudMutationGuard, runCrudMutationGuardAfterSuccess } from '@op
 import { WorkflowDefinition } from '../../../../data/entities'
 import { serializeWorkflowDefinition } from '../../serialize'
 import { getCodeWorkflow } from '../../../../lib/code-registry'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -145,7 +148,7 @@ export async function POST(request: NextRequest, context: RouteContext) {
         )
       }
     } catch (eventError) {
-      console.error('Failed to emit workflows.definition.customized event:', eventError)
+      logger.error('Failed to emit workflows.definition.customized event', { err: eventError })
     }
 
     return NextResponse.json({
@@ -153,7 +156,7 @@ export async function POST(request: NextRequest, context: RouteContext) {
       message: 'Workflow definition customized successfully',
     })
   } catch (error) {
-    console.error('Error customizing workflow definition:', error)
+    logger.error('Error customizing workflow definition', { err: error })
     return NextResponse.json({ error: 'Failed to customize workflow definition' }, { status: 500 })
   }
 }

package/src/modules/workflows/api/definitions/[id]/reset-to-code/route.ts

@@ -16,6 +16,9 @@ import { validateCrudMutationGuard, runCrudMutationGuardAfterSuccess } from '@op
 import { WorkflowDefinition, WorkflowInstance } from '../../../../data/entities'
 import { serializeCodeWorkflowDefinition } from '../../serialize'
 import { getCodeWorkflow } from '../../../../lib/code-registry'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -174,7 +177,7 @@ export async function POST(
         )
       }
     } catch (eventError) {
-      console.error('Failed to emit workflows.definition.reset_to_code event:', eventError)
+      logger.error('Failed to emit workflows.definition.reset_to_code event', { err: eventError })
     }
 
     if (!codeDef) {
@@ -191,7 +194,7 @@ export async function POST(
       message: 'Workflow definition reset to code version',
     })
   } catch (error) {
-    console.error('Error resetting workflow definition to code:', error)
+    logger.error('Error resetting workflow definition to code', { err: error })
     return NextResponse.json(
       { error: 'Failed to reset workflow definition to code' },
       { status: 500 }

package/src/modules/workflows/api/definitions/[id]/route.ts

@@ -26,6 +26,9 @@ import { registerOptimisticLockReaderIfAbsent } from '@open-mercato/shared/lib/c
 import { validateCrudMutationGuard, runCrudMutationGuardAfterSuccess } from '@open-mercato/shared/lib/crud/mutation-guard'
 import { enforceCommandOptimisticLockWithGuards } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
 import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 registerOptimisticLockReaderIfAbsent({
   'workflows.definition': createGenericOptimisticLockReader({
@@ -102,7 +105,7 @@ export async function GET(
 
     return NextResponse.json({ data: serializeWorkflowDefinition(definition) })
   } catch (error) {
-    console.error('Error getting workflow definition:', error)
+    logger.error('Error getting workflow definition', { err: error })
     return NextResponse.json(
       { error: 'Failed to get workflow definition' },
       { status: 500 }
@@ -269,7 +272,7 @@ export async function PUT(
           )
         }
       } catch (eventError) {
-        console.error('Failed to emit workflows.definition.customized event:', eventError)
+        logger.error('Failed to emit workflows.definition.customized event', { err: eventError })
       }
 
       if (guardResult?.shouldRunAfterSuccess) {
@@ -376,7 +379,7 @@ export async function PUT(
       message: 'Workflow definition updated successfully',
     })
   } catch (error) {
-    console.error('Error updating workflow definition:', error)
+    logger.error('Error updating workflow definition', { err: error })
     return NextResponse.json(
       { error: 'Failed to update workflow definition' },
       { status: 500 }
@@ -496,7 +499,7 @@ export async function DELETE(
       message: 'Workflow definition deleted successfully',
     })
   } catch (error) {
-    console.error('Error deleting workflow definition:', error)
+    logger.error('Error deleting workflow definition', { err: error })
     return NextResponse.json(
       { error: 'Failed to delete workflow definition' },
       { status: 500 }

package/src/modules/workflows/api/definitions/route.ts

@@ -21,6 +21,9 @@ import {
 import { serializeWorkflowDefinition, serializeCodeWorkflowDefinition } from './serialize'
 import { invalidateTriggerCache } from '../../lib/event-trigger-service'
 import { getAllCodeWorkflows } from '../../lib/code-registry'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -162,7 +165,7 @@ export async function GET(request: NextRequest) {
       },
     })
   } catch (error) {
-    console.error('Error listing workflow definitions:', error)
+    logger.error('Error listing workflow definitions', { err: error })
     return NextResponse.json(
       { error: 'Failed to list workflow definitions' },
       { status: 500 }
@@ -275,7 +278,7 @@ export async function POST(request: NextRequest) {
       )
     }
 
-    console.error('Error creating workflow definition:', error)
+    logger.error('Error creating workflow definition', { err: error })
     return NextResponse.json(
       { error: 'Failed to create workflow definition' },
       { status: 500 }

package/src/modules/workflows/api/events/[id]/route.ts

@@ -14,6 +14,9 @@ import { resolveOrganizationScopeFilter } from '@open-mercato/core/modules/direc
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { WorkflowEvent, WorkflowInstance } from '../../../data/entities'
 import { workflowEventDetailSchema } from '../../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -118,7 +121,7 @@ export async function GET(request: NextRequest, context: RouteContext) {
 
     return NextResponse.json(response)
   } catch (error) {
-    console.error('Error getting workflow event:', error)
+    logger.error('Error getting workflow event', { err: error })
     return NextResponse.json(
       { error: 'Failed to get workflow event' },
       { status: 500 }

package/src/modules/workflows/api/events/route.ts

@@ -14,6 +14,9 @@ import { resolveOrganizationScopeFilter } from '@open-mercato/core/modules/direc
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { WorkflowEvent, WorkflowInstance } from '../../data/entities'
 import { workflowEventListItemSchema } from '../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -155,7 +158,7 @@ export async function GET(request: NextRequest) {
       totalPages,
     })
   } catch (error) {
-    console.error('Error getting workflow events:', error)
+    logger.error('Error getting workflow events', { err: error })
     return NextResponse.json(
       { error: 'Failed to get workflow events' },
       { status: 500 }

package/src/modules/workflows/api/instances/[id]/advance/route.ts

@@ -26,6 +26,9 @@ import {
   advanceWorkflowResponseSchema,
   workflowErrorSchema,
 } from '../../../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 // Validation schema
 const advanceWorkflowSchema = z.object({
@@ -261,7 +264,7 @@ export async function POST(request: NextRequest, context: RouteContext) {
       { status: 200 }
     )
   } catch (error) {
-    console.error('Error advancing workflow:', error)
+    logger.error('Error advancing workflow', { err: error })
 
     if (error instanceof Error) {
       return NextResponse.json(

package/src/modules/workflows/api/instances/[id]/cancel/route.ts

@@ -13,6 +13,9 @@ import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/d
 import { WorkflowInstance } from '../../../../data/entities'
 import * as workflowExecutor from '../../../../lib/workflow-executor'
 import { workflowInstanceResponseSchema } from '../../../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -107,7 +110,7 @@ export async function POST(
       message: 'Workflow cancelled successfully',
     })
   } catch (error) {
-    console.error('Error cancelling workflow instance:', error)
+    logger.error('Error cancelling workflow instance', { err: error })
     return NextResponse.json(
       { error: 'Failed to cancel workflow instance' },
       { status: 500 }

package/src/modules/workflows/api/instances/[id]/events/route.ts

@@ -13,6 +13,9 @@ import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/d
 import { resolveOrganizationScopeFilter } from '@open-mercato/core/modules/directory/utils/organizationScopeFilter'
 import { WorkflowInstance, WorkflowEvent } from '../../../../data/entities'
 import { workflowEventRowSchema, paginationSchema } from '../../../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -105,7 +108,7 @@ export async function GET(
       },
     })
   } catch (error) {
-    console.error('Error getting workflow events:', error)
+    logger.error('Error getting workflow events', { err: error })
     return NextResponse.json(
       { error: 'Failed to get workflow events' },
       { status: 500 }

package/src/modules/workflows/api/instances/[id]/retry/route.ts

@@ -14,6 +14,9 @@ import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { WorkflowInstance } from '../../../../data/entities'
 import * as workflowExecutor from '../../../../lib/workflow-executor'
 import { workflowInstanceResponseSchema, workflowExecutionResultSchema } from '../../../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -130,7 +133,7 @@ export async function POST(
       message: 'Workflow retry initiated successfully',
     })
   } catch (error) {
-    console.error('Error retrying workflow instance:', error)
+    logger.error('Error retrying workflow instance', { err: error })
 
     // Handle specific errors
     if (error instanceof workflowExecutor.WorkflowExecutionError) {

package/src/modules/workflows/api/instances/[id]/route.ts

@@ -16,6 +16,9 @@ import { resolveOrganizationScopeFilter } from '@open-mercato/core/modules/direc
 import { WorkflowInstance } from '../../../data/entities'
 import * as workflowExecutor from '../../../lib/workflow-executor'
 import { workflowInstanceResponseSchema } from '../../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -73,7 +76,7 @@ export async function GET(
 
     return NextResponse.json({ data: instance })
   } catch (error) {
-    console.error('Error getting workflow instance:', error)
+    logger.error('Error getting workflow instance', { err: error })
     return NextResponse.json(
       { error: 'Failed to get workflow instance' },
       { status: 500 }

package/src/modules/workflows/api/instances/[id]/signal/route.ts

@@ -11,6 +11,9 @@ import {
   sendSignalResponseSchema,
   workflowErrorSchema,
 } from '../../../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -56,7 +59,8 @@ export async function POST(request: NextRequest, context: RouteContext) {
       )
     }
 
-    console.log('[Signal API] Auth context:', {
+    logger.debug('Signal auth context resolved', {
+      component: 'signal',
       userId: auth.sub,
       tenantId,
       organizationId,
@@ -92,12 +96,7 @@ export async function POST(request: NextRequest, context: RouteContext) {
       message: 'Signal sent successfully',
     })
   } catch (error: any) {
-    console.error('[Signal API] Error occurred:', {
-      name: error.name,
-      message: error.message,
-      code: error.code,
-      stack: error.stack,
-    })
+    logger.error('Signal request failed', { component: 'signal', err: error })
 
     // Handle Zod validation errors
     if (error.name === 'ZodError') {