rivetkit 2.3.29 → 3.0.0-preview.1

package/dist/tsup/mod.cjs

@@ -1,6 +1,6 @@
 "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 _chunkNK4D6G45cjs = require('./chunk-NK4D6G45.cjs');
+var _chunkVCVV726Pcjs = require('./chunk-VCVV726P.cjs');
 
 
 
@@ -35,17 +35,17 @@ var _chunkHDVZ6YZGcjs = require('./chunk-HDVZ6YZG.cjs');
 
 
 
-var _chunkWSSI5L6Lcjs = require('./chunk-WSSI5L6L.cjs');
+var _chunkCTQKKUZCcjs = require('./chunk-CTQKKUZC.cjs');
 
 
 
-var _chunkMYWZCDMLcjs = require('./chunk-MYWZCDML.cjs');
-require('./chunk-Q6GKUC22.cjs');
+var _chunkRTWH3AX3cjs = require('./chunk-RTWH3AX3.cjs');
+require('./chunk-HW2D5OFJ.cjs');
 
 
 
 
-var _chunk56QW6V7Fcjs = require('./chunk-56QW6V7F.cjs');
+var _chunkJLBPBEWCcjs = require('./chunk-JLBPBEWC.cjs');
 require('./chunk-KVFIONKQ.cjs');
 
 
@@ -80,7 +80,8 @@ require('./chunk-KVFIONKQ.cjs');
 
 
 
-var _chunkDTGPF6XYcjs = require('./chunk-DTGPF6XY.cjs');
+var _chunkIBEFA6CXcjs = require('./chunk-IBEFA6CX.cjs');
+
 
 
 
@@ -97,7 +98,7 @@ var _chunkMGI2VVF6cjs = require('./chunk-MGI2VVF6.cjs');
 
 // src/actor/log.ts
 function loggerWithoutContext() {
-  return _chunkDTGPF6XYcjs.getLogger.call(void 0, "actor-runtime");
+  return _chunkIBEFA6CXcjs.getLogger.call(void 0, "actor-runtime");
 }
 
 // src/actor/definition.ts
