@ewhauser/world-celld 0.7.0 → 0.8.0

package/dist/worker.js

@@ -1,4 +1,4 @@
-import { _ as isRecord$1, a as queueOrphanName, c as validateNativeQueueEnvelope, d as HOOK_CLAIM_LEASE_MS, f as LIFECYCLE_COMPACTION_RETRY_MS, g as isPositiveSafeInteger, h as isNonNegativeSafeInteger, i as queueClaimName, l as validateNativeQueueSendOptions, m as QUEUE_CLAIM_STALE_MS, n as QUEUE_PAYLOAD_REGISTRY_PREFIX, o as queuePayloadObjectKey, p as MAX_RUN_INDEX_PUBLICATION_LIFETIME_MS, s as queuePayloadRegistryKey, t as NATIVE_QUEUE_MAX_MESSAGE_BYTES, v as queueDelayDeadline, y as strictIntegerSetting } from "./queue-protocol-CtH7UUCO.js";
+import { _ as isPositiveSafeInteger, a as queueClaimName, b as strictIntegerSetting, c as queuePayloadRegistryKey, f as HOOK_CLAIM_LEASE_MS, g as isNonNegativeSafeInteger, h as QUEUE_CLAIM_STALE_MS, l as validateNativeQueueEnvelope, m as MAX_RUN_INDEX_PUBLICATION_LIFETIME_MS, n as QUEUE_PAYLOAD_REGISTRY_PREFIX, o as queueOrphanName, p as LIFECYCLE_COMPACTION_RETRY_MS, r as isInlineRunBody, s as queuePayloadObjectKey, t as NATIVE_QUEUE_MAX_MESSAGE_BYTES, u as validateNativeQueueSendOptions, v as isRecord$1, y as queueDelayDeadline } from "./queue-protocol-DKYt8qZJ.js";
 import { DurableObject, WorkerEntrypoint } from "cloudflare:workers";
 import { CreateEventSchema, EventSchema, HookSchema, SPEC_VERSION_CURRENT, StepSchema, WaitSchema, WorkflowRunSchema, applyAttributeChanges, eventIdToSlot, getMaxEventsPerRun, isChildEntityCreationEvent, isTerminalStepStatus, isTerminalWorkflowRunStatus, slotToEventId, validateAttributeChanges } from "@workflow/world";
 //#region src/worker/auth.ts
@@ -42,6 +42,57 @@ async function authenticate(request, secret) {
 	return { ok: true };
 }
 //#endregion
+//#region src/worker/queue-claims.ts
+/**
+* Idempotency claims for Queue messages. A claim lives either in its own
+* claim cell (named by queue and idempotency key) or, for run-bearing
+* messages whose envelope says so, as an entry in the run's own cell.
+*/
+function cellQueueClaim(cell) {
+	return {
+		claim: (messageId, staleMs) => cell.claimInflight({
+			messageId,
+			staleMs
+		}),
+		hold: (params) => cell.holdInflight(params),
+		release: (messageId) => cell.releaseInflight(messageId),
+		complete: (messageId) => cell.completeQueueMessage(messageId)
+	};
+}
+function runQueueClaim(run, claimName) {
+	return {
+		claim: async (messageId, staleMs) => {
+			const result = await run.claimRunQueueMessage({
+				claimName,
+				messageId,
+				staleMs
+			});
+			return result.expired ? {
+				expired: true,
+				claimed: false
+			} : result;
+		},
+		hold: (params) => run.holdRunQueueMessage({
+			claimName,
+			...params
+		}),
+		release: (messageId) => run.releaseRunQueueMessage({
+			claimName,
+			messageId
+		}),
+		complete: (messageId) => run.completeRunQueueMessage({
+			claimName,
+			messageId
+		})
+	};
+}
+/** The claim a delivered envelope was reserved under, if it has an idempotency key. */
+function deliveryQueueClaim(envelope, runStub) {
+	if (!envelope.idempotencyKey) return void 0;
+	const claimName = queueClaimName(envelope.queueName, envelope.idempotencyKey);
+	return envelope.claimScope === "run" && envelope.runId ? runQueueClaim(runStub(envelope.runId), claimName) : cellQueueClaim(runStub(claimName));
+}
+//#endregion
 //#region src/worker/queue-delivery.ts
 /** Internal delivery contract. No Request/Response objects cross the RPC boundary. */
 const MAX_QUEUE_DELIVERY_RESPONSE_BYTES = 65536;
