rivetkit 2.3.0-rc.8 → 2.3.0

package/dist/tsup/mod.js

@@ -1,3 +1,6 @@
+import {
+  decodeWorkflowHistoryTransport
+} from "./chunk-UMZVD6DQ.js";
 import {
   ACTOR_CONTEXT_INTERNAL_SYMBOL,
   ActorConfigSchema,
@@ -6,10 +9,7 @@ import {
   getRunFunction,
   getRunInspectorConfig,
   getRunMetadata
-} from "./chunk-D5G75T7J.js";
-import {
-  decodeWorkflowHistoryTransport
-} from "./chunk-VUGENVIK.js";
+} from "./chunk-DPIMKYNB.js";
 import {
   ALLOWED_PUBLIC_HEADERS,
   HEADER_CONN_PARAMS,
@@ -19,7 +19,7 @@ import {
   getDatacenters,
   tryParseEndpoint,
   updateRunnerConfig
-} from "./chunk-EMFKMVJR.js";
+} from "./chunk-4JDSFJS5.js";
 import {
   KEYS,
   makePrefixedKey,
@@ -27,15 +27,14 @@ import {
   queueMetadataKey,
   removePrefixFromKey,
   workflowStoragePrefix
-} from "./chunk-3YY5S6TV.js";
+} from "./chunk-HXUEHHJF.js";
 import {
   assertJsonCompatValue,
   decodeCborCompat,
-  decodeCborJsonCompat,
   encodeCborCompat
-} from "./chunk-KY3CERZR.js";
-import "./chunk-PCBNKI2J.js";
-import "./chunk-D3T3ZBSY.js";
+} from "./chunk-2OTRTA3J.js";
+import "./chunk-JZ7TWV65.js";
+import "./chunk-BEI24WTI.js";
 import {
   LogLevelSchema,
   VERSION,
@@ -52,6 +51,8 @@ import {
   getRivetPublicEndpoint,
   getRivetPublicToken,
   getRivetRunEngine,
+  getRivetRunEngineHost,
+  getRivetRunEnginePort,
   getRivetRunEngineVersion,
   getRivetToken,
   getRivetTotalSlots,
@@ -60,7 +61,7 @@ import {
   noopNext,
   stringifyError,
   toUint8Array
-} from "./chunk-GBG63SUG.js";
+} from "./chunk-VTTFNQQI.js";
 import {
   INTERNAL_ERROR_CODE,
   RivetError,
@@ -71,7 +72,7 @@ import {
   isRivetErrorLike,
   toRivetError,
   unsupportedFeature
-} from "./chunk-TMLOKTRB.js";
+} from "./chunk-BRP62GZC.js";
 
 // src/actor/log.ts
 function loggerWithoutContext() {
@@ -143,7 +144,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];
@@ -204,8 +205,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");
 }
