@yielded/agent-platform-cloudflare 0.1.0-beta.173 → 0.1.0-beta.174

package/dist/{Alarm-BMEAZo3p.mjs → Alarm-4J9B8Fg8.mjs}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
-import { DurableObjectContext } from "./CloudflareBindings.mjs";
+import { DurableObjectContext, ThreadObjectPlacement } from "./CloudflareBindings.mjs";
 import { AuxiliaryDispatchMillis, CloudflareDurableRuntimeConfig } from "./CloudflareConfig.mjs";
 import { r as safeCauseMessage } from "./boundary-BguazVkh.mjs";
 import { CurrentNativeSource } from "@yielded/agent-storage-cloudflare/port-routing";
@@ -108,7 +108,7 @@ const make = (storage) => {
 		}
 	};
 	const write = (changes) => {
-		if (decode(sql.exec(`WITH changes (id, revision, dueAt, stalls, progressKey, notBefore, state, reported, expected_revision) AS (
+		if (sql.exec(`WITH changes (id, revision, dueAt, stalls, progressKey, notBefore, state, reported, expected_revision) AS (
             VALUES ${changes.map(() => "(?, ?, ?, ?, ?, ?, ?, ?, ?)").join(", ")}
           ) INSERT INTO platform_cloudflare_due_queue
             (id, revision, dueAt, stalls, progressKey, notBefore, state, reported)
@@ -118,7 +118,7 @@ const make = (storage) => {
             notBefore = excluded.notBefore, state = excluded.state, reported = excluded.reported
           WHERE platform_cloudflare_due_queue.revision = (
             SELECT expected_revision FROM changes WHERE changes.id = excluded.id
-          ) RETURNING id, revision, dueAt, stalls, progressKey, notBefore, state, reported`, ...changes.flatMap(({ before, after }) => [
+          ) RETURNING 1`, ...changes.flatMap(({ before, after }) => [
 			after.id,
 			after.revision,
 			after.dueAt,
@@ -128,7 +128,7 @@ const make = (storage) => {
 			after.state,
 			after.reported,
 			before?.revision ?? -1
-		])).toArray()).length !== changes.length) throw new Error("Maintenance due revision changed during transaction");
+		])).toArray().length !== changes.length) throw new Error("Maintenance due revision changed during transaction");
 	};
 	const flush = (frame) => {
 		if (frame.parent !== void 0) return;
@@ -205,6 +205,14 @@ const make = (storage) => {
 			progressKey: progressKey ?? row?.progressKey ?? null
 		}));
 	};
