rivetkit 2.3.0-rc.9 → 2.3.0

package/dist/tsup/mod.cjs

@@ -1,15 +1,15 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } var _class; var _class2;
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } var _class; var _class2; var _class3;
 
+var _chunk47HHIEXHcjs = require('./chunk-47HHIEXH.cjs');
 
 
 
 
 
-var _chunkWQ4HNA4Wcjs = require('./chunk-WQ4HNA4W.cjs');
 
 
-var _chunk4CGA6QJOcjs = require('./chunk-4CGA6QJO.cjs');
 
+var _chunkNIY3RSPXcjs = require('./chunk-NIY3RSPX.cjs');
 
 
 
@@ -18,23 +18,23 @@ var _chunk4CGA6QJOcjs = require('./chunk-4CGA6QJO.cjs');
 
 
 
-var _chunkGVTOE34Scjs = require('./chunk-GVTOE34S.cjs');
 
+var _chunk7QKCIVAYcjs = require('./chunk-7QKCIVAY.cjs');
 
 
 
 
 
 
-var _chunkLD5YASJUcjs = require('./chunk-LD5YASJU.cjs');
 
+var _chunkVE2X4KMGcjs = require('./chunk-VE2X4KMG.cjs');
 
 
 
-var _chunkVJFRBJVQcjs = require('./chunk-VJFRBJVQ.cjs');
-require('./chunk-2NDZ7JCR.cjs');
-require('./chunk-MALSPBAF.cjs');
 
+var _chunk3677IIOVcjs = require('./chunk-3677IIOV.cjs');
+require('./chunk-ZA7FLHKH.cjs');
+require('./chunk-LVTBW2RE.cjs');
 
 
 
@@ -57,22 +57,26 @@ require('./chunk-MALSPBAF.cjs');
 
 
 
-var _chunkY5NSCZA2cjs = require('./chunk-Y5NSCZA2.cjs');
 
 
 
 
+var _chunkDXXJPH55cjs = require('./chunk-DXXJPH55.cjs');
 
 
 
 
 
 
-var _chunkQAZLM4WTcjs = require('./chunk-QAZLM4WT.cjs');
+
+
+
+
+var _chunkKORQB2IRcjs = require('./chunk-KORQB2IR.cjs');
 
 // src/actor/log.ts
 function loggerWithoutContext() {
-  return _chunkY5NSCZA2cjs.getLogger.call(void 0, "actor-runtime");
+  return _chunkDXXJPH55cjs.getLogger.call(void 0, "actor-runtime");
 }
 
 // src/actor/definition.ts
