@rivetkit/supabase 2.3.11-rc.9 → 2.3.11

package/dist/mod.js

@@ -321,6 +321,7 @@ __export(mod_exports, {
   actor: () => actor,
   buildActorNames: () => buildActorNames,
   createClientWithDriver: () => createClientWithDriver,
+  defineRunHandler: () => defineRunHandler,
   event: () => event,
   isStaticActorDefinition: () => isStaticActorDefinition,
   isStaticActorInstance: () => isStaticActorInstance,
@@ -508,7 +509,7 @@ function unsupportedFeature(feature) {
   );
 }
 
-// ../rivetkit/dist/tsup/chunk-LZ4TSBIP.js
+// ../rivetkit/dist/tsup/chunk-OUENKQHB.js
 var import_pino = require("pino");
 
 // ../../../node_modules/.pnpm/zod@4.1.13/node_modules/zod/v4/classic/external.js
@@ -13181,7 +13182,7 @@ var classic_default = external_exports;
 // ../../../node_modules/.pnpm/zod@4.1.13/node_modules/zod/v4/index.js
 var v4_default = classic_default;
 
-// ../rivetkit/dist/tsup/chunk-LZ4TSBIP.js
+// ../rivetkit/dist/tsup/chunk-OUENKQHB.js
 var cbor = __toESM(require("cbor-x"), 1);
 var import_invariant = __toESM(require_invariant(), 1);
 var getRivetEngine = () => getEnvUniversal("RIVET_ENGINE");
@@ -13346,7 +13347,7 @@ function noopNext() {
 }
 var package_default = {
   name: "rivetkit",
-  version: "2.3.11-rc.9",
+  version: "2.3.11",
   description: "Lightweight libraries for building stateful actors on edge platforms",
   license: "Apache-2.0",
   keywords: [
@@ -13482,6 +13483,16 @@ var package_default = {
         default: "./dist/tsup/inspector/mod.cjs"
       }
     },
+    "./experimental/inspector/workflow": {
+      import: {
+        types: "./dist/tsup/inspector/workflow.d.ts",
+        default: "./dist/tsup/inspector/workflow.js"
+      },
+      require: {
+        types: "./dist/tsup/inspector/workflow.d.cts",
+        default: "./dist/tsup/inspector/workflow.cjs"
+      }
+    },
     "./inspector-tab": {
       import: {
         types: "./dist/tsup/inspector-tab/mod.d.ts",
@@ -13527,7 +13538,7 @@ var package_default = {
     "./dist/tsup/chunk-*.cjs"
   ],
   scripts: {
-    build: "tsup src/mod.ts src/client/mod.ts src/common/log.ts src/common/websocket.ts src/actor/errors.ts src/utils.ts src/workflow/mod.ts src/test/mod.ts src/inspector/mod.ts src/inspector-tab/mod.ts src/db/mod.ts src/db/drizzle.ts src/dynamic/mod.ts src/unstable/migrations.ts && tsup src/agent-os/index.ts --no-clean --out-dir dist/tsup/agent-os",
+    build: "tsup src/mod.ts src/client/mod.ts src/common/log.ts src/common/websocket.ts src/actor/errors.ts src/utils.ts src/workflow/mod.ts src/test/mod.ts src/inspector/mod.ts src/inspector/workflow.ts src/inspector-tab/mod.ts src/db/mod.ts src/db/drizzle.ts src/dynamic/mod.ts src/unstable/migrations.ts && tsup src/agent-os/index.ts --no-clean --out-dir dist/tsup/agent-os && node scripts/check-built-commonjs.mjs",
     "build:browser": "tsup --config tsup.browser.config.ts",
     "check-types": "tsc --noEmit",
     lint: "biome check . && pnpm run check:test-skips && pnpm run check:wait-for-comments",
@@ -14639,7 +14650,7 @@ function Config({ initialBufferLength = 1024, maxBufferLength = 1024 * 1024 * 32
   };
 }
 
-// ../rivetkit/dist/tsup/chunk-C5TORAVP.js
+// ../rivetkit/dist/tsup/chunk-QFJ24MBU.js
 var config2 = /* @__PURE__ */ Config({});
 function readWorkflowCbor(bc) {
   return readData(bc);
@@ -14937,7 +14948,7 @@ function decodeWorkflowHistoryTransport(data) {
   return decodeWorkflowHistory(toUint8Array(data));
 }
 
-// ../rivetkit/dist/tsup/chunk-QWLJCP3X.js
+// ../rivetkit/dist/tsup/chunk-6W5VGLFT.js
 function flattenActionHandlers(actions) {
   const flattened = /* @__PURE__ */ Object.create(null);
   for (const { name, handler } of collectActionEntries(actions)) {
@@ -15043,6 +15054,7 @@ var zActionTree = external_exports.custom((value) => {
 });
 var WorkflowInspectorConfigSchema = external_exports.object({
   getHistory: zFunction(),
+  getState: zFunction().optional(),
   onHistoryUpdated: zFunction().optional(),
   replayFromStep: zFunction().optional()
 });
@@ -15112,9 +15124,36 @@ var RunConfigSchema = external_exports.object({
   /** Inspector integration for long-running run handlers. */
   inspector: RunInspectorConfigSchema.optional()
 });
-var RUN_FUNCTION_CONFIG_SYMBOL = /* @__PURE__ */ Symbol.for(
-  "rivetkit.run_function_config"
-);
+var RUN_FUNCTION_CONFIG_SYMBOL = /* @__PURE__ */ Symbol.for("rivetkit.run_function_config");
+function defineRunHandler(run, options) {
+  if (options.inspectorKind === void 0 !== (options.createInspector === void 0)) {
+    throw new TypeError(
+      "defineRunHandler requires inspectorKind and createInspector together"
+    );
+  }
+  Object.defineProperty(run, RUN_FUNCTION_CONFIG_SYMBOL, {
+    configurable: false,
+    enumerable: false,
+    writable: false,
+    value: {
+      name: options.name,
+      icon: options.icon,
+      inspectorKind: options.inspectorKind,
+      createInspector: options.createInspector
+    }
+  });
+  return run;
+}
+function getRunInspectorKind(run) {
+  var _a2;
+  if (!run || typeof run !== "function") return void 0;
+  return (_a2 = run[RUN_FUNCTION_CONFIG_SYMBOL]) == null ? void 0 : _a2.inspectorKind;
+}
+function createRunInspector(run, context) {
+  var _a2, _b;
+  if (!run || typeof run !== "function") return void 0;
+  return (_b = (_a2 = run[RUN_FUNCTION_CONFIG_SYMBOL]) == null ? void 0 : _a2.createInspector) == null ? void 0 : _b.call(_a2, context);
+}
 var zRunHandler = external_exports.union([zFunction(), RunConfigSchema]).optional();
 function getRunFunction(run) {
   if (!run) return void 0;
@@ -15138,6 +15177,12 @@ function getRunInspectorConfig(run, actor2) {
   }
   return run.inspector;
 }
+function hasRunInspectorConfig(run) {
+  if (!run) return false;
+  if (typeof run !== "function") return run.inspector !== void 0;
+  const config3 = run[RUN_FUNCTION_CONFIG_SYMBOL];
+  return (config3 == null ? void 0 : config3.inspectorKind) !== void 0 || (config3 == null ? void 0 : config3.createInspector) !== void 0 || (config3 == null ? void 0 : config3.inspector) !== void 0 || (config3 == null ? void 0 : config3.inspectorFactory) !== void 0;
+}
 function disposeRunInspector(run, actorId) {
   var _a2;
   if (!run || typeof run !== "function") {
@@ -15484,7 +15529,90 @@ function removePrefixFromKey(prefixedKey) {
   return prefixedKey.slice(KEYS.KV.length);
 }
 
-// ../rivetkit/dist/tsup/chunk-XOOESJY7.js
+// ../rivetkit/dist/tsup/chunk-JTHHCZCZ.js
+var MIGRATION_TRANSACTION_TIMEOUT_MS = 5 * 6e4;
+function isManualTransactionControl(query) {
+  return /^\s*(?:BEGIN|SAVEPOINT|COMMIT|END|ROLLBACK)\b/i.test(query);
+}
+function validateTransactionTimeout(timeout) {
+  if (timeout !== void 0 && (!Number.isFinite(timeout) || timeout <= 0)) {
+    throw new Error(
+      "db.transaction() timeout must be a positive finite number of milliseconds"
+    );
+  }
+}
+function validateTransactionName(name) {
+  if (name === void 0) {
+    return;
+  }
+  if (name.length === 0) {
+    throw new Error("db.transaction() name must not be empty");
+  }
+}
+function isSqliteBindingValue(value) {
+  if (value === null || typeof value === "number" || typeof value === "string" || typeof value === "bigint" || value instanceof Uint8Array) {
+    return true;
+  }
+  if (Array.isArray(value)) {
+    return value.every((item) => typeof item === "number");
+  }
+  return false;
+}
+function isPlainObject3(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return false;
+  }
+  return Object.getPrototypeOf(value) === Object.prototype;
+}
+function isSqliteBindingObject(value) {
+  if (!isPlainObject3(value)) {
+    return false;
+  }
+  return Object.values(value).every((entry) => isSqliteBindingValue(entry));
+}
+function toSqliteBindings(input) {
+  if (Array.isArray(input)) {
+    for (const value of input) {
+      if (!isSqliteBindingValue(value)) {
+        throw new Error(
+          `unsupported sqlite binding type: ${typeof value}`
+        );
+      }
+    }
+    return input;
+  }
+  if (isSqliteBindingObject(input)) {
+    return input;
+  }
+  throw new Error("unsupported sqlite binding collection");
+}
+var AsyncMutex = class {
+  #locked = false;
+  #waiting = [];
+  async acquire() {
+    while (this.#locked) {
+      await new Promise((resolve) => this.#waiting.push(resolve));
+    }
+    this.#locked = true;
+  }
+  release() {
+    this.#locked = false;
+    const next = this.#waiting.shift();
+    if (next) {
+      next();
+    }
+  }
+  async run(fn) {
+    await this.acquire();
+    try {
+      return await fn();
+    } finally {
+      this.release();
+    }
+  }
+};
+
+// ../rivetkit/dist/tsup/chunk-FWROC5LA.js
 function logger() {
   return getLogger("actor-client");
 }
@@ -15522,35 +15650,7 @@ async function importWebSocket() {
   return webSocketPromise;
 }
 
-// ../rivetkit/dist/tsup/chunk-7AFZMFPQ.js
-var MIGRATION_TRANSACTION_TIMEOUT_MS = 5 * 6e4;
-var AsyncMutex = class {
-  #locked = false;
-  #waiting = [];
-  async acquire() {
-    while (this.#locked) {
-      await new Promise((resolve) => this.#waiting.push(resolve));
-    }
-    this.#locked = true;
-  }
-  release() {
-    this.#locked = false;
-    const next = this.#waiting.shift();
-    if (next) {
-      next();
-    }
-  }
-  async run(fn) {
-    await this.acquire();
-    try {
-      return await fn();
-    } finally {
-      this.release();
-    }
-  }
-};
-
-// ../rivetkit/dist/tsup/chunk-HOZ3ZLZ2.js
+// ../rivetkit/dist/tsup/chunk-3ZR542SK.js
 var import_invariant2 = __toESM(require_invariant(), 1);
 
 // ../../../node_modules/.pnpm/p-retry@6.2.1/node_modules/p-retry/index.js
@@ -15728,7 +15828,7 @@ function createVersionedDataHandler(config3) {
   return new VersionedDataHandler(config3);
 }
 
-// ../rivetkit/dist/tsup/chunk-HOZ3ZLZ2.js
+// ../rivetkit/dist/tsup/chunk-3ZR542SK.js
 var import_invariant3 = __toESM(require_invariant(), 1);
 var import_invariant4 = __toESM(require_invariant(), 1);
 var PATH_CONNECT = "/connect";
@@ -21444,6 +21544,231 @@ function apiActorToOutput(actor2) {
   };
 }
 
+// ../rivetkit/dist/tsup/chunk-6WYATRS4.js
+var nativeStateTransactionOpeners = /* @__PURE__ */ new WeakMap();
+var nativeStateTransactionClientBinders = /* @__PURE__ */ new WeakMap();
+function registerNativeStateTransactionOpener(provider, opener) {
+  nativeStateTransactionOpeners.set(provider, opener);
+  return provider;
+}
+function bindNativeStateTransactionContext(client, context) {
+  if ((typeof client !== "object" || client === null) && typeof client !== "function") {
+    return client;
+  }
+  const bind = nativeStateTransactionClientBinders.get(client);
+  return (bind == null ? void 0 : bind(context)) ?? client;
+}
+function hasMultipleStatements(query) {
+  const trimmed = query.trim().replace(/;+$/, "").trimEnd();
+  return trimmed.includes(";");
+}
+function db({
+  onMigrate,
+  warnOnManualTransactions = true,
+  profiling
+} = {}) {
+  const provider = {
+    sqliteProfiling: profiling,
+    createClient: async (ctx) => {
+      const nativeDatabaseProvider = ctx.nativeDatabaseProvider;
+      if (!nativeDatabaseProvider) {
+        throw new Error(
+          "native SQLite is required, but the current runtime did not provide a native database provider"
+        );
+      }
+      const db2 = await nativeDatabaseProvider.open(ctx.actorId);
+      let closed = false;
+      let manualTransactionWarned = false;
+      const ensureOpen = () => {
+        if (closed) {
+          throw new Error(
+            "Database is closed. This usually means a background timer (setInterval, setTimeout) or a stray promise is still running after the actor stopped. Use c.abortSignal to clean up timers before the actor shuts down."
+          );
+        }
+      };
+      const createClient = (target, transactionScoped = false, stateTransactionContext) => {
+        const client2 = {
+          execute: async (query, ...args) => {
+            var _a2, _b, _c, _d;
+            ensureOpen();
+            if (!transactionScoped && warnOnManualTransactions && !manualTransactionWarned && !hasMultipleStatements(query) && isManualTransactionControl(query)) {
+              manualTransactionWarned = true;
+              getLogger("database").warn(
+                { actorId: ctx.actorId },
+                "Manual cross-call SQLite transactions can interleave with other actor work. Use db.transaction() for coordinated transactions. Set warnOnManualTransactions: false in your db(...) configuration to disable this warning."
+              );
+            }
+            const kvReadsBefore = ((_a2 = ctx.metrics) == null ? void 0 : _a2.totalKvReads) ?? 0;
+            const kvWritesBefore = ((_b = ctx.metrics) == null ? void 0 : _b.totalKvWrites) ?? 0;
+            const start = performance.now();
+            try {
+              if (args.length > 0) {
+                const bindings = args.length === 1 && isSqliteBindingObject(args[0]) ? toSqliteBindings(args[0]) : toSqliteBindings(args);
+                const { rows, columns } = await target.execute(
+                  query,
+                  bindings
+                );
+                return rows.map(
+                  (row) => rowToObject(row, columns)
+                );
+              }
+              if (!hasMultipleStatements(query)) {
+                const { rows, columns } = await target.execute(
+                  query,
+                  void 0
+                );
+                return rows.map(
+                  (row) => rowToObject(row, columns)
+                );
+              }
+              return await execMultiStatement(
+                target,
+                query
+              );
+            } finally {
+              const durationMs = performance.now() - start;
+              (_c = ctx.metrics) == null ? void 0 : _c.trackSql(query, durationMs);
+              if (ctx.metrics) {
+                const kvReads = ctx.metrics.totalKvReads - kvReadsBefore;
+                const kvWrites = ctx.metrics.totalKvWrites - kvWritesBefore;
+                (_d = ctx.log) == null ? void 0 : _d.debug({
+                  msg: "sql query",
+                  query: query.slice(0, 120),
+                  durationMs,
+                  kvReads,
+                  kvWrites
+                });
+              }
+            }
+          },
+          transaction: async (callback, options) => {
+            var _a2, _b;
+            validateTransactionTimeout(options == null ? void 0 : options.timeout);
+            validateTransactionName(options == null ? void 0 : options.name);
+            if (transactionScoped && ((_a2 = options == null ? void 0 : options.experimental) == null ? void 0 : _a2.includeState)) {
+              throw new Error(
+                "experimental.includeState is not supported for nested transactions"
+              );
+            }
+            const includeState = ((_b = options == null ? void 0 : options.experimental) == null ? void 0 : _b.includeState) === true;
+            const stateScope = includeState && stateTransactionContext ? await stateTransactionContext.enter() : void 0;
+            try {
+              const transaction = includeState ? await (() => {
+                const beginStateTransaction = ctx.nativeDatabaseProvider && nativeStateTransactionOpeners.get(
+                  ctx.nativeDatabaseProvider
+                );
+                if (!beginStateTransaction) {
+                  throw new Error(
+                    "experimental.includeState is only supported by RivetKit's embedded database provider"
+                  );
+                }
+                return beginStateTransaction(
+                  options == null ? void 0 : options.timeout,
+                  stateScope
+                );
+              })() : await db2.beginTransaction(
+                options == null ? void 0 : options.timeout,
+                options == null ? void 0 : options.name
+              );
+              const tx = createClient(transaction, true);
+              try {
+                const result = await callback(tx);
+                await transaction.commit();
+                return result;
+              } catch (error46) {
+                try {
+                  await transaction.rollback();
+                } catch {
+                }
+                throw error46;
+              }
+            } finally {
+              if (stateScope !== void 0) {
+                stateTransactionContext == null ? void 0 : stateTransactionContext.exit(stateScope);
+              }
+            }
+          },
+          close: async () => {
+            if (!closed) {
+              closed = true;
+              await db2.close();
+            }
+          },
+          nativeMetrics: () => {
+            var _a2;
+            return ((_a2 = db2.nativeMetrics) == null ? void 0 : _a2.call(db2)) ?? null;
+          }
+        };
+        if (!transactionScoped) {
+          nativeStateTransactionClientBinders.set(
+            client2,
+            (context) => createClient(target, false, context)
+          );
+        }
+        return client2;
+      };
+      const client = createClient(db2);
+      return client;
+    },
+    onMigrate: async (client) => {
+      if (onMigrate) {
+        await withMigrationSavepoint(
+          client,
+          (leased) => onMigrate(leased)
+        );
+      }
+    }
+  };
+  return provider;
+}
+function rowToObject(row, columns) {
+  const rowObj = {};
+  for (let i = 0; i < columns.length; i++) {
+    rowObj[columns[i]] = row[i];
+  }
+  return rowObj;
+}
+async function execMultiStatement(db2, query) {
+  const results = [];
+  let columnNames = null;
+  await db2.exec(query, (row, columns) => {
+    if (!columnNames) {
+      columnNames = columns;
+    }
+    results.push(rowToObject(row, columnNames));
+  });
+  return results;
+}
+async function withMigrationSavepoint(client, callback) {
+  return await client.transaction(
+    async (transaction) => {
+      await transaction.execute("SAVEPOINT __rivet_on_migrate");
+      try {
+        const result = await callback(transaction);
+        await transaction.execute(
+          "RELEASE SAVEPOINT __rivet_on_migrate"
+        );
+        return result;
+      } catch (error46) {
+        try {
+          await transaction.execute(
+            "ROLLBACK TO SAVEPOINT __rivet_on_migrate"
+          );
+        } finally {
+          await transaction.execute(
+            "RELEASE SAVEPOINT __rivet_on_migrate"
+          );
+        }
+        throw error46;
+      }
+    },
+    {
+      name: "rivetkit-migration",
+      timeout: MIGRATION_TRANSACTION_TIMEOUT_MS
+    }
+  );
+}
+
 // ../../../shared/typescript/virtual-websocket/dist/mod.js
 var VirtualWebSocket = class {
   static CONNECTING = 0;
@@ -22677,7 +23002,6 @@ onChange.unsubscribe = (proxy) => proxy?.[UNSUBSCRIBE] ?? proxy;
 var source_default = onChange;
 
 // ../rivetkit/dist/tsup/mod.js
-var import_meta = {};
 function loggerWithoutContext() {
   return getLogger("actor-runtime");
 }
@@ -23764,11 +24088,33 @@ function wrapJsNativeDatabase(database) {
         release();
       }
     },
-    async beginTransaction(timeoutMs) {
+    async beginTransaction(timeoutMs, name) {
       const release = gate.enter();
       let transaction;
       try {
-        transaction = await database.beginTransaction(timeoutMs);
+        transaction = await database.beginTransaction(timeoutMs, name);
+      } catch (error46) {
+        enrichNativeDatabaseError(database, error46);
+      } 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.beginStateTransaction(
+          timeoutMs,
+          context
+        );
       } catch (error46) {
         enrichNativeDatabaseError(database, error46);
       } finally {
@@ -23875,45 +24221,37 @@ var nodeChildProcess;
 var nodeStream;
 var nodeUrl;
 var hasImportedDependencies = false;
-function getRequireFn() {
-  return (0, import_module.createRequire)(import_meta.url);
+var fallbackRequire;
+function loadNodeBuiltin(id) {
+  var _a2;
+  const nodeProcess = globalThis.process;
+  const builtin = (_a2 = nodeProcess == null ? void 0 : nodeProcess.getBuiltinModule) == null ? void 0 : _a2.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 ??= (0, import_module.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(
@@ -23960,6 +24298,9 @@ function asNativeWebSocket(handle) {
 function asNativeSqlTransaction(handle) {
   return handle;
 }
+function asNativeActorStateTransaction(handle) {
+  return handle;
+}
 function asNativeCancellationToken(handle) {
   return handle;
 }
@@ -24183,6 +24524,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);
   }
@@ -24343,9 +24687,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) {
@@ -24364,6 +24709,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,
@@ -24421,6 +24786,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,
@@ -24607,6 +24979,164 @@ function validationError(target, issues) {
     metadata: { issues }
   });
 }
+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 _a2;
+    const state = this.#getOrCreate(actorId);
+    state.restart = restart;
+    this.#initializeInspector(actorId, state);
+    return (_a2 = state.inspector) == null ? void 0 : _a2.inspector;
+  }
+  destroy(actorId) {
+    var _a2, _b;
+    const state = this.#states.get(actorId);
+    if (!state) return;
+    state.closed = true;
+    (_b = (_a2 = state.inspector) == null ? void 0 : _a2.dispose) == null ? void 0 : _b.call(_a2);
+    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 (error46) {
+            state.exclusiveOutcome = "failure";
+            throw error46;
+          } 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;
+  }
+};
+function asWasmConstructors(bindings) {
+  return bindings;
+}
 function asWasmRegistry(handle) {
   return handle;
 }
@@ -24731,10 +25261,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);
@@ -24747,7 +25277,7 @@ var WasmCoreRuntime = class {
   }
   createRegistry() {
     return callWasmSync(
-      () => asRegistryHandle2(new this.#bindings.CoreRegistry())
+      () => asRegistryHandle2(new this.#constructors.CoreRegistry())
     );
   }
   registerActor(registry2, name, factory) {
@@ -24802,13 +25332,13 @@ var WasmCoreRuntime = class {
   createActorFactory(callbacks, config3) {
     return callWasmSync(
       () => asActorFactoryHandle2(
-        new this.#bindings.ActorFactory(callbacks, config3)
+        new this.#constructors.ActorFactory(callbacks, config3)
       )
     );
   }
   createCancellationToken() {
     return callWasmSync(
-      () => new this.#bindings.CancellationToken()
+      () => new this.#constructors.CancellationToken()
     );
   }
   cancellationTokenAborted(token) {
@@ -24843,6 +25373,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);
   }
@@ -25057,9 +25594,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) {
@@ -25083,6 +25620,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));
   }
@@ -25155,6 +25713,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(
@@ -25363,7 +25931,7 @@ function unwrapProxy(value) {
   }
   return current;
 }
-function isPlainObject3(value) {
+function isPlainObject4(value) {
   const proto = Object.getPrototypeOf(value);
   return proto === Object.prototype || proto === null;
 }
@@ -25416,7 +25984,7 @@ function unwrapDeep(value, seen) {
     }
     return unwrapped;
   }
-  if (isPlainObject3(unwrapped)) {
+  if (isPlainObject4(unwrapped)) {
     for (const key of Object.keys(unwrapped)) {
       const child = unwrapDeep(unwrapped[key], seen);
       if (child !== unwrapped[key]) {
@@ -25573,6 +26141,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",
@@ -25589,6 +26165,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",
@@ -25691,10 +26275,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),
@@ -25707,6 +26292,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),
@@ -26087,12 +26704,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() {
@@ -26118,29 +26739,35 @@ var NativeConnAdapter = class {
     if (!this.#ctx) {
       return this.#createStateProxy(nextState);
     }
-    const connState = getNativeConnPersistState(
-      this.#runtime,
-      this.#ctx,
-      this.#conn
-    );
-    if (connState.stateProxy === void 0 || connState.stateProxyTarget !== nextState) {
-      connState.stateProxyTarget = nextState;
-      connState.stateProxy = this.#createStateProxy(nextState);
+    if (this.#stateProxy === void 0 || this.#stateProxyTarget !== nextState) {
+      this.#stateProxyTarget = nextState;
+      this.#stateProxy = this.#createStateProxy(nextState);
     }
-    return connState.stateProxy;
+    return this.#stateProxy;
   }
   #createStateProxy(state) {
+    const assertCurrentState = () => {
+      var _a2;
+      (_a2 = this.#assertCanMutateState) == null ? void 0 : _a2.call(this);
+      if (this.#ctx && this.#readState() !== state) {
+        throw stateTransactionConflictError();
+      }
+    };
     return createWriteThroughProxy(
       state,
       (nextValue) => {
+        assertCurrentState();
         this.#writeState(nextValue, { writeNative: true });
       },
       (newValue) => {
+        assertCurrentState();
         assertJsonCompatValue(newValue);
       }
     );
   }
   set state(value) {
+    var _a2;
+    (_a2 = this.#assertCanMutateState) == null ? void 0 : _a2.call(this);
     const nextValue = unwrapWriteThroughProxy(value);
     assertJsonCompatValue(nextValue);
     this.#writeState(nextValue, { writeNative: true });
@@ -26466,8 +27093,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,
@@ -26605,6 +27233,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(
@@ -27041,10 +27688,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(
@@ -27057,7 +27706,8 @@ var NativeConnectionMap = class {
           this.#ctx,
           connId
         )
-      )
+      ),
+      this.#assertCanMutateState
     );
   }
   get size() {
@@ -27116,17 +27766,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) {
@@ -27143,12 +27796,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)
@@ -27164,7 +27811,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();
@@ -27179,22 +27826,28 @@ 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) {
@@ -27237,6 +27890,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(
@@ -27271,7 +27944,8 @@ var ActorContextHandleAdapter = class {
       this.#connMap = new NativeConnectionMap(
         this.#runtime,
         this.#ctx,
-        this.#schemas
+        this.#schemas,
+        () => this.#assertCanMutateState()
       );
     }
     return this.#connMap;
@@ -27340,11 +28014,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) => {
@@ -27365,21 +28039,126 @@ var ActorContextHandleAdapter = class {
       log: {
         debug: (obj) => logger22().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 (error46) {
+      pendingOwners.delete(this.#stateTransactionOwner);
+      if (actorState.activeStateTransactionOwner === this.#stateTransactionOwner) {
+        actorState.activeStateTransactionOwner = void 0;
+      }
+      release();
+      throw error46;
+    }
+  }
+  #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 cached2 = actorState.connStates.get(connId);
+      if (cached2) {
+        cached2.state = decodeValue(baseline);
+      }
+    }
+    this.#scheduleSave();
   }
   async prepare() {
     if (!this.#databaseProvider) {
@@ -27397,7 +28176,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);
   }
@@ -27417,6 +28195,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
@@ -27437,10 +28216,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);
@@ -27494,10 +28280,6 @@ var ActorContextHandleAdapter = class {
     }
     return promise2;
   }
-  runHandlerActive() {
-    var _a2;
-    return ((_a2 = this.#runHandlerActiveProvider) == null ? void 0 : _a2.call(this)) ?? false;
-  }
   internalKeepAwake(run) {
     const promise2 = typeof run === "function" ? run() : run;
     const trackedPromise = promise2.then(
@@ -27579,7 +28361,6 @@ var ActorContextHandleAdapter = class {
     var _a2;
     this.#flushStateChange();
     (_a2 = this.#abortSignalCleanup) == null ? void 0 : _a2.call(this);
-    this.#sql = void 0;
   }
   #createActorAbortSignal() {
     const nativeSignal = callNativeSync(
@@ -27613,10 +28394,18 @@ var ActorContextHandleAdapter = class {
     this.#scheduleSave();
   }
   #assertCanMutateState() {
+    var _a2;
     const actorState = getNativePersistState(this.#runtime, this.#ctx);
     if (actorState.isInOnStateChange) {
       throw stateMutationReentrantError();
     }
+    if (actorState.activeStateTransactionOwner !== this.#stateTransactionOwner && (actorState.activeStateTransactionOwner !== void 0 || (((_a2 = actorState.pendingStateTransactionOwners) == null ? void 0 : _a2.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
@@ -27638,6 +28427,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);
@@ -27761,9 +28559,6 @@ var NativeWorkflowRuntimeAdapter = class {
       }
     };
   }
-  isRunHandlerActive() {
-    return this.#ctx.runHandlerActive();
-  }
   async restartRunHandler() {
     await this.#ctx.restartRunHandler();
   }
@@ -27796,43 +28591,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 _a2;
   const config3 = definition.config;
   const options = config3.options ?? {};
   const canHibernate = options.canHibernateWebSocket;
   const usesRemoteSqlite = sqliteBackendForConfig(registryConfig) === "remote";
+  const sqliteProfiling = (_a2 = config3.db) == null ? void 0 : _a2.sqliteProfiling;
   return {
     name: options.name,
     icon: options.icon,
-    hasDatabase: config3.db !== void 0 || usesRemoteSqlite,
+    hasDatabase: true,
     remoteSqlite: usesRemoteSqlite,
+    sqliteProfiling,
     enableActorRuntimeSocket: options.enableActorRuntimeSocket === true,
     hasState: config3.state !== void 0 || typeof config3.createState === "function",
     canHibernateWebsocket: typeof canHibernate === "boolean" ? canHibernate : void 0,
@@ -27931,7 +28728,7 @@ function validateInspectorTabSource(tabId, resolved) {
 function buildNativeFactory(runtime, registryConfig, definition) {
   var _a2;
   const config3 = definition.config;
-  const databaseProvider = config3.db;
+  const databaseProvider = config3.db ?? db();
   const actionHandlers = flattenActionHandlers(config3.actions);
   const schemaConfig = {
     actionInputSchemas: flattenActionInputSchemas(
@@ -27948,16 +28745,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(config3.run);
+  const runHandlerCoordinator = getRunInspectorKind(config3.run) === "workflow" ? new RunHandlerCoordinator(config3.run) : void 0;
   const getNativeWorkflowInspector = (ctx) => {
-    var _a22;
-    return (_a22 = getRunInspectorConfig(
-      config3.run,
-      callNativeSync(() => runtime.actorId(ctx))
-    )) == null ? void 0 : _a22.workflow;
+    var _a22, _b;
+    const actorId = callNativeSync(() => runtime.actorId(ctx));
+    const restart = () => callNativeSync(() => runtime.actorRestartRunHandler(ctx));
+    return ((_a22 = runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.getInspector(actorId, restart)) == null ? void 0 : _a22.workflow) ?? ((_b = getRunInspectorConfig(config3.run, actorId)) == null ? void 0 : _b.workflow);
   };
   const onStateChange = typeof config3.onStateChange === "function" ? (actorCtx, nextState) => {
     config3.onStateChange(actorCtx, nextState);
@@ -27977,9 +28771,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,
@@ -27991,7 +28785,8 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     request,
     stateEnabled,
     onStateChange,
-    cancelToken
+    cancelToken,
+    run !== void 0
   );
   const maybeHandleNativeInspectorRequest = async (ctx, _rawRequest, jsRequest) => {
     var _a22, _b, _c, _d;
@@ -28042,6 +28837,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 (url2.pathname === "/inspector/state" && jsRequest.method === "GET") {
         return jsonResponse({
@@ -28169,9 +28965,9 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         }
       }
       if (url2.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"
           )
         );
@@ -28179,13 +28975,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}`
             )
           );
@@ -28220,7 +29016,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)),
@@ -28248,15 +29044,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 (url2.pathname === "/inspector/summary" && jsRequest.method === "GET") {
@@ -28282,7 +29074,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()
@@ -28472,6 +29264,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
       async (error46, payload) => {
         const { ctx } = unwrapTsfnPayload(error46, payload);
         const actorCtx = makeActorCtx(ctx);
+        const actorId = callNativeSync(() => runtime.actorId(ctx));
         const saveActorState = async () => {
           if (runtime.kind === "wasm") {
             await runtime.actorSaveState(
@@ -28497,6 +29290,8 @@ function buildNativeFactory(runtime, registryConfig, definition) {
               saveActorState
             );
           } finally {
+            runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.destroy(actorId);
+            disposeRunInspector(config3.run, actorId);
             await actorCtx.dispose();
           }
         }
@@ -28506,14 +29301,14 @@ function buildNativeFactory(runtime, registryConfig, definition) {
       async (error46, payload) => {
         const { ctx } = unwrapTsfnPayload(error46, payload);
         const actorCtx = makeActorCtx(ctx);
+        const actorId = callNativeSync(() => runtime.actorId(ctx));
+        runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.destroy(actorId);
+        disposeRunInspector(config3.run, actorId);
         try {
           if (typeof config3.onDestroy === "function") {
             await config3.onDestroy(actorCtx);
           }
         } finally {
-          const actorId = callNativeSync(() => runtime.actorId(ctx));
-          nativeRunHandlerActiveByActorId.delete(actorId);
-          disposeRunInspector(config3.run, actorId);
           resolveNativeDestroy(runtime, ctx);
           await actorCtx.closeDatabase();
           clearNativeRuntimeState(runtime, ctx);
@@ -28561,7 +29356,8 @@ function buildNativeFactory(runtime, registryConfig, definition) {
               ctx,
               connId
             )
-          )
+          ),
+          () => actorCtx.assertCanMutateState()
         );
         try {
           const nextConnState = hasStaticConnState ? structuredClone(config3.connState) : await config3.createConnState(
@@ -28598,7 +29394,8 @@ function buildNativeFactory(runtime, registryConfig, definition) {
               ctx,
               connId
             )
-          )
+          ),
+          () => actorCtx.assertCanMutateState()
         );
         try {
           await config3.onConnect(
@@ -28630,7 +29427,8 @@ function buildNativeFactory(runtime, registryConfig, definition) {
                     ctx,
                     connId
                   )
-                )
+                ),
+                () => actorCtx.assertCanMutateState()
               )
             );
           }
@@ -28774,7 +29572,6 @@ function buildNativeFactory(runtime, registryConfig, definition) {
       }
     ) : void 0,
     run: (() => {
-      const run = getRunFunction(config3.run);
       if (!run) {
         return void 0;
       }
@@ -28782,18 +29579,30 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         async (error46, payload) => {
           const { ctx } = unwrapTsfnPayload(error46, 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(config3.run) !== void 0 ? wrapNativeCallback(
+    getWorkflowHistory: hasRunInspectorConfig(config3.run) ? wrapNativeCallback(
       async (error46, payload) => {
         var _a22;
         const { ctx } = unwrapTsfnPayload(error46, payload);
@@ -28801,7 +29610,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         return history == null ? void 0 : toUint8Array(history);
       }
     ) : void 0,
-    replayWorkflow: getRunInspectorConfig(config3.run) !== void 0 ? wrapNativeCallback(
+    replayWorkflow: hasRunInspectorConfig(config3.run) ? wrapNativeCallback(
       async (error46, payload) => {
         const { ctx, entryId } = unwrapTsfnPayload(
           error46,
@@ -28811,9 +29620,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,
@@ -28866,7 +29673,8 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           jsRequest,
           stateEnabled,
           onStateChange,
-          cancelToken
+          cancelToken,
+          run !== void 0
         );
         try {
           if (!schemaConfig.queues || !hasSchemaConfigKey(schemaConfig.queues, name)) {
@@ -29749,7 +30557,7 @@ function setup(input) {
 }
 
 // src/mod.ts
-var import_meta2 = {};
+var import_meta = {};
 var DEFAULT_MANAGER_PATH = "/api/rivet";
 function setup2(config3) {
   return setup({
@@ -29760,7 +30568,7 @@ function setup2(config3) {
   });
 }
 var resolveWasmUrl = () => new URL(
-  import_meta2.resolve("@rivetkit/rivetkit-wasm/rivetkit_wasm_bg.wasm")
+  import_meta.resolve("@rivetkit/rivetkit-wasm/rivetkit_wasm_bg.wasm")
 );
 function applyEnv(config3, managerPath) {
   if (!config3.endpoint) {
@@ -29837,6 +30645,7 @@ async function serve(registryOrConfig, options = {}) {
   actor,
   buildActorNames,
   createClientWithDriver,
+  defineRunHandler,
   event,
   isStaticActorDefinition,
   isStaticActorInstance,