rivetkit 2.3.5-rc.1 → 2.3.6

package/dist/tsup/mod.d.cts

@@ -1,12 +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-CPPEwn_e.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 ActorCron, s as ActorCronEveryOptions, t as ActorCronSetOptions, u as ActorDefinition, v as ActorInspectorConfig, w as ActorInspectorConfigSchema, x as ActorKey, y as ActorKv, z as ActorLogger, F as ActorOptions, G as ActorOptionsInput, H as ActorOptionsSchema, I as ActorQuery, J as ActorQueue, K as ActorSchedule, L as ActorTypes, N as ActorsSchema, O as AnyActorInstance, P as AnyClient, T as AnyConn, U as AnyStaticActorDefinition, V as AnyStaticActorInstance, X as AuthIntent, Y as BUILTIN_INSPECTOR_TAB_IDS, Z as BaseActorInstance, _ as BuiltinInspectorTabIdSchema, $ as CONN_DRIVER_SYMBOL, a0 as CONN_STATE_MANAGER_SYMBOL, a1 as Client, a2 as Conn, a3 as CronFire, a4 as CronJobInfo, a5 as CustomInspectorTabEntrySchema, a6 as DEFAULT_SLEEP_GRACE_PERIOD, a7 as DocActorConfigSchema, a8 as DocActorOptionsSchema, a9 as DocConfigurePoolSchema, aa as DocEnvoyConfigSchema, ab as DocRegistryConfigSchema, ac as DocServerlessConfigSchema, ad as DocSqliteConfigSchema, ae as FetchHandler, af as GlobalActorOptions, ag as GlobalActorOptionsInput, ah as GlobalActorOptionsSchema, ai as HideInspectorTabEntrySchema, aj as InspectorTabEntrySchema, ak as InspectorUnsubscribe, al as InstanceActorOptions, am as InstanceActorOptionsInput, an as InstanceActorOptionsSchema, ao as QueueEnqueueAndWaitOptions, ap as QueueFilterName, aq as QueueIterOptions, ar as QueueMessageOf, as as QueueName, at as QueueNextBatchOptions, au as QueueNextOptions, av as QueueResultMessageForName, aw as QueueTryNextBatchOptions, ax as QueueTryNextOptions, ay as QueueWaitOptions, az as RAW_STATE_SYMBOL, aA as RUN_FUNCTION_CONFIG_SYMBOL, aB as Registry, aC as RegistryActors, aD as RegistryConfig, aE as RegistryConfigInput, aF as RegistryConfigSchema, aG as RegistryDeps, aH as RegistryRoutes, aI as RunConfig, aJ as RunConfigSchema, aK as RunInspectorConfig, aL as RuntimeKind, aM as RuntimeKindSchema, aN as ScheduledEventInfo, aO as ScheduledFireInfo, aP as ServerlessHandler, aQ as SqliteBackend, aR as SqliteBackendSchema, aS as SqliteConfig, aT as SqliteConfigSchema, aU as TestConfig, aV as TestConfigSchema, aW as Type, aX as WasmRuntimeBindings, aY as WasmRuntimeConfig, aZ as WasmRuntimeConfigSchema, a_ as WasmRuntimeInitInput, a$ as WorkflowInspectorConfig, b0 as actor, b1 as buildActorNames, b2 as createClientWithDriver, b3 as disposeRunInspector, b4 as event, b5 as getRunFunction, b6 as getRunInspectorConfig, b7 as getRunMetadata, b8 as isStaticActorDefinition, b9 as isStaticActorInstance, ba as lookupInRegistry, bb as queue, bc as setup, bd as test } from './config-CPPEwn_e.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-BobvQpex.cjs';
+export { k as ACTOR_CONTEXT_INTERNAL_SYMBOL, l as ActionInputSchemas, m as Actions, n as ActorConfig, o as ActorConfigInput, p as ActorConfigSchema, q as ActorContext, r as ActorContextOf, s as ActorCron, t as ActorCronEveryOptions, u as ActorCronSetOptions, v as ActorDefinition, w as ActorInspectorConfig, x as ActorInspectorConfigSchema, y as ActorKey, z as ActorKv, F as ActorLogger, G as ActorOptions, H as ActorOptionsInput, I as ActorOptionsSchema, J as ActorQuery, K as ActorQueue, L as ActorSchedule, N as ActorTypes, O as ActorsSchema, P as AnyActorInstance, T as AnyClient, U as AnyConn, V as AnyStaticActorDefinition, X as AnyStaticActorInstance, Y as AuthIntent, Z as BUILTIN_INSPECTOR_TAB_IDS, _ as BaseActorInstance, $ as BuiltinInspectorTabIdSchema, a0 as CONN_DRIVER_SYMBOL, a1 as CONN_STATE_MANAGER_SYMBOL, a2 as Client, a3 as Conn, a4 as CronFire, a5 as CronJobInfo, a6 as CustomInspectorTabEntrySchema, a7 as DEFAULT_SLEEP_GRACE_PERIOD, a8 as DocActorConfigSchema, a9 as DocActorOptionsSchema, aa as DocConfigurePoolSchema, ab as DocEnvoyConfigSchema, ac as DocRegistryConfigSchema, ad as DocServerlessConfigSchema, ae as DocSqliteConfigSchema, af as FetchHandler, ag as GlobalActorOptions, ah as GlobalActorOptionsInput, ai as GlobalActorOptionsSchema, aj as HideInspectorTabEntrySchema, ak as InspectorTabEntrySchema, al as InspectorUnsubscribe, am as InstanceActorOptions, an as InstanceActorOptionsInput, ao as InstanceActorOptionsSchema, ap as QueueEnqueueAndWaitOptions, aq as QueueFilterName, ar as QueueIterOptions, as as QueueMessageOf, at as QueueName, au as QueueNextBatchOptions, av as QueueNextOptions, aw as QueueResultMessageForName, ax as QueueTryNextBatchOptions, ay as QueueTryNextOptions, az as QueueWaitOptions, aA as RAW_STATE_SYMBOL, aB as RUN_FUNCTION_CONFIG_SYMBOL, aC as Registry, aD as RegistryActors, aE as RegistryConfig, aF as RegistryConfigInput, aG as RegistryConfigSchema, aH as RegistryDeps, aI as RegistryRoutes, aJ as RunConfig, aK as RunConfigSchema, aL as RunInspectorConfig, aM as RuntimeKind, aN as RuntimeKindSchema, aO as ScheduledEventInfo, aP as ScheduledFireInfo, aQ as ServerlessHandler, aR as SqliteBackend, aS as SqliteBackendSchema, aT as SqliteConfig, aU as SqliteConfigSchema, aV as TestConfig, aW as TestConfigSchema, aX as Type, aY as WasmRuntimeBindings, aZ as WasmRuntimeConfig, a_ as WasmRuntimeConfigSchema, a$ as WasmRuntimeInitInput, b0 as WorkflowInspectorConfig, b1 as actor, b2 as buildActorNames, b3 as createClientWithDriver, b4 as disposeRunInspector, b5 as event, b6 as getRunFunction, b7 as getRunInspectorConfig, b8 as getRunMetadata, b9 as isStaticActorDefinition, ba as isStaticActorInstance, bb as lookupInRegistry, bc as queue, bd as setup, be as test } from './config-BobvQpex.cjs';
 export { E as Encoding, t as toUint8Array } from './utils-DQDCphrl.cjs';
 import { UniversalWebSocket } from '@rivetkit/virtual-websocket';
 export { RivetCloseEvent, RivetEvent, RivetMessageEvent, UniversalWebSocket } from '@rivetkit/virtual-websocket';
 import { A as AnyDatabaseProvider } from './config-BxOimoGX.cjs';
 export { R as ActorError, R as RivetError, a as RivetErrorLike, b as RivetErrorOptions, U as UserError, c as UserErrorOptions, n as noopNext } from './utils-CqDnC_PS.cjs';
 import { WSContext } from 'hono/ws';
