experimental-a2 0.18.0 → 0.18.1

package/dist/{store-polling-B5FcwJfo.js.map → store-polling-7WJV0YWP.js.map}

@@ -1 +1 @@
-{"version":3,"file":"store-polling-B5FcwJfo.js","names":[],"sources":["../src/stream-activity.ts","../src/store-polling.ts"],"sourcesContent":["export type StreamActivity = {\n  readonly idle: boolean\n  setIdle(idle: boolean): void\n  activate(): void\n  subscribe(listener: (idle: boolean) => void): () => void\n}\n\nexport const streamActivities: WeakMap<object, StreamActivity> = new WeakMap()\n\nexport function createStreamActivity(wake: () => void): StreamActivity {\n  let idle = false\n  const listeners = new Set<(idle: boolean) => void>()\n  const setIdle = (next: boolean): void => {\n    if (idle === next) return\n    idle = next\n    for (const listener of listeners) listener(idle)\n  }\n  return {\n    get idle() {\n      return idle\n    },\n    setIdle,\n    activate() {\n      setIdle(false)\n      wake()\n    },\n    subscribe(listener) {\n      listeners.add(listener)\n      return () => listeners.delete(listener)\n    },\n  }\n}\n","/**\n * The shared polling stream — how poll-based backends (sqlite,\n * postgres) implement `A2Store.stream`.\n *\n * The cadence is activity-adaptive: while events are flowing, polls\n * run at a tight floor (25ms) so streams feel pushed — a token\n * generation reads smoothly instead of clumping at the idle interval;\n * every empty poll doubles the gap until the idle ceiling. The cadence\n * is owned (POLL_TIMINGS in internal.ts), not a public option: the\n * floor already keeps active streams smooth, so tuning it is a cost\n * decision a2 makes, not one it delegates. Correctness never depends\n * on the cadence — each poll is a catch-up read (`index > last`, in\n * order), so nothing can be missed, only arrive a beat later.\n */\n\nimport { POLL_TIMINGS } from './internal.ts'\nimport type { Event } from './store.ts'\nimport { createStreamActivity, streamActivities } from './stream-activity.ts'\n\n/** One cancellable sleep — the injection seam for cadence tests. */\nexport type Sleeper = { promise: Promise<void>; cancel: () => void }\n\n/** Unref'd cancellable timer — shared with the redis safety read. */\nexport const defaultSleep = (ms: number): Sleeper => {\n  let timer: ReturnType<typeof setTimeout> | undefined\n  let wake: (() => void) | undefined\n  const promise = new Promise<void>((resolve) => {\n    wake = resolve // assigned synchronously by the executor\n    timer = setTimeout(resolve, ms)\n    // Don't hold the process open for an idle poll.\n    ;(timer as { unref?: () => void }).unref?.()\n  })\n  return {\n    promise,\n    cancel: () => {\n      clearTimeout(timer)\n      wake?.()\n    },\n  }\n}\n\n// Read the seam lazily — tests shrink POLL_TIMINGS in their setup.\nconst ceiling = (): number => POLL_TIMINGS.idleCeilingMs\nconst floor = (): number =>\n  Math.min(POLL_TIMINGS.activeFloorMs, POLL_TIMINGS.idleCeilingMs)\n\nexport type PollingStreamOptions = {\n  /** Deliver events strictly after this index (exclusive). */\n  startAfter?: number\n  /** Injectable sleep — tests assert the cadence without wall-clock waits. */\n  sleep?: (ms: number) => Sleeper\n}\n\n/**\n * Build the `stream()` iterable from a backend's catch-up read. The\n * iterable ends when the consumer calls `return()` (a disconnecting\n * SSE client), waking any pending sleep immediately.\n */\nexport function pollingStream(\n  readAfter: (afterIndex: number) => Event[] | Promise<Event[]>,\n  options: PollingStreamOptions,\n): AsyncIterable<Event> {\n  const startAfter = options.startAfter ?? 0\n  const sleep = options.sleep ?? defaultSleep\n\n  return {\n    [Symbol.asyncIterator](): AsyncIterator<Event> {\n      let last = startAfter\n      let buffer: Array<Event | undefined> = []\n      let position = 0\n      let closed = false\n      let pending: Sleeper | null = null\n      let interval = floor()\n      let activityVersion = 0\n      const activity = createStreamActivity(() => {\n        if (closed) return\n        activityVersion += 1\n        interval = floor()\n        pending?.cancel()\n      })\n\n      const iterator: AsyncIterator<Event> = {\n        async next(): Promise<IteratorResult<Event>> {\n          for (;;) {\n            if (closed) return { value: undefined, done: true }\n            try {\n              if (position === buffer.length) {\n                // oxlint-disable-next-line no-await-in-loop -- poll loop\n                const rows = await readAfter(last)\n                if (closed) return { value: undefined, done: true }\n                buffer = rows\n                position = 0\n              }\n            } catch (error) {\n              if (closed) return { value: undefined, done: true }\n              throw error\n            }\n            if (closed) return { value: undefined, done: true }\n            const row = buffer[position]\n            if (row) {\n              // Activity: tighten back to the floor.\n              activity.activate()\n              last = row.index\n              buffer[position] = undefined\n              position += 1\n              if (position === buffer.length) {\n                buffer = []\n                position = 0\n              }\n              return { value: row, done: false }\n            }\n            // Empty poll: wait, then back off toward the idle ceiling.\n            activity.setIdle(interval === ceiling())\n            const version = activityVersion\n            pending = sleep(interval)\n            // oxlint-disable-next-line no-await-in-loop -- poll loop\n            await pending.promise\n            pending = null\n            if (version === activityVersion) {\n              interval = Math.min(interval * 2, ceiling())\n            }\n          }\n        },\n        async return(): Promise<IteratorResult<Event>> {\n          closed = true\n          buffer = []\n          position = 0\n          pending?.cancel()\n          return { value: undefined, done: true }\n        },\n      }\n      streamActivities.set(iterator, activity)\n      return iterator\n    },\n  }\n}\n"],"mappings":";;AAOA,MAAa,mCAAoD,IAAI,QAAQ;AAE7E,SAAgB,qBAAqB,MAAkC;CACrE,IAAI,OAAO;CACX,MAAM,4BAAY,IAAI,IAA6B;CACnD,MAAM,WAAW,SAAwB;EACvC,IAAI,SAAS,MAAM;EACnB,OAAO;EACP,KAAK,MAAM,YAAY,WAAW,SAAS,IAAI;CACjD;CACA,OAAO;EACL,IAAI,OAAO;GACT,OAAO;EACT;EACA;EACA,WAAW;GACT,QAAQ,KAAK;GACb,KAAK;EACP;EACA,UAAU,UAAU;GAClB,UAAU,IAAI,QAAQ;GACtB,aAAa,UAAU,OAAO,QAAQ;EACxC;CACF;AACF;;;;;;;;;;;;;;;;;;ACRA,MAAa,gBAAgB,OAAwB;CACnD,IAAI;CACJ,IAAI;CAOJ,OAAO;EACL,SAAA,IAPkB,SAAe,YAAY;GAC7C,OAAO;GACP,QAAQ,WAAW,SAAS,EAAE;GAE7B,MAAkC,QAAQ;EAC7C,CAEQ;EACN,cAAc;GACZ,aAAa,KAAK;GAClB,OAAO;EACT;CACF;AACF;AAGA,MAAM,gBAAwB,aAAa;AAC3C,MAAM,cACJ,KAAK,IAAI,aAAa,eAAe,aAAa,aAAa;;;;;;AAcjE,SAAgB,cACd,WACA,SACsB;CACtB,MAAM,aAAa,QAAQ,cAAc;CACzC,MAAM,QAAQ,QAAQ,SAAS;CAE/B,OAAO,EACL,CAAC,OAAO,iBAAuC;EAC7C,IAAI,OAAO;EACX,IAAI,SAAmC,CAAC;EACxC,IAAI,WAAW;EACf,IAAI,SAAS;EACb,IAAI,UAA0B;EAC9B,IAAI,WAAW,MAAM;EACrB,IAAI,kBAAkB;EACtB,MAAM,WAAW,2BAA2B;GAC1C,IAAI,QAAQ;GACZ,mBAAmB;GACnB,WAAW,MAAM;GACjB,SAAS,OAAO;EAClB,CAAC;EAED,MAAM,WAAiC;GACrC,MAAM,OAAuC;IAC3C,SAAS;KACP,IAAI,QAAQ,OAAO;MAAE,OAAO,KAAA;MAAW,MAAM;KAAK;KAClD,IAAI;MACF,IAAI,aAAa,OAAO,QAAQ;OAE9B,MAAM,OAAO,MAAM,UAAU,IAAI;OACjC,IAAI,QAAQ,OAAO;QAAE,OAAO,KAAA;QAAW,MAAM;OAAK;OAClD,SAAS;OACT,WAAW;MACb;KACF,SAAS,OAAO;MACd,IAAI,QAAQ,OAAO;OAAE,OAAO,KAAA;OAAW,MAAM;MAAK;MAClD,MAAM;KACR;KACA,IAAI,QAAQ,OAAO;MAAE,OAAO,KAAA;MAAW,MAAM;KAAK;KAClD,MAAM,MAAM,OAAO;KACnB,IAAI,KAAK;MAEP,SAAS,SAAS;MAClB,OAAO,IAAI;MACX,OAAO,YAAY,KAAA;MACnB,YAAY;MACZ,IAAI,aAAa,OAAO,QAAQ;OAC9B,SAAS,CAAC;OACV,WAAW;MACb;MACA,OAAO;OAAE,OAAO;OAAK,MAAM;MAAM;KACnC;KAEA,SAAS,QAAQ,aAAa,QAAQ,CAAC;KACvC,MAAM,UAAU;KAChB,UAAU,MAAM,QAAQ;KAExB,MAAM,QAAQ;KACd,UAAU;KACV,IAAI,YAAY,iBACd,WAAW,KAAK,IAAI,WAAW,GAAG,QAAQ,CAAC;IAE/C;GACF;GACA,MAAM,SAAyC;IAC7C,SAAS;IACT,SAAS,CAAC;IACV,WAAW;IACX,SAAS,OAAO;IAChB,OAAO;KAAE,OAAO,KAAA;KAAW,MAAM;IAAK;GACxC;EACF;EACA,iBAAiB,IAAI,UAAU,QAAQ;EACvC,OAAO;CACT,EACF;AACF"}
+{"version":3,"file":"store-polling-7WJV0YWP.js","names":[],"sources":["../src/stream-activity.ts","../src/store-polling.ts"],"sourcesContent":["export type StreamActivity = {\n  readonly idle: boolean\n  setIdle(idle: boolean): void\n  activate(): void\n  subscribe(listener: (idle: boolean) => void): () => void\n}\n\nexport const streamActivities: WeakMap<object, StreamActivity> = new WeakMap()\n\nexport function createStreamActivity(wake: () => void): StreamActivity {\n  let idle = false\n  const listeners = new Set<(idle: boolean) => void>()\n  const setIdle = (next: boolean): void => {\n    if (idle === next) return\n    idle = next\n    for (const listener of listeners) listener(idle)\n  }\n  return {\n    get idle() {\n      return idle\n    },\n    setIdle,\n    activate() {\n      setIdle(false)\n      wake()\n    },\n    subscribe(listener) {\n      listeners.add(listener)\n      return () => listeners.delete(listener)\n    },\n  }\n}\n","/**\n * The shared polling stream — how poll-based backends (sqlite,\n * postgres) implement `A2Store.stream`.\n *\n * The cadence is activity-adaptive: while events are flowing, polls\n * run at a tight floor (25ms) so streams feel pushed — a token\n * generation reads smoothly instead of clumping at the idle interval;\n * every empty poll doubles the gap until the idle ceiling. The cadence\n * is owned (POLL_TIMINGS in internal.ts), not a public option: the\n * floor already keeps active streams smooth, so tuning it is a cost\n * decision a2 makes, not one it delegates. Correctness never depends\n * on the cadence — each poll is a catch-up read (`index > last`, in\n * order), so nothing can be missed, only arrive a beat later.\n */\n\nimport { POLL_TIMINGS } from './internal.ts'\nimport type { Event } from './store.ts'\nimport { createStreamActivity, streamActivities } from './stream-activity.ts'\n\n/** One cancellable sleep — the injection seam for cadence tests. */\nexport type Sleeper = { promise: Promise<void>; cancel: () => void }\n\n/** Unref'd cancellable timer — shared with the redis safety read. */\nexport const defaultSleep = (ms: number): Sleeper => {\n  let timer: ReturnType<typeof setTimeout> | undefined\n  let wake: (() => void) | undefined\n  const promise = new Promise<void>((resolve) => {\n    wake = resolve // assigned synchronously by the executor\n    timer = setTimeout(resolve, ms)\n    // Don't hold the process open for an idle poll.\n    ;(timer as { unref?: () => void }).unref?.()\n  })\n  return {\n    promise,\n    cancel: () => {\n      clearTimeout(timer)\n      wake?.()\n    },\n  }\n}\n\n// Read the seam lazily — tests shrink POLL_TIMINGS in their setup.\nconst ceiling = (): number => POLL_TIMINGS.idleCeilingMs\nconst floor = (): number =>\n  Math.min(POLL_TIMINGS.activeFloorMs, POLL_TIMINGS.idleCeilingMs)\n\nexport type PollingStreamOptions = {\n  /** Deliver events strictly after this index (exclusive). */\n  startAfter?: number\n  /** Injectable sleep — tests assert the cadence without wall-clock waits. */\n  sleep?: (ms: number) => Sleeper\n}\n\n/**\n * Build the `stream()` iterable from a backend's catch-up read. The\n * iterable ends when the consumer calls `return()` (a disconnecting\n * SSE client), waking any pending sleep immediately.\n */\nexport function pollingStream(\n  readAfter: (afterIndex: number) => Event[] | Promise<Event[]>,\n  options: PollingStreamOptions,\n): AsyncIterable<Event> {\n  const startAfter = options.startAfter ?? 0\n  const sleep = options.sleep ?? defaultSleep\n\n  return {\n    [Symbol.asyncIterator](): AsyncIterator<Event> {\n      let last = startAfter\n      let buffer: Array<Event | undefined> = []\n      let position = 0\n      let closed = false\n      let pending: Sleeper | null = null\n      let interval = floor()\n      let activityVersion = 0\n      const activity = createStreamActivity(() => {\n        if (closed) return\n        activityVersion += 1\n        interval = floor()\n        pending?.cancel()\n      })\n\n      const iterator: AsyncIterator<Event> = {\n        async next(): Promise<IteratorResult<Event>> {\n          for (;;) {\n            if (closed) return { value: undefined, done: true }\n            try {\n              if (position === buffer.length) {\n                // oxlint-disable-next-line no-await-in-loop -- poll loop\n                const rows = await readAfter(last)\n                if (closed) return { value: undefined, done: true }\n                buffer = rows\n                position = 0\n              }\n            } catch (error) {\n              if (closed) return { value: undefined, done: true }\n              throw error\n            }\n            if (closed) return { value: undefined, done: true }\n            const row = buffer[position]\n            if (row) {\n              // Activity: tighten back to the floor.\n              activity.activate()\n              last = row.index\n              buffer[position] = undefined\n              position += 1\n              if (position === buffer.length) {\n                buffer = []\n                position = 0\n              }\n              return { value: row, done: false }\n            }\n            // Empty poll: wait, then back off toward the idle ceiling.\n            activity.setIdle(interval === ceiling())\n            const version = activityVersion\n            pending = sleep(interval)\n            // oxlint-disable-next-line no-await-in-loop -- poll loop\n            await pending.promise\n            pending = null\n            if (version === activityVersion) {\n              interval = Math.min(interval * 2, ceiling())\n            }\n          }\n        },\n        async return(): Promise<IteratorResult<Event>> {\n          closed = true\n          buffer = []\n          position = 0\n          pending?.cancel()\n          return { value: undefined, done: true }\n        },\n      }\n      streamActivities.set(iterator, activity)\n      return iterator\n    },\n  }\n}\n"],"mappings":";;AAOA,MAAa,mCAAoD,IAAI,QAAQ;AAE7E,SAAgB,qBAAqB,MAAkC;CACrE,IAAI,OAAO;CACX,MAAM,4BAAY,IAAI,IAA6B;CACnD,MAAM,WAAW,SAAwB;EACvC,IAAI,SAAS,MAAM;EACnB,OAAO;EACP,KAAK,MAAM,YAAY,WAAW,SAAS,IAAI;CACjD;CACA,OAAO;EACL,IAAI,OAAO;GACT,OAAO;EACT;EACA;EACA,WAAW;GACT,QAAQ,KAAK;GACb,KAAK;EACP;EACA,UAAU,UAAU;GAClB,UAAU,IAAI,QAAQ;GACtB,aAAa,UAAU,OAAO,QAAQ;EACxC;CACF;AACF;;;;;;;;;;;;;;;;;;ACRA,MAAa,gBAAgB,OAAwB;CACnD,IAAI;CACJ,IAAI;CAOJ,OAAO;EACL,SAAA,IAPkB,SAAe,YAAY;GAC7C,OAAO;GACP,QAAQ,WAAW,SAAS,EAAE;GAE7B,MAAkC,QAAQ;EAC7C,CAEQ;EACN,cAAc;GACZ,aAAa,KAAK;GAClB,OAAO;EACT;CACF;AACF;AAGA,MAAM,gBAAwB,aAAa;AAC3C,MAAM,cACJ,KAAK,IAAI,aAAa,eAAe,aAAa,aAAa;;;;;;AAcjE,SAAgB,cACd,WACA,SACsB;CACtB,MAAM,aAAa,QAAQ,cAAc;CACzC,MAAM,QAAQ,QAAQ,SAAS;CAE/B,OAAO,EACL,CAAC,OAAO,iBAAuC;EAC7C,IAAI,OAAO;EACX,IAAI,SAAmC,CAAC;EACxC,IAAI,WAAW;EACf,IAAI,SAAS;EACb,IAAI,UAA0B;EAC9B,IAAI,WAAW,MAAM;EACrB,IAAI,kBAAkB;EACtB,MAAM,WAAW,2BAA2B;GAC1C,IAAI,QAAQ;GACZ,mBAAmB;GACnB,WAAW,MAAM;GACjB,SAAS,OAAO;EAClB,CAAC;EAED,MAAM,WAAiC;GACrC,MAAM,OAAuC;IAC3C,SAAS;KACP,IAAI,QAAQ,OAAO;MAAE,OAAO,KAAA;MAAW,MAAM;KAAK;KAClD,IAAI;MACF,IAAI,aAAa,OAAO,QAAQ;OAE9B,MAAM,OAAO,MAAM,UAAU,IAAI;OACjC,IAAI,QAAQ,OAAO;QAAE,OAAO,KAAA;QAAW,MAAM;OAAK;OAClD,SAAS;OACT,WAAW;MACb;KACF,SAAS,OAAO;MACd,IAAI,QAAQ,OAAO;OAAE,OAAO,KAAA;OAAW,MAAM;MAAK;MAClD,MAAM;KACR;KACA,IAAI,QAAQ,OAAO;MAAE,OAAO,KAAA;MAAW,MAAM;KAAK;KAClD,MAAM,MAAM,OAAO;KACnB,IAAI,KAAK;MAEP,SAAS,SAAS;MAClB,OAAO,IAAI;MACX,OAAO,YAAY,KAAA;MACnB,YAAY;MACZ,IAAI,aAAa,OAAO,QAAQ;OAC9B,SAAS,CAAC;OACV,WAAW;MACb;MACA,OAAO;OAAE,OAAO;OAAK,MAAM;MAAM;KACnC;KAEA,SAAS,QAAQ,aAAa,QAAQ,CAAC;KACvC,MAAM,UAAU;KAChB,UAAU,MAAM,QAAQ;KAExB,MAAM,QAAQ;KACd,UAAU;KACV,IAAI,YAAY,iBACd,WAAW,KAAK,IAAI,WAAW,GAAG,QAAQ,CAAC;IAE/C;GACF;GACA,MAAM,SAAyC;IAC7C,SAAS;IACT,SAAS,CAAC;IACV,WAAW;IACX,SAAS,OAAO;IAChB,OAAO;KAAE,OAAO,KAAA;KAAW,MAAM;IAAK;GACxC;EACF;EACA,iBAAiB,IAAI,UAAU,QAAQ;EACvC,OAAO;CACT,EACF;AACF"}

