rivetkit 2.3.0-rc.5 → 2.3.0-rc.7

package/dist/tsup/mod.js

@@ -2,27 +2,24 @@ import {
   ACTOR_CONTEXT_INTERNAL_SYMBOL,
   ActorConfigSchema,
   CONN_STATE_MANAGER_SYMBOL,
+  RAW_STATE_SYMBOL,
   getRunFunction,
   getRunInspectorConfig,
   getRunMetadata
-} from "./chunk-T6YVRM4K.js";
+} from "./chunk-D5G75T7J.js";
 import {
   decodeWorkflowHistoryTransport
-} from "./chunk-PGYEMIOE.js";
+} from "./chunk-52TPEKEC.js";
 import {
   ALLOWED_PUBLIC_HEADERS,
-  CURRENT_VERSION,
   HEADER_CONN_PARAMS,
-  HEADER_ENCODING,
-  HTTP_RESPONSE_ERROR_VERSIONED,
-  HttpResponseErrorSchema,
   RemoteEngineControlClient,
   convertRegistryConfigToClientConfig,
   createClientWithDriver,
   getDatacenters,
   tryParseEndpoint,
   updateRunnerConfig
-} from "./chunk-JY73X7VU.js";
+} from "./chunk-VJ4Y4WBT.js";
 import {
   KEYS,
   makePrefixedKey,
@@ -32,18 +29,18 @@ import {
   workflowStoragePrefix
 } from "./chunk-3YY5S6TV.js";
 import {
-  contentTypeForEncoding,
+  assertJsonCompatValue,
   decodeCborCompat,
   decodeCborJsonCompat,
-  encodeCborCompat,
-  serializeWithEncoding
-} from "./chunk-LDTT6WKJ.js";
+  encodeCborCompat
+} from "./chunk-4LTY5TOO.js";
 import "./chunk-PCBNKI2J.js";
-import "./chunk-UXTP4EBU.js";
+import "./chunk-4DJMFOSU.js";
 import {
   LogLevelSchema,
   VERSION,
   deconstructError,
+  detectRuntime,
   getEnvUniversal,
   getLogger,
   getNodeEnv,
@@ -63,7 +60,7 @@ import {
   noopNext,
   stringifyError,
   toUint8Array
-} from "./chunk-N2DQSJIW.js";
+} from "./chunk-HERL2VQ2.js";
 import {
   INTERNAL_ERROR_CODE,
   RivetError,
@@ -74,7 +71,7 @@ import {
   isRivetErrorLike,
   toRivetError,
   unsupportedFeature
-} from "./chunk-K34B3OVG.js";
+} from "./chunk-TMLOKTRB.js";
 
 // src/actor/log.ts
 function loggerWithoutContext() {
@@ -320,24 +317,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) {
@@ -350,8 +347,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);
@@ -360,6 +357,9 @@ var InlineWebSocketAdapter = class {
   }
 };
 
+// src/registry/index.ts
+import { Hono } from "hono";
+
 // src/common/engine.ts
 var ENGINE_PORT = 6420;
 var ENGINE_ENDPOINT = `http://127.0.0.1:${ENGINE_PORT}`;
@@ -456,6 +456,145 @@ async function configureServerlessPool(config) {
   throw lastError;
 }
 
