rivetkit 2.3.0-rc.11 → 2.3.0-rc.13

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 _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 _chunkISDKSSYRcjs = require('./chunk-ISDKSSYR.cjs');
 
 
 
 
 
 
-var _chunkXCDCURZ4cjs = require('./chunk-XCDCURZ4.cjs');
 
 
-var _chunkLNP7Q6I6cjs = require('./chunk-LNP7Q6I6.cjs');
+var _chunkNIY3RSPXcjs = require('./chunk-NIY3RSPX.cjs');
 
 
 
@@ -19,7 +19,7 @@ var _chunkLNP7Q6I6cjs = require('./chunk-LNP7Q6I6.cjs');
 
 
 
-var _chunkXG25CGSWcjs = require('./chunk-XG25CGSW.cjs');
+var _chunkE5CLYAUZcjs = require('./chunk-E5CLYAUZ.cjs');
 
 
 
@@ -32,9 +32,10 @@ var _chunkVE2X4KMGcjs = require('./chunk-VE2X4KMG.cjs');
 
 
 
-var _chunkGX6W4MW3cjs = require('./chunk-GX6W4MW3.cjs');
-require('./chunk-ZA7FLHKH.cjs');
-require('./chunk-LW5HNCWD.cjs');
+var _chunkBSPS6NSNcjs = require('./chunk-BSPS6NSN.cjs');
+require('./chunk-7XQCARVY.cjs');
+
+
 
 
 
@@ -59,7 +60,7 @@ require('./chunk-LW5HNCWD.cjs');
 
 
 
-var _chunkRDBGKI66cjs = require('./chunk-RDBGKI66.cjs');
+var _chunkEBWOJRCCcjs = require('./chunk-EBWOJRCC.cjs');
 
 
 
@@ -71,10 +72,11 @@ var _chunkRDBGKI66cjs = require('./chunk-RDBGKI66.cjs');
 
 
 var _chunkKORQB2IRcjs = require('./chunk-KORQB2IR.cjs');
+require('./chunk-ZA7FLHKH.cjs');
 
 // src/actor/log.ts
 function loggerWithoutContext() {
-  return _chunkRDBGKI66cjs.getLogger.call(void 0, "actor-runtime");
+  return _chunkEBWOJRCCcjs.getLogger.call(void 0, "actor-runtime");
 }
 
 // src/actor/definition.ts
