rivetkit 2.3.0-rc.7 → 2.3.0-rc.9

package/dist/tsup/mod.js

@@ -2,14 +2,13 @@ import {
   ACTOR_CONTEXT_INTERNAL_SYMBOL,
   ActorConfigSchema,
   CONN_STATE_MANAGER_SYMBOL,
-  RAW_STATE_SYMBOL,
   getRunFunction,
   getRunInspectorConfig,
   getRunMetadata
-} from "./chunk-D5G75T7J.js";
+} from "./chunk-T6YVRM4K.js";
 import {
   decodeWorkflowHistoryTransport
-} from "./chunk-52TPEKEC.js";
+} from "./chunk-KJTA3ATT.js";
 import {
   ALLOWED_PUBLIC_HEADERS,
   HEADER_CONN_PARAMS,
@@ -19,7 +18,7 @@ import {
   getDatacenters,
   tryParseEndpoint,
   updateRunnerConfig
-} from "./chunk-VJ4Y4WBT.js";
+} from "./chunk-F3Q5BFQ6.js";
 import {
   KEYS,
   makePrefixedKey,
@@ -29,18 +28,16 @@ import {
   workflowStoragePrefix
 } from "./chunk-3YY5S6TV.js";
 import {
-  assertJsonCompatValue,
   decodeCborCompat,
   decodeCborJsonCompat,
   encodeCborCompat
-} from "./chunk-4LTY5TOO.js";
+} from "./chunk-W7EYSYVI.js";
 import "./chunk-PCBNKI2J.js";
-import "./chunk-4DJMFOSU.js";
+import "./chunk-H37XQU3I.js";
 import {
   LogLevelSchema,
   VERSION,
   deconstructError,
-  detectRuntime,
   getEnvUniversal,
   getLogger,
   getNodeEnv,
@@ -60,7 +57,7 @@ import {
   noopNext,
   stringifyError,
   toUint8Array
-} from "./chunk-HERL2VQ2.js";
+} from "./chunk-VRCIXJRN.js";
 import {
   INTERNAL_ERROR_CODE,
   RivetError,
@@ -71,7 +68,7 @@ import {
   isRivetErrorLike,
   toRivetError,
   unsupportedFeature
-} from "./chunk-TMLOKTRB.js";
+} from "./chunk-KIWH5H3K.js";
 
 // src/actor/log.ts
 function loggerWithoutContext() {
@@ -317,24 +314,24 @@ var InlineWebSocketAdapter = class {
       this.#close(1011, "Internal error during initialization");
     }
   }
-  #handleError(error) {
-    console.error("INLINE_WEBSOCKET_ADAPTER_ERROR", error);
+  #handleError(err) {
+    console.error("INLINE_WEBSOCKET_ADAPTER_ERROR", err);
     logger().error({
       msg: "error in websocket",
-      error,
-      errorMessage: error instanceof Error ? error.message : String(error),
-      stack: error instanceof Error ? error.stack : void 0
+      error: err,
+      errorMessage: err instanceof Error ? err.message : String(err),
+      stack: err instanceof Error ? err.stack : void 0
     });
     try {
-      this.#handler.onError(error, this.#wsContext);
-    } catch (error2) {
+      this.#handler.onError(err, this.#wsContext);
+    } catch (handlerErr) {
       logger().error({
         msg: "error in onError handler",
-        error: error2
+        error: handlerErr
       });
     }
