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

package/src/modules/shipping_carriers/lib/shipping-service.ts

@@ -22,6 +22,13 @@ import {
   TERMINAL_SHIPPING_STATUSES,
 } from './status-sync'
 
+export class CarrierShipmentNotFoundError extends Error {
+  constructor() {
+    super('Shipment not found')
+    this.name = 'CarrierShipmentNotFoundError'
+  }
+}
+
 export function createShippingCarrierService(deps: {
   em: EntityManager
   integrationCredentialsService: CredentialsService
@@ -45,7 +52,31 @@ export function createShippingCarrierService(deps: {
       scope,
     )
     if (!shipment) {
-      throw new Error('Shipment not found')
+      throw new CarrierShipmentNotFoundError()
+    }
+    return shipment
+  }
+
+  async function findShipmentByTrackingNumberOrThrow(
+    providerKey: string,
+    trackingNumber: string,
+    scope: { organizationId: string; tenantId: string },
+  ): Promise<CarrierShipment> {
+    const shipment = await findOneWithDecryption(
+      em,
+      CarrierShipment,
+      {
+        providerKey,
+        trackingNumber,
+        organizationId: scope.organizationId,
+        tenantId: scope.tenantId,
+        deletedAt: null,
+      },
+      undefined,
+      scope,
+    )
+    if (!shipment) {
+      throw new CarrierShipmentNotFoundError()
     }
     return shipment
   }
@@ -189,30 +220,24 @@ export function createShippingCarrierService(deps: {
       organizationId: string
       tenantId: string
     }) {
-      const { adapter, credentials } = await resolveAdapter(input.providerKey, {
+      const scope = {
         organizationId: input.organizationId,
         tenantId: input.tenantId,
-      })
-      const shipment = input.shipmentId
-        ? await findOneWithDecryption(
-          em,
-          CarrierShipment,
-          {
-            id: input.shipmentId,
-            organizationId: input.organizationId,
-            tenantId: input.tenantId,
-            deletedAt: null,
-          },
-          undefined,
-          {
-            organizationId: input.organizationId,
-            tenantId: input.tenantId,
-          },
-        )
-        : null
+      }
+      const { adapter, credentials } = await resolveAdapter(input.providerKey, scope)
+      let shipment: CarrierShipment
+      if (input.shipmentId) {
+        shipment = await findShipmentOrThrow(input.shipmentId, scope)
+      } else {
+        const trackingNumber = input.trackingNumber
+        if (!trackingNumber) {
+          throw new CarrierShipmentNotFoundError()
+        }
+        shipment = await findShipmentByTrackingNumberOrThrow(input.providerKey, trackingNumber, scope)
+      }
       return adapter.getTracking({
-        shipmentId: shipment?.carrierShipmentId ?? input.shipmentId,
-        trackingNumber: input.trackingNumber ?? shipment?.trackingNumber,
+        shipmentId: shipment.carrierShipmentId,
+        trackingNumber: shipment.trackingNumber,
         credentials,
       })
     },

package/src/modules/shipping_carriers/lib/upstream-error-response.ts

@@ -1,11 +1,14 @@
 import { NextResponse } from 'next/server'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('shipping_carriers')
 
 const upstreamFailedKey = 'shipping_carriers.errors.upstreamFailed'
 const upstreamFailedFallback = 'Carrier provider request failed. Try again later.'
 
 export async function shippingCarrierUpstreamErrorResponse(routeId: string, error: unknown) {
-  console.error(`[shipping_carriers.${routeId}] provider upstream error`, error)
+  logger.error('Provider upstream error', { routeId, err: error })
   const { translate } = await resolveTranslations()
   return NextResponse.json({ error: translate(upstreamFailedKey, upstreamFailedFallback) }, { status: 502 })
 }

package/src/modules/shipping_carriers/workers/webhook-processor.ts

@@ -7,6 +7,9 @@ import type { ShippingWebhookEvent } from '../lib/adapter'
 import { getShippingAdapter } from '../lib/adapter-registry'
 import { getTerminalShippingEvent, syncShipmentStatus, TERMINAL_SHIPPING_STATUSES } from '../lib/status-sync'
 import { claimWebhookProcessing, releaseWebhookClaim } from '../lib/webhook-utils'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('shipping_carriers').child({ component: 'webhook-processor' })
 
 type WebhookJobPayload = {
   providerKey: string
@@ -99,11 +102,7 @@ export default async function handle(job: QueuedJob<WebhookJobPayload>, ctx: Han
       throw error
     }
   } catch (error) {
-    console.error('[shipping-carriers:webhook-processor] Job processing failed', {
-      providerKey: job.payload.providerKey,
-      shipmentId: job.payload.shipmentId,
-      error: error instanceof Error ? error.message : String(error),
-    })
+    logger.error('Job processing failed', { providerKey: job.payload.providerKey, shipmentId: job.payload.shipmentId, err: error })
     throw error
   }
 }

package/src/modules/staff/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 { createStaffCrudOpenApi, createPagedListResponseSchema, defaultOkResponseSchema } from './openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 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('[staff.comments] failed to enrich author metadata', err)
+        logger.warn('staff.comments failed to enrich author metadata', { err })
       }
     },
   },

