@effect-agent/storage-cloudflare 0.1.0-beta.69 → 0.1.0-beta.70

package/dist/DoMessageDeliveryStore.mjs

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
 import { DoStorageConfig } from "./DoStorageConfig.mjs";
 import { DoStorageFailpoint } from "./DoStorageFailpoint.mjs";
-import { a as initializeDoJournal } from "./do-journal-CllwJfgW.mjs";
+import { a as initializeDoJournal } from "./do-journal-DnzUmhPA.mjs";
 import { MessageDeliveryError, MessageDeliveryStore } from "@effect-agent/thread/MessageDelivery";
 import { SqlMessageDeliveryTransaction, makeSqlMessageDeliveryStore } from "@effect-agent/thread/SqlMessageDeliveryStore";
 import { Effect, Layer } from "effect";

package/dist/{DoStorageVersion-C05M2uDX.d.mts → DoStorageVersion-x5OOurvZ.d.mts}

@@ -1,10 +1,12 @@
+import { Effect } from "effect";
+import "effect/unstable/sql/SqlClient";
 import { SqliteMigrator } from "@effect/sql-sqlite-do";
 //#region src/internal/migrations.d.ts
 /** The current storage version recorded in `effect_agent_meta`. */
-declare const CurrentDoStorageVersion = 5;
+declare const CurrentDoStorageVersion = 6;
 declare namespace DoStorageVersion_d_exports {
   export { CurrentDoStorageVersion };
 }
 //#endregion
 export { CurrentDoStorageVersion as n, DoStorageVersion_d_exports as t };
-//# sourceMappingURL=DoStorageVersion-C05M2uDX.d.mts.map
+//# sourceMappingURL=DoStorageVersion-x5OOurvZ.d.mts.map

package/dist/DoStorageVersion.d.mts

@@ -1,2 +1,2 @@
-import { n as CurrentDoStorageVersion } from "./DoStorageVersion-C05M2uDX.mjs";
+import { n as CurrentDoStorageVersion } from "./DoStorageVersion-x5OOurvZ.mjs";
 export { CurrentDoStorageVersion };

package/dist/DoStorageVersion.mjs

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
-import { t as CurrentDoStorageVersion } from "./migrations-BK3kMBdI.mjs";
+import { t as CurrentDoStorageVersion } from "./migrations-Ba_kOrSx.mjs";
 //#region src/DoStorageVersion.ts
-var DoStorageVersion_exports = /* @__PURE__ */ __exportAll({ CurrentDoStorageVersion: () => 5 });
+var DoStorageVersion_exports = /* @__PURE__ */ __exportAll({ CurrentDoStorageVersion: () => 6 });
 //#endregion
 export { CurrentDoStorageVersion, DoStorageVersion_exports as t };
 

package/dist/DoSubmissionLedger.mjs

@@ -2,7 +2,7 @@ import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
 import { DoStorageConfig } from "./DoStorageConfig.mjs";
 import { DoStorageFailpoint } from "./DoStorageFailpoint.mjs";
 import { DoLedgerError, DoStorageCorruptionError, DoStorageError } from "./DoStorageError.mjs";
-import { a as initializeDoJournal, i as decodeRows } from "./do-journal-CllwJfgW.mjs";
+import { a as initializeDoJournal, i as decodeRows } from "./do-journal-DnzUmhPA.mjs";
 import { storageConfigLayer, storageFailpointLayer } from "./DoThreadStore.mjs";
 import { Clock, Context, Crypto, DateTime, Effect, Layer, Option, Schema, Stream } from "effect";
 import * as SqlClientService from "effect/unstable/sql/SqlClient";
@@ -970,39 +970,68 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
 		yield* hitFailpoint("ledger:reserve-settlement:after", operation);
 		return reserved;
 	});
