rivetkit 2.3.0-rc.5 → 2.3.0-rc.6

package/dist/tsup/mod.d.cts

@@ -1,13 +1,12 @@
-import { A as AnyActorDefinition, B as BaseActorDefinition, E as EventSchemaConfig, Q as QueueSchemaConfig, a as ActionContext, b as BeforeActionResponseContext, c as BeforeConnectContext, C as ConnectContext, d as CreateConnStateContext, e as CreateContext, f as CreateVarsContext, D as DestroyContext, g as DisconnectContext, M as MigrateContext, R as RequestContext, h as RunContext, S as SleepContext, i as StateChangeContext, W as WakeContext, j as WebSocketContext } from './config-C-a9vrke.cjs';
-export { k as ACTOR_CONTEXT_INTERNAL_SYMBOL, l as Actions, m as ActorConfig, n as ActorConfigInput, o as ActorConfigSchema, p as ActorContext, q as ActorContextOf, r as ActorDefinition, s as ActorKey, t as ActorKv, u as ActorLogger, v as ActorOptions, w as ActorOptionsInput, x as ActorOptionsSchema, y as ActorQuery, z as ActorQueue, F as ActorSchedule, G as ActorTypes, H as ActorsSchema, I as AnyActorInstance, J as AnyClient, K as AnyConn, L as AnyStaticActorDefinition, N as AnyStaticActorInstance, O as AuthIntent, P as BaseActorInstance, T as CONN_DRIVER_SYMBOL, U as CONN_STATE_MANAGER_SYMBOL, V as Client, X as Conn, Y as DEFAULT_SLEEP_GRACE_PERIOD, Z as DocActorConfigSchema, _ as DocActorOptionsSchema, $ as DocConfigurePoolSchema, a0 as DocEnvoyConfigSchema, a1 as DocRegistryConfigSchema, a2 as DocServerlessConfigSchema, a3 as DocSqliteConfigSchema, a4 as Encoding, a5 as FetchHandler, a6 as GlobalActorOptions, a7 as GlobalActorOptionsInput, a8 as GlobalActorOptionsSchema, a9 as InspectorUnsubscribe, aa as InstanceActorOptions, ab as InstanceActorOptionsInput, ac as InstanceActorOptionsSchema, ad as QueueEnqueueAndWaitOptions, ae as QueueFilterName, af as QueueIterOptions, ag as QueueMessageOf, ah as QueueName, ai as QueueNextBatchOptions, aj as QueueNextOptions, ak as QueueResultMessageForName, al as QueueTryNextBatchOptions, am as QueueTryNextOptions, an as QueueWaitOptions, ao as RUN_FUNCTION_CONFIG_SYMBOL, ap as Registry, aq as RegistryActors, ar as RegistryConfig, as as RegistryConfigInput, at as RegistryConfigSchema, au as RegistryDiagnostics, av as RunConfig, aw as RunConfigSchema, ax as RunInspectorConfig, ay as RuntimeKind, az as RuntimeKindSchema, aA as ServerlessHandler, aB as SqliteBackend, aC as SqliteBackendSchema, aD as SqliteConfig, aE as SqliteConfigSchema, aF as TestConfig, aG as TestConfigSchema, aH as Type, aI as WasmRuntimeBindings, aJ as WasmRuntimeConfig, aK as WasmRuntimeConfigSchema, aL as WasmRuntimeInitInput, aM as WorkflowInspectorConfig, aN as actor, aO as buildActorNames, aP as createClientWithDriver, aQ as event, aR as getRunFunction, aS as getRunInspectorConfig, aT as getRunMetadata, aU as isStaticActorDefinition, aV as isStaticActorInstance, aW as lookupInRegistry, aX as queue, aY as setup, aZ as test } from './config-C-a9vrke.cjs';
+import { A as AnyActorDefinition, B as BaseActorDefinition, E as EventSchemaConfig, Q as QueueSchemaConfig, a as ActionContext, b as BeforeActionResponseContext, c as BeforeConnectContext, C as ConnectContext, d as CreateConnStateContext, e as CreateContext, f as CreateVarsContext, D as DestroyContext, g as DisconnectContext, M as MigrateContext, R as RequestContext, h as RunContext, S as SleepContext, i as StateChangeContext, W as WakeContext, j as WebSocketContext } from './config-Ca8dN4cS.cjs';
+export { k as ACTOR_CONTEXT_INTERNAL_SYMBOL, l as Actions, m as ActorConfig, n as ActorConfigInput, o as ActorConfigSchema, p as ActorContext, q as ActorContextOf, r as ActorDefinition, s as ActorKey, t as ActorKv, u as ActorLogger, v as ActorOptions, w as ActorOptionsInput, x as ActorOptionsSchema, y as ActorQuery, z as ActorQueue, F as ActorSchedule, G as ActorTypes, H as ActorsSchema, I as AnyActorInstance, J as AnyClient, K as AnyConn, L as AnyStaticActorDefinition, N as AnyStaticActorInstance, O as AuthIntent, P as BaseActorInstance, T as CONN_DRIVER_SYMBOL, U as CONN_STATE_MANAGER_SYMBOL, V as Client, X as Conn, Y as DEFAULT_SLEEP_GRACE_PERIOD, Z as DocActorConfigSchema, _ as DocActorOptionsSchema, $ as DocConfigurePoolSchema, a0 as DocEnvoyConfigSchema, a1 as DocRegistryConfigSchema, a2 as DocServerlessConfigSchema, a3 as DocSqliteConfigSchema, a4 as Encoding, a5 as FetchHandler, a6 as GlobalActorOptions, a7 as GlobalActorOptionsInput, a8 as GlobalActorOptionsSchema, a9 as InspectorUnsubscribe, aa as InstanceActorOptions, ab as InstanceActorOptionsInput, ac as InstanceActorOptionsSchema, ad as QueueEnqueueAndWaitOptions, ae as QueueFilterName, af as QueueIterOptions, ag as QueueMessageOf, ah as QueueName, ai as QueueNextBatchOptions, aj as QueueNextOptions, ak as QueueResultMessageForName, al as QueueTryNextBatchOptions, am as QueueTryNextOptions, an as QueueWaitOptions, ao as RUN_FUNCTION_CONFIG_SYMBOL, ap as Registry, aq as RegistryActors, ar as RegistryConfig, as as RegistryConfigInput, at as RegistryConfigSchema, au as RegistryRoutes, av as RunConfig, aw as RunConfigSchema, ax as RunInspectorConfig, ay as RuntimeKind, az as RuntimeKindSchema, aA as ServerlessHandler, aB as SqliteBackend, aC as SqliteBackendSchema, aD as SqliteConfig, aE as SqliteConfigSchema, aF as TestConfig, aG as TestConfigSchema, aH as Type, aI as WasmRuntimeBindings, aJ as WasmRuntimeConfig, aK as WasmRuntimeConfigSchema, aL as WasmRuntimeInitInput, aM as WorkflowInspectorConfig, aN as actor, aO as buildActorNames, aP as createClientWithDriver, aQ as event, aR as getRunFunction, aS as getRunInspectorConfig, aT as getRunMetadata, aU as isStaticActorDefinition, aV as isStaticActorInstance, aW as lookupInRegistry, aX as queue, aY as setup, aZ as test } from './config-Ca8dN4cS.cjs';
 import { UniversalWebSocket } from '@rivetkit/virtual-websocket';
 export { RivetCloseEvent, RivetEvent, RivetMessageEvent, UniversalWebSocket } from '@rivetkit/virtual-websocket';