-    this.#clientWs.triggerError(error);
-    this.#actorWs.triggerError(error);
+    this.#clientWs.triggerError(err);
+    this.#actorWs.triggerError(err);
   }
   #close(code, reason) {
     if (this.#readyState === 3 || this.#readyState === 2) {
@@ -347,8 +344,8 @@ var InlineWebSocketAdapter = class {
         { code, reason, wasClean: true },
         this.#wsContext
       );
-    } catch (error) {
-      logger().error({ msg: "error closing websocket", error });
+    } catch (err) {
+      logger().error({ msg: "error closing websocket", error: err });
     } finally {
       this.#readyState = 3;
       this.#clientWs.triggerClose(code, reason);
@@ -357,9 +354,6 @@ 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,145 +450,6 @@ 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";
 
@@ -1299,29 +1154,6 @@ 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;
@@ -1442,15 +1274,32 @@ var NapiCoreRuntime = class {
   async shutdownRegistry(registry) {
     await asNativeRegistry(registry).shutdown();
   }
-  async registryDiagnostics(registry) {
-    const diagnostics = await asNativeRegistry(registry).diagnostics();
+  async registryActorStopThresholdMs(registry) {
+    return await asNativeRegistry(registry).actorStopThresholdMs() ?? void 0;
+  }
+  async registryHealth(registry) {
+    const response = await asNativeRegistry(registry).health();
     return {
-      mode: diagnostics.mode,
-      envoyActiveActorCount: diagnostics.envoyActiveActorCount
+      status: response.status,
+      headers: response.headers,
+      body: response.body
     };
   }
-  async registryActorStopThresholdMs(registry) {
-    return await asNativeRegistry(registry).actorStopThresholdMs() ?? void 0;
+  async registryMetadata(registry) {
+    const response = asNativeRegistry(registry).metadata();
+    return {
+      status: response.status,
+      headers: response.headers,
+      body: response.body
+    };
+  }
+  async registryMetrics(registry) {
+    const response = asNativeRegistry(registry).metrics();
+    return {
+      status: response.status,
+      headers: response.headers,
+      body: response.body
+    };
   }
   async handleServerlessRequest(registry, req, onStreamEvent, cancelToken, config) {
     return await asNativeRegistry(registry).handleServerlessRequest(
@@ -1992,8 +1841,18 @@ var WasmCoreRuntime = class {
   async shutdownRegistry(registry) {
     await callWasm(() => asWasmRegistry(registry).shutdown());
   }
-  async registryDiagnostics() {
-    return { mode: "wasm", envoyActiveActorCount: null };
+  async registryHealth() {
+    return {
+      status: 200,
+      headers: { "content-type": "application/json" },
+      body: new TextEncoder().encode(
+        JSON.stringify({
+          status: "ok",
+          runtime: "rivetkit",
+          version: "wasm"
+        })
+      )
+    };
   }
   async handleServerlessRequest(registry, req, onStreamEvent, cancelToken, config) {
     return await callHandleAsync(
@@ -2542,14 +2401,6 @@ 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",
@@ -2602,20 +2453,7 @@ 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 runtime.actorWaitForTrackedShutdownWork(ctx);
   await closeNativeDatabaseClient(runtime, ctx);
   await closeNativeSqlDatabase(runtime, ctx);
   clearNativeRuntimeState(runtime, ctx);
@@ -2995,6 +2833,44 @@ 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;
@@ -3047,19 +2923,13 @@ 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) {
@@ -3883,70 +3753,6 @@ 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;
@@ -3955,9 +3761,9 @@ var ActorContextHandleAdapter = class {
   #abortSignalCleanup;
   #client;
   #clientFactory;
-  #connMap;
   #databaseProvider;
   #db;
+  #dbProxy;
   #dispatchCancelToken;
   #kv;
   #queue;
@@ -4000,45 +3806,56 @@ var ActorContextHandleAdapter = class {
     if (!this.#databaseProvider) {
       throw databaseNotConfiguredError();
     }
-    if (this.#db) {
-      return this.#db;
-    }
-    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();
+    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);
+            };
+          }
+        }
+      );
     }
-    return this.#readState();
+    return this.#dbProxy;
   }
   get state() {
     if (!this.#stateEnabled) {
       throw stateNotEnabledError();
     }
+    const actorState = getNativePersistState(this.#runtime, this.#ctx);
     const nextState = this.#readState();
-    return createWriteThroughProxy(
-      nextState,
-      (nextValue) => {
-        this.#writeState(nextValue, { scheduleSave: true });
-      },
-      (newValue) => {
-        this.#assertCanMutateState();
-        assertJsonCompatValue(newValue);
-      }
-    );
+    if (actorState.stateProxy === void 0 || actorState.stateProxyTarget !== nextState) {
+      actorState.stateProxyTarget = nextState;
+      actorState.stateProxy = createWriteThroughProxy(
+        nextState,
+        (nextValue) => {
+          this.#writeState(nextValue, { scheduleSave: true });
+        },
+        () => {
+          this.#assertCanMutateState();
+        }
+      );
+    }
+    return actorState.stateProxy;
   }
   set state(value) {
     if (!this.#stateEnabled) {
       throw stateNotEnabledError();
     }
     this.#assertCanMutateState();
-    assertJsonCompatValue(value);
     this.#writeState(value, { scheduleSave: true });
   }
   initializeState(value) {
@@ -4095,10 +3912,25 @@ var ActorContextHandleAdapter = class {
     return callNativeSync(() => this.#runtime.actorRegion(this.#ctx));
   }
   get conns() {
-    if (!this.#connMap) {
-      this.#connMap = new NativeConnectionMap(this.#runtime, this.#ctx, this.#schemas);
-    }
-    return this.#connMap;
+    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
+              )
+            )
+          )
+        ]
+      )
+    );
   }
   get log() {
     return logger2();
@@ -4296,39 +4128,20 @@ var ActorContextHandleAdapter = class {
     });
   }
   keepAwake(promise) {
-    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);
+    const trackedPromise = Promise.resolve(promise).catch((error) => {
+      logger2().warn({
+        msg: "keepAwake promise rejected",
+        error: stringifyError(error)
+      });
+    }).then(() => null);
     try {
       callNativeSync(
         () => this.#runtime.actorKeepAwake(this.#ctx, trackedPromise)
       );
     } catch (error) {
-      if (isClosedTaskRegistrationError(error)) {
-        logger2().warn({
-          msg: "keepAwake registration dropped (teardown already started); promise will not delay grace",
-          error: stringifyError(error)
-        });
-        return promise;
+      if (!isClosedTaskRegistrationError(error)) {
+        throw error;
       }
-      throw error;
     }
     return promise;
   }
@@ -4411,6 +4224,7 @@ var ActorContextHandleAdapter = class {
   }
   async dispose() {
     var _a;
+    this.#flushStateChange();
     (_a = this.#abortSignalCleanup) == null ? void 0 : _a.call(this);
     this.#sql = void 0;
   }
@@ -4438,13 +4252,12 @@ var ActorContextHandleAdapter = class {
     return actorState.state;
   }
   #writeState(value, options) {
-    encodeValue(value);
     const actorState = getNativePersistState(this.#runtime, this.#ctx);
     actorState.state = value;
     if (!options.scheduleSave) {
       return;
     }
-    this.#handleStateChange();
+    this.#scheduleSave();
   }
   #assertCanMutateState() {
     const actorState = getNativePersistState(this.#runtime, this.#ctx);
@@ -4452,9 +4265,31 @@ var ActorContextHandleAdapter = class {
       throw stateMutationReentrantError();
     }
   }
-  #handleStateChange() {
+  // Coalesce the request-save and onStateChange work to once per event loop
+  // tick. A synchronous burst of mutations (for example
+  // `Object.assign(c.state, ...)`) would otherwise cross the NAPI boundary and
+  // run onStateChange once per field, re-serializing the whole state each time
+  // and pinning the event loop on large state.
+  #scheduleSave() {
     const actorState = getNativePersistState(this.#runtime, this.#ctx);
-    encodeValue(actorState.state);
+    if (actorState.saveScheduled) {
+      return;
+    }
+    actorState.saveScheduled = true;
+    actorState.pendingSaveHandle = setImmediate(() => {
+      this.#flushStateChange();
+    });
+  }
+  #flushStateChange() {
+    const actorState = getNativePersistState(this.#runtime, this.#ctx);
+    if (!actorState.saveScheduled) {
+      return;
+    }
+    actorState.saveScheduled = false;
+    if (actorState.pendingSaveHandle !== void 0) {
+      clearImmediate(actorState.pendingSaveHandle);
+      actorState.pendingSaveHandle = void 0;
+    }
     callNativeSync(
       () => this.#runtime.actorRequestSave(this.#ctx, { immediate: false })
     );
@@ -4852,10 +4687,6 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             isWorkflowEnabled: getNativeWorkflowInspector(ctx) !== void 0
           });
         } catch (error) {
-          logger2().error({
-            msg: "error replaying workflow history",
-            error
-          });
           return errorResponse(error);
         }
       }
