@open-mercato/scheduler 0.6.7-develop.6630.1.c8a615e536 → 0.6.7-develop.6645.1.52f0b37813

package/.turbo/turbo-build.log

@@ -1,2 +1,2 @@
-[build:scheduler] found 52 entry points
+[build:scheduler] found 53 entry points
 [build:scheduler] built successfully

package/dist/modules/scheduler/lib/queueTargetPayload.js

@@ -0,0 +1,17 @@
+function buildQueueTargetPayload(input) {
+  const base = input.targetPayload && typeof input.targetPayload === "object" && !Array.isArray(input.targetPayload) ? { ...input.targetPayload } : {};
+  return {
+    ...base,
+    tenantId: input.tenantId ?? null,
+    organizationId: input.organizationId ?? null,
+    _idempotencyKey: input.idempotencyKey
+  };
+}
+function buildSchedulerIdempotencyKey(scheduleId, executionKey) {
+  return `scheduler-${scheduleId}-${executionKey}`;
+}
+export {
+  buildQueueTargetPayload,
+  buildSchedulerIdempotencyKey
+};
+//# sourceMappingURL=queueTargetPayload.js.map

package/dist/modules/scheduler/lib/queueTargetPayload.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/scheduler/lib/queueTargetPayload.ts"],
+  "sourcesContent": ["export type QueueTargetPayloadInput = {\n  targetPayload: unknown\n  tenantId: string | null | undefined\n  organizationId: string | null | undefined\n  idempotencyKey: string\n}\n\n/**\n * Single source of truth for the payload a scheduled queue target receives.\n * Both the local scheduler and the asynchronous execute-schedule worker MUST\n * build their enqueue payload here so workers see one flat contract:\n * the configured targetPayload fields on the root, with scheduler-owned\n * tenantId/organizationId/_idempotencyKey applied last so they always win\n * over conflicting targetPayload fields.\n */\nexport function buildQueueTargetPayload(input: QueueTargetPayloadInput): Record<string, unknown> {\n  const base =\n    input.targetPayload && typeof input.targetPayload === 'object' && !Array.isArray(input.targetPayload)\n      ? { ...(input.targetPayload as Record<string, unknown>) }\n      : {}\n  return {\n    ...base,\n    tenantId: input.tenantId ?? null,\n    organizationId: input.organizationId ?? null,\n    _idempotencyKey: input.idempotencyKey,\n  }\n}\n\n/**\n * One logical scheduled firing must keep one idempotency key across worker\n * retries, so downstream consumers can deduplicate. Pass a retry-stable\n * execution key: the execute-schedule job id in async mode, or the firing\n * timestamp in local mode (which runs each firing exactly once).\n */\nexport function buildSchedulerIdempotencyKey(scheduleId: string, executionKey: string | number): string {\n  return `scheduler-${scheduleId}-${executionKey}`\n}\n"],
+  "mappings": "AAeO,SAAS,wBAAwB,OAAyD;AAC/F,QAAM,OACJ,MAAM,iBAAiB,OAAO,MAAM,kBAAkB,YAAY,CAAC,MAAM,QAAQ,MAAM,aAAa,IAChG,EAAE,GAAI,MAAM,cAA0C,IACtD,CAAC;AACP,SAAO;AAAA,IACL,GAAG;AAAA,IACH,UAAU,MAAM,YAAY;AAAA,IAC5B,gBAAgB,MAAM,kBAAkB;AAAA,IACxC,iBAAiB,MAAM;AAAA,EACzB;AACF;AAQO,SAAS,6BAA6B,YAAoB,cAAuC;AACtG,SAAO,aAAa,UAAU,IAAI,YAAY;AAChD;",
+  "names": []
+}

package/dist/modules/scheduler/services/localSchedulerService.js

@@ -5,6 +5,7 @@ import { recalculateNextRun } from "../lib/nextRunCalculator.js";
 import { emitSchedulerEvent } from "../events.js";
 import { getGlobalEventBus } from "@open-mercato/shared/modules/events";
 import { buildScheduledCommandContext } from "../lib/commandContext.js";