@@ -107,7 +109,7 @@ function actor(input) {
   warnDeprecatedShutdownTimeoutKeys(
     input == null ? void 0 : input.options
   );
-  const config = _chunkXCDCURZ4cjs.ActorConfigSchema.parse(input);
+  const config = _chunkNIY3RSPXcjs.ActorConfigSchema.parse(input);
   return new ActorDefinition(config);
 }
 function isStaticActorDefinition(definition) {
@@ -206,7 +208,7 @@ function validateSchemaSync(schemas, key, data) {
 var _virtualwebsocket = require('@rivetkit/virtual-websocket');
 var _ws = require('hono/ws');
 function logger() {
-  return _chunkRDBGKI66cjs.getLogger.call(void 0, "inline-websocket-adapter");
+  return _chunkEBWOJRCCcjs.getLogger.call(void 0, "inline-websocket-adapter");
 }
 var InlineWebSocketAdapter = class {
   #handler;
@@ -360,12 +362,27 @@ var InlineWebSocketAdapter = class {
 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 _chunkRDBGKI66cjs.getLogger.call(void 0, "registry");
+  return _chunkEBWOJRCCcjs.getLogger.call(void 0, "registry");
 }
 
 // src/serverless/configure.ts
@@ -411,8 +428,8 @@ async function configureServerlessPool(config) {
         );
       }
       const customConfig = config.configurePool;
-      const clientConfig = _chunkXG25CGSWcjs.convertRegistryConfigToClientConfig.call(void 0, config);
-      const dcsRes = await _chunkXG25CGSWcjs.getDatacenters.call(void 0, clientConfig);
+      const clientConfig = _chunkE5CLYAUZcjs.convertRegistryConfigToClientConfig.call(void 0, config);
+      const dcsRes = await _chunkE5CLYAUZcjs.getDatacenters.call(void 0, clientConfig);
       const poolName = _nullishCoalesce(customConfig.name, () => ( "default"));
       const serverlessToken = _nullishCoalesce(config.token, () => ( config.publicToken));
       const headers = {
@@ -434,7 +451,7 @@ async function configureServerlessPool(config) {
         metadata: _nullishCoalesce(customConfig.metadata, () => ( {})),
         drain_on_version_upgrade: _nullishCoalesce(customConfig.drainOnVersionUpgrade, () => ( true))
       };
-      await _chunkXG25CGSWcjs.updateRunnerConfig.call(void 0, clientConfig, poolName, {
+      await _chunkE5CLYAUZcjs.updateRunnerConfig.call(void 0, clientConfig, poolName, {
         datacenters: Object.fromEntries(
           dcsRes.datacenters.map((dc) => [dc.name, serverlessConfig])
         )
@@ -451,7 +468,7 @@ async function configureServerlessPool(config) {
       logger2().warn({
         msg: "serverless pool configuration attempt failed",
         attempts,
-        error: _chunkRDBGKI66cjs.stringifyError.call(void 0, error)
+        error: _chunkEBWOJRCCcjs.stringifyError.call(void 0, error)
       });
       await sleep(CONFIGURE_RETRY_DELAY_MS);
     }
@@ -459,7 +476,7 @@ async function configureServerlessPool(config) {
   logger2().error({
     msg: "failed to configure serverless pool, validate endpoint is configured correctly then restart this process",
     attempts,
-    error: _chunkRDBGKI66cjs.stringifyError.call(void 0, lastError)
+    error: _chunkEBWOJRCCcjs.stringifyError.call(void 0, lastError)
   });
   throw lastError;
 }
@@ -467,7 +484,7 @@ async function configureServerlessPool(config) {
 // src/utils/serve.ts
 var _getport = require('get-port'); var _getport2 = _interopRequireDefault(_getport);
 var serveStaticLoaderPromises = {};
-async function crossPlatformServe(config, httpPort, app, runtime = _chunkRDBGKI66cjs.detectRuntime.call(void 0, )) {
+async function crossPlatformServe(config, httpPort, app, runtime = _chunkEBWOJRCCcjs.detectRuntime.call(void 0, )) {
   logger2().debug({ msg: "detected runtime for serve", runtime });
   switch (runtime) {
     case "deno":
@@ -518,7 +535,7 @@ async function serveNode(config, httpPort, app) {
   } catch (err) {
     logger2().error({
       msg: "failed to import @hono/node-server. please run 'npm install @hono/node-server @hono/node-ws'",
-      error: _chunkRDBGKI66cjs.stringifyError.call(void 0, err)
+      error: _chunkEBWOJRCCcjs.stringifyError.call(void 0, err)
     });
     process.exit(1);
   }
@@ -533,7 +550,7 @@ async function serveNode(config, httpPort, app) {
   } catch (err) {
     logger2().error({
       msg: "failed to import @hono/node-ws. please run 'npm install @hono/node-server @hono/node-ws'",
-      error: _chunkRDBGKI66cjs.stringifyError.call(void 0, err)
+      error: _chunkEBWOJRCCcjs.stringifyError.call(void 0, err)
     });
     process.exit(1);
   }
@@ -564,7 +581,7 @@ async function serveDeno(config, httpPort, app) {
   } catch (err) {
     logger2().error({
       msg: "failed to import hono/deno",
-      error: _chunkRDBGKI66cjs.stringifyError.call(void 0, err)
+      error: _chunkEBWOJRCCcjs.stringifyError.call(void 0, err)
     });
     process.exit(1);
   }
@@ -586,7 +603,7 @@ async function serveBun(config, httpPort, app) {
   } catch (err) {
     logger2().error({
       msg: "failed to import hono/bun",
-      error: _chunkRDBGKI66cjs.stringifyError.call(void 0, err)
+      error: _chunkEBWOJRCCcjs.stringifyError.call(void 0, err)
     });
     process.exit(1);
   }
@@ -610,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(_chunkRDBGKI66cjs.getRivetPool.call(void 0, ), () => ( "default"))),
+  poolName: _v4.z.string().default(() => _nullishCoalesce(_chunkEBWOJRCCcjs.getRivetPool.call(void 0, ), () => ( "default"))),
   version: _v4.z.number().default(() => {
-    const version = _chunkRDBGKI66cjs.getRivetEnvoyVersion.call(void 0, );
+    const version = _chunkEBWOJRCCcjs.getRivetEnvoyVersion.call(void 0, );
     if (version !== void 0) return version;
-    if (_chunkRDBGKI66cjs.getNodeEnv.call(void 0, ) === "production" && !warnedMissingVersion) {
+    if (_chunkEBWOJRCCcjs.getNodeEnv.call(void 0, ) === "production" && !warnedMissingVersion) {
       warnedMissingVersion = true;
-      _chunkRDBGKI66cjs.getLogger.call(void 0, "rivetkit").error(
+      _chunkEBWOJRCCcjs.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(_chunkRDBGKI66cjs.getRivetTotalSlots.call(void 0, ), () => ( 1e5))),
+  totalSlots: _v4.z.number().default(() => _nullishCoalesce(_chunkEBWOJRCCcjs.getRivetTotalSlots.call(void 0, ), () => ( 1e5))),
   envoyKey: _v4.z.string().optional()
 });
 
@@ -661,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, () => ( _chunkRDBGKI66cjs.getRivetPublicEndpoint.call(void 0, )))),
+  publicEndpoint: _v4.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkEBWOJRCCcjs.getRivetPublicEndpoint.call(void 0, )))),
   /**
    * Token that clients should use when connecting via the public endpoint.
    *
@@ -669,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, () => ( _chunkRDBGKI66cjs.getRivetPublicToken.call(void 0, ))))
+  publicToken: _v4.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkEBWOJRCCcjs.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.
@@ -723,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, () => ( _chunkRDBGKI66cjs.getRivetkitRuntime.call(void 0, )));
+    const rawRuntime = _nullishCoalesce(val, () => ( _chunkEBWOJRCCcjs.getRivetkitRuntime.call(void 0, )));
     if (rawRuntime === void 0) {
       return "auto";
     }
@@ -760,7 +777,7 @@ var RegistryConfigSchema = _zod.z.object({
    * */
   logging: _zod.z.object({
     baseLogger: _zod.z.custom().optional(),
-    level: _chunkRDBGKI66cjs.LogLevelSchema.optional()
+    level: _chunkEBWOJRCCcjs.LogLevelSchema.optional()
   }).optional().default(() => ({})),
   // MARK: Routing
   // // This is a function to allow for lazy configuration of upgradeWebSocket on the
@@ -778,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, () => ( _chunkRDBGKI66cjs.getRivetEngine.call(void 0, ))), () => ( _chunkRDBGKI66cjs.getRivetEndpoint.call(void 0, )))),
-  token: _zod.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkRDBGKI66cjs.getRivetToken.call(void 0, )))),
-  namespace: _zod.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkRDBGKI66cjs.getRivetNamespace.call(void 0, )))),
+  endpoint: _zod.z.string().optional().transform((val) => _nullishCoalesce(_nullishCoalesce(val, () => ( _chunkEBWOJRCCcjs.getRivetEngine.call(void 0, ))), () => ( _chunkEBWOJRCCcjs.getRivetEndpoint.call(void 0, )))),
+  token: _zod.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkEBWOJRCCcjs.getRivetToken.call(void 0, )))),
+  namespace: _zod.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkEBWOJRCCcjs.getRivetNamespace.call(void 0, )))),
   headers: _zod.z.record(_zod.z.string(), _zod.z.string()).optional().default({}),
   // MARK: Client
   // TODO:
