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

package/dist/modules/communication_channels/setup.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/modules/communication_channels/setup.ts"],
-  "sourcesContent": ["import { createHash } from 'node:crypto'\nimport type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'\nimport { COMMUNICATION_CHANNELS_QUEUES } from './lib/queue'\n\ntype SchedulerServiceLike = {\n  register: (registration: {\n    id: string\n    name: string\n    scopeType: 'system' | 'organization' | 'tenant'\n    organizationId?: string\n    tenantId?: string\n    scheduleType: 'cron' | 'interval'\n    scheduleValue: string\n    timezone?: string\n    targetType: 'queue' | 'command'\n    targetQueue?: string\n    targetPayload?: unknown\n    sourceType?: 'user' | 'module'\n    sourceModule?: string\n    isEnabled?: boolean\n    description?: string\n  }) => Promise<void>\n}\n\n/**\n * Tick interval in seconds. Default 60s per email integration spec\n * \u00A7 Hub Deltas \u2192 Delta 6 (scheduler mechanism).\n */\nconst POLL_TICK_INTERVAL_SECONDS = Math.max(\n  10,\n  Number.parseInt(process.env.OM_HUB_POLL_SCHEDULER_TICK_SECONDS ?? '60', 10) || 60,\n)\n\n/**\n * `scheduled_jobs.id` is a uuid column, so a module-owned schedule's stable\n * registration key must be hashed into a uuid rather than used verbatim \u2014 this\n * keeps `schedulerService.register()` an idempotent upsert across re-runs of\n * seedDefaults instead of trying to insert a raw string into the uuid PK.\n */\nfunction stableScheduleUuid(stableKey: string): string {\n  const hex = createHash('sha256').update(stableKey).digest('hex')\n  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20, 32)}`\n}\n\nfunction stablePollTickScheduleId(organizationId: string): string {\n  return stableScheduleUuid(`communication_channels:poll-tick:${organizationId}`)\n}\n\nexport const setup: ModuleSetupConfig = {\n  defaultRoleFeatures: {\n    superadmin: [\n      'communication_channels.view',\n      'communication_channels.manage',\n      'communication_channels.react',\n      'communication_channels.assign',\n      'communication_channels.connect_user_channel',\n      'communication_channels.admin',\n      'communication_channels.channel.import_history',\n      'communication_channels.channel.push.manage',\n    ],\n    admin: [\n      'communication_channels.view',\n      'communication_channels.manage',\n      'communication_channels.react',\n      'communication_channels.assign',\n      'communication_channels.connect_user_channel',\n      'communication_channels.admin',\n      'communication_channels.channel.import_history',\n      'communication_channels.channel.push.manage',\n    ],\n    manager: [\n      'communication_channels.view',\n      'communication_channels.manage',\n      'communication_channels.react',\n      'communication_channels.assign',\n      'communication_channels.connect_user_channel',\n    ],\n    employee: [\n      'communication_channels.view',\n      'communication_channels.react',\n      'communication_channels.connect_user_channel',\n    ],\n  },\n\n  async seedDefaults({ container, organizationId, tenantId }) {\n    /**\n     * Register the per-channel polling tick with `@open-mercato/scheduler`.\n     *\n     * Per email integration spec \u00A7 Hub Deltas \u2192 Delta 6: every\n     * `POLL_TICK_INTERVAL_SECONDS` (default 60s), enqueue a single\n     * `communication-channels-poll-tick` job that enumerates due channels and\n     * fans out to the `communication-channels-poll` queue.\n     *\n     * The registration is per-organization (one tick row per org/tenant pair)\n     * so multi-tenant deploys schedule independently. Skipped silently when the\n     * scheduler module isn't enabled \u2014 keeps the hub usable in scheduler-less\n     * test harnesses.\n     */\n    const cradle = container as { hasRegistration?: (name: string) => boolean }\n    if (typeof cradle.hasRegistration !== 'function' || !cradle.hasRegistration('schedulerService')) {\n      return\n    }\n    const schedulerService = container.resolve('schedulerService') as SchedulerServiceLike\n    // Best-effort: a scheduler failure must not abort tenant initialization for\n    // every other module (mirrors the ai_assistant setup pattern). The schedule\n    // ids are deterministic uuids so re-runs upsert idempotently.\n    try {\n      await schedulerService.register({\n        id: stablePollTickScheduleId(organizationId),\n        name: 'Communication channels poll tick',\n        description:\n          `Enumerates active polling channels every ${POLL_TICK_INTERVAL_SECONDS}s and enqueues per-channel poll jobs.`,\n        scopeType: 'organization',\n        organizationId,\n        tenantId,\n        scheduleType: 'interval',\n        scheduleValue: `${POLL_TICK_INTERVAL_SECONDS}s`,\n        timezone: 'UTC',\n        targetType: 'queue',\n        targetQueue: COMMUNICATION_CHANNELS_QUEUES.pollTick,\n        targetPayload: {\n          scope: { tenantId, organizationId },\n        },\n        sourceType: 'module',\n        sourceModule: 'communication_channels',\n        isEnabled: true,\n      })\n\n      // Spec C \u00A7 Phase C4 \u2014 Gmail watch renewal cron, per-org so multi-tenant\n      // deploys schedule independently.\n      await schedulerService.register({\n        id: stableScheduleUuid(`communication_channels:gmail-renew-watch:${organizationId}`),\n        name: 'Gmail watch renewal',\n        description:\n          'Daily 04:00 UTC. Re-issues gmail.users.watch for channels within OM_PUSH_RENEWAL_GMAIL_LEAD_HOURS of expiry.',\n        scopeType: 'organization',\n        organizationId,\n        tenantId,\n        scheduleType: 'cron',\n        scheduleValue: '0 4 * * *',\n        timezone: 'UTC',\n        targetType: 'queue',\n        targetQueue: COMMUNICATION_CHANNELS_QUEUES.gmailRenewWatch,\n        targetPayload: { scope: { tenantId, organizationId } },\n        sourceType: 'module',\n        sourceModule: 'communication_channels',\n        isEnabled: true,\n      })\n    } catch (error) {\n      console.warn(\n        '[communication_channels] Failed to register module schedules:',\n        error instanceof Error ? error.message : error,\n      )\n    }\n  },\n}\n\nexport default setup\n"],
-  "mappings": "AAAA,SAAS,kBAAkB;AAE3B,SAAS,qCAAqC;AA0B9C,MAAM,6BAA6B,KAAK;AAAA,EACtC;AAAA,EACA,OAAO,SAAS,QAAQ,IAAI,sCAAsC,MAAM,EAAE,KAAK;AACjF;AAQA,SAAS,mBAAmB,WAA2B;AACrD,QAAM,MAAM,WAAW,QAAQ,EAAE,OAAO,SAAS,EAAE,OAAO,KAAK;AAC/D,SAAO,GAAG,IAAI,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI,MAAM,GAAG,EAAE,CAAC,IAAI,IAAI,MAAM,IAAI,EAAE,CAAC,IAAI,IAAI,MAAM,IAAI,EAAE,CAAC,IAAI,IAAI,MAAM,IAAI,EAAE,CAAC;AAC9G;AAEA,SAAS,yBAAyB,gBAAgC;AAChE,SAAO,mBAAmB,oCAAoC,cAAc,EAAE;AAChF;AAEO,MAAM,QAA2B;AAAA,EACtC,qBAAqB;AAAA,IACnB,YAAY;AAAA,MACV;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IACA,OAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IACA,SAAS;AAAA,MACP;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IACA,UAAU;AAAA,MACR;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAM,aAAa,EAAE,WAAW,gBAAgB,SAAS,GAAG;AAc1D,UAAM,SAAS;AACf,QAAI,OAAO,OAAO,oBAAoB,cAAc,CAAC,OAAO,gBAAgB,kBAAkB,GAAG;AAC/F;AAAA,IACF;AACA,UAAM,mBAAmB,UAAU,QAAQ,kBAAkB;AAI7D,QAAI;AACF,YAAM,iBAAiB,SAAS;AAAA,QAC9B,IAAI,yBAAyB,cAAc;AAAA,QAC3C,MAAM;AAAA,QACN,aACE,4CAA4C,0BAA0B;AAAA,QACxE,WAAW;AAAA,QACX;AAAA,QACA;AAAA,QACA,cAAc;AAAA,QACd,eAAe,GAAG,0BAA0B;AAAA,QAC5C,UAAU;AAAA,QACV,YAAY;AAAA,QACZ,aAAa,8BAA8B;AAAA,QAC3C,eAAe;AAAA,UACb,OAAO,EAAE,UAAU,eAAe;AAAA,QACpC;AAAA,QACA,YAAY;AAAA,QACZ,cAAc;AAAA,QACd,WAAW;AAAA,MACb,CAAC;AAID,YAAM,iBAAiB,SAAS;AAAA,QAC9B,IAAI,mBAAmB,4CAA4C,cAAc,EAAE;AAAA,QACnF,MAAM;AAAA,QACN,aACE;AAAA,QACF,WAAW;AAAA,QACX;AAAA,QACA;AAAA,QACA,cAAc;AAAA,QACd,eAAe;AAAA,QACf,UAAU;AAAA,QACV,YAAY;AAAA,QACZ,aAAa,8BAA8B;AAAA,QAC3C,eAAe,EAAE,OAAO,EAAE,UAAU,eAAe,EAAE;AAAA,QACrD,YAAY;AAAA,QACZ,cAAc;AAAA,QACd,WAAW;AAAA,MACb,CAAC;AAAA,IACH,SAAS,OAAO;AACd,cAAQ;AAAA,QACN;AAAA,QACA,iBAAiB,QAAQ,MAAM,UAAU;AAAA,MAC3C;AAAA,IACF;AAAA,EACF;AACF;AAEA,IAAO,gBAAQ;",
+  "sourcesContent": ["import { createHash } from 'node:crypto'\nimport type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'\nimport { COMMUNICATION_CHANNELS_QUEUES } from './lib/queue'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('communication_channels')\n\ntype SchedulerServiceLike = {\n  register: (registration: {\n    id: string\n    name: string\n    scopeType: 'system' | 'organization' | 'tenant'\n    organizationId?: string\n    tenantId?: string\n    scheduleType: 'cron' | 'interval'\n    scheduleValue: string\n    timezone?: string\n    targetType: 'queue' | 'command'\n    targetQueue?: string\n    targetPayload?: unknown\n    sourceType?: 'user' | 'module'\n    sourceModule?: string\n    isEnabled?: boolean\n    description?: string\n  }) => Promise<void>\n}\n\n/**\n * Tick interval in seconds. Default 60s per email integration spec\n * \u00A7 Hub Deltas \u2192 Delta 6 (scheduler mechanism).\n */\nconst POLL_TICK_INTERVAL_SECONDS = Math.max(\n  10,\n  Number.parseInt(process.env.OM_HUB_POLL_SCHEDULER_TICK_SECONDS ?? '60', 10) || 60,\n)\n\n/**\n * `scheduled_jobs.id` is a uuid column, so a module-owned schedule's stable\n * registration key must be hashed into a uuid rather than used verbatim \u2014 this\n * keeps `schedulerService.register()` an idempotent upsert across re-runs of\n * seedDefaults instead of trying to insert a raw string into the uuid PK.\n */\nfunction stableScheduleUuid(stableKey: string): string {\n  const hex = createHash('sha256').update(stableKey).digest('hex')\n  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20, 32)}`\n}\n\nfunction stablePollTickScheduleId(organizationId: string): string {\n  return stableScheduleUuid(`communication_channels:poll-tick:${organizationId}`)\n}\n\nexport const setup: ModuleSetupConfig = {\n  defaultRoleFeatures: {\n    superadmin: [\n      'communication_channels.view',\n      'communication_channels.manage',\n      'communication_channels.react',\n      'communication_channels.assign',\n      'communication_channels.connect_user_channel',\n      'communication_channels.admin',\n      'communication_channels.channel.import_history',\n      'communication_channels.channel.push.manage',\n    ],\n    admin: [\n      'communication_channels.view',\n      'communication_channels.manage',\n      'communication_channels.react',\n      'communication_channels.assign',\n      'communication_channels.connect_user_channel',\n      'communication_channels.admin',\n      'communication_channels.channel.import_history',\n      'communication_channels.channel.push.manage',\n    ],\n    manager: [\n      'communication_channels.view',\n      'communication_channels.manage',\n      'communication_channels.react',\n      'communication_channels.assign',\n      'communication_channels.connect_user_channel',\n    ],\n    employee: [\n      'communication_channels.view',\n      'communication_channels.react',\n      'communication_channels.connect_user_channel',\n    ],\n  },\n\n  async seedDefaults({ container, organizationId, tenantId }) {\n    /**\n     * Register the per-channel polling tick with `@open-mercato/scheduler`.\n     *\n     * Per email integration spec \u00A7 Hub Deltas \u2192 Delta 6: every\n     * `POLL_TICK_INTERVAL_SECONDS` (default 60s), enqueue a single\n     * `communication-channels-poll-tick` job that enumerates due channels and\n     * fans out to the `communication-channels-poll` queue.\n     *\n     * The registration is per-organization (one tick row per org/tenant pair)\n     * so multi-tenant deploys schedule independently. Skipped silently when the\n     * scheduler module isn't enabled \u2014 keeps the hub usable in scheduler-less\n     * test harnesses.\n     */\n    const cradle = container as { hasRegistration?: (name: string) => boolean }\n    if (typeof cradle.hasRegistration !== 'function' || !cradle.hasRegistration('schedulerService')) {\n      return\n    }\n    const schedulerService = container.resolve('schedulerService') as SchedulerServiceLike\n    // Best-effort: a scheduler failure must not abort tenant initialization for\n    // every other module (mirrors the ai_assistant setup pattern). The schedule\n    // ids are deterministic uuids so re-runs upsert idempotently.\n    try {\n      await schedulerService.register({\n        id: stablePollTickScheduleId(organizationId),\n        name: 'Communication channels poll tick',\n        description:\n          `Enumerates active polling channels every ${POLL_TICK_INTERVAL_SECONDS}s and enqueues per-channel poll jobs.`,\n        scopeType: 'organization',\n        organizationId,\n        tenantId,\n        scheduleType: 'interval',\n        scheduleValue: `${POLL_TICK_INTERVAL_SECONDS}s`,\n        timezone: 'UTC',\n        targetType: 'queue',\n        targetQueue: COMMUNICATION_CHANNELS_QUEUES.pollTick,\n        targetPayload: {\n          scope: { tenantId, organizationId },\n        },\n        sourceType: 'module',\n        sourceModule: 'communication_channels',\n        isEnabled: true,\n      })\n\n      // Spec C \u00A7 Phase C4 \u2014 Gmail watch renewal cron, per-org so multi-tenant\n      // deploys schedule independently.\n      await schedulerService.register({\n        id: stableScheduleUuid(`communication_channels:gmail-renew-watch:${organizationId}`),\n        name: 'Gmail watch renewal',\n        description:\n          'Daily 04:00 UTC. Re-issues gmail.users.watch for channels within OM_PUSH_RENEWAL_GMAIL_LEAD_HOURS of expiry.',\n        scopeType: 'organization',\n        organizationId,\n        tenantId,\n        scheduleType: 'cron',\n        scheduleValue: '0 4 * * *',\n        timezone: 'UTC',\n        targetType: 'queue',\n        targetQueue: COMMUNICATION_CHANNELS_QUEUES.gmailRenewWatch,\n        targetPayload: { scope: { tenantId, organizationId } },\n        sourceType: 'module',\n        sourceModule: 'communication_channels',\n        isEnabled: true,\n      })\n    } catch (error) {\n      logger.warn('Failed to register module schedules', { err: error })\n    }\n  },\n}\n\nexport default setup\n"],
+  "mappings": "AAAA,SAAS,kBAAkB;AAE3B,SAAS,qCAAqC;AAC9C,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,wBAAwB;AA0BpD,MAAM,6BAA6B,KAAK;AAAA,EACtC;AAAA,EACA,OAAO,SAAS,QAAQ,IAAI,sCAAsC,MAAM,EAAE,KAAK;AACjF;AAQA,SAAS,mBAAmB,WAA2B;AACrD,QAAM,MAAM,WAAW,QAAQ,EAAE,OAAO,SAAS,EAAE,OAAO,KAAK;AAC/D,SAAO,GAAG,IAAI,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI,MAAM,GAAG,EAAE,CAAC,IAAI,IAAI,MAAM,IAAI,EAAE,CAAC,IAAI,IAAI,MAAM,IAAI,EAAE,CAAC,IAAI,IAAI,MAAM,IAAI,EAAE,CAAC;AAC9G;AAEA,SAAS,yBAAyB,gBAAgC;AAChE,SAAO,mBAAmB,oCAAoC,cAAc,EAAE;AAChF;AAEO,MAAM,QAA2B;AAAA,EACtC,qBAAqB;AAAA,IACnB,YAAY;AAAA,MACV;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IACA,OAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IACA,SAAS;AAAA,MACP;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IACA,UAAU;AAAA,MACR;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAM,aAAa,EAAE,WAAW,gBAAgB,SAAS,GAAG;AAc1D,UAAM,SAAS;AACf,QAAI,OAAO,OAAO,oBAAoB,cAAc,CAAC,OAAO,gBAAgB,kBAAkB,GAAG;AAC/F;AAAA,IACF;AACA,UAAM,mBAAmB,UAAU,QAAQ,kBAAkB;AAI7D,QAAI;AACF,YAAM,iBAAiB,SAAS;AAAA,QAC9B,IAAI,yBAAyB,cAAc;AAAA,QAC3C,MAAM;AAAA,QACN,aACE,4CAA4C,0BAA0B;AAAA,QACxE,WAAW;AAAA,QACX;AAAA,QACA;AAAA,QACA,cAAc;AAAA,QACd,eAAe,GAAG,0BAA0B;AAAA,QAC5C,UAAU;AAAA,QACV,YAAY;AAAA,QACZ,aAAa,8BAA8B;AAAA,QAC3C,eAAe;AAAA,UACb,OAAO,EAAE,UAAU,eAAe;AAAA,QACpC;AAAA,QACA,YAAY;AAAA,QACZ,cAAc;AAAA,QACd,WAAW;AAAA,MACb,CAAC;AAID,YAAM,iBAAiB,SAAS;AAAA,QAC9B,IAAI,mBAAmB,4CAA4C,cAAc,EAAE;AAAA,QACnF,MAAM;AAAA,QACN,aACE;AAAA,QACF,WAAW;AAAA,QACX;AAAA,QACA;AAAA,QACA,cAAc;AAAA,QACd,eAAe;AAAA,QACf,UAAU;AAAA,QACV,YAAY;AAAA,QACZ,aAAa,8BAA8B;AAAA,QAC3C,eAAe,EAAE,OAAO,EAAE,UAAU,eAAe,EAAE;AAAA,QACrD,YAAY;AAAA,QACZ,cAAc;AAAA,QACd,WAAW;AAAA,MACb,CAAC;AAAA,IACH,SAAS,OAAO;AACd,aAAO,KAAK,uCAAuC,EAAE,KAAK,MAAM,CAAC;AAAA,IACnE;AAAA,EACF;AACF;AAEA,IAAO,gBAAQ;",
   "names": []
 }