+import { buildQueueTargetPayload, buildSchedulerIdempotencyKey } from "../lib/queueTargetPayload.js";
 import { createLogger } from "@open-mercato/shared/lib/logger";
 const logger = createLogger("scheduler").child({ component: "local" });
 class LocalSchedulerService {
@@ -167,15 +168,12 @@ class LocalSchedulerService {
       throw new Error("Target queue is required for queue target type");
     }
     const queue = this.queueFactory(schedule.targetQueue);
-    await queue.enqueue({
-      scheduleId: schedule.id,
-      scheduleName: schedule.name,
-      scopeType: schedule.scopeType,
+    await queue.enqueue(buildQueueTargetPayload({
+      targetPayload: schedule.targetPayload,
       tenantId: schedule.tenantId,
       organizationId: schedule.organizationId,
-      payload: schedule.targetPayload || {},
-      triggeredAt: /* @__PURE__ */ new Date()
-    });
+      idempotencyKey: buildSchedulerIdempotencyKey(schedule.id, Date.now())
+    }));
     logger.info("Enqueued job to target queue", { scheduleId: schedule.id, targetQueue: schedule.targetQueue });
   }
   /**

package/dist/modules/scheduler/services/localSchedulerService.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/scheduler/services/localSchedulerService.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/core'\nimport type { Queue } from '@open-mercato/queue'\nimport { CommandBus } from '@open-mercato/shared/lib/commands'\nimport type { AppContainer } from '@open-mercato/shared/lib/di/container'\nimport { ScheduledJob } from '../data/entities.js'\nimport { LocalLockStrategy } from '../lib/localLockStrategy'\nimport { recalculateNextRun } from '../lib/nextRunCalculator'\nimport { emitSchedulerEvent } from '../events.js'\nimport { getGlobalEventBus } from '@open-mercato/shared/modules/events'\nimport { buildScheduledCommandContext } from '../lib/commandContext.js'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('scheduler').child({ component: 'local' })\n\nexport interface RbacServiceLike {\n  tenantHasFeature(tenantId: string | null | undefined, feature: string, opts?: { organizationId?: string | null }): Promise<boolean>\n}\n\nexport interface LocalSchedulerConfig {\n  pollIntervalMs: number\n}\n\n/**\n * Local scheduler service for development\n * \n * This service polls the database for due schedules and executes them locally\n * without requiring Redis. Perfect for local development.\n * \n * Features:\n * - PostgreSQL polling (configurable interval, default 30s)\n * - PostgreSQL advisory locks for duplicate prevention\n * - Supports both queue and command targets\n * - Emits the same events as async strategy\n * - Updates nextRunAt after execution\n * \n * Limitations:\n * - Polling delay (up to configured interval)\n * - Single instance only (no distributed locking across instances)\n * - Higher database load than async strategy\n * \n * Set QUEUE_STRATEGY=local to use this service.\n */\nexport class LocalSchedulerService {\n  private isRunning = false\n  private pollTimer?: NodeJS.Timeout\n  private lockStrategy: LocalLockStrategy\n\n  constructor(\n    private em: () => EntityManager,\n    private queueFactory: (name: string) => Queue,\n    private rbacService: RbacServiceLike,\n    private config: LocalSchedulerConfig = { pollIntervalMs: 30000 },\n  ) {\n    this.lockStrategy = new LocalLockStrategy(em)\n  }\n\n  /**\n   * Start the local scheduler polling engine\n   */\n  async start(): Promise<void> {\n    if (this.isRunning) {\n      logger.warn('Polling engine already running')\n      return\n    }\n\n    this.isRunning = true\n    logger.info('Starting polling engine', { pollIntervalMs: this.config.pollIntervalMs })\n\n    // Run initial poll immediately\n    await this.poll()\n\n    // Schedule recurring polls\n    this.pollTimer = setInterval(() => {\n      this.poll().catch((error) => {\n        logger.error('Poll error', { err: error })\n      })\n    }, this.config.pollIntervalMs)\n\n    logger.info('Polling engine started')\n  }\n\n  /**\n   * Stop the local scheduler\n   */\n  async stop(): Promise<void> {\n    logger.info('Stopping polling engine')\n    this.isRunning = false\n    \n    if (this.pollTimer) {\n      clearInterval(this.pollTimer)\n      this.pollTimer = undefined\n    }\n\n    logger.info('Polling engine stopped')\n  }\n\n  /**\n   * Poll for due schedules and execute them\n   */\n  private async poll(): Promise<void> {\n    if (!this.isRunning) {\n      return\n    }\n\n    const em = this.em().fork()\n\n    try {\n      // Find enabled schedules that are due (limited to avoid spikes after outages)\n      const dueSchedules = await em.find(ScheduledJob, {\n        isEnabled: true,\n        deletedAt: null,\n        nextRunAt: { $lte: new Date() },\n      }, {\n        limit: 100,\n        orderBy: { nextRunAt: 'ASC' },\n      })\n\n      if (dueSchedules.length === 0) {\n        logger.debug('No due schedules')\n        return\n      }\n\n      logger.info('Found due schedules', { count: dueSchedules.length })\n\n      // Execute each schedule\n      for (const schedule of dueSchedules) {\n        await this.executeSchedule(schedule)\n      }\n    } catch (error: unknown) {\n      logger.error('Poll failed', { err: error })\n    }\n  }\n\n  /**\n   * Execute a single schedule\n   */\n  private async executeSchedule(schedule: ScheduledJob): Promise<void> {\n    const lockKey = `schedule:${schedule.id}`\n    const scheduleLogger = logger.child({ scheduleId: schedule.id, scheduleName: schedule.name })\n\n    const { acquired } = await this.lockStrategy.runWithLock(lockKey, async () => {\n      scheduleLogger.info('Executing schedule')\n\n      // Emit started event\n      await emitSchedulerEvent('scheduler.job.started', {\n        id: schedule.id,\n        tenantId: schedule.tenantId,\n        organizationId: schedule.organizationId,\n        scheduleName: schedule.name,\n        scopeType: schedule.scopeType,\n        triggerType: 'scheduled',\n        startedAt: new Date(),\n      })\n\n      try {\n        // Check feature flag if required\n        if (schedule.requireFeature) {\n          const hasFeature = await this.checkFeature(schedule)\n          \n          if (!hasFeature) {\n            scheduleLogger.info('Schedule skipped: missing required feature', { requireFeature: schedule.requireFeature })\n            \n            await emitSchedulerEvent('scheduler.job.skipped', {\n              id: schedule.id,\n              tenantId: schedule.tenantId,\n              organizationId: schedule.organizationId,\n              scheduleName: schedule.name,\n              scopeType: schedule.scopeType,\n              reason: `Missing required feature: ${schedule.requireFeature}`,\n              skippedAt: new Date(),\n            })\n\n            // Still update next run time\n            await this.updateNextRun(schedule)\n            return\n          }\n        }\n\n        // Execute based on target type\n        if (schedule.targetType === 'queue') {\n          await this.executeQueueTarget(schedule)\n        } else if (schedule.targetType === 'command') {\n          await this.executeCommandTarget(schedule)\n        } else {\n          throw new Error(`Unknown target type: ${schedule.targetType}`)\n        }\n\n        // Update last run and next run times\n        const em = this.em().fork()\n        const freshSchedule = await em.findOne(ScheduledJob, { id: schedule.id })\n        \n        if (freshSchedule) {\n          freshSchedule.lastRunAt = new Date()\n          \n          // Calculate next run time\n          const nextRun = recalculateNextRun(\n            freshSchedule.scheduleType,\n            freshSchedule.scheduleValue,\n            freshSchedule.timezone\n          )\n          \n          if (nextRun) {\n            freshSchedule.nextRunAt = nextRun\n          }\n          \n          await em.flush()\n        }\n\n        scheduleLogger.info('Schedule completed')\n\n        // Emit completed event\n        await emitSchedulerEvent('scheduler.job.completed', {\n          id: schedule.id,\n          tenantId: schedule.tenantId,\n          organizationId: schedule.organizationId,\n          scheduleName: schedule.name,\n          scopeType: schedule.scopeType,\n          completedAt: new Date(),\n        })\n      } catch (error: unknown) {\n        scheduleLogger.error('Schedule failed', { err: error })\n\n        // Emit failed event\n        await emitSchedulerEvent('scheduler.job.failed', {\n          id: schedule.id,\n          tenantId: schedule.tenantId,\n          organizationId: schedule.organizationId,\n          scheduleName: schedule.name,\n          scopeType: schedule.scopeType,\n          error: error instanceof Error ? error.message : String(error),\n          failedAt: new Date(),\n        })\n\n        // Still update next run time even on failure\n        await this.updateNextRun(schedule)\n      }\n    })\n\n    if (!acquired) {\n      scheduleLogger.debug('Schedule already locked, skipping')\n      return\n    }\n  }\n\n  /**\n   * Execute a queue-based target\n   */\n  private async executeQueueTarget(schedule: ScheduledJob): Promise<void> {\n    if (!schedule.targetQueue) {\n      throw new Error('Target queue is required for queue target type')\n    }\n\n    const queue = this.queueFactory(schedule.targetQueue)\n    \n    await queue.enqueue({\n      scheduleId: schedule.id,\n      scheduleName: schedule.name,\n      scopeType: schedule.scopeType,\n      tenantId: schedule.tenantId,\n      organizationId: schedule.organizationId,\n      payload: schedule.targetPayload || {},\n      triggeredAt: new Date(),\n    })\n\n    logger.info('Enqueued job to target queue', { scheduleId: schedule.id, targetQueue: schedule.targetQueue })\n  }\n\n  /**\n   * Execute a command-based target\n   */\n  private async executeCommandTarget(schedule: ScheduledJob): Promise<void> {\n    if (!schedule.targetCommand) {\n      throw new Error('Target command is required for command target type')\n    }\n\n    const commandBus = new CommandBus()\n    \n    const commandInput = {\n      ...((schedule.targetPayload as Record<string, unknown>) || {}),\n      tenantId: schedule.tenantId,\n      organizationId: schedule.organizationId,\n    }\n    \n    const commandCtx = buildScheduledCommandContext(\n      schedule,\n      {\n        resolve: (name: string) => {\n          // Simple resolver that forwards to our dependencies\n          if (name === 'em') return this.em()\n          if (name === 'eventBus') return getGlobalEventBus()\n          if (name === 'rbacService') return this.rbacService\n          throw new Error(`Service not available in scheduler context: ${name}`)\n        },\n      } as AppContainer,\n    )\n\n    await commandBus.execute(schedule.targetCommand, {\n      input: commandInput,\n      ctx: commandCtx,\n    })\n\n    logger.info('Executed command', { scheduleId: schedule.id, targetCommand: schedule.targetCommand })\n  }\n\n  /**\n   * Check if user/tenant has required feature\n   */\n  private async checkFeature(schedule: ScheduledJob): Promise<boolean> {\n    if (!schedule.requireFeature) {\n      return true\n    }\n\n    try {\n      // For system-scoped schedules, no RBAC check needed\n      if (schedule.scopeType === 'system') {\n        return true\n      }\n\n      // For tenant/org scoped schedules, check if ANY admin user has the feature\n      // This is a simplified check - in reality, scheduled jobs run without a user context\n      // so we're just checking if the feature is enabled for the tenant\n      const hasFeature = await this.rbacService.tenantHasFeature(\n        schedule.tenantId,\n        schedule.requireFeature,\n        {\n          organizationId: schedule.organizationId,\n        }\n      )\n\n      return hasFeature\n    } catch (error: unknown) {\n      logger.error('Feature check failed', { scheduleId: schedule.id, err: error })\n      return false\n    }\n  }\n\n  /**\n   * Update next run time for a schedule\n   */\n  private async updateNextRun(schedule: ScheduledJob): Promise<void> {\n    const em = this.em().fork()\n    const freshSchedule = await em.findOne(ScheduledJob, { id: schedule.id })\n    \n    if (freshSchedule) {\n      const nextRun = recalculateNextRun(\n        freshSchedule.scheduleType,\n        freshSchedule.scheduleValue,\n        freshSchedule.timezone\n      )\n      \n      if (nextRun) {\n        freshSchedule.nextRunAt = nextRun\n        await em.flush()\n      }\n    }\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/core'\nimport type { Queue } from '@open-mercato/queue'\nimport { CommandBus } from '@open-mercato/shared/lib/commands'\nimport type { AppContainer } from '@open-mercato/shared/lib/di/container'\nimport { ScheduledJob } from '../data/entities.js'\nimport { LocalLockStrategy } from '../lib/localLockStrategy'\nimport { recalculateNextRun } from '../lib/nextRunCalculator'\nimport { emitSchedulerEvent } from '../events.js'\nimport { getGlobalEventBus } from '@open-mercato/shared/modules/events'\nimport { buildScheduledCommandContext } from '../lib/commandContext.js'\nimport { buildQueueTargetPayload, buildSchedulerIdempotencyKey } from '../lib/queueTargetPayload.js'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('scheduler').child({ component: 'local' })\n\nexport interface RbacServiceLike {\n  tenantHasFeature(tenantId: string | null | undefined, feature: string, opts?: { organizationId?: string | null }): Promise<boolean>\n}\n\nexport interface LocalSchedulerConfig {\n  pollIntervalMs: number\n}\n\n/**\n * Local scheduler service for development\n * \n * This service polls the database for due schedules and executes them locally\n * without requiring Redis. Perfect for local development.\n * \n * Features:\n * - PostgreSQL polling (configurable interval, default 30s)\n * - PostgreSQL advisory locks for duplicate prevention\n * - Supports both queue and command targets\n * - Emits the same events as async strategy\n * - Updates nextRunAt after execution\n * \n * Limitations:\n * - Polling delay (up to configured interval)\n * - Single instance only (no distributed locking across instances)\n * - Higher database load than async strategy\n * \n * Set QUEUE_STRATEGY=local to use this service.\n */\nexport class LocalSchedulerService {\n  private isRunning = false\n  private pollTimer?: NodeJS.Timeout\n  private lockStrategy: LocalLockStrategy\n\n  constructor(\n    private em: () => EntityManager,\n    private queueFactory: (name: string) => Queue,\n    private rbacService: RbacServiceLike,\n    private config: LocalSchedulerConfig = { pollIntervalMs: 30000 },\n  ) {\n    this.lockStrategy = new LocalLockStrategy(em)\n  }\n\n  /**\n   * Start the local scheduler polling engine\n   */\n  async start(): Promise<void> {\n    if (this.isRunning) {\n      logger.warn('Polling engine already running')\n      return\n    }\n\n    this.isRunning = true\n    logger.info('Starting polling engine', { pollIntervalMs: this.config.pollIntervalMs })\n\n    // Run initial poll immediately\n    await this.poll()\n\n    // Schedule recurring polls\n    this.pollTimer = setInterval(() => {\n      this.poll().catch((error) => {\n        logger.error('Poll error', { err: error })\n      })\n    }, this.config.pollIntervalMs)\n\n    logger.info('Polling engine started')\n  }\n\n  /**\n   * Stop the local scheduler\n   */\n  async stop(): Promise<void> {\n    logger.info('Stopping polling engine')\n    this.isRunning = false\n    \n    if (this.pollTimer) {\n      clearInterval(this.pollTimer)\n      this.pollTimer = undefined\n    }\n\n    logger.info('Polling engine stopped')\n  }\n\n  /**\n   * Poll for due schedules and execute them\n   */\n  private async poll(): Promise<void> {\n    if (!this.isRunning) {\n      return\n    }\n\n    const em = this.em().fork()\n\n    try {\n      // Find enabled schedules that are due (limited to avoid spikes after outages)\n      const dueSchedules = await em.find(ScheduledJob, {\n        isEnabled: true,\n        deletedAt: null,\n        nextRunAt: { $lte: new Date() },\n      }, {\n        limit: 100,\n        orderBy: { nextRunAt: 'ASC' },\n      })\n\n      if (dueSchedules.length === 0) {\n        logger.debug('No due schedules')\n        return\n      }\n\n      logger.info('Found due schedules', { count: dueSchedules.length })\n\n      // Execute each schedule\n      for (const schedule of dueSchedules) {\n        await this.executeSchedule(schedule)\n      }\n    } catch (error: unknown) {\n      logger.error('Poll failed', { err: error })\n    }\n  }\n\n  /**\n   * Execute a single schedule\n   */\n  private async executeSchedule(schedule: ScheduledJob): Promise<void> {\n    const lockKey = `schedule:${schedule.id}`\n    const scheduleLogger = logger.child({ scheduleId: schedule.id, scheduleName: schedule.name })\n\n    const { acquired } = await this.lockStrategy.runWithLock(lockKey, async () => {\n      scheduleLogger.info('Executing schedule')\n\n      // Emit started event\n      await emitSchedulerEvent('scheduler.job.started', {\n        id: schedule.id,\n        tenantId: schedule.tenantId,\n        organizationId: schedule.organizationId,\n        scheduleName: schedule.name,\n        scopeType: schedule.scopeType,\n        triggerType: 'scheduled',\n        startedAt: new Date(),\n      })\n\n      try {\n        // Check feature flag if required\n        if (schedule.requireFeature) {\n          const hasFeature = await this.checkFeature(schedule)\n          \n          if (!hasFeature) {\n            scheduleLogger.info('Schedule skipped: missing required feature', { requireFeature: schedule.requireFeature })\n            \n            await emitSchedulerEvent('scheduler.job.skipped', {\n              id: schedule.id,\n              tenantId: schedule.tenantId,\n              organizationId: schedule.organizationId,\n              scheduleName: schedule.name,\n              scopeType: schedule.scopeType,\n              reason: `Missing required feature: ${schedule.requireFeature}`,\n              skippedAt: new Date(),\n            })\n\n            // Still update next run time\n            await this.updateNextRun(schedule)\n            return\n          }\n        }\n\n        // Execute based on target type\n        if (schedule.targetType === 'queue') {\n          await this.executeQueueTarget(schedule)\n        } else if (schedule.targetType === 'command') {\n          await this.executeCommandTarget(schedule)\n        } else {\n          throw new Error(`Unknown target type: ${schedule.targetType}`)\n        }\n\n        // Update last run and next run times\n        const em = this.em().fork()\n        const freshSchedule = await em.findOne(ScheduledJob, { id: schedule.id })\n        \n        if (freshSchedule) {\n          freshSchedule.lastRunAt = new Date()\n          \n          // Calculate next run time\n          const nextRun = recalculateNextRun(\n            freshSchedule.scheduleType,\n            freshSchedule.scheduleValue,\n            freshSchedule.timezone\n          )\n          \n          if (nextRun) {\n            freshSchedule.nextRunAt = nextRun\n          }\n          \n          await em.flush()\n        }\n\n        scheduleLogger.info('Schedule completed')\n\n        // Emit completed event\n        await emitSchedulerEvent('scheduler.job.completed', {\n          id: schedule.id,\n          tenantId: schedule.tenantId,\n          organizationId: schedule.organizationId,\n          scheduleName: schedule.name,\n          scopeType: schedule.scopeType,\n          completedAt: new Date(),\n        })\n      } catch (error: unknown) {\n        scheduleLogger.error('Schedule failed', { err: error })\n\n        // Emit failed event\n        await emitSchedulerEvent('scheduler.job.failed', {\n          id: schedule.id,\n          tenantId: schedule.tenantId,\n          organizationId: schedule.organizationId,\n          scheduleName: schedule.name,\n          scopeType: schedule.scopeType,\n          error: error instanceof Error ? error.message : String(error),\n          failedAt: new Date(),\n        })\n\n        // Still update next run time even on failure\n        await this.updateNextRun(schedule)\n      }\n    })\n\n    if (!acquired) {\n      scheduleLogger.debug('Schedule already locked, skipping')\n      return\n    }\n  }\n\n  /**\n   * Execute a queue-based target\n   */\n  private async executeQueueTarget(schedule: ScheduledJob): Promise<void> {\n    if (!schedule.targetQueue) {\n      throw new Error('Target queue is required for queue target type')\n    }\n\n    const queue = this.queueFactory(schedule.targetQueue)\n\n    // Deliver the same flat contract as the asynchronous execute-schedule\n    // worker: targetPayload fields on the root, scheduler-owned scope and\n    // idempotency fields applied last. Local mode runs each firing exactly\n    // once, so the firing timestamp is a valid logical execution key.\n    await queue.enqueue(buildQueueTargetPayload({\n      targetPayload: schedule.targetPayload,\n      tenantId: schedule.tenantId,\n      organizationId: schedule.organizationId,\n      idempotencyKey: buildSchedulerIdempotencyKey(schedule.id, Date.now()),\n    }))\n\n    logger.info('Enqueued job to target queue', { scheduleId: schedule.id, targetQueue: schedule.targetQueue })\n  }\n\n  /**\n   * Execute a command-based target\n   */\n  private async executeCommandTarget(schedule: ScheduledJob): Promise<void> {\n    if (!schedule.targetCommand) {\n      throw new Error('Target command is required for command target type')\n    }\n\n    const commandBus = new CommandBus()\n    \n    const commandInput = {\n      ...((schedule.targetPayload as Record<string, unknown>) || {}),\n      tenantId: schedule.tenantId,\n      organizationId: schedule.organizationId,\n    }\n    \n    const commandCtx = buildScheduledCommandContext(\n      schedule,\n      {\n        resolve: (name: string) => {\n          // Simple resolver that forwards to our dependencies\n          if (name === 'em') return this.em()\n          if (name === 'eventBus') return getGlobalEventBus()\n          if (name === 'rbacService') return this.rbacService\n          throw new Error(`Service not available in scheduler context: ${name}`)\n        },\n      } as AppContainer,\n    )\n\n    await commandBus.execute(schedule.targetCommand, {\n      input: commandInput,\n      ctx: commandCtx,\n    })\n\n    logger.info('Executed command', { scheduleId: schedule.id, targetCommand: schedule.targetCommand })\n  }\n\n  /**\n   * Check if user/tenant has required feature\n   */\n  private async checkFeature(schedule: ScheduledJob): Promise<boolean> {\n    if (!schedule.requireFeature) {\n      return true\n    }\n\n    try {\n      // For system-scoped schedules, no RBAC check needed\n      if (schedule.scopeType === 'system') {\n        return true\n      }\n\n      // For tenant/org scoped schedules, check if ANY admin user has the feature\n      // This is a simplified check - in reality, scheduled jobs run without a user context\n      // so we're just checking if the feature is enabled for the tenant\n      const hasFeature = await this.rbacService.tenantHasFeature(\n        schedule.tenantId,\n        schedule.requireFeature,\n        {\n          organizationId: schedule.organizationId,\n        }\n      )\n\n      return hasFeature\n    } catch (error: unknown) {\n      logger.error('Feature check failed', { scheduleId: schedule.id, err: error })\n      return false\n    }\n  }\n\n  /**\n   * Update next run time for a schedule\n   */\n  private async updateNextRun(schedule: ScheduledJob): Promise<void> {\n    const em = this.em().fork()\n    const freshSchedule = await em.findOne(ScheduledJob, { id: schedule.id })\n    \n    if (freshSchedule) {\n      const nextRun = recalculateNextRun(\n        freshSchedule.scheduleType,\n        freshSchedule.scheduleValue,\n        freshSchedule.timezone\n      )\n      \n      if (nextRun) {\n        freshSchedule.nextRunAt = nextRun\n        await em.flush()\n      }\n    }\n  }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/scheduler/workers/execute-schedule.worker.js

@@ -4,6 +4,7 @@ import { ScheduledJob } from "../data/entities.js";
 import { CommandBus } from "@open-mercato/shared/lib/commands";
 import { emitSchedulerEvent } from "../events.js";
 import { buildScheduledCommandContext } from "../lib/commandContext.js";
+import { buildQueueTargetPayload, buildSchedulerIdempotencyKey } from "../lib/queueTargetPayload.js";
 import { createLogger } from "@open-mercato/shared/lib/logger";
 const logger = createLogger("scheduler").child({ component: "worker" });
 const metadata = {
@@ -97,15 +98,13 @@ async function executeScheduleWorker(job, ctx) {
     });
     let targetJobId;
     try {
-      const executionTimestamp = Date.now();
-      const idempotencyKey = `scheduler-${schedule.id}-${executionTimestamp}`;
-      const queuePayload = {
-        ...schedule.targetPayload || {},
+      const idempotencyKey = buildSchedulerIdempotencyKey(schedule.id, ctx.jobId ?? Date.now());
+      targetJobId = await targetQueue.enqueue(buildQueueTargetPayload({
+        targetPayload: schedule.targetPayload,
         tenantId: schedule.tenantId,
         organizationId: schedule.organizationId,
-        _idempotencyKey: idempotencyKey
-      };
-      targetJobId = await targetQueue.enqueue(queuePayload);
+        idempotencyKey
+      }));
     } finally {
       await targetQueue.close();
     }

package/dist/modules/scheduler/workers/execute-schedule.worker.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/scheduler/workers/execute-schedule.worker.ts"],
-  "sourcesContent": ["import type { QueuedJob, JobContext, WorkerMeta } from '@open-mercato/queue'\nimport { createQueue } from '@open-mercato/queue'\nimport { getRedisUrlOrThrow } from '@open-mercato/shared/lib/redis/connection'\nimport type { EntityManager } from '@mikro-orm/core'\nimport { ScheduledJob } from '../data/entities.js'\nimport { CommandBus } from '@open-mercato/shared/lib/commands'\nimport type { AppContainer } from '@open-mercato/shared/lib/di/container'\nimport { emitSchedulerEvent } from '../events.js'\nimport { buildScheduledCommandContext } from '../lib/commandContext.js'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('scheduler').child({ component: 'worker' })\n\n// Worker metadata for auto-discovery\nexport const metadata: WorkerMeta = {\n  queue: 'scheduler-execution',\n  concurrency: 5, // Process up to 5 schedules concurrently\n}\n\nexport type ExecuteSchedulePayload = {\n  scheduleId: string\n  tenantId?: string | null\n  organizationId?: string | null\n  scopeType: 'system' | 'organization' | 'tenant'\n  triggerType?: 'scheduled' | 'manual'\n  triggeredByUserId?: string | null\n}\n\ntype HandlerContext = { resolve: <T = unknown>(name: string) => T }\ntype RbacServiceLike = {\n  tenantHasFeature(\n    tenantId: string | null | undefined,\n    feature: string,\n    opts?: { organizationId?: string | null },\n  ): Promise<boolean>\n}\n\n/**\n * Worker that executes scheduled jobs.\n * \n * This worker is triggered by BullMQ repeatable jobs at the scheduled times.\n * It loads the fresh schedule configuration from the database, validates\n * conditions, and enqueues the target job or executes the command.\n * \n * BullMQ handles:\n * - Timing (exact cron/interval execution)\n * - Distributed locking (prevents duplicate execution)\n * - Retries (if worker fails)\n * - Execution history (via job state, logs, timestamps)\n * \n * This worker handles:\n * - Loading fresh schedule config\n * - Checking feature flags and conditions\n * - Enqueuing target job or executing command\n * - Updating last run time\n */\nexport default async function executeScheduleWorker(\n  job: QueuedJob<ExecuteSchedulePayload>,\n  ctx: JobContext & HandlerContext,\n): Promise<void> {\n  logger.debug('Processing job', {\n    jobId: ctx.jobId,\n    attemptNumber: ctx.attemptNumber,\n  })\n  \n  // Defensive: handle both data and payload for BullMQ compatibility\n  const payload = (job.payload || (job as unknown as { data?: ExecuteSchedulePayload }).data) as ExecuteSchedulePayload | undefined\n  \n  if (!payload || !payload.scheduleId) {\n    logger.error('Invalid job payload: scheduleId missing', { jobId: ctx.jobId })\n    throw new Error('scheduleId is required in job payload')\n  }\n\n  const { scheduleId } = payload\n\n  const em = ctx.resolve<EntityManager>('em')\n  const rbacService = ctx.resolve<RbacServiceLike>('rbacService')\n\n  // Load fresh schedule from database\n  const schedule = await em.findOne(ScheduledJob, { \n    id: scheduleId,\n    deletedAt: null,\n  })\n\n  if (!schedule) {\n    logger.info('Schedule not found or deleted', { scheduleId })\n    return\n  }\n\n  // CRITICAL: Verify scope integrity - ensure payload scope matches database\n  // This prevents scope tampering and ensures proper multi-tenant isolation\n  if (payload.scopeType !== schedule.scopeType) {\n    logger.error('Scope type mismatch for schedule', {\n      scheduleId,\n      payloadScope: payload.scopeType,\n      dbScope: schedule.scopeType,\n    })\n    throw new Error('Schedule scope type mismatch - potential security issue')\n  }\n\n  if (payload.tenantId !== schedule.tenantId) {\n    logger.error('Tenant ID mismatch for schedule', {\n      scheduleId,\n      payloadTenant: payload.tenantId,\n      dbTenant: schedule.tenantId,\n    })\n    throw new Error('Schedule tenant ID mismatch - potential security issue')\n  }\n\n  if (payload.organizationId !== schedule.organizationId) {\n    logger.error('Organization ID mismatch for schedule', {\n      scheduleId,\n      payloadOrg: payload.organizationId,\n      dbOrg: schedule.organizationId,\n    })\n    throw new Error('Schedule organization ID mismatch - potential security issue')\n  }\n\n  // Check if schedule is still enabled\n  if (!schedule.isEnabled) {\n    logger.debug('Schedule is disabled', { scheduleId })\n    await emitSchedulerEvent('scheduler.job.skipped', {\n      id: schedule.id,\n      tenantId: schedule.tenantId,\n      organizationId: schedule.organizationId,\n      reason: 'Schedule is disabled',\n    })\n    return\n  }\n\n  // Emit started event\n  await emitSchedulerEvent('scheduler.job.started', {\n    id: schedule.id,\n    tenantId: schedule.tenantId,\n    organizationId: schedule.organizationId,\n    scheduleName: schedule.name,\n    attemptNumber: ctx.attemptNumber || 1,\n  })\n\n  // Check feature flag if required\n  if (schedule.requireFeature) {\n    const hasFeature = await rbacService.tenantHasFeature(\n      schedule.tenantId,\n      schedule.requireFeature,\n      { organizationId: schedule.organizationId },\n    )\n    \n    if (!hasFeature) {\n      await emitSchedulerEvent('scheduler.job.skipped', {\n        id: schedule.id,\n        tenantId: schedule.tenantId,\n        organizationId: schedule.organizationId,\n        reason: `Feature not enabled: ${schedule.requireFeature}`,\n      })\n\n      logger.debug('Schedule skipped: feature not enabled', { scheduleId, requireFeature: schedule.requireFeature })\n      return\n    }\n  }\n\n  // Enqueue target job or execute command\n  if (schedule.targetType === 'queue' && schedule.targetQueue) {\n    // Determine queue strategy from environment\n    const queueStrategy = (process.env.QUEUE_STRATEGY || 'local') as 'local' | 'async'\n    const targetQueue = createQueue(schedule.targetQueue, queueStrategy, {\n      connection: { url: getRedisUrlOrThrow('QUEUE') },\n    })\n    \n    let targetJobId: string | undefined\n    try {\n      // Generate a deterministic idempotency key so that if BullMQ retries\n      // this worker after a crash between enqueue and DB flush, downstream\n      // workers can deduplicate using this key.\n      const executionTimestamp = Date.now()\n      const idempotencyKey = `scheduler-${schedule.id}-${executionTimestamp}`\n\n      const queuePayload = {\n        ...((schedule.targetPayload as Record<string, unknown>) || {}),\n        tenantId: schedule.tenantId,\n        organizationId: schedule.organizationId,\n        _idempotencyKey: idempotencyKey,\n      }\n\n      targetJobId = await targetQueue.enqueue(queuePayload)\n    } finally {\n      // Always close the queue instance to free Redis connections\n      await targetQueue.close()\n    }\n    \n    // Update schedule's last run time\n    schedule.lastRunAt = new Date()\n    await em.flush()\n\n    await emitSchedulerEvent('scheduler.job.completed', {\n      id: schedule.id,\n      tenantId: schedule.tenantId,\n      organizationId: schedule.organizationId,\n      queueJobId: targetJobId,\n      queueName: schedule.targetQueue,\n    })\n\n    logger.debug('Successfully enqueued job', {\n      scheduleId: schedule.id,\n      targetQueue: schedule.targetQueue,\n      queueJobId: targetJobId,\n    })\n\n  } else if (schedule.targetType === 'command' && schedule.targetCommand) {\n    const commandBus = new CommandBus()\n    \n    const commandInput = {\n      ...((schedule.targetPayload as Record<string, unknown>) || {}),\n      tenantId: schedule.tenantId,\n      organizationId: schedule.organizationId,\n    }\n    \n    const commandCtx = buildScheduledCommandContext(schedule, ctx as unknown as AppContainer)\n    \n    const commandResult = await commandBus.execute(schedule.targetCommand, {\n      input: commandInput,\n      ctx: commandCtx,\n    })\n    \n    // Update schedule's last run time\n    schedule.lastRunAt = new Date()\n    await em.flush()\n    \n    await emitSchedulerEvent('scheduler.job.completed', {\n      id: schedule.id,\n      tenantId: schedule.tenantId,\n      organizationId: schedule.organizationId,\n      commandId: schedule.targetCommand,\n      commandResult: commandResult.result,\n    })\n    \n    logger.debug('Successfully executed command', {\n      scheduleId: schedule.id,\n      commandId: schedule.targetCommand,\n    })\n\n  } else {\n    throw new Error('Invalid target configuration')\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { QueuedJob, JobContext, WorkerMeta } from '@open-mercato/queue'\nimport { createQueue } from '@open-mercato/queue'\nimport { getRedisUrlOrThrow } from '@open-mercato/shared/lib/redis/connection'\nimport type { EntityManager } from '@mikro-orm/core'\nimport { ScheduledJob } from '../data/entities.js'\nimport { CommandBus } from '@open-mercato/shared/lib/commands'\nimport type { AppContainer } from '@open-mercato/shared/lib/di/container'\nimport { emitSchedulerEvent } from '../events.js'\nimport { buildScheduledCommandContext } from '../lib/commandContext.js'\nimport { buildQueueTargetPayload, buildSchedulerIdempotencyKey } from '../lib/queueTargetPayload.js'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('scheduler').child({ component: 'worker' })\n\n// Worker metadata for auto-discovery\nexport const metadata: WorkerMeta = {\n  queue: 'scheduler-execution',\n  concurrency: 5, // Process up to 5 schedules concurrently\n}\n\nexport type ExecuteSchedulePayload = {\n  scheduleId: string\n  tenantId?: string | null\n  organizationId?: string | null\n  scopeType: 'system' | 'organization' | 'tenant'\n  triggerType?: 'scheduled' | 'manual'\n  triggeredByUserId?: string | null\n}\n\ntype HandlerContext = { resolve: <T = unknown>(name: string) => T }\ntype RbacServiceLike = {\n  tenantHasFeature(\n    tenantId: string | null | undefined,\n    feature: string,\n    opts?: { organizationId?: string | null },\n  ): Promise<boolean>\n}\n\n/**\n * Worker that executes scheduled jobs.\n * \n * This worker is triggered by BullMQ repeatable jobs at the scheduled times.\n * It loads the fresh schedule configuration from the database, validates\n * conditions, and enqueues the target job or executes the command.\n * \n * BullMQ handles:\n * - Timing (exact cron/interval execution)\n * - Distributed locking (prevents duplicate execution)\n * - Retries (if worker fails)\n * - Execution history (via job state, logs, timestamps)\n * \n * This worker handles:\n * - Loading fresh schedule config\n * - Checking feature flags and conditions\n * - Enqueuing target job or executing command\n * - Updating last run time\n */\nexport default async function executeScheduleWorker(\n  job: QueuedJob<ExecuteSchedulePayload>,\n  ctx: JobContext & HandlerContext,\n): Promise<void> {\n  logger.debug('Processing job', {\n    jobId: ctx.jobId,\n    attemptNumber: ctx.attemptNumber,\n  })\n  \n  // Defensive: handle both data and payload for BullMQ compatibility\n  const payload = (job.payload || (job as unknown as { data?: ExecuteSchedulePayload }).data) as ExecuteSchedulePayload | undefined\n  \n  if (!payload || !payload.scheduleId) {\n    logger.error('Invalid job payload: scheduleId missing', { jobId: ctx.jobId })\n    throw new Error('scheduleId is required in job payload')\n  }\n\n  const { scheduleId } = payload\n\n  const em = ctx.resolve<EntityManager>('em')\n  const rbacService = ctx.resolve<RbacServiceLike>('rbacService')\n\n  // Load fresh schedule from database\n  const schedule = await em.findOne(ScheduledJob, { \n    id: scheduleId,\n    deletedAt: null,\n  })\n\n  if (!schedule) {\n    logger.info('Schedule not found or deleted', { scheduleId })\n    return\n  }\n\n  // CRITICAL: Verify scope integrity - ensure payload scope matches database\n  // This prevents scope tampering and ensures proper multi-tenant isolation\n  if (payload.scopeType !== schedule.scopeType) {\n    logger.error('Scope type mismatch for schedule', {\n      scheduleId,\n      payloadScope: payload.scopeType,\n      dbScope: schedule.scopeType,\n    })\n    throw new Error('Schedule scope type mismatch - potential security issue')\n  }\n\n  if (payload.tenantId !== schedule.tenantId) {\n    logger.error('Tenant ID mismatch for schedule', {\n      scheduleId,\n      payloadTenant: payload.tenantId,\n      dbTenant: schedule.tenantId,\n    })\n    throw new Error('Schedule tenant ID mismatch - potential security issue')\n  }\n\n  if (payload.organizationId !== schedule.organizationId) {\n    logger.error('Organization ID mismatch for schedule', {\n      scheduleId,\n      payloadOrg: payload.organizationId,\n      dbOrg: schedule.organizationId,\n    })\n    throw new Error('Schedule organization ID mismatch - potential security issue')\n  }\n\n  // Check if schedule is still enabled\n  if (!schedule.isEnabled) {\n    logger.debug('Schedule is disabled', { scheduleId })\n    await emitSchedulerEvent('scheduler.job.skipped', {\n      id: schedule.id,\n      tenantId: schedule.tenantId,\n      organizationId: schedule.organizationId,\n      reason: 'Schedule is disabled',\n    })\n    return\n  }\n\n  // Emit started event\n  await emitSchedulerEvent('scheduler.job.started', {\n    id: schedule.id,\n    tenantId: schedule.tenantId,\n    organizationId: schedule.organizationId,\n    scheduleName: schedule.name,\n    attemptNumber: ctx.attemptNumber || 1,\n  })\n\n  // Check feature flag if required\n  if (schedule.requireFeature) {\n    const hasFeature = await rbacService.tenantHasFeature(\n      schedule.tenantId,\n      schedule.requireFeature,\n      { organizationId: schedule.organizationId },\n    )\n    \n    if (!hasFeature) {\n      await emitSchedulerEvent('scheduler.job.skipped', {\n        id: schedule.id,\n        tenantId: schedule.tenantId,\n        organizationId: schedule.organizationId,\n        reason: `Feature not enabled: ${schedule.requireFeature}`,\n      })\n\n      logger.debug('Schedule skipped: feature not enabled', { scheduleId, requireFeature: schedule.requireFeature })\n      return\n    }\n  }\n\n  // Enqueue target job or execute command\n  if (schedule.targetType === 'queue' && schedule.targetQueue) {\n    // Determine queue strategy from environment\n    const queueStrategy = (process.env.QUEUE_STRATEGY || 'local') as 'local' | 'async'\n    const targetQueue = createQueue(schedule.targetQueue, queueStrategy, {\n      connection: { url: getRedisUrlOrThrow('QUEUE') },\n    })\n    \n    let targetJobId: string | undefined\n    try {\n      // The execute-schedule job id is stable across BullMQ retries, so if\n      // this worker crashes between enqueue and DB flush the retried attempt\n      // reuses the same idempotency key and downstream workers can dedupe.\n      const idempotencyKey = buildSchedulerIdempotencyKey(schedule.id, ctx.jobId ?? Date.now())\n\n      targetJobId = await targetQueue.enqueue(buildQueueTargetPayload({\n        targetPayload: schedule.targetPayload,\n        tenantId: schedule.tenantId,\n        organizationId: schedule.organizationId,\n        idempotencyKey,\n      }))\n    } finally {\n      // Always close the queue instance to free Redis connections\n      await targetQueue.close()\n    }\n    \n    // Update schedule's last run time\n    schedule.lastRunAt = new Date()\n    await em.flush()\n\n    await emitSchedulerEvent('scheduler.job.completed', {\n      id: schedule.id,\n      tenantId: schedule.tenantId,\n      organizationId: schedule.organizationId,\n      queueJobId: targetJobId,\n      queueName: schedule.targetQueue,\n    })\n\n    logger.debug('Successfully enqueued job', {\n      scheduleId: schedule.id,\n      targetQueue: schedule.targetQueue,\n      queueJobId: targetJobId,\n    })\n\n  } else if (schedule.targetType === 'command' && schedule.targetCommand) {\n    const commandBus = new CommandBus()\n    \n    const commandInput = {\n      ...((schedule.targetPayload as Record<string, unknown>) || {}),\n      tenantId: schedule.tenantId,\n      organizationId: schedule.organizationId,\n    }\n    \n    const commandCtx = buildScheduledCommandContext(schedule, ctx as unknown as AppContainer)\n    \n    const commandResult = await commandBus.execute(schedule.targetCommand, {\n      input: commandInput,\n      ctx: commandCtx,\n    })\n    \n    // Update schedule's last run time\n    schedule.lastRunAt = new Date()\n    await em.flush()\n    \n    await emitSchedulerEvent('scheduler.job.completed', {\n      id: schedule.id,\n      tenantId: schedule.tenantId,\n      organizationId: schedule.organizationId,\n      commandId: schedule.targetCommand,\n      commandResult: commandResult.result,\n    })\n    \n    logger.debug('Successfully executed command', {\n      scheduleId: schedule.id,\n      commandId: schedule.targetCommand,\n    })\n\n  } else {\n    throw new Error('Invalid target configuration')\n  }\n}\n"],
+  "mappings": "AACA,SAAS,mBAAmB;AAC5B,SAAS,0BAA0B;AAEnC,SAAS,oBAAoB;AAC7B,SAAS,kBAAkB;AAE3B,SAAS,0BAA0B;AACnC,SAAS,oCAAoC;AAC7C,SAAS,yBAAyB,oCAAoC;AACtE,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,WAAW,EAAE,MAAM,EAAE,WAAW,SAAS,CAAC;AAG/D,MAAM,WAAuB;AAAA,EAClC,OAAO;AAAA,EACP,aAAa;AAAA;AACf;AAuCA,eAAO,sBACL,KACA,KACe;AACf,SAAO,MAAM,kBAAkB;AAAA,IAC7B,OAAO,IAAI;AAAA,IACX,eAAe,IAAI;AAAA,EACrB,CAAC;AAGD,QAAM,UAAW,IAAI,WAAY,IAAqD;AAEtF,MAAI,CAAC,WAAW,CAAC,QAAQ,YAAY;AACnC,WAAO,MAAM,2CAA2C,EAAE,OAAO,IAAI,MAAM,CAAC;AAC5E,UAAM,IAAI,MAAM,uCAAuC;AAAA,EACzD;AAEA,QAAM,EAAE,WAAW,IAAI;AAEvB,QAAM,KAAK,IAAI,QAAuB,IAAI;AAC1C,QAAM,cAAc,IAAI,QAAyB,aAAa;AAG9D,QAAM,WAAW,MAAM,GAAG,QAAQ,cAAc;AAAA,IAC9C,IAAI;AAAA,IACJ,WAAW;AAAA,EACb,CAAC;AAED,MAAI,CAAC,UAAU;AACb,WAAO,KAAK,iCAAiC,EAAE,WAAW,CAAC;AAC3D;AAAA,EACF;AAIA,MAAI,QAAQ,cAAc,SAAS,WAAW;AAC5C,WAAO,MAAM,oCAAoC;AAAA,MAC/C;AAAA,MACA,cAAc,QAAQ;AAAA,MACtB,SAAS,SAAS;AAAA,IACpB,CAAC;AACD,UAAM,IAAI,MAAM,yDAAyD;AAAA,EAC3E;AAEA,MAAI,QAAQ,aAAa,SAAS,UAAU;AAC1C,WAAO,MAAM,mCAAmC;AAAA,MAC9C;AAAA,MACA,eAAe,QAAQ;AAAA,MACvB,UAAU,SAAS;AAAA,IACrB,CAAC;AACD,UAAM,IAAI,MAAM,wDAAwD;AAAA,EAC1E;AAEA,MAAI,QAAQ,mBAAmB,SAAS,gBAAgB;AACtD,WAAO,MAAM,yCAAyC;AAAA,MACpD;AAAA,MACA,YAAY,QAAQ;AAAA,MACpB,OAAO,SAAS;AAAA,IAClB,CAAC;AACD,UAAM,IAAI,MAAM,8DAA8D;AAAA,EAChF;AAGA,MAAI,CAAC,SAAS,WAAW;AACvB,WAAO,MAAM,wBAAwB,EAAE,WAAW,CAAC;AACnD,UAAM,mBAAmB,yBAAyB;AAAA,MAChD,IAAI,SAAS;AAAA,MACb,UAAU,SAAS;AAAA,MACnB,gBAAgB,SAAS;AAAA,MACzB,QAAQ;AAAA,IACV,CAAC;AACD;AAAA,EACF;AAGA,QAAM,mBAAmB,yBAAyB;AAAA,IAChD,IAAI,SAAS;AAAA,IACb,UAAU,SAAS;AAAA,IACnB,gBAAgB,SAAS;AAAA,IACzB,cAAc,SAAS;AAAA,IACvB,eAAe,IAAI,iBAAiB;AAAA,EACtC,CAAC;AAGD,MAAI,SAAS,gBAAgB;AAC3B,UAAM,aAAa,MAAM,YAAY;AAAA,MACnC,SAAS;AAAA,MACT,SAAS;AAAA,MACT,EAAE,gBAAgB,SAAS,eAAe;AAAA,IAC5C;AAEA,QAAI,CAAC,YAAY;AACf,YAAM,mBAAmB,yBAAyB;AAAA,QAChD,IAAI,SAAS;AAAA,QACb,UAAU,SAAS;AAAA,QACnB,gBAAgB,SAAS;AAAA,QACzB,QAAQ,wBAAwB,SAAS,cAAc;AAAA,MACzD,CAAC;AAED,aAAO,MAAM,yCAAyC,EAAE,YAAY,gBAAgB,SAAS,eAAe,CAAC;AAC7G;AAAA,IACF;AAAA,EACF;AAGA,MAAI,SAAS,eAAe,WAAW,SAAS,aAAa;AAE3D,UAAM,gBAAiB,QAAQ,IAAI,kBAAkB;AACrD,UAAM,cAAc,YAAY,SAAS,aAAa,eAAe;AAAA,MACnE,YAAY,EAAE,KAAK,mBAAmB,OAAO,EAAE;AAAA,IACjD,CAAC;AAED,QAAI;AACJ,QAAI;AAIF,YAAM,iBAAiB,6BAA6B,SAAS,IAAI,IAAI,SAAS,KAAK,IAAI,CAAC;AAExF,oBAAc,MAAM,YAAY,QAAQ,wBAAwB;AAAA,QAC9D,eAAe,SAAS;AAAA,QACxB,UAAU,SAAS;AAAA,QACnB,gBAAgB,SAAS;AAAA,QACzB;AAAA,MACF,CAAC,CAAC;AAAA,IACJ,UAAE;AAEA,YAAM,YAAY,MAAM;AAAA,IAC1B;AAGA,aAAS,YAAY,oBAAI,KAAK;AAC9B,UAAM,GAAG,MAAM;AAEf,UAAM,mBAAmB,2BAA2B;AAAA,MAClD,IAAI,SAAS;AAAA,MACb,UAAU,SAAS;AAAA,MACnB,gBAAgB,SAAS;AAAA,MACzB,YAAY;AAAA,MACZ,WAAW,SAAS;AAAA,IACtB,CAAC;AAED,WAAO,MAAM,6BAA6B;AAAA,MACxC,YAAY,SAAS;AAAA,MACrB,aAAa,SAAS;AAAA,MACtB,YAAY;AAAA,IACd,CAAC;AAAA,EAEH,WAAW,SAAS,eAAe,aAAa,SAAS,eAAe;AACtE,UAAM,aAAa,IAAI,WAAW;AAElC,UAAM,eAAe;AAAA,MACnB,GAAK,SAAS,iBAA6C,CAAC;AAAA,MAC5D,UAAU,SAAS;AAAA,MACnB,gBAAgB,SAAS;AAAA,IAC3B;AAEA,UAAM,aAAa,6BAA6B,UAAU,GAA8B;AAExF,UAAM,gBAAgB,MAAM,WAAW,QAAQ,SAAS,eAAe;AAAA,MACrE,OAAO;AAAA,MACP,KAAK;AAAA,IACP,CAAC;AAGD,aAAS,YAAY,oBAAI,KAAK;AAC9B,UAAM,GAAG,MAAM;AAEf,UAAM,mBAAmB,2BAA2B;AAAA,MAClD,IAAI,SAAS;AAAA,MACb,UAAU,SAAS;AAAA,MACnB,gBAAgB,SAAS;AAAA,MACzB,WAAW,SAAS;AAAA,MACpB,eAAe,cAAc;AAAA,IAC/B,CAAC;AAED,WAAO,MAAM,iCAAiC;AAAA,MAC5C,YAAY,SAAS;AAAA,MACrB,WAAW,SAAS;AAAA,IACtB,CAAC;AAAA,EAEH,OAAO;AACL,UAAM,IAAI,MAAM,8BAA8B;AAAA,EAChD;AACF;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/scheduler",
-  "version": "0.6.7-develop.6630.1.c8a615e536",
+  "version": "0.6.7-develop.6645.1.52f0b37813",
   "license": "MIT",
   "description": "Database-managed scheduled jobs with admin UI",
   "type": "module",
@@ -59,13 +59,13 @@
     "./*/*/*/*/*/*.json": "./src/*/*/*/*/*/*.json"
   },
   "dependencies": {
-    "@open-mercato/events": "0.6.7-develop.6630.1.c8a615e536",
-    "@open-mercato/queue": "0.6.7-develop.6630.1.c8a615e536",
+    "@open-mercato/events": "0.6.7-develop.6645.1.52f0b37813",
+    "@open-mercato/queue": "0.6.7-develop.6645.1.52f0b37813",
     "cron-parser": "^5.6.2"
   },
   "peerDependencies": {
     "@mikro-orm/core": "^7.0.14",
-    "@open-mercato/shared": "0.6.7-develop.6630.1.c8a615e536",
+    "@open-mercato/shared": "0.6.7-develop.6645.1.52f0b37813",
     "bullmq": "^5.0.0",
     "ioredis": "^5.0.0",
     "zod": ">=3.23.0"
@@ -79,7 +79,7 @@
     }
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.6.7-develop.6630.1.c8a615e536",
+    "@open-mercato/shared": "0.6.7-develop.6645.1.52f0b37813",
     "@types/jest": "^30.0.0",
     "@types/node": "^26.0.1",
     "jest": "^30.4.2",

package/src/modules/scheduler/lib/__tests__/queueTargetPayload.test.ts

@@ -0,0 +1,85 @@
+import { buildQueueTargetPayload, buildSchedulerIdempotencyKey } from '../queueTargetPayload'
+
+describe('buildQueueTargetPayload', () => {
+  it('spreads targetPayload fields onto the payload root', () => {
+    const payload = buildQueueTargetPayload({
+      targetPayload: { connectionId: 'connection-id', scope: 'organization' },
+      tenantId: 'tenant-1',
+      organizationId: 'org-1',
+      idempotencyKey: 'scheduler-s1-key',
+    })
+    expect(payload).toEqual({
+      connectionId: 'connection-id',
+      scope: 'organization',
+      tenantId: 'tenant-1',
+      organizationId: 'org-1',
+      _idempotencyKey: 'scheduler-s1-key',
+    })
+  })
+
+  it('lets scheduler-owned scope and idempotency fields win over colliding targetPayload fields', () => {
+    const payload = buildQueueTargetPayload({
+      targetPayload: {
+        tenantId: 'spoofed-tenant',
+        organizationId: 'spoofed-org',
+        _idempotencyKey: 'spoofed-key',
+      },
+      tenantId: 'tenant-1',
+      organizationId: 'org-1',
+      idempotencyKey: 'scheduler-s1-key',
+    })
+    expect(payload.tenantId).toBe('tenant-1')
+    expect(payload.organizationId).toBe('org-1')
+    expect(payload._idempotencyKey).toBe('scheduler-s1-key')
+  })
+
+  it('handles empty and non-object targetPayload values', () => {
+    for (const targetPayload of [null, undefined, {}, 'text', 42, ['array']]) {
+      const payload = buildQueueTargetPayload({
+        targetPayload,
+        tenantId: null,
+        organizationId: null,
+        idempotencyKey: 'scheduler-s1-key',
+      })
+      expect(payload).toEqual({
+        tenantId: null,
+        organizationId: null,
+        _idempotencyKey: 'scheduler-s1-key',
+      })
+    }
+  })
+
+  it('preserves a literal application field named payload on the root', () => {
+    const payload = buildQueueTargetPayload({
+      targetPayload: { payload: { nested: true }, other: 1 },
+      tenantId: 'tenant-1',
+      organizationId: null,
+      idempotencyKey: 'scheduler-s1-key',
+    })
+    expect(payload.payload).toEqual({ nested: true })
+    expect(payload.other).toBe(1)
+  })
+
+  it('does not mutate the configured targetPayload', () => {
+    const configured = { connectionId: 'connection-id' }
+    buildQueueTargetPayload({
+      targetPayload: configured,
+      tenantId: 'tenant-1',
+      organizationId: 'org-1',
+      idempotencyKey: 'scheduler-s1-key',
+    })
+    expect(configured).toEqual({ connectionId: 'connection-id' })
+  })
+})
+
+describe('buildSchedulerIdempotencyKey', () => {
+  it('is deterministic for one logical execution key', () => {
+    expect(buildSchedulerIdempotencyKey('s1', 'job-1')).toBe('scheduler-s1-job-1')
+    expect(buildSchedulerIdempotencyKey('s1', 'job-1')).toBe(buildSchedulerIdempotencyKey('s1', 'job-1'))
+  })
+
+  it('differs across schedules and executions', () => {
+    expect(buildSchedulerIdempotencyKey('s1', 'job-1')).not.toBe(buildSchedulerIdempotencyKey('s2', 'job-1'))
+    expect(buildSchedulerIdempotencyKey('s1', 'job-1')).not.toBe(buildSchedulerIdempotencyKey('s1', 'job-2'))
+  })
+})

package/src/modules/scheduler/lib/queueTargetPayload.ts

@@ -0,0 +1,37 @@
+export type QueueTargetPayloadInput = {
+  targetPayload: unknown
+  tenantId: string | null | undefined
+  organizationId: string | null | undefined
+  idempotencyKey: string
+}
+
+/**
+ * Single source of truth for the payload a scheduled queue target receives.
+ * Both the local scheduler and the asynchronous execute-schedule worker MUST
+ * build their enqueue payload here so workers see one flat contract:
+ * the configured targetPayload fields on the root, with scheduler-owned
+ * tenantId/organizationId/_idempotencyKey applied last so they always win
+ * over conflicting targetPayload fields.
+ */
+export function buildQueueTargetPayload(input: QueueTargetPayloadInput): Record<string, unknown> {
+  const base =
+    input.targetPayload && typeof input.targetPayload === 'object' && !Array.isArray(input.targetPayload)
+      ? { ...(input.targetPayload as Record<string, unknown>) }
+      : {}
+  return {
+    ...base,
+    tenantId: input.tenantId ?? null,
+    organizationId: input.organizationId ?? null,
+    _idempotencyKey: input.idempotencyKey,
+  }
+}
+
+/**
+ * One logical scheduled firing must keep one idempotency key across worker
+ * retries, so downstream consumers can deduplicate. Pass a retry-stable
+ * execution key: the execute-schedule job id in async mode, or the firing
+ * timestamp in local mode (which runs each firing exactly once).
+ */
+export function buildSchedulerIdempotencyKey(scheduleId: string, executionKey: string | number): string {
+  return `scheduler-${scheduleId}-${executionKey}`
+}

package/src/modules/scheduler/services/__tests__/localSchedulerService.test.ts

@@ -271,9 +271,9 @@ describe('LocalSchedulerService', () => {
 
       expect(mockQueue.enqueue).toHaveBeenCalledWith(
         expect.objectContaining({
-          scheduleId: 'test-1',
-          scheduleName: 'Test Schedule',
-          scopeType: 'system',
+          tenantId: null,
+          organizationId: null,
+          _idempotencyKey: expect.stringMatching(/^scheduler-test-1-/),
         })
       )
     })
@@ -548,9 +548,9 @@ describe('LocalSchedulerService', () => {
       )
     })
 
