@rivetkit/supabase 2.3.5-rc.1 → 2.3.6

package/dist/mod.mjs

@@ -471,7 +471,7 @@ function unsupportedFeature(feature) {
   );
 }
 
-// ../rivetkit/dist/tsup/chunk-B4IZU537.js
+// ../rivetkit/dist/tsup/chunk-RDTFPGU2.js
 import {
   pino,
   stdTimeFunctions
@@ -13147,7 +13147,7 @@ var classic_default = external_exports;
 // ../../../node_modules/.pnpm/zod@4.1.13/node_modules/zod/v4/index.js
 var v4_default = classic_default;
 
-// ../rivetkit/dist/tsup/chunk-B4IZU537.js
+// ../rivetkit/dist/tsup/chunk-RDTFPGU2.js
 var import_invariant = __toESM(require_invariant(), 1);
 import * as cbor from "cbor-x";
 var getRivetEngine = () => getEnvUniversal("RIVET_ENGINE");
@@ -13312,7 +13312,7 @@ function noopNext() {
 }
 var package_default = {
   name: "rivetkit",
-  version: "2.3.5-rc.1",
+  version: "2.3.6",
   description: "Lightweight libraries for building stateful actors on edge platforms",
   license: "Apache-2.0",
   keywords: [
@@ -13384,6 +13384,16 @@ var package_default = {
         default: "./dist/tsup/db/drizzle.cjs"
       }
     },
+    "./unstable/migrations": {
+      import: {
+        types: "./dist/tsup/unstable/migrations.d.ts",
+        default: "./dist/tsup/unstable/migrations.js"
+      },
+      require: {
+        types: "./dist/tsup/unstable/migrations.d.cts",
+        default: "./dist/tsup/unstable/migrations.cjs"
+      }
+    },
     "./dynamic": {
       import: {
         types: "./dist/tsup/dynamic/mod.d.ts",
@@ -13483,7 +13493,7 @@ var package_default = {
     "./dist/tsup/chunk-*.cjs"
   ],
   scripts: {
-    build: "tsup src/mod.ts src/client/mod.ts src/common/log.ts src/common/websocket.ts src/actor/errors.ts src/utils.ts src/workflow/mod.ts src/test/mod.ts src/inspector/mod.ts src/inspector-tab/mod.ts src/db/mod.ts src/db/drizzle.ts src/dynamic/mod.ts && tsup src/agent-os/index.ts --no-clean --out-dir dist/tsup/agent-os",
+    build: "tsup src/mod.ts src/client/mod.ts src/common/log.ts src/common/websocket.ts src/actor/errors.ts src/utils.ts src/workflow/mod.ts src/test/mod.ts src/inspector/mod.ts src/inspector-tab/mod.ts src/db/mod.ts src/db/drizzle.ts src/dynamic/mod.ts src/unstable/migrations.ts && tsup src/agent-os/index.ts --no-clean --out-dir dist/tsup/agent-os",
     "build:browser": "tsup --config tsup.browser.config.ts",
     "check-types": "tsc --noEmit",
     lint: "biome check . && pnpm run check:test-skips && pnpm run check:wait-for-comments",
@@ -14592,7 +14602,7 @@ function Config({ initialBufferLength = 1024, maxBufferLength = 1024 * 1024 * 32
   };
 }
 
-// ../rivetkit/dist/tsup/chunk-MGTSVSUC.js
+// ../rivetkit/dist/tsup/chunk-PLLHHJWR.js
 var config2 = /* @__PURE__ */ Config({});
 function readWorkflowCbor(bc) {
   return readData(bc);
@@ -14890,7 +14900,87 @@ function decodeWorkflowHistoryTransport(data) {
   return decodeWorkflowHistory(toUint8Array(data));
 }
 
-// ../rivetkit/dist/tsup/chunk-SHBE77IT.js
+// ../rivetkit/dist/tsup/chunk-QWLJCP3X.js
+function flattenActionHandlers(actions) {
+  const flattened = /* @__PURE__ */ Object.create(null);
+  for (const { name, handler } of collectActionEntries(actions)) {
+    flattened[name] = handler;
+  }
+  return flattened;
+}
+function flattenActionInputSchemas(actions, schemas) {
+  if (schemas === void 0) return void 0;
+  if (!isRecord(schemas)) {
+    throw new TypeError("actionInputSchemas must be an object");
+  }
+  const flattened = /* @__PURE__ */ Object.create(null);
+  for (const { name, path: path2 } of collectActionEntries(actions)) {
+    const nestedSchema = lookupNestedSchema(schemas, path2);
+    const flatSchema = schemas[name];
+    if (nestedSchema !== void 0 && flatSchema !== void 0 && nestedSchema !== flatSchema) {
+      throw new TypeError(
+        `Action input schema \`${name}\` is defined by both a nested path and a dotted key`
+      );
+    }
+    const schema = nestedSchema ?? flatSchema;
+    if (schema !== void 0) {
+      flattened[name] = schema;
+    }
+  }
+  return flattened;
+}
+function collectActionEntries(actions) {
+  const entries = [];
+  const names = /* @__PURE__ */ new Set();
+  visitActionGroup(actions ?? {}, [], entries, names);
+  return entries;
+}
+function visitActionGroup(value, path2, entries, names) {
+  if (!isRecord(value)) {
+    throw new TypeError(
+      `${formatActionPath(path2)} must be an action handler or group`
+    );
+  }
+  for (const [segment, child] of Object.entries(value)) {
+    const childPath = [...path2, segment];
+    if (typeof child === "function") {
+      const name = childPath.join(".");
+      if (names.has(name)) {
+        throw new TypeError(
+          `Multiple action definitions flatten to \`${name}\``
+        );
+      }
+      names.add(name);
+      entries.push({
+        name,
+        path: childPath,
+        handler: child
+      });
+    } else {
+      visitActionGroup(child, childPath, entries, names);
+    }
+  }
+}
+function lookupNestedSchema(schemas, path2) {
+  let value = schemas;
+  for (const segment of path2) {
+    if (!isRecord(value) || !Object.hasOwn(value, segment)) {
+      return void 0;
+    }
+    value = value[segment];
+  }
+  return value;
+}
+function isRecord(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value);
+  return prototype === Object.prototype || prototype === null;
+}
+function formatActionPath(path2) {
+  return path2.length === 0 ? "actions" : `Action \`${path2.join(".")}\``;
+}
 var DEFAULT_SLEEP_GRACE_PERIOD = 15e3;
 var ACTOR_CONTEXT_INTERNAL_SYMBOL = /* @__PURE__ */ Symbol(
   "rivetkit.actor_context_internal"
@@ -14898,6 +14988,22 @@ var ACTOR_CONTEXT_INTERNAL_SYMBOL = /* @__PURE__ */ Symbol(
 var RAW_STATE_SYMBOL = /* @__PURE__ */ Symbol("rivetkit.raw_state");
 var CONN_STATE_MANAGER_SYMBOL = /* @__PURE__ */ Symbol("rivetkit.conn_state_manager");
 var zFunction = () => external_exports.custom((val) => typeof val === "function");
+var zActionTree = external_exports.custom((value) => {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value);
+  return prototype === Object.prototype || prototype === null;
+}).superRefine((actions, ctx) => {
+  try {
+    flattenActionHandlers(actions);
+  } catch (error46) {
+    ctx.addIssue({
+      code: "custom",
+      message: error46 instanceof Error ? error46.message : "Invalid action definition"
+    });
+  }
+});
 var WorkflowInspectorConfigSchema = external_exports.object({
   getHistory: zFunction(),
   onHistoryUpdated: zFunction().optional(),
@@ -15067,7 +15173,7 @@ var ActorConfigSchema = external_exports.object({
   onBeforeActionResponse: zFunction().optional(),
   onRequest: zFunction().optional(),
   onWebSocket: zFunction().optional(),
-  actions: external_exports.record(external_exports.string(), zFunction()).default(() => ({})),
+  actions: zActionTree.default(() => ({})),
   actionInputSchemas: external_exports.record(external_exports.string(), external_exports.any()).optional(),
   connParamsSchema: external_exports.any().optional(),
   events: external_exports.record(external_exports.string(), external_exports.any()).optional(),
@@ -15211,10 +15317,10 @@ var DocActorConfigSchema = external_exports.object({
     "Called for raw WebSocket connections to /actors/{name}/websocket/* endpoints."
   ),
   actions: external_exports.record(external_exports.string(), external_exports.unknown()).optional().describe(
-    "Map of action name to handler function. Defaults to an empty object."
+    "Tree of action names or nested groups to handler functions. Nested paths use dot-separated low-level action names. Defaults to an empty object."
   ),
   actionInputSchemas: external_exports.record(external_exports.string(), external_exports.unknown()).optional().describe(
-    "Optional schema map for validating action argument tuples in native runtimes."
+    "Optional schemas for validating action argument tuples in native runtimes. May mirror nested action groups or use dot-separated low-level action names."
   ),
   connParamsSchema: external_exports.unknown().optional().describe(
     "Optional schema for validating connection params in native runtimes."
@@ -15341,35 +15447,7 @@ function removePrefixFromKey(prefixedKey) {
   return prefixedKey.slice(KEYS.KV.length);
 }
 
-// ../rivetkit/dist/tsup/chunk-7AFZMFPQ.js
-var MIGRATION_TRANSACTION_TIMEOUT_MS = 5 * 6e4;
-var AsyncMutex = class {
-  #locked = false;
-  #waiting = [];
-  async acquire() {
-    while (this.#locked) {
-      await new Promise((resolve) => this.#waiting.push(resolve));
-    }
-    this.#locked = true;
-  }
-  release() {
-    this.#locked = false;
-    const next = this.#waiting.shift();
-    if (next) {
-      next();
-    }
-  }
-  async run(fn) {
-    await this.acquire();
-    try {
-      return await fn();
-    } finally {
-      this.release();
-    }
-  }
-};
-
-// ../rivetkit/dist/tsup/chunk-PAG6G46L.js
+// ../rivetkit/dist/tsup/chunk-OH6CBWUD.js
 function logger() {
   return getLogger("actor-client");
 }
@@ -15407,7 +15485,35 @@ async function importWebSocket() {
   return webSocketPromise;
 }
 
-// ../rivetkit/dist/tsup/chunk-GAV4PKFT.js
+// ../rivetkit/dist/tsup/chunk-7AFZMFPQ.js
+var MIGRATION_TRANSACTION_TIMEOUT_MS = 5 * 6e4;
+var AsyncMutex = class {
+  #locked = false;
+  #waiting = [];
+  async acquire() {
+    while (this.#locked) {
+      await new Promise((resolve) => this.#waiting.push(resolve));
+    }
+    this.#locked = true;
+  }
+  release() {
+    this.#locked = false;
+    const next = this.#waiting.shift();
+    if (next) {
+      next();
+    }
+  }
+  async run(fn) {
+    await this.acquire();
+    try {
+      return await fn();
+    } finally {
+      this.release();
+    }
+  }
+};
+
+// ../rivetkit/dist/tsup/chunk-F6ZW7JZQ.js
 var import_invariant2 = __toESM(require_invariant(), 1);
 
 // ../../../node_modules/.pnpm/p-retry@6.2.1/node_modules/p-retry/index.js
@@ -15585,7 +15691,7 @@ function createVersionedDataHandler(config3) {
   return new VersionedDataHandler(config3);
 }
 
-// ../rivetkit/dist/tsup/chunk-GAV4PKFT.js
+// ../rivetkit/dist/tsup/chunk-F6ZW7JZQ.js
 var import_invariant3 = __toESM(require_invariant(), 1);
 var import_invariant4 = __toESM(require_invariant(), 1);
 var PATH_CONNECT = "/connect";
@@ -19032,6 +19138,23 @@ function createClientWithDriver(driver, config3 = {}) {
 }
 function createActorProxy(handle) {
   const methodCache = /* @__PURE__ */ new Map();
+  const actionPath = (name) => {
+    let method2 = methodCache.get(name);
+    if (method2) return method2;
+    method2 = new Proxy(
+      (...args) => handle.action({ name, args }),
+      {
+        get(target, prop) {
+          if (typeof prop === "symbol")
+            return Reflect.get(target, prop);
+          if (prop === "then") return void 0;
+          return actionPath(`${name}.${prop}`);
+        }
+      }
+    );
+    methodCache.set(name, method2);
+    return method2;
+  };
   return new Proxy(handle, {
     get(target, prop, receiver) {
       if (typeof prop === "symbol") {
@@ -19046,12 +19169,7 @@ function createActorProxy(handle) {
       }
       if (typeof prop === "string") {
         if (prop === "then") return void 0;
-        let method2 = methodCache.get(prop);
-        if (!method2) {
-          method2 = (...args) => target.action({ name: prop, args });
-          methodCache.set(prop, method2);
-        }
-        return method2;
+        return actionPath(prop);
       }
     },
     // Support for 'in' operator
@@ -19069,6 +19187,7 @@ function createActorProxy(handle) {
     },
     // Support proper property descriptors
     getOwnPropertyDescriptor(target, prop) {
+      if (prop === "then") return void 0;
       const targetDescriptor = Reflect.getOwnPropertyDescriptor(
         target,
         prop
@@ -19081,7 +19200,7 @@ function createActorProxy(handle) {
           configurable: true,
           enumerable: false,
           writable: false,
-          value: (...args) => target.action({ name: prop, args })
+          value: actionPath(prop)
         };
       }
       return void 0;
@@ -20317,103 +20436,6 @@ function convertRegistryConfigToClientConfig(config3) {
     devtools: typeof window !== "undefined" && (((_a2 = window == null ? void 0 : window.location) == null ? void 0 : _a2.hostname) === "127.0.0.1" || ((_b = window == null ? void 0 : window.location) == null ? void 0 : _b.hostname) === "localhost")
   };
 }
-function logger2() {
-  return getLogger("engine-client");
-}
-function getEndpoint(config3) {
-  return config3.endpoint ?? "http://127.0.0.1:6420";
-}
-async function apiCall(config3, method2, path2, body) {
-  const endpoint = getEndpoint(config3);
-  const url2 = combineUrlPath(endpoint, path2, {
-    namespace: config3.namespace
-  });
-  logger2().debug({ msg: "making api call", method: method2, url: url2 });
-  const headers = {
-    ...config3.headers
-  };
-  if (config3.token) {
-    headers.Authorization = `Bearer ${config3.token}`;
-  }
-  return await sendHttpRequest({
-    method: method2,
-    url: url2,
-    headers,
-    body,
-    encoding: "json",
-    skipParseResponse: false,
-    requestVersionedDataHandler: void 0,
-    requestVersion: void 0,
-    responseVersionedDataHandler: void 0,
-    responseVersion: void 0,
-    requestZodSchema: external_exports.any(),
-    responseZodSchema: external_exports.any(),
-    // Identity conversions (passthrough for generic API calls)
-    requestToJson: (value) => value,
-    requestToBare: (value) => value,
-    responseFromJson: (value) => value,
-    responseFromBare: (value) => value
-  });
-}
-async function getActor(config3, _, actorId) {
-  return apiCall(
-    config3,
-    "GET",
-    `/actors?actor_ids=${encodeURIComponent(actorId)}`
-  );
-}
-async function getActorByKey(config3, name, key) {
-  const serializedKey = serializeActorKey(key);
-  return apiCall(
-    config3,
-    "GET",
-    `/actors?name=${encodeURIComponent(name)}&key=${encodeURIComponent(serializedKey)}`
-  );
-}
-async function listActorsByName(config3, name) {
-  return apiCall(
-    config3,
-    "GET",
-    `/actors?name=${encodeURIComponent(name)}`
-  );
-}
-async function getOrCreateActor(config3, request) {
-  return apiCall(
-    config3,
-    "PUT",
-    `/actors`,
-    request
-  );
-}
-async function createActor(config3, request) {
-  return apiCall(
-    config3,
-    "POST",
-    `/actors`,
-    request
-  );
-}
-async function destroyActor(config3, actorId) {
-  return apiCall(
-    config3,
-    "DELETE",
-    `/actors/${encodeURIComponent(actorId)}`
-  );
-}
-async function getMetadata(config3) {
-  return apiCall(config3, "GET", `/metadata`);
-}
-async function getDatacenters(config3) {
-  return apiCall(config3, "GET", `/datacenters`);
-}
-async function updateRunnerConfig(config3, runnerName, request) {
-  return apiCall(
-    config3,
-    "PUT",
-    `/runner-configs/${runnerName}`,
-    request
-  );
-}
 function shouldSkipReadyWait(options = {}) {
   return options.skipReadyWait === true;
 }
@@ -20501,6 +20523,9 @@ function setRemoteHibernatableWebSocketAckTestHooks(websocket, token, enabled) {
     enabled
   );
 }
+function logger2() {
+  return getLogger("engine-client");
+}
 var BufferedRemoteWebSocket = class {
   CONNECTING = 0;
   OPEN = 1;
@@ -20778,6 +20803,100 @@ function buildWebSocketProtocols(runConfig, encoding, params, ackHookToken, targ
   }
   return protocols;
 }
+function getEndpoint(config3) {
+  return config3.endpoint ?? "http://127.0.0.1:6420";
+}
+async function apiCall(config3, method2, path2, body) {
+  const endpoint = getEndpoint(config3);
+  const url2 = combineUrlPath(endpoint, path2, {
+    namespace: config3.namespace
+  });
+  logger2().debug({ msg: "making api call", method: method2, url: url2 });
+  const headers = {
+    ...config3.headers
+  };
+  if (config3.token) {
+    headers.Authorization = `Bearer ${config3.token}`;
+  }
+  return await sendHttpRequest({
+    method: method2,
+    url: url2,
+    headers,
+    body,
+    encoding: "json",
+    skipParseResponse: false,
+    requestVersionedDataHandler: void 0,
+    requestVersion: void 0,
+    responseVersionedDataHandler: void 0,
+    responseVersion: void 0,
+    requestZodSchema: external_exports.any(),
+    responseZodSchema: external_exports.any(),
+    // Identity conversions (passthrough for generic API calls)
+    requestToJson: (value) => value,
+    requestToBare: (value) => value,
+    responseFromJson: (value) => value,
+    responseFromBare: (value) => value
+  });
+}
+async function getActor(config3, _, actorId) {
+  return apiCall(
+    config3,
+    "GET",
+    `/actors?actor_ids=${encodeURIComponent(actorId)}`
+  );
+}
+async function getActorByKey(config3, name, key) {
+  const serializedKey = serializeActorKey(key);
+  return apiCall(
+    config3,
+    "GET",
+    `/actors?name=${encodeURIComponent(name)}&key=${encodeURIComponent(serializedKey)}`
+  );
+}
+async function listActorsByName(config3, name) {
+  return apiCall(
+    config3,
+    "GET",
+    `/actors?name=${encodeURIComponent(name)}`
+  );
+}
+async function getOrCreateActor(config3, request) {
+  return apiCall(
+    config3,
+    "PUT",
+    `/actors`,
+    request
+  );
+}
+async function createActor(config3, request) {
+  return apiCall(
+    config3,
+    "POST",
+    `/actors`,
+    request
+  );
+}
+async function destroyActor(config3, actorId) {
+  return apiCall(
+    config3,
+    "DELETE",
+    `/actors/${encodeURIComponent(actorId)}`
+  );
+}
+async function getMetadata(config3) {
+  return apiCall(config3, "GET", `/metadata`);
+}
+async function getDatacenters(config3) {
+  return apiCall(config3, "GET", `/datacenters`);
+}
+async function updateRunnerConfig(config3, runnerName, request) {
+  return apiCall(
+    config3,
+    "PUT",
+    `/runner-configs/${runnerName}`,
+    request
+  );
+}
 var metadataLookupCache = /* @__PURE__ */ new Map();
 async function lookupMetadataCached(config3) {
   const endpoint = getEndpoint(config3);
@@ -22536,6 +22655,8 @@ function actor(input) {
     input == null ? void 0 : input.options
   );
   const config3 = ActorConfigSchema.parse(input);
+  flattenActionHandlers(config3.actions);
+  flattenActionInputSchemas(config3.actions, config3.actionInputSchemas);
   return new ActorDefinition(config3);
 }
 function isStaticActorDefinition(definition) {
@@ -23192,7 +23313,7 @@ var RegistryConfigSchema = external_exports.object({
     config3.engineHost,
     config3.enginePort
   );
-  const endpoint = config3.startEngine ? localEngineEndpoint : (parsedEndpoint == null ? void 0 : parsedEndpoint.endpoint) ?? (isDevEnv ? buildEngineEndpoint(ENGINE_HOST, ENGINE_PORT) : void 0);
+  const endpoint = config3.startEngine ? localEngineEndpoint : (parsedEndpoint == null ? void 0 : parsedEndpoint.endpoint) ?? (isDevEnv ? localEngineEndpoint : void 0);
   const validateServerlessEndpoint = Boolean(
     config3.startEngine || parsedEndpoint
   );
@@ -23209,7 +23330,7 @@ var RegistryConfigSchema = external_exports.object({
       path: ["serverless", "publicEndpoint"]
     });
   }
-  const publicEndpoint = (parsedPublicEndpoint == null ? void 0 : parsedPublicEndpoint.endpoint) ?? (isDevEnv && config3.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) ?? config3.serverless.publicToken;
   return {
@@ -23879,6 +24000,9 @@ var NapiCoreRuntime = class {
   async serveRegistry(registry2, config3) {
     await asNativeRegistry(registry2).serve(config3);
   }
+  async waitRegistryReady(registry2) {
+    await asNativeRegistry(registry2).waitReady();
+  }
   async shutdownRegistry(registry2) {
     await asNativeRegistry(registry2).shutdown();
   }
@@ -24543,6 +24667,11 @@ var WasmCoreRuntime = class {
   async serveRegistry(registry2, config3) {
     await callWasm(() => asWasmRegistry(registry2).serve(config3));
   }
+  async waitRegistryReady() {
+    throw new Error(
+      "registry.startAndWait() is not supported by the WASM runtime"
+    );
+  }
   async shutdownRegistry(registry2) {
     await callWasm(() => asWasmRegistry(registry2).shutdown());
   }
@@ -27532,7 +27661,7 @@ function buildActorConfig(definition, registryConfig, runtimeKind) {
     maxOutgoingMessageSize: registryConfig.maxOutgoingMessageSize,
     preloadMaxWorkflowBytes: options.preloadMaxWorkflowBytes,
     preloadMaxConnectionsBytes: options.preloadMaxConnectionsBytes,
-    actions: Object.keys(config3.actions ?? {}).sort().map((name) => ({ name })),
+    actions: Object.keys(flattenActionHandlers(config3.actions)).sort().map((name) => ({ name })),
     inspectorTabs: buildInspectorTabs(config3.inspector, runtimeKind)
   };
 }
@@ -27609,15 +27738,16 @@ function buildNativeFactory(runtime, registryConfig, definition) {
   var _a2;
   const config3 = definition.config;
   const databaseProvider = config3.db;
+  const actionHandlers = flattenActionHandlers(config3.actions);
   const schemaConfig = {
-    actionInputSchemas: config3.actionInputSchemas,
+    actionInputSchemas: flattenActionInputSchemas(
+      config3.actions,
+      config3.actionInputSchemas
+    ),
     connParamsSchema: config3.connParamsSchema,
     events: config3.events,
     queues: config3.queues
   };
-  const actionHandlers = Object.fromEntries(
-    Object.entries(config3.actions ?? {}).map(([name, handler]) => [name, handler])
-  );
   const createClient = () => createClientWithDriver(
     new RemoteEngineControlClient(
       convertRegistryConfigToClientConfig(registryConfig)
@@ -28665,6 +28795,7 @@ async function buildConfiguredRegistry(config3) {
     runtime
   );
 }
+var REGISTRY_READY_TIMEOUT_MS = 3e4;
 function signalExitCode(signal) {
   switch (signal) {
     case "SIGINT":
@@ -28690,6 +28821,8 @@ var Registry = class {
     return RegistryConfigSchema.parse(this.#config);
   }
   #runtimeServePromise;
+  #runtimeServeLifecyclePromise;
+  #runtimeReadyPromise;
   #runtimeServeConfiguredPromise;
   #runtimeServerlessPromise;
   #configureServerlessPoolPromise;
@@ -29036,11 +29169,16 @@ var Registry = class {
     if (!this.#runtimeServePromise) {
       const configuredRegistryPromise = this.#buildConfiguredRegistry(config3);
       this.#runtimeServeConfiguredPromise = configuredRegistryPromise;
-      this.#runtimeServePromise = configuredRegistryPromise.then(async ({ runtime, registry: registry2, serveConfig }) => {
-        await runtime.serveRegistry(registry2, serveConfig);
-      }).catch((error46) => {
-        logger22().warn({ error: error46 }, "runtime registry serve errored");
-      });
+      this.#runtimeServeLifecyclePromise = configuredRegistryPromise.then(
+        async ({ runtime, registry: registry2, serveConfig }) => {
+          await runtime.serveRegistry(registry2, serveConfig);
+        }
+      );
+      this.#runtimeServePromise = this.#runtimeServeLifecyclePromise.catch(
+        (error46) => {
+          logger22().warn({ error: error46 }, "runtime registry serve errored");
+        }
+      );
       this.#installSignalHandlers(config3);
     }
     if (printWelcome) {
@@ -29186,6 +29324,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 config3 = this.parseConfig();
+    if (config3.runtime === "wasm") {
+      return Promise.reject(
+        new Error(
+          "registry.startAndWait() requires the native runtime; WebAssembly registries do not host an envoy"
+        )
+      );
+    }
+    this.#startEnvoy(config3, 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 _a2;
+      timeout = setTimeout(
+        () => reject(
+          new Error(
+            `RivetKit registry did not register with the Engine within ${REGISTRY_READY_TIMEOUT_MS}ms`
+          )
+        ),
+        REGISTRY_READY_TIMEOUT_MS
+      );
+      (_a2 = timeout.unref) == null ? void 0 : _a2.call(timeout);
+    });
+    const readinessPromise = (async () => {
+      const { runtime, registry: registry2 } = await configuredRegistryPromise;
+      const stoppedBeforeReady = serveLifecyclePromise.then(() => {
+        throw new Error("RivetKit registry stopped before becoming ready");
+      });
+      await Promise.race([
+        runtime.waitRegistryReady(registry2),
+        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.
    *