package/dist/modules/communication_channels/workers/channel-import-history.js

@@ -6,6 +6,8 @@ import {
 import { COMMUNICATION_CHANNELS_QUEUES } from "../lib/queue.js";
 import { refreshCredentialsIfNeeded } from "../lib/credential-refresh.js";
 import { classifyOutboundError } from "../lib/error-classification.js";
+import { createLogger } from "@open-mercato/shared/lib/logger";
+const logger = createLogger("communication_channels").child({ component: "channel-import-history" });
 const metadata = {
   queue: COMMUNICATION_CHANNELS_QUEUES.importHistory,
   id: "communication_channels:channel-import-history",
@@ -141,9 +143,7 @@ async function handle(job, ctx) {
           if (classification.transient) {
             throw err;
           }
-          console.warn(
-            `[communication_channels:channel-import-history] permanent ingest failure on channel ${channel.id}; skipping message ${message.externalMessageId}. Reason: ${classification.message}`
-          );
+          logger.warn("permanent ingest failure; skipping message", { channelId: channel.id, externalMessageId: message.externalMessageId, reason: classification.message });
         }
         processedCount += 1;
       }
@@ -171,9 +171,7 @@ async function handle(job, ctx) {
         progressContext
       );
     } catch (failErr) {
-      console.error(
-        `[communication_channels:channel-import-history] failed to mark progress job ${progressJobId} as failed: ${failErr instanceof Error ? failErr.message : String(failErr)}`
-      );
+      logger.error("failed to mark progress job as failed", { progressJobId, err: failErr });
     }
     throw err;
   }

