@adonis-agora/durable 0.49.1 → 0.51.0

package/dist/src/singleton-admission.js

@@ -0,0 +1,156 @@
+import { TERMINAL_RUN_STATUSES } from './interfaces.js';
+/**
+ * Reserved engine tag marking a run that holds a durable singleton slot. Written only by a store's
+ * {@link StateStore.tryAdmitSingleton} (inside its atomic claim), stripped from every fresh run's
+ * tags, and cleared when the run reaches a terminal status. The slot is independent of the execution
+ * lease: a holder that sleeps, waits on a signal, is parked `blocked` or has its lease expire keeps it.
+ */
+export const SINGLETON_ADMITTED_TAG = 'durable:singleton:admitted';
+/**
+ * Reserved engine tag marking a not-yet-admitted singleton run whose admission is decided by the tag
+ * scheme: it holds no slot unless it also carries {@link SINGLETON_ADMITTED_TAG}. Stamped on the run's
+ * first execution (in the same write that sets it `running`, before it competes) and on every denial;
+ * removed on admission, terminal settlement and requeue. An untagged executed run WITHOUT it was
+ * executed (admitted) by a replica older than 0.51 — see {@link legacySingletonHolders}.
+ */
+export const SINGLETON_TRACKED_TAG = 'durable:singleton:tracked';
+/** Tags only the engine and the store may write; stripped from a fresh run's user-supplied tags. */
+export const SINGLETON_RESERVED_TAGS = [
+    SINGLETON_ADMITTED_TAG,
+    SINGLETON_TRACKED_TAG,
+];
+/** The statuses a singleton run occupies its key in — as a holder or as a FIFO waiter. */
+export const SINGLETON_ACTIVE_STATUSES = [
+    'pending',
+    'running',
+    'suspended',
+    'blocked',
+];
+/** The same `(createdAt, id)` total order every instance uses for the FIFO waiter queue. */
+function byCreation(a, b) {
+    return a.createdAt.getTime() - b.createdAt.getTime() || a.id.localeCompare(b.id);
+}
+/** The statuses the pre-0.51 scan admission ranked a key's runs in (it ignored `pending`/`blocked`). */
+const LEGACY_SCAN_STATUSES = ['running', 'suspended'];
+/** `tags` without the engine's singleton markers (admitted and tracked). */
+export function withoutSingletonMarkers(tags) {
+    return tags?.filter((tag) => !SINGLETON_RESERVED_TAGS.includes(tag));
+}
+/** `tags` carrying {@link SINGLETON_TRACKED_TAG} (returned unchanged when admitted or already tracked). */
+export function withSingletonTracked(tags) {
+    const current = tags ?? [];
+    if (current.includes(SINGLETON_ADMITTED_TAG) || current.includes(SINGLETON_TRACKED_TAG)) {
+        return current;
+    }
+    return [...current, SINGLETON_TRACKED_TAG];
+}
+/**
+ * The runs of `active`, other than `runId`, that may hold a slot WITHOUT carrying
+ * {@link SINGLETON_ADMITTED_TAG}: holders admitted by a replica older than 0.51, during a rolling
+ * upgrade that mixes old and new replicas.
+ *
+ * Old replicas admit by a scan: a run may execute while it ranks among the `limit` oldest
+ * `running`/`suspended` runs of the key by `(createdAt, id)`, and they write no tag. Among those
+ * statuses an untagged run counts as a legacy holder when either:
+ *
+ * - it lacks {@link SINGLETON_TRACKED_TAG}. A new replica stamps that marker on a run's first
+ *   execution and on every denial, so an untagged executed run without it was executed — admitted —
+ *   by an old replica, wherever it ranks (an old replica can admit a run past an older `pending` one
+ *   it never saw). A denial alone can't be told from a holder (both park the run `suspended` on a
+ *   retry `wakeAt`, exactly like a holder sleeping in `ctx.sleep`), which is why the marker exists.
+ *   Waiters an old replica parked count too until a new replica re-checks them (one retry, ~1s):
+ *   that only delays, never over-admits.
+ * - it sits inside the old scan's own window (the `limit` oldest of those runs, every tagged holder
+ *   keeping its seat in it). An old replica can admit a run a new replica had marked without clearing
+ *   the marker; the window is what it admitted it on. With no old replica left this never changes a `limit: 1` decision (a run inside the window
+ *   is the head of the FIFO, admitted next anyway); with a larger limit it can only delay one.
+ */
+export function legacySingletonHolders(active, runId, limit) {
+    const scanned = active
+        .filter((run) => LEGACY_SCAN_STATUSES.includes(run.status))
+        .sort(byCreation);
+    // The old scan's window, with every tagged holder given its seat in it whatever its status: a
+    // holder parked `blocked` is invisible to the old scan, and without its seat the window would fill
+    // with the tracked waiters behind it, each counting the next as a holder.
+    const window = new Set(active
+        .filter((run) => LEGACY_SCAN_STATUSES.includes(run.status) || run.tags?.includes(SINGLETON_ADMITTED_TAG))
+        .sort(byCreation)
+        .slice(0, limit)
+        .map((run) => run.id));
+    return scanned.filter((run) => run.id !== runId &&
+        !run.tags?.includes(SINGLETON_ADMITTED_TAG) &&
+        (!run.tags?.includes(SINGLETON_TRACKED_TAG) || window.has(run.id)));
+}
+/**
+ * The admission decision, given every active run of `workflow` sharing `tag` (a superset is fine: the
+ * filter is re-applied here). Returns the candidate's new tags when it is (or already was) admitted,
+ * `null` when it must wait. Call only inside a store's atomic critical section — between a read that
+ * serialized competing claims and the write of the returned tags.
+ *
+ * Holders (runs carrying {@link SINGLETON_ADMITTED_TAG}) always keep their slot; only the slots they
+ * leave free go to the oldest unadmitted waiters, so a later or same-millisecond start can never
+ * displace a holder. Holders a pre-atomic (0.50 and older) replica admitted without the tag are
+ * counted too (see {@link legacySingletonHolders}), so a fleet mid rolling upgrade never admits past
+ * `limit`. Admission replaces the candidate's {@link SINGLETON_TRACKED_TAG} with the admitted tag.
+ */
+export function singletonAdmissionTags(runs, runId, tag, workflow, limit) {
+    if (!Number.isInteger(limit) || limit < 1) {
+        throw new Error('singleton limit must be a positive integer');
+    }
+    const active = runs.filter((run) => run.workflow === workflow &&
+        SINGLETON_ACTIVE_STATUSES.includes(run.status) &&
+        run.tags?.includes(tag));
+    const candidate = active.find((run) => run.id === runId);
+    if (!candidate)
+        return null;
+    if (candidate.tags?.includes(SINGLETON_ADMITTED_TAG))
+        return candidate.tags ?? [];
+    const legacy = new Set(legacySingletonHolders(active, runId, limit).map((run) => run.id));
+    const holders = active.filter((run) => run.tags?.includes(SINGLETON_ADMITTED_TAG)).length + legacy.size;
+    const free = limit - holders;
+    if (free <= 0)
+        return null;
+    const waiters = active
+        .filter((run) => !run.tags?.includes(SINGLETON_ADMITTED_TAG) && !legacy.has(run.id))
+        .sort(byCreation);
+    if (!waiters.slice(0, free).some((run) => run.id === runId))
+        return null;
+    return [
+        ...(candidate.tags ?? []).filter((t) => t !== SINGLETON_TRACKED_TAG),
+        SINGLETON_ADMITTED_TAG,
+    ];
+}
+/**
+ * The patch that parks a denied candidate on its retry timer, or `undefined` when nothing may be
+ * written: the run is gone, or it already left the active set (a concurrent `cancel` settled it) —
+ * a denial must never overwrite that and resurrect the run. Apply it under the same locks as the read.
+ */
+export function singletonAdmissionDenialPatch(runs, runId, tag, workflow, retryWakeAt) {
+    if (retryWakeAt === undefined)
+        return undefined;
+    const candidate = runs.find((run) => run.id === runId &&
+        run.workflow === workflow &&
+        SINGLETON_ACTIVE_STATUSES.includes(run.status) &&
+        run.tags?.includes(tag));
+    if (!candidate)
+        return undefined;
+    // Marked as a waiter the tag scheme tracks, so it is never mistaken for a legacy holder.
+    return {
+        status: 'suspended',
+        wakeAt: retryWakeAt,
+        tags: withSingletonTracked(candidate.tags),
+        updatedAt: new Date(),
+    };
+}
+/** Whether a run patch settles the run terminally (and so must release its singleton slot). */
+export function settlesTerminally(patch) {
+    return (patch.status !== undefined &&
+        TERMINAL_RUN_STATUSES.includes(patch.status));
+}
+/** `tags` without the singleton markers (admitted and tracked), or `undefined` when nothing changes. */
+export function withoutAdmission(tags) {
+    if (!tags?.some((t) => SINGLETON_RESERVED_TAGS.includes(t)))
+        return undefined;
+    return withoutSingletonMarkers(tags);
+}
+//# sourceMappingURL=singleton-admission.js.map