@@ -105,7 +109,7 @@ function actor(input) {
   warnDeprecatedShutdownTimeoutKeys(
     input == null ? void 0 : input.options
   );
-  const config = _chunkWQ4HNA4Wcjs.ActorConfigSchema.parse(input);
+  const config = _chunkNIY3RSPXcjs.ActorConfigSchema.parse(input);
   return new ActorDefinition(config);
 }
 function isStaticActorDefinition(definition) {
@@ -140,7 +144,7 @@ function hasSchemaConfigKey(schemas, key) {
   if (!schemas) {
     return false;
   }
-  return Object.prototype.hasOwnProperty.call(schemas, key);
+  return Object.hasOwn(schemas, key);
 }
 function getEventCanSubscribe(schemas, key) {
   const schema = schemas == null ? void 0 : schemas[key];
@@ -187,7 +191,7 @@ function validateSchemaSync(schemas, key, data) {
   if (isStandardSchema(schema)) {
     const result = schema["~standard"].validate(data);
     if (isPromiseLike(result)) {
-      throw _chunkQAZLM4WTcjs.unsupportedFeature.call(void 0, "async schema validation");
+      throw _chunkKORQB2IRcjs.unsupportedFeature.call(void 0, "async schema validation");
     }
     if (result.issues) {
       return { success: false, issues: [...result.issues] };
@@ -201,10 +205,10 @@ function validateSchemaSync(schemas, key, data) {
 }
 
 // src/common/inline-websocket-adapter.ts
-var _ws = require('hono/ws');
 var _virtualwebsocket = require('@rivetkit/virtual-websocket');
+var _ws = require('hono/ws');
 function logger() {
-  return _chunkY5NSCZA2cjs.getLogger.call(void 0, "inline-websocket-adapter");
+  return _chunkDXXJPH55cjs.getLogger.call(void 0, "inline-websocket-adapter");
 }
 var InlineWebSocketAdapter = class {
   #handler;
@@ -314,24 +318,24 @@ var InlineWebSocketAdapter = class {
       this.#close(1011, "Internal error during initialization");
     }
   }
-  #handleError(err) {
-    console.error("INLINE_WEBSOCKET_ADAPTER_ERROR", err);
+  #handleError(error) {
+    console.error("INLINE_WEBSOCKET_ADAPTER_ERROR", error);
     logger().error({
       msg: "error in websocket",
-      error: err,
-      errorMessage: err instanceof Error ? err.message : String(err),
-      stack: err instanceof Error ? err.stack : void 0
+      error,
+      errorMessage: error instanceof Error ? error.message : String(error),
+      stack: error instanceof Error ? error.stack : void 0
     });
     try {
-      this.#handler.onError(err, this.#wsContext);
-    } catch (handlerErr) {
+      this.#handler.onError(error, this.#wsContext);
+    } catch (error2) {
       logger().error({
         msg: "error in onError handler",
-        error: handlerErr
+        error: error2
       });
     }
-    this.#clientWs.triggerError(err);
-    this.#actorWs.triggerError(err);
+    this.#clientWs.triggerError(error);
+    this.#actorWs.triggerError(error);
   }
   #close(code, reason) {
     if (this.#readyState === 3 || this.#readyState === 2) {
@@ -344,8 +348,8 @@ var InlineWebSocketAdapter = class {
         { code, reason, wasClean: true },
         this.#wsContext
       );
-    } catch (err) {
-      logger().error({ msg: "error closing websocket", error: err });
+    } catch (error) {
+      logger().error({ msg: "error closing websocket", error });
     } finally {
       this.#readyState = 3;
       this.#clientWs.triggerClose(code, reason);
@@ -354,13 +358,31 @@ var InlineWebSocketAdapter = class {
   }
 };
 
+// src/registry/index.ts
+var _hono = require('hono');
+
 // src/common/engine.ts
+var ENGINE_HOST = "127.0.0.1";
 var ENGINE_PORT = 6420;
-var ENGINE_ENDPOINT = `http://127.0.0.1:${ENGINE_PORT}`;
+var ENGINE_ENDPOINT = buildEngineEndpoint(ENGINE_HOST, ENGINE_PORT);
+function buildEngineEndpoint(host, port) {
+  const urlHost = host.includes(":") && !host.startsWith("[") ? `[${host}]` : host;
+  return `http://${urlHost}:${port}`;
+}
+function isLocalEngineEndpoint(endpoint) {
+  let url;
+  try {
+    url = new URL(endpoint);
+  } catch (e) {
+    return false;
+  }
+  const hostname = url.hostname.toLowerCase();
+  return hostname === "localhost" || hostname === "0.0.0.0" || hostname === "::" || hostname === "[::]" || hostname === "::1" || hostname === "[::1]" || /^127(?:\.\d{1,3}){0,3}$/.test(hostname);
+}
 
 // src/registry/log.ts
 function logger2() {
-  return _chunkY5NSCZA2cjs.getLogger.call(void 0, "registry");
+  return _chunkDXXJPH55cjs.getLogger.call(void 0, "registry");
 }
 
 // src/serverless/configure.ts
@@ -371,10 +393,13 @@ function sleep(ms) {
 }
 function configureTimeoutMs() {
   const value = process.env.RIVET_SERVERLESS_CONFIGURE_TIMEOUT_MS;
-  if (value === void 0 || value === "") return DEFAULT_CONFIGURE_TIMEOUT_MS;
+  if (value === void 0 || value === "")
+    return DEFAULT_CONFIGURE_TIMEOUT_MS;
   const parsed = Number(value);
   if (!Number.isFinite(parsed) || parsed < 0) {
-    throw new Error("RIVET_SERVERLESS_CONFIGURE_TIMEOUT_MS must be a finite non-negative number");
+    throw new Error(
+      "RIVET_SERVERLESS_CONFIGURE_TIMEOUT_MS must be a finite non-negative number"
+    );
   }
   return parsed;
 }
@@ -388,17 +413,23 @@ async function configureServerlessPool(config) {
     attempts += 1;
     try {
       if (!config.namespace) {
-        throw new Error("namespace is required for serverless configuration");
+        throw new Error(
+          "namespace is required for serverless configuration"
+        );
       }
       if (!config.endpoint) {
-        throw new Error("endpoint is required for serverless configuration");
+        throw new Error(
+          "endpoint is required for serverless configuration"
+        );
       }
       if (!config.configurePool) {
-        throw new Error("configurePool is required for serverless configuration");
+        throw new Error(
+          "configurePool is required for serverless configuration"
+        );
       }
       const customConfig = config.configurePool;
-      const clientConfig = _chunkGVTOE34Scjs.convertRegistryConfigToClientConfig.call(void 0, config);
-      const dcsRes = await _chunkGVTOE34Scjs.getDatacenters.call(void 0, clientConfig);
+      const clientConfig = _chunk7QKCIVAYcjs.convertRegistryConfigToClientConfig.call(void 0, config);
+      const dcsRes = await _chunk7QKCIVAYcjs.getDatacenters.call(void 0, clientConfig);
       const poolName = _nullishCoalesce(customConfig.name, () => ( "default"));
       const serverlessToken = _nullishCoalesce(config.token, () => ( config.publicToken));
       const headers = {
@@ -420,7 +451,7 @@ async function configureServerlessPool(config) {
         metadata: _nullishCoalesce(customConfig.metadata, () => ( {})),
         drain_on_version_upgrade: _nullishCoalesce(customConfig.drainOnVersionUpgrade, () => ( true))
       };
-      await _chunkGVTOE34Scjs.updateRunnerConfig.call(void 0, clientConfig, poolName, {
+      await _chunk7QKCIVAYcjs.updateRunnerConfig.call(void 0, clientConfig, poolName, {
         datacenters: Object.fromEntries(
           dcsRes.datacenters.map((dc) => [dc.name, serverlessConfig])
         )
@@ -437,7 +468,7 @@ async function configureServerlessPool(config) {
       logger2().warn({
         msg: "serverless pool configuration attempt failed",
         attempts,
-        error: _chunkY5NSCZA2cjs.stringifyError.call(void 0, error)
+        error: _chunkDXXJPH55cjs.stringifyError.call(void 0, error)
       });
       await sleep(CONFIGURE_RETRY_DELAY_MS);
     }
@@ -445,11 +476,150 @@ async function configureServerlessPool(config) {
   logger2().error({
     msg: "failed to configure serverless pool, validate endpoint is configured correctly then restart this process",
     attempts,
-    error: _chunkY5NSCZA2cjs.stringifyError.call(void 0, lastError)
+    error: _chunkDXXJPH55cjs.stringifyError.call(void 0, lastError)
   });
   throw lastError;
 }
 
+// src/utils/serve.ts
+var _getport = require('get-port'); var _getport2 = _interopRequireDefault(_getport);
+var serveStaticLoaderPromises = {};
+async function crossPlatformServe(config, httpPort, app, runtime = _chunkDXXJPH55cjs.detectRuntime.call(void 0, )) {
+  logger2().debug({ msg: "detected runtime for serve", runtime });
+  switch (runtime) {
+    case "deno":
+      return serveDeno(config, httpPort, app);
+    case "bun":
+      return serveBun(config, httpPort, app);
+    case "node":
+      return serveNode(config, httpPort, app);
+    default:
+      return serveNode(config, httpPort, app);
+  }
+}
+async function loadRuntimeServeStatic(runtime) {
+  if (!serveStaticLoaderPromises[runtime]) {
+    if (runtime === "node") {
+      const nodeServeStaticModule = "@hono/node-server/serve-static";
+      serveStaticLoaderPromises[runtime] = Promise.resolve().then(() => _interopRequireWildcard(require(
+        /* webpackIgnore: true */
+        nodeServeStaticModule
+      ))).then((x) => x.serveStatic);
+    } else if (runtime === "bun") {
+      const bunModule = "hono/bun";
+      serveStaticLoaderPromises[runtime] = Promise.resolve().then(() => _interopRequireWildcard(require(
+        /* webpackIgnore: true */
+        bunModule
+      ))).then((x) => x.serveStatic);
+    } else if (runtime === "deno") {
+      const denoModule = "hono/deno";
+      serveStaticLoaderPromises[runtime] = Promise.resolve().then(() => _interopRequireWildcard(require(
+        /* webpackIgnore: true */
+        denoModule
+      ))).then((x) => x.serveStatic);
+    } else {
+      throw new Error(`unsupported runtime: ${runtime}`);
+    }
+  }
+  return await serveStaticLoaderPromises[runtime];
+}
+async function serveNode(config, httpPort, app) {
+  const nodeServerModule = "@hono/node-server";
+  let serve;
+  try {
+    const dep = await Promise.resolve().then(() => _interopRequireWildcard(require(
+      /* webpackIgnore: true */
+      nodeServerModule
+    )));
+    serve = dep.serve;
+  } catch (err) {
+    logger2().error({
+      msg: "failed to import @hono/node-server. please run 'npm install @hono/node-server @hono/node-ws'",
+      error: _chunkDXXJPH55cjs.stringifyError.call(void 0, err)
+    });
+    process.exit(1);
+  }
+  const nodeWsModule = "@hono/node-ws";
+  let createNodeWebSocket;
+  try {
+    const dep = await Promise.resolve().then(() => _interopRequireWildcard(require(
+      /* webpackIgnore: true */
+      nodeWsModule
+    )));
+    createNodeWebSocket = dep.createNodeWebSocket;
+  } catch (err) {
+    logger2().error({
+      msg: "failed to import @hono/node-ws. please run 'npm install @hono/node-server @hono/node-ws'",
+      error: _chunkDXXJPH55cjs.stringifyError.call(void 0, err)
+    });
+    process.exit(1);
+  }
+  const { injectWebSocket, upgradeWebSocket } = createNodeWebSocket({
+    app
+  });
+  const port = httpPort;
+  const hostname = config.httpHost;
+  const server = serve(
+    { fetch: app.fetch, port, hostname },
+    () => logger2().info({ msg: "server listening", port, hostname })
+  );
+  injectWebSocket(server);
+  const closeServer = () => {
+    server.close();
+  };
+  return { upgradeWebSocket, closeServer };
+}
+async function serveDeno(config, httpPort, app) {
+  const honoDenoModule = "hono/deno";
+  let upgradeWebSocket;
+  try {
+    const dep = await Promise.resolve().then(() => _interopRequireWildcard(require(
+      /* webpackIgnore: true */
+      honoDenoModule
+    )));
+    upgradeWebSocket = dep.upgradeWebSocket;
+  } catch (err) {
+    logger2().error({
+      msg: "failed to import hono/deno",
+      error: _chunkDXXJPH55cjs.stringifyError.call(void 0, err)
+    });
+    process.exit(1);
+  }
+  const port = httpPort;
+  const hostname = config.httpHost;
+  Deno.serve({ port, hostname }, app.fetch);
+  logger2().info({ msg: "server listening", port, hostname });
+  return { upgradeWebSocket };
+}
+async function serveBun(config, httpPort, app) {
+  const honoBunModule = "hono/bun";
+  let createBunWebSocket;
+  try {
+    const dep = await Promise.resolve().then(() => _interopRequireWildcard(require(
+      /* webpackIgnore: true */
+      honoBunModule
+    )));
+    createBunWebSocket = dep.createBunWebSocket;
+  } catch (err) {
+    logger2().error({
+      msg: "failed to import hono/bun",
+      error: _chunkDXXJPH55cjs.stringifyError.call(void 0, err)
+    });
+    process.exit(1);
+  }
+  const { websocket, upgradeWebSocket } = createBunWebSocket();
+  const port = httpPort;
+  const hostname = config.httpHost;
+  Bun.serve({
+    fetch: app.fetch,
+    port,
+    hostname,
+    websocket
+  });
+  logger2().info({ msg: "server listening", port, hostname });
+  return { upgradeWebSocket };
+}
+
 // src/registry/config/index.ts
 var _zod = require('zod');
 
@@ -457,20 +627,20 @@ var _zod = require('zod');
 var _v4 = require('zod/v4');
 var warnedMissingVersion = false;
 var EnvoyConfigSchema = _v4.z.object({
-  poolName: _v4.z.string().default(() => _nullishCoalesce(_chunkY5NSCZA2cjs.getRivetPool.call(void 0, ), () => ( "default"))),
+  poolName: _v4.z.string().default(() => _nullishCoalesce(_chunkDXXJPH55cjs.getRivetPool.call(void 0, ), () => ( "default"))),
   version: _v4.z.number().default(() => {
-    const version = _chunkY5NSCZA2cjs.getRivetEnvoyVersion.call(void 0, );
+    const version = _chunkDXXJPH55cjs.getRivetEnvoyVersion.call(void 0, );
     if (version !== void 0) return version;
-    if (_chunkY5NSCZA2cjs.getNodeEnv.call(void 0, ) === "production" && !warnedMissingVersion) {
+    if (_chunkDXXJPH55cjs.getNodeEnv.call(void 0, ) === "production" && !warnedMissingVersion) {
       warnedMissingVersion = true;
-      _chunkY5NSCZA2cjs.getLogger.call(void 0, "rivetkit").error(
+      _chunkDXXJPH55cjs.getLogger.call(void 0, "rivetkit").error(
         "RIVET_ENVOY_VERSION is not set. Actors will not be versioned, which means they won't be drained on deploy. This is only needed when self-hosting or using a custom envoy (not needed for Rivet Compute). Set this as a build arg in your Dockerfile. See https://rivet.dev/docs/actors/versions"
       );
     }
     return 1;
   }),
   // Deprecated.
-  totalSlots: _v4.z.number().default(() => _nullishCoalesce(_chunkY5NSCZA2cjs.getRivetTotalSlots.call(void 0, ), () => ( 1e5))),
+  totalSlots: _v4.z.number().default(() => _nullishCoalesce(_chunkDXXJPH55cjs.getRivetTotalSlots.call(void 0, ), () => ( 1e5))),
   envoyKey: _v4.z.string().optional()
 });
 
@@ -508,7 +678,7 @@ var ServerlessConfigSchema = _v4.z.object({
    *
    * Can also be set via RIVET_PUBLIC_ENDPOINT environment variable.
    */
-  publicEndpoint: _v4.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkY5NSCZA2cjs.getRivetPublicEndpoint.call(void 0, )))),
+  publicEndpoint: _v4.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkDXXJPH55cjs.getRivetPublicEndpoint.call(void 0, )))),
   /**
    * Token that clients should use when connecting via the public endpoint.
    *
@@ -516,7 +686,7 @@ var ServerlessConfigSchema = _v4.z.object({
    *
    * Can also be specified in the publicEndpoint URL as `https://namespace:token@host`.
    */
-  publicToken: _v4.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkY5NSCZA2cjs.getRivetPublicToken.call(void 0, ))))
+  publicToken: _v4.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkDXXJPH55cjs.getRivetPublicToken.call(void 0, ))))
   // There is no publicNamespace config option because the frontend and backend
   // cannot use different namespaces. The namespace is extracted from the
   // publicEndpoint URL auth syntax if provided.
@@ -570,7 +740,7 @@ var RegistryConfigSchema = _zod.z.object({
    * Runtime binding to use for RivetKit core.
    * */
   runtime: RuntimeKindSchema.optional().transform((val, ctx) => {
-    const rawRuntime = _nullishCoalesce(val, () => ( _chunkY5NSCZA2cjs.getRivetkitRuntime.call(void 0, )));
+    const rawRuntime = _nullishCoalesce(val, () => ( _chunkDXXJPH55cjs.getRivetkitRuntime.call(void 0, )));
     if (rawRuntime === void 0) {
       return "auto";
     }
@@ -607,7 +777,7 @@ var RegistryConfigSchema = _zod.z.object({
    * */
   logging: _zod.z.object({
     baseLogger: _zod.z.custom().optional(),
-    level: _chunkY5NSCZA2cjs.LogLevelSchema.optional()
+    level: _chunkDXXJPH55cjs.LogLevelSchema.optional()
   }).optional().default(() => ({})),
   // MARK: Routing
   // // This is a function to allow for lazy configuration of upgradeWebSocket on the
@@ -625,9 +795,9 @@ var RegistryConfigSchema = _zod.z.object({
    *
    * Can also be set via RIVET_ENDPOINT environment variables.
    */
-  endpoint: _zod.z.string().optional().transform((val) => _nullishCoalesce(_nullishCoalesce(val, () => ( _chunkY5NSCZA2cjs.getRivetEngine.call(void 0, ))), () => ( _chunkY5NSCZA2cjs.getRivetEndpoint.call(void 0, )))),
-  token: _zod.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkY5NSCZA2cjs.getRivetToken.call(void 0, )))),
-  namespace: _zod.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkY5NSCZA2cjs.getRivetNamespace.call(void 0, )))),
+  endpoint: _zod.z.string().optional().transform((val) => _nullishCoalesce(_nullishCoalesce(val, () => ( _chunkDXXJPH55cjs.getRivetEngine.call(void 0, ))), () => ( _chunkDXXJPH55cjs.getRivetEndpoint.call(void 0, )))),
+  token: _zod.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkDXXJPH55cjs.getRivetToken.call(void 0, )))),
+  namespace: _zod.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkDXXJPH55cjs.getRivetNamespace.call(void 0, )))),
   headers: _zod.z.record(_zod.z.string(), _zod.z.string()).optional().default({}),
   // MARK: Client
   // TODO:
