rivetkit 2.3.11-rc.8 → 2.3.11

package/dist/tsup/mod.js

@@ -1,18 +1,22 @@
 import {
   decodeWorkflowHistoryTransport
-} from "./chunk-4EDGOGCB.js";
+} from "./chunk-QFJ24MBU.js";
 import {
   ACTOR_CONTEXT_INTERNAL_SYMBOL,
   ActorConfigSchema,
   CONN_STATE_MANAGER_SYMBOL,
   RAW_STATE_SYMBOL,
+  createRunInspector,
+  defineRunHandler,
   disposeRunInspector,
   flattenActionHandlers,
   flattenActionInputSchemas,
   getRunFunction,
   getRunInspectorConfig,
-  getRunMetadata
-} from "./chunk-QWLJCP3X.js";
+  getRunInspectorKind,
+  getRunMetadata,
+  hasRunInspectorConfig
+} from "./chunk-6W5VGLFT.js";
 import {
   ALLOWED_PUBLIC_HEADERS,
   HEADER_CONN_PARAMS,
@@ -23,13 +27,18 @@ import {
   isResponseLike,
   tryParseEndpoint,
   updateRunnerConfig
-} from "./chunk-JBQ63WSM.js";
+} from "./chunk-3ZR542SK.js";
 import {
   makePrefixedKey,
   removePrefixFromKey
 } from "./chunk-JI6GZ2C2.js";
-import "./chunk-7AFZMFPQ.js";
-import "./chunk-V6ANE6JM.js";
+import {
+  bindNativeStateTransactionContext,
+  db,
+  registerNativeStateTransactionOpener
+} from "./chunk-6WYATRS4.js";
+import "./chunk-JTHHCZCZ.js";
+import "./chunk-FWROC5LA.js";
 import {
   LogLevelSchema,
   VERSION,
@@ -62,7 +71,7 @@ import {
   parsePortEnv,
   stringifyError,
   toUint8Array
-} from "./chunk-AGNBLCNJ.js";
+} from "./chunk-OUENKQHB.js";
 import {
   INTERNAL_ERROR_CODE,
   RivetError,
@@ -1193,11 +1202,33 @@ function wrapJsNativeDatabase(database) {
         release();
       }
     },
