rivetkit 2.3.0-rc.9 → 2.3.1

package/dist/tsup/mod.js

@@ -1,14 +1,16 @@
+import {
+  decodeWorkflowHistoryTransport
+} from "./chunk-NERUIBOT.js";
 import {
   ACTOR_CONTEXT_INTERNAL_SYMBOL,
   ActorConfigSchema,
   CONN_STATE_MANAGER_SYMBOL,
+  RAW_STATE_SYMBOL,
+  disposeRunInspector,
   getRunFunction,
   getRunInspectorConfig,
   getRunMetadata
-} from "./chunk-T6YVRM4K.js";
-import {
-  decodeWorkflowHistoryTransport
-} from "./chunk-KJTA3ATT.js";
+} from "./chunk-XIX5DOZN.js";
 import {
   ALLOWED_PUBLIC_HEADERS,
   HEADER_CONN_PARAMS,
@@ -18,7 +20,7 @@ import {
   getDatacenters,
   tryParseEndpoint,
   updateRunnerConfig
-} from "./chunk-F3Q5BFQ6.js";
+} from "./chunk-PT6OIW5E.js";
 import {
   KEYS,
   makePrefixedKey,
@@ -26,14 +28,14 @@ import {
   queueMetadataKey,
   removePrefixFromKey,
   workflowStoragePrefix
-} from "./chunk-3YY5S6TV.js";
+} from "./chunk-HXUEHHJF.js";
 import {
+  assertJsonCompatValue,
   decodeCborCompat,
-  decodeCborJsonCompat,
   encodeCborCompat
-} from "./chunk-W7EYSYVI.js";
-import "./chunk-PCBNKI2J.js";
-import "./chunk-H37XQU3I.js";
+} from "./chunk-R6KPN5EW.js";
+import "./chunk-JZ7TWV65.js";
+import "./chunk-JBUZRPY5.js";
 import {
   LogLevelSchema,
   VERSION,
@@ -49,15 +51,20 @@ import {
   getRivetPublicEndpoint,
   getRivetPublicToken,
   getRivetRunEngine,
+  getRivetRunEngineHost,
+  getRivetRunEnginePort,
   getRivetRunEngineVersion,
   getRivetToken,
   getRivetTotalSlots,
+  getRivetkitPublicDir,
   getRivetkitRuntime,
+  getRivetkitRuntimeMode,
   isDev,
   noopNext,
+  parsePortEnv,
   stringifyError,
   toUint8Array
-} from "./chunk-VRCIXJRN.js";
+} from "./chunk-L2X3YFER.js";
 import {
   INTERNAL_ERROR_CODE,
   RivetError,
@@ -65,10 +72,11 @@ import {
   decodeBridgeRivetError,
   encodeBridgeRivetError,
   forbiddenError,
+  isActorAbortedError,
   isRivetErrorLike,
   toRivetError,
   unsupportedFeature
-} from "./chunk-KIWH5H3K.js";
+} from "./chunk-ZZ3WBRPD.js";
 
 // src/actor/log.ts
 function loggerWithoutContext() {
@@ -140,7 +148,7 @@ function hasSchemaConfigKey(schemas, key) {
   if (!schemas) {
     return false;
   }
-  return Object.prototype.hasOwnProperty.call(schemas, key);
+  return Object.hasOwn(schemas, key);
 }
 function getEventCanSubscribe(schemas, key) {
   const schema = schemas == null ? void 0 : schemas[key];
@@ -201,8 +209,8 @@ function validateSchemaSync(schemas, key, data) {
 }
 
 // src/common/inline-websocket-adapter.ts
-import { WSContext } from "hono/ws";
 import { VirtualWebSocket } from "@rivetkit/virtual-websocket";
+import { WSContext } from "hono/ws";
 function logger() {
   return getLogger("inline-websocket-adapter");
 }
@@ -314,24 +322,24 @@ var InlineWebSocketAdapter = class {
       this.#close(1011, "Internal error during initialization");
     }
   }
-  #handleError(err) {
-    console.error("INLINE_WEBSOCKET_ADAPTER_ERROR", err);
+  #handleError(error) {
+    console.error("INLINE_WEBSOCKET_ADAPTER_ERROR", error);
     logger().error({
       msg: "error in websocket",
-      error: err,
-      errorMessage: err instanceof Error ? err.message : String(err),
-      stack: err instanceof Error ? err.stack : void 0
+      error,
+      errorMessage: error instanceof Error ? error.message : String(error),
+      stack: error instanceof Error ? error.stack : void 0
     });
     try {
-      this.#handler.onError(err, this.#wsContext);
-    } catch (handlerErr) {
+      this.#handler.onError(error, this.#wsContext);
+    } catch (error2) {
       logger().error({
         msg: "error in onError handler",
-        error: handlerErr
+        error: error2
       });
     }
-    this.#clientWs.triggerError(err);
-    this.#actorWs.triggerError(err);
+    this.#clientWs.triggerError(error);
+    this.#actorWs.triggerError(error);
   }
   #close(code, reason) {
     if (this.#readyState === 3 || this.#readyState === 2) {
@@ -344,8 +352,8 @@ var InlineWebSocketAdapter = class {
         { code, reason, wasClean: true },
         this.#wsContext
       );
-    } catch (err) {
-      logger().error({ msg: "error closing websocket", error: err });
+    } catch (error) {
+      logger().error({ msg: "error closing websocket", error });
     } finally {
       this.#readyState = 3;
       this.#clientWs.triggerClose(code, reason);
@@ -355,8 +363,23 @@ var InlineWebSocketAdapter = class {
 };
 
 // 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 {
+    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() {
@@ -371,10 +394,13 @@ function sleep(ms) {
 }
 function configureTimeoutMs() {
   const value = process.env.RIVET_SERVERLESS_CONFIGURE_TIMEOUT_MS;
-  if (value === void 0 || value === "") return DEFAULT_CONFIGURE_TIMEOUT_MS;
+  if (value === void 0 || value === "")
+    return DEFAULT_CONFIGURE_TIMEOUT_MS;
   const parsed = Number(value);
   if (!Number.isFinite(parsed) || parsed < 0) {
-    throw new Error("RIVET_SERVERLESS_CONFIGURE_TIMEOUT_MS must be a finite non-negative number");
+    throw new Error(
+      "RIVET_SERVERLESS_CONFIGURE_TIMEOUT_MS must be a finite non-negative number"
+    );
   }
   return parsed;
 }
@@ -388,13 +414,19 @@ async function configureServerlessPool(config) {
     attempts += 1;
     try {
       if (!config.namespace) {
-        throw new Error("namespace is required for serverless configuration");
+        throw new Error(
+          "namespace is required for serverless configuration"
+        );
       }
       if (!config.endpoint) {
-        throw new Error("endpoint is required for serverless configuration");
+        throw new Error(
+          "endpoint is required for serverless configuration"
+        );
       }
       if (!config.configurePool) {
-        throw new Error("configurePool is required for serverless configuration");
+        throw new Error(
+          "configurePool is required for serverless configuration"
+        );
       }
       const customConfig = config.configurePool;
       const clientConfig = convertRegistryConfigToClientConfig(config);
@@ -668,6 +700,18 @@ var RegistryConfigSchema = z3.object({
    * Starts the full Rust engine process locally.
    */
   startEngine: z3.boolean().default(() => getRivetRunEngine()),
+  /**
+   * @experimental
+   *
+   * Host to bind the spawned local engine process to.
+   */
+  engineHost: z3.string().optional().default(() => getRivetRunEngineHost() ?? ENGINE_HOST),
+  /**
+   * @experimental
+   *
+   * Port to bind the spawned local engine process to.
+   */
+  enginePort: z3.number().int().min(1).max(65535).optional().default(() => getRivetRunEnginePort() ?? ENGINE_PORT),
   /** @experimental */
   engineVersion: z3.string().optional().default(() => getRivetRunEngineVersion() ?? VERSION),
   /**
@@ -703,7 +747,7 @@ var RegistryConfigSchema = z3.object({
      * after calling `CoreRegistry::shutdown()`. Defaults to the
      * engine-provided actor stop threshold once the envoy connects.
      *
-     * Must be >= rivetkit-core's drain timeout (20s) + margin.
+     * Must be long enough for rivetkit-core to drain the envoy.
      */
     gracePeriodMs: z3.number().int().min(1e3).optional(),
     /**
@@ -745,7 +789,11 @@ var RegistryConfigSchema = z3.object({
       message: "configurePool requires either endpoint or startEngine"
     });
   }
-  const endpoint = config.startEngine ? ENGINE_ENDPOINT : (parsedEndpoint == null ? void 0 : parsedEndpoint.endpoint) ?? (isDevEnv ? ENGINE_ENDPOINT : void 0);
+  const localEngineEndpoint = buildEngineEndpoint(
+    config.engineHost,
+    config.enginePort
+  );
+  const endpoint = config.startEngine ? localEngineEndpoint : (parsedEndpoint == null ? void 0 : parsedEndpoint.endpoint) ?? (isDevEnv ? buildEngineEndpoint(ENGINE_HOST, ENGINE_PORT) : void 0);
   const validateServerlessEndpoint = Boolean(
     config.startEngine || parsedEndpoint
   );
@@ -762,7 +810,7 @@ var RegistryConfigSchema = z3.object({
       path: ["serverless", "publicEndpoint"]
     });
   }
-  const publicEndpoint = (parsedPublicEndpoint == null ? void 0 : parsedPublicEndpoint.endpoint) ?? (isDevEnv && config.startEngine ? ENGINE_ENDPOINT : void 0);
+  const publicEndpoint = (parsedPublicEndpoint == null ? void 0 : parsedPublicEndpoint.endpoint) ?? (isDevEnv && config.startEngine ? endpoint : void 0);
   const publicNamespace = parsedPublicEndpoint == null ? void 0 : parsedPublicEndpoint.namespace;
   const publicToken = (parsedPublicEndpoint == null ? void 0 : parsedPublicEndpoint.token) ?? config.serverless.publicToken;
   return {
@@ -1154,6 +1202,82 @@ function lastInsertRowIdColumnName(sql) {
   return alias;
 }
 
+// src/utils/node.ts
+import { createRequire } from "module";
+var nodeCrypto;
+var nodeFsSync;
+var nodeFs;
+var nodePath;
+var nodeOs;
+var nodeChildProcess;
+var nodeStream;
+var nodeUrl;
+var hasImportedDependencies = false;
+function getRequireFn() {
+  return createRequire(import.meta.url);
+}
+function importNodeDependencies() {
+  if (hasImportedDependencies) return;
+  try {
+    const requireFn = getRequireFn();
+    nodeCrypto = requireFn(
+      /* webpackIgnore: true */
+      "node:crypto"
+    );
+    nodeFsSync = requireFn(
+      /* webpackIgnore: true */
+      "node:fs"
+    );
+    nodeFs = requireFn(
+      /* webpackIgnore: true */
+      "node:fs/promises"
+    );
+    nodePath = requireFn(
+      /* webpackIgnore: true */
+      "node:path"
+    );
+    nodeOs = requireFn(
+      /* webpackIgnore: true */
+      "node:os"
+    );
+    nodeChildProcess = requireFn(
+      /* webpackIgnore: true */
+      "node:child_process"
+    );
+    nodeStream = requireFn(
+      /* webpackIgnore: true */
+      "node:stream/promises"
+    );
+    nodeUrl = requireFn(
+      /* webpackIgnore: true */
+      "node:url"
+    );
+    hasImportedDependencies = true;
+  } catch (err) {
+    console.warn(
+      "Node.js modules not available, file system driver will not work",
+      err
+    );
+    throw err;
+  }
+}
+function getNodeFsSync() {
+  if (!nodeFsSync) {
+    throw new Error(
+      "Node fs module not loaded. Ensure importNodeDependencies() has been called."
+    );
+  }
+  return nodeFsSync;
+}
+function getNodePath() {
+  if (!nodePath) {
+    throw new Error(
+      "Node path module not loaded. Ensure importNodeDependencies() has been called."
+    );
+  }
+  return nodePath;
+}
+
 // src/registry/runtime.ts
 function normalizeRuntimeSqlExecuteResult(result) {
   return result;
@@ -1309,6 +1433,16 @@ var NapiCoreRuntime = class {
       config
     );
   }
+  async serveListener(registry, listener, config) {
+    await asNativeRegistry(registry).serveListener(
+      {
+        port: listener.port,
+        host: listener.host,
+        publicDir: listener.publicDir
+      },
+      config
+    );
+  }
   createActorFactory(callbacks, config) {
     return asActorFactoryHandle(
       new this.#bindings.NapiActorFactory(callbacks, config)
@@ -1424,6 +1558,9 @@ var NapiCoreRuntime = class {
   async actorWaitForTrackedShutdownWork(ctx) {
     return await asNativeActorContext(ctx).waitForTrackedShutdownWork();
   }
+  async actorWaitForTrackedShutdownWorkUnbounded(ctx) {
+    await asNativeActorContext(ctx).waitForTrackedShutdownWorkUnbounded();
+  }
   actorKeepAwake(ctx, promise) {
     asNativeActorContext(ctx).keepAwake(promise);
   }
@@ -1535,8 +1672,12 @@ var NapiCoreRuntime = class {
       )
     );
   }
-  async actorQueueWaitForNamesAvailable(ctx, names, options) {
-    await asNativeActorContext(ctx).queue().waitForNamesAvailable(names, options);
+  async actorQueueWaitForNamesAvailable(ctx, names, options, signal) {
+    await asNativeActorContext(ctx).queue().waitForNamesAvailable(
+      names,
+      options,
+      signal ? asNativeCancellationToken(signal) : signal
+    );
   }
   async actorQueueEnqueueAndWait(ctx, name, body, options, signal) {
     return await asNativeActorContext(ctx).queue().enqueueAndWait(
@@ -1670,20 +1811,18 @@ function validateQueueComplete(schemas, name, response) {
     response
   );
   if (!result.success) {
-    throw validationError(`queue \`${name}\` completion response`, result.issues);
+    throw validationError(
+      `queue \`${name}\` completion response`,
+      result.issues
+    );
   }
   return result.data;
 }
 function validationError(target, issues) {
-  return new RivetError(
-    "actor",
-    "validation_error",
-    `Invalid ${target}`,
-    {
-      public: true,
-      metadata: { issues }
-    }
-  );
+  return new RivetError("actor", "validation_error", `Invalid ${target}`, {
+    public: true,
+    metadata: { issues }
+  });
 }
 
 // src/registry/wasm-runtime.ts
@@ -1864,6 +2003,11 @@ var WasmCoreRuntime = class {
       config
     );
   }
+  async serveListener(_registry, _listener, _config) {
+    throw new Error(
+      "registry.listen() is not supported on the wasm runtime; use registry.serve() and mount the handler in your platform's HTTP server instead"
+    );
+  }
   createActorFactory(callbacks, config) {
     return callWasmSync(
       () => asActorFactoryHandle2(
@@ -2007,6 +2151,12 @@ var WasmCoreRuntime = class {
       "waitForTrackedShutdownWork"
     );
   }
+  async actorWaitForTrackedShutdownWorkUnbounded(ctx) {
+    await callHandle(
+      asWasmActorContext(ctx),
+      "waitForTrackedShutdownWorkUnbounded"
+    );
+  }
   actorKeepAwake(ctx, promise) {
     const wasmCtx = asWasmActorContext(ctx);
     const regionId = callHandle(wasmCtx, "beginKeepAwake");
@@ -2154,9 +2304,15 @@ var WasmCoreRuntime = class {
       )
     );
   }
-  async actorQueueWaitForNamesAvailable(ctx, names, options) {
+  async actorQueueWaitForNamesAvailable(ctx, names, options, signal) {
     const queue2 = childHandle(asWasmActorContext(ctx), "queue");
-    await callHandleAsync(queue2, "waitForNamesAvailable", names, options);
+    await callHandleAsync(
+      queue2,
+      "waitForNamesAvailable",
+      names,
+      options,
+      signal
+    );
   }
   async actorQueueEnqueueAndWait(ctx, name, body, options, signal) {
     const queue2 = childHandle(asWasmActorContext(ctx), "queue");
@@ -2248,6 +2404,29 @@ async function loadWasmRuntime(config) {
   };
 }
 
+// src/registry/write-through-proxy.ts
+import onChange from "@rivetkit/on-change";
+function createWriteThroughProxy(value, commit, beforeChange) {
+  if (!value || typeof value !== "object") {
+    return value;
+  }
+  return onChange(
+    value,
+    () => {
+      commit(value);
+    },
+    {
+      // Rejection is throw-based: beforeChange throws to prevent the
+      // mutation. We always return true so on-change applies the change
+      // if beforeChange did not throw.
+      onValidate(_path, newValue) {
+        beforeChange == null ? void 0 : beforeChange(newValue);
+        return true;
+      }
+    }
+  );
+}
+
 // src/registry/native.ts
 var textEncoder = new TextEncoder();
 var textDecoder = new TextDecoder();
@@ -2401,6 +2580,14 @@ function databaseNotConfiguredError() {
     { public: true }
   );
 }
+function databaseClientNotReadyError() {
+  return new RivetError(
+    "actor",
+    "database_client_not_ready",
+    "actor database client was not initialized before user code ran. this is an internal lifecycle error; the migration callback should have pre-warmed the client. file an issue if you can reproduce.",
+    { public: true }
+  );
+}
 function stateNotEnabledError() {
   return new RivetError(
     "actor",
@@ -2452,8 +2639,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: stringifyError(error)
+      });
+    });
+    return;
+  }
+  await (afterTrackedWorkDrained == null ? void 0 : afterTrackedWorkDrained());
   await closeNativeDatabaseClient(runtime, ctx);
   await closeNativeSqlDatabase(runtime, ctx);
   clearNativeRuntimeState(runtime, ctx);
@@ -2558,11 +2760,14 @@ function decodeValue(value) {
   if (!value || value.length === 0) {
     return void 0;
   }
-  return decodeCborJsonCompat(value);
+  return decodeCborCompat(value);
 }
 function encodeValue(value) {
   return encodeCborCompat(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) {
     throw error;
@@ -2618,12 +2823,6 @@ function callNativeSync(invoke) {
     throw normalizeNativeBridgeError(error);
   }
 }
-function actorAbortedError() {
-  return Object.assign(new Error("Actor aborted"), {
-    group: "actor",
-    code: "aborted"
-  });
-}
 function isClosedTaskRegistrationError(error) {
   const metadata = error instanceof RivetError ? error.metadata : void 0;
   const metadataError = metadata && typeof metadata === "object" && "error" in metadata ? metadata.error : void 0;
@@ -2756,7 +2955,7 @@ function serializeWorkflowHistoryForJson(data) {
     return null;
   }
   const history = decodeWorkflowHistoryTransport(data);
-  return {
+  return jsonSafe({
     nameRegistry: [...history.nameRegistry],
     entries: history.entries.map((entry) => ({
       id: entry.id,
@@ -2780,7 +2979,7 @@ function serializeWorkflowHistoryForJson(data) {
         ]
       )
     )
-  };
+  });
 }
 function toHttpJsonCompatible(value) {
   return JSON.parse(
@@ -2831,45 +3030,7 @@ function wrapNativeCallback(callback) {
 }
 function decodeArgs(value) {
   const decoded = decodeValue(value);
-  return Array.isArray(decoded) ? decoded : decoded === void 0 ? [] : [decoded];
-}
-function createWriteThroughProxy(value, commit, beforeChange) {
-  if (!value || typeof value !== "object") {
-    return value;
-  }
-  const proxies = /* @__PURE__ */ new WeakMap();
-  const wrap = (target) => {
-    const cached = proxies.get(target);
-    if (cached) {
-      return cached;
-    }
-    const proxy = new Proxy(target, {
-      get(innerTarget, property, receiver) {
-        const result = Reflect.get(innerTarget, property, receiver);
-        return result && typeof result === "object" ? wrap(result) : result;
-      },
-      set(innerTarget, property, nextValue, receiver) {
-        beforeChange == null ? void 0 : beforeChange();
-        const updated = Reflect.set(
-          innerTarget,
-          property,
-          nextValue,
-          receiver
-        );
-        commit(value);
-        return updated;
-      },
-      deleteProperty(innerTarget, property) {
-        beforeChange == null ? void 0 : beforeChange();
-        const updated = Reflect.deleteProperty(innerTarget, property);
-        commit(value);
-        return updated;
-      }
-    });
-    proxies.set(target, proxy);
-    return proxy;
-  };
-  return wrap(value);
+  return normalizeArgs(decoded);
 }
 function buildRequest(init) {
   const url = init.uri.startsWith("http") ? init.uri : new URL(init.uri, "http://127.0.0.1").toString();
@@ -2923,13 +3084,23 @@ var NativeConnAdapter = class {
       decodeValue(this.#runtime.connParams(this.#conn))
     );
   }
+  [RAW_STATE_SYMBOL]() {
+    return this.#readState();
+  }
   get state() {
     const nextState = this.#readState();
-    return createWriteThroughProxy(nextState, (nextValue) => {
-      this.#writeState(nextValue, { writeNative: true });
-    });
+    return createWriteThroughProxy(
+      nextState,
+      (nextValue) => {
+        this.#writeState(nextValue, { writeNative: true });
+      },
+      (newValue) => {
+        assertJsonCompatValue(newValue);
+      }
+    );
   }
   set state(value) {
+    assertJsonCompatValue(value);
     this.#writeState(value, { writeNative: true });
   }
   initializeState(value) {
@@ -3281,44 +3452,23 @@ var NativeQueueAdapter = class {
     }
   }
   async waitForNamesAvailable(names, options) {
-    if (!(options == null ? void 0 : options.signal)) {
+    const { token, cleanup } = await createCancellationTokenHandle(
+      this.#runtime,
+      options == null ? void 0 : options.signal
+    );
+    try {
       await callNative(
         () => this.#runtime.actorQueueWaitForNamesAvailable(
           this.#ctx,
           [...names],
           {
             timeoutMs: options == null ? void 0 : options.timeout
-          }
+          },
+          token
         )
       );
-      return;
-    }
-    const deadline = options.timeout === void 0 ? void 0 : Date.now() + options.timeout;
-    for (; ; ) {
-      if (options.signal.aborted) {
-        throw actorAbortedError();
-      }
-      const remainingTimeout = deadline === void 0 ? void 0 : Math.max(0, deadline - Date.now());
-      const sliceTimeout = remainingTimeout === void 0 ? 100 : Math.min(remainingTimeout, 100);
-      try {
-        await callNative(
-          () => this.#runtime.actorQueueWaitForNamesAvailable(
-            this.#ctx,
-            [...names],
-            {
-              timeoutMs: sliceTimeout
-            }
-          )
-        );
-        return;
-      } catch (error) {
-        if (error.group === "queue" && error.code === "timed_out") {
-          if (remainingTimeout === void 0 || remainingTimeout > 100) {
-            continue;
-          }
-        }
-        throw error;
-      }
+    } finally {
+      cleanup == null ? void 0 : cleanup();
     }
   }
   async enqueueAndWait(name, body, options) {
@@ -3388,7 +3538,7 @@ var NativeQueueAdapter = class {
         }
         yield message;
       } catch (error) {
-        if (isRivetErrorLike(error) && error.group === "actor" && error.code === "aborted") {
+        if (isActorAbortedError(error)) {
           return;
         }
         throw error;
@@ -3753,6 +3903,68 @@ var TrackedWebSocketHandleAdapter = class {
     return typeof value === "object" && value !== null && "then" in value && typeof value.then === "function";
   }
 };
+var NativeConnectionMap = class {
+  #runtime;
+  #ctx;
+  #schemas;
+  constructor(runtime, ctx, schemas) {
+    this.#runtime = runtime;
+    this.#ctx = ctx;
+    this.#schemas = schemas;
+  }
+  #connToAdapter(conn) {
+    return new NativeConnAdapter(
+      this.#runtime,
+      conn,
+      this.#schemas,
+      this.#ctx,
+      (connId) => callNativeSync(
+        () => this.#runtime.actorQueueHibernationRemoval(
+          this.#ctx,
+          connId
+        )
+      )
+    );
+  }
+  get size() {
+    return callNativeSync(() => this.#runtime.actorConns(this.#ctx)).length;
+  }
+  get(key) {
+    const conns = callNativeSync(() => this.#runtime.actorConns(this.#ctx));
+    const conn = conns.find((c) => this.#runtime.connId(c) === key);
+    if (!conn) return void 0;
+    return this.#connToAdapter(conn);
+  }
+  has(key) {
+    const conns = callNativeSync(() => this.#runtime.actorConns(this.#ctx));
+    return conns.some((c) => this.#runtime.connId(c) === key);
+  }
+  keys() {
+    const conns = callNativeSync(() => this.#runtime.actorConns(this.#ctx));
+    return conns.map((c) => this.#runtime.connId(c))[Symbol.iterator]();
+  }
+  values() {
+    const conns = callNativeSync(() => this.#runtime.actorConns(this.#ctx));
+    return conns.map((c) => this.#connToAdapter(c))[Symbol.iterator]();
+  }
+  entries() {
+    const conns = callNativeSync(() => this.#runtime.actorConns(this.#ctx));
+    return conns.map(
+      (c) => [this.#runtime.connId(c), this.#connToAdapter(c)]
+    )[Symbol.iterator]();
+  }
+  forEach(callback, thisArg) {
+    const conns = callNativeSync(() => this.#runtime.actorConns(this.#ctx));
+    for (const conn of conns) {
+      const id = this.#runtime.connId(conn);
+      callback.call(thisArg, this.#connToAdapter(conn), id, this);
+    }
+  }
+  [Symbol.iterator]() {
+    return this.entries();
+  }
+  [Symbol.toStringTag] = "NativeConnectionMap";
+};
 var ActorContextHandleAdapter = class {
   #runtime;
   #ctx;
@@ -3761,9 +3973,9 @@ var ActorContextHandleAdapter = class {
   #abortSignalCleanup;
   #client;
   #clientFactory;
+  #connMap;
   #databaseProvider;
   #db;
-  #dbProxy;
   #dispatchCancelToken;
   #kv;
   #queue;
@@ -3806,30 +4018,22 @@ var ActorContextHandleAdapter = class {
     if (!this.#databaseProvider) {
       throw databaseNotConfiguredError();
     }
-    if (!this.#dbProxy) {
-      this.#dbProxy = new Proxy(
-        {},
-        {
-          get: (_target, property) => {
-            if (property === "then") {
-              return void 0;
-            }
-            return async (...args) => {
-              const client = await this.ensureDatabaseClient();
-              const value = Reflect.get(
-                client,
-                property
-              );
-              if (typeof value !== "function") {
-                return value;
-              }
-              return await value.apply(client, args);
-            };
-          }
-        }
-      );
+    if (this.#db) {
+      return this.#db;
     }
-    return this.#dbProxy;
+    const runtimeState = getNativeRuntimeState(this.#runtime, this.#ctx);
+    const cachedClient = runtimeState.databaseClient;
+    if (cachedClient) {
+      this.#db = cachedClient.client;
+      return this.#db;
+    }
+    throw databaseClientNotReadyError();
+  }
+  [RAW_STATE_SYMBOL]() {
+    if (!this.#stateEnabled) {
+      throw stateNotEnabledError();
+    }
+    return this.#readState();
   }
   get state() {
     if (!this.#stateEnabled) {
@@ -3844,8 +4048,9 @@ var ActorContextHandleAdapter = class {
         (nextValue) => {
           this.#writeState(nextValue, { scheduleSave: true });
         },
-        () => {
+        (newValue) => {
           this.#assertCanMutateState();
+          assertJsonCompatValue(newValue);
         }
       );
     }
@@ -3856,6 +4061,7 @@ var ActorContextHandleAdapter = class {
       throw stateNotEnabledError();
     }
     this.#assertCanMutateState();
+    assertJsonCompatValue(value);
     this.#writeState(value, { scheduleSave: true });
   }
   initializeState(value) {
@@ -3912,25 +4118,14 @@ var ActorContextHandleAdapter = class {
     return callNativeSync(() => this.#runtime.actorRegion(this.#ctx));
   }
   get conns() {
-    return new Map(
-      callNativeSync(() => this.#runtime.actorConns(this.#ctx)).map(
-        (conn) => [
-          this.#runtime.connId(conn),
-          new NativeConnAdapter(
-            this.#runtime,
-            conn,
-            this.#schemas,
-            this.#ctx,
-            (connId) => callNativeSync(
-              () => this.#runtime.actorQueueHibernationRemoval(
-                this.#ctx,
-                connId
-              )
-            )
-          )
-        ]
-      )
-    );
+    if (!this.#connMap) {
+      this.#connMap = new NativeConnectionMap(
+        this.#runtime,
+        this.#ctx,
+        this.#schemas
+      );
+    }
+    return this.#connMap;
   }
   get log() {
     return logger2();
@@ -4151,7 +4346,10 @@ var ActorContextHandleAdapter = class {
   }
   internalKeepAwake(run) {
     const promise = typeof run === "function" ? run() : run;
-    const trackedPromise = promise.then(() => null);
+    const trackedPromise = promise.then(
+      () => null,
+      () => null
+    );
     try {
       callNativeSync(
         () => this.#runtime.actorRegisterTask(this.#ctx, trackedPromise)
@@ -4207,6 +4405,7 @@ var ActorContextHandleAdapter = class {
     return false;
   }
   sleep() {
+    this.#flushStateChange();
     callNativeSync(() => this.#runtime.actorSleep(this.#ctx));
   }
   destroy() {
@@ -4467,7 +4666,7 @@ function withConnContext(runtime, ctx, conn, clientFactory, schemas = {}, databa
     }
   );
 }
-function buildActorConfig(definition, registryConfig) {
+function buildActorConfig(definition, registryConfig, runtimeKind) {
   const config = definition.config;
   const options = config.options ?? {};
   const canHibernate = options.canHibernateWebSocket;
@@ -4496,9 +4695,79 @@ function buildActorConfig(definition, registryConfig) {
     maxOutgoingMessageSize: registryConfig.maxOutgoingMessageSize,
     preloadMaxWorkflowBytes: options.preloadMaxWorkflowBytes,
     preloadMaxConnectionsBytes: options.preloadMaxConnectionsBytes,
-    actions: Object.keys(config.actions ?? {}).sort().map((name) => ({ name }))
+    actions: Object.keys(config.actions ?? {}).sort().map((name) => ({ name })),
+    inspectorTabs: buildInspectorTabs(config.inspector, runtimeKind)
   };
 }
+function buildInspectorTabs(inspector, runtimeKind) {
+  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 };
+    }
+    if (runtimeKind === "wasm") {
+      if (entry.source !== void 0) {
+        logger2().warn(
+          {
+            tabId: entry.id,
+            runtimeKind
+          },
+          "inspector.tabs[].source is not supported on wasm runners (current host: wasm). Tab descriptors will still appear in the dashboard strip but the tab body will render a not-available placeholder."
+        );
+      }
+      return {
+        id: entry.id,
+        label: entry.label,
+        icon: entry.icon,
+        source: void 0
+      };
+    }
+    const resolved = entry.source !== void 0 ? getNodePath().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 === getNodePath().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 = getNodeFsSync().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: ${(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;
@@ -4590,13 +4859,16 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         }
       );
     };
-    try {
-      await runtime.actorVerifyInspectorAuth(
-        ctx,
-        ((_a2 = jsRequest.headers.get("authorization")) == null ? void 0 : _a2.replace(/^Bearer\s+/i, "")) ?? null
-      );
-    } catch (error) {
-      return errorResponse(error, 401);
+    const isPublicPerActorPath = jsRequest.method === "GET" && (url.pathname === "/inspector/tab-config" || url.pathname.startsWith("/inspector/custom-tabs/"));
+    if (!isPublicPerActorPath) {
+      try {
+        await runtime.actorVerifyInspectorAuth(
+          ctx,
+          ((_a2 = jsRequest.headers.get("authorization")) == null ? void 0 : _a2.replace(/^Bearer\s+/i, "")) ?? null
+        );
+      } catch (error) {
+        return errorResponse(error, 401);
+      }
     }
     const workflowHistory = () => {
       var _a3;
@@ -4687,6 +4959,10 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             isWorkflowEnabled: getNativeWorkflowInspector(ctx) !== void 0
           });
         } catch (error) {
+          logger2().error({
+            msg: "error replaying workflow history",
+            error
+          });
           return errorResponse(error);
         }
       }
@@ -4827,17 +5103,34 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           );
         }
         const body = await jsRequest.json();
+        if (body.args !== void 0 && body.properties !== void 0) {
+          return jsonResponse(
+            { error: "use either args or properties, not both" },
+            { status: 400 }
+          );
+        }
+        if (body.properties !== void 0 && (body.properties === null || typeof body.properties !== "object" || Array.isArray(body.properties))) {
+          return jsonResponse(
+            { error: "properties must be an object" },
+            { status: 400 }
+          );
+        }
+        const args = body.properties !== void 0 ? [body.properties] : normalizeArgs(body.args);
         try {
           const output = await action(
             actorCtx,
             ...validateActionArgs(
               schemaConfig.actionInputSchemas,
               actionName,
-              body.args ?? []
+              args
             )
           );
           return jsonResponse({ output });
         } catch (error) {
+          logger2().error({
+            msg: "Error handling inspector action request",
+            error
+          });
           return errorResponse(error);
         }
       }
@@ -4851,6 +5144,10 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         { status: 404 }
       );
     } catch (error) {
+      logger2().error({
+        msg: "Error handling inspector request",
+        error
+      });
       return errorResponse(error);
     } finally {
       await actorCtx.dispose();
@@ -4973,24 +5270,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();
           }
@@ -5006,6 +5309,9 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             await config.onDestroy(actorCtx);
           }
         } finally {
+          const actorId = callNativeSync(() => runtime.actorId(ctx));
+          nativeRunHandlerActiveByActorId.delete(actorId);
+          disposeRunInspector(config.run, actorId);
           resolveNativeDestroy(runtime, ctx);
           await actorCtx.closeDatabase();
           clearNativeRuntimeState(runtime, ctx);
@@ -5279,7 +5585,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           try {
             await run(actorCtx);
           } finally {
-            nativeRunHandlerActiveByActorId.set(actorId, false);
+            nativeRunHandlerActiveByActorId.delete(actorId);
             await actorCtx.dispose();
           }
         }
@@ -5412,7 +5718,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
   };
   return runtime.createActorFactory(
     callbacks,
-    buildActorConfig(definition, registryConfig)
+    buildActorConfig(definition, registryConfig, runtime.kind)
   );
 }
 async function buildServeConfig(config) {
@@ -5435,10 +5741,17 @@ async function buildServeConfig(config) {
     serverlessValidateEndpoint: config.validateServerlessEndpoint,
     serverlessMaxStartPayloadBytes: config.serverless.maxStartPayloadBytes
   };
-  if (config.startEngine) {
+  try {
     const { getEnginePath } = await loadEngineCli();
     serveConfig.engineBinaryPath = getEnginePath();
+  } catch (error) {
+    logger2().warn({
+      msg: "could not resolve a local engine binary; if a local engine must be spawned it will fail with engine.binary_unavailable \u2014 set RIVET_ENGINE_BINARY_PATH or install the @rivetkit/engine-cli platform package",
+      error: stringifyError(error)
+    });
   }
+  serveConfig.engineHost = config.engineHost;
+  serveConfig.enginePort = config.enginePort;
   if ((_a = config.test) == null ? void 0 : _a.enabled) {
     serveConfig.inspectorTestToken = getEnvUniversal("_RIVET_TEST_INSPECTOR_TOKEN") ?? "token";
   }
@@ -5449,6 +5762,9 @@ async function buildRegistryWithRuntime(config, runtime) {
   if (((_a = config.test) == null ? void 0 : _a.enabled) && getEnvUniversal("_RIVET_TEST_INSPECTOR_TOKEN") === void 0) {
     trySetProcessEnv("_RIVET_TEST_INSPECTOR_TOKEN", "token");
   }
+  if (runtime.kind === "napi") {
+    importNodeDependencies();
+  }
   const registry = runtime.createRegistry();
   for (const [name, definition] of Object.entries(config.use)) {
     runtime.registerActor(
@@ -5488,6 +5804,7 @@ function finishShutdownSignal(signal) {
 }
 var Registry = class {
   #config;
+  #buildConfiguredRegistry;
   routes;
   get config() {
     return this.#config;
@@ -5503,23 +5820,30 @@ var Registry = class {
   #shutdownInstalled = false;
   #shutdownInFlight = null;
   #signalHandlers = {};
-  constructor(config) {
+  constructor(config, deps) {
     this.#config = config;
+    this.#buildConfiguredRegistry = (deps == null ? void 0 : deps.buildConfiguredRegistry) ?? buildConfiguredRegistry;
     this.routes = {
       health: () => this.#healthRoute(),
       metadata: () => this.#metadataRoute(),
       prometheusMetrics: (request) => this.#prometheusMetricsRoute(request)
     };
   }
+  /**
+   * Fires `configureServerlessPool` once per process when the registry
+   * config opts into it. Cached on the instance so repeated calls (from
+   * `handler()` and `listen()`) only run the upsert once. The retry loop
+   * inside `configureServerlessPool` tolerates the engine still warming up.
+   */
   #ensureServerlessPoolConfigured(config) {
     if (!config.configurePool) return void 0;
     if (!this.#configureServerlessPoolPromise) {
-      this.#configureServerlessPoolPromise = configureServerlessPool(config).catch(
-        (error) => {
-          this.#configureServerlessPoolPromise = void 0;
-          throw error;
-        }
-      );
+      this.#configureServerlessPoolPromise = configureServerlessPool(
+        config
+      ).catch((error) => {
+        this.#configureServerlessPoolPromise = void 0;
+        throw error;
+      });
       this.#configureServerlessPoolPromise.catch(() => {
       });
     }
@@ -5540,7 +5864,7 @@ var Registry = class {
     const config = this.parseConfig();
     this.#printWelcome(config, "serverless");
     if (!this.#runtimeServerlessPromise) {
-      this.#runtimeServerlessPromise = buildConfiguredRegistry(config);
+      this.#runtimeServerlessPromise = this.#buildConfiguredRegistry(config);
     }
     const { runtime, registry, serveConfig } = await this.#runtimeServerlessPromise;
     const isStartRequest = isServerlessStartRequest(
@@ -5555,7 +5879,7 @@ var Registry = class {
     if (isStartRequest) {
       try {
         await this.#ensureServerlessPoolConfigured(config);
-      } catch (error) {
+      } catch (_error) {
         return new Response(
           JSON.stringify({
             group: "guard",
@@ -5669,7 +5993,7 @@ var Registry = class {
     if (isMetadataRequest && !isEngineMetadataRequest) {
       try {
         await this.#ensureServerlessPoolConfigured(config);
-      } catch (error) {
+      } catch (_error) {
         return new Response(
           JSON.stringify({
             group: "guard",
@@ -5702,6 +6026,44 @@ var Registry = class {
       fetch: (request) => this.handler(request)
     };
   }
+  /**
+   * Bind an HTTP listener provided by the native (Rust) runtime and serve
+   * the registry's serverless endpoints over it. Resolves only after the
+   * registry is shut down (SIGINT/SIGTERM or `nativeRegistry.shutdown()`).
+   *
+   * @param opts.port      Port to listen on. Defaults to `process.env.RIVET_PORT`
+   *                       if set, otherwise 3000.
+   * @param opts.host      Address to bind. Defaults to `0.0.0.0`.
+   * @param opts.publicDir If set, serves static files from this directory
+   *                       as a fallback below the framework routes.
+   *
+   * @example
+   * ```ts
+   * await registry.listen();
+   * await registry.listen({ port: 8080, publicDir: "./public" });
+   * ```
+   */
+  async listen(opts = {}) {
+    const port = opts.port ?? parsePortEnv(process.env.RIVET_PORT) ?? 3e3;
+    const publicDir = opts.publicDir ?? getRivetkitPublicDir();
+    const config = this.parseConfig();
+    const configuredRegistryPromise = buildConfiguredRegistry(config);
+    this.#runtimeServeConfiguredPromise = configuredRegistryPromise;
+    this.#runtimeServerlessPromise = configuredRegistryPromise;
+    this.#installSignalHandlers(config);
+    this.#printWelcome(config, "serverless", {
+      port,
+      host: opts.host,
+      publicDir
+    });
+    this.#ensureServerlessPoolConfigured(config);
+    const { runtime, registry, serveConfig } = await configuredRegistryPromise;
+    await runtime.serveListener(
+      registry,
+      { port, host: opts.host, publicDir },
+      serveConfig
+    );
+  }
   /**
    * Returns a health response suitable for mounting in a user-owned router.
    */
@@ -5791,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((err) => {
-        logger2().warn({ err }, "runtime registry serve errored");
+      }).catch((error) => {
+        logger2().warn({ error }, "runtime registry serve errored");
       });
-      this.#installSignalHandlers(config, configuredRegistryPromise);
+      this.#installSignalHandlers(config);
     }
     if (printWelcome) {
       this.#printWelcome(config, "serverful");
     }
   }
-  #installSignalHandlers(config, configuredRegistryPromise) {
+  #installSignalHandlers(config) {
     var _a;
     if (this.#shutdownInstalled) return;
     if ((_a = config.shutdown) == null ? void 0 : _a.disableSignalHandlers) return;
@@ -5813,58 +6175,86 @@ var Registry = class {
     }
     this.#shutdownInstalled = true;
     const install = (signal) => {
-      const handler = () => this.#onShutdownSignal(
-        signal,
-        config,
-        configuredRegistryPromise
-      );
+      const handler = () => this.#onShutdownSignal(signal, config);
       this.#signalHandlers[signal] = handler;
       process.on(signal, handler);
     };
     install("SIGINT");
     install("SIGTERM");
   }
-  #onShutdownSignal(signal, config, configuredRegistryPromise) {
+  #onShutdownSignal(signal, config) {
     if (this.#shutdownInFlight !== null) {
       this.#removeSignalHandlers();
       finishShutdownSignal(signal);
       return;
     }
-    this.#shutdownInFlight = this.#runShutdown(
-      signal,
-      config,
-      configuredRegistryPromise
-    ).catch((err) => {
+    this.#shutdownInFlight = this.#drain(config).catch((err) => {
       logger2().warn({ err }, "shutdown error");
+    }).then(() => {
+      this.#removeSignalHandlers();
+      finishShutdownSignal(signal);
     });
   }
-  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 = ((_a = config.shutdown) == null ? void 0 : _a.gracePeriodMs) ?? await this.#actorStopThresholdMs(configuredRegistryPromise) ?? 30 * 60 * 1e3;
+    const modeAPromise = this.#runtimeServeConfiguredPromise;
+    const modeBPromise = this.#runtimeServerlessPromise;
+    const gracePeriodMs = ((_a = config.shutdown) == null ? void 0 : _a.gracePeriodMs) ?? await this.#actorStopThresholdMs(modeAPromise ?? modeBPromise) ?? 30 * 60 * 1e3;
     const drain = async () => {
-      const registries = [
-        (async () => {
-          try {
-            const { runtime, registry } = await configuredRegistryPromise;
-            await runtime.shutdownRegistry(registry);
-          } catch (err) {
-            logger2().warn(
-              { err },
-              "runtime registry shutdown errored (mode A)"
-            );
-          }
-        })()
-      ];
-      const runtimeServerlessPromise = this.#runtimeServerlessPromise;
-      if (runtimeServerlessPromise !== void 0) {
+      const registries = [];
+      if (modeAPromise !== void 0) {
         registries.push(
           (async () => {
             try {
-              const { runtime, registry } = await runtimeServerlessPromise;
+              const { runtime, registry } = await modeAPromise;
               await runtime.shutdownRegistry(registry);
             } catch (err) {
               logger2().warn(
                 { err },
+                "runtime registry shutdown errored (mode A)"
+              );
+            }
+          })()
+        );
+      }
+      if (modeBPromise !== void 0) {
+        registries.push(
+          (async () => {
+            try {
+              const { runtime, registry } = await modeBPromise;
+              await runtime.shutdownRegistry(registry);
+            } catch (err) {
+              logger2().warn(
+                { error: err },
                 "runtime registry shutdown errored (mode B)"
               );
             }
@@ -5886,11 +6276,10 @@ var Registry = class {
         }
       )
     ]);
-    this.#removeSignalHandlers();
-    finishShutdownSignal(signal);
   }
   async #actorStopThresholdMs(configuredRegistryPromise) {
     var _a;
+    if (configuredRegistryPromise === void 0) return void 0;
     try {
       const { runtime, registry } = await configuredRegistryPromise;
       const thresholdMs = await ((_a = runtime.registryActorStopThresholdMs) == null ? void 0 : _a.call(runtime, registry));
@@ -5919,6 +6308,10 @@ var Registry = class {
   /**
    * Starts the actor envoy for standalone server deployments.
    *
+   * Set `RIVETKIT_RUNTIME_MODE=serverless` to instead bind an HTTP listener
+   * via `listen()` (Mode B). Mode A (envoy) and Mode B (listener) are
+   * mutually exclusive per registry instance.
+   *
    * @example
    * ```ts
    * const registry = setup({ use: { counter } });
@@ -5926,10 +6319,20 @@ var Registry = class {
    * ```
    */
   start() {
+    if (getRivetkitRuntimeMode() === "serverless") {
+      const publicDir = getRivetkitPublicDir() ?? "/public";
+      this.listen({ publicDir }).catch((error) => {
+        logger2().error({ error }, "auto-listen failed; exiting");
+        if (typeof process !== "undefined" && typeof process.exit === "function") {
+          process.exit(1);
+        }
+      });
+      return;
+    }
     const config = this.parseConfig();
     this.#startEnvoy(config, true);
   }
-  #printWelcome(config, kind) {
+  #printWelcome(config, kind, listener) {
     if (config.noWelcome || this.#welcomePrinted) return;
     this.#welcomePrinted = true;
     const logLine = (label, value) => {
@@ -5944,13 +6347,20 @@ var Registry = class {
       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) {
       logLine("Client", config.publicEndpoint);
     }
     logLine("Actors", Object.keys(config.use).length.toString());
+    if (listener) {
+      const host = listener.host ?? "0.0.0.0";
+      logLine("Listening", `http://${host}:${listener.port}`);
+      if (listener.publicDir) {
+        logLine("Public Dir", listener.publicDir);
+      }
+    }
     console.log();
   }
 };