@@ -820,9 +837,21 @@ var RegistryConfigSchema = _zod.z.object({
    *
    * Starts the full Rust engine process locally.
    */
-  startEngine: _zod.z.boolean().default(() => _chunkRDBGKI66cjs.getRivetRunEngine.call(void 0, )),
+  startEngine: _zod.z.boolean().default(() => _chunkEBWOJRCCcjs.getRivetRunEngine.call(void 0, )),
+  /**
+   * @experimental
+   *
+   * Host to bind the spawned local engine process to.
+   */
+  engineHost: _zod.z.string().optional().default(() => _nullishCoalesce(_chunkEBWOJRCCcjs.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(_chunkEBWOJRCCcjs.getRivetRunEnginePort.call(void 0, ), () => ( ENGINE_PORT))),
   /** @experimental */
-  engineVersion: _zod.z.string().optional().default(() => _nullishCoalesce(_chunkRDBGKI66cjs.getRivetRunEngineVersion.call(void 0, ), () => ( _chunkRDBGKI66cjs.VERSION))),
+  engineVersion: _zod.z.string().optional().default(() => _nullishCoalesce(_chunkEBWOJRCCcjs.getRivetRunEngineVersion.call(void 0, ), () => ( _chunkEBWOJRCCcjs.VERSION))),
   /**
    * @experimental
    *
@@ -853,12 +882,12 @@ var RegistryConfigSchema = _zod.z.object({
   shutdown: _zod.z.object({
     /**
      * Wait this many milliseconds for the serve promise to resolve
-     * after calling `CoreRegistry::shutdown()`. Defaults to 30s,
-     * matching Kubernetes `terminationGracePeriodSeconds`.
+     * after calling `CoreRegistry::shutdown()`. Defaults to the
+     * engine-provided actor stop threshold once the envoy connects.
      *
      * Must be long enough for rivetkit-core to drain the envoy.
      */
-    gracePeriodMs: _zod.z.number().int().min(1e3).optional().default(3e4),
+    gracePeriodMs: _zod.z.number().int().min(1e3).optional(),
     /**
      * If true, rivetkit will not install SIGINT/SIGTERM handlers.
      * Use when the host application owns signal policy and will
@@ -866,12 +895,11 @@ var RegistryConfigSchema = _zod.z.object({
      */
     disableSignalHandlers: _zod.z.boolean().optional().default(false)
   }).optional().default(() => ({
-    gracePeriodMs: 3e4,
     disableSignalHandlers: false
   }))
 }).transform((config, ctx) => {
   var _a, _b, _c;
-  const isDevEnv = _chunkRDBGKI66cjs.isDev.call(void 0, );
+  const isDevEnv = _chunkEBWOJRCCcjs.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({
@@ -881,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 ? _chunkXG25CGSWcjs.tryParseEndpoint.call(void 0, ctx, {
+  const parsedEndpoint = config.endpoint ? _chunkE5CLYAUZcjs.tryParseEndpoint.call(void 0, ctx, {
     endpoint: config.endpoint,
     path: ["endpoint"],
     namespace: config.namespace,
@@ -899,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 ? _chunkXG25CGSWcjs.tryParseEndpoint.call(void 0, ctx, {
+  const parsedPublicEndpoint = config.serverless.publicEndpoint ? _chunkE5CLYAUZcjs.tryParseEndpoint.call(void 0, ctx, {
     endpoint: config.serverless.publicEndpoint,
     path: ["serverless", "publicEndpoint"]
   }) : void 0;
@@ -916,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 {
@@ -940,7 +972,7 @@ function buildActorNames(config) {
     Object.keys(config.use).map((actorName) => {
       const definition = config.use[actorName];
       const options = _nullishCoalesce(definition.config.options, () => ( {}));
-      const runMeta = _chunkXCDCURZ4cjs.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));
@@ -1033,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: _chunkRDBGKI66cjs.LogLevelSchema.optional().describe(
+    level: _chunkEBWOJRCCcjs.LogLevelSchema.optional().describe(
       "Log level for RivetKit. Default: 'warn'"
     )
   }).optional().describe("Logging configuration."),
@@ -1578,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);
   }
@@ -2163,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");
@@ -2312,7 +2353,13 @@ var WasmCoreRuntime = (_class2 = class {
   }
   async actorQueueWaitForNamesAvailable(ctx, names, options, signal) {
     const queue2 = childHandle(asWasmActorContext(ctx), "queue");
-    await callHandleAsync(queue2, "waitForNamesAvailable", names, options, signal);
+    await callHandleAsync(
+      queue2,
+      "waitForNamesAvailable",
+      names,
+      options,
+      signal
+    );
   }
   async actorQueueEnqueueAndWait(ctx, name, body, options, signal) {
     const queue2 = childHandle(asWasmActorContext(ctx), "queue");
@@ -2404,6 +2451,10 @@ 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) {
@@ -2439,7 +2490,7 @@ function trySetProcessEnv(key, value) {
   if (typeof process === "undefined") return;
   try {
     process.env[key] = value;
-  } catch (e) {
+  } catch (e2) {
   }
 }
 function detectRuntimeHost() {
@@ -2476,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;
   }
 }
@@ -2639,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: _chunkEBWOJRCCcjs.stringifyError.call(void 0, error)
+      });
+    });
+    return;
+  }
+  await (afterTrackedWorkDrained == null ? void 0 : afterTrackedWorkDrained());
   await closeNativeDatabaseClient(runtime, ctx);
   await closeNativeSqlDatabase(runtime, ctx);
   clearNativeRuntimeState(runtime, ctx);
@@ -2745,10 +2811,13 @@ function decodeValue(value) {
   if (!value || value.length === 0) {
     return void 0;
   }
-  return _chunkGX6W4MW3cjs.decodeCborCompat.call(void 0, value);
+  return _chunkBSPS6NSNcjs.decodeCborCompat.call(void 0, value);
 }
 function encodeValue(value) {
-  return _chunkGX6W4MW3cjs.encodeCborCompat.call(void 0, value);
+  return _chunkBSPS6NSNcjs.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) {
@@ -2781,7 +2850,7 @@ function isStructuredBridgeError(error) {
   return _chunkKORQB2IRcjs.isRivetErrorLike.call(void 0, error) && "__type" in error && (error.__type === "RivetError" || error.__type === "ActorError");
 }
 function encodeNativeCallbackError(error) {
-  const structuredError = isStructuredBridgeError(error) ? error : _chunkRDBGKI66cjs.deconstructError.call(void 0, error, true);
+  const structuredError = isStructuredBridgeError(error) ? error : _chunkEBWOJRCCcjs.deconstructError.call(void 0, error, true);
   const bridgeError = new Error(_chunkKORQB2IRcjs.encodeBridgeRivetError.call(void 0, structuredError), {
     cause: error instanceof Error ? error : void 0
   });
@@ -2831,8 +2900,8 @@ function decodeWorkflowCbor(data) {
     return null;
   }
   try {
-    return _chunkGX6W4MW3cjs.decodeCborCompat.call(void 0, new Uint8Array(data));
-  } catch (e3) {
+    return _chunkBSPS6NSNcjs.decodeCborCompat.call(void 0, new Uint8Array(data));
+  } catch (e4) {
     return null;
   }
 }
@@ -2936,7 +3005,7 @@ function serializeWorkflowHistoryForJson(data) {
   if (data === null) {
     return null;
   }
-  const history = _chunkLNP7Q6I6cjs.decodeWorkflowHistoryTransport.call(void 0, data);
+  const history = _chunkISDKSSYRcjs.decodeWorkflowHistoryTransport.call(void 0, data);
   return jsonSafe({
     nameRegistry: [...history.nameRegistry],
     entries: history.entries.map((entry) => ({
@@ -3012,7 +3081,7 @@ function wrapNativeCallback(callback) {
 }
 function decodeArgs(value) {
   const decoded = decodeValue(value);
-  return Array.isArray(decoded) ? decoded : decoded === void 0 ? [] : [decoded];
+  return normalizeArgs(decoded);
 }
 function buildRequest(init) {
   const url = init.uri.startsWith("http") ? init.uri : new URL(init.uri, "http://127.0.0.1").toString();
@@ -3049,7 +3118,7 @@ var NativeConnAdapter = class {
     this.#schemas = schemas;
     this.#ctx = ctx;
     this.#queueHibernationRemoval = queueHibernationRemoval;
-    this[_chunkXCDCURZ4cjs.CONN_STATE_MANAGER_SYMBOL] = {
+    this[_chunkNIY3RSPXcjs.CONN_STATE_MANAGER_SYMBOL] = {
       stateEnabled: true,
       get state() {
         return thisConn.state;
@@ -3066,7 +3135,7 @@ var NativeConnAdapter = class {
       decodeValue(this.#runtime.connParams(this.#conn))
     );
   }
-  [_chunkXCDCURZ4cjs.RAW_STATE_SYMBOL]() {
+  [_chunkNIY3RSPXcjs.RAW_STATE_SYMBOL]() {
     return this.#readState();
   }
   get state() {
@@ -3077,12 +3146,12 @@ var NativeConnAdapter = class {
         this.#writeState(nextValue, { writeNative: true });
       },
       (newValue) => {
-        _chunkGX6W4MW3cjs.assertJsonCompatValue.call(void 0, newValue);
+        _chunkBSPS6NSNcjs.assertJsonCompatValue.call(void 0, newValue);
       }
     );
   }
   set state(value) {
-    _chunkGX6W4MW3cjs.assertJsonCompatValue.call(void 0, value);
+    _chunkBSPS6NSNcjs.assertJsonCompatValue.call(void 0, value);
     this.#writeState(value, { writeNative: true });
   }
   initializeState(value) {
@@ -3980,7 +4049,7 @@ var ActorContextHandleAdapter = class {
       this.#databaseProvider = databaseProvider;
     }
     this.#request = request;
-    this[_chunkXCDCURZ4cjs.ACTOR_CONTEXT_INTERNAL_SYMBOL] = new NativeWorkflowRuntimeAdapter(
+    this[_chunkNIY3RSPXcjs.ACTOR_CONTEXT_INTERNAL_SYMBOL] = new NativeWorkflowRuntimeAdapter(
       this
     );
   }
@@ -4011,7 +4080,7 @@ var ActorContextHandleAdapter = class {
     }
     throw databaseClientNotReadyError();
   }
-  [_chunkXCDCURZ4cjs.RAW_STATE_SYMBOL]() {
+  [_chunkNIY3RSPXcjs.RAW_STATE_SYMBOL]() {
     if (!this.#stateEnabled) {
       throw stateNotEnabledError();
     }
@@ -4032,7 +4101,7 @@ var ActorContextHandleAdapter = class {
         },
         (newValue) => {
           this.#assertCanMutateState();
-          _chunkGX6W4MW3cjs.assertJsonCompatValue.call(void 0, newValue);
+          _chunkBSPS6NSNcjs.assertJsonCompatValue.call(void 0, newValue);
         }
       );
     }
@@ -4043,7 +4112,7 @@ var ActorContextHandleAdapter = class {
       throw stateNotEnabledError();
     }
     this.#assertCanMutateState();
-    _chunkGX6W4MW3cjs.assertJsonCompatValue.call(void 0, value);
+    _chunkBSPS6NSNcjs.assertJsonCompatValue.call(void 0, value);
     this.#writeState(value, { scheduleSave: true });
   }
   initializeState(value) {
@@ -4308,7 +4377,7 @@ var ActorContextHandleAdapter = class {
     const trackedPromise = Promise.resolve(promise).catch((error) => {
       logger2().warn({
         msg: "keepAwake promise rejected",
-        error: _chunkRDBGKI66cjs.stringifyError.call(void 0, error)
+        error: _chunkEBWOJRCCcjs.stringifyError.call(void 0, error)
       });
     }).then(() => null);
     try {
@@ -4384,6 +4453,7 @@ var ActorContextHandleAdapter = class {
     return false;
   }
   sleep() {
+    this.#flushStateChange();
     callNativeSync(() => this.#runtime.actorSleep(this.#ctx));
   }
   destroy() {
@@ -4673,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;
@@ -4689,9 +4812,9 @@ function buildNativeFactory(runtime, registryConfig, definition) {
   const actionHandlers = Object.fromEntries(
     Object.entries(_nullishCoalesce(config.actions, () => ( {}))).map(([name, handler]) => [name, handler])
   );
-  const createClient = () => _chunkXG25CGSWcjs.createClientWithDriver.call(void 0, 
-    new (0, _chunkXG25CGSWcjs.RemoteEngineControlClient)(
-      _chunkXG25CGSWcjs.convertRegistryConfigToClientConfig.call(void 0, registryConfig)
+  const createClient = () => _chunkE5CLYAUZcjs.createClientWithDriver.call(void 0, 
+    new (0, _chunkE5CLYAUZcjs.RemoteEngineControlClient)(
+      _chunkE5CLYAUZcjs.convertRegistryConfigToClientConfig.call(void 0, registryConfig)
     ),
     { encoding: "bare" }
   );
@@ -4701,7 +4824,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
   ), () => ( false));
   const getNativeWorkflowInspector = (ctx) => {
     var _a2;
-    return (_a2 = _chunkXCDCURZ4cjs.getRunInspectorConfig.call(void 0, 
+    return (_a2 = _chunkNIY3RSPXcjs.getRunInspectorConfig.call(void 0, 
       config.run,
       callNativeSync(() => runtime.actorId(ctx))
     )) == null ? void 0 : _a2.workflow;
@@ -5008,13 +5131,26 @@ 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 });
@@ -5162,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();
           }
@@ -5390,7 +5532,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
               new Response(null, { status: 404 })
             );
           }
-          const rawConnParams = jsRequest.headers.get(_chunkXG25CGSWcjs.HEADER_CONN_PARAMS);
+          const rawConnParams = jsRequest.headers.get(_chunkE5CLYAUZcjs.HEADER_CONN_PARAMS);
           let requestCtx;
           let conn;
           try {
@@ -5455,7 +5597,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
       }
     ) : void 0,
     run: (() => {
-      const run = _chunkXCDCURZ4cjs.getRunFunction.call(void 0, config.run);
+      const run = _chunkNIY3RSPXcjs.getRunFunction.call(void 0, config.run);
       if (!run) {
         return void 0;
       }
@@ -5474,7 +5616,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         }
       );
     })(),
-    getWorkflowHistory: _chunkXCDCURZ4cjs.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);
@@ -5482,7 +5624,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         return history == null ? void 0 : encodeValue(history);
       }
     ) : void 0,
-    replayWorkflow: _chunkXCDCURZ4cjs.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,
@@ -5617,7 +5759,7 @@ async function buildServeConfig(config) {
     poolName: config.envoy.poolName,
     handleInspectorHttpInRuntime: true,
     serverlessBasePath: config.serverless.basePath,
-    serverlessPackageVersion: _chunkRDBGKI66cjs.VERSION,
+    serverlessPackageVersion: _chunkEBWOJRCCcjs.VERSION,
     serverlessClientEndpoint: config.publicEndpoint,
     serverlessClientNamespace: config.publicNamespace,
     serverlessClientToken: config.publicToken,
@@ -5627,15 +5769,17 @@ async function buildServeConfig(config) {
   if (config.startEngine) {
     const { getEnginePath } = await loadEngineCli();
     serveConfig.engineBinaryPath = getEnginePath();
+    serveConfig.engineHost = config.engineHost;
+    serveConfig.enginePort = config.enginePort;
   }
   if ((_a = config.test) == null ? void 0 : _a.enabled) {
-    serveConfig.inspectorTestToken = _nullishCoalesce(_chunkRDBGKI66cjs.getEnvUniversal.call(void 0, "_RIVET_TEST_INSPECTOR_TOKEN"), () => ( "token"));
+    serveConfig.inspectorTestToken = _nullishCoalesce(_chunkEBWOJRCCcjs.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) && _chunkRDBGKI66cjs.getEnvUniversal.call(void 0, "_RIVET_TEST_INSPECTOR_TOKEN") === void 0) {
+  if (((_a = config.test) == null ? void 0 : _a.enabled) && _chunkEBWOJRCCcjs.getEnvUniversal.call(void 0, "_RIVET_TEST_INSPECTOR_TOKEN") === void 0) {
     trySetProcessEnv("_RIVET_TEST_INSPECTOR_TOKEN", "token");
   }
   const registry = runtime.createRegistry();
@@ -5661,8 +5805,23 @@ async function buildConfiguredRegistry(config) {
 }
 
 // src/registry/index.ts
+function signalExitCode(signal) {
+  switch (signal) {
+    case "SIGINT":
+      return 130;
+    case "SIGTERM":
+      return 143;
+  }
+}
+function finishShutdownSignal(signal) {
+  if (process.pid === 1) {
+    process.exit(signalExitCode(signal));
+  }
+  process.kill(process.pid, signal);
+}
 var Registry = class {
   #config;
+  #buildConfiguredRegistry;
   
   get config() {
     return this.#config;
@@ -5678,8 +5837,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(),
@@ -5715,7 +5875,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(
@@ -5895,7 +6055,7 @@ var Registry = class {
   async listen(opts = {}) {
     const port = _nullishCoalesce(opts.port, () => ( 3e3));
     const config = this.parseConfig();
-    const runtime = _chunkRDBGKI66cjs.detectRuntime.call(void 0, );
+    const runtime = _chunkEBWOJRCCcjs.detectRuntime.call(void 0, );
     const app = new (0, _hono.Hono)();
     if (opts.publicDir) {
       const serveStatic = await loadRuntimeServeStatic(runtime);
@@ -5913,7 +6073,7 @@ var Registry = class {
       return jsonRouteResponse(503, {
         status: "not_started",
         runtime: "rivetkit",
-        version: _chunkRDBGKI66cjs.VERSION
+        version: _chunkEBWOJRCCcjs.VERSION
       });
     }
     const { runtime, registry } = configured;
@@ -5921,7 +6081,7 @@ var Registry = class {
       return jsonRouteResponse(501, {
         status: "unsupported",
         runtime: "rivetkit",
-        version: _chunkRDBGKI66cjs.VERSION
+        version: _chunkEBWOJRCCcjs.VERSION
       });
     }
     const response = await runtime.registryHealth(registry);
@@ -5993,20 +6153,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((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;
@@ -6015,54 +6175,82 @@ 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();
-      process.kill(process.pid, signal);
+      finishShutdownSignal(signal);
       return;
     }
-    this.#shutdownInFlight = this.#runShutdown(
-      signal,
-      config,
-      configuredRegistryPromise
-    ).catch((error) => {
-      logger2().warn({ error }, "shutdown error");
+    this.#shutdownInFlight = this.#drain(config).catch((err) => {
+      logger2().warn({ err }, "shutdown error");
+    }).then(() => {
+      this.#removeSignalHandlers();
+      finishShutdownSignal(signal);
     });
   }
-  async #runShutdown(signal, config, configuredRegistryPromise) {
+  /**
+   * 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 #drain(config) {
     var _a;
-    const gracePeriodMs = _nullishCoalesce(((_a = config.shutdown) == null ? void 0 : _a.gracePeriodMs), () => ( 3e4));
+    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 (error) {
-            logger2().warn(
-              { error },
-              "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 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 runtimeServerlessPromise;
+              const { runtime, registry } = await modeBPromise;
               await runtime.shutdownRegistry(registry);
             } catch (err) {
               logger2().warn(
@@ -6088,8 +6276,23 @@ var Registry = class {
         }
       )
     ]);
-    this.#removeSignalHandlers();
-    process.kill(process.pid, 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));
+      if (thresholdMs !== void 0 && Number.isFinite(thresholdMs) && thresholdMs > 0) {
+        return thresholdMs;
+      }
+    } catch (err) {
+      logger2().warn(
+        { err },
+        "failed to read actor stop threshold for shutdown grace"
+      );
+    }
+    return void 0;
   }
   #removeSignalHandlers() {
     for (const [signal, handler] of Object.entries(
@@ -6124,13 +6327,13 @@ var Registry = class {
     };
     console.log();
     console.log(
-      `  RivetKit ${_chunkRDBGKI66cjs.VERSION} (Engine - ${kind === "serverless" ? "Serverless" : "Serverful"})`
+      `  RivetKit ${_chunkEBWOJRCCcjs.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) {
@@ -6192,5 +6395,5 @@ function setup(input) {
 
 
 
-exports.ALLOWED_PUBLIC_HEADERS = _chunkXG25CGSWcjs.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 = _chunkXG25CGSWcjs.createClientWithDriver; exports.event = event; exports.isStaticActorDefinition = isStaticActorDefinition; exports.isStaticActorInstance = isStaticActorInstance; exports.lookupInRegistry = lookupInRegistry; exports.noopNext = _chunkRDBGKI66cjs.noopNext; exports.queue = queue; exports.setup = setup; exports.toUint8Array = _chunkRDBGKI66cjs.toUint8Array;
+exports.ALLOWED_PUBLIC_HEADERS = _chunkE5CLYAUZcjs.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 = _chunkE5CLYAUZcjs.createClientWithDriver; exports.event = event; exports.isStaticActorDefinition = isStaticActorDefinition; exports.isStaticActorInstance = isStaticActorInstance; exports.lookupInRegistry = lookupInRegistry; exports.noopNext = _chunkEBWOJRCCcjs.noopNext; exports.queue = queue; exports.setup = setup; exports.toUint8Array = _chunkEBWOJRCCcjs.toUint8Array;
 //# sourceMappingURL=mod.cjs.map