package/dist/modules/communication_channels/workers/channel-import-history.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/communication_channels/workers/channel-import-history.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport type { JobContext, QueuedJob, WorkerMeta } from '@open-mercato/queue'\nimport type { CommandBus } from '@open-mercato/shared/lib/commands'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { CommunicationChannel } from '../data/entities'\nimport {\n  COMMUNICATION_CHANNELS_INGEST_INBOUND_COMMAND_ID,\n  type IngestInboundMessageInput,\n} from '../commands/ingest-inbound-message'\nimport { COMMUNICATION_CHANNELS_QUEUES } from '../lib/queue'\nimport { refreshCredentialsIfNeeded } from '../lib/credential-refresh'\nimport { classifyOutboundError } from '../lib/error-classification'\nimport type { ChannelAdapterRegistry } from '../lib/registry'\nimport type {\n  ChannelImportHistoryJobPayload,\n} from '../commands/queue-import-history'\nimport type {\n  ProgressService,\n  ProgressServiceContext,\n} from '../../progress/lib/progressService'\n\n/**\n * Spec B \u00A7 Phase B6 \u2014 operator-triggered backlog import worker.\n *\n * Distinct from `poll-channel` (which runs every scheduler tick and ingests\n * *new* mail since the channel cursor). This worker reaches backward in time\n * by calling `adapter.importHistory` with explicit `sinceDays` / `contactEmails`\n * filters, paginating until the adapter signals `hasMore: false` or the\n * `maxMessages` cap is reached.\n *\n * Runs with `concurrency: 1` to avoid hammering the provider with multiple\n * historical sweeps in parallel; per-channel concurrency is additionally\n * enforced at enqueue time by `queueImportHistory`.\n */\nexport const metadata: WorkerMeta = {\n  queue: COMMUNICATION_CHANNELS_QUEUES.importHistory,\n  id: 'communication_channels:channel-import-history',\n  concurrency: 1,\n}\n\ntype HandlerContext = JobContext & {\n  resolve: <T = unknown>(name: string) => T\n}\n\ntype CredentialsServiceLike = {\n  resolve: (\n    integrationId: string,\n    scope: { organizationId: string; tenantId: string; userId?: string | null },\n  ) => Promise<Record<string, unknown> | null>\n  save?: (\n    integrationId: string,\n    credentials: Record<string, unknown>,\n    scope: { organizationId: string; tenantId: string; userId?: string | null },\n  ) => Promise<void>\n}\n\nexport default async function handle(\n  job: QueuedJob<ChannelImportHistoryJobPayload>,\n  ctx: HandlerContext,\n): Promise<void> {\n  const payload = job.payload\n  const { progressJobId, channelId, sinceDays, contactEmails, maxMessages, scope } = payload\n\n  const progressService = ctx.resolve<ProgressService>('progressService')\n  const progressContext: ProgressServiceContext = {\n    tenantId: scope.tenantId,\n    organizationId: scope.organizationId,\n  }\n\n  const em = (ctx.resolve('em') as EntityManager).fork()\n  const adapterRegistry = ctx.resolve<ChannelAdapterRegistry>('channelAdapterRegistry')\n\n  try {\n    await progressService.startJob(progressJobId, progressContext)\n\n    const channel = await findOneWithDecryption(\n      em,\n      CommunicationChannel,\n      {\n        id: channelId,\n        tenantId: scope.tenantId,\n        organizationId: scope.organizationId,\n        deletedAt: null,\n      },\n      undefined,\n      scope,\n    )\n    if (!channel) {\n      await progressService.failJob(\n        progressJobId,\n        { errorMessage: 'Channel not found' },\n        progressContext,\n      )\n      return\n    }\n    if (!channel.isActive || channel.status !== 'connected') {\n      await progressService.failJob(\n        progressJobId,\n        { errorMessage: `Channel is not connected (status=${channel.status})` },\n        progressContext,\n      )\n      return\n    }\n\n    const adapter = adapterRegistry?.get(channel.providerKey)\n    if (!adapter || typeof adapter.importHistory !== 'function') {\n      await progressService.failJob(\n        progressJobId,\n        {\n          errorMessage: `Provider \"${channel.providerKey}\" does not support history import`,\n        },\n        progressContext,\n      )\n      return\n    }\n\n    // Resolve + refresh credentials. Same flow as poll-channel.\n    let credentialsService: CredentialsServiceLike | null = null\n    try {\n      credentialsService = ctx.resolve<CredentialsServiceLike>('integrationCredentialsService')\n    } catch {\n      credentialsService = null\n    }\n    const credentialsScope = {\n      tenantId: scope.tenantId,\n      organizationId: scope.organizationId,\n      userId: channel.userId ?? null,\n    }\n    let credentials: Record<string, unknown> = {}\n    if (channel.credentialsRef && credentialsService) {\n      try {\n        credentials =\n          (await credentialsService.resolve(`channel_${channel.providerKey}`, credentialsScope)) ?? {}\n      } catch {\n        credentials = {}\n      }\n    }\n    const refreshed = await refreshCredentialsIfNeeded(\n      { adapter, channelId: channel.id, credentials, scope: credentialsScope },\n      { credentialsService },\n    )\n    credentials = refreshed.credentials\n\n    const commandBus = ctx.resolve<CommandBus>('commandBus')\n    const containerProxy = { resolve: ctx.resolve.bind(ctx) }\n    const commandCtx = {\n      container: containerProxy as never,\n      auth: null,\n      organizationScope: null,\n      selectedOrganizationId: scope.organizationId,\n      organizationIds: [scope.organizationId],\n    }\n\n    let cursor: string | undefined\n    let processedCount = 0\n    let totalCount = maxMessages\n    let firstPage = true\n\n    // Bounded loop guards against a misbehaving adapter (infinite hasMore).\n    // 100 pages * HARD_CAP (default 200) = 20k messages \u2014 far above the 5k cap\n    // enforced by the schema, so this only trips on adapter bugs.\n    const MAX_PAGES = 100\n    for (let pageIndex = 0; pageIndex < MAX_PAGES; pageIndex += 1) {\n      if (await progressService.isCancellationRequested(progressJobId, scope.tenantId, scope.organizationId)) {\n        await progressService.markCancelled(progressJobId, progressContext)\n        return\n      }\n\n      const page = await adapter.importHistory!({\n        credentials,\n        scope: { tenantId: scope.tenantId, organizationId: scope.organizationId },\n        sinceDays,\n        contactEmails,\n        maxMessages,\n        cursor,\n      })\n\n      if (firstPage && typeof page.totalCandidates === 'number') {\n        totalCount = Math.min(maxMessages, page.totalCandidates)\n        await progressService.updateProgress(\n          progressJobId,\n          { totalCount, processedCount: 0 },\n          progressContext,\n        )\n        firstPage = false\n      }\n\n      for (const message of page.messages) {\n        if (processedCount >= maxMessages) break\n        try {\n          const input: IngestInboundMessageInput = {\n            channelId: channel.id,\n            providerKey: channel.providerKey,\n            channelType: channel.channelType,\n            scope: { tenantId: scope.tenantId, organizationId: scope.organizationId },\n            message,\n          }\n          await commandBus.execute(COMMUNICATION_CHANNELS_INGEST_INBOUND_COMMAND_ID, {\n            input,\n            ctx: commandCtx as never,\n          })\n        } catch (err) {\n          // Import-history is best-effort per-message. Same classification\n          // logic as poll-channel: a transient failure aborts the whole job\n          // (the operator can retry), permanent failures are logged and\n          // skipped (the bad message would loop forever otherwise).\n          const classification = classifyOutboundError(err)\n          if (classification.transient) {\n            throw err\n          }\n          console.warn(\n            `[communication_channels:channel-import-history] permanent ingest failure on channel ${channel.id}; skipping message ${message.externalMessageId}. Reason: ${classification.message}`,\n          )\n        }\n        processedCount += 1\n      }\n\n      await progressService.updateProgress(\n        progressJobId,\n        { processedCount, totalCount },\n        progressContext,\n      )\n\n      if (processedCount >= maxMessages) break\n      if (!page.hasMore || !page.nextCursor) break\n      cursor = page.nextCursor\n    }\n\n    await progressService.completeJob(\n      progressJobId,\n      { resultSummary: { importedCount: processedCount, channelId } },\n      progressContext,\n    )\n  } catch (err) {\n    const message = err instanceof Error ? err.message : 'Import history job failed'\n    const stack = err instanceof Error ? err.stack : undefined\n    try {\n      await progressService.failJob(\n        progressJobId,\n        { errorMessage: message.slice(0, 2000), errorStack: stack?.slice(0, 10000) },\n        progressContext,\n      )\n    } catch (failErr) {\n      console.error(\n        `[communication_channels:channel-import-history] failed to mark progress job ${progressJobId} as failed: ${\n          failErr instanceof Error ? failErr.message : String(failErr)\n        }`,\n      )\n    }\n    throw err\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport type { JobContext, QueuedJob, WorkerMeta } from '@open-mercato/queue'\nimport type { CommandBus } from '@open-mercato/shared/lib/commands'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { CommunicationChannel } from '../data/entities'\nimport {\n  COMMUNICATION_CHANNELS_INGEST_INBOUND_COMMAND_ID,\n  type IngestInboundMessageInput,\n} from '../commands/ingest-inbound-message'\nimport { COMMUNICATION_CHANNELS_QUEUES } from '../lib/queue'\nimport { refreshCredentialsIfNeeded } from '../lib/credential-refresh'\nimport { classifyOutboundError } from '../lib/error-classification'\nimport type { ChannelAdapterRegistry } from '../lib/registry'\nimport type {\n  ChannelImportHistoryJobPayload,\n} from '../commands/queue-import-history'\nimport type {\n  ProgressService,\n  ProgressServiceContext,\n} from '../../progress/lib/progressService'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('communication_channels').child({ component: 'channel-import-history' })\n\n/**\n * Spec B \u00A7 Phase B6 \u2014 operator-triggered backlog import worker.\n *\n * Distinct from `poll-channel` (which runs every scheduler tick and ingests\n * *new* mail since the channel cursor). This worker reaches backward in time\n * by calling `adapter.importHistory` with explicit `sinceDays` / `contactEmails`\n * filters, paginating until the adapter signals `hasMore: false` or the\n * `maxMessages` cap is reached.\n *\n * Runs with `concurrency: 1` to avoid hammering the provider with multiple\n * historical sweeps in parallel; per-channel concurrency is additionally\n * enforced at enqueue time by `queueImportHistory`.\n */\nexport const metadata: WorkerMeta = {\n  queue: COMMUNICATION_CHANNELS_QUEUES.importHistory,\n  id: 'communication_channels:channel-import-history',\n  concurrency: 1,\n}\n\ntype HandlerContext = JobContext & {\n  resolve: <T = unknown>(name: string) => T\n}\n\ntype CredentialsServiceLike = {\n  resolve: (\n    integrationId: string,\n    scope: { organizationId: string; tenantId: string; userId?: string | null },\n  ) => Promise<Record<string, unknown> | null>\n  save?: (\n    integrationId: string,\n    credentials: Record<string, unknown>,\n    scope: { organizationId: string; tenantId: string; userId?: string | null },\n  ) => Promise<void>\n}\n\nexport default async function handle(\n  job: QueuedJob<ChannelImportHistoryJobPayload>,\n  ctx: HandlerContext,\n): Promise<void> {\n  const payload = job.payload\n  const { progressJobId, channelId, sinceDays, contactEmails, maxMessages, scope } = payload\n\n  const progressService = ctx.resolve<ProgressService>('progressService')\n  const progressContext: ProgressServiceContext = {\n    tenantId: scope.tenantId,\n    organizationId: scope.organizationId,\n  }\n\n  const em = (ctx.resolve('em') as EntityManager).fork()\n  const adapterRegistry = ctx.resolve<ChannelAdapterRegistry>('channelAdapterRegistry')\n\n  try {\n    await progressService.startJob(progressJobId, progressContext)\n\n    const channel = await findOneWithDecryption(\n      em,\n      CommunicationChannel,\n      {\n        id: channelId,\n        tenantId: scope.tenantId,\n        organizationId: scope.organizationId,\n        deletedAt: null,\n      },\n      undefined,\n      scope,\n    )\n    if (!channel) {\n      await progressService.failJob(\n        progressJobId,\n        { errorMessage: 'Channel not found' },\n        progressContext,\n      )\n      return\n    }\n    if (!channel.isActive || channel.status !== 'connected') {\n      await progressService.failJob(\n        progressJobId,\n        { errorMessage: `Channel is not connected (status=${channel.status})` },\n        progressContext,\n      )\n      return\n    }\n\n    const adapter = adapterRegistry?.get(channel.providerKey)\n    if (!adapter || typeof adapter.importHistory !== 'function') {\n      await progressService.failJob(\n        progressJobId,\n        {\n          errorMessage: `Provider \"${channel.providerKey}\" does not support history import`,\n        },\n        progressContext,\n      )\n      return\n    }\n\n    // Resolve + refresh credentials. Same flow as poll-channel.\n    let credentialsService: CredentialsServiceLike | null = null\n    try {\n      credentialsService = ctx.resolve<CredentialsServiceLike>('integrationCredentialsService')\n    } catch {\n      credentialsService = null\n    }\n    const credentialsScope = {\n      tenantId: scope.tenantId,\n      organizationId: scope.organizationId,\n      userId: channel.userId ?? null,\n    }\n    let credentials: Record<string, unknown> = {}\n    if (channel.credentialsRef && credentialsService) {\n      try {\n        credentials =\n          (await credentialsService.resolve(`channel_${channel.providerKey}`, credentialsScope)) ?? {}\n      } catch {\n        credentials = {}\n      }\n    }\n    const refreshed = await refreshCredentialsIfNeeded(\n      { adapter, channelId: channel.id, credentials, scope: credentialsScope },\n      { credentialsService },\n    )\n    credentials = refreshed.credentials\n\n    const commandBus = ctx.resolve<CommandBus>('commandBus')\n    const containerProxy = { resolve: ctx.resolve.bind(ctx) }\n    const commandCtx = {\n      container: containerProxy as never,\n      auth: null,\n      organizationScope: null,\n      selectedOrganizationId: scope.organizationId,\n      organizationIds: [scope.organizationId],\n    }\n\n    let cursor: string | undefined\n    let processedCount = 0\n    let totalCount = maxMessages\n    let firstPage = true\n\n    // Bounded loop guards against a misbehaving adapter (infinite hasMore).\n    // 100 pages * HARD_CAP (default 200) = 20k messages \u2014 far above the 5k cap\n    // enforced by the schema, so this only trips on adapter bugs.\n    const MAX_PAGES = 100\n    for (let pageIndex = 0; pageIndex < MAX_PAGES; pageIndex += 1) {\n      if (await progressService.isCancellationRequested(progressJobId, scope.tenantId, scope.organizationId)) {\n        await progressService.markCancelled(progressJobId, progressContext)\n        return\n      }\n\n      const page = await adapter.importHistory!({\n        credentials,\n        scope: { tenantId: scope.tenantId, organizationId: scope.organizationId },\n        sinceDays,\n        contactEmails,\n        maxMessages,\n        cursor,\n      })\n\n      if (firstPage && typeof page.totalCandidates === 'number') {\n        totalCount = Math.min(maxMessages, page.totalCandidates)\n        await progressService.updateProgress(\n          progressJobId,\n          { totalCount, processedCount: 0 },\n          progressContext,\n        )\n        firstPage = false\n      }\n\n      for (const message of page.messages) {\n        if (processedCount >= maxMessages) break\n        try {\n          const input: IngestInboundMessageInput = {\n            channelId: channel.id,\n            providerKey: channel.providerKey,\n            channelType: channel.channelType,\n            scope: { tenantId: scope.tenantId, organizationId: scope.organizationId },\n            message,\n          }\n          await commandBus.execute(COMMUNICATION_CHANNELS_INGEST_INBOUND_COMMAND_ID, {\n            input,\n            ctx: commandCtx as never,\n          })\n        } catch (err) {\n          // Import-history is best-effort per-message. Same classification\n          // logic as poll-channel: a transient failure aborts the whole job\n          // (the operator can retry), permanent failures are logged and\n          // skipped (the bad message would loop forever otherwise).\n          const classification = classifyOutboundError(err)\n          if (classification.transient) {\n            throw err\n          }\n          logger.warn('permanent ingest failure; skipping message', { channelId: channel.id, externalMessageId: message.externalMessageId, reason: classification.message })\n        }\n        processedCount += 1\n      }\n\n      await progressService.updateProgress(\n        progressJobId,\n        { processedCount, totalCount },\n        progressContext,\n      )\n\n      if (processedCount >= maxMessages) break\n      if (!page.hasMore || !page.nextCursor) break\n      cursor = page.nextCursor\n    }\n\n    await progressService.completeJob(\n      progressJobId,\n      { resultSummary: { importedCount: processedCount, channelId } },\n      progressContext,\n    )\n  } catch (err) {\n    const message = err instanceof Error ? err.message : 'Import history job failed'\n    const stack = err instanceof Error ? err.stack : undefined\n    try {\n      await progressService.failJob(\n        progressJobId,\n        { errorMessage: message.slice(0, 2000), errorStack: stack?.slice(0, 10000) },\n        progressContext,\n      )\n    } catch (failErr) {\n      logger.error('failed to mark progress job as failed', { progressJobId, err: failErr })\n    }\n    throw err\n  }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/communication_channels/workers/gmail-history-sync.js

@@ -8,6 +8,8 @@ import { preservePushState } from "../lib/push-state.js";
 import { refreshCredentialsIfNeeded } from "../lib/credential-refresh.js";
 import { classifyOutboundError } from "../lib/error-classification.js";
 import { writeIngestDeadLetter } from "../lib/dead-letter.js";
+import { createLogger } from "@open-mercato/shared/lib/logger";
+const logger = createLogger("communication_channels").child({ component: "gmail-history-sync" });
 const MAX_DRAIN_PAGES = 100;
 const metadata = {
   queue: COMMUNICATION_CHANNELS_QUEUES.gmailHistorySync,
@@ -31,15 +33,13 @@ async function handle(job, ctx) {
     scope
   );
   if (!channel) {
-    console.warn(`[gmail-history-sync] channel ${channelId} not found (skip)`);
+    logger.warn("channel not found (skip)", { channelId });
     return;
   }
   if (!channel.isActive || channel.status !== "connected") return;
   const adapter = adapterRegistry?.get(channel.providerKey);
   if (!adapter || typeof adapter.applyPushNotification !== "function") {
-    console.warn(
-      `[gmail-history-sync] adapter for '${channel.providerKey}' does not support applyPushNotification`
-    );
+    logger.warn("adapter does not support applyPushNotification", { providerKey: channel.providerKey });
     return;
   }
   let credentialsService = null;
@@ -77,9 +77,7 @@ async function handle(job, ctx) {
   } catch (err) {
     const classification = classifyOutboundError(err);
     if (classification.transient) throw err;
-    console.warn(
-      `[gmail-history-sync] permanent failure applying push for channel ${channel.id}: ${classification.message}`
-    );
+    logger.warn("permanent failure applying push for channel", { channelId: channel.id, reason: classification.message });
     return;
   }
   const messages = Array.isArray(page?.messages) ? page.messages : [];
@@ -111,9 +109,7 @@ async function handle(job, ctx) {
         if (classification.transient) {
           throw err;
         }
-        console.warn(
-          `[gmail-history-sync] permanent ingest failure for channel ${channel.id}: ${classification.message}`
-        );
+        logger.warn("permanent ingest failure for channel", { channelId: channel.id, reason: classification.message });
         await writeIngestDeadLetter({ em, scope, channel, message, err, errorMessage: classification.message });
       }
     }
@@ -125,9 +121,7 @@ async function handle(job, ctx) {
       channel.lastPolledAt = /* @__PURE__ */ new Date();
       await em.flush();
     } catch (err) {
-      console.warn(
-        `[gmail-history-sync] failed to persist next cursor for channel ${channel.id}: ${err instanceof Error ? err.message : String(err)}`
-      );
+      logger.warn("failed to persist next cursor for channel", { channelId: channel.id, err });
     }
   }
   if (page?.hasMore && page?.nextCursor) {
@@ -141,9 +135,7 @@ async function handle(job, ctx) {
         { delayMs: 250 }
       );
     } else {
-      console.warn(
-        `[gmail-history-sync] drain page cap (${MAX_DRAIN_PAGES}) reached for channel ${channelId}; stopping re-enqueue`
-      );
+      logger.warn("drain page cap reached; stopping re-enqueue", { maxDrainPages: MAX_DRAIN_PAGES, channelId });
     }
   }
 }