-export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from './context-DSA9gFXB.cjs';
+export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from './context-YEBNJrws.cjs';
 import 'zod/v4';
 import '@rivetkit/rivetkit-wasm';
 import 'zod';

package/dist/tsup/mod.d.ts

@@ -1,12 +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-BzdqbLAP.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 ActorCron, s as ActorCronEveryOptions, t as ActorCronSetOptions, u as ActorDefinition, v as ActorInspectorConfig, w as ActorInspectorConfigSchema, x as ActorKey, y as ActorKv, z as ActorLogger, F as ActorOptions, G as ActorOptionsInput, H as ActorOptionsSchema, I as ActorQuery, J as ActorQueue, K as ActorSchedule, L as ActorTypes, N as ActorsSchema, O as AnyActorInstance, P as AnyClient, T as AnyConn, U as AnyStaticActorDefinition, V as AnyStaticActorInstance, X as AuthIntent, Y as BUILTIN_INSPECTOR_TAB_IDS, Z as BaseActorInstance, _ as BuiltinInspectorTabIdSchema, $ as CONN_DRIVER_SYMBOL, a0 as CONN_STATE_MANAGER_SYMBOL, a1 as Client, a2 as Conn, a3 as CronFire, a4 as CronJobInfo, a5 as CustomInspectorTabEntrySchema, a6 as DEFAULT_SLEEP_GRACE_PERIOD, a7 as DocActorConfigSchema, a8 as DocActorOptionsSchema, a9 as DocConfigurePoolSchema, aa as DocEnvoyConfigSchema, ab as DocRegistryConfigSchema, ac as DocServerlessConfigSchema, ad as DocSqliteConfigSchema, ae as FetchHandler, af as GlobalActorOptions, ag as GlobalActorOptionsInput, ah as GlobalActorOptionsSchema, ai as HideInspectorTabEntrySchema, aj as InspectorTabEntrySchema, ak as InspectorUnsubscribe, al as InstanceActorOptions, am as InstanceActorOptionsInput, an as InstanceActorOptionsSchema, ao as QueueEnqueueAndWaitOptions, ap as QueueFilterName, aq as QueueIterOptions, ar as QueueMessageOf, as as QueueName, at as QueueNextBatchOptions, au as QueueNextOptions, av as QueueResultMessageForName, aw as QueueTryNextBatchOptions, ax as QueueTryNextOptions, ay as QueueWaitOptions, az as RAW_STATE_SYMBOL, aA as RUN_FUNCTION_CONFIG_SYMBOL, aB as Registry, aC as RegistryActors, aD as RegistryConfig, aE as RegistryConfigInput, aF as RegistryConfigSchema, aG as RegistryDeps, aH as RegistryRoutes, aI as RunConfig, aJ as RunConfigSchema, aK as RunInspectorConfig, aL as RuntimeKind, aM as RuntimeKindSchema, aN as ScheduledEventInfo, aO as ScheduledFireInfo, aP as ServerlessHandler, aQ as SqliteBackend, aR as SqliteBackendSchema, aS as SqliteConfig, aT as SqliteConfigSchema, aU as TestConfig, aV as TestConfigSchema, aW as Type, aX as WasmRuntimeBindings, aY as WasmRuntimeConfig, aZ as WasmRuntimeConfigSchema, a_ as WasmRuntimeInitInput, a$ as WorkflowInspectorConfig, b0 as actor, b1 as buildActorNames, b2 as createClientWithDriver, b3 as disposeRunInspector, b4 as event, b5 as getRunFunction, b6 as getRunInspectorConfig, b7 as getRunMetadata, b8 as isStaticActorDefinition, b9 as isStaticActorInstance, ba as lookupInRegistry, bb as queue, bc as setup, bd as test } from './config-BzdqbLAP.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-BRpVbJCD.js';
+export { k as ACTOR_CONTEXT_INTERNAL_SYMBOL, l as ActionInputSchemas, m as Actions, n as ActorConfig, o as ActorConfigInput, p as ActorConfigSchema, q as ActorContext, r as ActorContextOf, s as ActorCron, t as ActorCronEveryOptions, u as ActorCronSetOptions, v as ActorDefinition, w as ActorInspectorConfig, x as ActorInspectorConfigSchema, y as ActorKey, z as ActorKv, F as ActorLogger, G as ActorOptions, H as ActorOptionsInput, I as ActorOptionsSchema, J as ActorQuery, K as ActorQueue, L as ActorSchedule, N as ActorTypes, O as ActorsSchema, P as AnyActorInstance, T as AnyClient, U as AnyConn, V as AnyStaticActorDefinition, X as AnyStaticActorInstance, Y as AuthIntent, Z as BUILTIN_INSPECTOR_TAB_IDS, _ as BaseActorInstance, $ as BuiltinInspectorTabIdSchema, a0 as CONN_DRIVER_SYMBOL, a1 as CONN_STATE_MANAGER_SYMBOL, a2 as Client, a3 as Conn, a4 as CronFire, a5 as CronJobInfo, a6 as CustomInspectorTabEntrySchema, a7 as DEFAULT_SLEEP_GRACE_PERIOD, a8 as DocActorConfigSchema, a9 as DocActorOptionsSchema, aa as DocConfigurePoolSchema, ab as DocEnvoyConfigSchema, ac as DocRegistryConfigSchema, ad as DocServerlessConfigSchema, ae as DocSqliteConfigSchema, af as FetchHandler, ag as GlobalActorOptions, ah as GlobalActorOptionsInput, ai as GlobalActorOptionsSchema, aj as HideInspectorTabEntrySchema, ak as InspectorTabEntrySchema, al as InspectorUnsubscribe, am as InstanceActorOptions, an as InstanceActorOptionsInput, ao as InstanceActorOptionsSchema, ap as QueueEnqueueAndWaitOptions, aq as QueueFilterName, ar as QueueIterOptions, as as QueueMessageOf, at as QueueName, au as QueueNextBatchOptions, av as QueueNextOptions, aw as QueueResultMessageForName, ax as QueueTryNextBatchOptions, ay as QueueTryNextOptions, az as QueueWaitOptions, aA as RAW_STATE_SYMBOL, aB as RUN_FUNCTION_CONFIG_SYMBOL, aC as Registry, aD as RegistryActors, aE as RegistryConfig, aF as RegistryConfigInput, aG as RegistryConfigSchema, aH as RegistryDeps, aI as RegistryRoutes, aJ as RunConfig, aK as RunConfigSchema, aL as RunInspectorConfig, aM as RuntimeKind, aN as RuntimeKindSchema, aO as ScheduledEventInfo, aP as ScheduledFireInfo, aQ as ServerlessHandler, aR as SqliteBackend, aS as SqliteBackendSchema, aT as SqliteConfig, aU as SqliteConfigSchema, aV as TestConfig, aW as TestConfigSchema, aX as Type, aY as WasmRuntimeBindings, aZ as WasmRuntimeConfig, a_ as WasmRuntimeConfigSchema, a$ as WasmRuntimeInitInput, b0 as WorkflowInspectorConfig, b1 as actor, b2 as buildActorNames, b3 as createClientWithDriver, b4 as disposeRunInspector, b5 as event, b6 as getRunFunction, b7 as getRunInspectorConfig, b8 as getRunMetadata, b9 as isStaticActorDefinition, ba as isStaticActorInstance, bb as lookupInRegistry, bc as queue, bd as setup, be as test } from './config-BRpVbJCD.js';
 export { E as Encoding, t as toUint8Array } from './utils-CV0akuDD.js';
 import { UniversalWebSocket } from '@rivetkit/virtual-websocket';
 export { RivetCloseEvent, RivetEvent, RivetMessageEvent, UniversalWebSocket } from '@rivetkit/virtual-websocket';
 import { A as AnyDatabaseProvider } from './config-BxOimoGX.js';
 export { R as ActorError, R as RivetError, a as RivetErrorLike, b as RivetErrorOptions, U as UserError, c as UserErrorOptions, n as noopNext } from './utils-CqDnC_PS.js';
 import { WSContext } from 'hono/ws';