-    async beginTransaction(timeoutMs) {
+    async beginTransaction(timeoutMs, name) {
+      const release = gate.enter();
+      let transaction;
+      try {
+        transaction = await database.beginTransaction(timeoutMs, name);
+      } catch (error) {
+        enrichNativeDatabaseError(database, error);
+      } finally {
+        release();
+      }
+      return wrapTransaction(database, transaction, gate, (result) => {
+        if (result.lastInsertRowId !== void 0) {
+          lastInsertRowId = result.lastInsertRowId;
+        }
+      });
+    },
+    async beginStateTransaction(timeoutMs, context) {
+      if (!database.beginStateTransaction) {
+        throw new Error("actor state transactions are not configured");
+      }
       const release = gate.enter();
       let transaction;
       try {
-        transaction = await database.beginTransaction(timeoutMs);
+        transaction = await database.beginStateTransaction(
+          timeoutMs,
+          context
+        );
       } catch (error) {
         enrichNativeDatabaseError(database, error);
       } finally {
@@ -1307,45 +1338,37 @@ var nodeChildProcess;
 var nodeStream;
 var nodeUrl;
 var hasImportedDependencies = false;
-function getRequireFn() {
-  return createRequire(import.meta.url);
+var fallbackRequire;
+function loadNodeBuiltin(id) {
+  var _a;
+  const nodeProcess = globalThis.process;
+  const builtin = (_a = nodeProcess == null ? void 0 : nodeProcess.getBuiltinModule) == null ? void 0 : _a.call(nodeProcess, id);
+  if (builtin !== void 0) {
+    return builtin;
+  }
+  if (!(nodeProcess == null ? void 0 : nodeProcess.execPath)) {
+    throw new Error("Node.js built-ins are not available");
+  }
+  fallbackRequire ??= createRequire(nodeProcess.execPath);
+  return fallbackRequire(id);
 }
 function importNodeDependencies() {
   if (hasImportedDependencies) return;
   try {
-    const requireFn = getRequireFn();
-    nodeCrypto = requireFn(
-      /* webpackIgnore: true */
-      "node:crypto"
-    );
-    nodeFsSync = requireFn(
-      /* webpackIgnore: true */
-      "node:fs"
-    );
-    nodeFs = requireFn(
-      /* webpackIgnore: true */
+    nodeCrypto = loadNodeBuiltin("node:crypto");
+    nodeFsSync = loadNodeBuiltin("node:fs");
+    nodeFs = loadNodeBuiltin(
       "node:fs/promises"
     );
-    nodePath = requireFn(
-      /* webpackIgnore: true */
-      "node:path"
-    );
-    nodeOs = requireFn(
-      /* webpackIgnore: true */
-      "node:os"
-    );
-    nodeChildProcess = requireFn(
-      /* webpackIgnore: true */
+    nodePath = loadNodeBuiltin("node:path");
+    nodeOs = loadNodeBuiltin("node:os");
+    nodeChildProcess = loadNodeBuiltin(
       "node:child_process"
     );
-    nodeStream = requireFn(
-      /* webpackIgnore: true */
+    nodeStream = loadNodeBuiltin(
       "node:stream/promises"
     );
-    nodeUrl = requireFn(
-      /* webpackIgnore: true */
-      "node:url"
-    );
+    nodeUrl = loadNodeBuiltin("node:url");
     hasImportedDependencies = true;
   } catch (err) {
     console.warn(
@@ -1396,6 +1419,9 @@ function asNativeWebSocket(handle) {
 function asNativeSqlTransaction(handle) {
   return handle;
 }
+function asNativeActorStateTransaction(handle) {
+  return handle;
+}
 function asNativeCancellationToken(handle) {
   return handle;
 }
@@ -1619,6 +1645,9 @@ var NapiCoreRuntime = class {
   actorSetAlarm(ctx, timestampMs) {
     asNativeActorContext(ctx).setAlarm(timestampMs);
   }
+  async actorSetRunWakeAt(ctx, timestampMs) {
+    await asNativeActorContext(ctx).setRunWakeAt(timestampMs);
+  }
   actorRequestSave(ctx, opts) {
     asNativeActorContext(ctx).requestSave(opts);
   }
@@ -1779,9 +1808,10 @@ var NapiCoreRuntime = class {
     );
     return results.map(normalizeRuntimeSqlExecuteResult);
   }
-  async actorSqlBeginTransaction(ctx, timeoutMs) {
+  async actorSqlBeginTransaction(ctx, timeoutMs, name) {
     return await this.#actorSql(ctx).beginTransaction(
-      timeoutMs
+      timeoutMs,
+      name
     );
   }
   async actorSqlTransactionExec(transaction, sql) {
@@ -1800,6 +1830,26 @@ var NapiCoreRuntime = class {
   async actorSqlTransactionRollback(transaction) {
     await asNativeSqlTransaction(transaction).rollback();
   }
+  async actorBeginStateTransaction(ctx, timeoutMs) {
+    return await asNativeActorContext(ctx).beginStateTransaction(
+      timeoutMs
+    );
+  }
+  async actorStateTransactionExecute(transaction, sql, params) {
+    const result = await asNativeActorStateTransaction(transaction).execute(
+      sql,
+      toNapiSqlBindParams(params)
+    );
+    return normalizeRuntimeSqlExecuteResult(result);
+  }
+  async actorStateTransactionCommit(transaction, payload) {
+    await asNativeActorStateTransaction(transaction).commit(
+      toNapiStateDeltaPayload(payload)
+    );
+  }
+  async actorStateTransactionRollback(transaction) {
+    await asNativeActorStateTransaction(transaction).rollback();
+  }
   async actorSqlQuery(ctx, sql, params) {
     return await this.#actorSql(ctx).query(
       sql,
@@ -1857,6 +1907,13 @@ var NapiCoreRuntime = class {
       signal ? asNativeCancellationToken(signal) : signal
     );
   }
+  async actorQueueCompletePersisted(ctx, messageId, expectedName, response) {
+    return await asNativeActorContext(ctx).queue().completePersisted(
+      messageId,
+      expectedName,
+      response == null ? response : toNapiBuffer(response)
+    );
+  }
   async actorQueueEnqueueAndWait(ctx, name, body, options, signal) {
     return await asNativeActorContext(ctx).queue().enqueueAndWait(
       name,
@@ -2046,7 +2103,167 @@ function validationError(target, issues) {
   });
 }
 
+// src/registry/run-handler-coordinator.ts
+function runUnavailable(actorId, reason) {
+  return new RivetError(
+    "actor",
+    "run_handler_unavailable",
+    `Run handler control is unavailable for actor ${actorId}: ${reason}.`,
+    {
+      public: true,
+      statusCode: 409,
+      metadata: { actorId, reason }
+    }
+  );
+}
+function notifyStateChanged(state) {
+  const waiters = [...state.waiters];
+  state.waiters.clear();
+  for (const waiter of waiters) {
+    waiter();
+  }
+}
+function waitForStateChange(state) {
+  return new Promise((resolve) => {
+    state.waiters.add(resolve);
+  });
+}
+var RunHandlerCoordinator = class {
+  #run;
+  #states = /* @__PURE__ */ new Map();
+  constructor(run) {
+    this.#run = run;
+  }
+  get inspectorKind() {
+    return getRunInspectorKind(this.#run);
+  }
+  async run(actorId, restart, callback) {
+    const state = this.#getOrCreate(actorId);
+    state.restart = restart;
+    this.#initializeInspector(actorId, state);
+    state.queued += 1;
+    const blockedGeneration = state.exclusive ? state.exclusiveGeneration : void 0;
+    try {
+      while (!state.closed && (state.exclusive || state.active)) {
+        await waitForStateChange(state);
+      }
+    } finally {
+      state.queued -= 1;
+    }
+    if (state.closed) {
+      return "closed";
+    }
+    if (blockedGeneration !== void 0 && state.exclusiveGeneration === blockedGeneration && state.exclusiveOutcome === "failure") {
+      return "suppressed";
+    }
+    state.active = true;
+    try {
+      await callback();
+      return "ran";
+    } finally {
+      state.active = false;
+      notifyStateChanged(state);
+    }
+  }
+  getInspector(actorId, restart) {
+    var _a;
+    const state = this.#getOrCreate(actorId);
+    state.restart = restart;
+    this.#initializeInspector(actorId, state);
+    return (_a = state.inspector) == null ? void 0 : _a.inspector;
+  }
+  destroy(actorId) {
+    var _a, _b;
+    const state = this.#states.get(actorId);
+    if (!state) return;
+    state.closed = true;
+    (_b = (_a = state.inspector) == null ? void 0 : _a.dispose) == null ? void 0 : _b.call(_a);
+    state.inspector = void 0;
+    notifyStateChanged(state);
+    this.#states.delete(actorId);
+  }
+  #control(actorId, state) {
+    return {
+      run: {
+        withInactive: async (options, callback) => {
+          if (state.closed) {
+            throw runUnavailable(actorId, "actor is destroyed");
+          }
+          if (state.active || state.queued > 0 || state.exclusive) {
+            throw runUnavailable(
+              actorId,
+              "the run handler is active or waiting to start"
+            );
+          }
+          state.exclusive = true;
+          state.exclusiveGeneration += 1;
+          state.exclusiveOutcome = void 0;
+          try {
+            const result = await callback();
+            if (state.closed) {
+              throw runUnavailable(actorId, "actor is destroyed");
+            }
+            state.exclusiveOutcome = "success";
+            if (options.restartOnSuccess && state.queued === 0) {
+              if (!state.restart) {
+                throw runUnavailable(
+                  actorId,
+                  "the runtime restart callback is not available"
+                );
+              }
+              await state.restart();
+            }
+            return result;
+          } catch (error) {
+            state.exclusiveOutcome = "failure";
+            throw error;
+          } finally {
+            state.exclusive = false;
+            notifyStateChanged(state);
+          }
+        }
+      }
+    };
+  }
+  #getOrCreate(actorId) {
+    let state = this.#states.get(actorId);
+    if (!state) {
+      state = {
+        active: false,
+        closed: false,
+        exclusive: false,
+        exclusiveGeneration: 0,
+        inspectorInitialized: false,
+        queued: 0,
+        waiters: /* @__PURE__ */ new Set()
+      };
+      this.#states.set(actorId, state);
+    }
+    return state;
+  }
+  #initializeInspector(actorId, state) {
+    if (state.inspectorInitialized) return;
+    const inspector = createRunInspector(this.#run, {
+      actorId,
+      control: this.#control(actorId, state)
+    });
+    if (this.inspectorKind === "workflow") {
+      const workflow = inspector === void 0 ? void 0 : inspector.inspector.workflow;
+      if (!workflow || typeof workflow.getHistory !== "function" || typeof workflow.getState !== "function" || typeof workflow.onHistoryUpdated !== "function" || typeof workflow.replayFromStep !== "function") {
+        throw new TypeError(
+          `defineRunHandler createInspector returned an invalid workflow adapter for actor ${actorId}`
+        );
+      }
+    }
+    state.inspector = inspector;
+    state.inspectorInitialized = true;
+  }
+};
+
 // src/registry/wasm-runtime.ts
+function asWasmConstructors(bindings) {
+  return bindings;
+}
 function asWasmRegistry(handle) {
   return handle;
 }
@@ -2171,10 +2388,10 @@ function childHandle(handle, name) {
 }
 var WasmCoreRuntime = class {
   kind = "wasm";
-  #bindings;
+  #constructors;
   #sql = /* @__PURE__ */ new WeakMap();
   constructor(bindings) {
-    this.#bindings = bindings;
+    this.#constructors = asWasmConstructors(bindings);
   }
   #actorSql(ctx) {
     const wasmCtx = asWasmActorContext(ctx);
@@ -2187,7 +2404,7 @@ var WasmCoreRuntime = class {
   }
   createRegistry() {
     return callWasmSync(
-      () => asRegistryHandle2(new this.#bindings.CoreRegistry())
+      () => asRegistryHandle2(new this.#constructors.CoreRegistry())
     );
   }
   registerActor(registry, name, factory) {
@@ -2242,13 +2459,13 @@ var WasmCoreRuntime = class {
   createActorFactory(callbacks, config) {
     return callWasmSync(
       () => asActorFactoryHandle2(
-        new this.#bindings.ActorFactory(callbacks, config)
+        new this.#constructors.ActorFactory(callbacks, config)
       )
     );
   }
   createCancellationToken() {
     return callWasmSync(
-      () => new this.#bindings.CancellationToken()
+      () => new this.#constructors.CancellationToken()
     );
   }
   cancellationTokenAborted(token) {
@@ -2283,6 +2500,13 @@ var WasmCoreRuntime = class {
       optionalWasmNumber(timestampMs)
     );
   }
+  async actorSetRunWakeAt(ctx, timestampMs) {
+    await callHandleAsync(
+      asWasmActorContext(ctx),
+      "setRunWakeAt",
+      optionalWasmNumber(timestampMs)
+    );
+  }
   actorRequestSave(ctx, opts) {
     callHandle(asWasmActorContext(ctx), "requestSave", opts);
   }
@@ -2497,9 +2721,9 @@ var WasmCoreRuntime = class {
     );
     return results.map(normalizeRuntimeSqlExecuteResult);
   }
-  async actorSqlBeginTransaction(ctx, timeoutMs) {
+  async actorSqlBeginTransaction(ctx, timeoutMs, name) {
     return await callWasm(
-      () => this.#actorSql(ctx).beginTransaction(timeoutMs)
+      () => this.#actorSql(ctx).beginTransaction(timeoutMs, name)
     );
   }
   async actorSqlTransactionExec(transaction, sql) {
@@ -2523,6 +2747,27 @@ var WasmCoreRuntime = class {
       () => transaction.rollback()
     );
   }
+  async actorBeginStateTransaction(ctx, timeoutMs) {
+    return await callWasm(
+      () => asWasmActorContext(ctx).beginStateTransaction(timeoutMs)
+    );
+  }
+  async actorStateTransactionExecute(transaction, sql, params) {
+    const result = await callWasm(
+      () => transaction.execute(sql, params)
+    );
+    return normalizeRuntimeSqlExecuteResult(result);
+  }
+  async actorStateTransactionCommit(transaction, payload) {
+    await callWasm(
+      () => transaction.commit(payload)
+    );
+  }
+  async actorStateTransactionRollback(transaction) {
+    await callWasm(
+      () => transaction.rollback()
+    );
+  }
   async actorSqlQuery(ctx, sql, params) {
     return await callWasm(() => this.#actorSql(ctx).query(sql, params));
   }
@@ -2595,6 +2840,16 @@ var WasmCoreRuntime = class {
       signal
     );
   }
+  async actorQueueCompletePersisted(ctx, messageId, expectedName, response) {
+    const queue2 = childHandle(asWasmActorContext(ctx), "queue");
+    return await callHandleAsync(
+      queue2,
+      "completePersisted",
+      messageId,
+      expectedName,
+      response
+    );
+  }
   async actorQueueEnqueueAndWait(ctx, name, body, options, signal) {
     const queue2 = childHandle(asWasmActorContext(ctx), "queue");
     return optionalBytes(
@@ -2795,6 +3050,83 @@ function createWriteThroughProxy(value, commit, beforeChange) {
     }
   );
 }
+function unwrapProxy(value) {
+  let current = value;
+  while (current !== null && typeof current === "object") {
+    const target = onChange.target(current);
+    if (target === current) {
+      break;
+    }
+    current = target;
+  }
+  return current;
+}
+function isPlainObject(value) {
+  const proto = Object.getPrototypeOf(value);
+  return proto === Object.prototype || proto === null;
+}
+function unwrapDeep(value, seen) {
+  const unwrapped = unwrapProxy(value);
+  if (!unwrapped || typeof unwrapped !== "object") {
+    return unwrapped;
+  }
+  if (seen.has(unwrapped)) {
+    return unwrapped;
+  }
+  seen.add(unwrapped);
+  if (Array.isArray(unwrapped)) {
+    for (let i = 0; i < unwrapped.length; i++) {
+      const child = unwrapDeep(unwrapped[i], seen);
+      if (child !== unwrapped[i]) {
+        unwrapped[i] = child;
+      }
+    }
+    return unwrapped;
+  }
+  if (unwrapped instanceof Map) {
+    const replacements = [];
+    for (const [key, child] of unwrapped.entries()) {
+      const nextKey = unwrapDeep(key, seen);
+      const nextChild = unwrapDeep(child, seen);
+      if (nextKey !== key || nextChild !== child) {
+        replacements.push([key, nextKey, nextChild]);
+      }
+    }
+    for (const [key, nextKey, nextChild] of replacements) {
+      if (nextKey !== key) {
+        unwrapped.delete(key);
+      }
+      unwrapped.set(nextKey, nextChild);
+    }
+    return unwrapped;
+  }
+  if (unwrapped instanceof Set) {
+    const replacements = [];
+    for (const child of unwrapped.values()) {
+      const next = unwrapDeep(child, seen);
+      if (next !== child) {
+        replacements.push([child, next]);
+      }
+    }
+    for (const [child, next] of replacements) {
+      unwrapped.delete(child);
+      unwrapped.add(next);
+    }
+    return unwrapped;
+  }
+  if (isPlainObject(unwrapped)) {
+    for (const key of Object.keys(unwrapped)) {
+      const child = unwrapDeep(unwrapped[key], seen);
+      if (child !== unwrapped[key]) {
+        unwrapped[key] = child;
+      }
+    }
+  }
+  return unwrapped;
+}
+function unwrapWriteThroughProxy(value) {
+  return unwrapDeep(value, /* @__PURE__ */ new Set());
+}
 
 // src/registry/native.ts
 var textEncoder = new TextEncoder();
@@ -2941,6 +3273,14 @@ function stateMutationReentrantError() {
     "State mutations are not allowed inside onStateChange."
   );
 }
+function stateTransactionConflictError() {
+  return new RivetError(
+    "actor",
+    "state_transaction_conflict",
+    "State cannot be mutated by another action while an experimental state-aware database transaction is active.",
+    { public: true, statusCode: 409 }
+  );
+}
 function databaseNotConfiguredError() {
   return new RivetError(
     "actor",
@@ -2957,6 +3297,14 @@ function databaseClientNotReadyError() {
     { public: true }
   );
 }
+function runHandlerNotConfiguredError() {
+  return new RivetError(
+    "actor",
+    "run_handler_unavailable",
+    "Cannot schedule a run wake because this actor does not define a run handler.",
+    { public: true, statusCode: 409 }
+  );
+}
 function stateNotEnabledError() {
   return new RivetError(
     "actor",
@@ -3059,10 +3407,11 @@ function getOrCreateNativeSqlDatabase(runtime, ctx) {
     exec: (sql) => runtime.actorSqlExec(ctx, sql),
     execute: (sql, params) => runtime.actorSqlExecute(ctx, sql, params),
     executeBatch: (statements) => runtime.actorSqlExecuteBatch(ctx, statements),
-    beginTransaction: async (timeoutMs) => {
+    beginTransaction: async (timeoutMs, name) => {
       const transaction = await runtime.actorSqlBeginTransaction(
         ctx,
-        timeoutMs
+        timeoutMs,
+        name
       );
       return {
         exec: (sql) => runtime.actorSqlTransactionExec(transaction, sql),
@@ -3075,6 +3424,38 @@ function getOrCreateNativeSqlDatabase(runtime, ctx) {
         rollback: () => runtime.actorSqlTransactionRollback(transaction)
       };
     },
+    beginStateTransaction: async (timeoutMs, context) => {
+      const scope = context;
+      if (!scope) {
+        throw new Error(
+          "actor state transaction context is not configured"
+        );
+      }
+      const transaction = await runtime.actorBeginStateTransaction(
+        ctx,
+        timeoutMs
+      );
+      return {
+        exec: async () => {
+          throw new Error(
+            "actor state transactions only support single-statement execute calls"
+          );
+        },
+        execute: (sql, params) => runtime.actorStateTransactionExecute(
+          transaction,
+          sql,
+          params
+        ),
+        commit: async () => {
+          await runtime.actorStateTransactionCommit(
+            transaction,
+            scope.actorContext.serializeForTick("save")
+          );
+          scope.committed = true;
+        },
+        rollback: () => runtime.actorStateTransactionRollback(transaction)
+      };
+    },
     query: (sql, params) => runtime.actorSqlQuery(ctx, sql, params),
     run: (sql, params) => runtime.actorSqlRun(ctx, sql, params),
     metrics: () => runtime.actorSqlMetrics(ctx),
@@ -3455,12 +3836,16 @@ var NativeConnAdapter = class {
   #schemas;
   #ctx;
   #queueHibernationRemoval;
-  constructor(runtime, conn, schemas = {}, ctx, queueHibernationRemoval) {
+  #assertCanMutateState;
+  #stateProxy;
+  #stateProxyTarget;
+  constructor(runtime, conn, schemas = {}, ctx, queueHibernationRemoval, assertCanMutateState) {
     this.#runtime = runtime;
     this.#conn = conn;
     this.#schemas = schemas;
     this.#ctx = ctx;
     this.#queueHibernationRemoval = queueHibernationRemoval;
+    this.#assertCanMutateState = assertCanMutateState;
     this[CONN_STATE_MANAGER_SYMBOL] = {
       stateEnabled: true,
       get state() {
@@ -3483,22 +3868,46 @@ var NativeConnAdapter = class {
   }
   get state() {
     const nextState = this.#readState();
+    if (!this.#ctx) {
+      return this.#createStateProxy(nextState);
+    }
+    if (this.#stateProxy === void 0 || this.#stateProxyTarget !== nextState) {
+      this.#stateProxyTarget = nextState;
+      this.#stateProxy = this.#createStateProxy(nextState);
+    }
+    return this.#stateProxy;
+  }
+  #createStateProxy(state) {
+    const assertCurrentState = () => {
+      var _a;
+      (_a = this.#assertCanMutateState) == null ? void 0 : _a.call(this);
+      if (this.#ctx && this.#readState() !== state) {
+        throw stateTransactionConflictError();
+      }
+    };
     return createWriteThroughProxy(
-      nextState,
+      state,
       (nextValue) => {
+        assertCurrentState();
         this.#writeState(nextValue, { writeNative: true });
       },
       (newValue) => {
+        assertCurrentState();
         assertJsonCompatValue(newValue);
       }
     );
   }
   set state(value) {
-    assertJsonCompatValue(value);
-    this.#writeState(value, { writeNative: true });
+    var _a;
+    (_a = this.#assertCanMutateState) == null ? void 0 : _a.call(this);
+    const nextValue = unwrapWriteThroughProxy(value);
+    assertJsonCompatValue(nextValue);
+    this.#writeState(nextValue, { writeNative: true });
   }
   initializeState(value) {
-    this.#writeState(value, { writeNative: false });
+    this.#writeState(unwrapWriteThroughProxy(value), {
+      writeNative: false
+    });
   }
   get isHibernatable() {
     return callNativeSync(
@@ -3816,8 +4225,9 @@ var NativeKvAdapter = class {
 };
 function wrapQueueMessage(message, schemas) {
   const name = callNativeSync(() => message.name());
+  const id = callNativeSync(() => message.id());
   return {
-    id: Number(callNativeSync(() => message.id())),
+    id: id <= BigInt(Number.MAX_SAFE_INTEGER) ? Number(id) : id,
     name,
     body: validateQueueBody(
       schemas,
@@ -3955,6 +4365,25 @@ var NativeQueueAdapter = class {
       cleanup == null ? void 0 : cleanup();
     }
   }
+  async waitForAvailable(names, options) {
+    await this.waitForNamesAvailable(names ?? [], options);
+  }
+  async complete(message, response) {
+    const validatedResponse = validateQueueComplete(
+      this.#schemas,
+      message.name,
+      response
+    );
+    await callNative(
+      () => this.#runtime.actorQueueCompletePersisted(
+        this.#ctx,
+        BigInt(message.id),
+        message.name,
+        encodeValue(validatedResponse)
+      )
+    );
+    this.#pendingCompletableMessageIds.delete(message.id.toString());
+  }
   async enqueueAndWait(name, body, options) {
     const validatedBody = validateQueueBody(this.#schemas, name, body);
     const { token, cleanup } = await createCancellationTokenHandle(
@@ -4391,10 +4820,12 @@ var NativeConnectionMap = class {
   #runtime;
   #ctx;
   #schemas;
-  constructor(runtime, ctx, schemas) {
+  #assertCanMutateState;
+  constructor(runtime, ctx, schemas, assertCanMutateState) {
     this.#runtime = runtime;
     this.#ctx = ctx;
     this.#schemas = schemas;
+    this.#assertCanMutateState = assertCanMutateState;
   }
   #connToAdapter(conn) {
     return new NativeConnAdapter(
@@ -4407,7 +4838,8 @@ var NativeConnectionMap = class {
           this.#ctx,
           connId
         )
-      )
+      ),
+      this.#assertCanMutateState
     );
   }
   get size() {
@@ -4466,17 +4898,20 @@ var ActorContextHandleAdapter = class {
   #queue;
   #request;
   #schedule;
-  #sql;
-  #runHandlerActiveProvider;
+  #run;
+  #runHandlerConfigured;
   #onStateChange;
   #stateEnabled;
-  constructor(runtime, ctx, clientFactory, schemas = {}, databaseProvider, request, stateEnabled = true, runHandlerActiveProvider, onStateChange, dispatchCancelToken) {
+  #stateProxy;
+  #stateProxyTarget;
+  #stateTransactionOwner = /* @__PURE__ */ Symbol("actor-state-transaction-owner");
+  constructor(runtime, ctx, clientFactory, schemas = {}, databaseProvider, request, stateEnabled = true, onStateChange, dispatchCancelToken, runHandlerConfigured = false) {
     this.#runtime = runtime;
     this.#ctx = ctx;
     this.#clientFactory = clientFactory;
     this.#schemas = schemas;
     this.#dispatchCancelToken = dispatchCancelToken;
-    this.#runHandlerActiveProvider = runHandlerActiveProvider;
+    this.#runHandlerConfigured = runHandlerConfigured;
     this.#onStateChange = onStateChange;
     this.#stateEnabled = stateEnabled;
     if (databaseProvider) {
@@ -4493,12 +4928,6 @@ var ActorContextHandleAdapter = class {
     }
     return this.#kv;
   }
-  get sql() {
-    if (!this.#sql) {
-      this.#sql = getOrCreateNativeSqlDatabase(this.#runtime, this.#ctx);
-    }
-    return this.#sql;
-  }
   async actorRuntimeSocket() {
     return await callNative(
       () => this.#runtime.actorRuntimeSocketProvision(this.#ctx)
@@ -4514,7 +4943,7 @@ var ActorContextHandleAdapter = class {
     const runtimeState = getNativeRuntimeState(this.#runtime, this.#ctx);
     const cachedClient = runtimeState.databaseClient;
     if (cachedClient) {
-      this.#db = cachedClient.client;
+      this.#db = this.#bindDatabaseClient(cachedClient.client);
       return this.#db;
     }
     throw databaseClientNotReadyError();
@@ -4529,36 +4958,45 @@ var ActorContextHandleAdapter = class {
     if (!this.#stateEnabled) {
       throw stateNotEnabledError();
     }
-    const actorState = getNativePersistState(this.#runtime, this.#ctx);
     const nextState = this.#readState();
-    if (actorState.stateProxy === void 0 || actorState.stateProxyTarget !== nextState) {
-      actorState.stateProxyTarget = nextState;
-      actorState.stateProxy = createWriteThroughProxy(
+    if (this.#stateProxy === void 0 || this.#stateProxyTarget !== nextState) {
+      const assertCurrentState = () => {
+        this.#assertCanMutateState();
+        if (this.#readState() !== nextState) {
+          throw stateTransactionConflictError();
+        }
+      };
+      this.#stateProxyTarget = nextState;
+      this.#stateProxy = createWriteThroughProxy(
         nextState,
         (nextValue) => {
+          assertCurrentState();
           this.#writeState(nextValue, { scheduleSave: true });
         },
         (newValue) => {
-          this.#assertCanMutateState();
+          assertCurrentState();
           assertJsonCompatValue(newValue);
         }
       );
     }
-    return actorState.stateProxy;
+    return this.#stateProxy;
   }
   set state(value) {
     if (!this.#stateEnabled) {
       throw stateNotEnabledError();
     }
     this.#assertCanMutateState();
-    assertJsonCompatValue(value);
-    this.#writeState(value, { scheduleSave: true });
+    const nextValue = unwrapWriteThroughProxy(value);
+    assertJsonCompatValue(nextValue);
+    this.#writeState(nextValue, { scheduleSave: true });
   }
   initializeState(value) {
     if (!this.#stateEnabled) {
       return;
     }
-    this.#writeState(value, { scheduleSave: false });
+    this.#writeState(unwrapWriteThroughProxy(value), {
+      scheduleSave: false
+    });
   }
   get vars() {
     const runtimeState = getNativeRuntimeState(this.#runtime, this.#ctx);
@@ -4584,6 +5022,26 @@ var ActorContextHandleAdapter = class {
     }
     return this.#queue;
   }
+  get run() {
+    if (!this.#run) {
+      this.#run = {
+        setWakeAt: async (timestamp) => {
+          if (timestamp !== null && !this.#runHandlerConfigured) {
+            throw runHandlerNotConfiguredError();
+          }
+          if (timestamp !== null && (!Number.isSafeInteger(timestamp) || timestamp < 0)) {
+            throw new TypeError(
+              "Run wake timestamp must be a non-negative safe integer or null"
+            );
+          }
+          await callNative(
+            () => this.#runtime.actorSetRunWakeAt(this.#ctx, timestamp)
+          );
+        }
+      };
+    }
+    return this.#run;
+  }
   get schedule() {
     if (!this.#schedule) {
       this.#schedule = new NativeScheduleAdapter(
@@ -4618,7 +5076,8 @@ var ActorContextHandleAdapter = class {
       this.#connMap = new NativeConnectionMap(
         this.#runtime,
         this.#ctx,
-        this.#schemas
+        this.#schemas,
+        () => this.#assertCanMutateState()
       );
     }
     return this.#connMap;
@@ -4687,11 +5146,11 @@ var ActorContextHandleAdapter = class {
     const runtimeState = getNativeRuntimeState(this.#runtime, this.#ctx);
     const cachedClient = runtimeState.databaseClient;
     if (cachedClient) {
-      this.#db = cachedClient.client;
+      this.#db = this.#bindDatabaseClient(cachedClient.client);
       return this.#db;
     }
     const actorId = this.actorId;
-    const client = await this.#databaseProvider.createClient({
+    const createdClient = await this.#databaseProvider.createClient({
       actorId,
       kv: {
         batchPut: async (entries) => {
@@ -4712,21 +5171,126 @@ var ActorContextHandleAdapter = class {
       log: {
         debug: (obj) => logger2().debug(obj)
       },
-      nativeDatabaseProvider: {
-        open: async (requestedActorId) => {
-          void requestedActorId;
-          return getOrCreateNativeSqlDatabase(
-            this.#runtime,
-            this.#ctx
-          );
-        }
-      }
+      nativeDatabaseProvider: registerNativeStateTransactionOpener(
+        {
+          open: async (requestedActorId) => {
+            void requestedActorId;
+            return getOrCreateNativeSqlDatabase(
+              this.#runtime,
+              this.#ctx
+            );
+          }
+        },
+        async (timeoutMs, context) => await getOrCreateNativeSqlDatabase(
+          this.#runtime,
+          this.#ctx
+        ).beginStateTransaction(timeoutMs, context)
+      )
     });
     runtimeState.databaseClient = {
-      client
+      client: createdClient
     };
-    this.#db = client;
-    return client;
+    this.#db = this.#bindDatabaseClient(createdClient);
+    return this.#db;
+  }
+  #bindDatabaseClient(client) {
+    return bindNativeStateTransactionContext(client, {
+      enter: async () => await this.#enterStateTransaction(),
+      exit: (scope) => this.#exitStateTransaction(
+        scope
+      )
+    });
+  }
+  async #enterStateTransaction() {
+    const actorState = getNativePersistState(this.#runtime, this.#ctx);
+    let pendingOwners = actorState.pendingStateTransactionOwners;
+    if (!pendingOwners) {
+      pendingOwners = /* @__PURE__ */ new Set();
+      actorState.pendingStateTransactionOwners = pendingOwners;
+    }
+    if (actorState.activeStateTransactionOwner === this.#stateTransactionOwner || pendingOwners.has(this.#stateTransactionOwner)) {
+      throw stateTransactionConflictError();
+    }
+    pendingOwners.add(this.#stateTransactionOwner);
+    const predecessor = actorState.stateTransactionTail ?? Promise.resolve();
+    let release;
+    const hold = new Promise((resolve) => {
+      release = resolve;
+    });
+    actorState.stateTransactionTail = predecessor.then(
+      async () => await hold
+    );
+    try {
+      await predecessor;
+      pendingOwners.delete(this.#stateTransactionOwner);
+      actorState.activeStateTransactionOwner = this.#stateTransactionOwner;
+      return {
+        actorContext: this,
+        actorStateBaseline: this.#stateEnabled ? structuredClone(this.#readState()) : void 0,
+        connectionStateBaselines: new Map(
+          callNativeSync(
+            () => this.#runtime.actorConns(this.#ctx)
+          ).map((conn) => [
+            callNativeSync(() => this.#runtime.connId(conn)),
+            new Uint8Array(
+              callNativeSync(() => this.#runtime.connState(conn))
+            )
+          ])
+        ),
+        committed: false,
+        release
+      };
+    } catch (error) {
+      pendingOwners.delete(this.#stateTransactionOwner);
+      if (actorState.activeStateTransactionOwner === this.#stateTransactionOwner) {
+        actorState.activeStateTransactionOwner = void 0;
+      }
+      release();
+      throw error;
+    }
+  }
+  #exitStateTransaction(scope) {
+    const actorState = getNativePersistState(this.#runtime, this.#ctx);
+    try {
+      if (!scope.committed) {
+        this.#restoreStateTransactionBaseline(scope);
+      }
+    } finally {
+      if (actorState.activeStateTransactionOwner === this.#stateTransactionOwner) {
+        actorState.activeStateTransactionOwner = void 0;
+      }
+      if (actorState.stateTransactionSaveDeferred) {
+        actorState.stateTransactionSaveDeferred = false;
+        this.#scheduleSave();
+      }
+      scope.release();
+    }
+  }
+  #restoreStateTransactionBaseline(scope) {
+    const actorState = getNativePersistState(this.#runtime, this.#ctx);
+    if (actorState.pendingSaveHandle !== void 0) {
+      clearImmediate(actorState.pendingSaveHandle);
+    }
+    actorState.pendingSaveHandle = void 0;
+    actorState.saveScheduled = false;
+    if (this.#stateEnabled) {
+      actorState.state = structuredClone(scope.actorStateBaseline);
+    }
+    for (const conn of callNativeSync(
+      () => this.#runtime.actorConns(this.#ctx)
+    )) {
+      const connId = callNativeSync(() => this.#runtime.connId(conn));
+      const baseline = scope.connectionStateBaselines.get(connId);
+      if (baseline === void 0) {
+        continue;
+      }
+      callNativeSync(() => this.#runtime.connSetState(conn, baseline));
+      const cached = actorState.connStates.get(connId);
+      if (cached) {
+        cached.state = decodeValue(baseline);
+      }
+    }
+    this.#scheduleSave();
   }
   async prepare() {
     if (!this.#databaseProvider) {
@@ -4744,7 +5308,6 @@ var ActorContextHandleAdapter = class {
   }
   async closeDatabase() {
     this.#db = void 0;
-    this.#sql = void 0;
     await closeNativeDatabaseClient(this.#runtime, this.#ctx);
     await closeNativeSqlDatabase(this.#runtime, this.#ctx);
   }
@@ -4764,6 +5327,7 @@ var ActorContextHandleAdapter = class {
   }
   async saveState(opts) {
     if (opts == null ? void 0 : opts.immediate) {
+      this.#assertCanAwaitStateSave();
       await callNative(
         () => this.#runtime.actorRequestSaveAndWait(this.#ctx, {
           immediate: true
@@ -4784,10 +5348,17 @@ var ActorContextHandleAdapter = class {
     );
   }
   async saveStateAndWorkflowBatch(writes) {
+    this.#assertCanAwaitStateSave();
     await callNative(
       () => this.#runtime.actorSaveStateAndWorkflowBatch(this.#ctx, writes)
     );
   }
+  #assertCanAwaitStateSave() {
+    const actorState = getNativePersistState(this.#runtime, this.#ctx);
+    if (actorState.activeStateTransactionOwner === this.#stateTransactionOwner) {
+      throw stateTransactionConflictError();
+    }
+  }
   serializeForTick(reason) {
     void reason;
     const actorState = getNativePersistState(this.#runtime, this.#ctx);
@@ -4841,10 +5412,6 @@ var ActorContextHandleAdapter = class {
     }
     return promise;
   }
-  runHandlerActive() {
-    var _a;
-    return ((_a = this.#runHandlerActiveProvider) == null ? void 0 : _a.call(this)) ?? false;
-  }
   internalKeepAwake(run) {
     const promise = typeof run === "function" ? run() : run;
     const trackedPromise = promise.then(
@@ -4926,7 +5493,6 @@ var ActorContextHandleAdapter = class {
     var _a;
     this.#flushStateChange();
     (_a = this.#abortSignalCleanup) == null ? void 0 : _a.call(this);
-    this.#sql = void 0;
   }
   #createActorAbortSignal() {
     const nativeSignal = callNativeSync(
@@ -4960,10 +5526,18 @@ var ActorContextHandleAdapter = class {
     this.#scheduleSave();
   }
   #assertCanMutateState() {
+    var _a;
     const actorState = getNativePersistState(this.#runtime, this.#ctx);
     if (actorState.isInOnStateChange) {
       throw stateMutationReentrantError();
     }
+    if (actorState.activeStateTransactionOwner !== this.#stateTransactionOwner && (actorState.activeStateTransactionOwner !== void 0 || (((_a = actorState.pendingStateTransactionOwners) == null ? void 0 : _a.size) ?? 0) > 0)) {
+      throw stateTransactionConflictError();
+    }
+  }
+  /** @internal */
+  assertCanMutateState() {
+    this.#assertCanMutateState();
   }
   // Coalesce the request-save and onStateChange work to once per event loop
   // tick. A synchronous burst of mutations (for example
@@ -4985,6 +5559,15 @@ var ActorContextHandleAdapter = class {
     if (!actorState.saveScheduled) {
       return;
     }
+    if (actorState.activeStateTransactionOwner !== void 0) {
+      actorState.saveScheduled = false;
+      if (actorState.pendingSaveHandle !== void 0) {
+        clearImmediate(actorState.pendingSaveHandle);
+        actorState.pendingSaveHandle = void 0;
+      }
+      actorState.stateTransactionSaveDeferred = true;
+      return;
+    }
     actorState.saveScheduled = false;
     if (actorState.pendingSaveHandle !== void 0) {
       clearImmediate(actorState.pendingSaveHandle);
@@ -5108,9 +5691,6 @@ var NativeWorkflowRuntimeAdapter = class {
       }
     };
   }
-  isRunHandlerActive() {
-    return this.#ctx.runHandlerActive();
-  }
   async restartRunHandler() {
     await this.#ctx.restartRunHandler();
   }
@@ -5143,43 +5723,45 @@ var NativeWorkflowRuntimeAdapter = class {
     };
   }
 };
-function withConnContext(runtime, ctx, conn, clientFactory, schemas = {}, databaseProvider, request, stateEnabled = true, onStateChange, dispatchCancelToken) {
-  return Object.assign(
-    new ActorContextHandleAdapter(
+function withConnContext(runtime, ctx, conn, clientFactory, schemas = {}, databaseProvider, request, stateEnabled = true, onStateChange, dispatchCancelToken, runHandlerConfigured = false) {
+  const actorContext = new ActorContextHandleAdapter(
+    runtime,
+    ctx,
+    clientFactory,
+    schemas,
+    databaseProvider,
+    request,
+    stateEnabled,
+    onStateChange,
+    dispatchCancelToken,
+    runHandlerConfigured
+  );
+  return Object.assign(actorContext, {
+    conn: new NativeConnAdapter(
       runtime,
-      ctx,
-      clientFactory,
+      conn,
       schemas,
-      databaseProvider,
-      request,
-      stateEnabled,
-      void 0,
-      onStateChange,
-      dispatchCancelToken
-    ),
-    {
-      conn: new NativeConnAdapter(
-        runtime,
-        conn,
-        schemas,
-        ctx,
-        (connId) => callNativeSync(
-          () => runtime.actorQueueHibernationRemoval(ctx, connId)
-        )
-      )
-    }
-  );
+      ctx,
+      (connId) => callNativeSync(
+        () => runtime.actorQueueHibernationRemoval(ctx, connId)
+      ),
+      () => actorContext.assertCanMutateState()
+    )
+  });
 }
 function buildActorConfig(definition, registryConfig, runtimeKind) {
+  var _a;
   const config = definition.config;
   const options = config.options ?? {};
   const canHibernate = options.canHibernateWebSocket;
   const usesRemoteSqlite = sqliteBackendForConfig(registryConfig) === "remote";
+  const sqliteProfiling = (_a = config.db) == null ? void 0 : _a.sqliteProfiling;
   return {
     name: options.name,
     icon: options.icon,
-    hasDatabase: config.db !== void 0 || usesRemoteSqlite,
+    hasDatabase: true,
     remoteSqlite: usesRemoteSqlite,
+    sqliteProfiling,
     enableActorRuntimeSocket: options.enableActorRuntimeSocket === true,
     hasState: config.state !== void 0 || typeof config.createState === "function",
     canHibernateWebsocket: typeof canHibernate === "boolean" ? canHibernate : void 0,
@@ -5278,7 +5860,7 @@ function validateInspectorTabSource(tabId, resolved) {
 function buildNativeFactory(runtime, registryConfig, definition) {
   var _a;
   const config = definition.config;
-  const databaseProvider = config.db;
+  const databaseProvider = config.db ?? db();
   const actionHandlers = flattenActionHandlers(config.actions);
   const schemaConfig = {
     actionInputSchemas: flattenActionInputSchemas(
@@ -5295,16 +5877,13 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     ),
     { encoding: "bare" }
   );
-  const nativeRunHandlerActiveByActorId = /* @__PURE__ */ new Map();
-  const isNativeRunHandlerActive = (ctx) => nativeRunHandlerActiveByActorId.get(
-    callNativeSync(() => runtime.actorId(ctx))
-  ) ?? false;
+  const run = getRunFunction(config.run);
+  const runHandlerCoordinator = getRunInspectorKind(config.run) === "workflow" ? new RunHandlerCoordinator(config.run) : void 0;
   const getNativeWorkflowInspector = (ctx) => {
-    var _a2;
-    return (_a2 = getRunInspectorConfig(
-      config.run,
-      callNativeSync(() => runtime.actorId(ctx))
-    )) == null ? void 0 : _a2.workflow;
+    var _a2, _b;
+    const actorId = callNativeSync(() => runtime.actorId(ctx));
+    const restart = () => callNativeSync(() => runtime.actorRestartRunHandler(ctx));
+    return ((_a2 = runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.getInspector(actorId, restart)) == null ? void 0 : _a2.workflow) ?? ((_b = getRunInspectorConfig(config.run, actorId)) == null ? void 0 : _b.workflow);
   };
   const onStateChange = typeof config.onStateChange === "function" ? (actorCtx, nextState) => {
     config.onStateChange(actorCtx, nextState);
@@ -5324,9 +5903,9 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     databaseProvider,
     request,
     stateEnabled,
-    () => isNativeRunHandlerActive(ctx),
     onStateChange,
-    cancelToken
+    cancelToken,
+    run !== void 0
   );
   const makeConnCtx = (ctx, conn, request, cancelToken) => withConnContext(
     runtime,
@@ -5338,7 +5917,8 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     request,
     stateEnabled,
     onStateChange,
-    cancelToken
+    cancelToken,
+    run !== void 0
   );
   const maybeHandleNativeInspectorRequest = async (ctx, _rawRequest, jsRequest) => {
     var _a2, _b, _c, _d;
@@ -5389,6 +5969,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
       return await ((_b2 = (_a3 = getNativeWorkflowInspector(ctx)) == null ? void 0 : _a3.getState) == null ? void 0 : _b2.call(_a3)) ?? null;
     };
     const actorCtx = makeActorCtx(ctx, jsRequest);
+    const sql = getOrCreateNativeSqlDatabase(runtime, ctx);
     try {
       if (url.pathname === "/inspector/state" && jsRequest.method === "GET") {
         return jsonResponse({
@@ -5516,9 +6097,9 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         }
       }
       if (url.pathname === "/inspector/database/schema" && jsRequest.method === "GET") {
-        const db = actorCtx.sql;
+        const db2 = sql;
         const tables = queryRows(
-          await db.query(
+          await db2.query(
             "SELECT name, type FROM sqlite_master WHERE type IN ('table', 'view') AND name NOT LIKE 'sqlite_%' AND name NOT LIKE '__drizzle_%' ORDER BY name"
           )
         );
@@ -5526,13 +6107,13 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         for (const table of tables) {
           const quoted = `"${table.name.replace(/"/g, '""')}"`;
           const columns = queryRows(
-            await db.query(`PRAGMA table_info(${quoted})`)
+            await db2.query(`PRAGMA table_info(${quoted})`)
           );
           const foreignKeys = queryRows(
-            await db.query(`PRAGMA foreign_key_list(${quoted})`)
+            await db2.query(`PRAGMA foreign_key_list(${quoted})`)
           );
           const countResult = queryRows(
-            await db.query(
+            await db2.query(
               `SELECT COUNT(*) as count FROM ${quoted}`
             )
           );
@@ -5567,7 +6148,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         );
         const quoted = `"${table.replace(/"/g, '""')}"`;
         const rows = queryRows(
-          await actorCtx.sql.query(
+          await sql.query(
             `SELECT * FROM ${quoted} LIMIT ? OFFSET ?`,
             [
               Math.max(0, Math.min(limit, 500)),
@@ -5595,15 +6176,11 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           const bindings = normalizeSqlitePropertyBindings(
             body.properties
           );
-          const rows2 = queryRows(
-            await actorCtx.sql.query(body.sql, bindings)
-          );
+          const rows2 = queryRows(await sql.query(body.sql, bindings));
           return jsonResponse({ rows: jsonSafe(rows2) });
         }
         const args = Array.isArray(body.args) ? body.args : [];
-        const rows = queryRows(
-          await actorCtx.sql.query(body.sql, args)
-        );
+        const rows = queryRows(await sql.query(body.sql, args));
         return jsonResponse({ rows: jsonSafe(rows) });
       }
       if (url.pathname === "/inspector/summary" && jsRequest.method === "GET") {
@@ -5629,7 +6206,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           rpcs: Object.keys(actionHandlers).sort(),
           queueSize: inspectorSnapshot.queueSize,
           isStateEnabled: stateEnabled,
-          isDatabaseEnabled: databaseProvider !== void 0,
+          isDatabaseEnabled: true,
           isWorkflowEnabled: getNativeWorkflowInspector(ctx) !== void 0,
           workflowState: await workflowState(),
           workflowHistory: workflowHistory()
@@ -5819,6 +6396,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
       async (error, payload) => {
         const { ctx } = unwrapTsfnPayload(error, payload);
         const actorCtx = makeActorCtx(ctx);
+        const actorId = callNativeSync(() => runtime.actorId(ctx));
         const saveActorState = async () => {
           if (runtime.kind === "wasm") {
             await runtime.actorSaveState(
@@ -5844,6 +6422,8 @@ function buildNativeFactory(runtime, registryConfig, definition) {
               saveActorState
             );
           } finally {
+            runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.destroy(actorId);
+            disposeRunInspector(config.run, actorId);
             await actorCtx.dispose();
           }
         }
@@ -5853,14 +6433,14 @@ function buildNativeFactory(runtime, registryConfig, definition) {
       async (error, payload) => {
         const { ctx } = unwrapTsfnPayload(error, payload);
         const actorCtx = makeActorCtx(ctx);
+        const actorId = callNativeSync(() => runtime.actorId(ctx));
+        runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.destroy(actorId);
+        disposeRunInspector(config.run, actorId);
         try {
           if (typeof config.onDestroy === "function") {
             await config.onDestroy(actorCtx);
           }
         } finally {
-          const actorId = callNativeSync(() => runtime.actorId(ctx));
-          nativeRunHandlerActiveByActorId.delete(actorId);
-          disposeRunInspector(config.run, actorId);
           resolveNativeDestroy(runtime, ctx);
           await actorCtx.closeDatabase();
           clearNativeRuntimeState(runtime, ctx);
@@ -5908,7 +6488,8 @@ function buildNativeFactory(runtime, registryConfig, definition) {
               ctx,
               connId
             )
-          )
+          ),
+          () => actorCtx.assertCanMutateState()
         );
         try {
           const nextConnState = hasStaticConnState ? structuredClone(config.connState) : await config.createConnState(
@@ -5945,7 +6526,8 @@ function buildNativeFactory(runtime, registryConfig, definition) {
               ctx,
               connId
             )
-          )
+          ),
+          () => actorCtx.assertCanMutateState()
         );
         try {
           await config.onConnect(
@@ -5977,7 +6559,8 @@ function buildNativeFactory(runtime, registryConfig, definition) {
                     ctx,
                     connId
                   )
-                )
+                ),
+                () => actorCtx.assertCanMutateState()
               )
             );
           }
@@ -6121,7 +6704,6 @@ function buildNativeFactory(runtime, registryConfig, definition) {
       }
     ) : void 0,
     run: (() => {
-      const run = getRunFunction(config.run);
       if (!run) {
         return void 0;
       }
@@ -6129,18 +6711,30 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         async (error, payload) => {
           const { ctx } = unwrapTsfnPayload(error, payload);
           const actorId = callNativeSync(() => runtime.actorId(ctx));
-          const actorCtx = makeActorCtx(ctx);
-          nativeRunHandlerActiveByActorId.set(actorId, true);
-          try {
-            await run(actorCtx);
-          } finally {
-            nativeRunHandlerActiveByActorId.delete(actorId);
-            await actorCtx.dispose();
+          const executeRun = async () => {
+            const actorCtx = makeActorCtx(ctx);
+            try {
+              await run(actorCtx);
+            } finally {
+              await actorCtx.dispose();
+            }
+          };
+          if (runHandlerCoordinator) {
+            const outcome = await runHandlerCoordinator.run(
+              actorId,
+              () => callNativeSync(
+                () => runtime.actorRestartRunHandler(ctx)
+              ),
+              executeRun
+            );
+            return outcome !== "suppressed";
           }
+          await executeRun();
+          return true;
         }
       );
     })(),
-    getWorkflowHistory: getRunInspectorConfig(config.run) !== void 0 ? wrapNativeCallback(
+    getWorkflowHistory: hasRunInspectorConfig(config.run) ? wrapNativeCallback(
       async (error, payload) => {
         var _a2;
         const { ctx } = unwrapTsfnPayload(error, payload);
@@ -6148,7 +6742,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         return history == null ? void 0 : toUint8Array(history);
       }
     ) : void 0,
-    replayWorkflow: getRunInspectorConfig(config.run) !== void 0 ? wrapNativeCallback(
+    replayWorkflow: hasRunInspectorConfig(config.run) ? wrapNativeCallback(
       async (error, payload) => {
         const { ctx, entryId } = unwrapTsfnPayload(
           error,
@@ -6158,9 +6752,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         if (!(workflowInspector == null ? void 0 : workflowInspector.replayFromStep)) {
           return void 0;
         }
-        const history = await workflowInspector.replayFromStep(
-          entryId
-        ) ?? null;
+        const history = await workflowInspector.replayFromStep(entryId) ?? null;
         return history == null ? void 0 : toUint8Array(history);
       }
     ) : void 0,
@@ -6213,7 +6805,8 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           jsRequest,
           stateEnabled,
           onStateChange,
-          cancelToken
+          cancelToken,
+          run !== void 0
         );
         try {
           if (!schemaConfig.queues || !hasSchemaConfigKey(schemaConfig.queues, name)) {
@@ -7119,6 +7712,7 @@ export {
   actor,
   buildActorNames,
   createClientWithDriver,
+  defineRunHandler,
   event,
   isStaticActorDefinition,
   isStaticActorInstance,