package/dist/modules/communication_channels/workers/gmail-history-sync.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/communication_channels/workers/gmail-history-sync.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport type { JobContext, QueuedJob, WorkerMeta } from '@open-mercato/queue'\nimport type { CommandBus } from '@open-mercato/shared/lib/commands'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { CommunicationChannel } from '../data/entities'\nimport {\n  COMMUNICATION_CHANNELS_INGEST_INBOUND_COMMAND_ID,\n  type IngestInboundMessageInput,\n} from '../commands/ingest-inbound-message'\nimport { COMMUNICATION_CHANNELS_QUEUES } from '../lib/queue'\nimport { preservePushState } from '../lib/push-state'\nimport { refreshCredentialsIfNeeded } from '../lib/credential-refresh'\nimport { classifyOutboundError } from '../lib/error-classification'\nimport { writeIngestDeadLetter } from '../lib/dead-letter'\nimport type { ChannelAdapterRegistry } from '../lib/registry'\n\n/**\n * Spec C \u00A7 Phase C2 \u2014 Gmail Pub/Sub push delivery worker.\n *\n * One job per verified webhook notification. Calls\n * `adapter.applyPushNotification(...)` to walk `users.history.list` from the\n * channel's stored `historyId`, then dispatches each message through\n * `ingest-inbound-message` (same path as the polling worker).\n *\n * Concurrency: bounded by the queue's default (10). Per-channel ordering is\n * NOT guaranteed across notifications \u2014 but the ingest command is idempotent\n * on `(channel_id, external_message_id)`, and Gmail's history cursor advances\n * monotonically per channel, so out-of-order replay is safe.\n */\nexport type GmailHistorySyncJobPayload = {\n  channelId: string\n  scope: { tenantId: string; organizationId: string | null }\n  notification: { emailAddress: string; historyId: string }\n  /** Self-re-enqueue drain counter (bounds the multi-page drain loop). */\n  drainPage?: number\n}\n\n/** Hard cap on self-re-enqueue drain pages \u2014 guards against an adapter that\n *  returns `hasMore` with a non-advancing cursor (a tight, unbounded loop). */\nconst MAX_DRAIN_PAGES = 100\n\nexport const metadata: WorkerMeta = {\n  queue: COMMUNICATION_CHANNELS_QUEUES.gmailHistorySync,\n  id: 'communication_channels:gmail-history-sync',\n  concurrency: 5,\n}\n\ntype HandlerContext = JobContext & {\n  resolve: <T = unknown>(name: string) => T\n}\n\ntype CredentialsServiceLike = {\n  resolve: (\n    integrationId: string,\n    scope: { organizationId: string; tenantId: string; userId?: string | null },\n  ) => Promise<Record<string, unknown> | null>\n  save?: (\n    integrationId: string,\n    credentials: Record<string, unknown>,\n    scope: { organizationId: string; tenantId: string; userId?: string | null },\n  ) => Promise<void>\n}\n\nexport default async function handle(\n  job: QueuedJob<GmailHistorySyncJobPayload>,\n  ctx: HandlerContext,\n): Promise<void> {\n  const { channelId, scope } = job.payload\n  const em = (ctx.resolve('em') as EntityManager).fork()\n  const adapterRegistry = ctx.resolve<ChannelAdapterRegistry>('channelAdapterRegistry')\n\n  const channel = await findOneWithDecryption(\n    em,\n    CommunicationChannel,\n    {\n      id: channelId,\n      tenantId: scope.tenantId,\n      organizationId: scope.organizationId ?? null,\n      deletedAt: null,\n    },\n    undefined,\n    scope,\n  )\n  if (!channel) {\n    console.warn(`[gmail-history-sync] channel ${channelId} not found (skip)`)\n    return\n  }\n  if (!channel.isActive || channel.status !== 'connected') return\n\n  const adapter = adapterRegistry?.get(channel.providerKey)\n  if (!adapter || typeof adapter.applyPushNotification !== 'function') {\n    console.warn(\n      `[gmail-history-sync] adapter for '${channel.providerKey}' does not support applyPushNotification`,\n    )\n    return\n  }\n\n  let credentialsService: CredentialsServiceLike | null = null\n  try {\n    credentialsService = ctx.resolve<CredentialsServiceLike>('integrationCredentialsService')\n  } catch {\n    credentialsService = null\n  }\n  const credentialsScope = {\n    tenantId: scope.tenantId,\n    organizationId: scope.organizationId ?? scope.tenantId,\n    userId: channel.userId ?? null,\n  }\n  let credentials: Record<string, unknown> = {}\n  if (channel.credentialsRef && credentialsService) {\n    try {\n      credentials =\n        (await credentialsService.resolve(`channel_${channel.providerKey}`, credentialsScope)) ?? {}\n    } catch {\n      credentials = {}\n    }\n  }\n  const refreshed = await refreshCredentialsIfNeeded(\n    { adapter, channelId: channel.id, credentials, scope: credentialsScope },\n    { credentialsService },\n  )\n  credentials = refreshed.credentials\n\n  let page\n  try {\n    page = await adapter.applyPushNotification({\n      credentials,\n      scope: { tenantId: scope.tenantId, organizationId: scope.organizationId ?? scope.tenantId },\n      channelState: (channel.channelState as Record<string, unknown> | null) ?? {},\n      notification: job.payload.notification as unknown as Record<string, unknown>,\n    })\n  } catch (err) {\n    const classification = classifyOutboundError(err)\n    if (classification.transient) throw err\n    console.warn(\n      `[gmail-history-sync] permanent failure applying push for channel ${channel.id}: ${classification.message}`,\n    )\n    return\n  }\n\n  const messages = Array.isArray(page?.messages) ? page.messages : []\n  if (messages.length > 0) {\n    const commandBus = ctx.resolve<CommandBus>('commandBus')\n    const containerProxy = { resolve: ctx.resolve.bind(ctx) }\n    const commandCtx = {\n      container: containerProxy as never,\n      auth: null,\n      organizationScope: null,\n      selectedOrganizationId: scope.organizationId ?? null,\n      organizationIds: scope.organizationId ? [scope.organizationId] : null,\n    }\n    for (const message of messages) {\n      try {\n        const input: IngestInboundMessageInput = {\n          channelId: channel.id,\n          providerKey: channel.providerKey,\n          channelType: channel.channelType,\n          scope: { tenantId: scope.tenantId, organizationId: scope.organizationId ?? null },\n          message,\n        }\n        await commandBus.execute(COMMUNICATION_CHANNELS_INGEST_INBOUND_COMMAND_ID, {\n          input,\n          ctx: commandCtx as never,\n        })\n      } catch (err) {\n        const classification = classifyOutboundError(err)\n        if (classification.transient) {\n          // Per-message commit semantics from Spec B: re-throw so queue\n          // retry re-runs from a safe point.\n          throw err\n        }\n        console.warn(\n          `[gmail-history-sync] permanent ingest failure for channel ${channel.id}: ${classification.message}`,\n        )\n        await writeIngestDeadLetter({ em, scope, channel, message, err, errorMessage: classification.message })\n      }\n    }\n  }\n\n  // Persist the adapter's advanced cursor (encoded in nextCursor) back to\n  // channel.channelState. fetchHistory's nextCursor is a base64-JSON blob\n  // mirroring the new GmailChannelState \u2014 same as the polling worker writes.\n  if (page?.nextCursor) {\n    try {\n      const decoded = JSON.parse(Buffer.from(page.nextCursor, 'base64').toString('utf-8')) as Record<string, unknown>\n      // Carry the push keys forward via preservePushState rather than spreading\n      // the decoded cursor wholesale: a blind spread would retain a stale\n      // `pendingHistoryPageToken` after a completed drain and mis-route the next\n      // push notification.\n      channel.channelState = preservePushState(channel.channelState, decoded)\n      channel.lastPolledAt = new Date()\n      await em.flush()\n    } catch (err) {\n      console.warn(\n        `[gmail-history-sync] failed to persist next cursor for channel ${channel.id}: ${\n          err instanceof Error ? err.message : String(err)\n        }`,\n      )\n    }\n  }\n\n  if (page?.hasMore && page?.nextCursor) {\n    // Re-enqueue self so the drain continues. The Pub/Sub notification fired\n    // once, but `history.list` may need multiple pages on a busy mailbox.\n    // Bound the drain and add a small delay so an adapter that returns\n    // `hasMore: true` with a non-advancing cursor cannot spin a tight,\n    // unthrottled re-enqueue loop against the provider/queue.\n    const drainPage = job.payload.drainPage ?? 0\n    if (drainPage < MAX_DRAIN_PAGES) {\n      const queue = (await import('../lib/queue')).getCommunicationChannelsQueue(\n        COMMUNICATION_CHANNELS_QUEUES.gmailHistorySync,\n      )\n      await queue.enqueue(\n        { ...job.payload, drainPage: drainPage + 1 } as unknown as Record<string, unknown>,\n        { delayMs: 250 },\n      )\n    } else {\n      console.warn(\n        `[gmail-history-sync] drain page cap (${MAX_DRAIN_PAGES}) reached for channel ${channelId}; stopping re-enqueue`,\n      )\n    }\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport type { JobContext, QueuedJob, WorkerMeta } from '@open-mercato/queue'\nimport type { CommandBus } from '@open-mercato/shared/lib/commands'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { CommunicationChannel } from '../data/entities'\nimport {\n  COMMUNICATION_CHANNELS_INGEST_INBOUND_COMMAND_ID,\n  type IngestInboundMessageInput,\n} from '../commands/ingest-inbound-message'\nimport { COMMUNICATION_CHANNELS_QUEUES } from '../lib/queue'\nimport { preservePushState } from '../lib/push-state'\nimport { refreshCredentialsIfNeeded } from '../lib/credential-refresh'\nimport { classifyOutboundError } from '../lib/error-classification'\nimport { writeIngestDeadLetter } from '../lib/dead-letter'\nimport type { ChannelAdapterRegistry } from '../lib/registry'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('communication_channels').child({ component: 'gmail-history-sync' })\n\n/**\n * Spec C \u00A7 Phase C2 \u2014 Gmail Pub/Sub push delivery worker.\n *\n * One job per verified webhook notification. Calls\n * `adapter.applyPushNotification(...)` to walk `users.history.list` from the\n * channel's stored `historyId`, then dispatches each message through\n * `ingest-inbound-message` (same path as the polling worker).\n *\n * Concurrency: bounded by the queue's default (10). Per-channel ordering is\n * NOT guaranteed across notifications \u2014 but the ingest command is idempotent\n * on `(channel_id, external_message_id)`, and Gmail's history cursor advances\n * monotonically per channel, so out-of-order replay is safe.\n */\nexport type GmailHistorySyncJobPayload = {\n  channelId: string\n  scope: { tenantId: string; organizationId: string | null }\n  notification: { emailAddress: string; historyId: string }\n  /** Self-re-enqueue drain counter (bounds the multi-page drain loop). */\n  drainPage?: number\n}\n\n/** Hard cap on self-re-enqueue drain pages \u2014 guards against an adapter that\n *  returns `hasMore` with a non-advancing cursor (a tight, unbounded loop). */\nconst MAX_DRAIN_PAGES = 100\n\nexport const metadata: WorkerMeta = {\n  queue: COMMUNICATION_CHANNELS_QUEUES.gmailHistorySync,\n  id: 'communication_channels:gmail-history-sync',\n  concurrency: 5,\n}\n\ntype HandlerContext = JobContext & {\n  resolve: <T = unknown>(name: string) => T\n}\n\ntype CredentialsServiceLike = {\n  resolve: (\n    integrationId: string,\n    scope: { organizationId: string; tenantId: string; userId?: string | null },\n  ) => Promise<Record<string, unknown> | null>\n  save?: (\n    integrationId: string,\n    credentials: Record<string, unknown>,\n    scope: { organizationId: string; tenantId: string; userId?: string | null },\n  ) => Promise<void>\n}\n\nexport default async function handle(\n  job: QueuedJob<GmailHistorySyncJobPayload>,\n  ctx: HandlerContext,\n): Promise<void> {\n  const { channelId, scope } = job.payload\n  const em = (ctx.resolve('em') as EntityManager).fork()\n  const adapterRegistry = ctx.resolve<ChannelAdapterRegistry>('channelAdapterRegistry')\n\n  const channel = await findOneWithDecryption(\n    em,\n    CommunicationChannel,\n    {\n      id: channelId,\n      tenantId: scope.tenantId,\n      organizationId: scope.organizationId ?? null,\n      deletedAt: null,\n    },\n    undefined,\n    scope,\n  )\n  if (!channel) {\n    logger.warn('channel not found (skip)', { channelId })\n    return\n  }\n  if (!channel.isActive || channel.status !== 'connected') return\n\n  const adapter = adapterRegistry?.get(channel.providerKey)\n  if (!adapter || typeof adapter.applyPushNotification !== 'function') {\n    logger.warn('adapter does not support applyPushNotification', { providerKey: channel.providerKey })\n    return\n  }\n\n  let credentialsService: CredentialsServiceLike | null = null\n  try {\n    credentialsService = ctx.resolve<CredentialsServiceLike>('integrationCredentialsService')\n  } catch {\n    credentialsService = null\n  }\n  const credentialsScope = {\n    tenantId: scope.tenantId,\n    organizationId: scope.organizationId ?? scope.tenantId,\n    userId: channel.userId ?? null,\n  }\n  let credentials: Record<string, unknown> = {}\n  if (channel.credentialsRef && credentialsService) {\n    try {\n      credentials =\n        (await credentialsService.resolve(`channel_${channel.providerKey}`, credentialsScope)) ?? {}\n    } catch {\n      credentials = {}\n    }\n  }\n  const refreshed = await refreshCredentialsIfNeeded(\n    { adapter, channelId: channel.id, credentials, scope: credentialsScope },\n    { credentialsService },\n  )\n  credentials = refreshed.credentials\n\n  let page\n  try {\n    page = await adapter.applyPushNotification({\n      credentials,\n      scope: { tenantId: scope.tenantId, organizationId: scope.organizationId ?? scope.tenantId },\n      channelState: (channel.channelState as Record<string, unknown> | null) ?? {},\n      notification: job.payload.notification as unknown as Record<string, unknown>,\n    })\n  } catch (err) {\n    const classification = classifyOutboundError(err)\n    if (classification.transient) throw err\n    logger.warn('permanent failure applying push for channel', { channelId: channel.id, reason: classification.message })\n    return\n  }\n\n  const messages = Array.isArray(page?.messages) ? page.messages : []\n  if (messages.length > 0) {\n    const commandBus = ctx.resolve<CommandBus>('commandBus')\n    const containerProxy = { resolve: ctx.resolve.bind(ctx) }\n    const commandCtx = {\n      container: containerProxy as never,\n      auth: null,\n      organizationScope: null,\n      selectedOrganizationId: scope.organizationId ?? null,\n      organizationIds: scope.organizationId ? [scope.organizationId] : null,\n    }\n    for (const message of messages) {\n      try {\n        const input: IngestInboundMessageInput = {\n          channelId: channel.id,\n          providerKey: channel.providerKey,\n          channelType: channel.channelType,\n          scope: { tenantId: scope.tenantId, organizationId: scope.organizationId ?? null },\n          message,\n        }\n        await commandBus.execute(COMMUNICATION_CHANNELS_INGEST_INBOUND_COMMAND_ID, {\n          input,\n          ctx: commandCtx as never,\n        })\n      } catch (err) {\n        const classification = classifyOutboundError(err)\n        if (classification.transient) {\n          // Per-message commit semantics from Spec B: re-throw so queue\n          // retry re-runs from a safe point.\n          throw err\n        }\n        logger.warn('permanent ingest failure for channel', { channelId: channel.id, reason: classification.message })\n        await writeIngestDeadLetter({ em, scope, channel, message, err, errorMessage: classification.message })\n      }\n    }\n  }\n\n  // Persist the adapter's advanced cursor (encoded in nextCursor) back to\n  // channel.channelState. fetchHistory's nextCursor is a base64-JSON blob\n  // mirroring the new GmailChannelState \u2014 same as the polling worker writes.\n  if (page?.nextCursor) {\n    try {\n      const decoded = JSON.parse(Buffer.from(page.nextCursor, 'base64').toString('utf-8')) as Record<string, unknown>\n      // Carry the push keys forward via preservePushState rather than spreading\n      // the decoded cursor wholesale: a blind spread would retain a stale\n      // `pendingHistoryPageToken` after a completed drain and mis-route the next\n      // push notification.\n      channel.channelState = preservePushState(channel.channelState, decoded)\n      channel.lastPolledAt = new Date()\n      await em.flush()\n    } catch (err) {\n      logger.warn('failed to persist next cursor for channel', { channelId: channel.id, err })\n    }\n  }\n\n  if (page?.hasMore && page?.nextCursor) {\n    // Re-enqueue self so the drain continues. The Pub/Sub notification fired\n    // once, but `history.list` may need multiple pages on a busy mailbox.\n    // Bound the drain and add a small delay so an adapter that returns\n    // `hasMore: true` with a non-advancing cursor cannot spin a tight,\n    // unthrottled re-enqueue loop against the provider/queue.\n    const drainPage = job.payload.drainPage ?? 0\n    if (drainPage < MAX_DRAIN_PAGES) {\n      const queue = (await import('../lib/queue')).getCommunicationChannelsQueue(\n        COMMUNICATION_CHANNELS_QUEUES.gmailHistorySync,\n      )\n      await queue.enqueue(\n        { ...job.payload, drainPage: drainPage + 1 } as unknown as Record<string, unknown>,\n        { delayMs: 250 },\n      )\n    } else {\n      logger.warn('drain page cap reached; stopping re-enqueue', { maxDrainPages: MAX_DRAIN_PAGES, channelId })\n    }\n  }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/communication_channels/workers/gmail-renew-watch.js

@@ -3,6 +3,8 @@ import { CommunicationChannel } from "../data/entities.js";
 import { COMMUNICATION_CHANNELS_QUEUES } from "../lib/queue.js";
 import { pushRenew } from "../commands/push-renew.js";
 import { emitCommunicationChannelsEvent } from "../events.js";
+import { createLogger } from "@open-mercato/shared/lib/logger";
+const logger = createLogger("communication_channels").child({ component: "gmail-renew-watch" });
 const metadata = {
   queue: COMMUNICATION_CHANNELS_QUEUES.gmailRenewWatch,
   id: "communication_channels:gmail-renew-watch",
@@ -40,9 +42,7 @@ async function handle(job, ctx) {
     if (state.watchExpirationMs > cutoffMs) continue;
     const organizationId = channel.organizationId;
     if (!organizationId) {
-      console.warn(
-        `[gmail-renew-watch] skipping channel ${channel.id} \u2014 no organizationId on row`
-      );
+      logger.warn("skipping channel \u2014 no organizationId on row", { channelId: channel.id });
       continue;
     }
     try {
@@ -73,13 +73,11 @@ async function handle(job, ctx) {
       }
     } catch (err) {
       failed += 1;
-      console.warn(
-        `[gmail-renew-watch] failed to renew channel ${channel.id}: ${err instanceof Error ? err.message : String(err)}`
-      );
+      logger.warn("failed to renew channel watch", { channelId: channel.id, err });
     }
   }
   if (renewed > 0 || failed > 0) {
-    console.info(`[gmail-renew-watch] renewed=${renewed} failed=${failed}`);
+    logger.info("gmail watch renewal summary", { renewed, failed });
   }
 }
 function resolveContainer(containerProxy, ctx) {

package/dist/modules/communication_channels/workers/gmail-renew-watch.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/communication_channels/workers/gmail-renew-watch.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport type { JobContext, QueuedJob, WorkerMeta } from '@open-mercato/queue'\nimport { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { CommunicationChannel } from '../data/entities'\nimport { COMMUNICATION_CHANNELS_QUEUES } from '../lib/queue'\nimport { pushRenew } from '../commands/push-renew'\nimport { emitCommunicationChannelsEvent } from '../events'\n\n/**\n * Spec C \u00A7 Phase C4 \u2014 Daily cron that re-issues `gmail.users.watch` for\n * channels whose `watchExpirationMs` is within the renewal lead window.\n *\n * Gmail watch expires after ~7 days. We renew with a lead time of\n * `OM_PUSH_RENEWAL_GMAIL_LEAD_HOURS` (default 24h) so a missed cron tick\n * doesn't drop us into the polling fallback.\n *\n * The actual renewal is delegated to `pushRenew` (which in turn calls\n * `pushRegister`) \u2014 Gmail's `users.watch` is idempotent, so re-calling it\n * just returns a fresh `historyId` + `expiration` and persists them.\n *\n * Scoped to `job.payload.scope` (the cron is registered per-org in\n * `setup.ts`); each per-org cron tick only walks channels for its own\n * `(tenantId, organizationId)`. A missing scope means the legacy global\n * sweep variant \u2014 supported for backwards compatibility, but new\n * registrations always carry a scope.\n */\nexport type GmailRenewWatchPayload = {\n  scope?: { tenantId: string; organizationId: string | null }\n}\n\nexport const metadata: WorkerMeta = {\n  queue: COMMUNICATION_CHANNELS_QUEUES.gmailRenewWatch,\n  id: 'communication_channels:gmail-renew-watch',\n  concurrency: 1,\n}\n\ntype HandlerContext = JobContext & { resolve: <T = unknown>(name: string) => T }\n\nconst LEAD_HOURS = Math.max(\n  1,\n  Number.parseInt(process.env.OM_PUSH_RENEWAL_GMAIL_LEAD_HOURS ?? '24', 10) || 24,\n)\n\nexport default async function handle(\n  job: QueuedJob<GmailRenewWatchPayload>,\n  ctx: HandlerContext,\n): Promise<void> {\n  const em = (ctx.resolve('em') as EntityManager).fork()\n  const cutoffMs = Date.now() + LEAD_HOURS * 60 * 60 * 1000\n  const scope = job?.payload?.scope ?? null\n\n  // Per-org cron: filter by the scope embedded in the payload. The unscoped\n  // fallback is preserved so a deploy that hand-enqueues a renewal sweep\n  // (e.g. an operator-triggered backfill) still works.\n  const where: Record<string, unknown> = {\n    providerKey: 'gmail',\n    isActive: true,\n    deletedAt: null,\n  }\n  if (scope?.tenantId) where.tenantId = scope.tenantId\n  if (scope?.organizationId) where.organizationId = scope.organizationId\n  const channels = await findWithDecryption(\n    em,\n    CommunicationChannel,\n    where,\n    undefined,\n    scope ? { tenantId: scope.tenantId, organizationId: scope.organizationId ?? null } : undefined,\n  )\n\n  const containerProxy = (ctx as unknown as { container?: unknown }).container\n  let renewed = 0\n  let failed = 0\n  for (const channel of channels) {\n    const state =\n      (channel.channelState as { watchExpirationMs?: number; pushStatus?: string } | null) ?? null\n    if (!state || state.pushStatus !== 'active') continue\n    if (typeof state.watchExpirationMs !== 'number') continue\n    if (state.watchExpirationMs > cutoffMs) continue\n\n    const organizationId = channel.organizationId\n    if (!organizationId) {\n      console.warn(\n        `[gmail-renew-watch] skipping channel ${channel.id} \u2014 no organizationId on row`,\n      )\n      continue\n    }\n\n    try {\n      const container = resolveContainer(containerProxy, ctx)\n      const result = await pushRenew({\n        container,\n        scope: {\n          tenantId: channel.tenantId,\n          organizationId,\n          userId: channel.userId ?? null,\n        },\n        input: { channelId: channel.id },\n      })\n      if (result.pushStatus === 'active') {\n        renewed += 1\n        await emitCommunicationChannelsEvent(\n          'communication_channels.push.renewed',\n          {\n            channelId: channel.id,\n            providerKey: channel.providerKey,\n            tenantId: channel.tenantId,\n            organizationId,\n          },\n          { persistent: false },\n        )\n      } else {\n        failed += 1\n      }\n    } catch (err) {\n      failed += 1\n      console.warn(\n        `[gmail-renew-watch] failed to renew channel ${channel.id}: ${\n          err instanceof Error ? err.message : String(err)\n        }`,\n      )\n    }\n  }\n  if (renewed > 0 || failed > 0) {\n    console.info(`[gmail-renew-watch] renewed=${renewed} failed=${failed}`)\n  }\n}\n\nfunction resolveContainer(\n  containerProxy: unknown,\n  ctx: { resolve: <T = unknown>(name: string) => T },\n): import('awilix').AwilixContainer {\n  // The queue runtime exposes container access via `ctx.container` in\n  // dedicated worker harnesses, but the bare-worker contract only provides\n  // `ctx.resolve(name)`. Both shapes appear in production (test harness,\n  // AUTO_SPAWN_WORKERS) so we accept either.\n  if (containerProxy && typeof containerProxy === 'object' && 'resolve' in containerProxy) {\n    return containerProxy as import('awilix').AwilixContainer\n  }\n  // Synthesize a minimal container shape from `resolve`.\n  return { resolve: ctx.resolve.bind(ctx) } as unknown as import('awilix').AwilixContainer\n}\n"],
-  "mappings": "AAEA,SAAS,0BAA0B;AACnC,SAAS,4BAA4B;AACrC,SAAS,qCAAqC;AAC9C,SAAS,iBAAiB;AAC1B,SAAS,sCAAsC;AAwBxC,MAAM,WAAuB;AAAA,EAClC,OAAO,8BAA8B;AAAA,EACrC,IAAI;AAAA,EACJ,aAAa;AACf;AAIA,MAAM,aAAa,KAAK;AAAA,EACtB;AAAA,EACA,OAAO,SAAS,QAAQ,IAAI,oCAAoC,MAAM,EAAE,KAAK;AAC/E;AAEA,eAAO,OACL,KACA,KACe;AACf,QAAM,KAAM,IAAI,QAAQ,IAAI,EAAoB,KAAK;AACrD,QAAM,WAAW,KAAK,IAAI,IAAI,aAAa,KAAK,KAAK;AACrD,QAAM,QAAQ,KAAK,SAAS,SAAS;AAKrC,QAAM,QAAiC;AAAA,IACrC,aAAa;AAAA,IACb,UAAU;AAAA,IACV,WAAW;AAAA,EACb;AACA,MAAI,OAAO,SAAU,OAAM,WAAW,MAAM;AAC5C,MAAI,OAAO,eAAgB,OAAM,iBAAiB,MAAM;AACxD,QAAM,WAAW,MAAM;AAAA,IACrB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,QAAQ,EAAE,UAAU,MAAM,UAAU,gBAAgB,MAAM,kBAAkB,KAAK,IAAI;AAAA,EACvF;AAEA,QAAM,iBAAkB,IAA2C;AACnE,MAAI,UAAU;AACd,MAAI,SAAS;AACb,aAAW,WAAW,UAAU;AAC9B,UAAM,QACH,QAAQ,gBAA+E;AAC1F,QAAI,CAAC,SAAS,MAAM,eAAe,SAAU;AAC7C,QAAI,OAAO,MAAM,sBAAsB,SAAU;AACjD,QAAI,MAAM,oBAAoB,SAAU;AAExC,UAAM,iBAAiB,QAAQ;AAC/B,QAAI,CAAC,gBAAgB;AACnB,cAAQ;AAAA,QACN,wCAAwC,QAAQ,EAAE;AAAA,MACpD;AACA;AAAA,IACF;AAEA,QAAI;AACF,YAAM,YAAY,iBAAiB,gBAAgB,GAAG;AACtD,YAAM,SAAS,MAAM,UAAU;AAAA,QAC7B;AAAA,QACA,OAAO;AAAA,UACL,UAAU,QAAQ;AAAA,UAClB;AAAA,UACA,QAAQ,QAAQ,UAAU;AAAA,QAC5B;AAAA,QACA,OAAO,EAAE,WAAW,QAAQ,GAAG;AAAA,MACjC,CAAC;AACD,UAAI,OAAO,eAAe,UAAU;AAClC,mBAAW;AACX,cAAM;AAAA,UACJ;AAAA,UACA;AAAA,YACE,WAAW,QAAQ;AAAA,YACnB,aAAa,QAAQ;AAAA,YACrB,UAAU,QAAQ;AAAA,YAClB;AAAA,UACF;AAAA,UACA,EAAE,YAAY,MAAM;AAAA,QACtB;AAAA,MACF,OAAO;AACL,kBAAU;AAAA,MACZ;AAAA,IACF,SAAS,KAAK;AACZ,gBAAU;AACV,cAAQ;AAAA,QACN,+CAA+C,QAAQ,EAAE,KACvD,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG,CACjD;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACA,MAAI,UAAU,KAAK,SAAS,GAAG;AAC7B,YAAQ,KAAK,+BAA+B,OAAO,WAAW,MAAM,EAAE;AAAA,EACxE;AACF;AAEA,SAAS,iBACP,gBACA,KACkC;AAKlC,MAAI,kBAAkB,OAAO,mBAAmB,YAAY,aAAa,gBAAgB;AACvF,WAAO;AAAA,EACT;AAEA,SAAO,EAAE,SAAS,IAAI,QAAQ,KAAK,GAAG,EAAE;AAC1C;",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport type { JobContext, QueuedJob, WorkerMeta } from '@open-mercato/queue'\nimport { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { CommunicationChannel } from '../data/entities'\nimport { COMMUNICATION_CHANNELS_QUEUES } from '../lib/queue'\nimport { pushRenew } from '../commands/push-renew'\nimport { emitCommunicationChannelsEvent } from '../events'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('communication_channels').child({ component: 'gmail-renew-watch' })\n\n/**\n * Spec C \u00A7 Phase C4 \u2014 Daily cron that re-issues `gmail.users.watch` for\n * channels whose `watchExpirationMs` is within the renewal lead window.\n *\n * Gmail watch expires after ~7 days. We renew with a lead time of\n * `OM_PUSH_RENEWAL_GMAIL_LEAD_HOURS` (default 24h) so a missed cron tick\n * doesn't drop us into the polling fallback.\n *\n * The actual renewal is delegated to `pushRenew` (which in turn calls\n * `pushRegister`) \u2014 Gmail's `users.watch` is idempotent, so re-calling it\n * just returns a fresh `historyId` + `expiration` and persists them.\n *\n * Scoped to `job.payload.scope` (the cron is registered per-org in\n * `setup.ts`); each per-org cron tick only walks channels for its own\n * `(tenantId, organizationId)`. A missing scope means the legacy global\n * sweep variant \u2014 supported for backwards compatibility, but new\n * registrations always carry a scope.\n */\nexport type GmailRenewWatchPayload = {\n  scope?: { tenantId: string; organizationId: string | null }\n}\n\nexport const metadata: WorkerMeta = {\n  queue: COMMUNICATION_CHANNELS_QUEUES.gmailRenewWatch,\n  id: 'communication_channels:gmail-renew-watch',\n  concurrency: 1,\n}\n\ntype HandlerContext = JobContext & { resolve: <T = unknown>(name: string) => T }\n\nconst LEAD_HOURS = Math.max(\n  1,\n  Number.parseInt(process.env.OM_PUSH_RENEWAL_GMAIL_LEAD_HOURS ?? '24', 10) || 24,\n)\n\nexport default async function handle(\n  job: QueuedJob<GmailRenewWatchPayload>,\n  ctx: HandlerContext,\n): Promise<void> {\n  const em = (ctx.resolve('em') as EntityManager).fork()\n  const cutoffMs = Date.now() + LEAD_HOURS * 60 * 60 * 1000\n  const scope = job?.payload?.scope ?? null\n\n  // Per-org cron: filter by the scope embedded in the payload. The unscoped\n  // fallback is preserved so a deploy that hand-enqueues a renewal sweep\n  // (e.g. an operator-triggered backfill) still works.\n  const where: Record<string, unknown> = {\n    providerKey: 'gmail',\n    isActive: true,\n    deletedAt: null,\n  }\n  if (scope?.tenantId) where.tenantId = scope.tenantId\n  if (scope?.organizationId) where.organizationId = scope.organizationId\n  const channels = await findWithDecryption(\n    em,\n    CommunicationChannel,\n    where,\n    undefined,\n    scope ? { tenantId: scope.tenantId, organizationId: scope.organizationId ?? null } : undefined,\n  )\n\n  const containerProxy = (ctx as unknown as { container?: unknown }).container\n  let renewed = 0\n  let failed = 0\n  for (const channel of channels) {\n    const state =\n      (channel.channelState as { watchExpirationMs?: number; pushStatus?: string } | null) ?? null\n    if (!state || state.pushStatus !== 'active') continue\n    if (typeof state.watchExpirationMs !== 'number') continue\n    if (state.watchExpirationMs > cutoffMs) continue\n\n    const organizationId = channel.organizationId\n    if (!organizationId) {\n      logger.warn('skipping channel \u2014 no organizationId on row', { channelId: channel.id })\n      continue\n    }\n\n    try {\n      const container = resolveContainer(containerProxy, ctx)\n      const result = await pushRenew({\n        container,\n        scope: {\n          tenantId: channel.tenantId,\n          organizationId,\n          userId: channel.userId ?? null,\n        },\n        input: { channelId: channel.id },\n      })\n      if (result.pushStatus === 'active') {\n        renewed += 1\n        await emitCommunicationChannelsEvent(\n          'communication_channels.push.renewed',\n          {\n            channelId: channel.id,\n            providerKey: channel.providerKey,\n            tenantId: channel.tenantId,\n            organizationId,\n          },\n          { persistent: false },\n        )\n      } else {\n        failed += 1\n      }\n    } catch (err) {\n      failed += 1\n      logger.warn('failed to renew channel watch', { channelId: channel.id, err })\n    }\n  }\n  if (renewed > 0 || failed > 0) {\n    logger.info('gmail watch renewal summary', { renewed, failed })\n  }\n}\n\nfunction resolveContainer(\n  containerProxy: unknown,\n  ctx: { resolve: <T = unknown>(name: string) => T },\n): import('awilix').AwilixContainer {\n  // The queue runtime exposes container access via `ctx.container` in\n  // dedicated worker harnesses, but the bare-worker contract only provides\n  // `ctx.resolve(name)`. Both shapes appear in production (test harness,\n  // AUTO_SPAWN_WORKERS) so we accept either.\n  if (containerProxy && typeof containerProxy === 'object' && 'resolve' in containerProxy) {\n    return containerProxy as import('awilix').AwilixContainer\n  }\n  // Synthesize a minimal container shape from `resolve`.\n  return { resolve: ctx.resolve.bind(ctx) } as unknown as import('awilix').AwilixContainer\n}\n"],
+  "mappings": "AAEA,SAAS,0BAA0B;AACnC,SAAS,4BAA4B;AACrC,SAAS,qCAAqC;AAC9C,SAAS,iBAAiB;AAC1B,SAAS,sCAAsC;AAC/C,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,wBAAwB,EAAE,MAAM,EAAE,WAAW,oBAAoB,CAAC;AAwBvF,MAAM,WAAuB;AAAA,EAClC,OAAO,8BAA8B;AAAA,EACrC,IAAI;AAAA,EACJ,aAAa;AACf;AAIA,MAAM,aAAa,KAAK;AAAA,EACtB;AAAA,EACA,OAAO,SAAS,QAAQ,IAAI,oCAAoC,MAAM,EAAE,KAAK;AAC/E;AAEA,eAAO,OACL,KACA,KACe;AACf,QAAM,KAAM,IAAI,QAAQ,IAAI,EAAoB,KAAK;AACrD,QAAM,WAAW,KAAK,IAAI,IAAI,aAAa,KAAK,KAAK;AACrD,QAAM,QAAQ,KAAK,SAAS,SAAS;AAKrC,QAAM,QAAiC;AAAA,IACrC,aAAa;AAAA,IACb,UAAU;AAAA,IACV,WAAW;AAAA,EACb;AACA,MAAI,OAAO,SAAU,OAAM,WAAW,MAAM;AAC5C,MAAI,OAAO,eAAgB,OAAM,iBAAiB,MAAM;AACxD,QAAM,WAAW,MAAM;AAAA,IACrB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,QAAQ,EAAE,UAAU,MAAM,UAAU,gBAAgB,MAAM,kBAAkB,KAAK,IAAI;AAAA,EACvF;AAEA,QAAM,iBAAkB,IAA2C;AACnE,MAAI,UAAU;AACd,MAAI,SAAS;AACb,aAAW,WAAW,UAAU;AAC9B,UAAM,QACH,QAAQ,gBAA+E;AAC1F,QAAI,CAAC,SAAS,MAAM,eAAe,SAAU;AAC7C,QAAI,OAAO,MAAM,sBAAsB,SAAU;AACjD,QAAI,MAAM,oBAAoB,SAAU;AAExC,UAAM,iBAAiB,QAAQ;AAC/B,QAAI,CAAC,gBAAgB;AACnB,aAAO,KAAK,oDAA+C,EAAE,WAAW,QAAQ,GAAG,CAAC;AACpF;AAAA,IACF;AAEA,QAAI;AACF,YAAM,YAAY,iBAAiB,gBAAgB,GAAG;AACtD,YAAM,SAAS,MAAM,UAAU;AAAA,QAC7B;AAAA,QACA,OAAO;AAAA,UACL,UAAU,QAAQ;AAAA,UAClB;AAAA,UACA,QAAQ,QAAQ,UAAU;AAAA,QAC5B;AAAA,QACA,OAAO,EAAE,WAAW,QAAQ,GAAG;AAAA,MACjC,CAAC;AACD,UAAI,OAAO,eAAe,UAAU;AAClC,mBAAW;AACX,cAAM;AAAA,UACJ;AAAA,UACA;AAAA,YACE,WAAW,QAAQ;AAAA,YACnB,aAAa,QAAQ;AAAA,YACrB,UAAU,QAAQ;AAAA,YAClB;AAAA,UACF;AAAA,UACA,EAAE,YAAY,MAAM;AAAA,QACtB;AAAA,MACF,OAAO;AACL,kBAAU;AAAA,MACZ;AAAA,IACF,SAAS,KAAK;AACZ,gBAAU;AACV,aAAO,KAAK,iCAAiC,EAAE,WAAW,QAAQ,IAAI,IAAI,CAAC;AAAA,IAC7E;AAAA,EACF;AACA,MAAI,UAAU,KAAK,SAAS,GAAG;AAC7B,WAAO,KAAK,+BAA+B,EAAE,SAAS,OAAO,CAAC;AAAA,EAChE;AACF;AAEA,SAAS,iBACP,gBACA,KACkC;AAKlC,MAAI,kBAAkB,OAAO,mBAAmB,YAAY,aAAa,gBAAgB;AACvF,WAAO;AAAA,EACT;AAEA,SAAO,EAAE,SAAS,IAAI,QAAQ,KAAK,GAAG,EAAE;AAC1C;",
   "names": []
 }

package/dist/modules/communication_channels/workers/outbound-delivery.js

@@ -3,6 +3,8 @@ import {
 } from "../commands/deliver-outbound-message.js";
 import { computeBackoffMs } from "../lib/error-classification.js";
 import { COMMUNICATION_CHANNELS_QUEUES, getCommunicationChannelsQueue } from "../lib/queue.js";
+import { createLogger } from "@open-mercato/shared/lib/logger";
+const logger = createLogger("communication_channels").child({ component: "outbound-delivery" });
 const OUTBOUND_DELIVERY_MAX_ATTEMPTS = 3;
 const metadata = {
   queue: COMMUNICATION_CHANNELS_QUEUES.outbound,
@@ -32,9 +34,7 @@ async function handle(job, ctx) {
     outcome = result;
   } catch (err) {
     const errorMessage = err instanceof Error ? err.message : String(err);
-    console.warn(
-      `[communication_channels:outbound-delivery] command threw on attempt ${attempt} for message ${messageId}: ${errorMessage}`
-    );
+    logger.warn("command threw during delivery attempt", { attempt, messageId, reason: errorMessage });
     if (attempt < OUTBOUND_DELIVERY_MAX_ATTEMPTS) {
       await reenqueue(job.payload, attempt);
       return;
@@ -48,22 +48,16 @@ async function handle(job, ctx) {
       return;
     case "failed": {
       if (outcome.requiresReauth && !forceCredentialRefresh && attempt < OUTBOUND_DELIVERY_MAX_ATTEMPTS) {
-        console.warn(
-          `[communication_channels:outbound-delivery] reauth failure on attempt ${attempt} for message ${messageId} (${outcome.providerKey}): ${outcome.error}. Retrying once with a forced credential refresh.`
-        );
+        logger.warn("reauth failure; retrying once with a forced credential refresh", { attempt, messageId, providerKey: outcome.providerKey, reason: outcome.error });
         await reenqueue({ ...job.payload, forceCredentialRefresh: true }, attempt);
         return;
       }
       if (outcome.transient && attempt < OUTBOUND_DELIVERY_MAX_ATTEMPTS) {
-        console.warn(
-          `[communication_channels:outbound-delivery] transient failure on attempt ${attempt} for message ${messageId} (${outcome.providerKey}): ${outcome.error}. Re-enqueueing.`
-        );
+        logger.warn("transient delivery failure; re-enqueueing", { attempt, messageId, providerKey: outcome.providerKey, reason: outcome.error });
         await reenqueue(job.payload, attempt);
         return;
       }
-      console.error(
-        `[communication_channels:outbound-delivery] giving up on message ${messageId} after attempt ${attempt} (${outcome.providerKey}): ${outcome.error}`
-      );
+      logger.error("giving up on message delivery", { messageId, attempt, providerKey: outcome.providerKey, reason: outcome.error });
       return;
     }
   }

package/dist/modules/communication_channels/workers/outbound-delivery.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/communication_channels/workers/outbound-delivery.ts"],
-  "sourcesContent": ["import type { JobContext, QueuedJob, WorkerMeta } from '@open-mercato/queue'\nimport type { CommandBus } from '@open-mercato/shared/lib/commands'\nimport {\n  COMMUNICATION_CHANNELS_DELIVER_OUTBOUND_COMMAND_ID,\n  type DeliverOutboundMessageInput,\n  type DeliverOutboundMessageResult,\n} from '../commands/deliver-outbound-message'\nimport { computeBackoffMs } from '../lib/error-classification'\nimport { COMMUNICATION_CHANNELS_QUEUES, getCommunicationChannelsQueue } from '../lib/queue'\n\n/**\n * Worker payload \u2014 the subscriber enqueues `{ messageId, scope, attempt? }`.\n *\n * `attempt` starts at 1 on first enqueue. The worker increments it when\n * re-enqueueing for retry, until `MAX_ATTEMPTS` is reached.\n */\nexport type OutboundDeliveryPayload = {\n  messageId: string\n  scope: {\n    tenantId: string\n    organizationId: string | null\n  }\n  /** Attempt number, 1-based. Set by the subscriber for the first try; the worker increments on retry. */\n  attempt?: number\n  /** Force credential refresh on this attempt \u2014 used after a 401 from the provider. */\n  forceCredentialRefresh?: boolean\n}\n\nexport const OUTBOUND_DELIVERY_MAX_ATTEMPTS = 3\n\nexport const metadata: WorkerMeta = {\n  queue: COMMUNICATION_CHANNELS_QUEUES.outbound,\n  id: 'communication_channels:outbound-delivery',\n  concurrency: 10,\n}\n\ntype HandlerContext = JobContext & {\n  resolve: <T = unknown>(name: string) => T\n}\n\n/**\n * Outbound delivery worker.\n *\n * Dispatches the `deliver_outbound_message` command which performs the actual\n * send. The command returns a classified result:\n *   - `delivered` / `already_delivered` / `no_channel_link` \u2192 success, return.\n *   - `failed` with `transient: true` \u2192 re-enqueue with exponential backoff,\n *      incremented attempt, up to `OUTBOUND_DELIVERY_MAX_ATTEMPTS`.\n *   - `failed` with `transient: false` \u2192 permanent failure, no retry.\n *\n * The command already wrote the failure record + emitted `.delivery_failed`,\n * so the worker just decides whether to schedule another attempt.\n *\n * We DO NOT throw on a recorded delivery-failure outcome \u2014 that would let the\n * queue apply its own retry policy on top of ours, double-retrying. Explicit\n * re-enqueue with delayMs is the portable, controllable pattern. The one\n * exception is an *unexpected* exception from the command itself (e.g. a DB blip\n * that stopped it from recording anything): we re-enqueue up to our max and then\n * rethrow so the infrastructure failure surfaces to the queue's dead-letter\n * instead of vanishing. The command's idempotency prevents a double-send.\n */\nexport default async function handle(\n  job: QueuedJob<OutboundDeliveryPayload>,\n  ctx: HandlerContext,\n): Promise<void> {\n  const { messageId, scope, attempt = 1, forceCredentialRefresh } = job.payload\n\n  const commandBus = ctx.resolve<CommandBus>('commandBus')\n  const containerProxy = { resolve: ctx.resolve.bind(ctx) }\n  const commandCtx = {\n    container: containerProxy as never,\n    auth: null,\n    organizationScope: null,\n    selectedOrganizationId: scope.organizationId ?? null,\n    organizationIds: scope.organizationId ? [scope.organizationId] : null,\n  }\n\n  let outcome: DeliverOutboundMessageResult\n  try {\n    const { result } = await commandBus.execute<\n      DeliverOutboundMessageInput,\n      DeliverOutboundMessageResult\n    >(\n      COMMUNICATION_CHANNELS_DELIVER_OUTBOUND_COMMAND_ID,\n      {\n        input: { messageId, scope, forceCredentialRefresh },\n        ctx: commandCtx as never,\n      },\n    )\n    outcome = result\n  } catch (err) {\n    // Unexpected error inside the command itself (e.g. DB blip). Re-enqueue\n    // up to MAX_ATTEMPTS so we don't lose deliveries due to infrastructure flakes.\n    const errorMessage = err instanceof Error ? err.message : String(err)\n    console.warn(\n      `[communication_channels:outbound-delivery] command threw on attempt ${attempt} for message ${messageId}: ${errorMessage}`,\n    )\n    if (attempt < OUTBOUND_DELIVERY_MAX_ATTEMPTS) {\n      await reenqueue(job.payload, attempt)\n      return\n    }\n    // Attempts exhausted on an unexpected command exception \u2014 rethrow so the\n    // failure reaches the queue's dead-letter / observability (see header note).\n    throw err\n  }\n\n  switch (outcome.status) {\n    case 'delivered':\n    case 'already_delivered':\n    case 'no_channel_link':\n      return\n    case 'failed': {\n      // Reauth (401 / invalid_grant): the command already flipped the channel to\n      // `requires_reauth`. Give the credentials exactly one forced-refresh retry\n      // before giving up \u2014 a near-expiry access token whose proactive refresh\n      // was skipped can still recover here. If we already forced a refresh and\n      // still got a reauth error, the token is unrecoverable: stop (the operator\n      // must reconnect).\n      if (\n        outcome.requiresReauth &&\n        !forceCredentialRefresh &&\n        attempt < OUTBOUND_DELIVERY_MAX_ATTEMPTS\n      ) {\n        console.warn(\n          `[communication_channels:outbound-delivery] reauth failure on attempt ${attempt} for message ${messageId} (${outcome.providerKey}): ${outcome.error}. Retrying once with a forced credential refresh.`,\n        )\n        await reenqueue({ ...job.payload, forceCredentialRefresh: true }, attempt)\n        return\n      }\n      if (outcome.transient && attempt < OUTBOUND_DELIVERY_MAX_ATTEMPTS) {\n        console.warn(\n          `[communication_channels:outbound-delivery] transient failure on attempt ${attempt} for message ${messageId} (${outcome.providerKey}): ${outcome.error}. Re-enqueueing.`,\n        )\n        await reenqueue(job.payload, attempt)\n        return\n      }\n      // Permanent or attempts exhausted \u2014 `.delivery_failed` was already emitted\n      // by the command, so we stop here.\n      console.error(\n        `[communication_channels:outbound-delivery] giving up on message ${messageId} after attempt ${attempt} (${outcome.providerKey}): ${outcome.error}`,\n      )\n      return\n    }\n  }\n}\n\nasync function reenqueue(payload: OutboundDeliveryPayload, attempt: number): Promise<void> {\n  const next: OutboundDeliveryPayload = {\n    ...payload,\n    attempt: attempt + 1,\n  }\n  const delayMs = computeBackoffMs(attempt)\n  const queue = getCommunicationChannelsQueue(COMMUNICATION_CHANNELS_QUEUES.outbound)\n  await queue.enqueue(next as unknown as Record<string, unknown>, { delayMs })\n}\n"],
-  "mappings": "AAEA;AAAA,EACE;AAAA,OAGK;AACP,SAAS,wBAAwB;AACjC,SAAS,+BAA+B,qCAAqC;AAoBtE,MAAM,iCAAiC;AAEvC,MAAM,WAAuB;AAAA,EAClC,OAAO,8BAA8B;AAAA,EACrC,IAAI;AAAA,EACJ,aAAa;AACf;AA2BA,eAAO,OACL,KACA,KACe;AACf,QAAM,EAAE,WAAW,OAAO,UAAU,GAAG,uBAAuB,IAAI,IAAI;AAEtE,QAAM,aAAa,IAAI,QAAoB,YAAY;AACvD,QAAM,iBAAiB,EAAE,SAAS,IAAI,QAAQ,KAAK,GAAG,EAAE;AACxD,QAAM,aAAa;AAAA,IACjB,WAAW;AAAA,IACX,MAAM;AAAA,IACN,mBAAmB;AAAA,IACnB,wBAAwB,MAAM,kBAAkB;AAAA,IAChD,iBAAiB,MAAM,iBAAiB,CAAC,MAAM,cAAc,IAAI;AAAA,EACnE;AAEA,MAAI;AACJ,MAAI;AACF,UAAM,EAAE,OAAO,IAAI,MAAM,WAAW;AAAA,MAIlC;AAAA,MACA;AAAA,QACE,OAAO,EAAE,WAAW,OAAO,uBAAuB;AAAA,QAClD,KAAK;AAAA,MACP;AAAA,IACF;AACA,cAAU;AAAA,EACZ,SAAS,KAAK;AAGZ,UAAM,eAAe,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG;AACpE,YAAQ;AAAA,MACN,uEAAuE,OAAO,gBAAgB,SAAS,KAAK,YAAY;AAAA,IAC1H;AACA,QAAI,UAAU,gCAAgC;AAC5C,YAAM,UAAU,IAAI,SAAS,OAAO;AACpC;AAAA,IACF;AAGA,UAAM;AAAA,EACR;AAEA,UAAQ,QAAQ,QAAQ;AAAA,IACtB,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AACH;AAAA,IACF,KAAK,UAAU;AAOb,UACE,QAAQ,kBACR,CAAC,0BACD,UAAU,gCACV;AACA,gBAAQ;AAAA,UACN,wEAAwE,OAAO,gBAAgB,SAAS,KAAK,QAAQ,WAAW,MAAM,QAAQ,KAAK;AAAA,QACrJ;AACA,cAAM,UAAU,EAAE,GAAG,IAAI,SAAS,wBAAwB,KAAK,GAAG,OAAO;AACzE;AAAA,MACF;AACA,UAAI,QAAQ,aAAa,UAAU,gCAAgC;AACjE,gBAAQ;AAAA,UACN,2EAA2E,OAAO,gBAAgB,SAAS,KAAK,QAAQ,WAAW,MAAM,QAAQ,KAAK;AAAA,QACxJ;AACA,cAAM,UAAU,IAAI,SAAS,OAAO;AACpC;AAAA,MACF;AAGA,cAAQ;AAAA,QACN,mEAAmE,SAAS,kBAAkB,OAAO,KAAK,QAAQ,WAAW,MAAM,QAAQ,KAAK;AAAA,MAClJ;AACA;AAAA,IACF;AAAA,EACF;AACF;AAEA,eAAe,UAAU,SAAkC,SAAgC;AACzF,QAAM,OAAgC;AAAA,IACpC,GAAG;AAAA,IACH,SAAS,UAAU;AAAA,EACrB;AACA,QAAM,UAAU,iBAAiB,OAAO;AACxC,QAAM,QAAQ,8BAA8B,8BAA8B,QAAQ;AAClF,QAAM,MAAM,QAAQ,MAA4C,EAAE,QAAQ,CAAC;AAC7E;",
+  "sourcesContent": ["import type { JobContext, QueuedJob, WorkerMeta } from '@open-mercato/queue'\nimport type { CommandBus } from '@open-mercato/shared/lib/commands'\nimport {\n  COMMUNICATION_CHANNELS_DELIVER_OUTBOUND_COMMAND_ID,\n  type DeliverOutboundMessageInput,\n  type DeliverOutboundMessageResult,\n} from '../commands/deliver-outbound-message'\nimport { computeBackoffMs } from '../lib/error-classification'\nimport { COMMUNICATION_CHANNELS_QUEUES, getCommunicationChannelsQueue } from '../lib/queue'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('communication_channels').child({ component: 'outbound-delivery' })\n\n/**\n * Worker payload \u2014 the subscriber enqueues `{ messageId, scope, attempt? }`.\n *\n * `attempt` starts at 1 on first enqueue. The worker increments it when\n * re-enqueueing for retry, until `MAX_ATTEMPTS` is reached.\n */\nexport type OutboundDeliveryPayload = {\n  messageId: string\n  scope: {\n    tenantId: string\n    organizationId: string | null\n  }\n  /** Attempt number, 1-based. Set by the subscriber for the first try; the worker increments on retry. */\n  attempt?: number\n  /** Force credential refresh on this attempt \u2014 used after a 401 from the provider. */\n  forceCredentialRefresh?: boolean\n}\n\nexport const OUTBOUND_DELIVERY_MAX_ATTEMPTS = 3\n\nexport const metadata: WorkerMeta = {\n  queue: COMMUNICATION_CHANNELS_QUEUES.outbound,\n  id: 'communication_channels:outbound-delivery',\n  concurrency: 10,\n}\n\ntype HandlerContext = JobContext & {\n  resolve: <T = unknown>(name: string) => T\n}\n\n/**\n * Outbound delivery worker.\n *\n * Dispatches the `deliver_outbound_message` command which performs the actual\n * send. The command returns a classified result:\n *   - `delivered` / `already_delivered` / `no_channel_link` \u2192 success, return.\n *   - `failed` with `transient: true` \u2192 re-enqueue with exponential backoff,\n *      incremented attempt, up to `OUTBOUND_DELIVERY_MAX_ATTEMPTS`.\n *   - `failed` with `transient: false` \u2192 permanent failure, no retry.\n *\n * The command already wrote the failure record + emitted `.delivery_failed`,\n * so the worker just decides whether to schedule another attempt.\n *\n * We DO NOT throw on a recorded delivery-failure outcome \u2014 that would let the\n * queue apply its own retry policy on top of ours, double-retrying. Explicit\n * re-enqueue with delayMs is the portable, controllable pattern. The one\n * exception is an *unexpected* exception from the command itself (e.g. a DB blip\n * that stopped it from recording anything): we re-enqueue up to our max and then\n * rethrow so the infrastructure failure surfaces to the queue's dead-letter\n * instead of vanishing. The command's idempotency prevents a double-send.\n */\nexport default async function handle(\n  job: QueuedJob<OutboundDeliveryPayload>,\n  ctx: HandlerContext,\n): Promise<void> {\n  const { messageId, scope, attempt = 1, forceCredentialRefresh } = job.payload\n\n  const commandBus = ctx.resolve<CommandBus>('commandBus')\n  const containerProxy = { resolve: ctx.resolve.bind(ctx) }\n  const commandCtx = {\n    container: containerProxy as never,\n    auth: null,\n    organizationScope: null,\n    selectedOrganizationId: scope.organizationId ?? null,\n    organizationIds: scope.organizationId ? [scope.organizationId] : null,\n  }\n\n  let outcome: DeliverOutboundMessageResult\n  try {\n    const { result } = await commandBus.execute<\n      DeliverOutboundMessageInput,\n      DeliverOutboundMessageResult\n    >(\n      COMMUNICATION_CHANNELS_DELIVER_OUTBOUND_COMMAND_ID,\n      {\n        input: { messageId, scope, forceCredentialRefresh },\n        ctx: commandCtx as never,\n      },\n    )\n    outcome = result\n  } catch (err) {\n    // Unexpected error inside the command itself (e.g. DB blip). Re-enqueue\n    // up to MAX_ATTEMPTS so we don't lose deliveries due to infrastructure flakes.\n    const errorMessage = err instanceof Error ? err.message : String(err)\n    logger.warn('command threw during delivery attempt', { attempt, messageId, reason: errorMessage })\n    if (attempt < OUTBOUND_DELIVERY_MAX_ATTEMPTS) {\n      await reenqueue(job.payload, attempt)\n      return\n    }\n    // Attempts exhausted on an unexpected command exception \u2014 rethrow so the\n    // failure reaches the queue's dead-letter / observability (see header note).\n    throw err\n  }\n\n  switch (outcome.status) {\n    case 'delivered':\n    case 'already_delivered':\n    case 'no_channel_link':\n      return\n    case 'failed': {\n      // Reauth (401 / invalid_grant): the command already flipped the channel to\n      // `requires_reauth`. Give the credentials exactly one forced-refresh retry\n      // before giving up \u2014 a near-expiry access token whose proactive refresh\n      // was skipped can still recover here. If we already forced a refresh and\n      // still got a reauth error, the token is unrecoverable: stop (the operator\n      // must reconnect).\n      if (\n        outcome.requiresReauth &&\n        !forceCredentialRefresh &&\n        attempt < OUTBOUND_DELIVERY_MAX_ATTEMPTS\n      ) {\n        logger.warn('reauth failure; retrying once with a forced credential refresh', { attempt, messageId, providerKey: outcome.providerKey, reason: outcome.error })\n        await reenqueue({ ...job.payload, forceCredentialRefresh: true }, attempt)\n        return\n      }\n      if (outcome.transient && attempt < OUTBOUND_DELIVERY_MAX_ATTEMPTS) {\n        logger.warn('transient delivery failure; re-enqueueing', { attempt, messageId, providerKey: outcome.providerKey, reason: outcome.error })\n        await reenqueue(job.payload, attempt)\n        return\n      }\n      // Permanent or attempts exhausted \u2014 `.delivery_failed` was already emitted\n      // by the command, so we stop here.\n      logger.error('giving up on message delivery', { messageId, attempt, providerKey: outcome.providerKey, reason: outcome.error })\n      return\n    }\n  }\n}\n\nasync function reenqueue(payload: OutboundDeliveryPayload, attempt: number): Promise<void> {\n  const next: OutboundDeliveryPayload = {\n    ...payload,\n    attempt: attempt + 1,\n  }\n  const delayMs = computeBackoffMs(attempt)\n  const queue = getCommunicationChannelsQueue(COMMUNICATION_CHANNELS_QUEUES.outbound)\n  await queue.enqueue(next as unknown as Record<string, unknown>, { delayMs })\n}\n"],
+  "mappings": "AAEA;AAAA,EACE;AAAA,OAGK;AACP,SAAS,wBAAwB;AACjC,SAAS,+BAA+B,qCAAqC;AAC7E,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,wBAAwB,EAAE,MAAM,EAAE,WAAW,oBAAoB,CAAC;AAoBvF,MAAM,iCAAiC;AAEvC,MAAM,WAAuB;AAAA,EAClC,OAAO,8BAA8B;AAAA,EACrC,IAAI;AAAA,EACJ,aAAa;AACf;AA2BA,eAAO,OACL,KACA,KACe;AACf,QAAM,EAAE,WAAW,OAAO,UAAU,GAAG,uBAAuB,IAAI,IAAI;AAEtE,QAAM,aAAa,IAAI,QAAoB,YAAY;AACvD,QAAM,iBAAiB,EAAE,SAAS,IAAI,QAAQ,KAAK,GAAG,EAAE;AACxD,QAAM,aAAa;AAAA,IACjB,WAAW;AAAA,IACX,MAAM;AAAA,IACN,mBAAmB;AAAA,IACnB,wBAAwB,MAAM,kBAAkB;AAAA,IAChD,iBAAiB,MAAM,iBAAiB,CAAC,MAAM,cAAc,IAAI;AAAA,EACnE;AAEA,MAAI;AACJ,MAAI;AACF,UAAM,EAAE,OAAO,IAAI,MAAM,WAAW;AAAA,MAIlC;AAAA,MACA;AAAA,QACE,OAAO,EAAE,WAAW,OAAO,uBAAuB;AAAA,QAClD,KAAK;AAAA,MACP;AAAA,IACF;AACA,cAAU;AAAA,EACZ,SAAS,KAAK;AAGZ,UAAM,eAAe,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG;AACpE,WAAO,KAAK,yCAAyC,EAAE,SAAS,WAAW,QAAQ,aAAa,CAAC;AACjG,QAAI,UAAU,gCAAgC;AAC5C,YAAM,UAAU,IAAI,SAAS,OAAO;AACpC;AAAA,IACF;AAGA,UAAM;AAAA,EACR;AAEA,UAAQ,QAAQ,QAAQ;AAAA,IACtB,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AACH;AAAA,IACF,KAAK,UAAU;AAOb,UACE,QAAQ,kBACR,CAAC,0BACD,UAAU,gCACV;AACA,eAAO,KAAK,kEAAkE,EAAE,SAAS,WAAW,aAAa,QAAQ,aAAa,QAAQ,QAAQ,MAAM,CAAC;AAC7J,cAAM,UAAU,EAAE,GAAG,IAAI,SAAS,wBAAwB,KAAK,GAAG,OAAO;AACzE;AAAA,MACF;AACA,UAAI,QAAQ,aAAa,UAAU,gCAAgC;AACjE,eAAO,KAAK,6CAA6C,EAAE,SAAS,WAAW,aAAa,QAAQ,aAAa,QAAQ,QAAQ,MAAM,CAAC;AACxI,cAAM,UAAU,IAAI,SAAS,OAAO;AACpC;AAAA,MACF;AAGA,aAAO,MAAM,iCAAiC,EAAE,WAAW,SAAS,aAAa,QAAQ,aAAa,QAAQ,QAAQ,MAAM,CAAC;AAC7H;AAAA,IACF;AAAA,EACF;AACF;AAEA,eAAe,UAAU,SAAkC,SAAgC;AACzF,QAAM,OAAgC;AAAA,IACpC,GAAG;AAAA,IACH,SAAS,UAAU;AAAA,EACrB;AACA,QAAM,UAAU,iBAAiB,OAAO;AACxC,QAAM,QAAQ,8BAA8B,8BAA8B,QAAQ;AAClF,QAAM,MAAM,QAAQ,MAA4C,EAAE,QAAQ,CAAC;AAC7E;",
   "names": []
 }

package/dist/modules/communication_channels/workers/poll-channel.js

@@ -9,6 +9,8 @@ import { writeIngestDeadLetter } from "../lib/dead-letter.js";
 import { classifyOutboundError, computeBackoffMs, isReauthError } from "../lib/error-classification.js";
 import { refreshCredentialsIfNeeded } from "../lib/credential-refresh.js";
 import { emitCommunicationChannelsEvent } from "../events.js";
+import { createLogger } from "@open-mercato/shared/lib/logger";
+const logger = createLogger("communication_channels").child({ component: "poll-channel" });
 const POLL_CHANNEL_MAX_ATTEMPTS = 3;
 const MAX_DRAIN_PAGES = 100;
 const metadata = {
@@ -33,18 +35,14 @@ async function handle(job, ctx) {
     scope
   );
   if (!channel) {
-    console.warn(
-      `[communication_channels:poll-channel] channel ${channelId} not found (skipping)`
-    );
+    logger.warn("channel not found (skipping)", { channelId });
     return;
   }
   if (!channel.isActive) return;
   if (channel.status !== "connected" && channel.status !== "error") return;
   const adapter = adapterRegistry?.get(channel.providerKey);
   if (!adapter) {
-    console.warn(
-      `[communication_channels:poll-channel] no adapter for provider '${channel.providerKey}' (channel ${channelId})`
-    );
+    logger.warn("no adapter for provider", { providerKey: channel.providerKey, channelId });
     return;
   }
   const capabilities = channel.capabilities ?? null;
@@ -138,9 +136,7 @@ async function handle(job, ctx) {
     } catch (err) {
       const classification = classifyOutboundError(err);
       if (classification.transient) {
-        console.warn(
-          `[communication_channels:poll-channel] transient ingest failure for channel ${channel.id}; aborting page so cursor is NOT advanced. Reason: ${classification.message}`
-        );
+        logger.warn("transient ingest failure; aborting page so cursor is not advanced", { channelId: channel.id, reason: classification.message });
         transientIngestAbort = true;
         break;
       }
@@ -152,9 +148,7 @@ async function handle(job, ctx) {
         err,
         errorMessage: classification.message
       });
-      console.warn(
-        `[communication_channels:poll-channel] permanent ingest failure for channel ${channel.id}; recorded in dead-letter and advancing cursor past message ${message.externalMessageId}. Reason: ${classification.message}`
-      );
+      logger.warn("permanent ingest failure; recorded in dead-letter and advancing cursor", { channelId: channel.id, externalMessageId: message.externalMessageId, reason: classification.message });
     }
   }
   if (transientIngestAbort) {
@@ -182,9 +176,7 @@ async function handle(job, ctx) {
         { delayMs: 250 }
       );
     } else {
-      console.warn(
-        `[communication_channels:poll-channel] drain page cap (${MAX_DRAIN_PAGES}) reached for channel ${channel.id}; stopping re-enqueue until the next scheduled tick`
-      );
+      logger.warn("drain page cap reached; stopping re-enqueue until the next scheduled tick", { maxDrainPages: MAX_DRAIN_PAGES, channelId: channel.id });
     }
   }
 }