+	/** Native checkpoints fence the generation, not each source commit. Once progress
+	* resets a claimed lane, further native commits owe the same recovery opportunity.
+	* A new claim, deadline, or retry budget makes the next commit advance it again. */
+	const progressNative = (dueAt) => {
+		const row = read().find((row) => row.id === Native);
+		if (row?.state === "pending" && row.dueAt !== null && row.dueAt <= dueAt && row.stalls === 0 && row.notBefore === 0 && row.reported === 0) return;
+		dirty(Native, dueAt, true);
+	};
 	/** A strictly increasing source cursor; old or repeated notices cannot renew a budget. */
 	const progress = (id, dueAt, cursor) => {
 		Schema.decodeSync(Schema.BigInt.check(Schema.isGreaterThanOrEqualToBigInt(0n)))(cursor);
@@ -287,6 +295,7 @@ const make = (storage) => {
 		transaction,
 		read,
 		dirty,
+		progressNative,
 		progress,
 		register,
 		claim,
@@ -384,8 +393,8 @@ var DurableAlarmService = class DurableAlarmService extends Context.Service()("@
 			ensureScheduledBy: (at) => wrap("advance maintenance checkpoint", alarms.scheduleAlarmEarlier(maintenanceAlarmInput(at))),
 			scheduleNow: Ref.get(inlineWork).pipe(Effect.flatMap((active) => active > 0 ? Effect.void : wrap("hint maintenance checkpoint", alarms.transaction((tx) => Effect.gen(function* () {
 				const now = yield* Clock.currentTimeMillis;
-				const next$4 = next(make(ctx.storage).read());
-				if (Number.isFinite(next$4)) yield* tx.scheduleAlarmEarlier(maintenanceAlarmInput(Math.max(now, next$4)));
+				const next$6 = next(make(ctx.storage).read());
+				if (Number.isFinite(next$6)) yield* tx.scheduleAlarmEarlier(maintenanceAlarmInput(Math.max(now, next$6)));
 			}))))),
 			withHintsDeferred: (body) => Effect.acquireUseRelease(Ref.update(inlineWork, (active) => active + 1), () => body, () => Ref.update(inlineWork, (active) => active - 1)),
 			cancel: wrap("cancel maintenance checkpoint", alarms.cancelAlarm(maintenanceAlarmRef))
@@ -420,12 +429,16 @@ const makeAlarmOperation = Effect.gen(function* () {
 		if (ambient._tag === "Some" && !ownsTransaction(ctx.storage, ambient.value[1])) return Effect.fail(SqlError.make({ reason: UnknownError.make({
 			operation: "begin maintenance source transaction",
 			message: "Use ThreadMutationGate.withTransaction at the outermost source transaction",
-			cause: /* @__PURE__ */ new Error("Unwrapped SQL transaction cannot own buffered maintenance intent")
+			cause: "Unwrapped SQL transaction cannot own buffered maintenance intent"
 		}) }));
 		return Effect.uninterruptibleMask((restore) => Effect.suspend(() => {
 			let frame;
-			return transaction(Effect.flatMap(Effect.serviceOption(sql.transactionService), (transaction) => Effect.sync(() => {
-				if (transaction._tag === "None") throw new Error("SQL transaction unavailable");
+			return transaction(Effect.flatMap(Effect.serviceOption(sql.transactionService), (transaction) => Effect.gen(function* () {
+				if (transaction._tag === "None") return yield* SqlError.make({ reason: UnknownError.make({
+					operation: "begin maintenance source transaction",
+					message: "SQL transaction unavailable",
+					cause: "SQL transaction unavailable"
+				}) });
 				frame = queue.begin(transaction.value[1]);
 			})).pipe(Effect.andThen(restore(body)), Effect.tap(() => Effect.try({
 				try: () => {
@@ -442,8 +455,12 @@ const makeAlarmOperation = Effect.gen(function* () {
 		}));
 	}).pipe(Effect.provideService(SqlClient, sql));
 	const run = (operation, execute) => {
-		const commit = Effect.flatMap(CurrentCheckpoint, (tx) => {
-			if (tx === void 0) return Effect.die(/* @__PURE__ */ new Error("Maintenance checkpoint transaction unavailable"));
+		const commit = Effect.withFiber((fiber) => {
+			const tx = fiber.getRef(CurrentCheckpoint);
+			if (tx === void 0) return Effect.die(DurableAlarmError.make({
+				operation: "checkpoint",
+				message: "Maintenance checkpoint transaction unavailable"
+			}));
 			return tx.requireActive.pipe(Effect.andThen(Effect.suspend(() => {
 				let checkpoint = Effect.void;
 				const intent = {
@@ -463,9 +480,9 @@ const makeAlarmOperation = Effect.gen(function* () {
 				}).pipe(Effect.tap(() => checkpoint));
 			})));
 		});
-		return Effect.gen(function* () {
-			if ((yield* CurrentCheckpoint) !== void 0) return yield* commit;
-			return yield* (yield* Effect.serviceOption(sql.transactionService))._tag === "Some" && !buffering(ctx.storage) ? transaction(commit).pipe(Effect.ensuring(Effect.sync(() => invalidate(ctx.storage)))) : withTransaction(commit);
+		return Effect.withFiber((fiber) => {
+			if (fiber.getRef(CurrentCheckpoint) !== void 0) return commit;
+			return Context.getOption(fiber.context, sql.transactionService)._tag === "Some" && !buffering(ctx.storage) ? transaction(commit).pipe(Effect.ensuring(Effect.sync(() => invalidate(ctx.storage)))) : withTransaction(commit);
 		}).pipe(Effect.uninterruptible, Effect.mapError(alarmFailure(operation)));
 	};
 	return {
@@ -684,6 +701,8 @@ var ThreadMutationGate = class ThreadMutationGate extends Context.Service()("@ef
 		const { ctx } = yield* DurableObjectContext;
 		const sql = yield* SqlClient;
 		const dueQueue = make(ctx.storage);
+		const placement = yield* Effect.serviceOption(ThreadObjectPlacement);
+		const singleThread = Option.isSome(placement) && placement.value.threadId !== void 0;
 		const config = yield* CloudflareDurableRuntimeConfig;
 		const failpoint = yield* ThreadMaintenanceFailpoint;
 		const activeMutations = yield* Ref.make(0);
@@ -721,8 +740,8 @@ var ThreadMutationGate = class ThreadMutationGate extends Context.Service()("@ef
 						dirty: state.dirty + 1n
 					})));
 				}
-				const next$6 = next(dueQueue.read());
-				if (Number.isFinite(next$6)) checkpoint.earlier(Math.max(next$6, now + minimumAlarmDelay));
+				const next$4 = next(dueQueue.read());
+				if (Number.isFinite(next$4)) checkpoint.earlier(Math.max(next$4, now + minimumAlarmDelay));
 			};
 			yield* runAlarmTransaction("schedule maintenance lane", enroll);
 			yield* notify;
@@ -779,7 +798,8 @@ var ThreadMutationGate = class ThreadMutationGate extends Context.Service()("@ef
 			const now = yield* Clock.currentTimeMillis;
 			const nativeSource = yield* CurrentNativeSource;
 			yield* runAlarmTransaction("record maintenance producer progress", async (transaction, checkpoint) => {
-				for (const id of affected) dueQueue.dirty(id, now, true);
+				for (const id of affected) if (singleThread && nativeSource && id === "effect-agent:native") dueQueue.progressNative(now);
+				else dueQueue.dirty(id, now, true);
 				if (affected.has("effect-agent:native")) {
 					const { state, initialized } = await readMaintenanceState(transaction);
 					if (!initialized || !nativeSource || state.retry !== void 0) await transaction.put(MAINTENANCE_STATE_KEY, encodeMaintenanceState(ThreadMaintenanceState.make({
@@ -789,7 +809,7 @@ var ThreadMutationGate = class ThreadMutationGate extends Context.Service()("@ef
 				}
 				checkpoint.earlier(now + minimumAlarmDelay);
 			});
-			yield* notify;
+			if (!(singleThread && nativeSource && affected.size === 1 && affected.has("effect-agent:native"))) yield* notify;
 		});
 		return ThreadMutationGate.of({
 			withTransaction,
@@ -956,10 +976,10 @@ var ThreadMaintenance = class ThreadMaintenance extends Context.Service()("@effe
 					};
 				}));
 				for (let sequence = range.next; sequence <= range.through; sequence++) {
-					const event = yield* runTransaction("read recovery event", async () => {
-						const event = decodeRecoveryEvent(await ctx.storage.get(recoveryEventKey(sequence)));
-						if (event.sequence !== sequence) throw new Error("Recovery event does not match its sequence key");
-						return event;
+					const event = yield* runTransaction("read recovery event", async () => decodeRecoveryEvent(await ctx.storage.get(recoveryEventKey(sequence))));
+					if (event.sequence !== sequence) return yield* DurableAlarmError.make({
+						operation: "read recovery event",
+						message: "Recovery event does not match its sequence key"
 					});
 					yield* recoveryEvents.publish(event);
 					const acknowledgedAt = yield* Clock.currentTimeMillis;
@@ -986,7 +1006,7 @@ var ThreadMaintenance = class ThreadMaintenance extends Context.Service()("@effe
 			for (const report of result.reports) threads.set(report.threadId, void 0);
 			for (const report of result.workReports ?? []) threads.set(report.threadId, void 0);
 			for (const blocked of result.blocked) threads.set(blocked.threadId, blocked.failure);
-			if (threads.size === 0) return /* @__PURE__ */ new Map();
+			if (threads.size === 0 || [...threads].every(([threadId, failure]) => failure === void 0 && recovery.loaded.has(threadId) && !recovery.faults.has(threadId))) return /* @__PURE__ */ new Map();
 			const now = yield* Clock.currentTimeMillis;
 			const submissions = current ?? (result.blocked.length === 0 ? [] : yield* Stream.runCollect(ledger.scanNonterminal));
 			yield* failpoint.hit("maintenance:recovery-status:before");
@@ -1046,20 +1066,22 @@ var ThreadMaintenance = class ThreadMaintenance extends Context.Service()("@effe
 			return retained.faults;
 		});
 		const recoverThread = Effect.fnUntraced(function* (threadId, recovery) {
-			let cursor = yield* runTransaction("read work recovery cursor", async () => {
-				const retained = await ctx.storage.get(workCursorKey(threadId));
-				if (retained === void 0) return void 0;
-				const decoded = Schema.decodeUnknownSync(NativeWorkCursor)(retained);
-				if (decoded.threadId !== threadId) throw new Error("Work cursor belongs to another Thread");
-				return decoded.cursor;
+			const retained = yield* runTransaction("read work recovery cursor", async () => {
+				const value = await ctx.storage.get(workCursorKey(threadId));
+				return value === void 0 ? void 0 : Schema.decodeUnknownSync(NativeWorkCursor)(value);
+			});
+			if (retained !== void 0 && retained.threadId !== threadId) return yield* DurableAlarmError.make({
+				operation: "read work recovery cursor",
+				message: "Work cursor belongs to another Thread"
 			});
+			let cursor = retained?.cursor;
 			do {
 				const result = yield* runtime.runRecovery({
 					threadId,
 					...cursor === void 0 ? {} : { cursor }
 				}).pipe(Effect.provideService(CurrentNativeSource, true));
 				const faults = yield* recordRecoveryFaults(result, recovery, void 0, threadId);
-				yield* runTransaction("checkpoint work recovery cursor", async () => {
+				if (cursor !== void 0 || result.cursor !== void 0) yield* runTransaction("checkpoint work recovery cursor", async () => {
 					if (result.cursor === void 0) await ctx.storage.delete(workCursorKey(threadId));
 					else await ctx.storage.put(workCursorKey(threadId), Schema.encodeSync(NativeWorkCursor)({
 						threadId,
@@ -1360,7 +1382,7 @@ var ThreadMaintenance = class ThreadMaintenance extends Context.Service()("@effe
 				const pivot = Math.max(0, runnable.findIndex((threadId) => state.lastServedThreadId === void 0 || threadId > state.lastServedThreadId));
 				const selected = dispatch ? [...runnable.slice(pivot), ...runnable.slice(0, pivot)].slice(0, nativeDispatchConcurrency() - reserved.size) : [];
 				const next = selected.at(-1);
-				if (next !== void 0) await transaction.put(MAINTENANCE_STATE_KEY, encodeMaintenanceState(ThreadMaintenanceState.make({
+				if (next !== void 0 && next !== state.lastServedThreadId) await transaction.put(MAINTENANCE_STATE_KEY, encodeMaintenanceState(ThreadMaintenanceState.make({
 					...state,
 					lastServedThreadId: next
 				})));
@@ -1837,4 +1859,4 @@ var ThreadMaintenance = class ThreadMaintenance extends Context.Service()("@effe
 //#endregion
 export { Lifecycle as _, ThreadHostMaintenance as a, Projection as b, ThreadMaintenanceFailpoint as c, ThreadNativeMaintenance as d, ThreadPublication as f, HostLaneId as g, publishCommitted as h, MaintenancePassReport as i, ThreadMessageDelivery as l, ThreadRecoveryFaultEvent as m, DurableAlarmError as n, ThreadMaintenance as o, ThreadRecoveryEvents as p, DurableAlarmService as r, ThreadMaintenanceAlarm as s, Alarm_exports as t, ThreadMutationGate as u, Messages as v, Publication as x, Native as y };
 
-//# sourceMappingURL=Alarm-BMEAZo3p.mjs.map
+//# sourceMappingURL=Alarm-4J9B8Fg8.mjs.map