+// src/utils/serve.ts
+import getPort from "get-port";
+var serveStaticLoaderPromises = {};
+async function crossPlatformServe(config, httpPort, app, runtime = detectRuntime()) {
+  logger2().debug({ msg: "detected runtime for serve", runtime });
+  switch (runtime) {
+    case "deno":
+      return serveDeno(config, httpPort, app);
+    case "bun":
+      return serveBun(config, httpPort, app);
+    case "node":
+      return serveNode(config, httpPort, app);
+    default:
+      return serveNode(config, httpPort, app);
+  }
+}
+async function loadRuntimeServeStatic(runtime) {
+  if (!serveStaticLoaderPromises[runtime]) {
+    if (runtime === "node") {
+      const nodeServeStaticModule = "@hono/node-server/serve-static";
+      serveStaticLoaderPromises[runtime] = import(
+        /* webpackIgnore: true */
+        nodeServeStaticModule
+      ).then((x) => x.serveStatic);
+    } else if (runtime === "bun") {
+      const bunModule = "hono/bun";
+      serveStaticLoaderPromises[runtime] = import(
+        /* webpackIgnore: true */
+        bunModule
+      ).then((x) => x.serveStatic);
+    } else if (runtime === "deno") {
+      const denoModule = "hono/deno";
+      serveStaticLoaderPromises[runtime] = import(
+        /* webpackIgnore: true */
+        denoModule
+      ).then((x) => x.serveStatic);
+    } else {
+      throw new Error(`unsupported runtime: ${runtime}`);
+    }
+  }
+  return await serveStaticLoaderPromises[runtime];
+}
+async function serveNode(config, httpPort, app) {
+  const nodeServerModule = "@hono/node-server";
+  let serve;
+  try {
+    const dep = await import(
+      /* webpackIgnore: true */
+      nodeServerModule
+    );
+    serve = dep.serve;
+  } catch (err) {
+    logger2().error({
+      msg: "failed to import @hono/node-server. please run 'npm install @hono/node-server @hono/node-ws'",
+      error: stringifyError(err)
+    });
+    process.exit(1);
+  }
+  const nodeWsModule = "@hono/node-ws";
+  let createNodeWebSocket;
+  try {
+    const dep = await import(
+      /* webpackIgnore: true */
+      nodeWsModule
+    );
+    createNodeWebSocket = dep.createNodeWebSocket;
+  } catch (err) {
+    logger2().error({
+      msg: "failed to import @hono/node-ws. please run 'npm install @hono/node-server @hono/node-ws'",
+      error: stringifyError(err)
+    });
+    process.exit(1);
+  }
+  const { injectWebSocket, upgradeWebSocket } = createNodeWebSocket({
+    app
+  });
+  const port = httpPort;
+  const hostname = config.httpHost;
+  const server = serve(
+    { fetch: app.fetch, port, hostname },
+    () => logger2().info({ msg: "server listening", port, hostname })
+  );
+  injectWebSocket(server);
+  const closeServer = () => {
+    server.close();
+  };
+  return { upgradeWebSocket, closeServer };
+}
+async function serveDeno(config, httpPort, app) {
+  const honoDenoModule = "hono/deno";
+  let upgradeWebSocket;
+  try {
+    const dep = await import(
+      /* webpackIgnore: true */
+      honoDenoModule
+    );
+    upgradeWebSocket = dep.upgradeWebSocket;
+  } catch (err) {
+    logger2().error({
+      msg: "failed to import hono/deno",
+      error: stringifyError(err)
+    });
+    process.exit(1);
+  }
+  const port = httpPort;
+  const hostname = config.httpHost;
+  Deno.serve({ port, hostname }, app.fetch);
+  logger2().info({ msg: "server listening", port, hostname });
+  return { upgradeWebSocket };
+}
+async function serveBun(config, httpPort, app) {
+  const honoBunModule = "hono/bun";
+  let createBunWebSocket;
+  try {
+    const dep = await import(
+      /* webpackIgnore: true */
+      honoBunModule
+    );
+    createBunWebSocket = dep.createBunWebSocket;
+  } catch (err) {
+    logger2().error({
+      msg: "failed to import hono/bun",
+      error: stringifyError(err)
+    });
+    process.exit(1);
+  }
+  const { websocket, upgradeWebSocket } = createBunWebSocket();
+  const port = httpPort;
+  const hostname = config.httpHost;
+  Bun.serve({
+    fetch: app.fetch,
+    port,
+    hostname,
+    websocket
+  });
+  logger2().info({ msg: "server listening", port, hostname });
+  return { upgradeWebSocket };
+}
+
 // src/registry/config/index.ts
 import { z as z3 } from "zod";
 