+	const validateFinalization = Effect.fn("DoSubmissionLedger.validateFinalization")(function* (validated, reservation) {
+		const operation = "ledger finalize settlement";
+		if (Option.isNone(reservation)) return yield* LedgerError.make({
+			operation,
+			message: `No settlement reservation exists for submission ${validated.submissionId}.`
+		});
+		if (reservation.value.settlement_id !== validated.settlementId) return yield* SettlementConflict.make({
+			submissionId: validated.submissionId,
+			existingOutcome: reservation.value.outcome
+		});
+		const reservationRecord = yield* decodeRecordEnvelopeText(reservation.value.record_json).pipe(Effect.mapError((error) => corruptionFailure(operation, "effect_agent_settlement_reservations", validated.submissionId, error.message)));
+		const settlementFailure = settlementFailureFromRecord(reservationRecord);
+		if (reservation.value.outcome === "failed" !== (settlementFailure !== void 0)) return yield* corruptionFailure(operation, "effect_agent_settlement_reservations", validated.submissionId, "The reserved outcome and canonical failure diagnostic disagree.");
+		return {
+			reservation: reservation.value,
+			settlementFailure
+		};
+	});
+	const replayFinalization = Effect.fn("DoSubmissionLedger.replayFinalization")(function* (validated, submission, { reservation, settlementFailure }) {
+		const operation = "ledger finalize settlement";
+		if (reservation.finalized_at === null) return yield* corruptionFailure(operation, "effect_agent_settlement_reservations", validated.submissionId, "A settled Submission's reservation carries no finalization timestamp.");
+		return yield* decodeSettlement({
+			submissionId: validated.submissionId,
+			settlementId: validated.settlementId,
+			receiptId: submission.receipt_id,
+			outcome: reservation.outcome,
+			...settlementFailure === void 0 ? {} : { failure: settlementFailure },
+			settledAt: reservation.finalized_at
+		}).pipe(Effect.mapError(internalFailure(operation)));
+	});
 	const finalizeSettlement = Effect.fn("DoSubmissionLedger.finalizeSettlement")(function* (request) {
 		const operation = "ledger finalize settlement";
 		const validated = yield* Schema.decodeUnknownEffect(Schema.toType(SettlementFinalization))(request).pipe(Effect.mapError(internalFailure(operation)));
 		yield* hitFailpoint("ledger:finalize-settlement:before", operation);
+		const replayRows = yield* sql`
+      SELECT submission.*, reservation.settlement_id, reservation.outcome,
+        reservation.record_id, reservation.record_json, reservation.record_digest,
+        reservation.reserved_at, reservation.finalized_at
+      FROM effect_agent_submissions AS submission
+      INNER JOIN effect_agent_settlement_reservations AS reservation
+        ON reservation.submission_id = submission.submission_id
+      WHERE submission.submission_id = ${validated.submissionId} AND submission.state = 'settled'
+    `.pipe(Effect.mapError(sqlFailure(operation)));
+		if (replayRows.length > 1) return yield* corruptionFailure(operation, "effect_agent_submissions", validated.submissionId, "A submission primary key returned more than one row.");
+		const replayRow = replayRows[0];
+		if (replayRow !== void 0) {
+			const reservations = yield* decodeRows(Schema.Array(ReservationRow), "effect_agent_settlement_reservations", validated.submissionId, replayRows).pipe(Effect.mapError(internalFailure(operation)));
+			const state = yield* validateFinalization(validated, Option.fromUndefinedOr(reservations[0]));
+			const submission = yield* Schema.decodeUnknownEffect(SubmissionRow)(replayRow).pipe(Effect.mapError((error) => corruptionFailure(operation, "effect_agent_submissions", validated.submissionId, error.message)));
+			const settlement = yield* replayFinalization(validated, submission, state);
+			yield* hitFailpoint("ledger:finalize-settlement:after", operation);
+			return settlement;
+		}
 		const settlement = yield* inWriteTransaction(operation, Effect.gen(function* () {
-			const reservation = yield* readReservation(operation, validated.submissionId);
-			if (Option.isNone(reservation)) return yield* LedgerError.make({
-				operation,
-				message: `No settlement reservation exists for submission ${validated.submissionId}.`
-			});
-			if (reservation.value.settlement_id !== validated.settlementId) return yield* SettlementConflict.make({
-				submissionId: validated.submissionId,
-				existingOutcome: reservation.value.outcome
-			});
-			const reservationRecord = yield* decodeRecordEnvelopeText(reservation.value.record_json).pipe(Effect.mapError((error) => corruptionFailure(operation, "effect_agent_settlement_reservations", validated.submissionId, error.message)));
-			const settlementFailure = settlementFailureFromRecord(reservationRecord);
-			if (reservation.value.outcome === "failed" !== (settlementFailure !== void 0)) return yield* corruptionFailure(operation, "effect_agent_settlement_reservations", validated.submissionId, "The reserved outcome and canonical failure diagnostic disagree.");
+			const state = yield* validateFinalization(validated, yield* readReservation(operation, validated.submissionId));
+			const { reservation, settlementFailure } = state;
 			const submission = yield* requireSubmission(operation, validated.submissionId);
-			if (submission.state === "settled") {
-				if (reservation.value.finalized_at === null) return yield* corruptionFailure(operation, "effect_agent_settlement_reservations", validated.submissionId, "A settled Submission's reservation carries no finalization timestamp.");
-				return yield* decodeSettlement({
-					submissionId: validated.submissionId,
-					settlementId: validated.settlementId,
-					receiptId: submission.receipt_id,
-					outcome: reservation.value.outcome,
-					...settlementFailure === void 0 ? {} : { failure: settlementFailure },
-					settledAt: reservation.value.finalized_at
-				}).pipe(Effect.mapError(internalFailure(operation)));
-			}
+			if (submission.state === "settled") return yield* replayFinalization(validated, submission, state);
 			const now = yield* currentInstant;
 			yield* sql`
           UPDATE effect_agent_submissions
-          SET state = 'settled', settled_outcome = ${reservation.value.outcome}
+          SET state = 'settled', settled_outcome = ${reservation.outcome}
           WHERE submission_id = ${validated.submissionId}
         `.pipe(Effect.mapError(sqlFailure(operation)));
 			yield* sql`
@@ -1018,7 +1047,7 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
 				submissionId: validated.submissionId,
 				settlementId: validated.settlementId,
 				receiptId: submission.receipt_id,
-				outcome: reservation.value.outcome,
+				outcome: reservation.outcome,
 				...settlementFailure === void 0 ? {} : { failure: settlementFailure },
 				settledAt: now.iso
 			}).pipe(Effect.mapError(internalFailure(operation)));
@@ -1609,13 +1638,7 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
           SELECT ${sql.literal(SUBMISSION_COLUMNS)}
           FROM effect_agent_submissions
           WHERE state <> 'settled'
-            AND (
-              thread_id > ${cursor.threadId}
-              OR (
-                thread_id = ${cursor.threadId}
-                AND queue_sequence > ${cursor.queueSequence}
-              )
-            )
+            AND (thread_id, queue_sequence) > (${cursor.threadId}, ${cursor.queueSequence})
           ORDER BY thread_id ASC, queue_sequence ASC
           LIMIT ${SCAN_PAGE_SIZE}
         `).pipe(Effect.mapError(sqlFailure(operation)));