@@ -5007,10 +4838,6 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           );
           return jsonResponse({ output });
         } catch (error) {
-          logger2().error({
-            msg: "Error handling inspector action request",
-            error
-          });
           return errorResponse(error);
         }
       }
@@ -5024,10 +4851,6 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         { status: 404 }
       );
     } catch (error) {
-      logger2().error({
-        msg: "Error handling inspector request",
-        error
-      });
       return errorResponse(error);
     } finally {
       await actorCtx.dispose();
@@ -5642,10 +5465,6 @@ 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
@@ -5669,6 +5488,7 @@ function finishShutdownSignal(signal) {
 }
 var Registry = class {
   #config;
+  routes;
   get config() {
     return this.#config;
   }
@@ -5685,6 +5505,11 @@ var Registry = class {
   #signalHandlers = {};
   constructor(config) {
     this.#config = config;
+    this.routes = {
+      health: () => this.#healthRoute(),
+      metadata: () => this.#metadataRoute(),
+      prometheusMetrics: (request) => this.#prometheusMetricsRoute(request)
+    };
   }
   #ensureServerlessPoolConfigured(config) {
     if (!config.configurePool) return void 0;
@@ -5878,46 +5703,88 @@ var Registry = class {
     };
   }
   /**
-   * 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" });
-   * ```
+   * Returns a health response suitable for mounting in a user-owned router.
    */
-  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 }));
+  async #healthRoute() {
+    const configured = await this.#activeConfiguredRegistry();
+    if (!configured) {
+      return jsonRouteResponse(503, {
+        status: "not_started",
+        runtime: "rivetkit",
+        version: VERSION
+      });
+    }
+    const { runtime, registry } = configured;
+    if (!runtime.registryHealth) {
+      return jsonRouteResponse(501, {
+        status: "unsupported",
+        runtime: "rivetkit",
+        version: VERSION
+      });
     }