-    it('should pass payload to queue job', async () => {
+    it('should deliver the flat targetPayload contract to the queue job', async () => {
       const schedule = createSchedule({
-        targetPayload: { foo: 'bar', baz: 123 },
+        targetPayload: { foo: 'bar', baz: 123, tenantId: 'spoofed-tenant' },
       })
 
       mockForkedEm.find.mockResolvedValue([schedule])
@@ -565,9 +565,17 @@ describe('LocalSchedulerService', () => {
 
       expect(mockQueue.enqueue).toHaveBeenCalledWith(
         expect.objectContaining({
-          payload: { foo: 'bar', baz: 123 },
+          foo: 'bar',
+          baz: 123,
+          tenantId: schedule.tenantId,
+          organizationId: schedule.organizationId,
+          _idempotencyKey: expect.stringMatching(new RegExp(`^scheduler-${schedule.id}-`)),
         })
       )
+      const enqueued = mockQueue.enqueue.mock.calls[0][0] as Record<string, unknown>
+      expect(enqueued).not.toHaveProperty('payload')
+      expect(enqueued).not.toHaveProperty('scheduleId')
+      expect(enqueued).not.toHaveProperty('scheduleName')
     })
 
     it('should pass scope to command input', async () => {

package/src/modules/scheduler/services/localSchedulerService.ts

@@ -8,6 +8,7 @@ import { recalculateNextRun } from '../lib/nextRunCalculator'
 import { emitSchedulerEvent } from '../events.js'
 import { getGlobalEventBus } from '@open-mercato/shared/modules/events'
 import { buildScheduledCommandContext } from '../lib/commandContext.js'
+import { buildQueueTargetPayload, buildSchedulerIdempotencyKey } from '../lib/queueTargetPayload.js'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('scheduler').child({ component: 'local' })
@@ -251,16 +252,17 @@ export class LocalSchedulerService {
     }
 
     const queue = this.queueFactory(schedule.targetQueue)
-    
-    await queue.enqueue({
-      scheduleId: schedule.id,
-      scheduleName: schedule.name,
-      scopeType: schedule.scopeType,
+
+    // Deliver the same flat contract as the asynchronous execute-schedule
+    // worker: targetPayload fields on the root, scheduler-owned scope and
+    // idempotency fields applied last. Local mode runs each firing exactly
+    // once, so the firing timestamp is a valid logical execution key.
+    await queue.enqueue(buildQueueTargetPayload({
+      targetPayload: schedule.targetPayload,
       tenantId: schedule.tenantId,
       organizationId: schedule.organizationId,
-      payload: schedule.targetPayload || {},
-      triggeredAt: new Date(),
-    })
+      idempotencyKey: buildSchedulerIdempotencyKey(schedule.id, Date.now()),
+    }))
 
     logger.info('Enqueued job to target queue', { scheduleId: schedule.id, targetQueue: schedule.targetQueue })
   }

package/src/modules/scheduler/workers/__tests__/execute-schedule.worker.test.ts

@@ -1,5 +1,6 @@
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { ensureTenantScope } from '@open-mercato/shared/lib/commands/scope'
+import { createQueue } from '@open-mercato/queue'
 import { ScheduledJob } from '../../data/entities'
 import executeScheduleWorker from '../execute-schedule.worker'
 
@@ -15,6 +16,10 @@ jest.mock('@open-mercato/queue', () => ({
   createQueue: jest.fn(),
 }), { virtual: true })
 
+jest.mock('@open-mercato/shared/lib/redis/connection', () => ({
+  getRedisUrlOrThrow: jest.fn(() => 'redis://localhost:6379'),
+}))
+
 jest.mock('../../events', () => ({
   emitSchedulerEvent: jest.fn(async () => undefined),
 }))
@@ -100,3 +105,76 @@ describe('executeScheduleWorker command scope', () => {
     expect(em.flush).not.toHaveBeenCalled()
   })
 })
+
+describe('executeScheduleWorker queue target payload contract', () => {
+  const enqueue = jest.fn(async () => 'target-job-1')
+  const close = jest.fn(async () => undefined)
+
+  function buildQueueSchedule(overrides: Partial<ScheduledJob> = {}): ScheduledJob {
+    return buildCommandSchedule({
+      targetType: 'queue',
+      targetQueue: 'example',
+      targetCommand: null,
+      targetPayload: { connectionId: 'connection-id', scope: 'organization' },
+      ...overrides,
+    })
+  }
+
+  function runWorker(schedule: ScheduledJob, jobId = 'worker-job-1', attemptNumber = 1) {
+    const { context } = buildWorkerContext(schedule)
+    return executeScheduleWorker(
+      {
+        id: 'queued-job-1',
+        queue: 'scheduler-execution',
+        payload: {
+          scheduleId,
+          tenantId: schedule.tenantId,
+          organizationId: schedule.organizationId,
+          scopeType: schedule.scopeType,
+        },
+        attempts: 0,
+        createdAt: Date.now(),
+      },
+      { ...context, jobId, attemptNumber },
+    )
+  }
+
+  beforeEach(() => {
+    enqueue.mockClear()
+    close.mockClear()
+    ;(createQueue as jest.Mock).mockReturnValue({ enqueue, close })
+  })
+
+  it('delivers the flat targetPayload contract with scheduler-owned fields applied last', async () => {
+    const schedule = buildQueueSchedule({
+      targetPayload: {
+        connectionId: 'connection-id',
+        scope: 'organization',
+        tenantId: 'spoofed-tenant',
+        payload: { nested: true },
+      },
+    })
+
+    await runWorker(schedule)
+
+    expect(enqueue).toHaveBeenCalledWith({
+      connectionId: 'connection-id',
+      scope: 'organization',
+      payload: { nested: true },
+      tenantId: 'tenant-a',
+      organizationId: 'org-a',
+      _idempotencyKey: `scheduler-${scheduleId}-worker-job-1`,
+    })
+    expect(close).toHaveBeenCalledTimes(1)
+  })
+
+  it('keeps one idempotency key across retries of the same logical firing', async () => {
+    await runWorker(buildQueueSchedule(), 'worker-job-1', 1)
+    await runWorker(buildQueueSchedule(), 'worker-job-1', 2)
+
+    const firstKey = (enqueue.mock.calls[0][0] as Record<string, unknown>)._idempotencyKey
+    const secondKey = (enqueue.mock.calls[1][0] as Record<string, unknown>)._idempotencyKey
+    expect(firstKey).toBe(`scheduler-${scheduleId}-worker-job-1`)
+    expect(secondKey).toBe(firstKey)
+  })
+})

package/src/modules/scheduler/workers/execute-schedule.worker.ts

@@ -7,6 +7,7 @@ import { CommandBus } from '@open-mercato/shared/lib/commands'
 import type { AppContainer } from '@open-mercato/shared/lib/di/container'
 import { emitSchedulerEvent } from '../events.js'
 import { buildScheduledCommandContext } from '../lib/commandContext.js'
+import { buildQueueTargetPayload, buildSchedulerIdempotencyKey } from '../lib/queueTargetPayload.js'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('scheduler').child({ component: 'worker' })
@@ -168,20 +169,17 @@ export default async function executeScheduleWorker(
     
     let targetJobId: string | undefined
     try {
-      // Generate a deterministic idempotency key so that if BullMQ retries
-      // this worker after a crash between enqueue and DB flush, downstream
-      // workers can deduplicate using this key.
-      const executionTimestamp = Date.now()
-      const idempotencyKey = `scheduler-${schedule.id}-${executionTimestamp}`
-
-      const queuePayload = {
-        ...((schedule.targetPayload as Record<string, unknown>) || {}),
+      // The execute-schedule job id is stable across BullMQ retries, so if
+      // this worker crashes between enqueue and DB flush the retried attempt
+      // reuses the same idempotency key and downstream workers can dedupe.
+      const idempotencyKey = buildSchedulerIdempotencyKey(schedule.id, ctx.jobId ?? Date.now())
+
+      targetJobId = await targetQueue.enqueue(buildQueueTargetPayload({
+        targetPayload: schedule.targetPayload,
         tenantId: schedule.tenantId,
         organizationId: schedule.organizationId,
-        _idempotencyKey: idempotencyKey,
-      }
-
-      targetJobId = await targetQueue.enqueue(queuePayload)
+        idempotencyKey,
+      }))
     } finally {
       // Always close the queue instance to free Redis connections
       await targetQueue.close()