@@ -706,12 +845,12 @@ var RegistryConfigSchema = z3.object({
   shutdown: z3.object({
     /**
      * Wait this many milliseconds for the serve promise to resolve
-     * after calling `CoreRegistry::shutdown()`. Defaults to 30s,
-     * matching Kubernetes `terminationGracePeriodSeconds`.
+     * after calling `CoreRegistry::shutdown()`. Defaults to the
+     * engine-provided actor stop threshold once the envoy connects.
      *
      * Must be >= rivetkit-core's drain timeout (20s) + margin.
      */
-    gracePeriodMs: z3.number().int().min(1e3).optional().default(3e4),
+    gracePeriodMs: z3.number().int().min(1e3).optional(),
     /**
      * If true, rivetkit will not install SIGINT/SIGTERM handlers.
      * Use when the host application owns signal policy and will
@@ -719,7 +858,6 @@ var RegistryConfigSchema = z3.object({
      */
     disableSignalHandlers: z3.boolean().optional().default(false)
   }).optional().default(() => ({
-    gracePeriodMs: 3e4,
     disableSignalHandlers: false
   }))
 }).transform((config, ctx) => {
@@ -930,7 +1068,8 @@ function shouldAttachNativeKvError(message) {
 }
 function enrichNativeDatabaseError(database, error) {
   var _a;
-  const bridged = typeof error === "string" ? decodeBridgeRivetError(error) : error instanceof Error ? decodeBridgeRivetError(error.message) : void 0;
+  const bridgeReason = typeof error === "string" ? error : error instanceof Error ? error.message : void 0;
+  const bridged = bridgeReason === void 0 ? void 0 : decodeBridgeRivetError(bridgeReason);
   if (bridged) {
     throw bridged;
   }
@@ -1160,6 +1299,29 @@ function lastInsertRowIdColumnName(sql) {
   return alias;
 }
 
+// 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/runtime.ts
 function normalizeRuntimeSqlExecuteResult(result) {
   return result;
@@ -1287,6 +1449,9 @@ var NapiCoreRuntime = class {
       envoyActiveActorCount: diagnostics.envoyActiveActorCount
     };
   }
+  async registryActorStopThresholdMs(registry) {
+    return await asNativeRegistry(registry).actorStopThresholdMs() ?? void 0;
+  }
   async handleServerlessRequest(registry, req, onStreamEvent, cancelToken, config) {
     return await asNativeRegistry(registry).handleServerlessRequest(
       { ...req, body: toNapiBuffer(req.body) },
@@ -1407,6 +1572,9 @@ var NapiCoreRuntime = class {
   actorWaitUntil(ctx, promise) {
     asNativeActorContext(ctx).waitUntil(promise);
   }
+  async actorWaitForTrackedShutdownWork(ctx) {
+    return await asNativeActorContext(ctx).waitForTrackedShutdownWork();
+  }
   actorKeepAwake(ctx, promise) {
     asNativeActorContext(ctx).keepAwake(promise);
   }
@@ -1974,6 +2142,12 @@ var WasmCoreRuntime = class {
   actorWaitUntil(ctx, promise) {
     callHandle(asWasmActorContext(ctx), "waitUntil", promise);
   }
+  async actorWaitForTrackedShutdownWork(ctx) {
+    return await callHandle(
+      asWasmActorContext(ctx),
+      "waitForTrackedShutdownWork"
+    );
+  }
   actorKeepAwake(ctx, promise) {
     const wasmCtx = asWasmActorContext(ctx);
     const regionId = callHandle(wasmCtx, "beginKeepAwake");
@@ -2368,6 +2542,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",
@@ -2420,20 +2602,24 @@ function clearNativeRuntimeState(runtime, ctx) {
   callNativeSync(() => runtime.actorClearRuntimeState(ctx));
 }
 async function cleanupNativeSleepRuntimeState(runtime, ctx) {
+  const waitStarted = Date.now();
+  const drained = await runtime.actorWaitForTrackedShutdownWork(ctx);
+  const waitMs = Date.now() - waitStarted;
+  if (drained) {
+    logger2().debug({
+      msg: "sleep cleanup: tracked shutdown work drained",
+      waitMs
+    });
+  } else {
+    logger2().warn({
+      msg: "sleep cleanup: shutdown deadline reached before tracked work drained; closing DB anyway",
+      waitMs
+    });
+  }
   await closeNativeDatabaseClient(runtime, ctx);
   await closeNativeSqlDatabase(runtime, ctx);
   clearNativeRuntimeState(runtime, ctx);
 }
-async function cleanupDeferredNativeSleepRuntimeState(runtime, ctx, runtimeState) {
-  runtimeState.deferSleepCleanupUntilKeepAwakeIdle = false;
-  const actorCtx = runtimeState.deferredSleepCleanupActorCtx;
-  runtimeState.deferredSleepCleanupActorCtx = void 0;
-  try {
-    await cleanupNativeSleepRuntimeState(runtime, ctx);
-  } finally {
-    await (actorCtx == null ? void 0 : actorCtx.dispose());
-  }
-}
 function closeNativeSqlDatabase(runtime, ctx) {
   const runtimeState = getNativeRuntimeState(runtime, ctx);
   const database = runtimeState.sql;
@@ -2570,27 +2756,7 @@ function isStructuredBridgeError(error) {
   return isRivetErrorLike(error) && "__type" in error && (error.__type === "RivetError" || error.__type === "ActorError");
 }
 function encodeNativeCallbackError(error) {
-  const structuredError = isStructuredBridgeError(error) ? error : deconstructError(error, logger2(), {
-    bridge: "native_callback"
-  });
-  let stack;
-  if (error instanceof Error) {
-    try {
-      stack = error.stack;
-    } catch {
-      stack = void 0;
-    }
-  }
-  logger2().warn({
-    msg: "native callback error encoded for bridge",
-    group: structuredError.group,
-    code: structuredError.code,
-    message: structuredError.message,
-    metadata: structuredError.metadata,
-    originalError: stringifyError(error),
-    stack,
-    bridge: "native_callback"
-  });
+  const structuredError = isStructuredBridgeError(error) ? error : deconstructError(error, true);
   const bridgeError = new Error(encodeBridgeRivetError(structuredError), {
     cause: error instanceof Error ? error : void 0
   });
@@ -2829,44 +2995,6 @@ 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);
-}
 function buildRequest(init) {
   const url = init.uri.startsWith("http") ? init.uri : new URL(init.uri, "http://127.0.0.1").toString();
   const body = init.body && init.body.length > 0 ? runtimeBytesToArrayBuffer(init.body) : void 0;
@@ -2919,13 +3047,19 @@ 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 });
+    }, (newValue) => {
+      assertJsonCompatValue(newValue);
     });
   }
   set state(value) {
+    assertJsonCompatValue(value);
     this.#writeState(value, { writeNative: true });
   }
   initializeState(value) {
@@ -3749,6 +3883,70 @@ 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;
@@ -3757,9 +3955,9 @@ var ActorContextHandleAdapter = class {
   #abortSignalCleanup;
   #client;
   #clientFactory;
+  #connMap;
   #databaseProvider;
   #db;
-  #dbProxy;
   #dispatchCancelToken;
   #kv;
   #queue;
@@ -3802,30 +4000,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) {
@@ -3837,8 +4027,9 @@ var ActorContextHandleAdapter = class {
       (nextValue) => {
         this.#writeState(nextValue, { scheduleSave: true });
       },
-      () => {
+      (newValue) => {
         this.#assertCanMutateState();
+        assertJsonCompatValue(newValue);
       }
     );
   }
@@ -3847,6 +4038,7 @@ var ActorContextHandleAdapter = class {
       throw stateNotEnabledError();
     }
     this.#assertCanMutateState();
+    assertJsonCompatValue(value);
     this.#writeState(value, { scheduleSave: true });
   }
   initializeState(value) {
@@ -3903,25 +4095,10 @@ 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();
@@ -4119,43 +4296,39 @@ var ActorContextHandleAdapter = class {
     });
   }
   keepAwake(promise) {
-    const runtimeState = getNativeRuntimeState(this.#runtime, this.#ctx);
-    runtimeState.keepAwakeCount = (runtimeState.keepAwakeCount ?? 0) + 1;
-    let registered = false;
-    const trackedPromise = Promise.resolve(promise).catch((error) => {
-      logger2().warn({
-        msg: "keepAwake promise rejected",
-        error: stringifyError(error)
-      });
-    }).finally(async () => {
-      if (!registered) {
-        return;
-      }
-      runtimeState.keepAwakeCount = Math.max(
-        (runtimeState.keepAwakeCount ?? 1) - 1,
-        0
-      );
-      if (runtimeState.keepAwakeCount === 0 && runtimeState.deferSleepCleanupUntilKeepAwakeIdle) {
-        await cleanupDeferredNativeSleepRuntimeState(
-          this.#runtime,
-          this.#ctx,
-          runtimeState
-        );
+    const startedAt = Date.now();
+    logger2().debug({
+      msg: "keepAwake registered",
+      at: startedAt
+    });
+    const trackedPromise = Promise.resolve(promise).then(
+      () => {
+        logger2().debug({
+          msg: "keepAwake promise resolved",
+          durationMs: Date.now() - startedAt
+        });
+      },
+      (error) => {
+        logger2().warn({
+          msg: "keepAwake promise rejected",
+          durationMs: Date.now() - startedAt,
+          error: stringifyError(error)
+        });
       }
-    }).then(() => null);
+    ).then(() => null);
     try {
       callNativeSync(
         () => this.#runtime.actorKeepAwake(this.#ctx, trackedPromise)
       );
-      registered = true;
     } catch (error) {
-      runtimeState.keepAwakeCount = Math.max(
-        (runtimeState.keepAwakeCount ?? 1) - 1,
-        0
-      );
-      if (!isClosedTaskRegistrationError(error)) {
-        throw error;
+      if (isClosedTaskRegistrationError(error)) {
+        logger2().warn({
+          msg: "keepAwake registration dropped (teardown already started); promise will not delay grace",
+          error: stringifyError(error)
+        });
+        return promise;
       }
+      throw error;
     }
     return promise;
   }
@@ -4459,39 +4632,6 @@ function withConnContext(runtime, ctx, conn, clientFactory, schemas = {}, databa
     }
   );
 }
-function buildNativeRequestErrorResponse(encoding, path, error) {
-  const { statusCode, group, code, message, metadata } = deconstructError(
-    error,
-    logger2(),
-    {
-      path,
-      runtime: "native"
-    },
-    false
-  );
-  const body = serializeWithEncoding(
-    encoding,
-    { group, code, message, metadata },
-    HTTP_RESPONSE_ERROR_VERSIONED,
-    CURRENT_VERSION,
-    HttpResponseErrorSchema,
-    (value) => value,
-    (value) => ({
-      group: value.group,
-      code: value.code,
-      message: value.message,
-      metadata: value.metadata === void 0 ? null : runtimeBytesToArrayBuffer(
-        encodeCborCompat(value.metadata)
-      )
-    })
-  );
-  return new Response(body, {
-    status: statusCode,
-    headers: {
-      "Content-Type": contentTypeForEncoding(encoding)
-    }
-  });
-}
 function buildActorConfig(definition, registryConfig) {
   const config = definition.config;
   const options = config.options ?? {};
@@ -4712,6 +4852,10 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             isWorkflowEnabled: getNativeWorkflowInspector(ctx) !== void 0
           });
         } catch (error) {
+          logger2().error({
+            msg: "error replaying workflow history",
+            error
+          });
           return errorResponse(error);
         }
       }
@@ -4863,6 +5007,10 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           );
           return jsonResponse({ output });
         } catch (error) {
+          logger2().error({
+            msg: "Error handling inspector action request",
+            error
+          });
           return errorResponse(error);
         }
       }