-    app.all("*", (c) => this.handler(c.req.raw));
-    await crossPlatformServe(config, port, app, runtime);
+    const response = await runtime.registryHealth(registry);
+    return new Response(new Uint8Array(response.body), {
+      status: response.status,
+      headers: response.headers
+    });
   }
-  async diagnostics() {
-    var _a;
+  /**
+   * Returns serverless metadata suitable for mounting in a user-owned router.
+   */
+  async #metadataRoute() {
+    const configured = await this.#activeConfiguredRegistry();
+    if (!configured) {
+      return new Response("registry not started\n", {
+        status: 503,
+        headers: { "content-type": "text/plain; charset=utf-8" }
+      });
+    }
+    const { runtime, registry } = configured;
+    if (!runtime.registryMetadata) {
+      return new Response("metadata is not supported by this runtime\n", {
+        status: 501,
+        headers: { "content-type": "text/plain; charset=utf-8" }
+      });
+    }
+    const response = await runtime.registryMetadata(registry);
+    return new Response(new Uint8Array(response.body), {
+      status: response.status,
+      headers: response.headers
+    });
+  }
+  /**
+   * Returns a Prometheus metrics response suitable for mounting in a user-owned router.
+   */
+  async #prometheusMetricsRoute(_request) {
+    const configured = await this.#activeConfiguredRegistry();
+    if (!configured) {
+      return new Response("registry not started\n", {
+        status: 503,
+        headers: { "content-type": "text/plain; charset=utf-8" }
+      });
+    }
+    const { runtime, registry } = configured;
+    if (!runtime.registryMetrics) {
+      return new Response("metrics are not supported by this runtime\n", {
+        status: 501,
+        headers: { "content-type": "text/plain; charset=utf-8" }
+      });
+    }
+    const response = await runtime.registryMetrics(registry);
+    return new Response(new Uint8Array(response.body), {
+      status: response.status,
+      headers: response.headers
+    });
+  }
+  async #activeConfiguredRegistry() {
     const candidates = [
       this.#runtimeServerlessPromise,
       this.#runtimeServeConfiguredPromise
     ].filter(
       (candidate) => candidate !== void 0
     );
-    for (const candidate of candidates) {
-      const { runtime, registry } = await candidate;
-      const diagnostics = await ((_a = runtime.registryDiagnostics) == null ? void 0 : _a.call(runtime, registry));
-      if (diagnostics) return diagnostics;
-    }
-    return { mode: "not_started", envoyActiveActorCount: null };
+    if (candidates.length === 0) return void 0;
+    return await candidates[0];
   }
   /**
    * Starts an actor envoy for standalone server deployments.
@@ -5928,8 +5795,8 @@ var Registry = class {
       this.#runtimeServeConfiguredPromise = configuredRegistryPromise;
       this.#runtimeServePromise = configuredRegistryPromise.then(async ({ runtime, registry, serveConfig }) => {
         await runtime.serveRegistry(registry, serveConfig);
-      }).catch((error) => {
-        logger2().warn({ error }, "runtime registry serve errored");
+      }).catch((err) => {
+        logger2().warn({ err }, "runtime registry serve errored");
       });
       this.#installSignalHandlers(config, configuredRegistryPromise);
     }
@@ -5967,8 +5834,8 @@ var Registry = class {
       signal,
       config,
       configuredRegistryPromise
-    ).catch((error) => {
-      logger2().warn({ error }, "shutdown error");
+    ).catch((err) => {
+      logger2().warn({ err }, "shutdown error");
     });
   }
   async #runShutdown(signal, config, configuredRegistryPromise) {
@@ -5980,9 +5847,9 @@ var Registry = class {
           try {
             const { runtime, registry } = await configuredRegistryPromise;
             await runtime.shutdownRegistry(registry);
-          } catch (error) {
+          } catch (err) {
             logger2().warn(
-              { error },
+              { err },
               "runtime registry shutdown errored (mode A)"
             );
           }
@@ -5997,7 +5864,7 @@ var Registry = class {
               await runtime.shutdownRegistry(registry);
             } catch (err) {
               logger2().warn(
-                { error: err },
+                { err },
                 "runtime registry shutdown errored (mode B)"
               );
             }
@@ -6099,6 +5966,12 @@ function isServerlessMetadataRequest(request, basePath) {
   const normalizedBase = basePath === "/" ? "" : `/${basePath.replace(/^\/+|\/+$/g, "")}`;
   return parsed.pathname === `${normalizedBase}/metadata`;
 }
+function jsonRouteResponse(status, body) {
+  return new Response(JSON.stringify(body), {
+    status,
+    headers: { "content-type": "application/json" }
+  });
+}
 function setup(input) {
   return new Registry(input);
 }