tapimo 0.10.2 → 0.12.0

package/dist/db/tables/earnVaults.js

@@ -34,6 +34,7 @@ export async function upsert(db, options) {
         slug,
         updatedAt: now,
         vaultAddress: normalize(options.vaultAddress),
+        zones: JSON.stringify(normalizeZones(options.zones)),
     })
         .onConflict((oc) => oc.columns(['chainId', 'vaultAddress']).doUpdateSet({
         description: options.description,
@@ -42,6 +43,7 @@ export async function upsert(db, options) {
         privateOutputTokens: JSON.stringify(options.privateOutputTokens),
         ...(options.slug !== undefined ? { slug } : {}),
         updatedAt: now,
+        zones: JSON.stringify(normalizeZones(options.zones)),
     }))
         .returningAll()
         .executeTakeFirstOrThrow();
@@ -69,4 +71,7 @@ function toRecord(row) {
 function normalize(address) {
     return address.toLowerCase();
 }
+function normalizeZones(zones) {
+    return zones.map((zone) => ({ ...zone, earnRouter: normalize(zone.earnRouter) }));
+}
 //# sourceMappingURL=earnVaults.js.map

package/dist/db/tables/earnVaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"earnVaults.js","sourceRoot":"","sources":["../../../src/db/tables/earnVaults.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAA;AAMvC,MAAM,UAAU,GAAG,cAAc,CAAC,sCAAsC,EAAE,CAAC,CAAC,CAAA;AAkB5E,0DAA0D;AAC1D,MAAM,CAAC,KAAK,UAAU,GAAG,CAAC,EAAS,EAAE,OAAoB;IACvD,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,MAAM;SACxB,UAAU,CAAC,aAAa,CAAC;SACzB,SAAS,EAAE;SACX,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SAC9C,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;SAC3D,gBAAgB,EAAE,CAAA;IACrB,OAAO,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AACxC,CAAC;AAYD,8DAA8D;AAC9D,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,EAAS,EAAE,OAAO,GAAiB,EAAE;IAC9D,IAAI,KAAK,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,SAAS,EAAE,CAAA;IAC3D,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS;QAAE,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;IAC/F,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,CAAA;IAC3F,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AAC3B,CAAC;AAUD,sFAAsF;AACtF,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,EAAS,EAAE,OAAuB;IAC7D,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;IACpC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,UAAU,EAAE,EAAE,CAAA;IACtE,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,MAAM;SACxB,UAAU,CAAC,aAAa,CAAC;SACzB,MAAM,CAAC;QACN,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,SAAS,EAAE,GAAG;QACd,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,kBAAkB,CAAC;QAC9D,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,mBAAmB,CAAC;QAChE,IAAI;QACJ,SAAS,EAAE,GAAG;QACd,YAAY,EAAE,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC;KAC9C,CAAC;SACD,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CACjB,EAAE,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC;QAClD,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,kBAAkB,CAAC;QAC9D,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,mBAAmB,CAAC;QAChE,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,SAAS,EAAE,GAAG;KACf,CAAC,CACH;SACA,YAAY,EAAE;SACd,uBAAuB,EAAE,CAAA;IAC5B,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAA;AACtB,CAAC;AAsBD,iCAAiC;AACjC,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,EAAS,EAAE,OAAuB;IAC7D,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,MAAM;SACxB,UAAU,CAAC,aAAa,CAAC;SACzB,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SAC9C,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;SAC3D,YAAY,EAAE;SACd,gBAAgB,EAAE,CAAA;IACrB,OAAO,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AACxC,CAAC;AAYD,SAAS,KAAK,CAAC,KAAa;IAC1B,OAAO,CACL,KAAK;SACF,WAAW,EAAE;SACb,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,OAAO,CACpC,CAAA;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,GAAsB;IACtC,OAAO,EAAE,GAAG,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAA;AACjD,CAAC;AAED,SAAS,SAAS,CAAC,OAAe;IAChC,OAAO,OAAO,CAAC,WAAW,EAAa,CAAA;AACzC,CAAC"}
+{"version":3,"file":"earnVaults.js","sourceRoot":"","sources":["../../../src/db/tables/earnVaults.ts"],"names":[],"mappings":"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"}

package/dist/db/tables/webhookDeliveries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhookDeliveries.d.ts","sourceRoot":"","sources":["../../../src/db/tables/webhookDeliveries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAExC,OAAO,KAAK,KAAK,QAAQ,MAAM,4BAA4B,CAAA;AAC3D,OAAO,KAAK,KAAK,EAAE,MAAM,UAAU,CAAA;AACnC,OAAO,KAAK,KAAK,SAAS,MAAM,cAAc,CAAA;AAE9C,wFAAwF;AACxF,MAAM,MAAM,KAAK,GAAG,SAAS,CAAC,eAAe,CAAA;AAE7C,qCAAqC;AACrC,MAAM,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;AAEtC,uEAAuE;AACvE,MAAM,MAAM,mBAAmB,GAAG,IAAI,CACpC,MAAM,EACN,SAAS,GAAG,WAAW,GAAG,OAAO,GAAG,IAAI,GAAG,gBAAgB,GAAG,gBAAgB,CAC/E,CAAA;AAED,+EAA+E;AAC/E,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAczD;AAED;;;;;;GAMG;AACH,wBAAsB,MAAM,CAC1B,EAAE,EAAE,EAAE,CAAC,EAAE,EACT,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAC3B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAkBf;AAED;;;;;;;;;GASG;AACH,wBAAsB,IAAI,CACxB,EAAE,EAAE,EAAE,CAAC,EAAE,EACT,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,IAAI,CAAC,OAAO,GACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAW9B;AAED,qEAAqE;AACrE,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,EAAE,CAAC,EAAE,EACT,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,iBAAiB,CAAC,OAAO,GACjC,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAyBhC;AAED,MAAM,CAAC,OAAO,WAAW,iBAAiB,CAAC;IACzC,gDAAgD;IAChD,KAAK,OAAO,GAAG;QACb,0CAA0C;QAC1C,IAAI,EAAE,MAAM,CAAA;QACZ,kCAAkC;QAClC,KAAK,EAAE,MAAM,CAAA;QACb,oDAAoD;QACpD,GAAG,EAAE,MAAM,CAAA;KACZ,CAAA;CACF;AAED,gFAAgF;AAChF,wBAAsB,kBAAkB,CACtC,EAAE,EAAE,EAAE,CAAC,EAAE,EACT,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,kBAAkB,CAAC,OAAO,GAClC,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED,MAAM,CAAC,OAAO,WAAW,kBAAkB,CAAC;IAC1C,iDAAiD;IACjD,KAAK,OAAO,GAAG;QACb,0CAA0C;QAC1C,IAAI,EAAE,MAAM,CAAA;QACZ,oDAAoD;QACpD,GAAG,EAAE,MAAM,CAAA;KACZ,CAAA;CACF;AAED,MAAM,CAAC,OAAO,WAAW,IAAI,CAAC;IAC5B,gCAAgC;IAChC,KAAK,OAAO,GAAG;QACb,wEAAwE;QACxE,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC3B,oCAAoC;QACpC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC1B,oDAAoD;QACpD,GAAG,EAAE,MAAM,CAAA;QACX,mFAAmF;QACnF,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAC5B,CAAA;CACF;AAED;;;;;;;GAOG;AACH,wBAAsB,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQ3F;AAED;;;;;;;;GAQG;AACH,wBAAsB,GAAG,CACvB,EAAE,EAAE,EAAE,CAAC,EAAE,EACT,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC,CASnC;AAED;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAM1E"}
+{"version":3,"file":"webhookDeliveries.d.ts","sourceRoot":"","sources":["../../../src/db/tables/webhookDeliveries.ts"],"names":[],"mappings":"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"}

package/dist/db/tables/webhookDeliveries.js

@@ -138,6 +138,9 @@ export async function get(db, subscriptionId, deliveryId, now) {
         .executeTakeFirst();
     return row ? toDelivery(row) : null;
 }
+// Per-statement delete bound: prune runs every minute, so a backlog drains in
+// a few ticks instead of one unbounded DELETE churning the origin.
+const pruneBatchLimit = 50_000;
 /**
  * Deletes deliveries past their retention deadline. Called best-effort from
  * the poller tick.
@@ -149,7 +152,14 @@ export async function get(db, subscriptionId, deliveryId, now) {
 export async function pruneExpired(db, now) {
     const result = await db.kysely
         .deleteFrom('webhook_deliveries')
+        // Repeated on the outer delete: the row recheck under concurrency re-runs
+        // only this predicate, so a row renewed mid-statement survives.
         .where('expiresAt', '<=', now)
+        .where('id', 'in', (eb) => eb
+        .selectFrom('webhook_deliveries')
+        .select('id')
+        .where('expiresAt', '<=', now)
+        .limit(pruneBatchLimit))
         .executeTakeFirst();
     return Number(result.numDeletedRows);
 }

package/dist/db/tables/webhookDeliveries.js.map

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

package/dist/db/tables/webhookQueueCompletions.d.ts

@@ -0,0 +1,15 @@
+import type * as Webhooks from '../../internal/Webhooks.js';
+import type * as Db from '../Db.js';
+import type * as db_Schema from '../Schema.js';
+/** Columns of the `webhook_queue_completions` table, derived from `Schema.WebhookQueueCompletion`. */
+export type Table = db_Schema.WebhookQueueCompletion;
+/** A terminal delivery-obligation outcome. */
+export type TerminalStatus = db_Schema.WebhookQueueCompletion['status'];
+/**
+ * Reads the unexpired completion for a reference, if any. Rows are written by
+ * the queue-event terminal transition and only ever read for dedupe.
+ */
+export declare function get(db: Db.Db, reference: Webhooks.QueueReference, now: string): Promise<Table | null>;
+/** Deletes expired completions, bounded per call; expiry is filtered at query time, so pruning is space-only. */
+export declare function pruneExpired(db: Db.Db, now: string): Promise<number>;
+//# sourceMappingURL=webhookQueueCompletions.d.ts.map

package/dist/db/tables/webhookQueueCompletions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhookQueueCompletions.d.ts","sourceRoot":"","sources":["../../../src/db/tables/webhookQueueCompletions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,QAAQ,MAAM,4BAA4B,CAAA;AAC3D,OAAO,KAAK,KAAK,EAAE,MAAM,UAAU,CAAA;AACnC,OAAO,KAAK,KAAK,SAAS,MAAM,cAAc,CAAA;AAE9C,sGAAsG;AACtG,MAAM,MAAM,KAAK,GAAG,SAAS,CAAC,sBAAsB,CAAA;AAEpD,8CAA8C;AAC9C,MAAM,MAAM,cAAc,GAAG,SAAS,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAA;AAEvE;;;GAGG;AACH,wBAAsB,GAAG,CACvB,EAAE,EAAE,EAAE,CAAC,EAAE,EACT,SAAS,EAAE,QAAQ,CAAC,cAAc,EAClC,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAUvB;AAMD,iHAAiH;AACjH,wBAAsB,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAmB1E"}

package/dist/db/tables/webhookQueueCompletions.js

@@ -0,0 +1,32 @@
+/**
+ * Reads the unexpired completion for a reference, if any. Rows are written by
+ * the queue-event terminal transition and only ever read for dedupe.
+ */
+export async function get(db, reference, now) {
+    return ((await db.kysely
+        .selectFrom('webhook_queue_completions')
+        .selectAll()
+        .where('eventId', '=', reference.eventId)
+        .where('subscriptionId', '=', reference.subscriptionId)
+        .where('expiresAt', '>', now)
+        .executeTakeFirst()) ?? null);
+}
+// Per-statement delete bound: prune runs every minute, so a backlog drains in
+// a few ticks instead of one unbounded DELETE churning the origin.
+const pruneBatchLimit = 50_000;
+/** Deletes expired completions, bounded per call; expiry is filtered at query time, so pruning is space-only. */
+export async function pruneExpired(db, now) {
+    const result = await db.kysely
+        .deleteFrom('webhook_queue_completions')
+        // Repeated on the outer delete: the row recheck under concurrency re-runs
+        // only this predicate, so a completion renewed mid-statement survives.
+        .where('expiresAt', '<=', now)
+        .where(({ eb, refTuple, selectFrom }) => eb(refTuple('subscriptionId', 'eventId'), 'in', selectFrom('webhook_queue_completions')
+        .select(['subscriptionId', 'eventId'])
+        .where('expiresAt', '<=', now)
+        .limit(pruneBatchLimit)
+        .$asTuple('subscriptionId', 'eventId')))
+        .executeTakeFirst();
+    return Number(result.numDeletedRows);
+}
+//# sourceMappingURL=webhookQueueCompletions.js.map

package/dist/db/tables/webhookQueueCompletions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhookQueueCompletions.js","sourceRoot":"","sources":["../../../src/db/tables/webhookQueueCompletions.ts"],"names":[],"mappings":"AAUA;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,GAAG,CACvB,EAAS,EACT,SAAkC,EAClC,GAAW;IAEX,OAAO,CACL,CAAC,MAAM,EAAE,CAAC,MAAM;SACb,UAAU,CAAC,2BAA2B,CAAC;SACvC,SAAS,EAAE;SACX,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC;SACxC,KAAK,CAAC,gBAAgB,EAAE,GAAG,EAAE,SAAS,CAAC,cAAc,CAAC;SACtD,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,CAAC;SAC5B,gBAAgB,EAAE,CAAC,IAAI,IAAI,CAC/B,CAAA;AACH,CAAC;AAED,8EAA8E;AAC9E,mEAAmE;AACnE,MAAM,eAAe,GAAG,MAAM,CAAA;AAE9B,iHAAiH;AACjH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,EAAS,EAAE,GAAW;IACvD,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,MAAM;SAC3B,UAAU,CAAC,2BAA2B,CAAC;QACxC,0EAA0E;QAC1E,uEAAuE;SACtE,KAAK,CAAC,WAAW,EAAE,IAAI,EAAE,GAAG,CAAC;SAC7B,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE,CACtC,EAAE,CACA,QAAQ,CAAC,gBAAgB,EAAE,SAAS,CAAC,EACrC,IAAI,EACJ,UAAU,CAAC,2BAA2B,CAAC;SACpC,MAAM,CAAC,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;SACrC,KAAK,CAAC,WAAW,EAAE,IAAI,EAAE,GAAG,CAAC;SAC7B,KAAK,CAAC,eAAe,CAAC;SACtB,QAAQ,CAAC,gBAAgB,EAAE,SAAS,CAAC,CACzC,CACF;SACA,gBAAgB,EAAE,CAAA;IACrB,OAAO,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;AACtC,CAAC"}

package/dist/db/tables/webhookQueueEvents.d.ts

@@ -1,32 +1,34 @@
 import { type Generated, type Insertable, type Selectable } from 'kysely';
 import type * as Webhooks from '../../internal/Webhooks.js';
 import type * as Db from '../Db.js';
+import * as WebhookQueueCompletions from './webhookQueueCompletions.js';
 import type * as db_Schema from '../Schema.js';
 /** Columns of the `webhook_queue_events` table, derived from `Schema.WebhookQueueEvent`. */
-export type Table = Omit<db_Schema.WebhookQueueEvent, 'attemptCount' | 'attemptingAt' | 'nextAttemptAt' | 'status'> & {
+export type Table = Omit<db_Schema.WebhookQueueEvent, 'attemptCount' | 'attemptingAt' | 'expiresAt' | 'nextAttemptAt' | 'observedAt' | 'status'> & {
     /** Delivery attempts claimed so far; database default 0. */
     attemptCount: Generated<number>;
     /** ISO timestamp of the current claim; database default null. */
     attemptingAt: Generated<string | null>;
+    /** Legacy dedupe deadline; unwritten since completions took over. */
+    expiresAt: Generated<string | null>;
     /** ISO retry due time; database default null (due immediately). */
     nextAttemptAt: Generated<string | null>;
+    /** ISO head-observation stamp; database default null (replays carry none). */
+    observedAt: Generated<string | null>;
     /** Delivery-obligation lifecycle status; database default `pending`. */
     status: Generated<db_Schema.WebhookQueueEvent['status']>;
 };
 /** A stored webhook Queue event. */
 export type Record = Selectable<Table>;
-/** A terminal delivery-obligation outcome. */
-export type TerminalStatus = Exclude<db_Schema.WebhookQueueEvent['status'], 'pending'>;
 /**
- * Reads one pending envelope. Terminal rows read as absent so no consumer
- * can redeliver a completed obligation or disturb its dedupe row.
+ * Reads one pending envelope. The status filter only ever excludes rows
+ * completed before the completions split; completions now leave the table.
  */
 export declare function get(db: Db.Db, reference: Webhooks.QueueReference): Promise<Webhooks.QueueEvent | null>;
 /**
- * Stages envelopes as fresh obligations. Pending conflicts keep their first
- * envelope and backoff position; terminal conflicts inside the dedupe window
- * suppress the replay; terminal conflicts past it are replaced, so an expired
- * dedupe row pruning has not yet reclaimed never blocks a replay.
+ * Stages envelopes as fresh obligations. Unexpired completions and any
+ * existing row suppress the replay; a replay stages only when neither exists,
+ * which a completion past its dedupe window guarantees for completed work.
  */
 export declare function ensure(db: Db.Db, rows: readonly Insertable<Table>[]): Promise<number>;
 /** Claims one due pending obligation with a single atomic update. */
@@ -51,13 +53,13 @@ export declare namespace claim {
         nextAttemptAt: string | null;
         type: 'scheduled';
     } | {
-        status: TerminalStatus;
+        status: WebhookQueueCompletions.TerminalStatus;
         type: 'terminal';
     };
 }
 /**
- * Marks a claimed obligation terminal, starting its dedupe retention window;
- * pending rows never expire, so this stamp is the only expiry that matters.
+ * Marks a claimed obligation terminal: one atomic statement deletes the queue
+ * row and writes the insert-only completion that starts the dedupe window.
  * The `attemptingAt` predicate fences stale claimants.
  */
 export declare function complete(db: Db.Db, reference: Webhooks.QueueReference, options: complete.Options): Promise<boolean>;
@@ -66,10 +68,10 @@ export declare namespace complete {
     type Options = {
         /** Claim marker returned by {@link claim}; fences stale claimants. */
         claimedAt: string;
-        /** Replacement ISO retention deadline for the terminal dedupe row. */
+        /** ISO retention deadline for the dedupe completion. */
         expiresAt: string;
         /** Terminal outcome. */
-        status: TerminalStatus;
+        status: WebhookQueueCompletions.TerminalStatus;
     };
 }
 /** Releases a claim and schedules the next attempt; fenced like {@link complete}. */
@@ -113,10 +115,4 @@ export declare namespace pending {
         oldestDueAt: string | null;
     };
 }
-/**
- * Deletes terminal dedupe rows past their retention deadline. Pending rows
- * never expire: owed work drains only through terminal transitions
- * (delivery, permanent failure, or the skip after auto-disable).
- */
-export declare function pruneExpired(db: Db.Db, now: string): Promise<number>;
 //# sourceMappingURL=webhookQueueEvents.d.ts.map

package/dist/db/tables/webhookQueueEvents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhookQueueEvents.d.ts","sourceRoot":"","sources":["../../../src/db/tables/webhookQueueEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,KAAK,UAAU,EAAO,MAAM,QAAQ,CAAA;AAEtG,OAAO,KAAK,KAAK,QAAQ,MAAM,4BAA4B,CAAA;AAC3D,OAAO,KAAK,KAAK,EAAE,MAAM,UAAU,CAAA;AACnC,OAAO,KAAK,KAAK,SAAS,MAAM,cAAc,CAAA;AAE9C,4FAA4F;AAC5F,MAAM,MAAM,KAAK,GAAG,IAAI,CACtB,SAAS,CAAC,iBAAiB,EAC3B,cAAc,GAAG,cAAc,GAAG,eAAe,GAAG,QAAQ,CAC7D,GAAG;IACF,4DAA4D;IAC5D,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,CAAA;IAC/B,iEAAiE;IACjE,YAAY,EAAE,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,CAAA;IACtC,mEAAmE;IACnE,aAAa,EAAE,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,CAAA;IACvC,wEAAwE;IACxE,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAA;CACzD,CAAA;AAED,oCAAoC;AACpC,MAAM,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;AAEtC,8CAA8C;AAC9C,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAA;AAEtF;;;GAGG;AACH,wBAAsB,GAAG,CACvB,EAAE,EAAE,EAAE,CAAC,EAAE,EACT,SAAS,EAAE,QAAQ,CAAC,cAAc,GACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,GAAG,IAAI,CAAC,CAUrC;AAED;;;;;GAKG;AACH,wBAAsB,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,SAAS,UAAU,CAAC,KAAK,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CA4B3F;AAcD,qEAAqE;AACrE,wBAAsB,KAAK,CACzB,EAAE,EAAE,EAAE,CAAC,EAAE,EACT,SAAS,EAAE,QAAQ,CAAC,cAAc,EAClC,OAAO,EAAE,KAAK,CAAC,OAAO,GACrB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAsBvB;AAED,MAAM,CAAC,OAAO,WAAW,KAAK,CAAC;IAC7B,0BAA0B;IAC1B,KAAK,OAAO,GAAG;QACb,uDAAuD;QACvD,GAAG,EAAE,MAAM,CAAA;QACX,gEAAgE;QAChE,WAAW,EAAE,MAAM,CAAA;KACpB,CAAA;IAED,4BAA4B;IAC5B,KAAK,MAAM,GACP;QAAE,IAAI,EAAE,YAAY,CAAA;KAAE,GACtB;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,SAAS,CAAA;KAAE,GACnC;QAAE,IAAI,EAAE,SAAS,CAAA;KAAE,GACnB;QAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,EAAE,WAAW,CAAA;KAAE,GACnD;QAAE,MAAM,EAAE,cAAc,CAAC;QAAC,IAAI,EAAE,UAAU,CAAA;KAAE,CAAA;CACjD;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAC5B,EAAE,EAAE,EAAE,CAAC,EAAE,EACT,SAAS,EAAE,QAAQ,CAAC,cAAc,EAClC,OAAO,EAAE,QAAQ,CAAC,OAAO,GACxB,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED,MAAM,CAAC,OAAO,WAAW,QAAQ,CAAC;IAChC,kCAAkC;IAClC,KAAK,OAAO,GAAG;QACb,sEAAsE;QACtE,SAAS,EAAE,MAAM,CAAA;QACjB,sEAAsE;QACtE,SAAS,EAAE,MAAM,CAAA;QACjB,wBAAwB;QACxB,MAAM,EAAE,cAAc,CAAA;KACvB,CAAA;CACF;AAED,qFAAqF;AACrF,wBAAsB,QAAQ,CAC5B,EAAE,EAAE,EAAE,CAAC,EAAE,EACT,SAAS,EAAE,QAAQ,CAAC,cAAc,EAClC,OAAO,EAAE,QAAQ,CAAC,OAAO,GACxB,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED,MAAM,CAAC,OAAO,WAAW,QAAQ,CAAC;IAChC,+BAA+B;IAC/B,KAAK,OAAO,GAAG;QACb,sEAAsE;QACtE,SAAS,EAAE,MAAM,CAAA;QACjB,wCAAwC;QACxC,aAAa,EAAE,MAAM,CAAA;KACtB,CAAA;CACF;AAED,wEAAwE;AACxE,wBAAsB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAW7F;AAED,MAAM,CAAC,OAAO,WAAW,GAAG,CAAC;IAC3B,oBAAoB;IACpB,KAAK,OAAO,GAAG;QACb,oCAAoC;QACpC,KAAK,EAAE,MAAM,CAAA;QACb,6BAA6B;QAC7B,GAAG,EAAE,MAAM,CAAA;QACX,gEAAgE;QAChE,WAAW,EAAE,MAAM,CAAA;KACpB,CAAA;CACF;AAED,gFAAgF;AAChF,wBAAsB,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAyB1F;AAED,MAAM,CAAC,OAAO,WAAW,OAAO,CAAC;IAC/B,4EAA4E;IAC5E,KAAK,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,GAAG,aAAa,CAAC,CAAA;IAEzD,6BAA6B;IAC7B,KAAK,MAAM,GAAG;QACZ,6EAA6E;QAC7E,KAAK,EAAE,MAAM,CAAA;QACb,qEAAqE;QACrE,QAAQ,EAAE,MAAM,CAAA;QAChB,2DAA2D;QAC3D,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;QACvB,sFAAsF;QACtF,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;KAC3B,CAAA;CACF;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO1E"}
+{"version":3,"file":"webhookQueueEvents.d.ts","sourceRoot":"","sources":["../../../src/db/tables/webhookQueueEvents.ts"],"names":[],"mappings":"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"}

package/dist/db/tables/webhookQueueEvents.js

@@ -1,7 +1,8 @@
 import { sql } from 'kysely'; // prettier-ignore
+import * as WebhookQueueCompletions from './webhookQueueCompletions.js';
 /**
- * Reads one pending envelope. Terminal rows read as absent so no consumer
- * can redeliver a completed obligation or disturb its dedupe row.
+ * Reads one pending envelope. The status filter only ever excludes rows
+ * completed before the completions split; completions now leave the table.
  */
 export async function get(db, reference) {
     return ((await db.kysely
@@ -13,35 +14,44 @@ export async function get(db, reference) {
         .executeTakeFirst()) ?? null);
 }
 /**
- * Stages envelopes as fresh obligations. Pending conflicts keep their first
- * envelope and backoff position; terminal conflicts inside the dedupe window
- * suppress the replay; terminal conflicts past it are replaced, so an expired
- * dedupe row pruning has not yet reclaimed never blocks a replay.
+ * Stages envelopes as fresh obligations. Unexpired completions and any
+ * existing row suppress the replay; a replay stages only when neither exists,
+ * which a completion past its dedupe window guarantees for completed work.
  */
 export async function ensure(db, rows) {
     if (rows.length === 0)
         return 0;
+    const values = sql.join(rows.map((row) => sql `(${row.subscriptionId}::text, ${row.eventId}::text, ${JSON.stringify(row.envelope)}::jsonb, ${row.createdAt}::text, ${row.nextAttemptAt ?? null}::text, ${row.observedAt ?? null}::text)`));
+    // The VALUES source is raw because kysely has no table constructor for it,
+    // but both real tables stay in the builder so WithSchemaPlugin qualifies
+    // them (previews isolate by schema; raw identifiers would escape it). The
+    // completion check must ride the insert: a separate read would let a
+    // completion commit between the statements and re-stage just-finished work.
+    // `column1..6` are Postgres's default VALUES names, in the row order above;
+    // the window comparison uses each row's own staging time, not a shared clock.
+    // Conflicts only ever hit pending rows (or pre-split terminal rows during
+    // the drain), and both suppress the replay; a legitimate post-expiry replay
+    // meets no conflict because its completed row was deleted.
     const result = await db.kysely
         .insertInto('webhook_queue_events')
-        .values([...rows])
-        .onConflict((oc) => oc
-        .columns(['subscriptionId', 'eventId'])
-        .doUpdateSet((eb) => ({
-        attemptCount: 0,
-        attemptingAt: null,
-        createdAt: eb.ref('excluded.createdAt'),
-        envelope: eb.ref('excluded.envelope'),
-        expiresAt: eb.ref('excluded.expiresAt'),
-        nextAttemptAt: eb.ref('excluded.nextAttemptAt'),
-        status: 'pending',
-    }))
-        .where((eb) => eb.and([
-        eb('webhook_queue_events.status', '!=', 'pending'),
-        eb('webhook_queue_events.expiresAt', '<=', eb.ref('excluded.createdAt')),
-    ])))
+        .columns(['subscriptionId', 'eventId', 'envelope', 'createdAt', 'nextAttemptAt', 'observedAt'])
+        .expression((eb) => eb
+        .selectFrom(sql `(VALUES ${values})`.as('v'))
+        .select([
+        sql `v.column1`.as('subscriptionId'),
+        sql `v.column2`.as('eventId'),
+        sql `v.column3`.as('envelope'),
+        sql `v.column4`.as('createdAt'),
+        sql `v.column5`.as('nextAttemptAt'),
+        sql `v.column6`.as('observedAt'),
+    ])
+        .where(({ exists, not, selectFrom }) => not(exists(selectFrom('webhook_queue_completions')
+        .select('eventId')
+        .where('subscriptionId', '=', sql `v.column1`)
+        .where('eventId', '=', sql `v.column2`)
+        .where('expiresAt', '>', sql `v.column4`)))))
+        .onConflict((oc) => oc.columns(['subscriptionId', 'eventId']).doNothing())
         .executeTakeFirst();
-    // The command tag counts inserted rows plus replaced expired rows; live
-    // conflicts fall out of the conditional update and are not counted.
     return Number(result.numInsertedOrUpdatedRows ?? 0n);
 }
 /** Due, unclaimed pending work: shared by {@link claim} and {@link due}. */
@@ -64,14 +74,24 @@ export async function claim(db, reference, options) {
         .executeTakeFirst();
     if (claimed)
         return { record: claimed, type: 'claimed' };
+    // Queue first, completions second: a complete() landing between the reads
+    // then still surfaces its completion, so a finished obligation never reads
+    // as missing, the one claim outcome alerts treat as a fault.
     const existing = await db.kysely
         .selectFrom('webhook_queue_events')
         .select(['attemptingAt', 'nextAttemptAt', 'status'])
         .where('subscriptionId', '=', reference.subscriptionId)
         .where('eventId', '=', reference.eventId)
         .executeTakeFirst();
-    if (!existing)
+    if (!existing) {
+        // An unexpired completion reads as terminal so claim-outcome metrics keep
+        // their meaning; an expired one reads as missing, like a pruned row.
+        const completed = await WebhookQueueCompletions.get(db, reference, options.now);
+        if (completed)
+            return { status: completed.status, type: 'terminal' };
         return { type: 'missing' };
+    }
+    // Reachable only for rows completed before the completions split.
     if (existing.status !== 'pending')
         return { status: existing.status, type: 'terminal' };
     if (existing.attemptingAt !== null && existing.attemptingAt > options.staleBefore)
@@ -79,20 +99,38 @@ export async function claim(db, reference, options) {
     return { nextAttemptAt: existing.nextAttemptAt, type: 'scheduled' };
 }
 /**
- * Marks a claimed obligation terminal, starting its dedupe retention window;
- * pending rows never expire, so this stamp is the only expiry that matters.
+ * Marks a claimed obligation terminal: one atomic statement deletes the queue
+ * row and writes the insert-only completion that starts the dedupe window.
  * The `attemptingAt` predicate fences stale claimants.
  */
 export async function complete(db, reference, options) {
     const result = await db.kysely
-        .updateTable('webhook_queue_events')
-        .set({ attemptingAt: null, expiresAt: options.expiresAt, status: options.status })
+        .with('done', (qb) => qb
+        .deleteFrom('webhook_queue_events')
         .where('subscriptionId', '=', reference.subscriptionId)
         .where('eventId', '=', reference.eventId)
         .where('status', '=', 'pending')
         .where('attemptingAt', '=', options.claimedAt)
+        .returning(['subscriptionId', 'eventId']))
+        .insertInto('webhook_queue_completions')
+        .columns(['subscriptionId', 'eventId', 'status', 'expiresAt'])
+        .expression((eb) => eb
+        .selectFrom('done')
+        .select((s) => [
+        'subscriptionId',
+        'eventId',
+        s.val(options.status).as('status'),
+        s.val(options.expiresAt).as('expiresAt'),
+    ]))
+        // Re-completing a replayed obligation: the latest delivery outcome wins
+        // and retention restarts, matching pre-split replay semantics; doNothing
+        // would also report zero rows and fail a fence that won.
+        .onConflict((oc) => oc.columns(['subscriptionId', 'eventId']).doUpdateSet((eb) => ({
+        expiresAt: eb.ref('excluded.expiresAt'),
+        status: eb.ref('excluded.status'),
+    })))
         .executeTakeFirst();
-    return result.numUpdatedRows === 1n;
+    return result.numInsertedOrUpdatedRows === 1n;
 }
 /** Releases a claim and schedules the next attempt; fenced like {@link complete}. */
 export async function schedule(db, reference, options) {
@@ -144,17 +182,4 @@ export async function pending(db, options) {
         oldestDueAt: row.oldestDueAt,
     };
 }
-/**
- * Deletes terminal dedupe rows past their retention deadline. Pending rows
- * never expire: owed work drains only through terminal transitions
- * (delivery, permanent failure, or the skip after auto-disable).
- */
-export async function pruneExpired(db, now) {
-    const result = await db.kysely
-        .deleteFrom('webhook_queue_events')
-        .where('expiresAt', '<=', now)
-        .where('status', '!=', 'pending')
-        .executeTakeFirst();
-    return Number(result.numDeletedRows);
-}
 //# sourceMappingURL=webhookQueueEvents.js.map

package/dist/db/tables/webhookQueueEvents.js.map

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