-export { ActorError, ActorError as RivetError, UserError, UserErrorOptions } from './actor/errors.cjs';
+export { R as ActorError, R as RivetError, U as UserError, a as UserErrorOptions, n as noopNext } from './utils-DVekpm4I.cjs';
 import { A as AnyDatabaseProvider } from './config-CxjGYf4K.cjs';
 import { WSContext } from 'hono/ws';
-export { n as noopNext } from './utils-fwx3o3K9.cjs';
 export { toUint8Array } from './utils.cjs';
-export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from './context-CA3r-pf2.cjs';
+export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from './context-CUrQ9MHc.cjs';
 import 'zod/v4';
 import '@rivetkit/rivetkit-wasm';
 import 'zod';

package/dist/tsup/mod.d.ts

@@ -1,13 +1,12 @@
-import { A as AnyActorDefinition, B as BaseActorDefinition, E as EventSchemaConfig, Q as QueueSchemaConfig, a as ActionContext, b as BeforeActionResponseContext, c as BeforeConnectContext, C as ConnectContext, d as CreateConnStateContext, e as CreateContext, f as CreateVarsContext, D as DestroyContext, g as DisconnectContext, M as MigrateContext, R as RequestContext, h as RunContext, S as SleepContext, i as StateChangeContext, W as WakeContext, j as WebSocketContext } from './config-CvQUtDp9.js';
-export { k as ACTOR_CONTEXT_INTERNAL_SYMBOL, l as Actions, m as ActorConfig, n as ActorConfigInput, o as ActorConfigSchema, p as ActorContext, q as ActorContextOf, r as ActorDefinition, s as ActorKey, t as ActorKv, u as ActorLogger, v as ActorOptions, w as ActorOptionsInput, x as ActorOptionsSchema, y as ActorQuery, z as ActorQueue, F as ActorSchedule, G as ActorTypes, H as ActorsSchema, I as AnyActorInstance, J as AnyClient, K as AnyConn, L as AnyStaticActorDefinition, N as AnyStaticActorInstance, O as AuthIntent, P as BaseActorInstance, T as CONN_DRIVER_SYMBOL, U as CONN_STATE_MANAGER_SYMBOL, V as Client, X as Conn, Y as DEFAULT_SLEEP_GRACE_PERIOD, Z as DocActorConfigSchema, _ as DocActorOptionsSchema, $ as DocConfigurePoolSchema, a0 as DocEnvoyConfigSchema, a1 as DocRegistryConfigSchema, a2 as DocServerlessConfigSchema, a3 as DocSqliteConfigSchema, a4 as Encoding, a5 as FetchHandler, a6 as GlobalActorOptions, a7 as GlobalActorOptionsInput, a8 as GlobalActorOptionsSchema, a9 as InspectorUnsubscribe, aa as InstanceActorOptions, ab as InstanceActorOptionsInput, ac as InstanceActorOptionsSchema, ad as QueueEnqueueAndWaitOptions, ae as QueueFilterName, af as QueueIterOptions, ag as QueueMessageOf, ah as QueueName, ai as QueueNextBatchOptions, aj as QueueNextOptions, ak as QueueResultMessageForName, al as QueueTryNextBatchOptions, am as QueueTryNextOptions, an as QueueWaitOptions, ao as RUN_FUNCTION_CONFIG_SYMBOL, ap as Registry, aq as RegistryActors, ar as RegistryConfig, as as RegistryConfigInput, at as RegistryConfigSchema, au as RegistryDiagnostics, av as RunConfig, aw as RunConfigSchema, ax as RunInspectorConfig, ay as RuntimeKind, az as RuntimeKindSchema, aA as ServerlessHandler, aB as SqliteBackend, aC as SqliteBackendSchema, aD as SqliteConfig, aE as SqliteConfigSchema, aF as TestConfig, aG as TestConfigSchema, aH as Type, aI as WasmRuntimeBindings, aJ as WasmRuntimeConfig, aK as WasmRuntimeConfigSchema, aL as WasmRuntimeInitInput, aM as WorkflowInspectorConfig, aN as actor, aO as buildActorNames, aP as createClientWithDriver, aQ as event, aR as getRunFunction, aS as getRunInspectorConfig, aT as getRunMetadata, aU as isStaticActorDefinition, aV as isStaticActorInstance, aW as lookupInRegistry, aX as queue, aY as setup, aZ as test } from './config-CvQUtDp9.js';
+import { A as AnyActorDefinition, B as BaseActorDefinition, E as EventSchemaConfig, Q as QueueSchemaConfig, a as ActionContext, b as BeforeActionResponseContext, c as BeforeConnectContext, C as ConnectContext, d as CreateConnStateContext, e as CreateContext, f as CreateVarsContext, D as DestroyContext, g as DisconnectContext, M as MigrateContext, R as RequestContext, h as RunContext, S as SleepContext, i as StateChangeContext, W as WakeContext, j as WebSocketContext } from './config-0Ta55UV0.js';
+export { k as ACTOR_CONTEXT_INTERNAL_SYMBOL, l as Actions, m as ActorConfig, n as ActorConfigInput, o as ActorConfigSchema, p as ActorContext, q as ActorContextOf, r as ActorDefinition, s as ActorKey, t as ActorKv, u as ActorLogger, v as ActorOptions, w as ActorOptionsInput, x as ActorOptionsSchema, y as ActorQuery, z as ActorQueue, F as ActorSchedule, G as ActorTypes, H as ActorsSchema, I as AnyActorInstance, J as AnyClient, K as AnyConn, L as AnyStaticActorDefinition, N as AnyStaticActorInstance, O as AuthIntent, P as BaseActorInstance, T as CONN_DRIVER_SYMBOL, U as CONN_STATE_MANAGER_SYMBOL, V as Client, X as Conn, Y as DEFAULT_SLEEP_GRACE_PERIOD, Z as DocActorConfigSchema, _ as DocActorOptionsSchema, $ as DocConfigurePoolSchema, a0 as DocEnvoyConfigSchema, a1 as DocRegistryConfigSchema, a2 as DocServerlessConfigSchema, a3 as DocSqliteConfigSchema, a4 as Encoding, a5 as FetchHandler, a6 as GlobalActorOptions, a7 as GlobalActorOptionsInput, a8 as GlobalActorOptionsSchema, a9 as InspectorUnsubscribe, aa as InstanceActorOptions, ab as InstanceActorOptionsInput, ac as InstanceActorOptionsSchema, ad as QueueEnqueueAndWaitOptions, ae as QueueFilterName, af as QueueIterOptions, ag as QueueMessageOf, ah as QueueName, ai as QueueNextBatchOptions, aj as QueueNextOptions, ak as QueueResultMessageForName, al as QueueTryNextBatchOptions, am as QueueTryNextOptions, an as QueueWaitOptions, ao as RUN_FUNCTION_CONFIG_SYMBOL, ap as Registry, aq as RegistryActors, ar as RegistryConfig, as as RegistryConfigInput, at as RegistryConfigSchema, au as RegistryRoutes, av as RunConfig, aw as RunConfigSchema, ax as RunInspectorConfig, ay as RuntimeKind, az as RuntimeKindSchema, aA as ServerlessHandler, aB as SqliteBackend, aC as SqliteBackendSchema, aD as SqliteConfig, aE as SqliteConfigSchema, aF as TestConfig, aG as TestConfigSchema, aH as Type, aI as WasmRuntimeBindings, aJ as WasmRuntimeConfig, aK as WasmRuntimeConfigSchema, aL as WasmRuntimeInitInput, aM as WorkflowInspectorConfig, aN as actor, aO as buildActorNames, aP as createClientWithDriver, aQ as event, aR as getRunFunction, aS as getRunInspectorConfig, aT as getRunMetadata, aU as isStaticActorDefinition, aV as isStaticActorInstance, aW as lookupInRegistry, aX as queue, aY as setup, aZ as test } from './config-0Ta55UV0.js';
 import { UniversalWebSocket } from '@rivetkit/virtual-websocket';
 export { RivetCloseEvent, RivetEvent, RivetMessageEvent, UniversalWebSocket } from '@rivetkit/virtual-websocket';