@@ -667,9 +837,21 @@ var RegistryConfigSchema = _zod.z.object({
    *
    * Starts the full Rust engine process locally.
    */
-  startEngine: _zod.z.boolean().default(() => _chunkY5NSCZA2cjs.getRivetRunEngine.call(void 0, )),
+  startEngine: _zod.z.boolean().default(() => _chunkDXXJPH55cjs.getRivetRunEngine.call(void 0, )),
+  /**
+   * @experimental
+   *
+   * Host to bind the spawned local engine process to.
+   */
+  engineHost: _zod.z.string().optional().default(() => _nullishCoalesce(_chunkDXXJPH55cjs.getRivetRunEngineHost.call(void 0, ), () => ( ENGINE_HOST))),
+  /**
+   * @experimental
+   *
+   * Port to bind the spawned local engine process to.
+   */
+  enginePort: _zod.z.number().int().min(1).max(65535).optional().default(() => _nullishCoalesce(_chunkDXXJPH55cjs.getRivetRunEnginePort.call(void 0, ), () => ( ENGINE_PORT))),
   /** @experimental */
-  engineVersion: _zod.z.string().optional().default(() => _nullishCoalesce(_chunkY5NSCZA2cjs.getRivetRunEngineVersion.call(void 0, ), () => ( _chunkY5NSCZA2cjs.VERSION))),
+  engineVersion: _zod.z.string().optional().default(() => _nullishCoalesce(_chunkDXXJPH55cjs.getRivetRunEngineVersion.call(void 0, ), () => ( _chunkDXXJPH55cjs.VERSION))),
   /**
    * @experimental
    *
@@ -703,7 +885,7 @@ var RegistryConfigSchema = _zod.z.object({
      * after calling `CoreRegistry::shutdown()`. Defaults to the
      * engine-provided actor stop threshold once the envoy connects.
      *
-     * Must be >= rivetkit-core's drain timeout (20s) + margin.
+     * Must be long enough for rivetkit-core to drain the envoy.
      */
     gracePeriodMs: _zod.z.number().int().min(1e3).optional(),
     /**
@@ -717,7 +899,7 @@ var RegistryConfigSchema = _zod.z.object({
   }))
 }).transform((config, ctx) => {
   var _a, _b, _c;
-  const isDevEnv = _chunkY5NSCZA2cjs.isDev.call(void 0, );
+  const isDevEnv = _chunkDXXJPH55cjs.isDev.call(void 0, );
   const sqliteBackend = _nullishCoalesce(((_a = config.sqlite) == null ? void 0 : _a.backend), () => ( ((_b = config.test) == null ? void 0 : _b.sqliteBackend)));
   if (config.runtime === "wasm" && sqliteBackend === "local") {
     ctx.addIssue({
@@ -727,7 +909,7 @@ var RegistryConfigSchema = _zod.z.object({
     });
   }
   const sqlite = config.runtime === "wasm" && config.sqlite === void 0 ? { backend: "remote" } : config.sqlite;
-  const parsedEndpoint = config.endpoint ? _chunkGVTOE34Scjs.tryParseEndpoint.call(void 0, ctx, {
+  const parsedEndpoint = config.endpoint ? _chunk7QKCIVAYcjs.tryParseEndpoint.call(void 0, ctx, {
     endpoint: config.endpoint,
     path: ["endpoint"],
     namespace: config.namespace,
@@ -745,13 +927,17 @@ var RegistryConfigSchema = _zod.z.object({
       message: "configurePool requires either endpoint or startEngine"
     });
   }
-  const endpoint = config.startEngine ? ENGINE_ENDPOINT : _nullishCoalesce((parsedEndpoint == null ? void 0 : parsedEndpoint.endpoint), () => ( (isDevEnv ? ENGINE_ENDPOINT : void 0)));
+  const localEngineEndpoint = buildEngineEndpoint(
+    config.engineHost,
+    config.enginePort
+  );
+  const endpoint = config.startEngine ? localEngineEndpoint : _nullishCoalesce((parsedEndpoint == null ? void 0 : parsedEndpoint.endpoint), () => ( (isDevEnv ? buildEngineEndpoint(ENGINE_HOST, ENGINE_PORT) : void 0)));
   const validateServerlessEndpoint = Boolean(
     config.startEngine || parsedEndpoint
   );
   const namespace = _nullishCoalesce(_nullishCoalesce((parsedEndpoint == null ? void 0 : parsedEndpoint.namespace), () => ( config.namespace)), () => ( "default"));
   const token = _nullishCoalesce((parsedEndpoint == null ? void 0 : parsedEndpoint.token), () => ( config.token));
-  const parsedPublicEndpoint = config.serverless.publicEndpoint ? _chunkGVTOE34Scjs.tryParseEndpoint.call(void 0, ctx, {
+  const parsedPublicEndpoint = config.serverless.publicEndpoint ? _chunk7QKCIVAYcjs.tryParseEndpoint.call(void 0, ctx, {
     endpoint: config.serverless.publicEndpoint,
     path: ["serverless", "publicEndpoint"]
   }) : void 0;
@@ -762,7 +948,7 @@ var RegistryConfigSchema = _zod.z.object({
       path: ["serverless", "publicEndpoint"]
     });
   }
-  const publicEndpoint = _nullishCoalesce((parsedPublicEndpoint == null ? void 0 : parsedPublicEndpoint.endpoint), () => ( (isDevEnv && config.startEngine ? ENGINE_ENDPOINT : void 0)));
+  const publicEndpoint = _nullishCoalesce((parsedPublicEndpoint == null ? void 0 : parsedPublicEndpoint.endpoint), () => ( (isDevEnv && config.startEngine ? endpoint : void 0)));
   const publicNamespace = parsedPublicEndpoint == null ? void 0 : parsedPublicEndpoint.namespace;
   const publicToken = _nullishCoalesce((parsedPublicEndpoint == null ? void 0 : parsedPublicEndpoint.token), () => ( config.serverless.publicToken));
   return {
@@ -786,30 +972,30 @@ function buildActorNames(config) {
     Object.keys(config.use).map((actorName) => {
       const definition = config.use[actorName];
       const options = _nullishCoalesce(definition.config.options, () => ( {}));
-      const runMeta = _chunkWQ4HNA4Wcjs.getRunMetadata.call(void 0, definition.config.run);
+      const runMeta = _chunkNIY3RSPXcjs.getRunMetadata.call(void 0, definition.config.run);
       const metadata = {};
       metadata.icon = _nullishCoalesce(options.icon, () => ( runMeta.icon));
       metadata.name = _nullishCoalesce(options.name, () => ( runMeta.name));
       metadata.preload = {
         keys: [
-          Array.from(_chunkLD5YASJUcjs.KEYS.PERSIST_DATA),
-          Array.from(_chunkLD5YASJUcjs.KEYS.INSPECTOR_TOKEN),
-          Array.from(_chunkLD5YASJUcjs.queueMetadataKey.call(void 0, )),
-          Array.from(_chunkLD5YASJUcjs.KEYS.LAST_PUSHED_ALARM)
+          Array.from(_chunkVE2X4KMGcjs.KEYS.PERSIST_DATA),
+          Array.from(_chunkVE2X4KMGcjs.KEYS.INSPECTOR_TOKEN),
+          Array.from(_chunkVE2X4KMGcjs.queueMetadataKey.call(void 0, )),
+          Array.from(_chunkVE2X4KMGcjs.KEYS.LAST_PUSHED_ALARM)
         ],
         prefixes: [
           {
-            prefix: Array.from(_chunkLD5YASJUcjs.workflowStoragePrefix.call(void 0, )),
+            prefix: Array.from(_chunkVE2X4KMGcjs.workflowStoragePrefix.call(void 0, )),
             maxBytes: _nullishCoalesce(options.preloadMaxWorkflowBytes, () => ( 131072)),
             partial: false
           },
           {
-            prefix: Array.from(_chunkLD5YASJUcjs.KEYS.CONN_PREFIX),
+            prefix: Array.from(_chunkVE2X4KMGcjs.KEYS.CONN_PREFIX),
             maxBytes: _nullishCoalesce(options.preloadMaxConnectionsBytes, () => ( 65536)),
             partial: false
           },
           {
-            prefix: Array.from(_chunkLD5YASJUcjs.queueMessagesPrefix.call(void 0, )),
+            prefix: Array.from(_chunkVE2X4KMGcjs.queueMessagesPrefix.call(void 0, )),
             maxBytes: 65536,
             partial: false
           }
@@ -879,7 +1065,7 @@ var DocRegistryConfigSchema = _zod.z.object({
   noWelcome: _zod.z.boolean().optional().describe("Disable the welcome message on startup. Default: false"),
   sqlite: DocSqliteConfigSchema,
   logging: _zod.z.object({
-    level: _chunkY5NSCZA2cjs.LogLevelSchema.optional().describe(
+    level: _chunkDXXJPH55cjs.LogLevelSchema.optional().describe(
       "Log level for RivetKit. Default: 'warn'"
     )
   }).optional().describe("Logging configuration."),
@@ -924,7 +1110,7 @@ function shouldAttachNativeKvError(message) {
 function enrichNativeDatabaseError(database, error) {
   var _a;
   const bridgeReason = typeof error === "string" ? error : error instanceof Error ? error.message : void 0;
-  const bridged = bridgeReason === void 0 ? void 0 : _chunkQAZLM4WTcjs.decodeBridgeRivetError.call(void 0, bridgeReason);
+  const bridged = bridgeReason === void 0 ? void 0 : _chunkKORQB2IRcjs.decodeBridgeRivetError.call(void 0, bridgeReason);
   if (bridged) {
     throw bridged;
   }
@@ -1424,6 +1610,9 @@ var NapiCoreRuntime = (_class = class {
   async actorWaitForTrackedShutdownWork(ctx) {
     return await asNativeActorContext(ctx).waitForTrackedShutdownWork();
   }
+  async actorWaitForTrackedShutdownWorkUnbounded(ctx) {
+    await asNativeActorContext(ctx).waitForTrackedShutdownWorkUnbounded();
+  }
   actorKeepAwake(ctx, promise) {
     asNativeActorContext(ctx).keepAwake(promise);
   }
@@ -1535,8 +1724,12 @@ var NapiCoreRuntime = (_class = class {
       )
     );
   }
-  async actorQueueWaitForNamesAvailable(ctx, names, options) {
-    await asNativeActorContext(ctx).queue().waitForNamesAvailable(names, options);
+  async actorQueueWaitForNamesAvailable(ctx, names, options, signal) {
+    await asNativeActorContext(ctx).queue().waitForNamesAvailable(
+      names,
+      options,
+      signal ? asNativeCancellationToken(signal) : signal
+    );
   }
   async actorQueueEnqueueAndWait(ctx, name, body, options, signal) {
     return await asNativeActorContext(ctx).queue().enqueueAndWait(
@@ -1670,20 +1863,18 @@ function validateQueueComplete(schemas, name, response) {
     response
   );
   if (!result.success) {
-    throw validationError(`queue \`${name}\` completion response`, result.issues);
+    throw validationError(
+      `queue \`${name}\` completion response`,
+      result.issues
+    );
   }
   return result.data;
 }
 function validationError(target, issues) {
-  return new (0, _chunkQAZLM4WTcjs.RivetError)(
-    "actor",
-    "validation_error",
-    `Invalid ${target}`,
-    {
-      public: true,
-      metadata: { issues }
-    }
-  );
+  return new (0, _chunkKORQB2IRcjs.RivetError)("actor", "validation_error", `Invalid ${target}`, {
+    public: true,
+    metadata: { issues }
+  });
 }
 
 // src/registry/wasm-runtime.ts
@@ -1749,16 +1940,16 @@ function normalizeQueueMessage(message) {
 }
 function normalizeWasmBridgeError(error) {
   if (typeof error === "string") {
-    return _nullishCoalesce(_chunkQAZLM4WTcjs.decodeBridgeRivetError.call(void 0, error), () => ( error));
+    return _nullishCoalesce(_chunkKORQB2IRcjs.decodeBridgeRivetError.call(void 0, error), () => ( error));
   }
   if (error instanceof Error) {
-    const bridged = _chunkQAZLM4WTcjs.decodeBridgeRivetError.call(void 0, error.message);
+    const bridged = _chunkKORQB2IRcjs.decodeBridgeRivetError.call(void 0, error.message);
     if (bridged) {
       return bridged;
     }
   }
   if (typeof error === "object" && error !== null && "reason" in error && typeof error.reason === "string") {
-    const bridged = _chunkQAZLM4WTcjs.decodeBridgeRivetError.call(void 0, error.reason);
+    const bridged = _chunkKORQB2IRcjs.decodeBridgeRivetError.call(void 0, error.reason);
     if (bridged) {
       return bridged;
     }
@@ -1780,7 +1971,7 @@ function callWasmSync(invoke) {
   }
 }
 function unsupportedWasmMethod(method2) {
-  throw new (0, _chunkQAZLM4WTcjs.RivetError)(
+  throw new (0, _chunkKORQB2IRcjs.RivetError)(
     "runtime",
     "unsupported",
     `Unsupported wasm runtime method: ${method2}`,
@@ -2007,6 +2198,12 @@ var WasmCoreRuntime = (_class2 = class {
       "waitForTrackedShutdownWork"
     );
   }
+  async actorWaitForTrackedShutdownWorkUnbounded(ctx) {
+    await callHandle(
+      asWasmActorContext(ctx),
+      "waitForTrackedShutdownWorkUnbounded"
+    );
+  }
   actorKeepAwake(ctx, promise) {
     const wasmCtx = asWasmActorContext(ctx);
     const regionId = callHandle(wasmCtx, "beginKeepAwake");
@@ -2154,9 +2351,15 @@ var WasmCoreRuntime = (_class2 = class {
       )
     );
   }
-  async actorQueueWaitForNamesAvailable(ctx, names, options) {
+  async actorQueueWaitForNamesAvailable(ctx, names, options, signal) {
     const queue2 = childHandle(asWasmActorContext(ctx), "queue");
-    await callHandleAsync(queue2, "waitForNamesAvailable", names, options);
+    await callHandleAsync(
+      queue2,
+      "waitForNamesAvailable",
+      names,
+      options,
+      signal
+    );
   }
   async actorQueueEnqueueAndWait(ctx, name, body, options, signal) {
     const queue2 = childHandle(asWasmActorContext(ctx), "queue");
@@ -2248,6 +2451,33 @@ async function loadWasmRuntime(config) {
   };
 }
 
+// src/registry/native.ts
+var _fs = require('fs'); var _fs2 = _interopRequireDefault(_fs);
+var _path2 = require('path'); var _path3 = _interopRequireDefault(_path2);
+
+// src/registry/write-through-proxy.ts
+var _onchange = require('@rivetkit/on-change'); var _onchange2 = _interopRequireDefault(_onchange);
+function createWriteThroughProxy(value, commit, beforeChange) {
+  if (!value || typeof value !== "object") {
+    return value;
+  }
+  return _onchange2.default.call(void 0, 
+    value,
+    () => {
+      commit(value);
+    },
+    {
+      // Rejection is throw-based: beforeChange throws to prevent the
+      // mutation. We always return true so on-change applies the change
+      // if beforeChange did not throw.
+      onValidate(_path, newValue) {
+        beforeChange == null ? void 0 : beforeChange(newValue);
+        return true;
+      }
+    }
+  );
+}
+
 // src/registry/native.ts
 var textEncoder = new TextEncoder();
 var textDecoder = new TextDecoder();
@@ -2260,7 +2490,7 @@ function trySetProcessEnv(key, value) {
   if (typeof process === "undefined") return;
   try {
     process.env[key] = value;
-  } catch (e) {
+  } catch (e2) {
   }
 }
 function detectRuntimeHost() {
@@ -2281,7 +2511,7 @@ function loadedRuntimeKind(runtime) {
     case "wasm":
       return "wasm";
   }
-  throw new (0, _chunkQAZLM4WTcjs.RivetError)(
+  throw new (0, _chunkKORQB2IRcjs.RivetError)(
     "config",
     "unknown_runtime",
     "RivetKit runtime must be NAPI or wasm.",
@@ -2297,7 +2527,7 @@ async function loadAutoRuntime(config, loaders = defaultRuntimeLoaders) {
   }
   try {
     return (await loaders.loadNative()).runtime;
-  } catch (e2) {
+  } catch (e3) {
     return (await loaders.loadWasm(config.wasm)).runtime;
   }
 }
@@ -2321,7 +2551,7 @@ function normalizeRuntimeConfigForKind(config, runtimeKind) {
     return config;
   }
   if (sqliteBackendForConfig(config) === "local") {
-    throw new (0, _chunkQAZLM4WTcjs.RivetError)(
+    throw new (0, _chunkKORQB2IRcjs.RivetError)(
       "config",
       "wasm_local_sqlite",
       "WebAssembly runtime cannot use local SQLite. Use remote SQLite instead.",
@@ -2387,22 +2617,30 @@ function getNativeConnPersistState(runtime, ctx, conn) {
   return connState;
 }
 function stateMutationReentrantError() {
-  return new (0, _chunkQAZLM4WTcjs.RivetError)(
+  return new (0, _chunkKORQB2IRcjs.RivetError)(
     "actor",
     "state_mutation_reentrant",
     "State mutations are not allowed inside onStateChange."
   );
 }
 function databaseNotConfiguredError() {
-  return new (0, _chunkQAZLM4WTcjs.RivetError)(
+  return new (0, _chunkKORQB2IRcjs.RivetError)(
     "actor",
     "database_not_configured",
     "database is not configured for this actor",
     { public: true }
   );
 }
+function databaseClientNotReadyError() {
+  return new (0, _chunkKORQB2IRcjs.RivetError)(
+    "actor",
+    "database_client_not_ready",
+    "actor database client was not initialized before user code ran. this is an internal lifecycle error; the migration callback should have pre-warmed the client. file an issue if you can reproduce.",
+    { public: true }
+  );
+}
 function stateNotEnabledError() {
-  return new (0, _chunkQAZLM4WTcjs.RivetError)(
+  return new (0, _chunkKORQB2IRcjs.RivetError)(
     "actor",
     "state_not_enabled",
     "State not enabled. Must implement `createState` or `state` to use state. (https://www.rivet.dev/docs/actors/state/#initializing-state)",
@@ -2410,7 +2648,7 @@ function stateNotEnabledError() {
   );
 }
 function nativeClientNotConfiguredError() {
-  return new (0, _chunkQAZLM4WTcjs.RivetError)(
+  return new (0, _chunkKORQB2IRcjs.RivetError)(
     "native",
     "client_not_configured",
     "native actor client is not configured",
@@ -2418,7 +2656,7 @@ function nativeClientNotConfiguredError() {
   );
 }
 function nativeEndpointNotConfiguredError() {
-  return new (0, _chunkQAZLM4WTcjs.RivetError)(
+  return new (0, _chunkKORQB2IRcjs.RivetError)(
     "native",
     "endpoint_not_configured",
     "registry endpoint is required for native envoy startup",
@@ -2452,8 +2690,23 @@ function resolveNativeDestroy(runtime, ctx) {
 function clearNativeRuntimeState(runtime, ctx) {
   callNativeSync(() => runtime.actorClearRuntimeState(ctx));
 }
-async function cleanupNativeSleepRuntimeState(runtime, ctx) {
-  await runtime.actorWaitForTrackedShutdownWork(ctx);
+async function cleanupNativeSleepRuntimeState(runtime, ctx, afterTrackedWorkDrained) {
+  const drained = await runtime.actorWaitForTrackedShutdownWork(ctx);
+  if (!drained) {
+    await closeNativeDatabaseClient(runtime, ctx);
+    await closeNativeSqlDatabase(runtime, ctx);
+    void runtime.actorWaitForTrackedShutdownWorkUnbounded(ctx).then(async () => {
+      await (afterTrackedWorkDrained == null ? void 0 : afterTrackedWorkDrained());
+      clearNativeRuntimeState(runtime, ctx);
+    }).catch((error) => {
+      logger2().warn({
+        msg: "deferred native sleep cleanup failed",
+        error: _chunkDXXJPH55cjs.stringifyError.call(void 0, error)
+      });
+    });
+    return;
+  }
+  await (afterTrackedWorkDrained == null ? void 0 : afterTrackedWorkDrained());
   await closeNativeDatabaseClient(runtime, ctx);
   await closeNativeSqlDatabase(runtime, ctx);
   clearNativeRuntimeState(runtime, ctx);
@@ -2558,10 +2811,13 @@ function decodeValue(value) {
   if (!value || value.length === 0) {
     return void 0;
   }
-  return _chunkVJFRBJVQcjs.decodeCborJsonCompat.call(void 0, value);
+  return _chunk3677IIOVcjs.decodeCborCompat.call(void 0, value);
 }
 function encodeValue(value) {
-  return _chunkVJFRBJVQcjs.encodeCborCompat.call(void 0, value);
+  return _chunk3677IIOVcjs.encodeCborCompat.call(void 0, value);
+}
+function normalizeArgs(value) {
+  return Array.isArray(value) ? value : value === void 0 || value === null ? [] : [value];
 }
 function unwrapTsfnPayload(error, payload) {
   if (error !== null && error !== void 0) {
@@ -2571,16 +2827,16 @@ function unwrapTsfnPayload(error, payload) {
 }
 function normalizeNativeBridgeError(error) {
   if (typeof error === "string") {
-    return _nullishCoalesce(_chunkQAZLM4WTcjs.decodeBridgeRivetError.call(void 0, error), () => ( error));
+    return _nullishCoalesce(_chunkKORQB2IRcjs.decodeBridgeRivetError.call(void 0, error), () => ( error));
   }
   if (error instanceof Error) {
-    const bridged = _chunkQAZLM4WTcjs.decodeBridgeRivetError.call(void 0, error.message);
+    const bridged = _chunkKORQB2IRcjs.decodeBridgeRivetError.call(void 0, error.message);
     if (bridged) {
       return bridged;
     }
   }
   if (typeof error === "object" && error !== null && "reason" in error && typeof error.reason === "string") {
-    const bridged = _chunkQAZLM4WTcjs.decodeBridgeRivetError.call(void 0, error.reason);
+    const bridged = _chunkKORQB2IRcjs.decodeBridgeRivetError.call(void 0, error.reason);
     if (bridged) {
       return bridged;
     }
@@ -2588,14 +2844,14 @@ function normalizeNativeBridgeError(error) {
   return error;
 }
 function isStructuredBridgeError(error) {
-  if (error instanceof _chunkQAZLM4WTcjs.RivetError) {
+  if (error instanceof _chunkKORQB2IRcjs.RivetError) {
     return true;
   }
-  return _chunkQAZLM4WTcjs.isRivetErrorLike.call(void 0, error) && "__type" in error && (error.__type === "RivetError" || error.__type === "ActorError");
+  return _chunkKORQB2IRcjs.isRivetErrorLike.call(void 0, error) && "__type" in error && (error.__type === "RivetError" || error.__type === "ActorError");
 }
 function encodeNativeCallbackError(error) {
-  const structuredError = isStructuredBridgeError(error) ? error : _chunkY5NSCZA2cjs.deconstructError.call(void 0, error, true);
-  const bridgeError = new Error(_chunkQAZLM4WTcjs.encodeBridgeRivetError.call(void 0, structuredError), {
+  const structuredError = isStructuredBridgeError(error) ? error : _chunkDXXJPH55cjs.deconstructError.call(void 0, error, true);
+  const bridgeError = new Error(_chunkKORQB2IRcjs.encodeBridgeRivetError.call(void 0, structuredError), {
     cause: error instanceof Error ? error : void 0
   });
   return Object.assign(bridgeError, {
@@ -2618,16 +2874,10 @@ function callNativeSync(invoke) {
     throw normalizeNativeBridgeError(error);
   }
 }
-function actorAbortedError() {
-  return Object.assign(new Error("Actor aborted"), {
-    group: "actor",
-    code: "aborted"
-  });
-}
 function isClosedTaskRegistrationError(error) {
-  const metadata = error instanceof _chunkQAZLM4WTcjs.RivetError ? error.metadata : void 0;
+  const metadata = error instanceof _chunkKORQB2IRcjs.RivetError ? error.metadata : void 0;
   const metadataError = metadata && typeof metadata === "object" && "error" in metadata ? metadata.error : void 0;
-  return error instanceof _chunkQAZLM4WTcjs.RivetError && error.group === "core" && error.code === _chunkQAZLM4WTcjs.INTERNAL_ERROR_CODE && typeof metadataError === "string" && /actor task registration is (closed|not configured)/.test(metadataError);
+  return error instanceof _chunkKORQB2IRcjs.RivetError && error.group === "core" && error.code === _chunkKORQB2IRcjs.INTERNAL_ERROR_CODE && typeof metadataError === "string" && /actor task registration is (closed|not configured)/.test(metadataError);
 }
 async function createCancellationTokenHandle(runtime, signal) {
   if (!signal) {
@@ -2650,8 +2900,8 @@ function decodeWorkflowCbor(data) {
     return null;
   }
   try {
-    return _chunkVJFRBJVQcjs.decodeCborCompat.call(void 0, new Uint8Array(data));
-  } catch (e3) {
+    return _chunk3677IIOVcjs.decodeCborCompat.call(void 0, new Uint8Array(data));
+  } catch (e4) {
     return null;
   }
 }
@@ -2755,8 +3005,8 @@ function serializeWorkflowHistoryForJson(data) {
   if (data === null) {
     return null;
   }
-  const history = _chunk4CGA6QJOcjs.decodeWorkflowHistoryTransport.call(void 0, data);
-  return {
+  const history = _chunk47HHIEXHcjs.decodeWorkflowHistoryTransport.call(void 0, data);
+  return jsonSafe({
     nameRegistry: [...history.nameRegistry],
     entries: history.entries.map((entry) => ({
       id: entry.id,
@@ -2780,7 +3030,7 @@ function serializeWorkflowHistoryForJson(data) {
         ]
       )
     )
-  };
+  });
 }
 function toHttpJsonCompatible(value) {
   return JSON.parse(
@@ -2831,45 +3081,7 @@ function wrapNativeCallback(callback) {
 }
 function decodeArgs(value) {
   const decoded = decodeValue(value);
-  return Array.isArray(decoded) ? decoded : decoded === void 0 ? [] : [decoded];
-}
-function createWriteThroughProxy(value, commit, beforeChange) {
-  if (!value || typeof value !== "object") {
-    return value;
-  }
-  const proxies = /* @__PURE__ */ new WeakMap();
-  const wrap = (target) => {
-    const cached = proxies.get(target);
-    if (cached) {
-      return cached;
-    }
-    const proxy = new Proxy(target, {
-      get(innerTarget, property, receiver) {
-        const result = Reflect.get(innerTarget, property, receiver);
-        return result && typeof result === "object" ? wrap(result) : result;
-      },
-      set(innerTarget, property, nextValue, receiver) {
-        beforeChange == null ? void 0 : beforeChange();
-        const updated = Reflect.set(
-          innerTarget,
-          property,
-          nextValue,
-          receiver
-        );
-        commit(value);
-        return updated;
-      },
-      deleteProperty(innerTarget, property) {
-        beforeChange == null ? void 0 : beforeChange();
-        const updated = Reflect.deleteProperty(innerTarget, property);
-        commit(value);
-        return updated;
-      }
-    });
-    proxies.set(target, proxy);
-    return proxy;
-  };
-  return wrap(value);
+  return normalizeArgs(decoded);
 }
 function buildRequest(init) {
   const url = init.uri.startsWith("http") ? init.uri : new URL(init.uri, "http://127.0.0.1").toString();
@@ -2906,7 +3118,7 @@ var NativeConnAdapter = class {
     this.#schemas = schemas;
     this.#ctx = ctx;
     this.#queueHibernationRemoval = queueHibernationRemoval;
-    this[_chunkWQ4HNA4Wcjs.CONN_STATE_MANAGER_SYMBOL] = {
+    this[_chunkNIY3RSPXcjs.CONN_STATE_MANAGER_SYMBOL] = {
       stateEnabled: true,
       get state() {
         return thisConn.state;
@@ -2923,13 +3135,23 @@ var NativeConnAdapter = class {
       decodeValue(this.#runtime.connParams(this.#conn))
     );
   }
+  [_chunkNIY3RSPXcjs.RAW_STATE_SYMBOL]() {
+    return this.#readState();
+  }
   get state() {
     const nextState = this.#readState();
-    return createWriteThroughProxy(nextState, (nextValue) => {
-      this.#writeState(nextValue, { writeNative: true });
-    });
+    return createWriteThroughProxy(
+      nextState,
+      (nextValue) => {
+        this.#writeState(nextValue, { writeNative: true });
+      },
+      (newValue) => {
+        _chunk3677IIOVcjs.assertJsonCompatValue.call(void 0, newValue);
+      }
+    );
   }
   set state(value) {
+    _chunk3677IIOVcjs.assertJsonCompatValue.call(void 0, value);
     this.#writeState(value, { writeNative: true });
   }
   initializeState(value) {
@@ -3034,7 +3256,7 @@ var NativeKvAdapter = class {
     const value = await callNative(
       () => this.#runtime.actorKvGet(
         this.#ctx,
-        _chunkLD5YASJUcjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(key))
+        _chunkVE2X4KMGcjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(key))
       )
     );
     return value ? decodeNativeKvValue(new Uint8Array(value), options) : null;
@@ -3043,7 +3265,7 @@ var NativeKvAdapter = class {
     await callNative(
       () => this.#runtime.actorKvPut(
         this.#ctx,
-        _chunkLD5YASJUcjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(key)),
+        _chunkVE2X4KMGcjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(key)),
         toRuntimeBytes(value)
       )
     );
@@ -3052,7 +3274,7 @@ var NativeKvAdapter = class {
     await callNative(
       () => this.#runtime.actorKvDelete(
         this.#ctx,
-        _chunkLD5YASJUcjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(key))
+        _chunkVE2X4KMGcjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(key))
       )
     );
   }
