@open-mercato/cli 0.6.8-develop.6918.1.7b3f32b0c8 → 0.6.8-develop.6925.1.cefa200fa4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/cli",
-  "version": "0.6.8-develop.6918.1.7b3f32b0c8",
+  "version": "0.6.8-develop.6925.1.cefa200fa4",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,9 +60,9 @@
     "@mikro-orm/decorators": "^7.1.8",
     "@mikro-orm/migrations": "^7.1.8",
     "@mikro-orm/postgresql": "^7.1.8",
-    "@open-mercato/queue": "0.6.8-develop.6918.1.7b3f32b0c8",
-    "@open-mercato/shared": "0.6.8-develop.6918.1.7b3f32b0c8",
-    "@open-mercato/telemetry": "0.6.8-develop.6918.1.7b3f32b0c8",
+    "@open-mercato/queue": "0.6.8-develop.6925.1.cefa200fa4",
+    "@open-mercato/shared": "0.6.8-develop.6925.1.cefa200fa4",
+    "@open-mercato/telemetry": "0.6.8-develop.6925.1.cefa200fa4",
     "cross-spawn": "^7.0.6",
     "pg": "8.22.0",
     "semver": "^7.8.5",
@@ -73,10 +73,10 @@
     "typescript-js": "npm:typescript@6.0.3"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.6.8-develop.6918.1.7b3f32b0c8"
+    "@open-mercato/shared": "0.6.8-develop.6925.1.cefa200fa4"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.6.8-develop.6918.1.7b3f32b0c8",
+    "@open-mercato/shared": "0.6.8-develop.6925.1.cefa200fa4",
     "@types/jest": "^30.0.0",
     "jest": "^30.4.2",
     "ts-jest": "^29.4.12"

package/src/lib/__tests__/events-single-delivery.test.ts

@@ -9,7 +9,7 @@ describe('reconcileEventsSingleDelivery', () => {
     expect(reconcileEventsSingleDelivery({}, 'lazy')).toEqual({ effective: true })
   })
 
-  it('falls back to inline dual-dispatch (with a warning) when no worker runs', () => {
+  it('falls back to inline delivery (with a warning) when no worker runs', () => {
     const result = reconcileEventsSingleDelivery({}, 'off')
     expect(result.effective).toBe(false)
     expect(result.warning).toContain('OM_EVENTS_SINGLE_DELIVERY')
@@ -65,4 +65,20 @@ describe('applyEventsSingleDeliveryGuard', () => {
     expect(errorSpy).not.toHaveBeenCalled()
     errorSpy.mockRestore()
   })
+
+  // The written value is what the spawned children actually consume: the guard
+  // copies it into the child `runtimeEnv`, so a Next.js or worker process started
+  // by `mercato server` reads this explicit token instead of re-deriving the
+  // default. An empty or non-boolean value would silently hand children the
+  // default-on behaviour the guard just decided against, so pin the token here.
+  it('writes an explicit boolean token into the env handed to spawned children', () => {
+    const processEnv: NodeJS.ProcessEnv = {}
+    const runtimeEnv: NodeJS.ProcessEnv = {}
+
+    applyEventsSingleDeliveryGuard({ processEnv, runtimeEnv, autoSpawnWorkersMode: 'lazy' })
+
+    for (const value of [processEnv.OM_EVENTS_SINGLE_DELIVERY, runtimeEnv.OM_EVENTS_SINGLE_DELIVERY]) {
+      expect(['1', 'true', 'yes', 'on']).toContain(value)
+    }
+  })
 })

package/src/lib/events-single-delivery.ts

@@ -5,6 +5,14 @@ import type { AutoSpawnWorkersMode } from './auto-spawn-workers'
 // `@open-mercato/events/single-delivery`. The CLI cannot import the events
 // package (no dependency edge), so the reconcile logic is mirrored here for the
 // server-bootstrap guard only; the bus and worker own the runtime behavior.
+//
+// This guard is the ONLY place that reconciles the flag against worker
+// availability. The event bus deliberately does not: the queue is durable, so a
+// persistent emit with no worker yet is delayed rather than lost, and delivering
+// inline instead would move the work onto the caller's request path. Only this
+// bootstrap knows for a fact that the process it is launching runs no worker, so
+// only it rewrites the value - into both envs below, so the app and any spawned
+// child agree.
 const EVENTS_SINGLE_DELIVERY_ENV = 'OM_EVENTS_SINGLE_DELIVERY'
 const EVENTS_EXTERNAL_WORKER_ENV = 'OM_EVENTS_EXTERNAL_WORKER'
 
@@ -23,7 +31,8 @@ export type SingleDeliveryReconciliation = {
  * (auto-spawn off and no acknowledged external worker) would skip those
  * subscribers with nothing to drain the queue — silently dropping notifications,
  * queued emails, and indexing. This fails safe by disabling single-delivery for
- * such a process (back to inline dual-dispatch) and returning a loud warning.
+ * such a process (persistent subscribers run inline instead) and returning a loud
+ * warning. The bus stamps the queued job, so the inline run stays exactly-once.
  *
  * Transient worker downtime is NOT this guard's concern: the durable queue holds
  * the job until a worker returns. Only the "no worker at all" config is guarded.
@@ -43,9 +52,10 @@ export function reconcileEventsSingleDelivery(
       `[events] ${EVENTS_SINGLE_DELIVERY_ENV} is on (default) but this process auto-spawns no events worker ` +
       `(AUTO_SPAWN_WORKERS=off) and ${EVENTS_EXTERNAL_WORKER_ENV} is not set. Persistent subscribers would be ` +
       `skipped inline with nothing to drain the queue, silently dropping notifications, queued emails, and ` +
-      `indexing. Falling back to legacy inline dual-dispatch for safety. To keep single-delivery, run an events ` +
-      `worker (\`mercato queue worker events\`) and set ${EVENTS_EXTERNAL_WORKER_ENV}=true, or enable ` +
-      `AUTO_SPAWN_WORKERS.`,
+      `indexing. Running them inline instead, on the caller's request path. Delivery stays exactly-once: the ` +
+      `queued job is stamped so an events worker that does drain the queue skips it. To move this work off the ` +
+      `request path, run an events worker (\`mercato queue worker events\`) and set ` +
+      `${EVENTS_EXTERNAL_WORKER_ENV}=true, or enable AUTO_SPAWN_WORKERS.`,
   }
 }