package/src/modules/staff/api/leave-requests/accept/route.ts

@@ -15,6 +15,9 @@ import {
   runStaffMutationGuardAfterSuccess,
   runStaffMutationGuards,
 } from '../../guards'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['staff.leave_requests.manage'] },
@@ -110,7 +113,7 @@ export async function POST(req: Request) {
       return NextResponse.json(err.body, { status: err.status })
     }
     const { translate } = await resolveTranslations()
-    console.error('staff.leave-requests.accept failed', err)
+    logger.error('staff.leave-requests.accept failed', { err })
     return NextResponse.json({ error: translate('staff.leaveRequests.errors.accept', 'Failed to approve leave request.') }, { status: 400 })
   }
 }

package/src/modules/staff/api/leave-requests/reject/route.ts

@@ -15,6 +15,9 @@ import {
   runStaffMutationGuardAfterSuccess,
   runStaffMutationGuards,
 } from '../../guards'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['staff.leave_requests.manage'] },
@@ -110,7 +113,7 @@ export async function POST(req: Request) {
       return NextResponse.json(err.body, { status: err.status })
     }
     const { translate } = await resolveTranslations()
-    console.error('staff.leave-requests.reject failed', err)
+    logger.error('staff.leave-requests.reject failed', { err })
     return NextResponse.json({ error: translate('staff.leaveRequests.errors.reject', 'Failed to reject leave request.') }, { status: 400 })
   }
 }

package/src/modules/staff/api/team-members/assignable/route.ts

@@ -13,6 +13,9 @@ import {
   resolveCustomersRequestContext,
 } from '@open-mercato/core/modules/customers/lib/interactionRequestContext'
 import { StaffTeam, StaffTeamMember } from '../../../data/entities'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 const querySchema = z
   .object({
@@ -222,7 +225,7 @@ export async function GET(request: Request) {
     if (error instanceof z.ZodError) {
       return NextResponse.json({ error: translate('customers.errors.validationFailed', 'Validation failed') }, { status: 400 })
     }
-    console.error('staff.assignable-team-members.get failed', error)
+    logger.error('staff.assignable-team-members.get failed', { err: error })
     return NextResponse.json({ error: translate('customers.errors.assignable_staff_load_failed', 'Failed to load assignable staff') }, { status: 500 })
   }
 }

package/src/modules/staff/api/team-members/self/route.ts

@@ -21,6 +21,9 @@ import {
   runStaffMutationGuardAfterSuccess,
   runStaffMutationGuards,
 } from '../../guards'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 export const metadata = {
   GET: { requireAuth: true, requireFeatures: ['staff.leave_requests.send'] },
@@ -83,7 +86,7 @@ export async function GET(req: Request) {
     })
   } catch (err) {
     if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
-    console.error('staff.teamMembers.self.load failed', err)
+    logger.error('staff.teamMembers.self.load failed', { err })
     return NextResponse.json({ member: null })
   }
 }
@@ -183,7 +186,7 @@ export async function POST(req: Request) {
       return NextResponse.json(err.body, { status: err.status })
     }
     const { translate } = await resolveTranslations()
-    console.error('staff.teamMembers.self.create failed', err)
+    logger.error('staff.teamMembers.self.create failed', { err })
     return NextResponse.json({ error: translate('staff.teamMembers.form.errors.create', 'Failed to create team member.') }, { status: 400 })
   }
 }

