@effect-agent/storage-cloudflare 0.1.0-beta.97 → 0.1.0-beta.99

package/dist/DoSubmissionLedger.mjs

@@ -296,8 +296,8 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
 	*/
 	const requireOwnership = Effect.fn("DoSubmissionLedger.requireOwnership")(function* (operation, submission, ownershipToken) {
 		const ownership = yield* readOwnership(operation, submission.submission_id);
-		if (Option.isNone(ownership) || ownership.value.ownership_token !== ownershipToken) {
-			const actualEpoch = yield* threadEpoch(operation, submission.thread_id);
+		const actualEpoch = yield* threadEpoch(operation, submission.thread_id);
+		if (Option.isNone(ownership) || ownership.value.ownership_token !== ownershipToken || ownership.value.producer_epoch !== actualEpoch) {
 			const submissionId = yield* Schema.decodeEffect(SubmissionSnapshot.fields.submissionId)(submission.submission_id).pipe(Effect.mapError(internalFailure(operation)));
 			return yield* OwnershipLost.make({
 				submissionId,
@@ -722,11 +722,31 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
 		const ownershipToken = `owner-${yield* mintUuid(operation)}`;
 		yield* hitFailpoint("ledger:claim:before", operation);
 		const claimed = yield* inWriteTransaction(operation, Effect.gen(function* () {
+			const now = yield* currentInstant;
+			const ownershipRows = yield* sql`
+            SELECT ownership.*
+            FROM effect_agent_submission_ownership AS ownership
+            JOIN effect_agent_submissions AS submission
+              ON submission.submission_id = ownership.submission_id
+            WHERE submission.thread_id = ${validated.threadId}
+            ORDER BY ownership.lease_expires_at DESC
+            LIMIT 1
+          `.pipe(Effect.mapError(sqlFailure(operation)));
+			const ownership = yield* decodeRows(Schema.Array(OwnershipRow), "effect_agent_submission_ownership", validated.threadId, ownershipRows).pipe(Effect.mapError(internalFailure(operation)));
+			if (ownership.length > 0) {
+				if ((yield* timestampMillis(operation, ownership[0].submission_id)(ownership[0].lease_expires_at)) > now.millis) return Option.none();
+			}
 			const headRows = yield* sql`
             SELECT ${sql.literal(SUBMISSION_COLUMNS)}
             FROM effect_agent_submissions
             WHERE thread_id = ${validated.threadId}
               AND state <> 'settled'
+              AND (
+                state <> 'unknown' OR EXISTS (
+                  SELECT 1 FROM effect_agent_abort_intents
+                  WHERE submission_id = effect_agent_submissions.submission_id
+                )
+              )
             ORDER BY queue_sequence ASC
             LIMIT 1
           `.pipe(Effect.mapError(sqlFailure(operation)));
@@ -734,11 +754,6 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
 			if (heads.length === 0) return Option.none();
 			const head = heads[0];
 			if (head.state === "joining" || head.state === "joined" || head.state === "suspended" || head.state === "unknown" && Option.isNone(yield* readAbortIntent(operation, head.submission_id))) return Option.none();
-			const now = yield* currentInstant;
-			const ownership = yield* readOwnership(operation, head.submission_id);
-			if (Option.isSome(ownership)) {
-				if ((yield* timestampMillis(operation, head.submission_id)(ownership.value.lease_expires_at)) > now.millis) return Option.none();
-			}
 			const threads = yield* journal.getThread(head.thread_id).pipe(Effect.mapError(internalFailure(operation)));
 			let producerEpoch;
 			if (threads.length === 0) {