package/dist/store-postgres.d.ts

@@ -1,4 +1,4 @@
-import { r as Clock, s as IdSource, t as A2Store } from "./store-Djdv0bnZ.js";
+import { r as Clock, s as IdSource, t as A2Store } from "./store-CyLUy86v.js";
 //#region src/store-postgres.d.ts
 /** The result shape this backend reads: just rows. */
 type PostgresQueryResult = {

package/dist/store-postgres.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store-postgres.d.ts","names":[],"sources":["../src/store-postgres.ts"],"mappings":";;;KAuDY;EAAwB,MAAM;;;KAG9B;EACV,MAAM,cAAc,qBAAqB,QAAQ;EACjD;;;;;;;;KASU;EACV,MAAM,cAAc,qBAAqB,QAAQ;EACjD,YAAY,QAAQ;EACpB,QAAQ;;KAGE;;EAEV;;EAEA;;EAEA,SAAS;;EAET,QAAQ;;EAER,MAAM;;KAGI,gBAAgB;;;EAG1B,SAAS;;iBAqQK,SAAS,UAAS,uBAA4B"}
+{"version":3,"file":"store-postgres.d.ts","names":[],"sources":["../src/store-postgres.ts"],"mappings":";;;KAuDY;EAAwB,MAAM;;;KAG9B;EACV,MAAM,cAAc,qBAAqB,QAAQ;EACjD;;;;;;;;KASU;EACV,MAAM,cAAc,qBAAqB,QAAQ;EACjD,YAAY,QAAQ;EACpB,QAAQ;;KAGE;;EAEV;;EAEA;;EAEA,SAAS;;EAET,QAAQ;;EAER,MAAM;;KAGI,gBAAgB;;;EAG1B,SAAS;;iBAiSK,SAAS,UAAS,uBAA4B"}

package/dist/store-postgres.js

@@ -1,12 +1,12 @@
 import { i as A2Error, r as sessionClearedError, s as supersededAttemptError, t as CLEAR_EVENT_TYPE } from "./session-clear-DGI4jTQ5.js";
-import { _ as nullProtoRecord, r as NOTIFY_TIMINGS } from "./internal-B2T3U4Rq.js";
-import { n as pollingStream, t as defaultSleep } from "./store-polling-B5FcwJfo.js";
+import { _ as nullProtoRecord, r as NOTIFY_TIMINGS } from "./internal-CscSY7K_.js";
+import { n as pollingStream, t as defaultSleep } from "./store-polling-7WJV0YWP.js";
 import { r as platformWaitUntil } from "./platform-B4TnJtWu.js";
 import { t as retryableLazy } from "./retryable-lazy-DZWmHpii.js";
 import { t as idempotentReplay } from "./idempotent-replay-JdgMQRRm.js";
 import { n as SYSTEM_CLOCK, t as RANDOM_IDS } from "./store-N8PXxDAS.js";
 import { t as decodeReturnedEventIds } from "./store-codec-DTG0Ftek.js";
-import { t as pollPresence } from "./store-presence-polling-BAwS8RWn.js";
+import { t as pollPresence } from "./store-presence-polling-B1ixeqIS.js";
 import { createHash } from "node:crypto";
 //#region src/postgres-notifications.ts
 const postgresNotificationChannel = ({ kind, sessionId }) => `a2_${kind}_${createHash("md5").update(sessionId).digest("hex")}`;
@@ -694,6 +694,19 @@ const createListener = ({ pg, connectionString }) => postgresNotifications(async
 		}
 	};
 });
