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

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

@@ -24,6 +24,9 @@ import {
   paginationSchema,
 } from '../openapi'
 import * as workflowExecutor from '../../lib/workflow-executor'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -125,7 +128,7 @@ export async function GET(request: NextRequest) {
       },
     })
   } catch (error) {
-    console.error('Error listing workflow instances:', error)
+    logger.error('Error listing workflow instances', { err: error })
     return NextResponse.json(
       { error: 'Failed to list workflow instances' },
       { status: 500 }
@@ -193,10 +196,10 @@ export async function POST(request: NextRequest) {
 
     const input: StartWorkflowApiInput = validation.data
 
-    // Inject metadata.initiatedBy if not provided
+    // User-started instances must always record the authenticated caller.
     const metadata = {
       ...input.metadata,
-      initiatedBy: input.metadata?.initiatedBy || auth.sub,
+      initiatedBy: auth.sub,
     }
 
     // Start workflow
@@ -219,7 +222,7 @@ export async function POST(request: NextRequest) {
         const bgEm = bgContainer.resolve('em')
         await workflowExecutor.executeWorkflow(bgEm, bgContainer, instance.id)
       } catch (error) {
-        console.error('Background workflow execution error:', error)
+        logger.error('Background workflow execution error', { err: error })
       }
     })
 
@@ -238,7 +241,7 @@ export async function POST(request: NextRequest) {
       { status: 201 }
     )
   } catch (error) {
-    console.error('Error starting workflow:', error)
+    logger.error('Error starting workflow', { err: error })
 
     // Handle specific errors
     if (error instanceof workflowExecutor.WorkflowExecutionError) {

package/src/modules/workflows/api/instances/validate-start/route.ts

@@ -21,6 +21,9 @@ import {
   validateStartResponseSchema,
   workflowErrorSchema,
 } from '../../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -93,7 +96,7 @@ export async function POST(request: NextRequest) {
       validatedRules: result.validatedRules.length > 0 ? result.validatedRules : undefined,
     })
   } catch (error) {
-    console.error('Error validating workflow start:', error)
+    logger.error('Error validating workflow start', { err: error })
     return NextResponse.json(
       { error: 'Failed to validate workflow start' },
       { status: 500 }

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

@@ -11,6 +11,9 @@ import {
   sendSignalByCorrelationResponseSchema,
   workflowErrorSchema,
 } from '../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -79,7 +82,7 @@ export async function POST(request: NextRequest) {
       count,
     })
   } catch (error: any) {
-    console.error('Signal error:', error)
+    logger.error('Signal error', { err: error })
     return NextResponse.json(
       { error: error.message || 'Failed to send signal' },
       { status: 500 }

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

@@ -16,6 +16,9 @@ import {
   userTaskClaimResponseSchema,
   workflowErrorSchema,
 } from '../../../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -77,7 +80,7 @@ export async function POST(
       message: 'Task claimed successfully',
     })
   } catch (error) {
-    console.error('Error claiming user task:', error)
+    logger.error('Error claiming user task', { err: error })
 
     // Handle specific error codes from task-handler
     if (error instanceof Error) {

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

@@ -18,6 +18,9 @@ import {
   userTaskCompleteResponseSchema,
   workflowErrorSchema,
 } from '../../../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -123,7 +126,7 @@ export async function POST(
       message: 'Task completed successfully. Workflow resumed.',
     })
   } catch (error) {
-    console.error('Error completing user task:', error)
+    logger.error('Error completing user task', { err: error })
 
     // Handle specific error codes from task-handler
     if (error instanceof Error) {

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

@@ -18,6 +18,9 @@ import {
   userTaskDetailResponseSchema,
   workflowErrorSchema,
 } from '../../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -70,7 +73,7 @@ export async function GET(
       data: task,
     })
   } catch (error) {
-    console.error('Error fetching user task:', error)
+    logger.error('Error fetching user task', { err: error })
     return NextResponse.json(
       {
         error: 'Failed to fetch user task',

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

@@ -18,6 +18,9 @@ import {
   userTaskListResponseSchema,
   workflowErrorSchema,
 } from '../openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export const metadata = {
   requireAuth: true,
@@ -125,7 +128,7 @@ export async function GET(request: NextRequest) {
       },
     })
   } catch (error) {
-    console.error('Error listing user tasks:', error)
+    logger.error('Error listing user tasks', { err: error })
     return NextResponse.json(
       {
         error: 'Failed to list user tasks',

package/src/modules/workflows/backend/definitions/visual-editor/page.tsx

@@ -45,6 +45,9 @@ import { useIsMobile } from '@open-mercato/ui/hooks/useIsMobile'
 import type { WorkflowDefinitionTrigger } from '../../../data/entities'
 import type { WorkflowMetadataState, WorkflowMetadataHandlers } from '../../../data/types'
 import * as React from 'react'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 /**
  * VisualEditorPage - Visual workflow definition editor
@@ -161,7 +164,7 @@ export default function VisualEditorPage() {
         setSource((definition.source as 'code' | 'code_override' | 'user') ?? null)
         setUpdatedAt(typeof definition.updatedAt === 'string' ? definition.updatedAt : null)
       } catch (error) {
-        console.error('Error loading workflow definition:', error)
+        logger.error('Error loading workflow definition', { err: error })
         flash('Failed to load workflow definition', 'error')
       } finally {
         setIsLoading(false)
@@ -437,7 +440,7 @@ export default function VisualEditorPage() {
       }, 1500)
 
     } catch (error) {
-      console.error('Error saving workflow definition:', error)
+      logger.error('Error saving workflow definition', { err: error })
       flash('Failed to save workflow definition. Please try again.', 'error')
     } finally {
       setIsSaving(false)

package/src/modules/workflows/backend/instances/[id]/page.tsx

@@ -20,6 +20,9 @@ import { useIsMobile } from '@open-mercato/ui/hooks/useIsMobile'
 import { definitionToGraph } from '../../../lib/graph-utils'
 import type { Node } from '@xyflow/react'
 import { RecordNotFoundState, ErrorMessage } from '@open-mercato/ui/backend/detail'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export default function WorkflowInstanceDetailPage({ params }: { params?: { id?: string } }) {
   const id = params?.id
@@ -68,7 +71,7 @@ export default function WorkflowInstanceDetailPage({ params }: { params?: { id?:
       // Fetch definition by ID
       const response = await apiFetch(`/api/workflows/definitions/${instance!.definitionId}`)
       if (!response.ok) {
-        console.error('Failed to fetch workflow definition:', response.statusText)
+        logger.error('Failed to fetch workflow definition', { statusText: response.statusText })
         return null
       }
       const result = await response.json()
@@ -151,7 +154,7 @@ export default function WorkflowInstanceDetailPage({ params }: { params?: { id?:
       queryClient.invalidateQueries({ queryKey: ['workflow-instance', id] })
     },
     onError: (error) => {
-      console.error('Error cancelling instance:', error)
+      logger.error('Error cancelling instance', { err: error })
       flash(t('workflows.instances.cancelFailed'), 'error')
     },
   })
@@ -171,7 +174,7 @@ export default function WorkflowInstanceDetailPage({ params }: { params?: { id?:
       queryClient.invalidateQueries({ queryKey: ['workflow-instance', id] })
     },
     onError: (error) => {
-      console.error('Error retrying instance:', error)
+      logger.error('Error retrying instance', { err: error })
       flash(t('workflows.instances.retryFailed'), 'error')
     },
   })

package/src/modules/workflows/backend/tasks/[id]/page.tsx

@@ -26,6 +26,9 @@ import { MobileTaskForm } from '../../../components/mobile/MobileTaskForm'
 import { useIsMobile } from '@open-mercato/ui/hooks/useIsMobile'
 import type { UserTaskResponse, UserTaskStatus } from '../../../data/types'
 import { RecordNotFoundState, ErrorMessage } from '@open-mercato/ui/backend/detail'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export default function UserTaskDetailPage({ params }: { params: { id: string } }) {
   const router = useRouter()
@@ -116,7 +119,7 @@ export default function UserTaskDetailPage({ params }: { params: { id: string }
         flash(error?.error || t('workflows.tasks.messages.completeFailed'), 'error')
       }
     } catch (err) {
-      console.error('Error completing task:', err)
+      logger.error('Error completing task', { err })
       flash(t('workflows.tasks.messages.completeFailed'), 'error')
     } finally {
       setSubmitting(false)

package/src/modules/workflows/components/BusinessRulesSelector.tsx

@@ -7,6 +7,9 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { Input } from '@open-mercato/ui/primitives/input'
 import { Badge } from '@open-mercato/ui/primitives/badge'
 import { Plus, Loader2, AlertCircle } from 'lucide-react'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export interface BusinessRule {
   id: string
@@ -133,15 +136,15 @@ export function BusinessRulesSelector({
           // If response is not JSON, use status code message
           errorMessage = `Failed to load business rules (${response.status})`
         }
-        console.error('Failed to fetch business rules:', {
+        logger.error('Failed to fetch business rules', {
           url,
           status: response.status,
-          error: errorMessage,
+          message: errorMessage,
         })
         setError(errorMessage)
       }
     } catch (err) {
-      console.error('Failed to fetch business rules:', err)
+      logger.error('Failed to fetch business rules', { err })
       const errorMessage = err instanceof Error ? err.message : 'Network error loading business rules'
       setError(errorMessage)
     } finally {

package/src/modules/workflows/components/WorkflowSelector.tsx

@@ -7,6 +7,9 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { Input } from '@open-mercato/ui/primitives/input'
 import { Badge } from '@open-mercato/ui/primitives/badge'
 import { Plus, Loader2, AlertCircle, Workflow } from 'lucide-react'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 export interface WorkflowDefinition {
   id: string
@@ -109,15 +112,15 @@ export function WorkflowSelector({
         } catch {
           // Use default error message
         }
-        console.error('Failed to fetch workflows:', {
+        logger.error('Failed to fetch workflows', {
           url,
           status: response.status,
-          error: errorMessage,
+          message: errorMessage,
         })
         setError(errorMessage)
       }
     } catch (err) {
-      console.error('Failed to fetch workflows:', err)
+      logger.error('Failed to fetch workflows', { err })
       const errorMessage = err instanceof Error ? err.message : 'Network error loading workflows'
       setError(errorMessage)
     } finally {

package/src/modules/workflows/components/fields/BusinessRuleConditionsEditor.tsx

@@ -12,6 +12,9 @@ import { EmptyState } from '@open-mercato/ui/backend/EmptyState'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { SwitchField } from '@open-mercato/ui/primitives/switch-field'
 import { ConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 /**
  * Condition definition structure (supports legacy string format and new object format)
@@ -118,7 +121,7 @@ export function BusinessRuleConditionsEditor({
         })
       }
     } catch (err) {
-      console.error(`Failed to fetch rule details for ${ruleId}:`, err)
+      logger.error('Failed to fetch rule details', { ruleId, err })
       setConditionsWithDetails((prev) => {
         const updated = [...prev]
         if (updated[index]) {

package/src/modules/workflows/components/fields/StartPreConditionsEditor.tsx

@@ -13,6 +13,9 @@ import { EmptyState } from '@open-mercato/ui/backend/EmptyState'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { SwitchField } from '@open-mercato/ui/primitives/switch-field'
 import { ConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 /**
  * StartPreCondition interface matching the schema in validators.ts
@@ -180,7 +183,7 @@ export function StartPreConditionsEditor({
         })
       }
     } catch (err) {
-      console.error(`Failed to fetch rule details for ${ruleId}:`, err)
+      logger.error('Failed to fetch rule details', { ruleId, err })
       setConditionsWithDetails((prev) => {
         const updated = [...prev]
         if (updated[index]) {

package/src/modules/workflows/components/fields/WorkflowSelectorField.tsx

@@ -10,6 +10,9 @@ import { Search, X, Loader2, AlertCircle, Workflow } from 'lucide-react'
 import type { CrudCustomFieldRenderProps } from '@open-mercato/ui/backend/CrudForm'
 import { WorkflowSelector, type WorkflowDefinition } from '../WorkflowSelector'
 import { apiFetch } from '@open-mercato/ui/backend/utils/api'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 interface WorkflowSelectorFieldProps extends CrudCustomFieldRenderProps {
   value: string
@@ -90,7 +93,7 @@ export function WorkflowSelectorField({
         })
       }
     } catch (err) {
-      console.error(`Failed to fetch workflow details for ${wfId}:`, err)
+      logger.error('Failed to fetch workflow details', { workflowId: wfId, err })
       setWorkflowDetails({
         workflowId: wfId,
         loading: false,

package/src/modules/workflows/frontend/checkout-demo/page.tsx

@@ -20,6 +20,9 @@ import Link from 'next/link'
 import { useQuery, useQueryClient } from '@tanstack/react-query'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { deriveCurrentStep } from './deriveCurrentStep'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 interface CartItem {
   id: string // Product UUID
@@ -148,7 +151,7 @@ export default function CheckoutDemoPage() {
 
       if (!response.ok) {
         const errorData = await response.json().catch(() => ({}))
-        console.error('[UserTasks] Error response:', errorData)
+        logger.error('User tasks request failed', { component: 'UserTasks', errorData })
         throw new Error(errorData.error || `HTTP ${response.status}`)
       }
 
@@ -462,7 +465,7 @@ export default function CheckoutDemoPage() {
         context: data.data.instance.context,
       })
     } catch (err) {
-      console.error('Checkout error:', err)
+      logger.error('Checkout failed', { err })
       setError(err instanceof Error ? err.message : 'An error occurred during checkout')
     } finally {
       setLoading(false)
@@ -502,7 +505,7 @@ export default function CheckoutDemoPage() {
         context: data.data.instance.context,
       })
     } catch (err) {
-      console.error('Advance error:', err)
+      logger.error('Advance failed', { err })
       setError(err instanceof Error ? err.message : 'Failed to advance workflow')
     } finally {
       setAdvancing(false)
@@ -622,8 +625,7 @@ export default function CheckoutDemoPage() {
           errorData = JSON.parse(responseText)
           isJson = true
         } catch (parseError) {
-          console.error('[Signal] Response is not JSON:', parseError)
-          console.error('[Signal] Raw response:', responseText)
+          logger.error('Signal response is not JSON', { component: 'Signal', responseLength: responseText.length, err: parseError })
         }
 
         const errorMsg = isJson && errorData.error
@@ -647,7 +649,7 @@ export default function CheckoutDemoPage() {
       // Clear any previous errors
       setSignalError(null)
     } catch (err) {
-      console.error('[Signal] Error:', err)
+      logger.error('Signal failed', { component: 'Signal', err })
       const errorMessage = err instanceof Error ? err.message : 'Failed to send payment confirmation'
       setSignalError(errorMessage)
     } finally {
@@ -700,7 +702,7 @@ export default function CheckoutDemoPage() {
       await queryClient.invalidateQueries({ queryKey: ['workflow-user-tasks', result?.instanceId] })
       await queryClient.invalidateQueries({ queryKey: ['workflow-events', result?.instanceId] })
     } catch (err) {
-      console.error('Error completing task:', err)
+      logger.error('Error completing task', { err })
       setTaskError(err instanceof Error ? err.message : 'Failed to complete task')
     } finally {
       setSubmittingTask(false)

package/src/modules/workflows/lib/activity-executor.ts

@@ -28,33 +28,28 @@ import { logWorkflowEvent } from './event-logger'
 import { parseDuration } from './duration'
 
 export { isPrivateUrl } from '@open-mercato/shared/lib/network'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 function isAllowPrivateWorkflowWebhookUrlsEnabled(): boolean {
   if (parseBooleanWithDefault(process.env.OM_WORKFLOWS_ALLOW_PRIVATE_URLS, false)) {
     if (process.env.NODE_ENV === 'production') {
-      console.warn(
-        '[CALL_WEBHOOK] OM_WORKFLOWS_ALLOW_PRIVATE_URLS is set but ignored in production. SSRF protection remains enabled.'
-      )
+      logger.warn('OM_WORKFLOWS_ALLOW_PRIVATE_URLS is set but ignored in production. SSRF protection remains enabled.', { component: 'CALL_WEBHOOK' })
       return false
     }
 
-    console.warn(
-      '[CALL_WEBHOOK] OM_WORKFLOWS_ALLOW_PRIVATE_URLS is enabled. SSRF protection is bypassed for workflow webhooks; use only in development.'
-    )
+    logger.warn('OM_WORKFLOWS_ALLOW_PRIVATE_URLS is enabled. SSRF protection is bypassed for workflow webhooks; use only in development.', { component: 'CALL_WEBHOOK' })
     return true
   }
 
   if (parseBooleanWithDefault(process.env.WORKFLOW_WEBHOOK_ALLOW_PRIVATE_URLS, false)) {
     if (process.env.NODE_ENV === 'production') {
-      console.warn(
-        '[CALL_WEBHOOK] WORKFLOW_WEBHOOK_ALLOW_PRIVATE_URLS is deprecated and ignored in production. Use OM_WORKFLOWS_ALLOW_PRIVATE_URLS for development only. SSRF protection remains enabled.'
-      )
+      logger.warn('WORKFLOW_WEBHOOK_ALLOW_PRIVATE_URLS is deprecated and ignored in production. Use OM_WORKFLOWS_ALLOW_PRIVATE_URLS for development only. SSRF protection remains enabled.', { component: 'CALL_WEBHOOK' })
       return false
     }
 
-    console.warn(
-      '[CALL_WEBHOOK] WORKFLOW_WEBHOOK_ALLOW_PRIVATE_URLS is deprecated. Use OM_WORKFLOWS_ALLOW_PRIVATE_URLS instead. SSRF protection is bypassed.'
-    )
+    logger.warn('WORKFLOW_WEBHOOK_ALLOW_PRIVATE_URLS is deprecated. Use OM_WORKFLOWS_ALLOW_PRIVATE_URLS instead. SSRF protection is bypassed.', { component: 'CALL_WEBHOOK' })
     return true
   }
 
@@ -337,7 +332,14 @@ export async function executeActivity(
 
       // Log activity retry attempt with context
       if (attempt < retryPolicy.maxAttempts - 1) {
-        console.error(`[WORKFLOW] Activity ${activity.activityId} (${activity.activityType}) failed on attempt ${attempt + 1}/${retryPolicy.maxAttempts} (instance: ${context.workflowInstance.id}):`, error instanceof Error ? error.message : error)
+        logger.error('Activity failed; will retry', {
+          activityId: activity.activityId,
+          activityType: activity.activityType,
+          attempt: attempt + 1,
+          maxAttempts: retryPolicy.maxAttempts,
+          instanceId: context.workflowInstance.id,
+          err: error,
+        })
       }
 
       // If not the last attempt, apply backoff and retry
@@ -356,10 +358,13 @@ export async function executeActivity(
 
   // All retries exhausted
   const errorMessage = lastError instanceof Error ? lastError.message : String(lastError)
-  console.error(`[WORKFLOW] Activity ${activity.activityId} (${activity.activityType}) failed after ${retryCount} attempts (instance: ${context.workflowInstance.id}): ${errorMessage}`)
-  if (lastError instanceof Error && lastError.stack) {
-    console.error('[WORKFLOW] Activity error stack:', lastError.stack)
-  }
+  logger.error('Activity failed after all attempts', {
+    activityId: activity.activityId,
+    activityType: activity.activityType,
+    attempts: retryCount,
+    instanceId: context.workflowInstance.id,
+    err: lastError,
+  })
 
   return {
     activityId: activity.activityId,
@@ -497,7 +502,7 @@ export async function executeSendEmail(
   }
 
   // For MVP: Log the email (actual email service integration can be added later)
-  console.log(`[Workflow Activity] Send email to ${to}: ${subject}`)
+  logger.info('Send email activity invoked', { component: 'SEND_EMAIL', subject })
 
   // Check if email service is available in container
   try {
@@ -685,7 +690,7 @@ async function resolveDictionaryEntryId(
     })
 
     if (!dictionary) {
-      console.warn(`[UPDATE_ENTITY] Dictionary not found: ${dictionaryKey}`)
+      logger.warn('Dictionary not found', { component: 'UPDATE_ENTITY', dictionaryKey })
       return null
     }
 
@@ -699,13 +704,13 @@ async function resolveDictionaryEntryId(
     })
 
     if (!entry) {
-      console.warn(`[UPDATE_ENTITY] Dictionary entry not found: ${dictionaryKey}/${value}`)
+      logger.warn('Dictionary entry not found', { component: 'UPDATE_ENTITY', dictionaryKey, value })
       return null
     }
 
     return entry.id
   } catch (error) {
-    console.error(`[UPDATE_ENTITY] Error resolving dictionary entry:`, error)
+    logger.error('Error resolving dictionary entry', { component: 'UPDATE_ENTITY', err: error })
     return null
   }
 }

package/src/modules/workflows/lib/activity-worker-handler.ts

@@ -18,6 +18,9 @@ import {
   executeCallWebhook,
   executeFunction,
 } from './activity-executor'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows').child({ component: 'activity-worker' })
 
 /**
  * Create activity worker handler for queue processing
@@ -37,9 +40,7 @@ export function createActivityWorkerHandler(
     // Timer jobs (kind: 'timer') are a distinct flow — they resume a paused
     // workflow instance rather than executing an activity. Handle them first.
     if (payload.kind === 'timer') {
-      console.log(
-        `[ActivityWorker] Firing timer for instance ${payload.workflowInstanceId} (job ${ctx.jobId})`
-      )
+      logger.debug('Firing timer for instance', { instanceId: payload.workflowInstanceId, jobId: ctx.jobId })
       try {
         const { fireTimer } = await import('./timer-handler')
         await fireTimer(em, container, {
@@ -50,18 +51,13 @@ export function createActivityWorkerHandler(
           userId: payload.userId,
         })
       } catch (error: any) {
-        console.error(
-          `[ActivityWorker] Failed to fire timer for instance ${payload.workflowInstanceId}:`,
-          error.message
-        )
+        logger.error('Failed to fire timer for instance', { instanceId: payload.workflowInstanceId, err: error })
         throw error
       }
       return
     }
 
-    console.log(
-      `[ActivityWorker] Processing activity ${payload.activityId} (job ${ctx.jobId})`
-    )
+    logger.debug('Processing activity', { activityId: payload.activityId, jobId: ctx.jobId })
 
     try {
       // Fetch workflow instance
@@ -149,16 +145,14 @@ export function createActivityWorkerHandler(
         organizationId: payload.organizationId,
       })
 
-      console.log(
-        `[ActivityWorker] Activity ${payload.activityId} completed in ${executionTimeMs}ms`
-      )
+      logger.debug('Activity completed', { activityId: payload.activityId, executionTimeMs })
 
       // Trigger workflow resume check (via event or direct call)
       await checkAndResumeWorkflow(em, container, payload.workflowInstanceId)
     } catch (error: any) {
       const executionTimeMs = Date.now() - startTime
 
-      console.error(`[ActivityWorker] Activity ${payload.activityId} failed:`, error.message)
+      logger.error('Activity failed', { activityId: payload.activityId, err: error })
 
       // Log failure event
       await logWorkflowEvent(em, {
@@ -208,7 +202,7 @@ async function checkAndResumeWorkflow(
   } catch (error: any) {
     // Ignore error if workflow not ready to resume yet
     if (!error.message?.includes('Activities still pending')) {
-      console.error(`[ActivityWorker] Failed to resume workflow ${workflowInstanceId}:`, error)
+      logger.error('Failed to resume workflow', { instanceId: workflowInstanceId, err: error })
     }
   }
 }

package/src/modules/workflows/lib/code-registry.ts

@@ -8,6 +8,9 @@
 
 import type { CodeWorkflowDefinition } from '@open-mercato/shared/modules/workflows'
 import { workflowDefinitionDataSchema } from '../data/validators'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('workflows')
 
 const codeWorkflowRegistry = new Map<string, CodeWorkflowDefinition>()
 
@@ -19,17 +22,15 @@ export function registerCodeWorkflows(workflows: CodeWorkflowDefinition[]): void
   for (const wf of workflows) {
     const validation = workflowDefinitionDataSchema.safeParse(wf.definition)
     if (!validation.success) {
-      console.warn(
-        `[workflows] Code workflow "${wf.workflowId}" failed validation:`,
-        validation.error.issues.map((i) => `${i.path.join('.')}: ${i.message}`).join('; '),
-      )
+      logger.warn('Code workflow failed validation', {
+        workflowId: wf.workflowId,
+        issues: validation.error.issues.map((i) => `${i.path.join('.')}: ${i.message}`).join('; '),
+      })
       continue
     }
 
     if (codeWorkflowRegistry.has(wf.workflowId)) {
-      console.warn(
-        `[workflows] Duplicate code workflow ID "${wf.workflowId}" from module "${wf.moduleId}" — overwriting`,
-      )
+      logger.warn('Duplicate code workflow ID — overwriting', { workflowId: wf.workflowId, moduleId: wf.moduleId })
     }
 
     codeWorkflowRegistry.set(wf.workflowId, wf)