-export { ActorError, ActorError as RivetError, UserError, UserErrorOptions } from './actor/errors.js';
+export { R as ActorError, R as RivetError, U as UserError, a as UserErrorOptions, n as noopNext } from './utils-DVekpm4I.js';
 import { A as AnyDatabaseProvider } from './config-CxjGYf4K.js';
 import { WSContext } from 'hono/ws';
-export { n as noopNext } from './utils-fwx3o3K9.js';
 export { toUint8Array } from './utils.js';
-export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from './context-A7R0bsZL.js';
+export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from './context-B_IWbWne.js';
 import 'zod/v4';
 import '@rivetkit/rivetkit-wasm';
 import 'zod';

package/dist/tsup/mod.js

@@ -8,21 +8,17 @@ import {
 } from "./chunk-T6YVRM4K.js";
 import {
   decodeWorkflowHistoryTransport
-} from "./chunk-PGYEMIOE.js";
+} from "./chunk-DEO7MMWQ.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-FLODVLYW.js";
 import {
   KEYS,
   makePrefixedKey,
@@ -32,14 +28,12 @@ import {
   workflowStoragePrefix
 } from "./chunk-3YY5S6TV.js";
 import {
-  contentTypeForEncoding,
   decodeCborCompat,
   decodeCborJsonCompat,
-  encodeCborCompat,
-  serializeWithEncoding
-} from "./chunk-LDTT6WKJ.js";
+  encodeCborCompat
+} from "./chunk-RTC2AZGB.js";
 import "./chunk-PCBNKI2J.js";