@@ -239,7 +240,7 @@ function validateSchemaSync(schemas, key, data) {
 var _virtualwebsocket = require('@rivetkit/virtual-websocket');
 var _ws = require('hono/ws');
 function logger() {
-  return _chunkDTGPF6XYcjs.getLogger.call(void 0, "inline-websocket-adapter");
+  return _chunkIBEFA6CXcjs.getLogger.call(void 0, "inline-websocket-adapter");
 }
 var InlineWebSocketAdapter = class {
   #handler;
@@ -391,7 +392,7 @@ var InlineWebSocketAdapter = class {
 
 // src/registry/log.ts
 function logger2() {
-  return _chunkDTGPF6XYcjs.getLogger.call(void 0, "registry");
+  return _chunkIBEFA6CXcjs.getLogger.call(void 0, "registry");
 }
 
 // src/serverless/configure.ts
@@ -437,8 +438,8 @@ async function configureServerlessPool(config) {
         );
       }
       const customConfig = config.configurePool;
-      const clientConfig = _chunkWSSI5L6Lcjs.convertRegistryConfigToClientConfig.call(void 0, config);
-      const dcsRes = await _chunkWSSI5L6Lcjs.getDatacenters.call(void 0, clientConfig);
+      const clientConfig = _chunkCTQKKUZCcjs.convertRegistryConfigToClientConfig.call(void 0, config);
+      const dcsRes = await _chunkCTQKKUZCcjs.getDatacenters.call(void 0, clientConfig);
       const poolName = _nullishCoalesce(customConfig.name, () => ( "default"));
       const serverlessToken = _nullishCoalesce(config.token, () => ( config.publicToken));
       const headers = {
@@ -460,7 +461,7 @@ async function configureServerlessPool(config) {
         metadata: _nullishCoalesce(customConfig.metadata, () => ( {})),
         drain_on_version_upgrade: _nullishCoalesce(customConfig.drainOnVersionUpgrade, () => ( true))
       };
-      await _chunkWSSI5L6Lcjs.updateRunnerConfig.call(void 0, clientConfig, poolName, {
+      await _chunkCTQKKUZCcjs.updateRunnerConfig.call(void 0, clientConfig, poolName, {
         datacenters: Object.fromEntries(
           dcsRes.datacenters.map((dc) => [dc.name, serverlessConfig])
         )
@@ -477,7 +478,7 @@ async function configureServerlessPool(config) {
       logger2().warn({
         msg: "serverless pool configuration attempt failed",
         attempts,
-        error: _chunkDTGPF6XYcjs.stringifyError.call(void 0, error)
+        error: _chunkIBEFA6CXcjs.stringifyError.call(void 0, error)
       });
       await sleep(CONFIGURE_RETRY_DELAY_MS);
     }
@@ -485,7 +486,7 @@ async function configureServerlessPool(config) {
   logger2().error({
     msg: "failed to configure serverless pool, validate endpoint is configured correctly then restart this process",
     attempts,
-    error: _chunkDTGPF6XYcjs.stringifyError.call(void 0, lastError)
+    error: _chunkIBEFA6CXcjs.stringifyError.call(void 0, lastError)
   });
   throw lastError;
 }
@@ -496,11 +497,11 @@ var _zod = require('zod');
 // src/registry/config/envoy.ts
 var _v4 = require('zod/v4');
 var EnvoyConfigSchema = _v4.z.object({
-  poolName: _v4.z.string().default(() => _nullishCoalesce(_chunkDTGPF6XYcjs.getRivetPool.call(void 0, ), () => ( "default"))),
-  version: _v4.z.number().default(() => _nullishCoalesce(_chunkDTGPF6XYcjs.getRivetEnvoyVersion.call(void 0, ), () => ( 1))),
+  poolName: _v4.z.string().default(() => _nullishCoalesce(_chunkIBEFA6CXcjs.getRivetPool.call(void 0, ), () => ( "default"))),
+  version: _v4.z.number().default(() => _nullishCoalesce(_chunkIBEFA6CXcjs.getRivetEnvoyVersion.call(void 0, ), () => ( 1))),
   // Deprecated.
-  totalSlots: _v4.z.number().default(() => _nullishCoalesce(_chunkDTGPF6XYcjs.getRivetTotalSlots.call(void 0, ), () => ( 1e5))),
-  envoyKey: _v4.z.string().optional()
+  totalSlots: _v4.z.number().default(() => _nullishCoalesce(_chunkIBEFA6CXcjs.getRivetTotalSlots.call(void 0, ), () => ( 1e5))),
+  nodeKey: _v4.z.string().optional()
 });
 
 // src/registry/config/serverless.ts
@@ -537,7 +538,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, () => ( _chunkDTGPF6XYcjs.getRivetPublicEndpoint.call(void 0, )))),
+  publicEndpoint: _v4.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkIBEFA6CXcjs.getRivetPublicEndpoint.call(void 0, )))),
   /**
    * Token that clients should use when connecting via the public endpoint.
    *
@@ -545,7 +546,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, () => ( _chunkDTGPF6XYcjs.getRivetPublicToken.call(void 0, ))))
+  publicToken: _v4.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkIBEFA6CXcjs.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.
@@ -599,7 +600,7 @@ var RegistryConfigSchema = _zod.z.object({
    * Runtime binding to use for RivetKit core.
    * */
   runtime: RuntimeKindSchema.optional().transform((val, ctx) => {
-    const rawRuntime = _nullishCoalesce(val, () => ( _chunkDTGPF6XYcjs.getRivetkitRuntime.call(void 0, )));
+    const rawRuntime = _nullishCoalesce(val, () => ( _chunkIBEFA6CXcjs.getRivetkitRuntime.call(void 0, )));
     if (rawRuntime === void 0) {
       return "auto";
     }
@@ -636,7 +637,7 @@ var RegistryConfigSchema = _zod.z.object({
    * */
   logging: _zod.z.object({
     baseLogger: _zod.z.custom().optional(),
-    level: _chunkDTGPF6XYcjs.LogLevelSchema.optional()
+    level: _chunkIBEFA6CXcjs.LogLevelSchema.optional()
   }).optional().default(() => ({})),
   // MARK: Routing
   // // This is a function to allow for lazy configuration of upgradeWebSocket on the
@@ -644,7 +645,7 @@ var RegistryConfigSchema = _zod.z.object({
   // // (specifically Node.js) can sometimes only be specified after the router is
   // // created or must be imported async using `await import(...)`
   // getUpgradeWebSocket: z.custom<GetUpgradeWebSocket>().optional(),
-  // MARK: Runner Configuration
+  // MARK: Node Configuration
   /**
    * Endpoint to connect to for Rivet Engine.
    *
@@ -654,9 +655,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, () => ( _chunkDTGPF6XYcjs.getRivetEngine.call(void 0, ))), () => ( _chunkDTGPF6XYcjs.getRivetEndpoint.call(void 0, )))),
-  token: _zod.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkDTGPF6XYcjs.getRivetToken.call(void 0, )))),
-  namespace: _zod.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkDTGPF6XYcjs.getRivetNamespace.call(void 0, )))),
+  endpoint: _zod.z.string().optional().transform((val) => _nullishCoalesce(_nullishCoalesce(val, () => ( _chunkIBEFA6CXcjs.getRivetEngine.call(void 0, ))), () => ( _chunkIBEFA6CXcjs.getRivetEndpoint.call(void 0, )))),
+  token: _zod.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkIBEFA6CXcjs.getRivetToken.call(void 0, )))),
+  namespace: _zod.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkIBEFA6CXcjs.getRivetNamespace.call(void 0, )))),
   headers: _zod.z.record(_zod.z.string(), _zod.z.string()).optional().default({}),
   // MARK: Client
   // TODO:
@@ -696,47 +697,47 @@ var RegistryConfigSchema = _zod.z.object({
    *
    * Starts the full Rust engine process locally.
    */
-  startEngine: _zod.z.boolean().default(() => _chunkDTGPF6XYcjs.getRivetRunEngine.call(void 0, )),
+  startEngine: _zod.z.boolean().default(() => _chunkIBEFA6CXcjs.getRivetRunEngine.call(void 0, )),
   /**
    * @experimental
    *
    * Host to bind the spawned local engine process to.
    */
-  engineHost: _zod.z.string().optional().default(() => _nullishCoalesce(_chunkDTGPF6XYcjs.getRivetRunEngineHost.call(void 0, ), () => ( _chunkWSSI5L6Lcjs.ENGINE_HOST))),
+  engineHost: _zod.z.string().optional().default(() => _nullishCoalesce(_chunkIBEFA6CXcjs.getRivetRunEngineHost.call(void 0, ), () => ( _chunkCTQKKUZCcjs.ENGINE_HOST))),
   /**
    * @experimental
    *
    * Port to bind the spawned local engine process to.
    */
-  enginePort: _zod.z.number().int().min(1).max(65535).optional().default(() => _nullishCoalesce(_chunkDTGPF6XYcjs.getRivetRunEnginePort.call(void 0, ), () => ( _chunkWSSI5L6Lcjs.ENGINE_PORT))),
+  enginePort: _zod.z.number().int().min(1).max(65535).optional().default(() => _nullishCoalesce(_chunkIBEFA6CXcjs.getRivetRunEnginePort.call(void 0, ), () => ( _chunkCTQKKUZCcjs.ENGINE_PORT))),
   /** @experimental */
-  engineVersion: _zod.z.string().optional().default(() => _nullishCoalesce(_chunkDTGPF6XYcjs.getRivetRunEngineVersion.call(void 0, ), () => ( _chunkDTGPF6XYcjs.VERSION))),
+  engineVersion: _zod.z.string().optional().default(() => _nullishCoalesce(_chunkIBEFA6CXcjs.getRivetRunEngineVersion.call(void 0, ), () => ( _chunkIBEFA6CXcjs.VERSION))),
   /**
    * Starts the first-party Services actor host when RivetKit manages
-   * a local engine. Defaults to the local-engine decision. Set
-   * RIVET_RUN_SERVICES=0 or 1 to override it.
+   * a local engine. Disabled by default. Set RIVET_RUN_SERVICES=1
+   * or startServices: true to enable it.
    */
   startServices: _zod.z.boolean().optional(),
   /**
    * @experimental
    *
-   * Automatically configure serverless envoys in the engine.
+   * Automatically configure serverless nodes in the engine.
    */
   configurePool: ConfigurePoolSchema.optional(),
   // MARK: Runtime-specific
   serverless: ServerlessConfigSchema.optional().default(
     () => ServerlessConfigSchema.parse({})
   ),
-  envoy: EnvoyConfigSchema.optional().default(
+  node: EnvoyConfigSchema.optional().default(
     () => EnvoyConfigSchema.parse({})
   ),
   // MARK: Shutdown
   /**
    * Graceful shutdown configuration for SIGINT/SIGTERM.
    *
-   * When a persistent envoy is running (Mode A, started via `registry.start()`),
+   * When a persistent node is running (Mode A, started via `registry.start()`),
    * rivetkit installs Node SIGINT/SIGTERM handlers that call into core's
-   * `shutdown()` and wait up to `gracePeriodMs` for the envoy to drain
+   * `shutdown()` and wait up to `gracePeriodMs` for the node to drain
    * before re-raising the signal to let Node exit via its default path.
    *
    * Handlers are NOT installed when `handler(request)` is used alone
@@ -748,9 +749,11 @@ var RegistryConfigSchema = _zod.z.object({
     /**
      * Wait this many milliseconds for the serve promise to resolve
      * after calling `CoreRegistry::shutdown()`. Defaults to the
-     * engine-provided actor stop threshold once the envoy connects.
+     * engine-provided actor stop threshold once the node connects. A
+     * signal-driven shutdown of a managed local development engine waits
+     * one second by default so a file watcher can restart promptly.
      *
-     * Must be long enough for rivetkit-core to drain the envoy.
+     * Set a longer period when a complete graceful node drain is required.
      */
     gracePeriodMs: _zod.z.number().int().min(1e3).optional(),
     /**
@@ -764,7 +767,7 @@ var RegistryConfigSchema = _zod.z.object({
   }))
 }).transform((config, ctx) => {
   var _a, _b, _c;
-  const isDevEnv = _chunkDTGPF6XYcjs.isDev.call(void 0, );
+  const isDevEnv = _chunkIBEFA6CXcjs.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({
@@ -774,7 +777,7 @@ var RegistryConfigSchema = _zod.z.object({
     });
   }
   const sqlite = config.runtime === "wasm" && config.sqlite === void 0 ? { backend: "remote" } : config.sqlite;
-  const parsedEndpoint = config.endpoint ? _chunkWSSI5L6Lcjs.tryParseEndpoint.call(void 0, ctx, {
+  const parsedEndpoint = config.endpoint ? _chunkCTQKKUZCcjs.tryParseEndpoint.call(void 0, ctx, {
     endpoint: config.endpoint,
     path: ["endpoint"],
     namespace: config.namespace,
@@ -786,24 +789,25 @@ var RegistryConfigSchema = _zod.z.object({
       message: "cannot specify both startEngine and endpoint"
     });
   }
-  if (config.configurePool && !parsedEndpoint && !config.startEngine) {
+  if (config.configurePool) {
     ctx.addIssue({
       code: "custom",
-      message: "configurePool requires either endpoint or startEngine"
+      message: "serverless is disabled in this version",
+      path: ["configurePool"]
     });
   }
-  const localEngineEndpoint = _chunkWSSI5L6Lcjs.buildEngineEndpoint.call(void 0, 
+  const localEngineEndpoint = _chunkCTQKKUZCcjs.buildEngineEndpoint.call(void 0, 
     config.engineHost,
     config.enginePort
   );
   const endpoint = config.startEngine ? localEngineEndpoint : _nullishCoalesce((parsedEndpoint == null ? void 0 : parsedEndpoint.endpoint), () => ( (isDevEnv ? localEngineEndpoint : void 0)));
-  const startServices = _nullishCoalesce(_nullishCoalesce(config.startServices, () => ( _chunkDTGPF6XYcjs.getRivetRunServices.call(void 0, ))), () => ( Boolean(endpoint && _chunkWSSI5L6Lcjs.isLocalEngineEndpoint.call(void 0, endpoint))));
+  const startServices = _nullishCoalesce(config.startServices, () => ( _chunkIBEFA6CXcjs.getRivetRunServices.call(void 0, )));
   const validateServerlessEndpoint = Boolean(
     config.startEngine || parsedEndpoint
   );
   const namespace = _nullishCoalesce(_nullishCoalesce((parsedEndpoint == null ? void 0 : parsedEndpoint.namespace), () => ( config.namespace)), () => ( "default"));
-  const token = _nullishCoalesce(_nullishCoalesce((parsedEndpoint == null ? void 0 : parsedEndpoint.token), () => ( config.token)), () => ( (endpoint && _chunkWSSI5L6Lcjs.isLocalEngineEndpoint.call(void 0, endpoint) ? "default" : void 0)));
-  const parsedPublicEndpoint = config.serverless.publicEndpoint ? _chunkWSSI5L6Lcjs.tryParseEndpoint.call(void 0, ctx, {
+  const token = _nullishCoalesce(_nullishCoalesce((parsedEndpoint == null ? void 0 : parsedEndpoint.token), () => ( config.token)), () => ( (endpoint && _chunkCTQKKUZCcjs.isLocalEngineEndpoint.call(void 0, endpoint) ? "default" : void 0)));
+  const parsedPublicEndpoint = config.serverless.publicEndpoint ? _chunkCTQKKUZCcjs.tryParseEndpoint.call(void 0, ctx, {
     endpoint: config.serverless.publicEndpoint,
     path: ["serverless", "publicEndpoint"]
   }) : void 0;
@@ -821,6 +825,7 @@ var RegistryConfigSchema = _zod.z.object({
     ...config,
     sqlite,
     endpoint,
+    engineSpawn: !parsedEndpoint && Boolean(endpoint),
     startServices,
     namespace,
     token,
@@ -850,8 +855,8 @@ function buildActorNames(config) {
   );
 }
 var DocConfigurePoolSchema = _zod.z.object({
-  name: _zod.z.string().optional().describe("Name of the runner pool."),
-  url: _zod.z.string().describe("URL of the serverless platform to configure runners."),
+  name: _zod.z.string().optional().describe("Name of the node pool."),
+  url: _zod.z.string().describe("URL of the serverless platform to configure nodes."),
   headers: _zod.z.record(_zod.z.string(), _zod.z.string()).optional().describe(
     "Headers to include in requests to the serverless platform."
   ),
@@ -866,7 +871,7 @@ var DocConfigurePoolSchema = _zod.z.object({
     "Interval in milliseconds between metadata polls from the engine. Defaults to 10000 milliseconds (10 seconds)."
   ),
   drainOnVersionUpgrade: _zod.z.boolean().optional().describe(
-    "Drain runners when a new version is deployed. Defaults to true."
+    "Drain nodes when a new version is deployed. Defaults to true."
   )
 }).optional();
 var DocServerlessConfigSchema = _zod.z.object({
@@ -885,10 +890,10 @@ var DocServerlessConfigSchema = _zod.z.object({
 }).describe("Configuration for serverless deployment mode.");
 var DocEnvoyConfigSchema = _zod.z.object({
   totalSlots: _zod.z.number().optional().describe("Total number of actor slots available. Default: 100000"),
-  poolName: _zod.z.string().optional().describe("Name of this envoy pool. Default: 'default'"),
-  envoyKey: _zod.z.string().optional().describe("Deprecated. Authentication key for the envoy."),
-  version: _zod.z.number().optional().describe("Version number of this envoy. Default: 1")
-}).describe("Configuration for envoy mode.");
+  poolName: _zod.z.string().optional().describe("Name of this node pool. Default: 'default'"),
+  nodeKey: _zod.z.string().optional().describe("Deprecated. Authentication key for the node."),
+  version: _zod.z.number().optional().describe("Version number of this node. Default: 1")
+}).describe("Configuration for node mode.");
 var DocSqliteConfigSchema = _zod.z.object({
   backend: SqliteBackendSchema.optional().describe(
     "SQLite backend to use. Native defaults to local. Wasm defaults to remote and cannot use local."
@@ -907,7 +912,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: _chunkDTGPF6XYcjs.LogLevelSchema.optional().describe(
+    level: _chunkIBEFA6CXcjs.LogLevelSchema.optional().describe(
       "Log level for RivetKit. Default: 'warn'"
     )
   }).optional().describe("Logging configuration."),
@@ -936,13 +941,13 @@ var DocRegistryConfigSchema = _zod.z.object({
     "Version of the local engine package to use. Defaults to the current RivetKit version."
   ),
   startServices: _zod.z.boolean().optional().describe(
-    "Starts Services when RivetKit manages a local Engine. Defaults to the local-Engine decision. Set RIVET_RUN_SERVICES=0 or 1 to override."
+    "Starts Services when RivetKit manages a local Engine. Disabled by default. Set RIVET_RUN_SERVICES=1 or startServices: true to enable."
   ),
   configurePool: DocConfigurePoolSchema.describe(
-    "Automatically configure serverless runners in the engine."
+    "Automatically configure serverless nodes in the engine."
   ),
   serverless: DocServerlessConfigSchema.optional(),
-  envoy: DocEnvoyConfigSchema.optional()
+  node: DocEnvoyConfigSchema.optional()
 }).describe("RivetKit registry configuration.");
 
 // src/registry/native.ts
@@ -1105,12 +1110,12 @@ var NativeCloseGate = class {
     if (this.#active > 0) {
       await new Promise((resolve) => this.#waiters.push(resolve));
     }
-    await callback();
+    await (callback == null ? void 0 : callback());
   }
 };
 function wrapJsNativeDatabase(database) {
   const gate = new NativeCloseGate();
-  let closePromise;
+  let terminalPromise;
   let lastInsertRowId = null;
   const executeNative = async (sql, params) => {
     const lastInsertRowIdColumn = lastInsertRowIdColumnName(sql);
@@ -1245,8 +1250,12 @@ function wrapJsNativeDatabase(database) {
       return normalizeNativeMetrics((_a = database.metrics) == null ? void 0 : _a.call(database));
     },
     async close() {
-      closePromise ??= gate.close(() => database.close());
-      await closePromise;
+      terminalPromise ??= gate.close(() => database.close());
+      await terminalPromise;
+    },
+    async detachForShutdown() {
+      terminalPromise ??= gate.close();
+      await terminalPromise;
     }
   };
 }
@@ -1392,6 +1401,12 @@ function getNodePath() {
 function normalizeRuntimeSqlExecuteResult(result) {
   return result;
 }
+function servicesBinaryUnavailable(cause) {
+  return new Error(
+    "services.binary_unavailable: Install @rivet-dev/services yourself to run local Services, or set RIVET_SERVICES_BINARY to its executable path.",
+    { cause }
+  );
+}
 
 // src/registry/napi-runtime.ts
 function asNativeRegistry(handle) {
@@ -1537,7 +1552,7 @@ var NapiCoreRuntime = (_class = class {
     if (!(active == null ? void 0 : active.sameActorInstance(ownerCtx))) {
       return ownerCtx;
     }
-    const applicationSpan = _chunkWSSI5L6Lcjs.readActiveTraceHeaders.call(void 0, );
+    const applicationSpan = _chunkCTQKKUZCcjs.readActiveTraceHeaders.call(void 0, );
     if (!applicationSpan) {
       return active;
     }
@@ -1664,7 +1679,8 @@ var NapiCoreRuntime = (_class = class {
     asNativeCancellationToken(token).cancel();
   }
   onCancellationTokenCancelled(token, callback) {
-    asNativeCancellationToken(token).onCancelled(callback);
+    const listener = asNativeCancellationToken(token).onCancelled(callback);
+    return () => listener.release();
   }
   actorState(ctx) {
     return asNativeActorContext(ctx).state();
@@ -1740,7 +1756,7 @@ var NapiCoreRuntime = (_class = class {
     const span = (_a = nativeCtx.invocationTraceContext()) == null ? void 0 : _a.span;
     return this.#invocationContext.run(
       nativeCtx,
-      () => _chunkWSSI5L6Lcjs.runWithActorInvocationSpan.call(void 0, span, run)
+      () => _chunkCTQKKUZCcjs.runWithActorInvocationSpan.call(void 0, span, run)
     );
   }
   actorInvocationTraceContext(ctx) {
@@ -2115,8 +2131,8 @@ function runtimeBytesToArrayBuffer(value) {
 function buildNativeHttpRequest(init) {
   var _a;
   const headers = new Headers(init.headers);
-  const originalUrl = headers.get(_chunkWSSI5L6Lcjs.HEADER_ORIGINAL_REQUEST_URL);
-  headers.delete(_chunkWSSI5L6Lcjs.HEADER_ORIGINAL_REQUEST_URL);
+  const originalUrl = headers.get(_chunkCTQKKUZCcjs.HEADER_ORIGINAL_REQUEST_URL);
+  headers.delete(_chunkCTQKKUZCcjs.HEADER_ORIGINAL_REQUEST_URL);
   const url = _nullishCoalesce(originalUrl, () => ( (init.uri.startsWith("http") ? init.uri : new URL(init.uri, "http://127.0.0.1").toString())));
   const method2 = init.method.toUpperCase();
   const bodyForbidden = method2 === "GET" || method2 === "HEAD";
@@ -2195,7 +2211,7 @@ async function pumpResponseBody(reader, stream) {
     }
   } catch (error) {
     try {
-      await stream.error(_chunkDTGPF6XYcjs.stringifyError.call(void 0, error));
+      await stream.error(_chunkIBEFA6CXcjs.stringifyError.call(void 0, error));
     } catch (streamError) {
       logger2().debug({
         msg: "failed to report native http response stream error",
@@ -2703,9 +2719,10 @@ var WasmCoreRuntime = (_class2 = class {
     callWasmSync(() => asWasmCancellationToken(token).cancel());
   }
   onCancellationTokenCancelled(token, callback) {
-    callWasmSync(
+    const listener = callWasmSync(
       () => asWasmCancellationToken(token).onCancelled(callback)
     );
+    return () => callWasmSync(() => listener.release());
   }
   actorState(ctx) {
     return toBytes(
@@ -3433,7 +3450,7 @@ async function loadAutoRuntime(config, loaders = defaultRuntimeLoaders) {
     nativeError = error;
     logger2().warn({
       msg: "native runtime failed to load; falling back to wasm",
-      error: _chunkDTGPF6XYcjs.stringifyError.call(void 0, error)
+      error: _chunkIBEFA6CXcjs.stringifyError.call(void 0, error)
     });
   }
   try {
@@ -3442,7 +3459,7 @@ async function loadAutoRuntime(config, loaders = defaultRuntimeLoaders) {
     throw new (0, _chunkMGI2VVF6cjs.RivetError)(
       "config",
       "runtime_unavailable",
-      `RivetKit could not load a core runtime. Native runtime: ${_chunkDTGPF6XYcjs.stringifyError.call(void 0, nativeError)} Wasm runtime: ${_chunkDTGPF6XYcjs.stringifyError.call(void 0, wasmError)}`,
+      `RivetKit could not load a core runtime. Native runtime: ${_chunkIBEFA6CXcjs.stringifyError.call(void 0, nativeError)} Wasm runtime: ${_chunkIBEFA6CXcjs.stringifyError.call(void 0, wasmError)}`,
       {
         public: true,
         statusCode: 500
@@ -3498,9 +3515,10 @@ function normalizeRuntimeConfig(config, runtime) {
   return normalizeRuntimeConfigForKind(config, loadedRuntimeKind(runtime));
 }
 function getNativeRuntimeState(runtime, ctx) {
-  const runtimeState = callNativeSync(
-    () => runtime.actorRuntimeState(ctx)
-  );
+  const runtimeState = readNativeRuntimeStateBag(runtime, ctx);
+  if (runtimeState.cleared) {
+    throw _chunkMGI2VVF6cjs.actorStopping.call(void 0, callNativeSync(() => runtime.actorId(ctx)));
+  }
   if (!runtimeState.destroyGate) {
     runtimeState.destroyGate = {};
   }
@@ -3513,6 +3531,14 @@ function getNativeRuntimeState(runtime, ctx) {
   }
   return runtimeState;
 }
+function readNativeRuntimeStateBag(runtime, ctx) {
+  return callNativeSync(
+    () => runtime.actorRuntimeState(ctx)
+  );
+}
+function isNativeRuntimeStateCleared(runtime, ctx) {
+  return readNativeRuntimeStateBag(runtime, ctx).cleared === true;
+}
 function getNativePersistState(runtime, ctx) {
   const persistState = getNativeRuntimeState(runtime, ctx).persistState;
   if (!persistState) {
@@ -3623,29 +3649,43 @@ function resolveNativeDestroy(runtime, ctx) {
   gate.destroyCompletion = void 0;
 }
 function clearNativeRuntimeState(runtime, ctx) {
+  var _a;
+  const pendingSaveHandle = (_a = readNativeRuntimeStateBag(runtime, ctx).persistState) == null ? void 0 : _a.pendingSaveHandle;
+  if (pendingSaveHandle !== void 0) {
+    clearImmediate(pendingSaveHandle);
+  }
   callNativeSync(() => runtime.actorClearRuntimeState(ctx));
+  readNativeRuntimeStateBag(runtime, ctx).cleared = true;
 }
 async function cleanupNativeSleepRuntimeState(runtime, ctx, afterTrackedWorkDrained) {
   const drained = await runtime.actorWaitForTrackedShutdownWork(ctx);
   if (!drained) {
-    await closeNativeDatabaseClient(runtime, ctx);
-    await closeNativeSqlDatabase(runtime, ctx);
+    await detachNativeDatabaseForShutdown(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: _chunkDTGPF6XYcjs.stringifyError.call(void 0, error)
+        error: _chunkIBEFA6CXcjs.stringifyError.call(void 0, error)
       });
     });
     return;
   }
   await (afterTrackedWorkDrained == null ? void 0 : afterTrackedWorkDrained());
-  await closeNativeDatabaseClient(runtime, ctx);
-  await closeNativeSqlDatabase(runtime, ctx);
+  await detachNativeDatabaseForShutdown(runtime, ctx);
   clearNativeRuntimeState(runtime, ctx);
 }
+async function detachNativeDatabaseForShutdown(runtime, ctx) {
+  var _a;
+  const runtimeState = getNativeRuntimeState(runtime, ctx);
+  await ((_a = runtimeState.sql) == null ? void 0 : _a.detachForShutdown());
+  try {
+    await closeNativeDatabaseClient(runtime, ctx);
+  } finally {
+    runtimeState.sql = void 0;
+  }
+}
 function closeNativeSqlDatabase(runtime, ctx) {
   const runtimeState = getNativeRuntimeState(runtime, ctx);
   const database = runtimeState.sql;
@@ -3799,10 +3839,10 @@ function decodeValue(value) {
   if (!value || value.length === 0) {
     return void 0;
   }
-  return _chunkDTGPF6XYcjs.decodeCborCompat.call(void 0, value);
+  return _chunkIBEFA6CXcjs.decodeCborCompat.call(void 0, value);
 }
 function encodeValue(value) {
-  return _chunkDTGPF6XYcjs.encodeCborCompat.call(void 0, value);
+  return _chunkIBEFA6CXcjs.encodeCborCompat.call(void 0, value);
 }
 function normalizeArgs(value) {
   return Array.isArray(value) ? value : value === void 0 || value === null ? [] : [value];
@@ -3838,7 +3878,7 @@ function isStructuredBridgeError(error) {
   return _chunkMGI2VVF6cjs.isRivetErrorLike.call(void 0, error) && "__type" in error && (error.__type === "RivetError" || error.__type === "ActorError");
 }
 function encodeNativeCallbackError(error) {
-  const structuredError = isStructuredBridgeError(error) ? error : _chunkDTGPF6XYcjs.deconstructError.call(void 0, error, true);
+  const structuredError = isStructuredBridgeError(error) ? error : _chunkIBEFA6CXcjs.deconstructError.call(void 0, error, true);
   const { encoded, droppedMetadataCause } = _chunkMGI2VVF6cjs.encodeBridgeRivetError.call(void 0, structuredError);
   if (droppedMetadataCause !== void 0) {
     logger2().warn(
@@ -3900,7 +3940,7 @@ function decodeWorkflowCbor(data) {
     return null;
   }
   try {
-    return _chunkDTGPF6XYcjs.decodeCborCompat.call(void 0, new Uint8Array(data));
+    return _chunkIBEFA6CXcjs.decodeCborCompat.call(void 0, new Uint8Array(data));
   } catch (e3) {
     return null;
   }
@@ -4013,7 +4053,7 @@ function serializeWorkflowHistoryForJson(data) {
   if (data === null) {
     return null;
   }
-  const history = _chunkNK4D6G45cjs.decodeWorkflowHistoryTransport.call(void 0, data);
+  const history = _chunkVCVV726Pcjs.decodeWorkflowHistoryTransport.call(void 0, data);
   return jsonSafe({
     nameRegistry: [...history.nameRegistry],
     entries: history.entries.map((entry) => ({
@@ -4159,7 +4199,7 @@ var NativeConnAdapter = class {
       },
       (newValue) => {
         assertCurrentState();
-        _chunkDTGPF6XYcjs.assertJsonCompatValue.call(void 0, newValue);
+        _chunkIBEFA6CXcjs.assertJsonCompatValue.call(void 0, newValue);
       }
     );
   }
@@ -4167,7 +4207,7 @@ var NativeConnAdapter = class {
     var _a;
     (_a = this.#assertCanMutateState) == null ? void 0 : _a.call(this);
     const nextValue = unwrapWriteThroughProxy(value);
-    _chunkDTGPF6XYcjs.assertJsonCompatValue.call(void 0, nextValue);
+    _chunkIBEFA6CXcjs.assertJsonCompatValue.call(void 0, nextValue);
     this.#writeState(nextValue, { writeNative: true });
   }
   initializeState(value) {
@@ -4364,7 +4404,7 @@ var NativeKvAdapter = class {
     const value = await callNative(
       () => this.#runtime.actorKvGet(
         this.#ctx,
-        _chunkMYWZCDMLcjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(key))
+        _chunkRTWH3AX3cjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(key))
       )
     );
     return value ? decodeNativeKvValue(new Uint8Array(value), options) : null;
@@ -4373,7 +4413,7 @@ var NativeKvAdapter = class {
     await callNative(
       () => this.#runtime.actorKvPut(
         this.#ctx,
-        _chunkMYWZCDMLcjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(key)),
+        _chunkRTWH3AX3cjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(key)),
         toRuntimeBytes(value)
       )
     );
@@ -4382,7 +4422,7 @@ var NativeKvAdapter = class {
     await callNative(
       () => this.#runtime.actorKvDelete(
         this.#ctx,
-        _chunkMYWZCDMLcjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(key))
+        _chunkRTWH3AX3cjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(key))
       )
     );
   }
@@ -4390,8 +4430,8 @@ var NativeKvAdapter = class {
     await callNative(
       () => this.#runtime.actorKvDeleteRange(
         this.#ctx,
-        _chunkMYWZCDMLcjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(start)),
-        _chunkMYWZCDMLcjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(end))
+        _chunkRTWH3AX3cjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(start)),
+        _chunkRTWH3AX3cjs.makePrefixedKey.call(void 0, encodeNativeKvUserKey(end))
       )
     );
   }
@@ -4404,7 +4444,7 @@ var NativeKvAdapter = class {
     const entries = await callNative(
       () => this.#runtime.actorKvListPrefix(
         this.#ctx,
-        _chunkMYWZCDMLcjs.makePrefixedKey.call(void 0, 
+        _chunkRTWH3AX3cjs.makePrefixedKey.call(void 0, 
           encodeNativeKvUserKey(
             prefix,
             options == null ? void 0 : options.keyType
@@ -4418,7 +4458,7 @@ var NativeKvAdapter = class {
     );
     return entries.map((entry) => [
       decodeNativeKvKey(
-        _chunkMYWZCDMLcjs.removePrefixFromKey.call(void 0, new Uint8Array(entry.key)),
+        _chunkRTWH3AX3cjs.removePrefixFromKey.call(void 0, new Uint8Array(entry.key)),
         options == null ? void 0 : options.keyType
       ),
       decodeNativeKvValue(new Uint8Array(entry.value), options)
@@ -4437,13 +4477,13 @@ var NativeKvAdapter = class {
     const entries = await callNative(
       () => this.#runtime.actorKvListRange(
         this.#ctx,
-        _chunkMYWZCDMLcjs.makePrefixedKey.call(void 0, 
+        _chunkRTWH3AX3cjs.makePrefixedKey.call(void 0, 
           encodeNativeKvUserKey(
             start,
             options == null ? void 0 : options.keyType
           )
         ),
-        _chunkMYWZCDMLcjs.makePrefixedKey.call(void 0, 
+        _chunkRTWH3AX3cjs.makePrefixedKey.call(void 0, 
           encodeNativeKvUserKey(
             end,
             options == null ? void 0 : options.keyType
@@ -4457,7 +4497,7 @@ var NativeKvAdapter = class {
     );
     return entries.map((entry) => [
       decodeNativeKvKey(
-        _chunkMYWZCDMLcjs.removePrefixFromKey.call(void 0, new Uint8Array(entry.key)),
+        _chunkRTWH3AX3cjs.removePrefixFromKey.call(void 0, new Uint8Array(entry.key)),
         options == null ? void 0 : options.keyType
       ),
       decodeNativeKvValue(new Uint8Array(entry.value), options)
@@ -5246,7 +5286,7 @@ var ActorContextHandleAdapter = class {
         },
         (newValue) => {
           assertCurrentState();
-          _chunkDTGPF6XYcjs.assertJsonCompatValue.call(void 0, newValue);
+          _chunkIBEFA6CXcjs.assertJsonCompatValue.call(void 0, newValue);
         }
       );
     }
@@ -5258,7 +5298,7 @@ var ActorContextHandleAdapter = class {
     }
     this.#assertCanMutateState();
     const nextValue = unwrapWriteThroughProxy(value);
-    _chunkDTGPF6XYcjs.assertJsonCompatValue.call(void 0, nextValue);
+    _chunkIBEFA6CXcjs.assertJsonCompatValue.call(void 0, nextValue);
     this.#writeState(nextValue, { scheduleSave: true });
   }
   initializeState(value) {
@@ -5386,12 +5426,14 @@ var ActorContextHandleAdapter = class {
   }
   get abortSignal() {
     if (!this.#abortSignal) {
-      const actorSignal = this.#createActorAbortSignal();
+      const actorAbort = this.#actorAbort();
+      const actorSignal = actorAbort.signal;
       if (this.#dispatchCancelToken === void 0) {
         this.#abortSignal = actorSignal;
       } else {
         const controller = new AbortController();
         let cleanedUp = false;
+        let releaseDispatchListener;
         const onActorAbort = () => {
           cleanup();
           controller.abort();
@@ -5401,7 +5443,9 @@ var ActorContextHandleAdapter = class {
             return;
           }
           cleanedUp = true;
-          actorSignal.removeEventListener("abort", onActorAbort);
+          actorAbort.listeners.delete(onActorAbort);
+          releaseDispatchListener == null ? void 0 : releaseDispatchListener();
+          releaseDispatchListener = void 0;
           this.#abortSignalCleanup = void 0;
         };
         if (actorSignal.aborted || this.#runtime.cancellationTokenAborted(
@@ -5411,10 +5455,8 @@ var ActorContextHandleAdapter = class {
         } else {
           const dispatchCancelToken = this.#dispatchCancelToken;
           this.#abortSignalCleanup = cleanup;
-          actorSignal.addEventListener("abort", onActorAbort, {
-            once: true
-          });
-          callNativeSync(
+          actorAbort.listeners.add(onActorAbort);
+          releaseDispatchListener = callNativeSync(
             () => this.#runtime.onCancellationTokenCancelled(
               dispatchCancelToken,
               () => {
@@ -5470,7 +5512,7 @@ var ActorContextHandleAdapter = class {
       log: {
         debug: (obj) => logger2().debug(obj)
       },
-      nativeDatabaseProvider: _chunk56QW6V7Fcjs.registerNativeStateTransactionOpener.call(void 0, 
+      nativeDatabaseProvider: _chunkJLBPBEWCcjs.registerNativeStateTransactionOpener.call(void 0, 
         {
           open: async (requestedActorId) => {
             void requestedActorId;
@@ -5493,7 +5535,7 @@ var ActorContextHandleAdapter = class {
     return this.#db;
   }
   #bindDatabaseClient(client) {
-    return _chunk56QW6V7Fcjs.bindNativeStateTransactionContext.call(void 0, client, {
+    return _chunkJLBPBEWCcjs.bindNativeStateTransactionContext.call(void 0, client, {
       enter: async () => await this.#enterStateTransaction(),
       exit: (scope) => this.#exitStateTransaction(
         scope
@@ -5697,7 +5739,7 @@ var ActorContextHandleAdapter = class {
     const trackedPromise = Promise.resolve(promise).catch((error) => {
       logger2().warn({
         msg: "keepAwake promise rejected",
-        error: _chunkDTGPF6XYcjs.stringifyError.call(void 0, error)
+        error: _chunkIBEFA6CXcjs.stringifyError.call(void 0, error)
       });
     }).then(() => null);
     try {
@@ -5790,22 +5832,42 @@ var ActorContextHandleAdapter = class {
   }
   async dispose() {
     var _a;
-    this.#flushStateChange();
+    if (!isNativeRuntimeStateCleared(this.#runtime, this.#ctx)) {
+      this.#flushStateChange();
+    }
     (_a = this.#abortSignalCleanup) == null ? void 0 : _a.call(this);
   }
-  #createActorAbortSignal() {
+  #actorAbort() {
+    const runtimeState = readNativeRuntimeStateBag(
+      this.#runtime,
+      this.#ctx
+    );
+    const cached = runtimeState.actorAbort;
+    if (cached && !cached.signal.aborted) {
+      return cached;
+    }
     const nativeSignal = callNativeSync(
       () => this.#runtime.actorAbortSignal(this.#ctx)
     );
     const controller = new AbortController();
-    if (nativeSignal.aborted) {
+    const actorAbort = {
+      signal: controller.signal,
+      listeners: /* @__PURE__ */ new Set()
+    };
+    const abort = () => {
       controller.abort();
+      for (const listener of actorAbort.listeners) {
+        listener();
+      }
+      actorAbort.listeners.clear();
+    };
+    if (nativeSignal.aborted) {
+      abort();
     } else {
-      nativeSignal.addEventListener("abort", () => controller.abort(), {
-        once: true
-      });
+      nativeSignal.addEventListener("abort", abort, { once: true });
     }
-    return controller.signal;
+    runtimeState.actorAbort = actorAbort;
+    return actorAbort;
   }
   #readState() {
     const actorState = getNativePersistState(this.#runtime, this.#ctx);
@@ -6175,7 +6237,7 @@ function validateInspectorTabSource(tabId, resolved) {
 function buildNativeFactory(runtime, registryConfig, definition) {
   var _a;
   const config = definition.config;
-  const databaseProvider = _nullishCoalesce(config.db, () => ( _chunk56QW6V7Fcjs.db.call(void 0, )));
+  const databaseProvider = _nullishCoalesce(config.db, () => ( _chunkJLBPBEWCcjs.db.call(void 0, )));
   const actionHandlers = _chunkHDVZ6YZGcjs.flattenActionHandlers.call(void 0, config.actions);
   const schemaConfig = {
     actionInputSchemas: _chunkHDVZ6YZGcjs.flattenActionInputSchemas.call(void 0, 
@@ -6186,9 +6248,9 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     events: config.events,
     queues: config.queues
   };
-  const createClient = (ctx) => _chunkWSSI5L6Lcjs.createClientWithDriver.call(void 0, 
-    new (0, _chunkWSSI5L6Lcjs.RemoteEngineControlClient)(
-      _chunkWSSI5L6Lcjs.convertRegistryConfigToClientConfig.call(void 0, registryConfig)
+  const createClient = (ctx) => _chunkCTQKKUZCcjs.createClientWithDriver.call(void 0, 
+    new (0, _chunkCTQKKUZCcjs.RemoteEngineControlClient)(
+      _chunkCTQKKUZCcjs.convertRegistryConfigToClientConfig.call(void 0, registryConfig)
     ),
     {
       encoding: "bare",
@@ -6380,7 +6442,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             400
           );
         }
-        const cbor = _chunkDTGPF6XYcjs.encodeCborCompat.call(void 0, 
+        const cbor = _chunkIBEFA6CXcjs.encodeCborCompat.call(void 0, 
           _nullishCoalesce(body.body, () => ( null))
         );
         const message = await runtime.actorQueueSend(ctx, name, cbor);
@@ -6767,7 +6829,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           }
         } finally {
           resolveNativeDestroy(runtime, ctx);
-          await actorCtx.closeDatabase();
+          await detachNativeDatabaseForShutdown(runtime, ctx);
           clearNativeRuntimeState(runtime, ctx);
           await actorCtx.dispose();
         }
@@ -6977,7 +7039,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
                 ...request,
                 abortController: requestAbortController
               });
-              const rawConnParams = handlerRequest.headers.get(_chunkWSSI5L6Lcjs.HEADER_CONN_PARAMS);
+              const rawConnParams = handlerRequest.headers.get(_chunkCTQKKUZCcjs.HEADER_CONN_PARAMS);
               let requestCtx;
               let conn;
               let removeRequestAbortListener;
@@ -7034,7 +7096,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
                   requestCtx,
                   handlerRequest
                 );
-                if (!_chunkWSSI5L6Lcjs.isResponseLike.call(void 0, response)) {
+                if (!_chunkCTQKKUZCcjs.isResponseLike.call(void 0, response)) {
                   throw new Error(
                     "onRequest handler must return a Response"
                   );
@@ -7129,7 +7191,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         var _a2;
         const { ctx } = unwrapTsfnPayload(error, payload);
         const history = (_a2 = getNativeWorkflowInspector(ctx)) == null ? void 0 : _a2.getHistory();
-        return history == null ? void 0 : _chunkDTGPF6XYcjs.toUint8Array.call(void 0, history);
+        return history == null ? void 0 : _chunkIBEFA6CXcjs.toUint8Array.call(void 0, history);
       }
     ) : void 0,
     replayWorkflow: _chunkHDVZ6YZGcjs.hasRunInspectorConfig.call(void 0, config.run) ? wrapNativeCallback(
@@ -7143,7 +7205,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           return void 0;
         }
         const history = await _asyncNullishCoalesce(await workflowInspector.replayFromStep(entryId), async () => ( null));
-        return history == null ? void 0 : _chunkDTGPF6XYcjs.toUint8Array.call(void 0, history);
+        return history == null ? void 0 : _chunkIBEFA6CXcjs.toUint8Array.call(void 0, history);
       }
     ) : void 0,
     actions: Object.fromEntries(
@@ -7271,15 +7333,16 @@ async function buildServeConfig(config, resolveServicesBinary = true) {
     throw nativeEndpointNotConfiguredError();
   }
   const serveConfig = {
-    version: config.envoy.version,
+    version: config.node.version,
     endpoint: config.endpoint,
+    engineSpawn: config.engineSpawn,
     token: config.token,
     namespace: config.namespace,
-    poolName: config.envoy.poolName,
+    poolName: config.node.poolName,
     startServices: resolveServicesBinary && config.startServices,
     handleInspectorHttpInRuntime: true,
     serverlessBasePath: config.serverless.basePath,
-    serverlessPackageVersion: _chunkDTGPF6XYcjs.VERSION,
+    serverlessPackageVersion: _chunkIBEFA6CXcjs.VERSION,
     serverlessClientEndpoint: config.publicEndpoint,
     serverlessClientNamespace: config.publicNamespace,
     serverlessClientToken: config.publicToken,
@@ -7292,30 +7355,32 @@ async function buildServeConfig(config, resolveServicesBinary = true) {
   } 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: _chunkDTGPF6XYcjs.stringifyError.call(void 0, error)
+      error: _chunkIBEFA6CXcjs.stringifyError.call(void 0, error)
     });
   }
   if (resolveServicesBinary && config.startServices) {
-    try {
-      const { getServicesPath } = await loadServices();
-      serveConfig.servicesBinaryPath = getServicesPath();
-    } catch (error) {
-      logger2().warn({
-        msg: "could not resolve the Services binary; a local engine will fail with services.binary_unavailable \u2014 set RIVET_RUN_SERVICES=0 to disable Services or RIVET_SERVICES_BINARY to a local rivet-services binary",
-        error: _chunkDTGPF6XYcjs.stringifyError.call(void 0, error)
-      });
+    const servicesBinary = _chunkIBEFA6CXcjs.getEnvUniversal.call(void 0, "RIVET_SERVICES_BINARY");
+    if (servicesBinary) {
+      serveConfig.servicesBinaryPath = servicesBinary;
+    } else {
+      try {
+        const { getServicesPath } = await loadServices();
+        serveConfig.servicesBinaryPath = getServicesPath();
+      } catch (error) {
+        throw servicesBinaryUnavailable(error);
+      }
     }
   }
   serveConfig.engineHost = config.engineHost;
   serveConfig.enginePort = config.enginePort;
   if ((_a = config.test) == null ? void 0 : _a.enabled) {
-    serveConfig.inspectorTestToken = _nullishCoalesce(_chunkDTGPF6XYcjs.getEnvUniversal.call(void 0, "_RIVET_TEST_INSPECTOR_TOKEN"), () => ( "token"));
+    serveConfig.inspectorTestToken = _nullishCoalesce(_chunkIBEFA6CXcjs.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) && _chunkDTGPF6XYcjs.getEnvUniversal.call(void 0, "_RIVET_TEST_INSPECTOR_TOKEN") === void 0) {
+  if (((_a = config.test) == null ? void 0 : _a.enabled) && _chunkIBEFA6CXcjs.getEnvUniversal.call(void 0, "_RIVET_TEST_INSPECTOR_TOKEN") === void 0) {
     trySetProcessEnv("_RIVET_TEST_INSPECTOR_TOKEN", "token");
   }
   if (runtime.kind === "napi") {
@@ -7345,6 +7410,9 @@ async function buildConfiguredRegistry(config) {
 
 // src/registry/index.ts
 var REGISTRY_READY_TIMEOUT_MS = 3e4;
+function rejectServerless() {
+  throw new Error("serverless is disabled in this version");
+}
 function signalExitCode(signal) {
   switch (signal) {
     case "SIGINT":
@@ -7382,7 +7450,7 @@ function createApplicationFetch(application, runtime) {
         signal: abortController.signal
       })
     );
-    if (!_chunkWSSI5L6Lcjs.isResponseLike.call(void 0, response)) {
+    if (!_chunkCTQKKUZCcjs.isResponseLike.call(void 0, response)) {
       throw new TypeError(
         "registry.listen() application fetch must return a Response"
       );
@@ -7432,7 +7500,7 @@ var Registry = class {
     var _a;
     this.#config = config;
     if ((_a = config.logging) == null ? void 0 : _a.baseLogger) {
-      _chunkDTGPF6XYcjs.configureBaseLogger.call(void 0, config.logging.baseLogger);
+      _chunkIBEFA6CXcjs.configureBaseLogger.call(void 0, config.logging.baseLogger);
     }
     this.#buildConfiguredRegistry = _nullishCoalesce((deps == null ? void 0 : deps.buildConfiguredRegistry), () => ( buildConfiguredRegistry));
     this.routes = {
@@ -7449,6 +7517,7 @@ var Registry = class {
    */
   #ensureServerlessPoolConfigured(config) {
     if (!config.configurePool) return void 0;
+    rejectServerless();
     if (!this.#configureServerlessPoolPromise) {
       this.#configureServerlessPoolPromise = configureServerlessPool(
         config
@@ -7473,6 +7542,7 @@ var Registry = class {
    */
   async handler(request) {
     var _a;
+    rejectServerless();
     const config = this.parseConfig();
     this.#printWelcome(config, "serverless");
     if (!this.#runtimeServerlessPromise) {
@@ -7634,6 +7704,7 @@ var Registry = class {
    * ```
    */
   serve() {
+    rejectServerless();
     return {
       fetch: (request) => this.handler(request)
     };
@@ -7658,10 +7729,13 @@ var Registry = class {
    * ```
    */
   async listen(opts = {}) {
-    const port = _nullishCoalesce(_nullishCoalesce(opts.port, () => ( _chunkDTGPF6XYcjs.parsePortEnv.call(void 0, process.env.RIVET_PORT))), () => ( 3e3));
-    const publicDir = _nullishCoalesce(opts.publicDir, () => ( _chunkDTGPF6XYcjs.getRivetkitPublicDir.call(void 0, )));
+    if (!opts.application) {
+      rejectServerless();
+    }
+    const port = _nullishCoalesce(_nullishCoalesce(opts.port, () => ( _chunkIBEFA6CXcjs.parsePortEnv.call(void 0, process.env.RIVET_PORT))), () => ( 3e3));
+    const publicDir = _nullishCoalesce(opts.publicDir, () => ( _chunkIBEFA6CXcjs.getRivetkitPublicDir.call(void 0, )));
     const config = this.parseConfig();
-    if (opts.application && _chunkDTGPF6XYcjs.getRivetkitRuntimeMode.call(void 0, ) !== "serverless") {
+    if (opts.application && _chunkIBEFA6CXcjs.getRivetkitRuntimeMode.call(void 0, ) !== "serverless") {
       if (config.runtime === "wasm") {
         throw new Error(
           "registry.listen() requires the native runtime; use an application-owned HTTP server with WebAssembly"
@@ -7737,7 +7811,7 @@ var Registry = class {
       return jsonRouteResponse(503, {
         status: "not_started",
         runtime: "rivetkit",
-        version: _chunkDTGPF6XYcjs.VERSION
+        version: _chunkIBEFA6CXcjs.VERSION
       });
     }
     const { runtime, registry } = configured;
@@ -7745,7 +7819,7 @@ var Registry = class {
       return jsonRouteResponse(501, {
         status: "unsupported",
         runtime: "rivetkit",
-        version: _chunkDTGPF6XYcjs.VERSION
+        version: _chunkIBEFA6CXcjs.VERSION
       });
     }
     const response = await runtime.registryHealth(registry);
@@ -7758,6 +7832,7 @@ var Registry = class {
    * Returns serverless metadata suitable for mounting in a user-owned router.
    */
   async #metadataRoute() {
+    rejectServerless();
     const configured = await this.#activeConfiguredRegistry();
     if (!configured) {
       return new Response("registry not started\n", {
@@ -7818,18 +7893,18 @@ var Registry = class {
   #startEnvoy(config, printWelcome) {
     var _a;
     if (!this.#runtimeServePromise) {
-      const configuredEnvoyVersion = (_a = this.#config.envoy) == null ? void 0 : _a.version;
-      const envoyVersionSource = configuredEnvoyVersion !== void 0 ? "config" : _chunkDTGPF6XYcjs.getRivetEnvoyVersion.call(void 0, ) !== void 0 ? "environment" : "default";
+      const configuredEnvoyVersion = (_a = this.#config.node) == null ? void 0 : _a.version;
+      const envoyVersionSource = configuredEnvoyVersion !== void 0 ? "config" : _chunkIBEFA6CXcjs.getRivetEnvoyVersion.call(void 0, ) !== void 0 ? "environment" : "default";
       logger2().info({
         msg: "starting rivetkit envoy",
-        rivetkitVersion: _chunkDTGPF6XYcjs.VERSION,
-        envoyVersion: config.envoy.version,
+        rivetkitVersion: _chunkIBEFA6CXcjs.VERSION,
+        envoyVersion: config.node.version,
         envoyVersionSource
       });
-      if (envoyVersionSource === "default" && _chunkDTGPF6XYcjs.getNodeEnv.call(void 0, ) === "production") {
+      if (envoyVersionSource === "default" && _chunkIBEFA6CXcjs.getNodeEnv.call(void 0, ) === "production") {
         logger2().error({
-          msg: "envoy version defaulted because neither config.envoy.version nor RIVET_ENVOY_VERSION is set; actors will not drain automatically across deploys. See https://rivet.dev/docs/actors/versions",
-          envoyVersion: config.envoy.version,
+          msg: "node version defaulted because neither config.node.version nor RIVET_NODE_VERSION is set; actors will not drain automatically across deploys. See https://rivet.dev/docs/actors/versions",
+          envoyVersion: config.node.version,
           envoyVersionSource
         });
       }
@@ -7841,7 +7916,10 @@ var Registry = class {
         }
       );
       this.#runtimeServePromise = this.#runtimeServeLifecyclePromise.catch((error) => {
-        logger2().warn({ error }, "runtime registry serve errored");
+        logger2().error({ error }, "runtime registry serve errored");
+        if (typeof process !== "undefined" && typeof process.exit === "function") {
+          process.exit(1);
+        }
       });
       this.#installSignalHandlers(config);
     }
@@ -7871,7 +7949,7 @@ var Registry = class {
       finishShutdownSignal(signal);
       return;
     }
-    this.#shutdownInFlight = this.#drain(config).catch((err) => {
+    this.#shutdownInFlight = this.#drain(config, true).catch((err) => {
       logger2().warn({ err }, "shutdown error");
     }).then(() => {
       this.#removeSignalHandlers();
@@ -7907,12 +7985,18 @@ var Registry = class {
     });
     return this.#shutdownInFlight;
   }
-  async #drain(config) {
+  async #drain(config, signalDriven = false) {
     var _a;
     const modeAPromise = this.#runtimeServeConfiguredPromise;
     const modeBPromise = this.#runtimeServerlessPromise;
     const runtimes = /* @__PURE__ */ new Set();
-    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 localDevSignal = signalDriven && _chunkIBEFA6CXcjs.getNodeEnv.call(void 0, ) !== "production" && config.engineSpawn && config.endpoint !== void 0 && _chunkCTQKKUZCcjs.isLocalEngineEndpoint.call(void 0, config.endpoint);
+    let gracePeriodMs = (_a = config.shutdown) == null ? void 0 : _a.gracePeriodMs;
+    if (gracePeriodMs === void 0) {
+      gracePeriodMs = localDevSignal ? 1e3 : await _asyncNullishCoalesce(await this.#actorStopThresholdMs(
+        _nullishCoalesce(modeAPromise, () => ( modeBPromise))
+      ), async () => ( 30 * 60 * 1e3));
+    }
     const drain = async () => {
       const registries = [];
       if (modeAPromise !== void 0) {
@@ -8017,12 +8101,16 @@ var Registry = class {
       );
     }
     if (this.#runtimeReadyPromise) return this.#runtimeReadyPromise;
-    if (_chunkDTGPF6XYcjs.getRivetkitRuntimeMode.call(void 0, ) === "serverless") {
-      return Promise.reject(
-        new Error(
-          "registry.startAndWait() requires envoy runtime mode; serverless registries become ready per request"
-        )
-      );
+    try {
+      if (_chunkIBEFA6CXcjs.getRivetkitRuntimeMode.call(void 0, ) === "serverless") {
+        return Promise.reject(
+          new Error(
+            "registry.startAndWait() requires envoy runtime mode; serverless registries become ready per request"
+          )
+        );
+      }
+    } catch (error) {
+      return Promise.reject(error);
     }
     const config = this.parseConfig();
     if (config.runtime === "wasm") {
@@ -8087,8 +8175,8 @@ var Registry = class {
    * ```
    */
   start() {
-    if (_chunkDTGPF6XYcjs.getRivetkitRuntimeMode.call(void 0, ) === "serverless") {
-      const publicDir = _nullishCoalesce(_chunkDTGPF6XYcjs.getRivetkitPublicDir.call(void 0, ), () => ( "/public"));
+    if (_chunkIBEFA6CXcjs.getRivetkitRuntimeMode.call(void 0, ) === "serverless") {
+      const publicDir = _nullishCoalesce(_chunkIBEFA6CXcjs.getRivetkitPublicDir.call(void 0, ), () => ( "/public"));
       this.listen({ publicDir }).catch((error) => {
         logger2().error({ error }, "auto-listen failed; exiting");
         if (typeof process !== "undefined" && typeof process.exit === "function") {
@@ -8109,13 +8197,13 @@ var Registry = class {
     };
     console.log();
     console.log(
-      `  RivetKit ${_chunkDTGPF6XYcjs.VERSION} (Engine - ${kind === "serverless" ? "Serverless" : "Serverful"})`
+      `  RivetKit ${_chunkIBEFA6CXcjs.VERSION} (Engine - ${kind === "serverless" ? "Serverless" : "Serverful"})`
     );
     if (config.namespace !== "default") {
       logLine("Namespace", config.namespace);
     }
     if (config.endpoint) {
-      const endpointType = config.startEngine || _chunkWSSI5L6Lcjs.isLocalEngineEndpoint.call(void 0, config.endpoint) ? "local native" : "remote";
+      const endpointType = config.startEngine || _chunkCTQKKUZCcjs.isLocalEngineEndpoint.call(void 0, config.endpoint) ? "local native" : "remote";
       logLine("Endpoint", `${config.endpoint} (${endpointType})`);
     }
     if (kind === "serverless" && config.publicEndpoint) {
@@ -8185,5 +8273,5 @@ function setup(input) {
 
 
 
-exports.ALLOWED_PUBLIC_HEADERS = _chunkWSSI5L6Lcjs.ALLOWED_PUBLIC_HEADERS; exports.ActorDefinition = ActorDefinition; exports.ActorError = _chunkMGI2VVF6cjs.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 = _chunkMGI2VVF6cjs.RivetError; exports.RuntimeKindSchema = RuntimeKindSchema; exports.SqliteBackendSchema = SqliteBackendSchema; exports.SqliteConfigSchema = SqliteConfigSchema; exports.TestConfigSchema = TestConfigSchema; exports.UserError = _chunkMGI2VVF6cjs.UserError; exports.WasmRuntimeConfigSchema = WasmRuntimeConfigSchema; exports.actor = actor; exports.buildActorNames = buildActorNames; exports.createClientWithDriver = _chunkWSSI5L6Lcjs.createClientWithDriver; exports.defineRunHandler = _chunkHDVZ6YZGcjs.defineRunHandler; exports.event = event; exports.isStaticActorDefinition = isStaticActorDefinition; exports.isStaticActorInstance = isStaticActorInstance; exports.lookupInRegistry = lookupInRegistry; exports.noopNext = _chunkDTGPF6XYcjs.noopNext; exports.queue = queue; exports.setup = setup; exports.toUint8Array = _chunkDTGPF6XYcjs.toUint8Array;
+exports.ALLOWED_PUBLIC_HEADERS = _chunkCTQKKUZCcjs.ALLOWED_PUBLIC_HEADERS; exports.ActorDefinition = ActorDefinition; exports.ActorError = _chunkMGI2VVF6cjs.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 = _chunkMGI2VVF6cjs.RivetError; exports.RuntimeKindSchema = RuntimeKindSchema; exports.SqliteBackendSchema = SqliteBackendSchema; exports.SqliteConfigSchema = SqliteConfigSchema; exports.TestConfigSchema = TestConfigSchema; exports.UserError = _chunkMGI2VVF6cjs.UserError; exports.WasmRuntimeConfigSchema = WasmRuntimeConfigSchema; exports.actor = actor; exports.buildActorNames = buildActorNames; exports.createClientWithDriver = _chunkCTQKKUZCcjs.createClientWithDriver; exports.defineRunHandler = _chunkHDVZ6YZGcjs.defineRunHandler; exports.event = event; exports.isStaticActorDefinition = isStaticActorDefinition; exports.isStaticActorInstance = isStaticActorInstance; exports.lookupInRegistry = lookupInRegistry; exports.noopNext = _chunkIBEFA6CXcjs.noopNext; exports.queue = queue; exports.setup = setup; exports.toUint8Array = _chunkIBEFA6CXcjs.toUint8Array;
 //# sourceMappingURL=mod.cjs.map