@@ -361,8 +362,23 @@ var InlineWebSocketAdapter = class {
 import { Hono } from "hono";
 
 // src/common/engine.ts
+var ENGINE_HOST = "127.0.0.1";
 var ENGINE_PORT = 6420;
-var ENGINE_ENDPOINT = `http://127.0.0.1:${ENGINE_PORT}`;
+var ENGINE_ENDPOINT = buildEngineEndpoint(ENGINE_HOST, ENGINE_PORT);
+function buildEngineEndpoint(host, port) {
+  const urlHost = host.includes(":") && !host.startsWith("[") ? `[${host}]` : host;
+  return `http://${urlHost}:${port}`;
+}
+function isLocalEngineEndpoint(endpoint) {
+  let url;
+  try {
+    url = new URL(endpoint);
+  } catch {
+    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() {
@@ -377,10 +393,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;
 }
@@ -394,13 +413,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);
@@ -813,6 +838,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),
   /**
@@ -848,7 +885,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(),
     /**
@@ -890,7 +927,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
   );
@@ -907,7 +948,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 {
@@ -1299,29 +1340,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 +1460,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(
@@ -1575,6 +1610,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);
   }
@@ -1686,8 +1724,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(
@@ -1821,20 +1863,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
@@ -1992,8 +2032,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(
@@ -2148,6 +2198,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");
@@ -2295,9 +2351,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");
@@ -2389,6 +2451,33 @@ async function loadWasmRuntime(config) {
   };
 }
 
+// src/registry/native.ts
+import nodeFs from "fs";
+import nodePath from "path";
+
+// 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();
@@ -2601,21 +2690,23 @@ function resolveNativeDestroy(runtime, ctx) {
 function clearNativeRuntimeState(runtime, ctx) {
   callNativeSync(() => runtime.actorClearRuntimeState(ctx));
 }
-async function cleanupNativeSleepRuntimeState(runtime, ctx) {
-  const waitStarted = Date.now();
+async function cleanupNativeSleepRuntimeState(runtime, ctx, afterTrackedWorkDrained) {
   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
+  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);
@@ -2720,11 +2811,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;
@@ -2780,12 +2874,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;
@@ -2918,7 +3006,7 @@ function serializeWorkflowHistoryForJson(data) {
     return null;
   }
   const history = decodeWorkflowHistoryTransport(data);
-  return {
+  return jsonSafe({
     nameRegistry: [...history.nameRegistry],
     entries: history.entries.map((entry) => ({
       id: entry.id,
@@ -2942,7 +3030,7 @@ function serializeWorkflowHistoryForJson(data) {
         ]
       )
     )
-  };
+  });
 }
 function toHttpJsonCompatible(value) {
   return JSON.parse(
@@ -2993,7 +3081,7 @@ function wrapNativeCallback(callback) {
 }
 function decodeArgs(value) {
   const decoded = decodeValue(value);
-  return Array.isArray(decoded) ? decoded : decoded === void 0 ? [] : [decoded];
+  return normalizeArgs(decoded);
 }
 function buildRequest(init) {
   const url = init.uri.startsWith("http") ? init.uri : new URL(init.uri, "http://127.0.0.1").toString();
@@ -3052,11 +3140,15 @@ var NativeConnAdapter = class {
   }
   get state() {
     const nextState = this.#readState();
-    return createWriteThroughProxy(nextState, (nextValue) => {
-      this.#writeState(nextValue, { writeNative: true });
-    }, (newValue) => {
-      assertJsonCompatValue(newValue);
-    });
+    return createWriteThroughProxy(
+      nextState,
+      (nextValue) => {
+        this.#writeState(nextValue, { writeNative: true });
+      },
+      (newValue) => {
+        assertJsonCompatValue(newValue);
+      }
+    );
   }
   set state(value) {
     assertJsonCompatValue(value);
@@ -3411,44 +3503,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) {
@@ -3911,9 +3982,7 @@ var NativeConnectionMap = class {
   }
   get(key) {
     const conns = callNativeSync(() => this.#runtime.actorConns(this.#ctx));
-    const conn = conns.find(
-      (c) => this.#runtime.connId(c) === key
-    );
+    const conn = conns.find((c) => this.#runtime.connId(c) === key);
     if (!conn) return void 0;
     return this.#connToAdapter(conn);
   }
@@ -4021,17 +4090,22 @@ var ActorContextHandleAdapter = class {
     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 });
+        },
+        (newValue) => {
+          this.#assertCanMutateState();
+          assertJsonCompatValue(newValue);
+        }
+      );
+    }
+    return actorState.stateProxy;
   }
   set state(value) {
     if (!this.#stateEnabled) {
@@ -4096,7 +4170,11 @@ var ActorContextHandleAdapter = class {
   }
   get conns() {
     if (!this.#connMap) {
-      this.#connMap = new NativeConnectionMap(this.#runtime, this.#ctx, this.#schemas);
+      this.#connMap = new NativeConnectionMap(
+        this.#runtime,
+        this.#ctx,
+        this.#schemas
+      );
     }
     return this.#connMap;
   }
@@ -4296,39 +4374,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;
   }
@@ -4394,6 +4453,7 @@ var ActorContextHandleAdapter = class {
     return false;
   }
   sleep() {
+    this.#flushStateChange();
     callNativeSync(() => this.#runtime.actorSleep(this.#ctx));
   }
   destroy() {
@@ -4411,6 +4471,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 +4499,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 +4512,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 })
     );
@@ -4661,9 +4743,62 @@ 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)
   };
 }
+function buildInspectorTabs(inspector) {
+  if (!inspector || typeof inspector !== "object") return void 0;
+  const tabs = inspector.tabs;
+  if (!Array.isArray(tabs) || tabs.length === 0) return void 0;
+  return tabs.map((raw) => {
+    const entry = raw;
+    if (entry.hidden === true) {
+      return { id: entry.id, hidden: true };
+    }
+    const resolved = entry.source !== void 0 ? nodePath.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 === nodePath.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 = nodeFs.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;
@@ -4996,13 +5131,26 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           );
         }
         const body = await jsRequest.json();
+        if (body.args !== void 0 && body.properties !== void 0) {
+          return jsonResponse(
+            { error: "use either args or properties, not both" },
+            { status: 400 }
+          );
+        }
+        if (body.properties !== void 0 && (body.properties === null || typeof body.properties !== "object" || Array.isArray(body.properties))) {
+          return jsonResponse(
+            { error: "properties must be an object" },
+            { status: 400 }
+          );
+        }
+        const args = body.properties !== void 0 ? [body.properties] : normalizeArgs(body.args);
         try {
           const output = await action(
             actorCtx,
             ...validateActionArgs(
               schemaConfig.actionInputSchemas,
               actionName,
-              body.args ?? []
+              args
             )
           );
           return jsonResponse({ output });
@@ -5150,24 +5298,30 @@ function buildNativeFactory(runtime, registryConfig, definition) {
       async (error, payload) => {
         const { ctx } = unwrapTsfnPayload(error, payload);
         const actorCtx = makeActorCtx(ctx);
+        const saveActorState = async () => {
+          if (runtime.kind === "wasm") {
+            await runtime.actorSaveState(
+              ctx,
+              actorCtx.serializeForTick("save")
+            );
+          } else {
+            await actorCtx.saveState({
+              immediate: true
+            });
+          }
+        };
         try {
           if (onSleep) {
-            try {
-              await onSleep(actorCtx);
-            } finally {
-              if (runtime.kind === "wasm") {
-                await runtime.actorSaveState(
-                  ctx,
-                  actorCtx.serializeForTick("save")
-                );
-              } else {
-                await actorCtx.saveState({ immediate: true });
-              }
-            }
+            await onSleep(actorCtx);
           }
+          await saveActorState();
         } finally {
           try {
-            await cleanupNativeSleepRuntimeState(runtime, ctx);
+            await cleanupNativeSleepRuntimeState(
+              runtime,
+              ctx,
+              saveActorState
+            );
           } finally {
             await actorCtx.dispose();
           }
@@ -5612,10 +5766,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";
   }
@@ -5642,10 +5803,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 +5826,8 @@ function finishShutdownSignal(signal) {
 }
 var Registry = class {
   #config;
+  #buildConfiguredRegistry;
+  routes;
   get config() {
     return this.#config;
   }
@@ -5683,18 +5842,24 @@ 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)
+    };
   }
   #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(() => {
       });
     }
@@ -5715,7 +5880,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(
@@ -5730,7 +5895,7 @@ var Registry = class {
     if (isStartRequest) {
       try {
         await this.#ensureServerlessPoolConfigured(config);
-      } catch (error) {
+      } catch (_error) {
         return new Response(
           JSON.stringify({
             group: "guard",
@@ -5844,7 +6009,7 @@ var Registry = class {
     if (isMetadataRequest && !isEngineMetadataRequest) {
       try {
         await this.#ensureServerlessPoolConfigured(config);
-      } catch (error) {
+      } catch (_error) {
         return new Response(
           JSON.stringify({
             group: "guard",
@@ -5904,40 +6069,109 @@ var Registry = class {
     app.all("*", (c) => this.handler(c.req.raw));
     await crossPlatformServe(config, port, app, runtime);
   }
-  async diagnostics() {
-    var _a;
+  /**
+   * Returns a health response suitable for mounting in a user-owned router.
+   */
+  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
+      });
+    }
+    const response = await runtime.registryHealth(registry);
+    return new Response(new Uint8Array(response.body), {
+      status: response.status,
+      headers: response.headers
+    });
+  }
+  /**
+   * 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.
    */
   #startEnvoy(config, printWelcome) {
     if (!this.#runtimeServePromise) {
-      const configuredRegistryPromise = buildConfiguredRegistry(config);
+      const configuredRegistryPromise = this.#buildConfiguredRegistry(config);
       this.#runtimeServeConfiguredPromise = configuredRegistryPromise;
       this.#runtimeServePromise = configuredRegistryPromise.then(async ({ runtime, registry, serveConfig }) => {
         await runtime.serveRegistry(registry, serveConfig);
       }).catch((error) => {
         logger2().warn({ error }, "runtime registry serve errored");
       });