-export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from './context-wWv-K2K_.js';
+export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from './context-Cj-DFyiy.js';
 import 'zod/v4';
 import '@rivetkit/rivetkit-wasm';
 import 'zod';

package/dist/tsup/mod.js

@@ -1,16 +1,18 @@
 import {
   decodeWorkflowHistoryTransport
-} from "./chunk-MGTSVSUC.js";
+} from "./chunk-PLLHHJWR.js";
 import {
   ACTOR_CONTEXT_INTERNAL_SYMBOL,
   ActorConfigSchema,
   CONN_STATE_MANAGER_SYMBOL,
   RAW_STATE_SYMBOL,
   disposeRunInspector,
+  flattenActionHandlers,
+  flattenActionInputSchemas,
   getRunFunction,
   getRunInspectorConfig,
   getRunMetadata
-} from "./chunk-SHBE77IT.js";
+} from "./chunk-QWLJCP3X.js";
 import {
   ALLOWED_PUBLIC_HEADERS,
   HEADER_CONN_PARAMS,
@@ -20,13 +22,13 @@ import {
   getDatacenters,
   tryParseEndpoint,
   updateRunnerConfig
-} from "./chunk-GAV4PKFT.js";
+} from "./chunk-F6ZW7JZQ.js";
 import {
   makePrefixedKey,
   removePrefixFromKey
 } from "./chunk-JI6GZ2C2.js";