package/src/modules/staff/api/team-members/tags/assign/route.ts

@@ -18,6 +18,9 @@ import {
   runStaffMutationGuardAfterSuccess,
   runStaffMutationGuards,
 } from '../../../guards'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['staff.manage_team'] },
@@ -113,7 +116,7 @@ export async function POST(req: Request) {
       return NextResponse.json(err.body, { status: err.status })
     }
     const { translate } = await resolveTranslations()
-    console.error('staff.teamMembers.tags.assign failed', err)
+    logger.error('staff.teamMembers.tags.assign failed', { err })
     return NextResponse.json({ error: translate('staff.teamMembers.tags.updateError', 'Failed to update tags.') }, { status: 400 })
   }
 }

package/src/modules/staff/api/team-members/tags/unassign/route.ts

@@ -18,6 +18,9 @@ import {
   runStaffMutationGuardAfterSuccess,
   runStaffMutationGuards,
 } from '../../../guards'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['staff.manage_team'] },
@@ -113,7 +116,7 @@ export async function POST(req: Request) {
       return NextResponse.json(err.body, { status: err.status })
     }
     const { translate } = await resolveTranslations()
-    console.error('staff.teamMembers.tags.unassign failed', err)
+    logger.error('staff.teamMembers.tags.unassign failed', { err })
     return NextResponse.json({ error: translate('staff.teamMembers.tags.updateError', 'Failed to update tags.') }, { status: 400 })
   }
 }

package/src/modules/staff/api/timesheets/my-projects/[projectId]/route.ts

