@trigger.dev/redis-worker 4.5.0-rc.3 → 4.5.0-rc.5

package/dist/index.d.cts

@@ -2147,6 +2147,10 @@ declare const BufferEntrySchema: z.ZodObject<{
     status: z.ZodEnum<["QUEUED", "DRAINING", "FAILED"]>;
     attempts: z.ZodEffects<z.ZodString, number, string>;
     createdAt: z.ZodEffects<z.ZodString, Date, string>;
+    createdAtMicros: z.ZodDefault<z.ZodEffects<z.ZodString, number, string>>;
+    materialised: z.ZodDefault<z.ZodEffects<z.ZodUnion<[z.ZodLiteral<"true">, z.ZodLiteral<"false">]>, boolean, "true" | "false">>;
+    idempotencyLookupKey: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    metadataVersion: z.ZodDefault<z.ZodEffects<z.ZodString, number, string>>;
     lastError: z.ZodOptional<z.ZodEffects<z.ZodString, {
         message: string;
         code: string;
@@ -2159,6 +2163,10 @@ declare const BufferEntrySchema: z.ZodObject<{
     envId: string;
     orgId: string;
     attempts: number;
+    createdAtMicros: number;
+    materialised: boolean;
+    idempotencyLookupKey: string;
+    metadataVersion: number;
     lastError?: {
         message: string;
         code: string;
@@ -2171,6 +2179,10 @@ declare const BufferEntrySchema: z.ZodObject<{
     envId: string;
     orgId: string;
     attempts: string;
+    createdAtMicros?: string | undefined;
+    materialised?: "true" | "false" | undefined;
+    idempotencyLookupKey?: string | undefined;
+    metadataVersion?: string | undefined;
     lastError?: string | undefined;
 }>;
 type BufferEntry = z.infer<typeof BufferEntrySchema>;
@@ -2179,31 +2191,114 @@ declare function deserialiseSnapshot<T = unknown>(serialised: string): T;
 
 type MollifierBufferOptions = {
     redisOptions: RedisOptions;
-    entryTtlSeconds: number;
     logger?: Logger;
+    ackGraceTtlSeconds?: number;
+    maxRetriesPerRequest?: number;
+    reconnectStepMs?: number;
+    reconnectMaxMs?: number;
+};
+type SnapshotPatch = {
+    type: "append_tags";
+    tags: string[];
+    maxTags?: number;
+} | {
+    type: "set_metadata";
+    metadata: string;
+    metadataType: string;
+} | {
+    type: "set_delay";
+    delayUntil: string;
+} | {
+    type: "mark_cancelled";
+    cancelledAt: string;
+    cancelReason?: string;
+};
+type MutateSnapshotResult = "applied_to_snapshot" | "not_found" | "busy" | "limit_exceeded";
+type CasSetMetadataResult = {
+    kind: "applied";
+    newVersion: number;
+} | {
+    kind: "version_conflict";
+    currentVersion: number;
+} | {
+    kind: "not_found";
+} | {
+    kind: "busy";
+};
+type AcceptResult = {
+    kind: "accepted";
+} | {
+    kind: "duplicate_run_id";
+} | {
+    kind: "duplicate_idempotency";
+    existingRunId: string;
+};
+type IdempotencyLookupInput = {
+    envId: string;
+    taskIdentifier: string;
+    idempotencyKey: string;
+};
+declare function idempotencyLookupKeyFor(input: IdempotencyLookupInput): string;
+declare function makeIdempotencyClaimKey(input: IdempotencyLookupInput): string;
+type IdempotencyClaimResult = {
+    kind: "claimed";
+} | {
+    kind: "pending";
+} | {
+    kind: "resolved";
+    runId: string;
 };
 declare class MollifierBuffer {
     #private;
     private readonly redis;
-    private readonly entryTtlSeconds;
     private readonly logger;
+    private readonly ackGraceTtlSeconds;
     constructor(options: MollifierBufferOptions);
     accept(input: {
         runId: string;
         envId: string;
         orgId: string;
         payload: string;
-    }): Promise<boolean>;
+        idempotencyKey?: string;
+        taskIdentifier?: string;
+    }): Promise<AcceptResult>;
     pop(envId: string): Promise<BufferEntry | null>;
     getEntry(runId: string): Promise<BufferEntry | null>;
     listOrgs(): Promise<string[]>;
     listEnvsForOrg(orgId: string): Promise<string[]>;
+    listEntriesForEnv(envId: string, maxCount: number): Promise<BufferEntry[]>;
+    mutateSnapshot(runId: string, patch: SnapshotPatch): Promise<MutateSnapshotResult>;
+    casSetMetadata(input: {
+        runId: string;
+        expectedVersion: number;
+        newMetadata: string;
+        newMetadataType: string;
+    }): Promise<CasSetMetadataResult>;
+    claimIdempotency(input: IdempotencyLookupInput & {
+        token: string;
+        ttlSeconds: number;
+    }): Promise<IdempotencyClaimResult>;
+    publishClaim(input: IdempotencyLookupInput & {
+        token: string;
+        runId: string;
+        ttlSeconds: number;
+    }): Promise<boolean>;
+    releaseClaim(input: IdempotencyLookupInput & {
+        token: string;
+    }): Promise<void>;
+    readClaim(input: IdempotencyLookupInput): Promise<IdempotencyClaimResult | null>;
+    lookupIdempotency(input: IdempotencyLookupInput): Promise<string | null>;
+    resetIdempotency(input: IdempotencyLookupInput): Promise<{
+        clearedRunId: string | null;
+    }>;
     ack(runId: string): Promise<void>;
     requeue(runId: string): Promise<void>;
     fail(runId: string, error: {
         code: string;
         message: string;
     }): Promise<boolean>;
+    getDrainingCount(): Promise<number>;
+    listStaleDraining(olderThanMs: number, limit: number): Promise<string[]>;
     getEntryTtlSeconds(runId: string): Promise<number>;
     evaluateTrip(envId: string, options: {
         windowMs: number;
@@ -2217,10 +2312,18 @@ declare class MollifierBuffer {
 }
 declare module "@internal/redis" {
     interface RedisCommander<Context> {
-        acceptMollifierEntry(entryKey: string, queueKey: string, orgsKey: string, runId: string, envId: string, orgId: string, payload: string, createdAt: string, ttlSeconds: string, orgEnvsPrefix: string, callback?: Callback<number>): Result<number, Context>;
-        popAndMarkDraining(queueKey: string, orgsKey: string, entryPrefix: string, envId: string, orgEnvsPrefix: string, callback?: Callback<string | null>): Result<string | null, Context>;
-        requeueMollifierEntry(entryKey: string, orgsKey: string, queuePrefix: string, runId: string, orgEnvsPrefix: string, callback?: Callback<number>): Result<number, Context>;
-        failMollifierEntry(entryKey: string, errorPayload: string, callback?: Callback<number>): Result<number, Context>;
+        acceptMollifierEntry(entryKey: string, queueKey: string, orgsKey: string, runId: string, envId: string, orgId: string, payload: string, createdAt: string, createdAtMicros: string, orgEnvsPrefix: string, idempotencyLookupKey: string, entryPrefix: string, callback?: Callback<number | string>): Result<number | string, Context>;
+        popAndMarkDraining(queueKey: string, orgsKey: string, drainingSetKey: string, entryPrefix: string, envId: string, orgEnvsPrefix: string, callback?: Callback<string | null>): Result<string | null, Context>;
+        requeueMollifierEntry(entryKey: string, orgsKey: string, drainingSetKey: string, queuePrefix: string, runId: string, orgEnvsPrefix: string, callback?: Callback<number>): Result<number, Context>;
+        mutateMollifierSnapshot(entryKey: string, patchJson: string, callback?: Callback<string>): Result<string, Context>;
+        casSetMollifierMetadata(entryKey: string, expectedVersion: string, newMetadata: string, newMetadataType: string, callback?: Callback<string>): Result<string, Context>;
+        resetMollifierIdempotency(lookupKey: string, entryPrefix: string, claimKey: string, callback?: Callback<string>): Result<string, Context>;
+        claimMollifierIdempotency(claimKey: string, pendingMarker: string, pendingPrefix: string, ttlSeconds: string, callback?: Callback<string>): Result<string, Context>;
+        publishMollifierClaim(claimKey: string, ownerMarker: string, runId: string, ttlSeconds: string, callback?: Callback<number>): Result<number, Context>;
+        releaseMollifierClaim(claimKey: string, ownerMarker: string, callback?: Callback<number>): Result<number, Context>;
+        ackMollifierEntry(entryKey: string, drainingSetKey: string, graceTtlSeconds: string, runId: string, callback?: Callback<number>): Result<number, Context>;
+        failMollifierEntry(entryKey: string, drainingSetKey: string, errorPayload: string, runId: string, callback?: Callback<number>): Result<number, Context>;
+        delMollifierKeyIfEquals(key: string, expected: string, callback?: Callback<number>): Result<number, Context>;
         mollifierEvaluateTrip(rateKey: string, trippedKey: string, windowMs: string, threshold: string, holdMs: string, callback?: Callback<[number, number]>): Result<[number, number], Context>;
     }
 }
@@ -2233,14 +2336,32 @@ type MollifierDrainerHandler<TPayload> = (input: {
     attempts: number;
     createdAt: Date;
 }) => Promise<void>;
+type MollifierDrainerTerminalFailureCause = "non-retryable" | "max-attempts-exhausted";
+type MollifierDrainerTerminalFailureHandler<TPayload> = (input: {
+    runId: string;
+    envId: string;
+    orgId: string;
+    payload: TPayload;
+    attempts: number;
+    createdAt: Date;
+    error: {
+        code: string;
+        message: string;
+    };
+    cause: MollifierDrainerTerminalFailureCause;
+}) => Promise<void>;
 type MollifierDrainerOptions<TPayload> = {
     buffer: MollifierBuffer;
     handler: MollifierDrainerHandler<TPayload>;
+    onTerminalFailure?: MollifierDrainerTerminalFailureHandler<TPayload>;
     concurrency: number;
     maxAttempts: number;
     isRetryable: (err: unknown) => boolean;
     pollIntervalMs?: number;
     maxOrgsPerTick?: number;
+    drainBatchSize?: number;
+    maxBackoffMs?: number;
+    backoffFloorMs?: number;
     logger?: Logger;
 };
 type DrainResult = {
@@ -2250,12 +2371,16 @@ type DrainResult = {
 declare class MollifierDrainer<TPayload = unknown> {
     private readonly buffer;
     private readonly handler;
+    private readonly onTerminalFailure?;
     private readonly maxAttempts;
     private readonly isRetryable;
     private readonly pollIntervalMs;
     private readonly maxOrgsPerTick;
+    private readonly drainBatchSize;
+    private readonly concurrency;
+    private readonly maxBackoffMs;
+    private readonly backoffFloorMs;
     private readonly logger;
-    private readonly limit;
     private orgCursor;
     private perOrgEnvCursors;
     private isRunning;
@@ -2272,8 +2397,7 @@ declare class MollifierDrainer<TPayload = unknown> {
     private delay;
     private takeOrgSlice;
     private pickEnvForOrg;
-    private processOneFromEnv;
     private processEntry;
 }
 
-export { type AnyMessageCatalog, type AnyQueueItem, BaseScheduler, type BatchConfig, BatchedSpanManager, type BatchedSpanManagerOptions, type BufferEntry, BufferEntryError, BufferEntrySchema, BufferEntryStatus, CallbackFairQueueKeyProducer, type ClaimResult, type ConcurrencyCheckResult, type ConcurrencyGroupConfig, ConcurrencyManager, type ConcurrencyManagerOptions, type ConcurrencyState, type ConsumerLoopState, type CooloffOptions, CronSchema, CustomRetry, DRRScheduler, type DRRSchedulerConfig, type DeadLetterMessage, DefaultFairQueueKeyProducer, type DispatchSchedulerContext, type DrainResult, type EnqueueBatchOptions, type EnqueueOptions, ExponentialBackoffRetry, FairQueue, FairQueueAttributes, type FairQueueKeyProducer, type FairQueueMetrics, type FairQueueOptions, FairQueueTelemetry, type FairScheduler, FixedDelayRetry, type GlobalRateLimiter, ImmediateRetry, type InFlightMessage, type JobHandler, type JobHandlerParams, LinearBackoffRetry, MasterQueue, type MasterQueueOptions, type MessageCatalogKey, type MessageCatalogSchema, type MessageCatalogValue, type MessageHandler, type MessageHandlerContext, MessagingAttributes, MollifierBuffer, type MollifierBufferOptions, MollifierDrainer, type MollifierDrainerHandler, type MollifierDrainerOptions, NoRetry, NoopScheduler, type QueueCooloffState, type QueueDescriptor, type QueueItem, type QueueMessage, type QueueWithScore, type ReclaimedMessageInfo, type RetryOptions, type RetryStrategy, RoundRobinScheduler, type SchedulerContext, SimpleQueue, type StoredMessage, type TelemetryOptions, TenantDispatch, type TenantDispatchOptions, type TenantQueues, type TenantWithScore, VisibilityManager, type VisibilityManagerOptions, WeightedScheduler, type WeightedSchedulerBiases, type WeightedSchedulerConfig, Worker, type WorkerCatalog, type WorkerConcurrencyOptions, WorkerQueueManager, type WorkerQueueManagerOptions, type WorkerQueueOptions, createDefaultRetryStrategy, defaultRetryOptions, deserialiseSnapshot, isAbortError, noopTelemetry, serialiseSnapshot };
+export { type AcceptResult, type AnyMessageCatalog, type AnyQueueItem, BaseScheduler, type BatchConfig, BatchedSpanManager, type BatchedSpanManagerOptions, type BufferEntry, BufferEntryError, BufferEntrySchema, BufferEntryStatus, CallbackFairQueueKeyProducer, type CasSetMetadataResult, type ClaimResult, type ConcurrencyCheckResult, type ConcurrencyGroupConfig, ConcurrencyManager, type ConcurrencyManagerOptions, type ConcurrencyState, type ConsumerLoopState, type CooloffOptions, CronSchema, CustomRetry, DRRScheduler, type DRRSchedulerConfig, type DeadLetterMessage, DefaultFairQueueKeyProducer, type DispatchSchedulerContext, type DrainResult, type EnqueueBatchOptions, type EnqueueOptions, ExponentialBackoffRetry, FairQueue, FairQueueAttributes, type FairQueueKeyProducer, type FairQueueMetrics, type FairQueueOptions, FairQueueTelemetry, type FairScheduler, FixedDelayRetry, type GlobalRateLimiter, type IdempotencyClaimResult, type IdempotencyLookupInput, ImmediateRetry, type InFlightMessage, type JobHandler, type JobHandlerParams, LinearBackoffRetry, MasterQueue, type MasterQueueOptions, type MessageCatalogKey, type MessageCatalogSchema, type MessageCatalogValue, type MessageHandler, type MessageHandlerContext, MessagingAttributes, MollifierBuffer, type MollifierBufferOptions, MollifierDrainer, type MollifierDrainerHandler, type MollifierDrainerOptions, type MollifierDrainerTerminalFailureCause, type MollifierDrainerTerminalFailureHandler, type MutateSnapshotResult, NoRetry, NoopScheduler, type QueueCooloffState, type QueueDescriptor, type QueueItem, type QueueMessage, type QueueWithScore, type ReclaimedMessageInfo, type RetryOptions, type RetryStrategy, RoundRobinScheduler, type SchedulerContext, SimpleQueue, type SnapshotPatch, type StoredMessage, type TelemetryOptions, TenantDispatch, type TenantDispatchOptions, type TenantQueues, type TenantWithScore, VisibilityManager, type VisibilityManagerOptions, WeightedScheduler, type WeightedSchedulerBiases, type WeightedSchedulerConfig, Worker, type WorkerCatalog, type WorkerConcurrencyOptions, WorkerQueueManager, type WorkerQueueManagerOptions, type WorkerQueueOptions, createDefaultRetryStrategy, defaultRetryOptions, deserialiseSnapshot, idempotencyLookupKeyFor, isAbortError, makeIdempotencyClaimKey, noopTelemetry, serialiseSnapshot };

package/dist/index.d.ts

@@ -2147,6 +2147,10 @@ declare const BufferEntrySchema: z.ZodObject<{
     status: z.ZodEnum<["QUEUED", "DRAINING", "FAILED"]>;
     attempts: z.ZodEffects<z.ZodString, number, string>;
     createdAt: z.ZodEffects<z.ZodString, Date, string>;
+    createdAtMicros: z.ZodDefault<z.ZodEffects<z.ZodString, number, string>>;
+    materialised: z.ZodDefault<z.ZodEffects<z.ZodUnion<[z.ZodLiteral<"true">, z.ZodLiteral<"false">]>, boolean, "true" | "false">>;
+    idempotencyLookupKey: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    metadataVersion: z.ZodDefault<z.ZodEffects<z.ZodString, number, string>>;
     lastError: z.ZodOptional<z.ZodEffects<z.ZodString, {
         message: string;
         code: string;
@@ -2159,6 +2163,10 @@ declare const BufferEntrySchema: z.ZodObject<{
     envId: string;
     orgId: string;
     attempts: number;
+    createdAtMicros: number;
+    materialised: boolean;
+    idempotencyLookupKey: string;
+    metadataVersion: number;
     lastError?: {
         message: string;
         code: string;
@@ -2171,6 +2179,10 @@ declare const BufferEntrySchema: z.ZodObject<{
     envId: string;
     orgId: string;
     attempts: string;
+    createdAtMicros?: string | undefined;
+    materialised?: "true" | "false" | undefined;
+    idempotencyLookupKey?: string | undefined;
+    metadataVersion?: string | undefined;
     lastError?: string | undefined;
 }>;
 type BufferEntry = z.infer<typeof BufferEntrySchema>;
@@ -2179,31 +2191,114 @@ declare function deserialiseSnapshot<T = unknown>(serialised: string): T;
 
 type MollifierBufferOptions = {
     redisOptions: RedisOptions;
-    entryTtlSeconds: number;
     logger?: Logger;
+    ackGraceTtlSeconds?: number;
+    maxRetriesPerRequest?: number;
+    reconnectStepMs?: number;
+    reconnectMaxMs?: number;
+};
+type SnapshotPatch = {
+    type: "append_tags";
+    tags: string[];
+    maxTags?: number;
+} | {
+    type: "set_metadata";
+    metadata: string;
+    metadataType: string;
+} | {
+    type: "set_delay";
+    delayUntil: string;
+} | {
+    type: "mark_cancelled";
+    cancelledAt: string;
+    cancelReason?: string;
+};
+type MutateSnapshotResult = "applied_to_snapshot" | "not_found" | "busy" | "limit_exceeded";
+type CasSetMetadataResult = {
+    kind: "applied";
+    newVersion: number;
+} | {
+    kind: "version_conflict";
+    currentVersion: number;
+} | {
+    kind: "not_found";
+} | {
+    kind: "busy";
+};
+type AcceptResult = {
+    kind: "accepted";
+} | {
+    kind: "duplicate_run_id";
+} | {
+    kind: "duplicate_idempotency";
+    existingRunId: string;
+};
+type IdempotencyLookupInput = {
+    envId: string;
+    taskIdentifier: string;
+    idempotencyKey: string;
+};
+declare function idempotencyLookupKeyFor(input: IdempotencyLookupInput): string;
+declare function makeIdempotencyClaimKey(input: IdempotencyLookupInput): string;
+type IdempotencyClaimResult = {
+    kind: "claimed";
+} | {
+    kind: "pending";
+} | {
+    kind: "resolved";
+    runId: string;
 };
 declare class MollifierBuffer {
     #private;
     private readonly redis;
-    private readonly entryTtlSeconds;
     private readonly logger;
+    private readonly ackGraceTtlSeconds;
     constructor(options: MollifierBufferOptions);
     accept(input: {
         runId: string;
         envId: string;
         orgId: string;
         payload: string;
-    }): Promise<boolean>;
+        idempotencyKey?: string;
+        taskIdentifier?: string;
+    }): Promise<AcceptResult>;
     pop(envId: string): Promise<BufferEntry | null>;
     getEntry(runId: string): Promise<BufferEntry | null>;
     listOrgs(): Promise<string[]>;
     listEnvsForOrg(orgId: string): Promise<string[]>;
+    listEntriesForEnv(envId: string, maxCount: number): Promise<BufferEntry[]>;
+    mutateSnapshot(runId: string, patch: SnapshotPatch): Promise<MutateSnapshotResult>;
+    casSetMetadata(input: {
+        runId: string;
+        expectedVersion: number;
+        newMetadata: string;
+        newMetadataType: string;
+    }): Promise<CasSetMetadataResult>;
+    claimIdempotency(input: IdempotencyLookupInput & {
+        token: string;
+        ttlSeconds: number;
+    }): Promise<IdempotencyClaimResult>;
+    publishClaim(input: IdempotencyLookupInput & {
+        token: string;
+        runId: string;
+        ttlSeconds: number;
+    }): Promise<boolean>;
+    releaseClaim(input: IdempotencyLookupInput & {
+        token: string;
+    }): Promise<void>;
+    readClaim(input: IdempotencyLookupInput): Promise<IdempotencyClaimResult | null>;
+    lookupIdempotency(input: IdempotencyLookupInput): Promise<string | null>;
+    resetIdempotency(input: IdempotencyLookupInput): Promise<{
+        clearedRunId: string | null;
+    }>;
     ack(runId: string): Promise<void>;
     requeue(runId: string): Promise<void>;
     fail(runId: string, error: {
         code: string;
         message: string;
     }): Promise<boolean>;
+    getDrainingCount(): Promise<number>;
+    listStaleDraining(olderThanMs: number, limit: number): Promise<string[]>;
     getEntryTtlSeconds(runId: string): Promise<number>;
     evaluateTrip(envId: string, options: {
         windowMs: number;
@@ -2217,10 +2312,18 @@ declare class MollifierBuffer {
 }
 declare module "@internal/redis" {
     interface RedisCommander<Context> {
-        acceptMollifierEntry(entryKey: string, queueKey: string, orgsKey: string, runId: string, envId: string, orgId: string, payload: string, createdAt: string, ttlSeconds: string, orgEnvsPrefix: string, callback?: Callback<number>): Result<number, Context>;
-        popAndMarkDraining(queueKey: string, orgsKey: string, entryPrefix: string, envId: string, orgEnvsPrefix: string, callback?: Callback<string | null>): Result<string | null, Context>;
-        requeueMollifierEntry(entryKey: string, orgsKey: string, queuePrefix: string, runId: string, orgEnvsPrefix: string, callback?: Callback<number>): Result<number, Context>;
-        failMollifierEntry(entryKey: string, errorPayload: string, callback?: Callback<number>): Result<number, Context>;
+        acceptMollifierEntry(entryKey: string, queueKey: string, orgsKey: string, runId: string, envId: string, orgId: string, payload: string, createdAt: string, createdAtMicros: string, orgEnvsPrefix: string, idempotencyLookupKey: string, entryPrefix: string, callback?: Callback<number | string>): Result<number | string, Context>;
+        popAndMarkDraining(queueKey: string, orgsKey: string, drainingSetKey: string, entryPrefix: string, envId: string, orgEnvsPrefix: string, callback?: Callback<string | null>): Result<string | null, Context>;
+        requeueMollifierEntry(entryKey: string, orgsKey: string, drainingSetKey: string, queuePrefix: string, runId: string, orgEnvsPrefix: string, callback?: Callback<number>): Result<number, Context>;
+        mutateMollifierSnapshot(entryKey: string, patchJson: string, callback?: Callback<string>): Result<string, Context>;
+        casSetMollifierMetadata(entryKey: string, expectedVersion: string, newMetadata: string, newMetadataType: string, callback?: Callback<string>): Result<string, Context>;
+        resetMollifierIdempotency(lookupKey: string, entryPrefix: string, claimKey: string, callback?: Callback<string>): Result<string, Context>;
+        claimMollifierIdempotency(claimKey: string, pendingMarker: string, pendingPrefix: string, ttlSeconds: string, callback?: Callback<string>): Result<string, Context>;
+        publishMollifierClaim(claimKey: string, ownerMarker: string, runId: string, ttlSeconds: string, callback?: Callback<number>): Result<number, Context>;
+        releaseMollifierClaim(claimKey: string, ownerMarker: string, callback?: Callback<number>): Result<number, Context>;
+        ackMollifierEntry(entryKey: string, drainingSetKey: string, graceTtlSeconds: string, runId: string, callback?: Callback<number>): Result<number, Context>;
+        failMollifierEntry(entryKey: string, drainingSetKey: string, errorPayload: string, runId: string, callback?: Callback<number>): Result<number, Context>;
+        delMollifierKeyIfEquals(key: string, expected: string, callback?: Callback<number>): Result<number, Context>;
         mollifierEvaluateTrip(rateKey: string, trippedKey: string, windowMs: string, threshold: string, holdMs: string, callback?: Callback<[number, number]>): Result<[number, number], Context>;
     }
 }
@@ -2233,14 +2336,32 @@ type MollifierDrainerHandler<TPayload> = (input: {
     attempts: number;
     createdAt: Date;
 }) => Promise<void>;
+type MollifierDrainerTerminalFailureCause = "non-retryable" | "max-attempts-exhausted";
+type MollifierDrainerTerminalFailureHandler<TPayload> = (input: {
+    runId: string;
+    envId: string;
+    orgId: string;
+    payload: TPayload;
+    attempts: number;
+    createdAt: Date;
+    error: {
+        code: string;
+        message: string;
+    };
+    cause: MollifierDrainerTerminalFailureCause;
+}) => Promise<void>;
 type MollifierDrainerOptions<TPayload> = {
     buffer: MollifierBuffer;
     handler: MollifierDrainerHandler<TPayload>;
+    onTerminalFailure?: MollifierDrainerTerminalFailureHandler<TPayload>;
     concurrency: number;
     maxAttempts: number;
     isRetryable: (err: unknown) => boolean;
     pollIntervalMs?: number;
     maxOrgsPerTick?: number;
+    drainBatchSize?: number;
+    maxBackoffMs?: number;
+    backoffFloorMs?: number;
     logger?: Logger;
 };
 type DrainResult = {
@@ -2250,12 +2371,16 @@ type DrainResult = {
 declare class MollifierDrainer<TPayload = unknown> {
     private readonly buffer;
     private readonly handler;
+    private readonly onTerminalFailure?;
     private readonly maxAttempts;
     private readonly isRetryable;
     private readonly pollIntervalMs;
     private readonly maxOrgsPerTick;
+    private readonly drainBatchSize;
+    private readonly concurrency;
+    private readonly maxBackoffMs;
+    private readonly backoffFloorMs;
     private readonly logger;
-    private readonly limit;
     private orgCursor;
     private perOrgEnvCursors;
     private isRunning;
@@ -2272,8 +2397,7 @@ declare class MollifierDrainer<TPayload = unknown> {
     private delay;
     private takeOrgSlice;
     private pickEnvForOrg;
-    private processOneFromEnv;
     private processEntry;
 }
 
-export { type AnyMessageCatalog, type AnyQueueItem, BaseScheduler, type BatchConfig, BatchedSpanManager, type BatchedSpanManagerOptions, type BufferEntry, BufferEntryError, BufferEntrySchema, BufferEntryStatus, CallbackFairQueueKeyProducer, type ClaimResult, type ConcurrencyCheckResult, type ConcurrencyGroupConfig, ConcurrencyManager, type ConcurrencyManagerOptions, type ConcurrencyState, type ConsumerLoopState, type CooloffOptions, CronSchema, CustomRetry, DRRScheduler, type DRRSchedulerConfig, type DeadLetterMessage, DefaultFairQueueKeyProducer, type DispatchSchedulerContext, type DrainResult, type EnqueueBatchOptions, type EnqueueOptions, ExponentialBackoffRetry, FairQueue, FairQueueAttributes, type FairQueueKeyProducer, type FairQueueMetrics, type FairQueueOptions, FairQueueTelemetry, type FairScheduler, FixedDelayRetry, type GlobalRateLimiter, ImmediateRetry, type InFlightMessage, type JobHandler, type JobHandlerParams, LinearBackoffRetry, MasterQueue, type MasterQueueOptions, type MessageCatalogKey, type MessageCatalogSchema, type MessageCatalogValue, type MessageHandler, type MessageHandlerContext, MessagingAttributes, MollifierBuffer, type MollifierBufferOptions, MollifierDrainer, type MollifierDrainerHandler, type MollifierDrainerOptions, NoRetry, NoopScheduler, type QueueCooloffState, type QueueDescriptor, type QueueItem, type QueueMessage, type QueueWithScore, type ReclaimedMessageInfo, type RetryOptions, type RetryStrategy, RoundRobinScheduler, type SchedulerContext, SimpleQueue, type StoredMessage, type TelemetryOptions, TenantDispatch, type TenantDispatchOptions, type TenantQueues, type TenantWithScore, VisibilityManager, type VisibilityManagerOptions, WeightedScheduler, type WeightedSchedulerBiases, type WeightedSchedulerConfig, Worker, type WorkerCatalog, type WorkerConcurrencyOptions, WorkerQueueManager, type WorkerQueueManagerOptions, type WorkerQueueOptions, createDefaultRetryStrategy, defaultRetryOptions, deserialiseSnapshot, isAbortError, noopTelemetry, serialiseSnapshot };
+export { type AcceptResult, type AnyMessageCatalog, type AnyQueueItem, BaseScheduler, type BatchConfig, BatchedSpanManager, type BatchedSpanManagerOptions, type BufferEntry, BufferEntryError, BufferEntrySchema, BufferEntryStatus, CallbackFairQueueKeyProducer, type CasSetMetadataResult, type ClaimResult, type ConcurrencyCheckResult, type ConcurrencyGroupConfig, ConcurrencyManager, type ConcurrencyManagerOptions, type ConcurrencyState, type ConsumerLoopState, type CooloffOptions, CronSchema, CustomRetry, DRRScheduler, type DRRSchedulerConfig, type DeadLetterMessage, DefaultFairQueueKeyProducer, type DispatchSchedulerContext, type DrainResult, type EnqueueBatchOptions, type EnqueueOptions, ExponentialBackoffRetry, FairQueue, FairQueueAttributes, type FairQueueKeyProducer, type FairQueueMetrics, type FairQueueOptions, FairQueueTelemetry, type FairScheduler, FixedDelayRetry, type GlobalRateLimiter, type IdempotencyClaimResult, type IdempotencyLookupInput, ImmediateRetry, type InFlightMessage, type JobHandler, type JobHandlerParams, LinearBackoffRetry, MasterQueue, type MasterQueueOptions, type MessageCatalogKey, type MessageCatalogSchema, type MessageCatalogValue, type MessageHandler, type MessageHandlerContext, MessagingAttributes, MollifierBuffer, type MollifierBufferOptions, MollifierDrainer, type MollifierDrainerHandler, type MollifierDrainerOptions, type MollifierDrainerTerminalFailureCause, type MollifierDrainerTerminalFailureHandler, type MutateSnapshotResult, NoRetry, NoopScheduler, type QueueCooloffState, type QueueDescriptor, type QueueItem, type QueueMessage, type QueueWithScore, type ReclaimedMessageInfo, type RetryOptions, type RetryStrategy, RoundRobinScheduler, type SchedulerContext, SimpleQueue, type SnapshotPatch, type StoredMessage, type TelemetryOptions, TenantDispatch, type TenantDispatchOptions, type TenantQueues, type TenantWithScore, VisibilityManager, type VisibilityManagerOptions, WeightedScheduler, type WeightedSchedulerBiases, type WeightedSchedulerConfig, Worker, type WorkerCatalog, type WorkerConcurrencyOptions, WorkerQueueManager, type WorkerQueueManagerOptions, type WorkerQueueOptions, createDefaultRetryStrategy, defaultRetryOptions, deserialiseSnapshot, idempotencyLookupKeyFor, isAbortError, makeIdempotencyClaimKey, noopTelemetry, serialiseSnapshot };