-      this.#installSignalHandlers(config, configuredRegistryPromise);
+      this.#installSignalHandlers(config);
     }
     if (printWelcome) {
       this.#printWelcome(config, "serverful");
     }
   }
-  #installSignalHandlers(config, configuredRegistryPromise) {
+  #installSignalHandlers(config) {
     var _a;
     if (this.#shutdownInstalled) return;
     if ((_a = config.shutdown) == null ? void 0 : _a.disableSignalHandlers) return;
@@ -5946,54 +6180,82 @@ var Registry = class {
     }
     this.#shutdownInstalled = true;
     const install = (signal) => {
-      const handler = () => this.#onShutdownSignal(
-        signal,
-        config,
-        configuredRegistryPromise
-      );
+      const handler = () => this.#onShutdownSignal(signal, config);
       this.#signalHandlers[signal] = handler;
       process.on(signal, handler);
     };
     install("SIGINT");
     install("SIGTERM");
   }
-  #onShutdownSignal(signal, config, configuredRegistryPromise) {
+  #onShutdownSignal(signal, config) {
     if (this.#shutdownInFlight !== null) {
       this.#removeSignalHandlers();
       finishShutdownSignal(signal);
       return;
     }
-    this.#shutdownInFlight = this.#runShutdown(
-      signal,
-      config,
-      configuredRegistryPromise
-    ).catch((error) => {
-      logger2().warn({ error }, "shutdown error");
+    this.#shutdownInFlight = this.#drain(config).catch((err) => {
+      logger2().warn({ err }, "shutdown error");
+    }).then(() => {
+      this.#removeSignalHandlers();
+      finishShutdownSignal(signal);
+    });
+  }
+  /**
+   * 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 #runShutdown(signal, config, configuredRegistryPromise) {
+  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 (error) {
-            logger2().warn(
-              { error },
-              "runtime registry shutdown errored (mode A)"
-            );
-          }
-        })()
-      ];
-      const runtimeServerlessPromise = this.#runtimeServerlessPromise;
-      if (runtimeServerlessPromise !== void 0) {
+      const registries = [];
+      if (modeAPromise !== void 0) {
         registries.push(
           (async () => {
             try {
-              const { runtime, registry } = await 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(
@@ -6019,11 +6281,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));
@@ -6077,7 +6338,7 @@ 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) {
@@ -6099,6 +6360,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);
 }