@@ -84,10 +135,10 @@ async function deliverQueueMessage(env, secret, input, attempt) {
 	const namespace = env.WORKFLOW_DB;
 	const payloadStore = env.WORKFLOW_QUEUE_PAYLOADS;
 	const runStub = (name) => namespace.get(namespace.idFromName(name));
-	let claim;
+	const claim = deliveryQueueClaim(envelope, runStub);
 	let claimed = false;
 	async function releaseClaim() {
-		if (claimed) await claim.releaseInflight(envelope.messageId);
+		if (claimed) await claim.release(envelope.messageId);
 	}
 	async function unregisterPayload() {
 		if (envelope.runId) {
@@ -96,12 +147,14 @@ async function deliverQueueMessage(env, secret, input, attempt) {
 		}
 	}
 	try {
-		if (envelope.idempotencyKey) {
-			claim = runStub(queueClaimName(envelope.queueName, envelope.idempotencyKey));
-			const result = await claim.claimInflight({
-				messageId: envelope.messageId,
-				staleMs: QUEUE_CLAIM_STALE_MS
-			});
+		let admission;
+		if (envelope.runId && !envelope.payloadKey && envelope.claimScope !== "run") {
+			admission = runStub(envelope.runId).getQueueAdmission();
+			admission.catch(() => void 0);
+		}
+		if (claim) {
+			const result = await claim.claim(envelope.messageId, QUEUE_CLAIM_STALE_MS);
+			if (result.expired) return { kind: "complete" };
 			if (!result.claimed) {
 				const now = Date.now();
 				if (result.retryAt !== void 0 && result.retryAt > now) return {
@@ -112,13 +165,17 @@ async function deliverQueueMessage(env, secret, input, attempt) {
 			}
 			claimed = true;
 		}
+		if (admission && !(await admission).ok) {
+			await claim?.complete(envelope.messageId);
+			return { kind: "complete" };
+		}
 		let body = envelope.body;
 		if (envelope.payloadKey) {
 			if (!payloadStore) throw new Error("missing binding: WORKFLOW_QUEUE_PAYLOADS");
 			body = await payloadStore.read(envelope.payloadKey) ?? void 0;
 			if (body === void 0) {
 				await unregisterPayload();
-				await claim?.completeQueueMessage(envelope.messageId);
+				await claim?.complete(envelope.messageId);
 				return { kind: "complete" };
 			}
 		}
@@ -141,7 +198,7 @@ async function deliverQueueMessage(env, secret, input, attempt) {
 				await payloadStore.delete(envelope.payloadKey);
 				await unregisterPayload();
 			}
-			await claim?.completeQueueMessage(envelope.messageId);
+			await claim?.complete(envelope.messageId);
 			return { kind: "complete" };
 		}
 		if (callback.status === 503) {
@@ -155,7 +212,7 @@ async function deliverQueueMessage(env, secret, input, attempt) {
 				key: envelope.payloadKey,
 				expiresAt: notBefore + QUEUE_ORPHAN_GRACE_MS$1
 			});
-			if (claim) await claim.holdInflight({
+			if (claim) await claim.hold({
 				messageId: envelope.messageId,
 				retryAt: notBefore,
 				expiresAt: notBefore + QUEUE_CLAIM_STALE_MS,
@@ -1854,6 +1911,18 @@ const INDEX_OPERATIONS = /* @__PURE__ */ new Set([
 */
 const WORLD_NAME = "world-celld";
 const WORLD_VERSION = "0.1.0";
+/**
+* Per-isolate record of runs whose Queue idempotency claims stay in claim
+* cells (created before run-scoped claims) or live in the run cell. A run's
+* scope never changes, so the cache only saves the run-cell question.
+*/
+const runClaimScopes = /* @__PURE__ */ new Map();
+const MAX_REMEMBERED_RUN_CLAIM_SCOPES = 4096;
+function rememberRunClaimScope(runId, scope) {
+	if (runClaimScopes.has(runId)) return;
+	if (runClaimScopes.size >= MAX_REMEMBERED_RUN_CLAIM_SCOPES) runClaimScopes.delete(runClaimScopes.keys().next().value);
+	runClaimScopes.set(runId, scope);
+}
 function workflowIndex(env) {
 	return createWorkflowIndex({
 		runCatalog: env.WORKFLOW_RUN_CATALOG,
@@ -2091,31 +2160,71 @@ function createRouter(env) {
 				try {
 					const namespace = env.WORKFLOW_DB;
 					const payloadStore = env.WORKFLOW_QUEUE_PAYLOADS;
-					const payloadKey = envelope.runId ? queuePayloadObjectKey(envelope.runId, envelope.messageId) : void 0;
-					const brokerEnvelope = payloadKey ? {
+					const inlineRunBody = envelope.runId !== void 0 && isInlineRunBody(envelope.body);
+					const payloadKey = envelope.runId && !inlineRunBody ? queuePayloadObjectKey(envelope.runId, envelope.messageId) : void 0;
+					let brokerEnvelope = payloadKey ? {
 						...envelope,
 						payloadKey,
 						body: void 0
 					} : envelope;
-					const encoded = JSON.stringify(brokerEnvelope);
-					if (new TextEncoder().encode(encoded).byteLength > 128e3) return errorResponse(413, "PayloadTooLarge", `native queue envelope exceeds ${NATIVE_QUEUE_MAX_MESSAGE_BYTES} bytes`);
+					const sized = JSON.stringify({
+						...brokerEnvelope,
+						claimScope: "run"
+					});
+					if (new TextEncoder().encode(sized).byteLength > 128e3) return errorResponse(413, "PayloadTooLarge", `native queue envelope exceeds ${NATIVE_QUEUE_MAX_MESSAGE_BYTES} bytes`);
 					const now = Date.now();
 					const reservationExpiresAt = Math.max(now, envelope.notBefore ?? now) + QUEUE_ORPHAN_GRACE_MS;
+					const run = envelope.runId ? namespace.get(namespace.idFromName(envelope.runId)) : void 0;
 					let claim;
+					let admission;
 					if (envelope.idempotencyKey) {
-						claim = namespace.get(namespace.idFromName(queueClaimName(envelope.queueName, envelope.idempotencyKey)));
-						const reservation = await claim.reserveQueueMessage({
-							messageId: envelope.messageId,
-							expiresAt: reservationExpiresAt
-						});
+						const claimName = queueClaimName(envelope.queueName, envelope.idempotencyKey);
+						let scope = run && envelope.runId ? runClaimScopes.get(envelope.runId) : "cell";
+						let reservation;
+						if (run && envelope.runId && scope !== "cell") {
+							const reserved = await run.reserveRunQueueMessage({
+								claimName,
+								messageId: envelope.messageId,
+								expiresAt: reservationExpiresAt
+							});
+							if (!reserved.ok) return errorResponse(410, "RunExpiredError", reserved.message);
+							scope = reserved.scope;
+							rememberRunClaimScope(envelope.runId, reserved.scope);
+							if (reserved.scope === "run") {
+								reservation = reserved;
+								claim = runQueueClaim(run, claimName);
+								brokerEnvelope = {
+									...brokerEnvelope,
+									claimScope: "run"
+								};
+							}
+						} else if (inlineRunBody && run) {
+							admission = run.getQueueAdmission();
+							admission.catch(() => void 0);
+						}
+						if (!reservation) {
+							const cell = namespace.get(namespace.idFromName(claimName));
+							reservation = await cell.reserveQueueMessage({
+								messageId: envelope.messageId,
+								expiresAt: reservationExpiresAt
+							});
+							claim = cellQueueClaim(cell);
+						}
 						if (!reservation.admitted) return new Response(rpcStringify({ messageId: reservation.messageId }), {
 							status: 200,
 							headers: { "content-type": "application/json" }
 						});
+					} else if (inlineRunBody && run) admission = run.getQueueAdmission();
+					const encoded = JSON.stringify(brokerEnvelope);
+					if (admission) {
+						const admitted = await admission;
+						if (!admitted.ok) {
+							await claim?.complete(envelope.messageId);
+							return errorResponse(410, "RunExpiredError", admitted.message);
+						}
 					}
-					if (envelope.runId && payloadKey) {
+					if (run && envelope.runId && payloadKey) {
 						if (!payloadStore) return errorResponse(500, "WorldMisconfigured", "missing binding: WORKFLOW_QUEUE_PAYLOADS");
-						const run = namespace.get(namespace.idFromName(envelope.runId));
 						const orphanExpiresAt = reservationExpiresAt;
 						const registered = await run.registerQueuePayload({
 							messageId: envelope.messageId,
@@ -2123,7 +2232,7 @@ function createRouter(env) {
 							orphanExpiresAt
 						});
 						if (!registered.ok) {
-							await claim?.completeQueueMessage(envelope.messageId);
+							await claim?.complete(envelope.messageId);
 							return errorResponse(410, "RunExpiredError", registered.message);
 						}
 						const orphan = namespace.get(namespace.idFromName(queueOrphanName(envelope.messageId)));
@@ -2136,7 +2245,7 @@ function createRouter(env) {
 							});
 						} catch (error) {
 							await run.unregisterQueuePayload(envelope.messageId);
-							await claim?.completeQueueMessage(envelope.messageId);
+							await claim?.complete(envelope.messageId);
 							throw error;
 						}
 						try {
@@ -2145,21 +2254,21 @@ function createRouter(env) {
 								messageId: envelope.messageId
 							});
 						} catch (error) {
-							await claim?.completeQueueMessage(envelope.messageId);
+							await claim?.complete(envelope.messageId);
 							throw error;
 						}
 						let finalized;
 						try {
 							finalized = await run.finalizeQueuePayload(envelope.messageId);
 						} catch (error) {
-							await claim?.completeQueueMessage(envelope.messageId);
+							await claim?.complete(envelope.messageId);
 							throw error;
 						}
 						if (!finalized.ok) {
 							await payloadStore.delete(payloadKey);
 							await run.unregisterQueuePayload(envelope.messageId);
 							await orphan.cancelQueuePayloadOrphan(envelope.messageId);
-							await claim?.completeQueueMessage(envelope.messageId);
+							await claim?.complete(envelope.messageId);
 							return errorResponse(410, "RunExpiredError", finalized.message);
 						}
 					}
@@ -3049,6 +3158,13 @@ const DELETE_BATCH_KEYS = 128;
 const DEFAULT_EXPIRE_BYTE_LIMIT = 16777216;
 const MAX_EXPIRE_BYTE_LIMIT = DEFAULT_EXPIRE_BYTE_LIMIT;
 const MAX_STREAM_INDEX = 2147483647;
+const SEGMENT_LAYOUT = 2;
+const SEGMENT_KEY_PREFIX = "seg:";
+const SEGMENT_SIZE_KEY_PREFIX = "segsize:";
+/** Payload bytes per segment row, well below the 2 MiB per-value storage limit. */
+const MAX_SEGMENT_BYTES = 1048576;
+/** Layout of a stream's first write. Existing streams keep the layout they started with. */
+const NEW_STREAM_LAYOUT = SEGMENT_LAYOUT;
 /** One storage get or put call accepts at most 128 keys. */
 const STORAGE_BATCH_KEYS = 128;
 function boundedLimit(value, fallback, maximum) {
@@ -3069,7 +3185,7 @@ function validateMeta(meta) {
 		"closed",
 		"errored",
 		"expired"
-	].includes(candidate.state) || candidate.ownerRunId !== void 0 && typeof candidate.ownerRunId !== "string" || candidate.payloadDeleted !== void 0 && typeof candidate.payloadDeleted !== "boolean") throw new Error("Invalid persisted stream metadata");
+	].includes(candidate.state) || candidate.ownerRunId !== void 0 && typeof candidate.ownerRunId !== "string" || candidate.payloadDeleted !== void 0 && typeof candidate.payloadDeleted !== "boolean" || candidate.layout !== void 0 && candidate.layout !== SEGMENT_LAYOUT) throw new Error("Invalid persisted stream metadata");
 	const error = candidate.error;
 	if (error !== void 0 && (!error || typeof error !== "object" || typeof error.name !== "string" || typeof error.message !== "string") || candidate.state === "errored" !== (error !== void 0)) throw new Error("Invalid persisted stream error metadata");
 	return candidate;
@@ -3081,6 +3197,80 @@ function chunkKey(index) {
 function chunkSizeKey(index) {
 	return `${CHUNK_SIZE_KEY_PREFIX}${index.toString().padStart(12, "0")}`;
 }
+function segmentKey(start) {
+	return `${SEGMENT_KEY_PREFIX}${start.toString().padStart(12, "0")}`;
+}
+function segmentSizeKey(start) {
+	return `${SEGMENT_SIZE_KEY_PREFIX}${start.toString().padStart(12, "0")}`;
+}
+function startFromSegmentKey(key, prefix) {
+	const suffix = key.slice(prefix.length);
+	const start = Number(suffix);
+	if (!key.startsWith(prefix) || !/^\d{12}$/.test(suffix) || !Number.isSafeInteger(start) || start > MAX_STREAM_INDEX) throw new Error(`Invalid persisted stream segment key "${key}"`);
+	return start;
+}
+function validateSegmentSize(value, start) {
+	const size = value;
+	if (!size || !Number.isSafeInteger(size.count) || size.count < 1 || !Number.isSafeInteger(size.bytes) || size.bytes < 0) throw new Error(`Invalid persisted stream segment size at index ${start}`);
+	return size;
+}
+/** Pack chunks as `[u32 count][u32 length]*count` followed by the payloads. */
+function encodeSegment(chunks) {
+	const payloadBytes = chunks.reduce((total, chunk) => total + chunk.byteLength, 0);
+	const header = 4 + 4 * chunks.length;
+	const encoded = new Uint8Array(header + payloadBytes);
+	const view = new DataView(encoded.buffer);
+	view.setUint32(0, chunks.length);
+	let offset = header;
+	for (let index = 0; index < chunks.length; index++) {
+		view.setUint32(4 + 4 * index, chunks[index].byteLength);
+		encoded.set(chunks[index], offset);
+		offset += chunks[index].byteLength;
+	}
+	return encoded;
+}
+function decodeSegment(value, start, size) {
+	if (!(value instanceof Uint8Array) || value.byteLength < 4) throw new Error(`Invalid persisted stream segment at index ${start}`);
+	const view = new DataView(value.buffer, value.byteOffset, value.byteLength);
+	const count = view.getUint32(0);
+	const header = 4 + 4 * count;
+	if (count !== size.count || header + size.bytes !== value.byteLength) throw new Error(`Invalid persisted stream segment at index ${start}`);
+	const chunks = [];
+	let offset = header;
+	for (let index = 0; index < count; index++) {
+		const length = view.getUint32(4 + 4 * index);
+		if (offset + length > value.byteLength) throw new Error(`Invalid persisted stream segment at index ${start}`);
+		chunks.push(value.subarray(offset, offset + length));
+		offset += length;
+	}
+	if (offset !== value.byteLength) throw new Error(`Invalid persisted stream segment at index ${start}`);
+	return chunks;
+}
+/** Group one write's chunks into segments of at most MAX_SEGMENT_BYTES payload bytes. */
+function packSegments(startIndex, chunks) {
+	const segments = [];
+	let current = [];
+	let bytes = 0;
+	let start = startIndex;
+	for (const chunk of chunks) {
+		if (current.length > 0 && bytes + chunk.byteLength > MAX_SEGMENT_BYTES) {
+			segments.push({
+				start,
+				chunks: current
+			});
+			start += current.length;
+			current = [];
+			bytes = 0;
+		}
+		current.push(chunk);
+		bytes += chunk.byteLength;
+	}
+	if (current.length > 0) segments.push({
+		start,
+		chunks: current
+	});
+	return segments;
+}
 function indexFromChunkSizeKey(key) {
 	const suffix = key.slice(11);
 	const index = Number(suffix);
@@ -3097,6 +3287,9 @@ function validateChunkSize(size, index) {
 	if (typeof size !== "number" || !Number.isSafeInteger(size) || size < 0 || size > 1048576) throw new Error(`Invalid persisted stream chunk size at index ${index}`);
 	return size;
 }
+async function deleteInBatches(txn, keys) {
+	for (let offset = 0; offset < keys.length; offset += DELETE_BATCH_KEYS) await txn.delete(keys.slice(offset, offset + DELETE_BATCH_KEYS));
+}
 function compactChunk(chunk) {
 	return chunk.byteOffset === 0 && chunk.byteLength === chunk.buffer.byteLength ? chunk : new Uint8Array(chunk);
 }
@@ -3193,29 +3386,8 @@ var StreamDO = class extends DurableObject {
 		const meta = await this.getMeta();
 		this.assertOwner(meta, request.runId);
 		const available = meta.state === "expired" ? 0 : Math.max(0, Math.min(request.maxChunks, meta.count - request.startIndex));
-		const chunks = [];
-		if (available > 0) {
-			const indexes = Array.from({ length: available }, (_, offset) => request.startIndex + offset);
-			const sizeKeys = indexes.map(chunkSizeKey);
-			const storedSizes = await this.getMany(sizeKeys);
-			const selectedIndexes = [];
-			const selectedSizes = [];
-			let bytes = 0;
-			for (const index of indexes) {
-				const size = validateChunkSize(storedSizes.get(chunkSizeKey(index)), index);
-				if (bytes + size > request.maxBytes) break;
-				selectedIndexes.push(index);
-				selectedSizes.push(size);
-				bytes += size;
-			}
-			const payloadKeys = selectedIndexes.map(chunkKey);
-			const storedChunks = await this.getMany(payloadKeys);
-			for (let offset = 0; offset < payloadKeys.length; offset++) {
-				const chunk = storedChunks.get(payloadKeys[offset]);
-				if (!(chunk instanceof Uint8Array) || chunk.byteLength !== selectedSizes[offset]) throw new Error(`Invalid persisted stream chunk at index ${selectedIndexes[offset]}`);
-				chunks.push(chunk);
-			}
-		}
+		let chunks = [];
+		if (available > 0) chunks = meta.layout === SEGMENT_LAYOUT ? await this.readSegmentRows(request.startIndex, available, request.maxBytes) : await this.readChunkRows(request.startIndex, available, request.maxBytes);
 		return {
 			startIndex: request.startIndex,
 			tailIndex: meta.count - 1,
@@ -3225,10 +3397,91 @@ var StreamDO = class extends DurableObject {
 			error: meta.error
 		};
 	}
+	async readChunkRows(startIndex, available, maxBytes) {
+		const indexes = Array.from({ length: available }, (_, offset) => startIndex + offset);
+		const sizeKeys = indexes.map(chunkSizeKey);
+		const storedSizes = await this.getMany(sizeKeys);
+		const selectedIndexes = [];
+		const selectedSizes = [];
+		let bytes = 0;
+		for (const index of indexes) {
+			const size = validateChunkSize(storedSizes.get(chunkSizeKey(index)), index);
+			if (bytes + size > maxBytes) break;
+			selectedIndexes.push(index);
+			selectedSizes.push(size);
+			bytes += size;
+		}
+		const payloadKeys = selectedIndexes.map(chunkKey);
+		const storedChunks = await this.getMany(payloadKeys);
+		const chunks = [];
+		for (let offset = 0; offset < payloadKeys.length; offset++) {
+			const chunk = storedChunks.get(payloadKeys[offset]);
+			if (!(chunk instanceof Uint8Array) || chunk.byteLength !== selectedSizes[offset]) throw new Error(`Invalid persisted stream chunk at index ${selectedIndexes[offset]}`);
+			chunks.push(chunk);
+		}
+		return chunks;
+	}
+	/**
+	* Plan from the small segment size rows, then load only the segments that
+	* cover the requested range. A read that starts on a segment boundary (the
+	* common sequential case) needs one list and one multi-get.
+	*/
+	async readSegmentRows(startIndex, available, maxBytes) {
+		const endIndex = startIndex + available;
+		const listed = await this.ctx.storage.list({
+			prefix: SEGMENT_SIZE_KEY_PREFIX,
+			start: segmentSizeKey(startIndex),
+			end: segmentSizeKey(endIndex),
+			limit: available
+		});
+		const planned = [];
+		for (const [key, value] of listed) {
+			const start = startFromSegmentKey(key, SEGMENT_SIZE_KEY_PREFIX);
+			planned.push({
+				start,
+				size: validateSegmentSize(value, start)
+			});
+		}
+		if (planned[0]?.start !== startIndex) {
+			const entry = (await this.ctx.storage.list({
+				prefix: SEGMENT_SIZE_KEY_PREFIX,
+				end: segmentSizeKey(startIndex + 1),
+				reverse: true,
+				limit: 1
+			})).entries().next().value;
+			if (!entry) throw new Error(`Missing persisted stream segment at index ${startIndex}`);
+			const start = startFromSegmentKey(entry[0], SEGMENT_SIZE_KEY_PREFIX);
+			planned.unshift({
+				start,
+				size: validateSegmentSize(entry[1], start)
+			});
+		}
+		const selected = [];
+		let plannedBytes = 0;
+		for (const segment of planned) {
+			if (selected.length > 0 && plannedBytes >= maxBytes) break;
+			selected.push(segment);
+			plannedBytes += segment.size.bytes;
+		}
+		const values = await this.getMany(selected.map(({ start }) => segmentKey(start)));
+		const chunks = [];
+		let bytes = 0;
+		let expected = startIndex;
+		for (const { start, size } of selected) {
+			if (start > expected) throw new Error(`Missing persisted stream segment at index ${expected}`);
+			const segment = decodeSegment(values.get(segmentKey(start)), start, size);
+			for (let offset = expected - start; offset < segment.length; offset++) {
+				if (expected >= endIndex || bytes + segment[offset].byteLength > maxBytes) return chunks;
+				chunks.push(segment[offset]);
+				bytes += segment[offset].byteLength;
+				expected++;
+			}
+		}
+		return chunks;
+	}
 	/** Append one bounded binary batch with contiguous indexes. */
 	async writeChunks(runId, chunks) {
 		validateStreamWriteChunks(chunks);
-		const storedChunks = chunks.map(compactChunk);
 		return await this.runMutation(async () => {
 			const committed = await this.ctx.storage.transaction(async (txn) => {
 				const stored = await txn.get(META_KEY);
@@ -3236,16 +3489,28 @@ var StreamDO = class extends DurableObject {
 				this.assertWritable(meta, runId);
 				const startIndex = meta.count;
 				if (startIndex + chunks.length > MAX_STREAM_INDEX) throw new Error("Stream offset limit exceeded");
+				const layout = stored === void 0 ? NEW_STREAM_LAYOUT : meta.layout;
 				const nextMeta = {
 					count: startIndex + chunks.length,
 					state: "open",
-					ownerRunId: runId
+					ownerRunId: runId,
+					...layout === void 0 ? {} : { layout }
 				};
 				const entries = [[META_KEY, nextMeta]];
-				for (let offset = 0; offset < storedChunks.length; offset++) {
-					const index = startIndex + offset;
-					entries.push([chunkKey(index), storedChunks[offset]]);
-					entries.push([chunkSizeKey(index), storedChunks[offset].byteLength]);
+				if (layout === SEGMENT_LAYOUT) for (const segment of packSegments(startIndex, chunks)) {
+					entries.push([segmentKey(segment.start), encodeSegment(segment.chunks)]);
+					entries.push([segmentSizeKey(segment.start), {
+						count: segment.chunks.length,
+						bytes: segment.chunks.reduce((total, chunk) => total + chunk.byteLength, 0)
+					}]);
+				}
+				else {
+					const storedChunks = chunks.map(compactChunk);
+					for (let offset = 0; offset < storedChunks.length; offset++) {
+						const index = startIndex + offset;
+						entries.push([chunkKey(index), storedChunks[offset]]);
+						entries.push([chunkSizeKey(index), storedChunks[offset].byteLength]);
+					}
 				}
 				for (let offset = 0; offset < entries.length; offset += STORAGE_BATCH_KEYS) await txn.put(Object.fromEntries(entries.slice(offset, offset + STORAGE_BATCH_KEYS)));
 				return {
@@ -3381,6 +3646,102 @@ var StreamDO = class extends DurableObject {
 			};
 		});
 	}
+	/** Delete one page of per-chunk rows, listing size rows to avoid loading payloads. */
+	async expireChunkPage(txn, limit, byteLimit) {
+		const candidates = await txn.list({
+			prefix: CHUNK_SIZE_KEY_PREFIX,
+			limit: limit + 1
+		});
+		const page = [];
+		let bytes = 0;
+		for (const [key, storedSize] of Array.from(candidates).slice(0, limit)) {
+			const index = indexFromChunkSizeKey(key);
+			const size = validateChunkSize(storedSize, index);
+			if (page.length > 0 && bytes + size > byteLimit) break;
+			page.push({
+				index,
+				size
+			});
+			bytes += size;
+		}
+		let payloadFallback = false;
+		if (candidates.size === 0) {
+			const first = (await txn.list({
+				prefix: CHUNK_KEY_PREFIX,
+				limit: 1
+			})).entries().next().value;
+			if (first) {
+				const [key, payload] = first;
+				page.push({
+					index: indexFromChunkKey(key),
+					size: payload instanceof Uint8Array ? payload.byteLength : 0
+				});
+				bytes = page[0].size;
+				payloadFallback = true;
+			}
+		}
+		await deleteInBatches(txn, page.flatMap(({ index }) => [chunkKey(index), chunkSizeKey(index)]));
+		let done = candidates.size === page.length;
+		if (payloadFallback) done = (await txn.list({
+			prefix: CHUNK_KEY_PREFIX,
+			limit: 1
+		})).size === 0;
+		else if (done && candidates.size > 0) done = (await txn.list({
+			prefix: CHUNK_KEY_PREFIX,
+			limit: 1
+		})).size === 0;
+		return {
+			chunks: page.length,
+			bytes,
+			done
+		};
+	}
+	/**
+	* Delete one page of segment rows, listing segment size rows to avoid
+	* loading payloads. One segment always makes progress, even when it holds
+	* more chunks or bytes than the page allows.
+	*/
+	async expireSegmentPage(txn, limit, byteLimit) {
+		const candidates = await txn.list({
+			prefix: SEGMENT_SIZE_KEY_PREFIX,
+			limit: limit + 1
+		});
+		const page = [];
+		let chunks = 0;
+		let bytes = 0;
+		for (const [key, value] of candidates) {
+			const start = startFromSegmentKey(key, SEGMENT_SIZE_KEY_PREFIX);
+			const size = validateSegmentSize(value, start);
+			if (page.length > 0 && (chunks + size.count > limit || bytes + size.bytes > byteLimit)) break;
+			page.push(start);
+			chunks += size.count;
+			bytes += size.bytes;
+		}
+		let orphan = false;
+		if (candidates.size === 0) {
+			const first = (await txn.list({
+				prefix: SEGMENT_KEY_PREFIX,
+				limit: 1
+			})).entries().next().value;
+			if (first) {
+				page.push(startFromSegmentKey(first[0], SEGMENT_KEY_PREFIX));
+				bytes = first[1] instanceof Uint8Array ? first[1].byteLength : 0;
+				chunks = 1;
+				orphan = true;
+			}
+		}
+		await deleteInBatches(txn, page.flatMap((start) => [segmentKey(start), segmentSizeKey(start)]));
+		let done = !orphan && candidates.size === page.length;
+		if (orphan || done) done = (await txn.list({
+			prefix: SEGMENT_KEY_PREFIX,
+			limit: 1
+		})).size === 0;
+		return {
+			chunks,
+			bytes,
+			done
+		};
+	}
 	/**
 	* Fence the stream and delete one bounded page. Listing size keys avoids
 	* loading payloads, and the transaction makes a crash retry resume safely.
@@ -3394,50 +3755,8 @@ var StreamDO = class extends DurableObject {
 				const meta = stored === void 0 ? emptyMeta() : validateMeta(stored);
 				this.assertOwner(meta, runId);
 				const firstFence = meta.state !== "expired";
-				const candidates = await txn.list({
-					prefix: CHUNK_SIZE_KEY_PREFIX,
-					limit: limit + 1
-				});
-				const page = [];
-				let bytes = 0;
-				for (const [key, storedSize] of Array.from(candidates).slice(0, limit)) {
-					const index = indexFromChunkSizeKey(key);
-					const size = validateChunkSize(storedSize, index);
-					if (page.length > 0 && bytes + size > byteLimit) break;
-					page.push({
-						index,
-						size
-					});
-					bytes += size;
-				}
-				let payloadFallback = false;
-				if (candidates.size === 0) {
-					const first = (await txn.list({
-						prefix: CHUNK_KEY_PREFIX,
-						limit: 1
-					})).entries().next().value;
-					if (first) {
-						const [key, payload] = first;
-						page.push({
-							index: indexFromChunkKey(key),
-							size: payload instanceof Uint8Array ? payload.byteLength : 0
-						});
-						bytes = page[0].size;
-						payloadFallback = true;
-					}
-				}
-				const keys = page.flatMap(({ index }) => [chunkKey(index), chunkSizeKey(index)]);
-				for (let offset = 0; offset < keys.length; offset += DELETE_BATCH_KEYS) await txn.delete(keys.slice(offset, offset + DELETE_BATCH_KEYS));
-				let done = candidates.size === page.length;
-				if (payloadFallback) done = (await txn.list({
-					prefix: CHUNK_KEY_PREFIX,
-					limit: 1
-				})).size === 0;
-				else if (done && candidates.size > 0) done = (await txn.list({
-					prefix: CHUNK_KEY_PREFIX,
-					limit: 1
-				})).size === 0;
-				if (done && page.length === 0 && meta.state === "expired" && meta.payloadDeleted) return {
+				const { chunks, bytes, done } = meta.layout === SEGMENT_LAYOUT ? await this.expireSegmentPage(txn, limit, byteLimit) : await this.expireChunkPage(txn, limit, byteLimit);
+				if (done && chunks === 0 && meta.state === "expired" && meta.payloadDeleted) return {
 					meta,
 					result: {
 						deleted: false,
@@ -3461,7 +3780,7 @@ var StreamDO = class extends DurableObject {
 					meta: nextMeta,
 					result: {
 						deleted: firstFence,
-						chunks: page.length,
+						chunks,
 						bytes,
 						done
 					}
@@ -3491,6 +3810,14 @@ const CLEANUP_RETRY_MAX_MS = 36e5;
 const MAX_DATE_MS = 864e13;
 const QUEUE_ORPHAN_KEY = "queue-orphan";
 const QUEUE_RESERVATION_KEY = "queue-reservation";
+/** Run-scoped Queue idempotency state, one key per claim name, in the run's own cell. */
+const RUN_QUEUE_CLAIM_PREFIX = "queue-claim:";
+/**
+* Present when every idempotency claim of this run lives in the run's own
+* cell. Written only when the run is created, so a run keeps one claim scope
+* for its whole life and claims made before the marker existed stay valid.
+*/
+const RUN_QUEUE_CLAIM_SCOPE_KEY = "queue-claim-scope";
 function validateCleanupRequest(request, allowDisabled) {
 	if (!isRecord$1(request)) throw new Error("world-celld retention request must be an object");
 	if (!(allowDisabled ? isNonNegativeSafeInteger(request.retentionMs) : isPositiveSafeInteger(request.retentionMs))) throw new Error(`world-celld retentionMs must be a ${allowDisabled ? "non-negative" : "positive"} safe integer`);
@@ -3544,6 +3871,12 @@ async function putStorageEntries(storage, entries) {
 	const all = Array.from(entries);
 	for (let offset = 0; offset < all.length; offset += STORAGE_BATCH_SIZE) await storage.put(Object.fromEntries(all.slice(offset, offset + STORAGE_BATCH_SIZE)));
 }
+function runQueueClaimKey(claimName) {
+	return `${RUN_QUEUE_CLAIM_PREFIX}${claimName}`;
+}
+function validRunQueueClaimName(claimName) {
+	return typeof claimName === "string" && claimName.startsWith("claim:");
+}
 /**
 * Durable Object for managing a single workflow run's state.
 *
@@ -3624,6 +3957,7 @@ var WorkflowRunDO = class extends DurableObject {
 			});
 			if (!outcome.ok) return outcome;
 			if (eventSequence !== storedSequence) await txn.put(EVENT_SEQUENCE_KEY, eventSequence);
+			if (outcome.runCreated) await txn.put(RUN_QUEUE_CLAIM_SCOPE_KEY, "run");
 			await putStorageEntries(txn, (outcome.hookToIndex ? [{
 				hookId: outcome.hookToIndex.hookId,
 				token: outcome.hookToIndex.token
@@ -4290,6 +4624,150 @@ var WorkflowRunDO = class extends DurableObject {
 			await txn.setAlarm(this.now() + delay);
 		});
 	}
+	/**
+	* Read-only admission for a run-bearing Queue message whose body travels
+	* inline in the broker envelope. It answers what payload registration does
+	* for offloaded bodies, without writing anything.
+	*/
+	async getQueueAdmission() {
+		const { tombstone } = await this.retentionState(this.ctx.storage);
+		return tombstone ? {
+			ok: false,
+			message: `Workflow run "${tombstone.runId}" expired at ${tombstone.expiredAt.toISOString()}`
+		} : { ok: true };
+	}
+	/**
+	* Enqueue-side admission and idempotency reservation in one transaction,
+	* for a run-scoped claim. Replaces a separate claim cell's reservation plus
+	* the run expiry check.
+	*/
+	async reserveRunQueueMessage(params) {
+		if (!validRunQueueClaimName(params?.claimName) || typeof params.messageId !== "string" || params.messageId.length === 0 || !isNonNegativeSafeInteger(params.expiresAt)) throw new TypeError("world-celld run queue reservation is invalid");
+		return await this.ctx.storage.transaction(async (txn) => {
+			const key = runQueueClaimKey(params.claimName);
+			const values = await txn.get([
+				TOMBSTONE_KEY,
+				CLEANUP_RECORD_KEY,
+				RUN_QUEUE_CLAIM_SCOPE_KEY,
+				key
+			]);
+			const tombstone = this.tombstoneFrom(values);
+			if (tombstone) return {
+				ok: false,
+				message: `Workflow run "${tombstone.runId}" expired at ${tombstone.expiredAt.toISOString()}`
+			};
+			if (values.get("queue-claim-scope") !== "run") return {
+				ok: true,
+				scope: "cell"
+			};
+			const state = values.get(key) ?? {};
+			const existing = state.reservation;
+			if (existing && existing.expiresAt > this.now() && existing.messageId !== params.messageId) return {
+				ok: true,
+				scope: "run",
+				admitted: false,
+				messageId: existing.messageId
+			};
+			await txn.put(key, {
+				...state,
+				reservation: {
+					messageId: params.messageId,
+					expiresAt: Math.max(existing?.expiresAt ?? 0, params.expiresAt)
+				}
+			});
+			return {
+				ok: true,
+				scope: "run",
+				admitted: true,
+				messageId: params.messageId
+			};
+		});
+	}
+	/** Delivery-side run expiry check and in-flight claim in one transaction. */
+	async claimRunQueueMessage(params) {
+		if (!validRunQueueClaimName(params?.claimName) || typeof params.messageId !== "string" || params.messageId.length === 0 || !isPositiveSafeInteger(params.staleMs)) throw new TypeError("world-celld run queue claim is invalid");
+		return await this.ctx.storage.transaction(async (txn) => {
+			const key = runQueueClaimKey(params.claimName);
+			const values = await txn.get([
+				TOMBSTONE_KEY,
+				CLEANUP_RECORD_KEY,
+				key
+			]);
+			if (this.tombstoneFrom(values)) return { expired: true };
+			const state = values.get(key) ?? {};
+			const existing = state.claim;
+			const now = this.now();
+			if (existing && existing.expiresAt > now) {
+				if (existing.messageId !== params.messageId) return {
+					expired: false,
+					claimed: false
+				};
+				if (existing.retryAt === void 0 || existing.retryAt > now) return {
+					expired: false,
+					claimed: false,
+					retryAt: existing.retryAt ?? existing.expiresAt
+				};
+			}
+			await txn.put(key, {
+				...state,
+				claim: {
+					messageId: params.messageId,
+					expiresAt: now + params.staleMs
+				}
+			});
+			return {
+				expired: false,
+				claimed: true
+			};
+		});
+	}
+	async holdRunQueueMessage(params) {
+		if (!validRunQueueClaimName(params?.claimName) || typeof params.messageId !== "string" || params.messageId.length === 0 || !isNonNegativeSafeInteger(params.retryAt) || !isNonNegativeSafeInteger(params.expiresAt) || params.reservationExpiresAt !== void 0 && !isNonNegativeSafeInteger(params.reservationExpiresAt)) throw new TypeError("world-celld run queue claim hold is invalid");
+		return await this.ctx.storage.transaction(async (txn) => {
+			const key = runQueueClaimKey(params.claimName);
+			const state = await txn.get(key) ?? {};
+			const existing = state.claim;
+			if (!existing || existing.messageId !== params.messageId) return { held: false };
+			const next = {
+				...state,
+				claim: {
+					...existing,
+					retryAt: params.retryAt,
+					expiresAt: Math.max(existing.expiresAt, params.expiresAt)
+				}
+			};
+			if (state.reservation?.messageId === params.messageId && params.reservationExpiresAt !== void 0 && params.reservationExpiresAt > state.reservation.expiresAt) next.reservation = {
+				...state.reservation,
+				expiresAt: params.reservationExpiresAt
+			};
+			await txn.put(key, next);
+			return { held: true };
+		});
+	}
+	async releaseRunQueueMessage(params) {
+		if (!validRunQueueClaimName(params?.claimName) || typeof params.messageId !== "string") throw new TypeError("world-celld run queue claim release is invalid");
+		await this.ctx.storage.transaction(async (txn) => {
+			const key = runQueueClaimKey(params.claimName);
+			const state = await txn.get(key);
+			if (state?.claim?.messageId !== params.messageId) return;
+			const { claim: _released, ...rest } = state;
+			if (rest.reservation) await txn.put(key, rest);
+			else await txn.delete(key);
+		});
+	}
+	async completeRunQueueMessage(params) {
+		if (!validRunQueueClaimName(params?.claimName) || typeof params.messageId !== "string") throw new TypeError("world-celld run queue completion is invalid");
+		await this.ctx.storage.transaction(async (txn) => {
+			const key = runQueueClaimKey(params.claimName);
+			const state = await txn.get(key);
+			if (!state) return;
+			const next = {};
+			if (state.reservation && state.reservation.messageId !== params.messageId) next.reservation = state.reservation;
+			if (state.claim && state.claim.messageId !== params.messageId) next.claim = state.claim;
+			if (next.reservation || next.claim) await txn.put(key, next);
+			else await txn.delete(key);
+		});
+	}
 	async registerQueuePayload(registration) {
 		if (!registration || typeof registration.messageId !== "string" || registration.messageId.length === 0 || typeof registration.key !== "string" || registration.key.length === 0 || !isNonNegativeSafeInteger(registration.orphanExpiresAt)) throw new TypeError("world-celld queue payload registration is invalid");
 		return await this.ctx.storage.transaction(async (txn) => {