+import "./chunk-OH6CBWUD.js";
 import "./chunk-7AFZMFPQ.js";
-import "./chunk-PAG6G46L.js";
 import {
   LogLevelSchema,
   VERSION,
@@ -59,7 +61,7 @@ import {
   parsePortEnv,
   stringifyError,
   toUint8Array
-} from "./chunk-B4IZU537.js";
+} from "./chunk-RDTFPGU2.js";
 import {
   INTERNAL_ERROR_CODE,
   RivetError,
@@ -115,6 +117,8 @@ function actor(input) {
     input == null ? void 0 : input.options
   );
   const config = ActorConfigSchema.parse(input);
+  flattenActionHandlers(config.actions);
+  flattenActionInputSchemas(config.actions, config.actionInputSchemas);
   return new ActorDefinition(config);
 }
 function isStaticActorDefinition(definition) {
@@ -794,7 +798,7 @@ var RegistryConfigSchema = z3.object({
     config.engineHost,
     config.enginePort
   );
-  const endpoint = config.startEngine ? localEngineEndpoint : (parsedEndpoint == null ? void 0 : parsedEndpoint.endpoint) ?? (isDevEnv ? buildEngineEndpoint(ENGINE_HOST, ENGINE_PORT) : void 0);
+  const endpoint = config.startEngine ? localEngineEndpoint : (parsedEndpoint == null ? void 0 : parsedEndpoint.endpoint) ?? (isDevEnv ? localEngineEndpoint : void 0);
   const validateServerlessEndpoint = Boolean(
     config.startEngine || parsedEndpoint
   );
@@ -811,7 +815,7 @@ var RegistryConfigSchema = z3.object({
       path: ["serverless", "publicEndpoint"]
     });
   }
-  const publicEndpoint = (parsedPublicEndpoint == null ? void 0 : parsedPublicEndpoint.endpoint) ?? (isDevEnv && config.startEngine ? endpoint : void 0);
+  const publicEndpoint = (parsedPublicEndpoint == null ? void 0 : parsedPublicEndpoint.endpoint) ?? (isDevEnv && !parsedEndpoint ? endpoint : void 0);
   const publicNamespace = parsedPublicEndpoint == null ? void 0 : parsedPublicEndpoint.namespace;
   const publicToken = (parsedPublicEndpoint == null ? void 0 : parsedPublicEndpoint.token) ?? config.serverless.publicToken;
   return {
@@ -1493,6 +1497,9 @@ var NapiCoreRuntime = class {
   async serveRegistry(registry, config) {
     await asNativeRegistry(registry).serve(config);
   }
+  async waitRegistryReady(registry) {
+    await asNativeRegistry(registry).waitReady();
+  }
   async shutdownRegistry(registry) {
     await asNativeRegistry(registry).shutdown();
   }
@@ -2161,6 +2168,11 @@ var WasmCoreRuntime = class {
   async serveRegistry(registry, config) {
     await callWasm(() => asWasmRegistry(registry).serve(config));
   }
+  async waitRegistryReady() {
+    throw new Error(
+      "registry.startAndWait() is not supported by the WASM runtime"
+    );
+  }
   async shutdownRegistry(registry) {
     await callWasm(() => asWasmRegistry(registry).shutdown());
   }
@@ -5155,7 +5167,7 @@ function buildActorConfig(definition, registryConfig, runtimeKind) {
     maxOutgoingMessageSize: registryConfig.maxOutgoingMessageSize,
     preloadMaxWorkflowBytes: options.preloadMaxWorkflowBytes,
     preloadMaxConnectionsBytes: options.preloadMaxConnectionsBytes,
-    actions: Object.keys(config.actions ?? {}).sort().map((name) => ({ name })),
+    actions: Object.keys(flattenActionHandlers(config.actions)).sort().map((name) => ({ name })),
     inspectorTabs: buildInspectorTabs(config.inspector, runtimeKind)
   };
 }
@@ -5232,15 +5244,16 @@ function buildNativeFactory(runtime, registryConfig, definition) {
   var _a;
   const config = definition.config;
   const databaseProvider = config.db;
+  const actionHandlers = flattenActionHandlers(config.actions);
   const schemaConfig = {
-    actionInputSchemas: config.actionInputSchemas,
+    actionInputSchemas: flattenActionInputSchemas(
+      config.actions,
+      config.actionInputSchemas
+    ),
     connParamsSchema: config.connParamsSchema,
     events: config.events,
     queues: config.queues
   };
-  const actionHandlers = Object.fromEntries(
-    Object.entries(config.actions ?? {}).map(([name, handler]) => [name, handler])
-  );
   const createClient = () => createClientWithDriver(
     new RemoteEngineControlClient(
       convertRegistryConfigToClientConfig(registryConfig)
@@ -6290,6 +6303,7 @@ async function buildConfiguredRegistry(config) {
 }
 
 // src/registry/index.ts
+var REGISTRY_READY_TIMEOUT_MS = 3e4;
 function signalExitCode(signal) {
   switch (signal) {
     case "SIGINT":
@@ -6315,6 +6329,8 @@ var Registry = class {
     return RegistryConfigSchema.parse(this.#config);
   }
   #runtimeServePromise;
+  #runtimeServeLifecyclePromise;
+  #runtimeReadyPromise;
   #runtimeServeConfiguredPromise;
   #runtimeServerlessPromise;
   #configureServerlessPoolPromise;
@@ -6661,11 +6677,16 @@ var Registry = class {
     if (!this.#runtimeServePromise) {
       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.#runtimeServeLifecyclePromise = configuredRegistryPromise.then(
+        async ({ runtime, registry, serveConfig }) => {
+          await runtime.serveRegistry(registry, serveConfig);
+        }
+      );
+      this.#runtimeServePromise = this.#runtimeServeLifecyclePromise.catch(
+        (error) => {
+          logger2().warn({ error }, "runtime registry serve errored");
+        }
+      );
       this.#installSignalHandlers(config);
     }
     if (printWelcome) {
@@ -6811,6 +6832,75 @@ var Registry = class {
   startEnvoy() {
     this.#startEnvoy(this.parseConfig(), true);
   }
+  /**
+   * Starts the serverful registry if needed and waits until its envoy has
+   * registered with the Engine. Repeated and concurrent calls share one
+   * startup lifecycle and readiness promise.
+   *
+   * Unlike {@link start}, this reports startup failures and does not resolve
+   * merely because an HTTP health endpoint is listening.
+   */
+  startAndWait() {
+    if (this.#shutdownInFlight !== null) {
+      return Promise.reject(
+        new Error("registry.startAndWait() cannot run after shutdown has begun")
+      );
+    }
+    if (this.#runtimeReadyPromise) return this.#runtimeReadyPromise;
+    if (getRivetkitRuntimeMode() === "serverless") {
+      return Promise.reject(
+        new Error(
+          "registry.startAndWait() requires envoy runtime mode; serverless registries become ready per request"
+        )
+      );
+    }
+    const config = this.parseConfig();
+    if (config.runtime === "wasm") {
+      return Promise.reject(
+        new Error(
+          "registry.startAndWait() requires the native runtime; WebAssembly registries do not host an envoy"
+        )
+      );
+    }
+    this.#startEnvoy(config, true);
+    const configuredRegistryPromise = this.#runtimeServeConfiguredPromise;
+    const serveLifecyclePromise = this.#runtimeServeLifecyclePromise;
+    if (!configuredRegistryPromise || !serveLifecyclePromise) {
+      throw new Error("registry envoy startup did not initialize");
+    }
+    let timeout;
+    const timeoutPromise = new Promise((_resolve, reject) => {
+      var _a;
+      timeout = setTimeout(
+        () => reject(
+          new Error(
+            `RivetKit registry did not register with the Engine within ${REGISTRY_READY_TIMEOUT_MS}ms`
+          )
+        ),
+        REGISTRY_READY_TIMEOUT_MS
+      );
+      (_a = timeout.unref) == null ? void 0 : _a.call(timeout);
+    });
+    const readinessPromise = (async () => {
+      const { runtime, registry } = await configuredRegistryPromise;
+      const stoppedBeforeReady = serveLifecyclePromise.then(() => {
+        throw new Error("RivetKit registry stopped before becoming ready");
+      });
+      await Promise.race([
+        runtime.waitRegistryReady(registry),
+        stoppedBeforeReady
+      ]);
+    })();
+    this.#runtimeReadyPromise = Promise.race([
+      readinessPromise,
+      timeoutPromise
+    ]).finally(() => {
+      if (timeout !== void 0) clearTimeout(timeout);
+    });
+    this.#runtimeReadyPromise.catch(() => {
+    });
+    return this.#runtimeReadyPromise;
+  }
   /**
    * Starts the actor envoy for standalone server deployments.
    *