@mcp-b/do-runtime 0.3.4 → 0.3.6

package/dist/cloudflare-workers.d.ts

@@ -0,0 +1 @@
+export * from "./src/api/cloudflare-workers.js";

package/dist/gate.js

@@ -1,54 +1,72 @@
-import { c as tryCurrentSlice, n as atCheckpointEnd } from "./chunks/io-context-BV4kxxAv.js";
+import { l as tryCurrentContinuation, r as atCheckpointEnd, u as tryCurrentIoContext } from "./chunks/io-context-RmmjNtwm.js";
 //#region src/gate.ts
-var continuationContext;
 var TRANSFORMED_AWAIT = Symbol("@mcp-b/do-runtime/transformed-await");
+/**
+* Own the gap between publishing an await result and its `__resumeAwait` call.
+* This is deliberately separate from the current-continuation ambient: a
+* reservation serializes publishers but must never make its actor look current.
+* See §2.3 and decision 8.
+*/
+var CURRENT_PUBLICATION = Symbol.for("@mcp-b/do-runtime/current-await-publication");
+var warnedUngatedAwaits = /* @__PURE__ */ new Set();
 function isThenable(value) {
 	return (typeof value === "object" && value !== null || typeof value === "function") && typeof Reflect.get(value, "then") === "function";
 }
 /** Re-enter the actor that owns this transformed await; fail open outside actors. */
 function __gate(value) {
-	const context = tryCurrentSlice() ?? continuationContext?.context;
+	const context = tryCurrentIoContext();
 	if (!isThenable(value) && context === void 0) return value;
 	if (context === void 0) return value;
 	return resumeWithContext(context, Promise.resolve(value));
 }
 /** Capture an actor await without publishing its context before the continuation runs. */