-import "./chunk-UXTP4EBU.js";
+import "./chunk-ZI5QJMKO.js";
 import {
   LogLevelSchema,
   VERSION,
@@ -63,7 +57,7 @@ import {
   noopNext,
   stringifyError,
   toUint8Array
-} from "./chunk-N2DQSJIW.js";
+} from "./chunk-6S25NVAP.js";
 import {
   INTERNAL_ERROR_CODE,
   RivetError,
@@ -74,7 +68,7 @@ import {
   isRivetErrorLike,
   toRivetError,
   unsupportedFeature
-} from "./chunk-K34B3OVG.js";
+} from "./chunk-KIWH5H3K.js";
 
 // src/actor/log.ts
 function loggerWithoutContext() {
@@ -706,12 +700,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 +713,6 @@ var RegistryConfigSchema = z3.object({
      */
     disableSignalHandlers: z3.boolean().optional().default(false)
   }).optional().default(() => ({
-    gracePeriodMs: 3e4,
     disableSignalHandlers: false
   }))
 }).transform((config, ctx) => {
@@ -930,7 +923,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;
   }
@@ -1280,11 +1274,31 @@ 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 {
+      status: response.status,
+      headers: response.headers,
+      body: response.body
+    };
+  }
+  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 {
-      mode: diagnostics.mode,
-      envoyActiveActorCount: diagnostics.envoyActiveActorCount
+      status: response.status,
+      headers: response.headers,
+      body: response.body
     };
   }
   async handleServerlessRequest(registry, req, onStreamEvent, cancelToken, config) {
@@ -1407,6 +1421,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);
   }
@@ -1824,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(
@@ -1974,6 +2001,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");
@@ -2420,20 +2453,11 @@ function clearNativeRuntimeState(runtime, ctx) {
   callNativeSync(() => runtime.actorClearRuntimeState(ctx));
 }
 async function cleanupNativeSleepRuntimeState(runtime, ctx) {
+  await runtime.actorWaitForTrackedShutdownWork(ctx);
   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 +2594,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
   });
@@ -4119,40 +4123,17 @@ 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
-        );
-      }
     }).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;
       }
@@ -4459,39 +4440,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 ?? {};
@@ -5014,12 +4962,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 +5205,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) {
@@ -5511,8 +5445,23 @@ 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;
+  routes;
   get config() {
     return this.#config;
   }
@@ -5529,6 +5478,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;
@@ -5721,20 +5675,89 @@ var Registry = class {
       fetch: (request) => this.handler(request)
     };
   }
-  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.
@@ -5777,7 +5800,7 @@ 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(
@@ -5790,7 +5813,7 @@ var Registry = class {
   }
   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 () => {
@@ -5837,7 +5860,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(
@@ -5900,6 +5939,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);
 }