+/** A dead-lettered event's snapshot pins, and history no pin keeps. */
+const releasePins = async ({ query, sessionId, index }) => {
+	await query(`delete from a2_snapshot_pins
+      where session_id = $1 and event_index = $2`, [sessionId, index]);
+	await query(`delete from a2_snapshot_history history
+      where history.session_id = $1
+        and not exists (
+          select 1 from a2_snapshot_pins pin
+           where pin.session_id = history.session_id
+             and pin.reducer_name = history.reducer_name
+             and pin.up_to_index = history.up_to_index
+        )`, [sessionId]);
+};
 function postgres(options = {}) {
 	const clock = options.clock ?? SYSTEM_CLOCK;
 	const generateId = options.ids ?? RANDOM_IDS;
@@ -1095,10 +1108,12 @@ function postgres(options = {}) {
 				return rows.map(toEvent);
 			});
 		},
-		async claimAvailable({ sessionId, holder, ttlMs, expiresAtMs, excludeIndexes = [] }) {
+		async claimAvailable({ sessionId, holder, ttlMs, expiresAtMs, excludeIndexes = [], maxFailures }) {
 			return wrap(() => withTx(async (query) => {
 				const now = clock.now().getTime();
 				const expiresAt = expiresAtMs ?? now + ttlMs;
+				const exhausted = `(claimed.claim_holder is not null
+               and claimed.failure_count + 1 >= $6::int)`;
 				const { rows } = await query(`with eligible as materialized (
                select event.idx
                  from a2_events event
@@ -1113,10 +1128,16 @@ function postgres(options = {}) {
              )
              update a2_events claimed set
                attempt_count = claimed.attempt_count + 1,
-               first_claimed_at = coalesce(claimed.first_claimed_at, $2),
-               last_claimed_at = $2,
-               claim_holder = $3,
-               claim_expires_at = $4
+               failure_count = claimed.failure_count
+                 + case when claimed.claim_holder is null then 0 else 1 end,
+               failed_at = case when ${exhausted} then $2::bigint else claimed.failed_at end,
+               first_claimed_at = case when ${exhausted}
+                 then claimed.first_claimed_at
+                 else coalesce(claimed.first_claimed_at, $2::bigint) end,
+               last_claimed_at = case when ${exhausted}
+                 then claimed.last_claimed_at else $2::bigint end,
+               claim_holder = case when ${exhausted} then null else $3::text end,
+               claim_expires_at = case when ${exhausted} then null else $4::bigint end
              from eligible
              where claimed.session_id = $1 and claimed.idx = eligible.idx
              returning claimed.*, ${clearIndexOf("$1")} as clear_index`, [
@@ -1124,8 +1145,14 @@ function postgres(options = {}) {
 					now,
 					holder,
 					expiresAt,
-					[...excludeIndexes]
+					[...excludeIndexes],
+					maxFailures ?? null
 				]);
+				for (const row of rows) if (row["failed_at"] !== null) await releasePins({
+					query,
+					sessionId,
+					index: asNumber(row["idx"])
+				});
 				if (rows.length > 0) return {
 					outcome: "claimed",
 					events: rows.map((row) => {
@@ -1142,7 +1169,12 @@ function postgres(options = {}) {
                 and failed_at is null
                 and lane_ready
                 and idx > ${clearIndexOf("$1")}
-                and claim_expires_at > $2`, [sessionId, now]);
+                and claim_expires_at > $2
+                and not (idx = any($3::bigint[]))`, [
+					sessionId,
+					now,
+					[...excludeIndexes]
+				]);
 				const retryAt = activeRows[0]?.["retry_at"];
 				return retryAt === null || retryAt === void 0 ? { outcome: "settled" } : {
 					outcome: "busy",
@@ -1336,7 +1368,8 @@ function postgres(options = {}) {
 				};
 			}));
 		},
-		async failAttempt({ sessionId, index, attempt, error, maxFailures }) {
+		async failAttempt({ sessionId, index, attempt, error, maxFailures, retryAfterMs }) {
+			const now = clock.now().getTime();
 			return wrap(() => withTx(async (query) => {
 				const { rows } = await query(`with current as materialized (
              select e.* from a2_events e
@@ -1354,7 +1387,10 @@ function postgres(options = {}) {
                  else e.failed_at
                end,
                claim_holder = null,
-               claim_expires_at = null
+               claim_expires_at = case
+                 when e.failure_count + 1 >= $5 then null
+                 else $7::bigint
+               end
              from current
              where e.session_id = $1
                and e.idx = $2
@@ -1393,7 +1429,8 @@ function postgres(options = {}) {
 					attempt,
 					error,
 					maxFailures,
-					clock.now().getTime()
+					now,
+					retryAfterMs === void 0 ? null : now + retryAfterMs
 				]);
 				const row = rows[0];
 				if (row?.["outcome"] === "cleared") return {
@@ -1411,18 +1448,11 @@ function postgres(options = {}) {
 					};
 					throw new TypeError(`no event at index ${index} in session '${sessionId}'`);
 				}
-				if (row["outcome"] === "dead_lettered") {
-					await query(`delete from a2_snapshot_pins
-                where session_id = $1 and event_index = $2`, [sessionId, index]);
-					await query(`delete from a2_snapshot_history history
-                where history.session_id = $1
-                  and not exists (
-                    select 1 from a2_snapshot_pins pin
-                     where pin.session_id = history.session_id
-                       and pin.reducer_name = history.reducer_name
-                       and pin.up_to_index = history.up_to_index
-                  )`, [sessionId]);
-				}
+				if (row["outcome"] === "dead_lettered") await releasePins({
+					query,
+					sessionId,
+					index
+				});
 				return {
 					outcome: row["outcome"],
 					failureCount: asNumber(row["failure_count"])