-function __gateAwait(value) {
-	const context = tryCurrentSlice() ?? continuationContext?.context;
-	if (context === void 0) return value;
+function __gateAwait(value, developmentSource) {
+	const context = tryCurrentIoContext();
+	if (context === void 0) {
+		if (developmentSource !== void 0 && !warnedUngatedAwaits.has(developmentSource)) {
+			warnedUngatedAwaits.add(developmentSource);
+			console.warn(`do-runtime: transformed await in ${developmentSource} ran without an actor input lock; an earlier await or entry path is not gated`);
+		}
+		return value;
+	}
 	return resumeAwaitWithContext(context, Promise.resolve(value));
 }
 /** Restore the captured actor at the first instruction after a transformed await. */
 function __resumeAwait(value) {
 	if (!isTransformedAwait(value)) return value;
-	restoreContinuation(value.context);
+	clearPublication(value.reservation);
+	value.context.restoreContinuation();
 	if (value.outcome.ok) return value.outcome.value;
 	throw value.outcome.exception;
 }
 function isTransformedAwait(value) {
 	return Reflect.get(Object(value), TRANSFORMED_AWAIT) === true;
 }
-function restoreContinuation(context) {
-	const token = {};
-	continuationContext = {
-		context,
-		token
-	};
-	atCheckpointEnd(() => {
-		if (continuationContext?.token === token) continuationContext = void 0;
-	});
+function currentPublication() {
+	return Reflect.get(globalThis, CURRENT_PUBLICATION);
+}
+function reservePublication(context) {
+	if (tryCurrentContinuation() !== void 0 || currentPublication() !== void 0) return void 0;
+	const reservation = { context };
+	Reflect.set(globalThis, CURRENT_PUBLICATION, reservation);
+	atCheckpointEnd(() => clearPublication(reservation));
+	return reservation;
+}
+function clearPublication(reservation) {
+	if (currentPublication() === reservation) Reflect.deleteProperty(globalThis, CURRENT_PUBLICATION);
 }
 function publishOutcome(context, promise, finish) {
 	return new Promise((resolve, reject) => {
 		const publish = context.makeTransformReentryCallback((outcome) => {
-			if (continuationContext !== void 0) {
+			const reservation = reservePublication(context);
+			if (reservation === void 0) {
 				schedulePublication({
 					publish: () => publish(outcome),
 					reject
 				});
 				return;
 			}
-			resolve(finish(outcome));
+			resolve(finish(outcome, reservation));
 		});
 		promise.then((value) => {
 			schedulePublication({
@@ -70,15 +88,17 @@ function publishOutcome(context, promise, finish) {
 	});
 }
 function resumeAwaitWithContext(context, promise) {
-	return publishOutcome(context, promise, (outcome) => ({
+	return publishOutcome(context, promise, (outcome, reservation) => ({
 		[TRANSFORMED_AWAIT]: true,
 		context,
-		outcome
+		outcome,
+		reservation
 	}));
 }
 function resumeWithContext(context, promise) {
-	return publishOutcome(context, promise, (outcome) => {
-		restoreContinuation(context);
+	return publishOutcome(context, promise, (outcome, reservation) => {
+		clearPublication(reservation);
+		context.restoreContinuation();
 		if (outcome.ok) return outcome.value;
 		throw outcome.exception;
 	});

package/dist/gate.js.map

@@ -1 +1 @@
-{"version":3,"file":"gate.js","names":[],"sources":["../src/gate.ts"],"sourcesContent":["/* @do-runtime-gated */\n\nimport { atCheckpointEnd, tryCurrentSlice, type IoContext } from \"./io/io-context\";\n\ntype ContinuationContext = {\n  readonly context: IoContext;\n  readonly token: object;\n};\n\nlet continuationContext: ContinuationContext | undefined;\n\ntype Publication = {\n  readonly publish: () => Promise<void>;\n  readonly reject: (exception: unknown) => void;\n};\n\ntype Outcome<T> =\n  | { readonly ok: true; readonly value: T }\n  | { readonly ok: false; readonly exception: unknown };\n\nconst TRANSFORMED_AWAIT = Symbol(\"@mcp-b/do-runtime/transformed-await\");\n\ntype TransformedAwait<T> = {\n  readonly [TRANSFORMED_AWAIT]: true;\n  readonly context: IoContext;\n  readonly outcome: Outcome<T>;\n};\n\nfunction isThenable(value: unknown): value is PromiseLike<unknown> {\n  return (\n    (typeof value === \"object\" && value !== null) ||\n    typeof value === \"function\"\n  ) && typeof Reflect.get(value, \"then\") === \"function\";\n}\n\n/** Re-enter the actor that owns this transformed await; fail open outside actors. */\nexport function __gate<T>(value: T): T | Promise<Awaited<T>> {\n  const context = tryCurrentSlice() ?? continuationContext?.context;\n  if (!isThenable(value) && context === undefined) return value;\n  if (context === undefined) return value;\n  return resumeWithContext(context, Promise.resolve(value));\n}\n\n/** Capture an actor await without publishing its context before the continuation runs. */\nexport function __gateAwait<T>(value: T): T | Promise<TransformedAwait<Awaited<T>>> {\n  const context = tryCurrentSlice() ?? continuationContext?.context;\n  if (context === undefined) return value;\n  return resumeAwaitWithContext(context, Promise.resolve(value));\n}\n\n/** Restore the captured actor at the first instruction after a transformed await. */\nexport function __resumeAwait<T>(value: T | TransformedAwait<T>): T {\n  if (!isTransformedAwait(value)) return value as T;\n\n  restoreContinuation(value.context);\n  if (value.outcome.ok) return value.outcome.value;\n  throw value.outcome.exception;\n}\n\nfunction isTransformedAwait<T>(value: T | TransformedAwait<T>): value is TransformedAwait<T> {\n  return Reflect.get(Object(value), TRANSFORMED_AWAIT) === true;\n}\n\nfunction restoreContinuation(context: IoContext): void {\n  const token = {};\n  continuationContext = { context, token };\n  atCheckpointEnd(() => {\n    if (continuationContext?.token === token) continuationContext = undefined;\n  });\n}\n\nfunction publishOutcome<T, Result>(\n  context: IoContext,\n  promise: Promise<T>,\n  finish: (outcome: Outcome<T>) => Result,\n): Promise<Result> {\n  return new Promise<Result>((resolve, reject) => {\n    const publish = context.makeTransformReentryCallback((outcome: Outcome<T>) => {\n      if (continuationContext !== undefined) {\n        schedulePublication({ publish: () => publish(outcome), reject });\n        return;\n      }\n      resolve(finish(outcome));\n    });\n    void promise.then(\n      (value) => {\n        schedulePublication({ publish: () => publish({ ok: true, value }), reject });\n      },\n      (exception: unknown) => {\n        schedulePublication({ publish: () => publish({ ok: false, exception }), reject });\n      },\n    );\n  });\n}\n\nfunction resumeAwaitWithContext<T>(\n  context: IoContext,\n  promise: Promise<T>,\n): Promise<TransformedAwait<T>> {\n  return publishOutcome(context, promise, (outcome) => ({\n    [TRANSFORMED_AWAIT]: true,\n    context,\n    outcome,\n  }));\n}\n\nfunction resumeWithContext<T>(context: IoContext, promise: Promise<T>): Promise<T> {\n  return publishOutcome(context, promise, (outcome) => {\n    restoreContinuation(context);\n    if (outcome.ok) return outcome.value;\n    throw outcome.exception;\n  });\n}\n\n/**\n * Resolve one transformed await per task, inside a fresh actor slice. Admission\n * attempts are independent so a blocked actor cannot stall the actor that will\n * unblock it. The task boundary keeps each continuation ambient isolated.\n */\nfunction schedulePublication(publication: Publication): void {\n  const channel = new MessageChannel();\n  channel.port1.onmessage = () => {\n    channel.port1.close();\n    channel.port2.close();\n\n    void publication.publish().catch((exception: unknown) => {\n      publication.reject(exception);\n    });\n  };\n  channel.port2.postMessage(undefined);\n}\n\nfunction iteratorFor<T>(iterable: AsyncIterable<T> | Iterable<T>): AsyncIterator<T> | Iterator<T> {\n  const subject = Object(iterable);\n  const asyncIterator: unknown = Reflect.get(subject, Symbol.asyncIterator);\n  if (typeof asyncIterator === \"function\") return Reflect.apply(asyncIterator, iterable, []);\n  const iterator: unknown = Reflect.get(subject, Symbol.iterator);\n  if (typeof iterator === \"function\") return Reflect.apply(iterator, iterable, []);\n  throw new TypeError(\"value is not async iterable or iterable\");\n}\n\nfunction gatedIterator<T>(iterable: AsyncIterable<T> | Iterable<T>): AsyncIterator<T> {\n  const iterator = iteratorFor(iterable);\n\n  function invoke(methodName: \"next\" | \"return\" | \"throw\", args: unknown[]): Promise<IteratorResult<T>> {\n    const method: unknown = Reflect.get(iterator, methodName);\n    if (typeof method === \"function\") {\n      return Promise.resolve(__gate(Reflect.apply(method, iterator, args)));\n    }\n    if (methodName === \"throw\") return Promise.reject(args[0]);\n    return Promise.resolve({ done: true, value: args[0] });\n  }\n\n  return {\n    next: (...args: [] | [unknown]) => invoke(\"next\", args),\n    return: (value?: unknown) => invoke(\"return\", [value]),\n    throw: (exception?: unknown) => invoke(\"throw\", [exception]),\n  };\n}\n\n/** Gate every operation used by `for await`, including early return and throw. */\nexport function __gateAsyncIterable<T, IterableType extends AsyncIterable<T> | Iterable<T>>(\n  iterable: IterableType,\n): IterableType;\nexport function __gateAsyncIterable<T>(\n  iterable: AsyncIterable<T> | Iterable<T>,\n): AsyncIterable<T> | Iterable<T> {\n  const wrapper: AsyncIterable<T> = {\n    [Symbol.asyncIterator]: () => gatedIterator(iterable),\n  };\n  if ((typeof iterable !== \"object\" || iterable === null) && typeof iterable !== \"function\") {\n    return wrapper;\n  }\n  return new Proxy(iterable, {\n    get(target, property, receiver): unknown {\n      if (property === Symbol.asyncIterator) return wrapper[Symbol.asyncIterator];\n      return Reflect.get(target, property, receiver);\n    },\n  });\n}\n"],"mappings":";;AASA,IAAI;AAWJ,IAAM,oBAAoB,OAAO,qCAAqC;AAQtE,SAAS,WAAW,OAA+C;CACjE,QACG,OAAO,UAAU,YAAY,UAAU,QACxC,OAAO,UAAU,eACd,OAAO,QAAQ,IAAI,OAAO,MAAM,MAAM;AAC7C;;AAGA,SAAgB,OAAU,OAAmC;CAC3D,MAAM,UAAU,gBAAgB,KAAK,qBAAqB;CAC1D,IAAI,CAAC,WAAW,KAAK,KAAK,YAAY,KAAA,GAAW,OAAO;CACxD,IAAI,YAAY,KAAA,GAAW,OAAO;CAClC,OAAO,kBAAkB,SAAS,QAAQ,QAAQ,KAAK,CAAC;AAC1D;;AAGA,SAAgB,YAAe,OAAqD;CAClF,MAAM,UAAU,gBAAgB,KAAK,qBAAqB;CAC1D,IAAI,YAAY,KAAA,GAAW,OAAO;CAClC,OAAO,uBAAuB,SAAS,QAAQ,QAAQ,KAAK,CAAC;AAC/D;;AAGA,SAAgB,cAAiB,OAAmC;CAClE,IAAI,CAAC,mBAAmB,KAAK,GAAG,OAAO;CAEvC,oBAAoB,MAAM,OAAO;CACjC,IAAI,MAAM,QAAQ,IAAI,OAAO,MAAM,QAAQ;CAC3C,MAAM,MAAM,QAAQ;AACtB;AAEA,SAAS,mBAAsB,OAA8D;CAC3F,OAAO,QAAQ,IAAI,OAAO,KAAK,GAAG,iBAAiB,MAAM;AAC3D;AAEA,SAAS,oBAAoB,SAA0B;CACrD,MAAM,QAAQ,CAAC;CACf,sBAAsB;EAAE;EAAS;CAAM;CACvC,sBAAsB;EACpB,IAAI,qBAAqB,UAAU,OAAO,sBAAsB,KAAA;CAClE,CAAC;AACH;AAEA,SAAS,eACP,SACA,SACA,QACiB;CACjB,OAAO,IAAI,SAAiB,SAAS,WAAW;EAC9C,MAAM,UAAU,QAAQ,8BAA8B,YAAwB;GAC5E,IAAI,wBAAwB,KAAA,GAAW;IACrC,oBAAoB;KAAE,eAAe,QAAQ,OAAO;KAAG;IAAO,CAAC;IAC/D;GACF;GACA,QAAQ,OAAO,OAAO,CAAC;EACzB,CAAC;EACD,QAAa,MACV,UAAU;GACT,oBAAoB;IAAE,eAAe,QAAQ;KAAE,IAAI;KAAM;IAAM,CAAC;IAAG;GAAO,CAAC;EAC7E,IACC,cAAuB;GACtB,oBAAoB;IAAE,eAAe,QAAQ;KAAE,IAAI;KAAO;IAAU,CAAC;IAAG;GAAO,CAAC;EAClF,CACF;CACF,CAAC;AACH;AAEA,SAAS,uBACP,SACA,SAC8B;CAC9B,OAAO,eAAe,SAAS,UAAU,aAAa;GACnD,oBAAoB;EACrB;EACA;CACF,EAAE;AACJ;AAEA,SAAS,kBAAqB,SAAoB,SAAiC;CACjF,OAAO,eAAe,SAAS,UAAU,YAAY;EACnD,oBAAoB,OAAO;EAC3B,IAAI,QAAQ,IAAI,OAAO,QAAQ;EAC/B,MAAM,QAAQ;CAChB,CAAC;AACH;;;;;;AAOA,SAAS,oBAAoB,aAAgC;CAC3D,MAAM,UAAU,IAAI,eAAe;CACnC,QAAQ,MAAM,kBAAkB;EAC9B,QAAQ,MAAM,MAAM;EACpB,QAAQ,MAAM,MAAM;EAEpB,YAAiB,QAAQ,CAAC,CAAC,OAAO,cAAuB;GACvD,YAAY,OAAO,SAAS;EAC9B,CAAC;CACH;CACA,QAAQ,MAAM,YAAY,KAAA,CAAS;AACrC;AAEA,SAAS,YAAe,UAA0E;CAChG,MAAM,UAAU,OAAO,QAAQ;CAC/B,MAAM,gBAAyB,QAAQ,IAAI,SAAS,OAAO,aAAa;CACxE,IAAI,OAAO,kBAAkB,YAAY,OAAO,QAAQ,MAAM,eAAe,UAAU,CAAC,CAAC;CACzF,MAAM,WAAoB,QAAQ,IAAI,SAAS,OAAO,QAAQ;CAC9D,IAAI,OAAO,aAAa,YAAY,OAAO,QAAQ,MAAM,UAAU,UAAU,CAAC,CAAC;CAC/E,MAAM,IAAI,UAAU,yCAAyC;AAC/D;AAEA,SAAS,cAAiB,UAA4D;CACpF,MAAM,WAAW,YAAY,QAAQ;CAErC,SAAS,OAAO,YAAyC,MAA6C;EACpG,MAAM,SAAkB,QAAQ,IAAI,UAAU,UAAU;EACxD,IAAI,OAAO,WAAW,YACpB,OAAO,QAAQ,QAAQ,OAAO,QAAQ,MAAM,QAAQ,UAAU,IAAI,CAAC,CAAC;EAEtE,IAAI,eAAe,SAAS,OAAO,QAAQ,OAAO,KAAK,EAAE;EACzD,OAAO,QAAQ,QAAQ;GAAE,MAAM;GAAM,OAAO,KAAK;EAAG,CAAC;CACvD;CAEA,OAAO;EACL,OAAO,GAAG,SAAyB,OAAO,QAAQ,IAAI;EACtD,SAAS,UAAoB,OAAO,UAAU,CAAC,KAAK,CAAC;EACrD,QAAQ,cAAwB,OAAO,SAAS,CAAC,SAAS,CAAC;CAC7D;AACF;AAMA,SAAgB,oBACd,UACgC;CAChC,MAAM,UAA4B,GAC/B,OAAO,sBAAsB,cAAc,QAAQ,EACtD;CACA,KAAK,OAAO,aAAa,YAAY,aAAa,SAAS,OAAO,aAAa,YAC7E,OAAO;CAET,OAAO,IAAI,MAAM,UAAU,EACzB,IAAI,QAAQ,UAAU,UAAmB;EACvC,IAAI,aAAa,OAAO,eAAe,OAAO,QAAQ,OAAO;EAC7D,OAAO,QAAQ,IAAI,QAAQ,UAAU,QAAQ;CAC/C,EACF,CAAC;AACH"}
+{"version":3,"file":"gate.js","names":[],"sources":["../src/gate.ts"],"sourcesContent":["/* @do-runtime-gated */\n\nimport {\n  atCheckpointEnd,\n  tryCurrentContinuation,\n  tryCurrentIoContext,\n  type IoContext,\n} from \"./io/io-context\";\n\ntype Publication = {\n  readonly publish: () => Promise<void>;\n  readonly reject: (exception: unknown) => void;\n};\n\ntype Outcome<T> =\n  | { readonly ok: true; readonly value: T }\n  | { readonly ok: false; readonly exception: unknown };\n\nconst TRANSFORMED_AWAIT = Symbol(\"@mcp-b/do-runtime/transformed-await\");\n/**\n * Own the gap between publishing an await result and its `__resumeAwait` call.\n * This is deliberately separate from the current-continuation ambient: a\n * reservation serializes publishers but must never make its actor look current.\n * See §2.3 and decision 8.\n */\nconst CURRENT_PUBLICATION = Symbol.for(\"@mcp-b/do-runtime/current-await-publication\");\nconst warnedUngatedAwaits = new Set<string>();\n\ntype PublicationReservation = {\n  readonly context: IoContext;\n};\n\ntype TransformedAwait<T> = {\n  readonly [TRANSFORMED_AWAIT]: true;\n  readonly context: IoContext;\n  readonly outcome: Outcome<T>;\n  readonly reservation: PublicationReservation;\n};\n\nfunction isThenable(value: unknown): value is PromiseLike<unknown> {\n  return (\n    (typeof value === \"object\" && value !== null) ||\n    typeof value === \"function\"\n  ) && typeof Reflect.get(value, \"then\") === \"function\";\n}\n\n/** Re-enter the actor that owns this transformed await; fail open outside actors. */\nexport function __gate<T>(value: T): T | Promise<Awaited<T>> {\n  const context = tryCurrentIoContext();\n  if (!isThenable(value) && context === undefined) return value;\n  if (context === undefined) return value;\n  return resumeWithContext(context, Promise.resolve(value));\n}\n\n/** Capture an actor await without publishing its context before the continuation runs. */\nexport function __gateAwait<T>(\n  value: T,\n  developmentSource?: string,\n): T | Promise<TransformedAwait<Awaited<T>>> {\n  const context = tryCurrentIoContext();\n  if (context === undefined) {\n    if (developmentSource !== undefined && !warnedUngatedAwaits.has(developmentSource)) {\n      warnedUngatedAwaits.add(developmentSource);\n      console.warn(\n        `do-runtime: transformed await in ${developmentSource} ran without an actor input lock; ` +\n          \"an earlier await or entry path is not gated\",\n      );\n    }\n    return value;\n  }\n  return resumeAwaitWithContext(context, Promise.resolve(value));\n}\n\n/** Restore the captured actor at the first instruction after a transformed await. */\nexport function __resumeAwait<T>(value: T | TransformedAwait<T>): T {\n  if (!isTransformedAwait(value)) return value as T;\n\n  clearPublication(value.reservation);\n  value.context.restoreContinuation();\n  if (value.outcome.ok) return value.outcome.value;\n  throw value.outcome.exception;\n}\n\nfunction isTransformedAwait<T>(value: T | TransformedAwait<T>): value is TransformedAwait<T> {\n  return Reflect.get(Object(value), TRANSFORMED_AWAIT) === true;\n}\n\nfunction currentPublication(): PublicationReservation | undefined {\n  return Reflect.get(globalThis, CURRENT_PUBLICATION) as PublicationReservation | undefined;\n}\n\nfunction reservePublication(context: IoContext): PublicationReservation | undefined {\n  if (tryCurrentContinuation() !== undefined || currentPublication() !== undefined) return undefined;\n  const reservation = { context };\n  Reflect.set(globalThis, CURRENT_PUBLICATION, reservation);\n  atCheckpointEnd(() => clearPublication(reservation));\n  return reservation;\n}\n\nfunction clearPublication(reservation: PublicationReservation): void {\n  if (currentPublication() === reservation) {\n    Reflect.deleteProperty(globalThis, CURRENT_PUBLICATION);\n  }\n}\n\nfunction publishOutcome<T, Result>(\n  context: IoContext,\n  promise: Promise<T>,\n  finish: (outcome: Outcome<T>, reservation: PublicationReservation) => Result,\n): Promise<Result> {\n  return new Promise<Result>((resolve, reject) => {\n    const publish = context.makeTransformReentryCallback((outcome: Outcome<T>) => {\n      const reservation = reservePublication(context);\n      if (reservation === undefined) {\n        schedulePublication({ publish: () => publish(outcome), reject });\n        return;\n      }\n      resolve(finish(outcome, reservation));\n    });\n    void promise.then(\n      (value) => {\n        schedulePublication({ publish: () => publish({ ok: true, value }), reject });\n      },\n      (exception: unknown) => {\n        schedulePublication({ publish: () => publish({ ok: false, exception }), reject });\n      },\n    );\n  });\n}\n\nfunction resumeAwaitWithContext<T>(\n  context: IoContext,\n  promise: Promise<T>,\n): Promise<TransformedAwait<T>> {\n  return publishOutcome(context, promise, (outcome, reservation) => ({\n    [TRANSFORMED_AWAIT]: true,\n    context,\n    outcome,\n    reservation,\n  }));\n}\n\nfunction resumeWithContext<T>(context: IoContext, promise: Promise<T>): Promise<T> {\n  return publishOutcome(context, promise, (outcome, reservation) => {\n    clearPublication(reservation);\n    context.restoreContinuation();\n    if (outcome.ok) return outcome.value;\n    throw outcome.exception;\n  });\n}\n\n/**\n * Resolve one transformed await per task, inside a fresh actor slice. Admission\n * attempts are independent so a blocked actor cannot stall the actor that will\n * unblock it. The task boundary keeps each continuation ambient isolated.\n */\nfunction schedulePublication(publication: Publication): void {\n  const channel = new MessageChannel();\n  channel.port1.onmessage = () => {\n    channel.port1.close();\n    channel.port2.close();\n\n    void publication.publish().catch((exception: unknown) => {\n      publication.reject(exception);\n    });\n  };\n  channel.port2.postMessage(undefined);\n}\n\nfunction iteratorFor<T>(iterable: AsyncIterable<T> | Iterable<T>): AsyncIterator<T> | Iterator<T> {\n  const subject = Object(iterable);\n  const asyncIterator: unknown = Reflect.get(subject, Symbol.asyncIterator);\n  if (typeof asyncIterator === \"function\") return Reflect.apply(asyncIterator, iterable, []);\n  const iterator: unknown = Reflect.get(subject, Symbol.iterator);\n  if (typeof iterator === \"function\") return Reflect.apply(iterator, iterable, []);\n  throw new TypeError(\"value is not async iterable or iterable\");\n}\n\nfunction gatedIterator<T>(iterable: AsyncIterable<T> | Iterable<T>): AsyncIterator<T> {\n  const iterator = iteratorFor(iterable);\n\n  function invoke(methodName: \"next\" | \"return\" | \"throw\", args: unknown[]): Promise<IteratorResult<T>> {\n    const method: unknown = Reflect.get(iterator, methodName);\n    if (typeof method === \"function\") {\n      return Promise.resolve(__gate(Reflect.apply(method, iterator, args)));\n    }\n    if (methodName === \"throw\") return Promise.reject(args[0]);\n    return Promise.resolve({ done: true, value: args[0] });\n  }\n\n  return {\n    next: (...args: [] | [unknown]) => invoke(\"next\", args),\n    return: (value?: unknown) => invoke(\"return\", [value]),\n    throw: (exception?: unknown) => invoke(\"throw\", [exception]),\n  };\n}\n\n/** Gate every operation used by `for await`, including early return and throw. */\nexport function __gateAsyncIterable<T, IterableType extends AsyncIterable<T> | Iterable<T>>(\n  iterable: IterableType,\n): IterableType;\nexport function __gateAsyncIterable<T>(\n  iterable: AsyncIterable<T> | Iterable<T>,\n): AsyncIterable<T> | Iterable<T> {\n  const wrapper: AsyncIterable<T> = {\n    [Symbol.asyncIterator]: () => gatedIterator(iterable),\n  };\n  if ((typeof iterable !== \"object\" || iterable === null) && typeof iterable !== \"function\") {\n    return wrapper;\n  }\n  return new Proxy(iterable, {\n    get(target, property, receiver): unknown {\n      if (property === Symbol.asyncIterator) return wrapper[Symbol.asyncIterator];\n      return Reflect.get(target, property, receiver);\n    },\n  });\n}\n"],"mappings":"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"}

package/dist/index.js

@@ -1,4 +1,4 @@
-import { a as isExceptionFromInputGateBroken, c as tryCurrentSlice, i as hasUserErrorDetail, l as InputGate, n as atCheckpointEnd, o as requireInputLock, r as captureGateStack, s as setUserErrorDetail, t as IoContext, u as OutputGate } from "./chunks/io-context-BV4kxxAv.js";
+import { a as hasUserErrorDetail, c as setUserErrorDetail, d as tryCurrentSlice, f as CanceledError, i as captureGateStack, m as OutputGate, n as IoContext, o as isExceptionFromInputGateBroken, p as InputGate, r as atCheckpointEnd, s as requireInputLock, t as BrokenActorError, u as tryCurrentIoContext } from "./chunks/io-context-RmmjNtwm.js";
 import { RpcTarget as RpcTarget$1 } from "./cloudflare-workers.js";
 import { a as getInt64, c as isNull, i as getBlob, o as getText, r as SqliteDatabase, s as hasCurrentSqliteTable } from "./chunks/sqlite-DFg92Tgt.js";
 import { ALARM_RETRY_MAX_TRIES, ALARM_RETRY_START_SECONDS, AlarmScheduler, RETRY_BACKOFF_MAX, RETRY_JITTER_FACTOR, alarmRetryDelayMs } from "./server/alarm-scheduler.js";
@@ -1366,70 +1366,6 @@ function asRawRow(values) {
 	return values;
 }
 //#endregion
-//#region src/api/sync-kv.ts
-var SyncKvStorage = class {
-	#ctx;
-	#owner;
-	constructor(ctx, owner) {
-		this.#ctx = ctx;
-		this.#owner = owner;
-	}
-	get(key) {
-		requireInputLock(this.#ctx, "kv.get()");
-		const value = this.#owner.getSqliteKv().get(key);
-		if (value === void 0) return void 0;
-		return deserializeValue(key, value);
-	}
-	/**
-	* ← `SyncKvStorage::list`, which reuses `compileListOptions` — "This is public
-	* so that SyncKvStorage can reuse it."
-	*/
-	list(options) {
-		requireInputLock(this.#ctx, "kv.list()");
-		const compiled = compileListOptions(options);
-		if (compiled === void 0) return { [Symbol.iterator]: () => emptyIterator() };
-		const cursor = this.#owner.getSqliteKv().list(compiled.start, compiled.end, compiled.limit, compiled.reverse ? "REVERSE" : "FORWARD");
-		return { [Symbol.iterator]: () => listIterator(cursor) };
-	}
-	put(key, value) {
-		requireInputLock(this.#ctx, "kv.put()");
-		this.#owner.getSqliteKv().put(key, serializeValue(key, value));
-	}
-	delete(key) {
-		requireInputLock(this.#ctx, "kv.delete()");
-		return this.#owner.getSqliteKv().delete(key);
-	}
-};
-/** ← `SyncKvStorage::listNext`, whose cancellation branch is the reason it is not a plain loop. */
-function listIterator(cursor) {
-	const iterator = {
-		[Symbol.iterator]: () => iterator,
-		next: () => {
-			const pair = cursor.next();
-			if (pair !== void 0) return {
-				done: false,
-				value: [pair.key, deserializeValue(pair.key, pair.value)]
-			};
-			if (cursor.wasCanceled()) throw new Error("kv.list() iterator was invalidated because a new call to kv.list() was started. Only one kv.list() iterator can exist at a time.");
-			return {
-				done: true,
-				value: void 0
-			};
-		}
-	};
-	return iterator;
-}
-function emptyIterator() {
-	const iterator = {
-		[Symbol.iterator]: () => iterator,
-		next: () => ({
-			done: true,
-			value: void 0
-		})
-	};
-	return iterator;
-}
-//#endregion
 //#region src/api/actor-state.ts
 /**
 * ← workerd `src/workerd/api/actor-state.{h,c++}`
@@ -1441,8 +1377,8 @@ function emptyIterator() {
 * **`DurableObjectStorage` satisfies workers-types with no cast (§2.4).** That
 * was checked rather than asserted, and two shapes here exist only because it
 * has to: `sql.Cursor` and `sql.Statement` must be constructible with no
-* arguments (see `sql.ts`), and `storage.kv` is required, which is why
-* `api/sync-kv.ts` exists at all. The narrowings that remain are all one thing —
+* arguments (see `sql.ts`), and `storage.kv` is required. The narrowings that
+* remain are all one thing —
 * `get<T>` returns the caller's claim about the shape of a value SQLite handed
 * back as bytes, which no check can confirm and which upstream states the same
 * way, as a `jsg::JsRef<jsg::JsValue>` behind a `JSG_TS_OVERRIDE`'d
@@ -1452,8 +1388,7 @@ function emptyIterator() {
 * That is upstream's: a `JSG_REQUIRE` inside a method returning `jsg::Promise`
 * throws into the isolate before the promise exists, so `put(k, undefined)`
 * throws rather than rejecting. The same goes for a value that will not decode,
-* because §1.4 makes the SQLite path take `transformCacheResult`'s value arm and
-* run the decoder synchronously.
+* because §1.4 makes the SQLite path run the decoder before `Promise.resolve`.
 *
 * **What the input gate does and does not do here.** Every entry point calls
 * `requireInputLock` — see its comment in `io/io-context.ts`, which is the one
@@ -1465,13 +1400,10 @@ function emptyIterator() {
 * section.
 *
 * **Decision 2's branch has one reachable site**, and it is not where upstream's
-* is. `transformCacheResult` branches on `allowConcurrency` because upstream's
-* `ActorCacheOps` returns `kj::OneOf<T, kj::Promise<T>>`; §1.4 measures that the
-* SQLite arm is always the immediate one, so Section 4 collapsed the `OneOf` and
-* the branch has nothing to select between. `transformMaybeBackpressure` keeps
-* it, because `DeleteAllResults.backpressure` is still a promise in
-* `io/actor-cache.ts`. Both helpers are kept under upstream's names so the
-* question "where did `allowConcurrency` go" is answered by reading them.
+* is. §1.4 measures that SQLite cache operations are immediate, so their
+* `kj::OneOf<T, kj::Promise<T>>` branch has nothing to select between.
+* `transformMaybeBackpressure` keeps the branch because
+* `DeleteAllResults.backpressure` is still a promise in `io/actor-cache.ts`.
 *
 * Not ported, because the substrate has no equivalent: Hibernatable WebSockets,
 * which is the whole reason `DurableObjectState`'s eight WebSocket methods are
@@ -1546,7 +1478,7 @@ var VALUE_CODEC_HEADER = new Uint8Array([
 * The short header keeps the new representation unambiguous while old JSON rows
 * remain readable.
 */
-function serializeValue(_key, value) {
+function serializeValue(value) {
 	const body = textEncoder.encode(JSON.stringify(serialize(value)));
 	const encoded = new Uint8Array(VALUE_CODEC_HEADER.byteLength + body.byteLength);
 	encoded.set(VALUE_CODEC_HEADER);
@@ -1573,26 +1505,6 @@ function deserializeValue(key, buffer) {
 		throw new Error(`actor storage deserialization failed: failed to deserialize stored value; key = ${key}; size = ${buffer.byteLength}`, { cause: exception });
 	}
 }
-/** ← `deserializeMaybeV8Value`. */
-function deserializeMaybeValue(key, buffer) {
-	return buffer === void 0 ? void 0 : deserializeValue(key, buffer);
-}
-/**
-* ← `transformCacheResult` and `transformCacheResultWithCacheStatus`
-* (`actor-state.c++:49-101`), with the arm that cannot happen removed.
-*
-* Upstream's body is a two-arm switch on `kj::OneOf<T, kj::Promise<T>>`, and the
-* `allowConcurrency` branch lives in the promise arm. §1.4 measures that a
-* SQLite-backed actor returns the immediate arm at every call site, so Section 4
-* collapsed the `OneOf` to `T` and there is no promise left to await — and
-* therefore no gate decision to make. The name is kept so a reader comparing the
-* two files finds the answer here rather than inferring an omission. The
-* `WithCacheStatus` variant differs only in a `cached` flag feeding billing
-* counters that have no port, so the two collapse to one function.
-*/
-function transformCacheResult(value, func) {
-	return Promise.resolve(func(value));
-}
 /**
 * ← `transformMaybeBackpressure` (`actor-state.c++:103-119`). THIS is decision
 * 2's live site: `DeleteAllResults.backpressure` is still `Promise<void> |
@@ -1611,8 +1523,8 @@ function transformMaybeBackpressure(ctx, options, maybeBackpressure) {
 /**
 * ← `DurableObjectStorageOperations::compileListOptions`
 * (`actor-state.c++:314-417`). Returns undefined if the list operation would
-* provably return no results. Public because `SyncKvStorage` reuses it, exactly
-* as upstream's comment says it must.
+* provably return no results. `SyncKvStorage` reuses it, exactly as upstream's
+* comment says it must.
 *
 * Two translations. `startAfter` gains ONE null character where upstream's
 * `kj::String` gains two, because the second of upstream's is the terminator and
@@ -1671,6 +1583,51 @@ function firstKeyAfterPrefix(prefix) {
 	return head.slice(0, -1) + String.fromCharCode(head.charCodeAt(head.length - 1) + 1);
 }
 /**
+* ← workerd `src/workerd/api/sync-kv.{h,c++}`. The synchronous surface lives
+* beside the asynchronous storage owner because both share the same codec and
+* list-option compiler over one `SqliteKv`.
+*/
+var SyncKvStorage = class {
+	#ctx;
+	#kv;
+	constructor(ctx, kv) {
+		this.#ctx = ctx;
+		this.#kv = kv;
+	}
+	get(key) {
+		requireInputLock(this.#ctx, "kv.get()");
+		const value = this.#kv.get(key);
+		if (value === void 0) return void 0;
+		return deserializeValue(key, value);
+	}
+	list(options) {
+		requireInputLock(this.#ctx, "kv.list()");
+		const compiled = compileListOptions(options);
+		if (compiled === void 0) return [];
+		return listIterator(this.#kv.list(compiled.start, compiled.end, compiled.limit, compiled.reverse ? "REVERSE" : "FORWARD"));
+	}
+	put(key, value) {
+		requireInputLock(this.#ctx, "kv.put()");
+		this.#kv.put(key, serializeValue(value));
+	}
+	delete(key) {
+		requireInputLock(this.#ctx, "kv.delete()");
+		return this.#kv.delete(key);
+	}
+};
+/** ← `SyncKvStorage::listNext`, whose cancellation branch is the reason it is not a plain loop. */
+function* listIterator(cursor) {
+	for (;;) {
+		const pair = cursor.next();
+		if (pair !== void 0) {
+			yield [pair.key, deserializeValue(pair.key, pair.value)];
+			continue;
+		}
+		if (cursor.wasCanceled()) throw new Error("kv.list() iterator was invalidated because a new call to kv.list() was started. Only one kv.list() iterator can exist at a time.");
+		return;
+	}
+}
+/**
 * ← `DurableObjectStorageOperations`. "Common implementation of
 * DurableObjectStorage and DurableObjectTransaction. This class is designed to
 * be used as a mixin."
@@ -1680,88 +1637,74 @@ var DurableObjectStorageOperations = class {
 	constructor(ctx) {
 		this.ctx = ctx;
 	}
-	/** Whether to skip caching and allow concurrency on all operations. */
-	useDirectIo() {
-		return false;
-	}
-	/**
-	* ← `configureOptions`. Both subclasses answer `useDirectIo()` false, so this
-	* is the identity today; it is upstream's hook and the only place the two
-	* flags are forced on.
-	*/
-	configureOptions(options) {
-		if (!this.useDirectIo()) return options;
-		return {
-			...options,
-			allowConcurrency: true,
-			noCache: true
-		};
-	}
 	get(keyOrKeys, maybeOptions) {
 		requireInputLock(this.ctx, OP_GET);
-		const options = this.configureOptions({ ...maybeOptions });
+		const options = { ...maybeOptions };
 		if (typeof keyOrKeys === "string") return this.#getOne(keyOrKeys, options);
 		return this.#getMultiple(keyOrKeys, options);
 	}
 	getAlarm(maybeOptions) {
 		requireInputLock(this.ctx, OP_GET_ALARM);
-		const options = this.configureOptions({
+		const options = {
 			...maybeOptions,
 			noCache: false
-		});
-		return transformCacheResult(this.getCache(OP_GET_ALARM).getAlarm(options), (date) => date);
+		};
+		return Promise.resolve(this.getCache(OP_GET_ALARM).getAlarm(options));
 	}
 	list(maybeOptions) {
 		requireInputLock(this.ctx, OP_LIST);
 		const compiled = compileListOptions(maybeOptions);
 		if (compiled === void 0) return Promise.resolve(/* @__PURE__ */ new Map());
-		const options = this.configureOptions({ ...maybeOptions });
+		const options = { ...maybeOptions };
 		const cache = this.getCache(OP_LIST);
-		return transformCacheResult(compiled.reverse ? cache.listReverse(compiled.start, compiled.end, compiled.limit, options) : cache.list(compiled.start, compiled.end, compiled.limit, options), (rows) => listResultsToMap(rows));
+		const result = compiled.reverse ? cache.listReverse(compiled.start, compiled.end, compiled.limit, options) : cache.list(compiled.start, compiled.end, compiled.limit, options);
+		return Promise.resolve(listResultsToMap(result));
 	}
 	put(keyOrEntries, valueOrOptions, maybeOptions) {
 		requireInputLock(this.ctx, OP_PUT);
 		if (typeof keyOrEntries === "string") {
 			if (valueOrOptions === void 0) throw new TypeError("put() called with undefined value.");
-			return this.#putOne(keyOrEntries, valueOrOptions, this.configureOptions({ ...maybeOptions }));
+			return this.#putOne(keyOrEntries, valueOrOptions, { ...maybeOptions });
 		}
-		return this.#putMultiple(keyOrEntries, this.configureOptions({ ...valueOrOptions }));
+		return this.#putMultiple(keyOrEntries, { ...valueOrOptions });
 	}
 	delete(keyOrKeys, maybeOptions) {
 		requireInputLock(this.ctx, OP_DELETE);
-		const options = this.configureOptions({ ...maybeOptions });
-		if (typeof keyOrKeys === "string") return transformCacheResult(this.getCache(OP_DELETE).delete(keyOrKeys, options), (deleted) => deleted);
-		return transformCacheResult(this.getCache(OP_DELETE).deleteMultiple(keyOrKeys, options), (count) => count);
+		const options = { ...maybeOptions };
+		if (typeof keyOrKeys === "string") return Promise.resolve(this.getCache(OP_DELETE).delete(keyOrKeys, options));
+		return Promise.resolve(this.getCache(OP_DELETE).deleteMultiple(keyOrKeys, options));
 	}
 	setAlarm(scheduledTime, maybeOptions) {
 		requireInputLock(this.ctx, OP_PUT_ALARM);
 		const when = scheduledTime instanceof Date ? scheduledTime.getTime() : scheduledTime;
 		if (!(when > 0)) throw new TypeError("setAlarm() cannot be called with an alarm time <= 0");
 		this.ctx.getActorOrThrow().assertCanSetAlarm();
-		const options = this.configureOptions({
+		const options = {
 			...maybeOptions,
 			noCache: false
-		});
+		};
 		this.getCache(OP_PUT_ALARM).setAlarm(Math.max(when, this.ctx.now()), options);
 		return Promise.resolve();
 	}
 	deleteAlarm(maybeOptions) {
 		requireInputLock(this.ctx, OP_DELETE_ALARM);
-		const options = this.configureOptions({
+		const options = {
 			...maybeOptions,
 			noCache: false
-		});
+		};
 		this.getCache(OP_DELETE_ALARM).setAlarm(null, options);
 		return Promise.resolve();
 	}
 	#getOne(key, options) {
-		return transformCacheResult(this.getCache(OP_GET).get(key, options), (bytes) => deserializeMaybeValue(key, bytes));
+		const value = this.getCache(OP_GET).get(key, options);
+		return Promise.resolve(value === void 0 ? void 0 : deserializeValue(key, value));
 	}
 	#getMultiple(keys, options) {
-		return transformCacheResult(this.getCache(OP_GET).getMultiple(keys, options), (rows) => listResultsToMap(rows));
+		const result = this.getCache(OP_GET).getMultiple(keys, options);
+		return Promise.resolve(listResultsToMap(result));
 	}
 	#putOne(key, value, options) {
-		this.getCache(OP_PUT).put(key, serializeValue(key, value), options);
+		this.getCache(OP_PUT).put(key, serializeValue(value), options);
 		return Promise.resolve();
 	}
 	#putMultiple(entries, options) {
@@ -1770,7 +1713,7 @@ var DurableObjectStorageOperations = class {
 			if (value === void 0) continue;
 			pairs.push({
 				key,
-				value: serializeValue(key, value)
+				value: serializeValue(value)
 			});
 		}
 		this.getCache(OP_PUT).putMultiple(pairs, options);
@@ -1799,10 +1742,6 @@ var DurableObjectStorage = class extends DurableObjectStorageOperations {
 	getSqliteDb() {
 		return this.#cache.getSqliteDatabase();
 	}
-	/** ← `DurableObjectStorage::getSqliteKv`. */
-	getSqliteKv() {
-		return this.#cache.getSqliteKv();
-	}
 	getCache() {
 		return this.#cache;
 	}
@@ -1813,7 +1752,7 @@ var DurableObjectStorage = class extends DurableObjectStorageOperations {
 	}
 	/** ← `JSG_LAZY_INSTANCE_PROPERTY(kv, getKv)`. */
 	get kv() {
-		this.#kv ??= new SyncKvStorage(this.ctx, this);
+		this.#kv ??= new SyncKvStorage(this.ctx, this.#cache.getSqliteKv());
 		return this.#kv;
 	}
 	/**
@@ -1825,7 +1764,7 @@ var DurableObjectStorage = class extends DurableObjectStorageOperations {
 	*/
 	deleteAll(maybeOptions) {
 		requireInputLock(this.ctx, "deleteAll()");
-		const options = this.configureOptions({ ...maybeOptions });
+		const options = { ...maybeOptions };
 		const result = this.#cache.deleteAll(options, { deleteAlarm: true });
 		return transformMaybeBackpressure(this.ctx, options, result.backpressure);
 	}
@@ -2140,7 +2079,7 @@ var DurableObjectState = class {
 	* gated slice.
 	*/
 	blockConcurrencyWhile(callback) {
-		return this.#ctx.blockConcurrencyWhile(() => callback());
+		return this.#ctx.blockConcurrencyWhile(callback);
 	}
 	/**
 	* ← `DurableObjectState::abort`. Reset the object, including breaking the
@@ -2490,7 +2429,7 @@ function gateReader(ctx, reader) {
 * "wrap it in awaitIo" would be wrong three ways:
 *
 *  - **Timers** capture the critical section at the ARMING call and re-enter
-*    through `ctx.run(callback, cs)` when they fire. Not `awaitIo`, deliberately
+*    through `ctx.run(callback, { input: cs })` when they fire. Not `awaitIo`, deliberately
 *    — see `TimeoutManager` in `io/io-context.ts` for upstream's own reason.
 *  - **`fetch`** is `awaitIo` (`http.c++` has ten of them and zero
 *    `awaitIoWithInputLock`), preceded by an output-gate wait so nothing departs
@@ -2996,7 +2935,7 @@ var AcceptedWebSocket = class extends EventTarget {
 			this.dispatchEvent(delivered);
 			const handler = this[`on${type}`];
 			handler?.(delivered);
-		}, this.#criticalSection));
+		}, { input: this.#criticalSection }));
 	}
 	/**
 	* ← `WebSocket::send` (`web-socket.c++:~640`), which inserts a
@@ -5662,6 +5601,15 @@ var ActorContainerImpl = class {
 	hasCurrent() {
 		return this.#ctx.hasCurrent();
 	}
+	resolveLoopback(invokeDirect, invokeEntry, caller) {
+		const context = tryCurrentIoContext();
+		if (context === this.#ctx) return invokeDirect();
+		if (context !== void 0) return context.awaitIo(context.waitForOutputLocks().then(invokeEntry));
+		if (caller === void 0) return invokeEntry();
+		if (!caller.hasCurrent()) throw new Error("resolveLoopback() caller has no current input lock");
+		if (caller === this) return invokeDirect();
+		return caller.awaitIo(caller.waitOutputLocks().then(invokeEntry));
+	}
 	/**
 	* ← `ActorContainer::start` (`server.c++:2854-2957`) as far as the class
 	* instance, plus decision 4's boot semantics.
@@ -5688,7 +5636,7 @@ var ActorContainerImpl = class {
 			throw exception;
 		}
 	}
-	entry(target) {
+	entry(target, signal) {
 		const bound = /* @__PURE__ */ new Map();
 		return new Proxy(target, { get: (subject, property) => {
 			const value = Reflect.get(subject, property, subject);
@@ -5697,7 +5645,7 @@ var ActorContainerImpl = class {
 			if (cached !== void 0) return cached;
 			const gated = async (...args) => {
 				this.#ctx.noteGateUse(`entry ${String(property)}()`, captureGateStack());
-				const result = await this.#ctx.run(() => this.#withExternalEntry(() => value.apply(subject, args)));
+				const result = await this.#ctx.run(() => this.#withExternalEntry(() => value.apply(subject, args)), { signal });
 				await this.#ctx.waitForOutputLocks();
 				return result;
 			};
@@ -5733,8 +5681,8 @@ var ActorContainerImpl = class {
 			return callback;
 		} });
 	}
-	run(event) {
-		return this.#ctx.run(() => this.#withExternalEntry(event));
+	run(event, signal) {
+		return this.#ctx.run(() => this.#withExternalEntry(event), { signal });
 	}
 	#withExternalEntry(body) {
 		const previous = this.#currentExternalEntry;
@@ -5756,7 +5704,7 @@ var ActorContainerImpl = class {
 	*
 	* "Alarms enter with no lock and no critical section, so an alarm queues behind
 	* any held lock and takes a fresh top-level lock" (§1.8) — which is exactly
-	* `ctx.run(func)` with no third argument. The retry ladder and the watchdog are
+	* `ctx.run(func)` with no input option. The retry ladder and the watchdog are
 	* `server/alarm-scheduler.ts`'s; what is here is one delivery, and the
 	* serialization of one delivery against the next, which is the property
 	* `_cf_executingScheduleRowId` upstream depends on.
@@ -5934,6 +5882,6 @@ function newRpcSession(port, localMain) {
 	return newMessagePortRpcSession(port, localMain);
 }
 //#endregion
-export { ACTOR_CLASS_SERIALIZATION_UNIMPLEMENTED_MESSAGE, ALARM_RETRY_MAX_TRIES, ALARM_RETRY_START_SECONDS, ALLOW_EXPERIMENTAL_MESSAGE, ALREADY_ACCEPTED_MESSAGE, AlarmInvocationInfo, AlarmScheduler, BYOB_READER_UNGATABLE_MESSAGE, DEAD_LOAD_CONTEXT_MESSAGE, DEFAULT_ALARM_OUTLET, FACET_ALARM_UNIMPLEMENTED_MESSAGE, FACET_NAME_MAX_LENGTH, FACET_TREE_MAX_DEPTH, FOREIGN_SLICE_MESSAGE, HIBERNATION_UNIMPLEMENTED_MESSAGE, LoopbackDurableObjectClass, NOT_BYTES_MESSAGE, NO_GLOBAL_OUTBOUND_MESSAGE, NO_MODULES_MESSAGE, PITR_UNIMPLEMENTED_MESSAGE, REPLICATION_UNIMPLEMENTED_MESSAGE, RETRY_BACKOFF_MAX, RETRY_JITTER_FACTOR, STREAMING_TAILS_EXPERIMENTAL_MESSAGE, WorkerLoader, WorkerStub, actorScopeBindings, alarmRetryDelayMs, asLoopbackDurableObjectClass, createActorContainer, createDurableObjectNamespace, gateRequestBody, installActorScope, jsModuleInPythonWorkerMessage, moduleFieldCountMessage, moduleNameMessage, newRpcSession, noFacets, notSerializableMessage, pythonModuleInJsWorkerMessage, typeScriptModuleNameMessage };
+export { ACTOR_CLASS_SERIALIZATION_UNIMPLEMENTED_MESSAGE, ALARM_RETRY_MAX_TRIES, ALARM_RETRY_START_SECONDS, ALLOW_EXPERIMENTAL_MESSAGE, ALREADY_ACCEPTED_MESSAGE, AlarmInvocationInfo, AlarmScheduler, BYOB_READER_UNGATABLE_MESSAGE, BrokenActorError, CanceledError, DEAD_LOAD_CONTEXT_MESSAGE, DEFAULT_ALARM_OUTLET, FACET_ALARM_UNIMPLEMENTED_MESSAGE, FACET_NAME_MAX_LENGTH, FACET_TREE_MAX_DEPTH, FOREIGN_SLICE_MESSAGE, HIBERNATION_UNIMPLEMENTED_MESSAGE, LoopbackDurableObjectClass, NOT_BYTES_MESSAGE, NO_GLOBAL_OUTBOUND_MESSAGE, NO_MODULES_MESSAGE, PITR_UNIMPLEMENTED_MESSAGE, REPLICATION_UNIMPLEMENTED_MESSAGE, RETRY_BACKOFF_MAX, RETRY_JITTER_FACTOR, STREAMING_TAILS_EXPERIMENTAL_MESSAGE, WorkerLoader, WorkerStub, actorScopeBindings, alarmRetryDelayMs, asLoopbackDurableObjectClass, createActorContainer, createDurableObjectNamespace, gateRequestBody, installActorScope, jsModuleInPythonWorkerMessage, moduleFieldCountMessage, moduleNameMessage, newRpcSession, noFacets, notSerializableMessage, pythonModuleInJsWorkerMessage, typeScriptModuleNameMessage };
 
 //# sourceMappingURL=index.js.map