@@ -3060,8 +3282,8 @@ var NativeKvAdapter = class {
     await callNative(
       () => this.#runtime.actorKvDeleteRange(
         this.#ctx,
-        _chunkLD5YASJUcjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(start)),
-        _chunkLD5YASJUcjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(end))
+        _chunkVE2X4KMGcjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(start)),
+        _chunkVE2X4KMGcjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(end))
       )
     );
   }
@@ -3074,7 +3296,7 @@ var NativeKvAdapter = class {
     const entries = await callNative(
       () => this.#runtime.actorKvListPrefix(
         this.#ctx,
-        _chunkLD5YASJUcjs.makePrefixedKey.call(void 0, 
+        _chunkVE2X4KMGcjs.makePrefixedKey.call(void 0, 
           encodeNativeKvUserKey(
             prefix,
             options == null ? void 0 : options.keyType
@@ -3088,7 +3310,7 @@ var NativeKvAdapter = class {
     );
     return entries.map((entry) => [
       decodeNativeKvKey(
-        _chunkLD5YASJUcjs.removePrefixFromKey.call(void 0, new Uint8Array(entry.key)),
+        _chunkVE2X4KMGcjs.removePrefixFromKey.call(void 0, new Uint8Array(entry.key)),
         options == null ? void 0 : options.keyType
       ),
       decodeNativeKvValue(new Uint8Array(entry.value), options)
@@ -3107,13 +3329,13 @@ var NativeKvAdapter = class {
     const entries = await callNative(
       () => this.#runtime.actorKvListRange(
         this.#ctx,
-        _chunkLD5YASJUcjs.makePrefixedKey.call(void 0, 
+        _chunkVE2X4KMGcjs.makePrefixedKey.call(void 0, 
           encodeNativeKvUserKey(
             start,
             options == null ? void 0 : options.keyType
           )
         ),
-        _chunkLD5YASJUcjs.makePrefixedKey.call(void 0, 
+        _chunkVE2X4KMGcjs.makePrefixedKey.call(void 0, 
           encodeNativeKvUserKey(
             end,
             options == null ? void 0 : options.keyType
@@ -3127,7 +3349,7 @@ var NativeKvAdapter = class {
     );
     return entries.map((entry) => [
       decodeNativeKvKey(
-        _chunkLD5YASJUcjs.removePrefixFromKey.call(void 0, new Uint8Array(entry.key)),
+        _chunkVE2X4KMGcjs.removePrefixFromKey.call(void 0, new Uint8Array(entry.key)),
         options == null ? void 0 : options.keyType
       ),
       decodeNativeKvValue(new Uint8Array(entry.value), options)
@@ -3219,7 +3441,7 @@ var NativeQueueAdapter = class {
   async nextBatch(options) {
     const completable = (options == null ? void 0 : options.completable) === true;
     if (this.#pendingCompletableMessageIds.size > 0) {
-      throw new (0, _chunkQAZLM4WTcjs.RivetError)(
+      throw new (0, _chunkKORQB2IRcjs.RivetError)(
         "queue",
         "previous_message_not_completed",
         "Previous completable queue message is not completed. Call `message.complete(...)` before receiving the next message.",
@@ -3281,44 +3503,23 @@ var NativeQueueAdapter = class {
     }
   }
   async waitForNamesAvailable(names, options) {
-    if (!(options == null ? void 0 : options.signal)) {
+    const { token, cleanup } = await createCancellationTokenHandle(
+      this.#runtime,
+      options == null ? void 0 : options.signal
+    );
+    try {
       await callNative(
         () => this.#runtime.actorQueueWaitForNamesAvailable(
           this.#ctx,
           [...names],
           {
             timeoutMs: options == null ? void 0 : options.timeout
-          }
+          },
+          token
         )
       );
-      return;
-    }
-    const deadline = options.timeout === void 0 ? void 0 : Date.now() + options.timeout;
-    for (; ; ) {
-      if (options.signal.aborted) {
-        throw actorAbortedError();
-      }
-      const remainingTimeout = deadline === void 0 ? void 0 : Math.max(0, deadline - Date.now());
-      const sliceTimeout = remainingTimeout === void 0 ? 100 : Math.min(remainingTimeout, 100);
-      try {
-        await callNative(
-          () => this.#runtime.actorQueueWaitForNamesAvailable(
-            this.#ctx,
-            [...names],
-            {
-              timeoutMs: sliceTimeout
-            }
-          )
-        );
-        return;
-      } catch (error) {
-        if (error.group === "queue" && error.code === "timed_out") {
-          if (remainingTimeout === void 0 || remainingTimeout > 100) {
-            continue;
-          }
-        }
-        throw error;
-      }
+    } finally {
+      cleanup == null ? void 0 : cleanup();
     }
   }
   async enqueueAndWait(name, body, options) {
@@ -3388,7 +3589,7 @@ var NativeQueueAdapter = class {
         }
         yield message;
       } catch (error) {
-        if (_chunkQAZLM4WTcjs.isRivetErrorLike.call(void 0, error) && error.group === "actor" && error.code === "aborted") {
+        if (_chunkKORQB2IRcjs.isRivetErrorLike.call(void 0, error) && error.group === "actor" && error.code === "aborted") {
           return;
         }
         throw error;
@@ -3409,7 +3610,7 @@ var NativeQueueAdapter = class {
       ...message,
       complete: async (response) => {
         if (typeof message.complete !== "function") {
-          throw new (0, _chunkQAZLM4WTcjs.RivetError)(
+          throw new (0, _chunkKORQB2IRcjs.RivetError)(
             "queue",
             "complete_not_configured",
             `Queue '${message.name}' does not support completion responses.`,
@@ -3421,7 +3622,7 @@ var NativeQueueAdapter = class {
           );
         }
         if (completed) {
-          throw new (0, _chunkQAZLM4WTcjs.RivetError)(
+          throw new (0, _chunkKORQB2IRcjs.RivetError)(
             "queue",
             "already_completed",
             "Queue message was already completed.",
@@ -3753,6 +3954,68 @@ var TrackedWebSocketHandleAdapter = class {
     return typeof value === "object" && value !== null && "then" in value && typeof value.then === "function";
   }
 };
+var NativeConnectionMap = (_class3 = class {
+  #runtime;
+  #ctx;
+  #schemas;
+  constructor(runtime, ctx, schemas) {;_class3.prototype.__init3.call(this);
+    this.#runtime = runtime;
+    this.#ctx = ctx;
+    this.#schemas = schemas;
+  }
+  #connToAdapter(conn) {
+    return new NativeConnAdapter(
+      this.#runtime,
+      conn,
+      this.#schemas,
+      this.#ctx,
+      (connId) => callNativeSync(
+        () => this.#runtime.actorQueueHibernationRemoval(
+          this.#ctx,
+          connId
+        )
+      )
+    );
+  }
+  get size() {
+    return callNativeSync(() => this.#runtime.actorConns(this.#ctx)).length;
+  }
+  get(key) {
+    const conns = callNativeSync(() => this.#runtime.actorConns(this.#ctx));
+    const conn = conns.find((c) => this.#runtime.connId(c) === key);
+    if (!conn) return void 0;
+    return this.#connToAdapter(conn);
+  }
+  has(key) {
+    const conns = callNativeSync(() => this.#runtime.actorConns(this.#ctx));
+    return conns.some((c) => this.#runtime.connId(c) === key);
+  }
+  keys() {
+    const conns = callNativeSync(() => this.#runtime.actorConns(this.#ctx));
+    return conns.map((c) => this.#runtime.connId(c))[Symbol.iterator]();
+  }
+  values() {
+    const conns = callNativeSync(() => this.#runtime.actorConns(this.#ctx));
+    return conns.map((c) => this.#connToAdapter(c))[Symbol.iterator]();
+  }
+  entries() {
+    const conns = callNativeSync(() => this.#runtime.actorConns(this.#ctx));
+    return conns.map(
+      (c) => [this.#runtime.connId(c), this.#connToAdapter(c)]
+    )[Symbol.iterator]();
+  }
+  forEach(callback, thisArg) {
+    const conns = callNativeSync(() => this.#runtime.actorConns(this.#ctx));
+    for (const conn of conns) {
+      const id = this.#runtime.connId(conn);
+      callback.call(thisArg, this.#connToAdapter(conn), id, this);
+    }
+  }
+  [Symbol.iterator]() {
+    return this.entries();
+  }
+  __init3() {this[Symbol.toStringTag] = "NativeConnectionMap"}
+}, _class3);
 var ActorContextHandleAdapter = class {
   #runtime;
   #ctx;
@@ -3761,9 +4024,9 @@ var ActorContextHandleAdapter = class {
   #abortSignalCleanup;
   #client;
   #clientFactory;
+  #connMap;
   #databaseProvider;
   #db;
-  #dbProxy;
   #dispatchCancelToken;
   #kv;
   #queue;
@@ -3786,7 +4049,7 @@ var ActorContextHandleAdapter = class {
       this.#databaseProvider = databaseProvider;
     }
     this.#request = request;
-    this[_chunkWQ4HNA4Wcjs.ACTOR_CONTEXT_INTERNAL_SYMBOL] = new NativeWorkflowRuntimeAdapter(
+    this[_chunkNIY3RSPXcjs.ACTOR_CONTEXT_INTERNAL_SYMBOL] = new NativeWorkflowRuntimeAdapter(
       this
     );
   }
@@ -3806,30 +4069,22 @@ var ActorContextHandleAdapter = class {
     if (!this.#databaseProvider) {
       throw databaseNotConfiguredError();
     }
-    if (!this.#dbProxy) {
-      this.#dbProxy = new Proxy(
-        {},
-        {
-          get: (_target, property) => {
-            if (property === "then") {
-              return void 0;
-            }
-            return async (...args) => {
-              const client = await this.ensureDatabaseClient();
-              const value = Reflect.get(
-                client,
-                property
-              );
-              if (typeof value !== "function") {
-                return value;
-              }
-              return await value.apply(client, args);
-            };
-          }
-        }
-      );
+    if (this.#db) {
+      return this.#db;
     }
-    return this.#dbProxy;
+    const runtimeState = getNativeRuntimeState(this.#runtime, this.#ctx);
+    const cachedClient = runtimeState.databaseClient;
+    if (cachedClient) {
+      this.#db = cachedClient.client;
+      return this.#db;
+    }
+    throw databaseClientNotReadyError();
+  }
+  [_chunkNIY3RSPXcjs.RAW_STATE_SYMBOL]() {
+    if (!this.#stateEnabled) {
+      throw stateNotEnabledError();
+    }
+    return this.#readState();
   }
   get state() {
     if (!this.#stateEnabled) {
@@ -3844,8 +4099,9 @@ var ActorContextHandleAdapter = class {
         (nextValue) => {
           this.#writeState(nextValue, { scheduleSave: true });
         },
-        () => {
+        (newValue) => {
           this.#assertCanMutateState();
+          _chunk3677IIOVcjs.assertJsonCompatValue.call(void 0, newValue);
         }
       );
     }
@@ -3856,6 +4112,7 @@ var ActorContextHandleAdapter = class {
       throw stateNotEnabledError();
     }
     this.#assertCanMutateState();
+    _chunk3677IIOVcjs.assertJsonCompatValue.call(void 0, value);
     this.#writeState(value, { scheduleSave: true });
   }
   initializeState(value) {
@@ -3912,25 +4169,14 @@ var ActorContextHandleAdapter = class {
     return callNativeSync(() => this.#runtime.actorRegion(this.#ctx));
   }
   get conns() {
-    return new Map(
-      callNativeSync(() => this.#runtime.actorConns(this.#ctx)).map(
-        (conn) => [
-          this.#runtime.connId(conn),
-          new NativeConnAdapter(
-            this.#runtime,
-            conn,
-            this.#schemas,
-            this.#ctx,
-            (connId) => callNativeSync(
-              () => this.#runtime.actorQueueHibernationRemoval(
-                this.#ctx,
-                connId
-              )
-            )
-          )
-        ]
-      )
-    );
+    if (!this.#connMap) {
+      this.#connMap = new NativeConnectionMap(
+        this.#runtime,
+        this.#ctx,
+        this.#schemas
+      );
+    }
+    return this.#connMap;
   }
   get log() {
     return logger2();
@@ -4131,7 +4377,7 @@ var ActorContextHandleAdapter = class {
     const trackedPromise = Promise.resolve(promise).catch((error) => {
       logger2().warn({
         msg: "keepAwake promise rejected",
-        error: _chunkY5NSCZA2cjs.stringifyError.call(void 0, error)
+        error: _chunkDXXJPH55cjs.stringifyError.call(void 0, error)
       });
     }).then(() => null);
     try {
@@ -4207,6 +4453,7 @@ var ActorContextHandleAdapter = class {
     return false;
   }
   sleep() {
+    this.#flushStateChange();
     callNativeSync(() => this.#runtime.actorSleep(this.#ctx));
   }
   destroy() {
@@ -4496,9 +4743,62 @@ function buildActorConfig(definition, registryConfig) {
     maxOutgoingMessageSize: registryConfig.maxOutgoingMessageSize,
     preloadMaxWorkflowBytes: options.preloadMaxWorkflowBytes,
     preloadMaxConnectionsBytes: options.preloadMaxConnectionsBytes,
-    actions: Object.keys(_nullishCoalesce(config.actions, () => ( {}))).sort().map((name) => ({ name }))
+    actions: Object.keys(_nullishCoalesce(config.actions, () => ( {}))).sort().map((name) => ({ name })),
+    inspectorTabs: buildInspectorTabs(config.inspector)
   };
 }
+function buildInspectorTabs(inspector) {
+  if (!inspector || typeof inspector !== "object") return void 0;
+  const tabs = inspector.tabs;
+  if (!Array.isArray(tabs) || tabs.length === 0) return void 0;
+  return tabs.map((raw) => {
+    const entry = raw;
+    if (entry.hidden === true) {
+      return { id: entry.id, hidden: true };
+    }
+    const resolved = entry.source !== void 0 ? _path3.default.resolve(entry.source) : void 0;
+    if (resolved !== void 0) {
+      validateInspectorTabSource(entry.id, resolved);
+    }
+    return {
+      id: entry.id,
+      label: entry.label,
+      icon: entry.icon,
+      source: resolved
+    };
+  });
+}
+function validateInspectorTabSource(tabId, resolved) {
+  if (resolved === _path3.default.parse(resolved).root) {
+    throw new Error(
+      `inspector.tabs[id="${tabId}"].source resolves to the filesystem root (${resolved}). Point it at the tab's own static-asset directory instead.`
+    );
+  }
+  let stat;
+  try {
+    stat = _fs2.default.statSync(resolved);
+  } catch (err) {
+    const code = err == null ? void 0 : err.code;
+    if (code === "ENOENT") {
+      throw new Error(
+        `inspector.tabs[id="${tabId}"].source (${resolved}) does not exist.`
+      );
+    }
+    if (code === "EACCES") {
+      throw new Error(
+        `inspector.tabs[id="${tabId}"].source (${resolved}) is not readable (EACCES).`
+      );
+    }
+    throw new Error(
+      `inspector.tabs[id="${tabId}"].source (${resolved}) could not be stat'd: ${_nullishCoalesce((err == null ? void 0 : err.message), () => ( err))}`
+    );
+  }
+  if (!stat.isDirectory()) {
+    throw new Error(
+      `inspector.tabs[id="${tabId}"].source (${resolved}) must be a directory, got ${stat.isFile() ? "file" : "non-directory"}.`
+    );
+  }
+}
 function buildNativeFactory(runtime, registryConfig, definition) {
   var _a;
   const config = definition.config;
@@ -4512,9 +4812,9 @@ function buildNativeFactory(runtime, registryConfig, definition) {
   const actionHandlers = Object.fromEntries(
     Object.entries(_nullishCoalesce(config.actions, () => ( {}))).map(([name, handler]) => [name, handler])
   );
-  const createClient = () => _chunkGVTOE34Scjs.createClientWithDriver.call(void 0, 
-    new (0, _chunkGVTOE34Scjs.RemoteEngineControlClient)(
-      _chunkGVTOE34Scjs.convertRegistryConfigToClientConfig.call(void 0, registryConfig)
+  const createClient = () => _chunk7QKCIVAYcjs.createClientWithDriver.call(void 0, 
+    new (0, _chunk7QKCIVAYcjs.RemoteEngineControlClient)(
+      _chunk7QKCIVAYcjs.convertRegistryConfigToClientConfig.call(void 0, registryConfig)
     ),
     { encoding: "bare" }
   );
@@ -4524,7 +4824,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
   ), () => ( false));
   const getNativeWorkflowInspector = (ctx) => {
     var _a2;
-    return (_a2 = _chunkWQ4HNA4Wcjs.getRunInspectorConfig.call(void 0, 
+    return (_a2 = _chunkNIY3RSPXcjs.getRunInspectorConfig.call(void 0, 
       config.run,
       callNativeSync(() => runtime.actorId(ctx))
     )) == null ? void 0 : _a2.workflow;
@@ -4577,7 +4877,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
       }
     });
     const errorResponse = (error, status) => {
-      const rivetError = _chunkQAZLM4WTcjs.toRivetError.call(void 0, error);
+      const rivetError = _chunkKORQB2IRcjs.toRivetError.call(void 0, error);
       return jsonResponse(
         {
           group: rivetError.group,
@@ -4687,6 +4987,10 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             isWorkflowEnabled: getNativeWorkflowInspector(ctx) !== void 0
           });
         } catch (error) {
+          logger2().error({
+            msg: "error replaying workflow history",
+            error
+          });
           return errorResponse(error);
         }
       }
@@ -4818,7 +5122,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         const action = actionHandlers[actionName];
         if (!action) {
           return errorResponse(
-            new (0, _chunkQAZLM4WTcjs.RivetError)(
+            new (0, _chunkKORQB2IRcjs.RivetError)(
               "action",
               "action_not_found",
               `Action ${actionName} not found`
@@ -4827,17 +5131,34 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           );
         }
         const body = await jsRequest.json();
+        if (body.args !== void 0 && body.properties !== void 0) {
+          return jsonResponse(
+            { error: "use either args or properties, not both" },
+            { status: 400 }
+          );
+        }
+        if (body.properties !== void 0 && (body.properties === null || typeof body.properties !== "object" || Array.isArray(body.properties))) {
+          return jsonResponse(
+            { error: "properties must be an object" },
+            { status: 400 }
+          );
+        }
+        const args = body.properties !== void 0 ? [body.properties] : normalizeArgs(body.args);
         try {
           const output = await action(
             actorCtx,
             ...validateActionArgs(
               schemaConfig.actionInputSchemas,
               actionName,
-              _nullishCoalesce(body.args, () => ( []))
+              args
             )
           );
           return jsonResponse({ output });
         } catch (error) {
+          logger2().error({
+            msg: "Error handling inspector action request",
+            error
+          });
           return errorResponse(error);
         }
       }
@@ -4851,6 +5172,10 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         { status: 404 }
       );
     } catch (error) {
+      logger2().error({
+        msg: "Error handling inspector request",
+        error
+      });
       return errorResponse(error);
     } finally {
       await actorCtx.dispose();
@@ -4973,24 +5298,30 @@ function buildNativeFactory(runtime, registryConfig, definition) {
       async (error, payload) => {
         const { ctx } = unwrapTsfnPayload(error, payload);
         const actorCtx = makeActorCtx(ctx);
+        const saveActorState = async () => {
+          if (runtime.kind === "wasm") {
+            await runtime.actorSaveState(
+              ctx,
+              actorCtx.serializeForTick("save")
+            );
+          } else {
+            await actorCtx.saveState({
+              immediate: true
+            });
+          }
+        };
         try {
           if (onSleep) {
-            try {
-              await onSleep(actorCtx);
-            } finally {
-              if (runtime.kind === "wasm") {
-                await runtime.actorSaveState(
-                  ctx,
-                  actorCtx.serializeForTick("save")
-                );
-              } else {
-                await actorCtx.saveState({ immediate: true });
-              }
-            }
+            await onSleep(actorCtx);
           }
+          await saveActorState();
         } finally {
           try {
-            await cleanupNativeSleepRuntimeState(runtime, ctx);
+            await cleanupNativeSleepRuntimeState(
+              runtime,
+              ctx,
+              saveActorState
+            );
           } finally {
             await actorCtx.dispose();
           }
@@ -5155,7 +5486,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             );
           }
           if (!result) {
-            throw _chunkQAZLM4WTcjs.forbiddenError.call(void 0, );
+            throw _chunkKORQB2IRcjs.forbiddenError.call(void 0, );
           }
         } finally {
           await actorCtx.dispose();
@@ -5201,7 +5532,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
               new Response(null, { status: 404 })
             );
           }
-          const rawConnParams = jsRequest.headers.get(_chunkGVTOE34Scjs.HEADER_CONN_PARAMS);
+          const rawConnParams = jsRequest.headers.get(_chunk7QKCIVAYcjs.HEADER_CONN_PARAMS);
           let requestCtx;
           let conn;
           try {
@@ -5266,7 +5597,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
       }
     ) : void 0,
     run: (() => {
-      const run = _chunkWQ4HNA4Wcjs.getRunFunction.call(void 0, config.run);
+      const run = _chunkNIY3RSPXcjs.getRunFunction.call(void 0, config.run);
       if (!run) {
         return void 0;
       }
@@ -5285,7 +5616,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         }
       );
     })(),
-    getWorkflowHistory: _chunkWQ4HNA4Wcjs.getRunInspectorConfig.call(void 0, config.run) !== void 0 ? wrapNativeCallback(
+    getWorkflowHistory: _chunkNIY3RSPXcjs.getRunInspectorConfig.call(void 0, config.run) !== void 0 ? wrapNativeCallback(
       async (error, payload) => {
         var _a2;
         const { ctx } = unwrapTsfnPayload(error, payload);
@@ -5293,7 +5624,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         return history == null ? void 0 : encodeValue(history);
       }
     ) : void 0,
-    replayWorkflow: _chunkWQ4HNA4Wcjs.getRunInspectorConfig.call(void 0, config.run) !== void 0 ? wrapNativeCallback(
+    replayWorkflow: _chunkNIY3RSPXcjs.getRunInspectorConfig.call(void 0, config.run) !== void 0 ? wrapNativeCallback(
       async (error, payload) => {
         const { ctx, entryId } = unwrapTsfnPayload(
           error,
@@ -5368,7 +5699,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             name
           );
           if (canPublish && !await canPublish(actorCtx)) {
-            throw _chunkQAZLM4WTcjs.forbiddenError.call(void 0, );
+            throw _chunkKORQB2IRcjs.forbiddenError.call(void 0, );
           }
           const decodedBody = decodeValue(body);
           if (wait) {
@@ -5428,25 +5759,32 @@ async function buildServeConfig(config) {
     poolName: config.envoy.poolName,
     handleInspectorHttpInRuntime: true,
     serverlessBasePath: config.serverless.basePath,
-    serverlessPackageVersion: _chunkY5NSCZA2cjs.VERSION,
+    serverlessPackageVersion: _chunkDXXJPH55cjs.VERSION,
     serverlessClientEndpoint: config.publicEndpoint,
     serverlessClientNamespace: config.publicNamespace,
     serverlessClientToken: config.publicToken,
     serverlessValidateEndpoint: config.validateServerlessEndpoint,
     serverlessMaxStartPayloadBytes: config.serverless.maxStartPayloadBytes
   };
-  if (config.startEngine) {
+  try {
     const { getEnginePath } = await loadEngineCli();
     serveConfig.engineBinaryPath = getEnginePath();
+  } catch (error) {
+    logger2().warn({
+      msg: "could not resolve a local engine binary; if a local engine must be spawned it will fail with engine.binary_unavailable \u2014 set RIVET_ENGINE_BINARY_PATH or install the @rivetkit/engine-cli platform package",
+      error: _chunkDXXJPH55cjs.stringifyError.call(void 0, error)
+    });
   }
+  serveConfig.engineHost = config.engineHost;
+  serveConfig.enginePort = config.enginePort;
   if ((_a = config.test) == null ? void 0 : _a.enabled) {
-    serveConfig.inspectorTestToken = _nullishCoalesce(_chunkY5NSCZA2cjs.getEnvUniversal.call(void 0, "_RIVET_TEST_INSPECTOR_TOKEN"), () => ( "token"));
+    serveConfig.inspectorTestToken = _nullishCoalesce(_chunkDXXJPH55cjs.getEnvUniversal.call(void 0, "_RIVET_TEST_INSPECTOR_TOKEN"), () => ( "token"));
   }
   return serveConfig;
 }
 async function buildRegistryWithRuntime(config, runtime) {
   var _a;
-  if (((_a = config.test) == null ? void 0 : _a.enabled) && _chunkY5NSCZA2cjs.getEnvUniversal.call(void 0, "_RIVET_TEST_INSPECTOR_TOKEN") === void 0) {
+  if (((_a = config.test) == null ? void 0 : _a.enabled) && _chunkDXXJPH55cjs.getEnvUniversal.call(void 0, "_RIVET_TEST_INSPECTOR_TOKEN") === void 0) {
     trySetProcessEnv("_RIVET_TEST_INSPECTOR_TOKEN", "token");
   }
   const registry = runtime.createRegistry();
@@ -5488,6 +5826,7 @@ function finishShutdownSignal(signal) {
 }
 var Registry = class {
   #config;
+  #buildConfiguredRegistry;
   
   get config() {
     return this.#config;
@@ -5503,8 +5842,9 @@ var Registry = class {
   #shutdownInstalled = false;
   #shutdownInFlight = null;
   #signalHandlers = {};
-  constructor(config) {
+  constructor(config, deps) {
     this.#config = config;
+    this.#buildConfiguredRegistry = _nullishCoalesce((deps == null ? void 0 : deps.buildConfiguredRegistry), () => ( buildConfiguredRegistry));
     this.routes = {
       health: () => this.#healthRoute(),
       metadata: () => this.#metadataRoute(),
@@ -5514,12 +5854,12 @@ var Registry = class {
   #ensureServerlessPoolConfigured(config) {
     if (!config.configurePool) return void 0;
     if (!this.#configureServerlessPoolPromise) {
-      this.#configureServerlessPoolPromise = configureServerlessPool(config).catch(
-        (error) => {
-          this.#configureServerlessPoolPromise = void 0;
-          throw error;
-        }
-      );
+      this.#configureServerlessPoolPromise = configureServerlessPool(
+        config
+      ).catch((error) => {
+        this.#configureServerlessPoolPromise = void 0;
+        throw error;
+      });
       this.#configureServerlessPoolPromise.catch(() => {
       });
     }
@@ -5540,7 +5880,7 @@ var Registry = class {
     const config = this.parseConfig();
     this.#printWelcome(config, "serverless");
     if (!this.#runtimeServerlessPromise) {
-      this.#runtimeServerlessPromise = buildConfiguredRegistry(config);
+      this.#runtimeServerlessPromise = this.#buildConfiguredRegistry(config);
     }
     const { runtime, registry, serveConfig } = await this.#runtimeServerlessPromise;
     const isStartRequest = isServerlessStartRequest(
@@ -5555,7 +5895,7 @@ var Registry = class {
     if (isStartRequest) {
       try {
         await this.#ensureServerlessPoolConfigured(config);
-      } catch (error) {
+      } catch (_error) {
         return new Response(
           JSON.stringify({
             group: "guard",
@@ -5669,7 +6009,7 @@ var Registry = class {
     if (isMetadataRequest && !isEngineMetadataRequest) {
       try {
         await this.#ensureServerlessPoolConfigured(config);
-      } catch (error) {
+      } catch (_error) {
         return new Response(
           JSON.stringify({
             group: "guard",
@@ -5702,6 +6042,33 @@ var Registry = class {
       fetch: (request) => this.handler(request)
     };
   }
+  /**
+   * Starts an HTTP server that dispatches every request through the
+   * serverless handler. Uses `crossPlatformServe` to pick the right
+   * runtime (Node, Bun, Deno).
+   *
+   * @param opts.port      Port to listen on. Defaults to 3000.
+   * @param opts.publicDir If set, serves static files from this directory
+   *                       before falling through to the registry handler.
+   *
+   * @example
+   * ```ts
+   * await registry.listen();
+   * await registry.listen({ port: 8080, publicDir: "./public" });
+   * ```
+   */
+  async listen(opts = {}) {
+    const port = _nullishCoalesce(opts.port, () => ( 3e3));
+    const config = this.parseConfig();
+    const runtime = _chunkDXXJPH55cjs.detectRuntime.call(void 0, );
+    const app = new (0, _hono.Hono)();
+    if (opts.publicDir) {
+      const serveStatic = await loadRuntimeServeStatic(runtime);
+      app.use("*", serveStatic({ root: opts.publicDir }));
+    }
+    app.all("*", (c) => this.handler(c.req.raw));
+    await crossPlatformServe(config, port, app, runtime);
+  }
   /**
    * Returns a health response suitable for mounting in a user-owned router.
    */
@@ -5711,7 +6078,7 @@ var Registry = class {
       return jsonRouteResponse(503, {
         status: "not_started",
         runtime: "rivetkit",
-        version: _chunkY5NSCZA2cjs.VERSION
+        version: _chunkDXXJPH55cjs.VERSION
       });
     }
     const { runtime, registry } = configured;
@@ -5719,7 +6086,7 @@ var Registry = class {
       return jsonRouteResponse(501, {
         status: "unsupported",
         runtime: "rivetkit",
-        version: _chunkY5NSCZA2cjs.VERSION
+        version: _chunkDXXJPH55cjs.VERSION
       });
     }
     const response = await runtime.registryHealth(registry);
@@ -5791,20 +6158,20 @@ var Registry = class {
    */
   #startEnvoy(config, printWelcome) {
     if (!this.#runtimeServePromise) {
-      const configuredRegistryPromise = buildConfiguredRegistry(config);
+      const configuredRegistryPromise = this.#buildConfiguredRegistry(config);
       this.#runtimeServeConfiguredPromise = configuredRegistryPromise;
       this.#runtimeServePromise = configuredRegistryPromise.then(async ({ runtime, registry, serveConfig }) => {
         await runtime.serveRegistry(registry, serveConfig);
-      }).catch((err) => {
-        logger2().warn({ err }, "runtime registry serve errored");
+      }).catch((error) => {
+        logger2().warn({ error }, "runtime registry serve errored");
       });
-      this.#installSignalHandlers(config, configuredRegistryPromise);
+      this.#installSignalHandlers(config);
     }
     if (printWelcome) {
       this.#printWelcome(config, "serverful");
     }
   }
-  #installSignalHandlers(config, configuredRegistryPromise) {
+  #installSignalHandlers(config) {
     var _a;
     if (this.#shutdownInstalled) return;
     if ((_a = config.shutdown) == null ? void 0 : _a.disableSignalHandlers) return;
@@ -5813,58 +6180,86 @@ var Registry = class {
     }
     this.#shutdownInstalled = true;
     const install = (signal) => {
-      const handler = () => this.#onShutdownSignal(
-        signal,
-        config,
-        configuredRegistryPromise
-      );
+      const handler = () => this.#onShutdownSignal(signal, config);
       this.#signalHandlers[signal] = handler;
       process.on(signal, handler);
     };
     install("SIGINT");
     install("SIGTERM");
   }
-  #onShutdownSignal(signal, config, configuredRegistryPromise) {
+  #onShutdownSignal(signal, config) {
     if (this.#shutdownInFlight !== null) {
       this.#removeSignalHandlers();
       finishShutdownSignal(signal);
       return;
     }
-    this.#shutdownInFlight = this.#runShutdown(
-      signal,
-      config,
-      configuredRegistryPromise
-    ).catch((err) => {
+    this.#shutdownInFlight = this.#drain(config).catch((err) => {
+      logger2().warn({ err }, "shutdown error");
+    }).then(() => {
+      this.#removeSignalHandlers();
+      finishShutdownSignal(signal);
+    });
+  }
+  /**
+   * Gracefully drains all live registries.
+   *
+   * Programmatic counterpart to the SIGINT/SIGTERM handlers: tears down
+   * every live `CoreRegistry` (both `start()` and `handler()` modes) and
+   * waits for the serve promise to resolve, all bounded by the shutdown
+   * grace period. Unlike a signal-driven shutdown, this does not re-raise a
+   * signal or exit the process. The caller owns process lifetime.
+   *
+   * Idempotent: concurrent or repeated calls share a single drain. Safe to
+   * call even if nothing has been started.
+   *
+   * @example
+   * ```ts
+   * const registry = setup({ use: { counter } });
+   * registry.start();
+   * // ...later, on your own shutdown trigger:
+   * await registry.shutdown();
+   * ```
+   */
+  async shutdown() {
+    if (this.#shutdownInFlight !== null) return this.#shutdownInFlight;
+    const config = this.parseConfig();
+    this.#removeSignalHandlers();
+    this.#shutdownInFlight = this.#drain(config).catch((err) => {
       logger2().warn({ err }, "shutdown error");
     });
+    return this.#shutdownInFlight;
   }
-  async #runShutdown(signal, config, configuredRegistryPromise) {
+  async #drain(config) {
     var _a;
-    const gracePeriodMs = await _asyncNullishCoalesce(await _asyncNullishCoalesce(((_a = config.shutdown) == null ? void 0 : _a.gracePeriodMs), async () => ( await this.#actorStopThresholdMs(configuredRegistryPromise))), async () => ( 30 * 60 * 1e3));
+    const modeAPromise = this.#runtimeServeConfiguredPromise;
+    const modeBPromise = this.#runtimeServerlessPromise;
+    const gracePeriodMs = await _asyncNullishCoalesce(await _asyncNullishCoalesce(((_a = config.shutdown) == null ? void 0 : _a.gracePeriodMs), async () => ( await this.#actorStopThresholdMs(_nullishCoalesce(modeAPromise, () => ( modeBPromise))))), async () => ( 30 * 60 * 1e3));
     const drain = async () => {
-      const registries = [
-        (async () => {
-          try {
-            const { runtime, registry } = await configuredRegistryPromise;
-            await runtime.shutdownRegistry(registry);
-          } catch (err) {
-            logger2().warn(
-              { err },
-              "runtime registry shutdown errored (mode A)"
-            );
-          }
-        })()
-      ];
-      const runtimeServerlessPromise = this.#runtimeServerlessPromise;
-      if (runtimeServerlessPromise !== void 0) {
+      const registries = [];
+      if (modeAPromise !== void 0) {
         registries.push(
           (async () => {
             try {
-              const { runtime, registry } = await runtimeServerlessPromise;
+              const { runtime, registry } = await modeAPromise;
               await runtime.shutdownRegistry(registry);
             } catch (err) {
               logger2().warn(
                 { err },
+                "runtime registry shutdown errored (mode A)"
+              );
+            }
+          })()
+        );
+      }
+      if (modeBPromise !== void 0) {
+        registries.push(
+          (async () => {
+            try {
+              const { runtime, registry } = await modeBPromise;
+              await runtime.shutdownRegistry(registry);
+            } catch (err) {
+              logger2().warn(
+                { error: err },
                 "runtime registry shutdown errored (mode B)"
               );
             }
@@ -5886,11 +6281,10 @@ var Registry = class {
         }
       )
     ]);
-    this.#removeSignalHandlers();
-    finishShutdownSignal(signal);
   }
   async #actorStopThresholdMs(configuredRegistryPromise) {
     var _a;
+    if (configuredRegistryPromise === void 0) return void 0;
     try {
       const { runtime, registry } = await configuredRegistryPromise;
       const thresholdMs = await ((_a = runtime.registryActorStopThresholdMs) == null ? void 0 : _a.call(runtime, registry));
@@ -5938,13 +6332,13 @@ var Registry = class {
     };
     console.log();
     console.log(
-      `  RivetKit ${_chunkY5NSCZA2cjs.VERSION} (Engine - ${kind === "serverless" ? "Serverless" : "Serverful"})`
+      `  RivetKit ${_chunkDXXJPH55cjs.VERSION} (Engine - ${kind === "serverless" ? "Serverless" : "Serverful"})`
     );
     if (config.namespace !== "default") {
       logLine("Namespace", config.namespace);
     }
     if (config.endpoint) {
-      const endpointType = config.endpoint === ENGINE_ENDPOINT ? "local native" : "remote";
+      const endpointType = config.startEngine || isLocalEngineEndpoint(config.endpoint) ? "local native" : "remote";
       logLine("Endpoint", `${config.endpoint} (${endpointType})`);
     }
     if (kind === "serverless" && config.publicEndpoint) {
@@ -6006,5 +6400,5 @@ function setup(input) {
 
 
 
-exports.ALLOWED_PUBLIC_HEADERS = _chunkGVTOE34Scjs.ALLOWED_PUBLIC_HEADERS; exports.ActorDefinition = ActorDefinition; exports.ActorError = _chunkQAZLM4WTcjs.RivetError; exports.ActorsSchema = ActorsSchema; exports.DocConfigurePoolSchema = DocConfigurePoolSchema; exports.DocEnvoyConfigSchema = DocEnvoyConfigSchema; exports.DocRegistryConfigSchema = DocRegistryConfigSchema; exports.DocServerlessConfigSchema = DocServerlessConfigSchema; exports.DocSqliteConfigSchema = DocSqliteConfigSchema; exports.InlineWebSocketAdapter = InlineWebSocketAdapter; exports.Registry = Registry; exports.RegistryConfigSchema = RegistryConfigSchema; exports.RivetError = _chunkQAZLM4WTcjs.RivetError; exports.RuntimeKindSchema = RuntimeKindSchema; exports.SqliteBackendSchema = SqliteBackendSchema; exports.SqliteConfigSchema = SqliteConfigSchema; exports.TestConfigSchema = TestConfigSchema; exports.UserError = _chunkQAZLM4WTcjs.UserError; exports.WasmRuntimeConfigSchema = WasmRuntimeConfigSchema; exports.actor = actor; exports.buildActorNames = buildActorNames; exports.createClientWithDriver = _chunkGVTOE34Scjs.createClientWithDriver; exports.event = event; exports.isStaticActorDefinition = isStaticActorDefinition; exports.isStaticActorInstance = isStaticActorInstance; exports.lookupInRegistry = lookupInRegistry; exports.noopNext = _chunkY5NSCZA2cjs.noopNext; exports.queue = queue; exports.setup = setup; exports.toUint8Array = _chunkY5NSCZA2cjs.toUint8Array;
+exports.ALLOWED_PUBLIC_HEADERS = _chunk7QKCIVAYcjs.ALLOWED_PUBLIC_HEADERS; exports.ActorDefinition = ActorDefinition; exports.ActorError = _chunkKORQB2IRcjs.RivetError; exports.ActorsSchema = ActorsSchema; exports.DocConfigurePoolSchema = DocConfigurePoolSchema; exports.DocEnvoyConfigSchema = DocEnvoyConfigSchema; exports.DocRegistryConfigSchema = DocRegistryConfigSchema; exports.DocServerlessConfigSchema = DocServerlessConfigSchema; exports.DocSqliteConfigSchema = DocSqliteConfigSchema; exports.InlineWebSocketAdapter = InlineWebSocketAdapter; exports.Registry = Registry; exports.RegistryConfigSchema = RegistryConfigSchema; exports.RivetError = _chunkKORQB2IRcjs.RivetError; exports.RuntimeKindSchema = RuntimeKindSchema; exports.SqliteBackendSchema = SqliteBackendSchema; exports.SqliteConfigSchema = SqliteConfigSchema; exports.TestConfigSchema = TestConfigSchema; exports.UserError = _chunkKORQB2IRcjs.UserError; exports.WasmRuntimeConfigSchema = WasmRuntimeConfigSchema; exports.actor = actor; exports.buildActorNames = buildActorNames; exports.createClientWithDriver = _chunk7QKCIVAYcjs.createClientWithDriver; exports.event = event; exports.isStaticActorDefinition = isStaticActorDefinition; exports.isStaticActorInstance = isStaticActorInstance; exports.lookupInRegistry = lookupInRegistry; exports.noopNext = _chunkDXXJPH55cjs.noopNext; exports.queue = queue; exports.setup = setup; exports.toUint8Array = _chunkDXXJPH55cjs.toUint8Array;
 //# sourceMappingURL=mod.cjs.map