@@ -16,6 +16,9 @@ import {
   runStaffMutationGuardAfterSuccess,
   runStaffMutationGuards,
 } from '../../../guards'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 export const metadata = {
   PATCH: { requireAuth: true, requireFeatures: ['staff.timesheets.manage_own'] },
@@ -154,7 +157,7 @@ export async function PATCH(req: Request) {
     if (err instanceof CrudHttpError) {
       return NextResponse.json(err.body, { status: err.status })
     }
-    console.error('staff.timesheets.my-projects.patch failed', err)
+    logger.error('staff.timesheets.my-projects.patch failed', { err })
     const { translate } = await resolveTranslations()
     return NextResponse.json(
       { error: translate('staff.timesheets.errors.updateMyProject', 'Failed to update project visibility.') },

package/src/modules/staff/api/timesheets/my-projects/route.ts

@@ -9,6 +9,9 @@ import { findWithDecryption, findOneWithDecryption } from '@open-mercato/shared/
 import type { EntityManager } from '@mikro-orm/postgresql'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { StaffTimeProjectMember, StaffTeamMember } from '../../../data/entities'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 export const metadata = {
   GET: { requireAuth: true, requireFeatures: ['staff.timesheets.view'] },
@@ -73,7 +76,7 @@ export async function GET(req: Request) {
     if (err instanceof CrudHttpError) {
       return NextResponse.json(err.body, { status: err.status })
     }
-    console.error('staff.timesheets.my-projects failed', err)
+    logger.error('staff.timesheets.my-projects failed', { err })
     const { translate } = await resolveTranslations()
     return NextResponse.json(
       { error: translate('staff.timesheets.errors.myProjects', 'Failed to load your projects.') },

package/src/modules/staff/api/timesheets/projects/kpis/route.ts

@@ -14,6 +14,9 @@ import {
   computeCollabProjectsKpis,
   computePmProjectsKpis,
 } from '../../../../lib/timesheets-projects/computeProjectsKpis'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 const VIEW_FEATURE = 'staff.timesheets.projects.view'
 const MANAGE_FEATURE = 'staff.timesheets.projects.manage'
@@ -118,7 +121,7 @@ export async function GET(req: Request) {
     if (err instanceof CrudHttpError) {
       return NextResponse.json(err.body, { status: err.status })
     }
-    console.error('staff.timesheets.projects.kpis failed', err)
+    logger.error('staff.timesheets.projects.kpis failed', { err })
     const { translate } = await resolveTranslations()
     return NextResponse.json(
       {

package/src/modules/staff/api/timesheets/time-entries/[id]/segments/route.ts

@@ -19,6 +19,9 @@ import {
   runStaffMutationGuardAfterSuccess,
   runStaffMutationGuards,
 } from '../../../../guards'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 function extractEntryIdFromUrl(request?: Request): string | null {
   if (!request?.url) return null
@@ -169,7 +172,7 @@ export async function POST(req: Request) {
       return NextResponse.json(err.body, { status: err.status })
     }
     const { translate } = await resolveTranslations()
-    console.error('staff.timesheets.time-entries.segments.create failed', err)
+    logger.error('staff.timesheets.time-entries.segments.create failed', { err })
     return NextResponse.json(
       { error: translate('staff.timesheets.errors.segmentCreate', 'Failed to create time entry segment.') },
       { status: 400 },

package/src/modules/staff/api/timesheets/time-entries/[id]/timer-start/route.ts

@@ -17,6 +17,9 @@ import {
   runStaffMutationGuards,
 } from '../../../../guards'
 import { emitStaffEvent } from '../../../../../events'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 function extractEntryIdFromUrl(request?: Request): string | null {
   if (!request?.url) return null
@@ -174,7 +177,7 @@ export async function POST(req: Request) {
       organizationId: entry.organizationId,
       startedAt: now.toISOString(),
     }, { persistent: true }).catch((err) => {
-      console.error('[staff.timesheets] emit timer_started failed', err)
+      logger.error('staff.timesheets emit timer_started failed', { err })
     })
 
     if (guardResult.afterSuccessCallbacks.length) {
@@ -196,7 +199,7 @@ export async function POST(req: Request) {
       return NextResponse.json(err.body, { status: err.status })
     }
     const { translate } = await resolveTranslations()
-    console.error('staff.timesheets.time-entries.timer-start failed', err)
+    logger.error('staff.timesheets.time-entries.timer-start failed', { err })
     return NextResponse.json(
       { error: translate('staff.timesheets.errors.timerStart', 'Failed to start timer.') },
       { status: 400 },

package/src/modules/staff/api/timesheets/time-entries/[id]/timer-stop/route.ts

@@ -17,6 +17,9 @@ import {
   runStaffMutationGuards,
 } from '../../../../guards'
 import { emitStaffEvent } from '../../../../../events'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 function extractEntryIdFromUrl(request?: Request): string | null {
   if (!request?.url) return null
@@ -157,7 +160,7 @@ export async function POST(req: Request) {
       stoppedAt: now.toISOString(),
       durationMinutes,
     }, { persistent: true }).catch((err) => {
-      console.error('[staff.timesheets] emit timer_stopped failed', err)
+      logger.error('staff.timesheets emit timer_stopped failed', { err })
     })
 
     if (guardResult.afterSuccessCallbacks.length) {
@@ -179,7 +182,7 @@ export async function POST(req: Request) {
       return NextResponse.json(err.body, { status: err.status })
     }
     const { translate } = await resolveTranslations()
-    console.error('staff.timesheets.time-entries.timer-stop failed', err)
+    logger.error('staff.timesheets.time-entries.timer-stop failed', { err })
     return NextResponse.json(
       { error: translate('staff.timesheets.errors.timerStop', 'Failed to stop timer.') },
       { status: 400 },

package/src/modules/staff/api/timesheets/time-entries/bulk/route.ts

@@ -19,6 +19,9 @@ import {
   runStaffMutationGuardAfterSuccess,
   runStaffMutationGuards,
 } from '../../../guards'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['staff.timesheets.manage_own'] },
@@ -246,7 +249,7 @@ export async function POST(req: Request) {
       return NextResponse.json(err.body, { status: err.status })
     }
     const { translate } = await resolveTranslations()
-    console.error('staff.timesheets.time-entries.bulk failed', err)
+    logger.error('staff.timesheets.time-entries.bulk failed', { err })
     return NextResponse.json(
       { error: translate('staff.timesheets.errors.bulkSave', 'Failed to bulk save time entries.') },
       { status: 400 },

package/src/modules/staff/api/timesheets/time-entries/start-timer/route.ts

@@ -10,6 +10,9 @@ import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { parseScopedCommandInput } from '@open-mercato/shared/lib/api/scoped'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { staffTimeEntryStartTimerSchema, type StaffTimeEntryStartTimerInput } from '../../../../data/validators'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['staff.timesheets.manage_own'] },
@@ -65,7 +68,7 @@ export async function POST(req: Request) {
       return NextResponse.json(err.body, { status: err.status })
     }
     const { translate } = await resolveTranslations()
-    console.error('staff.timesheets.time-entries.start-timer failed', err)
+    logger.error('staff.timesheets.time-entries.start-timer failed', { err })
     return NextResponse.json(
       { error: translate('staff.timesheets.errors.timerStart', 'Failed to start timer.') },
       { status: 400 },

package/src/modules/staff/backend/staff/team-members/page.tsx

@@ -21,6 +21,9 @@ import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/u
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { Pencil, Users } from 'lucide-react'
 import { formatDateTime } from '@open-mercato/shared/lib/time'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 const PAGE_SIZE = 50
 
@@ -269,7 +272,7 @@ export default function StaffTeamMembersPage() {
           ? payload.totalPages
           : Math.max(1, Math.ceil(items.length / PAGE_SIZE)))
     } catch (error) {
-      console.error('staff.team-members.list', error)
+      logger.error('staff.team-members.list', { err: error })
       flash(labels.errors.load, 'error')
     } finally {
       setIsLoading(false)
@@ -401,7 +404,7 @@ export default function StaffTeamMembersPage() {
       flash(labels.messages.deleted, 'success')
       handleRefresh()
     } catch (error) {
-      console.error('staff.team-members.delete', error)
+      logger.error('staff.team-members.delete', { err: error })
       flash(labels.errors.delete, 'error')
     }
   }, [confirm, handleRefresh, labels.actions.deleteConfirm, labels.actions.delete, labels.errors.delete, labels.messages.deleted])

package/src/modules/staff/backend/staff/team-roles/page.tsx

@@ -21,6 +21,9 @@ import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/u
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { truncate } from 'fs'
 import { formatDateTime } from '@open-mercato/shared/lib/time'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 const PAGE_SIZE = 50
 
@@ -201,7 +204,7 @@ export default function StaffTeamRolesPage() {
       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('staff.team-roles.list', error)
+      logger.error('staff.team-roles.list', { err: error })
       flash(labels.errors.load, 'error')
     } finally {
       setIsLoading(false)
@@ -282,7 +285,7 @@ export default function StaffTeamRolesPage() {
       flash(labels.messages.deleted, 'success')
       handleRefresh()
     } catch (error) {
-      console.error('staff.team-roles.delete', error)
+      logger.error('staff.team-roles.delete', { err: error })
       flash(labels.errors.delete, 'error')
     }
   }, [confirm, handleRefresh, labels.actions.deleteConfirm, labels.actions.delete, labels.errors.delete, labels.messages.deleted])

package/src/modules/staff/backend/staff/teams/[id]/edit/page.tsx

@@ -22,6 +22,9 @@ import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { Plus } from 'lucide-react'
 import { formatDateTime } from '@open-mercato/shared/lib/time'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 const TEAM_MEMBERS_PAGE_SIZE = 50
 
@@ -264,7 +267,7 @@ export default function StaffTeamEditPage({ params }: { params?: { id?: string }
           : Math.max(1, Math.ceil(items.length / TEAM_MEMBERS_PAGE_SIZE)),
       )
     } catch (error) {
-      console.error('staff.teams.team-members.list', error)
+      logger.error('staff.teams.team-members.list', { err: error })
       flash(memberLabels.errors.load, 'error')
     } finally {
       setMembersLoading(false)
@@ -295,7 +298,7 @@ export default function StaffTeamEditPage({ params }: { params?: { id?: string }
       flash(memberLabels.messages.unassigned, 'success')
       handleMemberRefresh()
     } catch (error) {
-      console.error('staff.teams.team-members.unassign', error)
+      logger.error('staff.teams.team-members.unassign', { err: error })
       flash(memberLabels.errors.unassign, 'error')
     }
   }, [handleMemberRefresh, memberLabels.errors.unassign, memberLabels.messages.unassigned, teamId])

package/src/modules/staff/backend/staff/teams/page.tsx

@@ -21,6 +21,9 @@ import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/u
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { Users } from 'lucide-react'
 import { formatDateTime } from '@open-mercato/shared/lib/time'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 const PAGE_SIZE = 50
 
@@ -173,7 +176,7 @@ export default function StaffTeamsPage() {
       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('staff.teams.list', error)
+      logger.error('staff.teams.list', { err: error })
       flash(labels.errors.load, 'error')
     } finally {
       setIsLoading(false)
@@ -214,7 +217,7 @@ export default function StaffTeamsPage() {
       handleRefresh()
     } catch (error) {
       if (surfaceRecordConflict(error, t)) { handleRefresh(); return }
-      console.error('staff.teams.delete', error)
+      logger.error('staff.teams.delete', { err: error })
       flash(labels.errors.delete, 'error')
     }
   }, [confirm, handleRefresh, labels.actions.deleteConfirm, labels.actions.delete, labels.errors.delete, labels.errors.deleteAssigned, labels.messages.deleted, t])

package/src/modules/staff/backend/staff/timesheets/page.tsx

@@ -19,6 +19,9 @@ import { TimerBar } from '../../../lib/timesheets-ui/TimerBar'
 import { AddRowDropdown } from '../../../lib/timesheets-ui/AddRowDropdown'
 import { CreateProjectDialog } from '../../../lib/timesheets-ui/CreateProjectDialog'
 import { ProjectColorDot } from '../../../lib/timesheets-ui/ProjectColorDot'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 // --- Types ---
 
@@ -341,7 +344,7 @@ export default function MyTimesheetsPage() {
       setDirty({})
       setRawText({})
     } catch (error) {
-      console.error('staff.timesheets.my.load', error)
+      logger.error('staff.timesheets.my.load', { err: error })
       flash(t('staff.timesheets.my.errors.load', 'Failed to load timesheets.'), 'error')
     } finally {
       isInitialLoadRef.current = false
@@ -446,7 +449,7 @@ export default function MyTimesheetsPage() {
       flash(t('staff.timesheets.my.saved', 'Timesheet saved.'), 'success')
       await loadData()
     } catch (error) {
-      console.error('staff.timesheets.my.save', error)
+      logger.error('staff.timesheets.my.save', { err: error })
       flash(t('staff.timesheets.my.errors.save', 'Failed to save timesheets.'), 'error')
     } finally {
       setIsSaving(false)
@@ -563,7 +566,7 @@ export default function MyTimesheetsPage() {
         return [...prev, project]
       })
     } catch (error) {
-      console.error('staff.timesheets.my.addRow', error)
+      logger.error('staff.timesheets.my.addRow', { err: error })
       flash(t('staff.timesheets.my.addRow.error', 'Could not add the project. Please try again.'), 'error')
     }
   }, [t, runMutation, mutationContextId, staffMemberId, retryLastMutation])
@@ -610,7 +613,7 @@ export default function MyTimesheetsPage() {
         return next
       })
     } catch (error) {
-      console.error('staff.timesheets.my.removeRow', error)
+      logger.error('staff.timesheets.my.removeRow', { err: error })
       flash(t('staff.timesheets.my.removeRow.error', 'Could not remove the project. Please try again.'), 'error')
     }
   }, [confirm, t, runMutation, mutationContextId, staffMemberId, retryLastMutation])
@@ -637,7 +640,7 @@ export default function MyTimesheetsPage() {
         mutationPayload: payload,
       })
     } catch (error) {
-      console.error('staff.timesheets.my.createProject.visibility', error)
+      logger.error('staff.timesheets.my.createProject.visibility', { err: error })
     }
     setProjects((prev) => [...prev, project])
     setCreateDialogOpen(false)

package/src/modules/staff/backend/staff/timesheets/projects/[id]/page.tsx

@@ -17,6 +17,9 @@ import { LoadingMessage } from '@open-mercato/ui/backend/detail'
 import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { ArrowLeft, Plus, Pencil, ChevronDown, Trash2, User } from 'lucide-react'
 import Link from 'next/link'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 const BACK_HREF = '/backend/staff/timesheets/projects'
 
@@ -196,7 +199,7 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
 
       setEmployees(mapped)
     } catch (loadError) {
-      console.error('staff.timesheets.projects.employees.list', loadError)
+      logger.error('staff.timesheets.projects.employees.list', { err: loadError })
     } finally {
       setEmployeesLoading(false)
     }