package/dist/src/singleton-admission.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"singleton-admission.js","sourceRoot":"","sources":["../../src/singleton-admission.ts"],"names":[],"mappings":"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"}

package/dist/src/singleton-gate.d.ts

@@ -1,7 +1,7 @@
 import type { SingletonConfig } from './engine.js';
 import type { StateStore, WorkflowRun } from './interfaces.js';
 export interface SingletonGateDeps {
-    store: Pick<StateStore, 'listRuns' | 'updateRun'>;
+    store: Pick<StateStore, 'listRuns' | 'updateRun' | 'updateRunIf' | 'tryAdmitSingleton'>;
     clock: () => number;
     /** Hand a gated run to the run dispatcher (fire-and-forget, like the engine's other dispatches). */
     dispatch: (runId: string) => void;
@@ -9,13 +9,15 @@ export interface SingletonGateDeps {
     configFor: (run: WorkflowRun) => SingletonConfig | undefined;
 }
 /**
- * Per-key serialization for singleton workflows — start-time back-pressure, FIFO race-free
- * admission, and notify-on-release wakeups. Extracted from {@link WorkflowEngine} so the whole
+ * Per-key serialization for singleton workflows — start-time back-pressure, durable atomic FIFO
+ * admission (claimed by the store's {@link StateStore.tryAdmitSingleton}), and notify-on-release wakeups. Extracted from {@link WorkflowEngine} so the whole
  * singleton feature lives in one place instead of being smeared across `start`, `execute`, both run
  * loops, and `cancel`.
  */
 export declare class SingletonGate {
     private readonly deps;
+    /** The non-atomic-store warning is printed once per engine, not once per admission. */
+    private warnedNonAtomic;
     constructor(deps: SingletonGateDeps);
     /** The tag a singleton run carries, so the gate can find others sharing its key. */
     tag(cfg: SingletonConfig, input: unknown): string;
@@ -23,16 +25,29 @@ export declare class SingletonGate {
     retryWakeAt(): number;
     /**
      * Reject a start that would grow the same-key backlog past `limit + maxQueueDepth` (counting
-     * `pending`/`running`/`suspended` runs sharing the key in one scan). No-op when no `maxQueueDepth`
-     * is configured.
+     * `pending`/`running`/`suspended`/`blocked` runs sharing the key in one scan). No-op when no
+     * `maxQueueDepth` is configured.
      */
     assertCapacity(workflow: string, cfg: SingletonConfig, input: unknown): Promise<void>;
     /**
-     * Whether `run` may run now under its key: it's among the `limit` oldest in-flight (running or
-     * suspended) runs sharing the key, by `(createdAt, id)` order. A consistent store gives every
-     * instance the same ordering, so admission is race-free + FIFO.
+     * Claim (or confirm) a slot for `run` under its key, atomically in the store: runs already holding
+     * a slot keep it, and free slots go to the oldest waiters by `(createdAt, id)`. A denied run is
+     * parked `suspended` on a jittered retry timer by the store, in the same critical section — never
+     * over a run a concurrent cancel already settled. Holding a slot is durable (a reserved tag), so a
+     * holder that sleeps, waits, is recovered on another instance or loses its lease keeps it until it
+     * settles terminally.
      */
     admit(run: WorkflowRun, cfg: SingletonConfig): Promise<boolean>;
+    /**
+     * The pre-atomic admission, kept for a custom store without {@link StateStore.tryAdmitSingleton}
+     * so an upgrade doesn't break it: `run` is admitted while it is among the `limit` oldest
+     * `running`/`suspended` runs sharing its key by `(createdAt, id)`. It is a read followed by a
+     * decision, not a claim, so replicas can briefly over-admit and a same-millisecond start can
+     * displace a holder — hence the one-time warning. A denied run is parked on the retry timer here,
+     * conditionally, so a concurrent cancel is not overwritten.
+     */
+    private admitByScan;
+    private warnNonAtomic;
     /**
      * Notify-on-release: a singleton run settled (freeing a slot), so dispatch the oldest gated
      * (`suspended` + same tag) waiters now instead of waiting for their ~1s retry timer. Each re-checks

package/dist/src/singleton-gate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"singleton-gate.d.ts","sourceRoot":"","sources":["../../src/singleton-gate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAU/D,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,WAAW,CAAC,CAAC;IAClD,KAAK,EAAE,MAAM,MAAM,CAAC;IACpB,oGAAoG;IACpG,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,oFAAoF;IACpF,SAAS,EAAE,CAAC,GAAG,EAAE,WAAW,KAAK,eAAe,GAAG,SAAS,CAAC;CAC9D;AAED;;;;;GAKG;AACH,qBAAa,aAAa;IACZ,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,iBAAiB,EAAI;IAExD,oFAAoF;IACpF,GAAG,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAEhD;IAED,gGAAgG;IAChG,WAAW,IAAI,MAAM,CAMpB;IAED;;;;OAIG;IACG,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAW1F;IAED;;;;OAIG;IACG,KAAK,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAYpE;IAED;;;;;OAKG;IACG,QAAQ,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBlD;CACF"}
+{"version":3,"file":"singleton-gate.d.ts","sourceRoot":"","sources":["../../src/singleton-gate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAe/D,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,WAAW,GAAG,aAAa,GAAG,mBAAmB,CAAC,CAAC;IACxF,KAAK,EAAE,MAAM,MAAM,CAAC;IACpB,oGAAoG;IACpG,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,oFAAoF;IACpF,SAAS,EAAE,CAAC,GAAG,EAAE,WAAW,KAAK,eAAe,GAAG,SAAS,CAAC;CAC9D;AAED;;;;;GAKG;AACH,qBAAa,aAAa;IAIZ,OAAO,CAAC,QAAQ,CAAC,IAAI;IAHjC,uFAAuF;IACvF,OAAO,CAAC,eAAe,CAAS;IAEhC,YAA6B,IAAI,EAAE,iBAAiB,EAAI;IAExD,oFAAoF;IACpF,GAAG,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAEhD;IAED,gGAAgG;IAChG,WAAW,IAAI,MAAM,CAMpB;IAED;;;;OAIG;IACG,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAW1F;IAED;;;;;;;OAOG;IACG,KAAK,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAiBpE;IAED;;;;;;;OAOG;YACW,WAAW;IAmBzB,OAAO,CAAC,aAAa;IAarB;;;;;OAKG;IACG,QAAQ,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBlD;CACF"}

package/dist/src/singleton-gate.js

@@ -1,4 +1,5 @@
 import { SingletonQueueFullError } from './errors.js';
+import { SINGLETON_ACTIVE_STATUSES, SINGLETON_ADMITTED_TAG, SINGLETON_TRACKED_TAG, } from './singleton-admission.js';
 const SINGLETON_RETRY_MS = 1000;
 /**
  * Max jitter (ms, each direction) added to {@link SINGLETON_RETRY_MS} so a queue of N gated runs
@@ -7,13 +8,15 @@ const SINGLETON_RETRY_MS = 1000;
  */
 const SINGLETON_RETRY_JITTER_MS = 250;
 /**
- * Per-key serialization for singleton workflows — start-time back-pressure, FIFO race-free
- * admission, and notify-on-release wakeups. Extracted from {@link WorkflowEngine} so the whole
+ * Per-key serialization for singleton workflows — start-time back-pressure, durable atomic FIFO
+ * admission (claimed by the store's {@link StateStore.tryAdmitSingleton}), and notify-on-release wakeups. Extracted from {@link WorkflowEngine} so the whole
  * singleton feature lives in one place instead of being smeared across `start`, `execute`, both run
  * loops, and `cancel`.
  */
 export class SingletonGate {
     deps;
+    /** The non-atomic-store warning is printed once per engine, not once per admission. */
+    warnedNonAtomic = false;
     constructor(deps) {
         this.deps = deps;
     }
@@ -29,8 +32,8 @@ export class SingletonGate {
     }
     /**
      * Reject a start that would grow the same-key backlog past `limit + maxQueueDepth` (counting
-     * `pending`/`running`/`suspended` runs sharing the key in one scan). No-op when no `maxQueueDepth`
-     * is configured.
+     * `pending`/`running`/`suspended`/`blocked` runs sharing the key in one scan). No-op when no
+     * `maxQueueDepth` is configured.
      */
     async assertCapacity(workflow, cfg, input) {
         if (cfg.maxQueueDepth == null)
@@ -39,27 +42,68 @@ export class SingletonGate {
         const queued = await this.deps.store.listRuns({
             tag: this.tag(cfg, input),
             workflow,
-            statuses: ['pending', 'running', 'suspended'],
+            statuses: SINGLETON_ACTIVE_STATUSES,
         });
         if (queued.length >= cap) {
             throw new SingletonQueueFullError(workflow, cfg.key(input), cfg.maxQueueDepth);
         }
     }
     /**
-     * Whether `run` may run now under its key: it's among the `limit` oldest in-flight (running or
-     * suspended) runs sharing the key, by `(createdAt, id)` order. A consistent store gives every
-     * instance the same ordering, so admission is race-free + FIFO.
+     * Claim (or confirm) a slot for `run` under its key, atomically in the store: runs already holding
+     * a slot keep it, and free slots go to the oldest waiters by `(createdAt, id)`. A denied run is
+     * parked `suspended` on a jittered retry timer by the store, in the same critical section — never
+     * over a run a concurrent cancel already settled. Holding a slot is durable (a reserved tag), so a
+     * holder that sleeps, waits, is recovered on another instance or loses its lease keeps it until it
+     * settles terminally.
      */
     async admit(run, cfg) {
-        // ONE scan for both in-flight statuses; the total `(createdAt, id)` sort makes admission order
-        // independent of the store's row order, preserving the FIFO + race-free-across-instances contract.
+        const store = this.deps.store;
+        if (!store.tryAdmitSingleton)
+            return this.admitByScan(run, cfg);
+        const admitted = await store.tryAdmitSingleton(run.id, this.tag(cfg, run.input), run.workflow, cfg.limit ?? 1, this.retryWakeAt());
+        if (admitted && !run.tags?.includes(SINGLETON_ADMITTED_TAG)) {
+            run.tags = [
+                ...(run.tags ?? []).filter((t) => t !== SINGLETON_TRACKED_TAG),
+                SINGLETON_ADMITTED_TAG,
+            ];
+        }
+        return admitted;
+    }
+    /**
+     * The pre-atomic admission, kept for a custom store without {@link StateStore.tryAdmitSingleton}
+     * so an upgrade doesn't break it: `run` is admitted while it is among the `limit` oldest
+     * `running`/`suspended` runs sharing its key by `(createdAt, id)`. It is a read followed by a
+     * decision, not a claim, so replicas can briefly over-admit and a same-millisecond start can
+     * displace a holder — hence the one-time warning. A denied run is parked on the retry timer here,
+     * conditionally, so a concurrent cancel is not overwritten.
+     */
+    async admitByScan(run, cfg) {
+        this.warnNonAtomic();
         const inflight = (await this.deps.store.listRuns({
             tag: this.tag(cfg, run.input),
             workflow: run.workflow,
             statuses: ['running', 'suspended'],
         })).sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime() || a.id.localeCompare(b.id));
         const idx = inflight.findIndex((r) => r.id === run.id);
-        return idx >= 0 && idx < (cfg.limit ?? 1);
+        if (idx >= 0 && idx < (cfg.limit ?? 1))
+            return true;
+        await this.deps.store.updateRunIf(run.id, SINGLETON_ACTIVE_STATUSES, {
+            status: 'suspended',
+            wakeAt: this.retryWakeAt(),
+            updatedAt: new Date(),
+        });
+        return false;
+    }
+    warnNonAtomic() {
+        if (this.warnedNonAtomic)
+            return;
+        this.warnedNonAtomic = true;
+        console.warn('[adonis-durable] singleton admission is NOT atomic on this state store: it does not implement ' +
+            'StateStore.tryAdmitSingleton, so the engine falls back to a scan of running/suspended runs. ' +
+            'Replicas can briefly admit more than `limit` runs per key, and a same-millisecond start can ' +
+            'displace a holder. Implement tryAdmitSingleton (see the exported singletonAdmissionTags / ' +
+            'singletonAdmissionDenialPatch helpers and the "Store support" section of the singleton docs) ' +
+            'to make admission atomic.');
     }
     /**
      * Notify-on-release: a singleton run settled (freeing a slot), so dispatch the oldest gated
@@ -74,7 +118,10 @@ export class SingletonGate {
         const tag = settled.tags?.find((t) => t.startsWith('singleton:'));
         if (!tag)
             return;
-        const gated = (await this.deps.store.listRuns({ tag, workflow: settled.workflow, statuses: ['suspended'] })).sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime() || a.id.localeCompare(b.id));
+        const gated = (await this.deps.store.listRuns({ tag, workflow: settled.workflow, statuses: ['suspended'] }))
+            // A suspended HOLDER (sleeping, waiting on a signal) is not waiting for a slot — leave it be.
+            .filter((r) => !r.tags?.includes(SINGLETON_ADMITTED_TAG))
+            .sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime() || a.id.localeCompare(b.id));
         for (const next of gated.slice(0, cfg.limit ?? 1)) {
             // Make the run due NOW rather than clearing its retry timer. The dispatch below goes through
             // the configured runDispatcher, which may legitimately be a NO-OP (a poll-only deployment

package/dist/src/singleton-gate.js.map

@@ -1 +1 @@
-{"version":3,"file":"singleton-gate.js","sourceRoot":"","sources":["../../src/singleton-gate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"singleton-gate.js","sourceRoot":"","sources":["../../src/singleton-gate.ts"],"names":[],"mappings":"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"}

package/dist/src/standard-schema.d.ts

@@ -0,0 +1,86 @@
+import { type SchemaValidationCode } from './errors.js';
+/**
+ * Vendored subset of the Standard Schema spec (https://standardschema.dev) — the `~standard`
+ * property protocol implemented by zod (3.24+ / 4), valibot, arktype, effect schema and others.
+ * Vendored (rather than taken as a dependency) as the spec recommends, so the package stays free of
+ * any schema library at runtime: the interface is types only, erased by the build. Source:
+ * https://github.com/standard-schema/standard-schema (MIT) — trimmed to the `StandardSchemaV1` shape
+ * this package consumes, identical to the copy in the NestJS sibling (`@dudousxd/nestjs-durable-core`).
+ *
+ * Used by `@Step({ input, output })` / `defineStep`, `register(..., { inputSchema })` /
+ * `static workflow = { inputSchema }` and the typed `searchAttributes` schema, so each accepts
+ * whichever schema library the app already uses.
+ */
+export interface StandardSchemaV1<Input = unknown, Output = Input> {
+    /** The Standard Schema properties. */
+    readonly '~standard': StandardSchemaV1.Props<Input, Output>;
+}
+export declare namespace StandardSchemaV1 {
+    /** The Standard Schema properties interface. */
+    interface Props<Input = unknown, Output = Input> {
+        /** The version number of the standard. */
+        readonly version: 1;
+        /** The vendor name of the schema library. */
+        readonly vendor: string;
+        /** Validates unknown input values. */
+        readonly validate: (value: unknown) => Result<Output> | Promise<Result<Output>>;
+        /** Inferred types associated with the schema. */
+        readonly types?: Types<Input, Output> | undefined;
+    }
+    /** The result interface of the validate function. */
+    type Result<Output> = SuccessResult<Output> | FailureResult;
+    /** The result interface if validation succeeds. */
+    interface SuccessResult<Output> {
+        /** The typed output value. */
+        readonly value: Output;
+        /** A falsy value for `issues` indicates success. */
+        readonly issues?: undefined;
+    }
+    /** The result interface if validation fails. */
+    interface FailureResult {
+        /** The issues of failed validation. */
+        readonly issues: ReadonlyArray<Issue>;
+    }
+    /** The issue interface of the failure output. */
+    interface Issue {
+        /** The error message of the issue. */
+        readonly message: string;
+        /** The path of the issue, if any. */
+        readonly path?: ReadonlyArray<PropertyKey | PathSegment> | undefined;
+    }
+    /** The path segment interface of the issue. */
+    interface PathSegment {
+        /** The key representing a path segment. */
+        readonly key: PropertyKey;
+    }
+    /** The Standard Schema types interface. */
+    interface Types<Input = unknown, Output = Input> {
+        /** The input type of the schema. */
+        readonly input: Input;
+        /** The output type of the schema. */
+        readonly output: Output;
+    }
+    /** Infers the input type of a Standard Schema. */
+    type InferInput<Schema extends StandardSchemaV1> = NonNullable<Schema['~standard']['types']>['input'];
+    /** Infers the output type of a Standard Schema. */
+    type InferOutput<Schema extends StandardSchemaV1> = NonNullable<Schema['~standard']['types']>['output'];
+}
+/**
+ * Validate `value` against any Standard Schema and return the schema's OUTPUT value (parsed /
+ * coerced / defaulted — e.g. zod's `.transform`, valibot's `pipe`, arktype morphs). Both a sync and
+ * an async (`Promise`-returning) `~standard.validate` are supported. On failure throws a
+ * {@link SchemaValidationError} — a non-retryable `FatalError` carrying the issues in `details`, so a
+ * bad payload fails fast instead of being retried forever.
+ *
+ * `label` names what was validated in the error message, e.g. `step "billing:charge" input`. `code`
+ * is the error's code: `invalid_input` / `invalid_output` for an input or output schema, and
+ * `schema_validation` (the default) otherwise.
+ */
+export declare function validateStandard<S extends StandardSchemaV1>(schema: S, value: unknown, label: string, code?: SchemaValidationCode): Promise<StandardSchemaV1.InferOutput<S>>;
+/**
+ * Synchronous {@link validateStandard}, for call sites that must not await a validator (the typed
+ * search-attributes write, where an async refinement could make replay nondeterministic). A schema
+ * whose `validate` returns a `Promise` throws a clear error instead of being silently awaited.
+ */
+export declare function validateStandardSync<S extends StandardSchemaV1>(schema: S, value: unknown, label: string, code?: SchemaValidationCode): StandardSchemaV1.InferOutput<S>;
+//# sourceMappingURL=standard-schema.d.ts.map

package/dist/src/standard-schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"standard-schema.d.ts","sourceRoot":"","sources":["../../src/standard-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,oBAAoB,EAAyB,MAAM,aAAa,CAAC;AAE/E;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,gBAAgB,CAAC,KAAK,GAAG,OAAO,EAAE,MAAM,GAAG,KAAK;IAC/D,sCAAsC;IACtC,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAC7D;AAED,MAAM,CAAC,OAAO,WAAW,gBAAgB,CAAC;IACxC,gDAAgD;IAChD,UAAU,KAAK,CAAC,KAAK,GAAG,OAAO,EAAE,MAAM,GAAG,KAAK;QAC7C,0CAA0C;QAC1C,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QACpB,6CAA6C;QAC7C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QACxB,sCAAsC;QACtC,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAChF,iDAAiD;QACjD,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;KACnD;IAED,qDAAqD;IACrD,KAAK,MAAM,CAAC,MAAM,IAAI,aAAa,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC;IAE5D,mDAAmD;IACnD,UAAU,aAAa,CAAC,MAAM;QAC5B,8BAA8B;QAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QACvB,oDAAoD;QACpD,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;KAC7B;IAED,gDAAgD;IAChD,UAAU,aAAa;QACrB,uCAAuC;QACvC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;KACvC;IAED,iDAAiD;IACjD,UAAU,KAAK;QACb,sCAAsC;QACtC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QACzB,qCAAqC;QACrC,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,SAAS,CAAC;KACtE;IAED,+CAA+C;IAC/C,UAAU,WAAW;QACnB,2CAA2C;QAC3C,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC;KAC3B;IAED,2CAA2C;IAC3C,UAAU,KAAK,CAAC,KAAK,GAAG,OAAO,EAAE,MAAM,GAAG,KAAK;QAC7C,oCAAoC;QACpC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;QACtB,qCAAqC;QACrC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;KACzB;IAED,kDAAkD;IAClD,KAAK,UAAU,CAAC,MAAM,SAAS,gBAAgB,IAAI,WAAW,CAC5D,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAC7B,CAAC,OAAO,CAAC,CAAC;IAEX,mDAAmD;IACnD,KAAK,WAAW,CAAC,MAAM,SAAS,gBAAgB,IAAI,WAAW,CAC7D,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAC7B,CAAC,QAAQ,CAAC,CAAC;CACb;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CAAC,CAAC,SAAS,gBAAgB,EAC/D,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,oBAAoB,GAC1B,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAI1C;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,gBAAgB,EAC7D,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,oBAAoB,GAC1B,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,CASjC"}

package/dist/src/standard-schema.js

@@ -0,0 +1,33 @@
+import { SchemaValidationError } from './errors.js';
+/**
+ * Validate `value` against any Standard Schema and return the schema's OUTPUT value (parsed /
+ * coerced / defaulted — e.g. zod's `.transform`, valibot's `pipe`, arktype morphs). Both a sync and
+ * an async (`Promise`-returning) `~standard.validate` are supported. On failure throws a
+ * {@link SchemaValidationError} — a non-retryable `FatalError` carrying the issues in `details`, so a
+ * bad payload fails fast instead of being retried forever.
+ *
+ * `label` names what was validated in the error message, e.g. `step "billing:charge" input`. `code`
+ * is the error's code: `invalid_input` / `invalid_output` for an input or output schema, and
+ * `schema_validation` (the default) otherwise.
+ */
+export async function validateStandard(schema, value, label, code) {
+    const result = await schema['~standard'].validate(value);
+    if (result.issues)
+        throw new SchemaValidationError(label, result.issues, code);
+    return result.value;
+}
+/**
+ * Synchronous {@link validateStandard}, for call sites that must not await a validator (the typed
+ * search-attributes write, where an async refinement could make replay nondeterministic). A schema
+ * whose `validate` returns a `Promise` throws a clear error instead of being silently awaited.
+ */
+export function validateStandardSync(schema, value, label, code) {
+    const result = schema['~standard'].validate(value);
+    if (result instanceof Promise) {
+        throw new TypeError(`${label}: schema validation must be synchronous (the schema's \`~standard.validate\` returned a Promise) — drop any async refinement from it.`);
+    }
+    if (result.issues)
+        throw new SchemaValidationError(label, result.issues, code);
+    return result.value;
+}
+//# sourceMappingURL=standard-schema.js.map

package/dist/src/standard-schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"standard-schema.js","sourceRoot":"","sources":["../../src/standard-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAkF/E;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAAS,EACT,KAAc,EACd,KAAa,EACb,IAA2B;IAE3B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzD,IAAI,MAAM,CAAC,MAAM;QAAE,MAAM,IAAI,qBAAqB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/E,OAAO,MAAM,CAAC,KAAwC,CAAC;AACzD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAClC,MAAS,EACT,KAAc,EACd,KAAa,EACb,IAA2B;IAE3B,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACnD,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;QAC9B,MAAM,IAAI,SAAS,CACjB,GAAG,KAAK,uIAAuI,CAChJ,CAAC;IACJ,CAAC;IACD,IAAI,MAAM,CAAC,MAAM;QAAE,MAAM,IAAI,qBAAqB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/E,OAAO,MAAM,CAAC,KAAwC,CAAC;AACzD,CAAC"}

package/dist/src/step-discovery.d.ts

@@ -1,3 +1,4 @@
+import { type BarrelTree, type RootedBarrel } from './discovery-roots.js';
 import type { StepLogger } from './interfaces.js';
 import type { StepHandler } from './protocol.js';
 import { type DurableStepMeta } from './step-ref.js';
@@ -13,7 +14,7 @@ export interface DiscoveredStep {
 }
 /**
  * Register a single discovered step on `server` under its stamped name, wrapping it with any
- * declared zod validation. The low-level `transport.handle(name, fn)` stays the escape hatch — this
+ * declared schema validation. The low-level `transport.handle(name, fn)` stays the escape hatch — this
  * is the convention the `app/steps` discovery builds on.
  */
 export declare function registerStep(server: StepServer, step: DiscoveredStep): void;
@@ -28,16 +29,25 @@ export declare function collectSteps(exported: unknown): DiscoveredStep[];
  *  onto `server`. De-duplicated by routing name (last wins). Returns the registered metadata. */
 export declare function registerSteps(server: StepServer, exports: Iterable<unknown>): DurableStepMeta[];
 /**
- * Scan `dir` RECURSIVELY for modules and register every exported `@Step` class / `defineStep`
- * handler on `server` — the `app/steps` convention, mirroring `app/workflows` discovery. Only the
- * extension present in `dir` is imported (see {@link pickModuleExt}). Missing directory → no-op
- * (the convention is opt-in). Returns the registered metadata.
+ * Scan `dir` — one directory or several — RECURSIVELY and register every exported `@Step` class /
+ * `defineStep` handler on `server`: the `app/steps` convention, mirroring `app/workflows` discovery.
+ * Only the extension present in each directory is imported (see `pickModuleExt`). Missing
+ * directory → nothing from it (the convention is opt-in). With several directories the same step
+ * name defined by different handlers in two of them throws a {@link DuplicateDiscoveryError}.
+ * Returns the registered metadata.
+ *
+ * `server` is anything with `handle(name, fn)`: a transport, the store-less `WorkerRuntime`, or the
+ * `WorkflowEngine` itself (it forwards to its primary transport) — the latter is how app code
+ * serves an extra directory from a preload: `await registerStepsFromDir(engine, dir)`.
  */
-export declare function registerStepsFromDir(server: StepServer, dir: string): Promise<DurableStepMeta[]>;
+export declare function registerStepsFromDir(server: StepServer, dir: string | readonly string[]): Promise<DurableStepMeta[]>;
 /** The build-time barrel shape the Assembler `init` hook generates for `app/steps` (key → lazy
- *  module import), mirroring {@link import('./workflow-discovery.js').WorkflowsBarrel}. */
-export type StepsBarrel = Record<string, () => Promise<Record<string, unknown>>>;
-/** Register every `@Step`/`defineStep` reachable from a generated {@link StepsBarrel} onto `server`
- *  — the build-time equivalent of {@link registerStepsFromDir} with no runtime `readdir`. */
-export declare function registerStepsFromBarrel(server: StepServer, barrel: StepsBarrel): Promise<DurableStepMeta[]>;
+ *  module import, nested per sub-directory), mirroring
+ *  {@link import('./workflow-discovery.js').WorkflowsBarrel}. A multi-root hook writes a
+ *  {@link RootedBarrel} array instead. */
+export type StepsBarrel = BarrelTree;
+/** Register every `@Step`/`defineStep` reachable from a generated {@link StepsBarrel} (or a
+ *  multi-root {@link RootedBarrel} array) onto `server` — the build-time equivalent of
+ *  {@link registerStepsFromDir} with no runtime `readdir`, same cross-root duplicate rule. */
+export declare function registerStepsFromBarrel(server: StepServer, barrel: StepsBarrel | readonly RootedBarrel[]): Promise<DurableStepMeta[]>;
 //# sourceMappingURL=step-discovery.d.ts.map

package/dist/src/step-discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"step-discovery.d.ts","sourceRoot":"","sources":["../../src/step-discovery.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,KAAK,eAAe,EAAc,MAAM,eAAe,CAAC;AAGjE;uFACuF;AACvF,MAAM,WAAW,UAAU;IACzB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,GAAG,IAAI,CAAC;CAC7C;AAED,+FAA+F;AAC/F,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1E;AAeD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,GAAG,IAAI,CAE3E;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,OAAO,GAAG,cAAc,EAAE,CA8BhE;AAED;iGACiG;AACjG,wBAAgB,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,eAAe,EAAE,CAY/F;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,eAAe,EAAE,CAAC,CAsB5B;AAED;2FAC2F;AAC3F,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;AAEjF;6FAC6F;AAC7F,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,eAAe,EAAE,CAAC,CAY5B"}
+{"version":3,"file":"step-discovery.d.ts","sourceRoot":"","sources":["../../src/step-discovery.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EAIf,KAAK,YAAY,EAElB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,OAAO,EAAE,KAAK,eAAe,EAAc,MAAM,eAAe,CAAC;AAEjE;uFACuF;AACvF,MAAM,WAAW,UAAU;IACzB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,GAAG,IAAI,CAAC;CAC7C;AAED,+FAA+F;AAC/F,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1E;AAoBD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,GAAG,IAAI,CAE3E;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,OAAO,GAAG,cAAc,EAAE,CA8BhE;AAED;iGACiG;AACjG,wBAAgB,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,eAAe,EAAE,CAY/F;AAmED;;;;;;;;;;;GAWG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,GAC9B,OAAO,CAAC,eAAe,EAAE,CAAC,CAE5B;AAED;;;0CAG0C;AAC1C,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC;AAErC;;8FAE8F;AAC9F,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,WAAW,GAAG,SAAS,YAAY,EAAE,GAC5C,OAAO,CAAC,eAAe,EAAE,CAAC,CAE5B"}