@@ -4876,6 +5024,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();
@@ -5014,12 +5166,9 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             }
           }
         } finally {
-          const runtimeState = getNativeRuntimeState(runtime, ctx);
-          if ((runtimeState.keepAwakeCount ?? 0) > 0) {
-            runtimeState.deferSleepCleanupUntilKeepAwakeIdle = true;
-            runtimeState.deferredSleepCleanupActorCtx = actorCtx;
-          } else {
+          try {
             await cleanupNativeSleepRuntimeState(runtime, ctx);
+          } finally {
             await actorCtx.dispose();
           }
         }
@@ -5260,17 +5409,6 @@ function buildNativeFactory(runtime, registryConfig, definition) {
               );
             }
             return await toRuntimeHttpResponse(response);
-          } catch (error2) {
-            const encodingHeader = jsRequest.headers.get(HEADER_ENCODING);
-            const encoding = encodingHeader === "cbor" || encodingHeader === "bare" ? encodingHeader : "json";
-            const path = new URL(jsRequest.url).pathname;
-            return await toRuntimeHttpResponse(
-              buildNativeRequestErrorResponse(
-                encoding,
-                path,
-                error2
-              )
-            );
           } finally {
             await (requestCtx == null ? void 0 : requestCtx.dispose());
             if (conn) {
@@ -5504,6 +5642,10 @@ async function buildRegistryWithRuntime(config, runtime) {
 }
 async function buildConfiguredRegistry(config) {
   const runtime = await loadConfiguredRuntime(config);
+  if (runtime.kind === "napi") {
+    const { startProcessMetrics } = await import("./process-metrics-NW754INA.js");
+    startProcessMetrics();
+  }
   return buildRegistryWithRuntime(
     normalizeRuntimeConfig(config, runtime),
     runtime
@@ -5511,6 +5653,20 @@ async function buildConfiguredRegistry(config) {
 }
 
 // src/registry/index.ts
+function signalExitCode(signal) {
+  switch (signal) {
+    case "SIGINT":
+      return 130;
+    case "SIGTERM":
+      return 143;
+  }
+}
+function finishShutdownSignal(signal) {
+  if (process.pid === 1) {
+    process.exit(signalExitCode(signal));
+  }
+  process.kill(process.pid, signal);
+}
 var Registry = class {
   #config;
   get config() {
@@ -5721,6 +5877,33 @@ var Registry = class {
       fetch: (request) => this.handler(request)
     };
   }
+  /**
+   * Starts an HTTP server that dispatches every request through the
+   * serverless handler. Uses `crossPlatformServe` to pick the right
+   * runtime (Node, Bun, Deno).
+   *
+   * @param opts.port      Port to listen on. Defaults to 3000.
+   * @param opts.publicDir If set, serves static files from this directory
+   *                       before falling through to the registry handler.
+   *
+   * @example
+   * ```ts
+   * await registry.listen();
+   * await registry.listen({ port: 8080, publicDir: "./public" });
+   * ```
+   */
+  async listen(opts = {}) {
+    const port = opts.port ?? 3e3;
+    const config = this.parseConfig();
+    const runtime = detectRuntime();
+    const app = new Hono();
+    if (opts.publicDir) {
+      const serveStatic = await loadRuntimeServeStatic(runtime);
+      app.use("*", serveStatic({ root: opts.publicDir }));
+    }
+    app.all("*", (c) => this.handler(c.req.raw));
+    await crossPlatformServe(config, port, app, runtime);
+  }
   async diagnostics() {
     var _a;
     const candidates = [
@@ -5745,8 +5928,8 @@ var Registry = class {
       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);
     }
@@ -5777,29 +5960,29 @@ var Registry = class {
   #onShutdownSignal(signal, config, configuredRegistryPromise) {
     if (this.#shutdownInFlight !== null) {
       this.#removeSignalHandlers();
-      process.kill(process.pid, signal);
+      finishShutdownSignal(signal);
       return;
     }
     this.#shutdownInFlight = this.#runShutdown(
       signal,
       config,
       configuredRegistryPromise
-    ).catch((err) => {
-      logger2().warn({ err }, "shutdown error");
+    ).catch((error) => {
+      logger2().warn({ error }, "shutdown error");
     });
   }
   async #runShutdown(signal, config, configuredRegistryPromise) {
     var _a;
-    const gracePeriodMs = ((_a = config.shutdown) == null ? void 0 : _a.gracePeriodMs) ?? 3e4;
+    const gracePeriodMs = ((_a = config.shutdown) == null ? void 0 : _a.gracePeriodMs) ?? await this.#actorStopThresholdMs(configuredRegistryPromise) ?? 30 * 60 * 1e3;
     const drain = async () => {
       const registries = [
         (async () => {
           try {
             const { runtime, registry } = await configuredRegistryPromise;
             await runtime.shutdownRegistry(registry);
-          } catch (err) {
+          } catch (error) {
             logger2().warn(
-              { err },
+              { error },
               "runtime registry shutdown errored (mode A)"
             );
           }
@@ -5814,7 +5997,7 @@ var Registry = class {
               await runtime.shutdownRegistry(registry);
             } catch (err) {
               logger2().warn(
-                { err },
+                { error: err },
                 "runtime registry shutdown errored (mode B)"
               );
             }
@@ -5837,7 +6020,23 @@ var Registry = class {
       )
     ]);
     this.#removeSignalHandlers();
-    process.kill(process.pid, signal);
+    finishShutdownSignal(signal);
+  }
+  async #actorStopThresholdMs(configuredRegistryPromise) {
+    var _a;
+    try {
+      const { runtime, registry } = await configuredRegistryPromise;
+      const thresholdMs = await ((_a = runtime.registryActorStopThresholdMs) == null ? void 0 : _a.call(runtime, registry));
+      if (thresholdMs !== void 0 && Number.isFinite(thresholdMs) && thresholdMs > 0) {
+        return thresholdMs;
+      }
+    } catch (err) {
+      logger2().warn(
+        { err },
+        "failed to read actor stop threshold for shutdown grace"
+      );
+    }
+    return void 0;
   }
   #removeSignalHandlers() {
     for (const [signal, handler] of Object.entries(